REPORT-114392 FR-FBP版本本地设计适配 代码质量

designer-realize/src/main/java/com/fanruan/boot/env/function/DesignComponent.java

@@ -199,16 +199,7 @@ public class DesignComponent {
         }, DesignerStartupPool.common());
         CompletableFuture<Void> mainDesignerPrepare = CompletableFuture.runAsync(this::designerModuleStart, DesignerStartupPool.common());
         CompletableFuture<Void> extendDesignerPrepare = CompletableFuture.runAsync(this::designerExtendStart, DesignerStartupPool.common());
-        CompletableFuture<Void> otherFeaturesPrepare = CompletableFuture.runAsync(() -> {
+        CompletableFuture<Void> otherFeaturesPrepare = CompletableFuture.runAsync(() -> designerOtherStart(), DesignerStartupPool.common());
-            startBBSLoginAuthServer();
-            migrateBBSInfoFromFineDB();
-            OSSupportCenter.buildAction(objects -> UserInfoPane.getInstance().updateBBSUserInfo(), SupportOSImpl.BBS_USER_LOGIN_PANE);
-            loadLogAppender();
-            DesignerWorkspaceLoader.init();
-            storePassport();
-            AlphaFineHelper.switchConfig4Locale();
-            RecoverManager.register(new RecoverForDesigner());
-        }, DesignerStartupPool.common());
         CompletableFuture<Void> resourcePrepare = CompletableFuture.runAsync(() -> {
             pushUpdateTask.run();
             if (WorkContext.getCurrent().isLocal()) {
@@ -219,6 +210,17 @@ public class DesignComponent {
         CompletableFuture.allOf(mainDesignerPrepare, extendDesignerPrepare, themeConfigPrepare, otherFeaturesPrepare, resourcePrepare).join();
     }
 
+    private void designerOtherStart() {
+        startBBSLoginAuthServer();
+        migrateBBSInfoFromFineDB();
+        OSSupportCenter.buildAction(objects -> UserInfoPane.getInstance().updateBBSUserInfo(), SupportOSImpl.BBS_USER_LOGIN_PANE);
+        loadLogAppender();
+        DesignerWorkspaceLoader.init();
+        storePassport();
+        AlphaFineHelper.switchConfig4Locale();
+        RecoverManager.register(new RecoverForDesigner());
+    }
+
 
     private void loadLogAppender() {
         logHandler = new LogHandler<DesignerLogAppender>() {

designer-realize/src/main/java/com/fanruan/boot/init/DesignerInitComponent.java

@@ -127,26 +127,11 @@ public class DesignerInitComponent {
                 activatorContext.setSuspendTime(suspendTime);
             };
             // selectAndOpenLast
-            model.setOpenLastTemplateRunnable(() -> {
+            model.setOpenLastTemplateRunnable(() -> openLastTemplate(recordSuspend, context, model));
-                recordSuspend.run();
-                context.setOpenLastFile(true);
-                handleModel(model);
-                launchAfterWarmup();
-            });
             // selectAndOpenEmpty
-            model.setOpenEmptyTemplateRunnable(() -> {
+            model.setOpenEmptyTemplateRunnable(() -> openEmptyTemplate(recordSuspend, context, model));
-                recordSuspend.run();
-                context.setOpenEmpty(true);
-                handleModel(model);
-                launchAfterWarmup();
-            });
             // selectAndCreateNew
-            model.setCreateNewTemplateRunnable(() -> {
+            model.setCreateNewTemplateRunnable(() -> createNewTemplate(recordSuspend, context, model));
-                recordSuspend.run();
-                context.setCreateNew(true);
-                handleModel(model);
-                launchAfterWarmup();
-            });
             StartupPageWindow window = new StartupPageWindow(model);
             window.setVisible(true);
             context.setOnWaiting(true);
@@ -154,6 +139,27 @@ public class DesignerInitComponent {
         });
     }
 
+    private void createNewTemplate(Runnable recordSuspend, DesignerStartupContext context, StartupPageModel model) {
+        recordSuspend.run();
+        context.setCreateNew(true);
+        handleModel(model);
+        launchAfterWarmup();
+    }
+
+    private void openEmptyTemplate(Runnable recordSuspend, DesignerStartupContext context, StartupPageModel model) {
+        recordSuspend.run();
+        context.setOpenEmpty(true);
+        handleModel(model);
+        launchAfterWarmup();
+    }
+
+    private void openLastTemplate(Runnable recordSuspend, DesignerStartupContext context, StartupPageModel model) {
+        recordSuspend.run();
+        context.setOpenLastFile(true);
+        handleModel(model);
+        launchAfterWarmup();
+    }
+
     private void suspendRecorder(DesignerStartupContext context) {
 
         DesignerMetrics designerMetrics = context.getDesignerMetrics();