From 7d04804799039c3705f51f90ac22165603b4c45f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=99=E5=B0=8F=E4=BA=91?= <sunpengchina85@gmail.com>
Date: Mon, 26 May 2025 09:42:53 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=89=88=E6=9C=AC=E7=9A=84?=
 =?UTF-8?q?=E6=8E=A7=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 environment.sh                | 34 ++++++++++++++++++----------------
 nginx/replace_vars.sh         |  1 +
 nginx/vhosts/oidcservice.conf |  2 +-
 3 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/environment.sh b/environment.sh
index a4cb7cf..09850bf 100644
--- a/environment.sh
+++ b/environment.sh
@@ -38,22 +38,6 @@ else
     echo "环境变量 DOMAIN_END 已设置，设置为 ${DOMAIN_END}"
 fi
 
-export SKYWALKING_UI_DOMAIN=sky-${DOMAIN}.${DOMAIN_END}
-export CONSUL_DOMAIN=consul-${DOMAIN}.${DOMAIN_END}
-export XXLJOB_DOMAIN=xxljob-${DOMAIN}.${DOMAIN_END}
-export OIDC_SERVER_DOMAIN=oidc-${DOMAIN}.${DOMAIN_END}
-export MINIO_DOMAIN=minio-${DOMAIN}.${DOMAIN_END}
-export MINIO_CONSOLE_DOMAIN=minioconsole-${DOMAIN}.${DOMAIN_END}
-export AIRPORT_DOMAIN=airport-${DOMAIN}.${DOMAIN_END}
-export SRS_DOMAIN=srs-${DOMAIN}.${DOMAIN_END}
-export HHZ_DOMAIN=hhz-${DOMAIN}.${DOMAIN_END}
-export DSP_DOMAIN=dsp-${DOMAIN}.${DOMAIN_END}
-export REGISTRY_HOST=${REGISTRY}/tuoheng/
-
-
-#Nginx 配置
-export NGINX_NAME=NGINX_${DOMAIN}
-export NGINX_IMAGE=${REGISTRY_HOST}nginx:${DOMAIN}${VERSION}
 # 主机对外爆露的HTTP端口
 if [ -z "$NGINX_HTTP_PORT" ]; then
     export NGINX_HTTP_PORT=8899
@@ -66,6 +50,24 @@ if [ -z "$NGINX_HTTPS_PORT" ]; then
 else
     echo "环境变量 NGINX_HTTPS_PORT 已设置，设置为 ${NGINX_HTTPS_PORT}"
 fi
+
+export SKYWALKING_UI_DOMAIN=sky-${DOMAIN}.${DOMAIN_END}
+export CONSUL_DOMAIN=consul-${DOMAIN}.${DOMAIN_END}
+export XXLJOB_DOMAIN=xxljob-${DOMAIN}.${DOMAIN_END}
+export OIDC_SERVER_DOMAIN=oidc-${DOMAIN}.${DOMAIN_END}
+export OIDC_DOMAIN_FULL=${OIDC_SERVER_DOMAIN}:${NGINX_HTTPS_PORT}
+export MINIO_DOMAIN=minio-${DOMAIN}.${DOMAIN_END}
+export MINIO_CONSOLE_DOMAIN=minioconsole-${DOMAIN}.${DOMAIN_END}
+export AIRPORT_DOMAIN=airport-${DOMAIN}.${DOMAIN_END}
+export SRS_DOMAIN=srs-${DOMAIN}.${DOMAIN_END}
+export HHZ_DOMAIN=hhz-${DOMAIN}.${DOMAIN_END}
+export DSP_DOMAIN=dsp-${DOMAIN}.${DOMAIN_END}
+export REGISTRY_HOST=${REGISTRY}/tuoheng/
+
+
+#Nginx 配置
+export NGINX_NAME=NGINX_${DOMAIN}
+export NGINX_IMAGE=${REGISTRY_HOST}nginx:${DOMAIN}${VERSION}
 export NGINX_MEMORY=256m
 
 #MySql 配置 
diff --git a/nginx/replace_vars.sh b/nginx/replace_vars.sh
index 510daf9..29bca22 100755
--- a/nginx/replace_vars.sh
+++ b/nginx/replace_vars.sh
@@ -50,6 +50,7 @@ for conf_file in vhosts/*.conf; do
         if [ ! -z "$var_value" ]; then
             # 使用更安全的变量替换方法
             pattern="\\\${$var_name}"
+            
             # 转义特殊字符
             escaped_value=$(echo "$var_value" | sed 's/[\/&]/\\&/g')
             echo "  替换变量: ${pattern} -> $var_value"
diff --git a/nginx/vhosts/oidcservice.conf b/nginx/vhosts/oidcservice.conf
index e2fb45c..457b4f9 100644
--- a/nginx/vhosts/oidcservice.conf
+++ b/nginx/vhosts/oidcservice.conf
@@ -19,6 +19,6 @@ server {
         proxy_set_header X-Forwarded-Proto $scheme;
         
         # 只添加这一行来修复重定向
-        proxy_redirect http://${OIDC_SERVER_DOMAIN} https://${OIDC_SERVER_DOMAIN}:${NGINX_HTTPS_PORT};
+        proxy_redirect http://${OIDC_SERVER_DOMAIN} https://${OIDC_DOMAIN_FULL};
     }
 }