From 22b10cd112f1744e83ce32575bba2b4f640be791 Mon Sep 17 00:00:00 2001
From: lingyuzeng <pylyzeng@gmail.com>
Date: Thu, 2 Oct 2025 22:48:20 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20NL=20=E9=98=B2=E6=AD=A2?=
 =?UTF-8?q?=E6=8D=A2=E8=A1=8C=E6=9C=89=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env         |  2 +-
 registrar.sh | 45 ++++++++++++++++++++++++++++-----------------
 2 files changed, 29 insertions(+), 18 deletions(-)

diff --git a/.env b/.env
index eaddbb6..ac096eb 100644
--- a/.env
+++ b/.env
@@ -20,4 +20,4 @@ DEREG_AFTER=1m
 # === Traefik 入口 & 证书解析器（与云端对应）===
 TRAEFIK_HTTP_ENTRYPOINT=websecure
 TRAEFIK_TCP_ENTRYPOINT=tcp
-TRAEFIK_CERT_RESOLVER=cf   # 或 alidns
+TRAEFIK_CERT_RESOLVER=alidns   # 或 alidns
diff --git a/registrar.sh b/registrar.sh
index d43d8c4..f7445ee 100755
--- a/registrar.sh
+++ b/registrar.sh
@@ -29,27 +29,38 @@ done
 
 ID="${SERVICE_NAME}-${SERVICE_ADDR}-${SERVICE_PORT}"
 
-# 组装 Traefik tags（ConsulCatalog）
+# 组装 Traefik tags（按“行”累加，避免值中逗号被拆）
+NL='
+'
 TAGS="traefik.enable=true"
+
 if [ "$SERVICE_PROTOCOL" = "http" ]; then
-  TAGS="$TAGS,traefik.http.routers.${SERVICE_NAME}.rule=Host(\`${ROUTE_HOST}\`)"
-  TAGS="$TAGS,traefik.http.routers.${SERVICE_NAME}.entrypoints=${TRAEFIK_HTTP_ENTRYPOINT}"
-  TAGS="$TAGS,traefik.http.routers.${SERVICE_NAME}.tls=true"
-  TAGS="$TAGS,traefik.http.services.${SERVICE_NAME}.loadbalancer.server.scheme=http"
-  TAGS="$TAGS,traefik.http.services.${SERVICE_NAME}.loadbalancer.server.port=${SERVICE_PORT}"
-  # 可选：应用云端 dynamic.yml 的中间件
-  TAGS="$TAGS,traefik.http.routers.${SERVICE_NAME}.middlewares=gzip-all@file,security-headers@file"
+  TAGS="$TAGS${NL}traefik.http.routers.${SERVICE_NAME}.rule=Host(\`${ROUTE_HOST}\`)"
+  TAGS="$TAGS${NL}traefik.http.routers.${SERVICE_NAME}.entrypoints=${TRAEFIK_HTTP_ENTRYPOINT}"
+  TAGS="$TAGS${NL}traefik.http.routers.${SERVICE_NAME}.tls=true"
+  TAGS="$TAGS${NL}traefik.http.services.${SERVICE_NAME}.loadbalancer.server.scheme=http"
+  TAGS="$TAGS${NL}traefik.http.services.${SERVICE_NAME}.loadbalancer.server.port=${SERVICE_PORT}"
+  # 抢占路由：给当前 Host 的 router 设置更高优先级
+  TAGS="$TAGS${NL}traefik.http.routers.${SERVICE_NAME}.priority=10000"
+  # 可选中间件（注意：值里有逗号也安全）
+  TAGS="$TAGS${NL}traefik.http.routers.${SERVICE_NAME}.middlewares=gzip-all@file,security-headers@file"
+  # 如需 ACME 证书解析器可再加一行（取消注释）
+  # TAGS="$TAGS${NL}traefik.http.routers.${SERVICE_NAME}.tls.certresolver=${TRAEFIK_CERT_RESOLVER}"
 elif [ "$SERVICE_PROTOCOL" = "tcp" ]; then
-  TAGS="$TAGS,traefik.tcp.routers.${SERVICE_NAME}.rule=HostSNI(\`${ROUTE_HOST}\`)"
-  TAGS="$TAGS,traefik.tcp.routers.${SERVICE_NAME}.entrypoints=${TRAEFIK_TCP_ENTRYPOINT}"
-  TAGS="$TAGS,traefik.tcp.services.${SERVICE_NAME}.loadbalancer.server.port=${SERVICE_PORT}"
+  TAGS="$TAGS${NL}traefik.tcp.routers.${SERVICE_NAME}.rule=HostSNI(\`${ROUTE_HOST}\`)"
+  TAGS="$TAGS${NL}traefik.tcp.routers.${SERVICE_NAME}.entrypoints=${TRAEFIK_TCP_ENTRYPOINT}"
+  TAGS="$TAGS${NL}traefik.tcp.services.${SERVICE_NAME}.loadbalancer.server.port=${SERVICE_PORT}"
 else
   echo "unsupported SERVICE_PROTOCOL=$SERVICE_PROTOCOL" >&2; exit 2
 fi
 
-# 转 JSON 数组（按逗号拆分）
-to_json_array() { echo "$1" | awk -v RS=, 'NF{print "\""$0"\""}' | paste -sd, - | sed 's/^/[/' | sed 's/$/]/'; }
-TAGS_JSON="$(to_json_array "$TAGS")"
+# 转 JSON 数组（按“行”解析）
+to_json_array() {
+  # 逐行 -> trim -> "..." -> [ ... ]
+  awk 'BEGIN{RS="\n"} NF {gsub(/^[ \t]+|[ \t]+$/,""); printf "\"%s\",\n",$0}' |
+  sed '1s/^/[/' | sed '$s/,\s*$/]/'
+}
+TAGS_JSON="$(printf "%s" "$TAGS" | to_json_array)"
 
 # 健康检查 JSON
 if [ "$CHECK_TYPE" = "http" ]; then
@@ -64,12 +75,12 @@ EOF
 )
 fi
 
-# 写 service 定义并注册到"云端" Consul Server
+# 写 service 定义并注册到云端 Consul
 cat > /tmp/svc.json <<EOF
 {"service":{"id":"${ID}","name":"${SERVICE_NAME}","address":"${SERVICE_ADDR}","port":${SERVICE_PORT},"tags":${TAGS_JSON},"checks":[${CHECK_JSON}]}}
 EOF
 
-echo "[registrar] register ${ID} -\u003e ${CONSUL}"
+echo "[registrar] register ${ID} -> ${CONSUL}"
 consul services register -http-addr="$CONSUL" /tmp/svc.json
 
 term() {
@@ -79,4 +90,4 @@ term() {
 }
 trap term TERM INT
 
-tail -f /dev/null
\ No newline at end of file
+tail -f /dev/null