From 3a341497523c00494125524a27cb7d8a9ad8fbcf Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Wed, 23 Apr 2025 09:48:39 +0800
Subject: [PATCH] refactor(mall): 注释掉会员绑定相关的代码
---
src/main/java/cc/mrbird/febs/mall/controller/CommonController.java | 84 +++++++++++++++++++++++++++++-------------
1 files changed, 58 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 131405b..12fecbc 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/CommonController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/CommonController.java
@@ -8,19 +8,30 @@
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.io.file.FileNameUtil;
+import cn.hutool.core.lang.UUID;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.StrUtil;
+import com.thoughtworks.xstream.core.BaseException;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
+import net.coobird.thumbnailator.Thumbnails;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.util.FileCopyUtils;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import sun.misc.BASE64Encoder;
+import javax.imageio.ImageIO;
+import java.awt.image.BufferedImage;
+import java.io.File;
+import java.io.FileOutputStream;
import java.io.IOException;
+import java.io.InputStream;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -53,7 +64,8 @@
// 发送手机验证码
if (AppContants.ACCOUNT_TYPE_MOBILE.equals(type)) {
- boolean result = Sms106Send.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<>();
@@ -114,40 +126,60 @@
}
/**
+ * 通用上传请求
+ */
+ // 文件保存目录路径
+ @Value("${static.resource.url}")
+ private String resourceUrl;
+ // 文件保存目录URL
+ @Value("${static.resource.path}")
+ private String resourcePath;
+
+ @ControllerEndpoint(operation = "文件上传服务器", exceptionMessage = "上传失败")
+ @PostMapping(value = "/fileUploadEsc")
+ public Map<String,Object> fileUploadEsc(@RequestBody @Validated MultipartFile file) throws IOException {
+ if (file == null) {
+ throw new FebsException("上传文件不能为空");
+ }
+ return FileUtil.fileUploadEsc(file,resourceUrl,resourcePath);
+ }
+
+ /**
* 图片上传
* @return
*/
@PostMapping(value = "/uploadFileBase64")
@ControllerEndpoint(operation = "图片上传", exceptionMessage = "上传失败")
- public Map<String,Object> uploadFileBase64(@RequestBody @Validated MultipartFile file) {
+ public Map<String,Object> uploadFileBase64(@RequestBody @Validated MultipartFile file) throws IOException {
if (file == null || file.isEmpty()) {
return new FebsResponse().message("上传文件为空");
}
+ return FileUtil.fileUploadEsc(file,resourceUrl,resourcePath);
- //文件加密
- 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;
+// //文件加密
+// 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 = "数据字典")
--
Gitblit v1.9.1