Merge pull request #3496 in DESIGN/design from bugfix/10.0 to feature/10.0

* commit '326fa4b47638192e9bc65d81bc40b07b6699fd7d': REPORT-43833 【10.0.14】远程设计数据连接/服务器数据集增加锁定漏掉了这个panel，将解锁放到aftercommit()中 REPORT-45901 【10.0.14】oem设计器多开接口 --加上端口限制 REPORT-45901 【10.0.14】设计器多开接口
4 years ago · b9ed6e734e
10 changed files with 165 additions and 7 deletions
--- a/designer-base/src/main/java/com/fr/design/DesignerEnvManager.java
+++ b/designer-base/src/main/java/com/fr/design/DesignerEnvManager.java
@ -15,10 +15,12 @@ import com.fr.design.env.DesignerWorkspaceType;
 import com.fr.design.env.LocalDesignerWorkspaceInfo;
 import com.fr.design.env.RemoteDesignerWorkspaceInfo;
 import com.fr.design.file.HistoryTemplateListPane;
+import com.fr.design.fun.DesignerPortProvider;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.locale.impl.ProductImproveMark;
 import com.fr.design.mainframe.vcs.VcsConfigManager;
 import com.fr.design.notification.SnapChatConfig;
+import com.fr.design.port.DesignerPortContext;
 import com.fr.design.update.push.DesignerPushUpdateConfigManager;
 import com.fr.design.style.color.ColorSelectConfigManager;
 import com.fr.design.utils.DesignUtils;
@ -42,6 +44,7 @@ import com.fr.stable.ListMap;
 import com.fr.stable.ProductConstants;
 import com.fr.stable.StableUtils;
 import com.fr.stable.StringUtils;
+import com.fr.stable.bridge.StableFactory;
 import com.fr.stable.core.UUID;
 import com.fr.stable.project.ProjectConstants;
 import com.fr.stable.xml.XMLPrintWriter;
@ -842,6 +845,10 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
     * 返回Jetty服务器的端口号
     */
    public int getEmbedServerPort() {
+        int embeddedServerPort = DesignerPortContext.getEmbeddedServerPort();
+        if (embeddedServerPort >= DesignerPort.MIN_PORT && embeddedServerPort <= DesignerPort.MAX_PORT) {
+            return embeddedServerPort;
+        }
        return this.jettyServerPort;
    }

--- a/designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionComboBoxPanel.java
+++ b/designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionComboBoxPanel.java
@ -144,8 +144,6 @@ public class ConnectionComboBoxPanel extends ItemEditableComboBoxPanel {
                    connectionListDialog.setDoOKSucceed(false);
                    return;
                }
