merge

designer-base/src/com/fr/design/mainframe/loghandler/socketio/DesignerSocketIO.java

@@ -47,7 +47,7 @@ public class DesignerSocketIO {
     static {
         EventDispatcher.listen(EnvEvents.AFTER_SIGN_OUT, new Listener<Null>() {
             @Override
-            public void on(Event<Null> event, Null param) {
+            public void on(Event event, Null param) {
                 if (socketIO.isPresent()) {
                     socketIO.get().close();
                     socketIO = Optional.absent();
@@ -56,7 +56,7 @@ public class DesignerSocketIO {
         });
         EventDispatcher.listen(EnvEvents.AFTER_SIGN_IN, new Listener<Null>() {
             @Override
-            public void on(Event<Null> event, Null param) {
+            public void on(Event event, Null param) {
                 updateSocket();
             }
         });

designer-base/src/com/fr/design/remote/action/RemoteDesignAuthorityManagerAction.java

@@ -48,11 +48,8 @@ public class RemoteDesignAuthorityManagerAction extends UpdateAction {
             public void doOk() {
                 DesignAuthority[] authorities = managerPane.update();
                 if (!FRContext.getCurrentEnv().isLocalEnv()) {
-                    try {
+                    boolean success = ((RemoteEnv) FRContext.getCurrentEnv()).updateAuthorities(authorities);
-                        ((RemoteEnv) FRContext.getCurrentEnv()).updateAuthorities(authorities);
+                    FRContext.getLogger().info("update remote design authority: " + success);
-                    } catch (Exception exception) {
-                        FRContext.getLogger().error(exception.getMessage());
-                    }
                 }
             }
 

designer-base/src/com/fr/design/utils/DesignUtils.java

@@ -1,11 +1,11 @@
 package com.fr.design.utils;
 
 import com.fr.base.BaseUtils;
-import com.fr.base.ServerConfig;
 import com.fr.base.Env;
 import com.fr.base.EnvException;
 import com.fr.base.FRContext;
 import com.fr.base.FeedBackInfo;
+import com.fr.base.ServerConfig;
 import com.fr.base.Utils;
 import com.fr.base.remote.RemoteDeziConstants;
 import com.fr.dav.DavXMLUtils;
@@ -23,6 +23,7 @@ import com.fr.general.FRLogger;
 import com.fr.general.GeneralContext;
 import com.fr.general.Inter;
 import com.fr.general.http.HttpClient;
+import com.fr.security.JwtUtils;
 import com.fr.stable.ArrayUtils;
 import com.fr.stable.CodeUtils;
 import com.fr.stable.EncodeConstants;
@@ -30,8 +31,11 @@ import com.fr.stable.StableUtils;
 import com.fr.stable.StringUtils;
 import com.fr.start.StartServer;
 
-import javax.swing.*;
+import javax.swing.JOptionPane;
-import java.awt.*;
+import javax.swing.SwingUtilities;
+import javax.swing.UIManager;
+import java.awt.Desktop;
+import java.awt.Font;
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
 import java.io.ByteArrayInputStream;
@@ -75,6 +79,7 @@ public class DesignUtils {
     /**
      * 通过端口是否被占用判断设计器有没有启动
      * s
+     *
      * @return 启动了返回true
      */
     public static boolean isStarted() {
@@ -121,6 +126,7 @@ public class DesignUtils {
 
     /**
      * 建立监听端口
+     *
      * @param startPort 端口
      * @param suffixs   文件后缀
      */
@@ -344,6 +350,9 @@ public class DesignUtils {
                     boolean isUserPrivilege = ((RemoteEnv) FRContext.getCurrentEnv()).writePrivilegeMap(time, postfixOfUri);
                     postfixOfUri = isUserPrivilege ? postfixOfUri + "&fr_check_url=" + time + "&id=" + FRContext.getCurrentEnv().getUserID() : postfixOfUri;
                 }
+                // 加参数给远程设计校验权限。
+                String design = JwtUtils.createDefaultJWT(FRContext.getCurrentEnv().getUser());
+                postfixOfUri = postfixOfUri + "&design=" + design;
 
                 String urlPath = getWebBrowserPath();
                 Desktop.getDesktop().browse(new URI(urlPath + postfixOfUri));

designer-base/src/com/fr/env/DesignAuthorityConfigurable.java

@@ -6,5 +6,5 @@ public interface DesignAuthorityConfigurable {
 
     DesignAuthority[] getAuthorities();
 
-    boolean updateAuthorities(DesignAuthority[] authorities) throws Exception;
+    boolean updateAuthorities(DesignAuthority[] authorities);
 }

designer-base/src/com/fr/env/RemoteEnvUtils.java

@@ -3,6 +3,7 @@ package com.fr.env;
 import com.fr.base.FRContext;
 import com.fr.general.IOUtils;
 import com.fr.report.DesignAuthority;
+import com.fr.report.util.AuthorityXMLUtils;
 import com.fr.stable.EncodeConstants;
 import com.fr.third.org.apache.http.HttpEntity;
 import com.fr.third.org.apache.http.client.methods.CloseableHttpResponse;
@@ -13,7 +14,6 @@ import com.fr.third.org.apache.http.entity.InputStreamEntity;
 import com.fr.third.org.apache.http.impl.client.CloseableHttpClient;
 import com.fr.third.org.apache.http.impl.client.HttpClients;
 import com.fr.third.org.apache.http.util.EntityUtils;
-import com.fr.web.utils.AuthorityXMLUtils;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;

designer-base/src/com/fr/env/SignIn.java

@@ -25,7 +25,7 @@ public class SignIn {
     static {
         EventDispatcher.listen(EnvEvents.CONNECTION_ERROR, new Listener<Null>() {
             @Override
-            public void on(Event<Null> event, Null param) {
+            public void on(Event event, Null param) {
                 if (JOptionPane.showConfirmDialog(null, Inter.getLocText("FR-Remote_Connect2Server_Again"), UIManager.getString("OptionPane.titleText"), JOptionPane.YES_NO_OPTION)
                         == JOptionPane.OK_OPTION) {
                     try {

designer-form/src/com/fr/design/mainframe/widget/accessibles/AccessibleBodyWatermarkEditor.java

@@ -7,6 +7,9 @@ import com.fr.design.mainframe.widget.editors.ITextComponent;
 import com.fr.design.mainframe.widget.renderer.WatermarkRenderer;
 import com.fr.design.mainframe.widget.wrappers.WatermarkWrapper;
 import com.fr.design.report.WatermarkPane;
+import com.fr.plugin.ExtraClassManager;
+import com.fr.stable.ReportFunctionProcessor;
+import com.fr.stable.fun.FunctionProcessor;
 
 import javax.swing.SwingUtilities;
 import java.awt.Dimension;
@@ -40,6 +43,11 @@ public class AccessibleBodyWatermarkEditor extends UneditableAccessibleEditor {
             public void doOk() {
                 setValue(watermarkPane.update());
                 fireStateChanged();
+                // 功能点
+                FunctionProcessor processor = ExtraClassManager.getInstance().getFunctionProcessor();
+                if (processor != null) {
+                    processor.recordFunction(ReportFunctionProcessor.WATERMARK);
+                }
             }
         });
         watermarkPane.populate((WatermarkAttr) getValue());

designer-realize/src/com/fr/design/actions/report/ReportWatermarkAction.java

@@ -9,7 +9,10 @@ import com.fr.design.mainframe.JWorkBook;
 import com.fr.design.menu.KeySetUtils;
 import com.fr.design.report.WatermarkPane;
 import com.fr.main.impl.WorkBook;
+import com.fr.plugin.ExtraClassManager;
 import com.fr.report.core.ReportUtils;
+import com.fr.stable.ReportFunctionProcessor;
+import com.fr.stable.fun.FunctionProcessor;
 
 import java.awt.event.ActionEvent;
 
@@ -42,6 +45,11 @@ public class ReportWatermarkAction extends JWorkBookAction {
             public void doOk() {
                 wbTpl.addAttrMark(watermarkPane.update());
                 jwb.fireTargetModified();
+                // 功能点
+                FunctionProcessor processor = ExtraClassManager.getInstance().getFunctionProcessor();
+                if (processor != null) {
+                    processor.recordFunction(ReportFunctionProcessor.WATERMARK);
+                }
             }
         }).setVisible(true);
     }