无jira 解决冲突

designer-base/src/main/java/com/fr/design/login/socketio/LoginAuthServer.java

@@ -1,5 +1,6 @@
 package com.fr.design.login.socketio;
 
+import com.fr.concurrent.NamedThreadFactory;
 import com.fr.design.DesignerEnvManager;
 import com.fr.design.login.DesignerLoginType;
 import com.fr.design.login.bean.BBSAccountLogin;
@@ -11,7 +12,11 @@ import com.fr.third.socketio.Configuration;
 import com.fr.third.socketio.SocketIOClient;
 import com.fr.third.socketio.SocketIOServer;
 import com.fr.third.socketio.listener.DataListener;
+
 import java.net.URLDecoder;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.atomic.AtomicBoolean;
 
 /**
  * @author Lanlan
@@ -19,9 +24,11 @@ import java.net.URLDecoder;
  * Created by Lanlan on 2021/6/3
  */
 public class LoginAuthServer {
+    
+    private AtomicBoolean started = new AtomicBoolean(false);
 
     private SocketIOServer server;
-
+    
     private static final String HOSTNAME = "localhost";
     private static final int PORT = 41925;
 
@@ -47,6 +54,23 @@ public class LoginAuthServer {
     }
 
     public void start() {
+        
+        // 只运行一次，不在乎成不成功
+        if (started.compareAndSet(false, true)) {
+            asyncStart();
+        }
+    }
+    
+    public void asyncStart() {
+        
+        ExecutorService asyncService = Executors.newSingleThreadExecutor(new NamedThreadFactory(LoginAuthServer.class.getName(), true));
+        asyncService.submit(this::compatibleStart);
+        asyncService.shutdown();
+    }
+    
+    @Deprecated
+    public void compatibleStart() {
+    
         try {
             server.start();
         } catch (Exception e) {

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

@@ -16,6 +16,7 @@ import com.fr.design.file.HistoryTemplateListCache;
 import com.fr.design.file.HistoryTemplateListPane;
 import com.fr.design.file.MutilTempalteTabPane;
 import com.fr.design.fun.MenuHandler;
+import com.fr.design.fun.OemProcessor;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.gui.ibutton.UIPreviewButton;
 import com.fr.design.gui.ibutton.UISaveForbiddenButton;
@@ -42,6 +43,7 @@ import com.fr.design.module.DesignModuleFactory;
 import com.fr.design.monitor.DesignerLifecycleMonitorContext;
 import com.fr.design.notification.ui.NotificationCenterPane;
 import com.fr.design.share.SharableManager;
+import com.fr.design.ui.util.UIUtil;
 import com.fr.design.utils.concurrent.ThreadFactoryBuilder;
 import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.env.utils.DesignerInteractionHistory;
@@ -59,6 +61,7 @@ import com.fr.stable.StableUtils;
 import com.fr.stable.StringUtils;
 import com.fr.stable.lifecycle.FineLifecycleFatalError;
 import com.fr.stable.xml.XMLTools;
+import com.fr.start.common.SplashCommon;
 import com.fr.start.module.StartupArgs;
 import com.fr.start.server.ServerTray;
 import com.fr.third.org.apache.commons.lang3.time.StopWatch;
@@ -106,7 +109,8 @@ public class MainDesigner extends BaseDesigner {
      * @param args 参数
      */
     public static void main(String[] args) {
-
+    
+        showSplash();
         DeepLinkManager.getInstance().start(args);
         StopWatch watch = new StopWatch();
         watch.start();
@@ -136,7 +140,18 @@ public class MainDesigner extends BaseDesigner {
         FineLoggerFactory.getLogger().info("Designer started.Time used {} ms", watch.getTime());
         watch.stop();
     }
-
+    
+    private static void showSplash() {
+        // 快快显示启动画面
+        UIUtil.invokeAndWaitIfNeeded(new Runnable() {
+            @Override
+            public void run() {
+                SplashContext.getInstance().registerSplash(createSplash());
+                SplashContext.getInstance().show();
+            }
+        });
+    }
+    
     /**
      * 创建新建文件的快捷方式数组。
      *
@@ -528,5 +543,22 @@ public class MainDesigner extends BaseDesigner {
         DesignerInteractionHistory historyCollector = DesignerInteractionHistory.getInstance();
         historyCollector.saveXMLFile();
     }
-
+    
+    private static SplashStrategy createSplash() {
+        
+        OemProcessor oemProcessor = OemHandler.findOem();
+        if (oemProcessor != null) {
+            SplashStrategy splashStrategy = null;
+            try {
+                splashStrategy = oemProcessor.createSplashStrategy();
+            } catch (Throwable e) {
+                FineLoggerFactory.getLogger().error(e.getMessage(), e);
+            }
+            if (splashStrategy != null) {
+                return splashStrategy;
+            }
+        }
+        
+        return new SplashCommon();
+    }
 }

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

@@ -36,7 +36,7 @@ public class SplashContext {
 
     private SplashStrategy splashStrategy;
 
-    private String moduleId = "";
+    private String moduleId = Toolkit.i18nText("Fine-Design_Basic_Initializing");
     private int loadingIndex = 0;
     private String[] loading = new String[]{"..", "....", "......"};
 

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

@@ -3,6 +3,7 @@ package com.fr.start.module;
 import com.fr.base.BaseFormula;
 import com.fr.base.Formula;
 import com.fr.base.MultiFieldParameter;
+import com.fr.base.OptimizeUtil;
 import com.fr.base.passport.FinePassportListenerAdapter;
 import com.fr.base.passport.FinePassportManager;
 import com.fr.base.process.ProcessOperator;
@@ -80,7 +81,10 @@ import com.fr.design.share.ui.generate.ShareGeneratePane;
 import com.fr.design.update.actions.RecoverForDesigner;
 import com.fr.design.update.push.DesignerPushUpdateManager;
 import com.fr.design.widget.ui.btn.FormSubmitButtonDetailPane;
+import com.fr.event.Event;
 import com.fr.event.EventDispatcher;
+import com.fr.event.Listener;
+import com.fr.event.Null;
 import com.fr.general.GeneralContext;
 import com.fr.general.xml.GeneralXMLTools;
 import com.fr.js.EmailJavaScript;
@@ -159,6 +163,8 @@ public class DesignerActivator extends Activator implements Prepare {
 
     @Override
     public void start() {
+    
+        startLoginAuthServer();
         migrateBBSInfoFromFineDB();
         FormThemeConfigMigrator.getInstance().upgrade();
         ReportThemeConfigMigrator.getInstance().upgrade();
@@ -488,7 +494,22 @@ public class DesignerActivator extends Activator implements Prepare {
 
     @Override
     public void prepare() {
-        LoginAuthServer.getInstance().start();
+    
         ContentReplacerCenter.getInstance().register();
     }
+    
+    private void startLoginAuthServer() {
+        
+        OptimizeUtil.execute(() -> {
+            // 设计器启动后启动
+            EventDispatcher.listen(DesignerLaunchStatus.STARTUP_COMPLETE, new Listener<Null>() {
+                @Override
+                public void on(Event event, Null param) {
+                    LoginAuthServer.getInstance().start();
+                }
+            });
+        }, () -> {
+            LoginAuthServer.getInstance().compatibleStart();
+        });
+    }
 }

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

@@ -17,7 +17,6 @@ import com.fr.design.i18n.Toolkit;
 import com.fr.design.mainframe.messagecollect.StartErrorMessageCollector;
 import com.fr.design.mainframe.messagecollect.StartupMessageCollector;
 import com.fr.design.mainframe.messagecollect.entity.DesignerErrorMessage;
-import com.fr.design.ui.util.UIUtil;
 import com.fr.design.utils.DesignUtils;
 import com.fr.design.utils.DesignerPort;
 import com.fr.env.utils.WorkspaceUtils;
@@ -38,7 +37,6 @@ import com.fr.stable.StableUtils;
 import com.fr.stable.StringUtils;
 import com.fr.stable.project.ProjectConstants;
 import com.fr.start.DesignerProcessType;
-import com.fr.start.OemHandler;
 import com.fr.start.ServerStarter;
 import com.fr.start.SplashContext;
 import com.fr.start.SplashStrategy;
@@ -116,14 +114,6 @@ public class DesignerStartup extends Activator {
             DesignerExiter.getInstance().execute();
             return;
         }
-        // 快快显示启动画面
-        UIUtil.invokeAndWaitIfNeeded(new Runnable() {
-            @Override
-            public void run() {
-                SplashContext.getInstance().registerSplash(createSplash());
-                SplashContext.getInstance().show();
-            }
-        });
     }
 
     @Override
@@ -166,23 +156,6 @@ public class DesignerStartup extends Activator {
         StartupMessageCollector.getInstance().recordStartupLog();
     }
 
-    private SplashStrategy createSplash() {
-        OemProcessor oemProcessor = OemHandler.findOem();
-        if (oemProcessor != null) {
-            SplashStrategy splashStrategy = null;
-            try {
-                splashStrategy = oemProcessor.createSplashStrategy();
-            } catch (Throwable e) {
-                FineLoggerFactory.getLogger().error(e.getMessage(), e);
-            }
-            if (splashStrategy != null) {
-                return splashStrategy;
-            }
-        }
-
-        return new SplashCommon();
-    }
-
     private void browserDemoIfNeeded() {
 
         if (startupArgsValue.getValue().isDemo()) {

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

@@ -2,14 +2,11 @@ package com.fr.start.module;
 
 import com.fr.design.DesignerEnvManager;
 import com.fr.design.RestartHelper;
-import com.fr.design.i18n.Toolkit;
 import com.fr.design.utils.DesignUtils;
-import com.fr.event.EventDispatcher;
 import com.fr.file.TmpFileUtils;
 import com.fr.general.CloudCenter;
 import com.fr.general.GeneralContext;
 import com.fr.module.Activator;
-import com.fr.module.ModuleEvent;
 
 /**
  * Created by juhaoyu on 2018/1/8.
@@ -21,8 +18,9 @@ public class PreStartActivator extends Activator {
         //清空临时文件
         TmpFileUtils.cleanUpInnerTmpFiles();
         RestartHelper.deleteRecordFilesWhenStart();
-        //初始化
-        EventDispatcher.fire(ModuleEvent.MajorModuleStarting, Toolkit.i18nText("Fine-Design_Basic_Initializing"));
+        //初始化起始画面放到 SplashContext 里面
+        //EventDispatcher.fire(ModuleEvent.MajorModuleStarting, Toolkit.i18nText("Fine-Design_Basic_Initializing"));
+        
         // 完成初始化
         //noinspection ResultOfMethodCallIgnored
         CloudCenter.getInstance();