Merge branch 'dev_arm_251208' into dev

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包

mhd-user-center/pom.xml

@@ -174,4 +174,18 @@
             </plugin>
         </plugins>
     </build>
+
+    <profiles>
+        <profile>
+            <id>mhd-user-center</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>com.spotify</groupId>
+                        <artifactId>dockerfile-maven-plugin</artifactId>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
 </project>

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

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

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
         # 共享配置