merge db

zhongzheng-admin/src/main/java/com/zhongzheng/controller/course/CourseController.java

@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.zhongzheng.common.exception.CustomException;
+import com.zhongzheng.common.type.EncryptHandler;
 import com.zhongzheng.common.utils.ServletUtils;
 import com.zhongzheng.modules.course.bo.*;
 import com.zhongzheng.modules.course.service.ICourseService;
@@ -205,7 +206,7 @@ public class CourseController extends BaseController {
     @GetMapping("/goodsList")
     public TableDataInfo<GoodsUserVo> goodsList(CourseQueryBo bo) {
         User user = iUserService.getOne(new LambdaQueryWrapper<User>()
-                .eq(User::getTelphone, bo.getTelphone()).last("limit 1"));
+                .eq(User::getTelphone, EncryptHandler.encrypt(bo.getTelphone())).last("limit 1"));
         if(Validator.isEmpty(user)){
             throw new CustomException("该用户不存在");
         }
@@ -224,7 +225,7 @@ public class CourseController extends BaseController {
         }
         for(CourseProgressQueryBo queryBo : bo.getTelphoneList()){
             User user = iUserService.getOne(new LambdaQueryWrapper<User>()
-                    .eq(User::getTelphone, queryBo.getTelphone()).last("limit 1"));
+                    .eq(User::getTelphone, EncryptHandler.encrypt(queryBo.getTelphone())).last("limit 1"));
             if(Validator.isEmpty(user)){
                 continue;
             }

zhongzheng-common/src/main/java/com/zhongzheng/common/type/EncryptHandler.java

@@ -35,6 +35,7 @@ public class EncryptHandler  implements TypeHandler<String> {
         if (null == value) {
             return null;
         }
+   //     return value;
         AES aes = SecureUtil.aes(KEYS);
         String encrypt = aes.encryptHex(value);
         return encrypt;
@@ -46,10 +47,8 @@ public class EncryptHandler  implements TypeHandler<String> {
             preparedStatement.setString(i, null);
             return;
         }
-        preparedStatement.setString(i, s);
-    //    String encrypt = encrypt(s);
-    //    preparedStatement.setString(i, encrypt);
-
+        String encrypt = encrypt(s);
+        preparedStatement.setString(i, encrypt);
     }
 
     @Override

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

@@ -373,7 +373,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
             //手机号变更
             if(Validator.isEmpty(oldUser.getTelphone()) || !oldUser.getTelphone().equals(update.getTelphone())){
                 User user = getOne(new LambdaQueryWrapper<User>()
-                        .eq(User::getTelphone,update.getTelphone()).ne(User::getUserId,update.getUserId()).last("limit 1"));
+                        .eq(User::getTelphone,EncryptHandler.encrypt(update.getTelphone())).ne(User::getUserId,update.getUserId()).last("limit 1"));
                 if(Validator.isNotNull(user)){
                     throw new CustomException("该手机号已注册");
                 }
@@ -417,7 +417,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
             //手机号变更
             if(Validator.isEmpty(oldUser.getTelphone()) || !oldUser.getTelphone().equals(update.getTelphone())){
                 User user = getOne(new LambdaQueryWrapper<User>()
-                        .eq(User::getTelphone,update.getTelphone()).ne(User::getUserId,update.getUserId()).last("limit 1"));
+                        .eq(User::getTelphone,EncryptHandler.encrypt(update.getTelphone())).ne(User::getUserId,update.getUserId()).last("limit 1"));
                 if(Validator.isNotNull(user)){
                     throw new CustomException("该手机号已注册");
                 }
@@ -645,13 +645,13 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
             throw new CustomException("真实姓名不能为空");
         }*/
         User user = getOne(new LambdaQueryWrapper<User>()
-                .eq(User::getTelphone,bo.getTel()).last("limit 1"));
+                .eq(User::getTelphone,EncryptHandler.encrypt(bo.getTel())).last("limit 1"));
         if(Validator.isNotNull(user)){
             throw new CustomException("该手机号已注册");
         }
         if(Validator.isNotEmpty(bo.getIdCard())){
             User user2 = getOne(new LambdaQueryWrapper<User>()
-                    .eq(User::getIdCard,bo.getIdCard()).last("limit 1"));
+                    .eq(User::getIdCard,EncryptHandler.encrypt(bo.getIdCard())).last("limit 1"));
             if(Validator.isNotNull(user2)){
                 throw new CustomException("该身份证已被使用");
             }
