From ef9f38587c61e8fcbe6456907b2d89898b0a93ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8F=8D=E7=BC=96=E8=AF=91=E5=B7=A5=E4=BD=9C=E5=8C=BA?=
 <decompiled@local>
Date: Fri, 1 May 2026 22:55:24 +0800
Subject: [PATCH] fix: use Redis port 6380 to avoid conflict with existing
 ybs-redis on 6379

Former-commit-id: e8adb090f9ed0d0ac1b4845f8271428bc4ddb386
---
 scripts/test-env/config/env.sh            | 2 +-
 scripts/test-env/docker-compose.infra.yml | 2 +-
 scripts/test-env/setup.sh                 | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/test-env/config/env.sh b/scripts/test-env/config/env.sh
index a35e86a3..6513bdd1 100644
--- a/scripts/test-env/config/env.sh
+++ b/scripts/test-env/config/env.sh
@@ -31,7 +31,7 @@ MYSQL_PORT=3307
 MYSQL_USER=root
 MYSQL_PASS=123456
 REDIS_HOST=127.0.0.1
-REDIS_PORT=6379
+REDIS_PORT=6380
 REDIS_PASS="1qaz!QAZ"
 CONSUL_HOST=127.0.0.1
 CONSUL_PORT=8500
diff --git a/scripts/test-env/docker-compose.infra.yml b/scripts/test-env/docker-compose.infra.yml
index 0773759a..ea4c8a1f 100644
--- a/scripts/test-env/docker-compose.infra.yml
+++ b/scripts/test-env/docker-compose.infra.yml
@@ -17,7 +17,7 @@ services:
     container_name: v2test-redis
     restart: unless-stopped
     ports:
-      - "6379:6379"
+      - "6380:6379"
     command: redis-server --requirepass "1qaz!QAZ"
 
   zookeeper:
diff --git a/scripts/test-env/setup.sh b/scripts/test-env/setup.sh
index a6121f98..f76f39c5 100755
--- a/scripts/test-env/setup.sh
+++ b/scripts/test-env/setup.sh
@@ -51,7 +51,7 @@ log_ok "MySQL: $MYSQL_HOST:$MYSQL_PORT OK"
 
 # 端口冲突
 CONFLICT_PORTS=""
-for port in 8500 6379 9092 2181 8090 18080 18081 16106 17011 3721; do
+for port in 8500 6380 9092 2181 8090 18080 18081 16106 17011 3721; do
   if ss -tlnp 2>/dev/null | grep -q ":$port "; then
     CONFLICT_PORTS="$CONFLICT_PORTS $port"
   fi