销售app 登录密码、注册密码校验修改

fs-company-app/src/main/java/com/fs/app/controller/CompanyUserController.java

@@ -11,6 +11,7 @@ import com.fs.common.annotation.RepeatSubmit;
 import com.fs.common.constant.UserConstants;
 import com.fs.common.core.domain.R;
 import com.fs.common.exception.ServiceException;
+import com.fs.common.utils.PatternUtils;
 import com.fs.common.utils.bean.BeanUtils;
 import com.fs.company.domain.Company;
 import com.fs.company.domain.CompanyDept;
@@ -158,6 +159,11 @@ public class CompanyUserController extends AppBaseController {
             return R.error("注册用户'" + param.getPhoneNumber() + "'失败，登录账号已存在");
         }
 
+        // 密码校验
+        if (!PatternUtils.checkPassword(param.getPassword())) {
+            return R.error("密码格式不正确,需包含字母、数字和特殊字符,长度为 8-20位");
+        }
+
         // 组装参数
         CompanyUser companyUser = new CompanyUser();
         BeanUtils.copyProperties(param, companyUser);

fs-company-app/src/main/java/com/fs/app/controller/UserController.java

@@ -4,9 +4,11 @@ import cn.hutool.core.lang.Validator;
 import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.fs.app.annotation.Login;
-import com.fs.app.param.*;
+import com.fs.app.param.EditPwdParam;
+import com.fs.app.param.EditUserInfoParam;
+import com.fs.app.param.EditUserQrCodeParam;
+import com.fs.app.param.LoginParam;
 import com.fs.app.utils.JwtUtils;
-import com.fs.app.vo.CompanySubUserVO;
 import com.fs.app.vo.CompanyUserAppVO;
 import com.fs.app.vo.UserListVO;
 import com.fs.app.vo.UserVO;
@@ -15,23 +17,20 @@ import com.fs.common.config.FSConfig;
 import com.fs.common.core.domain.R;
 import com.fs.common.core.redis.RedisCache;
 import com.fs.common.exception.BaseException;
-import com.fs.common.exception.CustomException;
 import com.fs.common.exception.ServiceException;
+import com.fs.common.utils.PatternUtils;
 import com.fs.common.utils.PinYinUtil;
-
 import com.fs.common.utils.StringUtils;
 import com.fs.common.utils.bean.BeanUtils;
 import com.fs.common.utils.http.HttpUtils;
 import com.fs.company.domain.Company;
 import com.fs.company.domain.CompanyUser;
 import com.fs.company.domain.CompanyUserCard;
-import com.fs.company.param.BaseQueryParam;
 import com.fs.company.param.CompanyUserCardQueryParam;
 import com.fs.company.service.*;
 import com.fs.company.vo.CompanyUserVO;
 import com.fs.core.security.SecurityUtils;
 import com.fs.course.service.IFsCourseRedPacketLogService;
-import com.fs.his.param.BaseParam;
 import com.fs.store.service.IFsUserService;
 import com.fs.wx.miniapp.config.WxMaProperties;
 import com.github.pagehelper.PageHelper;
@@ -47,8 +46,6 @@ import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletRequest;
 import java.math.BigDecimal;
 import java.time.ZoneId;
-import java.time.format.DateTimeFormatter;
-import java.time.format.DateTimeParseException;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
@@ -150,6 +147,12 @@ public class UserController extends AppBaseController {
     @PostMapping("/login")
     @ApiOperation("密码登录")
     public R login(@Validated @RequestBody LoginParam param) {
+
+        // 密码校验
+        if (!PatternUtils.checkPassword(param.getPassword())) {
+            return R.error("密码格式不正确,需包含字母、数字和特殊字符,长度为 8-20位");
+        }
+
         try {
             //判断用户基本规则
             CompanyUser companyUser = userService.selectUserByUserName(param.getAccount());