Merge branch 'master' of http://1.14.104.71:10880/root/ylrz_scrm_java

fs-admin/src/main/java/com/fs/company/controller/CompanyController.java

@@ -183,7 +183,7 @@ public class CompanyController extends BaseController
     public AjaxResult resetPwd(@PathVariable Long companyId)
     {
         Company company=companyService.selectCompanyById(companyId);
-        return toAjax(userService.resetUserPwdByUserId(company.getUserId(),SecurityUtils.encryptPassword("123456")));
+        return toAjax(userService.resetUserPwdByUserId(company.getUserId(),SecurityUtils.encryptPassword("cq654321!!")));
     }
 
 //    @PreAuthorize("@ss.hasPermi('company:company:resetMoney')")

fs-admin/src/main/java/com/fs/web/controller/system/SysLoginController.java

@@ -1,27 +1,28 @@
 package com.fs.web.controller.system;
 
-import java.util.List;
-import java.util.Set;
-
+import com.fs.common.constant.Constants;
+import com.fs.common.core.domain.AjaxResult;
 import com.fs.common.core.domain.R;
+import com.fs.common.core.domain.entity.SysMenu;
+import com.fs.common.core.domain.entity.SysUser;
 import com.fs.common.core.redis.RedisCache;
+import com.fs.common.utils.PatternUtils;
+import com.fs.common.utils.ServletUtils;
 import com.fs.core.security.LoginBody;
 import com.fs.core.security.LoginUser;
 import com.fs.core.security.SecurityUtils;
+import com.fs.core.web.service.SysLoginService;
+import com.fs.core.web.service.SysPermissionService;
+import com.fs.core.web.service.TokenService;
+import com.fs.system.service.ISysMenuService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
-import com.fs.common.constant.Constants;
-import com.fs.common.core.domain.AjaxResult;
-import com.fs.common.core.domain.entity.SysMenu;
-import com.fs.common.core.domain.entity.SysUser;
-import com.fs.common.utils.ServletUtils;
-import com.fs.core.web.service.SysLoginService;
-import com.fs.core.web.service.SysPermissionService;
-import com.fs.core.web.service.TokenService;
-import com.fs.system.service.ISysMenuService;
+
+import java.util.List;
+import java.util.Set;
 
 /**
  * 登录验证
@@ -57,6 +58,9 @@ public class SysLoginController
     {
 
         try{
+            if (!PatternUtils.checkPassword(loginBody.getPassword())) {
+                return R.error("密码格式不正确,需包含字母、数字和特殊字符,长度为 8-20 位");
+            }
 
             // 生成令牌
             String token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(),

fs-admin/src/main/java/com/fs/web/controller/system/SysProfileController.java

@@ -1,28 +1,23 @@
 package com.fs.web.controller.system;
 
-import java.io.IOException;
-
-import com.fs.core.security.LoginUser;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.multipart.MultipartFile;
 import com.fs.common.annotation.Log;
 import com.fs.common.config.FSConfig;
 import com.fs.common.core.controller.BaseController;
 import com.fs.common.core.domain.AjaxResult;
 import com.fs.common.core.domain.entity.SysUser;
 import com.fs.common.enums.BusinessType;
-import com.fs.core.security.SecurityUtils;
+import com.fs.common.utils.PatternUtils;
 import com.fs.common.utils.ServletUtils;
 import com.fs.common.utils.file.FileUploadUtils;
+import com.fs.core.security.LoginUser;
+import com.fs.core.security.SecurityUtils;
 import com.fs.core.web.service.TokenService;
 import com.fs.system.service.ISysUserService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.IOException;
 
 /**
  * 个人信息 业务处理
@@ -88,6 +83,11 @@ public class SysProfileController extends BaseController
         {
             return AjaxResult.error("修改密码失败，旧密码错误");
         }
+
+        if (!PatternUtils.checkPassword(newPassword)) {
+            return AjaxResult.error("新密码格式不正确,需包含字母、数字和特殊字符,长度为 8-20 位");
+        }
+
         if (SecurityUtils.matchesPassword(newPassword, password))
         {
             return AjaxResult.error("新密码不能与旧密码相同");

fs-common/src/main/java/com/fs/common/utils/PatternUtils.java

@@ -0,0 +1,17 @@
+package com.fs.common.utils;
+
+import java.util.regex.Pattern;
+
+public class PatternUtils {
+
+    private final static Pattern PWD = Pattern.compile("^(?=.*[A-Za-z])(?=.*\\d)(?=.*[^A-Za-z0-9]).{8,20}$");
+
+    /**
+     * 校验密码是否符合条件
+     * @param value 密码
+     * @return boolean
+     */
+    public static boolean checkPassword(String value) {
+        return PWD.matcher(value).matches();
+    }
+}

fs-company/src/main/java/com/fs/company/controller/CompanyLoginController.java

@@ -1,16 +1,12 @@
 package com.fs.company.controller;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-
+import com.fs.common.constant.Constants;
+import com.fs.common.core.domain.AjaxResult;
 import com.fs.common.core.redis.RedisCache;
+import com.fs.common.utils.PatternUtils;
+import com.fs.common.utils.ServletUtils;
 import com.fs.company.domain.CompanyMenu;
 import com.fs.company.domain.CompanyUser;
-import com.fs.company.param.LoginToken;
 import com.fs.company.service.ICompanyMenuService;
 import com.fs.core.security.LoginBody;
 import com.fs.core.security.LoginUser;
