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

Compare commits

merge into: weiaisuosi/nanguangszwlback:dev_crkbh_260721
Branches Tags
weiaisuosi/nanguangszwlback:cangmapda_260710 weiaisuosi/nanguangszwlback:dev weiaisuosi/nanguangszwlback:dev-bms-260826 weiaisuosi/nanguangszwlback:dev-ty1.2 weiaisuosi/nanguangszwlback:dev_sfjk_0827 weiaisuosi/nanguangszwlback:dev_820 weiaisuosi/nanguangszwlback:feature/dev-0729 weiaisuosi/nanguangszwlback:dev-bms-0723 weiaisuosi/nanguangszwlback:dev_crkbh_260721 weiaisuosi/nanguangszwlback:dev_jinji weiaisuosi/nanguangszwlback:dev_v3.0.5 weiaisuosi/nanguangszwlback:lop weiaisuosi/nanguangszwlback:dev_jhyydgz_0622 weiaisuosi/nanguangszwlback:test weiaisuosi/nanguangszwlback:master weiaisuosi/nanguangszwlback:dev_minio_20251210
...
pull from: weiaisuosi/nanguangszwlback:test
Branches Tags
weiaisuosi/nanguangszwlback:dev weiaisuosi/nanguangszwlback:dev-bms-260826 weiaisuosi/nanguangszwlback:dev-ty1.2 weiaisuosi/nanguangszwlback:dev_sfjk_0827 weiaisuosi/nanguangszwlback:dev_820 weiaisuosi/nanguangszwlback:feature/dev-0729 weiaisuosi/nanguangszwlback:dev-bms-0723 weiaisuosi/nanguangszwlback:dev_crkbh_260721 weiaisuosi/nanguangszwlback:dev_jinji weiaisuosi/nanguangszwlback:cangmapda_260710 weiaisuosi/nanguangszwlback:dev_v3.0.5 weiaisuosi/nanguangszwlback:lop weiaisuosi/nanguangszwlback:dev_jhyydgz_0622 weiaisuosi/nanguangszwlback:test weiaisuosi/nanguangszwlback:master weiaisuosi/nanguangszwlback:dev_minio_20251210
13 Commits
dev_crkbh_260721 ... test
Author SHA1 Message Date
王奎兴 f6b112a134 dockerfile jdk修改 2026-02-10 17:47:33 +08:00
王奎兴 afc47230df bms nacos配置修改; 2026-02-09 15:23:17 +08:00
王奎兴 4917dcb154 修改dockerfile jar包位置 2026-02-09 15:14:52 +08:00
王奎兴 b136e6a55e bms及bms达梦配置修改; 2026-02-09 14:58:07 +08:00
王奎兴 1eb2f4c816 测试环境nacos配置修改; 2026-02-09 14:46:28 +08:00
王奎兴 8ca0b289fa Merge branch 'dev' into test 2026-02-09 14:45:24 +08:00
王奎兴 457fceb0b1 测试环境nacos配置修改; 2026-02-09 14:44:40 +08:00
王奎兴 4f16713c03 Merge branch 'dev' into test 
# Conflicts:
#	mhd-user-center/src/main/resources/bootstrap.yml
#	mhd_finance/src/main/resources/bootstrap.yml
 2026-02-09 14:40:57 +08:00
赵辉 98c4c08a8f 修改密码修正 2026-02-06 18:51:54 +08:00
赵辉 5170a2d96f Merge branch 'dev' into test 2026-02-06 18:50:42 +08:00
赵辉 d1e982b9d4 Merge branch 'dev' into test 2026-02-06 15:26:00 +08:00
赵辉 c0c75e2db0 Merge branch 'dev' into test 
# Conflicts:
#	mhd_finance/src/main/resources/bootstrap.yml
 2026-02-06 14:20:05 +08:00
