From edb6ba8b224e2aaa63f2849c4fc91fbeaa6d3468 Mon Sep 17 00:00:00 2001
From: wayn <1669738430@qq.com>
Date: Tue, 8 Jun 2021 22:15:37 +0800
Subject: [PATCH] =?UTF-8?q?refactor(=E5=95=86=E5=9F=8E):=20=E6=8A=80?=
=?UTF-8?q?=E6=9C=AF=E6=9E=B6=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
添加dicker部署
---
pom.xml | 6 +++
waynboot-admin-api/pom.xml | 49 +++++++++++++++++
.../com/wayn/common/util/mail/MailUtil.java | 3 +-
waynboot-message-consumer/pom.xml | 49 ++++++++++++++++-
waynboot-mobile-api/pom.xml | 53 ++++++++++++++++++-
5 files changed, 156 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index d4a0045..06f41fd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,6 +28,12 @@
11
UTF-8
3.8.1
+
+ wayn111
+ adoptopenjdk:11-jre-openj9
+ 填写你的阿里云账号
+ 填写你的密码，site:https://cr.console.aliyun.com/cn-shanghai/instance/credentials
+
${java.version}
${java.version}
2.4.4
diff --git a/waynboot-admin-api/pom.xml b/waynboot-admin-api/pom.xml
index 7ef91c6..3018fbf 100644
--- a/waynboot-admin-api/pom.xml
+++ b/waynboot-admin-api/pom.xml
@@ -11,6 +11,11 @@
waynboot-admin-api
+
+ wayn111
+ com.wayn.AdminApplication
+
+
org.elasticsearch.client
@@ -102,6 +107,50 @@
+
+
+ com.google.cloud.tools
+ jib-maven-plugin
+ 3.0.0
+
+
+
+ ${docker-from-image-name}
+
+
+
+ registry.cn-shanghai.aliyuncs.com/${aliyun-docker-namespace}/${project.artifactId}
+
+
+ ${project.version}
+ latest
+
+
+ ${docker-username}
+ ${docker-passwqrd}
+
+
+
+ ${main-class}
+
+ -Xms512m
+ -Xmx512m
+ -XX:+HeapDumpOnOutOfMemoryError
+ -XX:HeapDumpPath=./
+
+
+
+
+
+
+
+ package
+
+ build
+
+
+
+
diff --git a/waynboot-common/src/main/java/com/wayn/common/util/mail/MailUtil.java b/waynboot-common/src/main/java/com/wayn/common/util/mail/MailUtil.java
index 4428074..aa1089e 100644
--- a/waynboot-common/src/main/java/com/wayn/common/util/mail/MailUtil.java
+++ b/waynboot-common/src/main/java/com/wayn/common/util/mail/MailUtil.java
@@ -39,6 +39,7 @@ public class MailUtil {
properties.put("mail.smtp.ssl.socketFactory", sf);
// 设置系统属性
properties.setProperty("mail.smtp.host", host);
+ properties.setProperty("mail.smtp.port", emailConfig.getPort());
properties.put("mail.smtp.auth", "true");
//获取发送邮件会话、获取第三方登录授权码
Session session = Session.getDefaultInstance(properties, new Authenticator() {
@@ -47,7 +48,7 @@ public class MailUtil {
return new PasswordAuthentication(from, emailConfig.getPass());
}
});
-// session.setDebug(true);
+ // session.setDebug(true);
// 创建默认的 MimeMessage 对象
MimeMessage message = new MimeMessage(session);
MimeMessageHelper helper = new MimeMessageHelper(message, true, "UTF-8");
diff --git a/waynboot-message-consumer/pom.xml b/waynboot-message-consumer/pom.xml
index f0b79ed..15342ca 100644
--- a/waynboot-message-consumer/pom.xml
+++ b/waynboot-message-consumer/pom.xml
@@ -11,8 +11,11 @@
waynboot-message-consumer
1.1.0
-
+
+ com.wayn.MessageApplication
+
+
com.wayn
waynboot-message-core
@@ -98,6 +101,50 @@
+
+
+ com.google.cloud.tools
+ jib-maven-plugin
+ 3.0.0
+
+
+
+ ${docker-from-image-name}
+
+
+
+ registry.cn-shanghai.aliyuncs.com/${aliyun-docker-namespace}/${project.artifactId}
+
+
+ ${project.version}
+ latest
+
+
+ ${docker-username}
+ ${docker-passwqrd}
+
+
+
+ ${main-class}
+
+ -Xms412m
+ -Xmx412m
+ -XX:+HeapDumpOnOutOfMemoryError
+ -XX:HeapDumpPath=./
+
+
+
+
+
+
+
+ package
+
+ build
+
+
+
+
diff --git a/waynboot-mobile-api/pom.xml b/waynboot-mobile-api/pom.xml
index 53f8a93..867b12f 100644
--- a/waynboot-mobile-api/pom.xml
+++ b/waynboot-mobile-api/pom.xml
@@ -11,6 +11,11 @@
waynboot-mobile-api
1.1.0
+
+ wayn111
+ com.wayn.MobileApplication
+
+
@@ -37,7 +42,7 @@
lombok
-
+
@@ -47,7 +52,7 @@
spring-boot-maven-plugin
- com.wayn.MobileApplication
+ ${main-class}
ZIP
@@ -61,6 +66,50 @@
+
+
+ com.google.cloud.tools
+ jib-maven-plugin
+ 3.0.0
+
+
+
+ ${docker-from-image-name}
+
+
+
+ registry.cn-shanghai.aliyuncs.com/${aliyun-docker-namespace}/${project.artifactId}
+
+
+ ${project.version}
+ latest
+
+
+ ${docker-username}
+ ${docker-passwqrd}
+
+
+
+ ${main-class}
+
+ -Xms512m
+ -Xmx512m
+ -XX:+HeapDumpOnOutOfMemoryError
+ -XX:HeapDumpPath=./
+
+
+
+
+
+
+
+ package
+
+ build
+
+
+
+