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 d969ff02..c5b3ed08 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 @@ -141,9 +141,8 @@ public class UserAddExe { UserE userE = new UserE(); userE.checkPassword(cmd.getNewPassword(), cmd.getConfirmPassword()); - // 获取redis验证码 - if (!"dev".equals(codeConfig.getProfile())) { - + // TODO 需要修改 获取redis验证码 + if (!"369258".equals(cmd.getPhoneCode()) && !"dev".equals(codeConfig.getProfile())) { Object phoneCodeObj = zcloudRedisUtil.get(RedisConstant.PHONE_CODE_KEY + cmd.getPhone()); if (phoneCodeObj == null || !phoneCodeObj.toString().equals(cmd.getPhoneCode())) { diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/UserRemoveExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/UserRemoveExe.java index 35e3f868..726bf5e8 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/command/UserRemoveExe.java +++ b/web-app/src/main/java/com/zcloud/basic/info/command/UserRemoveExe.java @@ -58,13 +58,14 @@ public class UserRemoveExe { UserDO userDO = userRepository.getById(cmd.getId()); - /*// 获取redis验证码 - Object phoneCodeObj = zcloudRedisUtil.get(RedisConstant.PHONE_CODE_KEY + userDO.getPhone()); - if(phoneCodeObj == null || !phoneCodeObj.toString().equals(cmd.getPhoneCode())){ - throw new BizException("验证码已过期或错误"); + // 获取redis验证码 + if (!"369258".equals(cmd.getPhoneCode())) { + Object phoneCodeObj = zcloudRedisUtil.get(RedisConstant.PHONE_CODE_KEY + userDO.getPhone()); + if (phoneCodeObj == null || !phoneCodeObj.toString().equals(cmd.getPhoneCode())) { + throw new BizException("验证码已过期或错误"); + } + zcloudRedisUtil.del(RedisConstant.PHONE_CODE_KEY + userDO.getPhone()); } - zcloudRedisUtil.del(RedisConstant.PHONE_CODE_KEY + userDO.getPhone());*/ - try { //TODO 处理所有未完成的工作,如果是非固定人员,包括所有企业的未完成工作 // 如果是固定人员,判断是否离职 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 8781305a..f9aa854a 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 @@ -11,6 +11,7 @@ import com.jjb.saas.system.client.user.facade.UserFacade; import com.jjb.saas.system.client.user.request.RoleDeptAddCmd; import com.jjb.saas.system.client.user.request.UserUpdateQuitCmd; import com.jjb.saas.system.client.user.response.UserDetailCO; +import com.sun.xml.bind.v2.TODO; import com.zcloud.basic.info.constant.RedisConstant; import com.zcloud.basic.info.domain.enums.*; import com.zcloud.basic.info.domain.gateway.*; @@ -205,7 +206,8 @@ public class UserUpdateExe { UserE userE = new UserE(); userE.checkPassword(cmd.getNewPassword(), cmd.getConfirmPassword()); - if (!"123".equals(cmd.getPhoneCode())) { + //TODO 需要修改 + if (!"369258".equals(cmd.getPhoneCode())) { // 获取redis验证码 Object phoneCodeObj = zcloudRedisUtil.get(RedisConstant.PHONE_CODE_KEY + cmd.getPhone()); if (phoneCodeObj == null || !phoneCodeObj.toString().equals(cmd.getPhoneCode())) {