From 8bc96dc629c543fcba8c5d7673907a3a9eed8aee Mon Sep 17 00:00:00 2001 From: ruibaby Date: Mon, 3 Dec 2018 22:20:25 +0800 Subject: [PATCH] =?UTF-8?q?:art:=20=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- .../java/cc/ryanc/halo/utils/CommentUtil.java | 9 +- .../java/cc/ryanc/halo/utils/HaloUtils.java | 60 ++------- .../admin/AttachmentController.java | 122 +++++++++++++----- 4 files changed, 107 insertions(+), 86 deletions(-) diff --git a/pom.xml b/pom.xml index ad19df4bc..94c7f22ea 100755 --- a/pom.xml +++ b/pom.xml @@ -35,7 +35,7 @@ 1.18.2 3.6.0 1.0 - 4.1.19 + 4.2.1 4.0.1 7.2.14 0.4.8 diff --git a/src/main/java/cc/ryanc/halo/utils/CommentUtil.java b/src/main/java/cc/ryanc/halo/utils/CommentUtil.java index 44db0792b..aabbebcb1 100644 --- a/src/main/java/cc/ryanc/halo/utils/CommentUtil.java +++ b/src/main/java/cc/ryanc/halo/utils/CommentUtil.java @@ -1,14 +1,13 @@ package cc.ryanc.halo.utils; +import cc.ryanc.halo.model.domain.Comment; +import org.springframework.util.Assert; +import org.springframework.util.CollectionUtils; + import java.util.ArrayList; import java.util.Collections; import java.util.List; -import org.springframework.util.Assert; -import org.springframework.util.CollectionUtils; - -import cc.ryanc.halo.model.domain.Comment; - /** * 
  * 拼装评论
diff --git a/src/main/java/cc/ryanc/halo/utils/HaloUtils.java b/src/main/java/cc/ryanc/halo/utils/HaloUtils.java
index f32e48c3d..bc58b67cc 100755
--- a/src/main/java/cc/ryanc/halo/utils/HaloUtils.java
+++ b/src/main/java/cc/ryanc/halo/utils/HaloUtils.java
@@ -8,6 +8,7 @@ import cc.ryanc.halo.model.enums.BlogPropertiesEnum;
 import cc.ryanc.halo.model.enums.CommonParamsEnum;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.io.FileUtil;
+import cn.hutool.core.text.StrBuilder;
 import cn.hutool.core.util.StrUtil;
 import com.sun.syndication.feed.rss.Channel;
 import com.sun.syndication.feed.rss.Content;
@@ -16,14 +17,12 @@ import com.sun.syndication.io.FeedException;
 import com.sun.syndication.io.WireFeedOutput;
 import io.github.biezhi.ome.OhMyEmail;
 import lombok.extern.slf4j.Slf4j;
-
 import org.springframework.util.Assert;
 import org.springframework.util.ResourceUtils;
 
 import javax.imageio.ImageIO;
 import java.awt.image.BufferedImage;
 import java.io.*;
-import java.net.URI;
 import java.net.URL;
 import java.net.URLConnection;
 import java.nio.file.Files;
@@ -341,17 +340,18 @@ public class HaloUtils {
      */
     public static String getSiteMap(List posts) {
         Assert.notEmpty(posts, "post mut not be empty");
-
-        String head = "\n";
-        String urlBody = "";
-        String urlItem;
+        StrBuilder head = new StrBuilder("\n");
+        StrBuilder urlBody = new StrBuilder();
         String urlPath = HaloConst.OPTIONS.get(BlogPropertiesEnum.BLOG_URL.getProp()) + "/archives/";
         for (Post post : posts) {
-            urlItem = "" + urlPath + post.getPostUrl() + ""
-                    + DateUtil.format(post.getPostDate(), "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + "" + "";
-            urlBody += urlItem;
+            urlBody.append("");
+            urlBody.append(urlPath);
+            urlBody.append(post.getPostUrl());
+            urlBody.append("");
+            urlBody.append(DateUtil.format(post.getPostDate(), "yyyy-MM-dd'T'HH:mm:ss.SSSXXX"));
+            urlBody.append("");
         }
-        return head + urlBody + "";
+        return head.append(urlBody).append("").toString();
     }
 
     /**
@@ -367,46 +367,6 @@ public class HaloUtils {
         OhMyEmail.config(properties, userName, password);
     }
 
-    /**
-     * 访问路径获取json数据
-     *
-     * @param enterUrl 路径
-     * @return String
-     */
-    public static String getHttpResponse(String enterUrl) {
-        Assert.hasText(enterUrl, "enter url must not be blank");
-
-        BufferedReader in = null;
-        StringBuffer result = null;
-        try {
-            URI uri = new URI(enterUrl);
-            URL url = uri.toURL();
-            URLConnection connection = url.openConnection();
-            connection.setRequestProperty("Content-Type", "application/x-www-form-urlencoded");
-            connection.setRequestProperty("Charset", "utf-8");
-            connection.connect();
-            result = new StringBuffer();
-            in = new BufferedReader(new InputStreamReader(connection.getInputStream()));
-            String line;
-            while ((line = in.readLine()) != null) {
-                result.append(line);
-            }
-            return result.toString();
-
-        } catch (Exception e) {
-            e.printStackTrace();
-        } finally {
-            try {
-                if (in != null) {
-                    in.close();
-                }
-            } catch (Exception e2) {
-                e2.printStackTrace();
-            }
-        }
-        return null;
-    }
-
     /**
      * 百度主动推送
      *
diff --git a/src/main/java/cc/ryanc/halo/web/controller/admin/AttachmentController.java b/src/main/java/cc/ryanc/halo/web/controller/admin/AttachmentController.java
index 22c707960..458c0d751 100755
--- a/src/main/java/cc/ryanc/halo/web/controller/admin/AttachmentController.java
+++ b/src/main/java/cc/ryanc/halo/web/controller/admin/AttachmentController.java
@@ -11,6 +11,9 @@ import cc.ryanc.halo.service.LogsService;
 import cc.ryanc.halo.utils.HaloUtils;
 import cc.ryanc.halo.utils.LocaleMessageUtil;
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.io.FileUtil;
+import cn.hutool.core.text.StrBuilder;
+import cn.hutool.core.util.ImageUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.extra.servlet.ServletUtil;
 import lombok.extern.slf4j.Slf4j;
@@ -27,11 +30,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
 import java.io.File;
-import java.text.SimpleDateFormat;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Random;
+import java.util.*;
 
 /**
  * 
@@ -118,41 +117,85 @@ public class AttachmentController {
     public Map upload(@RequestParam("file") MultipartFile file,
                                       HttpServletRequest request) {
         Map result = new HashMap<>(3);
+        String dateString = DateUtil.format(DateUtil.date(), "yyyyMMddHHmmss");
         if (!file.isEmpty()) {
             try {
                 //用户目录
-                String userPath = System.getProperties().getProperty("user.home") + "/halo";
-                //upload的路径
-                StringBuffer sbMedia = new StringBuffer("upload/");
-                //获取当前年月以创建目录，如果没有该目录则创建
-                sbMedia.append(DateUtil.thisYear()).append("/").append(DateUtil.thisMonth()).append("/");
-                File mediaPath = new File(userPath, sbMedia.toString());
-                if (!mediaPath.exists()) {
-                    mediaPath.mkdirs();
-                }
-                SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHmmss");
-                String nameWithOutSuffix = file.getOriginalFilename().substring(0, file.getOriginalFilename().lastIndexOf('.')).replaceAll(" ", "_").replaceAll(",", "") + dateFormat.format(DateUtil.date()) + new Random().nextInt(1000);
-                String fileSuffix = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf('.') + 1);
-                String fileName = nameWithOutSuffix + "." + fileSuffix;
-                file.transferTo(new File(mediaPath.getAbsoluteFile(), fileName));
+                StrBuilder uploadPath = new StrBuilder(System.getProperties().getProperty("user.home"));
+                uploadPath.append("/halo/");
+                uploadPath.append("upload/");
+
+                //获取当前年月以创建目录，如果没有该目录则创建
+                uploadPath.append(DateUtil.thisYear()).append("/").append(DateUtil.thisMonth()).append("/");
+                File mediaPath = new File(uploadPath.toString());
+                if (!mediaPath.exists()) {
+                    if (!mediaPath.mkdirs()) {
+                        result.put("success",0);
+                        return result;
+                    }
+                }
+
+                //不带后缀
+                StrBuilder nameWithOutSuffix = new StrBuilder(file.getOriginalFilename().substring(0, file.getOriginalFilename().lastIndexOf('.')).replaceAll(" ", "_").replaceAll(",", ""));
+                nameWithOutSuffix.append(dateString);
+                nameWithOutSuffix.append(new Random().nextInt(1000));
+
+                //文件后缀
+                String fileSuffix = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf('.') + 1);
+
+                //带后缀
+                StrBuilder fileName = new StrBuilder(nameWithOutSuffix);
+                fileName.append(".");
+                fileName.append(fileSuffix);
+                file.transferTo(new File(mediaPath.getAbsoluteFile(), fileName.toString()));
+
+                //文件原路径
+                StrBuilder fullPath = new StrBuilder(mediaPath.getAbsolutePath());
+                fullPath.append("/");
+                fullPath.append(fileName);
+
+                //压缩文件路径
+                StrBuilder fullSmallPath = new StrBuilder(mediaPath.getAbsolutePath());
+                fullSmallPath.append("/");
+                fullSmallPath.append(nameWithOutSuffix);
+                fullSmallPath.append("_small.");
+                fullSmallPath.append(fileSuffix);
+
+                //压缩文件
+                Thumbnails.of(fullPath.toString()).size(256, 256).keepAspectRatio(false).toFile(fullSmallPath.toString());
+
+                //映射路径
+                StrBuilder filePath = new StrBuilder("/upload/");
+                filePath.append(DateUtil.thisYear());
+                filePath.append("/");
+                filePath.append(DateUtil.thisMonth());
+                filePath.append("/");
+                filePath.append(fileName);
+
+                //缩略图映射路径
+                StrBuilder fileSmallPath = new StrBuilder("/upload/");
+                fileSmallPath.append(DateUtil.thisYear());
+                fileSmallPath.append("/");
+                fileSmallPath.append(DateUtil.thisMonth());
+                fileSmallPath.append("/");
+                fileSmallPath.append(nameWithOutSuffix);
+                fileSmallPath.append("_small.");
+                fileSmallPath.append(fileSuffix);
 
-                //压缩图片
-                Thumbnails.of(new StringBuffer(mediaPath.getAbsolutePath()).append("/").append(fileName).toString()).size(256, 256).keepAspectRatio(false).toFile(new StringBuffer(mediaPath.getAbsolutePath()).append("/").append(nameWithOutSuffix).append("_small.").append(fileSuffix).toString());
-                String filePath = new StringBuffer("/upload/").append(DateUtil.thisYear()).append("/").append(DateUtil.thisMonth()).append("/").append(fileName).toString();
                 //保存在数据库
                 Attachment attachment = new Attachment();
-                attachment.setAttachName(fileName);
-                attachment.setAttachPath(filePath);
-                attachment.setAttachSmallPath(new StringBuffer("/upload/").append(DateUtil.thisYear()).append("/").append(DateUtil.thisMonth()).append("/").append(nameWithOutSuffix).append("_small.").append(fileSuffix).toString());
+                attachment.setAttachName(fileName.toString());
+                attachment.setAttachPath(filePath.toString());
+                attachment.setAttachSmallPath(fileSmallPath.toString());
                 attachment.setAttachType(file.getContentType());
-                attachment.setAttachSuffix(new StringBuffer(".").append(fileSuffix).toString());
+                attachment.setAttachSuffix(new StrBuilder(".").append(fileSuffix).toString());
                 attachment.setAttachCreated(DateUtil.date());
-                attachment.setAttachSize(HaloUtils.parseSize(new File(mediaPath, fileName).length()));
-                attachment.setAttachWh(HaloUtils.getImageWh(new File(mediaPath, fileName)));
+                attachment.setAttachSize(HaloUtils.parseSize(new File(fullPath.toString()).length()));
+                attachment.setAttachWh(HaloUtils.getImageWh(new File(fullPath.toString())));
                 attachmentService.saveByAttachment(attachment);
                 log.info("Upload file {} to {} successfully", fileName, mediaPath.getAbsolutePath());
                 logsService.saveByLogs(
-                        new Logs(LogsRecord.UPLOAD_FILE, fileName, ServletUtil.getClientIP(request), DateUtil.date())
+                        new Logs(LogsRecord.UPLOAD_FILE, fileName.toString(), ServletUtil.getClientIP(request), DateUtil.date())
                 );
 
                 result.put("success", 1);
@@ -170,6 +213,25 @@ public class AttachmentController {
         return result;
     }
 
+    /**
+     * 添加外部url附件
+     *
+     * @param attachment attachment
+     * @return JsonResult
+     */
+    @PostMapping(value = "/addFromUrl")
+    @ResponseBody
+    public JsonResult addFromUrl(@ModelAttribute(value = "attachment") Attachment attachment) {
+        attachment.setAttachCreated(new Date());
+        attachment.setAttachOrigin(1);
+        attachment = attachmentService.saveByAttachment(attachment);
+        if (null != attachment) {
+            return new JsonResult(ResultCodeEnum.SUCCESS.getCode(), localeMessageUtil.getMessage("code.admin.common.save-success"));
+        } else {
+            return new JsonResult(ResultCodeEnum.FAIL.getCode(), localeMessageUtil.getMessage("code.admin.common.save-failed"));
+        }
+    }
+
     /**
      * 处理获取附件详情的请求
      *
@@ -180,7 +242,7 @@ public class AttachmentController {
     @GetMapping(value = "/attachment")
     public String attachmentDetail(Model model, @RequestParam("attachId") Long attachId) {
         Optional attachment = attachmentService.findByAttachId(attachId);
-        model.addAttribute("attachment", attachment.get());
+        model.addAttribute("attachment", attachment.orElse(new Attachment()));
         return "admin/widget/_attachment-detail";
     }