Merge branch 'master' of http://git.gdatac.com/sundelong/cnooc_zydeepen-cggl_expert-manage-miniapp

merge

src/main/java/com/cnooc/expert/auth/service/impl/SmsServiceImpl.java

@@ -11,7 +11,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Service;
-
+import java.util.concurrent.TimeUnit;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.CompletableFuture;
@@ -38,10 +38,10 @@ public class SmsServiceImpl implements SmsService {
         String storedCode = redisTemplate.opsForValue().get(key);
         if (storedCode != null && storedCode.equals(code)) {
             // 验证码正确，删除缓存中的验证码
-//            smsCodeRedisCache.delete(key);
+            redisTemplate.delete(key);
             return true;
         }
-        return true;
+        return false;
     }
 
     /**
@@ -55,7 +55,8 @@ public class SmsServiceImpl implements SmsService {
         //String code = RandomUtil.randomNumbers(6);
         String code = "666666";
         String key = "sms:code:" + phone;
-        redisTemplate.opsForValue().set(key, code, 60 * 60 * 1L);// 存入 Redis，设置过期时间为5分钟
+        redisTemplate.opsForValue().set(key, code, 5,TimeUnit.MINUTES);// 存入 Redis，设置过期时间为5分钟
+        //String storedCode = (String)redisTemplate.opsForValue().get(key);
         System.out.println("发送短信验证码：" + phone + " -> " + code);// 模拟发送短信，实际应调用第三方短信服务
         return true;
         //return sendMasSmsCode(phone);