From 6e45b2e0c2bd8ead46acf38ba48d43cb0461758f Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Sat, 2 Jun 2018 12:28:40 +0800
Subject: [PATCH] =?UTF-8?q?MsgPushUtils.push(type...)=E7=9A=84receiveUserC?=
 =?UTF-8?q?ode=E5=8F=82=E6=95=B0=E6=94=AF=E6=8C=81=E5=A4=9A=E4=B8=AA?=
 =?UTF-8?q?=EF=BC=8C=E4=BE=9D[CODE]=E5=89=8D=E7=BC=80=EF=BC=8C=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E7=9B=B4=E6=8E=A5=E6=8C=87=E5=AE=9A=E6=89=8B=E6=9C=BA?=
 =?UTF-8?q?=E5=8F=B7=E7=A0=81=E6=88=96=E9=82=AE=E7=AE=B1=E5=9C=B0=E5=9D=80?=
 =?UTF-8?q?=E7=AD=89=E7=AD=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/sys/web/user/AccountController.java  | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/web/user/AccountController.java b/modules/core/src/main/java/com/jeesite/modules/sys/web/user/AccountController.java
index ab2492c3..8ef257de 100644
--- a/modules/core/src/main/java/com/jeesite/modules/sys/web/user/AccountController.java
+++ b/modules/core/src/main/java/com/jeesite/modules/sys/web/user/AccountController.java
@@ -20,6 +20,8 @@ import com.jeesite.common.config.Global;
 import com.jeesite.common.lang.StringUtils;
 import com.jeesite.common.service.ServiceException;
 import com.jeesite.common.web.BaseController;
+import com.jeesite.modules.msg.entity.MsgPush;
+import com.jeesite.modules.msg.utils.MsgPushUtils;
 import com.jeesite.modules.sys.entity.User;
 import com.jeesite.modules.sys.service.UserService;
 import com.jeesite.modules.sys.utils.UserUtils;
@@ -332,10 +334,11 @@ public class AccountController extends BaseController{
 	 */
 	private String sendEmailValidCode(User user, String code, String title){
 		try {
-			String contentTitle = user.getUserName() + "（" + user.getLoginCode() + "）"+title+"验证码";
-			String contentText = "尊敬的用户，您好!\n\n您的验证码是：" + code +"（请勿透露给其他人）\n\n"
+			title = user.getUserName() + "（" + user.getLoginCode() + "）"+title+"验证码";
+			String content = "尊敬的用户，您好!\n\n您的验证码是：" + code +"（请勿透露给其他人）\n\n"
 						+ "请复制后，填写在你的验证码窗口完成验证。\n\n本邮件由系统自动发出，请勿回复。\n\n感谢您的使用。";
-			String receiverCodes = user.getEmail(), receiverNames = user.getUserName();
+			String receiveUserCode = "[CODE]"+user.getEmail();
+			MsgPushUtils.push(MsgPush.TYPE_EMAIL, title, content, null, null, receiveUserCode);
 		} catch (Exception e) {
 			logger.error(title+"发送邮件错误。", e);
 			return renderResult(Global.FALSE, "系统出现了点问题，错误信息：" + e.getMessage());
@@ -348,9 +351,10 @@ public class AccountController extends BaseController{
 	 */
 	private String sendSmsValidCode(User user, String code, String title){
 		try {
-			String contentTitle = user.getUserName() + "（" + user.getLoginCode() + "）"+title+"验证码";
-			String contentText = "您好，您的验证码是：" + code +"（请勿透露给其他人）感谢您的使用。";
-			String receiverCodes = user.getMobile(), receiverNames = user.getUserName();
+			title = user.getUserName() + "（" + user.getLoginCode() + "）"+title+"验证码";
+			String content = "您好，您的验证码是：" + code +"（请勿透露给其他人）感谢您的使用。";
+			String receiveUserCode = "[CODE]"+user.getMobile();
+			MsgPushUtils.push(MsgPush.TYPE_SMS, title, content, null, null, receiveUserCode);
 		} catch (Exception e) {
 			logger.error(title+"发送短信错误。", e);
 			return renderResult(Global.FALSE, "系统出现了点问题，错误信息：" + e.getMessage());