From f609ca35ee2946acd0ff04b7ac1aa61f75a2e4a1 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 09 十二月 2021 16:09:54 +0800
Subject: [PATCH] 自动化代码中的service优化

---
 src/main/resources/code/service/app/src/main/java/com/ks/app/service/manager/VerifyCodeManager.java |   34 +++++++++++++++++++++++++---------
 1 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/src/main/resources/code/service/app/src/main/java/com/ks/app/service/manager/VerifyCodeManager.java b/src/main/resources/code/service/app/src/main/java/com/ks/app/service/manager/VerifyCodeManager.java
index 99d28c6..1022c41 100644
--- a/src/main/resources/code/service/app/src/main/java/com/ks/app/service/manager/VerifyCodeManager.java
+++ b/src/main/resources/code/service/app/src/main/java/com/ks/app/service/manager/VerifyCodeManager.java
@@ -1,11 +1,11 @@
 package com.ks.app.service.manager;
 
+import com.ks.app.entity.SystemEnum;
+import com.ks.app.entity.config.SystemConfigKey;
+import com.ks.app.service.inter.config.SystemConfigService;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Component;
-import org.yeshi.utils.NumberUtil;
 import org.yeshi.utils.StringUtil;
-import org.yeshi.utils.sms.TencentSMSUtil;
-import org.yeshi.utils.sms.VerifyCodeFactory;
 
 import javax.annotation.Resource;
 import java.util.concurrent.TimeUnit;
@@ -21,6 +21,10 @@
     @Resource
     private RedisTemplate<String, String> redisTemplate;
 
+
+    @Resource
+    private SystemConfigService systemConfigService;
+
     /**
      * @return void
      * @author hxh
@@ -29,9 +33,9 @@
      * @param: phone
      * @param: msg 鍙橀噺涓�:{楠岃瘉鐮亇
      **/
-    public void sendSMSSuccess(String phone, String code) {
+    public void sendSMSSuccess(SystemEnum system, String phone, String code) {
 
-        redisTemplate.opsForValue().set("v-c-p-" + phone, code, 120, TimeUnit.SECONDS);
+        redisTemplate.opsForValue().set(String.format("vcp-%s-%s", system.name(), phone), code, 120, TimeUnit.SECONDS);
 
     }
 
@@ -57,9 +61,21 @@
      * @param: phone
      * @param: code
      **/
-    public boolean isPhoneCodeRight(String phone, String code) {
-        String oldCode = redisTemplate.opsForValue().get("v-c-p-" + phone);
+    public boolean isPhoneCodeRight(SystemEnum system, String phone, String code) {
+
+        String value = systemConfigService.getValueCache(system, SystemConfigKey.testAccount);
+        //娴嬭瘯璐﹀彿
+        if (!StringUtil.isNullOrEmpty(value)) {
+            String[] sts = value.split("#");
+            if (sts.length > 1 && sts[0].equalsIgnoreCase(phone) && sts[1].equalsIgnoreCase(code)) {
+                return true;
+            }
+        }
+
+
+        String oldCode = redisTemplate.opsForValue().get(String.format("vcp-%s-%s", system.name(), phone));
         return oldCode != null && oldCode.equalsIgnoreCase(code);
+//        return true;
     }
 
     /**
@@ -71,8 +87,8 @@
      * @param: code
      **/
     public boolean isEMailCodeRight(String email, String code) {
-        String oldCode = redisTemplate.opsForValue().get("v-c-e-" + StringUtil.Md5(email));
-        return oldCode != null && oldCode.equalsIgnoreCase(code);
+        Object oldCode = redisTemplate.opsForValue().get("v-c-e-" + StringUtil.Md5(email));
+        return oldCode != null && oldCode.toString().equalsIgnoreCase(code);
     }
 
 

--
Gitblit v1.8.0