From e01960b35881958c5c36c37999857de86550f4d7 Mon Sep 17 00:00:00 2001
From: Toyas <toyasovo@gmail.com>
Date: Tue, 17 Mar 2026 16:06:38 +0800
Subject: [PATCH] fix(config): Complete Redis high availability fixes

---
 video-admin/src/main/resources/application-ha.yml     | 3 +++
 video-auth/src/main/resources/application-ha.yml      | 3 +++
 video-comment/src/main/resources/application-ha.yml   | 3 +++
 video-content/src/main/resources/application-ha.yml   | 3 +++
 video-recommend/src/main/resources/application-ha.yml | 3 +++
 video-user/src/main/resources/application-ha.yml      | 3 +++
 6 files changed, 18 insertions(+)

diff --git a/video-admin/src/main/resources/application-ha.yml b/video-admin/src/main/resources/application-ha.yml
index 26fb153..49c8166 100644
--- a/video-admin/src/main/resources/application-ha.yml
+++ b/video-admin/src/main/resources/application-ha.yml
@@ -42,6 +42,9 @@ 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-auth/src/main/resources/application-ha.yml b/video-auth/src/main/resources/application-ha.yml
index 34a5f4b..0fbe774 100644
--- a/video-auth/src/main/resources/application-ha.yml
+++ b/video-auth/src/main/resources/application-ha.yml
@@ -42,6 +42,9 @@ spring:
       maximum-pool-size: 20
   data:
     redis:
+      # 显式清空单机配置，防止与 application.yml 合并时冲突
+      host:
+      port:
       # Redis Sentinel 高可用配置
       password: ${REDIS_PASSWORD:redis_HA_Cluster_2024}
       database: 0
diff --git a/video-comment/src/main/resources/application-ha.yml b/video-comment/src/main/resources/application-ha.yml
index 849bdad..9c43dad 100644
--- a/video-comment/src/main/resources/application-ha.yml
+++ b/video-comment/src/main/resources/application-ha.yml
@@ -42,6 +42,9 @@ 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-content/src/main/resources/application-ha.yml b/video-content/src/main/resources/application-ha.yml
index e0f5330..64fd046 100644
--- a/video-content/src/main/resources/application-ha.yml
+++ b/video-content/src/main/resources/application-ha.yml
@@ -42,6 +42,9 @@ 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-recommend/src/main/resources/application-ha.yml b/video-recommend/src/main/resources/application-ha.yml
index cb67149..da7301f 100644
--- a/video-recommend/src/main/resources/application-ha.yml
+++ b/video-recommend/src/main/resources/application-ha.yml
@@ -42,6 +42,9 @@ 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-user/src/main/resources/application-ha.yml b/video-user/src/main/resources/application-ha.yml
index 93b81d9..dabc867 100644
--- a/video-user/src/main/resources/application-ha.yml
+++ b/video-user/src/main/resources/application-ha.yml
@@ -42,6 +42,9 @@ spring:
       maximum-pool-size: 20
   data:
     redis:
+      # 显式清空单机配置，防止与 application.yml 合并时冲突
+      host:
+      port:
       password: ${REDIS_PASSWORD:redis_HA_Cluster_2024}
       database: 1
       timeout: 10000