From 1d76a4bbcd64046b86afc76e2b07c445c5a8aad9 Mon Sep 17 00:00:00 2001
From: hades <hades@fanraun.com>
Date: Tue, 17 Aug 2021 10:02:14 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-57057=20=E8=BF=9C=E7=A8=8B=E8=AE=BE?=
 =?UTF-8?q?=E8=AE=A1=E6=8A=A5=E9=94=99=E8=A7=84=E8=8C=83-=E5=90=AF?=
 =?UTF-8?q?=E5=8A=A8=E8=BF=9C=E7=A8=8B=E7=8A=B6=E6=80=81=E4=B8=8B=E7=9A=84?=
 =?UTF-8?q?=E8=AE=BE=E8=AE=A1=E5=99=A8=E6=97=B6=EF=BC=8C=E6=8A=A5=E9=94=99?=
 =?UTF-8?q?=E5=BC=B9=E7=AA=97=E8=A2=AB=20=E5=88=87=E6=8D=A2=E5=B7=A5?=
 =?UTF-8?q?=E4=BD=9C=E7=9B=AE=E5=BD=95=E7=9A=84=E5=BC=B9=E7=AA=97=E8=A6=86?=
 =?UTF-8?q?=E7=9B=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/fr/design/EnvChangeEntrance.java       | 5 ++++-
 .../java/com/fr/start/module/DesignerWorkspaceProvider.java  | 5 ++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/design/EnvChangeEntrance.java b/designer-base/src/main/java/com/fr/design/EnvChangeEntrance.java
index 1b38bb150..98c079ee2 100644
--- a/designer-base/src/main/java/com/fr/design/EnvChangeEntrance.java
+++ b/designer-base/src/main/java/com/fr/design/EnvChangeEntrance.java
@@ -407,7 +407,7 @@ public class EnvChangeEntrance {
     /**
      * 处理异常
      */
-    public void dealEvnExceptionWhenStartDesigner() {
+    public void dealEvnExceptionWhenStartDesigner(Throwable e, DesignerWorkspaceInfo workspaceInfo) {
         ProcessEventPipe eventPipe = FineProcessContext.getParentPipe();
         if (eventPipe != null) {
             eventPipe.fire(new CarryMessageEvent(ReportState.STOP.getValue()));
@@ -435,6 +435,9 @@ public class EnvChangeEntrance {
                 DesignerExiter.getInstance().execute();
             }
         });
+        if (e != null) {
+            RemoteDesignExceptionHandler.getInstance().handleInStart(e, workspaceInfo);
+        }
         envListDialog.setVisible(true);
     }
 
diff --git a/designer-realize/src/main/java/com/fr/start/module/DesignerWorkspaceProvider.java b/designer-realize/src/main/java/com/fr/start/module/DesignerWorkspaceProvider.java
index dbebb5f99..d5b6cdb63 100644
--- a/designer-realize/src/main/java/com/fr/start/module/DesignerWorkspaceProvider.java
+++ b/designer-realize/src/main/java/com/fr/start/module/DesignerWorkspaceProvider.java
@@ -59,7 +59,7 @@ public class DesignerWorkspaceProvider extends Activator {
                 Workspace workspace = DesignerWorkspaceGenerator.generate(workspaceInfo);
                 boolean checkValid = workspace != null && workspaceInfo.checkValid();
                 if (!checkValid) {
-                    EnvChangeEntrance.getInstance().dealEvnExceptionWhenStartDesigner();
+                    EnvChangeEntrance.getInstance().dealEvnExceptionWhenStartDesigner(null, workspaceInfo);
                 } else {
                     WorkContext.switchTo(workspace);
                     //在设计器完全启动完成后，对初始环境进行一次服务检测，对主要功能无影响，异常仅做日志提示即可
@@ -76,8 +76,7 @@ public class DesignerWorkspaceProvider extends Activator {
                     });
                 }
             } catch (Throwable e) {
-                RemoteDesignExceptionHandler.getInstance().handleInStart(e, workspaceInfo);
-                EnvChangeEntrance.getInstance().dealEvnExceptionWhenStartDesigner();
+                EnvChangeEntrance.getInstance().dealEvnExceptionWhenStartDesigner(e, workspaceInfo);
             }
         }
         pluginErrorRemind();