@@ -703,7 +703,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
             throw new CustomException("验证码错误");
         }
         User user = getOne(new LambdaQueryWrapper<User>()
-                .eq(User::getTelphone,bo.getTel()).last("limit 1"));
+                .eq(User::getTelphone,EncryptHandler.encrypt(bo.getTel())).last("limit 1"));
         if(Validator.isNotNull(user)){
             throw new CustomException("该手机号已注册");
         }
@@ -776,7 +776,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
                 itemImport.setSubjectIds(ToolsUtils.join(",", sIdList));
             }
             User user = getOne(new LambdaQueryWrapper<User>()
-                    .eq(User::getTelphone,itemImport.getTelphone()).last("limit 1"));
+                    .eq(User::getTelphone,EncryptHandler.encrypt(itemImport.getTelphone())).last("limit 1"));
             if(Validator.isNotNull(user)){
                 if(Validator.isNotEmpty(user.getIdCard())&&Validator.isNotEmpty(itemImport.getIdCard())&&!itemImport.getIdCard().equals(user.getIdCard())){
                     throw new CustomException(itemImport.getRealname()+"身份证号码不一致");
@@ -803,7 +803,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
                 continue;
             }else{
                 User user2 = getOne(new LambdaQueryWrapper<User>()
-                        .eq(User::getIdCard,itemImport.getIdCard()).last("limit 1"));
+                        .eq(User::getIdCard,EncryptHandler.encrypt(itemImport.getIdCard())).last("limit 1"));
                 if(Validator.isNotEmpty(user2)){
                     throw new CustomException(itemImport.getRealname()+"身份证号码已存在，创建失败");
                 }
@@ -878,7 +878,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
                 throw new CustomException("用户手机号码缺失");
             }
             User user1 = getOne(new LambdaQueryWrapper<User>()
-                    .eq(User::getTelphone,bo.getTelphone()).last("limit 1"));
+                    .eq(User::getTelphone,EncryptHandler.encrypt(bo.getTelphone())).last("limit 1"));
             //手机号码存在
             if(Validator.isNotEmpty(user1)){
                 UserIdCardBatchVo user = BeanUtil.toBean(bo, UserIdCardBatchVo.class);
@@ -1015,7 +1015,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         }
         redisCache.deleteObject(key);
         User user = getOne(new LambdaQueryWrapper<User>()
-                .eq(User::getTelphone,bo.getTel()).last("limit 1"));
+                .eq(User::getTelphone,EncryptHandler.encrypt(bo.getTel())).last("limit 1"));
         if(Validator.isEmpty(user)){
             throw new CustomException("该手机号未注册");
         }
@@ -1041,7 +1041,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         }
         redisCache.deleteObject(key);
         User user = getOne(new LambdaQueryWrapper<User>()
-                .eq(User::getTelphone,bo.getTel()).last("limit 1"));
+                .eq(User::getTelphone,EncryptHandler.encrypt(bo.getTel())).last("limit 1"));
         if(Validator.isEmpty(user)){
             throw new CustomException("该手机号未注册");
         }
@@ -1074,7 +1074,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         }
         redisCache.deleteObject(key);
         User user = getOne(new LambdaQueryWrapper<User>()
-                .eq(User::getTelphone,bo.getTel()).last("limit 1"));
+                .eq(User::getTelphone,EncryptHandler.encrypt(bo.getTel())).last("limit 1"));
         if(Validator.isNotEmpty(user)){
             throw new CustomException("该手机号已被注册");
         }
@@ -1101,7 +1101,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         iUserLoginErrorService.checkLimit(bo.getAccount());
         LambdaQueryWrapper<User> queryWrapper =new LambdaQueryWrapper<User>();
         queryWrapper.and(wq -> wq
-                .eq(User::getTelphone,bo.getAccount())
+                .eq(User::getTelphone,EncryptHandler.encrypt(bo.getAccount()))
                 .or()
                 .eq(User::getIdCard,bo.getAccount()));
         User user = getOne(queryWrapper);
@@ -1154,7 +1154,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         if(Validator.isEmpty(bo.getRealname())){
             throw new CustomException("数据缺失");
         }
