From de7b44cbbc263f8d340121002a14eccee5a751ef Mon Sep 17 00:00:00 2001
From: ruibaby <i@ryanc.cc>
Date: Thu, 11 Apr 2019 21:35:21 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E9=99=A4=20hutool-setting?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build.gradle                                      |  1 -
 .../halo/app/service/impl/ThemeServiceImpl.java   | 15 ++++-----------
 .../templates/themes/material/theme.properties    |  2 +-
 3 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/build.gradle b/build.gradle
index b507ea891..64fcc1625 100644
--- a/build.gradle
+++ b/build.gradle
@@ -38,7 +38,6 @@ dependencies {
     implementation 'cn.hutool:hutool-core:4.5.0'
     implementation 'cn.hutool:hutool-crypto:4.5.0'
     implementation 'cn.hutool:hutool-extra:4.5.0'
-    implementation 'cn.hutool:hutool-setting:4.5.0'
     implementation 'com.upyun:java-sdk:4.0.1'
     implementation 'com.qiniu:qiniu-java-sdk:7.2.18'
     implementation 'com.aliyun.oss:aliyun-sdk-oss:3.4.2'
diff --git a/src/main/java/run/halo/app/service/impl/ThemeServiceImpl.java b/src/main/java/run/halo/app/service/impl/ThemeServiceImpl.java
index f6ee47469..5e9c7d780 100644
--- a/src/main/java/run/halo/app/service/impl/ThemeServiceImpl.java
+++ b/src/main/java/run/halo/app/service/impl/ThemeServiceImpl.java
@@ -4,8 +4,6 @@ import cn.hutool.core.io.file.FileReader;
 import cn.hutool.core.io.file.FileWriter;
 import cn.hutool.core.text.StrBuilder;
 import cn.hutool.core.util.StrUtil;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
 import freemarker.template.Configuration;
 import freemarker.template.TemplateModelException;
 import lombok.extern.slf4j.Slf4j;
@@ -56,20 +54,15 @@ public class ThemeServiceImpl implements ThemeService {
      * Theme work directory.
      */
     private final Path workDir;
-
+    private final OptionService optionService;
+    private final StringCacheStore cacheStore;
+    private final Configuration configuration;
+    private final ThemeConfigResolvers resolvers;
     /**
      * Activated theme id.
      */
     private String activatedThemeId;
 
-    private final OptionService optionService;
-
-    private final StringCacheStore cacheStore;
-
-    private final Configuration configuration;
-
-    private final ThemeConfigResolvers resolvers;
-
     public ThemeServiceImpl(HaloProperties haloProperties,
                             OptionService optionService,
                             StringCacheStore cacheStore,
diff --git a/src/main/resources/templates/themes/material/theme.properties b/src/main/resources/templates/themes/material/theme.properties
index b5c79de6f..d331f67f4 100644
--- a/src/main/resources/templates/themes/material/theme.properties
+++ b/src/main/resources/templates/themes/material/theme.properties
@@ -1,7 +1,7 @@
 theme.id=viosey_material
 theme.name=Material
 theme.website=https://github.com/viosey/hexo-theme-material
-theme.description=Nature, Pure | ԭ�ʣ�����
+theme.description=Nature, Pure | 原质，纯粹
 theme.logo=https://avatars0.githubusercontent.com/u/8141232?s=460&v=4
 theme.version=1.0
 theme.author=Viosey