From 888b817df47c177cfbec60a0be8a6f5fbc925272 Mon Sep 17 00:00:00 2001
From: wanggeng888 <450292408@qq.com>
Date: Wed, 5 May 2021 12:39:13 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=89=8B=E6=9C=BA=E7=9F=AD?=
 =?UTF-8?q?=E4=BF=A1=E7=99=BB=E5=BD=95=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/api/appsign/AppSignAppController.java | 22 +++++++++++++------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/login-app/src/main/java/ink/wgink/login/app/controller/app/api/appsign/AppSignAppController.java b/login-app/src/main/java/ink/wgink/login/app/controller/app/api/appsign/AppSignAppController.java
index 0eb0ea34..80a5dee6 100644
--- a/login-app/src/main/java/ink/wgink/login/app/controller/app/api/appsign/AppSignAppController.java
+++ b/login-app/src/main/java/ink/wgink/login/app/controller/app/api/appsign/AppSignAppController.java
@@ -2,8 +2,10 @@ package ink.wgink.login.app.controller.app.api.appsign;
 
 import ink.wgink.annotation.CheckRequestBodyAnnotation;
 import ink.wgink.common.base.DefaultBaseController;
+import ink.wgink.exceptions.DependencyException;
 import ink.wgink.exceptions.ParamsException;
 import ink.wgink.interfaces.consts.ISystemConstant;
+import ink.wgink.interfaces.sms.ISmsBaseService;
 import ink.wgink.login.app.pojo.vos.appsign.AppLoginDefaultVO;
 import ink.wgink.login.app.pojo.vos.appsign.AppLoginPhoneVO;
 import ink.wgink.login.app.service.appsign.IAppSignService;
@@ -14,6 +16,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiResponse;
 import io.swagger.annotations.ApiResponses;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -39,6 +42,8 @@ public class AppSignAppController extends DefaultBaseController {
 
     @Autowired
     private IAppSignService appSignService;
+    @Autowired(required = false)
+    private ISmsBaseService smsBaseService;
 
     @ApiOperation(value = "APP用户名密码登录", notes = "APP用户名密码登录接口")
     @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)})
@@ -53,16 +58,19 @@ public class AppSignAppController extends DefaultBaseController {
     @PostMapping("phone")
     @CheckRequestBodyAnnotation
     public synchronized SuccessResultData<String> phone(@RequestBody AppLoginPhoneVO appLoginPhoneVO) throws Exception {
+        if(smsBaseService == null) {
+            throw new DependencyException("短信依赖未引入");
+        }
         if (!RegexUtil.isPhone(appLoginPhoneVO.getUsername())) {
             throw new ParamsException("用户名非手机格式");
         }
-        // String verificationCode = VerificationCodeManager.getInstance().getVerificationCode(appLoginPhoneVO.getUsername());
-//        if (StringUtils.isBlank(verificationCode)) {
-//            throw new ParamsException("验证码为空");
-//        }
-//        if (!StringUtils.equalsIgnoreCase(verificationCode, appLoginPhoneVO.getVerificationCode())) {
-//            throw new ParamsException("验证码错误");
-//        }
+        String verifyCode = smsBaseService.getVerifyCode(appLoginPhoneVO.getUsername());
+        if (StringUtils.isBlank(verifyCode)) {
+            throw new ParamsException("验证码为空");
+        }
+        if (!StringUtils.equalsIgnoreCase(verifyCode, appLoginPhoneVO.getVerificationCode())) {
+            throw new ParamsException("验证码错误");
+        }
         return new SuccessResultData<>(appSignService.phoneSign(appLoginPhoneVO));
     }