refactor: 统一配置参数到env.properties

- 更新env.properties，添加Nacos/Redis/日志/多租户等公共配置
- 各服务application.yml使用环境变量引用公共配置
- 数据库配置保持独立，不纳入统一配置

assembly/assembly.xml

@@ -26,10 +26,8 @@
             <outputDirectory>conf</outputDirectory>
             <includes>
                 <include>application.yml</include>
-                <include>application-*.yml</include>
                 <include>logback-spring.xml</include>
                 <include>bootstrap.yml</include>
-                <include>bootstrap-*.yml</include>
             </includes>
             <excludes>
                 <!-- 排除docker相关配置 -->

fund-cust/src/main/resources/application.yml

@@ -8,11 +8,11 @@ spring:
   cloud:
     nacos:
       discovery:
-        server-addr: localhost:8848
+        server-addr: ${NACOS_SERVER_ADDR:localhost:8848}
-        namespace: fund-platform
+        namespace: ${NACOS_NAMESPACE:fund-platform}
-        group: DEFAULT_GROUP
+        group: ${NACOS_GROUP:DEFAULT_GROUP}
-        username: nacos
+        username: ${NACOS_USERNAME:nacos}
-        password: nacos
+        password: ${NACOS_PASSWORD:nacos}
         # 租户路由元数据
         # tenant-id: 空值=共享实例，单值=单租户专属，多值(逗号分隔)=多租户专属
         metadata:
@@ -45,13 +45,13 @@ logging:
   level:
     com.fundplatform.cust: DEBUG
   pattern:
-    console: "%d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n"
+    console: "${LOG_PATTERN:%d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n}"
 
 # 多租户路由配置
 tenant:
   routing:
-    enabled: true
+    enabled: ${TENANT_ROUTING_ENABLED:true}
-    tenant-header: X-Tenant-Id
+    tenant-header: ${TENANT_HEADER:X-Tenant-Id}
-    default-tenant-id: "1"
+    default-tenant-id: "${DEFAULT_TENANT_ID:1}"
     fallback-to-shared: true
 

fund-exp/src/main/resources/application.yml

@@ -8,11 +8,11 @@ spring:
   cloud:
     nacos:
       discovery:
-        server-addr: localhost:8848
+        server-addr: ${NACOS_SERVER_ADDR:localhost:8848}
-        namespace: fund-platform
+        namespace: ${NACOS_NAMESPACE:fund-platform}
-        group: DEFAULT_GROUP
+        group: ${NACOS_GROUP:DEFAULT_GROUP}
-        username: nacos
+        username: ${NACOS_USERNAME:nacos}
-        password: nacos
+        password: ${NACOS_PASSWORD:nacos}
         # 租户路由元数据
         metadata:
           tenant-id: ${TENANT_ID:}
@@ -44,12 +44,12 @@ logging:
   level:
     com.fundplatform.exp: DEBUG
   pattern:
-    console: "%d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n"
+    console: "${LOG_PATTERN:%d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n}"
 
 # 多租户路由配置
 tenant:
   routing:
-    enabled: true
+    enabled: ${TENANT_ROUTING_ENABLED:true}
-    tenant-header: X-Tenant-Id
+    tenant-header: ${TENANT_HEADER:X-Tenant-Id}
-    default-tenant-id: "1"
+    default-tenant-id: "${DEFAULT_TENANT_ID:1}"
     fallback-to-shared: true

fund-file/src/main/resources/application.yml

@@ -8,11 +8,11 @@ spring:
   cloud:
     nacos:
       discovery:
-        server-addr: localhost:8848
+        server-addr: ${NACOS_SERVER_ADDR:localhost:8848}
-        namespace: fund-platform
+        namespace: ${NACOS_NAMESPACE:fund-platform}
-        group: DEFAULT_GROUP
+        group: ${NACOS_GROUP:DEFAULT_GROUP}
-        username: nacos
+        username: ${NACOS_USERNAME:nacos}
-        password: nacos
+        password: ${NACOS_PASSWORD:nacos}
         # 共享服务，无需租户路由
   
   datasource:
@@ -46,7 +46,7 @@ logging:
   level:
     com.fundplatform.file: DEBUG
   pattern:
-    console: "%d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n"
+    console: "${LOG_PATTERN:%d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n}"
 
 # 共享服务，禁用租户路由
 tenant:

fund-gateway/src/main/resources/application.yml

@@ -8,10 +8,10 @@ spring:
   # Redis配置(用于限流和Token验证)
   data:
     redis:
-      host: localhost
+      host: ${REDIS_HOST:localhost}
-      port: 6379
+      port: ${REDIS_PORT:6379}
-      password: zjf@123456
+      password: ${REDIS_PASSWORD:zjf@123456}
-      database: 0
+      database: ${REDIS_DATABASE:0}
   
   cloud:
     compatibility-verifier:
