From 31727f4e5ce2a7e449b4d21bbf8fbb80f08ca7c8 Mon Sep 17 00:00:00 2001 From: caiyuchao Date: Fri, 15 Nov 2024 18:19:32 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E8=B0=83=E6=95=B4=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker/copy.sh | 2 +- docker/docker-compose.yml | 2 +- docker/nacos/conf/application.properties | 2 +- docker/nginx/conf/nginx.conf | 2 +- wfc-auth/src/main/resources/bootstrap.yml | 4 ++-- wfc-gateway/src/main/resources/bootstrap.yml | 6 +++--- wfc-modules/wfc-system/src/main/resources/bootstrap.yml | 4 ++-- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/docker/copy.sh b/docker/copy.sh index 3c22375..56c99bb 100644 --- a/docker/copy.sh +++ b/docker/copy.sh @@ -14,7 +14,7 @@ cp ../sql/wfc-config.sql ./mysql/db # copy html echo "begin copy html " -cp -r ../wfc-ui/dist/** ./nginx/html/dist +cp -r ../../be.wfc/dist/** ./nginx/html/dist # copy jar diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 42705c7..7b51d2f 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -22,7 +22,7 @@ services: build: context: ./mysql ports: - - "3307:3306" + - "3306:3306" volumes: - ./mysql/conf:/etc/mysql/conf.d - ./mysql/logs:/logs diff --git a/docker/nacos/conf/application.properties b/docker/nacos/conf/application.properties index b81fcf0..5a9da5c 100644 --- a/docker/nacos/conf/application.properties +++ b/docker/nacos/conf/application.properties @@ -1,6 +1,6 @@ spring.datasource.platform=mysql db.num=1 -db.url.0=jdbc:mysql://localhost:3306/wfc-config?characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useUnicode=true&useSSL=false&serverTimezone=UTC +db.url.0=jdbc:mysql://wfc-mysql:3306/wfc-config?characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useUnicode=true&useSSL=false&serverTimezone=UTC db.user=root db.password=123456 diff --git a/docker/nginx/conf/nginx.conf b/docker/nginx/conf/nginx.conf index e2ef5be..bf6ae83 100644 --- a/docker/nginx/conf/nginx.conf +++ b/docker/nginx/conf/nginx.conf @@ -25,7 +25,7 @@ http { 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/; + proxy_pass http://192.168.9.50/prod-api/:8080/; } # 避免actuator暴露 diff --git a/wfc-auth/src/main/resources/bootstrap.yml b/wfc-auth/src/main/resources/bootstrap.yml index cbdc37a..d13581e 100644 --- a/wfc-auth/src/main/resources/bootstrap.yml +++ b/wfc-auth/src/main/resources/bootstrap.yml @@ -14,10 +14,10 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 127.0.0.1:8848 + server-addr: 192.168.9.50:8848 config: # 配置中心地址 - server-addr: 127.0.0.1:8848 + server-addr: 192.168.9.50:8848 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/wfc-gateway/src/main/resources/bootstrap.yml b/wfc-gateway/src/main/resources/bootstrap.yml index ddc2c85..202a56d 100644 --- a/wfc-gateway/src/main/resources/bootstrap.yml +++ b/wfc-gateway/src/main/resources/bootstrap.yml @@ -14,10 +14,10 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 127.0.0.1:8848 + server-addr: 192.168.9.50:8848 config: # 配置中心地址 - server-addr: 127.0.0.1:8848 + server-addr: 192.168.9.50:8848 # 配置文件格式 file-extension: yml # 共享配置 @@ -33,7 +33,7 @@ spring: datasource: ds1: nacos: - server-addr: 127.0.0.1:8848 + server-addr: 192.168.9.50:8848 dataId: sentinel-wfc-gateway groupId: DEFAULT_GROUP data-type: json diff --git a/wfc-modules/wfc-system/src/main/resources/bootstrap.yml b/wfc-modules/wfc-system/src/main/resources/bootstrap.yml index 19e2b6c..323baff 100644 --- a/wfc-modules/wfc-system/src/main/resources/bootstrap.yml +++ b/wfc-modules/wfc-system/src/main/resources/bootstrap.yml @@ -14,10 +14,10 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 127.0.0.1:8848 + server-addr: 192.168.9.50:8848 config: # 配置中心地址 - server-addr: 127.0.0.1:8848 + server-addr: 192.168.9.50:8848 # 配置文件格式 file-extension: yml # 共享配置