修改手机号加密

lib/EmergencyBaseLib/EmergencyCommon/src/main/java/com/zdxt/common/util/CommonUtil.java

@@ -1,15 +1,20 @@
 package com.zdxt.common.util;
 
-import com.zdxt.common.util.StringUtils;
 
 public class CommonUtil {
 
+    private static String KEY="VRJHzFqJpsSZhwnsKTWNspv_GZMxTWl-bgH6DyE9Ty0";
+
     /**
-     * 手机号加密
+     * 手机号****加密
      * @return
      */
     public static String encryptPhone(String num){
         if(StringUtils.isEmpty(num))return num;
+
+        if(!num.matches("^\\d+$")){
+            num=IdCardCryptoUtil.symmetricDecryptIdCard(KEY,num);
+        }
         String regex = "^1\\d{10}$";
         if(num.matches(regex)){
             return num.replaceAll("(\\d{3})\\d{4}(\\d{4})", "$1****$2");

lib/EmergencyBaseLib/EmergencyCommonEntity/src/main/java/com/zdxt/domain/auth/User.java

@@ -326,6 +326,19 @@ public class User extends BaseDomain {
 
     private String gender;
 
+    /**
+     * AES 解密后的手机号
+     */
+    private String decryptPhoneNum;
+
+    public String getDecryptPhoneNum() {
+        return decryptPhoneNum;
+    }
+
+    public void setDecryptPhoneNum(String decryptPhoneNum) {
+        this.decryptPhoneNum = decryptPhoneNum;
+    }
+
     public String getZwwxId() {
         return zwwxId;
     }

lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppSystemController.java

@@ -16,6 +16,7 @@ import com.zdxt.code.service.IZfryjdm2405301Service;
 import com.zdxt.common.ZDResponse;
 import com.zdxt.common.controller.BaseController;
 import com.zdxt.common.util.IdCardCryptoUtil;
+import com.zdxt.common.util.StringUtils;
 import com.zdxt.common.util.TableDataInfo;
 import com.zdxt.domain.auth.Dept;
 import com.zdxt.domain.auth.DictData;
@@ -59,6 +60,9 @@ public class AppSystemController extends BaseController {
     @Value("${srnwg.secretKey}")
     private String secretKey;
 
+    // 手机号解密key
+    private static String KEY="VRJHzFqJpsSZhwnsKTWNspv_GZMxTWl-bgH6DyE9Ty0";
+
 
     @GetMapping("/getUserInfo/{userId}")
     @ResponseBody
@@ -116,6 +120,12 @@ public class AppSystemController extends BaseController {
         }
         user.setDataScopeId(null);
         List<User> list = userService.selectUserListByHave(user);
+        if(list.size()>0){
+            list.stream().filter(l->StringUtils.isNotEmpty(l.getPhonenumber())).forEach(li->{
+                if(!li.getPhonenumber().matches("^\\d+$"))
+                    li.setDecryptPhoneNum(IdCardCryptoUtil.symmetricDecryptIdCard(KEY, li.getPhonenumber()));
+            });
+        }
         //解密
 //        if(list.size() > 0){
 //            for (int i = 0; i < list.size(); i++) {

lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/feign/UserApiImpl.java

@@ -13,8 +13,7 @@ import com.zdxt.auth.project.system.user.dto.UserSearchDto;
 import com.zdxt.auth.project.system.user.mapper.UserMapper;
 import com.zdxt.auth.project.system.user.service.IUserService;
 import com.zdxt.common.annotation.DataScope;
-import com.zdxt.common.util.DateUtils;
+import com.zdxt.common.util.*;
-import com.zdxt.common.util.UserConstants;
 import com.zdxt.domain.auth.Dept;
 import com.zdxt.domain.auth.Role;
 import com.zdxt.domain.auth.User;
@@ -45,6 +44,8 @@ public class UserApiImpl implements UserApi {
     @Autowired
     private DictDataMapper dictDataMapper;
 
+    private static String KEY="VRJHzFqJpsSZhwnsKTWNspv_GZMxTWl-bgH6DyE9Ty0";
+
 
 //    private final String dictType = "sys_dept_type";
 
@@ -123,6 +124,11 @@ public class UserApiImpl implements UserApi {
     @Override
     public UserBean getUserByUserId(Long userId) {
         User user = userMapper.selectUserById(userId);
+        try{
+            if(StringUtils.isNotEmpty(user.getPhonenumber())){
+                user.setDecryptPhoneNum(CommonUtil.encryptPhone(user.getPhonenumber()));
+            }
+        }catch (Exception e){}
         UserBean userBean = new UserBean();
         BeanUtil.copyProperties(user, userBean);
         return userBean;

lib/EmergencyServiceApi/emergencyAuthServiceApi/src/main/java/com/zdxt/auth/dto/UserBean.java

@@ -74,6 +74,11 @@ public class UserBean implements Serializable {
     @ApiModelProperty("手机号码")
     private String phonenumber;
 
+    /**
+     * AES 解密后的手机号
+     */
+    private String decryptPhoneNum;
+
     /**
      * 执法证件号
      */
@@ -560,4 +565,12 @@ public class UserBean implements Serializable {
                 ", params=" + params +
                 '}';
     }
+
+    public String getDecryptPhoneNum() {
+        return decryptPhoneNum;
+    }
+
+    public void setDecryptPhoneNum(String decryptPhoneNum) {
+        this.decryptPhoneNum = decryptPhoneNum;
+    }
 }