From 5ee65912ba6c337a25b250ad11c9fbe02e78b4d5 Mon Sep 17 00:00:00 2001
From: taochengbo <552920369@qq.com>
Date: Sun, 24 May 2020 19:49:47 +0800
Subject: [PATCH] =?UTF-8?q?bug--=E4=BF=AE=E5=A4=8D=E4=B8=AA=E4=BA=BA?=
 =?UTF-8?q?=E4=B8=AD=E5=BF=83=E4=BF=AE=E6=94=B9=E5=AF=86=E7=A0=81=E6=8A=A5?=
 =?UTF-8?q?=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/system/service/impl/SysUserServiceImpl.java     | 4 ++--
 .../modules/system/service/mapper/SysUserMapper.java        | 6 +++---
 .../yixiang/tools/service/impl/EmailConfigServiceImpl.java  | 2 ++
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/yshop-system/src/main/java/co/yixiang/modules/system/service/impl/SysUserServiceImpl.java b/yshop-system/src/main/java/co/yixiang/modules/system/service/impl/SysUserServiceImpl.java
index 350812ce..c7fb68f1 100644
--- a/yshop-system/src/main/java/co/yixiang/modules/system/service/impl/SysUserServiceImpl.java
+++ b/yshop-system/src/main/java/co/yixiang/modules/system/service/impl/SysUserServiceImpl.java
@@ -8,6 +8,7 @@
 */
 package co.yixiang.modules.system.service.impl;
 
+import cn.hutool.core.date.DateUtil;
 import co.yixiang.exception.EntityExistException;
 import co.yixiang.modules.system.domain.Role;
 import co.yixiang.modules.system.domain.User;
@@ -20,7 +21,6 @@ import co.yixiang.utils.RedisUtils;
 import co.yixiang.utils.SecurityUtils;
 import co.yixiang.utils.StringUtils;
 import co.yixiang.utils.ValidationUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import co.yixiang.dozer.service.IGenerator;
 import com.github.pagehelper.PageInfo;
@@ -154,7 +154,7 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserMapper, User> imp
      */
     @Override
     public void updatePass(String username, String encryptPassword) {
-        userMapper.updatePass(encryptPassword,new Date(),username);
+        userMapper.updatePass(encryptPassword, DateUtil.format(new Date(),"yyyy-MM-dd HH:mm:ss"),username);
     }
 
     /**
diff --git a/yshop-system/src/main/java/co/yixiang/modules/system/service/mapper/SysUserMapper.java b/yshop-system/src/main/java/co/yixiang/modules/system/service/mapper/SysUserMapper.java
index b61f2aa0..c0269626 100644
--- a/yshop-system/src/main/java/co/yixiang/modules/system/service/mapper/SysUserMapper.java
+++ b/yshop-system/src/main/java/co/yixiang/modules/system/service/mapper/SysUserMapper.java
@@ -31,15 +31,15 @@ public interface SysUserMapper extends CoreMapper<User> {
      * @param password 密码
      * @param lastPasswordResetTime /
      */
-    @Update("update `user` set password = password+${password} , last_password_reset_time = lastPasswordResetTime+${lastPasswordResetTime} where username = #{username}")
-    void updatePass( @Param("password") String password,@Param("lastPasswordResetTime") Date lastPasswordResetTime, @Param("username") String username);
+    @Update("update `user` set password = #{password} , last_password_reset_time = #{lastPasswordResetTime} where username = #{username}")
+    void updatePass( @Param("password") String password,@Param("lastPasswordResetTime") String lastPasswordResetTime, @Param("username") String username);
 
     /**
      * 修改邮箱
      * @param username 用户名
      * @param email 邮箱
      */
-    @Update("update `user` set email = email+ ${email} where username = #{username}")
+    @Update("update `user` set email = #{email} where username = #{username}")
     void updateEmail(@Param("email") String email, @Param("username") String username);
 
 }
diff --git a/yshop-tools/src/main/java/co/yixiang/tools/service/impl/EmailConfigServiceImpl.java b/yshop-tools/src/main/java/co/yixiang/tools/service/impl/EmailConfigServiceImpl.java
index f486c50c..c8230c61 100644
--- a/yshop-tools/src/main/java/co/yixiang/tools/service/impl/EmailConfigServiceImpl.java
+++ b/yshop-tools/src/main/java/co/yixiang/tools/service/impl/EmailConfigServiceImpl.java
@@ -79,6 +79,8 @@ public class EmailConfigServiceImpl extends BaseServiceImpl<EmailConfigMapper, E
         account.setFrom(emailConfig.getUser()+"<"+emailConfig.getFromUser()+">");
         // ssl方式发送
         account.setSslEnable(true);
+        // 使用STARTTLS安全连接
+        account.setStarttlsEnable(true);
         String content = emailVo.getContent();
         // 发送
         try {