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 | 49 +++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 47 insertions(+), 2 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 d41d5f6..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
@@ -13,6 +13,11 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
+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;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.redis.core.StringRedisTemplate;
@@ -38,6 +43,8 @@
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
+import static com.panzhihua.common.utlis.FileTypeUploadUtils.assertAllowed;
+
/**
* @program: springcloud_k8s_panzhihuazhihuishequ
* @description: 公共接口
@@ -48,7 +55,7 @@
@RestController
@RequestMapping("/common/")
@Api(tags = {"公共接口"})
-public class CommonApi {
+public class CommonApi extends BaseController {
/**
* 允许的图片文件后缀
*/
@@ -73,10 +80,14 @@
private int port;
@Value("${ftp.url}")
private String url;
+ @Value("${minio.url}")
+ private String minUrl;
@Resource
private WxMaConfiguration wxMaConfiguration;
@Resource
private CommunityService communityService;
+ @Resource
+ private MinioUtil minioUtil;
public static void main(String[] args) {
// int nextInt = RandomUtils.nextInt(99999, 1000000);
@@ -92,7 +103,7 @@
@PostMapping(value = "uploadimage", consumes = "multipart/*", headers = "content-type=multipart/form-date")
public R uploadImage(@RequestParam MultipartFile file, HttpServletRequest request) throws IOException {
// 微信图片内容校验
- WxMaSecCheckService wxMaSecCheckService = wxMaConfiguration.getMaService().getSecCheckService();
+ WxMaSecCheckService wxMaSecCheckService = wxMaConfiguration.getMaService(this.getAppId()).getSecCheckService();
String property = System.getProperty("user.dir");
String fileExtension = ".jpg";
@@ -141,6 +152,40 @@
}
+ @ApiOperation(value = "新上传照片接口")
+ @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);
+ return R.ok(imageUrl);
+ } catch (Exception e) {
+ log.error("上传照片失败【{}】", e.getMessage());
+ return R.fail();
+ }
+ }
+
+ @ApiOperation(value = "新上传照片压缩接口")
+ @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;
+ 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();
+ }
+ }
+
@ApiOperation(value = "发送验证码")
@PostMapping(value = "smscode")
public R smscode(@RequestBody UserPhoneVO userPhoneVO) {
--
Gitblit v1.7.1