From ae11f9bba2e1fda1c12524e20a05c6cea3138766 Mon Sep 17 00:00:00 2001
From: hades <hades@fanraun.com>
Date: Fri, 13 May 2022 19:56:16 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-70888=20=E3=80=90=E8=AE=BE=E8=AE=A1?=
 =?UTF-8?q?=E5=99=A8=E3=80=91=E5=A4=A7=E5=B1=8F=E7=BC=96=E8=BE=91=E5=99=A8?=
 =?UTF-8?q?-=E8=AE=BE=E8=AE=A1=E5=99=A8=E5=90=AF=E5=8A=A8=E6=97=B6?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E6=89=93=E5=BC=80=E7=9A=84fvs=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF=E4=BC=9A=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/fr/start/module/DesignerStartup.java   |  4 ++++
 .../module/optimized/TenantDBAdapter4Designer.java  | 13 +++++++++++--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/designer-realize/src/main/java/com/fr/start/module/DesignerStartup.java b/designer-realize/src/main/java/com/fr/start/module/DesignerStartup.java
index da8b559e8..4149753f7 100644
--- a/designer-realize/src/main/java/com/fr/start/module/DesignerStartup.java
+++ b/designer-realize/src/main/java/com/fr/start/module/DesignerStartup.java
@@ -124,6 +124,10 @@ public class DesignerStartup extends Activator {
             listenEvent(LazyStartupEvent.INSTANCE, new Listener<Null>(Integer.MIN_VALUE) {
                 @Override
                 public void on(Event event, Null param) {
+                    // 有可能被插件之类的 强制启动了 判断下
+                    if (FineEmbedServer.isRunning()) {
+                        return;
+                    }
                     startEmbeddedServer();
                 }
             });
diff --git a/designer-realize/src/main/java/com/fr/start/module/optimized/TenantDBAdapter4Designer.java b/designer-realize/src/main/java/com/fr/start/module/optimized/TenantDBAdapter4Designer.java
index d45913e1a..ad2485d69 100644
--- a/designer-realize/src/main/java/com/fr/start/module/optimized/TenantDBAdapter4Designer.java
+++ b/designer-realize/src/main/java/com/fr/start/module/optimized/TenantDBAdapter4Designer.java
@@ -9,6 +9,7 @@ import com.fr.event.Null;
 import com.fr.exit.ConfigToPropMigrator;
 import com.fr.stable.db.tenant.TenantDBAdapter;
 import com.fr.start.event.LazyStartupEvent;
+import com.fr.start.server.EmbedServerEvent;
 
 /**
  * @author hades
@@ -24,7 +25,15 @@ public class TenantDBAdapter4Designer extends TenantDBAdapter {
                 @Override
                 public void on(Event event, Null param) {
                     TenantDBAdapter4Designer.super.start();
-                    afterStart();
+                }
+            });
+
+            listenEvent(EmbedServerEvent.BeforeStart, new Listener<Null>() {
+                @Override
+                public void on(Event event, Null param) {
+                    if (DaoSelectorFactory.getDaoSelector().useCacheDao()) {
+                        beforeEmbedServerStart();
+                    }
                 }
             });
 
@@ -33,7 +42,7 @@ public class TenantDBAdapter4Designer extends TenantDBAdapter {
         }
     }
 
-    private void afterStart() {
+    private void beforeEmbedServerStart() {
         DesignerEnvManager.getEnvManager().setPropertiesUsable(false);
         DaoSwitcher.executeSwitch();
         ConfigToPropMigrator.getInstance().deletePropertiesCache();