From f21b1c12248daaac71491aaf2e46908fadc63377 Mon Sep 17 00:00:00 2001
From: Hentua <wangdoubleone@gmail.com>
Date: Sun, 11 Jun 2023 11:34:21 +0800
Subject: [PATCH] fix

---
 src/main/java/cc/mrbird/febs/mall/controller/CommonController.java |   49 +++++++++++++++++++++++--------------------------
 1 files changed, 23 insertions(+), 26 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 58a6e45..752a2bc 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/CommonController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/CommonController.java
@@ -46,36 +46,33 @@
                                    @ApiParam(name = "type", value = "类型1-手机号", required = true) @RequestParam("type") String type) {
         log.info("#账号:{}, 类型:{}#", account, type);
 
-        Integer code = 123456;
-//        Integer code = (int) ((Math.random() * 9 + 1) * 100000);
+        Integer code = (int) ((Math.random() * 9 + 1) * 100000);
         if (StrUtil.isNotBlank(redisUtils.getString(AppContants.VERIFY_CODE_PREFIX + account))) {
             throw new FebsException("验证码已发送");
         }
 
-        boolean flag = redisUtils.set(AppContants.VERIFY_CODE_PREFIX + account, code, 120);
-
-//        // 发送手机验证码
-//        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("未定义账号类型");
-//        }
+        // 发送手机验证码
+        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("验证码发送失败");
     }
 

--
Gitblit v1.9.1