@@ -22,9 +18,10 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
-import com.fs.common.constant.Constants;
-import com.fs.common.core.domain.AjaxResult;
-import com.fs.common.utils.ServletUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
 
 /**
  * 登录验证
@@ -57,6 +54,10 @@ public class CompanyLoginController
     @PostMapping("/login")
     public AjaxResult login(@RequestBody LoginBody loginBody)
     {
+        if (!PatternUtils.checkPassword(loginBody.getPassword())) {
+            return AjaxResult.error("密码格式不正确,需包含字母、数字和特殊字符,长度为 8-20 位");
+        }
+
         AjaxResult ajax = AjaxResult.success();
         // 生成令牌
         String token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(),

fs-company/src/main/java/com/fs/company/controller/CompanyProfileController.java

@@ -1,33 +1,27 @@
 package com.fs.company.controller;
 
-import java.io.IOException;
-
-import com.fs.company.domain.Company;
+import com.fs.common.annotation.Log;
+import com.fs.common.config.FSConfig;
+import com.fs.common.core.controller.BaseController;
+import com.fs.common.core.domain.AjaxResult;
+import com.fs.common.enums.BusinessType;
+import com.fs.common.utils.PatternUtils;
+import com.fs.common.utils.ServletUtils;
+import com.fs.common.utils.file.FileUploadUtils;
 import com.fs.company.domain.CompanyUser;
 import com.fs.company.domain.CompanyVoiceCaller;
 import com.fs.company.param.CompanyUserEditParam;
 import com.fs.company.service.ICompanyUserService;
 import com.fs.company.service.ICompanyVoiceCallerService;
 import com.fs.core.security.LoginUser;
+import com.fs.core.security.SecurityUtils;
 import com.fs.core.web.service.TokenService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
-import com.fs.common.annotation.Log;
-import com.fs.common.config.FSConfig;
-import com.fs.common.core.controller.BaseController;
-import com.fs.common.core.domain.AjaxResult;
-import com.fs.common.enums.BusinessType;
-import com.fs.core.security.SecurityUtils;
-import com.fs.common.utils.ServletUtils;
-import com.fs.common.utils.file.FileUploadUtils;
+
+import java.io.IOException;
 
 /**
  * 个人信息
@@ -108,6 +102,11 @@ public class CompanyProfileController extends BaseController
         {
             return AjaxResult.error("新密码不能与旧密码相同");
         }
+
+        if (!PatternUtils.checkPassword(newPassword)) {
+            return AjaxResult.error("新密码格式不正确,需包含字母、数字和特殊字符,长度为 8-20 位");
+        }
+
         if (userService.resetUserPwd(userName, SecurityUtils.encryptPassword(newPassword)) > 0)
         {
             // 更新缓存用户密码

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

@@ -1,13 +1,18 @@
 package com.fs.company.controller;
 
-import java.util.Date;
-import java.util.List;
-import java.util.stream.Collectors;
-
 import cn.hutool.json.JSONUtil;
+import com.fs.common.annotation.Log;
+import com.fs.common.constant.UserConstants;
+import com.fs.common.core.controller.BaseController;
+import com.fs.common.core.domain.AjaxResult;
 import com.fs.common.core.domain.R;
-
+import com.fs.common.core.page.TableDataInfo;
+import com.fs.common.enums.BusinessType;
 import com.fs.common.utils.DomainUtil;
+import com.fs.common.utils.PatternUtils;
+import com.fs.common.utils.ServletUtils;
+import com.fs.common.utils.StringUtils;
+import com.fs.common.utils.poi.ExcelUtil;
 import com.fs.company.domain.*;
 import com.fs.company.param.CompanyUserAreaParam;
 import com.fs.company.param.CompanyUserQwParam;
@@ -15,27 +20,20 @@ import com.fs.company.service.*;
 import com.fs.company.vo.CompanyUserQwListVO;
 import com.fs.company.vo.CompanyUserVO;
 import com.fs.core.security.LoginUser;
+import com.fs.core.security.SecurityUtils;
 import com.fs.core.web.service.TokenService;
 import com.fs.course.config.CourseConfig;
-import com.fs.qw.vo.CompanyUserQwVO;
-import com.fs.qw.vo.QwUserVO;
 import com.fs.his.vo.OptionsVO;
+import com.fs.qw.vo.QwUserVO;
 import com.fs.system.service.ISysConfigService;
-import com.fs.system.vo.DictVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
-import com.fs.common.annotation.Log;
-import com.fs.common.constant.UserConstants;
-import com.fs.common.core.controller.BaseController;
-import com.fs.common.core.domain.AjaxResult;
-import com.fs.common.core.page.TableDataInfo;
-import com.fs.common.enums.BusinessType;
-import com.fs.core.security.SecurityUtils;
-import com.fs.common.utils.ServletUtils;
-import com.fs.common.utils.StringUtils;
-import com.fs.common.utils.poi.ExcelUtil;
+
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
 
 
 /**
@@ -175,6 +173,10 @@ public class CompanyUserController extends BaseController
     @PostMapping
     public AjaxResult add(@Validated @RequestBody CompanyUser user)
     {
+        if (!PatternUtils.checkPassword(user.getPassword())) {
+            return AjaxResult.error("密码格式不正确,需包含字母、数字和特殊字符,长度为 8-20 位");
+        }
+
         //判断用户数量是否已达到上线
         LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
         Integer count=companyUserService.selectCompanyUserCountByCompanyId(loginUser.getCompany().getCompanyId());
@@ -240,6 +242,9 @@ public class CompanyUserController extends BaseController
     @PutMapping("/resetPwd")
     public AjaxResult resetPwd(@RequestBody CompanyUser user)
     {
+        if (!PatternUtils.checkPassword(user.getPassword())) {
+            return AjaxResult.error("密码格式不正确,需包含字母、数字和特殊字符,长度为 8-20 位");
+        }
         return toAjax(companyUserService.resetUserPwdByUserId(user.getUserId(), SecurityUtils.encryptPassword(user.getPassword())));
     }