diff --git a/mhd-auth/Dockerfile b/mhd-auth/Dockerfile index ab8325a42..2257eeeda 100644 --- a/mhd-auth/Dockerfile +++ b/mhd-auth/Dockerfile @@ -1,5 +1,5 @@ # 基础镜像 -FROM kdvolder/jdk8 +FROM arm64v8/openjdk:8 # author MAINTAINER manhuoda #指定东八区时区 @@ -10,8 +10,9 @@ 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包 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..0f2e5a40b 100644 --- a/mhd-gateway/Dockerfile +++ b/mhd-gateway/Dockerfile @@ -1,5 +1,5 @@ # 基础镜像 -FROM kdvolder/jdk8 +FROM arm64v8/openjdk:8 # author MAINTAINER manhuoda #指定东八区时区 @@ -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-gateway/pom.xml b/mhd-gateway/pom.xml index 6cda48c31..1b3843d1e 100644 --- a/mhd-gateway/pom.xml +++ b/mhd-gateway/pom.xml @@ -127,4 +127,20 @@ + + + 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..5795e4dea 100644 --- a/mhd-modules/mhd-system/Dockerfile +++ b/mhd-modules/mhd-system/Dockerfile @@ -1,5 +1,5 @@ # 基础镜像 -FROM kdvolder/jdk8 +FROM arm64v8/openjdk:8 # author MAINTAINER manhuoda #指定东八区时区 @@ -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-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..cb2123c58 100644 --- a/mhd-user-center/Dockerfile +++ b/mhd-user-center/Dockerfile @@ -1,16 +1,11 @@ # 基础镜像 -FROM kdvolder/jdk8 -# author -MAINTAINER manhuoda +FROM arm64v8/openjdk:8 #指定东八区时区 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 +ADD target/mhd-user-center.jar mhd-user-center.jar #暴露容器端口 Docker镜像告知Docker宿主机应用监听了端口 EXPOSE 8007 # 运行jar包 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/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 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..3deb94377 100644 --- a/mhd_finance/Dockerfile +++ b/mhd_finance/Dockerfile @@ -1,5 +1,5 @@ # 基础镜像 -FROM kdvolder/jdk8 +FROM arm64v8/openjdk:8 # author MAINTAINER manhuoda #指定东八区时区 @@ -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_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..52eb11569 100644 --- a/mhd_product/Dockerfile +++ b/mhd_product/Dockerfile @@ -1,5 +1,5 @@ # 基础镜像 -FROM kdvolder/jdk8 +FROM arm64v8/openjdk:8 # author MAINTAINER manhuoda #指定东八区时区 @@ -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_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..c67a76cd1 100644 --- a/mhd_thrid_party/Dockerfile +++ b/mhd_thrid_party/Dockerfile @@ -1,5 +1,5 @@ # 基础镜像 -FROM kdvolder/jdk8 +FROM arm64v8/openjdk:8 # author MAINTAINER manhuoda #指定东八区时区 @@ -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_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..84f389e73 100644 --- a/mhd_transport/Dockerfile +++ b/mhd_transport/Dockerfile @@ -1,5 +1,5 @@ # 基础镜像 -FROM kdvolder/jdk8 +FROM arm64v8/openjdk:8 # author MAINTAINER manhuoda #指定东八区时区 @@ -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包 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..7fc1fac97 100644 --- a/pom.xml +++ b/pom.xml @@ -43,6 +43,30 @@ 2.13.2 3.16.2 2.7.3 + + + 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 + @@ -286,7 +310,7 @@ - + @@ -334,6 +358,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 + 1.4.10 + + + default + + build + + + + + ${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 + + + +