@@ -20,11 +20,11 @@ spring:
     # Nacos 服务发现
     nacos:
       discovery:
-        server-addr: localhost:8848
+        server-addr: ${NACOS_SERVER_ADDR:localhost:8848}
-        namespace: fund-platform
+        namespace: ${NACOS_NAMESPACE:fund-platform}
-        group: DEFAULT_GROUP
+        group: ${NACOS_GROUP:DEFAULT_GROUP}
-        username: nacos
+        username: ${NACOS_USERNAME:nacos}
-        password: nacos
+        password: ${NACOS_PASSWORD:nacos}
     
     # Sentinel配置
     sentinel:
@@ -131,4 +131,4 @@ logging:
 # 多租户路由配置
 tenant:
   routing:
-    enabled: true
+    enabled: ${TENANT_ROUTING_ENABLED:true}

fund-proj/src/main/resources/application.yml

@@ -8,11 +8,11 @@ spring:
   cloud:
     nacos:
       discovery:
-        server-addr: localhost:8848
+        server-addr: ${NACOS_SERVER_ADDR:localhost:8848}
-        namespace: fund-platform
+        namespace: ${NACOS_NAMESPACE:fund-platform}
-        group: DEFAULT_GROUP
+        group: ${NACOS_GROUP:DEFAULT_GROUP}
-        username: nacos
+        username: ${NACOS_USERNAME:nacos}
-        password: nacos
+        password: ${NACOS_PASSWORD:nacos}
         # 租户路由元数据
         metadata:
           tenant-id: ${TENANT_ID:}
@@ -44,13 +44,13 @@ logging:
   level:
     com.fundplatform.proj: DEBUG
   pattern:
-    console: "%d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n"
+    console: "${LOG_PATTERN:%d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n}"
 
 # 多租户路由配置
 tenant:
   routing:
-    enabled: true
+    enabled: ${TENANT_ROUTING_ENABLED:true}
-    tenant-header: X-Tenant-Id
+    tenant-header: ${TENANT_HEADER:X-Tenant-Id}
-    default-tenant-id: "1"
+    default-tenant-id: "${DEFAULT_TENANT_ID:1}"
     fallback-to-shared: true
 

fund-receipt/src/main/resources/application.yml

@@ -8,11 +8,11 @@ spring:
   cloud:
     nacos:
       discovery:
-        server-addr: localhost:8848
+        server-addr: ${NACOS_SERVER_ADDR:localhost:8848}
-        namespace: fund-platform
+        namespace: ${NACOS_NAMESPACE:fund-platform}
-        group: DEFAULT_GROUP
+        group: ${NACOS_GROUP:DEFAULT_GROUP}
-        username: nacos
+        username: ${NACOS_USERNAME:nacos}
-        password: nacos
+        password: ${NACOS_PASSWORD:nacos}
         # 租户路由元数据
         metadata:
           tenant-id: ${TENANT_ID:}
@@ -44,14 +44,14 @@ logging:
   level:
     com.fundplatform.receipt: DEBUG
   pattern:
-    console: "%d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n"
+    console: "${LOG_PATTERN:%d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n}"
 
 # 多租户路由配置
 tenant:
   routing:
-    enabled: true
+    enabled: ${TENANT_ROUTING_ENABLED:true}
-    tenant-header: X-Tenant-Id
+    tenant-header: ${TENANT_HEADER:X-Tenant-Id}
-    default-tenant-id: "1"
+    default-tenant-id: "${DEFAULT_TENANT_ID:1}"
     fallback-to-shared: true
 
 # 定时任务配置

fund-report/src/main/resources/application.yml

@@ -8,11 +8,11 @@ spring:
   cloud:
     nacos:
       discovery:
-        server-addr: localhost:8848
+        server-addr: ${NACOS_SERVER_ADDR:localhost:8848}
-        namespace: fund-platform
+        namespace: ${NACOS_NAMESPACE:fund-platform}
-        group: DEFAULT_GROUP
+        group: ${NACOS_GROUP:DEFAULT_GROUP}
-        username: nacos
+        username: ${NACOS_USERNAME:nacos}
-        password: nacos
+        password: ${NACOS_PASSWORD:nacos}
         # 共享服务，无需租户路由
   
   datasource:
@@ -25,7 +25,7 @@ logging:
   level:
     com.fundplatform.report: DEBUG
   pattern:
-    console: "%d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n"
+    console: "${LOG_PATTERN:%d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n}"
 
 # 共享服务，禁用租户路由
 tenant:

fund-req/src/main/resources/application.yml

@@ -8,11 +8,11 @@ spring:
   cloud:
     nacos:
       discovery:
