From f9a7691e2175281dd972ae2ad2beb73bc3fd0650 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 23 Sep 2022 15:33:16 +0800
Subject: [PATCH] 20220902

---
 src/main/java/cc/mrbird/febs/mall/controller/CommonController.java |   49 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 49 insertions(+), 0 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/mall/controller/CommonController.java b/src/main/java/cc/mrbird/febs/mall/controller/CommonController.java
index 357c82a..00c7369 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/CommonController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/CommonController.java
@@ -4,6 +4,7 @@
 import cc.mrbird.febs.common.entity.FebsResponse;
 import cc.mrbird.febs.common.exception.FebsException;
 import cc.mrbird.febs.common.utils.*;
+import cc.mrbird.febs.mall.dto.AccountAndCodeDto;
 import cc.mrbird.febs.mall.dto.Base64UploadDto;
 import cc.mrbird.febs.mall.entity.DataDictionaryCustom;
 import cc.mrbird.febs.mall.service.ICommonService;
@@ -29,6 +30,7 @@
  * @date 2021-09-16
  **/
 @Slf4j
+@CrossOrigin("*")
 @RestController
 @RequestMapping(value = "/api/common")
 @RequiredArgsConstructor
@@ -52,6 +54,42 @@
         // 发送手机验证码
         if (AppContants.ACCOUNT_TYPE_MOBILE.equals(type)) {
             boolean result = ZzSmsSend.sendVerifyCode(account, code.toString(), 2);
+            if (result) {
+                Map<String, Object> map = new HashMap<>();
+                boolean flag = redisUtils.set(AppContants.VERIFY_CODE_PREFIX + account, code, 120);
+                map.put("code", flag);
+                return new FebsResponse().success().message("验证码发送成功");
+            }
+            // 发送邮件验证码
+        } else if (AppContants.ACCOUNT_TYPE_EMAIL.equals(type)) {
+            boolean flag = SubMailSend.sendMail(account, code.toString());
+            if (flag) {
+                redisUtils.set(AppContants.VERIFY_CODE_PREFIX + account, code, 120);
+                return new FebsResponse().success().message("验证码发送成功");
+            } else {
+                return new FebsResponse().fail().message("验证码发送失败");
+            }
+        } else {
+            log.info("未定义账号类型");
+            throw new FebsException("未定义账号类型");
+        }
+        return new FebsResponse().fail().message("验证码发送失败");
+    }
+
+    @ApiOperation(value = "获取阿里云验证码接口", notes = "获取阿里云验证码接口")
+    @GetMapping(value = "/aliVerifyCode")
+    public FebsResponse aliVerifyCode(@ApiParam(name = "account", value = "手机号", required = true) @RequestParam(value = "account") String account,
+                                   @ApiParam(name = "type", value = "类型1-手机号", required = true) @RequestParam("type") String type) {
+        log.info("#账号:{}, 类型:{}#", account, type);
+
+        Integer code = (int) ((Math.random() * 9 + 1) * 100000);
+        if (StrUtil.isNotBlank(redisUtils.getString(AppContants.VERIFY_CODE_PREFIX + account))) {
+            throw new FebsException("验证码已发送");
+        }
+
+        // 发送手机验证码
+        if (AppContants.ACCOUNT_TYPE_MOBILE.equals(type)) {
+            boolean result = ZzSmsSend.sendALiYun(account, code.toString());
             if (result) {
                 Map<String, Object> map = new HashMap<>();
                 boolean flag = redisUtils.set(AppContants.VERIFY_CODE_PREFIX + account, code, 120);
@@ -141,4 +179,15 @@
     public FebsResponse appVersion() {
         return new FebsResponse().message("获取成功").success().data(commonService.findAppVersion());
     }
+
+    @ApiOperation(value = "验证验证码接口")
+    @PostMapping(value = "/checkCode")
+    public FebsResponse checkCode(@RequestBody AccountAndCodeDto accountAndCodeDto) {
+
+        boolean flag = commonService.verifyCode(accountAndCodeDto.getAccount(), accountAndCodeDto.getCode());
+        if (flag) {
+            return new FebsResponse().success();
+        }
+        return new FebsResponse().fail().message("验证码错误");
+    }
 }

--
Gitblit v1.9.1