From 6f35efe90fbe762e2678f01e8fa7c0287dfb3f34 Mon Sep 17 00:00:00 2001 From: ruibaby Date: Fri, 26 Apr 2019 22:58:27 +0800 Subject: [PATCH] Support journal search. --- src/main/java/run/halo/app/Application.java | 2 +- .../config/FreeMarkerAutoConfiguration.java | 2 +- .../app/config/WebMvcAutoConfiguration.java | 2 +- .../admin/api/JournalController.java | 7 ++- .../controller/admin/api/LinkController.java | 2 +- .../controller/admin/api/MainController.java | 2 +- .../controller/admin/api/PhotoController.java | 2 +- .../controller/admin/api/ThemeController.java | 2 +- .../content/ContentArchiveController.java | 2 +- .../content/ContentCategoryController.java | 2 +- .../content/ContentFeedController.java | 2 +- .../content/ContentIndexController.java | 2 +- .../content/ContentSearchController.java | 2 +- .../content/ContentSheetController.java | 2 +- .../content/ContentTagController.java | 2 +- .../app/controller/core/CommonController.java | 2 +- .../controller/core/InstallController.java | 2 +- .../factory/StringToEnumConverterFactory.java | 2 +- .../theme/config/support/ThemeProperty.java | 2 +- .../halo/app/listener/StartedListener.java | 2 +- .../java/run/halo/app/model/dto/LinkDTO.java | 2 +- .../java/run/halo/app/model/dto/PhotoDTO.java | 2 +- .../run/halo/app/model/entity/Attachment.java | 2 +- .../java/run/halo/app/model/entity/Link.java | 2 +- .../java/run/halo/app/model/entity/Menu.java | 2 +- .../java/run/halo/app/model/entity/Photo.java | 2 +- .../run/halo/app/model/entity/PostTag.java | 2 +- .../java/run/halo/app/model/entity/Tag.java | 2 +- .../java/run/halo/app/model/entity/User.java | 2 +- .../halo/app/model/enums/AttachmentType.java | 2 +- .../model/freemarker/method/RandomMethod.java | 2 +- .../method/RecentCommentsMethod.java | 2 +- .../freemarker/method/RecentPostsMethod.java | 2 +- .../freemarker/tag/CategoryTagDirective.java | 2 +- .../freemarker/tag/CommentTagDirective.java | 2 +- .../freemarker/tag/LinkTagDirective.java | 2 +- .../freemarker/tag/MenuTagDirective.java | 2 +- .../freemarker/tag/PhotoTagDirective.java | 2 +- .../freemarker/tag/PostTagDirective.java | 2 +- .../model/freemarker/tag/TagTagDirective.java | 2 +- .../app/model/params/AttachmentParam.java | 2 +- .../app/model/params/AttachmentQuery.java | 2 +- .../halo/app/model/params/CommentQuery.java | 2 +- .../halo/app/model/params/JournalQuery.java | 18 ++++++++ .../run/halo/app/model/params/PhotoParam.java | 2 +- .../run/halo/app/model/params/PhotoQuery.java | 2 +- .../app/model/properties/BlogProperties.java | 2 +- .../run/halo/app/model/support/BackupDto.java | 2 +- .../run/halo/app/model/support/HaloConst.java | 2 +- .../halo/app/model/support/LogsRecord.java | 2 +- .../run/halo/app/model/support/ThemeFile.java | 2 +- .../run/halo/app/model/vo/LinkTeamVO.java | 2 +- .../java/run/halo/app/model/vo/MenuVO.java | 2 +- .../run/halo/app/model/vo/PhotoTeamVO.java | 2 +- .../app/repository/JournalRepository.java | 3 +- .../halo/app/repository/PostRepository.java | 2 +- .../run/halo/app/service/JournalService.java | 12 +++++ .../run/halo/app/service/MailService.java | 2 +- .../run/halo/app/service/MenuService.java | 2 +- .../run/halo/app/service/PostService.java | 2 +- .../run/halo/app/service/ThemeService.java | 2 +- .../service/impl/AttachmentServiceImpl.java | 2 +- .../app/service/impl/CategoryServiceImpl.java | 2 +- .../app/service/impl/JournalServiceImpl.java | 45 +++++++++++++++++-- .../app/service/impl/LinkServiceImpl.java | 2 +- .../halo/app/service/impl/LogServiceImpl.java | 2 +- .../app/service/impl/MailServiceImpl.java | 2 +- .../app/service/impl/MenuServiceImpl.java | 2 +- .../app/service/impl/OptionServiceImpl.java | 2 +- .../app/service/impl/PhotoServiceImpl.java | 2 +- .../service/impl/PostCommentServiceImpl.java | 2 +- .../app/service/impl/PostServiceImpl.java | 2 +- .../halo/app/service/impl/TagServiceImpl.java | 2 +- .../app/service/impl/ThemeServiceImpl.java | 2 +- .../app/service/impl/UserServiceImpl.java | 2 +- .../java/run/halo/app/utils/HaloUtils.java | 2 +- .../run/halo/app/utils/MarkdownUtils.java | 2 +- .../java/run/halo/app/utils/DemoUtilTest.java | 2 +- 78 files changed, 151 insertions(+), 80 deletions(-) create mode 100644 src/main/java/run/halo/app/model/params/JournalQuery.java diff --git a/src/main/java/run/halo/app/Application.java b/src/main/java/run/halo/app/Application.java index b32c4c1c7..2e52c6314 100755 --- a/src/main/java/run/halo/app/Application.java +++ b/src/main/java/run/halo/app/Application.java @@ -13,7 +13,7 @@ import org.springframework.scheduling.annotation.EnableScheduling; * Halo run! * * - * @author : RYAN0UP + * @author ryanwang * @date : 2017/11/14 */ @SpringBootApplication diff --git a/src/main/java/run/halo/app/config/FreeMarkerAutoConfiguration.java b/src/main/java/run/halo/app/config/FreeMarkerAutoConfiguration.java index af5b8f0ed..467be1a19 100644 --- a/src/main/java/run/halo/app/config/FreeMarkerAutoConfiguration.java +++ b/src/main/java/run/halo/app/config/FreeMarkerAutoConfiguration.java @@ -18,7 +18,7 @@ import javax.annotation.PostConstruct; /** * FreeMarker configuration. * - * @author : RYAN0UP + * @author ryanwang * @date : 2018/4/26 */ @Slf4j diff --git a/src/main/java/run/halo/app/config/WebMvcAutoConfiguration.java b/src/main/java/run/halo/app/config/WebMvcAutoConfiguration.java index 40f2f9408..b0fce101b 100644 --- a/src/main/java/run/halo/app/config/WebMvcAutoConfiguration.java +++ b/src/main/java/run/halo/app/config/WebMvcAutoConfiguration.java @@ -30,7 +30,7 @@ import java.util.List; /** * Mvc configuration. * - * @author : RYAN0UP + * @author ryanwang * @date : 2018/1/2 */ @Slf4j diff --git a/src/main/java/run/halo/app/controller/admin/api/JournalController.java b/src/main/java/run/halo/app/controller/admin/api/JournalController.java index 248054c83..d0733e85e 100644 --- a/src/main/java/run/halo/app/controller/admin/api/JournalController.java +++ b/src/main/java/run/halo/app/controller/admin/api/JournalController.java @@ -12,6 +12,7 @@ import run.halo.app.model.dto.JournalDTO; import run.halo.app.model.dto.JournalWithCmtCountDTO; import run.halo.app.model.entity.Journal; import run.halo.app.model.params.JournalParam; +import run.halo.app.model.params.JournalQuery; import run.halo.app.model.vo.BaseCommentVO; import run.halo.app.model.vo.BaseCommentWithParentVO; import run.halo.app.service.JournalCommentService; @@ -27,6 +28,7 @@ import static org.springframework.data.domain.Sort.Direction.DESC; * Journal controller. * * @author johnniang + * @author ryanwang * @date 19-4-25 */ @RestController @@ -49,8 +51,9 @@ public class JournalController { @GetMapping @ApiOperation("Gets latest journals") - public Page pageBy(@PageableDefault(sort = "updateTime", direction = DESC) Pageable pageable) { - Page journalPage = journalService.listAll(pageable); + public Page pageBy(@PageableDefault(sort = "updateTime", direction = DESC) Pageable pageable, + JournalQuery journalQuery) { + Page journalPage = journalService.pageBy(journalQuery,pageable); return journalService.convertToCmtCountDto(journalPage); } diff --git a/src/main/java/run/halo/app/controller/admin/api/LinkController.java b/src/main/java/run/halo/app/controller/admin/api/LinkController.java index 606a13fe0..fec0f7aaf 100644 --- a/src/main/java/run/halo/app/controller/admin/api/LinkController.java +++ b/src/main/java/run/halo/app/controller/admin/api/LinkController.java @@ -15,7 +15,7 @@ import java.util.List; /** * Link Controller * - * @author : RYAN0UP + * @author ryanwang * @date : 2019/3/21 */ @RestController diff --git a/src/main/java/run/halo/app/controller/admin/api/MainController.java b/src/main/java/run/halo/app/controller/admin/api/MainController.java index 7316d90cf..daad85d7a 100644 --- a/src/main/java/run/halo/app/controller/admin/api/MainController.java +++ b/src/main/java/run/halo/app/controller/admin/api/MainController.java @@ -6,7 +6,7 @@ import org.springframework.web.bind.annotation.GetMapping; /** * Admin page. * - * @author : RYAN0UP + * @author ryanwang * @date : 2019-04-23 */ @Controller diff --git a/src/main/java/run/halo/app/controller/admin/api/PhotoController.java b/src/main/java/run/halo/app/controller/admin/api/PhotoController.java index 5c8340a7a..3b8f5018e 100644 --- a/src/main/java/run/halo/app/controller/admin/api/PhotoController.java +++ b/src/main/java/run/halo/app/controller/admin/api/PhotoController.java @@ -21,7 +21,7 @@ import static org.springframework.data.domain.Sort.Direction.DESC; /** * Photo controller * - * @author : RYAN0UP + * @author ryanwang * @date : 2019/3/21 */ @RestController diff --git a/src/main/java/run/halo/app/controller/admin/api/ThemeController.java b/src/main/java/run/halo/app/controller/admin/api/ThemeController.java index 9fd6ff1fb..c45f3c922 100644 --- a/src/main/java/run/halo/app/controller/admin/api/ThemeController.java +++ b/src/main/java/run/halo/app/controller/admin/api/ThemeController.java @@ -18,7 +18,7 @@ import java.util.Set; /** * Theme controller. * - * @author : RYAN0UP + * @author ryanwang * @date : 2019/3/20 */ @RestController diff --git a/src/main/java/run/halo/app/controller/content/ContentArchiveController.java b/src/main/java/run/halo/app/controller/content/ContentArchiveController.java index e96f94483..3af73e910 100644 --- a/src/main/java/run/halo/app/controller/content/ContentArchiveController.java +++ b/src/main/java/run/halo/app/controller/content/ContentArchiveController.java @@ -28,7 +28,7 @@ import static org.springframework.data.domain.Sort.Direction.DESC; /** * Blog archive page controller * - * @author : RYAN0UP + * @author ryanwang * @date : 2019-03-17 */ @Slf4j diff --git a/src/main/java/run/halo/app/controller/content/ContentCategoryController.java b/src/main/java/run/halo/app/controller/content/ContentCategoryController.java index 4fb8a5497..582da8b7d 100644 --- a/src/main/java/run/halo/app/controller/content/ContentCategoryController.java +++ b/src/main/java/run/halo/app/controller/content/ContentCategoryController.java @@ -21,7 +21,7 @@ import run.halo.app.service.ThemeService; import static org.springframework.data.domain.Sort.Direction.DESC; /** - * @author : RYAN0UP + * @author ryanwang * @date : 2019/3/20 */ @Controller diff --git a/src/main/java/run/halo/app/controller/content/ContentFeedController.java b/src/main/java/run/halo/app/controller/content/ContentFeedController.java index 38b026822..5fb94d754 100644 --- a/src/main/java/run/halo/app/controller/content/ContentFeedController.java +++ b/src/main/java/run/halo/app/controller/content/ContentFeedController.java @@ -24,7 +24,7 @@ import java.util.List; import static org.springframework.data.domain.Sort.Direction.DESC; /** - * @author : RYAN0UP + * @author ryanwang * @date : 2019-03-21 */ @Controller diff --git a/src/main/java/run/halo/app/controller/content/ContentIndexController.java b/src/main/java/run/halo/app/controller/content/ContentIndexController.java index 0713e782b..ba19b65c1 100644 --- a/src/main/java/run/halo/app/controller/content/ContentIndexController.java +++ b/src/main/java/run/halo/app/controller/content/ContentIndexController.java @@ -24,7 +24,7 @@ import static org.springframework.data.domain.Sort.Direction.DESC; /** * Blog index page controller * - * @author : RYAN0UP + * @author ryanwang * @date : 2019-03-17 */ @Slf4j diff --git a/src/main/java/run/halo/app/controller/content/ContentSearchController.java b/src/main/java/run/halo/app/controller/content/ContentSearchController.java index 32f91bd12..70c2c7610 100644 --- a/src/main/java/run/halo/app/controller/content/ContentSearchController.java +++ b/src/main/java/run/halo/app/controller/content/ContentSearchController.java @@ -24,7 +24,7 @@ import static org.springframework.data.domain.Sort.Direction.DESC; /** * Search Controller * - * @author : RYAN0UP + * @author ryanwang * @date : 2019-04-21 */ @Controller diff --git a/src/main/java/run/halo/app/controller/content/ContentSheetController.java b/src/main/java/run/halo/app/controller/content/ContentSheetController.java index 0752ccc9d..721d3c4e0 100644 --- a/src/main/java/run/halo/app/controller/content/ContentSheetController.java +++ b/src/main/java/run/halo/app/controller/content/ContentSheetController.java @@ -12,7 +12,7 @@ import run.halo.app.service.SheetService; import run.halo.app.service.ThemeService; /** - * @author : RYAN0UP + * @author ryanwang * @date : 2019-03-21 */ @Controller diff --git a/src/main/java/run/halo/app/controller/content/ContentTagController.java b/src/main/java/run/halo/app/controller/content/ContentTagController.java index 0399b92d3..a2e8428d0 100644 --- a/src/main/java/run/halo/app/controller/content/ContentTagController.java +++ b/src/main/java/run/halo/app/controller/content/ContentTagController.java @@ -23,7 +23,7 @@ import static org.springframework.data.domain.Sort.Direction.DESC; /** * Tag Controller * - * @author : RYAN0UP + * @author ryanwang * @date : 2019-03-21 */ @Controller diff --git a/src/main/java/run/halo/app/controller/core/CommonController.java b/src/main/java/run/halo/app/controller/core/CommonController.java index bdb1616c4..4ce631d9f 100644 --- a/src/main/java/run/halo/app/controller/core/CommonController.java +++ b/src/main/java/run/halo/app/controller/core/CommonController.java @@ -18,7 +18,7 @@ import java.io.FileNotFoundException; /** * Error page Controller * - * @author : RYAN0UP + * @author ryanwang * @date : 2017/12/26 */ @Slf4j diff --git a/src/main/java/run/halo/app/controller/core/InstallController.java b/src/main/java/run/halo/app/controller/core/InstallController.java index f9088e8c8..ae347d7e8 100644 --- a/src/main/java/run/halo/app/controller/core/InstallController.java +++ b/src/main/java/run/halo/app/controller/core/InstallController.java @@ -29,7 +29,7 @@ import static run.halo.app.model.support.HaloConst.DEFAULT_THEME_ID; /** * Installation controller. * - * @author : RYAN0UP + * @author ryanwang * @date : 2019-03-17 */ @Slf4j diff --git a/src/main/java/run/halo/app/factory/StringToEnumConverterFactory.java b/src/main/java/run/halo/app/factory/StringToEnumConverterFactory.java index fa7c456a3..6b68e7987 100644 --- a/src/main/java/run/halo/app/factory/StringToEnumConverterFactory.java +++ b/src/main/java/run/halo/app/factory/StringToEnumConverterFactory.java @@ -5,7 +5,7 @@ import org.springframework.core.convert.converter.ConverterFactory; import org.springframework.stereotype.Component; /** - * @author : RYAN0UP + * @author ryanwang * @date : 2019/3/14 */ @Component diff --git a/src/main/java/run/halo/app/handler/theme/config/support/ThemeProperty.java b/src/main/java/run/halo/app/handler/theme/config/support/ThemeProperty.java index 947fb139a..859b13cf6 100644 --- a/src/main/java/run/halo/app/handler/theme/config/support/ThemeProperty.java +++ b/src/main/java/run/halo/app/handler/theme/config/support/ThemeProperty.java @@ -7,7 +7,7 @@ import java.util.Objects; /** * Theme property. * - * @author : RYAN0UP + * @author ryanwang * @date : 2019-03-22 */ @Data diff --git a/src/main/java/run/halo/app/listener/StartedListener.java b/src/main/java/run/halo/app/listener/StartedListener.java index 423f89da0..f07f342ef 100644 --- a/src/main/java/run/halo/app/listener/StartedListener.java +++ b/src/main/java/run/halo/app/listener/StartedListener.java @@ -23,7 +23,7 @@ import java.util.List; /** * The method executed after the application is started. * - * @author : RYAN0UP + * @author ryanwang * @date : 2018/12/5 */ @Slf4j diff --git a/src/main/java/run/halo/app/model/dto/LinkDTO.java b/src/main/java/run/halo/app/model/dto/LinkDTO.java index 8cebd36d0..ef39f930f 100644 --- a/src/main/java/run/halo/app/model/dto/LinkDTO.java +++ b/src/main/java/run/halo/app/model/dto/LinkDTO.java @@ -7,7 +7,7 @@ import lombok.Data; /** * Link output dto. * - * @author : RYAN0UP + * @author ryanwang * @date : 2019/3/21 */ @Data diff --git a/src/main/java/run/halo/app/model/dto/PhotoDTO.java b/src/main/java/run/halo/app/model/dto/PhotoDTO.java index 612037369..b4f7747b2 100644 --- a/src/main/java/run/halo/app/model/dto/PhotoDTO.java +++ b/src/main/java/run/halo/app/model/dto/PhotoDTO.java @@ -7,7 +7,7 @@ import lombok.Data; import java.util.Date; /** - * @author : RYAN0UP + * @author ryanwang * @date : 2019/3/21 */ @Data diff --git a/src/main/java/run/halo/app/model/entity/Attachment.java b/src/main/java/run/halo/app/model/entity/Attachment.java index 8de2ca865..879367787 100644 --- a/src/main/java/run/halo/app/model/entity/Attachment.java +++ b/src/main/java/run/halo/app/model/entity/Attachment.java @@ -12,7 +12,7 @@ import javax.persistence.*; /** * Attachment entity * - * @author : RYAN0UP + * @author ryanwang * @date : 2019-03-12 */ @Data diff --git a/src/main/java/run/halo/app/model/entity/Link.java b/src/main/java/run/halo/app/model/entity/Link.java index e5d3deac1..d75195021 100644 --- a/src/main/java/run/halo/app/model/entity/Link.java +++ b/src/main/java/run/halo/app/model/entity/Link.java @@ -11,7 +11,7 @@ import javax.persistence.*; /** * Link entity * - * @author : RYAN0UP + * @author ryanwang * @date : 2019-03-12 */ @Data diff --git a/src/main/java/run/halo/app/model/entity/Menu.java b/src/main/java/run/halo/app/model/entity/Menu.java index fa6d5c656..4a4d9e4b0 100644 --- a/src/main/java/run/halo/app/model/entity/Menu.java +++ b/src/main/java/run/halo/app/model/entity/Menu.java @@ -11,7 +11,7 @@ import javax.persistence.*; /** * Menu entity * - * @author : RYAN0UP + * @author ryanwang * @date : 2019-03-12 */ @Data diff --git a/src/main/java/run/halo/app/model/entity/Photo.java b/src/main/java/run/halo/app/model/entity/Photo.java index add81ffaa..40db592d9 100644 --- a/src/main/java/run/halo/app/model/entity/Photo.java +++ b/src/main/java/run/halo/app/model/entity/Photo.java @@ -12,7 +12,7 @@ import java.util.Date; /** * Photo entity * - * @author : RYAN0UP + * @author ryanwang * @date : 2019-03-12 */ @Data diff --git a/src/main/java/run/halo/app/model/entity/PostTag.java b/src/main/java/run/halo/app/model/entity/PostTag.java index 2eb892d63..bb1126068 100644 --- a/src/main/java/run/halo/app/model/entity/PostTag.java +++ b/src/main/java/run/halo/app/model/entity/PostTag.java @@ -11,7 +11,7 @@ import java.util.Objects; /** * Post tag entity. * - * @author : RYAN0UP + * @author ryanwang * @date : 2019-03-12 */ @Data diff --git a/src/main/java/run/halo/app/model/entity/Tag.java b/src/main/java/run/halo/app/model/entity/Tag.java index 04f61fc8c..7c8f4677a 100644 --- a/src/main/java/run/halo/app/model/entity/Tag.java +++ b/src/main/java/run/halo/app/model/entity/Tag.java @@ -11,7 +11,7 @@ import javax.persistence.*; /** * Tag entity * - * @author : RYAN0UP + * @author ryanwang * @date : 2019-03-12 */ @Data diff --git a/src/main/java/run/halo/app/model/entity/User.java b/src/main/java/run/halo/app/model/entity/User.java index 94f52aeea..e7669da10 100644 --- a/src/main/java/run/halo/app/model/entity/User.java +++ b/src/main/java/run/halo/app/model/entity/User.java @@ -14,7 +14,7 @@ import java.util.Date; /** * User entity * - * @author : RYAN0UP + * @author ryanwang * @date : 2019-03-12 */ @Data diff --git a/src/main/java/run/halo/app/model/enums/AttachmentType.java b/src/main/java/run/halo/app/model/enums/AttachmentType.java index d2e1c7a5d..db1626846 100644 --- a/src/main/java/run/halo/app/model/enums/AttachmentType.java +++ b/src/main/java/run/halo/app/model/enums/AttachmentType.java @@ -3,7 +3,7 @@ package run.halo.app.model.enums; /** * Attach origin. * - * @author : RYAN0UP + * @author ryanwang * @date : 2019-03-12 */ public enum AttachmentType implements ValueEnum { diff --git a/src/main/java/run/halo/app/model/freemarker/method/RandomMethod.java b/src/main/java/run/halo/app/model/freemarker/method/RandomMethod.java index b688fa49c..fcb84788d 100644 --- a/src/main/java/run/halo/app/model/freemarker/method/RandomMethod.java +++ b/src/main/java/run/halo/app/model/freemarker/method/RandomMethod.java @@ -9,7 +9,7 @@ import org.springframework.stereotype.Component; import java.util.List; /** - * @author : RYAN0UP + * @author ryanwang * @date : 2018/12/21 */ @Component diff --git a/src/main/java/run/halo/app/model/freemarker/method/RecentCommentsMethod.java b/src/main/java/run/halo/app/model/freemarker/method/RecentCommentsMethod.java index 46f06c77c..bccb758c3 100644 --- a/src/main/java/run/halo/app/model/freemarker/method/RecentCommentsMethod.java +++ b/src/main/java/run/halo/app/model/freemarker/method/RecentCommentsMethod.java @@ -7,7 +7,7 @@ import org.springframework.stereotype.Component; import java.util.List; /** - * @author : RYAN0UP + * @author ryanwang * @date : 2018/12/31 */ @Component diff --git a/src/main/java/run/halo/app/model/freemarker/method/RecentPostsMethod.java b/src/main/java/run/halo/app/model/freemarker/method/RecentPostsMethod.java index 5d193b242..d1eceb6b9 100644 --- a/src/main/java/run/halo/app/model/freemarker/method/RecentPostsMethod.java +++ b/src/main/java/run/halo/app/model/freemarker/method/RecentPostsMethod.java @@ -7,7 +7,7 @@ import org.springframework.stereotype.Component; import java.util.List; /** - * @author : RYAN0UP + * @author ryanwang * @date : 2018/12/31 */ @Component diff --git a/src/main/java/run/halo/app/model/freemarker/tag/CategoryTagDirective.java b/src/main/java/run/halo/app/model/freemarker/tag/CategoryTagDirective.java index 6f0130b71..502247793 100644 --- a/src/main/java/run/halo/app/model/freemarker/tag/CategoryTagDirective.java +++ b/src/main/java/run/halo/app/model/freemarker/tag/CategoryTagDirective.java @@ -12,7 +12,7 @@ import java.util.Map; /** * Freemarker custom tag of category. * - * @author : RYAN0UP + * @author ryanwang * @date : 2019/3/22 */ @Component diff --git a/src/main/java/run/halo/app/model/freemarker/tag/CommentTagDirective.java b/src/main/java/run/halo/app/model/freemarker/tag/CommentTagDirective.java index 027c2caa3..6b0bbfcf4 100644 --- a/src/main/java/run/halo/app/model/freemarker/tag/CommentTagDirective.java +++ b/src/main/java/run/halo/app/model/freemarker/tag/CommentTagDirective.java @@ -12,7 +12,7 @@ import java.util.Map; /** * Freemarker custom tag of comment. * - * @author : RYAN0UP + * @author ryanwang * @date : 2019/3/22 */ @Component diff --git a/src/main/java/run/halo/app/model/freemarker/tag/LinkTagDirective.java b/src/main/java/run/halo/app/model/freemarker/tag/LinkTagDirective.java index c1a41a7b6..07e74bfea 100644 --- a/src/main/java/run/halo/app/model/freemarker/tag/LinkTagDirective.java +++ b/src/main/java/run/halo/app/model/freemarker/tag/LinkTagDirective.java @@ -15,7 +15,7 @@ import static org.springframework.data.domain.Sort.Direction.DESC; /** * Freemarker custom tag of link. * - * @author : RYAN0UP + * @author ryanwang * @date : 2019/3/22 */ @Component diff --git a/src/main/java/run/halo/app/model/freemarker/tag/MenuTagDirective.java b/src/main/java/run/halo/app/model/freemarker/tag/MenuTagDirective.java index 417e10750..9e67984c7 100644 --- a/src/main/java/run/halo/app/model/freemarker/tag/MenuTagDirective.java +++ b/src/main/java/run/halo/app/model/freemarker/tag/MenuTagDirective.java @@ -12,7 +12,7 @@ import java.util.Map; /** * Freemarker custom tag of menu. * - * @author : RYAN0UP + * @author ryanwang * @date : 2019/3/22 */ @Component diff --git a/src/main/java/run/halo/app/model/freemarker/tag/PhotoTagDirective.java b/src/main/java/run/halo/app/model/freemarker/tag/PhotoTagDirective.java index d73840142..c3dae5052 100644 --- a/src/main/java/run/halo/app/model/freemarker/tag/PhotoTagDirective.java +++ b/src/main/java/run/halo/app/model/freemarker/tag/PhotoTagDirective.java @@ -15,7 +15,7 @@ import static org.springframework.data.domain.Sort.Direction.DESC; /** * Freemarker custom tag of photo. * - * @author : RYAN0UP + * @author ryanwang * @date : 2019/4/21 */ @Component diff --git a/src/main/java/run/halo/app/model/freemarker/tag/PostTagDirective.java b/src/main/java/run/halo/app/model/freemarker/tag/PostTagDirective.java index 77be6eb06..6703f3566 100644 --- a/src/main/java/run/halo/app/model/freemarker/tag/PostTagDirective.java +++ b/src/main/java/run/halo/app/model/freemarker/tag/PostTagDirective.java @@ -12,7 +12,7 @@ import java.util.Map; /** * Freemarker custom tag of post. * - * @author : RYAN0UP + * @author ryanwang * @date : 2018/4/26 */ @Component diff --git a/src/main/java/run/halo/app/model/freemarker/tag/TagTagDirective.java b/src/main/java/run/halo/app/model/freemarker/tag/TagTagDirective.java index e4d9a6499..d63a0d5e8 100644 --- a/src/main/java/run/halo/app/model/freemarker/tag/TagTagDirective.java +++ b/src/main/java/run/halo/app/model/freemarker/tag/TagTagDirective.java @@ -12,7 +12,7 @@ import java.util.Map; /** * Freemarker custom tag of tag. * - * @author : RYAN0UP + * @author ryanwang * @date : 2019/3/22 */ @Component diff --git a/src/main/java/run/halo/app/model/params/AttachmentParam.java b/src/main/java/run/halo/app/model/params/AttachmentParam.java index 0d13a4ea4..36891b129 100644 --- a/src/main/java/run/halo/app/model/params/AttachmentParam.java +++ b/src/main/java/run/halo/app/model/params/AttachmentParam.java @@ -10,7 +10,7 @@ import javax.validation.constraints.Size; /** * Attachment params. * - * @author : RYAN0UP + * @author ryanwang * @date : 2019/04/20 */ @Data diff --git a/src/main/java/run/halo/app/model/params/AttachmentQuery.java b/src/main/java/run/halo/app/model/params/AttachmentQuery.java index bda57794f..e8c71a306 100644 --- a/src/main/java/run/halo/app/model/params/AttachmentQuery.java +++ b/src/main/java/run/halo/app/model/params/AttachmentQuery.java @@ -6,7 +6,7 @@ import run.halo.app.model.enums.AttachmentType; /** * Attachment query params. * - * @author : RYAN0UP + * @author ryanwang * @date : 2019/04/18 */ @Data diff --git a/src/main/java/run/halo/app/model/params/CommentQuery.java b/src/main/java/run/halo/app/model/params/CommentQuery.java index ab86fec7b..159e7d945 100644 --- a/src/main/java/run/halo/app/model/params/CommentQuery.java +++ b/src/main/java/run/halo/app/model/params/CommentQuery.java @@ -6,7 +6,7 @@ import run.halo.app.model.enums.CommentStatus; /** * Comment query params. * - * @author : RYAN0UP + * @author ryanwang * @date : 2019/04/18 */ @Data diff --git a/src/main/java/run/halo/app/model/params/JournalQuery.java b/src/main/java/run/halo/app/model/params/JournalQuery.java new file mode 100644 index 000000000..06cb654eb --- /dev/null +++ b/src/main/java/run/halo/app/model/params/JournalQuery.java @@ -0,0 +1,18 @@ +package run.halo.app.model.params; + +import lombok.Data; + +/** + * Journal query params. + * + * @author ryanwang + * @date : 2019/04/26 + */ +@Data +public class JournalQuery { + + /** + * Keyword. + */ + private String keyword; +} diff --git a/src/main/java/run/halo/app/model/params/PhotoParam.java b/src/main/java/run/halo/app/model/params/PhotoParam.java index 12904d959..ebf8dc5fd 100644 --- a/src/main/java/run/halo/app/model/params/PhotoParam.java +++ b/src/main/java/run/halo/app/model/params/PhotoParam.java @@ -10,7 +10,7 @@ import java.util.Date; /** * Post param. * - * @author RYAN0UP + * @author ryanwang * @date 2019/04/25 */ @Data diff --git a/src/main/java/run/halo/app/model/params/PhotoQuery.java b/src/main/java/run/halo/app/model/params/PhotoQuery.java index d8bf81eab..90f36e26c 100644 --- a/src/main/java/run/halo/app/model/params/PhotoQuery.java +++ b/src/main/java/run/halo/app/model/params/PhotoQuery.java @@ -5,7 +5,7 @@ import lombok.Data; /** * Photo query params. * - * @author : RYAN0UP + * @author ryanwang * @date : 2019/04/25 */ @Data diff --git a/src/main/java/run/halo/app/model/properties/BlogProperties.java b/src/main/java/run/halo/app/model/properties/BlogProperties.java index c825b07fe..14b496177 100644 --- a/src/main/java/run/halo/app/model/properties/BlogProperties.java +++ b/src/main/java/run/halo/app/model/properties/BlogProperties.java @@ -1,7 +1,7 @@ package run.halo.app.model.properties; /** - * @author : RYAN0UP + * @author ryanwang * @date : 2019-03-17 */ public enum BlogProperties implements PropertyEnum { diff --git a/src/main/java/run/halo/app/model/support/BackupDto.java b/src/main/java/run/halo/app/model/support/BackupDto.java index 887750e9a..b9bcea8e3 100644 --- a/src/main/java/run/halo/app/model/support/BackupDto.java +++ b/src/main/java/run/halo/app/model/support/BackupDto.java @@ -9,7 +9,7 @@ import java.util.Date; * 备份信息 * * - * @author : RYAN0UP + * @author ryanwang * @date : 2018/6/4 */ @Data diff --git a/src/main/java/run/halo/app/model/support/HaloConst.java b/src/main/java/run/halo/app/model/support/HaloConst.java index f7f1e177a..27a200d67 100644 --- a/src/main/java/run/halo/app/model/support/HaloConst.java +++ b/src/main/java/run/halo/app/model/support/HaloConst.java @@ -5,7 +5,7 @@ package run.halo.app.model.support; * 公共常量 * * - * @author : RYAN0UP + * @author ryanwang * @date : 2017/12/29 */ public class HaloConst { diff --git a/src/main/java/run/halo/app/model/support/LogsRecord.java b/src/main/java/run/halo/app/model/support/LogsRecord.java index c27e32091..2e17ae572 100644 --- a/src/main/java/run/halo/app/model/support/LogsRecord.java +++ b/src/main/java/run/halo/app/model/support/LogsRecord.java @@ -5,7 +5,7 @@ package run.halo.app.model.support; * 日志常量 * * - * @author : RYAN0UP + * @author ryanwang * @date : 2018/1/19 */ public interface LogsRecord { diff --git a/src/main/java/run/halo/app/model/support/ThemeFile.java b/src/main/java/run/halo/app/model/support/ThemeFile.java index 36ab8e8ec..ac70473d6 100644 --- a/src/main/java/run/halo/app/model/support/ThemeFile.java +++ b/src/main/java/run/halo/app/model/support/ThemeFile.java @@ -9,7 +9,7 @@ import java.util.List; /** * Theme file. * - * @author RYAN0UP + * @author ryanwang * @date 2019/04/02 */ @Data diff --git a/src/main/java/run/halo/app/model/vo/LinkTeamVO.java b/src/main/java/run/halo/app/model/vo/LinkTeamVO.java index 55bc0aeba..fb1edd546 100644 --- a/src/main/java/run/halo/app/model/vo/LinkTeamVO.java +++ b/src/main/java/run/halo/app/model/vo/LinkTeamVO.java @@ -9,7 +9,7 @@ import java.util.List; /** * Link team vo. * - * @author : RYAN0UP + * @author ryanwang * @date : 2019/3/22 */ @Data diff --git a/src/main/java/run/halo/app/model/vo/MenuVO.java b/src/main/java/run/halo/app/model/vo/MenuVO.java index 969612ea1..d58278786 100644 --- a/src/main/java/run/halo/app/model/vo/MenuVO.java +++ b/src/main/java/run/halo/app/model/vo/MenuVO.java @@ -6,7 +6,7 @@ import run.halo.app.model.dto.MenuDTO; import java.util.List; /** - * @author : RYAN0UP + * @author ryanwang * @date : 2019-04-07 */ @Data diff --git a/src/main/java/run/halo/app/model/vo/PhotoTeamVO.java b/src/main/java/run/halo/app/model/vo/PhotoTeamVO.java index fa2fc9338..af06cf70e 100644 --- a/src/main/java/run/halo/app/model/vo/PhotoTeamVO.java +++ b/src/main/java/run/halo/app/model/vo/PhotoTeamVO.java @@ -9,7 +9,7 @@ import java.util.List; /** * Link team vo. * - * @author : RYAN0UP + * @author ryanwang * @date : 2019/3/22 */ @Data diff --git a/src/main/java/run/halo/app/repository/JournalRepository.java b/src/main/java/run/halo/app/repository/JournalRepository.java index dca4d841a..b7e28a2c5 100644 --- a/src/main/java/run/halo/app/repository/JournalRepository.java +++ b/src/main/java/run/halo/app/repository/JournalRepository.java @@ -1,5 +1,6 @@ package run.halo.app.repository; +import org.springframework.data.jpa.repository.JpaSpecificationExecutor; import run.halo.app.model.entity.Journal; import run.halo.app.repository.base.BaseRepository; @@ -9,6 +10,6 @@ import run.halo.app.repository.base.BaseRepository; * @author johnniang * @date 3/22/19 */ -public interface JournalRepository extends BaseRepository { +public interface JournalRepository extends BaseRepository, JpaSpecificationExecutor { } diff --git a/src/main/java/run/halo/app/repository/PostRepository.java b/src/main/java/run/halo/app/repository/PostRepository.java index ff3ac5597..addac430a 100644 --- a/src/main/java/run/halo/app/repository/PostRepository.java +++ b/src/main/java/run/halo/app/repository/PostRepository.java @@ -10,7 +10,7 @@ import run.halo.app.repository.base.BasePostRepository; * Post repository. * * @author johnniang - * @author RYAN0UP + * @author ryanwang */ public interface PostRepository extends BasePostRepository, JpaSpecificationExecutor { diff --git a/src/main/java/run/halo/app/service/JournalService.java b/src/main/java/run/halo/app/service/JournalService.java index daf684cec..12a2297de 100644 --- a/src/main/java/run/halo/app/service/JournalService.java +++ b/src/main/java/run/halo/app/service/JournalService.java @@ -8,6 +8,7 @@ import run.halo.app.model.dto.JournalDTO; import run.halo.app.model.dto.JournalWithCmtCountDTO; import run.halo.app.model.entity.Journal; import run.halo.app.model.params.JournalParam; +import run.halo.app.model.params.JournalQuery; import run.halo.app.service.base.CrudService; import java.util.List; @@ -16,6 +17,7 @@ import java.util.List; * Journal service interface. * * @author johnniang + * @author ryanwang * @date 19-4-24 */ public interface JournalService extends CrudService { @@ -37,6 +39,16 @@ public interface JournalService extends CrudService { */ Page pageLatest(int top); + /** + * Pages journals. + * + * @param journalQuery journal query must not be null + * @param pageable page info must not be null + * @return a page of post + */ + @NonNull + Page pageBy(@NonNull JournalQuery journalQuery, @NonNull Pageable pageable); + /** * Converts to journal dto. * diff --git a/src/main/java/run/halo/app/service/MailService.java b/src/main/java/run/halo/app/service/MailService.java index 1cc202341..e64a5c050 100644 --- a/src/main/java/run/halo/app/service/MailService.java +++ b/src/main/java/run/halo/app/service/MailService.java @@ -5,7 +5,7 @@ import java.util.Map; /** * Mail server * - * @author : RYAN0UP + * @author ryanwang * @date : 2019-03-17 */ public interface MailService { diff --git a/src/main/java/run/halo/app/service/MenuService.java b/src/main/java/run/halo/app/service/MenuService.java index 173c5fdd6..8f099d8e1 100644 --- a/src/main/java/run/halo/app/service/MenuService.java +++ b/src/main/java/run/halo/app/service/MenuService.java @@ -14,7 +14,7 @@ import java.util.List; * Menu service. * * @author johnniang - * @author RYAN0UP + * @author ryanwang */ public interface MenuService extends CrudService { diff --git a/src/main/java/run/halo/app/service/PostService.java b/src/main/java/run/halo/app/service/PostService.java index 47609f2c4..c309132ac 100755 --- a/src/main/java/run/halo/app/service/PostService.java +++ b/src/main/java/run/halo/app/service/PostService.java @@ -20,7 +20,7 @@ import java.util.Set; * Post service. * * @author johnniang - * @author RYAN0UP + * @author ryanwang */ public interface PostService extends BasePostService { diff --git a/src/main/java/run/halo/app/service/ThemeService.java b/src/main/java/run/halo/app/service/ThemeService.java index 269933e5e..50fa5628f 100644 --- a/src/main/java/run/halo/app/service/ThemeService.java +++ b/src/main/java/run/halo/app/service/ThemeService.java @@ -14,7 +14,7 @@ import java.util.Optional; import java.util.Set; /** - * @author : RYAN0UP + * @author ryanwang * @date : 2019/3/26 */ public interface ThemeService { diff --git a/src/main/java/run/halo/app/service/impl/AttachmentServiceImpl.java b/src/main/java/run/halo/app/service/impl/AttachmentServiceImpl.java index f2735f5af..f778a5c9e 100644 --- a/src/main/java/run/halo/app/service/impl/AttachmentServiceImpl.java +++ b/src/main/java/run/halo/app/service/impl/AttachmentServiceImpl.java @@ -30,7 +30,7 @@ import java.util.Objects; /** * AttachmentService implementation * - * @author : RYAN0UP + * @author ryanwang * @date : 2019-03-14 */ @Slf4j diff --git a/src/main/java/run/halo/app/service/impl/CategoryServiceImpl.java b/src/main/java/run/halo/app/service/impl/CategoryServiceImpl.java index 5c82a6b93..c4466df4a 100644 --- a/src/main/java/run/halo/app/service/impl/CategoryServiceImpl.java +++ b/src/main/java/run/halo/app/service/impl/CategoryServiceImpl.java @@ -24,7 +24,7 @@ import java.util.stream.Collectors; /** * CategoryService implementation class * - * @author : RYAN0UP + * @author ryanwang * @date : 2019-03-14 */ @Slf4j diff --git a/src/main/java/run/halo/app/service/impl/JournalServiceImpl.java b/src/main/java/run/halo/app/service/impl/JournalServiceImpl.java index ccb411934..f974905f4 100644 --- a/src/main/java/run/halo/app/service/impl/JournalServiceImpl.java +++ b/src/main/java/run/halo/app/service/impl/JournalServiceImpl.java @@ -1,7 +1,11 @@ package run.halo.app.service.impl; +import org.apache.commons.lang3.StringUtils; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageImpl; +import org.springframework.data.domain.Pageable; +import org.springframework.data.jpa.domain.Specification; +import org.springframework.lang.NonNull; import org.springframework.stereotype.Service; import org.springframework.util.Assert; import org.springframework.util.CollectionUtils; @@ -9,22 +13,22 @@ import run.halo.app.model.dto.JournalDTO; import run.halo.app.model.dto.JournalWithCmtCountDTO; import run.halo.app.model.entity.Journal; import run.halo.app.model.params.JournalParam; +import run.halo.app.model.params.JournalQuery; import run.halo.app.repository.JournalRepository; import run.halo.app.service.JournalCommentService; import run.halo.app.service.JournalService; import run.halo.app.service.base.AbstractCrudService; import run.halo.app.utils.ServiceUtils; -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.Set; +import javax.persistence.criteria.Predicate; +import java.util.*; import java.util.stream.Collectors; /** * Journal service implementation. * * @author johnniang + * @author ryanwang * @date 19-4-24 */ @Service @@ -53,6 +57,13 @@ public class JournalServiceImpl extends AbstractCrudService im return listAll(ServiceUtils.buildLatestPageable(top)); } + @Override + public Page pageBy(JournalQuery journalQuery, Pageable pageable) { + Assert.notNull(journalQuery, "Journal query must not be null"); + Assert.notNull(pageable, "Page info must not be null"); + return journalRepository.findAll(buildSpecByQuery(journalQuery), pageable); + } + @Override public JournalDTO convertTo(Journal journal) { Assert.notNull(journal, "Journal must not be null"); @@ -94,4 +105,30 @@ public class JournalServiceImpl extends AbstractCrudService im } + /** + * Build specification by journal query. + * + * @param journalQuery query query must not be null + * @return a query specification + */ + @NonNull + private Specification buildSpecByQuery(@NonNull JournalQuery journalQuery) { + Assert.notNull(journalQuery, "Journal query must not be null"); + + return (Specification) (root, query, criteriaBuilder) -> { + List predicates = new LinkedList<>(); + + if (journalQuery.getKeyword() != null) { + // Format like condition + String likeCondition = String.format("%%%s%%", StringUtils.strip(journalQuery.getKeyword())); + + // Build like predicate + Predicate contentLike = criteriaBuilder.like(root.get("content"), likeCondition); + + predicates.add(criteriaBuilder.or(contentLike)); + } + + return query.where(predicates.toArray(new Predicate[0])).getRestriction(); + }; + } } diff --git a/src/main/java/run/halo/app/service/impl/LinkServiceImpl.java b/src/main/java/run/halo/app/service/impl/LinkServiceImpl.java index 6376be411..3b8d8c620 100644 --- a/src/main/java/run/halo/app/service/impl/LinkServiceImpl.java +++ b/src/main/java/run/halo/app/service/impl/LinkServiceImpl.java @@ -23,7 +23,7 @@ import java.util.stream.Collectors; /** * LinkService implementation class * - * @author : RYAN0UP + * @author ryanwang * @date : 2019-03-14 */ @Service diff --git a/src/main/java/run/halo/app/service/impl/LogServiceImpl.java b/src/main/java/run/halo/app/service/impl/LogServiceImpl.java index ac6966d25..5fb0e8067 100644 --- a/src/main/java/run/halo/app/service/impl/LogServiceImpl.java +++ b/src/main/java/run/halo/app/service/impl/LogServiceImpl.java @@ -14,7 +14,7 @@ import org.springframework.util.Assert; /** * LogService implementation class * - * @author : RYAN0UP + * @author ryanwang * @date : 2019-03-14 */ @Service diff --git a/src/main/java/run/halo/app/service/impl/MailServiceImpl.java b/src/main/java/run/halo/app/service/impl/MailServiceImpl.java index 3e5285313..8895624e9 100644 --- a/src/main/java/run/halo/app/service/impl/MailServiceImpl.java +++ b/src/main/java/run/halo/app/service/impl/MailServiceImpl.java @@ -19,7 +19,7 @@ import java.util.Properties; /** * Mail service implementation. * - * @author : RYAN0UP + * @author ryanwang * @date : 2019-03-17 */ @Slf4j diff --git a/src/main/java/run/halo/app/service/impl/MenuServiceImpl.java b/src/main/java/run/halo/app/service/impl/MenuServiceImpl.java index eab322ff2..559e9aeee 100644 --- a/src/main/java/run/halo/app/service/impl/MenuServiceImpl.java +++ b/src/main/java/run/halo/app/service/impl/MenuServiceImpl.java @@ -22,7 +22,7 @@ import java.util.stream.Collectors; /** * MenuService implementation class * - * @author : RYAN0UP + * @author ryanwang * @date : 2019-03-14 */ @Service diff --git a/src/main/java/run/halo/app/service/impl/OptionServiceImpl.java b/src/main/java/run/halo/app/service/impl/OptionServiceImpl.java index 2340bb47c..197ef8cee 100644 --- a/src/main/java/run/halo/app/service/impl/OptionServiceImpl.java +++ b/src/main/java/run/halo/app/service/impl/OptionServiceImpl.java @@ -28,7 +28,7 @@ import java.util.stream.Collectors; /** * OptionService implementation class * - * @author : RYAN0UP + * @author ryanwang * @date : 2019-03-14 */ @Slf4j diff --git a/src/main/java/run/halo/app/service/impl/PhotoServiceImpl.java b/src/main/java/run/halo/app/service/impl/PhotoServiceImpl.java index 7d341a258..d8a9b46fa 100644 --- a/src/main/java/run/halo/app/service/impl/PhotoServiceImpl.java +++ b/src/main/java/run/halo/app/service/impl/PhotoServiceImpl.java @@ -28,7 +28,7 @@ import java.util.stream.Collectors; /** * PhotoService implementation class * - * @author : RYAN0UP + * @author ryanwang * @date : 2019-03-14 */ @Service diff --git a/src/main/java/run/halo/app/service/impl/PostCommentServiceImpl.java b/src/main/java/run/halo/app/service/impl/PostCommentServiceImpl.java index 458e9b63d..8ce5d1302 100644 --- a/src/main/java/run/halo/app/service/impl/PostCommentServiceImpl.java +++ b/src/main/java/run/halo/app/service/impl/PostCommentServiceImpl.java @@ -27,7 +27,7 @@ import java.util.stream.Collectors; /** * PostCommentService implementation class * - * @author : RYAN0UP + * @author ryanwang * @date : 2019-03-14 */ @Slf4j diff --git a/src/main/java/run/halo/app/service/impl/PostServiceImpl.java b/src/main/java/run/halo/app/service/impl/PostServiceImpl.java index d4916247b..b49711912 100644 --- a/src/main/java/run/halo/app/service/impl/PostServiceImpl.java +++ b/src/main/java/run/halo/app/service/impl/PostServiceImpl.java @@ -41,7 +41,7 @@ import static org.springframework.data.domain.Sort.Direction.DESC; * Post service implementation. * * @author johnniang - * @author RYAN0UP + * @author ryanwang */ @Slf4j @Service diff --git a/src/main/java/run/halo/app/service/impl/TagServiceImpl.java b/src/main/java/run/halo/app/service/impl/TagServiceImpl.java index ae53bec83..67896e3d4 100644 --- a/src/main/java/run/halo/app/service/impl/TagServiceImpl.java +++ b/src/main/java/run/halo/app/service/impl/TagServiceImpl.java @@ -19,7 +19,7 @@ import java.util.stream.Collectors; /** * TagService implementation class * - * @author : RYAN0UP + * @author ryanwang * @date : 2019-03-14 */ @Slf4j 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 cf2350d99..14123081a 100644 --- a/src/main/java/run/halo/app/service/impl/ThemeServiceImpl.java +++ b/src/main/java/run/halo/app/service/impl/ThemeServiceImpl.java @@ -51,7 +51,7 @@ import java.util.zip.ZipInputStream; import static run.halo.app.model.support.HaloConst.DEFAULT_THEME_ID; /** - * @author : RYAN0UP + * @author ryanwang * @date : 2019/3/26 */ @Slf4j diff --git a/src/main/java/run/halo/app/service/impl/UserServiceImpl.java b/src/main/java/run/halo/app/service/impl/UserServiceImpl.java index b11ecbf06..4f1ce1d33 100644 --- a/src/main/java/run/halo/app/service/impl/UserServiceImpl.java +++ b/src/main/java/run/halo/app/service/impl/UserServiceImpl.java @@ -32,7 +32,7 @@ import java.util.concurrent.TimeUnit; /** * UserService implementation class * - * @author : RYAN0UP + * @author ryanwang * @date : 2019-03-14 */ @Service diff --git a/src/main/java/run/halo/app/utils/HaloUtils.java b/src/main/java/run/halo/app/utils/HaloUtils.java index 5d5d9e924..6e54f272d 100755 --- a/src/main/java/run/halo/app/utils/HaloUtils.java +++ b/src/main/java/run/halo/app/utils/HaloUtils.java @@ -25,7 +25,7 @@ import java.util.UUID; * 常用工具 * * - * @author : RYAN0UP + * @author ryanwang * @date : 2017/12/22 */ @Slf4j diff --git a/src/main/java/run/halo/app/utils/MarkdownUtils.java b/src/main/java/run/halo/app/utils/MarkdownUtils.java index 719f8ed8d..5ad0c6bf2 100644 --- a/src/main/java/run/halo/app/utils/MarkdownUtils.java +++ b/src/main/java/run/halo/app/utils/MarkdownUtils.java @@ -17,7 +17,7 @@ import java.util.Set; /** * Markdown utils * - * @author : RYAN0UP + * @author ryanwang * @date : 2018/11/14 */ public class MarkdownUtils { diff --git a/src/test/java/run/halo/app/utils/DemoUtilTest.java b/src/test/java/run/halo/app/utils/DemoUtilTest.java index 67135607b..cb7bd4db5 100644 --- a/src/test/java/run/halo/app/utils/DemoUtilTest.java +++ b/src/test/java/run/halo/app/utils/DemoUtilTest.java @@ -3,7 +3,7 @@ package run.halo.app.utils; import org.junit.Test; /** - * @author : RYAN0UP + * @author ryanwang * @date : 2017/12/26 * @version : 1.0 * description: