diff --git a/src/main/java/cc/ryanc/halo/Application.java b/src/main/java/cc/ryanc/halo/Application.java index 7c0805a08..ec41569ee 100755 --- a/src/main/java/cc/ryanc/halo/Application.java +++ b/src/main/java/cc/ryanc/halo/Application.java @@ -1,7 +1,7 @@ package cc.ryanc.halo; +import cc.ryanc.halo.logging.Logger; import cc.ryanc.halo.repository.base.BaseRepositoryImpl; -import lombok.extern.slf4j.Slf4j; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.cache.annotation.EnableCaching; @@ -18,16 +18,21 @@ import org.springframework.scheduling.annotation.EnableScheduling; * @author : RYAN0UP * @date : 2017/11/14 */ -@Slf4j @SpringBootApplication @EnableCaching @EnableJpaAuditing @EnableScheduling @EnableJpaRepositories(basePackages = "cc.ryanc.halo.repository", repositoryBaseClass = BaseRepositoryImpl.class) public class Application { + + private final static Logger LOG = Logger.getLogger(Application.class); + public static void main(String[] args) { + // Run application ApplicationContext context = SpringApplication.run(Application.class, args); + // Get server port String serverPort = context.getEnvironment().getProperty("server.port"); - log.info("Halo started at http://localhost:" + serverPort); + + LOG.debug("Halo started at http://localhost:" + serverPort); } } diff --git a/src/main/java/cc/ryanc/halo/listener/StartedListener.java b/src/main/java/cc/ryanc/halo/listener/StartedListener.java index 306b38e4d..81a880028 100644 --- a/src/main/java/cc/ryanc/halo/listener/StartedListener.java +++ b/src/main/java/cc/ryanc/halo/listener/StartedListener.java @@ -1,6 +1,6 @@ package cc.ryanc.halo.listener; -import cc.ryanc.halo.model.dto.Theme; +import cc.ryanc.halo.model.support.Theme; import cc.ryanc.halo.model.enums.BlogPropertiesEnum; import cc.ryanc.halo.service.OptionsService; import cc.ryanc.halo.utils.HaloUtils; @@ -17,7 +17,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import static cc.ryanc.halo.model.dto.HaloConst.*; +import static cc.ryanc.halo.model.support.HaloConst.*; /** *
diff --git a/src/main/java/cc/ryanc/halo/model/dto/Archive.java b/src/main/java/cc/ryanc/halo/model/support/Archive.java
similarity index 93%
rename from src/main/java/cc/ryanc/halo/model/dto/Archive.java
rename to src/main/java/cc/ryanc/halo/model/support/Archive.java
index 037365c6d..76bcbb34d 100644
--- a/src/main/java/cc/ryanc/halo/model/dto/Archive.java
+++ b/src/main/java/cc/ryanc/halo/model/support/Archive.java
@@ -1,4 +1,4 @@
-package cc.ryanc.halo.model.dto;
+package cc.ryanc.halo.model.support;
 
 import cc.ryanc.halo.model.domain.Post;
 import lombok.Data;
diff --git a/src/main/java/cc/ryanc/halo/model/dto/BackupDto.java b/src/main/java/cc/ryanc/halo/model/support/BackupDto.java
similarity index 93%
rename from src/main/java/cc/ryanc/halo/model/dto/BackupDto.java
rename to src/main/java/cc/ryanc/halo/model/support/BackupDto.java
index 9a5331727..3bb52ab5e 100644
--- a/src/main/java/cc/ryanc/halo/model/dto/BackupDto.java
+++ b/src/main/java/cc/ryanc/halo/model/support/BackupDto.java
@@ -1,4 +1,4 @@
-package cc.ryanc.halo.model.dto;
+package cc.ryanc.halo.model.support;
 
 import lombok.Data;
 
diff --git a/src/main/java/cc/ryanc/halo/model/dto/HaloConst.java b/src/main/java/cc/ryanc/halo/model/support/HaloConst.java
similarity index 98%
rename from src/main/java/cc/ryanc/halo/model/dto/HaloConst.java
rename to src/main/java/cc/ryanc/halo/model/support/HaloConst.java
index dea15becd..213e6c2f0 100644
--- a/src/main/java/cc/ryanc/halo/model/dto/HaloConst.java
+++ b/src/main/java/cc/ryanc/halo/model/support/HaloConst.java
@@ -1,4 +1,4 @@
-package cc.ryanc.halo.model.dto;
+package cc.ryanc.halo.model.support;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/src/main/java/cc/ryanc/halo/model/dto/JsonResult.java b/src/main/java/cc/ryanc/halo/model/support/JsonResult.java
similarity index 99%
rename from src/main/java/cc/ryanc/halo/model/dto/JsonResult.java
rename to src/main/java/cc/ryanc/halo/model/support/JsonResult.java
index 6db965806..a8ed1c3e4 100644
--- a/src/main/java/cc/ryanc/halo/model/dto/JsonResult.java
+++ b/src/main/java/cc/ryanc/halo/model/support/JsonResult.java
@@ -1,4 +1,4 @@
-package cc.ryanc.halo.model.dto;
+package cc.ryanc.halo.model.support;
 
 import cc.ryanc.halo.model.enums.ResultCodeEnum;
 import lombok.Data;
diff --git a/src/main/java/cc/ryanc/halo/model/dto/ListPage.java b/src/main/java/cc/ryanc/halo/model/support/ListPage.java
similarity index 98%
rename from src/main/java/cc/ryanc/halo/model/dto/ListPage.java
rename to src/main/java/cc/ryanc/halo/model/support/ListPage.java
index 236819255..82f115118 100644
--- a/src/main/java/cc/ryanc/halo/model/dto/ListPage.java
+++ b/src/main/java/cc/ryanc/halo/model/support/ListPage.java
@@ -1,4 +1,4 @@
-package cc.ryanc.halo.model.dto;
+package cc.ryanc.halo.model.support;
 
 import java.util.Collections;
 import java.util.List;
diff --git a/src/main/java/cc/ryanc/halo/model/dto/LogsRecord.java b/src/main/java/cc/ryanc/halo/model/support/LogsRecord.java
similarity index 94%
rename from src/main/java/cc/ryanc/halo/model/dto/LogsRecord.java
rename to src/main/java/cc/ryanc/halo/model/support/LogsRecord.java
index c2d44fa87..94f36a709 100644
--- a/src/main/java/cc/ryanc/halo/model/dto/LogsRecord.java
+++ b/src/main/java/cc/ryanc/halo/model/support/LogsRecord.java
@@ -1,4 +1,4 @@
-package cc.ryanc.halo.model.dto;
+package cc.ryanc.halo.model.support;
 
 /**
  * 
diff --git a/src/main/java/cc/ryanc/halo/model/dto/QiNiuPutSet.java b/src/main/java/cc/ryanc/halo/model/support/QiNiuPutSet.java
similarity index 90%
rename from src/main/java/cc/ryanc/halo/model/dto/QiNiuPutSet.java
rename to src/main/java/cc/ryanc/halo/model/support/QiNiuPutSet.java
index 219bdebff..ba89b9a79 100644
--- a/src/main/java/cc/ryanc/halo/model/dto/QiNiuPutSet.java
+++ b/src/main/java/cc/ryanc/halo/model/support/QiNiuPutSet.java
@@ -1,4 +1,4 @@
-package cc.ryanc.halo.model.dto;
+package cc.ryanc.halo.model.support;
 
 import lombok.Data;
 
diff --git a/src/main/java/cc/ryanc/halo/model/dto/Theme.java b/src/main/java/cc/ryanc/halo/model/support/Theme.java
similarity index 92%
rename from src/main/java/cc/ryanc/halo/model/dto/Theme.java
rename to src/main/java/cc/ryanc/halo/model/support/Theme.java
index 4cc99cfbe..782be3561 100644
--- a/src/main/java/cc/ryanc/halo/model/dto/Theme.java
+++ b/src/main/java/cc/ryanc/halo/model/support/Theme.java
@@ -1,4 +1,4 @@
-package cc.ryanc.halo.model.dto;
+package cc.ryanc.halo.model.support;
 
 import lombok.Data;
 
diff --git a/src/main/java/cc/ryanc/halo/service/PostService.java b/src/main/java/cc/ryanc/halo/service/PostService.java
index adfc418a2..6dde40dae 100755
--- a/src/main/java/cc/ryanc/halo/service/PostService.java
+++ b/src/main/java/cc/ryanc/halo/service/PostService.java
@@ -3,7 +3,7 @@ package cc.ryanc.halo.service;
 import cc.ryanc.halo.model.domain.Category;
 import cc.ryanc.halo.model.domain.Post;
 import cc.ryanc.halo.model.domain.Tag;
-import cc.ryanc.halo.model.dto.Archive;
+import cc.ryanc.halo.model.support.Archive;
 import cc.ryanc.halo.service.base.CrudService;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
@@ -13,7 +13,6 @@ import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.Date;
 import java.util.List;
-import java.util.Optional;
 
 /**
  * 
diff --git a/src/main/java/cc/ryanc/halo/service/impl/AttachmentServiceImpl.java b/src/main/java/cc/ryanc/halo/service/impl/AttachmentServiceImpl.java
index 9edb134d2..d2f294d5d 100644
--- a/src/main/java/cc/ryanc/halo/service/impl/AttachmentServiceImpl.java
+++ b/src/main/java/cc/ryanc/halo/service/impl/AttachmentServiceImpl.java
@@ -2,7 +2,7 @@ package cc.ryanc.halo.service.impl;
 
 import cc.ryanc.halo.logging.Logger;
 import cc.ryanc.halo.model.domain.Attachment;
-import cc.ryanc.halo.model.dto.QiNiuPutSet;
+import cc.ryanc.halo.model.support.QiNiuPutSet;
 import cc.ryanc.halo.model.enums.AttachLocationEnum;
 import cc.ryanc.halo.model.enums.BlogPropertiesEnum;
 import cc.ryanc.halo.repository.AttachmentRepository;
@@ -43,7 +43,7 @@ import java.io.IOException;
 import java.nio.file.Paths;
 import java.util.*;
 
-import static cc.ryanc.halo.model.dto.HaloConst.OPTIONS;
+import static cc.ryanc.halo.model.support.HaloConst.OPTIONS;
 
 /**
  * 
diff --git a/src/main/java/cc/ryanc/halo/service/impl/MailServiceImpl.java b/src/main/java/cc/ryanc/halo/service/impl/MailServiceImpl.java
index 3bbab106a..c475a8b45 100644
--- a/src/main/java/cc/ryanc/halo/service/impl/MailServiceImpl.java
+++ b/src/main/java/cc/ryanc/halo/service/impl/MailServiceImpl.java
@@ -14,7 +14,7 @@ import org.springframework.web.servlet.view.freemarker.FreeMarkerConfigurer;
 import java.io.File;
 import java.util.Map;
 
-import static cc.ryanc.halo.model.dto.HaloConst.OPTIONS;
+import static cc.ryanc.halo.model.support.HaloConst.OPTIONS;
 
 /**
  * 
diff --git a/src/main/java/cc/ryanc/halo/service/impl/PostServiceImpl.java b/src/main/java/cc/ryanc/halo/service/impl/PostServiceImpl.java
index 7c7eb411c..97f4d013c 100755
--- a/src/main/java/cc/ryanc/halo/service/impl/PostServiceImpl.java
+++ b/src/main/java/cc/ryanc/halo/service/impl/PostServiceImpl.java
@@ -3,7 +3,7 @@ package cc.ryanc.halo.service.impl;
 import cc.ryanc.halo.model.domain.Category;
 import cc.ryanc.halo.model.domain.Post;
 import cc.ryanc.halo.model.domain.Tag;
-import cc.ryanc.halo.model.dto.Archive;
+import cc.ryanc.halo.model.support.Archive;
 import cc.ryanc.halo.model.enums.BlogPropertiesEnum;
 import cc.ryanc.halo.model.enums.PostStatusEnum;
 import cc.ryanc.halo.model.enums.PostTypeEnum;
@@ -29,8 +29,8 @@ import java.util.Date;
 import java.util.List;
 import java.util.Optional;
 
-import static cc.ryanc.halo.model.dto.HaloConst.OPTIONS;
-import static cc.ryanc.halo.model.dto.HaloConst.POSTS_VIEWS;
+import static cc.ryanc.halo.model.support.HaloConst.OPTIONS;
+import static cc.ryanc.halo.model.support.HaloConst.POSTS_VIEWS;
 
 /**
  * 
diff --git a/src/main/java/cc/ryanc/halo/task/PostSyncTask.java b/src/main/java/cc/ryanc/halo/task/PostSyncTask.java
index f6632c689..1b5a12295 100644
--- a/src/main/java/cc/ryanc/halo/task/PostSyncTask.java
+++ b/src/main/java/cc/ryanc/halo/task/PostSyncTask.java
@@ -6,7 +6,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
-import static cc.ryanc.halo.model.dto.HaloConst.POSTS_VIEWS;
+import static cc.ryanc.halo.model.support.HaloConst.POSTS_VIEWS;
 
 /**
  * @author : RYAN0UP
diff --git a/src/main/java/cc/ryanc/halo/utils/HaloUtils.java b/src/main/java/cc/ryanc/halo/utils/HaloUtils.java
index 0b1e6e357..e7d9f8ee8 100755
--- a/src/main/java/cc/ryanc/halo/utils/HaloUtils.java
+++ b/src/main/java/cc/ryanc/halo/utils/HaloUtils.java
@@ -1,7 +1,7 @@
 package cc.ryanc.halo.utils;
 
-import cc.ryanc.halo.model.dto.BackupDto;
-import cc.ryanc.halo.model.dto.Theme;
+import cc.ryanc.halo.model.support.BackupDto;
+import cc.ryanc.halo.model.support.Theme;
 import cc.ryanc.halo.model.enums.BlogPropertiesEnum;
 import cc.ryanc.halo.model.enums.CommonParamsEnum;
 import cn.hutool.core.io.FileUtil;
@@ -25,7 +25,7 @@ import java.nio.file.attribute.BasicFileAttributeView;
 import java.nio.file.attribute.BasicFileAttributes;
 import java.util.*;
 
-import static cc.ryanc.halo.model.dto.HaloConst.OPTIONS;
+import static cc.ryanc.halo.model.support.HaloConst.OPTIONS;
 
 /**
  * 
diff --git a/src/main/java/cc/ryanc/halo/utils/MarkdownUtils.java b/src/main/java/cc/ryanc/halo/utils/MarkdownUtils.java
index d1ee89ddf..ceeb434c7 100644
--- a/src/main/java/cc/ryanc/halo/utils/MarkdownUtils.java
+++ b/src/main/java/cc/ryanc/halo/utils/MarkdownUtils.java
@@ -1,6 +1,6 @@
 package cc.ryanc.halo.utils;
 
-import cc.ryanc.halo.model.dto.HaloConst;
+import cc.ryanc.halo.model.support.HaloConst;
 import org.commonmark.Extension;
 import org.commonmark.ext.front.matter.YamlFrontMatterExtension;
 import org.commonmark.ext.front.matter.YamlFrontMatterVisitor;
diff --git a/src/main/java/cc/ryanc/halo/utils/OwoUtil.java b/src/main/java/cc/ryanc/halo/utils/OwoUtil.java
index 20ec31f88..d1586b0cd 100644
--- a/src/main/java/cc/ryanc/halo/utils/OwoUtil.java
+++ b/src/main/java/cc/ryanc/halo/utils/OwoUtil.java
@@ -2,7 +2,7 @@ package cc.ryanc.halo.utils;
 
 import lombok.extern.slf4j.Slf4j;
 
-import static cc.ryanc.halo.model.dto.HaloConst.OWO;
+import static cc.ryanc.halo.model.support.HaloConst.OWO;
 
 /**
  * 
diff --git a/src/main/java/cc/ryanc/halo/web/controller/admin/AdminController.java b/src/main/java/cc/ryanc/halo/web/controller/admin/AdminController.java
index e632836aa..52f3c710e 100755
--- a/src/main/java/cc/ryanc/halo/web/controller/admin/AdminController.java
+++ b/src/main/java/cc/ryanc/halo/web/controller/admin/AdminController.java
@@ -2,8 +2,8 @@ package cc.ryanc.halo.web.controller.admin;
 
 import cc.ryanc.halo.logging.Logger;
 import cc.ryanc.halo.model.domain.*;
-import cc.ryanc.halo.model.dto.JsonResult;
-import cc.ryanc.halo.model.dto.LogsRecord;
+import cc.ryanc.halo.model.support.JsonResult;
+import cc.ryanc.halo.model.support.LogsRecord;
 import cc.ryanc.halo.model.enums.*;
 import cc.ryanc.halo.service.*;
 import cc.ryanc.halo.utils.LocaleMessageUtil;
@@ -34,8 +34,8 @@ import javax.servlet.http.HttpSession;
 import java.io.IOException;
 import java.util.*;
 
-import static cc.ryanc.halo.model.dto.HaloConst.OPTIONS;
-import static cc.ryanc.halo.model.dto.HaloConst.USER_SESSION_KEY;
+import static cc.ryanc.halo.model.support.HaloConst.OPTIONS;
+import static cc.ryanc.halo.model.support.HaloConst.USER_SESSION_KEY;
 
 /**
  * 
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 a76fca61d..af6d295bc 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
@@ -1,8 +1,8 @@
 package cc.ryanc.halo.web.controller.admin;
 
 import cc.ryanc.halo.model.domain.Attachment;
-import cc.ryanc.halo.model.dto.JsonResult;
-import cc.ryanc.halo.model.dto.LogsRecord;
+import cc.ryanc.halo.model.support.JsonResult;
+import cc.ryanc.halo.model.support.LogsRecord;
 import cc.ryanc.halo.model.enums.PostTypeEnum;
 import cc.ryanc.halo.model.enums.ResultCodeEnum;
 import cc.ryanc.halo.service.AttachmentService;
diff --git a/src/main/java/cc/ryanc/halo/web/controller/admin/BackupController.java b/src/main/java/cc/ryanc/halo/web/controller/admin/BackupController.java
index 6a1babeb7..91352d512 100644
--- a/src/main/java/cc/ryanc/halo/web/controller/admin/BackupController.java
+++ b/src/main/java/cc/ryanc/halo/web/controller/admin/BackupController.java
@@ -4,8 +4,8 @@ import cc.ryanc.halo.model.domain.Category;
 import cc.ryanc.halo.model.domain.Post;
 import cc.ryanc.halo.model.domain.Tag;
 import cc.ryanc.halo.model.domain.User;
-import cc.ryanc.halo.model.dto.BackupDto;
-import cc.ryanc.halo.model.dto.JsonResult;
+import cc.ryanc.halo.model.support.BackupDto;
+import cc.ryanc.halo.model.support.JsonResult;
 import cc.ryanc.halo.model.enums.*;
 import cc.ryanc.halo.service.MailService;
 import cc.ryanc.halo.service.PostService;
@@ -33,8 +33,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import static cc.ryanc.halo.model.dto.HaloConst.OPTIONS;
-import static cc.ryanc.halo.model.dto.HaloConst.USER_SESSION_KEY;
+import static cc.ryanc.halo.model.support.HaloConst.OPTIONS;
+import static cc.ryanc.halo.model.support.HaloConst.USER_SESSION_KEY;
 
 /**
  * 
diff --git a/src/main/java/cc/ryanc/halo/web/controller/admin/CategoryController.java b/src/main/java/cc/ryanc/halo/web/controller/admin/CategoryController.java
index 9e4a157eb..6d823a1f7 100755
--- a/src/main/java/cc/ryanc/halo/web/controller/admin/CategoryController.java
+++ b/src/main/java/cc/ryanc/halo/web/controller/admin/CategoryController.java
@@ -1,7 +1,7 @@
 package cc.ryanc.halo.web.controller.admin;
 
 import cc.ryanc.halo.model.domain.Category;
-import cc.ryanc.halo.model.dto.JsonResult;
+import cc.ryanc.halo.model.support.JsonResult;
 import cc.ryanc.halo.service.CategoryService;
 import cc.ryanc.halo.utils.LocaleMessageUtil;
 import lombok.extern.slf4j.Slf4j;
diff --git a/src/main/java/cc/ryanc/halo/web/controller/admin/CommentController.java b/src/main/java/cc/ryanc/halo/web/controller/admin/CommentController.java
index a81b65b41..4d4c24e3b 100755
--- a/src/main/java/cc/ryanc/halo/web/controller/admin/CommentController.java
+++ b/src/main/java/cc/ryanc/halo/web/controller/admin/CommentController.java
@@ -3,7 +3,7 @@ package cc.ryanc.halo.web.controller.admin;
 import cc.ryanc.halo.model.domain.Comment;
 import cc.ryanc.halo.model.domain.Post;
 import cc.ryanc.halo.model.domain.User;
-import cc.ryanc.halo.model.dto.JsonResult;
+import cc.ryanc.halo.model.support.JsonResult;
 import cc.ryanc.halo.model.enums.*;
 import cc.ryanc.halo.service.CommentService;
 import cc.ryanc.halo.service.MailService;
@@ -31,8 +31,8 @@ import javax.servlet.http.HttpSession;
 import java.util.HashMap;
 import java.util.Map;
 
-import static cc.ryanc.halo.model.dto.HaloConst.OPTIONS;
-import static cc.ryanc.halo.model.dto.HaloConst.USER_SESSION_KEY;
+import static cc.ryanc.halo.model.support.HaloConst.OPTIONS;
+import static cc.ryanc.halo.model.support.HaloConst.USER_SESSION_KEY;
 
 /**
  * 
diff --git a/src/main/java/cc/ryanc/halo/web/controller/admin/MenuController.java b/src/main/java/cc/ryanc/halo/web/controller/admin/MenuController.java
index 55ccc9fd8..911d3f9d5 100644
--- a/src/main/java/cc/ryanc/halo/web/controller/admin/MenuController.java
+++ b/src/main/java/cc/ryanc/halo/web/controller/admin/MenuController.java
@@ -1,7 +1,7 @@
 package cc.ryanc.halo.web.controller.admin;
 
 import cc.ryanc.halo.model.domain.Menu;
-import cc.ryanc.halo.model.dto.JsonResult;
+import cc.ryanc.halo.model.support.JsonResult;
 import cc.ryanc.halo.service.MenuService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/main/java/cc/ryanc/halo/web/controller/admin/OptionController.java b/src/main/java/cc/ryanc/halo/web/controller/admin/OptionController.java
index b0f54c293..176ec7e16 100755
--- a/src/main/java/cc/ryanc/halo/web/controller/admin/OptionController.java
+++ b/src/main/java/cc/ryanc/halo/web/controller/admin/OptionController.java
@@ -1,6 +1,6 @@
 package cc.ryanc.halo.web.controller.admin;
 
-import cc.ryanc.halo.model.dto.JsonResult;
+import cc.ryanc.halo.model.support.JsonResult;
 import cc.ryanc.halo.service.OptionsService;
 import cc.ryanc.halo.utils.LocaleMessageUtil;
 import freemarker.template.Configuration;
@@ -13,7 +13,7 @@ import org.springframework.web.servlet.i18n.SessionLocaleResolver;
 import javax.servlet.http.HttpSession;
 import java.util.Map;
 
-import static cc.ryanc.halo.model.dto.HaloConst.OPTIONS;
+import static cc.ryanc.halo.model.support.HaloConst.OPTIONS;
 
 /**
  * 
diff --git a/src/main/java/cc/ryanc/halo/web/controller/admin/PageController.java b/src/main/java/cc/ryanc/halo/web/controller/admin/PageController.java
index 0b8615dd4..82c3c5a02 100755
--- a/src/main/java/cc/ryanc/halo/web/controller/admin/PageController.java
+++ b/src/main/java/cc/ryanc/halo/web/controller/admin/PageController.java
@@ -4,8 +4,8 @@ import cc.ryanc.halo.model.domain.Gallery;
 import cc.ryanc.halo.model.domain.Link;
 import cc.ryanc.halo.model.domain.Post;
 import cc.ryanc.halo.model.domain.User;
-import cc.ryanc.halo.model.dto.JsonResult;
-import cc.ryanc.halo.model.dto.LogsRecord;
+import cc.ryanc.halo.model.support.JsonResult;
+import cc.ryanc.halo.model.support.LogsRecord;
 import cc.ryanc.halo.model.enums.BlogPropertiesEnum;
 import cc.ryanc.halo.model.enums.PostTypeEnum;
 import cc.ryanc.halo.model.enums.ResultCodeEnum;
@@ -41,8 +41,8 @@ import java.util.Date;
 import java.util.List;
 import java.util.Optional;
 
-import static cc.ryanc.halo.model.dto.HaloConst.OPTIONS;
-import static cc.ryanc.halo.model.dto.HaloConst.USER_SESSION_KEY;
+import static cc.ryanc.halo.model.support.HaloConst.OPTIONS;
+import static cc.ryanc.halo.model.support.HaloConst.USER_SESSION_KEY;
 
 /**
  * 
diff --git a/src/main/java/cc/ryanc/halo/web/controller/admin/PostController.java b/src/main/java/cc/ryanc/halo/web/controller/admin/PostController.java
index 5e7a031ed..328a6d298 100755
--- a/src/main/java/cc/ryanc/halo/web/controller/admin/PostController.java
+++ b/src/main/java/cc/ryanc/halo/web/controller/admin/PostController.java
@@ -2,8 +2,8 @@ package cc.ryanc.halo.web.controller.admin;
 
 import cc.ryanc.halo.model.domain.Post;
 import cc.ryanc.halo.model.domain.User;
-import cc.ryanc.halo.model.dto.JsonResult;
-import cc.ryanc.halo.model.dto.LogsRecord;
+import cc.ryanc.halo.model.support.JsonResult;
+import cc.ryanc.halo.model.support.LogsRecord;
 import cc.ryanc.halo.model.enums.BlogPropertiesEnum;
 import cc.ryanc.halo.model.enums.PostStatusEnum;
 import cc.ryanc.halo.model.enums.PostTypeEnum;
@@ -35,8 +35,8 @@ import java.util.Date;
 import java.util.List;
 import java.util.Optional;
 
-import static cc.ryanc.halo.model.dto.HaloConst.OPTIONS;
-import static cc.ryanc.halo.model.dto.HaloConst.USER_SESSION_KEY;
+import static cc.ryanc.halo.model.support.HaloConst.OPTIONS;
+import static cc.ryanc.halo.model.support.HaloConst.USER_SESSION_KEY;
 import static org.springframework.data.domain.Sort.Direction.DESC;
 
 /**
diff --git a/src/main/java/cc/ryanc/halo/web/controller/admin/TagController.java b/src/main/java/cc/ryanc/halo/web/controller/admin/TagController.java
index 91b8db9bd..8aff0e70f 100755
--- a/src/main/java/cc/ryanc/halo/web/controller/admin/TagController.java
+++ b/src/main/java/cc/ryanc/halo/web/controller/admin/TagController.java
@@ -1,7 +1,7 @@
 package cc.ryanc.halo.web.controller.admin;
 
 import cc.ryanc.halo.model.domain.Tag;
-import cc.ryanc.halo.model.dto.JsonResult;
+import cc.ryanc.halo.model.support.JsonResult;
 import cc.ryanc.halo.service.TagService;
 import cc.ryanc.halo.utils.LocaleMessageUtil;
 import lombok.extern.slf4j.Slf4j;
diff --git a/src/main/java/cc/ryanc/halo/web/controller/admin/ThemeController.java b/src/main/java/cc/ryanc/halo/web/controller/admin/ThemeController.java
index fed98218d..15736e6b1 100755
--- a/src/main/java/cc/ryanc/halo/web/controller/admin/ThemeController.java
+++ b/src/main/java/cc/ryanc/halo/web/controller/admin/ThemeController.java
@@ -1,7 +1,7 @@
 package cc.ryanc.halo.web.controller.admin;
 
-import cc.ryanc.halo.model.dto.JsonResult;
-import cc.ryanc.halo.model.dto.LogsRecord;
+import cc.ryanc.halo.model.support.JsonResult;
+import cc.ryanc.halo.model.support.LogsRecord;
 import cc.ryanc.halo.model.enums.BlogPropertiesEnum;
 import cc.ryanc.halo.model.enums.TrueFalseEnum;
 import cc.ryanc.halo.service.LogsService;
@@ -31,8 +31,8 @@ import java.io.File;
 import java.io.FileNotFoundException;
 import java.util.List;
 
-import static cc.ryanc.halo.model.dto.HaloConst.OPTIONS;
-import static cc.ryanc.halo.model.dto.HaloConst.THEMES;
+import static cc.ryanc.halo.model.support.HaloConst.OPTIONS;
+import static cc.ryanc.halo.model.support.HaloConst.THEMES;
 
 /**
  * 
diff --git a/src/main/java/cc/ryanc/halo/web/controller/admin/UserController.java b/src/main/java/cc/ryanc/halo/web/controller/admin/UserController.java
index 4c20849ea..2bdd8a0a6 100644
--- a/src/main/java/cc/ryanc/halo/web/controller/admin/UserController.java
+++ b/src/main/java/cc/ryanc/halo/web/controller/admin/UserController.java
@@ -1,7 +1,7 @@
 package cc.ryanc.halo.web.controller.admin;
 
 import cc.ryanc.halo.model.domain.User;
-import cc.ryanc.halo.model.dto.JsonResult;
+import cc.ryanc.halo.model.support.JsonResult;
 import cc.ryanc.halo.service.UserService;
 import cc.ryanc.halo.utils.LocaleMessageUtil;
 import cn.hutool.crypto.SecureUtil;
@@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpSession;
 import javax.validation.Valid;
 
-import static cc.ryanc.halo.model.dto.HaloConst.USER_SESSION_KEY;
+import static cc.ryanc.halo.model.support.HaloConst.USER_SESSION_KEY;
 
 /**
  * 
diff --git a/src/main/java/cc/ryanc/halo/web/controller/api/ApiArchivesController.java b/src/main/java/cc/ryanc/halo/web/controller/api/ApiArchivesController.java
index a9e236275..cc56f56ef 100644
--- a/src/main/java/cc/ryanc/halo/web/controller/api/ApiArchivesController.java
+++ b/src/main/java/cc/ryanc/halo/web/controller/api/ApiArchivesController.java
@@ -1,6 +1,6 @@
 package cc.ryanc.halo.web.controller.api;
 
-import cc.ryanc.halo.model.dto.Archive;
+import cc.ryanc.halo.model.support.Archive;
 import cc.ryanc.halo.service.PostService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
diff --git a/src/main/java/cc/ryanc/halo/web/controller/api/ApiCommentController.java b/src/main/java/cc/ryanc/halo/web/controller/api/ApiCommentController.java
index ad16086e6..0ebbabb87 100644
--- a/src/main/java/cc/ryanc/halo/web/controller/api/ApiCommentController.java
+++ b/src/main/java/cc/ryanc/halo/web/controller/api/ApiCommentController.java
@@ -2,7 +2,7 @@ package cc.ryanc.halo.web.controller.api;
 
 import cc.ryanc.halo.model.domain.Comment;
 import cc.ryanc.halo.model.domain.Post;
-import cc.ryanc.halo.model.dto.JsonResult;
+import cc.ryanc.halo.model.support.JsonResult;
 import cc.ryanc.halo.model.enums.BlogPropertiesEnum;
 import cc.ryanc.halo.model.enums.TrueFalseEnum;
 import cc.ryanc.halo.service.CommentService;
@@ -23,7 +23,7 @@ import org.springframework.web.bind.annotation.RestController;
 import javax.servlet.http.HttpServletRequest;
 import javax.validation.Valid;
 
-import static cc.ryanc.halo.model.dto.HaloConst.OPTIONS;
+import static cc.ryanc.halo.model.support.HaloConst.OPTIONS;
 
 /**
  * 
diff --git a/src/main/java/cc/ryanc/halo/web/controller/api/ApiOptionController.java b/src/main/java/cc/ryanc/halo/web/controller/api/ApiOptionController.java
index 0dff4cee6..084e3de3d 100644
--- a/src/main/java/cc/ryanc/halo/web/controller/api/ApiOptionController.java
+++ b/src/main/java/cc/ryanc/halo/web/controller/api/ApiOptionController.java
@@ -1,6 +1,6 @@
 package cc.ryanc.halo.web.controller.api;
 
-import cc.ryanc.halo.model.dto.JsonResult;
+import cc.ryanc.halo.model.support.JsonResult;
 import cc.ryanc.halo.service.OptionsService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
diff --git a/src/main/java/cc/ryanc/halo/web/controller/api/ApiPostController.java b/src/main/java/cc/ryanc/halo/web/controller/api/ApiPostController.java
index 9330cc988..4df165118 100644
--- a/src/main/java/cc/ryanc/halo/web/controller/api/ApiPostController.java
+++ b/src/main/java/cc/ryanc/halo/web/controller/api/ApiPostController.java
@@ -2,7 +2,7 @@ package cc.ryanc.halo.web.controller.api;
 
 import cc.ryanc.halo.exception.NotFoundException;
 import cc.ryanc.halo.model.domain.Post;
-import cc.ryanc.halo.model.dto.JsonResult;
+import cc.ryanc.halo.model.support.JsonResult;
 import cc.ryanc.halo.model.enums.PostStatusEnum;
 import cc.ryanc.halo.model.enums.PostTypeEnum;
 import cc.ryanc.halo.service.CategoryService;
diff --git a/src/main/java/cc/ryanc/halo/web/controller/base/CommonResultControllerAdvice.java b/src/main/java/cc/ryanc/halo/web/controller/base/CommonResultControllerAdvice.java
index 4217a8c59..7762f10b5 100644
--- a/src/main/java/cc/ryanc/halo/web/controller/base/CommonResultControllerAdvice.java
+++ b/src/main/java/cc/ryanc/halo/web/controller/base/CommonResultControllerAdvice.java
@@ -1,6 +1,6 @@
 package cc.ryanc.halo.web.controller.base;
 
-import cc.ryanc.halo.model.dto.JsonResult;
+import cc.ryanc.halo.model.support.JsonResult;
 import org.springframework.core.MethodParameter;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
diff --git a/src/main/java/cc/ryanc/halo/web/controller/base/ControllerExceptionHandler.java b/src/main/java/cc/ryanc/halo/web/controller/base/ControllerExceptionHandler.java
index 840fd4c40..7ba4eecad 100644
--- a/src/main/java/cc/ryanc/halo/web/controller/base/ControllerExceptionHandler.java
+++ b/src/main/java/cc/ryanc/halo/web/controller/base/ControllerExceptionHandler.java
@@ -2,7 +2,7 @@ package cc.ryanc.halo.web.controller.base;
 
 import cc.ryanc.halo.exception.HaloException;
 import cc.ryanc.halo.logging.Logger;
-import cc.ryanc.halo.model.dto.JsonResult;
+import cc.ryanc.halo.model.support.JsonResult;
 import cc.ryanc.halo.utils.ExceptionUtils;
 import cc.ryanc.halo.utils.ValidationUtils;
 import org.springframework.dao.DataIntegrityViolationException;
diff --git a/src/main/java/cc/ryanc/halo/web/controller/core/InstallController.java b/src/main/java/cc/ryanc/halo/web/controller/core/InstallController.java
index f73f31de2..44be65ed6 100644
--- a/src/main/java/cc/ryanc/halo/web/controller/core/InstallController.java
+++ b/src/main/java/cc/ryanc/halo/web/controller/core/InstallController.java
@@ -1,8 +1,8 @@
 package cc.ryanc.halo.web.controller.core;
 
 import cc.ryanc.halo.model.domain.*;
-import cc.ryanc.halo.model.dto.JsonResult;
-import cc.ryanc.halo.model.dto.LogsRecord;
+import cc.ryanc.halo.model.support.JsonResult;
+import cc.ryanc.halo.model.support.LogsRecord;
 import cc.ryanc.halo.model.enums.AllowCommentEnum;
 import cc.ryanc.halo.model.enums.AttachLocationEnum;
 import cc.ryanc.halo.model.enums.BlogPropertiesEnum;
@@ -26,7 +26,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import static cc.ryanc.halo.model.dto.HaloConst.OPTIONS;
+import static cc.ryanc.halo.model.support.HaloConst.OPTIONS;
 
 /**
  * 
diff --git a/src/main/java/cc/ryanc/halo/web/controller/front/FrontArchiveController.java b/src/main/java/cc/ryanc/halo/web/controller/front/FrontArchiveController.java
index d1e9f2a6c..a744f034b 100644
--- a/src/main/java/cc/ryanc/halo/web/controller/front/FrontArchiveController.java
+++ b/src/main/java/cc/ryanc/halo/web/controller/front/FrontArchiveController.java
@@ -3,7 +3,7 @@ package cc.ryanc.halo.web.controller.front;
 import cc.ryanc.halo.model.domain.Comment;
 import cc.ryanc.halo.model.domain.Post;
 import cc.ryanc.halo.model.domain.Tag;
-import cc.ryanc.halo.model.dto.ListPage;
+import cc.ryanc.halo.model.support.ListPage;
 import cc.ryanc.halo.model.enums.*;
 import cc.ryanc.halo.service.CommentService;
 import cc.ryanc.halo.service.PostService;
@@ -32,7 +32,7 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
-import static cc.ryanc.halo.model.dto.HaloConst.OPTIONS;
+import static cc.ryanc.halo.model.support.HaloConst.OPTIONS;
 import static org.springframework.data.domain.Sort.Direction.DESC;
 
 /**
diff --git a/src/main/java/cc/ryanc/halo/web/controller/front/FrontCategoryController.java b/src/main/java/cc/ryanc/halo/web/controller/front/FrontCategoryController.java
index fcbd0fa76..0600d1a33 100644
--- a/src/main/java/cc/ryanc/halo/web/controller/front/FrontCategoryController.java
+++ b/src/main/java/cc/ryanc/halo/web/controller/front/FrontCategoryController.java
@@ -22,7 +22,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 
 import java.util.List;
 
-import static cc.ryanc.halo.model.dto.HaloConst.OPTIONS;
+import static cc.ryanc.halo.model.support.HaloConst.OPTIONS;
 import static org.springframework.data.domain.Sort.Direction.DESC;
 
 /**
diff --git a/src/main/java/cc/ryanc/halo/web/controller/front/FrontCommentController.java b/src/main/java/cc/ryanc/halo/web/controller/front/FrontCommentController.java
index c454ae3c1..8803acb9d 100644
--- a/src/main/java/cc/ryanc/halo/web/controller/front/FrontCommentController.java
+++ b/src/main/java/cc/ryanc/halo/web/controller/front/FrontCommentController.java
@@ -3,7 +3,7 @@ package cc.ryanc.halo.web.controller.front;
 import cc.ryanc.halo.logging.Logger;
 import cc.ryanc.halo.model.domain.Comment;
 import cc.ryanc.halo.model.domain.Post;
-import cc.ryanc.halo.model.dto.JsonResult;
+import cc.ryanc.halo.model.support.JsonResult;
 import cc.ryanc.halo.model.enums.BlogPropertiesEnum;
 import cc.ryanc.halo.model.enums.PostTypeEnum;
 import cc.ryanc.halo.model.enums.TrueFalseEnum;
@@ -32,7 +32,7 @@ import javax.validation.Valid;
 import java.util.HashMap;
 import java.util.Map;
 
-import static cc.ryanc.halo.model.dto.HaloConst.OPTIONS;
+import static cc.ryanc.halo.model.support.HaloConst.OPTIONS;
 
 /**
  * 
diff --git a/src/main/java/cc/ryanc/halo/web/controller/front/FrontIndexController.java b/src/main/java/cc/ryanc/halo/web/controller/front/FrontIndexController.java
index 42a1ccfc0..071dab368 100644
--- a/src/main/java/cc/ryanc/halo/web/controller/front/FrontIndexController.java
+++ b/src/main/java/cc/ryanc/halo/web/controller/front/FrontIndexController.java
@@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 
-import static cc.ryanc.halo.model.dto.HaloConst.OPTIONS;
+import static cc.ryanc.halo.model.support.HaloConst.OPTIONS;
 import static org.springframework.data.domain.Sort.Direction.DESC;
 
 /**
diff --git a/src/main/java/cc/ryanc/halo/web/controller/front/FrontOthersController.java b/src/main/java/cc/ryanc/halo/web/controller/front/FrontOthersController.java
index 6d40924c6..4e292e929 100644
--- a/src/main/java/cc/ryanc/halo/web/controller/front/FrontOthersController.java
+++ b/src/main/java/cc/ryanc/halo/web/controller/front/FrontOthersController.java
@@ -22,7 +22,7 @@ import org.springframework.web.servlet.view.freemarker.FreeMarkerConfigurer;
 import java.io.IOException;
 import java.util.List;
 
-import static cc.ryanc.halo.model.dto.HaloConst.OPTIONS;
+import static cc.ryanc.halo.model.support.HaloConst.OPTIONS;
 
 /**
  * 
diff --git a/src/main/java/cc/ryanc/halo/web/controller/front/FrontPageController.java b/src/main/java/cc/ryanc/halo/web/controller/front/FrontPageController.java
index 865eb0df9..a7ea46528 100644
--- a/src/main/java/cc/ryanc/halo/web/controller/front/FrontPageController.java
+++ b/src/main/java/cc/ryanc/halo/web/controller/front/FrontPageController.java
@@ -3,7 +3,7 @@ package cc.ryanc.halo.web.controller.front;
 import cc.ryanc.halo.model.domain.Comment;
 import cc.ryanc.halo.model.domain.Gallery;
 import cc.ryanc.halo.model.domain.Post;
-import cc.ryanc.halo.model.dto.ListPage;
+import cc.ryanc.halo.model.support.ListPage;
 import cc.ryanc.halo.model.enums.*;
 import cc.ryanc.halo.service.CommentService;
 import cc.ryanc.halo.service.GalleryService;
@@ -21,7 +21,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.List;
 
-import static cc.ryanc.halo.model.dto.HaloConst.OPTIONS;
+import static cc.ryanc.halo.model.support.HaloConst.OPTIONS;
 
 /**
  * 
diff --git a/src/main/java/cc/ryanc/halo/web/controller/front/FrontSearchController.java b/src/main/java/cc/ryanc/halo/web/controller/front/FrontSearchController.java
index ce22c6677..5df89a9b5 100644
--- a/src/main/java/cc/ryanc/halo/web/controller/front/FrontSearchController.java
+++ b/src/main/java/cc/ryanc/halo/web/controller/front/FrontSearchController.java
@@ -23,7 +23,7 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 
-import static cc.ryanc.halo.model.dto.HaloConst.OPTIONS;
+import static cc.ryanc.halo.model.support.HaloConst.OPTIONS;
 import static org.springframework.data.domain.Sort.Direction.DESC;
 
 /**
diff --git a/src/main/java/cc/ryanc/halo/web/controller/front/FrontTagController.java b/src/main/java/cc/ryanc/halo/web/controller/front/FrontTagController.java
index 1ecfc2104..8fee4c85b 100644
--- a/src/main/java/cc/ryanc/halo/web/controller/front/FrontTagController.java
+++ b/src/main/java/cc/ryanc/halo/web/controller/front/FrontTagController.java
@@ -20,7 +20,7 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 
-import static cc.ryanc.halo.model.dto.HaloConst.OPTIONS;
+import static cc.ryanc.halo.model.support.HaloConst.OPTIONS;
 import static org.springframework.data.domain.Sort.Direction.DESC;
 
 /**
diff --git a/src/main/java/cc/ryanc/halo/web/interceptor/ApiInterceptor.java b/src/main/java/cc/ryanc/halo/web/interceptor/ApiInterceptor.java
index dcd317b53..6d50f995b 100644
--- a/src/main/java/cc/ryanc/halo/web/interceptor/ApiInterceptor.java
+++ b/src/main/java/cc/ryanc/halo/web/interceptor/ApiInterceptor.java
@@ -1,6 +1,6 @@
 package cc.ryanc.halo.web.interceptor;
 
-import cc.ryanc.halo.model.dto.JsonResult;
+import cc.ryanc.halo.model.support.JsonResult;
 import cc.ryanc.halo.model.enums.BlogPropertiesEnum;
 import cc.ryanc.halo.model.enums.TrueFalseEnum;
 import cn.hutool.core.util.StrUtil;
@@ -15,7 +15,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.nio.charset.StandardCharsets;
 
-import static cc.ryanc.halo.model.dto.HaloConst.OPTIONS;
+import static cc.ryanc.halo.model.support.HaloConst.OPTIONS;
 
 /**
  * 
diff --git a/src/main/java/cc/ryanc/halo/web/interceptor/InstallInterceptor.java b/src/main/java/cc/ryanc/halo/web/interceptor/InstallInterceptor.java
index c418a9217..ad9a243c8 100644
--- a/src/main/java/cc/ryanc/halo/web/interceptor/InstallInterceptor.java
+++ b/src/main/java/cc/ryanc/halo/web/interceptor/InstallInterceptor.java
@@ -10,7 +10,7 @@ import org.springframework.web.servlet.ModelAndView;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import static cc.ryanc.halo.model.dto.HaloConst.OPTIONS;
+import static cc.ryanc.halo.model.support.HaloConst.OPTIONS;
 
 /**
  * 
diff --git a/src/main/java/cc/ryanc/halo/web/interceptor/LocaleInterceptor.java b/src/main/java/cc/ryanc/halo/web/interceptor/LocaleInterceptor.java
index 736262570..723fafe46 100644
--- a/src/main/java/cc/ryanc/halo/web/interceptor/LocaleInterceptor.java
+++ b/src/main/java/cc/ryanc/halo/web/interceptor/LocaleInterceptor.java
@@ -12,7 +12,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.Locale;
 
-import static cc.ryanc.halo.model.dto.HaloConst.OPTIONS;
+import static cc.ryanc.halo.model.support.HaloConst.OPTIONS;
 
 /**
  * @author : wangry
diff --git a/src/main/java/cc/ryanc/halo/web/interceptor/LoginInterceptor.java b/src/main/java/cc/ryanc/halo/web/interceptor/LoginInterceptor.java
index c1d17595d..6f2548ecf 100755
--- a/src/main/java/cc/ryanc/halo/web/interceptor/LoginInterceptor.java
+++ b/src/main/java/cc/ryanc/halo/web/interceptor/LoginInterceptor.java
@@ -7,7 +7,7 @@ import org.springframework.web.servlet.ModelAndView;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import static cc.ryanc.halo.model.dto.HaloConst.USER_SESSION_KEY;
+import static cc.ryanc.halo.model.support.HaloConst.USER_SESSION_KEY;
 
 /**
  *