Browse Source

Pull request #14184: REPORT-114392 FR-FBP版本本地设计适配 适配定时调度,保证内置服务器启动

Merge in DESIGN/design from ~DESTINY.LIN/design:fbp-1.0 to fbp-1.0

* commit '7fc07ebbeb0b6aeb5816216c8814b67003f42f13':
  REPORT-114392 FR-FBP版本本地设计适配 优化定时调度写法
  REPORT-114392 FR-FBP版本本地设计适配 适配定时调度,保证内置服务器启动
fbp-1.0
Destiny.Lin-林锦龙 5 months ago
parent
commit
f714695751
  1. 1
      build.gradle
  2. 54
      designer-realize/src/main/java/com/fanruan/boot/env/DesignEnvComponent.java

1
build.gradle

@ -77,6 +77,7 @@ allprojects {
// //
implementation 'com.fr.license:fine-license-webui:' + apiVersion implementation 'com.fr.license:fine-license-webui:' + apiVersion
// //
implementation 'com.fr.cbb:fine-cbb-common:' + cbbVersion
implementation 'com.fr.auth:fine-auth-webui:' + apiVersion implementation 'com.fr.auth:fine-auth-webui:' + apiVersion
implementation 'com.fr.portal:fine-portal-api:' + apiVersion implementation 'com.fr.portal:fine-portal-api:' + apiVersion
implementation 'com.fr.essential:fine-essential:' + cbbVersion implementation 'com.fr.essential:fine-essential:' + cbbVersion

54
designer-realize/src/main/java/com/fanruan/boot/env/DesignEnvComponent.java vendored

@ -3,6 +3,7 @@ package com.fanruan.boot.env;
import com.fanruan.boot.FSProperties; import com.fanruan.boot.FSProperties;
import com.fanruan.boot.KVProperties; import com.fanruan.boot.KVProperties;
import com.fanruan.boot.LoggerProperties; import com.fanruan.boot.LoggerProperties;
import com.fanruan.boot.SchedulerCoreComponent;
import com.fanruan.carina.Carina; import com.fanruan.carina.Carina;
import com.fanruan.carina.annotions.FineComponent; import com.fanruan.carina.annotions.FineComponent;
import com.fanruan.carina.annotions.JPAEntityScan; import com.fanruan.carina.annotions.JPAEntityScan;
@ -26,6 +27,8 @@ import com.fanruan.kv.manager.CarinaKVManager;
import com.fanruan.kv.store.KVStore; import com.fanruan.kv.store.KVStore;
import com.fanruan.kv.store.KVStoreHolder; import com.fanruan.kv.store.KVStoreHolder;
import com.fr.cbb.dialect.security.InsecurityElementFactory; import com.fr.cbb.dialect.security.InsecurityElementFactory;
import com.fr.cluster.ClusterBridge;
import com.fr.cluster.lock.ClusterLock;
import com.fr.config.BaseDBEnv; import com.fr.config.BaseDBEnv;
import com.fr.config.ConfigContext; import com.fr.config.ConfigContext;
import com.fr.config.ConfigEvent; import com.fr.config.ConfigEvent;
@ -65,6 +68,9 @@ import com.fr.record.analyzer.AnalyzerKey;
import com.fr.record.analyzer.AnalyzerMutableGroup; import com.fr.record.analyzer.AnalyzerMutableGroup;
import com.fr.record.analyzer.Assistant; import com.fr.record.analyzer.Assistant;
import com.fr.record.analyzer.DBMetrics; import com.fr.record.analyzer.DBMetrics;
import com.fr.scheduler.QuartzContext;
import com.fr.scheduler.SchedulerEvent;
import com.fr.scheduler.tenant.ScheduleThreadCurrentTenantProvider;
import com.fr.security.encryption.EncryptionInitialization; import com.fr.security.encryption.EncryptionInitialization;
import com.fr.security.encryption.core.EncryptionScaffold; import com.fr.security.encryption.core.EncryptionScaffold;
import com.fr.security.encryption.provider.SecuritySeedProvider; import com.fr.security.encryption.provider.SecuritySeedProvider;
@ -74,12 +80,16 @@ import com.fr.stable.GraphDrawHelper;
import com.fr.stable.StringUtils; import com.fr.stable.StringUtils;
import com.fr.stable.db.DBContext; import com.fr.stable.db.DBContext;
import com.fr.stable.db.properties.FineMicroServicesDBProperties; import com.fr.stable.db.properties.FineMicroServicesDBProperties;
import com.fr.stable.db.session.DBSession;
import com.fr.stable.project.ProjectConstants; import com.fr.stable.project.ProjectConstants;
import com.fr.tenant.context.TenantContext;
import com.fr.tenant.context.provider.CurrentTenantKey;
import com.fr.third.net.bytebuddy.description.type.TypeDescription; import com.fr.third.net.bytebuddy.description.type.TypeDescription;
import com.fr.third.net.bytebuddy.dynamic.DynamicType; import com.fr.third.net.bytebuddy.dynamic.DynamicType;
import com.fr.third.net.bytebuddy.implementation.MethodDelegation; import com.fr.third.net.bytebuddy.implementation.MethodDelegation;
import com.fr.third.net.bytebuddy.matcher.ElementMatchers; import com.fr.third.net.bytebuddy.matcher.ElementMatchers;
import com.fr.third.net.bytebuddy.utility.JavaModule; import com.fr.third.net.bytebuddy.utility.JavaModule;
import com.fr.third.org.hibernate.jdbc.AbstractWork;
import com.fr.tolerance.FaultTolerance; import com.fr.tolerance.FaultTolerance;
import com.fr.tolerance.FaultToleranceInterceptor; import com.fr.tolerance.FaultToleranceInterceptor;
import com.fr.transaction.Configurations; import com.fr.transaction.Configurations;
@ -90,7 +100,10 @@ import com.fr.transaction.TransactorFactory;
import com.fr.workspace.WorkContext; import com.fr.workspace.WorkContext;
import java.net.URI; import java.net.URI;
import java.sql.Connection;
import java.sql.SQLException;
import java.util.Objects; import java.util.Objects;
import java.util.Properties;
/** /**
* 设计器env模块环境切换的底层模块 * 设计器env模块环境切换的底层模块
@ -129,6 +142,7 @@ public class DesignEnvComponent {
Carina.getApplicationContext().group(AnalyzerMutableGroup.class).add(AnalyzerConfiguration.create((builder, typeDescription, classLoader, module) -> builder Carina.getApplicationContext().group(AnalyzerMutableGroup.class).add(AnalyzerConfiguration.create((builder, typeDescription, classLoader, module) -> builder
.method(ElementMatchers.isAnnotatedWith(FaultTolerance.class)) .method(ElementMatchers.isAnnotatedWith(FaultTolerance.class))
.intercept(MethodDelegation.to(FaultToleranceInterceptor.class)))); .intercept(MethodDelegation.to(FaultToleranceInterceptor.class))));
Carina.getApplicationContext().group(CurrentTenantKey.class).add(ScheduleThreadCurrentTenantProvider.INSTANCE);
} }
@Start @Start
@ -147,13 +161,47 @@ public class DesignEnvComponent {
startLogger(); startLogger();
// 7.kv // 7.kv
startKv(); startKv();
// 8.scheduler
startScheduler();
} }
private void startScheduler() {
TenantContext.doIsolatedWork(() -> {
ClusterLock lock = ClusterBridge.getLockFactory().get(SchedulerCoreComponent.class);
// 多节点同时启动quartz模块可能会产生脏数据,导致报错,使用集群锁控制一下
DBSession dbSession = null;
try {
lock.lock();
final DBContextProvider context = BaseDBEnv.getDBContext();
if (context == null) {
throw new IllegalArgumentException("ConfigDBActivator must start before SchedulerActivator");
}
dbSession = context.openSession();
dbSession.doWork(new AbstractWork() {
@Override
public void execute(Connection connection) throws SQLException {
//quartz需要的数据库方言
Properties properties = context.getDBProperties();
QuartzContext.getInstance().initScheduler(properties);
}
});
EventDispatcher.fire(SchedulerEvent.START);
} catch (Exception e) {
FineLoggerFactory.getLogger().error(e.getMessage(), e);
} finally {
if (dbSession != null) {
dbSession.closeSession();
}
lock.unlock();
}
}, "default");
}
@Stop @Stop
public void stop() { public void stop() {
stopScheduler();
stopLogger(); stopLogger();
stopFileServer(); stopFileServer();
stopConfConfig(); stopConfConfig();
@ -162,6 +210,11 @@ public class DesignEnvComponent {
stopEnvPrepare(); stopEnvPrepare();
} }
private void stopScheduler() {
EventDispatcher.fire(SchedulerEvent.STOP);
QuartzContext.getInstance().destroy();
}
/** /**
* -------------------private------------------- * -------------------private-------------------
@ -171,6 +224,7 @@ public class DesignEnvComponent {
* ----------kv--------- * ----------kv---------
*/ */
private void startKv() { private void startKv() {
// KVProperties没有的话默认走内存
KVStore kvStore = KVStoreFactory.createFineKVStore(Carina.properties(KVProperties.class).getType()); KVStore kvStore = KVStoreFactory.createFineKVStore(Carina.properties(KVProperties.class).getType());
KVStoreHolder.getInstance().setStore(kvStore); KVStoreHolder.getInstance().setStore(kvStore);
CarinaKV.switchTo(new CarinaKVManager()); CarinaKV.switchTo(new CarinaKVManager());

Loading…
Cancel
Save