diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java index 9d0d310866..9e18f31ecd 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java @@ -135,6 +135,18 @@ public class RedisKeys { return rootPrefix.concat("party:member:confirm:").concat(userId).concat("-").concat(mobile).concat("-").concat(code); } + /** + * + * 党员认证手机验证码key(模糊查询) + * + * @param userId 用户id + * @param mobile 手机号 + * @return String + */ + public static String getUserMobileCodeKey(String userId, String mobile) { + return rootPrefix.concat("party:member:confirm:").concat(userId).concat("-").concat(mobile).concat("-*"); + } + /** * * 居民注册手机验证码key diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/redis/PartymemberInfoRedis.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/redis/PartymemberInfoRedis.java index d97754ad04..ff20d1ffac 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/redis/PartymemberInfoRedis.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/redis/PartymemberInfoRedis.java @@ -47,7 +47,7 @@ public class PartymemberInfoRedis { public void setUserMobileCode(String userId, String mobile, String code){ String key = RedisKeys.getUserMobileCodeKey(userId, mobile, code); - redisUtils.set(key, code, RedisUtils.MINUTE_TEN_EXPIRE); + redisUtils.set(key, code, RedisUtils.MINUTE_THIRTY_EXPIRE); } public String getUserMobileCode(String userId, String mobile, String code){ @@ -60,4 +60,9 @@ public class PartymemberInfoRedis { redisUtils.delete(key); } + public void deleteUserMobileCodeByPattern(String userId, String mobile){ + String key = RedisKeys.getUserMobileCodeKey(userId, mobile); + redisUtils.deleteByPattern(key); + } + } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java index 48a8416d4c..cae131a226 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java @@ -120,6 +120,8 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService result.setMsg(EpmetErrorCode.MOBILE_GET_CODE_ERROR.getName()); return result; } + //删除旧验证码 + partyMemberInfoRedis.deleteUserMobileCodeByPattern(fromDTO.getUserId(), fromDTO.getMobile()); //将验证码存入Redis partyMemberInfoRedis.setUserMobileCode(fromDTO.getUserId(), fromDTO.getMobile(), message.get("code")); @@ -145,10 +147,6 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService result.setCode(EpmetErrorCode.MOBILE_CODE_ERROR.getValue()); result.setMsg(EpmetErrorCode.MOBILE_CODE_ERROR.getName()); return result; - } else { - partyMemberInfoRedis.delUserMobileCode(partyMemberInfoDTO.getUserId(), - partyMemberInfoDTO.getMobile(), - partyMemberInfoDTO.getCode()); } //获取党员基本信息