赵辉 8f8bda4a87 yml修改 2026-02-06 14:19:37 +08:00
16 changed files with 49 additions and 231 deletions
Expand all files Collapse all files
mhd-auth/src/main/resources/bootstrap.yml
+3 -13
View File
@@ -12,24 +12,14 @@ spring:
cloud:
nacos:
discovery:
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.5:6848
# username: nacos
# password: manhuoda@2023
config:
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
#线上正式环境
group: DEFAULT_GROUP # 默认分组就是DEFAULT_GROUP，如果使用默认分组可以不配置
file-extension: yml #默认properties
# 共享配置
shared-configs:
- application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
- application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
mhd-gateway/src/main/resources/bootstrap.yml
+3 -17
View File
@@ -13,26 +13,12 @@ spring:
cloud:
nacos:
discovery:
# server-addr: 127.0.0.1:8848
server-addr: 10.33.0.129:6010
# 线上测试环境配置 容器名+端口号
# server-addr: 10.102.192.5:6848
# server-addr: 10.33.0.129:6010
#线上正式环境
server-addr: 127.0.0.1:8848
# server-addr: 10.102.192.5:6848
username: nacos
password: manhuoda@2023
config:
# server-addr: 127.0.0.1:8848
# 线上测试环境配置 容器名+端口号
# server-addr: 10.33.0.129:6010
#线上正式环境
server-addr: 127.0.0.1:8848
# server-addr: 10.102.192.5:6848
username: nacos
password: manhuoda@2023
server-addr: 10.33.0.129:6010
group: DEFAULT_GROUP # 默认分组就是DEFAULT_GROUP，如果使用默认分组可以不配置
file-extension: yml #默认properties
# 共享配置
shared-configs:
- application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
- application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
mhd-modules/mhd-system/src/main/resources/bootstrap.yml
+3 -16
View File
@@ -13,25 +13,12 @@ spring:
cloud:
nacos:
discovery:
server-addr: 127.0.0.1:8848
# server-addr: 10.33.0.129:6010
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-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
server-addr: 10.33.0.129:6010
group: DEFAULT_GROUP # 默认分组就是DEFAULT_GROUP，如果使用默认分组可以不配置
file-extension: yml #默认properties
# 共享配置
shared-configs:
- application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
- application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
mhd-user-center/src/main/resources/bootstrap.yml
+2 -11
View File
@@ -18,19 +18,10 @@ spring:
cloud:
nacos:
discovery:
server-addr: 127.0.0.1:8848
server-addr: 10.33.0.129:6010
# 线上测试环境配置 容器名+端口号
# server-addr: 10.33.0.129:6010
# server-addr: 10.102.192.5:6848
username: nacos
password: manhuoda@2023
config:
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.33.0.129:6010
group: DEFAULT_GROUP # 默认分组就是DEFAULT_GROUP，如果使用默认分组可以不配置
file-extension: yml #默认properties
# 共享配置
mhd_bms/Dockerfile
+3 -3
View File
@@ -1,5 +1,5 @@
# 基础镜像
FROM kdvolder/jdk8
FROM arm64v8/openjdk:8
# author
MAINTAINER manhuoda
#指定东八区时区
@@ -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/pom.xml
+8 -3
View File
@@ -85,9 +85,14 @@
<artifactId>mhd-common-redis</artifactId>
</dependency>
<!-- Mysql Connector -->
<dependency>
<!--<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
</dependency>-->
<dependency>
<groupId>com.dameng</groupId>
<artifactId>DmJdbcDriver18</artifactId>
<version>8.1.1.193</version>
</dependency>
<!--添加druid连接池 依赖 -->
<dependency>
@@ -99,7 +104,7 @@
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.18.4</version>
<version>1.18.30</version>
<scope>provided</scope>
</dependency>
<!--import mybatis plus 它会自动引入mybatis及mybatis spring切勿重复引用以免冲突-->
@@ -174,4 +179,4 @@
</build>
</profile>
</profiles>
</project>
</project>
mhd_bms/src/main/resources/bootstrap.yml
+4 -9
View File
@@ -16,18 +16,13 @@ spring:
cloud:
nacos:
discovery:
server-addr: 127.0.0.1:8848
server-addr: 10.33.0.129:6010
# 线上测试环境配置 容器名+端口号
config:
# 配置中心地址
server-addr: 127.0.0.1:8848
# 锁定server端的配置文件（读取它的配置项）
namespace: # 命名空间id
server-addr: 10.33.0.129:6010
group: DEFAULT_GROUP # 默认分组就是DEFAULT_GROUP，如果使用默认分组可以不配置
file-extension: yml #默认properties
# 开启nacos自动刷新，如果这个配置没有或者为false会导致配置不能自动刷新
# 允许nacos服务端向本地同步配置
enable-remote-sync-config: true
refresh-enabled: true
refresh-enabled: true
mhd_finance/src/main/resources/bootstrap.yml
+3 -27
View File
@@ -18,36 +18,12 @@ spring:
cloud:
nacos:
discovery:
# server-addr: 127.0.0.1:8848
server-addr: 10.33.0.129:6010
# 线上测试环境配置 容器名+端口号
# server-addr: 10.33.0.129:6010
# server-addr: 10.102.192.5:6848
# username: nacos
# password: manhuoda@2023
#线上正式环境
server-addr: 127.0.0.1:8848
# 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-addr: 116.204.23.92:8848
# 线上测试环境配置 容器名+端口号
# server-addr: 10.33.0.129:6010
# server-addr: 10.102.192.5:6848
# username: nacos
# password: manhuoda@2023
#线上正式环境
server-addr: 127.0.0.1:8848
# server-addr: 10.102.192.5:6848
username: nacos
password: manhuoda@2023
#线上正式环境
# server-addr: 10.102.192.105:6848
server-addr: 10.33.0.129:6010
group: DEFAULT_GROUP # 默认分组就是DEFAULT_GROUP，如果使用默认分组可以不配置
file-extension: yml #默认properties
# 共享配置
shared-configs:
- application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
- application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
mhd_oms/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_oms.jar mhd_oms.jar
ADD target/mhd_oms.jar mhd_oms.jar
#暴露容器端口 Docker镜像告知Docker宿主机应用监听了端口
EXPOSE 8017
# 运行jar包
ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-Xms1000m", "-Xmx1500m","-jar","/mhd_oms.jar"]
ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-Xms1000m", "-Xmx1500m","-jar","/mhd_oms.jar"]
mhd_oms/src/main/resources/bootstrap.yml
+4 -33
View File
@@ -16,39 +16,10 @@ 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
# ip: 118.25.4.55
# 大运通泰生产环境
# server-addr: 39.107.137.158:8848
# 线上测试环境
# server-addr: 116.204.23.92:8848
server-addr: 10.33.0.129:6010
# 线上测试环境配置 容器名+端口号
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端的配置文件（读取它的配置项）
server-addr: 10.33.0.129:6010
namespace: # 命名空间id
group: DEFAULT_GROUP # 默认分组就是DEFAULT_GROUP，如果使用默认分组可以不配置
file-extension: yml #默认properties
file-extension: yml #默认properties
mhd_product/src/main/resources/bootstrap.yml
+2 -21
View File
@@ -18,29 +18,10 @@ spring:
cloud:
nacos:
discovery:
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.5:6848
# username: nacos
# password: manhuoda@2023
#线上正式环境
# server-addr: 10.102.192.105:6848
config:
server-addr: 127.0.0.1:8848
# 线上测试环境配置 容器名+端口号
# server-addr: 10.102.192.5:6848
username: nacos
password: manhuoda@2023
#线上正式环境
# server-addr: 10.102.192.5:6848
# username: nacos
# password: manhuoda@2023
#线上正式环境
# server-addr: 10.102.192.105:6848
server-addr: 10.33.0.129:6010
group: DEFAULT_GROUP # 默认分组就是DEFAULT_GROUP，如果使用默认分组可以不配置
file-extension: yml #默认properties
# 共享配置
mhd_thrid_party/src/main/resources/bootstrap.yml
+2 -21
View File
@@ -18,29 +18,10 @@ spring:
cloud:
nacos:
discovery:
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.5:6848
# username: nacos
# password: manhuoda@2023
#线上正式环境
# server-addr: 10.102.192.105:6848
config:
server-addr: 127.0.0.1:8848
# 线上测试环境配置 容器名+端口号
# server-addr: 10.102.192.5:6848
username: nacos
password: manhuoda@2023
#线上正式环境
# server-addr: 10.102.192.5:6848
# username: nacos
# password: manhuoda@2023
#线上正式环境
# server-addr: 10.102.192.105:6848
server-addr: 10.33.0.129:6010
group: DEFAULT_GROUP # 默认分组就是DEFAULT_GROUP，如果使用默认分组可以不配置
file-extension: yml #默认properties
# 共享配置
mhd_transport/src/main/resources/bootstrap.yml
+3 -24
View File
@@ -18,31 +18,10 @@ spring:
cloud:
nacos:
discovery:
server-addr: 127.0.0.1:8848
# 线上测试环境配置使用ip+端口号
# server-addr: 10.33.0.129:6010
# server-addr: 10.102.192.5:6848
username: nacos
password: manhuoda@2023
#线上正式环境
# server-addr: 10.102.192.5:6848
# username: nacos
# password: manhuoda@2023
#线上正式环境
# server-addr: 10.102.192.105:6848
server-addr: 10.33.0.129:6010
# 线上测试环境配置 容器名+端口号
config:
server-addr: 127.0.0.1:8848
# 线上测试环境配置使用ip+端口号
# server-addr: 10.102.192.5:6848
username: nacos
password: manhuoda@2023
#线上正式环境
# server-addr: 10.102.192.5:6848
# username: nacos
# password: manhuoda@2023
# server-addr: 10.33.0.129:6010
#线上正式环境
# server-addr: 10.102.192.105:6848
server-addr: 10.33.0.129:6010
group: DEFAULT_GROUP # 默认分组就是DEFAULT_GROUP，如果使用默认分组可以不配置
file-extension: yml #默认properties
# 共享配置
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
+4 -29
View File
@@ -13,37 +13,12 @@ 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: 10.33.0.129:6010
# 线上测试环境配置 容器名+端口号
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: 10.33.0.129:6010
# 配置文件格式
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}
pom.xml
+1
View File
@@ -301,6 +301,7 @@
<module>mhd_thrid_party</module>
<module>mhd_oms</module>
<module>mhd_wms</module>
<module>mhd_bms</module>
</modules>
<packaging>pom</packaging>