From 03d713e1cddef21bd1ba6976acb109daa94e9086 Mon Sep 17 00:00:00 2001 From: songguoqiang <765017469@qq.com> Date: Fri, 10 May 2024 11:57:57 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E6=9C=8D=E5=8A=A1=E9=85=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.production | 2 +- .env.test | 10 +++++----- Dockerfile | 6 +++--- nginx.conf | 10 +++++----- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.env.production b/.env.production index edd9cb1..52b32c4 100644 --- a/.env.production +++ b/.env.production @@ -28,7 +28,7 @@ VITE_SOURCEMAP=false VITE_BASE_PATH=/ # 输出路径 -VITE_OUT_DIR=eam +VITE_OUT_DIR=tianhe # 自定义接口路径 VITE_INTERFACE_URL='http://10.62.139.32:80/magic/web/index.html' diff --git a/.env.test b/.env.test index f8d316c..8b3d366 100644 --- a/.env.test +++ b/.env.test @@ -4,10 +4,10 @@ NODE_ENV=test VITE_DEV=false # 请求路径 -VITE_BASE_URL='http://dev.ccwin-in.com:25200/api' +VITE_BASE_URL='http://dev.ccwin-in.com:28020/api' # 上传路径 -VITE_UPLOAD_URL='http://dev.ccwin-in.com:25200/api/admin-api/infra/file/upload' +VITE_UPLOAD_URL='http://dev.ccwin-in.com:28020/api/admin-api/infra/file/upload' # 接口前缀 VITE_API_BASEPATH= @@ -28,10 +28,10 @@ VITE_SOURCEMAP=false VITE_BASE_PATH=/ # 输出路径 -VITE_OUT_DIR=eam +VITE_OUT_DIR=tianhe # 自定义接口路径 -VITE_INTERFACE_URL='http://dev.ccwin-in.com:25210/magic/web/index.html' +VITE_INTERFACE_URL='http://dev.ccwin-in.com:28029/magic/web/index.html' # 积木报表请求路径 -VITE_JMREPORT_BASE_URL='http://dev.ccwin-in.com:25210' +VITE_JMREPORT_BASE_URL='http://dev.ccwin-in.com:28029' diff --git a/Dockerfile b/Dockerfile index 0166bd1..4a5e323 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ # 设置基础镜像 FROM win-nginx -WORKDIR /opt/eam +WORKDIR /opt/tianhe COPY nginx.conf /usr/local/nginx/conf/nginx.conf -# 将dist文件中的内容复制到 /opt/eam 这个目录下面 -COPY eam/ /opt/eam +# 将dist文件中的内容复制到 /opt/tianhe 这个目录下面 +COPY tianhe/ /opt/tianhe diff --git a/nginx.conf b/nginx.conf index d5aa0a2..95303ed 100644 --- a/nginx.conf +++ b/nginx.conf @@ -26,15 +26,15 @@ http { gzip_types text/plain application/javascript text/css application/xml text/javascript image/jpeg image/gif image/png; gzip_vary on; gzip_disable "MSIE [1-6]\."; - upstream eam { - server localhost:25210 weight=10 max_fails=3 fail_timeout=10s; + upstream tianhe { + server localhost:28029 weight=10 max_fails=3 fail_timeout=10s; } server { - listen 25200; + listen 28020; server_name_in_redirect off; server_name dev.ccwin-in.com; location /api/ { - proxy_pass http://eam/; + proxy_pass http://tianhe/; proxy_next_upstream http_500 http_502 http_503 http_504 error timeout invalid_header; proxy_set_header X-Forwared-For $proxy_add_x_forwarded_for; proxy_set_header Host $http_host; @@ -53,7 +53,7 @@ http { proxy_cache_valid 200 304 12h; proxy_cache_key $host$uri$is_args$args; try_files $uri $uri/ /index.html; - root /opt/eam; + root /opt/tianhe; index index.html index.htm; } }