From 866d28f1f3818b5fb1792467949227f651326def Mon Sep 17 00:00:00 2001 From: cwchen <1048842385@qq.com> Date: Fri, 28 Jun 2024 16:36:43 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/bonus/system/api/domain/SysUser.java | 13 ++++++++ .../common/core/constant/ValidateUtils.java | 30 +++++++++++++++++++ .../system/controller/SysRoleController.java | 4 +-- .../system/controller/SysUserController.java | 7 +++++ .../resources/mapper/system/SysUserMapper.xml | 7 ++++- 5 files changed, 58 insertions(+), 3 deletions(-) create mode 100644 bonus-common/bonus-common-core/src/main/java/com/bonus/common/core/constant/ValidateUtils.java diff --git a/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysUser.java b/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysUser.java index 6d89efc..6fdc833 100644 --- a/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysUser.java +++ b/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysUser.java @@ -89,6 +89,9 @@ public class SysUser extends BaseEntity /** 角色ID */ private Long roleId; + /** 登录权限 */ + private String loginType; + public SysUser() { @@ -296,6 +299,15 @@ public class SysUser extends BaseEntity { this.roleId = roleId; } + + public String getLoginType() { + return loginType; + } + + public void setLoginType(String loginType) { + this.loginType = loginType; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) @@ -318,6 +330,7 @@ public class SysUser extends BaseEntity .append("updateTime", getUpdateTime()) .append("remark", getRemark()) .append("dept", getDept()) + .append("loginType", getLoginType()) .toString(); } } diff --git a/bonus-common/bonus-common-core/src/main/java/com/bonus/common/core/constant/ValidateUtils.java b/bonus-common/bonus-common-core/src/main/java/com/bonus/common/core/constant/ValidateUtils.java new file mode 100644 index 0000000..3192c0f --- /dev/null +++ b/bonus-common/bonus-common-core/src/main/java/com/bonus/common/core/constant/ValidateUtils.java @@ -0,0 +1,30 @@ +package com.bonus.common.core.constant; + +import com.bonus.common.core.utils.StringUtils; + +/** + * @className:ValidateUtils + * @author:cwchen + * @date:2024-06-28-14:52 + * @version:1.0 + * @description:校验规则工具类 + */ +public class ValidateUtils { + + /** + * 密码校验规则 + */ + public static final String PWD_REGEX = "^(?=.*[A-Za-z])(?=.*\\d)(?=.*[@$!%*#?&])[A-Za-z\\d@$!%*#?&]{8,20}$"; + + /** + * 密码校验 + * + * @param pwd + * @return String + * @author cwchen + * @date 2024/6/28 15:01 + */ + public static String isPwd(String pwd) { + return StringUtils.isEmpty(pwd) ? "密码不能为空" : pwd.matches(PWD_REGEX) ? null : "密码必须包含字母、数字、特殊字符，且长度在8-20位之间"; + } +} diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/controller/SysRoleController.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/controller/SysRoleController.java index f496694..e25523f 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/controller/SysRoleController.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/controller/SysRoleController.java @@ -105,7 +105,7 @@ public class SysRoleController extends BaseController @PutMapping public AjaxResult edit(@Validated @RequestBody SysRole role) { - roleService.checkRoleAllowed(role); +// roleService.checkRoleAllowed(role); roleService.checkRoleDataScope(role.getRoleId()); if (!roleService.checkRoleNameUnique(role)) { @@ -140,7 +140,7 @@ public class SysRoleController extends BaseController @PutMapping("/changeStatus") public AjaxResult changeStatus(@RequestBody SysRole role) { - roleService.checkRoleAllowed(role); +// roleService.checkRoleAllowed(role); roleService.checkRoleDataScope(role.getRoleId()); role.setUpdateBy(SecurityUtils.getUsername()); return toAjax(roleService.updateRoleStatus(role)); diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/controller/SysUserController.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/controller/SysUserController.java index 65ec30b..ccdd755 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/controller/SysUserController.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/controller/SysUserController.java @@ -2,9 +2,12 @@ package com.bonus.system.controller; import java.io.IOException; import java.util.List; +import java.util.Objects; import java.util.Set; import java.util.stream.Collectors; import javax.servlet.http.HttpServletResponse; + +import com.bonus.common.core.constant.ValidateUtils; import org.apache.commons.lang3.ArrayUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; @@ -213,6 +216,10 @@ public class SysUserController extends BaseController { return error("新增用户'" + user.getUserName() + "'失败，邮箱账号已存在"); } + String pwd = ValidateUtils.isPwd(user.getPassword()); + if(StringUtils.isNotEmpty(pwd)){ + return error("新增用户'" + user.getUserName() + "'失败，" + pwd); + } user.setCreateBy(SecurityUtils.getUsername()); user.setPassword(SecurityUtils.encryptPassword(user.getPassword())); return toAjax(userService.insertUser(user)); diff --git a/bonus-modules/bonus-system/src/main/resources/mapper/system/SysUserMapper.xml b/bonus-modules/bonus-system/src/main/resources/mapper/system/SysUserMapper.xml index 05c93a4..a7e3af7 100644 --- a/bonus-modules/bonus-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/bonus-modules/bonus-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -23,8 +23,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + @@ -49,7 +51,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status, - r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status + r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status,u.login_type from sys_user u left join sys_dept d on u.dept_id = d.dept_id left join sys_user_role ur on u.user_id = ur.user_id @@ -156,6 +158,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" status, create_by, remark, + login_type, create_time )values( #{userId}, @@ -170,6 +173,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{status}, #{createBy}, #{remark}, + #{loginType}, sysdate() ) @@ -190,6 +194,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" login_date = #{loginDate}, update_by = #{updateBy}, remark = #{remark}, + login_type = #{loginType}, update_time = sysdate() where user_id = #{userId}