From 047dc0fe088f45d298822d4fc1bbe39c0a21fab7 Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期二, 22 二月 2022 09:45:25 +0800
Subject: [PATCH] 修复bug

---
 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommonApi.java |   23 +++++++++++++++++++++--
 1 files changed, 21 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..560eb63 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,9 @@
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 
+import com.panzhihua.applets.config.MinioUtil;
+import com.panzhihua.common.controller.BaseController;
+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;
@@ -48,7 +51,7 @@
 @RestController
 @RequestMapping("/common/")
 @Api(tags = {"公共接口"})
-public class CommonApi {
+public class CommonApi extends BaseController {
     /**
      * 允许的图片文件后缀
      */
@@ -77,6 +80,8 @@
     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 +97,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 +146,20 @@
 
     }
 
+    @ApiOperation(value = "新上传照片接口")
+    @PostMapping(value = "/uploadimages", consumes = "multipart/*", headers = "content-type=multipart/form-date")
+    public R uploadImages(@RequestParam MultipartFile file, HttpServletRequest request) {
+        try {
+            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 = "smscode")
     public R smscode(@RequestBody UserPhoneVO userPhoneVO) {

--
Gitblit v1.7.1