From 64e9304966372a20acfcdbe8fd018412bd180f13 Mon Sep 17 00:00:00 2001
From: fusimin <a0000@0000deMacBook-Pro.local>
Date: Mon, 11 Aug 2025 19:04:47 +0800
Subject: [PATCH] =?UTF-8?q?add:=E6=89=8B=E6=9C=BA=E7=9F=AD=E4=BF=A1?=
 =?UTF-8?q?=E9=AA=8C=E8=AF=81=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/controller/app/AppLoginController.java     | 14 ++++++++++++--
 .../sys/service/impl/SysCaptchaServiceImpl.java    |  2 +-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/sqx/modules/app/controller/app/AppLoginController.java b/src/main/java/com/sqx/modules/app/controller/app/AppLoginController.java
index ed87869..6c3e64e 100644
--- a/src/main/java/com/sqx/modules/app/controller/app/AppLoginController.java
+++ b/src/main/java/com/sqx/modules/app/controller/app/AppLoginController.java
@@ -11,6 +11,7 @@ import com.sqx.modules.app.utils.UserConstantInterface;
 import com.sqx.modules.app.utils.WxPhone;
 import com.sqx.modules.common.entity.CommonInfo;
 import com.sqx.modules.common.service.CommonInfoService;
+import com.sqx.modules.sys.service.SysCaptchaService;
 import com.sqx.modules.utils.HttpClientUtil;
 import com.sqx.modules.utils.MD5Util;
 import io.swagger.annotations.Api;
@@ -24,6 +25,8 @@ import org.springframework.web.bind.annotation.*;
 import weixin.popular.api.SnsAPI;
 import weixin.popular.bean.sns.SnsToken;
 
+
+
 import java.util.HashMap;
 import java.util.Map;
 
@@ -43,6 +46,9 @@ public class AppLoginController {
     @Autowired
     private CommonInfoService commonInfoService;
 
+    @Autowired
+    SysCaptchaService sysCaptchaService;
+
 
     @ApiOperation("微信小程序登陆")
     @RequestMapping(value = "/wxLogin", method = RequestMethod.GET)
@@ -119,9 +125,13 @@ public class AppLoginController {
     }
 
     @ApiOperation("用户端发送验证码")
-    @RequestMapping(value = "/sendMsg/{phone}/{state}", method = RequestMethod.GET)
+    @RequestMapping(value = "/sendMsg/{phone}/{state}/{captchaval}/{uuid}", method = RequestMethod.GET)
     @ResponseBody
-    public Result sendMsg(@PathVariable String phone, @PathVariable String state) {
+    public Result sendMsg(@PathVariable String phone, @PathVariable String state,@PathVariable String captchaval,@PathVariable String uuid) {
+        boolean captcha = sysCaptchaService.validate(uuid, captchaval);
+        if(!captcha){
+            return Result.error("验证码不正确");
+        }
         return userService.sendMsg(phone, state);
     }
 
diff --git a/src/main/java/com/sqx/modules/sys/service/impl/SysCaptchaServiceImpl.java b/src/main/java/com/sqx/modules/sys/service/impl/SysCaptchaServiceImpl.java
index ad23106..a29b756 100644
--- a/src/main/java/com/sqx/modules/sys/service/impl/SysCaptchaServiceImpl.java
+++ b/src/main/java/com/sqx/modules/sys/service/impl/SysCaptchaServiceImpl.java
@@ -38,7 +38,7 @@ public class SysCaptchaServiceImpl extends ServiceImpl<SysCaptchaDao, SysCaptcha
         captchaEntity.setCode(code);
         //5分钟后过期
         captchaEntity.setExpireTime(DateUtils.addDateMinutes(new Date(), 5));
-        this.save(captchaEntity);
+        this.saveOrUpdate(captchaEntity,new QueryWrapper<SysCaptchaEntity>().eq("uuid",uuid));
 
         return producer.createImage(code);
     }