21

src/main/java/com/fdkankan/ucenter/common/constants/ConstantFilePath.java

@@ -1,5 +1,7 @@
 package com.fdkankan.ucenter.common.constants;
 
+import com.fdkankan.common.constant.ConstantRegex;
+
 public class ConstantFilePath {
     public static final String BASE_PATH = "/mnt/4Dkankan";
     // 用户上传图片
@@ -34,5 +36,10 @@ public class ConstantFilePath {
     public static final String AGENT_PATH = "/mnt/4Dkankan/agent/";
     public final static String OSS_SCENE_PATH_V4 = "scene_edit_data/%s/";
 
+    public static final String PASSWORD_REGEX = "^(?=.*\\d)(?=.*[a-z])(?=.*[A-Z])[\\da-zA-Z`~!@#$%^&*()+=|{}':;',\\[\\].<>/?~！@#￥%……&*（）——+|{}【】‘；：”“’。，、？]{8,16}$";
+
+    public static void main(String[] args) {
+        System.out.println("Aa123456".matches(ConstantRegex.PASSWORD_REGEX));
+    }
 
 }

src/main/java/com/fdkankan/ucenter/controller/app/AppController.java

@@ -68,6 +68,7 @@ public class AppController {
     @PostMapping("/register")
     public Result register(@RequestBody RegisterParam param){
         param.setConfirmPwd(param.getPassword());
+        param.setClear("YES");
         loginService.register(param);
         return Result.success();
     }

src/main/java/com/fdkankan/ucenter/service/impl/LoginService.java

@@ -147,7 +147,13 @@ public class LoginService {
                 || StringUtils.isEmpty(param.getConfirmPwd())){
             throw new BusinessException(LoginConstant.FAILURE_CODE_3001, LoginConstant.FAILURE_MSG_3001);
         }
-        if(!param.getPassword().matches(ConstantRegex.PASSWORD_REGEX)){
+        String password ;
+        if(StringUtils.isNotBlank(param.getClear()) && param.getClear().equals("YES")){
+            password = param.getPassword();
+        }else {
+            password = Base64Converter.decode(Base64Converter.subText(param.getPassword()));
+        }
+        if(!password.matches(ConstantFilePath.PASSWORD_REGEX)){
             throw new BusinessException(LoginConstant.FAILURE_CODE_3011, LoginConstant.FAILURE_MSG_3011);
         }
         if (!param.getConfirmPwd().equals(param.getPassword())){
@@ -158,6 +164,7 @@ public class LoginService {
         if(user != null){
             throw new BusinessException(LoginConstant.FAILURE_CODE_3008, LoginConstant.FAILURE_MSG_3008);
         }
+        param.setPassword(password);
         userService.register(param);
 
     }