From d0dde705cd1a74deeaa359e03e5a2520d0f63615 Mon Sep 17 00:00:00 2001
From: "Destiny.Lin" <destiny.lin@fanruan.com>
Date: Thu, 15 Aug 2024 18:09:24 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-114392=20FR-FBP=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E6=9C=AC=E5=9C=B0=E8=AE=BE=E8=AE=A1=E9=80=82=E9=85=8D=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=89=93=E5=8C=85=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fr/design/data/tabledata/wrapper/TableDataFactory.java   | 2 +-
 .../main/java/com/fr/start/server/DesignEmbedLauncher.java   | 5 +++++
 .../java/com/fanruan/boot/pre/DesignPreStartComponent.java   | 4 ++--
 .../src/main/java/com/fr/start/DesignLauncher.java           | 3 +++
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/TableDataFactory.java b/designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/TableDataFactory.java
index b5e1df4f26..bc80f43425 100644
--- a/designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/TableDataFactory.java
+++ b/designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/TableDataFactory.java
@@ -14,7 +14,6 @@ import com.fr.data.impl.RecursionTableData;
 import com.fr.data.impl.storeproc.StoreProcedure;
 import com.fr.decision.webservice.bean.dataset.ServerDataSetBean;
 import com.fr.design.data.datapane.TableDataNameObjectCreator;
-import com.fr.design.data.datapane.preview.TableDataBeanHelper;
 import com.fr.design.data.tabledata.tabledatapane.AbstractTableDataPane;
 import com.fr.design.data.tabledata.tabledatapane.ClassTableDataPane;
 import com.fr.design.data.tabledata.tabledatapane.DBTableDataPane;
@@ -32,6 +31,7 @@ import com.fr.workspace.WorkContext;
 import com.fr.workspace.server.authority.user.UserAuthority;
 import com.fr.workspace.server.entity.connection.ConnectionBean;
 import com.fr.workspace.server.repository.connection.ConnectionRepository;
+import com.fr.workspace.server.repository.tabledata.TableDataBeanHelper;
 import com.fr.workspace.server.repository.tabledata.TableDataRepository;
 
 import java.lang.reflect.Constructor;
diff --git a/designer-base/src/main/java/com/fr/start/server/DesignEmbedLauncher.java b/designer-base/src/main/java/com/fr/start/server/DesignEmbedLauncher.java
index b4e2be70cb..6c741b463e 100644
--- a/designer-base/src/main/java/com/fr/start/server/DesignEmbedLauncher.java
+++ b/designer-base/src/main/java/com/fr/start/server/DesignEmbedLauncher.java
@@ -31,6 +31,11 @@ public class DesignEmbedLauncher extends XmlCarinaLauncher {
         return Carina.getApplicationContext();
     }
 
+    @Override
+    protected void initTenant() throws CarinaException {
+
+    }
+
     @Override
     protected void initializeSpring() throws CarinaException {
         super.initializeSpring();
diff --git a/designer-realize/src/main/java/com/fanruan/boot/pre/DesignPreStartComponent.java b/designer-realize/src/main/java/com/fanruan/boot/pre/DesignPreStartComponent.java
index 44ce5af0d1..eca6315272 100644
--- a/designer-realize/src/main/java/com/fanruan/boot/pre/DesignPreStartComponent.java
+++ b/designer-realize/src/main/java/com/fanruan/boot/pre/DesignPreStartComponent.java
@@ -58,7 +58,7 @@ import com.fr.start.SplashStrategy;
 import com.fr.start.common.SplashCommon;
 import com.fr.start.preload.PreLoadService;
 import com.fr.tenant.config.TenantConfigProvider;
-import com.fr.tenant.context.PlatformScaffoldTenantStarter;
+import com.fr.tenant.context.CurrentTenantProviderStater;
 import com.fr.tenant.context.TenantContext;
 import com.fr.tenant.context.provider.CurrentTenantKey;
 import com.fr.tenant.store.impl.DefaultTenantStorage;
@@ -215,7 +215,7 @@ public class DesignPreStartComponent {
                 return false;
             }
         });
-        PlatformScaffoldTenantStarter.start(new ArrayList<>(Carina.getApplicationContext().group(CurrentTenantKey.class).getAll()));
+        CurrentTenantProviderStater.start(new ArrayList<>(Carina.getApplicationContext().group(CurrentTenantKey.class).getAll()));
     }
 
     private void startUniversalConfig() {
diff --git a/designer-realize/src/main/java/com/fr/start/DesignLauncher.java b/designer-realize/src/main/java/com/fr/start/DesignLauncher.java
index b3b9ce0778..4dbc59f4ed 100644
--- a/designer-realize/src/main/java/com/fr/start/DesignLauncher.java
+++ b/designer-realize/src/main/java/com/fr/start/DesignLauncher.java
@@ -34,6 +34,9 @@ public class DesignLauncher extends XmlCarinaLauncher {
         return context;
     }
 
+    @Override
+    protected void initTenant() throws CarinaException {
+    }
 
     @Override
     protected void initServiceDiscovery() throws CarinaException {