REPORT-15700 设计器端口启动问题

designer-realize/src/main/java/com/fr/start/Designer.java

@@ -3,7 +3,6 @@ package com.fr.start;
 import com.fr.base.BaseUtils;
 import com.fr.base.vcs.DesignerMode;
 import com.fr.design.DesignerEnvManager;
-import com.fr.design.RestartHelper;
 import com.fr.design.actions.core.ActionFactory;
 import com.fr.design.actions.file.WebPreviewUtils;
 import com.fr.design.actions.file.newReport.NewPolyReportAction;
@@ -28,14 +27,12 @@ import com.fr.design.mainframe.JWorkBook;
 import com.fr.design.mainframe.alphafine.component.AlphaFinePane;
 import com.fr.design.mainframe.bbs.UserInfoLabel;
 import com.fr.design.mainframe.bbs.UserInfoPane;
-import com.fr.design.mainframe.templateinfo.TemplateInfoCollector;
 import com.fr.design.mainframe.toolbar.ToolBarMenuDockPlus;
 import com.fr.design.menu.KeySetUtils;
 import com.fr.design.menu.MenuDef;
 import com.fr.design.menu.SeparatorDef;
 import com.fr.design.menu.ShortCut;
 import com.fr.design.module.DesignModuleFactory;
-import com.fr.design.utils.DesignUtils;
 import com.fr.design.utils.concurrent.ThreadFactoryBuilder;
 import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.general.ComparatorUtils;
@@ -43,17 +40,12 @@ import com.fr.log.FineLoggerFactory;
 import com.fr.module.Module;
 import com.fr.module.ModuleContext;
 import com.fr.runtime.FineRuntime;
-import com.fr.stable.BuildContext;
-import com.fr.stable.OperatingSystem;
 import com.fr.stable.ProductConstants;
 import com.fr.stable.StableUtils;
 import com.fr.stable.StringUtils;
 import com.fr.stable.lifecycle.LifecycleFatalError;
 import com.fr.stable.xml.XMLTools;
-import com.fr.start.fx.SplashFx;
-import com.fr.start.jni.SplashMac;
 import com.fr.start.module.StartupArgs;
-import com.fr.start.preload.ImagePreLoader;
 import com.fr.start.server.ServerTray;
 import com.fr.workspace.WorkContext;
 
@@ -69,8 +61,6 @@ import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.io.File;
 import java.util.ArrayList;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.ThreadPoolExecutor;
