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/Dockerfile b/Dockerfile index 2d223969..0276f9f4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -# 使用轻量级的 Nginx 镜像 +# 使用轻量级的 Nginx 镜像 FROM nginx:alpine ARG NGINX_CONF=nginx.conf @@ -10,7 +10,8 @@ COPY dist /usr/share/nginx/html EXPOSE 8088 - +# 安装 getent 依赖(Alpine 自带) +# 创建启动脚本:轮询等待后端 DNS 解析成功后再启动 nginx # 创建启动脚本 RUN echo -e '#!/bin/sh\n\ echo "Waiting for MySQL/Redis/MinIO to start..."\n\ @@ -18,4 +19,4 @@ sleep 15\n\ nginx -g "daemon off;"' > /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 02bb6629..7e5d6e20 100644 --- a/nginx-inner.conf +++ b/nginx-inner.conf @@ -1,4 +1,4 @@ -server { +server { listen 8088; server_name localhost; @@ -22,21 +22,8 @@ # 如果 inner 环境的后端服务名不同,比如叫 besure-server-inner # 就把下面的 proxy_pass 改成对应的服务名或IP - location /admin-api-inner/ { - set $upstream_besure http://besure-server-inner:48081; - proxy_pass $upstream_besure; - 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"; - } - - # 如果 inner 环境还需要访问原 /admin-api/,可以保留 location /admin-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; @@ -48,7 +35,7 @@ # 其他路径保持不变 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; @@ -59,7 +46,7 @@ } 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; @@ -70,7 +57,7 @@ } 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; @@ -81,7 +68,7 @@ } 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; @@ -92,21 +79,21 @@ } 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; } @@ -122,4 +109,4 @@ location = /50x.html { root /usr/share/nginx/html; } -} \ No newline at end of file +}