Merge branch 'dev_arm_251208' into dev
This commit is contained in:
+3
-2
@@ -1,5 +1,5 @@
|
|||||||
# 基础镜像
|
# 基础镜像
|
||||||
FROM kdvolder/jdk8
|
FROM arm64v8/openjdk:8
|
||||||
# author
|
# author
|
||||||
MAINTAINER manhuoda
|
MAINTAINER manhuoda
|
||||||
#指定东八区时区
|
#指定东八区时区
|
||||||
@@ -10,8 +10,9 @@ ENV JAVA_TOOL_OPTIONS="-Dfile.encoding=UTF-8"
|
|||||||
# 其效果是在主机 /var/lib/docker 目录下创建了一个临时文件,并链接到容器的/tmp
|
# 其效果是在主机 /var/lib/docker 目录下创建了一个临时文件,并链接到容器的/tmp
|
||||||
VOLUME /tmp
|
VOLUME /tmp
|
||||||
#将当前jar 复制到容器根目录下
|
#将当前jar 复制到容器根目录下
|
||||||
ADD mhd-auth.jar mhd-auth.jar
|
ADD target/mhd-auth.jar mhd-auth.jar
|
||||||
#暴露容器端口 Docker镜像告知Docker宿主机应用监听了端口
|
#暴露容器端口 Docker镜像告知Docker宿主机应用监听了端口
|
||||||
EXPOSE 9200
|
EXPOSE 9200
|
||||||
# 运行jar包
|
# 运行jar包
|
||||||
ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-Xms1000m", "-Xmx1500m","-jar","/mhd-auth.jar"]
|
ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-Xms1000m", "-Xmx1500m","-jar","/mhd-auth.jar"]
|
||||||
|
|
||||||
|
|||||||
@@ -85,4 +85,18 @@
|
|||||||
</plugins>
|
</plugins>
|
||||||
</build>
|
</build>
|
||||||
|
|
||||||
|
<profiles>
|
||||||
|
<profile>
|
||||||
|
<id>mhd-auth</id>
|
||||||
|
<build>
|
||||||
|
<plugins>
|
||||||
|
<plugin>
|
||||||
|
<groupId>com.spotify</groupId>
|
||||||
|
<artifactId>dockerfile-maven-plugin</artifactId>
|
||||||
|
</plugin>
|
||||||
|
</plugins>
|
||||||
|
</build>
|
||||||
|
</profile>
|
||||||
|
</profiles>
|
||||||
|
|
||||||
</project>
|
</project>
|
||||||
|
|||||||
@@ -12,13 +12,13 @@ spring:
|
|||||||
cloud:
|
cloud:
|
||||||
nacos:
|
nacos:
|
||||||
discovery:
|
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:
|
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,如果使用默认分组可以不配置
|
group: DEFAULT_GROUP # 默认分组就是DEFAULT_GROUP,如果使用默认分组可以不配置
|
||||||
file-extension: yml #默认properties
|
file-extension: yml #默认properties
|
||||||
# 共享配置
|
# 共享配置
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
# 基础镜像
|
# 基础镜像
|
||||||
FROM kdvolder/jdk8
|
FROM arm64v8/openjdk:8
|
||||||
# author
|
# author
|
||||||
MAINTAINER manhuoda
|
MAINTAINER manhuoda
|
||||||
#指定东八区时区
|
#指定东八区时区
|
||||||
@@ -10,7 +10,7 @@ ENV JAVA_TOOL_OPTIONS="-Dfile.encoding=UTF-8"
|
|||||||
# 其效果是在主机 /var/lib/docker 目录下创建了一个临时文件,并链接到容器的/tmp
|
# 其效果是在主机 /var/lib/docker 目录下创建了一个临时文件,并链接到容器的/tmp
|
||||||
VOLUME /tmp
|
VOLUME /tmp
|
||||||
#将当前jar 复制到容器根目录下
|
#将当前jar 复制到容器根目录下
|
||||||
ADD mhd-gateway.jar mhd-gateway.jar
|
ADD target/mhd-gateway.jar mhd-gateway.jar
|
||||||
#暴露容器端口 Docker镜像告知Docker宿主机应用监听了端口
|
#暴露容器端口 Docker镜像告知Docker宿主机应用监听了端口
|
||||||
EXPOSE 8088
|
EXPOSE 8088
|
||||||
# 运行jar包
|
# 运行jar包
|
||||||
|
|||||||
@@ -127,4 +127,20 @@
|
|||||||
</plugins>
|
</plugins>
|
||||||
</build>
|
</build>
|
||||||
|
|
||||||
|
<profiles>
|
||||||
|
<profile>
|
||||||
|
<id>mhd-gateway</id>
|
||||||
|
<build>
|
||||||
|
<plugins>
|
||||||
|
<plugin>
|
||||||
|
<groupId>com.spotify</groupId>
|
||||||
|
<artifactId>dockerfile-maven-plugin</artifactId>
|
||||||
|
</plugin>
|
||||||
|
</plugins>
|
||||||
|
</build>
|
||||||
|
</profile>
|
||||||
|
</profiles>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
</project>
|
</project>
|
||||||
|
|||||||
@@ -13,13 +13,15 @@ spring:
|
|||||||
cloud:
|
cloud:
|
||||||
nacos:
|
nacos:
|
||||||
discovery:
|
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:
|
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,如果使用默认分组可以不配置
|
group: DEFAULT_GROUP # 默认分组就是DEFAULT_GROUP,如果使用默认分组可以不配置
|
||||||
file-extension: yml #默认properties
|
file-extension: yml #默认properties
|
||||||
# 共享配置
|
# 共享配置
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
# 基础镜像
|
# 基础镜像
|
||||||
FROM kdvolder/jdk8
|
FROM arm64v8/openjdk:8
|
||||||
# author
|
# author
|
||||||
MAINTAINER manhuoda
|
MAINTAINER manhuoda
|
||||||
#指定东八区时区
|
#指定东八区时区
|
||||||
@@ -10,7 +10,7 @@ ENV JAVA_TOOL_OPTIONS="-Dfile.encoding=UTF-8"
|
|||||||
# 其效果是在主机 /var/lib/docker 目录下创建了一个临时文件,并链接到容器的/tmp
|
# 其效果是在主机 /var/lib/docker 目录下创建了一个临时文件,并链接到容器的/tmp
|
||||||
VOLUME /tmp
|
VOLUME /tmp
|
||||||
#将当前jar 复制到容器根目录下
|
#将当前jar 复制到容器根目录下
|
||||||
ADD mhd-modules-system.jar mhd-modules-system.jar
|
ADD target/mhd-modules-system.jar mhd-modules-system.jar
|
||||||
#暴露容器端口 Docker镜像告知Docker宿主机应用监听了端口
|
#暴露容器端口 Docker镜像告知Docker宿主机应用监听了端口
|
||||||
EXPOSE 9201
|
EXPOSE 9201
|
||||||
# 运行jar包
|
# 运行jar包
|
||||||
|
|||||||
@@ -148,4 +148,19 @@
|
|||||||
</plugins>
|
</plugins>
|
||||||
</build>
|
</build>
|
||||||
|
|
||||||
|
|
||||||
|
<profiles>
|
||||||
|
<profile>
|
||||||
|
<id>mhd-modules-system</id>
|
||||||
|
<build>
|
||||||
|
<plugins>
|
||||||
|
<plugin>
|
||||||
|
<groupId>com.spotify</groupId>
|
||||||
|
<artifactId>dockerfile-maven-plugin</artifactId>
|
||||||
|
</plugin>
|
||||||
|
</plugins>
|
||||||
|
</build>
|
||||||
|
</profile>
|
||||||
|
</profiles>
|
||||||
|
|
||||||
</project>
|
</project>
|
||||||
|
|||||||
@@ -13,13 +13,13 @@ spring:
|
|||||||
cloud:
|
cloud:
|
||||||
nacos:
|
nacos:
|
||||||
discovery:
|
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:
|
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,如果使用默认分组可以不配置
|
group: DEFAULT_GROUP # 默认分组就是DEFAULT_GROUP,如果使用默认分组可以不配置
|
||||||
file-extension: yml #默认properties
|
file-extension: yml #默认properties
|
||||||
# 共享配置
|
# 共享配置
|
||||||
|
|||||||
@@ -1,16 +1,11 @@
|
|||||||
# 基础镜像
|
# 基础镜像
|
||||||
FROM kdvolder/jdk8
|
FROM arm64v8/openjdk:8
|
||||||
# author
|
|
||||||
MAINTAINER manhuoda
|
|
||||||
#指定东八区时区
|
#指定东八区时区
|
||||||
ENV TZ Asia/Shanghai
|
ENV TZ Asia/Shanghai
|
||||||
#指定utf-8编码格
|
#指定utf-8编码格
|
||||||
ENV JAVA_TOOL_OPTIONS="-Dfile.encoding=UTF-8"
|
ENV JAVA_TOOL_OPTIONS="-Dfile.encoding=UTF-8"
|
||||||
# VOLUME 指定了临时文件目录为/tmp。
|
|
||||||
# 其效果是在主机 /var/lib/docker 目录下创建了一个临时文件,并链接到容器的/tmp
|
|
||||||
VOLUME /tmp
|
|
||||||
#将当前jar 复制到容器根目录下
|
#将当前jar 复制到容器根目录下
|
||||||
ADD mhd-user-center.jar mhd-user-center.jar
|
ADD target/mhd-user-center.jar mhd-user-center.jar
|
||||||
#暴露容器端口 Docker镜像告知Docker宿主机应用监听了端口
|
#暴露容器端口 Docker镜像告知Docker宿主机应用监听了端口
|
||||||
EXPOSE 8007
|
EXPOSE 8007
|
||||||
# 运行jar包
|
# 运行jar包
|
||||||
|
|||||||
@@ -174,4 +174,18 @@
|
|||||||
</plugin>
|
</plugin>
|
||||||
</plugins>
|
</plugins>
|
||||||
</build>
|
</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>
|
</project>
|
||||||
|
|||||||
+2
@@ -19,6 +19,7 @@ import lombok.extern.slf4j.Slf4j;
|
|||||||
import org.apache.commons.lang.StringUtils;
|
import org.apache.commons.lang.StringUtils;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.cloud.stream.function.StreamBridge;
|
import org.springframework.cloud.stream.function.StreamBridge;
|
||||||
|
import org.springframework.context.annotation.Lazy;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
import javax.annotation.Resource;
|
import javax.annotation.Resource;
|
||||||
@@ -39,6 +40,7 @@ public class AgentSignApplicationService {
|
|||||||
|
|
||||||
@Resource
|
@Resource
|
||||||
private ThirdPartyServiceFeign thirdPartyServiceFeign;
|
private ThirdPartyServiceFeign thirdPartyServiceFeign;
|
||||||
|
@Lazy
|
||||||
@Autowired
|
@Autowired
|
||||||
private MotorcadeCollectionApplicationService motorcadeCollectionApplicationService;
|
private MotorcadeCollectionApplicationService motorcadeCollectionApplicationService;
|
||||||
// @Autowired
|
// @Autowired
|
||||||
|
|||||||
+2
@@ -36,6 +36,7 @@ import com.mhd.user.interfaces.dto.MotorcadeCollectionDTO;
|
|||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.springframework.beans.BeanUtils;
|
import org.springframework.beans.BeanUtils;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
import org.springframework.context.annotation.Lazy;
|
||||||
import org.springframework.scheduling.annotation.Async;
|
import org.springframework.scheduling.annotation.Async;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
@@ -56,6 +57,7 @@ import java.util.Map;
|
|||||||
public class MotorcadeCollectionApplicationService {
|
public class MotorcadeCollectionApplicationService {
|
||||||
@Autowired
|
@Autowired
|
||||||
private MotorcadeCollectionDomainService motorcadeCollectionDomainService;
|
private MotorcadeCollectionDomainService motorcadeCollectionDomainService;
|
||||||
|
@Lazy
|
||||||
@Autowired
|
@Autowired
|
||||||
private AgentSignApplicationService agentSignApplicationService;
|
private AgentSignApplicationService agentSignApplicationService;
|
||||||
@Autowired
|
@Autowired
|
||||||
|
|||||||
@@ -20,13 +20,13 @@ spring:
|
|||||||
discovery:
|
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
|
||||||
server-addr: 116.204.23.92:8848
|
# server-addr: 116.204.23.92:8848
|
||||||
config:
|
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
|
||||||
server-addr: 116.204.23.92:8848
|
# server-addr: 116.204.23.92:8848
|
||||||
group: DEFAULT_GROUP # 默认分组就是DEFAULT_GROUP,如果使用默认分组可以不配置
|
group: DEFAULT_GROUP # 默认分组就是DEFAULT_GROUP,如果使用默认分组可以不配置
|
||||||
file-extension: yml #默认properties
|
file-extension: yml #默认properties
|
||||||
# 共享配置
|
# 共享配置
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
# 基础镜像
|
# 基础镜像
|
||||||
FROM kdvolder/jdk8
|
FROM arm64v8/openjdk:8
|
||||||
# author
|
# author
|
||||||
MAINTAINER manhuoda
|
MAINTAINER manhuoda
|
||||||
#指定东八区时区
|
#指定东八区时区
|
||||||
@@ -10,7 +10,7 @@ ENV JAVA_TOOL_OPTIONS="-Dfile.encoding=UTF-8"
|
|||||||
# 其效果是在主机 /var/lib/docker 目录下创建了一个临时文件,并链接到容器的/tmp
|
# 其效果是在主机 /var/lib/docker 目录下创建了一个临时文件,并链接到容器的/tmp
|
||||||
VOLUME /tmp
|
VOLUME /tmp
|
||||||
#将当前mhd_product.jar 复制到容器根目录下
|
#将当前mhd_product.jar 复制到容器根目录下
|
||||||
ADD mhd_finance.jar mhd_finance.jar
|
ADD target/mhd_finance.jar mhd_finance.jar
|
||||||
#暴露容器端口 Docker镜像告知Docker宿主机应用监听了端口
|
#暴露容器端口 Docker镜像告知Docker宿主机应用监听了端口
|
||||||
EXPOSE 8011
|
EXPOSE 8011
|
||||||
# 运行jar包
|
# 运行jar包
|
||||||
|
|||||||
@@ -182,4 +182,17 @@
|
|||||||
</plugins>
|
</plugins>
|
||||||
</build>
|
</build>
|
||||||
|
|
||||||
|
<profiles>
|
||||||
|
<profile>
|
||||||
|
<id>mhd_finance</id>
|
||||||
|
<build>
|
||||||
|
<plugins>
|
||||||
|
<plugin>
|
||||||
|
<groupId>com.spotify</groupId>
|
||||||
|
<artifactId>dockerfile-maven-plugin</artifactId>
|
||||||
|
</plugin>
|
||||||
|
</plugins>
|
||||||
|
</build>
|
||||||
|
</profile>
|
||||||
|
</profiles>
|
||||||
</project>
|
</project>
|
||||||
|
|||||||
@@ -20,13 +20,13 @@ spring:
|
|||||||
discovery:
|
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
|
||||||
server-addr: 116.204.23.92:8848
|
# server-addr: 116.204.23.92:8848
|
||||||
config:
|
config:
|
||||||
# server-addr: 127.0.0.1:8848
|
# server-addr: 127.0.0.1:8848
|
||||||
server-addr: 116.204.23.92:8848
|
# server-addr: 116.204.23.92:8848
|
||||||
# 线上测试环境配置 容器名+端口号
|
# 线上测试环境配置 容器名+端口号
|
||||||
#server-addr: mhd-nacos:8848
|
server-addr: 10.33.0.129:6010
|
||||||
group: DEFAULT_GROUP # 默认分组就是DEFAULT_GROUP,如果使用默认分组可以不配置
|
group: DEFAULT_GROUP # 默认分组就是DEFAULT_GROUP,如果使用默认分组可以不配置
|
||||||
file-extension: yml #默认properties
|
file-extension: yml #默认properties
|
||||||
# 共享配置
|
# 共享配置
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
# 基础镜像
|
# 基础镜像
|
||||||
FROM kdvolder/jdk8
|
FROM arm64v8/openjdk:8
|
||||||
# author
|
# author
|
||||||
MAINTAINER manhuoda
|
MAINTAINER manhuoda
|
||||||
#指定东八区时区
|
#指定东八区时区
|
||||||
@@ -10,7 +10,7 @@ ENV JAVA_TOOL_OPTIONS="-Dfile.encoding=UTF-8"
|
|||||||
# 其效果是在主机 /var/lib/docker 目录下创建了一个临时文件,并链接到容器的/tmp
|
# 其效果是在主机 /var/lib/docker 目录下创建了一个临时文件,并链接到容器的/tmp
|
||||||
VOLUME /tmp
|
VOLUME /tmp
|
||||||
#将当前mhd_product.jar 复制到容器根目录下
|
#将当前mhd_product.jar 复制到容器根目录下
|
||||||
ADD mhd_product.jar mhd_product.jar
|
ADD target/mhd_product.jar mhd_product.jar
|
||||||
#暴露容器端口 Docker镜像告知Docker宿主机应用监听了端口
|
#暴露容器端口 Docker镜像告知Docker宿主机应用监听了端口
|
||||||
EXPOSE 8005
|
EXPOSE 8005
|
||||||
# 运行jar包
|
# 运行jar包
|
||||||
|
|||||||
@@ -149,4 +149,18 @@
|
|||||||
</plugins>
|
</plugins>
|
||||||
</build>
|
</build>
|
||||||
|
|
||||||
|
<profiles>
|
||||||
|
<profile>
|
||||||
|
<id>mhd_product</id>
|
||||||
|
<build>
|
||||||
|
<plugins>
|
||||||
|
<plugin>
|
||||||
|
<groupId>com.spotify</groupId>
|
||||||
|
<artifactId>dockerfile-maven-plugin</artifactId>
|
||||||
|
</plugin>
|
||||||
|
</plugins>
|
||||||
|
</build>
|
||||||
|
</profile>
|
||||||
|
</profiles>
|
||||||
|
|
||||||
</project>
|
</project>
|
||||||
|
|||||||
@@ -18,13 +18,13 @@ spring:
|
|||||||
cloud:
|
cloud:
|
||||||
nacos:
|
nacos:
|
||||||
discovery:
|
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:
|
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,如果使用默认分组可以不配置
|
group: DEFAULT_GROUP # 默认分组就是DEFAULT_GROUP,如果使用默认分组可以不配置
|
||||||
file-extension: yml #默认properties
|
file-extension: yml #默认properties
|
||||||
# 共享配置
|
# 共享配置
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
# 基础镜像
|
# 基础镜像
|
||||||
FROM kdvolder/jdk8
|
FROM arm64v8/openjdk:8
|
||||||
# author
|
# author
|
||||||
MAINTAINER manhuoda
|
MAINTAINER manhuoda
|
||||||
#指定东八区时区
|
#指定东八区时区
|
||||||
@@ -10,7 +10,7 @@ ENV JAVA_TOOL_OPTIONS="-Dfile.encoding=UTF-8"
|
|||||||
# 其效果是在主机 /var/lib/docker 目录下创建了一个临时文件,并链接到容器的/tmp
|
# 其效果是在主机 /var/lib/docker 目录下创建了一个临时文件,并链接到容器的/tmp
|
||||||
VOLUME /tmp
|
VOLUME /tmp
|
||||||
#将当前mhd_thrid_party.jar 复制到容器根目录下
|
#将当前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宿主机应用监听了端口
|
#暴露容器端口 Docker镜像告知Docker宿主机应用监听了端口
|
||||||
EXPOSE 8012
|
EXPOSE 8012
|
||||||
# 运行jar包
|
# 运行jar包
|
||||||
|
|||||||
+13
-1
@@ -277,5 +277,17 @@
|
|||||||
</resources>
|
</resources>
|
||||||
</build>
|
</build>
|
||||||
|
|
||||||
|
<profiles>
|
||||||
|
<profile>
|
||||||
|
<id>mhd_thrid_party</id>
|
||||||
|
<build>
|
||||||
|
<plugins>
|
||||||
|
<plugin>
|
||||||
|
<groupId>com.spotify</groupId>
|
||||||
|
<artifactId>dockerfile-maven-plugin</artifactId>
|
||||||
|
</plugin>
|
||||||
|
</plugins>
|
||||||
|
</build>
|
||||||
|
</profile>
|
||||||
|
</profiles>
|
||||||
</project>
|
</project>
|
||||||
|
|||||||
@@ -18,13 +18,13 @@ spring:
|
|||||||
cloud:
|
cloud:
|
||||||
nacos:
|
nacos:
|
||||||
discovery:
|
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:
|
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,如果使用默认分组可以不配置
|
group: DEFAULT_GROUP # 默认分组就是DEFAULT_GROUP,如果使用默认分组可以不配置
|
||||||
file-extension: yml #默认properties
|
file-extension: yml #默认properties
|
||||||
# 共享配置
|
# 共享配置
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
# 基础镜像
|
# 基础镜像
|
||||||
FROM kdvolder/jdk8
|
FROM arm64v8/openjdk:8
|
||||||
# author
|
# author
|
||||||
MAINTAINER manhuoda
|
MAINTAINER manhuoda
|
||||||
#指定东八区时区
|
#指定东八区时区
|
||||||
@@ -10,7 +10,7 @@ ENV JAVA_TOOL_OPTIONS="-Dfile.encoding=UTF-8"
|
|||||||
# 其效果是在主机 /var/lib/docker 目录下创建了一个临时文件,并链接到容器的/tmp
|
# 其效果是在主机 /var/lib/docker 目录下创建了一个临时文件,并链接到容器的/tmp
|
||||||
VOLUME /tmp
|
VOLUME /tmp
|
||||||
#将当前mhd_transport.jar 复制到容器根目录下
|
#将当前mhd_transport.jar 复制到容器根目录下
|
||||||
ADD mhd_transport.jar mhd_transport.jar
|
ADD target/mhd_transport.jar mhd_transport.jar
|
||||||
#暴露容器端口 Docker镜像告知Docker宿主机应用监听了端口
|
#暴露容器端口 Docker镜像告知Docker宿主机应用监听了端口
|
||||||
EXPOSE 8006
|
EXPOSE 8006
|
||||||
# 运行jar包
|
# 运行jar包
|
||||||
|
|||||||
@@ -155,4 +155,17 @@
|
|||||||
</plugins>
|
</plugins>
|
||||||
</build>
|
</build>
|
||||||
|
|
||||||
|
<profiles>
|
||||||
|
<profile>
|
||||||
|
<id>mhd_transport</id>
|
||||||
|
<build>
|
||||||
|
<plugins>
|
||||||
|
<plugin>
|
||||||
|
<groupId>com.spotify</groupId>
|
||||||
|
<artifactId>dockerfile-maven-plugin</artifactId>
|
||||||
|
</plugin>
|
||||||
|
</plugins>
|
||||||
|
</build>
|
||||||
|
</profile>
|
||||||
|
</profiles>
|
||||||
</project>
|
</project>
|
||||||
|
|||||||
@@ -20,10 +20,12 @@ spring:
|
|||||||
discovery:
|
discovery:
|
||||||
# server-addr: 127.0.0.1:8848
|
# server-addr: 127.0.0.1:8848
|
||||||
# 线上测试环境配置使用ip+端口号
|
# 线上测试环境配置使用ip+端口号
|
||||||
|
# server-addr: 10.33.0.129:6010r
|
||||||
server-addr: 10.33.0.129:6010
|
server-addr: 10.33.0.129:6010
|
||||||
config:
|
config:
|
||||||
# server-addr: 127.0.0.1:8848
|
# server-addr: 127.0.0.1:8848
|
||||||
# 线上测试环境配置使用ip+端口号
|
# 线上测试环境配置使用ip+端口号
|
||||||
|
# server-addr: 10.33.0.129:6010
|
||||||
server-addr: 10.33.0.129:6010
|
server-addr: 10.33.0.129:6010
|
||||||
group: DEFAULT_GROUP # 默认分组就是DEFAULT_GROUP,如果使用默认分组可以不配置
|
group: DEFAULT_GROUP # 默认分组就是DEFAULT_GROUP,如果使用默认分组可以不配置
|
||||||
file-extension: yml #默认properties
|
file-extension: yml #默认properties
|
||||||
|
|||||||
@@ -43,6 +43,30 @@
|
|||||||
<transmittable-thread-local.version>2.13.2</transmittable-thread-local.version>
|
<transmittable-thread-local.version>2.13.2</transmittable-thread-local.version>
|
||||||
<redisson.version>3.16.2</redisson.version>
|
<redisson.version>3.16.2</redisson.version>
|
||||||
<jetcache.version>2.7.3</jetcache.version>
|
<jetcache.version>2.7.3</jetcache.version>
|
||||||
|
|
||||||
|
<!-- 插件 -->
|
||||||
|
<plugin.maven.compiler.version>3.12.0</plugin.maven.compiler.version>
|
||||||
|
<plugin.maven.resources.version>3.1.0</plugin.maven.resources.version>
|
||||||
|
<plugin.maven.source.version>3.1.0</plugin.maven.source.version>
|
||||||
|
<plugin.maven.dockerfile.version>1.4.13</plugin.maven.dockerfile.version>
|
||||||
|
<!-- 基础框架 -->
|
||||||
|
<spring.boot.version>3.2.12</spring.boot.version>
|
||||||
|
<spring.cloud.version>2023.0.3</spring.cloud.version>
|
||||||
|
<spring.cloud.alibaba.version>2023.0.1.2</spring.cloud.alibaba.version>
|
||||||
|
|
||||||
|
<!-- 数据库 -->
|
||||||
|
<mybatis.plus.version>3.5.6</mybatis.plus.version>
|
||||||
|
<pagehelper.version>2.1.0</pagehelper.version>
|
||||||
|
|
||||||
|
<!-- 其它依赖 -->
|
||||||
|
<httpc.version>4.5.14</httpc.version>
|
||||||
|
<jasypt.version>3.0.5</jasypt.version>
|
||||||
|
<bcprov.version>1.78</bcprov.version>
|
||||||
|
<jwt.version>4.4.0</jwt.version>
|
||||||
|
<commons.io.version>2.16.0</commons.io.version>
|
||||||
|
<minio.version>8.5.2</minio.version>
|
||||||
|
<smartjavaai.version>1.0.23</smartjavaai.version>
|
||||||
|
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
<!-- 依赖声明 -->
|
<!-- 依赖声明 -->
|
||||||
@@ -286,7 +310,7 @@
|
|||||||
</dependency>
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
|
||||||
<build>
|
<!-- <build>
|
||||||
<plugins>
|
<plugins>
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
@@ -299,7 +323,7 @@
|
|||||||
</configuration>
|
</configuration>
|
||||||
</plugin>
|
</plugin>
|
||||||
</plugins>
|
</plugins>
|
||||||
</build>
|
</build>-->
|
||||||
|
|
||||||
<!-- <repositories>-->
|
<!-- <repositories>-->
|
||||||
<!-- <repository>-->
|
<!-- <repository>-->
|
||||||
@@ -334,6 +358,104 @@
|
|||||||
</pluginRepository>
|
</pluginRepository>
|
||||||
</pluginRepositories>
|
</pluginRepositories>
|
||||||
|
|
||||||
|
<build>
|
||||||
|
<resources>
|
||||||
|
<resource>
|
||||||
|
<directory>src/main/resources</directory>
|
||||||
|
<filtering>true</filtering>
|
||||||
|
</resource>
|
||||||
|
</resources>
|
||||||
|
<testResources>
|
||||||
|
<testResource>
|
||||||
|
<directory>src/test/resources</directory>
|
||||||
|
<filtering>true</filtering>
|
||||||
|
</testResource>
|
||||||
|
</testResources>
|
||||||
|
<pluginManagement>
|
||||||
|
<plugins>
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
|
<artifactId>maven-compiler-plugin</artifactId>
|
||||||
|
<version>${plugin.maven.compiler.version}</version>
|
||||||
|
<configuration>
|
||||||
|
<source>${java.version}</source>
|
||||||
|
<target>${java.version}</target>
|
||||||
|
<encoding>utf-8</encoding>
|
||||||
|
</configuration>
|
||||||
|
</plugin>
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
|
<artifactId>maven-resources-plugin</artifactId>
|
||||||
|
<version>${plugin.maven.resources.version}</version>
|
||||||
|
<configuration>
|
||||||
|
<encoding>UTF-8</encoding>
|
||||||
|
</configuration>
|
||||||
|
</plugin>
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
|
<artifactId>maven-source-plugin</artifactId>
|
||||||
|
<version>${plugin.maven.source.version}</version>
|
||||||
|
<executions>
|
||||||
|
<execution>
|
||||||
|
<id>attach-sources</id>
|
||||||
|
<phase>verify</phase>
|
||||||
|
<goals>
|
||||||
|
<goal>jar-no-fork</goal>
|
||||||
|
</goals>
|
||||||
|
</execution>
|
||||||
|
</executions>
|
||||||
|
</plugin>
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.springframework.boot</groupId>
|
||||||
|
<artifactId>spring-boot-maven-plugin</artifactId>
|
||||||
|
<version>${spring.boot.version}</version>
|
||||||
|
<executions>
|
||||||
|
<execution>
|
||||||
|
<phase>package</phase>
|
||||||
|
<goals>
|
||||||
|
<goal>repackage</goal>
|
||||||
|
</goals>
|
||||||
|
</execution>
|
||||||
|
</executions>
|
||||||
|
<configuration>
|
||||||
|
<includeSystemScope>true</includeSystemScope>
|
||||||
|
</configuration>
|
||||||
|
</plugin>
|
||||||
|
<plugin>
|
||||||
|
<groupId>com.spotify</groupId>
|
||||||
|
<artifactId>dockerfile-maven-plugin</artifactId>
|
||||||
|
<version>1.4.10</version>
|
||||||
|
<executions>
|
||||||
|
<execution>
|
||||||
|
<id>default</id>
|
||||||
|
<goals>
|
||||||
|
<goal>build</goal>
|
||||||
|
</goals>
|
||||||
|
</execution>
|
||||||
|
</executions>
|
||||||
|
<configuration>
|
||||||
|
<repository>${project.build.finalName}</repository>
|
||||||
|
<tag>${project.version}</tag>
|
||||||
|
</configuration>
|
||||||
|
</plugin>
|
||||||
|
</plugins>
|
||||||
|
</pluginManagement>
|
||||||
|
<plugins>
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
|
<artifactId>maven-compiler-plugin</artifactId>
|
||||||
|
</plugin>
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
|
<artifactId>maven-resources-plugin</artifactId>
|
||||||
|
</plugin>
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
|
<artifactId>maven-source-plugin</artifactId>
|
||||||
|
</plugin>
|
||||||
|
</plugins>
|
||||||
|
</build>
|
||||||
|
|
||||||
<!-- <pluginRepositories>-->
|
<!-- <pluginRepositories>-->
|
||||||
<!-- <pluginRepository>-->
|
<!-- <pluginRepository>-->
|
||||||
<!-- <id>public</id>-->
|
<!-- <id>public</id>-->
|
||||||
|
|||||||
Reference in New Issue
Block a user