chore(config): Improve Nacos high availability deployment

2026-03-17 17:26:49 +08:00
parent f7751cb633
commit 88bb0c0cd0
23 changed files with 609 additions and 1579 deletions
@@ -1,29 +0,0 @@
-spring:
-  datasource:
-    dynamic:
-      primary: master
-      strict: false
-      datasource:
-        master:
-          url: jdbc:mysql://5.180.253.115:3306/video_admin?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
-          username: root
-          password: sty@G458221
-          driver-class-name: com.mysql.cj.jdbc.Driver
-
-  data:
-    redis:
-      database: 5
-      host: 5.180.253.115
-      port: 6379
-      password: redis_EsJ8FX
-      timeout: 10000
-
-# 开发环境启用操作日志记录
-operation-log:
-  enabled: true
-
-# 开发环境日志配置
-logging:
-  level:
-    com.nuaa.video: debug
-    org.springframework.security: debug
@@ -1,112 +0,0 @@
-server:
-  port: 9006
-
-spring:
-  application:
-    name: video-admin
-  cloud:
-    nacos:
-      discovery:
-        server-addr: ${NACOS_SERVERS:192.168.1.101:8848,192.168.1.102:8848,192.168.1.103:8848}
-        namespace: ${NACOS_NAMESPACE:public}
-        group: ${NACOS_GROUP:DEFAULT_GROUP}
-        username: nacos
-        password: nacos
-        ip: ${ADMIN_IP:}
-      config:
-        server-addr: ${spring.cloud.nacos.discovery.server-addr}
-        namespace: ${spring.cloud.nacos.discovery.namespace}
-        group: ${spring.cloud.nacos.discovery.group}
-        file-extension: yaml
-        username: nacos
-        password: nacos
-    sentinel:
-      transport:
-        dashboard: ${SENTINEL_HOST:sentinel}:${SENTINEL_PORT:8080}
-        port: 8726
-        client-ip: ${ADMIN_IP:}
-      eager: true
-  datasource:
-    url: jdbc:mysql://${MYSQL_HOST:mysql}:${MYSQL_PORT:3306}/video_admin?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&allowMultiQueries=true
-    username: root
-    password: ${MYSQL_ROOT_PASSWORD:root123456}
-    driver-class-name: com.mysql.cj.jdbc.Driver
-    hikari:
-      max-lifetime: 58000
-      idle-timeout: 300000
-      connection-timeout: 20000
-      connection-test-query: SELECT 1
-      keepalive-time: 60000
-      validation-timeout: 3000
-      minimum-idle: 5
-      maximum-pool-size: 20
-  data:
-    redis:
-      password: ${REDIS_PASSWORD:redis_HA_Cluster_2024}
-      database: 5
-      timeout: 10000
-      sentinel:
-        master: mymaster
-        nodes: ${REDIS_SENTINEL_NODES:192.168.1.101:26379,192.168.1.102:26379,192.168.1.103:26379}
-        password: ${REDIS_PASSWORD:redis_HA_Cluster_2024}
-      lettuce:
-        pool:
-          max-active: 200
-          max-wait: -1
-          max-idle: 10
-          min-idle: 0
-
-mybatis-plus:
-  mapper-locations: classpath:mapper/*.xml
-  type-aliases-package: com.nuaa.video.admin.entity
-  configuration:
-    map-underscore-to-camel-case: true
-    cache-enabled: false
-    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
-  global-config:
-    db-config:
-      id-type: auto
-      logic-delete-field: status
-      logic-delete-value: 0
-      logic-not-delete-value: 1
-
-jwt:
-  secret: video-platform-admin-secret-key-2024-nuaa-ha
-  expiration: 86400
-  token-header: Authorization
-  token-prefix: "Bearer "
-
-login:
-  retry-count: 5
-  lock-time: 30
-
-operation-log:
-  enabled: true
-  exclude-paths:
-    - /admin/auth/login
-    - /admin/auth/logout
-    - /admin/auth/captcha
-    - /actuator/**
-
-management:
-  endpoints:
-    web:
-      exposure:
-        include: '*'
-  endpoint:
-    health:
-      show-details: always
-
-feign:
-  client:
-    config:
-      default:
-        connectTimeout: 5000
-        readTimeout: 5000
-  circuitbreaker:
-    enabled: true
-
-logging:
-  level:
-    com.nuaa.video: info
-    org.springframework.security: info
@@ -5,15 +5,17 @@ spring:
  application:
    name: video-admin
  profiles:
-    active: dev
+    active: ${SPRING_PROFILES_ACTIVE:dev}
  config:
    import:
-      - optional:nacos:${spring.application.name}.yaml?username=${NACOS_USERNAME:nacos}&password=${NACOS_PASSWORD:nacos}
+      - optional:nacos:common.yaml?refreshEnabled=true
+      - optional:nacos:common-redis-${spring.profiles.active}.yaml?refreshEnabled=true
+      - optional:nacos:${spring.application.name}.yaml?refreshEnabled=true
  cloud:
    nacos:
      discovery:
-        server-addr: ${NACOS_HOST:5.180.253.115}:${NACOS_PORT:8848}
-        namespace: ${NACOS_NAMESPACE:public}
+        server-addr: ${NACOS_SERVER_ADDR:${NACOS_HOST:127.0.0.1}:${NACOS_PORT:8848}}
+        namespace: ${NACOS_NAMESPACE:}
        group: ${NACOS_GROUP:DEFAULT_GROUP}
        username: ${NACOS_USERNAME:nacos}
        password: ${NACOS_PASSWORD:nacos}
@@ -25,74 +27,6 @@ spring:
        file-extension: yaml
        username: ${NACOS_USERNAME:nacos}
        password: ${NACOS_PASSWORD:nacos}
-    sentinel:
-      transport:
-        dashboard: ${SENTINEL_DASHBOARD_HOST:5.180.253.115}:${SENTINEL_DASHBOARD_PORT:8080}
-        port: ${SPRING_CLOUD_SENTINEL_TRANSPORT_PORT:8725}
-        client-ip: ${SPRING_CLOUD_SENTINEL_TRANSPORT_CLIENT_IP:}
-      eager: true
-
-  datasource:
-    driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://${MYSQL_HOST:5.180.253.115}:${MYSQL_PORT:3306}/video_admin?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
-    username: ${MYSQL_USERNAME:root}
-    password: ${MYSQL_PASSWORD:sty@G458221}
-    hikari:
-      minimum-idle: 5
-      maximum-pool-size: 20
-      idle-timeout: 30000
-      max-lifetime: 1200000
-      connection-timeout: 30000
-      connection-test-query: SELECT 1
-
-  data:
-    redis:
-      password: ${REDIS_PASSWORD:redis_EsJ8FX}
-      database: 5
-      timeout: 10000
-      lettuce:
-        pool:
-          max-active: 200
-          max-wait: -1
-          max-idle: 10
-          min-idle: 0
-
-mybatis-plus:
-  mapper-locations: classpath:mapper/*.xml
-  type-aliases-package: com.nuaa.video.admin.entity
-  configuration:
-    map-underscore-to-camel-case: true
-    cache-enabled: false
-    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
-  global-config:
-    db-config:
-      id-type: auto
-      logic-delete-field: status
-      logic-delete-value: 0
-      logic-not-delete-value: 1
-
-# JWT配置
-jwt:
-  secret: video-platform-admin-secret-key-2024-nuaa
-  expiration: 86400 # 24小时
-  token-header: Authorization
-  token-prefix: "Bearer "
-
-# 登录配置
-login:
-  # 最大重试次数
-  retry-count: 5
-  # 锁定时间（分钟）
-  lock-time: 30
-
-# 操作日志配置
-operation-log:
-  enabled: true
-  exclude-paths:
-    - /admin/auth/login
-    - /admin/auth/logout
-    - /admin/auth/captcha
-    - /actuator/**

 management:
  endpoints:
@@ -102,17 +36,3 @@ management:
  endpoint:
    health:
      show-details: always
-
-feign:
-  client:
-    config:
-      default:
-        connectTimeout: 5000
-        readTimeout: 5000
-  circuitbreaker:
-    enabled: true
-
-logging:
-  level:
-    com.nuaa.video: info
-    org.springframework.security: info