Merge branch 'release/10.0' of ssh://code.fineres.com:7999/~tommy/design into release/10.0

designer-base/src/main/java/com/fr/design/EnvChangeEntrance.java

@@ -8,6 +8,7 @@ import com.fr.design.dialog.DialogActionAdapter;
 import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.env.DesignerWorkspaceGenerator;
 import com.fr.design.env.DesignerWorkspaceInfo;
+import com.fr.design.env.DesignerWorkspaceInfoContext;
 import com.fr.design.env.DesignerWorkspaceType;
 import com.fr.design.env.RemoteDesignerWorkspaceInfo;
 import com.fr.design.env.RemoteWorkspace;
@@ -20,7 +21,7 @@ import com.fr.design.notification.NotificationCenter;
 import com.fr.design.utils.DesignUtils;
 import com.fr.design.versioncheck.VersionCheckUtils;
 import com.fr.env.EnvListPane;
-import com.fr.env.handler.RemoteDesignExceptionHandler;
+import com.fr.env.handler.WorkspaceExceptionHandler;
 import com.fr.exit.DesignerExiter;
 import com.fr.general.GeneralUtils;
 import com.fr.invoke.Reflect;
@@ -105,6 +106,7 @@ public class EnvChangeEntrance {
     private boolean switch2Env(final String envName, PopTipStrategy strategy) {
         DesignerEnvManager envManager = DesignerEnvManager.getEnvManager();
         DesignerWorkspaceInfo selectedEnv = envManager.getWorkspaceInfo(envName);
+        DesignerWorkspaceInfoContext.setWorkspaceInfo(selectedEnv);
         WorkspaceConnectionInfo connectionInfo = selectedEnv.getConnection();
 
         try {
@@ -139,7 +141,7 @@ public class EnvChangeEntrance {
             pluginErrorRemind();
         } catch (Exception exception) {
             // 失败的处理
-            RemoteDesignExceptionHandler.getInstance().handleInSwitch(exception, selectedEnv);
+            WorkspaceExceptionHandler.getInstance().handleInSwitch(exception, selectedEnv);
             return false;
         }
         TemplateTreePane.getInstance().refreshDockingView();
@@ -436,7 +438,7 @@ public class EnvChangeEntrance {
             }
         });
         if (e != null) {
-            RemoteDesignExceptionHandler.getInstance().handleInStart(e, workspaceInfo);
+            WorkspaceExceptionHandler.getInstance().handleInStart(e, workspaceInfo);
         }
         envListDialog.setVisible(true);
     }

designer-base/src/main/java/com/fr/design/data/datapane/connect/JDBCDefPane.java

@@ -7,6 +7,7 @@ import com.fr.data.impl.JDBCDatabaseConnection;
 import com.fr.design.border.UITitledBorder;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.gui.icombobox.UIComboBox;
+import com.fr.design.gui.icombobox.UIComboBoxUI;
 import com.fr.design.gui.ilable.ActionLabel;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.ipasswordfield.UIPasswordFieldWithFixedLength;
@@ -32,6 +33,8 @@ import javax.swing.JPanel;
 import javax.swing.JPasswordField;
 import javax.swing.event.DocumentEvent;
 import javax.swing.event.DocumentListener;
+import javax.swing.plaf.ComboBoxUI;
+import javax.swing.plaf.basic.ComboPopup;
 import java.awt.BorderLayout;
 import java.awt.Color;
 import java.awt.Component;
@@ -275,8 +278,9 @@ public class JDBCDefPane extends JPanel {
         }
         dbtypeComboBox.addActionListener(dbtypeActionListener);
         dbtypeComboBox.setMaximumRowCount(10);
-        driverLoaderBox = new UIComboBox();
+        driverLoaderBox = new SpecialUIComboBox();
         refreshDriverLoader();
+        driverLoaderBox.setPreferredSize(new Dimension(200, driverLoaderBox.getPreferredSize().height));
         driverLoaderBox.setEditable(false);
         driverManageBox = new UIComboBox();
         refreshDriverManage(true);
