From 5f69a549add739b190f46ba7d035e2fe31390e01 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <913652501@qq.com>
Date: Fri, 17 Jul 2020 09:39:04 +0800
Subject: [PATCH] 添加修改密码的加密的功能

---
 kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java |   27 +++++++++++++++++++--------
 1 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java
index 1ed685b..a5fa6eb 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java
@@ -15,6 +15,7 @@
 import com.kidgrow.common.model.SysUser;
 import com.kidgrow.common.model.*;
 import com.kidgrow.common.service.impl.SuperServiceImpl;
+import com.kidgrow.common.utils.AesUtils;
 import com.kidgrow.common.utils.DateUtils;
 import com.kidgrow.common.utils.Pinyin4jUtil;
 import com.kidgrow.redis.util.RedisUtils;
@@ -228,15 +229,19 @@
 
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public ResultBody updatePassword(Long id, String oldPassword, String newPassword, Boolean isdefault) {
+    public ResultBody updatePassword(Long id, String oldPassword, String newPassword, Boolean isdefault) throws Exception {
+
         SysUser sysUser = baseMapper.selectById(id);
         if (StrUtil.isNotBlank(oldPassword)) {
+            oldPassword=AesUtils.desEncrypt(oldPassword).trim();
             if (!passwordEncoder.matches(oldPassword, sysUser.getPassword())) {
                 return ResultBody.failed("旧密码错误!");
             }
         }
         if (StrUtil.isBlank(newPassword)) {
             newPassword = com.kidgrow.common.utils.RandomValueUtils.getRandom(6);
+        }else {
+            newPassword=AesUtils.desEncrypt(newPassword).trim();
         }
         SysUser user = new SysUser();
         user.setId(id);
@@ -256,12 +261,12 @@
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public ResultBody updateUserTel(Map<String, Object> params) {
+    public ResultBody updateUserTel(Map<String, Object> params) throws Exception  {
         Long id = MapUtils.getLong(params, "id");
         String oldTel = MapUtils.getString(params, "oldTel");
-        String newTel = MapUtils.getString(params, "newTel");
-        String authCode = MapUtils.getString(params, "authCode");
-        String userPassword = MapUtils.getString(params, "userPassword");
+        String newTel = AesUtils.desEncrypt(MapUtils.getString(params, "newTel")).trim();
+        String authCode = AesUtils.desEncrypt(MapUtils.getString(params, "authCode")).trim();
+        String userPassword = AesUtils.desEncrypt(MapUtils.getString(params, "userPassword")).trim();
 
         if (id > 0 && StringUtils.isNotBlank(oldTel) && StringUtils.isNotBlank(newTel) && StringUtils.isNotBlank(authCode) && StringUtils.isNotBlank(userPassword)) {
             //检查验证码
@@ -275,6 +280,7 @@
                 } else {
                     //验证旧手机号和密码
                     SysUser sysUser = baseMapper.selectById(id);
+                    userPassword = AesUtils.desEncrypt(userPassword);
                     if (passwordEncoder.matches(userPassword, sysUser.getPassword()) && sysUser.getMobile().equals((oldTel))) {
                         //验证通过,修改手机号
                         SysUser user = new SysUser();
@@ -494,7 +500,7 @@
      * @return
      */
     @Override
-    public ResultBody passwordByPhone(Map<String, Object> map) {
+    public ResultBody passwordByPhone(Map<String, Object> map) throws Exception {
         //手机号,type,验证码,新密码
         String phone = MapUtils.getString(map, "phone");
         if (phone == null || "".equals(phone.trim())) {
@@ -508,7 +514,10 @@
         if (newPass == null || "".equals(newPass.trim())) {
             return ResultBody.failed("请输入正确的密码");
         }
-        if (CheckVerificationCode(ConstantSMS.PASSWORD_SMS, map.get("phone").toString(), verificationCode)) {
+        phone= AesUtils.desEncrypt(phone.trim());
+        verificationCode= AesUtils.desEncrypt(verificationCode.trim());
+        newPass= AesUtils.desEncrypt(newPass.trim());
+        if (CheckVerificationCode(ConstantSMS.PASSWORD_SMS, phone, verificationCode)) {
             //查询表
             Map<String, Object> selectMap = new HashMap<>();
             selectMap.put("mobile", phone);
@@ -642,10 +651,12 @@
      */
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public ResultBody doctorUserReg(UserRegVo userRegVo, SysUser sysUserd) {
+    public ResultBody doctorUserReg(UserRegVo userRegVo, SysUser sysUserd) throws Exception {
         if(sysUserd.getId()==null){
             sysUserd = this.baseMapper.selectById(userRegVo.getUserId());
         }
+        userRegVo.setPassword(AesUtils.desEncrypt(userRegVo.getPassword()).trim());
+        userRegVo.setUsername(AesUtils.desEncrypt(userRegVo.getUsername()).trim());
         //检查手机号是否已经注册 H端登录名和手机号存一样的值
         if (phoneIsUsed(userRegVo.getMobile())) {
             return ResultBody.failed("该手机号已经注册");

--
Gitblit v1.8.0