From dc497c3c857c19551f0b942448f7ca6a198bf2d3 Mon Sep 17 00:00:00 2001
From: ruibaby <i@ryanc.cc>
Date: Mon, 25 Nov 2019 21:26:51 +0800
Subject: [PATCH] feat: support set style rule for tencent cos.

---
 .../handler/file/TencentYunFileHandler.java   |  6 +++--
 .../halo/app/listener/StartedListener.java    |  3 ++-
 .../model/properties/AliYunProperties.java    |  4 ++--
 .../properties/TencentYunProperties.java      | 24 +++++++++++++------
 4 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/src/main/java/run/halo/app/handler/file/TencentYunFileHandler.java b/src/main/java/run/halo/app/handler/file/TencentYunFileHandler.java
index ebdb93cf0..99223e678 100644
--- a/src/main/java/run/halo/app/handler/file/TencentYunFileHandler.java
+++ b/src/main/java/run/halo/app/handler/file/TencentYunFileHandler.java
@@ -54,6 +54,8 @@ public class TencentYunFileHandler implements FileHandler {
         String secretKey = optionService.getByPropertyOfNonNull(TencentYunProperties.COS_SECRET_KEY).toString();
         String bucketName = optionService.getByPropertyOfNonNull(TencentYunProperties.COS_BUCKET_NAME).toString();
         String source = StringUtils.join(protocol, bucketName, ".cos." + region + ".myqcloud.com");
+        String styleRule = optionService.getByPropertyOrDefault(TencentYunProperties.COS_STYLE_RULE, String.class, "");
+        String thumbnailStyleRule = optionService.getByPropertyOrDefault(TencentYunProperties.COS_THUMBNAIL_STYLE_RULE, String.class, "");
 
         //get file attribute
         long size = file.getSize();
@@ -90,7 +92,7 @@ public class TencentYunFileHandler implements FileHandler {
             // Response result
             UploadResult uploadResult = new UploadResult();
             uploadResult.setFilename(basename);
-            uploadResult.setFilePath(filePath);
+            uploadResult.setFilePath(StringUtils.isBlank(styleRule) ? filePath : filePath + styleRule);
             uploadResult.setKey(upFilePath);
             uploadResult.setMediaType(MediaType.valueOf(Objects.requireNonNull(file.getContentType())));
             uploadResult.setSuffix(extension);
@@ -101,7 +103,7 @@ public class TencentYunFileHandler implements FileHandler {
                 BufferedImage image = ImageIO.read(file.getInputStream());
                 uploadResult.setWidth(image.getWidth());
                 uploadResult.setHeight(image.getHeight());
-                uploadResult.setThumbPath(filePath);
+                uploadResult.setThumbPath(StringUtils.isBlank(thumbnailStyleRule) ? filePath : filePath + thumbnailStyleRule);
             }
 
             return uploadResult;
diff --git a/src/main/java/run/halo/app/listener/StartedListener.java b/src/main/java/run/halo/app/listener/StartedListener.java
index 7db3b567a..7ee648546 100644
--- a/src/main/java/run/halo/app/listener/StartedListener.java
+++ b/src/main/java/run/halo/app/listener/StartedListener.java
@@ -54,8 +54,9 @@ public class StartedListener implements ApplicationListener<ApplicationStartedEv
         log.info("Halo started at         {}", blogUrl);
         log.info("Halo admin started at   {}{}", blogUrl, haloProperties.getAdminPath());
         if (!haloProperties.isDocDisabled()) {
-            log.debug("Halo doc was enable at  {}/swagger-ui.html", blogUrl);
+            log.debug("Halo api doc was enabled at  {}/swagger-ui.html", blogUrl);
         }
+        log.info("Halo has started successfully!");
     }
 
     /**
diff --git a/src/main/java/run/halo/app/model/properties/AliYunProperties.java b/src/main/java/run/halo/app/model/properties/AliYunProperties.java
index 90b66849b..c5aac098b 100644
--- a/src/main/java/run/halo/app/model/properties/AliYunProperties.java
+++ b/src/main/java/run/halo/app/model/properties/AliYunProperties.java
@@ -40,12 +40,12 @@ public enum AliYunProperties implements PropertyEnum {
     OSS_ACCESS_SECRET("oss_aliyun_access_secret", String.class, ""),
 
     /**
-     * Aliyun oss style rule
+     * Aliyun oss style rule.
      */
     OSS_STYLE_RULE("oss_aliyun_style_rule", String.class, ""),
 
     /**
-     * Aliyun oss thumbnail style rule
+     * Aliyun oss thumbnail style rule.
      */
     OSS_THUMBNAIL_STYLE_RULE("oss_aliyun_thumbnail_style_rule", String.class, "");
 
diff --git a/src/main/java/run/halo/app/model/properties/TencentYunProperties.java b/src/main/java/run/halo/app/model/properties/TencentYunProperties.java
index 275bb470c..84093a412 100644
--- a/src/main/java/run/halo/app/model/properties/TencentYunProperties.java
+++ b/src/main/java/run/halo/app/model/properties/TencentYunProperties.java
@@ -10,34 +10,44 @@ package run.halo.app.model.properties;
 public enum TencentYunProperties implements PropertyEnum {
 
     /**
-     * Tencentyun cos domain protocol.
+     * Tencent yun cos domain protocol.
      */
     COS_PROTOCOL("cos_tencentyun_domain_protocol", String.class, "https://"),
 
     /**
-     * Tencentyun cos domain.
+     * Tencent yun cos domain.
      */
     COS_DOMAIN("cos_tencentyun_domain", String.class, ""),
 
     /**
-     * Tencentyun cos endpoint.
+     * Tencent yun cos endpoint.
      */
     COS_REGION("cos_tencentyun_region", String.class, ""),
 
     /**
-     * Tencentyun cos bucket name.
+     * Tencent yun cos bucket name.
      */
     COS_BUCKET_NAME("cos_tencentyun_bucket_name", String.class, ""),
 
     /**
-     * Tencentyun cos secret id.
+     * Tencent yun cos secret id.
      */
     COS_SECRET_ID("cos_tencentyun_secret_id", String.class, ""),
 
     /**
-     * Tencentyun cos secret key.
+     * Tencent yun cos secret key.
      */
-    COS_SECRET_KEY("cos_tencentyun_secret_key", String.class, "");
+    COS_SECRET_KEY("cos_tencentyun_secret_key", String.class, ""),
+
+    /**
+     * Tencent yun cos style rule.
+     */
+    COS_STYLE_RULE("cos_tencentyun_style_rule", String.class, ""),
+
+    /**
+     * Tencent yun cos thumbnail style rule.
+     */
+    COS_THUMBNAIL_STYLE_RULE("cos_tencentyun_thumbnail_style_rule", String.class, "");
 
     private final String value;