github
/
halo
mirror of https://github.com/halo-dev/halo
1
0
Fork 0
Code Issues Releases Wiki Activity

Move old dtos into new package

pull/137/head
johnniang 2019-03-04 14:14:03 +08:00
parent ab990e5e9a
commit 6e0d4e5d8b
49 changed files with 89 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/cc/ryanc/halo/Application.java
View File

@ -1,7 +1,7 @@
package cc.ryanc.halo; package cc.ryanc.halo;
import cc.ryanc.halo.logging.Logger;
import cc.ryanc.halo.repository.base.BaseRepositoryImpl; import cc.ryanc.halo.repository.base.BaseRepositoryImpl;
import lombok.extern.slf4j.Slf4j;
import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.cache.annotation.EnableCaching; import org.springframework.cache.annotation.EnableCaching;
@ -18,16 +18,21 @@ import org.springframework.scheduling.annotation.EnableScheduling;
* @author : RYAN0UP * @author : RYAN0UP
* @date : 2017/11/14 * @date : 2017/11/14
*/ */
@Slf4j
@SpringBootApplication @SpringBootApplication
@EnableCaching @EnableCaching
@EnableJpaAuditing @EnableJpaAuditing
@EnableScheduling @EnableScheduling
@EnableJpaRepositories(basePackages = "cc.ryanc.halo.repository", repositoryBaseClass = BaseRepositoryImpl.class) @EnableJpaRepositories(basePackages = "cc.ryanc.halo.repository", repositoryBaseClass = BaseRepositoryImpl.class)
public class Application { public class Application {
private final static Logger LOG = Logger.getLogger(Application.class);
public static void main(String[] args) { public static void main(String[] args) {
// Run application
ApplicationContext context = SpringApplication.run(Application.class, args); ApplicationContext context = SpringApplication.run(Application.class, args);
// Get server port
String serverPort = context.getEnvironment().getProperty("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);
} }
} }

4
src/main/java/cc/ryanc/halo/listener/StartedListener.java
View File

@ -1,6 +1,6 @@
package cc.ryanc.halo.listener; 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.model.enums.BlogPropertiesEnum;
import cc.ryanc.halo.service.OptionsService; import cc.ryanc.halo.service.OptionsService;
import cc.ryanc.halo.utils.HaloUtils; import cc.ryanc.halo.utils.HaloUtils;
@ -17,7 +17,7 @@ import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import static cc.ryanc.halo.model.dto.HaloConst.*; import static cc.ryanc.halo.model.support.HaloConst.*;
/** /**
* <pre> * <pre>

2
src/main/java/cc/ryanc/halo/model/dto/Archive.java → src/main/java/cc/ryanc/halo/model/support/Archive.java
View File

@ -1,4 +1,4 @@
package cc.ryanc.halo.model.dto; package cc.ryanc.halo.model.support;
import cc.ryanc.halo.model.domain.Post; import cc.ryanc.halo.model.domain.Post;
import lombok.Data; import lombok.Data;

2
src/main/java/cc/ryanc/halo/model/dto/BackupDto.java → src/main/java/cc/ryanc/halo/model/support/BackupDto.java
View File

@ -1,4 +1,4 @@
package cc.ryanc.halo.model.dto; package cc.ryanc.halo.model.support;
import lombok.Data; import lombok.Data;

2
src/main/java/cc/ryanc/halo/model/dto/HaloConst.java → src/main/java/cc/ryanc/halo/model/support/HaloConst.java
View File

@ -1,4 +1,4 @@
package cc.ryanc.halo.model.dto; package cc.ryanc.halo.model.support;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;

2
src/main/java/cc/ryanc/halo/model/dto/JsonResult.java → src/main/java/cc/ryanc/halo/model/support/JsonResult.java
View File

@ -1,4 +1,4 @@
package cc.ryanc.halo.model.dto; package cc.ryanc.halo.model.support;
import cc.ryanc.halo.model.enums.ResultCodeEnum; import cc.ryanc.halo.model.enums.ResultCodeEnum;
import lombok.Data; import lombok.Data;

2
src/main/java/cc/ryanc/halo/model/dto/ListPage.java → src/main/java/cc/ryanc/halo/model/support/ListPage.java
View File

@ -1,4 +1,4 @@
package cc.ryanc.halo.model.dto; package cc.ryanc.halo.model.support;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;

2
src/main/java/cc/ryanc/halo/model/dto/LogsRecord.java → src/main/java/cc/ryanc/halo/model/support/LogsRecord.java
View File

@ -1,4 +1,4 @@
package cc.ryanc.halo.model.dto; package cc.ryanc.halo.model.support;
/** /**
* <pre> * <pre>

2
src/main/java/cc/ryanc/halo/model/dto/QiNiuPutSet.java → src/main/java/cc/ryanc/halo/model/support/QiNiuPutSet.java
View File

@ -1,4 +1,4 @@
package cc.ryanc.halo.model.dto; package cc.ryanc.halo.model.support;
import lombok.Data; import lombok.Data;

2
src/main/java/cc/ryanc/halo/model/dto/Theme.java → src/main/java/cc/ryanc/halo/model/support/Theme.java
View File

@ -1,4 +1,4 @@
package cc.ryanc.halo.model.dto; package cc.ryanc.halo.model.support;
import lombok.Data; import lombok.Data;

3
src/main/java/cc/ryanc/halo/service/PostService.java
View File

@ -3,7 +3,7 @@ package cc.ryanc.halo.service;
import cc.ryanc.halo.model.domain.Category; import cc.ryanc.halo.model.domain.Category;
import cc.ryanc.halo.model.domain.Post; import cc.ryanc.halo.model.domain.Post;
import cc.ryanc.halo.model.domain.Tag; 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 cc.ryanc.halo.service.base.CrudService;
import org.springframework.data.domain.Page; import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Pageable;
@ -13,7 +13,6 @@ import org.springframework.web.bind.annotation.RequestParam;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Optional;
/** /**
* <pre> * <pre>

4
src/main/java/cc/ryanc/halo/service/impl/AttachmentServiceImpl.java
View File

@ -2,7 +2,7 @@ package cc.ryanc.halo.service.impl;
import cc.ryanc.halo.logging.Logger; import cc.ryanc.halo.logging.Logger;
import cc.ryanc.halo.model.domain.Attachment; 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.AttachLocationEnum;
import cc.ryanc.halo.model.enums.BlogPropertiesEnum; import cc.ryanc.halo.model.enums.BlogPropertiesEnum;
import cc.ryanc.halo.repository.AttachmentRepository; import cc.ryanc.halo.repository.AttachmentRepository;
@ -43,7 +43,7 @@ import java.io.IOException;
import java.nio.file.Paths; import java.nio.file.Paths;
import java.util.*; import java.util.*;
import static cc.ryanc.halo.model.dto.HaloConst.OPTIONS; import static cc.ryanc.halo.model.support.HaloConst.OPTIONS;
/** /**
* <pre> * <pre>

2
src/main/java/cc/ryanc/halo/service/impl/MailServiceImpl.java
View File

@ -14,7 +14,7 @@ import org.springframework.web.servlet.view.freemarker.FreeMarkerConfigurer;
import java.io.File; import java.io.File;
import java.util.Map; import java.util.Map;
import static cc.ryanc.halo.model.dto.HaloConst.OPTIONS; import static cc.ryanc.halo.model.support.HaloConst.OPTIONS;
/** /**
* <pre> * <pre>

6
src/main/java/cc/ryanc/halo/service/impl/PostServiceImpl.java
View File

@ -3,7 +3,7 @@ package cc.ryanc.halo.service.impl;
import cc.ryanc.halo.model.domain.Category; import cc.ryanc.halo.model.domain.Category;
import cc.ryanc.halo.model.domain.Post; import cc.ryanc.halo.model.domain.Post;
import cc.ryanc.halo.model.domain.Tag; 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.BlogPropertiesEnum;
import cc.ryanc.halo.model.enums.PostStatusEnum; import cc.ryanc.halo.model.enums.PostStatusEnum;
import cc.ryanc.halo.model.enums.PostTypeEnum; import cc.ryanc.halo.model.enums.PostTypeEnum;
@ -29,8 +29,8 @@ import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Optional; import java.util.Optional;
import static cc.ryanc.halo.model.dto.HaloConst.OPTIONS; import static cc.ryanc.halo.model.support.HaloConst.OPTIONS;
import static cc.ryanc.halo.model.dto.HaloConst.POSTS_VIEWS; import static cc.ryanc.halo.model.support.HaloConst.POSTS_VIEWS;
/** /**
* <pre> * <pre>

2
src/main/java/cc/ryanc/halo/task/PostSyncTask.java
View File

@ -6,7 +6,7 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.scheduling.annotation.Scheduled; import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component; 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 * @author : RYAN0UP

6
src/main/java/cc/ryanc/halo/utils/HaloUtils.java
View File

@ -1,7 +1,7 @@
package cc.ryanc.halo.utils; package cc.ryanc.halo.utils;
import cc.ryanc.halo.model.dto.BackupDto; import cc.ryanc.halo.model.support.BackupDto;
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.model.enums.BlogPropertiesEnum;
import cc.ryanc.halo.model.enums.CommonParamsEnum; import cc.ryanc.halo.model.enums.CommonParamsEnum;
import cn.hutool.core.io.FileUtil; import cn.hutool.core.io.FileUtil;
@ -25,7 +25,7 @@ import java.nio.file.attribute.BasicFileAttributeView;
import java.nio.file.attribute.BasicFileAttributes; import java.nio.file.attribute.BasicFileAttributes;
import java.util.*; import java.util.*;
import static cc.ryanc.halo.model.dto.HaloConst.OPTIONS; import static cc.ryanc.halo.model.support.HaloConst.OPTIONS;
/** /**
* <pre> * <pre>

2
src/main/java/cc/ryanc/halo/utils/MarkdownUtils.java
View File

@ -1,6 +1,6 @@
package cc.ryanc.halo.utils; 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.Extension;
import org.commonmark.ext.front.matter.YamlFrontMatterExtension; import org.commonmark.ext.front.matter.YamlFrontMatterExtension;
import org.commonmark.ext.front.matter.YamlFrontMatterVisitor; import org.commonmark.ext.front.matter.YamlFrontMatterVisitor;

2
src/main/java/cc/ryanc/halo/utils/OwoUtil.java
View File

@ -2,7 +2,7 @@ package cc.ryanc.halo.utils;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import static cc.ryanc.halo.model.dto.HaloConst.OWO; import static cc.ryanc.halo.model.support.HaloConst.OWO;
/** /**
* <pre> * <pre>

8
src/main/java/cc/ryanc/halo/web/controller/admin/AdminController.java
View File

@ -2,8 +2,8 @@ package cc.ryanc.halo.web.controller.admin;
import cc.ryanc.halo.logging.Logger; import cc.ryanc.halo.logging.Logger;
import cc.ryanc.halo.model.domain.*; import cc.ryanc.halo.model.domain.*;
import cc.ryanc.halo.model.dto.JsonResult; import cc.ryanc.halo.model.support.JsonResult;
import cc.ryanc.halo.model.dto.LogsRecord; import cc.ryanc.halo.model.support.LogsRecord;
import cc.ryanc.halo.model.enums.*; import cc.ryanc.halo.model.enums.*;
import cc.ryanc.halo.service.*; import cc.ryanc.halo.service.*;
import cc.ryanc.halo.utils.LocaleMessageUtil; import cc.ryanc.halo.utils.LocaleMessageUtil;
@ -34,8 +34,8 @@ import javax.servlet.http.HttpSession;
import java.io.IOException; import java.io.IOException;
import java.util.*; import java.util.*;
import static cc.ryanc.halo.model.dto.HaloConst.OPTIONS; import static cc.ryanc.halo.model.support.HaloConst.OPTIONS;
import static cc.ryanc.halo.model.dto.HaloConst.USER_SESSION_KEY; import static cc.ryanc.halo.model.support.HaloConst.USER_SESSION_KEY;
/** /**
* <pre> * <pre>

4
src/main/java/cc/ryanc/halo/web/controller/admin/AttachmentController.java
View File

@ -1,8 +1,8 @@
package cc.ryanc.halo.web.controller.admin; package cc.ryanc.halo.web.controller.admin;
import cc.ryanc.halo.model.domain.Attachment; import cc.ryanc.halo.model.domain.Attachment;
import cc.ryanc.halo.model.dto.JsonResult; import cc.ryanc.halo.model.support.JsonResult;
import cc.ryanc.halo.model.dto.LogsRecord; import cc.ryanc.halo.model.support.LogsRecord;
import cc.ryanc.halo.model.enums.PostTypeEnum; import cc.ryanc.halo.model.enums.PostTypeEnum;
import cc.ryanc.halo.model.enums.ResultCodeEnum; import cc.ryanc.halo.model.enums.ResultCodeEnum;
import cc.ryanc.halo.service.AttachmentService; import cc.ryanc.halo.service.AttachmentService;

8
src/main/java/cc/ryanc/halo/web/controller/admin/BackupController.java
View File

@ -4,8 +4,8 @@ import cc.ryanc.halo.model.domain.Category;
import cc.ryanc.halo.model.domain.Post; import cc.ryanc.halo.model.domain.Post;
import cc.ryanc.halo.model.domain.Tag; import cc.ryanc.halo.model.domain.Tag;
import cc.ryanc.halo.model.domain.User; import cc.ryanc.halo.model.domain.User;
import cc.ryanc.halo.model.dto.BackupDto; import cc.ryanc.halo.model.support.BackupDto;
import cc.ryanc.halo.model.dto.JsonResult; import cc.ryanc.halo.model.support.JsonResult;
import cc.ryanc.halo.model.enums.*; import cc.ryanc.halo.model.enums.*;
import cc.ryanc.halo.service.MailService; import cc.ryanc.halo.service.MailService;
import cc.ryanc.halo.service.PostService; import cc.ryanc.halo.service.PostService;
@ -33,8 +33,8 @@ import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import static cc.ryanc.halo.model.dto.HaloConst.OPTIONS; import static cc.ryanc.halo.model.support.HaloConst.OPTIONS;
import static cc.ryanc.halo.model.dto.HaloConst.USER_SESSION_KEY; import static cc.ryanc.halo.model.support.HaloConst.USER_SESSION_KEY;
/** /**
* <pre> * <pre>

2
src/main/java/cc/ryanc/halo/web/controller/admin/CategoryController.java
View File

@ -1,7 +1,7 @@
package cc.ryanc.halo.web.controller.admin; package cc.ryanc.halo.web.controller.admin;
import cc.ryanc.halo.model.domain.Category; 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.service.CategoryService;
import cc.ryanc.halo.utils.LocaleMessageUtil; import cc.ryanc.halo.utils.LocaleMessageUtil;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;

6
src/main/java/cc/ryanc/halo/web/controller/admin/CommentController.java
View File

@ -3,7 +3,7 @@ package cc.ryanc.halo.web.controller.admin;
import cc.ryanc.halo.model.domain.Comment; import cc.ryanc.halo.model.domain.Comment;
import cc.ryanc.halo.model.domain.Post; import cc.ryanc.halo.model.domain.Post;
import cc.ryanc.halo.model.domain.User; 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.model.enums.*;
import cc.ryanc.halo.service.CommentService; import cc.ryanc.halo.service.CommentService;
import cc.ryanc.halo.service.MailService; import cc.ryanc.halo.service.MailService;
@ -31,8 +31,8 @@ import javax.servlet.http.HttpSession;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import static cc.ryanc.halo.model.dto.HaloConst.OPTIONS; import static cc.ryanc.halo.model.support.HaloConst.OPTIONS;
import static cc.ryanc.halo.model.dto.HaloConst.USER_SESSION_KEY; import static cc.ryanc.halo.model.support.HaloConst.USER_SESSION_KEY;
/** /**
* <pre> * <pre>

2
src/main/java/cc/ryanc/halo/web/controller/admin/MenuController.java
View File

@ -1,7 +1,7 @@
package cc.ryanc.halo.web.controller.admin; package cc.ryanc.halo.web.controller.admin;
import cc.ryanc.halo.model.domain.Menu; 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 cc.ryanc.halo.service.MenuService;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;

4
src/main/java/cc/ryanc/halo/web/controller/admin/OptionController.java
View File

@ -1,6 +1,6 @@
package cc.ryanc.halo.web.controller.admin; 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.service.OptionsService;
import cc.ryanc.halo.utils.LocaleMessageUtil; import cc.ryanc.halo.utils.LocaleMessageUtil;
import freemarker.template.Configuration; import freemarker.template.Configuration;
@ -13,7 +13,7 @@ import org.springframework.web.servlet.i18n.SessionLocaleResolver;
import javax.servlet.http.HttpSession; import javax.servlet.http.HttpSession;
import java.util.Map; import java.util.Map;
import static cc.ryanc.halo.model.dto.HaloConst.OPTIONS; import static cc.ryanc.halo.model.support.HaloConst.OPTIONS;
/** /**
* <pre> * <pre>

8
src/main/java/cc/ryanc/halo/web/controller/admin/PageController.java
View File

@ -4,8 +4,8 @@ import cc.ryanc.halo.model.domain.Gallery;
import cc.ryanc.halo.model.domain.Link; import cc.ryanc.halo.model.domain.Link;
import cc.ryanc.halo.model.domain.Post; import cc.ryanc.halo.model.domain.Post;
import cc.ryanc.halo.model.domain.User; 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.dto.LogsRecord; import cc.ryanc.halo.model.support.LogsRecord;
import cc.ryanc.halo.model.enums.BlogPropertiesEnum; import cc.ryanc.halo.model.enums.BlogPropertiesEnum;
import cc.ryanc.halo.model.enums.PostTypeEnum; import cc.ryanc.halo.model.enums.PostTypeEnum;
import cc.ryanc.halo.model.enums.ResultCodeEnum; import cc.ryanc.halo.model.enums.ResultCodeEnum;
@ -41,8 +41,8 @@ import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Optional; import java.util.Optional;
import static cc.ryanc.halo.model.dto.HaloConst.OPTIONS; import static cc.ryanc.halo.model.support.HaloConst.OPTIONS;
import static cc.ryanc.halo.model.dto.HaloConst.USER_SESSION_KEY; import static cc.ryanc.halo.model.support.HaloConst.USER_SESSION_KEY;
/** /**
* <pre> * <pre>

8
src/main/java/cc/ryanc/halo/web/controller/admin/PostController.java
View File

@ -2,8 +2,8 @@ package cc.ryanc.halo.web.controller.admin;
import cc.ryanc.halo.model.domain.Post; import cc.ryanc.halo.model.domain.Post;
import cc.ryanc.halo.model.domain.User; 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.dto.LogsRecord; import cc.ryanc.halo.model.support.LogsRecord;
import cc.ryanc.halo.model.enums.BlogPropertiesEnum; import cc.ryanc.halo.model.enums.BlogPropertiesEnum;
import cc.ryanc.halo.model.enums.PostStatusEnum; import cc.ryanc.halo.model.enums.PostStatusEnum;
import cc.ryanc.halo.model.enums.PostTypeEnum; import cc.ryanc.halo.model.enums.PostTypeEnum;
@ -35,8 +35,8 @@ import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Optional; import java.util.Optional;
import static cc.ryanc.halo.model.dto.HaloConst.OPTIONS; import static cc.ryanc.halo.model.support.HaloConst.OPTIONS;
import static cc.ryanc.halo.model.dto.HaloConst.USER_SESSION_KEY; import static cc.ryanc.halo.model.support.HaloConst.USER_SESSION_KEY;
import static org.springframework.data.domain.Sort.Direction.DESC; import static org.springframework.data.domain.Sort.Direction.DESC;
/** /**

2
src/main/java/cc/ryanc/halo/web/controller/admin/TagController.java
View File

@ -1,7 +1,7 @@
package cc.ryanc.halo.web.controller.admin; package cc.ryanc.halo.web.controller.admin;
import cc.ryanc.halo.model.domain.Tag; 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.service.TagService;
import cc.ryanc.halo.utils.LocaleMessageUtil; import cc.ryanc.halo.utils.LocaleMessageUtil;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;

8
src/main/java/cc/ryanc/halo/web/controller/admin/ThemeController.java
View File

@ -1,7 +1,7 @@
package cc.ryanc.halo.web.controller.admin; 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.model.dto.LogsRecord; import cc.ryanc.halo.model.support.LogsRecord;
import cc.ryanc.halo.model.enums.BlogPropertiesEnum; import cc.ryanc.halo.model.enums.BlogPropertiesEnum;
import cc.ryanc.halo.model.enums.TrueFalseEnum; import cc.ryanc.halo.model.enums.TrueFalseEnum;
import cc.ryanc.halo.service.LogsService; import cc.ryanc.halo.service.LogsService;
@ -31,8 +31,8 @@ import java.io.File;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;
import java.util.List; import java.util.List;
import static cc.ryanc.halo.model.dto.HaloConst.OPTIONS; import static cc.ryanc.halo.model.support.HaloConst.OPTIONS;
import static cc.ryanc.halo.model.dto.HaloConst.THEMES; import static cc.ryanc.halo.model.support.HaloConst.THEMES;
/** /**
* <pre> * <pre>

4
src/main/java/cc/ryanc/halo/web/controller/admin/UserController.java
View File

@ -1,7 +1,7 @@
package cc.ryanc.halo.web.controller.admin; package cc.ryanc.halo.web.controller.admin;
import cc.ryanc.halo.model.domain.User; 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.service.UserService;
import cc.ryanc.halo.utils.LocaleMessageUtil; import cc.ryanc.halo.utils.LocaleMessageUtil;
import cn.hutool.crypto.SecureUtil; import cn.hutool.crypto.SecureUtil;
@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpSession; import javax.servlet.http.HttpSession;
import javax.validation.Valid; 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;
/** /**
* <pre> * <pre>

2
src/main/java/cc/ryanc/halo/web/controller/api/ApiArchivesController.java
View File

@ -1,6 +1,6 @@
package cc.ryanc.halo.web.controller.api; 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 cc.ryanc.halo.service.PostService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;

4
src/main/java/cc/ryanc/halo/web/controller/api/ApiCommentController.java
View File

@ -2,7 +2,7 @@ package cc.ryanc.halo.web.controller.api;
import cc.ryanc.halo.model.domain.Comment; import cc.ryanc.halo.model.domain.Comment;
import cc.ryanc.halo.model.domain.Post; 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.BlogPropertiesEnum;
import cc.ryanc.halo.model.enums.TrueFalseEnum; import cc.ryanc.halo.model.enums.TrueFalseEnum;
import cc.ryanc.halo.service.CommentService; import cc.ryanc.halo.service.CommentService;
@ -23,7 +23,7 @@ import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.validation.Valid; import javax.validation.Valid;
import static cc.ryanc.halo.model.dto.HaloConst.OPTIONS; import static cc.ryanc.halo.model.support.HaloConst.OPTIONS;
/** /**
* <pre> * <pre>

2
src/main/java/cc/ryanc/halo/web/controller/api/ApiOptionController.java
View File

@ -1,6 +1,6 @@
package cc.ryanc.halo.web.controller.api; 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 cc.ryanc.halo.service.OptionsService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;

2
src/main/java/cc/ryanc/halo/web/controller/api/ApiPostController.java
View File

@ -2,7 +2,7 @@ package cc.ryanc.halo.web.controller.api;
import cc.ryanc.halo.exception.NotFoundException; import cc.ryanc.halo.exception.NotFoundException;
import cc.ryanc.halo.model.domain.Post; 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.PostStatusEnum;
import cc.ryanc.halo.model.enums.PostTypeEnum; import cc.ryanc.halo.model.enums.PostTypeEnum;
import cc.ryanc.halo.service.CategoryService; import cc.ryanc.halo.service.CategoryService;

2
src/main/java/cc/ryanc/halo/web/controller/base/CommonResultControllerAdvice.java
View File

@ -1,6 +1,6 @@
package cc.ryanc.halo.web.controller.base; 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.core.MethodParameter;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
import org.springframework.http.MediaType; import org.springframework.http.MediaType;

2
src/main/java/cc/ryanc/halo/web/controller/base/ControllerExceptionHandler.java
View File

@ -2,7 +2,7 @@ package cc.ryanc.halo.web.controller.base;
import cc.ryanc.halo.exception.HaloException; import cc.ryanc.halo.exception.HaloException;
import cc.ryanc.halo.logging.Logger; 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.ExceptionUtils;
import cc.ryanc.halo.utils.ValidationUtils; import cc.ryanc.halo.utils.ValidationUtils;
import org.springframework.dao.DataIntegrityViolationException; import org.springframework.dao.DataIntegrityViolationException;

6
src/main/java/cc/ryanc/halo/web/controller/core/InstallController.java
View File

@ -1,8 +1,8 @@
package cc.ryanc.halo.web.controller.core; package cc.ryanc.halo.web.controller.core;
import cc.ryanc.halo.model.domain.*; import cc.ryanc.halo.model.domain.*;
import cc.ryanc.halo.model.dto.JsonResult; import cc.ryanc.halo.model.support.JsonResult;
import cc.ryanc.halo.model.dto.LogsRecord; import cc.ryanc.halo.model.support.LogsRecord;
import cc.ryanc.halo.model.enums.AllowCommentEnum; import cc.ryanc.halo.model.enums.AllowCommentEnum;
import cc.ryanc.halo.model.enums.AttachLocationEnum; import cc.ryanc.halo.model.enums.AttachLocationEnum;
import cc.ryanc.halo.model.enums.BlogPropertiesEnum; import cc.ryanc.halo.model.enums.BlogPropertiesEnum;
@ -26,7 +26,7 @@ import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import static cc.ryanc.halo.model.dto.HaloConst.OPTIONS; import static cc.ryanc.halo.model.support.HaloConst.OPTIONS;
/** /**
* <pre> * <pre>

4
src/main/java/cc/ryanc/halo/web/controller/front/FrontArchiveController.java
View File

@ -3,7 +3,7 @@ package cc.ryanc.halo.web.controller.front;
import cc.ryanc.halo.model.domain.Comment; import cc.ryanc.halo.model.domain.Comment;
import cc.ryanc.halo.model.domain.Post; import cc.ryanc.halo.model.domain.Post;
import cc.ryanc.halo.model.domain.Tag; 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.model.enums.*;
import cc.ryanc.halo.service.CommentService; import cc.ryanc.halo.service.CommentService;
import cc.ryanc.halo.service.PostService; import cc.ryanc.halo.service.PostService;
@ -32,7 +32,7 @@ import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import java.util.List; 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; import static org.springframework.data.domain.Sort.Direction.DESC;
/** /**

2
src/main/java/cc/ryanc/halo/web/controller/front/FrontCategoryController.java
View File

@ -22,7 +22,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
import java.util.List; 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; import static org.springframework.data.domain.Sort.Direction.DESC;
/** /**

4
src/main/java/cc/ryanc/halo/web/controller/front/FrontCommentController.java
View File

@ -3,7 +3,7 @@ package cc.ryanc.halo.web.controller.front;
import cc.ryanc.halo.logging.Logger; import cc.ryanc.halo.logging.Logger;
import cc.ryanc.halo.model.domain.Comment; import cc.ryanc.halo.model.domain.Comment;
import cc.ryanc.halo.model.domain.Post; 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.BlogPropertiesEnum;
import cc.ryanc.halo.model.enums.PostTypeEnum; import cc.ryanc.halo.model.enums.PostTypeEnum;
import cc.ryanc.halo.model.enums.TrueFalseEnum; import cc.ryanc.halo.model.enums.TrueFalseEnum;
@ -32,7 +32,7 @@ import javax.validation.Valid;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import static cc.ryanc.halo.model.dto.HaloConst.OPTIONS; import static cc.ryanc.halo.model.support.HaloConst.OPTIONS;
/** /**
* <pre> * <pre>

2
src/main/java/cc/ryanc/halo/web/controller/front/FrontIndexController.java
View File

@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping; 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; import static org.springframework.data.domain.Sort.Direction.DESC;
/** /**

2
src/main/java/cc/ryanc/halo/web/controller/front/FrontOthersController.java
View File

@ -22,7 +22,7 @@ import org.springframework.web.servlet.view.freemarker.FreeMarkerConfigurer;
import java.io.IOException; import java.io.IOException;
import java.util.List; import java.util.List;
import static cc.ryanc.halo.model.dto.HaloConst.OPTIONS; import static cc.ryanc.halo.model.support.HaloConst.OPTIONS;
/** /**
* <pre> * <pre>

4
src/main/java/cc/ryanc/halo/web/controller/front/FrontPageController.java
View File

@ -3,7 +3,7 @@ package cc.ryanc.halo.web.controller.front;
import cc.ryanc.halo.model.domain.Comment; import cc.ryanc.halo.model.domain.Comment;
import cc.ryanc.halo.model.domain.Gallery; import cc.ryanc.halo.model.domain.Gallery;
import cc.ryanc.halo.model.domain.Post; 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.model.enums.*;
import cc.ryanc.halo.service.CommentService; import cc.ryanc.halo.service.CommentService;
import cc.ryanc.halo.service.GalleryService; import cc.ryanc.halo.service.GalleryService;
@ -21,7 +21,7 @@ import org.springframework.web.bind.annotation.RequestParam;
import java.util.List; import java.util.List;
import static cc.ryanc.halo.model.dto.HaloConst.OPTIONS; import static cc.ryanc.halo.model.support.HaloConst.OPTIONS;
/** /**
* <pre> * <pre>

2
src/main/java/cc/ryanc/halo/web/controller/front/FrontSearchController.java
View File

@ -23,7 +23,7 @@ import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam; 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; import static org.springframework.data.domain.Sort.Direction.DESC;
/** /**

2
src/main/java/cc/ryanc/halo/web/controller/front/FrontTagController.java
View File

@ -20,7 +20,7 @@ import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping; 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; import static org.springframework.data.domain.Sort.Direction.DESC;
/** /**

4
src/main/java/cc/ryanc/halo/web/interceptor/ApiInterceptor.java
View File

@ -1,6 +1,6 @@
package cc.ryanc.halo.web.interceptor; 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.BlogPropertiesEnum;
import cc.ryanc.halo.model.enums.TrueFalseEnum; import cc.ryanc.halo.model.enums.TrueFalseEnum;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
@ -15,7 +15,7 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
import static cc.ryanc.halo.model.dto.HaloConst.OPTIONS; import static cc.ryanc.halo.model.support.HaloConst.OPTIONS;
/** /**
* <pre> * <pre>

2
src/main/java/cc/ryanc/halo/web/interceptor/InstallInterceptor.java
View File

@ -10,7 +10,7 @@ import org.springframework.web.servlet.ModelAndView;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import static cc.ryanc.halo.model.dto.HaloConst.OPTIONS; import static cc.ryanc.halo.model.support.HaloConst.OPTIONS;
/** /**
* <pre> * <pre>

2
src/main/java/cc/ryanc/halo/web/interceptor/LocaleInterceptor.java
View File

@ -12,7 +12,7 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.util.Locale; import java.util.Locale;
import static cc.ryanc.halo.model.dto.HaloConst.OPTIONS; import static cc.ryanc.halo.model.support.HaloConst.OPTIONS;
/** /**
* @author : wangry * @author : wangry

2
src/main/java/cc/ryanc/halo/web/interceptor/LoginInterceptor.java
View File

@ -7,7 +7,7 @@ import org.springframework.web.servlet.ModelAndView;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; 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;
/** /**
* <pre> * <pre>