From 8ad015968fbbd91efbcc8eff7195e5fd73f0a0ad Mon Sep 17 00:00:00 2001 From: simonzhangsz Date: Tue, 3 Dec 2024 09:51:01 +0800 Subject: [PATCH] update docker env --- docker/copy.bat | 8 ++++++-- docker/copy.sh | 6 ++++-- docker/docker-compose.yml | 3 +-- docker/nginx/conf/nginx.conf | 22 ++++++++++++++++++---- docker/nginx/dockerfile | 8 ++++---- docker/nginx/html/dist/readme.txt | 4 +++- 6 files changed, 36 insertions(+), 15 deletions(-) diff --git a/docker/copy.bat b/docker/copy.bat index c59a357..3888669 100644 --- a/docker/copy.bat +++ b/docker/copy.bat @@ -5,8 +5,12 @@ copy ..\sql\wfc-cloud.sql .\mysql\db copy ..\sql\wfc-config.sql .\mysql\db REM 复制 HTML 文件 -echo begin copy html -xcopy /E /I ..\..\fe.wfc\dist\* .\nginx\html\dist +echo begin copy sys html +rmdir /s /q .\nginx\html\dist\sys +xcopy /E /I /Y ..\..\fe.wfc\dist\* .\nginx\html\dist\sys +echo begin copy user html +rmdir /s /q .\nginx\html\dist\u +xcopy /E /I /Y ..\..\fe.wfc.user\dist\* .\nginx\html\dist\u REM 复制 JAR 文件 echo begin copy wfc-gateway diff --git a/docker/copy.sh b/docker/copy.sh index 52248ed..074dbe8 100755 --- a/docker/copy.sh +++ b/docker/copy.sh @@ -13,9 +13,11 @@ cp ../sql/wfc-cloud.sql ./mysql/db cp ../sql/wfc-config.sql ./mysql/db # copy html -echo "begin copy html " -cp -r ../../fe.wfc/dist/** ./nginx/html/dist +echo "begin copy sys html " +cp -rf ../../fe.wfc/dist/** ./nginx/html/dist/sys/ +echo "begin copy user html " +cp -rf ../../fe.wfc.user/dist/** ./nginx/html/dist/u/ # copy jar echo "begin copy wfc-gateway " diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 396ec08..dd2fede 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -1,4 +1,3 @@ -version : '3.8' services: wfc-nacos: container_name: wfc-nacos @@ -57,7 +56,7 @@ services: ports: - "80:80" volumes: - - ./nginx/html/dist:/home/wfc/projects/wfc-ui + - ./nginx/html/dist:/home/wfc/portal - ./nginx/conf/nginx.conf:/etc/nginx/nginx.conf - ./nginx/logs:/var/log/nginx - ./nginx/conf.d:/etc/nginx/conf.d diff --git a/docker/nginx/conf/nginx.conf b/docker/nginx/conf/nginx.conf index 51e2bcd..3d58ce0 100644 --- a/docker/nginx/conf/nginx.conf +++ b/docker/nginx/conf/nginx.conf @@ -14,18 +14,32 @@ http { listen 80; server_name localhost; - location / { - root /home/wfc/projects/wfc-ui; + location /sys { + root /home/wfc/portal; try_files $uri $uri/ /index.html; index index.html index.htm; } - location /prod-api/{ + location /sys-api/{ proxy_set_header Host $http_host; proxy_set_header X-Real-IP $remote_addr; proxy_set_header REMOTE-HOST $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_pass http://192.168.2.248:8080/; + proxy_pass http://wfc-gateway:8080/; + } + + location /u { + root /home/wfc/portal; + try_files $uri $uri/ /index.html; + index index.html index.htm; + } + + location /u-api/{ + proxy_set_header Host $http_host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header REMOTE-HOST $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_pass http://wfc-gateway:8080/; } # 避免actuator暴露 diff --git a/docker/nginx/dockerfile b/docker/nginx/dockerfile index ffe31bb..c00dc9b 100644 --- a/docker/nginx/dockerfile +++ b/docker/nginx/dockerfile @@ -4,12 +4,12 @@ FROM nginx MAINTAINER wfc # 挂载目录 -VOLUME /home/wfc/projects/wfc-ui +VOLUME /home/wfc/portal # 创建目录 -RUN mkdir -p /home/wfc/projects/wfc-ui +RUN mkdir -p /home/wfc/portal # 指定路径 -WORKDIR /home/wfc/projects/wfc-ui +WORKDIR /home/wfc/portal # 复制conf文件到路径 COPY ./conf/nginx.conf /etc/nginx/nginx.conf # 复制html文件到路径 -COPY ./html/dist /home/wfc/projects/wfc-ui +COPY ./html/dist /home/wfc/portal diff --git a/docker/nginx/html/dist/readme.txt b/docker/nginx/html/dist/readme.txt index c3ceade..d25a313 100644 --- a/docker/nginx/html/dist/readme.txt +++ b/docker/nginx/html/dist/readme.txt @@ -1 +1,3 @@ -���ǰ��wfc-ui�����õľ�̬�ļ�������nginx������ʡ� \ No newline at end of file +1. 目录./sys存放客户平台(sys portal)前端文件 +2. 目录./u存放用户平台(user portal)前端文件 +用于nginx自动执行 \ No newline at end of file