diff --git a/src/main/java/cc/ryanc/halo/logging/Logger.java b/src/main/java/cc/ryanc/halo/logging/Logger.java index 9b3483c67..15dc26ef7 100644 --- a/src/main/java/cc/ryanc/halo/logging/Logger.java +++ b/src/main/java/cc/ryanc/halo/logging/Logger.java @@ -341,9 +341,7 @@ public final class Logger implements org.slf4j.Logger { } @Override - public void warn(Marker marker, String - -format, Object... arguments) { + public void warn(Marker marker, String format, Object... arguments) { if (isWarnEnabled(marker)) { proxy.warn(marker, format, arguments); } diff --git a/src/main/java/cc/ryanc/halo/model/enums/ResponseStatusEnum.java b/src/main/java/cc/ryanc/halo/model/enums/ResponseStatusEnum.java deleted file mode 100644 index 210e1886e..000000000 --- a/src/main/java/cc/ryanc/halo/model/enums/ResponseStatusEnum.java +++ /dev/null @@ -1,48 +0,0 @@ -package cc.ryanc.halo.model.enums; - -/** - * 
- *     请求响应enum
- *
- * - * @author : RYAN0UP - * @date : 2018/7/1 - */ -public enum ResponseStatusEnum { - - /** - * 请求成功 - */ - SUCCESS(200, "OK"), - - /** - * 资源为空 - */ - EMPTY(204, "No Content"), - - /** - * 服务器内部错误 - */ - ERROR(500, "Internal Server Error"), - - /** - * 未找到资源 - */ - NOTFOUND(404, "Not Found"); - - private Integer code; - private String msg; - - ResponseStatusEnum(Integer code, String msg) { - this.code = code; - this.msg = msg; - } - - public Integer getCode() { - return code; - } - - public String getMsg() { - return msg; - } -} diff --git a/src/main/java/cc/ryanc/halo/repository/base/BaseRepositoryImpl.java b/src/main/java/cc/ryanc/halo/repository/base/BaseRepositoryImpl.java index 648e7284c..4ff2c7b2f 100644 --- a/src/main/java/cc/ryanc/halo/repository/base/BaseRepositoryImpl.java +++ b/src/main/java/cc/ryanc/halo/repository/base/BaseRepositoryImpl.java @@ -81,6 +81,7 @@ public class BaseRepositoryImpl extends SimpleJpaRepository root, CriteriaQuery query, CriteriaBuilder cb) { Path path = root.get(this.entityInformation.getIdAttribute()); this.parameter = cb.parameter(Iterable.class); 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 0de1c3008..0014e7ddf 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 @@ -21,6 +21,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.data.web.PageableDefault; +import org.springframework.http.HttpStatus; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.*; @@ -78,6 +79,7 @@ public class AdminController extends BaseController { * 请求后台页面 * * @param model model + * * @return 模板路径admin/admin_index */ @GetMapping(value = {"", "/index"}) @@ -117,6 +119,7 @@ public class AdminController extends BaseController { * 处理跳转到登录页的请求 * * @param session session + * * @return 模板路径admin/admin_login */ @GetMapping(value = "/login") @@ -135,6 +138,7 @@ public class AdminController extends BaseController { * @param loginName 登录名：邮箱／用户名 * @param loginPwd loginPwd 密码 * @param session session session + * * @return JsonResult JsonResult */ @PostMapping(value = "/getLogin") @@ -186,6 +190,7 @@ public class AdminController extends BaseController { * 退出登录 销毁session * * @param session session + * * @return 重定向到/admin/login */ @GetMapping(value = "/logOut") @@ -201,6 +206,7 @@ public class AdminController extends BaseController { * 查看所有日志 * * @param model model model + * * @return 模板路径admin/widget/_logs-all */ @GetMapping(value = "/logs") @@ -244,10 +250,9 @@ public class AdminController extends BaseController { @ResponseBody public JsonResult getToken() { final String token = (System.currentTimeMillis() + new Random().nextInt(999999999)) + ""; - return new JsonResult(ResultCodeEnum.SUCCESS.getCode(), ResponseStatusEnum.SUCCESS.getMsg(), SecureUtil.md5(token)); + return new JsonResult(ResultCodeEnum.SUCCESS.getCode(), HttpStatus.OK.getReasonPhrase(), SecureUtil.md5(token)); } - /** * 小工具 * @@ -273,6 +278,7 @@ public class AdminController extends BaseController { * * @param file file * @param request request + * * @return JsonResult */ @PostMapping(value = "/tools/markdownImport") 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 24bb26564..604d72a65 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 @@ -2,9 +2,9 @@ package cc.ryanc.halo.web.controller.api; import cc.ryanc.halo.model.dto.Archive; import cc.ryanc.halo.model.dto.JsonResult; -import cc.ryanc.halo.model.enums.ResponseStatusEnum; import cc.ryanc.halo.service.PostService; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; import org.springframework.util.CollectionUtils; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -75,9 +75,9 @@ public class ApiArchivesController { public JsonResult archivesYear() { final List archives = postService.findPostGroupByYear(); if (!CollectionUtils.isEmpty(archives)) { - return new JsonResult(ResponseStatusEnum.SUCCESS.getCode(), ResponseStatusEnum.SUCCESS.getMsg(), archives); + return new JsonResult(HttpStatus.OK.value(), HttpStatus.OK.getReasonPhrase(), archives); } else { - return new JsonResult(ResponseStatusEnum.EMPTY.getCode(), ResponseStatusEnum.EMPTY.getMsg()); + return new JsonResult(HttpStatus.NO_CONTENT.value(), HttpStatus.NO_CONTENT.getReasonPhrase()); } } @@ -132,6 +132,7 @@ public class ApiArchivesController { /** * @return JsonResult + * * @Author Aquan * @Description 返回所有文章 * @Date 2019.1.4 11:06 diff --git a/src/main/java/cc/ryanc/halo/web/controller/api/ApiCategoryController.java b/src/main/java/cc/ryanc/halo/web/controller/api/ApiCategoryController.java index 4f7a00b54..1ac9e79d0 100644 --- a/src/main/java/cc/ryanc/halo/web/controller/api/ApiCategoryController.java +++ b/src/main/java/cc/ryanc/halo/web/controller/api/ApiCategoryController.java @@ -3,7 +3,10 @@ package cc.ryanc.halo.web.controller.api; import cc.ryanc.halo.model.domain.Category; import cc.ryanc.halo.service.CategoryService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import java.util.List; @@ -70,6 +73,7 @@ public class ApiCategoryController { *

* * @param cateUrl 分类路径 + * * @return JsonResult */ @GetMapping(value = "/{cateUrl}") 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 acb537482..2a58ecf30 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 @@ -51,6 +51,7 @@ public class ApiCommentController { * @param comment comment * @param postId postId * @param request request + * * @return JsonResult */ @PostMapping(value = "/save") diff --git a/src/main/java/cc/ryanc/halo/web/controller/api/ApiGalleryController.java b/src/main/java/cc/ryanc/halo/web/controller/api/ApiGalleryController.java index 8f3aa0d3d..9c099f8ae 100644 --- a/src/main/java/cc/ryanc/halo/web/controller/api/ApiGalleryController.java +++ b/src/main/java/cc/ryanc/halo/web/controller/api/ApiGalleryController.java @@ -1,14 +1,14 @@ package cc.ryanc.halo.web.controller.api; import cc.ryanc.halo.model.domain.Gallery; -import cc.ryanc.halo.model.dto.JsonResult; -import cc.ryanc.halo.model.enums.ResponseStatusEnum; import cc.ryanc.halo.service.GalleryService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import java.util.List; -import java.util.Optional; /** * 
@@ -81,6 +81,7 @@ public class ApiGalleryController {
      * 

      *
      * @param id id
+     *
      * @return JsonResult
      */
     @GetMapping(value = "/{id}")
diff --git a/src/main/java/cc/ryanc/halo/web/controller/api/ApiLinkController.java b/src/main/java/cc/ryanc/halo/web/controller/api/ApiLinkController.java
index 73ad33e52..9dbdc0792 100644
--- a/src/main/java/cc/ryanc/halo/web/controller/api/ApiLinkController.java
+++ b/src/main/java/cc/ryanc/halo/web/controller/api/ApiLinkController.java
@@ -1,11 +1,8 @@
 package cc.ryanc.halo.web.controller.api;
 
 import cc.ryanc.halo.model.domain.Link;
-import cc.ryanc.halo.model.dto.JsonResult;
-import cc.ryanc.halo.model.enums.ResponseStatusEnum;
 import cc.ryanc.halo.service.LinkService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
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 52a5ba0c2..21517c840 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,12 +1,13 @@
 package cc.ryanc.halo.web.controller.api;
 
 import cc.ryanc.halo.model.dto.JsonResult;
-import cc.ryanc.halo.model.enums.BlogPropertiesEnum;
-import cc.ryanc.halo.model.enums.ResponseStatusEnum;
 import cc.ryanc.halo.service.OptionsService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.util.Map;
 
@@ -75,6 +76,7 @@ public class ApiOptionController {
      * 

      *
      * @param optionName 设置选项名称
+     *
      * @return JsonResult
      */
     @GetMapping(value = "/one")
diff --git a/src/main/java/cc/ryanc/halo/web/controller/api/ApiPageController.java b/src/main/java/cc/ryanc/halo/web/controller/api/ApiPageController.java
index abc2b221e..22bdf8d76 100644
--- a/src/main/java/cc/ryanc/halo/web/controller/api/ApiPageController.java
+++ b/src/main/java/cc/ryanc/halo/web/controller/api/ApiPageController.java
@@ -2,12 +2,13 @@ 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.enums.PostTypeEnum;
-import cc.ryanc.halo.model.enums.ResponseStatusEnum;
 import cc.ryanc.halo.service.PostService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * 
@@ -58,6 +59,7 @@ public class ApiPageController {
      * 

      *
      * @param postId postId
+     *
      * @return JsonResult
      */
     @GetMapping(value = "/{postId}")
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 f35dcb6ef..fbbc8d46b 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
@@ -6,7 +6,6 @@ import cc.ryanc.halo.model.dto.JsonResult;
 import cc.ryanc.halo.model.enums.BlogPropertiesEnum;
 import cc.ryanc.halo.model.enums.PostStatusEnum;
 import cc.ryanc.halo.model.enums.PostTypeEnum;
-import cc.ryanc.halo.model.enums.ResponseStatusEnum;
 import cc.ryanc.halo.service.PostService;
 import cn.hutool.core.util.StrUtil;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -15,7 +14,11 @@ import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.web.SortDefault;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import static cc.ryanc.halo.model.dto.HaloConst.OPTIONS;
 import static org.springframework.data.domain.Sort.Direction.DESC;
@@ -98,6 +101,7 @@ public class ApiPostController {
      * 

      *
      * @param page 页码
+     *
      * @return JsonResult
      */
     @GetMapping(value = "/page/{page}")
@@ -109,9 +113,9 @@ public class ApiPostController {
         final Pageable pageable = PageRequest.of(page - 1, size, sort);
         final Page posts = postService.findPostByStatus(PostStatusEnum.PUBLISHED.getCode(), PostTypeEnum.POST_TYPE_POST.getDesc(), pageable);
         if (null == posts) {
-            return new JsonResult(ResponseStatusEnum.EMPTY.getCode(), ResponseStatusEnum.EMPTY.getMsg());
+            return new JsonResult(HttpStatus.NO_CONTENT.value(), HttpStatus.NO_CONTENT.getReasonPhrase());
         }
-        return new JsonResult(ResponseStatusEnum.SUCCESS.getCode(), ResponseStatusEnum.SUCCESS.getMsg(), posts);
+        return new JsonResult(HttpStatus.OK.value(), HttpStatus.OK.getReasonPhrase(), posts);
     }
 
     /**
@@ -148,6 +152,7 @@ public class ApiPostController {
      * 

      *
      * @param postId 文章编号
+     *
      * @return JsonResult
      */
     @GetMapping(value = "/{postId}")
diff --git a/src/main/java/cc/ryanc/halo/web/controller/api/ApiTagController.java b/src/main/java/cc/ryanc/halo/web/controller/api/ApiTagController.java
index 732b439c8..2a68d6124 100644
--- a/src/main/java/cc/ryanc/halo/web/controller/api/ApiTagController.java
+++ b/src/main/java/cc/ryanc/halo/web/controller/api/ApiTagController.java
@@ -3,10 +3,13 @@ package cc.ryanc.halo.web.controller.api;
 import cc.ryanc.halo.exception.NotFoundException;
 import cc.ryanc.halo.model.domain.Tag;
 import cc.ryanc.halo.model.dto.JsonResult;
-import cc.ryanc.halo.model.enums.ResponseStatusEnum;
 import cc.ryanc.halo.service.TagService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.CrossOrigin;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
 
 import java.util.List;
 
@@ -51,9 +54,9 @@ public class ApiTagController {
     public JsonResult tags() {
         final List tags = tagService.listAll();
         if (null != tags && tags.size() > 0) {
-            return new JsonResult(ResponseStatusEnum.SUCCESS.getCode(), ResponseStatusEnum.SUCCESS.getMsg(), tags);
+            return new JsonResult(HttpStatus.OK.value(), HttpStatus.OK.getReasonPhrase(), tags);
         } else {
-            return new JsonResult(ResponseStatusEnum.EMPTY.getCode(), ResponseStatusEnum.EMPTY.getMsg());
+            return new JsonResult(HttpStatus.NO_CONTENT.value(), HttpStatus.NO_CONTENT.getReasonPhrase());
         }
     }
 
@@ -76,6 +79,7 @@ public class ApiTagController {
      * 

      *
      * @param tagUrl tagUrl
+     *
      * @return JsonResult
      */
     @GetMapping(value = "/{tagUrl}")