代码提交

pqs-auth/src/main/java/com/njcn/auth/security/granter/SmsTokenGranter.java

@@ -2,8 +2,10 @@ package com.njcn.auth.security.granter;
 
 import cn.hutool.core.util.StrUtil;
 import com.njcn.auth.security.token.SmsCodeAuthenticationToken;
+import com.njcn.common.pojo.constant.PatternRegex;
 import com.njcn.common.pojo.constant.SecurityConstants;
 import com.njcn.common.pojo.exception.BusinessException;
+import com.njcn.common.utils.PubUtils;
 import com.njcn.redis.pojo.enums.RedisKeyEnum;
 import com.njcn.redis.utils.RedisUtil;
 import com.njcn.user.enums.UserResponseEnum;
@@ -45,7 +47,7 @@ public class SmsTokenGranter extends AbstractTokenGranter {
         Map<String, String> parameters = new LinkedHashMap<>(tokenRequest.getRequestParameters());
         String phone = parameters.get(SecurityConstants.PHONE);
         String smsCode = parameters.get(SecurityConstants.SMS_CODE);
-        if (StrUtil.isBlank(phone)) {
+        if (StrUtil.isBlank(phone) || !PubUtils.match(PatternRegex.PHONE_REGEX, phone)) {
             throw new BusinessException(UserResponseEnum.REGISTER_PHONE_WRONG);
         }
         if (!judgeSmsCode(phone, smsCode)) {

pqs-common/common-core/src/main/java/com/njcn/common/utils/PubUtils.java

@@ -23,10 +23,7 @@ import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
 import java.time.format.DateTimeFormatter;
-import java.util.Calendar;
+import java.util.*;
-import java.util.Date;
-import java.util.List;
-import java.util.Locale;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -323,8 +320,20 @@ public class PubUtils {
         return matcher.matches();
     }
 
-    public static boolean patternPasswordPhone(String password) {
+    /**
-        return match(PatternRegex.PASSWORD_PHONE_REGEX, password);
+     * 生成随机推荐码
+     */
+    public static String getCode(Integer number){
+        final String BASIC = "123456789AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZZ";
+        char[] basicArray = BASIC.toCharArray();
+        Random random = new Random();
+        char[] result = new char[number];
+        for (int i = 0; i < result.length; i++) {
+            int index = random.nextInt(100) % (basicArray.length);
+            result[i] = basicArray[index];
         }
+        return new String(result);
+    }
+
     //***************************************************添加结束********************************************************
 }

pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/AppRoleServiceImpl.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.TypeReference;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.njcn.common.pojo.exception.BusinessException;
+import com.njcn.common.utils.PubUtils;
 import com.njcn.redis.utils.RedisUtil;
 import com.njcn.user.enums.UserResponseEnum;
 import com.njcn.user.pojo.po.UserRole;
@@ -53,7 +54,7 @@ public class AppRoleServiceImpl implements IAppRoleService {
         LinkedHashMap<String,String> roleMap = new LinkedHashMap<>();
         for (Map.Entry<String, String> entry : map.entrySet()) {
             if (Objects.equals(entry.getKey(),referralCode)){
-                roleMap.put(ReferralCodeServiceImpl.getCode(),entry.getValue());
+                roleMap.put(PubUtils.getCode(6),entry.getValue());
             } else {
                 roleMap.put(entry.getKey(),entry.getValue());
             }

pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/AppUserServiceImpl.java

@@ -259,7 +259,7 @@ public class AppUserServiceImpl extends ServiceImpl<AppUserMapper, User> impleme
     }
 
     private void judgeCode(String phone, String code, String devCode) {
-        String key = phone + devCode;
+        String key = RedisKeyEnum.SMS_LOGIN_KEY.getKey() + phone;
         String redisCode = redisUtil.getStringByKey(key);
         if (StringUtils.isEmpty(redisCode) || !code.equalsIgnoreCase(redisCode)) {
             throw new BusinessException(UserResponseEnum.LOGIN_WRONG_CODE);
@@ -286,7 +286,7 @@ public class AppUserServiceImpl extends ServiceImpl<AppUserMapper, User> impleme
         user.setState(UserState.ENABLE);
         user.setOrigin(UserState.NORMAL_ORIGIN);
         user.setCasualUser(UserType.OFFICIAL);
-        user.setPwdState(UserState.NEED);
+        user.setPwdState(UserState.NEEDLESS);
         user.setRegisterTime(LocalDateTime.now());
         user.setLoginTime(LocalDateTime.now());
         user.setPwdValidity(LocalDateTime.now());

pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/ReferralCodeServiceImpl.java

@@ -1,5 +1,6 @@
 package com.njcn.user.service.impl;
 
+import com.njcn.common.utils.PubUtils;
 import com.njcn.redis.utils.RedisUtil;
 import com.njcn.user.pojo.vo.app.RoleReferralCodeVO;
 import com.njcn.user.service.IReferralCodeService;
@@ -22,8 +23,6 @@ import java.util.*;
 @AllArgsConstructor
 public class ReferralCodeServiceImpl implements IReferralCodeService {
 
-    private static final String BASIC = "123456789AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZZ";
-
     private final RedisUtil redisUtil;
 
     private final IRoleService roleService;
@@ -34,9 +33,9 @@ public class ReferralCodeServiceImpl implements IReferralCodeService {
         Object object = redisUtil.getObjectByKey("roleReferralCode");
         if (Objects.isNull(object)){
             LinkedHashMap<String,String> roleMap = new LinkedHashMap<>();
-            String code1 = getCode();
+            String code1 = PubUtils.getCode(6);
-            String code2 = getCode();
+            String code2 = PubUtils.getCode(6);
-            String code3 = getCode();
+            String code3 = PubUtils.getCode(6);
             roleMap.put(code1,"market_user");
             roleMap.put(code2,"engineering_user");
             roleMap.put(code3,"app_user");
@@ -66,9 +65,9 @@ public class ReferralCodeServiceImpl implements IReferralCodeService {
     @Override
     public List<RoleReferralCodeVO> refreshReferralCode() {
         LinkedHashMap<String,String> roleMap = new LinkedHashMap<>();
-        String code1 = getCode();
+        String code1 = PubUtils.getCode(6);
-        String code2 = getCode();
+        String code2 = PubUtils.getCode(6);
-        String code3 = getCode();
+        String code3 = PubUtils.getCode(6);
         roleMap.put(code1,"market_user");
         roleMap.put(code2,"engineering_user");
         roleMap.put(code3,"app_user");
@@ -82,21 +81,8 @@ public class ReferralCodeServiceImpl implements IReferralCodeService {
         RoleReferralCodeVO vo3 = new RoleReferralCodeVO();
         vo3.setRoleName(roleService.getRoleByCode("app_user").getName());
         vo3.setRoleReferralCode(code3);
+
         return Arrays.asList(vo1,vo2,vo3);
     }
 
-    /**
-     * 生成随机推荐码
-     */
-    public static String getCode(){
-        char[] basicArray = BASIC.toCharArray();
-        Random random = new Random();
-        char[] result = new char[6];
-        for (int i = 0; i < result.length; i++) {
-            int index = random.nextInt(100) % (basicArray.length);
-            result[i] = basicArray[index];
-        }
-        return new String(result);
-    }
-
 }

pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/UserServiceImpl.java

@@ -251,6 +251,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
             return null;
         }
         BeanUtil.copyProperties(user, userVO);
+        if (!Objects.isNull(user.getDeptId())){
             Dept dept = deptService.getDeptById(user.getDeptId());
             //非自定义部门
             if (Objects.equals(dept.getType(),0)){
@@ -261,9 +262,10 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
                 userVO.setAreaName(deptService.getNameByDeptId(user.getDeptId()));
             }
             userVO.setDeptName(deptService.getNameByDeptId(user.getDeptId()));
+            userVO.setDeptLevel(dept.getPids().split(StrUtil.COMMA).length);
+        }
         userVO.setRoleList(roleService.getIdByUserId(id));
         userVO.setRole(roleService.getNameByUserId(id));
-        userVO.setDeptLevel(dept.getPids().split(StrUtil.COMMA).length);
         return userVO;
     }
 

pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/UserSetServiceImpl.java

@@ -53,8 +53,10 @@ public class UserSetServiceImpl extends ServiceImpl<UserSetMapper, UserSet> impl
         String secretKey = PubUtils.randomCode(16);
         userSet.setSecretKey(secretKey);
         Sm4Utils sm4 = new Sm4Utils(secretKey);
+        String password = PubUtils.getCode(8);
+        System.out.println("password==:" + password);
         //SM4加密初始默认密码
-        String strSm4 = sm4.encryptData_ECB(UserDefaultPassword.DEFAULT_PASSWORD);
+        String strSm4 = sm4.encryptData_ECB(password);
         userSet.setStandBy(strSm4);
         this.save(userSet);
         return userSet;