diff --git a/ruoyi-admin/src/main/java/org/dromara/web/controller/CaptchaController.java b/ruoyi-admin/src/main/java/org/dromara/web/controller/CaptchaController.java index 9c89a8993..9b031d52a 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/controller/CaptchaController.java +++ b/ruoyi-admin/src/main/java/org/dromara/web/controller/CaptchaController.java @@ -54,13 +54,13 @@ public class CaptchaController { /** * 发送短信验证码。 * - * @param phonenumber 用户手机号 + * @param phoneNumber 用户手机号 * @return 操作结果 */ @RateLimiter(key = "#phonenumber", time = 60, count = 1) @GetMapping("/resource/sms/code") - public R smsCode(@NotBlank(message = "{user.phonenumber.not.blank}") String phonenumber) { - String key = GlobalConstants.CAPTCHA_CODE_KEY + phonenumber; + public R smsCode(@NotBlank(message = "{user.phonenumber.not.blank}") String phoneNumber) { + String key = GlobalConstants.CAPTCHA_CODE_KEY + phoneNumber; String code = RandomUtil.randomNumbers(4); RedisUtils.setCacheObject(key, code, Duration.ofMinutes(Constants.CAPTCHA_EXPIRATION)); // 验证码模板id 自行处理 (查数据库或写死均可) @@ -68,7 +68,7 @@ public class CaptchaController { LinkedHashMap map = new LinkedHashMap<>(1); map.put("code", code); SmsBlend smsBlend = SmsFactory.getSmsBlend("config1"); - SmsResponse smsResponse = smsBlend.sendMessage(phonenumber, templateId, map); + SmsResponse smsResponse = smsBlend.sendMessage(phoneNumber, templateId, map); if (!smsResponse.isSuccess()) { log.error("验证码短信发送异常 => {}", smsResponse); return R.fail(smsResponse.getData().toString()); diff --git a/ruoyi-admin/src/main/java/org/dromara/web/service/impl/SmsAuthStrategy.java b/ruoyi-admin/src/main/java/org/dromara/web/service/impl/SmsAuthStrategy.java index 7c2f226dc..686ee1626 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/service/impl/SmsAuthStrategy.java +++ b/ruoyi-admin/src/main/java/org/dromara/web/service/impl/SmsAuthStrategy.java @@ -53,10 +53,10 @@ public class SmsAuthStrategy implements IAuthStrategy { public LoginVo login(String body, SysClientVo client) { SmsLoginBody loginBody = JsonUtils.parseObject(body, SmsLoginBody.class); ValidatorUtils.validate(loginBody); - String phonenumber = loginBody.getPhonenumber(); + String phoneNumber = loginBody.getPhoneNumber(); String smsCode = loginBody.getSmsCode(); - SysUserVo user = loadUserByPhonenumber(phonenumber); - loginService.checkLogin(LoginType.SMS, user.getUserName(), () -> !validateSmsCode(phonenumber, smsCode)); + SysUserVo user = loadUserByPhoneNumber(phoneNumber); + loginService.checkLogin(LoginType.SMS, user.getUserName(), () -> !validateSmsCode(phoneNumber, smsCode)); // 此处可根据登录用户的数据不同 自行创建 loginUser 属性不够用继承扩展就行了 LoginUser loginUser = loginService.buildLoginUser(user); loginUser.setClientKey(client.getClientKey()); @@ -81,14 +81,14 @@ public class SmsAuthStrategy implements IAuthStrategy { /** * 校验短信验证码是否存在且匹配。 * - * @param phonenumber 手机号 + * @param phoneNumber 手机号 * @param smsCode 用户输入的短信验证码 * @return 是否校验通过 */ - private boolean validateSmsCode(String phonenumber, String smsCode) { - String code = RedisUtils.getCacheObject(GlobalConstants.CAPTCHA_CODE_KEY + phonenumber); + private boolean validateSmsCode(String phoneNumber, String smsCode) { + String code = RedisUtils.getCacheObject(GlobalConstants.CAPTCHA_CODE_KEY + phoneNumber); if (StringUtils.isBlank(code)) { - loginService.recordLoginInfo(phonenumber, Constants.LOGIN_FAIL, MessageUtils.message("user.jcaptcha.expire")); + loginService.recordLoginInfo(phoneNumber, Constants.LOGIN_FAIL, MessageUtils.message("user.jcaptcha.expire")); throw new CaptchaExpireException(); } return code.equals(smsCode); @@ -97,17 +97,17 @@ public class SmsAuthStrategy implements IAuthStrategy { /** * 按手机号加载可登录用户，并校验是否存在或被停用。 * - * @param phonenumber 手机号 + * @param phoneNumber 手机号 * @return 用户信息 */ - private SysUserVo loadUserByPhonenumber(String phonenumber) { - SysUserVo user = userMapper.selectVoOne(new LambdaQueryWrapper().eq(SysUser::getPhoneNumber, phonenumber)); + private SysUserVo loadUserByPhoneNumber(String phoneNumber) { + SysUserVo user = userMapper.selectVoOne(new LambdaQueryWrapper().eq(SysUser::getPhoneNumber, phoneNumber)); if (ObjectUtil.isNull(user)) { - log.info("登录用户：{} 不存在.", phonenumber); - throw new UserException("user.not.exists", phonenumber); + log.info("登录用户：{} 不存在.", phoneNumber); + throw new UserException("user.not.exists", phoneNumber); } else if (SystemConstants.DISABLE.equals(user.getStatus())) { - log.info("登录用户：{} 已被停用.", phonenumber); - throw new UserException("user.blocked", phonenumber); + log.info("登录用户：{} 已被停用.", phoneNumber); + throw new UserException("user.blocked", phoneNumber); } return user; } diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/UserDTO.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/UserDTO.java index 393a0f0de..1893f6f39 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/UserDTO.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/UserDTO.java @@ -53,7 +53,7 @@ public class UserDTO implements Serializable { /** * 手机号码 */ - private String phonenumber; + private String phoneNumber; /** * 用户性别（0男 1女 2未知） diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/SmsLoginBody.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/SmsLoginBody.java index c285fa71f..c8eec563e 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/SmsLoginBody.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/SmsLoginBody.java @@ -17,7 +17,7 @@ public class SmsLoginBody extends LoginBody { * 手机号 */ @NotBlank(message = "{user.phonenumber.not.blank}") - private String phonenumber; + private String phoneNumber; /** * 短信code diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysUserProfileBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysUserProfileBo.java index 933410761..d3d1e28c1 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysUserProfileBo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysUserProfileBo.java @@ -46,7 +46,7 @@ public class SysUserProfileBo implements Serializable { */ @Pattern(regexp = RegexConstants.MOBILE, message = "手机号格式不正确") @Sensitive(strategy = SensitiveStrategy.PHONE) - private String phonenumber; + private String phoneNumber; /** * 用户性别（0男 1女 2未知） diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/ProfileUserVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/ProfileUserVo.java index bf00f8675..18a761038 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/ProfileUserVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/ProfileUserVo.java @@ -53,7 +53,7 @@ public class ProfileUserVo implements Serializable { /** * 手机号码 */ - private String phonenumber; + private String phoneNumber; /** * 用户性别（0男 1女 2未知） diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserExportVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserExportVo.java index 4b8c11956..528851111 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserExportVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserExportVo.java @@ -51,7 +51,7 @@ public class SysUserExportVo implements Serializable { * 手机号码 */ @ExcelProperty(value = "手机号码") - private String phonenumber; + private String phoneNumber; /** * 用户性别 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserImportVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserImportVo.java index 7ee0392c0..41544d491 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserImportVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserImportVo.java @@ -57,7 +57,7 @@ public class SysUserImportVo implements Serializable { * 手机号码 */ @ExcelProperty(value = "手机号码") - private String phonenumber; + private String phoneNumber; /** * 用户性别 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysUserService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysUserService.java index ee5a87377..c90ca335c 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysUserService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysUserService.java @@ -63,10 +63,10 @@ public interface ISysUserService { /** * 通过手机号查询用户 * - * @param phonenumber 手机号 + * @param phoneNumber 手机号 * @return 用户对象信息 */ - SysUserVo selectUserByPhonenumber(String phonenumber); + SysUserVo selectUserByPhoneNumber(String phoneNumber); /** * 通过用户ID查询用户 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java index 23f02ffd6..27e0eef5d 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java @@ -147,12 +147,12 @@ public class SysUserServiceImpl implements ISysUserService, UserService { /** * 通过手机号查询用户 * - * @param phonenumber 手机号 + * @param phoneNumber 手机号 * @return 用户对象信息 */ @Override - public SysUserVo selectUserByPhonenumber(String phonenumber) { - return baseMapper.selectVoOne(new LambdaQueryWrapper().eq(SysUser::getPhoneNumber, phonenumber)); + public SysUserVo selectUserByPhoneNumber(String phoneNumber) { + return baseMapper.selectVoOne(new LambdaQueryWrapper().eq(SysUser::getPhoneNumber, phoneNumber)); } /** diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowHisTaskVo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowHisTaskVo.java index 1bc084503..caf2685b5 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowHisTaskVo.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowHisTaskVo.java @@ -248,8 +248,4 @@ public class FlowHisTaskVo implements Serializable { this.cooperateTypeName = CooperateType.getValueByKey(cooperateType); } - public String getCreateTime() { - return DateUtils.formatFriendlyTime(createTime); - } - } diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowTaskVo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowTaskVo.java index d5399e13c..b907d1c2d 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowTaskVo.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowTaskVo.java @@ -210,13 +210,4 @@ public class FlowTaskVo implements Serializable { private String businessTitle; //业务扩展信息结束 - /** - * 获取友好格式的创建时间。 - * - * @return 格式化后的创建时间 - */ - public String getCreateTime() { - return DateUtils.formatFriendlyTime(createTime); - } - }