From 62672a60f723cc9cf7d0e056e8ac4782a1ed81d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Tue, 10 Mar 2026 16:17:25 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=8F=91=E5=8C=85=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E9=85=8D=E7=BD=AE;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mhd_bms/src/main/resources/bootstrap.yml | 26 +++++++++----- mhd_wms/src/main/resources/bootstrap.yml | 46 +++++++++--------------- 2 files changed, 34 insertions(+), 38 deletions(-) diff --git a/mhd_bms/src/main/resources/bootstrap.yml b/mhd_bms/src/main/resources/bootstrap.yml index 7803d21bb..a77f8fe02 100644 --- a/mhd_bms/src/main/resources/bootstrap.yml +++ b/mhd_bms/src/main/resources/bootstrap.yml @@ -16,18 +16,26 @@ spring: cloud: nacos: discovery: - server-addr: 127.0.0.1:8848 + # server-addr: 127.0.0.1:8848 + server-addr: 10.33.0.129:6010 + # 线上测试环境配置 容器名+端口号 + # server-addr: 10.102.192.5:6848 + # username: nacos + # password: manhuoda@2023 + #线上正式环境 + # server-addr: 10.102.192.105:6848 config: - # 配置中心地址 - server-addr: 127.0.0.1:8848 - # 锁定server端的配置文件（读取它的配置项） - namespace: # 命名空间id + # server-addr: 127.0.0.1:8848 + server-addr: 10.33.0.129:6010 + # 线上测试环境配置 容器名+端口号 + # server-addr: 10.102.192.5:6848 + # username: nacos + # password: manhuoda@2023 + #线上正式环境 + # server-addr: 10.102.192.105:6848 group: DEFAULT_GROUP # 默认分组就是DEFAULT_GROUP，如果使用默认分组可以不配置 file-extension: yml #默认properties # 开启nacos自动刷新，如果这个配置没有或者为false会导致配置不能自动刷新 # 允许nacos服务端向本地同步配置 enable-remote-sync-config: true - refresh-enabled: true - - - + refresh-enabled: true \ No newline at end of file diff --git a/mhd_wms/src/main/resources/bootstrap.yml b/mhd_wms/src/main/resources/bootstrap.yml index daa9ac6db..26f5fddc5 100644 --- a/mhd_wms/src/main/resources/bootstrap.yml +++ b/mhd_wms/src/main/resources/bootstrap.yml @@ -13,37 +13,25 @@ spring: cloud: nacos: discovery: - # 服务注册地址 - server-addr: 127.0.0.1:8848 - username: nacos - password: manhuoda@2023 - # 演示环境 -# server-addr: 47.92.229.169:8848 - # 测试开发环境 -# server-addr: 192.168.10.18:8848 - # Saas环境 -# server-addr: 8.130.64.92:8848 - # 大运通泰生产环境 -# server-addr: 39.107.137.158:8848 - # 线上测试环境 -# server-addr: 116.204.23.92:8848 + # server-addr: 127.0.0.1:8848 + server-addr: 10.33.0.129:6010 + # 线上测试环境配置 容器名+端口号 + # server-addr: 10.102.192.5:6848 + # username: nacos + # password: manhuoda@2023 + #线上正式环境 + # server-addr: 10.102.192.105:6848 config: - # 配置中心地址 - server-addr: 127.0.0.1:8848 - username: nacos - password: manhuoda@2023 - # 演示环境 -# server-addr: 47.92.229.169:8848 - # 测试开发环境 -# server-addr: 192.168.10.18:8848 - # Saas环境 -# server-addr: 8.130.64.92:8848 - # 大运通泰生产环境 -# server-addr: 39.107.137.158:8848 - # 线上测试环境 -# server-addr: 116.204.23.92:8848 + # server-addr: 127.0.0.1:8848 + server-addr: 10.33.0.129:6010 + # 线上测试环境配置 容器名+端口号 + # server-addr: 10.102.192.5:6848 + # username: nacos + # password: manhuoda@2023 + #线上正式环境 + # server-addr: 10.102.192.105:6848 # 配置文件格式 file-extension: yml # 共享配置 shared-configs: - - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} \ No newline at end of file From 6ad6a1a5a0923a9a3eb5dd447ba30a1eeb8cc2ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Tue, 10 Mar 2026 16:21:19 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=89=93=E5=8C=85=E6=8A=A5=E9=94=99?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mhd_bms/Dockerfile | 4 ++-- mhd_wms/Dockerfile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mhd_bms/Dockerfile b/mhd_bms/Dockerfile index 04fc6ed22..40e037546 100644 --- a/mhd_bms/Dockerfile +++ b/mhd_bms/Dockerfile @@ -10,8 +10,8 @@ ENV JAVA_TOOL_OPTIONS="-Dfile.encoding=UTF-8" # 其效果是在主机 /var/lib/docker 目录下创建了一个临时文件，并链接到容器的/tmp VOLUME /tmp #将当前jar 复制到容器根目录下 -ADD mhd_bms.jar mhd_bms.jar +ADD target/mhd_bms.jar mhd_bms.jar #暴露容器端口 Docker镜像告知Docker宿主机应用监听了端口 EXPOSE 8019 # 运行jar包 -ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-Xms1000m", "-Xmx1500m","-jar","/mhd_bms.jar"] +ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-Xms1000m", "-Xmx1500m","-jar","/mhd_bms.jar"] \ No newline at end of file diff --git a/mhd_wms/Dockerfile b/mhd_wms/Dockerfile index 05b4b637a..86659fd11 100644 --- a/mhd_wms/Dockerfile +++ b/mhd_wms/Dockerfile @@ -10,8 +10,8 @@ ENV JAVA_TOOL_OPTIONS="-Dfile.encoding=UTF-8" # 其效果是在主机 /var/lib/docker 目录下创建了一个临时文件，并链接到容器的/tmp VOLUME /tmp #将当前mhd_special_logistics.jar 复制到容器根目录下 -ADD mhd_wms.jar mhd_wms.jar +ADD target/mhd_wms.jar mhd_wms.jar #暴露容器端口 Docker镜像告知Docker宿主机应用监听了端口 EXPOSE 8017 # 运行jar包 -ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-Xms1000m", "-Xmx1500m","-jar","/mhd_wms.jar"] +ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-Xms1000m", "-Xmx1500m","-jar","/mhd_wms.jar"] \ No newline at end of file