From b9e7b5f21c71c6aa261e9e693f803d02fd465a46 Mon Sep 17 00:00:00 2001
From: liutao <790864623@qq.com>
Date: Mon, 22 Jun 2026 10:25:24 +0800
Subject: [PATCH 01/10] fix: remove UTF-8 BOM from nginx-inner.conf, add
 resolver for runtime DNS

---
 nginx-inner.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nginx-inner.conf b/nginx-inner.conf
index 02bb6629..5edca8e7 100644
--- a/nginx-inner.conf
+++ b/nginx-inner.conf
@@ -1,4 +1,4 @@
-server {
+server {
     listen 8088;
     server_name localhost;
 

From 4056b36c89c9b9492f1629db2f5fad7157bb100c Mon Sep 17 00:00:00 2001
From: liutao <790864623@qq.com>
Date: Mon, 22 Jun 2026 10:35:59 +0800
Subject: [PATCH 02/10] update

---
 nginx-inner.conf | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/nginx-inner.conf b/nginx-inner.conf
index 5edca8e7..60747051 100644
--- a/nginx-inner.conf
+++ b/nginx-inner.conf
@@ -23,8 +23,7 @@ server {
     # 如果 inner 环境的后端服务名不同，比如叫 besure-server-inner
     # 就把下面的 proxy_pass 改成对应的服务名或IP
     location /admin-api-inner/ {
-        set $upstream_besure http://besure-server-inner:48081;
-        proxy_pass $upstream_besure;
+        proxy_pass http://besure-server-inner:48081;  # 👈 这里改！
         proxy_set_header Host $host;
         proxy_set_header X-Real-IP $remote_addr;
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;

From 75f7c1caeddde7ff5abf5734a830130c90e27564 Mon Sep 17 00:00:00 2001
From: liutao <790864623@qq.com>
Date: Mon, 22 Jun 2026 11:16:37 +0800
Subject: [PATCH 03/10] update

---
 Dockerfile       | 19 +++++++++++--------
 nginx-inner.conf | 31 ++++++++++++++++++++-----------
 2 files changed, 31 insertions(+), 19 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 2d223969..d9a7a8c7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-# 使用轻量级的 Nginx 镜像
+# 使用轻量级的 Nginx 镜像
 FROM nginx:alpine
 
 ARG NGINX_CONF=nginx.conf
@@ -10,12 +10,15 @@ COPY dist /usr/share/nginx/html
 
 EXPOSE 8088
 
-
-# 创建启动脚本
-RUN echo -e '#!/bin/sh\n\
-echo "Waiting for MySQL/Redis/MinIO to start..."\n\
-sleep 15\n\
-nginx -g "daemon off;"' > /start.sh && \
+# 安装 getent 依赖（Alpine 自带）
+# 创建启动脚本：轮询等待后端 DNS 解析成功后再启动 nginx
+RUN printf "#!/bin/sh\n\
+echo \"Waiting for upstream besure-server-inner to resolve...\"\n\
+while ! getent hosts besure-server-inner > /dev/null 2>&1; do\n\
+  sleep 2\n\
+done\n\
+echo \"Upstream resolved! Starting nginx...\"\n\
+nginx -g \"daemon off;\"\n" > /start.sh && \
     chmod +x /start.sh
 
-CMD ["/start.sh"]
\ No newline at end of file
+CMD ["/start.sh"]
diff --git a/nginx-inner.conf b/nginx-inner.conf
index 60747051..388e0abc 100644
--- a/nginx-inner.conf
+++ b/nginx-inner.conf
@@ -1,4 +1,4 @@
-server {
+server {
     listen 8088;
     server_name localhost;
 
@@ -23,7 +23,8 @@ server {
     # 如果 inner 环境的后端服务名不同，比如叫 besure-server-inner
     # 就把下面的 proxy_pass 改成对应的服务名或IP
     location /admin-api-inner/ {
-        proxy_pass http://besure-server-inner:48081;  # 👈 这里改！
+        set $backend_inner "http://besure-server-inner:48081";
+        proxy_pass $backend_inner;
         proxy_set_header Host $host;
         proxy_set_header X-Real-IP $remote_addr;
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
@@ -35,7 +36,8 @@ server {
 
     # 如果 inner 环境还需要访问原 /admin-api/，可以保留
     location /admin-api/ {
-        proxy_pass http://besure-server:48081;  # 👈 原生产后端
+        set $backend_server "http://besure-server:48081";
+        proxy_pass $backend_server;
         proxy_set_header Host $host;
         proxy_set_header X-Real-IP $remote_addr;
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
@@ -47,7 +49,8 @@ server {
 
     # 其他路径保持不变
     location /api/ {
-        proxy_pass http://besure-server:48081;
+        set $backend_server "http://besure-server:48081";
+        proxy_pass $backend_server;
         proxy_set_header Host $host;
         proxy_set_header X-Real-IP $remote_addr;
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
@@ -58,7 +61,8 @@ server {
     }
 
     location /jmreport/ {
-        proxy_pass http://besure-server:48081;
+        set $backend_server "http://besure-server:48081";
+        proxy_pass $backend_server;
         proxy_set_header Host $host;
         proxy_set_header X-Real-IP $remote_addr;
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
@@ -69,7 +73,8 @@ server {
     }
 
     location /v3/api-docs/ {
-        proxy_pass http://besure-server:48081;
+        set $backend_server "http://besure-server:48081";
+        proxy_pass $backend_server;
         proxy_set_header Host $host;
         proxy_set_header X-Real-IP $remote_addr;
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
@@ -80,7 +85,8 @@ server {
     }
 
     location /doc.html {
-        proxy_pass http://besure-server:48081;
+        set $backend_server "http://besure-server:48081";
+        proxy_pass $backend_server;
         proxy_set_header Host $host;
         proxy_set_header X-Real-IP $remote_addr;
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
@@ -91,21 +97,24 @@ server {
     }
 
     location /swagger-ui/ {
-        proxy_pass http://besure-server:48081;
+        set $backend_server "http://besure-server:48081";
+        proxy_pass $backend_server;
         proxy_set_header Host $host;
         proxy_set_header X-Real-IP $remote_addr;
     }
 
     # 处理Swagger静态资源
     location /webjars/ {
-        proxy_pass http://besure-server:48081;
+        set $backend_server "http://besure-server:48081";
+        proxy_pass $backend_server;
         proxy_set_header Host $host;
         proxy_set_header X-Real-IP $remote_addr;
     }
 
     # 处理API文档JSON文件
     location ~ /v3/api-docs/.*\.json$ {
-        proxy_pass http://besure-server:48081;
+        set $backend_server "http://besure-server:48081";
+        proxy_pass $backend_server;
         proxy_set_header Host $host;
         proxy_set_header X-Real-IP $remote_addr;
     }
@@ -121,4 +130,4 @@ server {
     location = /50x.html {
         root /usr/share/nginx/html;
     }
-}
\ No newline at end of file
+}

From b3846446034f30fac0855c268ae62248a770ec39 Mon Sep 17 00:00:00 2001
From: liutao <790864623@qq.com>
Date: Mon, 22 Jun 2026 14:22:07 +0800
Subject: [PATCH 04/10] update

---
 Dockerfile | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index d9a7a8c7..0276f9f4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,13 +12,11 @@ EXPOSE 8088
 
 # 安装 getent 依赖（Alpine 自带）
 # 创建启动脚本：轮询等待后端 DNS 解析成功后再启动 nginx
-RUN printf "#!/bin/sh\n\
-echo \"Waiting for upstream besure-server-inner to resolve...\"\n\
-while ! getent hosts besure-server-inner > /dev/null 2>&1; do\n\
-  sleep 2\n\
-done\n\
-echo \"Upstream resolved! Starting nginx...\"\n\
-nginx -g \"daemon off;\"\n" > /start.sh && \
+# 创建启动脚本
+RUN echo -e '#!/bin/sh\n\
+echo "Waiting for MySQL/Redis/MinIO to start..."\n\
+sleep 15\n\
+nginx -g "daemon off;"' > /start.sh && \
     chmod +x /start.sh
 
 CMD ["/start.sh"]

From 9bd36900860ce782583cf3aa8ec9d248f7d6f8b9 Mon Sep 17 00:00:00 2001
From: liutao <790864623@qq.com>
Date: Mon, 22 Jun 2026 14:38:33 +0800
Subject: [PATCH 05/10] update

---
 nginx-inner.conf | 29 ++++++++++-------------------
 1 file changed, 10 insertions(+), 19 deletions(-)

diff --git a/nginx-inner.conf b/nginx-inner.conf
index 388e0abc..eba21c66 100644
--- a/nginx-inner.conf
+++ b/nginx-inner.conf
@@ -1,4 +1,4 @@
-server {
+server {
     listen 8088;
     server_name localhost;
 
@@ -23,8 +23,7 @@
     # 如果 inner 环境的后端服务名不同，比如叫 besure-server-inner
     # 就把下面的 proxy_pass 改成对应的服务名或IP
     location /admin-api-inner/ {
-        set $backend_inner "http://besure-server-inner:48081";
-        proxy_pass $backend_inner;
+        proxy_pass http://besure-server-inner:48081;  # 👈 这里改！
         proxy_set_header Host $host;
         proxy_set_header X-Real-IP $remote_addr;
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
@@ -36,8 +35,7 @@
 
     # 如果 inner 环境还需要访问原 /admin-api/，可以保留
     location /admin-api/ {
-        set $backend_server "http://besure-server:48081";
-        proxy_pass $backend_server;
+        proxy_pass http://besure-server:48081;  # 👈 原生产后端
         proxy_set_header Host $host;
         proxy_set_header X-Real-IP $remote_addr;
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
@@ -49,8 +47,7 @@
 
     # 其他路径保持不变
     location /api/ {
-        set $backend_server "http://besure-server:48081";
-        proxy_pass $backend_server;
+        proxy_pass http://besure-server:48081;  # 👈 原生产后端
         proxy_set_header Host $host;
         proxy_set_header X-Real-IP $remote_addr;
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
@@ -61,8 +58,7 @@
     }
 
     location /jmreport/ {
-        set $backend_server "http://besure-server:48081";
-        proxy_pass $backend_server;
+        proxy_pass http://besure-server:48081;  # 👈 原生产后端
         proxy_set_header Host $host;
         proxy_set_header X-Real-IP $remote_addr;
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
@@ -73,8 +69,7 @@
     }
 
     location /v3/api-docs/ {
-        set $backend_server "http://besure-server:48081";
-        proxy_pass $backend_server;
+        proxy_pass http://besure-server:48081;  # 👈 原生产后端
         proxy_set_header Host $host;
         proxy_set_header X-Real-IP $remote_addr;
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
@@ -85,8 +80,7 @@
     }
 
     location /doc.html {
-        set $backend_server "http://besure-server:48081";
-        proxy_pass $backend_server;
+        proxy_pass http://besure-server:48081;  # 👈 原生产后端
         proxy_set_header Host $host;
         proxy_set_header X-Real-IP $remote_addr;
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
@@ -97,24 +91,21 @@
     }
 
     location /swagger-ui/ {
-        set $backend_server "http://besure-server:48081";
-        proxy_pass $backend_server;
+        proxy_pass http://besure-server:48081;  # 👈 原生产后端
         proxy_set_header Host $host;
         proxy_set_header X-Real-IP $remote_addr;
     }
 
     # 处理Swagger静态资源
     location /webjars/ {
-        set $backend_server "http://besure-server:48081";
-        proxy_pass $backend_server;
+        proxy_pass http://besure-server:48081;  # 👈 原生产后端
         proxy_set_header Host $host;
         proxy_set_header X-Real-IP $remote_addr;
     }
 
     # 处理API文档JSON文件
     location ~ /v3/api-docs/.*\.json$ {
-        set $backend_server "http://besure-server:48081";
-        proxy_pass $backend_server;
+        proxy_pass http://besure-server:48081;  # 👈 原生产后端
         proxy_set_header Host $host;
         proxy_set_header X-Real-IP $remote_addr;
     }

From b4bf99db9c4e017b9713bca91bc66077d6d3372a Mon Sep 17 00:00:00 2001
From: liutao <790864623@qq.com>
Date: Mon, 22 Jun 2026 15:17:32 +0800
Subject: [PATCH 06/10] update

---
 nginx-inner.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nginx-inner.conf b/nginx-inner.conf
index eba21c66..fd44445b 100644
--- a/nginx-inner.conf
+++ b/nginx-inner.conf
@@ -23,7 +23,7 @@ server {
     # 如果 inner 环境的后端服务名不同，比如叫 besure-server-inner
     # 就把下面的 proxy_pass 改成对应的服务名或IP
     location /admin-api-inner/ {
-        proxy_pass http://besure-server-inner:48081;  # 👈 这里改！
+        proxy_pass http://besure_server_inner:48081;  # 👈 这里改！
         proxy_set_header Host $host;
         proxy_set_header X-Real-IP $remote_addr;
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;

From 40188f309434c5f5474bb75d0e41f998dbaf32de Mon Sep 17 00:00:00 2001
From: liutao <790864623@qq.com>
Date: Mon, 22 Jun 2026 15:25:30 +0800
Subject: [PATCH 07/10] update

---
 nginx-inner.conf | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/nginx-inner.conf b/nginx-inner.conf
index fd44445b..a842eddb 100644
--- a/nginx-inner.conf
+++ b/nginx-inner.conf
@@ -35,7 +35,7 @@ server {
 
     # 如果 inner 环境还需要访问原 /admin-api/，可以保留
     location /admin-api/ {
-        proxy_pass http://besure-server:48081;  # 👈 原生产后端
+        proxy_pass http://besure_server_inner-server:48081;  # 👈 原生产后端
         proxy_set_header Host $host;
         proxy_set_header X-Real-IP $remote_addr;
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
@@ -47,7 +47,7 @@ server {
 
     # 其他路径保持不变
     location /api/ {
-        proxy_pass http://besure-server:48081;  # 👈 原生产后端
+        proxy_pass http://besure_server_inner:48081;  # 👈 原生产后端
         proxy_set_header Host $host;
         proxy_set_header X-Real-IP $remote_addr;
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
@@ -58,7 +58,7 @@ server {
     }
 
     location /jmreport/ {
-        proxy_pass http://besure-server:48081;  # 👈 原生产后端
+        proxy_pass http://besure_server_inner:48081;  # 👈 原生产后端
         proxy_set_header Host $host;
         proxy_set_header X-Real-IP $remote_addr;
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
@@ -69,7 +69,7 @@ server {
     }
 
     location /v3/api-docs/ {
-        proxy_pass http://besure-server:48081;  # 👈 原生产后端
+        proxy_pass http://besure_server_inner:48081;  # 👈 原生产后端
         proxy_set_header Host $host;
         proxy_set_header X-Real-IP $remote_addr;
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
@@ -80,7 +80,7 @@ server {
     }
 
     location /doc.html {
-        proxy_pass http://besure-server:48081;  # 👈 原生产后端
+        proxy_pass http://besure_server_inner:48081;  # 👈 原生产后端
         proxy_set_header Host $host;
         proxy_set_header X-Real-IP $remote_addr;
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
@@ -91,21 +91,21 @@ server {
     }
 
     location /swagger-ui/ {
-        proxy_pass http://besure-server:48081;  # 👈 原生产后端
+        proxy_pass http://besure_server_inner:48081;  # 👈 原生产后端
         proxy_set_header Host $host;
         proxy_set_header X-Real-IP $remote_addr;
     }
 
     # 处理Swagger静态资源
     location /webjars/ {
-        proxy_pass http://besure-server:48081;  # 👈 原生产后端
+        proxy_pass http://besure_server_inner:48081;  # 👈 原生产后端
         proxy_set_header Host $host;
         proxy_set_header X-Real-IP $remote_addr;
     }
 
     # 处理API文档JSON文件
     location ~ /v3/api-docs/.*\.json$ {
-        proxy_pass http://besure-server:48081;  # 👈 原生产后端
+        proxy_pass http://besure_server_inner:48081;  # 👈 原生产后端
         proxy_set_header Host $host;
         proxy_set_header X-Real-IP $remote_addr;
     }

From 8fcdfcb852d5351e91d83edb24a6e19a77670a0a Mon Sep 17 00:00:00 2001
From: liutao <790864623@qq.com>
Date: Mon, 22 Jun 2026 15:32:26 +0800
Subject: [PATCH 08/10] update

---
 nginx-inner.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nginx-inner.conf b/nginx-inner.conf
index a842eddb..3fca4b41 100644
--- a/nginx-inner.conf
+++ b/nginx-inner.conf
@@ -35,7 +35,7 @@ server {
 
     # 如果 inner 环境还需要访问原 /admin-api/，可以保留
     location /admin-api/ {
-        proxy_pass http://besure_server_inner-server:48081;  # 👈 原生产后端
+        proxy_pass http://besure_server_inner:48081;  # 👈 原生产后端
         proxy_set_header Host $host;
         proxy_set_header X-Real-IP $remote_addr;
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;

From 648dc3b52479aa62cc7e06bfe5a60ad1b44fca72 Mon Sep 17 00:00:00 2001
From: liutao <790864623@qq.com>
Date: Mon, 22 Jun 2026 17:57:41 +0800
Subject: [PATCH 09/10] update

---
 .env.inner       | 2 +-
 nginx-inner.conf | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.env.inner b/.env.inner
index 3a78ec70..bb6ff5bd 100644
--- a/.env.inner
+++ b/.env.inner
@@ -15,7 +15,7 @@ VITE_UPLOAD_URL=/admin-api/infra/file/upload
 # 接口地址
 # 【修改点】这里改成一个内部域名或IP，例如 http://192.168.1.100:8080
 # 如果前端和后端在同一个 Docker 网络，也可以用内部服务名，比如 http://besure-server-inner:48081
-VITE_API_URL=/admin-api-inner
+VITE_API_URL=/admin-api
 
 # 是否删除debugger
 VITE_DROP_DEBUGGER=true
diff --git a/nginx-inner.conf b/nginx-inner.conf
index 3fca4b41..6412b328 100644
--- a/nginx-inner.conf
+++ b/nginx-inner.conf
@@ -22,7 +22,7 @@ server {
 
     # 如果 inner 环境的后端服务名不同，比如叫 besure-server-inner
     # 就把下面的 proxy_pass 改成对应的服务名或IP
-    location /admin-api-inner/ {
+    location /admin-api/ {
         proxy_pass http://besure_server_inner:48081;  # 👈 这里改！
         proxy_set_header Host $host;
         proxy_set_header X-Real-IP $remote_addr;

From ab99ca64fec6e87b55a0b8b12bb79d9036d2e51c Mon Sep 17 00:00:00 2001
From: liutao <790864623@qq.com>
Date: Mon, 22 Jun 2026 18:06:34 +0800
Subject: [PATCH 10/10] update

---
 nginx-inner.conf | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/nginx-inner.conf b/nginx-inner.conf
index 6412b328..7e5d6e20 100644
--- a/nginx-inner.conf
+++ b/nginx-inner.conf
@@ -33,18 +33,6 @@ server {
         proxy_set_header Connection "upgrade";
     }
 
-    # 如果 inner 环境还需要访问原 /admin-api/，可以保留
-    location /admin-api/ {
-        proxy_pass http://besure_server_inner:48081;  # 👈 原生产后端
-        proxy_set_header Host $host;
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header X-Forwarded-Proto $scheme;
-        proxy_http_version 1.1;
-        proxy_set_header Upgrade $http_upgrade;
-        proxy_set_header Connection "upgrade";
-    }
-
     # 其他路径保持不变
     location /api/ {
         proxy_pass http://besure_server_inner:48081;  # 👈 原生产后端