diff --git a/docker/.env b/docker/.env index 667ca21..2d0dd87 100644 --- a/docker/.env +++ b/docker/.env @@ -1,7 +1,24 @@ MYSQL_ROOT_PASSWORD=123456 MYSQL_DATABASE=wfc_system_db +WFC_CONFIG_DATABASE=wfc_config_db +WFC_SYSTEM_DATABASE=wfc_system_db +WFC_USER_DATABASE=wfc_user_db +MYSQL_PORT=3306 MYSQL_USER=mysql -MYSQL_PASSWORD= -NACOS_SERVER_ADDR=192.168.2.248:8848 +MYSQL_PASSWORD=123456 +REDIS_PORT=6379 NACOS_NAME_SPACE=wfc-test -GATEWAY_ADDR=192.168.2.248:8080 \ No newline at end of file +WFC_SERVER_PORT=80 +NACOS_SERVER_PORT=8848 +GATEWAY_SERVER_PORT=8080 +AUTH_SERVER_PORT=8081 +WFC_JOB_PORT=9203 +WFC_PAYMENT_PORT=9204 +WFC_SYSTEM_PORT=9205 +WFC_USER_PORT=9206 +WFC_SERVER_IP=192.168.2.248 +NACOS_SERVER_IP=${WFC_SERVER_IP} +GATEWAY_SERVER_IP=${WFC_SERVER_IP} +AUTH_SERVER_IP=${WFC_SERVER_IP} +RESTART_OPTION=on-failure:5 + diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 5f76a63..3e38209 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -6,7 +6,7 @@ services: context: ./nacos environment: - MODE=standalone - - NACOS_SERVER_ADDR=${NACOS_SERVER_ADDR} + - NACOS_SERVER_IP=${NACOS_SERVER_IP} - NACOS_NAME_SPACE=${NACOS_NAME_SPACE} volumes: - ./nacos/logs/:/home/nacos/logs @@ -49,9 +49,9 @@ services: ports: - "6379:6379" volumes: - - ./redis/conf/redis.conf:/home/wfc/redis/redis.conf + - ./redis/conf/redis.conf:/opt/wfc/redis/redis.conf - ./redis/data:/data - command: redis-server /home/wfc/redis/redis.conf + command: redis-server /opt/wfc/redis/redis.conf wfc-gateway: container_name: wfc-gateway @@ -61,13 +61,13 @@ services: ports: - "8080:8080" volumes: - - ./wfc/gateway/jar/wfc-gateway.jar:/home/wfc/wfc-gateway.jar + - ./wfc/gateway/jar/wfc-gateway.jar:/opt/wfc/wfc-gateway.jar depends_on: - wfc-redis links: - wfc-redis environment: - - NACOS_SERVER_ADDR=${NACOS_SERVER_ADDR} + - NACOS_SERVER_IP=${NACOS_SERVER_IP} - NACOS_NAME_SPACE=${NACOS_NAME_SPACE} wfc-auth: container_name: wfc-auth @@ -77,13 +77,13 @@ services: ports: - "9200:9200" volumes: - - ./wfc/auth/jar/wfc-auth.jar:/home/wfc/wfc-auth.jar + - ./wfc/auth/jar/wfc-auth.jar:/opt/wfc/wfc-auth.jar depends_on: - wfc-redis links: - wfc-redis environment: - - NACOS_SERVER_ADDR=${NACOS_SERVER_ADDR} + - NACOS_SERVER_IP=${NACOS_SERVER_IP} - NACOS_NAME_SPACE=${NACOS_NAME_SPACE} wfc-modules-system: container_name: wfc-modules-system @@ -93,7 +93,7 @@ services: ports: - "9201:9201" volumes: - - ./wfc/modules/system/jar/wfc-modules-system.jar:/home/wfc/wfc-modules-system.jar + - ./wfc/modules/system/jar/wfc-modules-system.jar:/opt/wfc/wfc-modules-system.jar depends_on: - wfc-redis - wfc-mysql @@ -101,7 +101,7 @@ services: - wfc-redis - wfc-mysql environment: - - NACOS_SERVER_ADDR=${NACOS_SERVER_ADDR} + - NACOS_SERVER_IP=${NACOS_SERVER_IP} - NACOS_NAME_SPACE=${NACOS_NAME_SPACE} wfc-modules-user: container_name: wfc-modules-user @@ -111,7 +111,7 @@ services: ports: - "9204:9204" volumes: - - ./wfc/modules/user/jar/wfc-modules-user.jar:/home/wfc/wfc-modules-user.jar + - ./wfc/modules/user/jar/wfc-modules-user.jar:/opt/wfc/wfc-modules-user.jar depends_on: - wfc-redis - wfc-mysql @@ -119,7 +119,7 @@ services: - wfc-redis - wfc-mysql environment: - - NACOS_SERVER_ADDR=${NACOS_SERVER_ADDR} + - NACOS_SERVER_IP=${NACOS_SERVER_IP} - NACOS_NAME_SPACE=${NACOS_NAME_SPACE} wfc-modules-gen: container_name: wfc-modules-gen @@ -129,13 +129,13 @@ services: ports: - "9202:9202" volumes: - - ./wfc/modules/gen/jar/wfc-modules-gen.jar:/home/wfc/wfc-modules-gen.jar + - ./wfc/modules/gen/jar/wfc-modules-gen.jar:/opt/wfc/wfc-modules-gen.jar depends_on: - wfc-mysql links: - wfc-mysql environment: - - NACOS_SERVER_ADDR=${NACOS_SERVER_ADDR} + - NACOS_SERVER_IP=${NACOS_SERVER_IP} - NACOS_NAME_SPACE=${NACOS_NAME_SPACE} wfc-modules-job: container_name: wfc-modules-job @@ -145,13 +145,13 @@ services: ports: - "9203:9203" volumes: - - ./wfc/modules/job/jar/wfc-modules-job.jar:/home/wfc/wfc-modules-job.jar + - ./wfc/modules/job/jar/wfc-modules-job.jar:/opt/wfc/wfc-modules-job.jar depends_on: - wfc-mysql links: - wfc-mysql environment: - - NACOS_SERVER_ADDR=${NACOS_SERVER_ADDR} + - NACOS_SERVER_IP=${NACOS_SERVER_IP} - NACOS_NAME_SPACE=${NACOS_NAME_SPACE} wfc-modules-file: container_name: wfc-modules-file @@ -161,10 +161,10 @@ services: ports: - "9300:9300" volumes: - - ./wfc/modules/file/jar/wfc-modules-file.jar:/home/wfc/wfc-modules-file.jar - - ./wfc/upload:/home/wfc/upload + - ./wfc/modules/file/jar/wfc-modules-file.jar:/opt/wfc/wfc-modules-file.jar + - ./wfc/upload:/opt/wfc/upload environment: - - NACOS_SERVER_ADDR=${NACOS_SERVER_ADDR} + - NACOS_SERVER_IP=${NACOS_SERVER_IP} - NACOS_NAME_SPACE=${NACOS_NAME_SPACE} wfc-modules-payment: container_name: wfc-modules-payment @@ -174,13 +174,13 @@ services: ports: - "9306:9306" volumes: - - ./wfc/modules/payment/jar/wfc-modules-payment.jar:/home/wfc/wfc-modules-payment.jar + - ./wfc/modules/payment/jar/wfc-modules-payment.jar:/opt/wfc/wfc-modules-payment.jar depends_on: - wfc-mysql links: - wfc-mysql environment: - - NACOS_SERVER_ADDR=${NACOS_SERVER_ADDR} + - NACOS_SERVER_IP=${NACOS_SERVER_IP} - NACOS_NAME_SPACE=${NACOS_NAME_SPACE} wfc-visual-monitor: container_name: wfc-visual-monitor @@ -190,9 +190,9 @@ services: ports: - "9100:9100" volumes: - - ./wfc/visual/monitor/jar/wfc-visual-monitor.jar:/home/wfc/wfc-visual-monitor.jar + - ./wfc/visual/monitor/jar/wfc-visual-monitor.jar:/opt/wfc/wfc-visual-monitor.jar environment: - - NACOS_SERVER_ADDR=${NACOS_SERVER_ADDR} + - NACOS_SERVER_IP=${NACOS_SERVER_IP} - NACOS_NAME_SPACE=${NACOS_NAME_SPACE} wfc-nginx: container_name: wfc-nginx @@ -202,7 +202,7 @@ services: ports: - "80:80" volumes: - - ./nginx/html/dist:/home/wfc/portal + - ./nginx/html/dist:/opt/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/nacos/conf/application.properties b/docker/nacos/conf/application.properties index d2b4e93..579920f 100644 --- a/docker/nacos/conf/application.properties +++ b/docker/nacos/conf/application.properties @@ -7,7 +7,7 @@ db.password=123456 nacos.naming.empty-service.auto-clean=true nacos.naming.empty-service.clean.initial-delay-ms=50000 nacos.naming.empty-service.clean.period-time-ms=30000 -nacos.server.ip=${nacos.server.ip} +# nacos.server.ip=${nacos.server.ip} management.endpoints.web.exposure.include=* diff --git a/docker/nginx/conf/nginx.conf b/docker/nginx/conf/nginx.conf index 3d58ce0..447d1b5 100644 --- a/docker/nginx/conf/nginx.conf +++ b/docker/nginx/conf/nginx.conf @@ -15,7 +15,7 @@ http { server_name localhost; location /sys { - root /home/wfc/portal; + root /opt/wfc/portal; try_files $uri $uri/ /index.html; index index.html index.htm; } @@ -29,7 +29,7 @@ http { } location /u { - root /home/wfc/portal; + root /opt/wfc/portal; try_files $uri $uri/ /index.html; index index.html index.htm; } diff --git a/docker/nginx/dockerfile b/docker/nginx/dockerfile index cafb08c..7fc08c4 100644 --- a/docker/nginx/dockerfile +++ b/docker/nginx/dockerfile @@ -3,8 +3,8 @@ FROM nginx # author MAINTAINER wfc # 工作目录 -WORKDIR /home/wfc/portal +WORKDIR /opt/wfc/portal # 复制conf文件到路径 COPY ./conf/nginx.conf /etc/nginx/nginx.conf # 复制html文件到路径 -COPY ./html /home/wfc/portal +COPY ./html /opt/wfc/portal diff --git a/docker/redis/dockerfile b/docker/redis/dockerfile index 9a227d6..e3eedfe 100644 --- a/docker/redis/dockerfile +++ b/docker/redis/dockerfile @@ -4,10 +4,10 @@ FROM redis MAINTAINER wfc # 挂载目录 -VOLUME /home/wfc/redis +VOLUME /opt/wfc/redis # 创建目录 -RUN mkdir -p /home/wfc/redis +RUN mkdir -p /opt/wfc/redis # 指定路径 -WORKDIR /home/wfc/redis +WORKDIR /opt/wfc/redis # 复制conf文件到路径 -COPY ./conf/redis.conf /home/wfc/redis/redis.conf +COPY ./conf/redis.conf /opt/wfc/redis/redis.conf diff --git a/docker/wfc/auth/dockerfile b/docker/wfc/auth/dockerfile index cfa1d29..2665225 100644 --- a/docker/wfc/auth/dockerfile +++ b/docker/wfc/auth/dockerfile @@ -4,12 +4,12 @@ FROM openjdk:8-jre MAINTAINER wfc # 挂载目录 -VOLUME /home/wfc +VOLUME /opt/wfc # 创建目录 -RUN mkdir -p /home/wfc +RUN mkdir -p /opt/wfc # 指定路径 -WORKDIR /home/wfc +WORKDIR /opt/wfc # 复制jar文件到路径 -COPY ./jar/wfc-auth.jar /home/wfc/wfc-auth.jar +COPY ./jar/wfc-auth.jar /opt/wfc/wfc-auth.jar # 启动认证服务 ENTRYPOINT ["java","-jar","wfc-auth.jar"] \ No newline at end of file diff --git a/docker/wfc/gateway/dockerfile b/docker/wfc/gateway/dockerfile index 4f57b4f..dfacec6 100644 --- a/docker/wfc/gateway/dockerfile +++ b/docker/wfc/gateway/dockerfile @@ -4,12 +4,12 @@ FROM openjdk:8-jre MAINTAINER wfc # 挂载目录 -VOLUME /home/wfc +VOLUME /opt/wfc # 创建目录 -RUN mkdir -p /home/wfc +RUN mkdir -p /opt/wfc # 指定路径 -WORKDIR /home/wfc +WORKDIR /opt/wfc # 复制jar文件到路径 -COPY ./jar/wfc-gateway.jar /home/wfc/wfc-gateway.jar +COPY ./jar/wfc-gateway.jar /opt/wfc/wfc-gateway.jar # 启动网关服务 ENTRYPOINT ["java","-jar","wfc-gateway.jar"] \ No newline at end of file diff --git a/docker/wfc/modules/file/dockerfile b/docker/wfc/modules/file/dockerfile index 9b79a0c..731fd39 100644 --- a/docker/wfc/modules/file/dockerfile +++ b/docker/wfc/modules/file/dockerfile @@ -4,12 +4,12 @@ FROM openjdk:8-jre MAINTAINER wfc # 挂载目录 -VOLUME /home/wfc +VOLUME /opt/wfc # 创建目录 -RUN mkdir -p /home/wfc +RUN mkdir -p /opt/wfc # 指定路径 -WORKDIR /home/wfc +WORKDIR /opt/wfc # 复制jar文件到路径 -COPY ./jar/wfc-modules-file.jar /home/wfc/wfc-modules-file.jar +COPY ./jar/wfc-modules-file.jar /opt/wfc/wfc-modules-file.jar # 启动文件服务 ENTRYPOINT ["java","-jar","wfc-modules-file.jar"] \ No newline at end of file diff --git a/docker/wfc/modules/gen/dockerfile b/docker/wfc/modules/gen/dockerfile index 27d8b95..3398fda 100644 --- a/docker/wfc/modules/gen/dockerfile +++ b/docker/wfc/modules/gen/dockerfile @@ -4,12 +4,12 @@ FROM openjdk:8-jre MAINTAINER wfc # 挂载目录 -VOLUME /home/wfc +VOLUME /opt/wfc # 创建目录 -RUN mkdir -p /home/wfc +RUN mkdir -p /opt/wfc # 指定路径 -WORKDIR /home/wfc +WORKDIR /opt/wfc # 复制jar文件到路径 -COPY ./jar/wfc-modules-gen.jar /home/wfc/wfc-modules-gen.jar +COPY ./jar/wfc-modules-gen.jar /opt/wfc/wfc-modules-gen.jar # 启动代码生成服务 ENTRYPOINT ["java","-jar","wfc-modules-gen.jar"] \ No newline at end of file diff --git a/docker/wfc/modules/job/dockerfile b/docker/wfc/modules/job/dockerfile index 4180408..3b36714 100644 --- a/docker/wfc/modules/job/dockerfile +++ b/docker/wfc/modules/job/dockerfile @@ -4,12 +4,12 @@ FROM openjdk:8-jre MAINTAINER wfc # 挂载目录 -VOLUME /home/wfc +VOLUME /opt/wfc # 创建目录 -RUN mkdir -p /home/wfc +RUN mkdir -p /opt/wfc # 指定路径 -WORKDIR /home/wfc +WORKDIR /opt/wfc # 复制jar文件到路径 -COPY ./jar/wfc-modules-job.jar /home/wfc/wfc-modules-job.jar +COPY ./jar/wfc-modules-job.jar /opt/wfc/wfc-modules-job.jar # 启动定时任务服务 ENTRYPOINT ["java","-jar","wfc-modules-job.jar"] \ No newline at end of file diff --git a/docker/wfc/modules/payment/dockerfile b/docker/wfc/modules/payment/dockerfile index edb0a3e..e668e64 100644 --- a/docker/wfc/modules/payment/dockerfile +++ b/docker/wfc/modules/payment/dockerfile @@ -4,12 +4,12 @@ FROM openjdk:8-jre LABEL org.wfc.image.authors="wfc@wfc.org" # 挂载目录 -VOLUME /home/wfc +VOLUME /opt/wfc # 创建目录 -RUN mkdir -p /home/wfc +RUN mkdir -p /opt/wfc # 指定路径 -WORKDIR /home/wfc +WORKDIR /opt/wfc # 复制jar文件到路径 -COPY ./jar/wfc-modules-payment.jar /home/wfc/wfc-modules-payment.jar +COPY ./jar/wfc-modules-payment.jar /opt/wfc/wfc-modules-payment.jar # 启动系统服务 ENTRYPOINT ["java","-jar","wfc-modules-payment.jar"] \ No newline at end of file diff --git a/docker/wfc/modules/system/dockerfile b/docker/wfc/modules/system/dockerfile index 8999e83..3ddd083 100644 --- a/docker/wfc/modules/system/dockerfile +++ b/docker/wfc/modules/system/dockerfile @@ -4,12 +4,12 @@ FROM openjdk:8-jre MAINTAINER wfc # 挂载目录 -VOLUME /home/wfc +VOLUME /opt/wfc # 创建目录 -RUN mkdir -p /home/wfc +RUN mkdir -p /opt/wfc # 指定路径 -WORKDIR /home/wfc +WORKDIR /opt/wfc # 复制jar文件到路径 -COPY ./jar/wfc-modules-system.jar /home/wfc/wfc-modules-system.jar +COPY ./jar/wfc-modules-system.jar /opt/wfc/wfc-modules-system.jar # 启动系统服务 ENTRYPOINT ["java","-jar","wfc-modules-system.jar"] \ No newline at end of file diff --git a/docker/wfc/modules/user/dockerfile b/docker/wfc/modules/user/dockerfile index 9beb563..0438d8d 100644 --- a/docker/wfc/modules/user/dockerfile +++ b/docker/wfc/modules/user/dockerfile @@ -4,12 +4,12 @@ FROM openjdk:8-jre MAINTAINER wfc # 挂载目录 -VOLUME /home/wfc +VOLUME /opt/wfc # 创建目录 -RUN mkdir -p /home/wfc +RUN mkdir -p /opt/wfc # 指定路径 -WORKDIR /home/wfc +WORKDIR /opt/wfc # 复制jar文件到路径 -COPY ./jar/wfc-modules-user.jar /home/wfc/wfc-modules-user.jar +COPY ./jar/wfc-modules-user.jar /opt/wfc/wfc-modules-user.jar # 启动系统服务 ENTRYPOINT ["java","-jar","wfc-modules-user.jar"] \ No newline at end of file diff --git a/docker/wfc/visual/monitor/dockerfile b/docker/wfc/visual/monitor/dockerfile index f2473be..aad45fc 100644 --- a/docker/wfc/visual/monitor/dockerfile +++ b/docker/wfc/visual/monitor/dockerfile @@ -4,12 +4,12 @@ FROM openjdk:8-jre MAINTAINER wfc # 挂载目录 -VOLUME /home/wfc +VOLUME /opt/wfc # 创建目录 -RUN mkdir -p /home/wfc +RUN mkdir -p /opt/wfc # 指定路径 -WORKDIR /home/wfc +WORKDIR /opt/wfc # 复制jar文件到路径 -COPY ./jar/wfc-visual-monitor.jar /home/wfc/wfc-visual-monitor.jar +COPY ./jar/wfc-visual-monitor.jar /opt/wfc/wfc-visual-monitor.jar # 启动系统服务 ENTRYPOINT ["java","-jar","wfc-visual-monitor.jar"] \ No newline at end of file diff --git a/pom.xml b/pom.xml index 13f3d05..d495e0f 100644 --- a/pom.xml +++ b/pom.xml @@ -39,6 +39,8 @@ 1.6.2 1.6.2 3.8.1 + ${env.NACOS_SERVER_NAME} + ${env.NACOS_SERVER_PORT} 9.0.96 @@ -452,7 +454,7 @@ prod - ${NACOS_SERVER_ADDR} + ${wfc.nacos.server}:${wfc.nacos.port} wfc-prod diff --git a/wfc-auth/src/main/resources/bootstrap.yml b/wfc-auth/src/main/resources/bootstrap.yml index f70da2f..88a955b 100644 --- a/wfc-auth/src/main/resources/bootstrap.yml +++ b/wfc-auth/src/main/resources/bootstrap.yml @@ -1,6 +1,6 @@ # Tomcat server: - port: 9200 + port: ${AUTH_SERVER_PORT:8081} # Spring spring: @@ -14,12 +14,12 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: ${NACOS_SERVER_ADDR} - namespace: ${NACOS_NAME_SPACE} + server-addr: ${NACOS_SERVER_NAME:wfc-nacos}:${NACOS_SERVER_PORT:8848} + namespace: ${NACOS_NAME_SPACE:wfc-prod} config: # 配置中心地址 - server-addr: ${NACOS_SERVER_ADDR} - namespace: ${NACOS_NAME_SPACE} + server-addr: ${NACOS_SERVER_NAME:wfc-nacos}:${NACOS_SERVER_PORT:8848} + namespace: ${NACOS_NAME_SPACE:wfc-prod} # 配置文件格式 file-extension: yml # 共享配置 diff --git a/wfc-gateway/src/main/resources/bootstrap.yml b/wfc-gateway/src/main/resources/bootstrap.yml index 1c5dd96..8943f0c 100644 --- a/wfc-gateway/src/main/resources/bootstrap.yml +++ b/wfc-gateway/src/main/resources/bootstrap.yml @@ -1,6 +1,6 @@ # Tomcat server: - port: 8080 + port: ${GATEWAY_SERVER_PORT:8080} # Spring spring: @@ -14,12 +14,12 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: ${NACOS_SERVER_ADDR} - namespace: ${NACOS_NAME_SPACE} + server-addr: ${NACOS_SERVER_NAME:wfc-nacos}:${NACOS_SERVER_PORT:8848} + namespace: ${NACOS_NAME_SPACE:wfc-prod} config: # 配置中心地址 - server-addr: ${NACOS_SERVER_ADDR} - namespace: ${NACOS_NAME_SPACE} + server-addr: ${NACOS_SERVER_NAME:wfc-nacos}:${NACOS_SERVER_PORT:8848} + namespace: ${NACOS_NAME_SPACE:wfc-prod} # 配置文件格式 file-extension: yml # 共享配置 @@ -35,7 +35,7 @@ spring: datasource: ds1: nacos: - server-addr: ${NACOS_SERVER_ADDR} + server-addr: ${NACOS_SERVER_NAME:wfc-nacos}:${NACOS_SERVER_PORT:8848} 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 a8066fa..48793b5 100644 --- a/wfc-modules/wfc-file/src/main/resources/bootstrap.yml +++ b/wfc-modules/wfc-file/src/main/resources/bootstrap.yml @@ -1,6 +1,6 @@ # Tomcat server: - port: 9300 + port: ${WFC_FILE_PORT:9201} # Spring spring: @@ -14,12 +14,12 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: ${NACOS_SERVER_ADDR} - namespace: ${NACOS_NAME_SPACE} + server-addr: ${NACOS_SERVER_NAME:wfc-nacos}:${NACOS_SERVER_PORT:8848} + namespace: ${NACOS_NAME_SPACE:wfc-prod} config: # 配置中心地址 - server-addr: ${NACOS_SERVER_ADDR} - namespace: ${NACOS_NAME_SPACE} + server-addr: ${NACOS_SERVER_NAME:wfc-nacos}:${NACOS_SERVER_PORT:8848} + namespace: ${NACOS_NAME_SPACE:wfc-prod} # 配置文件格式 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 b91c972..79c72fc 100644 --- a/wfc-modules/wfc-gen/src/main/resources/bootstrap.yml +++ b/wfc-modules/wfc-gen/src/main/resources/bootstrap.yml @@ -1,6 +1,6 @@ # Tomcat server: - port: 9202 + port: ${WFC_GEN_PORT:9202} # Spring spring: @@ -14,12 +14,12 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: ${NACOS_SERVER_ADDR} - namespace: ${NACOS_NAME_SPACE} + server-addr: ${NACOS_SERVER_NAME:wfc-nacos}:${NACOS_SERVER_PORT:8848} + namespace: ${NACOS_NAME_SPACE:wfc-prod} config: # 配置中心地址 - server-addr: ${NACOS_SERVER_ADDR} - namespace: ${NACOS_NAME_SPACE} + server-addr: ${NACOS_SERVER_NAME:wfc-nacos}:${NACOS_SERVER_PORT:8848} + namespace: ${NACOS_NAME_SPACE:wfc-prod} # 配置文件格式 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 a189bf9..21b36d1 100644 --- a/wfc-modules/wfc-job/src/main/resources/bootstrap.yml +++ b/wfc-modules/wfc-job/src/main/resources/bootstrap.yml @@ -1,6 +1,6 @@ # Tomcat server: - port: 9203 + port: ${WFC_JOB_PORT:9203} # Spring spring: @@ -14,12 +14,12 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: ${NACOS_SERVER_ADDR} - namespace: ${NACOS_NAME_SPACE} + server-addr: ${NACOS_SERVER_NAME:wfc-nacos}:${NACOS_SERVER_PORT:8848} + namespace: ${NACOS_NAME_SPACE:wfc-prod} config: # 配置中心地址 - server-addr: ${NACOS_SERVER_ADDR} - namespace: ${NACOS_NAME_SPACE} + server-addr: ${NACOS_SERVER_NAME:wfc-nacos}:${NACOS_SERVER_PORT:8848} + namespace: ${NACOS_NAME_SPACE:wfc-prod} # 配置文件格式 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 93b3528..7892a51 100644 --- a/wfc-modules/wfc-payment/src/main/resources/bootstrap.yml +++ b/wfc-modules/wfc-payment/src/main/resources/bootstrap.yml @@ -14,12 +14,12 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: wfc-nacos:${NACOS_SERVER_PORT} - namespace: ${NACOS_NAME_SPACE} + server-addr: ${NACOS_SERVER_NAME:wfc-nacos}:${NACOS_SERVER_PORT:8848} + namespace: ${NACOS_NAME_SPACE:wfc-prod} config: # 配置中心地址 - server-addr: wfc-nacos:${NACOS_SERVER_PORT} - namespace: ${NACOS_NAME_SPACE} + server-addr: ${NACOS_SERVER_NAME:wfc-nacos}:${NACOS_SERVER_PORT:8848} + namespace: ${NACOS_NAME_SPACE:wfc-prod} # 配置文件格式 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 79af505..48c9793 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: wfc-nacos:${NACOS_SERVER_PORT} - namespace: ${NACOS_NAME_SPACE} + server-addr: ${NACOS_SERVER_NAME:wfc-nacos}:${NACOS_SERVER_PORT:8848} + namespace: ${NACOS_NAME_SPACE:wfc-prod} config: # 配置中心地址 - server-addr: wfc-nacos:${NACOS_SERVER_PORT} - namespace: ${NACOS_NAME_SPACE} + server-addr: ${NACOS_SERVER_NAME:wfc-nacos}:${NACOS_SERVER_PORT:8848} + namespace: ${NACOS_NAME_SPACE:wfc-prod} # 配置文件格式 file-extension: yml # 共享配置 diff --git a/wfc-modules/wfc-user/src/main/resources/bootstrap.yml b/wfc-modules/wfc-user/src/main/resources/bootstrap.yml index e9a47a5..aa8001c 100644 --- a/wfc-modules/wfc-user/src/main/resources/bootstrap.yml +++ b/wfc-modules/wfc-user/src/main/resources/bootstrap.yml @@ -14,12 +14,12 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: wfc-nacos:${NACOS_SERVER_PORT} - namespace: ${NACOS_NAME_SPACE} + server-addr: ${NACOS_SERVER_NAME:wfc-nacos}:${NACOS_SERVER_PORT:8848} + namespace: ${NACOS_NAME_SPACE:wfc-prod} config: # 配置中心地址 - server-addr: wfc-nacos:${NACOS_SERVER_PORT} - namespace: ${NACOS_NAME_SPACE} + server-addr: ${NACOS_SERVER_NAME:wfc-nacos}:${NACOS_SERVER_PORT:8848} + namespace: ${NACOS_NAME_SPACE:wfc-prod} # 配置文件格式 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 c5aa216..a4ea35c 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: ${NACOS_SERVER_ADDR} - namespace: ${NACOS_NAME_SPACE} + server-addr: ${NACOS_SERVER_NAME:wfc-nacos}:${NACOS_SERVER_PORT:8848} + namespace: ${NACOS_NAME_SPACE:wfc-prod} config: # 配置中心地址 - server-addr: ${NACOS_SERVER_ADDR} - namespace: ${NACOS_NAME_SPACE} + server-addr: ${NACOS_SERVER_NAME:wfc-nacos}:${NACOS_SERVER_PORT:8848} + namespace: ${NACOS_NAME_SPACE:wfc-prod} # 配置文件格式 file-extension: yml # 共享配置