From f929be682f711e9b677b6ff5245316e392aa1699 Mon Sep 17 00:00:00 2001
From: "yunhao.wang" <yunhao.wang@estsh.com>
Date: Sun, 27 Jan 2019 11:51:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E9=82=AE=E4=BB=B6=E5=8F=91?=
 =?UTF-8?q?=E9=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../apiservice/controller/busi/SysConfigController.java | 17 ++++++++++++-----
 .../core/apiservice/mq/MessageMailQueueReceiver.java    |  4 ++--
 .../cn/estsh/i3plus/core/apiservice/util/MailUtil.java  | 13 +++++++++++++
 3 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysConfigController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysConfigController.java
index 63c6147..1f674c4 100644
--- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysConfigController.java
+++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysConfigController.java
@@ -10,6 +10,7 @@ import cn.estsh.i3plus.pojo.base.common.Pager;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
+import cn.estsh.i3plus.pojo.platform.bean.MailConfig;
 import cn.estsh.i3plus.pojo.platform.bean.SessionUser;
 import cn.estsh.i3plus.pojo.platform.bean.SysConfig;
 import cn.estsh.impp.framework.base.controller.CoreBaseController;
@@ -230,17 +231,23 @@ public class SysConfigController extends CoreBaseController {
         }
     }
 
-    @GetMapping("/send-test-mail/{to}")
+    @GetMapping("/send-test-mail")
     @ApiOperation(value = "邮件测试")
-    public ResultBean sendTestMail(@PathVariable("to") String to){
+    public ResultBean sendTestMail(MailConfig mailConfig){
         try {
-            ValidatorBean.checkNotNull(to,"收件人不能为空");
+            ValidatorBean.beginValid(mailConfig)
+                    .notNull("mailHost",mailConfig.getMailHost())
+                    .notNull("mailPort",mailConfig.getMailPort())
+                    .notNull("mailUser",mailConfig.getMailUser())
+                    .notNull("mailPassword",mailConfig.getMailPassword())
+                    .notNull("mailNick",mailConfig.getMailNick())
+                    .notNull("testTo",mailConfig.getTestTo());
 
-            mailUtil.init();
+            mailUtil.init(mailConfig);
             mailUtil.setSubject("测试邮件");
             mailUtil.setContentType(ImppEnumUtil.MESSAGE_TYPE_CONTENT.HTML.getDescription());
             mailUtil.setBody("测试邮件");
-            mailUtil.setTo(to);
+            mailUtil.setTo(mailConfig.getTestTo());
             mailUtil.send();
             return ResultBean.success("测试邮件已发送").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
         }catch(ImppBusiException busExcep){
diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/MessageMailQueueReceiver.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/MessageMailQueueReceiver.java
index 0643d4c..930c657 100644
--- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/MessageMailQueueReceiver.java
+++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/MessageMailQueueReceiver.java
@@ -60,7 +60,7 @@ public class MessageMailQueueReceiver {
                 mailUtil.setBody(msg.getMessageContent());
                 mailUtil.setTo(sysConfigService.getSysConfigByCode(PlatformConstWords.CONTACT_MAIL).getConfigValue());
                 //信息已处理
-//                mailUtil.send();
+                mailUtil.send();
             }else {
 
                 // 收件人信息
@@ -91,7 +91,7 @@ public class MessageMailQueueReceiver {
                     mailUtil.setContentType(ImppEnumUtil.MESSAGE_TYPE_CONTENT.valueOfDescription(msg.getMessageContentType()));
                     mailUtil.setBody(msg.getMessageContent());
                     mailUtil.setTo(sysUser.getUserEmail());
-//                    mailUtil.send();
+                    mailUtil.send();
                 }
 
                 msg.setMessageSenderNameRdd(StringUtils.join(receiverName, ","));
diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/MailUtil.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/MailUtil.java
index 0441a03..11ffc87 100644
--- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/MailUtil.java
+++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/MailUtil.java
@@ -3,6 +3,7 @@ package cn.estsh.i3plus.core.apiservice.util;
 import cn.estsh.i3plus.core.api.iservice.busi.ISysConfigService;
 import cn.estsh.i3plus.platform.common.util.PlatformConstWords;
 import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil;
+import cn.estsh.i3plus.pojo.platform.bean.MailConfig;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -58,6 +59,18 @@ public class MailUtil {
         return this;
     }
 
+    //初始化服务器邮箱参数
+    public MailUtil init(MailConfig mailConfig) {
+        this.smtpHost = mailConfig.getMailHost();
+        this.smtpPort = mailConfig.getMailPort();
+        this.from = mailConfig.getMailUser();
+        this.nick = mailConfig.getMailNick();
+        this.smtpUser = mailConfig.getMailUser();
+        this.smtpPassword = mailConfig.getMailPassword();
+        this.isAuthenticationSMTP = true;
+
+        return this;
+    }
     /**
      * 设置收件人地址
      *