From 0860cba72998ba9291b0b8d2290c20bee7b7373e Mon Sep 17 00:00:00 2001 From: SondonYong Date: Fri, 5 Dec 2025 08:29:09 +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 --- .../zcloud/basic/info/command/UserAddExe.java | 41 +++++++++---------- .../basic/info/command/UserUpdateExe.java | 4 +- .../repository/UserRepository.java | 2 + .../repository/impl/UserRepositoryImpl.java | 7 ++++ 4 files changed, 32 insertions(+), 22 deletions(-) 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 a861241..383e9ff 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 @@ -61,7 +61,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) @@ -205,28 +205,27 @@ 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 true; + return false; } // 组装发送短信 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 2593577..5b30643 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 @@ -130,7 +130,8 @@ public class UserUpdateExe { @Transactional(rollbackFor = Exception.class) public boolean execute(AppUserRegisterCmd cmd) { - + // 根据手机号查询用户信息 + UserDO userDO = userRepository.getByPhone(cmd.getPhone()); UserE userE = new UserE(); userE.checkPassword(cmd.getNewPassword(), cmd.getConfirmPassword()); @@ -143,6 +144,7 @@ public class UserUpdateExe { // zcloudRedisUtil.del(RedisConstant.PHONE_CODE_KEY + cmd.getPhone()); BeanUtils.copyProperties(cmd, userE); + userE.setId(userDO.getId()); userE.encryptionPassword(); userGateway.updatePassword(userE); diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/UserRepository.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/UserRepository.java index a6ccd5d..2af5dc8 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/UserRepository.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/UserRepository.java @@ -75,5 +75,7 @@ public interface UserRepository extends BaseRepository { PageResponse listXgf(Map params); void sendResignationMq(Long userId, Long corpinfoId); + + UserDO getByPhone(String phone); } 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 490b3ba..c1d08a9 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 @@ -426,5 +426,12 @@ public class UserRepositoryImpl extends BaseRepositoryImpl i } } + + @Override + public UserDO getByPhone(String phone) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("phone", phone); + return getOne(queryWrapper); + } }