From e7644ea1f0f34ef2c2b8012fd42ed2d6149332bd Mon Sep 17 00:00:00 2001 From: simonzhangsz <15231584+simonzhangsz@user.noreply.gitee.com> Date: Fri, 13 Dec 2024 21:28:24 +0800 Subject: [PATCH] feat: docker environment enhancement, support modify .env to fix in prodution env --- docker/.env | 7 +++ docker/docker-compose.yml | 51 +++++++++++++++++-- pom.xml | 2 +- wfc-auth/src/main/resources/bootstrap.yml | 8 +-- wfc-gateway/src/main/resources/bootstrap.yml | 10 ++-- .../wfc-file/src/main/resources/bootstrap.yml | 8 +-- .../wfc-gen/src/main/resources/bootstrap.yml | 8 +-- .../wfc-job/src/main/resources/bootstrap.yml | 8 +-- .../src/main/resources/bootstrap.yml | 8 +-- .../src/main/resources/bootstrap.yml | 12 ++--- .../src/main/resources/bootstrap.yml | 8 +-- .../src/main/resources/bootstrap.yml | 8 +-- 12 files changed, 93 insertions(+), 45 deletions(-) create mode 100644 docker/.env diff --git a/docker/.env b/docker/.env new file mode 100644 index 0000000..667ca21 --- /dev/null +++ b/docker/.env @@ -0,0 +1,7 @@ +MYSQL_ROOT_PASSWORD=123456 +MYSQL_DATABASE=wfc_system_db +MYSQL_USER=mysql +MYSQL_PASSWORD= +NACOS_SERVER_ADDR=192.168.2.248:8848 +NACOS_NAME_SPACE=wfc-test +GATEWAY_ADDR=192.168.2.248:8080 \ No newline at end of file diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 10a2215..5f76a63 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -6,7 +6,8 @@ services: context: ./nacos environment: - MODE=standalone - - NACOS_SERVER_ADDR=192.168.13.128 + - NACOS_SERVER_ADDR=${NACOS_SERVER_ADDR} + - NACOS_NAME_SPACE=${NACOS_NAME_SPACE} volumes: - ./nacos/logs/:/home/nacos/logs - ./nacos/conf/application.properties:/home/nacos/conf/application.properties @@ -24,6 +25,7 @@ services: ports: - "3306:3306" volumes: + - ./mysql/db:/docker-entrypoint-initdb.d # 挂载 SQL 文件 - ./mysql/conf:/etc/mysql/conf.d - ./mysql/logs:/logs - ./mysql/data:/var/lib/mysql @@ -58,10 +60,15 @@ services: dockerfile: dockerfile ports: - "8080:8080" + volumes: + - ./wfc/gateway/jar/wfc-gateway.jar:/home/wfc/wfc-gateway.jar depends_on: - wfc-redis links: - wfc-redis + environment: + - NACOS_SERVER_ADDR=${NACOS_SERVER_ADDR} + - NACOS_NAME_SPACE=${NACOS_NAME_SPACE} wfc-auth: container_name: wfc-auth build: @@ -69,10 +76,15 @@ services: dockerfile: dockerfile ports: - "9200:9200" + volumes: + - ./wfc/auth/jar/wfc-auth.jar:/home/wfc/wfc-auth.jar depends_on: - wfc-redis links: - wfc-redis + environment: + - NACOS_SERVER_ADDR=${NACOS_SERVER_ADDR} + - NACOS_NAME_SPACE=${NACOS_NAME_SPACE} wfc-modules-system: container_name: wfc-modules-system build: @@ -80,12 +92,17 @@ services: dockerfile: dockerfile ports: - "9201:9201" + volumes: + - ./wfc/modules/system/jar/wfc-modules-system.jar:/home/wfc/wfc-modules-system.jar depends_on: - wfc-redis - wfc-mysql links: - wfc-redis - wfc-mysql + environment: + - NACOS_SERVER_ADDR=${NACOS_SERVER_ADDR} + - NACOS_NAME_SPACE=${NACOS_NAME_SPACE} wfc-modules-user: container_name: wfc-modules-user build: @@ -93,12 +110,17 @@ services: dockerfile: dockerfile ports: - "9204:9204" + volumes: + - ./wfc/modules/user/jar/wfc-modules-user.jar:/home/wfc/wfc-modules-user.jar depends_on: - wfc-redis - wfc-mysql links: - wfc-redis - wfc-mysql + environment: + - NACOS_SERVER_ADDR=${NACOS_SERVER_ADDR} + - NACOS_NAME_SPACE=${NACOS_NAME_SPACE} wfc-modules-gen: container_name: wfc-modules-gen build: @@ -106,10 +128,15 @@ services: dockerfile: dockerfile ports: - "9202:9202" + volumes: + - ./wfc/modules/gen/jar/wfc-modules-gen.jar:/home/wfc/wfc-modules-gen.jar depends_on: - wfc-mysql links: - wfc-mysql + environment: + - NACOS_SERVER_ADDR=${NACOS_SERVER_ADDR} + - NACOS_NAME_SPACE=${NACOS_NAME_SPACE} wfc-modules-job: container_name: wfc-modules-job build: @@ -117,10 +144,15 @@ services: dockerfile: dockerfile ports: - "9203:9203" + volumes: + - ./wfc/modules/job/jar/wfc-modules-job.jar:/home/wfc/wfc-modules-job.jar depends_on: - wfc-mysql links: - wfc-mysql + environment: + - NACOS_SERVER_ADDR=${NACOS_SERVER_ADDR} + - NACOS_NAME_SPACE=${NACOS_NAME_SPACE} wfc-modules-file: container_name: wfc-modules-file build: @@ -129,7 +161,11 @@ services: ports: - "9300:9300" volumes: - - ./wfc/uploadPath:/home/wfc/uploadPath + - ./wfc/modules/file/jar/wfc-modules-file.jar:/home/wfc/wfc-modules-file.jar + - ./wfc/upload:/home/wfc/upload + environment: + - NACOS_SERVER_ADDR=${NACOS_SERVER_ADDR} + - NACOS_NAME_SPACE=${NACOS_NAME_SPACE} wfc-modules-payment: container_name: wfc-modules-payment build: @@ -137,10 +173,15 @@ services: dockerfile: dockerfile ports: - "9306:9306" + volumes: + - ./wfc/modules/payment/jar/wfc-modules-payment.jar:/home/wfc/wfc-modules-payment.jar depends_on: - wfc-mysql links: - wfc-mysql + environment: + - NACOS_SERVER_ADDR=${NACOS_SERVER_ADDR} + - NACOS_NAME_SPACE=${NACOS_NAME_SPACE} wfc-visual-monitor: container_name: wfc-visual-monitor build: @@ -148,7 +189,11 @@ services: dockerfile: dockerfile ports: - "9100:9100" - + volumes: + - ./wfc/visual/monitor/jar/wfc-visual-monitor.jar:/home/wfc/wfc-visual-monitor.jar + environment: + - NACOS_SERVER_ADDR=${NACOS_SERVER_ADDR} + - NACOS_NAME_SPACE=${NACOS_NAME_SPACE} wfc-nginx: container_name: wfc-nginx image: nginx diff --git a/pom.xml b/pom.xml index 5fe2f80..8675d2f 100644 --- a/pom.xml +++ b/pom.xml @@ -452,7 +452,7 @@ prod - 192.168.2.248:8848 + ${NACOS_SERVER_ADDR} wfc-prod diff --git a/wfc-auth/src/main/resources/bootstrap.yml b/wfc-auth/src/main/resources/bootstrap.yml index f6bc595..f70da2f 100644 --- a/wfc-auth/src/main/resources/bootstrap.yml +++ b/wfc-auth/src/main/resources/bootstrap.yml @@ -14,12 +14,12 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: '@nacosServerAddr@' - namespace: '@nacosNamespace@' + server-addr: ${NACOS_SERVER_ADDR} + namespace: ${NACOS_NAME_SPACE} config: # 配置中心地址 - server-addr: '@nacosServerAddr@' - namespace: '@nacosNamespace@' + server-addr: ${NACOS_SERVER_ADDR} + namespace: ${NACOS_NAME_SPACE} # 配置文件格式 file-extension: yml # 共享配置 diff --git a/wfc-gateway/src/main/resources/bootstrap.yml b/wfc-gateway/src/main/resources/bootstrap.yml index 9f731f1..1c5dd96 100644 --- a/wfc-gateway/src/main/resources/bootstrap.yml +++ b/wfc-gateway/src/main/resources/bootstrap.yml @@ -14,12 +14,12 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: '@nacosServerAddr@' - namespace: '@nacosNamespace@' + server-addr: ${NACOS_SERVER_ADDR} + namespace: ${NACOS_NAME_SPACE} config: # 配置中心地址 - server-addr: '@nacosServerAddr@' - namespace: '@nacosNamespace@' + server-addr: ${NACOS_SERVER_ADDR} + namespace: ${NACOS_NAME_SPACE} # 配置文件格式 file-extension: yml # 共享配置 @@ -35,7 +35,7 @@ spring: datasource: ds1: nacos: - server-addr: '@nacosServerAddr@' + server-addr: ${NACOS_SERVER_ADDR} dataId: sentinel-wfc-gateway groupId: DEFAULT_GROUP data-type: json diff --git a/wfc-modules/wfc-file/src/main/resources/bootstrap.yml b/wfc-modules/wfc-file/src/main/resources/bootstrap.yml index e24f2f4..a8066fa 100644 --- a/wfc-modules/wfc-file/src/main/resources/bootstrap.yml +++ b/wfc-modules/wfc-file/src/main/resources/bootstrap.yml @@ -14,12 +14,12 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: '@nacosServerAddr@' - namespace: '@nacosNamespace@' + server-addr: ${NACOS_SERVER_ADDR} + namespace: ${NACOS_NAME_SPACE} config: # 配置中心地址 - server-addr: '@nacosServerAddr@' - namespace: '@nacosNamespace@' + server-addr: ${NACOS_SERVER_ADDR} + namespace: ${NACOS_NAME_SPACE} # 配置文件格式 file-extension: yml # 共享配置 diff --git a/wfc-modules/wfc-gen/src/main/resources/bootstrap.yml b/wfc-modules/wfc-gen/src/main/resources/bootstrap.yml index 32e1768..b91c972 100644 --- a/wfc-modules/wfc-gen/src/main/resources/bootstrap.yml +++ b/wfc-modules/wfc-gen/src/main/resources/bootstrap.yml @@ -14,12 +14,12 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: '@nacosServerAddr@' - namespace: '@nacosNamespace@' + server-addr: ${NACOS_SERVER_ADDR} + namespace: ${NACOS_NAME_SPACE} config: # 配置中心地址 - server-addr: '@nacosServerAddr@' - namespace: '@nacosNamespace@' + server-addr: ${NACOS_SERVER_ADDR} + namespace: ${NACOS_NAME_SPACE} # 配置文件格式 file-extension: yml # 共享配置 diff --git a/wfc-modules/wfc-job/src/main/resources/bootstrap.yml b/wfc-modules/wfc-job/src/main/resources/bootstrap.yml index 3c5ae1d..a189bf9 100644 --- a/wfc-modules/wfc-job/src/main/resources/bootstrap.yml +++ b/wfc-modules/wfc-job/src/main/resources/bootstrap.yml @@ -14,12 +14,12 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: '@nacosServerAddr@' - namespace: '@nacosNamespace@' + server-addr: ${NACOS_SERVER_ADDR} + namespace: ${NACOS_NAME_SPACE} config: # 配置中心地址 - server-addr: '@nacosServerAddr@' - namespace: '@nacosNamespace@' + server-addr: ${NACOS_SERVER_ADDR} + namespace: ${NACOS_NAME_SPACE} # 配置文件格式 file-extension: yml # 共享配置 diff --git a/wfc-modules/wfc-modules-user/src/main/resources/bootstrap.yml b/wfc-modules/wfc-modules-user/src/main/resources/bootstrap.yml index 6a8e745..edc7291 100644 --- a/wfc-modules/wfc-modules-user/src/main/resources/bootstrap.yml +++ b/wfc-modules/wfc-modules-user/src/main/resources/bootstrap.yml @@ -14,12 +14,12 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: '@nacosServerAddr@' - namespace: '@nacosNamespace@' + server-addr: ${NACOS_SERVER_ADDR} + namespace: ${NACOS_NAME_SPACE} config: # 配置中心地址 - server-addr: '@nacosServerAddr@' - namespace: '@nacosNamespace@' + server-addr: ${NACOS_SERVER_ADDR} + namespace: ${NACOS_NAME_SPACE} # 配置文件格式 file-extension: yml # 共享配置 diff --git a/wfc-modules/wfc-payment/src/main/resources/bootstrap.yml b/wfc-modules/wfc-payment/src/main/resources/bootstrap.yml index c4566c8..8794ec3 100644 --- a/wfc-modules/wfc-payment/src/main/resources/bootstrap.yml +++ b/wfc-modules/wfc-payment/src/main/resources/bootstrap.yml @@ -14,16 +14,12 @@ spring: nacos: discovery: # 服务注册地址 - # server-addr: '@nacosServerAddr@' - # namespace: '@nacosNamespace@' - server-addr: ${nacos.server.ip} - namespace: ${nacosNamespace} + server-addr: ${NACOS_SERVER_ADDR} + namespace: ${NACOS_NAME_SPACE} config: # 配置中心地址 - # server-addr: '@nacosServerAddr@' - # namespace: '@nacosNamespace@' - server-addr: ${nacos.server.ip} - namespace: ${nacosNamespace} + server-addr: ${NACOS_SERVER_ADDR} + namespace: ${NACOS_NAME_SPACE} # 配置文件格式 file-extension: yml # 共享配置 diff --git a/wfc-modules/wfc-system/src/main/resources/bootstrap.yml b/wfc-modules/wfc-system/src/main/resources/bootstrap.yml index b365791..bc42c83 100644 --- a/wfc-modules/wfc-system/src/main/resources/bootstrap.yml +++ b/wfc-modules/wfc-system/src/main/resources/bootstrap.yml @@ -14,12 +14,12 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: '@nacosServerAddr@' - namespace: '@nacosNamespace@' + server-addr: ${NACOS_SERVER_ADDR} + namespace: ${NACOS_NAME_SPACE} config: # 配置中心地址 - server-addr: '@nacosServerAddr@' - namespace: '@nacosNamespace@' + server-addr: ${NACOS_SERVER_ADDR} + namespace: ${NACOS_NAME_SPACE} # 配置文件格式 file-extension: yml # 共享配置 diff --git a/wfc-visual/wfc-visual-monitor/src/main/resources/bootstrap.yml b/wfc-visual/wfc-visual-monitor/src/main/resources/bootstrap.yml index 04ed72b..c5aa216 100644 --- a/wfc-visual/wfc-visual-monitor/src/main/resources/bootstrap.yml +++ b/wfc-visual/wfc-visual-monitor/src/main/resources/bootstrap.yml @@ -14,12 +14,12 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: '@nacosServerAddr@' - namespace: '@nacosNamespace@' + server-addr: ${NACOS_SERVER_ADDR} + namespace: ${NACOS_NAME_SPACE} config: # 配置中心地址 - server-addr: '@nacosServerAddr@' - namespace: '@nacosNamespace@' + server-addr: ${NACOS_SERVER_ADDR} + namespace: ${NACOS_NAME_SPACE} # 配置文件格式 file-extension: yml # 共享配置