-        User userBak = getOne(new LambdaQueryWrapper<User>().eq(User::getIdCard,bo.getIdCard()).last("limit 1"));
+        User userBak = getOne(new LambdaQueryWrapper<User>().eq(User::getIdCard,EncryptHandler.encrypt(bo.getIdCard())).last("limit 1"));
         if(!Validator.isEmpty(userBak)){
             throw new CustomException("该身份证已使用");
         }

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

@@ -18,6 +18,7 @@ import com.zhongzheng.common.constant.Constants;
 import com.zhongzheng.common.core.redis.RedisCache;
 import com.zhongzheng.common.exception.CustomException;
 
+import com.zhongzheng.common.type.EncryptHandler;
 import com.zhongzheng.common.utils.*;
 import com.zhongzheng.common.utils.http.HttpUtils;
 import com.zhongzheng.common.utils.ip.IpUtils;
@@ -392,7 +393,7 @@ public class WxLoginService implements IWxLoginService {
             throw new CustomException("该微信没有绑定手机号码" + resultString);
         }
         User user = iUserService.getOne(new LambdaQueryWrapper<User>()
-                .eq(User::getTelphone, phoneNumber).last("limit 1"));
+                .eq(User::getTelphone, EncryptHandler.encrypt(phoneNumber)).last("limit 1"));
         if (Validator.isNotEmpty(user)) {
             user.setOpenId(openId);
             user.setUnionId(unionId);
@@ -416,7 +417,7 @@ public class WxLoginService implements IWxLoginService {
                 throw new CustomException("注册失败");
             }
             user = iUserService.getOne(new LambdaQueryWrapper<User>()
-                    .eq(User::getTelphone, phoneNumber).last("limit 1"));
+                    .eq(User::getTelphone, EncryptHandler.encrypt(phoneNumber)).last("limit 1"));
         }
         return user;
     }

zhongzheng-system/src/main/java/com/zhongzheng/modules/alisms/service/impl/AliSmsServiceImpl.java

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.zhongzheng.common.constant.Constants;
 import com.zhongzheng.common.core.redis.RedisCache;
 import com.zhongzheng.common.exception.CustomException;
+import com.zhongzheng.common.type.EncryptHandler;
 import com.zhongzheng.common.utils.ServletUtils;
 import com.zhongzheng.common.utils.SmsUtils;
 import com.zhongzheng.common.utils.ToolsUtils;
@@ -93,7 +94,7 @@ public class AliSmsServiceImpl implements IAliSmsService {
             throw new CustomException("手机号码不能为空");
         }
         User user = iUserService.getOne(new LambdaQueryWrapper<User>()
-                .eq(User::getTelphone,tel).last("limit 1"));
+                .eq(User::getTelphone,EncryptHandler.encrypt(tel)).last("limit 1"));
         if(Validator.isNotNull(user)){
             throw new CustomException("该手机号已注册");
         }
@@ -126,7 +127,7 @@ public class AliSmsServiceImpl implements IAliSmsService {
             throw new CustomException("手机号码不能为空");
         }
         User user = iUserService.getOne(new LambdaQueryWrapper<User>()
-                .eq(User::getTelphone,tel).last("limit 1"));
+                .eq(User::getTelphone,EncryptHandler.encrypt(tel)).last("limit 1"));
         if(Validator.isEmpty(user)){
             throw new CustomException("该手机号未注册");
         }
@@ -158,7 +159,7 @@ public class AliSmsServiceImpl implements IAliSmsService {
             throw new CustomException("手机号码不能为空");
         }
         User user = iUserService.getOne(new LambdaQueryWrapper<User>()
-                .eq(User::getTelphone,tel).last("limit 1"));
+                .eq(User::getTelphone,EncryptHandler.encrypt(tel)).last("limit 1"));
         if(Validator.isEmpty(user)){
             throw new CustomException("该手机号未注册");
         }
@@ -213,7 +214,7 @@ public class AliSmsServiceImpl implements IAliSmsService {
             throw new CustomException("手机号码不能为空");
         }
         User user = iUserService.getOne(new LambdaQueryWrapper<User>()
-                .eq(User::getTelphone,tel).last("limit 1"));
+                .eq(User::getTelphone, EncryptHandler.encrypt(tel)).last("limit 1"));
         if(Validator.isNotEmpty(user)){
             throw new CustomException("该手机号已被使用");
         }

