diff --git a/video-admin/src/main/resources/application-ha.yml b/video-admin/src/main/resources/application-ha.yml index 49c8166..26fb153 100644 --- a/video-admin/src/main/resources/application-ha.yml +++ b/video-admin/src/main/resources/application-ha.yml @@ -42,9 +42,6 @@ spring: maximum-pool-size: 20 data: redis: - # 显式清空单机配置,防止与 application.yml 合并时冲突 - host: - port: password: ${REDIS_PASSWORD:redis_HA_Cluster_2024} database: 5 timeout: 10000 diff --git a/video-admin/src/main/resources/application.yml b/video-admin/src/main/resources/application.yml index 4c5ca73..07ea759 100644 --- a/video-admin/src/main/resources/application.yml +++ b/video-admin/src/main/resources/application.yml @@ -47,8 +47,6 @@ spring: data: redis: - host: ${REDIS_HOST:5.180.253.115} - port: ${REDIS_PORT:6379} password: ${REDIS_PASSWORD:redis_EsJ8FX} database: 5 timeout: 10000 diff --git a/video-auth/src/main/resources/application-ha.yml b/video-auth/src/main/resources/application-ha.yml index 0fbe774..1816045 100644 --- a/video-auth/src/main/resources/application-ha.yml +++ b/video-auth/src/main/resources/application-ha.yml @@ -42,17 +42,11 @@ spring: maximum-pool-size: 20 data: redis: - # 显式清空单机配置,防止与 application.yml 合并时冲突 - host: - port: - # Redis Sentinel 高可用配置 password: ${REDIS_PASSWORD:redis_HA_Cluster_2024} database: 0 timeout: 10000 sentinel: - # Sentinel master 名称,与 sentinel.conf 中配置的 mymaster 一致 master: mymaster - # Sentinel 节点列表 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: diff --git a/video-auth/src/main/resources/application.yml b/video-auth/src/main/resources/application.yml index 5007021..eef3cdf 100644 --- a/video-auth/src/main/resources/application.yml +++ b/video-auth/src/main/resources/application.yml @@ -57,8 +57,6 @@ spring: data: redis: - host: ${REDIS_HOST:5.180.253.115} - port: ${REDIS_PORT:6379} password: ${REDIS_PASSWORD:redis_EsJ8FX} database: 0 timeout: 10000 diff --git a/video-comment/src/main/resources/application-ha.yml b/video-comment/src/main/resources/application-ha.yml index 9c43dad..849bdad 100644 --- a/video-comment/src/main/resources/application-ha.yml +++ b/video-comment/src/main/resources/application-ha.yml @@ -42,9 +42,6 @@ spring: maximum-pool-size: 20 data: redis: - # 显式清空单机配置,防止与 application.yml 合并时冲突 - host: - port: password: ${REDIS_PASSWORD:redis_HA_Cluster_2024} database: 3 timeout: 10000 diff --git a/video-comment/src/main/resources/application.yml b/video-comment/src/main/resources/application.yml index 790abcc..ad30b47 100644 --- a/video-comment/src/main/resources/application.yml +++ b/video-comment/src/main/resources/application.yml @@ -47,8 +47,6 @@ spring: data: redis: - host: ${REDIS_HOST:5.180.253.115} - port: ${REDIS_PORT:6379} password: ${REDIS_PASSWORD:redis_EsJ8FX} database: 3 timeout: 10000 diff --git a/video-content/src/main/resources/application-ha.yml b/video-content/src/main/resources/application-ha.yml index 64fd046..e0f5330 100644 --- a/video-content/src/main/resources/application-ha.yml +++ b/video-content/src/main/resources/application-ha.yml @@ -42,9 +42,6 @@ spring: maximum-pool-size: 20 data: redis: - # 显式清空单机配置,防止与 application.yml 合并时冲突 - host: - port: password: ${REDIS_PASSWORD:redis_HA_Cluster_2024} database: 2 timeout: 10000 diff --git a/video-content/src/main/resources/application.yml b/video-content/src/main/resources/application.yml index e11435f..a7bd39a 100644 --- a/video-content/src/main/resources/application.yml +++ b/video-content/src/main/resources/application.yml @@ -47,8 +47,6 @@ spring: data: redis: - host: ${REDIS_HOST:5.180.253.115} - port: ${REDIS_PORT:6379} password: ${REDIS_PASSWORD:redis_EsJ8FX} database: 2 timeout: 10000 diff --git a/video-recommend/src/main/resources/application-ha.yml b/video-recommend/src/main/resources/application-ha.yml index da7301f..cb67149 100644 --- a/video-recommend/src/main/resources/application-ha.yml +++ b/video-recommend/src/main/resources/application-ha.yml @@ -42,9 +42,6 @@ spring: maximum-pool-size: 20 data: redis: - # 显式清空单机配置,防止与 application.yml 合并时冲突 - host: - port: password: ${REDIS_PASSWORD:redis_HA_Cluster_2024} database: 4 timeout: 10000 diff --git a/video-recommend/src/main/resources/application.yml b/video-recommend/src/main/resources/application.yml index 396cce5..f69bca9 100644 --- a/video-recommend/src/main/resources/application.yml +++ b/video-recommend/src/main/resources/application.yml @@ -47,8 +47,6 @@ spring: data: redis: - host: ${REDIS_HOST:5.180.253.115} - port: ${REDIS_PORT:6379} password: ${REDIS_PASSWORD:redis_EsJ8FX} database: 4 timeout: 10000 diff --git a/video-user/src/main/resources/application-ha.yml b/video-user/src/main/resources/application-ha.yml index dabc867..93b81d9 100644 --- a/video-user/src/main/resources/application-ha.yml +++ b/video-user/src/main/resources/application-ha.yml @@ -42,9 +42,6 @@ spring: maximum-pool-size: 20 data: redis: - # 显式清空单机配置,防止与 application.yml 合并时冲突 - host: - port: password: ${REDIS_PASSWORD:redis_HA_Cluster_2024} database: 1 timeout: 10000 diff --git a/video-user/src/main/resources/application.yml b/video-user/src/main/resources/application.yml index 1988dbb..ecdfb30 100644 --- a/video-user/src/main/resources/application.yml +++ b/video-user/src/main/resources/application.yml @@ -47,8 +47,6 @@ spring: data: redis: - host: ${REDIS_HOST:5.180.253.115} - port: ${REDIS_PORT:6379} password: ${REDIS_PASSWORD:redis_EsJ8FX} database: 1 timeout: 10000