From 7e21301e7d4fcd36fface79370c9e3197e36433c Mon Sep 17 00:00:00 2001
From: wangning <164851225@qq.com>
Date: Tue, 15 May 2018 15:11:17 +0800
Subject: [PATCH] update

---
 pom.xml                                             |  5 -----
 .../signin/core/impls/SignInAccountServiceImpl.java | 13 +++++++++++--
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index d43ae02c5..6c9ab7a3d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,11 +16,6 @@
             <groupId>au.com.royalpay.payment</groupId>
             <artifactId>tools</artifactId>
         </dependency>
-        <dependency>
-            <groupId>cn.yixblog</groupId>
-            <artifactId>yixblog-platform</artifactId>
-            <version>1.2.0</version>
-        </dependency>
         <dependency>
             <groupId>au.com.royalpay.payment</groupId>
             <artifactId>payment-core</artifactId>
diff --git a/src/main/java/au/com/royalpay/payment/manage/signin/core/impls/SignInAccountServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/signin/core/impls/SignInAccountServiceImpl.java
index b085daed0..0435dfd8f 100644
--- a/src/main/java/au/com/royalpay/payment/manage/signin/core/impls/SignInAccountServiceImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/signin/core/impls/SignInAccountServiceImpl.java
@@ -9,18 +9,19 @@ import au.com.royalpay.payment.manage.mappers.system.ManagerMapper;
 import au.com.royalpay.payment.manage.mappers.system.OrgMapper;
 import au.com.royalpay.payment.manage.merchants.core.ClientConfigService;
 import au.com.royalpay.payment.manage.merchants.core.ClientManager;
-import au.com.royalpay.payment.manage.notice.core.MailService;
 import au.com.royalpay.payment.manage.signin.beans.ChangePwdBean;
 import au.com.royalpay.payment.manage.signin.beans.LoginInfo;
 import au.com.royalpay.payment.manage.signin.core.SignInAccountService;
 import au.com.royalpay.payment.manage.signin.core.SignInStatusManager;
 import au.com.royalpay.payment.manage.signin.events.ClientLoginEvent;
 import au.com.royalpay.payment.manage.signin.events.ManagerLoginEvent;
+import au.com.royalpay.payment.manage.system.core.MailService;
 import au.com.royalpay.payment.tools.env.PlatformEnvironment;
 import au.com.royalpay.payment.tools.env.RequestEnvironment;
 import au.com.royalpay.payment.tools.exceptions.BadRequestException;
 import au.com.royalpay.payment.tools.exceptions.ForbiddenException;
 import au.com.royalpay.payment.tools.locale.LocaleSupport;
+import au.com.royalpay.payment.tools.mail.SendMail;
 import au.com.royalpay.payment.tools.utils.PasswordUtils;
 
 import com.alibaba.fastjson.JSONObject;
@@ -39,8 +40,10 @@ import org.thymeleaf.spring4.SpringTemplateEngine;
 
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 import javax.annotation.Resource;
 
@@ -308,7 +311,13 @@ public class SignInAccountServiceImpl implements SignInAccountService, Applicati
 
                 new Thread(() -> {
                     try {
-                        mailService.sendEmail("Reset Password", contact_email, "", content);
+                        SendMail sendMail = new SendMail();
+                        Set<String> to = new HashSet<>();
+                        to.add(contact_email);
+                        sendMail.setMailTos(to);
+                        sendMail.setTitle("Reset Password");
+                        sendMail.setContent(content);
+                        mailService.sendMail(sendMail);
                     } catch (Exception ignored) {
                     }
                 }).start();