zhongzheng-system/src/main/java/com/zhongzheng/modules/base/service/impl/UserProfileServiceImpl.java

@@ -18,6 +18,7 @@ import com.zhongzheng.common.annotation.DataScope;
 import com.zhongzheng.common.core.domain.AjaxResult;
 import com.zhongzheng.common.core.domain.model.LoginUser;
 import com.zhongzheng.common.exception.CustomException;
+import com.zhongzheng.common.type.EncryptHandler;
 import com.zhongzheng.common.utils.DateUtils;
 import com.zhongzheng.common.utils.SecurityUtils;
 import com.zhongzheng.common.utils.ServletUtils;
@@ -501,7 +502,7 @@ public class UserProfileServiceImpl extends ServiceImpl<UserProfileMapper, UserP
                     UserVo user = iUserService.queryById(bo.getUserId());
                     if(Validator.isNotEmpty(user)&&Validator.isEmpty(user.getIdCard())){ //身份证为空是覆盖
                         User user2 = iUserService.getOne(new LambdaQueryWrapper<User>()
-                                .eq(User::getIdCard,idcard).last("limit 1"));
+                                .eq(User::getIdCard, EncryptHandler.encrypt(idcard)).last("limit 1"));
                         if(Validator.isNotEmpty(user2)){
                             throw new CustomException("身份证号码已存在，创建失败");
                         }

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/impl/OrderServiceImpl.java

@@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.zhongzheng.common.core.redis.RedisCache;
 import com.zhongzheng.common.core.redis.RedisLockEntity;
 import com.zhongzheng.common.exception.CustomException;
+import com.zhongzheng.common.type.EncryptHandler;
 import com.zhongzheng.common.utils.DateUtils;
 import com.zhongzheng.common.utils.ServletUtils;
 import com.zhongzheng.common.utils.ToolsUtils;
@@ -252,7 +253,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
             //订单商品
             Goods goods = iGoodsService.getOne(new LambdaQueryWrapper<Goods>().eq(Goods::getGoodsId, bo.getGoodsId()));
             User user = iUserService.getOne(new LambdaQueryWrapper<User>()
-                    .eq(User::getTelphone,bo.getTel()).last("limit 1"));
+                    .eq(User::getTelphone, EncryptHandler.encrypt(bo.getTel())).last("limit 1"));
             if(Validator.isNull(user)){
                 bo.setMsg("该手机号码用户不存在");
                 continue;

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/impl/UserSubscribeServiceImpl.java

@@ -16,6 +16,7 @@ import com.zhongzheng.common.annotation.DataScope;
 import com.zhongzheng.common.core.domain.AjaxResult;
 import com.zhongzheng.common.core.redis.RedisCache;
 import com.zhongzheng.common.exception.CustomException;
+import com.zhongzheng.common.type.EncryptHandler;
 import com.zhongzheng.common.utils.DateUtils;
 import com.zhongzheng.common.utils.ServletUtils;
 import com.zhongzheng.common.utils.ToolsUtils;
@@ -177,7 +178,7 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
     public List<UserSubscribeIdsImport> importIdsDataFilter(List<UserSubscribeIdsImport> list) {
         for(UserSubscribeIdsImport info : list){
             User user = iUserService.getOne(new LambdaQueryWrapper<User>()
-                    .eq(User::getIdCard,info.getIdCard()).last("limit 1"));
+                    .eq(User::getIdCard,EncryptHandler.encrypt(info.getIdCard())).last("limit 1"));
             if(Validator.isEmpty(user)){
                 throw new CustomException("学员："+info.getIdCard()+"不存在没有符合导出的数据,，请先处理再继续操作");
             }
@@ -189,7 +190,7 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
     public List<UserSubscribeIdsImport> checkIdsDataFilter(UserSubscribeIdsImportCheck bo) {
         for(UserSubscribeIdsImport info : bo.getList()){
             User user = iUserService.getOne(new LambdaQueryWrapper<User>()
-                    .eq(User::getIdCard,info.getIdCard()).last("limit 1"));
+                    .eq(User::getIdCard, EncryptHandler.encrypt(info.getIdCard())).last("limit 1"));
             if(Validator.isEmpty(user)){
                 throw new CustomException("学员："+info.getIdCard()+"不存在，请先处理再继续操作");
             }