From c58b3cc689b07b18859a8bc6c75ad1c8b50172da Mon Sep 17 00:00:00 2001 From: "LAPTOP-DREK3SC6\\86186" <577364224@qq.com> Date: Mon, 8 Dec 2025 23:46:19 +0800 Subject: [PATCH 01/10] =?UTF-8?q?arm=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mhd-auth/Dockerfile | 3 +- mhd-auth/pom.xml | 14 +++ mhd-auth/src/main/resources/bootstrap.yml | 8 +- mhd-gateway/Dockerfile | 2 +- mhd-gateway/pom.xml | 14 +++ mhd-gateway/src/main/resources/bootstrap.yml | 10 +- mhd-modules/mhd-system/Dockerfile | 2 +- mhd-modules/mhd-system/pom.xml | 15 +++ .../src/main/resources/bootstrap.yml | 8 +- mhd-user-center/Dockerfile | 7 +- mhd-user-center/pom.xml | 14 +++ .../src/main/resources/bootstrap.yml | 8 +- mhd_finance/Dockerfile | 2 +- mhd_finance/pom.xml | 13 +++ mhd_finance/src/main/resources/bootstrap.yml | 10 +- mhd_product/Dockerfile | 2 +- mhd_product/pom.xml | 14 +++ mhd_product/src/main/resources/bootstrap.yml | 8 +- mhd_thrid_party/Dockerfile | 2 +- mhd_thrid_party/pom.xml | 14 ++- .../src/main/resources/bootstrap.yml | 8 +- mhd_transport/Dockerfile | 2 +- mhd_transport/pom.xml | 13 +++ .../src/main/resources/bootstrap.yml | 2 + pom.xml | 109 +++++++++++++++++- 25 files changed, 259 insertions(+), 45 deletions(-) diff --git a/mhd-auth/Dockerfile b/mhd-auth/Dockerfile index ab8325a42..d29ce88f5 100644 --- a/mhd-auth/Dockerfile +++ b/mhd-auth/Dockerfile @@ -1,5 +1,5 @@ # 基础镜像 -FROM kdvolder/jdk8 +FROM arm64v8/openjdk:8-jre-slim # author MAINTAINER manhuoda #指定东八区时区 @@ -15,3 +15,4 @@ ADD mhd-auth.jar mhd-auth.jar EXPOSE 9200 # 运行jar包 ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-Xms1000m", "-Xmx1500m","-jar","/mhd-auth.jar"] + diff --git a/mhd-auth/pom.xml b/mhd-auth/pom.xml index 9961823e0..ce1606edc 100644 --- a/mhd-auth/pom.xml +++ b/mhd-auth/pom.xml @@ -85,4 +85,18 @@ + + + mhd-auth + + + + com.spotify + dockerfile-maven-plugin + + + + + + diff --git a/mhd-auth/src/main/resources/bootstrap.yml b/mhd-auth/src/main/resources/bootstrap.yml index 9e60f8ac2..ddb64b1d3 100644 --- a/mhd-auth/src/main/resources/bootstrap.yml +++ b/mhd-auth/src/main/resources/bootstrap.yml @@ -12,13 +12,13 @@ spring: cloud: nacos: discovery: - server-addr: 127.0.0.1:8848 +# server-addr: 127.0.0.1:8848 # 线上测试环境配置 容器名+端口号 - #server-addr: mhd-nacos:8848 + server-addr: 10.33.0.129:6010 config: - server-addr: 127.0.0.1:8848 +# server-addr: 127.0.0.1:8848 # 线上测试环境配置 容器名+端口号 - #server-addr: mhd-nacos:8848 + server-addr: 10.33.0.129:6010 group: DEFAULT_GROUP # 默认分组就是DEFAULT_GROUP，如果使用默认分组可以不配置 file-extension: yml #默认properties # 共享配置 diff --git a/mhd-gateway/Dockerfile b/mhd-gateway/Dockerfile index 9c79e4652..8b870933c 100644 --- a/mhd-gateway/Dockerfile +++ b/mhd-gateway/Dockerfile @@ -1,5 +1,5 @@ # 基础镜像 -FROM kdvolder/jdk8 +FROM arm64v8/openjdk:8-jre-slim # author MAINTAINER manhuoda #指定东八区时区 diff --git a/mhd-gateway/pom.xml b/mhd-gateway/pom.xml index 6cda48c31..b066a4359 100644 --- a/mhd-gateway/pom.xml +++ b/mhd-gateway/pom.xml @@ -127,4 +127,18 @@ + + + mhd-gateway + + + + com.spotify + dockerfile-maven-plugin + + + + + + diff --git a/mhd-gateway/src/main/resources/bootstrap.yml b/mhd-gateway/src/main/resources/bootstrap.yml index e858447d1..d1a88efe4 100644 --- a/mhd-gateway/src/main/resources/bootstrap.yml +++ b/mhd-gateway/src/main/resources/bootstrap.yml @@ -13,13 +13,15 @@ spring: cloud: nacos: discovery: - server-addr: 127.0.0.1:8848 +# server-addr: 127.0.0.1:8848 # 线上测试环境配置 容器名+端口号 - #server-addr: mhd-nacos:8848 +# server-addr: 10.102.192.5:6848 + server-addr: 10.33.0.129:6010 config: - server-addr: 127.0.0.1:8848 +# server-addr: 127.0.0.1:8848 # 线上测试环境配置 容器名+端口号 - #server-addr: mhd-nacos:8848 +# server-addr: 10.102.192.5:6848 + server-addr: 10.33.0.129:6010 group: DEFAULT_GROUP # 默认分组就是DEFAULT_GROUP，如果使用默认分组可以不配置 file-extension: yml #默认properties # 共享配置 diff --git a/mhd-modules/mhd-system/Dockerfile b/mhd-modules/mhd-system/Dockerfile index 3098d7b9f..e301ffd5a 100644 --- a/mhd-modules/mhd-system/Dockerfile +++ b/mhd-modules/mhd-system/Dockerfile @@ -1,5 +1,5 @@ # 基础镜像 -FROM kdvolder/jdk8 +FROM arm64v8/openjdk:8-jre-slim # author MAINTAINER manhuoda #指定东八区时区 diff --git a/mhd-modules/mhd-system/pom.xml b/mhd-modules/mhd-system/pom.xml index 923472867..b58151899 100644 --- a/mhd-modules/mhd-system/pom.xml +++ b/mhd-modules/mhd-system/pom.xml @@ -148,4 +148,19 @@ + + + + mhd-modules-system + + + + com.spotify + dockerfile-maven-plugin + + + + + + diff --git a/mhd-modules/mhd-system/src/main/resources/bootstrap.yml b/mhd-modules/mhd-system/src/main/resources/bootstrap.yml index 351d1a52d..16293438f 100644 --- a/mhd-modules/mhd-system/src/main/resources/bootstrap.yml +++ b/mhd-modules/mhd-system/src/main/resources/bootstrap.yml @@ -13,13 +13,13 @@ spring: cloud: nacos: discovery: - server-addr: 127.0.0.1:8848 +# server-addr: 127.0.0.1:8848 # 线上测试环境配置 容器名+端口号 - #server-addr: mhd-nacos:8848 + server-addr: 10.33.0.129:6010 config: - server-addr: 127.0.0.1:8848 +# server-addr: 127.0.0.1:8848 # 线上测试环境配置 容器名+端口号 - #server-addr: mhd-nacos:8848 + server-addr: 10.33.0.129:6010 group: DEFAULT_GROUP # 默认分组就是DEFAULT_GROUP，如果使用默认分组可以不配置 file-extension: yml #默认properties # 共享配置 diff --git a/mhd-user-center/Dockerfile b/mhd-user-center/Dockerfile index 2716ebcb4..ac5ee8857 100644 --- a/mhd-user-center/Dockerfile +++ b/mhd-user-center/Dockerfile @@ -1,14 +1,9 @@ # 基础镜像 -FROM kdvolder/jdk8 -# author -MAINTAINER manhuoda +FROM arm64v8/openjdk:8-jre-slim #指定东八区时区 ENV TZ Asia/Shanghai #指定utf-8编码格 ENV JAVA_TOOL_OPTIONS="-Dfile.encoding=UTF-8" -# VOLUME 指定了临时文件目录为/tmp。 -# 其效果是在主机 /var/lib/docker 目录下创建了一个临时文件，并链接到容器的/tmp -VOLUME /tmp #将当前jar 复制到容器根目录下 ADD mhd-user-center.jar mhd-user-center.jar #暴露容器端口 Docker镜像告知Docker宿主机应用监听了端口 diff --git a/mhd-user-center/pom.xml b/mhd-user-center/pom.xml index 25dd0c35e..a606b42ed 100644 --- a/mhd-user-center/pom.xml +++ b/mhd-user-center/pom.xml @@ -174,4 +174,18 @@ + + + + mhd-user-center + + + + com.spotify + dockerfile-maven-plugin + + + + + diff --git a/mhd-user-center/src/main/resources/bootstrap.yml b/mhd-user-center/src/main/resources/bootstrap.yml index 611627ee0..f26ae0f15 100644 --- a/mhd-user-center/src/main/resources/bootstrap.yml +++ b/mhd-user-center/src/main/resources/bootstrap.yml @@ -20,13 +20,13 @@ spring: discovery: # server-addr: 127.0.0.1:8848 # 线上测试环境配置 容器名+端口号 - #server-addr: mhd-nacos:8848 - server-addr: 116.204.23.92:8848 + server-addr: 10.33.0.129:6010 +# server-addr: 116.204.23.92:8848 config: # server-addr: 127.0.0.1:8848 # 线上测试环境配置 容器名+端口号 - #server-addr: mhd-nacos:8848 - server-addr: 116.204.23.92:8848 + server-addr: 10.33.0.129:6010 +# server-addr: 116.204.23.92:8848 group: DEFAULT_GROUP # 默认分组就是DEFAULT_GROUP，如果使用默认分组可以不配置 file-extension: yml #默认properties # 共享配置 diff --git a/mhd_finance/Dockerfile b/mhd_finance/Dockerfile index 73e7eef62..6797e4d46 100644 --- a/mhd_finance/Dockerfile +++ b/mhd_finance/Dockerfile @@ -1,5 +1,5 @@ # 基础镜像 -FROM kdvolder/jdk8 +FROM arm64v8/openjdk:8-jre-slim # author MAINTAINER manhuoda #指定东八区时区 diff --git a/mhd_finance/pom.xml b/mhd_finance/pom.xml index b9e4a2be6..37138e56b 100644 --- a/mhd_finance/pom.xml +++ b/mhd_finance/pom.xml @@ -182,4 +182,17 @@ + + + mhd_finance + + + + com.spotify + dockerfile-maven-plugin + + + + + diff --git a/mhd_finance/src/main/resources/bootstrap.yml b/mhd_finance/src/main/resources/bootstrap.yml index cb609f6e6..97e774c85 100644 --- a/mhd_finance/src/main/resources/bootstrap.yml +++ b/mhd_finance/src/main/resources/bootstrap.yml @@ -20,13 +20,13 @@ spring: discovery: # server-addr: 127.0.0.1:8848 # 线上测试环境配置 容器名+端口号 - #server-addr: mhd-nacos:8848 - server-addr: 116.204.23.92:8848 + server-addr: 10.33.0.129:6010 +# server-addr: 116.204.23.92:8848 config: # server-addr: 127.0.0.1:8848 - server-addr: 116.204.23.92:8848 - # 线上测试环境配置 容器名+端口号 - #server-addr: mhd-nacos:8848 +# server-addr: 116.204.23.92:8848 +# 线上测试环境配置 容器名+端口号 + server-addr: 10.33.0.129:6010 group: DEFAULT_GROUP # 默认分组就是DEFAULT_GROUP，如果使用默认分组可以不配置 file-extension: yml #默认properties # 共享配置 diff --git a/mhd_product/Dockerfile b/mhd_product/Dockerfile index b1e41baab..2fc20258b 100644 --- a/mhd_product/Dockerfile +++ b/mhd_product/Dockerfile @@ -1,5 +1,5 @@ # 基础镜像 -FROM kdvolder/jdk8 +FROM arm64v8/openjdk:8-jre-slim # author MAINTAINER manhuoda #指定东八区时区 diff --git a/mhd_product/pom.xml b/mhd_product/pom.xml index 3fde65335..e665e0a44 100644 --- a/mhd_product/pom.xml +++ b/mhd_product/pom.xml @@ -149,4 +149,18 @@ + + + mhd_product + + + + com.spotify + dockerfile-maven-plugin + + + + + + diff --git a/mhd_product/src/main/resources/bootstrap.yml b/mhd_product/src/main/resources/bootstrap.yml index a3958fb96..1a8021d1d 100644 --- a/mhd_product/src/main/resources/bootstrap.yml +++ b/mhd_product/src/main/resources/bootstrap.yml @@ -18,13 +18,13 @@ spring: cloud: nacos: discovery: - server-addr: 127.0.0.1:8848 +# server-addr: 127.0.0.1:8848 # 线上测试环境配置 容器名+端口号 - #server-addr: mhd-nacos:8848 + server-addr: 10.33.0.129:6010 config: - server-addr: 127.0.0.1:8848 +# server-addr: 127.0.0.1:8848 # 线上测试环境配置 容器名+端口号 - #server-addr: mhd-nacos:8848 + server-addr: 10.33.0.129:6010 group: DEFAULT_GROUP # 默认分组就是DEFAULT_GROUP，如果使用默认分组可以不配置 file-extension: yml #默认properties # 共享配置 diff --git a/mhd_thrid_party/Dockerfile b/mhd_thrid_party/Dockerfile index 5f30e1148..6ba77d29c 100644 --- a/mhd_thrid_party/Dockerfile +++ b/mhd_thrid_party/Dockerfile @@ -1,5 +1,5 @@ # 基础镜像 -FROM kdvolder/jdk8 +FROM arm64v8/openjdk:8-jre-slim # author MAINTAINER manhuoda #指定东八区时区 diff --git a/mhd_thrid_party/pom.xml b/mhd_thrid_party/pom.xml index 7d5c8bdc4..a4341ca80 100644 --- a/mhd_thrid_party/pom.xml +++ b/mhd_thrid_party/pom.xml @@ -277,5 +277,17 @@ - + + + mhd_thrid_party + + + + com.spotify + dockerfile-maven-plugin + + + + + diff --git a/mhd_thrid_party/src/main/resources/bootstrap.yml b/mhd_thrid_party/src/main/resources/bootstrap.yml index 2a05ef307..a922ae813 100644 --- a/mhd_thrid_party/src/main/resources/bootstrap.yml +++ b/mhd_thrid_party/src/main/resources/bootstrap.yml @@ -18,13 +18,13 @@ spring: cloud: nacos: discovery: - server-addr: 127.0.0.1:8848 +# server-addr: 127.0.0.1:8848 # 线上测试环境配置 容器名+端口号 - #server-addr: mhd-nacos:8848 + server-addr: 10.33.0.129:6010 config: - server-addr: 127.0.0.1:8848 +# server-addr: 127.0.0.1:8848 # 线上测试环境配置 容器名+端口号 - #server-addr: mhd-nacos:8848 + server-addr: 10.33.0.129:6010 group: DEFAULT_GROUP # 默认分组就是DEFAULT_GROUP，如果使用默认分组可以不配置 file-extension: yml #默认properties # 共享配置 diff --git a/mhd_transport/Dockerfile b/mhd_transport/Dockerfile index 7c47729ae..f9ddb4a01 100644 --- a/mhd_transport/Dockerfile +++ b/mhd_transport/Dockerfile @@ -1,5 +1,5 @@ # 基础镜像 -FROM kdvolder/jdk8 +FROM arm64v8/openjdk:8-jre-slim # author MAINTAINER manhuoda #指定东八区时区 diff --git a/mhd_transport/pom.xml b/mhd_transport/pom.xml index 64c31ee4d..328497119 100644 --- a/mhd_transport/pom.xml +++ b/mhd_transport/pom.xml @@ -155,4 +155,17 @@ + + + mhd_transport + + + + com.spotify + dockerfile-maven-plugin + + + + + diff --git a/mhd_transport/src/main/resources/bootstrap.yml b/mhd_transport/src/main/resources/bootstrap.yml index 45d645557..464240e6c 100644 --- a/mhd_transport/src/main/resources/bootstrap.yml +++ b/mhd_transport/src/main/resources/bootstrap.yml @@ -20,10 +20,12 @@ spring: discovery: # server-addr: 127.0.0.1:8848 # 线上测试环境配置使用ip+端口号 +# server-addr: 10.33.0.129:6010r server-addr: 10.33.0.129:6010 config: # server-addr: 127.0.0.1:8848 # 线上测试环境配置使用ip+端口号 +# server-addr: 10.33.0.129:6010 server-addr: 10.33.0.129:6010 group: DEFAULT_GROUP # 默认分组就是DEFAULT_GROUP，如果使用默认分组可以不配置 file-extension: yml #默认properties diff --git a/pom.xml b/pom.xml index 8ab45146d..1762d51d6 100644 --- a/pom.xml +++ b/pom.xml @@ -43,6 +43,13 @@ 2.13.2 3.16.2 2.7.3 + + + 3.13.0 + 3.3.1 + 3.3.1 + 1.4.13 + @@ -286,7 +293,7 @@ - + @@ -334,6 +341,104 @@ + + + + src/main/resources + true + + + + + src/test/resources + true + + + + + + org.apache.maven.plugins + maven-compiler-plugin + ${plugin.maven.compiler.version} + + ${java.version} + ${java.version} + utf-8 + + + + org.apache.maven.plugins + maven-resources-plugin + ${plugin.maven.resources.version} + + UTF-8 + + + + org.apache.maven.plugins + maven-source-plugin + ${plugin.maven.source.version} + + + attach-sources + verify + + jar-no-fork + + + + + + org.springframework.boot + spring-boot-maven-plugin + ${spring.boot.version} + + + package + + repackage + + + + + true + + + + com.spotify + dockerfile-maven-plugin + ${plugin.maven.dockerfile.version} + + + default + + build + + + + + dtyb/${project.build.finalName} + ${project.version} + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + + org.apache.maven.plugins + maven-resources-plugin + + + org.apache.maven.plugins + maven-source-plugin + + + + From 099caba531ecc78ec7d08968718326e4491d79ba Mon Sep 17 00:00:00 2001 From: hjx <577364224@qq.com> Date: Tue, 9 Dec 2025 09:25:01 +0800 Subject: [PATCH 02/10] =?UTF-8?q?arm=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 1762d51d6..8b78d0b90 100644 --- a/pom.xml +++ b/pom.xml @@ -45,10 +45,27 @@ 2.7.3 - 3.13.0 - 3.3.1 - 3.3.1 + 3.12.0 + 3.1.0 + 3.1.0 1.4.13 + + 3.2.12 + 2023.0.3 + 2023.0.1.2 + + + 3.5.6 + 2.1.0 + + + 4.5.14 + 3.0.5 + 1.78 + 4.4.0 + 2.16.0 + 8.5.2 + 1.0.23 From 409af3c4ce0fa38e988f8cfa3c2bc04a1c9cab1f Mon Sep 17 00:00:00 2001 From: hjx <577364224@qq.com> Date: Tue, 9 Dec 2025 11:17:54 +0800 Subject: [PATCH 03/10] =?UTF-8?q?arm=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mhd-gateway/pom.xml | 2 ++ pom.xml | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/mhd-gateway/pom.xml b/mhd-gateway/pom.xml index b066a4359..1b3843d1e 100644 --- a/mhd-gateway/pom.xml +++ b/mhd-gateway/pom.xml @@ -141,4 +141,6 @@ + + diff --git a/pom.xml b/pom.xml index 8b78d0b90..4193cf29a 100644 --- a/pom.xml +++ b/pom.xml @@ -424,7 +424,7 @@ com.spotify dockerfile-maven-plugin - ${plugin.maven.dockerfile.version} + 1.4.10 default From f63a48783e0b60f15c7fd50a1a9860fc5c91d40c Mon Sep 17 00:00:00 2001 From: hjx <577364224@qq.com> Date: Tue, 9 Dec 2025 11:54:45 +0800 Subject: [PATCH 04/10] =?UTF-8?q?arm=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mhd-auth/Dockerfile | 2 +- mhd-gateway/Dockerfile | 2 +- mhd-modules/mhd-system/Dockerfile | 2 +- mhd-user-center/Dockerfile | 2 +- mhd_finance/Dockerfile | 2 +- mhd_product/Dockerfile | 2 +- mhd_thrid_party/Dockerfile | 2 +- mhd_transport/Dockerfile | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/mhd-auth/Dockerfile b/mhd-auth/Dockerfile index d29ce88f5..dfd187992 100644 --- a/mhd-auth/Dockerfile +++ b/mhd-auth/Dockerfile @@ -10,7 +10,7 @@ ENV JAVA_TOOL_OPTIONS="-Dfile.encoding=UTF-8" # 其效果是在主机 /var/lib/docker 目录下创建了一个临时文件，并链接到容器的/tmp VOLUME /tmp #将当前jar 复制到容器根目录下 -ADD mhd-auth.jar mhd-auth.jar +ADD target/mhd-auth.jar mhd-auth.jar #暴露容器端口 Docker镜像告知Docker宿主机应用监听了端口 EXPOSE 9200 # 运行jar包 diff --git a/mhd-gateway/Dockerfile b/mhd-gateway/Dockerfile index 8b870933c..53cd095ef 100644 --- a/mhd-gateway/Dockerfile +++ b/mhd-gateway/Dockerfile @@ -10,7 +10,7 @@ ENV JAVA_TOOL_OPTIONS="-Dfile.encoding=UTF-8" # 其效果是在主机 /var/lib/docker 目录下创建了一个临时文件，并链接到容器的/tmp VOLUME /tmp #将当前jar 复制到容器根目录下 -ADD mhd-gateway.jar mhd-gateway.jar +ADD target/mhd-gateway.jar mhd-gateway.jar #暴露容器端口 Docker镜像告知Docker宿主机应用监听了端口 EXPOSE 8088 # 运行jar包 diff --git a/mhd-modules/mhd-system/Dockerfile b/mhd-modules/mhd-system/Dockerfile index e301ffd5a..5810caf70 100644 --- a/mhd-modules/mhd-system/Dockerfile +++ b/mhd-modules/mhd-system/Dockerfile @@ -10,7 +10,7 @@ ENV JAVA_TOOL_OPTIONS="-Dfile.encoding=UTF-8" # 其效果是在主机 /var/lib/docker 目录下创建了一个临时文件，并链接到容器的/tmp VOLUME /tmp #将当前jar 复制到容器根目录下 -ADD mhd-modules-system.jar mhd-modules-system.jar +ADD target/mhd-modules-system.jar mhd-modules-system.jar #暴露容器端口 Docker镜像告知Docker宿主机应用监听了端口 EXPOSE 9201 # 运行jar包 diff --git a/mhd-user-center/Dockerfile b/mhd-user-center/Dockerfile index ac5ee8857..5c8ff51bd 100644 --- a/mhd-user-center/Dockerfile +++ b/mhd-user-center/Dockerfile @@ -5,7 +5,7 @@ ENV TZ Asia/Shanghai #指定utf-8编码格 ENV JAVA_TOOL_OPTIONS="-Dfile.encoding=UTF-8" #将当前jar 复制到容器根目录下 -ADD mhd-user-center.jar mhd-user-center.jar +ADD target/mhd-user-center.jar mhd-user-center.jar #暴露容器端口 Docker镜像告知Docker宿主机应用监听了端口 EXPOSE 8007 # 运行jar包 diff --git a/mhd_finance/Dockerfile b/mhd_finance/Dockerfile index 6797e4d46..86bc68b06 100644 --- a/mhd_finance/Dockerfile +++ b/mhd_finance/Dockerfile @@ -10,7 +10,7 @@ ENV JAVA_TOOL_OPTIONS="-Dfile.encoding=UTF-8" # 其效果是在主机 /var/lib/docker 目录下创建了一个临时文件，并链接到容器的/tmp VOLUME /tmp #将当前mhd_product.jar 复制到容器根目录下 -ADD mhd_finance.jar mhd_finance.jar +ADD target/mhd_finance.jar mhd_finance.jar #暴露容器端口 Docker镜像告知Docker宿主机应用监听了端口 EXPOSE 8011 # 运行jar包 diff --git a/mhd_product/Dockerfile b/mhd_product/Dockerfile index 2fc20258b..2ba8ab865 100644 --- a/mhd_product/Dockerfile +++ b/mhd_product/Dockerfile @@ -10,7 +10,7 @@ ENV JAVA_TOOL_OPTIONS="-Dfile.encoding=UTF-8" # 其效果是在主机 /var/lib/docker 目录下创建了一个临时文件，并链接到容器的/tmp VOLUME /tmp #将当前mhd_product.jar 复制到容器根目录下 -ADD mhd_product.jar mhd_product.jar +ADD target/mhd_product.jar mhd_product.jar #暴露容器端口 Docker镜像告知Docker宿主机应用监听了端口 EXPOSE 8005 # 运行jar包 diff --git a/mhd_thrid_party/Dockerfile b/mhd_thrid_party/Dockerfile index 6ba77d29c..18ecd46fb 100644 --- a/mhd_thrid_party/Dockerfile +++ b/mhd_thrid_party/Dockerfile @@ -10,7 +10,7 @@ ENV JAVA_TOOL_OPTIONS="-Dfile.encoding=UTF-8" # 其效果是在主机 /var/lib/docker 目录下创建了一个临时文件，并链接到容器的/tmp VOLUME /tmp #将当前mhd_thrid_party.jar 复制到容器根目录下 -ADD mhd_thrid_party.jar mhd_thrid_party.jar +ADD target/mhd_thrid_party.jar mhd_thrid_party.jar #暴露容器端口 Docker镜像告知Docker宿主机应用监听了端口 EXPOSE 8012 # 运行jar包 diff --git a/mhd_transport/Dockerfile b/mhd_transport/Dockerfile index f9ddb4a01..c56ce4ecd 100644 --- a/mhd_transport/Dockerfile +++ b/mhd_transport/Dockerfile @@ -10,7 +10,7 @@ ENV JAVA_TOOL_OPTIONS="-Dfile.encoding=UTF-8" # 其效果是在主机 /var/lib/docker 目录下创建了一个临时文件，并链接到容器的/tmp VOLUME /tmp #将当前mhd_transport.jar 复制到容器根目录下 -ADD mhd_transport.jar mhd_transport.jar +ADD target/mhd_transport.jar mhd_transport.jar #暴露容器端口 Docker镜像告知Docker宿主机应用监听了端口 EXPOSE 8006 # 运行jar包 From 737f61ca4832202cda774668ddb42a49f886fe35 Mon Sep 17 00:00:00 2001 From: hjx <577364224@qq.com> Date: Tue, 9 Dec 2025 12:06:01 +0800 Subject: [PATCH 05/10] =?UTF-8?q?arm=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4193cf29a..7fc1fac97 100644 --- a/pom.xml +++ b/pom.xml @@ -434,7 +434,7 @@ - dtyb/${project.build.finalName} + ${project.build.finalName} ${project.version} From 9153b6a4981e6b1db76174d0a81b382241bb8d94 Mon Sep 17 00:00:00 2001 From: hjx <577364224@qq.com> Date: Tue, 9 Dec 2025 16:14:22 +0800 Subject: [PATCH 06/10] =?UTF-8?q?arm=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mhd-auth/Dockerfile | 2 +- mhd-gateway/Dockerfile | 2 +- mhd-user-center/Dockerfile | 2 +- mhd_finance/Dockerfile | 2 +- mhd_product/Dockerfile | 2 +- mhd_thrid_party/Dockerfile | 2 +- mhd_transport/Dockerfile | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/mhd-auth/Dockerfile b/mhd-auth/Dockerfile index dfd187992..2257eeeda 100644 --- a/mhd-auth/Dockerfile +++ b/mhd-auth/Dockerfile @@ -1,5 +1,5 @@ # 基础镜像 -FROM arm64v8/openjdk:8-jre-slim +FROM arm64v8/openjdk:8 # author MAINTAINER manhuoda #指定东八区时区 diff --git a/mhd-gateway/Dockerfile b/mhd-gateway/Dockerfile index 53cd095ef..0f2e5a40b 100644 --- a/mhd-gateway/Dockerfile +++ b/mhd-gateway/Dockerfile @@ -1,5 +1,5 @@ # 基础镜像 -FROM arm64v8/openjdk:8-jre-slim +FROM arm64v8/openjdk:8 # author MAINTAINER manhuoda #指定东八区时区 diff --git a/mhd-user-center/Dockerfile b/mhd-user-center/Dockerfile index 5c8ff51bd..cb2123c58 100644 --- a/mhd-user-center/Dockerfile +++ b/mhd-user-center/Dockerfile @@ -1,5 +1,5 @@ # 基础镜像 -FROM arm64v8/openjdk:8-jre-slim +FROM arm64v8/openjdk:8 #指定东八区时区 ENV TZ Asia/Shanghai #指定utf-8编码格 diff --git a/mhd_finance/Dockerfile b/mhd_finance/Dockerfile index 86bc68b06..3deb94377 100644 --- a/mhd_finance/Dockerfile +++ b/mhd_finance/Dockerfile @@ -1,5 +1,5 @@ # 基础镜像 -FROM arm64v8/openjdk:8-jre-slim +FROM arm64v8/openjdk:8 # author MAINTAINER manhuoda #指定东八区时区 diff --git a/mhd_product/Dockerfile b/mhd_product/Dockerfile index 2ba8ab865..52eb11569 100644 --- a/mhd_product/Dockerfile +++ b/mhd_product/Dockerfile @@ -1,5 +1,5 @@ # 基础镜像 -FROM arm64v8/openjdk:8-jre-slim +FROM arm64v8/openjdk:8 # author MAINTAINER manhuoda #指定东八区时区 diff --git a/mhd_thrid_party/Dockerfile b/mhd_thrid_party/Dockerfile index 18ecd46fb..c67a76cd1 100644 --- a/mhd_thrid_party/Dockerfile +++ b/mhd_thrid_party/Dockerfile @@ -1,5 +1,5 @@ # 基础镜像 -FROM arm64v8/openjdk:8-jre-slim +FROM arm64v8/openjdk:8 # author MAINTAINER manhuoda #指定东八区时区 diff --git a/mhd_transport/Dockerfile b/mhd_transport/Dockerfile index c56ce4ecd..84f389e73 100644 --- a/mhd_transport/Dockerfile +++ b/mhd_transport/Dockerfile @@ -1,5 +1,5 @@ # 基础镜像 -FROM arm64v8/openjdk:8-jre-slim +FROM arm64v8/openjdk:8 # author MAINTAINER manhuoda #指定东八区时区 From 5b02024f4cb3f10ea40c564ef660a57c12c832b5 Mon Sep 17 00:00:00 2001 From: hjx <577364224@qq.com> Date: Tue, 9 Dec 2025 17:36:49 +0800 Subject: [PATCH 07/10] =?UTF-8?q?arm=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mhd-gateway/Dockerfile | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/mhd-gateway/Dockerfile b/mhd-gateway/Dockerfile index 0f2e5a40b..b2ac8bd14 100644 --- a/mhd-gateway/Dockerfile +++ b/mhd-gateway/Dockerfile @@ -1,5 +1,15 @@ # 基础镜像 FROM arm64v8/openjdk:8 + +RUN apt-get update && \ + apt-get install -y \ + libfreetype6 \ + fontconfig \ + libfontconfig1 \ + libxrender1 \ + libxtst6 \ + libxi6 \ + && rm -rf /var/lib/apt/lists/* # author MAINTAINER manhuoda #指定东八区时区 From 2a393ceb2c811a80a0d2fcff755410433335bdf0 Mon Sep 17 00:00:00 2001 From: hjx <577364224@qq.com> Date: Tue, 9 Dec 2025 18:29:09 +0800 Subject: [PATCH 08/10] =?UTF-8?q?arm=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mhd-gateway/Dockerfile | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/mhd-gateway/Dockerfile b/mhd-gateway/Dockerfile index b2ac8bd14..0f2e5a40b 100644 --- a/mhd-gateway/Dockerfile +++ b/mhd-gateway/Dockerfile @@ -1,15 +1,5 @@ # 基础镜像 FROM arm64v8/openjdk:8 - -RUN apt-get update && \ - apt-get install -y \ - libfreetype6 \ - fontconfig \ - libfontconfig1 \ - libxrender1 \ - libxtst6 \ - libxi6 \ - && rm -rf /var/lib/apt/lists/* # author MAINTAINER manhuoda #指定东八区时区 From f2a65c9039ed19b4baa1fb4fb6244eb74f170467 Mon Sep 17 00:00:00 2001 From: hjx <577364224@qq.com> Date: Tue, 9 Dec 2025 19:41:55 +0800 Subject: [PATCH 09/10] =?UTF-8?q?arm=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mhd-modules/mhd-system/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mhd-modules/mhd-system/Dockerfile b/mhd-modules/mhd-system/Dockerfile index 5810caf70..5795e4dea 100644 --- a/mhd-modules/mhd-system/Dockerfile +++ b/mhd-modules/mhd-system/Dockerfile @@ -1,5 +1,5 @@ # 基础镜像 -FROM arm64v8/openjdk:8-jre-slim +FROM arm64v8/openjdk:8 # author MAINTAINER manhuoda #指定东八区时区 From 083e5fc1458576c4d7fe58e3fa44788e98929143 Mon Sep 17 00:00:00 2001 From: hjx <577364224@qq.com> Date: Wed, 10 Dec 2025 01:35:21 +0800 Subject: [PATCH 10/10] =?UTF-8?q?arm=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../user/application/service/AgentSignApplicationService.java | 2 ++ .../service/MotorcadeCollectionApplicationService.java | 2 ++ 2 files changed, 4 insertions(+) diff --git a/mhd-user-center/src/main/java/com/mhd/user/application/service/AgentSignApplicationService.java b/mhd-user-center/src/main/java/com/mhd/user/application/service/AgentSignApplicationService.java index a69ab648c..477d2cb41 100644 --- a/mhd-user-center/src/main/java/com/mhd/user/application/service/AgentSignApplicationService.java +++ b/mhd-user-center/src/main/java/com/mhd/user/application/service/AgentSignApplicationService.java @@ -19,6 +19,7 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cloud.stream.function.StreamBridge; +import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -39,6 +40,7 @@ public class AgentSignApplicationService { @Resource private ThirdPartyServiceFeign thirdPartyServiceFeign; + @Lazy @Autowired private MotorcadeCollectionApplicationService motorcadeCollectionApplicationService; // @Autowired diff --git a/mhd-user-center/src/main/java/com/mhd/user/application/service/MotorcadeCollectionApplicationService.java b/mhd-user-center/src/main/java/com/mhd/user/application/service/MotorcadeCollectionApplicationService.java index 4a4909cbd..e4109c3ea 100644 --- a/mhd-user-center/src/main/java/com/mhd/user/application/service/MotorcadeCollectionApplicationService.java +++ b/mhd-user-center/src/main/java/com/mhd/user/application/service/MotorcadeCollectionApplicationService.java @@ -36,6 +36,7 @@ import com.mhd.user.interfaces.dto.MotorcadeCollectionDTO; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; @@ -56,6 +57,7 @@ import java.util.Map; public class MotorcadeCollectionApplicationService { @Autowired private MotorcadeCollectionDomainService motorcadeCollectionDomainService; + @Lazy @Autowired private AgentSignApplicationService agentSignApplicationService; @Autowired