diff --git a/capability/src/main/resources/logback.xml b/capability/src/main/resources/logback.xml
index e6a80844..d760db13 100644
--- a/capability/src/main/resources/logback.xml
+++ b/capability/src/main/resources/logback.xml
@@ -29,9 +29,9 @@
100MB
- 15
+ 15
- 3GB
+ 3GB
true
@@ -46,9 +46,10 @@
${LOG_HOME}/core.log.%d{yyyy-MM-dd}.%i.log.gz
100MB
- 15
+ 15
- 2GB
+ 2GB
+ true
[%X{traceId}] %d{yyyy-MM-dd HH:mm:ss.SSS} %5p ${PID:- } [%15.15t] %X{callerInfo} : %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}
diff --git a/data/src/main/resources/logback.xml b/data/src/main/resources/logback.xml
index 8c5d2338..6a9f0dd7 100644
--- a/data/src/main/resources/logback.xml
+++ b/data/src/main/resources/logback.xml
@@ -26,8 +26,9 @@
${LOG_HOME}/running.log.%d{yyyy-MM-dd}.%i.log.gz
100MB
- 15
- 3GB
+ 15
+ 3GB
+ true
${FILE_LOG_PATTERN}
@@ -43,8 +44,9 @@
${LOG_HOME}/running_debug.log.%d{yyyy-MM-dd}.%i.log.gz
100MB
- 15
- 2GB
+ 15
+ 2GB
+ true
${FILE_LOG_PATTERN}
@@ -62,8 +64,9 @@
${LOG_HOME}/core.log.%d{yyyy-MM-dd}.%i.log.gz
100MB
- 15
- 1GB
+ 15
+ 1GB
+ true
[%X{traceId}] %d{yyyy-MM-dd HH:mm:ss.SSS} %5p ${PID:- } [%15.15t] %X{callerInfo} : %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}
diff --git a/flowable/src/main/resources/logback.xml b/flowable/src/main/resources/logback.xml
index 4ebe463e..3cb7e8a8 100644
--- a/flowable/src/main/resources/logback.xml
+++ b/flowable/src/main/resources/logback.xml
@@ -26,8 +26,9 @@
${LOG_HOME}/running.log.%d{yyyy-MM-dd}.%i.log.gz
100MB
- 15
- 3GB
+ 15
+ 3GB
+ true
${FILE_LOG_PATTERN}
@@ -43,8 +44,9 @@
${LOG_HOME}/running_debug.log.%d{yyyy-MM-dd}.%i.log.gz
100MB
- 15
- 2GB
+ 15
+ 2GB
+ true
${FILE_LOG_PATTERN}
diff --git a/gateway2/src/main/resources/logback.xml b/gateway2/src/main/resources/logback.xml
index d7ea9b70..1073b255 100644
--- a/gateway2/src/main/resources/logback.xml
+++ b/gateway2/src/main/resources/logback.xml
@@ -31,9 +31,10 @@
100MB
- 15
+ 15
- 3GB
+ 3GB
+ true
@@ -49,8 +50,9 @@
${LOG_HOME}/core.log.%d{yyyy-MM-dd}.%i.log.gz
100MB
- 15
- 2GB
+ 15
+ 2GB
+ true
diff --git a/job/src/main/resources/logback.xml b/job/src/main/resources/logback.xml
index e85a5bf2..7dbfc0bd 100644
--- a/job/src/main/resources/logback.xml
+++ b/job/src/main/resources/logback.xml
@@ -25,8 +25,8 @@
${LOG_HOME}/running.log.%d{yyyy-MM-dd}.%i.log.gz
100MB
- 15
- 3GB
+ 15
+ 3GB
true
@@ -40,8 +40,9 @@
${LOG_HOME}/core.log.%d{yyyy-MM-dd}.%i.log.gz
100MB
- 15
- 2GB
+ 15
+ 2GB
+ true
[%X{traceId}] %d{yyyy-MM-dd HH:mm:ss.SSS} %5p ${PID:- } [%15.15t] %X{callerInfo} : %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}
diff --git a/pbs/src/main/resources/logback.xml b/pbs/src/main/resources/logback.xml
index 1f122f41..66b81e79 100644
--- a/pbs/src/main/resources/logback.xml
+++ b/pbs/src/main/resources/logback.xml
@@ -1,107 +1,114 @@
-
-
+
+
+
+
+
-
-
-
-
-
+
+
+
-
+
+
+
+
+
+
+
+
-
+
${CONSOLE_LOG_PATTERN}
+ UTF-8
-
-
+
+
+
+ 2048
+ 200
+ true
+
+
+
+
+
${LOG_HOME}/running.log
- ${LOG_HOME}/running.log.%d{yyyy-MM-dd}.%i.log.gz
+
+ ${LOG_HOME}/running.log.%d{yyyy-MM-dd}.%i.log.gz
100MB
- 15
- 3GB
+ 15
+ 3GB
true
-
+
${FILE_LOG_PATTERN}
+ UTF-8
-
+
+
${LOG_HOME}/core.log
-
- ${LOG_HOME}/core.log.%d{yyyy-MM-dd}.%i.log.gz
- 100MB
- 15
- 2GB
-
-
- [%X{traceId}] %d{yyyy-MM-dd HH:mm:ss.SSS} %5p ${PID:- } [%15.15t] %X{callerInfo} : %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}
-
+
+
INFO
+
+
+ ${LOG_HOME}/core.log.%d{yyyy-MM-dd}.%i.log.gz
+ 100MB
+ 15
+ 2GB
+ true
+
+
+
+
+ [%d{yyyy-MM-dd HH:mm:ss.SSS}] %-5p [%15.15t] %X{callerInfo} : [%X{traceId:-}] %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}
+ UTF-8
+
-
+
-
+
+
-
+
+
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
\ No newline at end of file
diff --git a/project/src/main/resources/logback.xml b/project/src/main/resources/logback.xml
index 70474a5a..cfc36fa3 100644
--- a/project/src/main/resources/logback.xml
+++ b/project/src/main/resources/logback.xml
@@ -26,8 +26,9 @@
${LOG_HOME}/running.log.%d{yyyy-MM-dd}.%i.log.gz
100MB
- 15
- 3GB
+ 15
+ 3GB
+ true
${FILE_LOG_PATTERN}
@@ -43,8 +44,9 @@
${LOG_HOME}/running_debug.log.%d{yyyy-MM-dd}.%i.log.gz
100MB
- 15
- 2GB
+ 15
+ 2GB
+ true
${FILE_LOG_PATTERN}
@@ -62,8 +64,9 @@
${LOG_HOME}/core.log.%d{yyyy-MM-dd}.%i.log.gz
100MB
- 15
- 1GB
+ 15
+ 1GB
+ true
[%X{traceId}] %d{yyyy-MM-dd HH:mm:ss.SSS} %5p ${PID:- } [%15.15t] %X{callerInfo} : %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}
diff --git a/system/src/main/java/com/sdm/system/service/impl/SimulationSystemConfigServiceImpl.java b/system/src/main/java/com/sdm/system/service/impl/SimulationSystemConfigServiceImpl.java
index 562c06e6..b9d20cae 100644
--- a/system/src/main/java/com/sdm/system/service/impl/SimulationSystemConfigServiceImpl.java
+++ b/system/src/main/java/com/sdm/system/service/impl/SimulationSystemConfigServiceImpl.java
@@ -445,8 +445,8 @@ public class SimulationSystemConfigServiceImpl extends BaseService implements IS
updateWrapper.set(SysFormConfigure::getComment, configure.getComment());
}
formConfigureService.update(updateWrapper);
- // 调用抽取后的管理员批量更新用户配置方法
- batchUpdateUserConfigure(configure);
+ // 调用抽取后的管理员覆盖用户的配置
+ batchUpdateUserConfigureNew(configure);
} else {
response = SdmResponse.failed("该表单配置不存在");
}
@@ -761,8 +761,27 @@ public class SimulationSystemConfigServiceImpl extends BaseService implements IS
return SdmResponse.success();
}
+ // 管理员操作某个表,直接删除用户的自定义配置的数据,这样相当于管理员覆盖了用户的自定义配置
+ private void batchUpdateUserConfigureNew(FormConfigure configure) {
+ // 查询当前租户下关联该主配置的所有用户自定义配置
+ List dbUserConfigs = formUserConfigureService.lambdaQuery()
+ .eq(SysFormUserConfigure::getFormConfigureId, configure.getId())
+ .eq(SysFormUserConfigure::getTenantId, ThreadLocalContext.getTenantId())
+ .list();
+
+ if (CollectionUtils.isNotEmpty(dbUserConfigs)) {
+ // 提取所有 id → 得到 List
+ List idList = dbUserConfigs.stream()
+ .map(SysFormUserConfigure::getId) // 取每个对象的 id
+ .collect(Collectors.toList());
+ boolean b = formUserConfigureService.removeBatchByIds(idList);
+ log.info("batchUpdateUserConfigureNew user config delete table name {},result:{}", configure.getFormName(),b);
+ }
+ }
+
/**
- * 管理员批量更新关联的用户自定义表单配置
+ * 管理员批量更新关联的用户自定义表单配置 V1 版本,管理员修改后,管理员有权限覆盖规定的3个字段之外的字段,用户自定义的三个字段还保留,字段删除,名称修改除外
+ * 2026-04-15 该方法暂时废弃
* @param configure 表单配置参数
*/
private void batchUpdateUserConfigure(FormConfigure configure) {
diff --git a/system/src/main/resources/logback.xml b/system/src/main/resources/logback.xml
index 6a84329b..b9d30c7b 100644
--- a/system/src/main/resources/logback.xml
+++ b/system/src/main/resources/logback.xml
@@ -26,8 +26,9 @@
${LOG_HOME}/running.log.%d{yyyy-MM-dd}.%i.log.gz
100MB
- 15
- 3GB
+ 15
+ 3GB
+ true
${FILE_LOG_PATTERN}
@@ -40,8 +41,9 @@
${LOG_HOME}/core.log.%d{yyyy-MM-dd}.%i.log.gz
100MB
- 15
- 2GB
+ 15
+ 2GB
+ true
[%X{traceId}] %d{yyyy-MM-dd HH:mm:ss.SSS} %5p ${PID:- } [%15.15t] %X{callerInfo} : %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}
diff --git a/task/src/main/resources/logback.xml b/task/src/main/resources/logback.xml
index c472d775..a1a1c808 100644
--- a/task/src/main/resources/logback.xml
+++ b/task/src/main/resources/logback.xml
@@ -26,8 +26,9 @@
${LOG_HOME}/running.log.%d{yyyy-MM-dd}.%i.log.gz
100MB
- 15
- 3GB
+ 15
+ 3GB
+ true
${FILE_LOG_PATTERN}
@@ -40,8 +41,8 @@
${LOG_HOME}/core.log.%d{yyyy-MM-dd}.%i.log.gz
100MB
- 15
- 2GB
+ 15
+ 2GB
[%X{traceId}] %d{yyyy-MM-dd HH:mm:ss.SSS} %5p ${PID:- } [%15.15t] %X{callerInfo} : %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}