Browse Source

REPORT-114392 FR-FBP版本本地设计适配 修复打包问题

fbp-1.0
Destiny.Lin 3 months ago
parent
commit
d0dde705cd
  1. 2
      designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/TableDataFactory.java
  2. 5
      designer-base/src/main/java/com/fr/start/server/DesignEmbedLauncher.java
  3. 4
      designer-realize/src/main/java/com/fanruan/boot/pre/DesignPreStartComponent.java
  4. 3
      designer-realize/src/main/java/com/fr/start/DesignLauncher.java

2
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.data.impl.storeproc.StoreProcedure;
import com.fr.decision.webservice.bean.dataset.ServerDataSetBean; import com.fr.decision.webservice.bean.dataset.ServerDataSetBean;
import com.fr.design.data.datapane.TableDataNameObjectCreator; 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.AbstractTableDataPane;
import com.fr.design.data.tabledata.tabledatapane.ClassTableDataPane; import com.fr.design.data.tabledata.tabledatapane.ClassTableDataPane;
import com.fr.design.data.tabledata.tabledatapane.DBTableDataPane; 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.authority.user.UserAuthority;
import com.fr.workspace.server.entity.connection.ConnectionBean; import com.fr.workspace.server.entity.connection.ConnectionBean;
import com.fr.workspace.server.repository.connection.ConnectionRepository; 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 com.fr.workspace.server.repository.tabledata.TableDataRepository;
import java.lang.reflect.Constructor; import java.lang.reflect.Constructor;

5
designer-base/src/main/java/com/fr/start/server/DesignEmbedLauncher.java

@ -31,6 +31,11 @@ public class DesignEmbedLauncher extends XmlCarinaLauncher {
return Carina.getApplicationContext(); return Carina.getApplicationContext();
} }
@Override
protected void initTenant() throws CarinaException {
}
@Override @Override
protected void initializeSpring() throws CarinaException { protected void initializeSpring() throws CarinaException {
super.initializeSpring(); super.initializeSpring();

4
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.common.SplashCommon;
import com.fr.start.preload.PreLoadService; import com.fr.start.preload.PreLoadService;
import com.fr.tenant.config.TenantConfigProvider; 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.TenantContext;
import com.fr.tenant.context.provider.CurrentTenantKey; import com.fr.tenant.context.provider.CurrentTenantKey;
import com.fr.tenant.store.impl.DefaultTenantStorage; import com.fr.tenant.store.impl.DefaultTenantStorage;
@ -215,7 +215,7 @@ public class DesignPreStartComponent {
return false; 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() { private void startUniversalConfig() {

3
designer-realize/src/main/java/com/fr/start/DesignLauncher.java

@ -34,6 +34,9 @@ public class DesignLauncher extends XmlCarinaLauncher {
return context; return context;
} }
@Override
protected void initTenant() throws CarinaException {
}
@Override @Override
protected void initServiceDiscovery() throws CarinaException { protected void initServiceDiscovery() throws CarinaException {

Loading…
Cancel
Save