@@ -99,22 +89,6 @@ public class Designer extends BaseDesigner {
 
         //启动运行时
         FineRuntime.start();
-        BuildContext.setBuildFilePath("/com/fr/stable/build.properties");
-        // 如果端口被占用了 说明程序已经运行了一次,也就是说，已经建立一个监听服务器，现在只要给服务器发送命令就好了
-        if (DesignUtils.isStarted()) {
-            DesignUtils.clientSend(args);
-            FineLoggerFactory.getLogger().error("Designer port not available.");
-            System.exit(0);
-            return;
-        }
-
-        RestartHelper.deleteRecordFilesWhenStart();
-
-        preloadResource();
-
-        SplashContext.getInstance().registerSplash(createSplash());
-
-        SplashContext.getInstance().show();
         Module designerRoot = ModuleContext.parseRoot("designer-startup.xml");
         //传递启动参数
         designerRoot.setSingleton(StartupArgs.class, new StartupArgs(args));
@@ -134,35 +108,6 @@ public class Designer extends BaseDesigner {
 
     }
 
-    private static void preloadResource() {
-        ExecutorService service = Executors.newCachedThreadPool();
-
-        service.submit(new Runnable() {
-            @Override
-            public void run() {
-                new ImagePreLoader();
-            }
-        });
-
-        service.submit(new Runnable() {
-            @Override
-            public void run() {
-                TemplateInfoCollector.getInstance();
-            }
-        });
-        service.shutdown();
-    }
-
-    private static SplashStrategy createSplash() {
-        // 这里可以开接口加载自定义启动画面
-        if (OperatingSystem.isWindows()) {
-            return new SplashFx();
-        } else if (OperatingSystem.isMacOS()) {
-            return new SplashMac();
-        }
-        return new SplashFx();
-    }
-
     public Designer(String[] args) {
         super(args);
     }

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

@@ -2,63 +2,99 @@ package com.fr.start.module;
 
 import com.fr.design.DesignerEnvManager;
 import com.fr.design.RestartHelper;
+import com.fr.design.mainframe.templateinfo.TemplateInfoCollector;
 import com.fr.design.utils.DesignUtils;
+import com.fr.design.utils.DesignerPort;
 import com.fr.general.CloudCenter;
 import com.fr.general.ComparatorUtils;
 import com.fr.general.GeneralContext;
+import com.fr.log.FineLoggerFactory;
 import com.fr.module.Activator;
+import com.fr.stable.BuildContext;
+import com.fr.stable.OperatingSystem;
 import com.fr.stable.ProductConstants;
+import com.fr.stable.StableUtils;
+import com.fr.start.SplashContext;
+import com.fr.start.SplashStrategy;
+import com.fr.start.fx.SplashFx;
+import com.fr.start.jni.SplashMac;
+import com.fr.start.preload.ImagePreLoader;
 
 import java.io.File;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 
 /**
  * Created by juhaoyu on 2018/1/8.
  */
 public class PreStartActivator extends Activator {
 
-    private static final int MESSAGE_PORT = 51462;
-
-    private static final int DEBUG_PORT = 51463;
-
     @Override
     public void start() {
 
-        CloudCenter.getInstance();
+        BuildContext.setBuildFilePath("/com/fr/stable/build.properties");
-        if (checkMultiStart()) {
+        // 如果端口被占用了 说明程序已经运行了一次,也就是说，已经建立一个监听服务器，现在只要给服务器发送命令就好了
+        final String[] args = getModule().upFindSingleton(StartupArgs.class).get();
+        // 检查是否是-Ddebug = true 启动 并切换对应的端口以及环境配置文件
+        checkDebugStart();
+        if (DesignUtils.isStarted()) {
+            DesignUtils.clientSend(args);
+            FineLoggerFactory.getLogger().info("The Designer Has Been Started");
+            System.exit(0);
             return;
         }
+
+        RestartHelper.deleteRecordFilesWhenStart();
+
+        preloadResource();
+
+        SplashContext.getInstance().registerSplash(createSplash());
+
+        SplashContext.getInstance().show();
+
+        // 完成初始化
+        //noinspection ResultOfMethodCallIgnored
+        CloudCenter.getInstance();
+
+        // 创建监听服务
+        DesignUtils.createListeningServer(DesignUtils.getPort(), startFileSuffix());
+
         initLanguage();
     }
 
-    private boolean checkMultiStart() {
+    @Override
+    public void stop() {
 
+    }
+
+    private void checkDebugStart() {
         if (isDebug()) {
             setDebugEnv();
         } else {
-            DesignUtils.setPort(getStartPort());
+            DesignUtils.setPort(DesignUtils.getPort());
         }
-
-        return false;
     }
 
-    private int getStartPort() {
-
-        return MESSAGE_PORT;
-    }
 
-
+    /**
-    //在VM options里加入-Ddebug=true激活
+     * 在VM options里加入-Ddebug=true激活
+     *
+     * @return isDebug
+     */
     private boolean isDebug() {
-
         return ComparatorUtils.equals("true", System.getProperty("debug"));
     }
 
 
     //端口改一下，环境配置文件改一下。便于启动两个设计器，进行对比调试
     private void setDebugEnv() {
-
+        DesignUtils.setPort(DesignerPort.DEBUG_MESSAGE_PORT);
-        DesignUtils.setPort(DEBUG_PORT);
+        String debugXMlFilePath = StableUtils.pathJoin(
-        DesignerEnvManager.setEnvFile(new File(ProductConstants.getEnvHome() + File.separator + ProductConstants.APP_NAME + "Env_debug.xml"));
+                ProductConstants.getEnvHome(),
+                ProductConstants.APP_NAME + "Env_debug.xml"
+        );
+        DesignerEnvManager.setEnvFile(
+                new File(debugXMlFilePath));
     }
 
     private void initLanguage() {
@@ -66,8 +102,36 @@ public class PreStartActivator extends Activator {
         GeneralContext.setLocale(DesignerEnvManager.getEnvManager(false).getLanguage());
     }
 
-    @Override
+    private String[] startFileSuffix() {
-    public void stop() {
+        return new String[]{".cpt", ".xls", ".xlsx", ".frm", ".form", ".cht", ".chart"};
+    }
 
+    private static void preloadResource() {
+        ExecutorService service = Executors.newCachedThreadPool();
+
+        service.submit(new Runnable() {
+            @Override
+            public void run() {
+                new ImagePreLoader();
+            }
+        });
+
+        service.submit(new Runnable() {
+            @Override
+            public void run() {
+                TemplateInfoCollector.getInstance();
+            }
+        });
+        service.shutdown();
+    }
+
+    private static SplashStrategy createSplash() {
+        // 这里可以开接口加载自定义启动画面
+        if (OperatingSystem.isWindows()) {
+            return new SplashFx();
+        } else if (OperatingSystem.isMacOS()) {
+            return new SplashMac();
+        }
+        return new SplashFx();
     }
 }

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

@@ -1,7 +1,6 @@
 package com.fr.start.module;
 
 import com.fr.design.fun.impl.GlobalListenerProviderManager;
-import com.fr.design.utils.DesignUtils;
 import com.fr.module.Activator;
 
 /**
@@ -9,28 +8,12 @@ import com.fr.module.Activator;
  */
 public class StartFinishActivator extends Activator {
 
-    private static final int MESSAGE_PORT = 51462;
-    
     @Override
     public void start() {
-        
-        DesignUtils.creatListeningServer(getStartPort(), startFileSuffix());
         GlobalListenerProviderManager.getInstance().init();
     }
 
-    private int getStartPort() {
-        
-        return MESSAGE_PORT;
-    }
-    
-    
-    private String[] startFileSuffix() {
-        
-        return new String[]{".cpt", ".xls", ".xlsx", ".frm", ".form", ".cht", ".chart"};
-    }
-    
     @Override
     public void stop() {
-    
     }
 }