Refactor generateThumbnail method.

q517544204 · Sep 9, 2019 · d41d3d8 · d41d3d8
1 parent f375c28
commit d41d3d8
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 13 deletions.
diff --git a/build.gradle b/build.gradle
@@ -43,13 +43,12 @@ bootJar {
 
 ext {
     ohMyEmailVersion = '0.0.4'
-    hutoolVersion = '4.5.0'
+    hutoolVersion = '4.6.3'
     upyunSdkVersion = '4.0.1'
     qiniuSdkVersion = '7.2.18'
     aliyunSdkVersion = '3.4.2'
     baiduSdkVersion = '0.10.36'
     qcloudSdkVersion = '5.5.7'
-    thumbnailatorVersion = '0.4.8'
     swaggerVersion = '2.9.2'
     commonsLangVersion = '3.8.1'
     httpclientVersion = '4.5.7'
@@ -74,7 +73,6 @@ dependencies {
     implementation "com.aliyun.oss:aliyun-sdk-oss:$aliyunSdkVersion"
     implementation "com.baidubce:bce-java-sdk:$baiduSdkVersion"
     implementation "com.qcloud:cos_api:$qcloudSdkVersion"
-    implementation "net.coobird:thumbnailator:$thumbnailatorVersion"
     implementation "io.springfox:springfox-swagger2:$swaggerVersion"
     implementation "io.springfox:springfox-swagger-ui:$swaggerVersion"
     implementation "org.apache.commons:commons-lang3:$commonsLangVersion"

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
+#Mon Sep 09 12:27:59 CST 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip
diff --git a/src/main/java/run/halo/app/handler/file/LocalFileHandler.java b/src/main/java/run/halo/app/handler/file/LocalFileHandler.java
@@ -1,7 +1,7 @@
 package run.halo.app.handler.file;
 
+import cn.hutool.core.img.ImgUtil;
 import lombok.extern.slf4j.Slf4j;
-import net.coobird.thumbnailator.Thumbnails;
 import org.springframework.http.MediaType;
 import org.springframework.lang.NonNull;
 import org.springframework.stereotype.Component;
@@ -31,7 +31,8 @@
  * Local file handler.
  *
  * @author johnniang
- * @date 3/27/19
+ * @author ryanwang
+ * @date 2019-03-27
  */
 @Slf4j
 @Component
@@ -47,11 +48,13 @@ public class LocalFileHandler implements FileHandler {
     /**
      * Thumbnail width.
      */
+    @Deprecated
     private final static int THUMB_WIDTH = 256;
 
     /**
      * Thumbnail height.
      */
+    @Deprecated
     private final static int THUMB_HEIGHT = 256;
 
     private final OptionService optionService;
@@ -135,8 +138,11 @@ public UploadResult upload(MultipartFile file) {
             uploadResult.setMediaType(MediaType.valueOf(Objects.requireNonNull(file.getContentType())));
             uploadResult.setSize(file.getSize());
 
+            // TODO refactor this: if image is svg ext. extension
+            boolean isSvg = "svg".equals(extension);
+
             // Check file type
-            if (FileHandler.isImageType(uploadResult.getMediaType())) {
+            if (FileHandler.isImageType(uploadResult.getMediaType()) && !isSvg) {
                 // Upload a thumbnail
                 String thumbnailBasename = basename + THUMBNAIL_SUFFIX;
                 String thumbnailSubFilePath = subDir + thumbnailBasename + '.' + extension;
@@ -154,9 +160,10 @@ public UploadResult upload(MultipartFile file) {
                 // Set width and height
                 uploadResult.setWidth(image.getWidth());
                 uploadResult.setHeight(image.getHeight());
-
                 // Set thumb path
                 uploadResult.setThumbPath(thumbnailSubFilePath);
+            } else {
+                uploadResult.setThumbPath(subFilePath);
             }
 
             return uploadResult;
@@ -220,7 +227,7 @@ private void generateThumbnail(@NonNull Path imagePath, @NonNull Path thumbPath)
         log.info("Generating thumbnail: [{}] for image: [{}]", thumbPath.getFileName(), imagePath.getFileName());
 
         // Convert to thumbnail and copy the thumbnail
-        Thumbnails.of(imagePath.toFile()).size(THUMB_WIDTH, THUMB_HEIGHT).keepAspectRatio(true).toFile(thumbPath.toFile());
+        ImgUtil.scale(imagePath.toFile(), thumbPath.toFile(), 0.1f);
     }
 
 }
diff --git a/src/main/java/run/halo/app/model/entity/BaseEntity.java b/src/main/java/run/halo/app/model/entity/BaseEntity.java
@@ -14,9 +14,9 @@
  * @author johnniang
  * @date 3/20/19
  */
-@MappedSuperclass
 @Data
 @ToString
+@MappedSuperclass
 @EqualsAndHashCode
 public class BaseEntity {
 

diff --git a/src/main/java/run/halo/app/model/entity/BasePost.java b/src/main/java/run/halo/app/model/entity/BasePost.java
@@ -42,7 +42,7 @@ public class BasePost extends BaseEntity {
     /**
      * Post url.
      */
-    @Column(name = "url", columnDefinition = "varchar(255) not null")
+    @Column(name = "url", columnDefinition = "varchar(255) not null", unique = true)
     private String url;
 
     /**

diff --git a/src/main/java/run/halo/app/model/entity/Category.java b/src/main/java/run/halo/app/model/entity/Category.java
@@ -31,7 +31,7 @@ public class Category extends BaseEntity {
     /**
      * Category slug name.
      */
-    @Column(name = "slug_name", columnDefinition = "varchar(50) not null")
+    @Column(name = "slug_name", columnDefinition = "varchar(50) not null", unique = true)
     private String slugName;
 
     /**

diff --git a/src/main/java/run/halo/app/model/entity/Tag.java b/src/main/java/run/halo/app/model/entity/Tag.java
@@ -33,7 +33,7 @@ public class Tag extends BaseEntity {
     /**
      * Tag slug name.
      */
-    @Column(name = "slug_name", columnDefinition = "varchar(255) not null")
+    @Column(name = "slug_name", columnDefinition = "varchar(255) not null", unique = true)
     private String slugName;
 
     @Override