From 2a8015ef185a1916f8279fcc88dbe3da00f85bb1 Mon Sep 17 00:00:00 2001
From: zjf <1799650030@qq.com>
Date: Fri, 25 Jul 2025 15:36:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BA=8F=E5=88=97=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/AppVisitorUserController.java  | 30 +++++++++++++------
 1 file changed, 21 insertions(+), 9 deletions(-)

diff --git a/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/controller/AppVisitorUserController.java b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/controller/AppVisitorUserController.java
index 29c587a37..f1d0ec8b0 100644
--- a/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/controller/AppVisitorUserController.java
+++ b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/controller/AppVisitorUserController.java
@@ -12,9 +12,11 @@ import com.bsd.pjcloud.integrated.service.VisitorUserService;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.http.HttpHeaders;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
@@ -40,13 +42,15 @@ public class AppVisitorUserController {
     @Autowired
     private RedisTemplate redisTemplate;
 
+    @Autowired
+    private StringRedisTemplate stringRedisTemplate;
+
     @Value("${visitor.jwt-secret}")
     private String secret;
 
 
     // 登录验证
     @PostMapping("/login")
-//    @Inner(value = false)
     @Transactional
     public R<Map<String, Object>> login(
             @RequestParam String phone,
@@ -105,22 +109,30 @@ public class AppVisitorUserController {
 
     private boolean verifyImageCode(String randomStr, String imageCode) {
         String key = CacheConstants.VISITOR_CODE_KEY + randomStr;
-        Object imageCodeValueObj = redisTemplate.opsForValue().get(key);
-        if (imageCodeValueObj == null) {
+        String s = stringRedisTemplate.opsForValue().get(key);
+//        Object imageCodeValueObj = redisTemplate.opsForValue().get(key);
+//        if (imageCodeValueObj == null) {
+//            return false;
+//        }
+        if (StringUtils.isBlank(s)){
             return false;
         }
-        String imageCodeValue = imageCodeValueObj.toString();
-        return imageCodeValue.equals(imageCode);
+//        String imageCodeValue = imageCodeValueObj.toString();
+        return s.equals(imageCode);
     }
 
     private boolean verifySmsCode(String phone, String smsCode) {
         String key = CacheConstants.SMS_VISITOR_CODE_KEY + phone;
-        Object smsCodeValueObj =  redisTemplate.opsForValue().get(key);
-        if (smsCodeValueObj == null) {
+        String s = stringRedisTemplate.opsForValue().get(key);
+        if (StringUtils.isBlank(s)){
             return false;
         }
-        String o = smsCodeValueObj.toString();
-        return o.equals(smsCode);
+//        Object smsCodeValueObj =  redisTemplate.opsForValue().get(key);
+//        if (smsCodeValueObj == null) {
+//            return false;
+//        }
+//        String o = smsCodeValueObj.toString();
+        return s.equals(smsCode);
     }