he2802 1 年之前
父节点
当前提交
65c05b3e8e

+ 1 - 1
zhongzheng-admin/src/main/java/com/zhongzheng/controller/common/CommonController.java

@@ -884,7 +884,7 @@ public class CommonController extends BaseController {
     @ApiOperation("人脸属性")
     @PostMapping("/common/free/detectFaceAttributes")
     public AjaxResult<Void> DetectFaceAttributes(@RequestBody FaceQueryBo bo) {
-        iFaceService.DetectFaceAttributes(bo);
+        iFaceService.DetectFace(bo);
         return AjaxResult.success();
     }
 }

+ 8 - 0
zhongzheng-framework/src/main/java/com/zhongzheng/framework/web/service/UserServiceImpl.java

@@ -756,6 +756,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         }else {
             pwd =  bo.getTel().substring(bo.getTel().length() - 6);
         }
+        inertData.setPasswordAes(EncryptHandler.encrypt(pwd));
         inertData.setPassword(SecurityUtils.encryptPassword(pwd));
         if(!save(inertData)){
             throw new CustomException("注册失败");
@@ -814,6 +815,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         inertData.setLastLoginTime(DateUtils.getNowTime());
         inertData.setCreateTime(DateUtils.getNowTime());
         inertData.setUpdateTime(DateUtils.getNowTime());
+        inertData.setPasswordAes(EncryptHandler.encrypt(bo.getPwd()));
         inertData.setPassword(SecurityUtils.encryptPassword(bo.getPwd()));
         if (Validator.isNotEmpty(bo.getShareCode())) {
             inertData.setShareCode(bo.getShareCode());
@@ -931,6 +933,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
             //初始密码(身份证后6位)
             String idCard = itemImport.getIdCard();
             String pwd =  idCard.substring(idCard.length() - 6); // 随机密码
+            inertData.setPasswordAes(EncryptHandler.encrypt(pwd));
             inertData.setPassword(SecurityUtils.encryptPassword(pwd));
             inertData.setImportNo(importNo); //设置导入编号 一个导入页面同时导入多次算一个编号
             if(!save(inertData)){
@@ -1006,6 +1009,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         //初始密码(身份证后6位)
         String idCard = itemImport.getIdCard();
         String pwd =  idCard.substring(idCard.length() - 6); // 随机密码
+        inertData.setPasswordAes(EncryptHandler.encrypt(pwd));
         inertData.setPassword(SecurityUtils.encryptPassword(pwd));
         inertData.setImportNo(importNo); //设置导入编号 一个导入页面同时导入多次算一个编号
         if(!save(inertData)){
@@ -1032,6 +1036,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         if(!ToolsUtils.verifEasyPwd(bo.getNewPwd())){
             throw new CustomException("密码应由8-16位数字、大小写字母、符号组成");
         }
+        user.setPasswordAes(EncryptHandler.encrypt(bo.getNewPwd()));
         user.setPassword(SecurityUtils.encryptPassword(bo.getNewPwd()));
         user.setPwdTime(DateUtils.getNowTime());
         user.setUpdateTime(DateUtils.getNowTime());
@@ -1052,6 +1057,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         if(!ToolsUtils.verifEasyPwd(bo.getNewPwd())){
             throw new CustomException("密码应由6-18位组成");
         }
+        user.setPasswordAes(EncryptHandler.encrypt(bo.getNewPwd()));
         user.setPassword(SecurityUtils.encryptPassword(bo.getNewPwd()));
         user.setPwdTime(DateUtils.getNowTime());
         user.setUpdateTime(DateUtils.getNowTime());
@@ -1294,6 +1300,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         if(Validator.isEmpty(user)){
             throw new CustomException("该手机号未注册");
         }
+        user.setPasswordAes(EncryptHandler.encrypt(bo.getPwd()));
         user.setPassword(SecurityUtils.encryptPassword(bo.getPwd()));
         user.setPwdTime(DateUtils.getNowTime());
         user.setUpdateTime(DateUtils.getNowTime());
@@ -1796,6 +1803,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
             //初始密码(身份证后6位)
             String idCard = itemImport.getUserCard();
             String pwd =  idCard.substring(idCard.length() - 6); // 随机密码
+            inertData.setPasswordAes(EncryptHandler.encrypt(pwd));
             inertData.setPassword(SecurityUtils.encryptPassword(pwd));
             inertData.setImportNo(importNo); //设置导入编号 一个导入页面同时导入多次算一个编号
             if(!save(inertData)){

+ 1 - 0
zhongzheng-framework/src/main/java/com/zhongzheng/framework/web/service/WxLoginService.java

@@ -390,6 +390,7 @@ public class WxLoginService implements IWxLoginService {
         bo.setUpdateTime(DateUtils.getNowTime());
 //        String pwd = ToolsUtils.getSmsCode(); // 随机密码
         String pwd = idCard.substring(idCard.length() - 6);
+        bo.setPasswordAes(EncryptHandler.encrypt(pwd));
         bo.setPassword(SecurityUtils.encryptPassword(pwd));
         if (inviteCode != null) {
             User inviteUser = iUserService.queryByAccount(inviteCode);

+ 2 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/user/domain/User.java

@@ -235,4 +235,6 @@ private static final long serialVersionUID=1L;
     private String school;
 
     private String graduationTime;
+
+    private String passwordAes;
 }