From e786fecd88e8c0d992f43950bcc5b9615c46230a Mon Sep 17 00:00:00 2001 From: SondonYong Date: Thu, 4 Dec 2025 15:07:10 +0800 Subject: [PATCH] =?UTF-8?q?dev:app=E7=AB=AF=E6=89=AB=E7=A0=81=E5=85=A5?= =?UTF-8?q?=E8=81=8C=E6=B5=81=E7=A8=8B=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/info/app/AppUserController.java | 10 ++-- .../zcloud/basic/info/command/UserAddExe.java | 52 ++++++++++--------- .../basic/info/command/UserUpdateExe.java | 10 ++-- .../repository/impl/UserRepositoryImpl.java | 4 +- 4 files changed, 39 insertions(+), 37 deletions(-) diff --git a/web-adapter/src/main/java/com/zcloud/basic/info/app/AppUserController.java b/web-adapter/src/main/java/com/zcloud/basic/info/app/AppUserController.java index 39f6a71..2d6f8f8 100644 --- a/web-adapter/src/main/java/com/zcloud/basic/info/app/AppUserController.java +++ b/web-adapter/src/main/java/com/zcloud/basic/info/app/AppUserController.java @@ -26,11 +26,11 @@ import org.springframework.web.bind.annotation.*; public class AppUserController { private final UserServiceI userService; - @ApiOperation("验证手机号是否已注册") - @PostMapping("/verifyPhone") - public Response verifyPhone(@Validated @RequestBody UserVerifyPhoneCmd cmd) { - return userService.verifyPhone(cmd); - } +// @ApiOperation("验证手机号是否已注册") +// @PostMapping("/verifyPhone") +// public Response verifyPhone(@Validated @RequestBody UserVerifyPhoneCmd cmd) { +// return userService.verifyPhone(cmd); +// } @ApiOperation("发送验证码") @PostMapping("/sendPhoneCode") diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/UserAddExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/UserAddExe.java index c3e37e2..4f24245 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/command/UserAddExe.java +++ b/web-app/src/main/java/com/zcloud/basic/info/command/UserAddExe.java @@ -60,7 +60,7 @@ public class UserAddExe { private final UserCorpRepository userCorpRepository; private final UserChangeRecordGateway userChangeRecordGateway; private final UserCorpRecordGateway userCorpRecordGateway; - private ZcloudRedisUtil zcloudRedisUtil; +// private ZcloudRedisUtil zcloudRedisUtil; @Transactional(rollbackFor = Exception.class) @@ -109,11 +109,11 @@ public class UserAddExe { UserE userE = new UserE(); userE.checkPassword(cmd.getPassword(), cmd.getConfirmPassword()); // 获取redis验证码 - Object phoneCodeObj = zcloudRedisUtil.get(RedisConstant.PHONE_CODE_KEY + cmd.getPhone()); - if(phoneCodeObj == null || !phoneCodeObj.toString().equals(cmd.getPhoneCode())){ - throw new BizException("验证码已过期或错误"); - } - zcloudRedisUtil.del(RedisConstant.PHONE_CODE_KEY + cmd.getPhone()); +// Object phoneCodeObj = zcloudRedisUtil.get(RedisConstant.PHONE_CODE_KEY + cmd.getPhone()); +// if(phoneCodeObj == null || !phoneCodeObj.toString().equals(cmd.getPhoneCode())){ +// throw new BizException("验证码已过期或错误"); +// } +// zcloudRedisUtil.del(RedisConstant.PHONE_CODE_KEY + cmd.getPhone()); CorpInfoDO corpInfoDO = corpInfoRepository.getCorpInfoByCorpName("相关方通用租户"); if(corpInfoDO == null){ @@ -121,6 +121,7 @@ public class UserAddExe { } BeanUtils.copyProperties(cmd, userE); userE.setCorpinfoId(corpInfoDO.getId()); + userE.setDepartmentId(corpInfoDO.getId()); userGateway.register(userE); return true; @@ -185,27 +186,28 @@ public class UserAddExe { public boolean executeSendPhoneCode(UserVerifyPhoneCmd cmd) { // 生成6位验证码 String phoneCode = RandomUtil.randomNumbers(6); - Object phoneCodeCountObj = zcloudRedisUtil.get(RedisConstant.PHONE_CODE_COUNT + DateUtil.getDays() + ":" + cmd.getPhone()); - if(phoneCodeCountObj != null){ - Integer phoneCodeCount = (Integer) phoneCodeCountObj; - if(phoneCodeCount >= 20){ - throw new BizException("今天验证码已发送次数已超过20次"); - } - } +// Object phoneCodeCountObj = zcloudRedisUtil.get(RedisConstant.PHONE_CODE_COUNT + DateUtil.getDays() + ":" + cmd.getPhone()); +// if(phoneCodeCountObj != null){ +// Integer phoneCodeCount = (Integer) phoneCodeCountObj; +// if(phoneCodeCount >= 20){ +// throw new BizException("今天验证码已发送次数已超过20次"); +// } +// } - boolean sendFlag = sendMessage(cmd.getPhone(), phoneCode); - if(sendFlag){ - // 发送成功 - // 放入到redis里 - zcloudRedisUtil.set(RedisConstant.PHONE_CODE_KEY + cmd.getPhone(), phoneCode, 60 * 15); - // 设置新的验证码发送次数 - zcloudRedisUtil.set(RedisConstant.PHONE_CODE_COUNT + DateUtil.getDays() + ":" + cmd.getPhone(), - phoneCodeCountObj == null ? 1 : (Integer)phoneCodeCountObj + 1, - 60 * 60 * 24); - return true; - } +// boolean sendFlag = sendMessage(cmd.getPhone(), phoneCode); +// if(sendFlag){ +// // 发送成功 +// // 放入到redis里 +// zcloudRedisUtil.set(RedisConstant.PHONE_CODE_KEY + cmd.getPhone(), phoneCode, 60 * 15); +// // 设置新的验证码发送次数 +// zcloudRedisUtil.set(RedisConstant.PHONE_CODE_COUNT + DateUtil.getDays() + ":" + cmd.getPhone(), +// phoneCodeCountObj == null ? 1 : (Integer)phoneCodeCountObj + 1, +// 60 * 60 * 24); +// return true; +// } - return false; +// return false; + return true; } // 组装发送短信 diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/UserUpdateExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/UserUpdateExe.java index c2619e4..ff79168 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/command/UserUpdateExe.java +++ b/web-app/src/main/java/com/zcloud/basic/info/command/UserUpdateExe.java @@ -123,11 +123,11 @@ public class UserUpdateExe { userE.checkPassword(cmd.getPassword(), cmd.getConfirmPassword()); // 获取redis验证码 - Object phoneCodeObj = zcloudRedisUtil.get(RedisConstant.PHONE_CODE_KEY + cmd.getPhone()); - if(phoneCodeObj == null || !phoneCodeObj.toString().equals(cmd.getPhoneCode())){ - throw new BizException("验证码已过期或错误"); - } - zcloudRedisUtil.del(RedisConstant.PHONE_CODE_KEY + cmd.getPhone()); +// Object phoneCodeObj = zcloudRedisUtil.get(RedisConstant.PHONE_CODE_KEY + cmd.getPhone()); +// if(phoneCodeObj == null || !phoneCodeObj.toString().equals(cmd.getPhoneCode())){ +// throw new BizException("验证码已过期或错误"); +// } +// zcloudRedisUtil.del(RedisConstant.PHONE_CODE_KEY + cmd.getPhone()); BeanUtils.copyProperties(cmd, userE); userE.encryptionPassword(); diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserRepositoryImpl.java index 43fe8d4..cc19d99 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserRepositoryImpl.java @@ -226,8 +226,8 @@ public class UserRepositoryImpl extends BaseRepositoryImpl i userAddCmd.setAccount(userDO.getPhone()); userAddCmd.setMobile(userDO.getPhone()); RoleDeptAddCmd roleDeptAddCmd = new RoleDeptAddCmd(); - roleDeptAddCmd.setRoleId(0L); - roleDeptAddCmd.setDeptId(0L); + roleDeptAddCmd.setRoleId(1994326788804837377L); + roleDeptAddCmd.setDeptId(userDO.getDepartmentId()); List roleDeptAddCmdList = Collections.singletonList(roleDeptAddCmd); userAddCmd.setRoleDepts(roleDeptAddCmdList); userAddCmd.setTenantId(userDO.getCorpinfoId());