From f7c7a1d550444e88c8f7033a8a586211ab8c3ce7 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 17 Jan 2023 21:04:02 +0800
Subject: [PATCH] 1
---
src/main/java/cc/mrbird/febs/mall/controller/CommonController.java | 23 ++++++++++++++++++-----
1 files changed, 18 insertions(+), 5 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 c3d4e4d..70db369 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;
@@ -52,13 +53,14 @@
// 发送手机验证码
if (AppContants.ACCOUNT_TYPE_MOBILE.equals(type)) {
- boolean result = ZzSmsSend.sendVerifyCode(account, code.toString(), 2);
- if (result) {
+// boolean result = ZzSmsSend.sendVerifyCode(account, code.toString(), 2);
+// boolean result = Sms106Send.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("验证码发送成功");
- }
+ return new FebsResponse().success().data(code);
+// }
// 发送邮件验证码
} else if (AppContants.ACCOUNT_TYPE_EMAIL.equals(type)) {
boolean flag = SubMailSend.sendMail(account, code.toString());
@@ -72,7 +74,7 @@
log.info("未定义账号类型");
throw new FebsException("未定义账号类型");
}
- return new FebsResponse().fail().message("验证码发送失败");
+// return new FebsResponse().fail().message("验证码发送失败");
}
/**
@@ -142,4 +144,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