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/application-yian.yml b/data/src/main/resources/application-yian.yml index f8ee554d..221aa37b 100644 --- a/data/src/main/resources/application-yian.yml +++ b/data/src/main/resources/application-yian.yml @@ -7,7 +7,7 @@ spring: datasource: username: root password: mysql - jdbc-url: jdbc:mysql://192.168.0.88:3306/spdm_baseline?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=Asia/Shanghai + jdbc-url: jdbc:mysql://192.168.0.89:3306/spdm_baseline?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=Asia/Shanghai driver-class-name: com.mysql.cj.jdbc.Driver hikari: # 设置连接池能够容纳的最大连接数。建议值：CPU核心数 * 2 + 有效磁盘I/O数。一个常见的经验值是 10-20。 @@ -23,18 +23,18 @@ spring: master: username: root password: mysql - jdbc-url: jdbc:mysql://192.168.0.88:3306/spdm_baseline?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=Asia/Shanghai + jdbc-url: jdbc:mysql://192.168.0.89:3306/spdm_baseline?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=Asia/Shanghai driver-class-name: com.mysql.cj.jdbc.Driver slave: username: root password: mysql - jdbc-url: jdbc:mysql://192.168.0.88:3306/spdm_baseline?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=Asia/Shanghai + jdbc-url: jdbc:mysql://192.168.0.89:3306/spdm_baseline?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=Asia/Shanghai driver-class-name: com.mysql.cj.jdbc.Driver enable: true cloud: nacos: discovery: - server-addr: 192.168.0.88:8848 + server-addr: 192.168.0.89:8848 group: DEV_GROUP # server-addr: 127.0.0.1:8848 enabled: true @@ -108,7 +108,7 @@ fileSystem: # spdmadmin/spdmadmin 作为普通用户只能看到spdm桶的数据 minio: - endpoint: 192.168.0.88 + endpoint: 192.168.0.89 port: 9000 access-key: minioadmin secret-key: minioadmin 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/application-yian.yml b/gateway2/src/main/resources/application-yian.yml index 828814c3..234beac0 100644 --- a/gateway2/src/main/resources/application-yian.yml +++ b/gateway2/src/main/resources/application-yian.yml @@ -7,13 +7,13 @@ spring: cloud: nacos: config: - server-addr: 192.168.0.88:8848 + server-addr: 192.168.0.89:8848 file-extension: yaml import-check: enabled: false enabled: false discovery: - server-addr: 192.168.0.88:8848 + server-addr: 192.168.0.89:8848 group: DEV_GROUP enabled: true gateway: @@ -133,7 +133,7 @@ logging: # 0单机处理，1负载均衡轮询 serverType: 0 -serverIp: 192.168.0.88 +serverIp: 192.168.0.89 #serverIp: 192.168.65.73 security: 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/application-yian.yml b/project/src/main/resources/application-yian.yml index a102b66d..5b6797d0 100644 --- a/project/src/main/resources/application-yian.yml +++ b/project/src/main/resources/application-yian.yml @@ -7,7 +7,7 @@ spring: datasource: username: root password: mysql - jdbc-url: jdbc:mysql://192.168.0.88:3306/spdm_baseline?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=Asia/Shanghai + jdbc-url: jdbc:mysql://192.168.0.89:3306/spdm_baseline?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=Asia/Shanghai driver-class-name: com.mysql.cj.jdbc.Driver hikari: # 设置连接池能够容纳的最大连接数。建议值：CPU核心数 * 2 + 有效磁盘I/O数。一个常见的经验值是 10-20。 @@ -23,18 +23,18 @@ spring: master: username: root password: mysql - jdbc-url: jdbc:mysql://192.168.0.88:3306/spdm_baseline?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=Asia/Shanghai + jdbc-url: jdbc:mysql://192.168.0.89:3306/spdm_baseline?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=Asia/Shanghai driver-class-name: com.mysql.cj.jdbc.Driver slave: username: root password: mysql - jdbc-url: jdbc:mysql://192.168.0.88:3306/spdm_baseline?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=Asia/Shanghai + jdbc-url: jdbc:mysql://192.168.0.89:3306/spdm_baseline?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=Asia/Shanghai driver-class-name: com.mysql.cj.jdbc.Driver enable: true cloud: nacos: discovery: - server-addr: 192.168.0.88:8848 + server-addr: 192.168.0.89:8848 enabled: true group: DEV_GROUP # username: nacos 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/application-yian.yml b/system/src/main/resources/application-yian.yml index fe18b1c2..743502c5 100644 --- a/system/src/main/resources/application-yian.yml +++ b/system/src/main/resources/application-yian.yml @@ -7,7 +7,7 @@ spring: datasource: username: root password: mysql - jdbc-url: jdbc:mysql://192.168.0.88:3306/spdm_baseline?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=Asia/Shanghai + jdbc-url: jdbc:mysql://192.168.0.89:3306/spdm_baseline?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=Asia/Shanghai driver-class-name: com.mysql.cj.jdbc.Driver hikari: # 设置连接池能够容纳的最大连接数。建议值：CPU核心数 * 2 + 有效磁盘I/O数。一个常见的经验值是 10-20。 @@ -23,18 +23,18 @@ spring: master: username: root password: mysql - jdbc-url: jdbc:mysql://192.168.0.88:3306/spdm_baseline?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=Asia/Shanghai + jdbc-url: jdbc:mysql://192.168.0.89:3306/spdm_baseline?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=Asia/Shanghai driver-class-name: com.mysql.cj.jdbc.Driver slave: username: root password: mysql - jdbc-url: jdbc:mysql://192.168.0.88:3306/spdm_baseline?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=Asia/Shanghai + jdbc-url: jdbc:mysql://192.168.0.89:3306/spdm_baseline?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=Asia/Shanghai driver-class-name: com.mysql.cj.jdbc.Driver enable: true cloud: nacos: discovery: - server-addr: 192.168.0.88:8848 + server-addr: 192.168.0.89:8848 group: DEV_GROUP # server-addr: localhost:8848 enabled: true @@ -140,7 +140,7 @@ tenantSystem: cid: - url: http://192.168.0.88:7101 # 请根据实际CID服务地址修改 + url: http://192.168.0.89:7101 # 请根据实际CID服务地址修改 ## url: http://192.168.65.75:8989/honeycom-spdm # 朱欣茹地址 user: listUser: /spdm-user/listUser 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/application-yian.yml b/task/src/main/resources/application-yian.yml index af2ec426..191afccb 100644 --- a/task/src/main/resources/application-yian.yml +++ b/task/src/main/resources/application-yian.yml @@ -8,7 +8,7 @@ spring: datasource: username: root password: mysql - jdbc-url: jdbc:mysql://192.168.0.88:3306/spdm_baseline?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=Asia/Shanghai + jdbc-url: jdbc:mysql://192.168.0.89:3306/spdm_baseline?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=Asia/Shanghai driver-class-name: com.mysql.cj.jdbc.Driver hikari: # 设置连接池能够容纳的最大连接数。建议值：CPU核心数 * 2 + 有效磁盘I/O数。一个常见的经验值是 10-20。 @@ -24,18 +24,18 @@ spring: master: username: root password: mysql - jdbc-url: jdbc:mysql://192.168.0.88:3306/spdm_baseline?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=Asia/Shanghai + jdbc-url: jdbc:mysql://192.168.0.89:3306/spdm_baseline?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=Asia/Shanghai driver-class-name: com.mysql.cj.jdbc.Driver slave: username: root password: mysql - jdbc-url: jdbc:mysql://192.168.0.88:3306/spdm_baseline?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=Asia/Shanghai + jdbc-url: jdbc:mysql://192.168.0.89:3306/spdm_baseline?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=Asia/Shanghai driver-class-name: com.mysql.cj.jdbc.Driver enable: true cloud: nacos: discovery: - server-addr: 192.168.0.88:8848 + server-addr: 192.168.0.89:8848 group: DEV_GROUP # server-addr: 127.0.0.1:8848 enabled: true @@ -46,7 +46,7 @@ spring: # Redis默认情况下有16个分片(库)，这里配置具体使用的分片，默认是0 database: 0 # redis服务器地址（填写自己的服务器地址） - host: 192.168.0.88 + host: 192.168.0.89 # redis端口（默认6379） port: 6379 #redis连接超时等待,10秒 @@ -119,7 +119,7 @@ file: rootPath: /data/home/sdm scriptPath : /opt/script approve: - replyUrl: http:192.168.0.88:7102/simulation/task/taskpool/approveHandleNotice + replyUrl: http:192.168.0.89:7102/simulation/task/taskpool/approveHandleNotice #logging: # config: ./config/logback.xml 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}