@@ -350,7 +354,7 @@ public class JDBCDefPane extends JPanel {
         odbcTipsPane.add(driverManageLabel);
         odbcTipsPane.add(odbcTipsLink);
         JPanel driverComboBoxAndTips = new JPanel(new BorderLayout());
-        JPanel normalFlowInnerContainer_s_pane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
+        JPanel normalFlowInnerContainer_s_pane = FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane(0, 5, 0);
         normalFlowInnerContainer_s_pane.add(driverManageBox);
         normalFlowInnerContainer_s_pane.add(driverComboBox);
         normalFlowInnerContainer_s_pane.add(driverLoaderBox);
@@ -507,7 +511,6 @@ public class JDBCDefPane extends JPanel {
                 this.dbtypeComboBox.setSelectedItem(OTHER_DB);
             }
         }
-        this.jdbcDatabase.setIdentity(jdbcDatabase.getIdentity());
         // jdbcDatabase.getDriverSource() 只会是空或者是有值，但是为了保险起见，还是应该做个处理
         String driverSource = jdbcDatabase.getDriverSource();
         if (driverSource == null) {
@@ -717,4 +720,22 @@ public class JDBCDefPane extends JPanel {
         private String driver;
         private String url;
     }
+
+    private static class SpecialUIComboBox extends UIComboBox {
+
+        @Override
+        public ComboBoxUI getUIComboBoxUI() {
+            return new SpecialUIComboBoxUI();
+        }
+    }
+
+    private static class SpecialUIComboBoxUI extends UIComboBoxUI {
+
+        @Override
+        public ComboPopup createPopup() {
+            return createHorizontalNeverUIComboPopUp();
+        }
+
+    }
+
 }

designer-base/src/main/java/com/fr/design/env/DesignerWorkspaceInfoContext.java

@@ -0,0 +1,20 @@
+package com.fr.design.env;
+
+/**
+ *
+ * @author hades
+ * @version 10.0
+ * Created by hades on 2021/8/24
+ */
+public class DesignerWorkspaceInfoContext {
+
+    private static DesignerWorkspaceInfo workspaceInfo;
+
+    public static DesignerWorkspaceInfo getWorkspaceInfo() {
+        return workspaceInfo;
+    }
+
+    public static void setWorkspaceInfo(DesignerWorkspaceInfo workspaceInfo) {
+        DesignerWorkspaceInfoContext.workspaceInfo = workspaceInfo;
+    }
+}

designer-base/src/main/java/com/fr/design/env/LocalDesignerWorkspaceInfo.java

@@ -1,18 +1,37 @@
 package com.fr.design.env;
 
 import com.fr.general.ComparatorUtils;
+import com.fr.general.GeneralUtils;
+import com.fr.locale.InterProviderFactory;
+import com.fr.stable.StableUtils;
 import com.fr.stable.StringUtils;
+import com.fr.stable.project.ProjectConstants;
 import com.fr.stable.xml.XMLPrintWriter;
 import com.fr.stable.xml.XMLableReader;
 import com.fr.workspace.connect.WorkspaceConnectionInfo;
 
+import com.fr.workspace.engine.exception.MainVersionNotMatchException;
 import java.io.File;
+import java.util.Properties;
 
 /**
  * Created by juhaoyu on 2018/6/15.
  */
 public class LocalDesignerWorkspaceInfo implements DesignerWorkspaceInfo {
-    
+
+    private static final String REPORT_ENGINE_KEY = "report-engine-key";
+    private static final String REPORT_ENGINE_JAR;
+    private static final String PROP_PATH = "/com/fr/env/jarVersion.properties";
+
+    static {
+        Properties properties = new Properties();
+        try {
+            properties.load(LocalDesignerWorkspaceInfo.class.getResourceAsStream(PROP_PATH));
+        } catch (Exception ignored) {
+        }
+        REPORT_ENGINE_JAR = properties.getProperty(REPORT_ENGINE_KEY, "default.jar");
+    }
+
     private String name;
 
     private String path;
@@ -86,6 +105,14 @@ public class LocalDesignerWorkspaceInfo implements DesignerWorkspaceInfo {
             return false;
         }
 
+        File engineLib = new File(StableUtils.pathJoin(this.path, ProjectConstants.LIB_NAME, REPORT_ENGINE_JAR));
+        // 非安装版本允许自由切换
+        boolean notExistLib = !ComparatorUtils.equals(GeneralUtils.readFullBuildNO(), InterProviderFactory.getProvider().getLocText("Fine-Core_Basic_About_No_Build"))
+                && !engineLib.exists();
+        if (notExistLib) {
+            throw new MainVersionNotMatchException();
+        }
+
         return true;
     }
 }

