NCZY/WAI_Project_BACKEND
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化插件更新配置

Browse Source
This commit is contained in:
ruying408
2024-07-22 23:45:30 +08:00
parent 1906001589
commit e08c0cc1f5
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/com/cool/core/plugin/service/CoolPluginService.java
View File

@@ -249,17 +249,20 @@ public class CoolPluginService {
public void updatePlugin(PluginInfoEntity entity) { public void updatePlugin(PluginInfoEntity entity) {
PluginInfoEntity dbPluginInfoEntity = pluginInfoService.getPluginInfoEntityByIdNoJarFile( PluginInfoEntity dbPluginInfoEntity = pluginInfoService.getPluginInfoEntityByIdNoJarFile(
entity.getId()); entity.getId());
boolean updateConfig = false; // 调用插件更新配置标识
boolean invokePluginConfig = false;
if (!MapExtUtil.compareMaps(entity.getConfig(), dbPluginInfoEntity.getConfig())) { if (!MapExtUtil.compareMaps(entity.getConfig(), dbPluginInfoEntity.getConfig())) {
// 不一致，说明更新了配置 // 不一致，说明更新了配置
entity.setPluginJson(dbPluginInfoEntity.getPluginJson());
entity.getPluginJson().setConfig(entity.getConfig()); entity.getPluginJson().setConfig(entity.getConfig());
updateConfig = true; // 更新了配置， 且插件是开启状态
invokePluginConfig = ObjUtil.equals(dbPluginInfoEntity.getStatus(), 1);
} }
if (!ObjUtil.equals(entity.getStatus(), dbPluginInfoEntity.getStatus())) { if (!ObjUtil.equals(entity.getStatus(), dbPluginInfoEntity.getStatus())) {
// 更新状态 // 更新状态
updateStatus(entity, dbPluginInfoEntity); updateStatus(entity, dbPluginInfoEntity);
} }
if (updateConfig) { if (invokePluginConfig) {
// 更新配置 // 更新配置
CoolPluginInvokers.setPluginJson(dbPluginInfoEntity.getKey(), entity); CoolPluginInvokers.setPluginJson(dbPluginInfoEntity.getKey(), entity);
} }

3
src/main/java/com/cool/modules/plugin/entity/PluginInfoEntity.java
View File

@@ -5,6 +5,7 @@ import com.cool.core.config.PluginJson;
import com.mybatisflex.annotation.Column; import com.mybatisflex.annotation.Column;
import com.mybatisflex.annotation.Table; import com.mybatisflex.annotation.Table;
import com.mybatisflex.core.handler.Fastjson2TypeHandler; import com.mybatisflex.core.handler.Fastjson2TypeHandler;
import com.mybatisflex.core.handler.JacksonTypeHandler;
import com.tangzc.autotable.annotation.Ignore; import com.tangzc.autotable.annotation.Ignore;
import com.tangzc.autotable.annotation.Index; import com.tangzc.autotable.annotation.Index;
import com.tangzc.mybatisflex.autotable.annotation.ColumnDefine; import com.tangzc.mybatisflex.autotable.annotation.ColumnDefine;
@@ -55,7 +56,7 @@ public class PluginInfoEntity extends BaseEntity<PluginInfoEntity> {
private byte[] jarFile; private byte[] jarFile;
@ColumnDefine(comment = "配置", type = "json") @ColumnDefine(comment = "配置", type = "json")
@Column(typeHandler = Fastjson2TypeHandler.class) @Column(typeHandler = JacksonTypeHandler.class)
private Map<String, Object> config; private Map<String, Object> config;
@Ignore @Ignore