From ff5e4f9e16dd4fd6159eedb4883ad94633d7a65a Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Tue, 05 Mar 2024 15:34:54 +0800
Subject: [PATCH] 抽奖
---
src/main/java/cc/mrbird/febs/mall/controller/CommonController.java | 81 ++++++++++++++++++++++++++
src/main/java/cc/mrbird/febs/mall/controller/AdminMallGoodsController.java | 74 +++++++++++++++++++++++-
src/main/resources/application-dev.yml | 7 ++
src/main/resources/application-prod.yml | 5 +
4 files changed, 162 insertions(+), 5 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/controller/AdminMallGoodsController.java b/src/main/java/cc/mrbird/febs/mall/controller/AdminMallGoodsController.java
index 9910b02..5344f26 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/AdminMallGoodsController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/AdminMallGoodsController.java
@@ -15,11 +15,14 @@
import cc.mrbird.febs.mall.vo.AdminMallGoodsCategoryTreeVo;
import cc.mrbird.febs.mall.vo.AdminMallGoodsTreeVo;
import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.lang.UUID;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.StrUtil;
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;
@@ -29,8 +32,7 @@
import javax.validation.Valid;
import javax.validation.constraints.NotNull;
import java.awt.image.BufferedImage;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
+import java.io.*;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -46,10 +48,76 @@
private final IAdminMallGoodsService adminMallGoodsService;
/**
+ * 通用上传请求
+ */
+
+ @Value("${static.resource.url}")
+ private String resourceUrl;
+
+ @Value("${static.resource.path}")
+ private String resourcePath;
+
+ @PostMapping("/uploadFileBase64")
+ @ControllerEndpoint(operation = "图片上传", exceptionMessage = "上传失败")
+ public Map<String,Object> upload(MultipartFile file) throws IOException {
+ if (file == null) {
+ return new FebsResponse().message("上传文件为空");
+ }
+ // 文件保存目录路径
+ String savePath = resourcePath;
+ // 文件保存目录URL
+ String saveUrl = resourceUrl;
+ // 检查目录
+ File uploadDir = new File(savePath);
+ if (!uploadDir.isDirectory()) {
+ uploadDir.mkdir();
+ }
+
+ // 获得文件的后缀
+ String fileName = file.getOriginalFilename();
+ String fileExt = fileName.substring(fileName.lastIndexOf(".") + 1);
+ String newFileName = UUID.randomUUID().toString() + "." + fileExt;
+ if (isImage(file.getInputStream())) {
+ Thumbnails.of(file.getInputStream())
+ // 图片大小（长宽）压缩比例 从0-1，1表示原图
+ .scale(1f)
+ // 图片质量压缩比例 从0-1，越接近1质量越好
+ .outputQuality(0.9f)
+ .toOutputStream(new FileOutputStream(savePath + newFileName));
+ } else {
+ File uploadedFile = new File(savePath, newFileName);
+ try {
+ //存文件
+ FileCopyUtils.copy(file.getBytes(), uploadedFile);
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+ String visitPath = (saveUrl + newFileName);
+ 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",visitPath);//图片url
+ map2.put("title",fileName);//图片名称，这个会显示在输入框里
+ return map;
+ }
+
+ private boolean isImage(InputStream inputStream) {
+ BufferedImage read = null;
+ try {
+ read = ImageIO.read(inputStream);
+ } catch (IOException e) {
+ return false;
+ }
+ return read != null;
+ }
+ /**
* 图片上传
* @return
*/
- @PostMapping(value = "/uploadFileBase64")
+ @PostMapping(value = "/uploadFileBase64oss")
@ControllerEndpoint(operation = "图片上传", exceptionMessage = "上传失败")
public Map<String,Object> uploadFileBase64(@RequestBody @Validated MultipartFile file) {
if (file.isEmpty()) {
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 67b86a1..ce22ede 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;
@@ -77,11 +88,79 @@
return new FebsResponse().fail().message("验证码发送失败");
}
+
+ /**
+ * 通用上传请求
+ */
+
+ @Value("${static.resource.url}")
+ private String resourceUrl;
+
+ @Value("${static.resource.path}")
+ private String resourcePath;
+
+ @PostMapping("/uploadFileBase64")
+ @ControllerEndpoint(operation = "图片上传", exceptionMessage = "上传失败")
+ public Map<String,Object> upload(MultipartFile file) throws IOException {
+ if (file == null) {
+ return new FebsResponse().message("上传文件为空");
+ }
+ // 文件保存目录路径
+ String savePath = resourcePath;
+ // 文件保存目录URL
+ String saveUrl = resourceUrl;
+ // 检查目录
+ File uploadDir = new File(savePath);
+ if (!uploadDir.isDirectory()) {
+ uploadDir.mkdir();
+ }
+
+ // 获得文件的后缀
+ String fileName = file.getOriginalFilename();
+ String fileExt = fileName.substring(fileName.lastIndexOf(".") + 1);
+ String newFileName = UUID.randomUUID().toString() + "." + fileExt;
+ if (isImage(file.getInputStream())) {
+ Thumbnails.of(file.getInputStream())
+ // 图片大小（长宽）压缩比例 从0-1，1表示原图
+ .scale(1f)
+ // 图片质量压缩比例 从0-1，越接近1质量越好
+ .outputQuality(0.9f)
+ .toOutputStream(new FileOutputStream(savePath + newFileName));
+ } else {
+ File uploadedFile = new File(savePath, newFileName);
+ try {
+ //存文件
+ FileCopyUtils.copy(file.getBytes(), uploadedFile);
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+ String visitPath = (saveUrl + newFileName);
+ 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",visitPath);//图片url
+ map2.put("title",fileName);//图片名称，这个会显示在输入框里
+ return map;
+ }
+
+ private boolean isImage(InputStream inputStream) {
+ BufferedImage read = null;
+ try {
+ read = ImageIO.read(inputStream);
+ } catch (IOException e) {
+ return false;
+ }
+ return read != null;
+ }
+
/**
* 图片上传
* @return
*/
- @PostMapping(value = "/uploadFileBase64")
+ @PostMapping(value = "/uploadFileBase64OSS")
@ControllerEndpoint(operation = "图片上传", exceptionMessage = "上传失败")
public Map<String,Object> uploadFileBase64(@RequestBody @Validated MultipartFile file) {
if (file == null || file.isEmpty()) {
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 083a895..7f75b53 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -63,4 +63,9 @@
mchId: 1641389321
mchKey: wqri51aCfiG31o4IcdX3dW12qnX3u4hp
keyPath: classpath:cert/apiclient_cert.p12
- noticeUrl: http://120.27.238.55:8185/api/pay/wxPayCallBack
\ No newline at end of file
+ noticeUrl: http://120.27.238.55:8185/api/pay/wxPayCallBack
+
+static:
+ resource:
+ url: http://gfa.huayamall.com/uploadeFile/
+ path: /home/javaweb/webresource/gfa/h5/uploadeFile/
\ No newline at end of file
diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml
index 7a23163..43bc245 100644
--- a/src/main/resources/application-prod.yml
+++ b/src/main/resources/application-prod.yml
@@ -64,3 +64,8 @@
mchKey: wqri51aCfiG31o4IcdX3dW12qnX3u4hp
keyPath: classpath:cert/apiclient_cert.p12
noticeUrl: https://hlm.meiao.biz/api/pay/wxPayCallBack
+
+static:
+ resource:
+ url: http://gfa.huayamall.com/uploadeFile/
+ path: /home/javaweb/webresource/gfa/h5/uploadeFile/
--
Gitblit v1.9.1