From 9cd69109f9da74174484914b98df5699c45ec7b9 Mon Sep 17 00:00:00 2001 From: donqi Date: Sat, 1 Jul 2023 19:34:25 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B3=A8=E5=86=8C=E5=8A=9F=E8=83=BD=E5=8F=8A?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/system/SysDeptController.java | 6 +- .../system/SysRegisterController.java | 17 +++-- .../main/resources/static/ruoyi/register.js | 64 +++++++++++++++-- .../src/main/resources/templates/login.html | 3 +- .../main/resources/templates/register.html | 41 +++++------ .../common/core/domain/dto/SysUserAddDTO.java | 32 +++++++++ .../com/ghy/framework/config/ShiroConfig.java | 1 + .../shiro/service/SysRegisterService.java | 68 +++++++------------ .../resources/mapper/system/SysUserMapper.xml | 44 ++++++------ 9 files changed, 174 insertions(+), 102 deletions(-) create mode 100644 ghy-common/src/main/java/com/ghy/common/core/domain/dto/SysUserAddDTO.java diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/system/SysDeptController.java b/ghy-admin/src/main/java/com/ghy/web/controller/system/SysDeptController.java index b78fc5aa..049d51b3 100644 --- a/ghy-admin/src/main/java/com/ghy/web/controller/system/SysDeptController.java +++ b/ghy-admin/src/main/java/com/ghy/web/controller/system/SysDeptController.java @@ -26,7 +26,7 @@ import com.ghy.system.service.ISysDeptService; /** * 部门信息 - * + * * @author clunt */ @Controller @@ -45,7 +45,7 @@ public class SysDeptController extends BaseController return prefix + "/dept"; } - @RequiresPermissions("system:dept:list") +// @RequiresPermissions("system:dept:list") @PostMapping("/list") @ResponseBody public List list(SysDept dept) @@ -160,7 +160,7 @@ public class SysDeptController extends BaseController /** * 选择部门树 - * + * * @param deptId 部门ID * @param excludeId 排除ID */ diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/system/SysRegisterController.java b/ghy-admin/src/main/java/com/ghy/web/controller/system/SysRegisterController.java index eb5b8d14..645fa8cc 100644 --- a/ghy-admin/src/main/java/com/ghy/web/controller/system/SysRegisterController.java +++ b/ghy-admin/src/main/java/com/ghy/web/controller/system/SysRegisterController.java @@ -1,5 +1,6 @@ package com.ghy.web.controller.system; +import com.ghy.common.core.domain.dto.SysUserAddDTO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.GetMapping; @@ -12,9 +13,11 @@ import com.ghy.common.utils.StringUtils; import com.ghy.framework.shiro.service.SysRegisterService; import com.ghy.system.service.ISysConfigService; +import javax.validation.Valid; + /** * 注册验证 - * + * * @author clunt */ @Controller @@ -34,13 +37,13 @@ public class SysRegisterController extends BaseController @PostMapping("/register") @ResponseBody - public AjaxResult ajaxRegister(SysUser user) + public AjaxResult ajaxRegister(@Valid SysUserAddDTO userAddDTO) { - if (!("true".equals(configService.selectConfigByKey("sys.account.registerUser")))) - { - return error("当前系统没有开启注册功能！"); - } - String msg = registerService.register(user); +// if (!("true".equals(configService.selectConfigByKey("sys.account.registerUser")))) +// { +// return error("当前系统没有开启注册功能！"); +// } + String msg = registerService.register(userAddDTO); return StringUtils.isEmpty(msg) ? success() : error(msg); } } diff --git a/ghy-admin/src/main/resources/static/ruoyi/register.js b/ghy-admin/src/main/resources/static/ruoyi/register.js index 9887b4b1..ee660d10 100644 --- a/ghy-admin/src/main/resources/static/ruoyi/register.js +++ b/ghy-admin/src/main/resources/static/ruoyi/register.js @@ -5,6 +5,41 @@ $(function() { var url = ctx + "captcha/captchaImage?type=" + captchaType + "&s=" + Math.random(); $(".imgcode").attr("src", url); }); + + $.ajax({ + type: "POST", + dataType:"json", + url: ctx + "system/dept/list", + data: { parentId: 100 }, + success: function (data) { + $.each(data, function (index, value) { + $('#deptId').append(""); + }); + } + }) +// $('#deptId').select2({ +// placeholder: '请选择公司编码', +// minimumResultsForSearch: -1, +// ajax: { +// type: "POST", +// dataType:"json", +// url: ctx + "system/dept/list", +// data: { parentId: 100 }, +// processResults: function (data) { +// var processedData = []; +// $.each(data, function (index, value) { +// processedData.push({ +// id: value.deptId, +// text: value.deptName +// }) +// }); +// return { +// results: processedData +// }; +// }, +// cache: true +// } +// }); }); $.validator.setDefaults({ @@ -16,6 +51,8 @@ $.validator.setDefaults({ function register() { $.modal.loading($("#btnSubmit").data("loading")); var username = $.common.trim($("input[name='username']").val()); + var phonenumber = $.common.trim($("input[name='phonenumber']").val()); + var deptId = $.common.trim($('#deptId').val()); var password = $.common.trim($("input[name='password']").val()); var validateCode = $("input[name='validateCode']").val(); $.ajax({ @@ -23,6 +60,8 @@ function register() { url: ctx + "register", data: { "loginName": username, + "phonenumber": phonenumber, + "deptId": deptId, "password": password, "validateCode": validateCode }, @@ -49,15 +88,23 @@ function register() { function validateRule() { var icon = " "; + $.validator.addMethod("checkPhone",function(value,element,params){ + var regex = /^1[345678]\d{9}$/; + return regex.test(value); + }, "请输入正确的手机号码"); $("#registerForm").validate({ rules: { username: { required: true, - minlength: 2 + rangelength: [2,20] + }, + phonenumber: { + required: true, + checkPhone: true }, password: { required: true, - minlength: 5 + rangelength: [5,20] }, confirmPassword: { required: true, @@ -66,15 +113,18 @@ function validateRule() { }, messages: { username: { - required: icon + "请输入您的用户名", - minlength: icon + "用户名不能小于2个字符" + required: icon + "请输入用户名", + rangelength: icon + "账户长度必须在2到20个字符之间" + }, + phonenumber: { + required: icon + "请输入手机号码" }, password: { - required: icon + "请输入您的密码", - minlength: icon + "密码不能小于5个字符", + required: icon + "请输入密码", + rangelength: icon + "密码长度必须在5到20个字符之间" }, confirmPassword: { - required: icon + "请再次输入您的密码", + required: icon + "请再次输入密码", equalTo: icon + "两次密码输入不一致" } } diff --git a/ghy-admin/src/main/resources/templates/login.html b/ghy-admin/src/main/resources/templates/login.html index d2f2c283..759ecc3c 100644 --- a/ghy-admin/src/main/resources/templates/login.html +++ b/ghy-admin/src/main/resources/templates/login.html @@ -36,7 +36,8 @@
  • 在你需要的时候
  • 总在您身边
    • - 还没有账号？ 立即注册» + + 还没有账号？ 立即注册»
    diff --git a/ghy-admin/src/main/resources/templates/register.html b/ghy-admin/src/main/resources/templates/register.html index 14bf79b4..fec87425 100644 --- a/ghy-admin/src/main/resources/templates/register.html +++ b/ghy-admin/src/main/resources/templates/register.html @@ -15,25 +15,22 @@ - + +
    @@ -41,9 +38,13 @@

    注册：

    你若不离不弃，我必生死相依

    - - - + + + + +
    @@ -54,17 +55,18 @@
    -
    - - 使用条款 -
    + + + +
    @@ -76,5 +78,6 @@ + diff --git a/ghy-common/src/main/java/com/ghy/common/core/domain/dto/SysUserAddDTO.java b/ghy-common/src/main/java/com/ghy/common/core/domain/dto/SysUserAddDTO.java new file mode 100644 index 00000000..b8ece7f6 --- /dev/null +++ b/ghy-common/src/main/java/com/ghy/common/core/domain/dto/SysUserAddDTO.java @@ -0,0 +1,32 @@ +package com.ghy.common.core.domain.dto; + +import com.ghy.common.core.domain.BaseEntity; +import lombok.Data; +import org.hibernate.validator.constraints.Length; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Pattern; + +/** + * @description: + * @author: yangdanqi + * @date: 2023/7/1 + */ +@Data +public class SysUserAddDTO extends BaseEntity { + @NotNull(message = "公司编码不能为空") + private Long deptId; + + @NotBlank(message = "账号不能为空") + @Length(min = 2, max = 20, message = "账户长度必须在2到20个字符之间") + private String loginName; + + @NotBlank(message = "手机号码不能为空") + @Pattern(regexp = "^1[345678]\\d{9}$", message = "手机号码格式不正确") + private String phonenumber; + + @NotBlank(message = "密码不能为空") + @Length(min = 5, max = 20, message = "密码长度必须在5到20个字符之间") + private String password; +} diff --git a/ghy-framework/src/main/java/com/ghy/framework/config/ShiroConfig.java b/ghy-framework/src/main/java/com/ghy/framework/config/ShiroConfig.java index f630da88..4fcfac1d 100644 --- a/ghy-framework/src/main/java/com/ghy/framework/config/ShiroConfig.java +++ b/ghy-framework/src/main/java/com/ghy/framework/config/ShiroConfig.java @@ -287,6 +287,7 @@ public class ShiroConfig filterChainDefinitionMap.put("/tool/**", "anon"); filterChainDefinitionMap.put("/adapay/**", "anon"); filterChainDefinitionMap.put("/system/area/**", "anon"); + filterChainDefinitionMap.put("/system/dept/list", "anon"); filterChainDefinitionMap.put("/customer/address/**", "anon"); filterChainDefinitionMap.put("/customer/place/app/**", "anon"); filterChainDefinitionMap.put("/customer/selection/app/**", "anon"); diff --git a/ghy-framework/src/main/java/com/ghy/framework/shiro/service/SysRegisterService.java b/ghy-framework/src/main/java/com/ghy/framework/shiro/service/SysRegisterService.java index 5294d004..6a5e5f1b 100644 --- a/ghy-framework/src/main/java/com/ghy/framework/shiro/service/SysRegisterService.java +++ b/ghy-framework/src/main/java/com/ghy/framework/shiro/service/SysRegisterService.java @@ -1,5 +1,7 @@ package com.ghy.framework.shiro.service; +import com.ghy.common.core.domain.dto.SysUserAddDTO; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import com.ghy.common.constant.Constants; @@ -10,14 +12,14 @@ import com.ghy.common.utils.DateUtils; import com.ghy.common.utils.MessageUtils; import com.ghy.common.utils.ServletUtils; import com.ghy.common.utils.ShiroUtils; -import com.ghy.common.utils.StringUtils; import com.ghy.framework.manager.AsyncManager; import com.ghy.framework.manager.factory.AsyncFactory; import com.ghy.system.service.ISysUserService; +import org.springframework.transaction.annotation.Transactional; /** * 注册校验方法 - * + * * @author clunt */ @Component @@ -32,50 +34,30 @@ public class SysRegisterService /** * 注册 */ - public String register(SysUser user) - { - String msg = "", loginName = user.getLoginName(), password = user.getPassword(); + @Transactional(rollbackFor = Exception.class) + public String register(SysUserAddDTO userAddDTO) { + String msg = ""; + SysUser sysUser = new SysUser(); + BeanUtils.copyProperties(userAddDTO, sysUser); - if (ShiroConstants.CAPTCHA_ERROR.equals(ServletUtils.getRequest().getAttribute(ShiroConstants.CURRENT_CAPTCHA))) - { + if (ShiroConstants.CAPTCHA_ERROR.equals(ServletUtils.getRequest().getAttribute(ShiroConstants.CURRENT_CAPTCHA))) { msg = "验证码错误"; - } - else if (StringUtils.isEmpty(loginName)) - { - msg = "用户名不能为空"; - } - else if (StringUtils.isEmpty(password)) - { - msg = "用户密码不能为空"; - } - else if (password.length() < UserConstants.PASSWORD_MIN_LENGTH - || password.length() > UserConstants.PASSWORD_MAX_LENGTH) - { - msg = "密码长度必须在5到20个字符之间"; - } - else if (loginName.length() < UserConstants.USERNAME_MIN_LENGTH - || loginName.length() > UserConstants.USERNAME_MAX_LENGTH) - { - msg = "账户长度必须在2到20个字符之间"; - } - else if (UserConstants.USER_NAME_NOT_UNIQUE.equals(userService.checkLoginNameUnique(loginName))) - { - msg = "保存用户'" + loginName + "'失败，注册账号已存在"; - } - else - { - user.setPwdUpdateDate(DateUtils.getNowDate()); - user.setUserName(loginName); - user.setSalt(ShiroUtils.randomSalt()); - user.setPassword(passwordService.encryptPassword(user.getLoginName(), user.getPassword(), user.getSalt())); - boolean regFlag = userService.registerUser(user); - if (!regFlag) - { + } else if (UserConstants.USER_NAME_NOT_UNIQUE.equals(userService.checkLoginNameUnique(sysUser.getLoginName()))) { + msg = "保存用户'" + userAddDTO.getLoginName() + "'失败，注册账号已存在"; + } else if (UserConstants.USER_NAME_NOT_UNIQUE.equals(userService.checkPhoneUnique(sysUser))) { + msg = "保存手机号码'" + userAddDTO.getPhonenumber() + "'失败，该手机号码已被注册"; + } else { + sysUser.setPwdUpdateDate(DateUtils.getNowDate()); + sysUser.setUserName(userAddDTO.getLoginName()); + sysUser.setSalt(ShiroUtils.randomSalt()); + sysUser.setPassword(passwordService.encryptPassword(sysUser.getLoginName(), sysUser.getPassword(), sysUser.getSalt())); + boolean regFlag = userService.registerUser(sysUser); + SysUser registeredUserInfo = userService.selectUserByLoginName(sysUser.getLoginName()); + userService.insertUserAuth(registeredUserInfo.getUserId(), new Long[]{101l}); + if (!regFlag) { msg = "注册失败,请联系系统管理人员"; - } - else - { - AsyncManager.me().execute(AsyncFactory.recordLogininfor(loginName, Constants.REGISTER, MessageUtils.message("user.register.success"))); + } else { + AsyncManager.me().execute(AsyncFactory.recordLogininfor(userAddDTO.getLoginName(), Constants.REGISTER, MessageUtils.message("user.register.success"))); } } return msg; diff --git a/ghy-system/src/main/resources/mapper/system/SysUserMapper.xml b/ghy-system/src/main/resources/mapper/system/SysUserMapper.xml index 609876a1..a08ef2bd 100644 --- a/ghy-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/ghy-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -29,7 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + @@ -38,7 +38,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + @@ -47,7 +47,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + select u.user_id, u.dept_id, u.login_name, u.user_name, u.user_type, u.email, u.avatar, u.phonenumber, u.sex, u.password, u.salt, u.status, u.del_flag, u.login_ip, u.login_date, u.pwd_update_date, u.create_time, u.remark, d.dept_id, d.parent_id, d.dept_name, d.order_num, d.leader, d.status as dept_status, @@ -57,7 +57,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join sys_user_role ur on u.user_id = ur.user_id left join sys_role r on r.role_id = ur.role_id - + - + - + - + - + - + - + - + - + - + - + update sys_user set del_flag = '2' where user_id = #{userId} - + update sys_user set del_flag = '2' where user_id in #{userId} - + - + update sys_user @@ -188,7 +188,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where user_id = #{userId} - + insert into sys_user( user_id, @@ -226,5 +226,5 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" sysdate() ) - - \ No newline at end of file + +