-        server-addr: localhost:8848
+        server-addr: ${NACOS_SERVER_ADDR:localhost:8848}
-        namespace: fund-platform
+        namespace: ${NACOS_NAMESPACE:fund-platform}
-        group: DEFAULT_GROUP
+        group: ${NACOS_GROUP:DEFAULT_GROUP}
-        username: nacos
+        username: ${NACOS_USERNAME:nacos}
-        password: nacos
+        password: ${NACOS_PASSWORD:nacos}
         # 租户路由元数据
         metadata:
           tenant-id: ${TENANT_ID:}
@@ -44,12 +44,12 @@ logging:
   level:
     com.fundplatform.req: DEBUG
   pattern:
-    console: "%d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n"
+    console: "${LOG_PATTERN:%d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n}"
 
 # 多租户路由配置
 tenant:
   routing:
-    enabled: true
+    enabled: ${TENANT_ROUTING_ENABLED:true}
-    tenant-header: X-Tenant-Id
+    tenant-header: ${TENANT_HEADER:X-Tenant-Id}
-    default-tenant-id: "1"
+    default-tenant-id: "${DEFAULT_TENANT_ID:1}"
     fallback-to-shared: true

fund-sys/src/main/resources/application.yml

@@ -8,11 +8,11 @@ spring:
   cloud:
     nacos:
       discovery:
-        server-addr: localhost:8848
+        server-addr: ${NACOS_SERVER_ADDR:localhost:8848}
-        namespace: fund-platform
+        namespace: ${NACOS_NAMESPACE:fund-platform}
-        group: DEFAULT_GROUP
+        group: ${NACOS_GROUP:DEFAULT_GROUP}
-        username: nacos
+        username: ${NACOS_USERNAME:nacos}
-        password: nacos
+        password: ${NACOS_PASSWORD:nacos}
         # 租户路由元数据
         # tenant-id: 空值=共享实例，有值=VIP专属实例
         metadata:
@@ -42,10 +42,10 @@ spring:
   # Redis配置
   data:
     redis:
-      host: localhost
+      host: ${REDIS_HOST:localhost}
-      port: 6379
+      port: ${REDIS_PORT:6379}
-      password: zjf@123456
+      password: ${REDIS_PASSWORD:zjf@123456}
-      database: 0
+      database: ${REDIS_DATABASE:0}
       timeout: 10000
       lettuce:
         pool:
@@ -74,14 +74,14 @@ logging:
   level:
     com.fundplatform.sys: DEBUG
   pattern:
-    console: "%d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n"
+    console: "${LOG_PATTERN:%d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n}"
 
 # 多租户路由配置
 tenant:
   routing:
-    enabled: true
+    enabled: ${TENANT_ROUTING_ENABLED:true}
-    tenant-header: X-Tenant-Id
+    tenant-header: ${TENANT_HEADER:X-Tenant-Id}
-    default-tenant-id: "1"
+    default-tenant-id: "${DEFAULT_TENANT_ID:1}"
     # 共享服务列表
     shared-services:
       - fund-gateway

scripts/env.properties

@@ -3,20 +3,36 @@
 # 服务启动时会加载此文件
 # ============================================
 
-# JVM参数配置
+# --------------------------------------------
-# JAVA_OPTS="-Xms256m -Xmx512m -XX:+UseG1GC -XX:MaxGCPauseMillis=200"
+# Nacos配置（所有服务共用）
-
+# --------------------------------------------
-# 数据库配置（可在配置文件中使用）
+NACOS_SERVER_ADDR=localhost:8848
-# MYSQL_HOST=localhost
+NACOS_NAMESPACE=fund-platform
-# MYSQL_PORT=3306
+NACOS_GROUP=DEFAULT_GROUP
+NACOS_USERNAME=nacos
+NACOS_PASSWORD=nacos
 
+# --------------------------------------------
 # Redis配置
-# REDIS_HOST=localhost
+# --------------------------------------------
-# REDIS_PORT=6379
+REDIS_HOST=localhost
+REDIS_PORT=6379
+REDIS_PASSWORD=zjf@123456
+REDIS_DATABASE=0
 
-# Nacos配置
+# --------------------------------------------
-# NACOS_HOST=localhost
+# 日志配置
-# NACOS_PORT=8848
+# --------------------------------------------
+LOG_PATTERN=%d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n
 
-# 日志级别
+# --------------------------------------------
-# LOG_LEVEL=INFO
+# 多租户路由配置
+# --------------------------------------------
+TENANT_ROUTING_ENABLED=true
+TENANT_HEADER=X-Tenant-Id
+DEFAULT_TENANT_ID=1
+
+# --------------------------------------------
+# JVM参数配置（可通过环境变量覆盖）
+# --------------------------------------------
+# JAVA_OPTS="-Xms256m -Xmx512m -XX:+UseG1GC -XX:MaxGCPauseMillis=200"