From 8d9be764777d27c7abf395be5055cf2324bdde8f Mon Sep 17 00:00:00 2001
From: puhanshu <a9236326>
Date: 星期三, 22 六月 2022 09:19:35 +0800
Subject: [PATCH] Merge branch 'dev'
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommonApi.java | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommonApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommonApi.java
index 55561cf..f465af5 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommonApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommonApi.java
@@ -15,6 +15,7 @@
import com.panzhihua.applets.config.MinioUtil;
import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.utlis.MimeTypeUtils;
import net.coobird.thumbnailator.Thumbnails;
import org.apache.commons.io.FilenameUtils;
import org.apache.commons.lang3.RandomUtils;
@@ -41,6 +42,8 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
+
+import static com.panzhihua.common.utlis.FileTypeUploadUtils.assertAllowed;
/**
* @program: springcloud_k8s_panzhihuazhihuishequ
@@ -77,6 +80,8 @@
private int port;
@Value("${ftp.url}")
private String url;
+ @Value("${minio.url}")
+ private String minUrl;
@Resource
private WxMaConfiguration wxMaConfiguration;
@Resource
@@ -151,6 +156,7 @@
@PostMapping(value = "/uploadimages", consumes = "multipart/*", headers = "content-type=multipart/form-date")
public R uploadImages(@RequestParam MultipartFile file, HttpServletRequest request) {
try {
+ assertAllowed(file, MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION);
String extension = FilenameUtils.getExtension(file.getOriginalFilename());
String name = UUID.randomUUID().toString().replaceAll("-", "") + "." + extension;
String imageUrl = minioUtil.upload(file, name);
@@ -165,12 +171,15 @@
@PostMapping(value = "/uploadimagescompress", consumes = "multipart/*", headers = "content-type=multipart/form-date")
public R uploadImagesComPress(@RequestParam MultipartFile file, HttpServletRequest request) {
try {
+ assertAllowed(file, MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION);
String extension = FilenameUtils.getExtension(file.getOriginalFilename());
String uuid=UUID.randomUUID().toString().replaceAll("-", "");
String name = uuid + "."+ extension;
- String imageUrl = minioUtil.upload(file, name);
- Thumbnails.of(file.getInputStream()).scale(1).outputQuality(0.01).outputFormat("jpg").toFile(FtpConstants.FTPFILEPATH_IDCARD+uuid+"-compress");
- return R.ok(url + "/idcard/" + uuid+"-compress.jpg");
+ minioUtil.upload(file, name);
+ Thumbnails.of(file.getInputStream()).scale(0.3).outputQuality(0.51).outputFormat("jpg").toFile(uuid+"_compress");
+ File file1=new File(uuid+"_compress.jpg");
+ String imageUrl = minioUtil.uploadFile(file1, uuid+"_compress.jpg");
+ return R.ok(imageUrl);
} catch (Exception e) {
log.error("上传照片失败【{}】", e.getMessage());
return R.fail();
--
Gitblit v1.7.1