From 86f2368f146af23c9e16507f790752e79858a29f Mon Sep 17 00:00:00 2001
From: Hentua <wangdoubleone@gmail.com>
Date: Thu, 22 Feb 2024 22:34:31 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/mall/controller/CommonController.java | 142 ++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 133 insertions(+), 9 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 0c1db62..87f7a27 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/CommonController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/CommonController.java
@@ -1,23 +1,28 @@
package cc.mrbird.febs.mall.controller;
+import cc.mrbird.febs.common.annotation.ControllerEndpoint;
import cc.mrbird.febs.common.entity.FebsResponse;
import cc.mrbird.febs.common.exception.FebsException;
-import cc.mrbird.febs.common.utils.AppContants;
-import cc.mrbird.febs.common.utils.RedisUtils;
-import cc.mrbird.febs.common.utils.SubMailSend;
-import cc.mrbird.febs.common.utils.ZzSmsSend;
+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;
+import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.StrUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import sun.misc.BASE64Encoder;
+import java.io.IOException;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
/**
@@ -25,6 +30,7 @@
* @date 2021-09-16
**/
@Slf4j
+@CrossOrigin("*")
@RestController
@RequestMapping(value = "/api/common")
@RequiredArgsConstructor
@@ -32,6 +38,7 @@
public class CommonController {
private final RedisUtils redisUtils;
+ private final ICommonService commonService;
@ApiOperation(value = "获取验证码接口", notes = "获取验证码通用接口")
@GetMapping(value = "/verifyCode")
@@ -46,7 +53,9 @@
// 发送手机验证码
if (AppContants.ACCOUNT_TYPE_MOBILE.equals(type)) {
- boolean result = ZzSmsSend.sendVerifyCode(account, code.toString(), 2);
+// boolean result = Sms106Send.sendVerifyCode(account, code.toString(), 2);
+ boolean result = ZzSmsSend.sendALiYun(account, code.toString());
+// 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);
@@ -68,4 +77,119 @@
}
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, 300);
+ 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("验证码发送失败");
+ }
+
+ /**
+ * 图片上传
+ * @return
+ */
+ @PostMapping(value = "/uploadFileBase64")
+ @ControllerEndpoint(operation = "图片上传", exceptionMessage = "上传失败")
+ public Map<String,Object> uploadFileBase64(@RequestBody @Validated MultipartFile file) {
+ if (file == null || file.isEmpty()) {
+ return new FebsResponse().message("上传文件为空");
+ }
+
+ //文件加密
+ BASE64Encoder base64Encoder =new BASE64Encoder();
+ String base64EncoderImg = null;
+ try {
+ base64EncoderImg = base64Encoder.encode(file.getBytes());
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+
+ String imageFuffix = ".png";
+ String imageNames = System.currentTimeMillis() + IdUtil.simpleUUID() + imageFuffix;
+ String imageName = "uploadeFile/" + imageNames;
+ OssUtils.uploadFileWithBase64(base64EncoderImg, imageName);
+ String bucket_name ="https://excoin.oss-cn-hangzhou.aliyuncs.com";
+ String url = bucket_name + "/" + imageName;
+
+ Map<String,Object> map = new HashMap<String,Object>();
+ Map<String,Object> map2 = new HashMap<String,Object>();
+ map.put("code",0);//0表示成功，1失败
+ map.put("msg","上传成功");//提示消息
+ map.put("data",map2);
+ map2.put("src",url);//图片url
+ map2.put("title",imageNames);//图片名称，这个会显示在输入框里
+ return map;
+ }
+
+ @ApiOperation(value = "数据字典")
+ @GetMapping(value = "/findDataDic/{type}")
+ public FebsResponse findDataDic(@PathVariable("type") String type) {
+ List<DataDictionaryCustom> dic = commonService.findDataDicByType(type);
+ return new FebsResponse().success().data(dic);
+ }
+
+ @ApiOperation(value = "base64上传")
+ @PostMapping(value = "/base64Upload")
+ public FebsResponse base64Upload(@RequestBody @Validated Base64UploadDto base64UploadDto) {
+ String base64Str = base64UploadDto.getBase64Str();
+ if (base64Str.startsWith("data:image")) {
+ base64Str = base64Str.substring(base64Str.indexOf(",") + 1, base64Str.length() - 1);
+ }
+
+ String imageFuffix = ".jpg";
+ String imageNames = System.currentTimeMillis() + IdUtil.simpleUUID() + imageFuffix;
+ String imageName = "uploadeFile/" + imageNames;
+ OssUtils.uploadFileWithBase64(base64Str, imageName);
+ String bucket_name ="https://excoin.oss-cn-hangzhou.aliyuncs.com";
+ String url = bucket_name + "/" + imageName;
+
+ 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