designer-base/src/main/java/com/fr/design/gui/icombobox/UIComboBoxUI.java

@@ -10,12 +10,26 @@ import com.fr.stable.Constants;
 import com.fr.stable.StringUtils;
 import sun.swing.DefaultLookup;
 
-import javax.swing.*;
+import javax.swing.AbstractButton;
+import javax.swing.JComboBox;
+import javax.swing.JComponent;
+import javax.swing.JList;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.ListCellRenderer;
+import javax.swing.ScrollPaneConstants;
+import javax.swing.UIManager;
 import javax.swing.plaf.ButtonUI;
 import javax.swing.plaf.basic.BasicComboBoxUI;
 import javax.swing.plaf.basic.BasicComboPopup;
 import javax.swing.plaf.basic.ComboPopup;
-import java.awt.*;
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.awt.Point;
+import java.awt.Rectangle;
+import java.awt.RenderingHints;
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseListener;
 
@@ -159,6 +173,10 @@ public class UIComboBoxUI extends BasicComboBoxUI implements MouseListener {
         return new UIComboPopup(comboBox);
     }
 
+    protected ComboPopup createHorizontalNeverUIComboPopUp() {
+        return new HorizontalNeverUIComboPopup(comboBox);
+    }
+
     private void setRollover(boolean isRollover) {
         if (this.isRollover != isRollover) {
             this.isRollover = isRollover;
@@ -270,4 +288,16 @@ public class UIComboBoxUI extends BasicComboBoxUI implements MouseListener {
         }
 
     }
+
+    private class HorizontalNeverUIComboPopup extends UIComboPopup {
+
+        public HorizontalNeverUIComboPopup(JComboBox comboBox) {
+            super(comboBox);
+        }
+
+        @Override
+        protected JScrollPane createScroller() {
+            return new UIScrollPane(list, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
+        }
+    }
 }

designer-base/src/main/java/com/fr/design/gui/icontainer/UIScrollPane.java

@@ -3,8 +3,11 @@ package com.fr.design.gui.icontainer;
 import com.fr.design.constants.UIConstants;
 import com.fr.design.gui.iscrollbar.UIScrollBar;
 
-import javax.swing.*;
+import javax.swing.JScrollBar;
-import java.awt.*;
+import javax.swing.JScrollPane;
+import javax.swing.ScrollPaneConstants;
+import java.awt.Color;
+import java.awt.Component;
 
 /**
  * @author zhou
@@ -16,7 +19,11 @@ public class UIScrollPane extends JScrollPane {
     private static final int INCREAMENT = 30;
 
     public UIScrollPane(Component c) {
-        super(c, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_AS_NEEDED);
+        this(c, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_AS_NEEDED);
+    }
+
+    public UIScrollPane(Component c, int vertical, int horizontal) {
+        super(c, vertical, horizontal);
         this.setHorizontalScrollBar(createHorizontalScrollBar());
         this.getVerticalScrollBar().setUnitIncrement(INCREAMENT);
         this.getVerticalScrollBar().setBlockIncrement(INCREAMENT);

designer-base/src/main/java/com/fr/env/RemoteEnvPane.java

@@ -21,7 +21,7 @@ import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.layout.TableLayoutHelper;
 import com.fr.design.scrollruler.ModLineBorder;
-import com.fr.env.handler.RemoteDesignExceptionHandler;
+import com.fr.env.handler.WorkspaceExceptionHandler;
 import com.fr.stable.StringUtils;
 import com.fr.third.guava.base.Strings;
 import com.fr.workspace.WorkContext;
@@ -596,7 +596,7 @@ public class RemoteEnvPane extends BasicBeanPane<RemoteDesignerWorkspaceInfo> {
                     }
                 } catch (Exception e) {
                     dialog.dispose();
-                    RemoteDesignExceptionHandler.getInstance().handleInTest(e, remoteEnv);
+                    WorkspaceExceptionHandler.getInstance().handleInTest(e, remoteEnv);
                 }
                 dialogDownPane.remove(cancelButton);
                 dialogDownPane.revalidate();

designer-base/src/main/java/com/fr/env/handler/WorkspaceExceptionHandler.java

@@ -1,5 +1,6 @@
 package com.fr.env.handler;
 
+import com.fr.base.exception.ExceptionDescriptor;
 import com.fr.design.EnvChangeEntrance;
 import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.env.DesignerWorkspaceInfo;
@@ -11,6 +12,7 @@ import com.fr.env.handler.impl.CommonHandler;
 import com.fr.env.handler.impl.ExecutionHandler;
 import com.fr.env.handler.impl.UnexpectedHandler;
 import com.fr.log.FineLoggerFactory;
+import com.fr.stable.StringUtils;
 import java.util.ArrayList;
 import java.util.List;
 import javax.swing.UIManager;
@@ -23,11 +25,11 @@ import static javax.swing.JOptionPane.ERROR_MESSAGE;
  * @version 10.0
  * Created by hades on 2021/8/5
  */
-public class RemoteDesignExceptionHandler {
+public class WorkspaceExceptionHandler {
 
-    private static final RemoteDesignExceptionHandler INSTANCE = new RemoteDesignExceptionHandler();
+    private static final WorkspaceExceptionHandler INSTANCE = new WorkspaceExceptionHandler();
 
-    public static RemoteDesignExceptionHandler getInstance() {
+    public static WorkspaceExceptionHandler getInstance() {
         return INSTANCE;
     }
 
@@ -35,7 +37,7 @@ public class RemoteDesignExceptionHandler {
 
     private final List<Handler<RefWrapper, ResultWrapper>> switchList = new ArrayList<>();
 
-    private RemoteDesignExceptionHandler() {
+    private WorkspaceExceptionHandler() {
         // 要保证顺序
         testList.add(new CancelHandler());
         testList.add(new ExecutionHandler());
@@ -65,11 +67,15 @@ public class RemoteDesignExceptionHandler {
     public void handleInSwitch(Throwable e, DesignerWorkspaceInfo workspaceInfo) {
         if (workspaceInfo == null || workspaceInfo.getType() == DesignerWorkspaceType.Local) {
             FineLoggerFactory.getLogger().error(e.getMessage(), e);
-            FineJOptionPane.showMessageDialog(EnvChangeEntrance.getInstance().getDialog(),
+            if (e instanceof ExceptionDescriptor) {
-                                              Toolkit.i18nText("Fine-Design_Basic_Switch_Workspace_Failed"),
+                new CommonHandler(true).handle(new RefWrapper(e, StringUtils.EMPTY));
-                                              Toolkit.i18nText("Fine-Design_Basic_Tool_Tips"),
+            } else {
-                                              ERROR_MESSAGE,
+                FineJOptionPane.showMessageDialog(EnvChangeEntrance.getInstance().getDialog(),
-                                              UIManager.getIcon("OptionPane.errorIcon"));
+                                                  Toolkit.i18nText("Fine-Design_Basic_Switch_Workspace_Failed"),
+                                                  Toolkit.i18nText("Fine-Design_Basic_Tool_Tips"),
+                                                  ERROR_MESSAGE,
+                                                  UIManager.getIcon("OptionPane.errorIcon"));
+            }
             return;
         }
         handle(e, switchList, workspaceInfo);
@@ -78,6 +84,7 @@ public class RemoteDesignExceptionHandler {
     public void handleInStart(Throwable e, DesignerWorkspaceInfo workspaceInfo) {
         if (workspaceInfo == null || workspaceInfo.getType() == DesignerWorkspaceType.Local) {
             FineLoggerFactory.getLogger().error(e.getMessage(), e);
+            new CommonHandler(false).handle(new RefWrapper(e, StringUtils.EMPTY));
             return;
         }
         handle(e, testList, workspaceInfo);

designer-base/src/main/resources/com/fr/env/jarVersion.properties

@@ -0,0 +1 @@
+report-engine-key=fine-report-engine-10.0.jar

designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/ChartTypePane.java

@@ -25,17 +25,19 @@ import com.fr.stable.AssistUtils;
 import com.fr.stable.StringUtils;
 
 import javax.swing.JPanel;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
 import java.awt.BorderLayout;
 import java.awt.CardLayout;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.ItemEvent;
 import java.awt.event.ItemListener;
-import java.util.ArrayList;
+import java.awt.event.MouseAdapter;
-import java.util.Iterator;
+import java.awt.event.MouseEvent;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
 
 /**
  * 图表 属性表, 类型选择 界面.
@@ -99,6 +101,19 @@ public class ChartTypePane extends AbstractChartAttrPane {
 
         buttonPane.setEditingChartPane(chartTypeComBox);
 
+        buttonPane.addMouseListener(new MouseAdapter() {
+            @Override
+            public void mouseReleased(MouseEvent e) {
+                buttonPane.requestFocus();
+            }
+        });
+
+        chartTypeComBox.addMouseListener(new MouseAdapter() {
+            @Override
+            public void mouseReleased(MouseEvent e) {
+                content.requestFocus();
+            }
+        });
         return content;
     }
 

designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/ChartImagePane.java

@@ -72,6 +72,7 @@ public class ChartImagePane extends ChartSelectDemoPane {
         }else{
             this.isDoubleClicked = false;
         }
+        this.requestFocus();
         super.mouseClicked(e);
     }
 

designer-realize/src/main/java/com/fr/design/mainframe/socketio/DesignerSocketIO.java

@@ -5,29 +5,40 @@ import com.fr.decision.webservice.utils.DecisionServiceConstants;
 import com.fr.design.DesignerEnvManager;
 import com.fr.design.EnvChangeEntrance;
 import com.fr.design.dialog.FineJOptionPane;
+import com.fr.design.env.DesignerWorkspaceInfo;
+import com.fr.design.env.DesignerWorkspaceInfoContext;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.mainframe.loghandler.DesignerLogger;
 import com.fr.design.ui.util.UIUtil;
-import com.fr.event.Event;
 import com.fr.event.EventDispatcher;
-import com.fr.event.Listener;
+import com.fr.general.ComparatorUtils;
 import com.fr.log.FineLoggerFactory;
 import com.fr.report.RemoteDesignConstants;
 import com.fr.serialization.SerializerHelper;
 import com.fr.stable.ArrayUtils;
+import com.fr.stable.StringUtils;
 import com.fr.third.apache.log4j.spi.LoggingEvent;
+import com.fr.third.org.apache.http.conn.ssl.NoopHostnameVerifier;
+import com.fr.third.org.apache.http.conn.ssl.TrustSelfSignedStrategy;
+import com.fr.third.org.apache.http.ssl.SSLContexts;
+import com.fr.web.WebSocketConfig;
+import com.fr.web.socketio.WebSocketProtocol;
 import com.fr.workspace.WorkContext;
 import com.fr.workspace.Workspace;
-import com.fr.workspace.WorkspaceEvent;
 import com.fr.workspace.base.WorkspaceConstants;
 import com.fr.workspace.connect.WorkspaceConnection;
+import com.fr.workspace.connect.WorkspaceConnectionInfo;
 import com.fr.workspace.server.socket.SocketInfoOperator;
 import io.socket.client.IO;
 import io.socket.client.Socket;
 import io.socket.emitter.Emitter;
 
+import java.io.File;
+import java.io.FileInputStream;
+import java.security.KeyStore;
 import java.util.Arrays;
+import javax.net.ssl.SSLContext;
 import javax.swing.*;
 import java.io.IOException;
 import java.net.URI;
@@ -37,26 +48,14 @@ import java.util.TimerTask;
 
 public class DesignerSocketIO {
 
-
-    static {
-        EventDispatcher.listen(WorkspaceEvent.LostConnect, new Listener<Workspace>() {
-            @Override
-            public void on(Event event, Workspace param) {
-                // 远程设计websocket不支持wss 所以断开无法提醒
-                // 使用远程设计的心跳断开来提醒断开
-                if (DesignerEnvManager.getEnvManager().isHttps()) {
-                    showConnectionLostDialog();
-                }
-            }
-        });
-    }
-
     enum Status {
         Connected,
         Disconnected,
         Disconnecting
     }
 
+    private static final String HTTPS = "https";
+    private static final String HTTP = "http";
     private static Socket socket = null;
     private static Status status = Status.Disconnected;
     private static Timer disConnectHintTimer = null;
@@ -65,6 +64,8 @@ public class DesignerSocketIO {
     private static String[] uri;
     //维护一个关于uri列表的计数器
     private static int count;
+    // 当前webSocket选择的协议
+    private static String currentProtocol;
 
 
     public static void close() {
@@ -95,7 +96,7 @@ public class DesignerSocketIO {
         //根据uri和计数器建立连接，并注册监听
         try {
             if (count < uri.length) {
-                socket = IO.socket(new URI(uri[count]));
+                socket = IO.socket(new URI(uri[count]), createOptions());
                 socket.on(WorkspaceConstants.WS_LOGRECORD, printLog);
                 socket.on(WorkspaceConstants.CONFIG_MODIFY, modifyConfig);
                 socket.on(Socket.EVENT_CONNECT_ERROR, failRetry);
@@ -112,15 +113,58 @@ public class DesignerSocketIO {
         }
     }
 
+    private static IO.Options createOptions() {
+        IO.Options options = new IO.Options();
+        try {
+            if (ComparatorUtils.equals(currentProtocol, HTTPS)) {
+                options.sslContext = getSSLContext();
+                options.hostnameVerifier = NoopHostnameVerifier.INSTANCE;
+                options.secure = true;
+            }
+        } catch (Exception e) {
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
+        }
+        return options;
+    }
+
+    private static SSLContext getSSLContext() throws Exception {
+        WorkspaceConnectionInfo connection = getConnectionInfo();
+        String certPath = connection.getCertPath();
+        String certSecretKey = connection.getCertSecretKey();
+        if (StringUtils.isBlank(certPath) || StringUtils.isBlank(certSecretKey)) {
+           return SSLContexts.createDefault();
+        }
+        KeyStore trustStore = KeyStore.getInstance(KeyStore.getDefaultType());
+        try (FileInputStream keystore = new FileInputStream(new File(certPath))) {
+            trustStore.load(keystore, certSecretKey.toCharArray());
+        }
+        return SSLContexts.custom()
+                .loadTrustMaterial(trustStore, new TrustSelfSignedStrategy())
+                .build();
+    }
+
+    private static WorkspaceConnectionInfo getConnectionInfo() {
+        if (DesignerWorkspaceInfoContext.getWorkspaceInfo() == null) {
+            String currentName = DesignerEnvManager.getEnvManager().getCurEnvName();
+            DesignerWorkspaceInfo info = DesignerEnvManager.getEnvManager().getWorkspaceInfo(currentName);
+            return info.getConnection();
+        } else {
+            return DesignerWorkspaceInfoContext.getWorkspaceInfo().getConnection();
+        }
+    }
+
     private static String[] getSocketUri() throws IOException {
         Workspace current = WorkContext.getCurrent();
         URL url = new URL(current.getPath());
         Integer[] ports = current.get(SocketInfoOperator.class).getPort();
         WorkspaceConnection connection = current.getConnection();
+        // 服务器配置https  webSocket可能是wss也可能是ws webSocket的协议可以单独配置
+        WebSocketProtocol webSocketProtocol = WebSocketConfig.getInstance().getProtocol();
+        currentProtocol = webSocketProtocol == WebSocketProtocol.PLAIN ? HTTP : HTTPS;
         String[] result = new String[ports.length];
         for (int i = 0; i < ports.length; i++) {
             result[i] = String.format("%s://%s:%s%s?%s=%s&%s=%s",
-                    url.getProtocol(),
+                    currentProtocol,
                     url.getHost(),
                     ports[i],
                     WorkspaceConstants.WS_NAMESPACE,
@@ -129,6 +173,7 @@ public class DesignerSocketIO {
                     RemoteDesignConstants.USER_LOCK_ID,
                     connection.getId());
         }
+        FineLoggerFactory.getLogger().error("Available ports: {}, current Protocol: {}", Arrays.toString(ports), currentProtocol);
         return result;
     }
 
@@ -136,7 +181,7 @@ public class DesignerSocketIO {
     private static final Emitter.Listener failRetry = new Emitter.Listener() {
         @Override
         public void call(Object... args) {
-            FineLoggerFactory.getLogger().warn("failed args: {}", Arrays.toString(args));
+            printLog(args, PrintEventLogImpl.WARN, "failed args: {}");
             status = Status.Disconnecting;
             socket.close();
             count++;
@@ -183,7 +228,7 @@ public class DesignerSocketIO {
                          * todo 远程心跳断开不一定 socket 断开 和远程紧密相关的业务都绑定在心跳上，切换成心跳断开之后进行提醒，
                          * socket 只用推日志和通知配置变更
                          */
-                        FineLoggerFactory.getLogger().error("disConnected args: {}", Arrays.toString(objects));
+                        printLog(objects, PrintEventLogImpl.ERROR, "disConnected args: {}");
                         if (status != Status.Disconnecting) {
                             showConnectionLostDialog();
                         }
@@ -199,7 +244,7 @@ public class DesignerSocketIO {
 
     private static void showConnectionLostDialog() {
         try {
-            UIUtil.invokeAndWaitIfNeeded(new Runnable() {
+            UIUtil.invokeLaterIfNeeded(new Runnable() {
                 @Override
                 public void run() {
                     FineJOptionPane.showMessageDialog(
@@ -226,4 +271,46 @@ public class DesignerSocketIO {
         }
     };
 
+    private static void printLog(Object[] objects, PrintEventLog printEventLog, String prefix) {
+        for (Object object : objects) {
+            if (object instanceof Throwable) {
+                Throwable  throwable = (Throwable) object;
+                printEventLog.printThrowable(throwable);
+            } else {
+                printEventLog.print(prefix, object);
+            }
+        }
+    }
+
+    interface PrintEventLog {
+        void printThrowable(Throwable throwable);
+        void print(String s, Object ...object);
+    }
+
+    enum PrintEventLogImpl implements PrintEventLog {
+        ERROR {
+            @Override
+            public void printThrowable(Throwable throwable) {
+                FineLoggerFactory.getLogger().error(throwable.getMessage(), throwable);
+            }
+
+            @Override
+            public void print(String s, Object... object) {
+                FineLoggerFactory.getLogger().error(s, object);
+            }
+        },
+
+        WARN {
+            @Override
+            public void printThrowable(Throwable throwable) {
+                FineLoggerFactory.getLogger().warn(throwable.getMessage(), throwable);
+            }
+
+            @Override
+            public void print(String s, Object... object) {
+                FineLoggerFactory.getLogger().warn(s, object);
+            }
+        };
+    }
+
 }

designer-realize/src/main/java/com/fr/design/report/PageSetupPane.java

@@ -779,7 +779,7 @@ public class PageSetupPane extends BasicPane {
                     //使用科学计数法显示长度的时候，限制纵向显示长度为9位
                     if (h_str.contains(E)) {
                         String str1 = h_str.substring(h_str.indexOf(E));
-                        String str2 = h_str.substring(0, 9 - str1.length());
+                        String str2 = h_str.substring(0, Math.min(h_str.length(), 9) - str1.length());
                         h_str = str2 + str1;
                     } else if (h_str.indexOf(CoreConstants.DOT) > 0) {
                         h_str = h_str.substring(0, h_str.indexOf(CoreConstants.DOT) + 2);

designer-realize/src/main/java/com/fr/start/module/DesignerWorkspaceProvider.java

@@ -9,7 +9,6 @@ import com.fr.design.env.DesignerWorkspaceGenerator;
 import com.fr.design.env.DesignerWorkspaceInfo;
 import com.fr.design.env.LocalDesignerWorkspaceInfo;
 import com.fr.design.versioncheck.VersionCheckUtils;
-import com.fr.env.handler.RemoteDesignExceptionHandler;
 import com.fr.event.Event;
 import com.fr.event.EventDispatcher;
 import com.fr.event.Listener;