From 69a10c49aadf3424c4cb81fe6077277832c2d170 Mon Sep 17 00:00:00 2001
From: zhangyongzhangyong <2012005003@qq.coom>
Date: Mon, 10 Aug 2020 10:17:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BF=97=E6=84=BF=E8=80=85=E7=9F=AD=E4=BF=A1?=
 =?UTF-8?q?=E9=AA=8C=E8=AF=81=E7=A0=81=EF=BC=8Credis=20-=20key=E5=8F=98?=
 =?UTF-8?q?=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/commons/tools/redis/RedisKeys.java   | 11 +++++++++++
 .../service/impl/VolunteerInfoServiceImpl.java     | 14 ++++----------
 2 files changed, 15 insertions(+), 10 deletions(-)

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 3c883ea2ac..bf7c8f1a83 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
@@ -277,4 +277,15 @@ public class RedisKeys {
 	public static String getPointVerificationResultKey(String userId){
 		return rootPrefix.concat("resi:point:exchange:").concat(userId);
 	}
+
+	/**
+	 * 居民端 - 志愿者认证发送验证码 epmet:smscode:regvolunteer:phone
+	 * @param phone
+	 * @return java.lang.String
+	 * @Author zhangyong
+	 * @Date 10:09 2020-08-10
+	 **/
+	public static String getVolunteerSmsCodeKey(String phone) {
+		return String.format(rootPrefix+"smscode:regvolunteer:%s",phone);
+	}
 }
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/VolunteerInfoServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/VolunteerInfoServiceImpl.java
index 199e560b60..e9c52e460f 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/VolunteerInfoServiceImpl.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/VolunteerInfoServiceImpl.java
@@ -18,7 +18,6 @@
 package com.epmet.service.impl;
 
 import com.alibaba.fastjson.JSON;
-import com.epmet.common.token.constant.LoginConstant;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.MqConstant;
 import com.epmet.commons.tools.constant.NumConstant;
@@ -68,11 +67,6 @@ public class VolunteerInfoServiceImpl extends BaseServiceImpl<VolunteerInfoDao,
     private Logger logger = LogManager.getLogger(VolunteerInfoServiceImpl.class);
     private static final String SEND_SMS_CODE_ERROR = "发送短信验证码异常,手机号[%s],code[%s],msg[%s]";
 
-    /**
-     * redis 验证码 过期时长为30分钟，单位：秒
-     */
-    private final static long MINUTE_THIRTY_EXPIRE = 60 * 30 * 1L;
-
     @Autowired
     private EpmetUserOpenFeignClient epmetUserOpenFeignClient;
 
@@ -90,7 +84,7 @@ public class VolunteerInfoServiceImpl extends BaseServiceImpl<VolunteerInfoDao,
     public Result authenticate(TokenDto tokenDto, ResiVolunteerAuthenticateFormDTO formDTO) {
         // 验证码校验
         if (null != formDTO.getSmsCode()){
-            String smsCodeKey = RedisKeys.getLoginSmsCodeKey(LoginConstant.APP_RESI, LoginConstant.CLIENT_WXMP, formDTO.getMobile());
+            String smsCodeKey = RedisKeys.getVolunteerSmsCodeKey(formDTO.getMobile());
             String rightSmsCode = (String) redisUtils.get(smsCodeKey);
             if (!formDTO.getSmsCode().equals(rightSmsCode)) {
                 logger.error(String.format("验证码错误code[%s],msg[%s]", EpmetErrorCode.MOBILE_CODE_ERROR.getCode(), EpmetErrorCode.MOBILE_CODE_ERROR.getMsg()));
@@ -185,15 +179,15 @@ public class VolunteerInfoServiceImpl extends BaseServiceImpl<VolunteerInfoDao,
      * 保存短信验证码(删除现有短信验证码、将新的短信验证码存入Redis)
      * 过期时长为30分钟
      *
-     * @param sendSmsCodeFormDTO app、client、phone
+     * @param sendSmsCodeFormDTO phone
      * @param smsCode            验证码
      * @return void
      * @Author zhangyong
      * @Date 09:43 2020-08-10
      **/
     public void saveSmsCode(ResiSendSmsCodeFormDTO sendSmsCodeFormDTO, String smsCode) {
-        String smsCodeKey = RedisKeys.getLoginSmsCodeKey(LoginConstant.APP_RESI, LoginConstant.CLIENT_WXMP, sendSmsCodeFormDTO.getMobile());
+        String smsCodeKey = RedisKeys.getVolunteerSmsCodeKey(sendSmsCodeFormDTO.getMobile());
         logger.info(String.format("短信验证码key=%s", smsCodeKey));
-        redisUtils.set(smsCodeKey, smsCode, MINUTE_THIRTY_EXPIRE);
+        redisUtils.set(smsCodeKey, smsCode, RedisUtils.MINUTE_THIRTY_EXPIRE);
     }
 }