From 0f16e370eaf2eaeb90abfb781e781786087cff56 Mon Sep 17 00:00:00 2001
From: admin <admin@yunhaixingtong.com>
Date: Mon, 10 Aug 2026 12:34:00 +0800
Subject: [PATCH] ci: deploy with correct Nacos env
 (SPRING_CLOUD_NACOS_CONFIG_NAMESPACE + top-level username/password);
 NACOS_NAMESPACE env name is not resolved by SCA 2.2.4 bootstrap, causing
 empty tenant + 403 (server-url-prefix fell back to bundled, /cas missing)

---
 .gitea/workflows/ci.yml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml
index 428d842..79248c7 100644
--- a/.gitea/workflows/ci.yml
+++ b/.gitea/workflows/ci.yml
@@ -108,9 +108,14 @@ jobs:
           RB=userbase-service:rb-$(date +%s)
           docker tag userbase-service:latest "$RB" 2>/dev/null || true
           docker stop userbase-service 2>/dev/null; docker rm -f userbase-service 2>/dev/null
+          # 注意(SCA 2.2.4 坑): 命名空间必须用标准属性名 SPRING_CLOUD_NACOS_CONFIG_NAMESPACE,
+          # 用 NACOS_NAMESPACE 这个 env 名不会被 bootstrap 的 ${NACOS_NAMESPACE:dev} 解析到(会落 public);
+          # 凭据必须放顶层 SPRING_CLOUD_NACOS_USERNAME/PASSWORD, 放在 spring.cloud.nacos.config.* 下不生效(403)。
           docker run -d --name userbase-service --restart unless-stopped --network infra-infra-net -p 8060:8060 \
             -e NACOS_ADDR=nacos:8848 \
-            -e NACOS_NAMESPACE=6196f0de-a28d-4894-8f10-e2982b57c6bc \
+            -e SPRING_CLOUD_NACOS_CONFIG_NAMESPACE=6196f0de-a28d-4894-8f10-e2982b57c6bc \
+            -e SPRING_CLOUD_NACOS_USERNAME=yh-reader \
+            -e SPRING_CLOUD_NACOS_PASSWORD=123456 \
             "$IMG"
           # 健康检查：Spring 起来后 /userbase/ 返回 404（根路径无映射控制器），000 表示未起来
           OK=0