From cbfcb952897532e377dd3027f6834c82d38341fc Mon Sep 17 00:00:00 2001
From: Hentua <wangdoubleone@gmail.com>
Date: Mon, 12 Jun 2023 22:01:36 +0800
Subject: [PATCH] Merge branch 'meiye_mall' of http://120.27.238.55:7000/r/xc-mall into meiye_mall
---
src/main/java/cc/mrbird/febs/mall/controller/CommonController.java | 31 ++++++++++++++++++++++++++++---
1 files changed, 28 insertions(+), 3 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 4f7ca23..8f86b54 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
@@ -44,14 +46,20 @@
@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);
if (StrUtil.isNotBlank(redisUtils.getString(AppContants.VERIFY_CODE_PREFIX + account))) {
throw new FebsException("验证码已发送");
}
+// 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("验证码发送成功");
+
// 发送手机验证码
if (AppContants.ACCOUNT_TYPE_MOBILE.equals(type)) {
- 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);
@@ -81,8 +89,8 @@
@PostMapping(value = "/uploadFileBase64")
@ControllerEndpoint(operation = "图片上传", exceptionMessage = "上传失败")
public Map<String,Object> uploadFileBase64(@RequestBody @Validated MultipartFile file) {
- if (file.isEmpty()) {
- new FebsResponse().message("上传文件为空");
+ if (file == null || file.isEmpty()) {
+ return new FebsResponse().message("上传文件为空");
}
//文件加密
@@ -135,4 +143,21 @@
return new FebsResponse().message("上传成功").success().data(url);
}
+
+ @ApiOperation(value = "获取版本信息")
+ @GetMapping(value = "/appVersion")
+ 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