From b9646ae7d71fb1de7a018c3fe930936cc0008492 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E6=9F=922012?= <345849402@qq.com>
Date: Sat, 20 Jun 2020 10:42:58 +0800
Subject: [PATCH] =?UTF-8?q?=E9=98=BF=E9=87=8C=E4=BA=91=E5=AD=98=E5=82=A8?=
 =?UTF-8?q?=E8=AF=B4=E6=98=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wechat/service/impl/GirlServiceImpl.java     | 16 ++++++----------
 .../tools/module/wechat/web/GirlController.java  |  4 ++++
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/tools/module/wechat/service/impl/GirlServiceImpl.java b/src/main/java/com/tools/module/wechat/service/impl/GirlServiceImpl.java
index e95565a..aa1e713 100644
--- a/src/main/java/com/tools/module/wechat/service/impl/GirlServiceImpl.java
+++ b/src/main/java/com/tools/module/wechat/service/impl/GirlServiceImpl.java
@@ -30,11 +30,6 @@ public class GirlServiceImpl implements GirlService {
     @Value("${ali-yun.oss.url}")
     private String ossUrl;
 
-    private static int corePoolSize = Runtime.getRuntime().availableProcessors();
-    private static ThreadPoolExecutor executor  =
-            new ThreadPoolExecutor(corePoolSize, corePoolSize+1, 10l, TimeUnit.SECONDS,
-                    new LinkedBlockingQueue<>(100));
-
     @Override
     public Result list(Integer pageSize, Integer pageNo) {
         String nativeSql = "SELECT * FROM app_girl WHERE status=? GROUP BY id DESC ";
@@ -47,11 +42,12 @@ public class GirlServiceImpl implements GirlService {
     @Override
     @Transactional(rollbackFor=Exception.class)
     public void upload(Girl image, File toPic,File fromPic) {
-        Runnable task = () -> {
-            String picName = image.getOssUrl().replace("zoom_","");
-            aliYunUtils.upload(fromPic,picName);
-        };
-        executor.execute(task);
+        /**
+         * 不需要阿里云OSS注释掉就可以
+         * 缩放、正常
+         */
+        String picName = image.getOssUrl().replace("zoom_","");
+        aliYunUtils.upload(fromPic,picName);
         aliYunUtils.upload(toPic,image.getOssUrl());
         image.setOssUrl(ossUrl+"/"+image.getOssUrl());
         dynamicQuery.save(image);
diff --git a/src/main/java/com/tools/module/wechat/web/GirlController.java b/src/main/java/com/tools/module/wechat/web/GirlController.java
index 811c2c3..a1f83ba 100644
--- a/src/main/java/com/tools/module/wechat/web/GirlController.java
+++ b/src/main/java/com/tools/module/wechat/web/GirlController.java
@@ -75,6 +75,10 @@ public class GirlController {
                 image.setGmtCreate(DateUtils.getTimestamp());
                 image.setStatus(Short.parseShort(status));
                 meiZiService.upload(image,toPic,fromPic);
+                /**
+                 * 默认返回的是阿里云OSS地址
+                 * 如果不需要改成本地的就可以
+                 */
                 res.put("url",ossUrl+"/"+fileDay+"/"+fileName);
                 res.put("success", 1);
                 res.put("message", "upload success!");
-- 
GitLab