From b92edf56e7e25440e7c46b967aa5373a7a8b25c2 Mon Sep 17 00:00:00 2001
From: puhanshu <a9236326>
Date: 星期一, 14 三月 2022 09:22:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommonApi.java |   10 +++++++---
 1 files changed, 7 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..b6c0204 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
@@ -77,6 +77,8 @@
     private int port;
     @Value("${ftp.url}")
     private String url;
+    @Value("${minio.url}")
+    private String minUrl;
     @Resource
     private WxMaConfiguration wxMaConfiguration;
     @Resource
@@ -168,9 +170,11 @@
             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