From 99fd1ae3713e6e2a47e9b2c28923c2949c16a36e Mon Sep 17 00:00:00 2001
From: "Destiny.Lin" <Destiny.Lin@fanruan.com>
Date: Mon, 27 Nov 2023 13:48:31 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-109834=20F0052=EF=BC=8C=E8=B5=B7?=
 =?UTF-8?q?=E5=A7=8B=E9=A1=B5=E8=A7=A6=E5=8F=91=E6=8A=A5=E9=94=99=EF=BC=8C?=
 =?UTF-8?q?starting=E6=8B=BF=E5=88=B0=E7=9A=84=E6=98=AFfalse?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../messagecollect/StartErrorMessageCollector.java     | 10 +++++++++-
 .../main/java/com/fr/startup/ui/StartupPageWindow.java |  1 +
 .../module/optimized/DesignerStartupPageActivator.java |  2 ++
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/designer-base/src/main/java/com/fr/design/mainframe/messagecollect/StartErrorMessageCollector.java b/designer-base/src/main/java/com/fr/design/mainframe/messagecollect/StartErrorMessageCollector.java
index cc096bbf7..2b6cf0a8f 100644
--- a/designer-base/src/main/java/com/fr/design/mainframe/messagecollect/StartErrorMessageCollector.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/messagecollect/StartErrorMessageCollector.java
@@ -25,6 +25,7 @@ public class StartErrorMessageCollector {
     private String uuid;
     private String activeKey;
 
+    private boolean extraJudgeStart = false;
 
     public static StartErrorMessageCollector getInstance() {
         return INSTANCE;
@@ -42,7 +43,7 @@ public class StartErrorMessageCollector {
         errorInfo.setLogid(id);
         errorInfo.setLog(msg);
         errorInfo.setStackTrace(detail);
-        errorInfo.setStarting(DesignerStartupContext.getInstance().isOnStartup());
+        errorInfo.setStarting(DesignerStartupContext.getInstance().isOnStartup() || extraJudgeStart);
         errorInfo.setRemote(!WorkContext.getCurrent().isLocal());
         errorInfo.saveAsJSON();
     }
@@ -57,4 +58,11 @@ public class StartErrorMessageCollector {
     public void record(String id, String msg) {
         record(id, msg, StringUtils.EMPTY);
     }
+
+    public void setExtraJudgeStart(boolean extraJudgeStart) {
+        this.extraJudgeStart = extraJudgeStart;
+    }
+
+
+
 }
diff --git a/designer-base/src/main/java/com/fr/startup/ui/StartupPageWindow.java b/designer-base/src/main/java/com/fr/startup/ui/StartupPageWindow.java
index 156b1b3e1..d7fa813c1 100644
--- a/designer-base/src/main/java/com/fr/startup/ui/StartupPageWindow.java
+++ b/designer-base/src/main/java/com/fr/startup/ui/StartupPageWindow.java
@@ -279,6 +279,7 @@ public class StartupPageWindow extends JFrame {
                                 e.getMessage());
                     } finally {
                         loadingPanel.hide();
+                        StartErrorMessageCollector.getInstance().setExtraJudgeStart(false);
                     }
                 }
             };
diff --git a/designer-realize/src/main/java/com/fr/start/module/optimized/DesignerStartupPageActivator.java b/designer-realize/src/main/java/com/fr/start/module/optimized/DesignerStartupPageActivator.java
index d861fa052..836abb631 100644
--- a/designer-realize/src/main/java/com/fr/start/module/optimized/DesignerStartupPageActivator.java
+++ b/designer-realize/src/main/java/com/fr/start/module/optimized/DesignerStartupPageActivator.java
@@ -2,6 +2,7 @@ package com.fr.start.module.optimized;
 
 import com.fr.design.DesignerEnvManager;
 import com.fr.design.mainframe.DesignerContext;
+import com.fr.design.mainframe.messagecollect.StartErrorMessageCollector;
 import com.fr.design.ui.util.UIUtil;
 import com.fr.log.FineLoggerFactory;
 import com.fr.module.Activator;
@@ -164,6 +165,7 @@ public class DesignerStartupPageActivator extends Activator {
             UIUtil.invokeLaterIfNeeded(() -> {
                 // 换到 awt 线程中关闭，不然异步会出现问题。
                 DesignerStartupContext.getInstance().setOnStartup(false);
+                StartErrorMessageCollector.getInstance().setExtraJudgeStart(true);
                 recordStartupEnd(stopWatch);
             });
             markComplete();