-                // 关闭定义数据连接页面，为其解锁
-                EditLockUtils.unlock(LockItem.CONNECTION);
                Configurations.modify(new WorkerFacade(ConnectionConfig.class) {
                    @Override
                    public void run() {
@ -161,6 +159,8 @@ public class ConnectionComboBoxPanel extends ItemEditableComboBoxPanel {
                    @Override
                    public void afterCommit() {
                        DesignerContext.getDesignerBean("databasename").refreshBeanElement();
+                        // 关闭定义数据连接页面，为其解锁
+                        EditLockUtils.unlock(LockItem.CONNECTION);
                    }
                }));

--- a/designer-base/src/main/java/com/fr/design/fun/DesignerLifecycleMonitor.java
+++ b/designer-base/src/main/java/com/fr/design/fun/DesignerLifecycleMonitor.java
@ -0,0 +1,31 @@
+package com.fr.design.fun;
+
+/**
+ * 设计器生命周期接口
+ *
+ * @author hades
+ * @version 10.0
+ * Created by hades on 2021/1/26
+ */
+public interface DesignerLifecycleMonitor {
+
+    String MARK_STRING = "DesignerLifecycleMonitor";
+
+    int CURRENT_LEVEL = 1;
+
+    /**
+     * 设计器启动之前
+     */
+    void beforeStart();
+
+    /**
+     * 设计器启动完成 界面出现之后
+     */
+    void afterStart();
+
+    /**
+     * 设计器关闭退出之前
+     */
+    void beforeStop();
+
+}
--- a/designer-base/src/main/java/com/fr/design/fun/DesignerPortProvider.java
+++ b/designer-base/src/main/java/com/fr/design/fun/DesignerPortProvider.java
@ -0,0 +1,31 @@
+package com.fr.design.fun;
+
+/**
+ * 设计器所有端口获取
+ *
+ * @author hades
+ * @version 10.0
+ * Created by hades on 2021/1/18
+ */
+public interface DesignerPortProvider {
+
+    String MARK_STRING = "DesignerPortProvider";
+
+    int CURRENT_LEVEL = 1;
+
+
+    /**
+     * 设计器自身端口
+     *
+     * @return
+     */
+    int messagePort();
+
+    /**
+     * 内置服务器端口
+     *
+     * @return
+     */
+    int embeddedServerPort();
+
+}
--- a/designer-base/src/main/java/com/fr/design/monitor/DesignerLifecycleMonitorContext.java
+++ b/designer-base/src/main/java/com/fr/design/monitor/DesignerLifecycleMonitorContext.java
@ -0,0 +1,47 @@
+package com.fr.design.monitor;
+
+import com.fr.design.fun.DesignerLifecycleMonitor;
+import com.fr.stable.bridge.StableFactory;
+
+/**
+ * @author hades
+ * @version 10.0
+ * Created by hades on 2021/1/27
+ */
+public class DesignerLifecycleMonitorContext {
+
+    private static DesignerLifecycleMonitor monitor;
+
+    static {
+        DesignerLifecycleMonitor designerLifecycleMonitor = StableFactory.getMarkedInstanceObjectFromClass(DesignerLifecycleMonitor.MARK_STRING, DesignerLifecycleMonitor.class);
+        if (designerLifecycleMonitor != null) {
+            monitor = designerLifecycleMonitor;
+        } else {
+            monitor = new EmptyDesignerLifecycleMonitor();
+        }
+    }
+
+    public static DesignerLifecycleMonitor getMonitor() {
+        return monitor;
+    }
+
+    static class EmptyDesignerLifecycleMonitor implements DesignerLifecycleMonitor {
+
+        @Override
+        public void beforeStart() {
+
+        }
+
+        @Override
+        public void afterStart() {
+
+        }
+
+        @Override
+        public void beforeStop() {
+
+        }
+    }
+
+
+}
--- a/designer-base/src/main/java/com/fr/design/port/DesignerPortContext.java
+++ b/designer-base/src/main/java/com/fr/design/port/DesignerPortContext.java
@ -0,0 +1,32 @@
+package com.fr.design.port;
+
+import com.fr.design.fun.DesignerPortProvider;
+import com.fr.stable.bridge.StableFactory;
+
+/**
+ * @author hades
+ * @version 10.0
+ * Created by hades on 2021/1/27
+ */
+public class DesignerPortContext {
+
+    private static int messagePort = -1;
+
+    private static int embeddedServerPort = -1;
+
+    static {
+        DesignerPortProvider designerPortProvider = StableFactory.getMarkedInstanceObjectFromClass(DesignerPortProvider.MARK_STRING, DesignerPortProvider.class);
+        if (designerPortProvider != null) {
+            messagePort = designerPortProvider.messagePort();
+            embeddedServerPort = designerPortProvider.embeddedServerPort();
+        }
+    }
+
+    public static int getMessagePort() {
+        return messagePort;
+    }
+
+    public static int getEmbeddedServerPort() {
+        return embeddedServerPort;
+    }
+}
--- a/designer-base/src/main/java/com/fr/design/utils/DesignerPort.java
+++ b/designer-base/src/main/java/com/fr/design/utils/DesignerPort.java
@ -4,19 +4,21 @@ import com.fr.common.report.ReportState;
 import com.fr.design.DesignerEnvManager;
 import com.fr.design.RestartHelper;
 import com.fr.design.dialog.TipDialog;
+import com.fr.design.fun.DesignerPortProvider;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.itextfield.UITextField;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.design.port.DesignerPortContext;
 import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.exit.DesignerExiter;
 import com.fr.general.ComparatorUtils;
 import com.fr.general.IOUtils;
-import com.fr.process.ProcessEventPipe;
 import com.fr.process.engine.core.CarryMessageEvent;
 import com.fr.process.engine.core.FineProcessContext;
 import com.fr.stable.StringUtils;
+import com.fr.stable.bridge.StableFactory;
 import com.fr.stable.xml.XMLPrintWriter;
 import com.fr.stable.xml.XMLReadable;
 import com.fr.stable.xml.XMLWriter;
@ -35,8 +37,8 @@ import java.awt.event.ActionListener;
 public class DesignerPort implements XMLReadable, XMLWriter {

    public static final String XML_TAG = "DesignerPort";
-    private static final int MIN_PORT = 1024;
-    private static final int MAX_PORT = 65535;
+    public static final int MIN_PORT = 1024;
+    public static final int MAX_PORT = 65535;

    public static final  DesignerPort INSTANCE = new DesignerPort();

@ -58,6 +60,10 @@ public class DesignerPort implements XMLReadable, XMLWriter {
    private int debugMessagePort = 51463;

    public int getMessagePort() {
+        int extraMessagePort = DesignerPortContext.getMessagePort();
+        if (extraMessagePort >= MIN_PORT && extraMessagePort <= MAX_PORT) {
+            return extraMessagePort;
+        }
        return messagePort;
    }

--- a/designer-base/src/main/java/com/fr/exit/DesignerExiter.java
+++ b/designer-base/src/main/java/com/fr/exit/DesignerExiter.java
@ -1,10 +1,9 @@
 package com.fr.exit;

 import com.fr.design.env.DesignerWorkspaceGenerator;
+import com.fr.design.monitor.DesignerLifecycleMonitorContext;
 import com.fr.process.engine.core.FineProcessContext;
 import com.fr.process.engine.core.FineProcessEngineEvent;
-import com.fr.stable.StableUtils;
-

 /**
 * @author hades
@ -20,6 +19,7 @@ public class DesignerExiter {
    }

    public void execute() {
+        DesignerLifecycleMonitorContext.getMonitor().beforeStop();
        beforeExit();
        if (FineProcessContext.getParentPipe() != null) {
            FineProcessContext.getParentPipe().syncFire(FineProcessEngineEvent.DESTROY);
--- a/designer-base/src/main/java/com/fr/start/BaseDesigner.java
+++ b/designer-base/src/main/java/com/fr/start/BaseDesigner.java
@ -14,6 +14,7 @@ import com.fr.design.fun.DesignerStartOpenFileProcessor;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.mainframe.DesignerFrame;
 import com.fr.design.mainframe.toolbar.ToolBarMenuDock;
+import com.fr.design.monitor.DesignerLifecycleMonitorContext;
 import com.fr.design.ui.util.UIUtil;
 import com.fr.event.Event;
 import com.fr.event.EventDispatcher;
@ -75,6 +76,7 @@ public abstract class BaseDesigner extends ToolBarMenuDock {
        EventDispatcher.listen(DesignerLaunchStatus.STARTUP_COMPLETE, new Listener<Null>() {
            @Override
            public void on(Event event, Null param) {
+                DesignerLifecycleMonitorContext.getMonitor().afterStart();
                EventDispatcher.stopListen(this);
                // 启动完成 停止监听
                ProcessEventPipe eventPipe = FineProcessContext.getParentPipe();
--- a/designer-realize/src/main/java/com/fr/start/MainDesigner.java
+++ b/designer-realize/src/main/java/com/fr/start/MainDesigner.java
@ -36,6 +36,7 @@ import com.fr.design.menu.ShortCut;
 import com.fr.design.module.ChartEmptyDataStyleAction;
 import com.fr.design.module.ChartPreStyleAction;
 import com.fr.design.module.DesignModuleFactory;
+import com.fr.design.monitor.DesignerLifecycleMonitorContext;
 import com.fr.design.utils.concurrent.ThreadFactoryBuilder;
 import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.event.Event;
@ -102,6 +103,7 @@ public class MainDesigner extends BaseDesigner {

        StopWatch watch = new StopWatch();
        watch.start();
+        DesignerLifecycleMonitorContext.getMonitor().beforeStart();
        //启动运行时
        FineRuntime.start();
        DesignerSubListener.getInstance().start();