From b0b852a8038a180c601dbf638dbc25c202b3e1ed Mon Sep 17 00:00:00 2001 From: johnniang Date: Tue, 19 Mar 2019 11:19:23 +0800 Subject: [PATCH] Rename ErrorResponse into BaseResponse --- .../{ErrorResponse.java => BaseResponse.java} | 2 +- .../DefaultAuthenticationFailureHandler.java | 4 ++-- .../cc/ryanc/halo/service/CommentService.java | 2 +- .../cc/ryanc/halo/service/LogService.java | 2 +- .../cc/ryanc/halo/service/PostService.java | 2 +- .../halo/service/impl/CommentServiceImpl.java | 2 +- .../halo/service/impl/LogServiceImpl.java | 2 +- .../halo/service/impl/OptionServiceImpl.java | 24 +++++++++---------- .../halo/service/impl/PostServiceImpl.java | 2 +- .../web/controller/admin/AdminController.java | 6 ++--- src/main/resources/application-dev.yaml | 2 +- 11 files changed, 25 insertions(+), 25 deletions(-) rename src/main/java/cc/ryanc/halo/model/support/{ErrorResponse.java => BaseResponse.java} (91%) diff --git a/src/main/java/cc/ryanc/halo/model/support/ErrorResponse.java b/src/main/java/cc/ryanc/halo/model/support/BaseResponse.java similarity index 91% rename from src/main/java/cc/ryanc/halo/model/support/ErrorResponse.java rename to src/main/java/cc/ryanc/halo/model/support/BaseResponse.java index 04a8ac91e..5dcccdcb6 100644 --- a/src/main/java/cc/ryanc/halo/model/support/ErrorResponse.java +++ b/src/main/java/cc/ryanc/halo/model/support/BaseResponse.java @@ -12,7 +12,7 @@ import lombok.*; @EqualsAndHashCode @NoArgsConstructor @AllArgsConstructor -public class ErrorResponse { +public class BaseResponse { private Integer status; diff --git a/src/main/java/cc/ryanc/halo/security/handler/DefaultAuthenticationFailureHandler.java b/src/main/java/cc/ryanc/halo/security/handler/DefaultAuthenticationFailureHandler.java index c2d6c2956..9518cdb55 100644 --- a/src/main/java/cc/ryanc/halo/security/handler/DefaultAuthenticationFailureHandler.java +++ b/src/main/java/cc/ryanc/halo/security/handler/DefaultAuthenticationFailureHandler.java @@ -1,7 +1,7 @@ package cc.ryanc.halo.security.handler; import cc.ryanc.halo.exception.HaloException; -import cc.ryanc.halo.model.support.ErrorResponse; +import cc.ryanc.halo.model.support.BaseResponse; import cc.ryanc.halo.utils.ExceptionUtils; import cn.hutool.extra.servlet.ServletUtil; import com.fasterxml.jackson.databind.ObjectMapper; @@ -36,7 +36,7 @@ public class DefaultAuthenticationFailureHandler implements AuthenticationFailur public void onFailure(HttpServletRequest request, HttpServletResponse response, HaloException exception) throws IOException, ServletException { log.warn("Handle unsuccessful authentication, ip: [{}]", ServletUtil.getClientIP(request)); - ErrorResponse errorDetail = new ErrorResponse(); + BaseResponse errorDetail = new BaseResponse(); errorDetail.setMessage(exception.getMessage()); diff --git a/src/main/java/cc/ryanc/halo/service/CommentService.java b/src/main/java/cc/ryanc/halo/service/CommentService.java index 02faf78d7..0712bf1c6 100644 --- a/src/main/java/cc/ryanc/halo/service/CommentService.java +++ b/src/main/java/cc/ryanc/halo/service/CommentService.java @@ -18,5 +18,5 @@ public interface CommentService extends CrudService { * @param top top number must not be less than 0 * @return a page of comments */ - Page listLatest(int top); + Page pageLatest(int top); } diff --git a/src/main/java/cc/ryanc/halo/service/LogService.java b/src/main/java/cc/ryanc/halo/service/LogService.java index a07bb5acd..21d6f4e8f 100644 --- a/src/main/java/cc/ryanc/halo/service/LogService.java +++ b/src/main/java/cc/ryanc/halo/service/LogService.java @@ -18,5 +18,5 @@ public interface LogService extends CrudService { * @param top top number must not be less than 0 * @return a page of latest logs */ - Page listLatest(int top); + Page pageLatest(int top); } diff --git a/src/main/java/cc/ryanc/halo/service/PostService.java b/src/main/java/cc/ryanc/halo/service/PostService.java index 3744a22e1..a16a0efc9 100755 --- a/src/main/java/cc/ryanc/halo/service/PostService.java +++ b/src/main/java/cc/ryanc/halo/service/PostService.java @@ -44,7 +44,7 @@ public interface PostService extends CrudService { * @return latest posts */ @NonNull - Page listLatest(int top); + Page pageLatest(int top); /** * List by status and type diff --git a/src/main/java/cc/ryanc/halo/service/impl/CommentServiceImpl.java b/src/main/java/cc/ryanc/halo/service/impl/CommentServiceImpl.java index 64b20aa11..6f33789d8 100644 --- a/src/main/java/cc/ryanc/halo/service/impl/CommentServiceImpl.java +++ b/src/main/java/cc/ryanc/halo/service/impl/CommentServiceImpl.java @@ -39,7 +39,7 @@ public class CommentServiceImpl extends AbstractCrudService imple } @Override - public Page listLatest(int top) { + public Page pageLatest(int top) { Assert.isTrue(top > 0, "Top number must not be less than 0"); // Build page request diff --git a/src/main/java/cc/ryanc/halo/service/impl/LogServiceImpl.java b/src/main/java/cc/ryanc/halo/service/impl/LogServiceImpl.java index fb50adcf8..a14599a0f 100644 --- a/src/main/java/cc/ryanc/halo/service/impl/LogServiceImpl.java +++ b/src/main/java/cc/ryanc/halo/service/impl/LogServiceImpl.java @@ -28,7 +28,7 @@ public class LogServiceImpl extends AbstractCrudService implements Lo } @Override - public Page listLatest(int top) { + public Page pageLatest(int top) { Assert.isTrue(top > 0, "Top number must not be less than 0"); // Build page request diff --git a/src/main/java/cc/ryanc/halo/service/impl/OptionServiceImpl.java b/src/main/java/cc/ryanc/halo/service/impl/OptionServiceImpl.java index 34f6a5eac..a7176101a 100644 --- a/src/main/java/cc/ryanc/halo/service/impl/OptionServiceImpl.java +++ b/src/main/java/cc/ryanc/halo/service/impl/OptionServiceImpl.java @@ -30,7 +30,7 @@ public class OptionServiceImpl extends AbstractCrudService impl } /** - * Save one option + * Saves one option * * @param key key * @param value value @@ -45,24 +45,24 @@ public class OptionServiceImpl extends AbstractCrudService impl return; } - Option options = optionRepository.findByOptionKey(key).map(option -> { + Option option = optionRepository.findByOptionKey(key).map(anOption -> { // Exist - option.setOptionValue(value); - return option; + anOption.setOptionValue(value); + return anOption; }).orElseGet(() -> { // Not exist - Option option = new Option(); - option.setOptionKey(key); - option.setOptionValue(value); - return option; + Option anOption = new Option(); + anOption.setOptionKey(key); + anOption.setOptionValue(value); + return anOption; }); // Save or update the options - optionRepository.save(options); + optionRepository.save(option); } /** - * Save multiple options + * Saves multiple options * * @param options options */ @@ -74,7 +74,7 @@ public class OptionServiceImpl extends AbstractCrudService impl } /** - * Get all options + * Gets all options * * @return Map */ @@ -84,7 +84,7 @@ public class OptionServiceImpl extends AbstractCrudService impl } /** - * Get option by key + * Gets option by key * * @param key key * @return String 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 68dfd07f1..fbf191e70 100644 --- a/src/main/java/cc/ryanc/halo/service/impl/PostServiceImpl.java +++ b/src/main/java/cc/ryanc/halo/service/impl/PostServiceImpl.java @@ -59,7 +59,7 @@ public class PostServiceImpl extends AbstractCrudService implemen } @Override - public Page listLatest(int top) { + public Page pageLatest(int top) { Assert.isTrue(top > 0, "Top number must not be less than 0"); PageRequest latestPageable = PageRequest.of(0, top, Sort.by(Sort.Direction.DESC, "editTime")); 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 a609eae26..e735a856b 100644 --- a/src/main/java/cc/ryanc/halo/web/controller/admin/AdminController.java +++ b/src/main/java/cc/ryanc/halo/web/controller/admin/AdminController.java @@ -52,11 +52,11 @@ public class AdminController { @GetMapping(value = {"", "index"}) public String admin(Model model) { - Page postPage = postService.listLatest(5); + Page postPage = postService.pageLatest(5); - Page commentPage = commentService.listLatest(5); + Page commentPage = commentService.pageLatest(5); - Page logPage = logService.listLatest(5); + Page logPage = logService.pageLatest(5); model.addAttribute("postsCount", postPage.getTotalElements()); model.addAttribute("commentsCount", commentPage.getTotalElements()); diff --git a/src/main/resources/application-dev.yaml b/src/main/resources/application-dev.yaml index 7140a3788..7e17e7d3f 100755 --- a/src/main/resources/application-dev.yaml +++ b/src/main/resources/application-dev.yaml @@ -18,7 +18,7 @@ spring: # H2database 配置 driver-class-name: org.h2.Driver - url: jdbc:h2:file:~/halo/db/halo + url: jdbc:h2:file:~/halo-dev/db/halo username: admin password: 123456