From 5cadd58b25ac8ca793fc9db6f4942f8033389c41 Mon Sep 17 00:00:00 2001
From: clay <20932067@zju.edu.cn>
Date: Sat, 19 Dec 2020 22:25:34 +0800
Subject: [PATCH] 01

---
 .../controller/MailConfigController.java      | 36 +------------------
 .../express/service/MailConfigService.java    |  2 +-
 .../service/impl/MailConfigServiceImpl.java   | 21 ++++++++++-
 3 files changed, 22 insertions(+), 37 deletions(-)

diff --git a/src/main/java/live/tomey/api/express/controller/MailConfigController.java b/src/main/java/live/tomey/api/express/controller/MailConfigController.java
index c883c51..bd19efb 100644
--- a/src/main/java/live/tomey/api/express/controller/MailConfigController.java
+++ b/src/main/java/live/tomey/api/express/controller/MailConfigController.java
@@ -37,41 +37,7 @@ public class MailConfigController {
             if (account==null){
                 return new Result(false,0,"系统错误");
             }
-            String sender = HttpServletRequestUtil.getString(request, "sender");
-            String personal = HttpServletRequestUtil.getString(request, "personal");
-            String emailSmtpHost = HttpServletRequestUtil.getString(request, "emailSmtpHost");
-            String emailSmtpPort = HttpServletRequestUtil.getString(request, "emailSmtpPort");
-            String username = HttpServletRequestUtil.getString(request, "username");
-            String password = HttpServletRequestUtil.getString(request, "password");
-            String encryption = HttpServletRequestUtil.getString(request, "encryption");
-            Integer state = HttpServletRequestUtil.getInteger(request, "state");
-            String testMail = HttpServletRequestUtil.getString(request, "testMail");
-            if (sender==null){
-                return new Result(false,0,"发件人地址不能为空!");
-            }
-            if (personal==null){
-                return new Result(false,0,"发件人信息不能为空!");
-            }
-            if (emailSmtpHost ==null){
-                return new Result(false,0,"服务器地址不能为空!");
-            }
-            if (emailSmtpPort ==null){
-                return new Result(false,0,"服务器端口不能为空!");
-            }
-            if (username ==null){
-                return new Result(false,0,"用户名不能为空!");
-            }
-            if (password ==null){
-                return new Result(false,0,"密码不能为空!");
-            }
-            if (encryption ==null){
-                return new Result(false,0,"加密方式不能为空!");
-            }
-            if (testMail ==null){
-                return new Result(false,0,"测试邮件不能为空!");
-            }
-            MailConfig mailConfig = new MailConfig(sender,personal,emailSmtpHost,emailSmtpPort,username,password,encryption,state,testMail);
-            ServerResult serverResult = mailConfigService.testSendMessage(account,mailConfig);
+            ServerResult serverResult = mailConfigService.testSendMessage(account);
             return new Result(serverResult.isStart(),0 ,serverResult.getMsg());
         } catch (RuntimeException e) {
             logger.error(e.getMessage());
diff --git a/src/main/java/live/tomey/api/express/service/MailConfigService.java b/src/main/java/live/tomey/api/express/service/MailConfigService.java
index c129939..46dcee2 100644
--- a/src/main/java/live/tomey/api/express/service/MailConfigService.java
+++ b/src/main/java/live/tomey/api/express/service/MailConfigService.java
@@ -17,6 +17,6 @@ public interface MailConfigService {
     ServerResult editMailConfig(MailConfig mailConfig);
 
 
-    ServerResult testSendMessage(Account account,MailConfig mailConfig);
+    ServerResult testSendMessage(Account account);
 
 }
diff --git a/src/main/java/live/tomey/api/express/service/impl/MailConfigServiceImpl.java b/src/main/java/live/tomey/api/express/service/impl/MailConfigServiceImpl.java
index bff9284..bbcd1cc 100644
--- a/src/main/java/live/tomey/api/express/service/impl/MailConfigServiceImpl.java
+++ b/src/main/java/live/tomey/api/express/service/impl/MailConfigServiceImpl.java
@@ -61,8 +61,27 @@ public class MailConfigServiceImpl implements MailConfigService {
     }
 
     @Override
-    public ServerResult testSendMessage(Account account, MailConfig mailConfig) {
+    public ServerResult testSendMessage(Account account) {
         try {
+            MailConfig mailConfig = mailConfigDao.getMailConfig();
+            if (mailConfig.getSender()==null){
+                return new ServerResult(false,"发件人地址为空");
+            }
+            if (mailConfig.getPersonal()==null){
+                return new ServerResult(false,"发件人昵称为空");
+            }
+            if (mailConfig.getEmailSmtpHost()==null){
+                return new ServerResult(false,"服务器地址为空");
+            }
+            if (mailConfig.getEmailSmtpPort()==null){
+                return new ServerResult(false,"服务器端口号为空");
+            }
+            if (mailConfig.getUsername()==null){
+                return new ServerResult(false,"用户名为空");
+            }
+            if (mailConfig.getPassword()==null){
+                return new ServerResult(false,"密码为空");
+            }
             String title = "测试邮件";
             String content = "你好"+mailConfig.getTestMail()+"这是一封测试邮件";
             account.setEmail(mailConfig.getTestMail());