diff --git a/assembly/assembly.xml b/assembly/assembly.xml index d9b7c7f..f41f1c6 100644 --- a/assembly/assembly.xml +++ b/assembly/assembly.xml @@ -26,10 +26,8 @@ conf application.yml - application-*.yml logback-spring.xml bootstrap.yml - bootstrap-*.yml diff --git a/fund-cust/src/main/resources/application.yml b/fund-cust/src/main/resources/application.yml index c92b285..315bb93 100644 --- a/fund-cust/src/main/resources/application.yml +++ b/fund-cust/src/main/resources/application.yml @@ -8,11 +8,11 @@ spring: cloud: nacos: discovery: - server-addr: localhost:8848 - namespace: fund-platform - group: DEFAULT_GROUP - username: nacos - password: nacos + server-addr: ${NACOS_SERVER_ADDR:localhost:8848} + namespace: ${NACOS_NAMESPACE:fund-platform} + group: ${NACOS_GROUP:DEFAULT_GROUP} + username: ${NACOS_USERNAME: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 - tenant-header: X-Tenant-Id - default-tenant-id: "1" + enabled: ${TENANT_ROUTING_ENABLED:true} + tenant-header: ${TENANT_HEADER:X-Tenant-Id} + default-tenant-id: "${DEFAULT_TENANT_ID:1}" fallback-to-shared: true diff --git a/fund-exp/src/main/resources/application.yml b/fund-exp/src/main/resources/application.yml index b681ec3..e8fd70f 100644 --- a/fund-exp/src/main/resources/application.yml +++ b/fund-exp/src/main/resources/application.yml @@ -8,11 +8,11 @@ spring: cloud: nacos: discovery: - server-addr: localhost:8848 - namespace: fund-platform - group: DEFAULT_GROUP - username: nacos - password: nacos + server-addr: ${NACOS_SERVER_ADDR:localhost:8848} + namespace: ${NACOS_NAMESPACE:fund-platform} + group: ${NACOS_GROUP:DEFAULT_GROUP} + username: ${NACOS_USERNAME: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 - tenant-header: X-Tenant-Id - default-tenant-id: "1" + enabled: ${TENANT_ROUTING_ENABLED:true} + tenant-header: ${TENANT_HEADER:X-Tenant-Id} + default-tenant-id: "${DEFAULT_TENANT_ID:1}" fallback-to-shared: true diff --git a/fund-file/src/main/resources/application.yml b/fund-file/src/main/resources/application.yml index cb8f9f5..0712580 100644 --- a/fund-file/src/main/resources/application.yml +++ b/fund-file/src/main/resources/application.yml @@ -8,11 +8,11 @@ spring: cloud: nacos: discovery: - server-addr: localhost:8848 - namespace: fund-platform - group: DEFAULT_GROUP - username: nacos - password: nacos + server-addr: ${NACOS_SERVER_ADDR:localhost:8848} + namespace: ${NACOS_NAMESPACE:fund-platform} + group: ${NACOS_GROUP:DEFAULT_GROUP} + username: ${NACOS_USERNAME: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: diff --git a/fund-gateway/src/main/resources/application.yml b/fund-gateway/src/main/resources/application.yml index c64711f..a0927d9 100644 --- a/fund-gateway/src/main/resources/application.yml +++ b/fund-gateway/src/main/resources/application.yml @@ -8,10 +8,10 @@ spring: # Redis配置(用于限流和Token验证) data: redis: - host: localhost - port: 6379 - password: zjf@123456 - database: 0 + host: ${REDIS_HOST:localhost} + port: ${REDIS_PORT:6379} + password: ${REDIS_PASSWORD:zjf@123456} + database: ${REDIS_DATABASE:0} cloud: compatibility-verifier: @@ -20,11 +20,11 @@ spring: # Nacos 服务发现 nacos: discovery: - server-addr: localhost:8848 - namespace: fund-platform - group: DEFAULT_GROUP - username: nacos - password: nacos + server-addr: ${NACOS_SERVER_ADDR:localhost:8848} + namespace: ${NACOS_NAMESPACE:fund-platform} + group: ${NACOS_GROUP:DEFAULT_GROUP} + username: ${NACOS_USERNAME:nacos} + password: ${NACOS_PASSWORD:nacos} # Sentinel配置 sentinel: @@ -131,4 +131,4 @@ logging: # 多租户路由配置 tenant: routing: - enabled: true + enabled: ${TENANT_ROUTING_ENABLED:true} diff --git a/fund-proj/src/main/resources/application.yml b/fund-proj/src/main/resources/application.yml index ca50139..646e0ce 100644 --- a/fund-proj/src/main/resources/application.yml +++ b/fund-proj/src/main/resources/application.yml @@ -8,11 +8,11 @@ spring: cloud: nacos: discovery: - server-addr: localhost:8848 - namespace: fund-platform - group: DEFAULT_GROUP - username: nacos - password: nacos + server-addr: ${NACOS_SERVER_ADDR:localhost:8848} + namespace: ${NACOS_NAMESPACE:fund-platform} + group: ${NACOS_GROUP:DEFAULT_GROUP} + username: ${NACOS_USERNAME: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 - tenant-header: X-Tenant-Id - default-tenant-id: "1" + enabled: ${TENANT_ROUTING_ENABLED:true} + tenant-header: ${TENANT_HEADER:X-Tenant-Id} + default-tenant-id: "${DEFAULT_TENANT_ID:1}" fallback-to-shared: true diff --git a/fund-receipt/src/main/resources/application.yml b/fund-receipt/src/main/resources/application.yml index 6baaf51..254e4b2 100644 --- a/fund-receipt/src/main/resources/application.yml +++ b/fund-receipt/src/main/resources/application.yml @@ -8,11 +8,11 @@ spring: cloud: nacos: discovery: - server-addr: localhost:8848 - namespace: fund-platform - group: DEFAULT_GROUP - username: nacos - password: nacos + server-addr: ${NACOS_SERVER_ADDR:localhost:8848} + namespace: ${NACOS_NAMESPACE:fund-platform} + group: ${NACOS_GROUP:DEFAULT_GROUP} + username: ${NACOS_USERNAME: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 - tenant-header: X-Tenant-Id - default-tenant-id: "1" + enabled: ${TENANT_ROUTING_ENABLED:true} + tenant-header: ${TENANT_HEADER:X-Tenant-Id} + default-tenant-id: "${DEFAULT_TENANT_ID:1}" fallback-to-shared: true # 定时任务配置 diff --git a/fund-report/src/main/resources/application.yml b/fund-report/src/main/resources/application.yml index 6753d49..0f90e89 100644 --- a/fund-report/src/main/resources/application.yml +++ b/fund-report/src/main/resources/application.yml @@ -8,11 +8,11 @@ spring: cloud: nacos: discovery: - server-addr: localhost:8848 - namespace: fund-platform - group: DEFAULT_GROUP - username: nacos - password: nacos + server-addr: ${NACOS_SERVER_ADDR:localhost:8848} + namespace: ${NACOS_NAMESPACE:fund-platform} + group: ${NACOS_GROUP:DEFAULT_GROUP} + username: ${NACOS_USERNAME: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: diff --git a/fund-req/src/main/resources/application.yml b/fund-req/src/main/resources/application.yml index be9482d..b709b7a 100644 --- a/fund-req/src/main/resources/application.yml +++ b/fund-req/src/main/resources/application.yml @@ -8,11 +8,11 @@ spring: cloud: nacos: discovery: - server-addr: localhost:8848 - namespace: fund-platform - group: DEFAULT_GROUP - username: nacos - password: nacos + server-addr: ${NACOS_SERVER_ADDR:localhost:8848} + namespace: ${NACOS_NAMESPACE:fund-platform} + group: ${NACOS_GROUP:DEFAULT_GROUP} + username: ${NACOS_USERNAME: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 - tenant-header: X-Tenant-Id - default-tenant-id: "1" + enabled: ${TENANT_ROUTING_ENABLED:true} + tenant-header: ${TENANT_HEADER:X-Tenant-Id} + default-tenant-id: "${DEFAULT_TENANT_ID:1}" fallback-to-shared: true diff --git a/fund-sys/src/main/resources/application.yml b/fund-sys/src/main/resources/application.yml index ba6e3bc..e0a9b4b 100644 --- a/fund-sys/src/main/resources/application.yml +++ b/fund-sys/src/main/resources/application.yml @@ -8,11 +8,11 @@ spring: cloud: nacos: discovery: - server-addr: localhost:8848 - namespace: fund-platform - group: DEFAULT_GROUP - username: nacos - password: nacos + server-addr: ${NACOS_SERVER_ADDR:localhost:8848} + namespace: ${NACOS_NAMESPACE:fund-platform} + group: ${NACOS_GROUP:DEFAULT_GROUP} + username: ${NACOS_USERNAME:nacos} + password: ${NACOS_PASSWORD:nacos} # 租户路由元数据 # tenant-id: 空值=共享实例,有值=VIP专属实例 metadata: @@ -42,10 +42,10 @@ spring: # Redis配置 data: redis: - host: localhost - port: 6379 - password: zjf@123456 - database: 0 + host: ${REDIS_HOST:localhost} + port: ${REDIS_PORT:6379} + password: ${REDIS_PASSWORD:zjf@123456} + 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 - tenant-header: X-Tenant-Id - default-tenant-id: "1" + enabled: ${TENANT_ROUTING_ENABLED:true} + tenant-header: ${TENANT_HEADER:X-Tenant-Id} + default-tenant-id: "${DEFAULT_TENANT_ID:1}" # 共享服务列表 shared-services: - fund-gateway diff --git a/scripts/env.properties b/scripts/env.properties index 53be5ba..69dd8b1 100644 --- a/scripts/env.properties +++ b/scripts/env.properties @@ -3,20 +3,36 @@ # 服务启动时会加载此文件 # ============================================ -# JVM参数配置 -# JAVA_OPTS="-Xms256m -Xmx512m -XX:+UseG1GC -XX:MaxGCPauseMillis=200" - -# 数据库配置(可在配置文件中使用) -# MYSQL_HOST=localhost -# MYSQL_PORT=3306 +# -------------------------------------------- +# Nacos配置(所有服务共用) +# -------------------------------------------- +NACOS_SERVER_ADDR=localhost:8848 +NACOS_NAMESPACE=fund-platform +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"