diff --git a/rdms-gateway/pom.xml b/rdms-gateway/pom.xml index 2bfa8c5..9b02286 100644 --- a/rdms-gateway/pom.xml +++ b/rdms-gateway/pom.xml @@ -54,6 +54,12 @@ spring-cloud-starter-alibaba-nacos-discovery + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-config + + com.google.guava @@ -77,6 +83,11 @@ org.springframework.boot spring-boot-maven-plugin ${spring.boot.version} + + + false + diff --git a/rdms-gateway/src/main/resources/application.yaml b/rdms-gateway/src/main/resources/application.yaml index 2b34ace..8a829c9 100644 --- a/rdms-gateway/src/main/resources/application.yaml +++ b/rdms-gateway/src/main/resources/application.yaml @@ -17,8 +17,13 @@ spring: main: allow-circular-references: true # 允许循环依赖,因为项目是三层架构,无法避免这个情况。 + # 配置中心:网关独享一份 dataId,不共用业务侧 rdms-common.yaml(其数据库/Redis/MyBatis 等配置网关用不到)。 + config: + import: + - nacos:gateway-server.yaml # 网关专属配置(日志路径等),需先在 Nacos 建好该 dataId + cloud: - # 注册中心连接(值由根 pom 的 nacos.* 属性在打包时注入)。网关仅用 Nacos 做服务发现,不加载配置中心文件。 + # 注册中心 + 配置中心连接(值由根 pom 的 nacos.* 属性在打包时注入)。 nacos: server-addr: @nacos.server-addr@ username: @nacos.username@ @@ -26,6 +31,9 @@ spring: discovery: namespace: @nacos.namespace@ group: @nacos.group@ + config: + namespace: @nacos.namespace@ + group: @nacos.group@ # Spring Cloud Gateway 配置项,对应 GatewayProperties 类 gateway: server: @@ -86,11 +94,7 @@ spring: server: port: 48080 -logging: - file: - name: ${user.home}/logs/${spring.application.name}.log # 日志文件名,全路径 - level: - org.springframework.context.support.PostProcessorRegistrationDelegate: ERROR +# 日志配置(logging.file.name + level)已整体外置到 Nacos gateway-server.yaml,按环境统一管理,本地不再定义以免覆盖。 # Actuator 监控端点的配置项 management: diff --git a/rdms-gateway/src/main/resources/logback-spring.xml b/rdms-gateway/src/main/resources/logback-spring.xml index d2888cd..7a49046 100644 --- a/rdms-gateway/src/main/resources/logback-spring.xml +++ b/rdms-gateway/src/main/resources/logback-spring.xml @@ -34,6 +34,7 @@ + diff --git a/rdms-project/rdms-project-boot/src/main/resources/application.yaml b/rdms-project/rdms-project-boot/src/main/resources/application.yaml index 2788404..a959ef5 100644 --- a/rdms-project/rdms-project-boot/src/main/resources/application.yaml +++ b/rdms-project/rdms-project-boot/src/main/resources/application.yaml @@ -58,8 +58,7 @@ server: keep-alive-timeout: 60s logging: - file: - name: ${user.home}/logs/${spring.application.name}.log # 日志文件名,全路径 + # 日志文件路径(logging.file.name)已外置到 Nacos rdms-common.yaml,按环境统一配置;本地不再定义以免覆盖 Nacos。 level: com.njcn.rdms.module.project.dal.mysql: debug # 打印本模块 Mapper 的 SQL 日志 diff --git a/rdms-project/rdms-project-boot/src/main/resources/logback-spring.xml b/rdms-project/rdms-project-boot/src/main/resources/logback-spring.xml new file mode 100644 index 0000000..7a49046 --- /dev/null +++ b/rdms-project/rdms-project-boot/src/main/resources/logback-spring.xml @@ -0,0 +1,46 @@ + + + + + + + + +       + + ${CONSOLE_LOG_PATTERN} + + + + + + + + ${FILE_LOG_PATTERN} + + + ${LOG_FILE} + + + ${LOG_FILE}.%d{yyyy-MM-dd}.%i.log + 30 + 10MB + + + + + 0 + 512 + + + + + + + + + + + + + diff --git a/rdms-system/rdms-system-boot/src/main/resources/application.yaml b/rdms-system/rdms-system-boot/src/main/resources/application.yaml index 9c6fc14..03c3819 100644 --- a/rdms-system/rdms-system-boot/src/main/resources/application.yaml +++ b/rdms-system/rdms-system-boot/src/main/resources/application.yaml @@ -58,8 +58,7 @@ server: # 必须大于网关 spring.cloud.gateway.server.webflux.httpclient.pool.max-idle-time(30s)。 keep-alive-timeout: 60s logging: - file: - name: ${user.home}/logs/${spring.application.name}.log # 日志文件名,全路径 + # 日志文件路径(logging.file.name)已外置到 Nacos rdms-common.yaml,按环境统一配置;本地不再定义以免覆盖 Nacos。 level: com.njcn.rdms.module.system.dal.mysql: debug # 打印本模块 Mapper 的 SQL 日志 com.njcn.rdms.module.system.dal.mysql.logger.ApiErrorLogMapper: INFO # 避免和 GlobalExceptionHandler 重复打印