weiaisuosi/nanguangszwlback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
zhou-hongcheng
2026-03-10 16:32:29 +08:00
parent feb13e3ece 6ad6a1a5a0
commit 7067220f7f
4 changed files with 38 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd_bms/Dockerfile
+2 -2
View File
@@ -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"]
mhd_bms/src/main/resources/bootstrap.yml
+17 -9
View File
@@ -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
mhd_wms/Dockerfile
+2 -2
View File
@@ -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"]
mhd_wms/src/main/resources/bootstrap.yml
+17 -29
View File
@@ -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}