From c2e7bce7bc3b18ccc7f9920890b53130e080ff01 Mon Sep 17 00:00:00 2001 From: ruibaby Date: Sun, 3 Mar 2019 09:47:32 +0800 Subject: [PATCH] =?UTF-8?q?:hammer:=20=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/admin/CategoryController.java | 11 ++++--- .../web/controller/admin/MenuController.java | 7 ++--- .../controller/admin/OptionController.java | 5 ++-- .../web/controller/admin/PageController.java | 16 +++++----- .../web/controller/admin/PostController.java | 20 ++++++------- .../web/controller/admin/TagController.java | 11 ++++--- .../web/controller/admin/ThemeController.java | 29 +++++++++---------- .../web/controller/admin/UserController.java | 13 ++++----- .../controller/api/ApiCategoryController.java | 1 - .../controller/api/ApiCommentController.java | 8 ++--- .../controller/api/ApiGalleryController.java | 1 - .../controller/api/ApiOptionController.java | 3 +- .../web/controller/api/ApiPageController.java | 1 - .../web/controller/api/ApiPostController.java | 4 +-- .../web/controller/api/ApiTagController.java | 1 - .../web/controller/core/BaseController.java | 3 +- .../web/controller/core/CommonController.java | 3 +- .../controller/core/InstallController.java | 11 ++++--- .../front/FrontArchiveController.java | 1 - .../front/FrontCommentController.java | 10 +++---- .../front/FrontIndexController.java | 1 - .../front/FrontOthersController.java | 9 ------ .../front/FrontSearchController.java | 1 - 23 files changed, 72 insertions(+), 98 deletions(-) diff --git a/src/main/java/cc/ryanc/halo/web/controller/admin/CategoryController.java b/src/main/java/cc/ryanc/halo/web/controller/admin/CategoryController.java index 5747ad0d4..9e4a157eb 100755 --- a/src/main/java/cc/ryanc/halo/web/controller/admin/CategoryController.java +++ b/src/main/java/cc/ryanc/halo/web/controller/admin/CategoryController.java @@ -2,7 +2,6 @@ package cc.ryanc.halo.web.controller.admin; import cc.ryanc.halo.model.domain.Category; import cc.ryanc.halo.model.dto.JsonResult; -import cc.ryanc.halo.model.enums.ResultCodeEnum; import cc.ryanc.halo.service.CategoryService; import cc.ryanc.halo.utils.LocaleMessageUtil; import lombok.extern.slf4j.Slf4j; @@ -56,24 +55,24 @@ public class CategoryController { public JsonResult saveCategory(@Valid Category category, BindingResult result) { if (result.hasErrors()) { for (ObjectError error : result.getAllErrors()) { - return new JsonResult(ResultCodeEnum.FAIL.getCode(), error.getDefaultMessage()); + return JsonResult.fail(error.getDefaultMessage()); } } final Category tempCategory = categoryService.findByCateUrl(category.getCateUrl()); if (null != category.getCateId()) { if (null != tempCategory && !category.getCateId().equals(tempCategory.getCateId())) { - return new JsonResult(ResultCodeEnum.FAIL.getCode(), localeMessageUtil.getMessage("code.admin.common.url-is-exists")); + return JsonResult.fail(localeMessageUtil.getMessage("code.admin.common.url-is-exists")); } } else { if (null != tempCategory) { - return new JsonResult(ResultCodeEnum.FAIL.getCode(), localeMessageUtil.getMessage("code.admin.common.url-is-exists")); + return JsonResult.fail(localeMessageUtil.getMessage("code.admin.common.url-is-exists")); } } category = categoryService.create(category); if (null == category) { - return new JsonResult(ResultCodeEnum.FAIL.getCode(), localeMessageUtil.getMessage("code.admin.common.save-failed")); + return JsonResult.fail(localeMessageUtil.getMessage("code.admin.common.save-failed")); } - return new JsonResult(ResultCodeEnum.SUCCESS.getCode(), localeMessageUtil.getMessage("code.admin.common.save-success")); + return JsonResult.success(localeMessageUtil.getMessage("code.admin.common.save-success")); } /** diff --git a/src/main/java/cc/ryanc/halo/web/controller/admin/MenuController.java b/src/main/java/cc/ryanc/halo/web/controller/admin/MenuController.java index 446ccb9a2..55ccc9fd8 100644 --- a/src/main/java/cc/ryanc/halo/web/controller/admin/MenuController.java +++ b/src/main/java/cc/ryanc/halo/web/controller/admin/MenuController.java @@ -2,7 +2,6 @@ package cc.ryanc.halo.web.controller.admin; import cc.ryanc.halo.model.domain.Menu; import cc.ryanc.halo.model.dto.JsonResult; -import cc.ryanc.halo.model.enums.ResultCodeEnum; import cc.ryanc.halo.service.MenuService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -51,14 +50,14 @@ public class MenuController { public JsonResult saveMenu(@Valid Menu menu, BindingResult result) { if (result.hasErrors()) { for (ObjectError error : result.getAllErrors()) { - return new JsonResult(ResultCodeEnum.FAIL.getCode(), error.getDefaultMessage()); + return JsonResult.fail(error.getDefaultMessage()); } } menu = menuService.create(menu); if (null != menu) { - return new JsonResult(ResultCodeEnum.SUCCESS.getCode(), "菜单保存成功！"); + return JsonResult.success("菜单保存成功！"); } else { - return new JsonResult(ResultCodeEnum.FAIL.getCode(), "菜单保存成功！"); + return JsonResult.fail("菜单保存失败！"); } } diff --git a/src/main/java/cc/ryanc/halo/web/controller/admin/OptionController.java b/src/main/java/cc/ryanc/halo/web/controller/admin/OptionController.java index 4a56e1923..b0f54c293 100755 --- a/src/main/java/cc/ryanc/halo/web/controller/admin/OptionController.java +++ b/src/main/java/cc/ryanc/halo/web/controller/admin/OptionController.java @@ -1,7 +1,6 @@ package cc.ryanc.halo.web.controller.admin; import cc.ryanc.halo.model.dto.JsonResult; -import cc.ryanc.halo.model.enums.ResultCodeEnum; import cc.ryanc.halo.service.OptionsService; import cc.ryanc.halo.utils.LocaleMessageUtil; import freemarker.template.Configuration; @@ -65,10 +64,10 @@ public class OptionController { OPTIONS = optionsService.findAllOptions(); session.removeAttribute(SessionLocaleResolver.LOCALE_SESSION_ATTRIBUTE_NAME); log.info("List of saved options: " + options); - return new JsonResult(ResultCodeEnum.SUCCESS.getCode(), localeMessageUtil.getMessage("code.admin.common.save-success")); + return JsonResult.success(localeMessageUtil.getMessage("code.admin.common.save-success")); } catch (Exception e) { log.error("Save settings option failed: " + e.getMessage(), e); - return new JsonResult(ResultCodeEnum.FAIL.getCode(), localeMessageUtil.getMessage("code.admin.common.save-failed")); + return JsonResult.fail(localeMessageUtil.getMessage("code.admin.common.save-failed")); } } } diff --git a/src/main/java/cc/ryanc/halo/web/controller/admin/PageController.java b/src/main/java/cc/ryanc/halo/web/controller/admin/PageController.java index 66e66dd35..0b8615dd4 100755 --- a/src/main/java/cc/ryanc/halo/web/controller/admin/PageController.java +++ b/src/main/java/cc/ryanc/halo/web/controller/admin/PageController.java @@ -123,14 +123,14 @@ public class PageController { public JsonResult saveLink(@Valid Link link, BindingResult result) { if (result.hasErrors()) { for (ObjectError error : result.getAllErrors()) { - return new JsonResult(ResultCodeEnum.FAIL.getCode(), error.getDefaultMessage()); + return JsonResult.fail(error.getDefaultMessage()); } } link = linkService.create(link); if (null == link) { - return new JsonResult(ResultCodeEnum.FAIL.getCode(), localeMessageUtil.getMessage("code.admin.common.save-failed")); + return JsonResult.fail(localeMessageUtil.getMessage("code.admin.common.save-failed")); } - return new JsonResult(ResultCodeEnum.SUCCESS.getCode(), localeMessageUtil.getMessage("code.admin.common.save-success")); + return JsonResult.success(localeMessageUtil.getMessage("code.admin.common.save-success")); } /** @@ -209,9 +209,9 @@ public class PageController { galleryService.removeById(galleryId); } catch (Exception e) { log.error("Failed to delete image: {}", e.getMessage()); - return new JsonResult(ResultCodeEnum.FAIL.getCode(), localeMessageUtil.getMessage("code.admin.common.delete-failed")); + return JsonResult.fail(localeMessageUtil.getMessage("code.admin.common.delete-failed")); } - return new JsonResult(ResultCodeEnum.SUCCESS.getCode(), localeMessageUtil.getMessage("code.admin.common.delete-success")); + return JsonResult.success(localeMessageUtil.getMessage("code.admin.common.delete-success")); } /** @@ -257,10 +257,10 @@ public class PageController { } postService.create(post); logsService.save(LogsRecord.PUSH_PAGE, post.getPostTitle(), request); - return new JsonResult(ResultCodeEnum.SUCCESS.getCode(), msg); + return JsonResult.success(msg); } catch (Exception e) { log.error("Save page failed: {}", e.getMessage()); - return new JsonResult(ResultCodeEnum.FAIL.getCode(), localeMessageUtil.getMessage("code.admin.common.save-failed")); + return JsonResult.fail(localeMessageUtil.getMessage("code.admin.common.save-failed")); } } @@ -291,7 +291,7 @@ public class PageController { public JsonResult checkUrlExists(@RequestParam("postUrl") String postUrl) { final Post post = postService.findByPostUrl(postUrl, PostTypeEnum.POST_TYPE_PAGE.getDesc()); if (null != post) { - return new JsonResult(ResultCodeEnum.FAIL.getCode(), localeMessageUtil.getMessage("code.admin.common.url-is-exists")); + return JsonResult.fail(localeMessageUtil.getMessage("code.admin.common.url-is-exists")); } return new JsonResult(ResultCodeEnum.SUCCESS.getCode(), ""); } diff --git a/src/main/java/cc/ryanc/halo/web/controller/admin/PostController.java b/src/main/java/cc/ryanc/halo/web/controller/admin/PostController.java index 9b3be7b88..5e7a031ed 100755 --- a/src/main/java/cc/ryanc/halo/web/controller/admin/PostController.java +++ b/src/main/java/cc/ryanc/halo/web/controller/admin/PostController.java @@ -154,11 +154,11 @@ public class PostController extends BaseController { } postService.create(post); logsService.save(LogsRecord.PUSH_POST, post.getPostTitle(), request); - return new JsonResult(ResultCodeEnum.SUCCESS.getCode(), localeMessageUtil.getMessage("code.admin.common.save-success")); + return JsonResult.success(localeMessageUtil.getMessage("code.admin.common.save-success")); } catch (Exception e) { log.error("Save article failed: {}", e.getMessage()); e.printStackTrace(); - return new JsonResult(ResultCodeEnum.FAIL.getCode(), localeMessageUtil.getMessage("code.admin.common.save-failed")); + return JsonResult.fail(localeMessageUtil.getMessage("code.admin.common.save-failed")); } } @@ -193,9 +193,9 @@ public class PostController extends BaseController { } post = postService.create(post); if (null != post) { - return new JsonResult(ResultCodeEnum.SUCCESS.getCode(), localeMessageUtil.getMessage("code.admin.common.update-success")); + return JsonResult.success(localeMessageUtil.getMessage("code.admin.common.update-success")); } else { - return new JsonResult(ResultCodeEnum.FAIL.getCode(), localeMessageUtil.getMessage("code.admin.common.update-failed")); + return JsonResult.fail(localeMessageUtil.getMessage("code.admin.common.update-failed")); } } @@ -269,9 +269,9 @@ public class PostController extends BaseController { } catch (Exception e) { log.error("Update summary failed: {}", e.getMessage()); e.printStackTrace(); - return new JsonResult(ResultCodeEnum.FAIL.getCode(), localeMessageUtil.getMessage("code.admin.common.update-failed")); + return JsonResult.fail(localeMessageUtil.getMessage("code.admin.common.update-failed")); } - return new JsonResult(ResultCodeEnum.SUCCESS.getCode(), localeMessageUtil.getMessage("code.admin.common.update-success")); + return JsonResult.success(localeMessageUtil.getMessage("code.admin.common.update-success")); } /** @@ -286,7 +286,7 @@ public class PostController extends BaseController { postUrl = urlFilter(postUrl); final Post post = postService.findByPostUrl(postUrl, PostTypeEnum.POST_TYPE_POST.getDesc()); if (null != post) { - return new JsonResult(ResultCodeEnum.FAIL.getCode(), localeMessageUtil.getMessage("code.admin.common.url-is-exists")); + return JsonResult.fail(localeMessageUtil.getMessage("code.admin.common.url-is-exists")); } return new JsonResult(ResultCodeEnum.SUCCESS.getCode(), ""); } @@ -301,7 +301,7 @@ public class PostController extends BaseController { @ResponseBody public JsonResult pushAllToBaidu(@RequestParam("baiduToken") String baiduToken) { if (StrUtil.isBlank(baiduToken)) { - return new JsonResult(ResultCodeEnum.FAIL.getCode(), localeMessageUtil.getMessage("code.admin.post.no-baidu-token")); + return JsonResult.fail(localeMessageUtil.getMessage("code.admin.post.no-baidu-token")); } final String blogUrl = OPTIONS.get(BlogPropertiesEnum.BLOG_URL.getProp()); final List posts = postService.findAll(PostTypeEnum.POST_TYPE_POST.getDesc()); @@ -314,9 +314,9 @@ public class PostController extends BaseController { } final String result = HaloUtils.baiduPost(blogUrl, baiduToken, urls.toString()); if (StrUtil.isEmpty(result)) { - return new JsonResult(ResultCodeEnum.FAIL.getCode(), localeMessageUtil.getMessage("code.admin.post.push-to-baidu-failed")); + return JsonResult.fail(localeMessageUtil.getMessage("code.admin.post.push-to-baidu-failed")); } - return new JsonResult(ResultCodeEnum.SUCCESS.getCode(), localeMessageUtil.getMessage("code.admin.post.push-to-baidu-success")); + return JsonResult.success(localeMessageUtil.getMessage("code.admin.post.push-to-baidu-success")); } @InitBinder diff --git a/src/main/java/cc/ryanc/halo/web/controller/admin/TagController.java b/src/main/java/cc/ryanc/halo/web/controller/admin/TagController.java index 79f28fb7d..91b8db9bd 100755 --- a/src/main/java/cc/ryanc/halo/web/controller/admin/TagController.java +++ b/src/main/java/cc/ryanc/halo/web/controller/admin/TagController.java @@ -2,7 +2,6 @@ package cc.ryanc.halo.web.controller.admin; import cc.ryanc.halo.model.domain.Tag; import cc.ryanc.halo.model.dto.JsonResult; -import cc.ryanc.halo.model.enums.ResultCodeEnum; import cc.ryanc.halo.service.TagService; import cc.ryanc.halo.utils.LocaleMessageUtil; import lombok.extern.slf4j.Slf4j; @@ -55,24 +54,24 @@ public class TagController { public JsonResult saveTag(@Valid Tag tag, BindingResult result) { if (result.hasErrors()) { for (ObjectError error : result.getAllErrors()) { - return new JsonResult(ResultCodeEnum.FAIL.getCode(), error.getDefaultMessage()); + return JsonResult.fail(error.getDefaultMessage()); } } final Tag tempTag = tagService.findByTagUrl(tag.getTagUrl()); if (null != tag.getTagId()) { if (null != tempTag && !tag.getTagId().equals(tempTag.getTagId())) { - return new JsonResult(ResultCodeEnum.FAIL.getCode(), localeMessageUtil.getMessage("code.admin.common.url-is-exists")); + return JsonResult.fail(localeMessageUtil.getMessage("code.admin.common.url-is-exists")); } } else { if (null != tempTag) { - return new JsonResult(ResultCodeEnum.FAIL.getCode(), localeMessageUtil.getMessage("code.admin.common.url-is-exists")); + return JsonResult.fail(localeMessageUtil.getMessage("code.admin.common.url-is-exists")); } } tag = tagService.create(tag); if (null == tag) { - return new JsonResult(ResultCodeEnum.FAIL.getCode(), localeMessageUtil.getMessage("code.admin.common.save-failed")); + return JsonResult.fail(localeMessageUtil.getMessage("code.admin.common.save-failed")); } - return new JsonResult(ResultCodeEnum.SUCCESS.getCode(), localeMessageUtil.getMessage("code.admin.common.save-success")); + return JsonResult.success(localeMessageUtil.getMessage("code.admin.common.save-success")); } /** diff --git a/src/main/java/cc/ryanc/halo/web/controller/admin/ThemeController.java b/src/main/java/cc/ryanc/halo/web/controller/admin/ThemeController.java index 4cf3264e8..fed98218d 100755 --- a/src/main/java/cc/ryanc/halo/web/controller/admin/ThemeController.java +++ b/src/main/java/cc/ryanc/halo/web/controller/admin/ThemeController.java @@ -3,7 +3,6 @@ package cc.ryanc.halo.web.controller.admin; import cc.ryanc.halo.model.dto.JsonResult; import cc.ryanc.halo.model.dto.LogsRecord; import cc.ryanc.halo.model.enums.BlogPropertiesEnum; -import cc.ryanc.halo.model.enums.ResultCodeEnum; import cc.ryanc.halo.model.enums.TrueFalseEnum; import cc.ryanc.halo.service.LogsService; import cc.ryanc.halo.service.OptionsService; @@ -98,9 +97,9 @@ public class ThemeController extends BaseController { configuration.setSharedVariable("options", OPTIONS); log.info("Changed theme to {}", siteTheme); logsService.save(LogsRecord.CHANGE_THEME, "更换为" + siteTheme, request); - return new JsonResult(ResultCodeEnum.SUCCESS.getCode(), localeMessageUtil.getMessage("code.admin.theme.change-success", new Object[]{siteTheme})); + return JsonResult.success(localeMessageUtil.getMessage("code.admin.theme.change-success", new Object[]{siteTheme})); } catch (Exception e) { - return new JsonResult(ResultCodeEnum.FAIL.getCode(), localeMessageUtil.getMessage("code.admin.theme.change-failed")); + return JsonResult.fail(localeMessageUtil.getMessage("code.admin.theme.change-failed")); } } @@ -129,13 +128,13 @@ public class ThemeController extends BaseController { THEMES = HaloUtils.getThemes(); } else { log.error("Upload theme failed, no file selected"); - return new JsonResult(ResultCodeEnum.FAIL.getCode(), localeMessageUtil.getMessage("code.admin.theme.upload-no-file")); + return JsonResult.fail(localeMessageUtil.getMessage("code.admin.theme.upload-no-file")); } } catch (Exception e) { log.error("Upload theme failed: {}", e.getMessage()); - return new JsonResult(ResultCodeEnum.FAIL.getCode(), localeMessageUtil.getMessage("code.admin.theme.upload-failed")); + return JsonResult.fail(localeMessageUtil.getMessage("code.admin.theme.upload-failed")); } - return new JsonResult(ResultCodeEnum.SUCCESS.getCode(), localeMessageUtil.getMessage("code.admin.theme.upload-success")); + return JsonResult.success(localeMessageUtil.getMessage("code.admin.theme.upload-success")); } /** @@ -180,7 +179,7 @@ public class ThemeController extends BaseController { public JsonResult cloneFromRemote(@RequestParam(value = "remoteAddr") String remoteAddr, @RequestParam(value = "themeName") String themeName) { if (StrUtil.isBlank(remoteAddr) || StrUtil.isBlank(themeName)) { - return new JsonResult(ResultCodeEnum.FAIL.getCode(), localeMessageUtil.getMessage("code.admin.common.info-no-complete")); + return JsonResult.fail(localeMessageUtil.getMessage("code.admin.common.info-no-complete")); } try { final File basePath = new File(ResourceUtils.getURL("classpath:").getPath()); @@ -190,9 +189,9 @@ public class ThemeController extends BaseController { THEMES = HaloUtils.getThemes(); } catch (FileNotFoundException e) { log.error("Cloning theme failed: {}", e.getMessage()); - return new JsonResult(ResultCodeEnum.FAIL.getCode(), localeMessageUtil.getMessage("code.admin.theme.clone-theme-failed") + e.getMessage()); + return JsonResult.fail(localeMessageUtil.getMessage("code.admin.theme.clone-theme-failed") + e.getMessage()); } - return new JsonResult(ResultCodeEnum.SUCCESS.getCode(), localeMessageUtil.getMessage("code.admin.common.install-success")); + return JsonResult.success(localeMessageUtil.getMessage("code.admin.common.install-success")); } /** @@ -207,14 +206,14 @@ public class ThemeController extends BaseController { try { final File basePath = new File(ResourceUtils.getURL("classpath:").getPath()); final File themePath = new File(basePath.getAbsolutePath(), "templates/themes"); - RuntimeUtil.execForStr("cd " + themePath.getAbsolutePath() + "/" + themeName,"git pull"); + RuntimeUtil.execForStr("cd " + themePath.getAbsolutePath() + "/" + themeName, "git pull"); THEMES.clear(); THEMES = HaloUtils.getThemes(); } catch (Exception e) { log.error("Update theme failed: {}", e.getMessage()); - return new JsonResult(ResultCodeEnum.FAIL.getCode(), localeMessageUtil.getMessage("code.admin.theme.update-theme-failed") + e.getMessage()); + return JsonResult.fail(localeMessageUtil.getMessage("code.admin.theme.update-theme-failed") + e.getMessage()); } - return new JsonResult(ResultCodeEnum.SUCCESS.getCode(), localeMessageUtil.getMessage("code.admin.common.update-success")); + return JsonResult.success(localeMessageUtil.getMessage("code.admin.common.update-success")); } /** @@ -287,7 +286,7 @@ public class ThemeController extends BaseController { public JsonResult saveTpl(@RequestParam("tplName") String tplName, @RequestParam("tplContent") String tplContent) { if (StrUtil.isBlank(tplContent)) { - return new JsonResult(ResultCodeEnum.FAIL.getCode(), localeMessageUtil.getMessage("code.admin.theme.edit.no-content")); + return JsonResult.fail(localeMessageUtil.getMessage("code.admin.theme.edit.no-content")); } try { //获取项目根路径 @@ -302,8 +301,8 @@ public class ThemeController extends BaseController { fileWriter.write(tplContent); } catch (Exception e) { log.error("Template save failed: {}", e.getMessage()); - return new JsonResult(ResultCodeEnum.FAIL.getCode(), localeMessageUtil.getMessage("code.admin.common.save-failed")); + return JsonResult.fail(localeMessageUtil.getMessage("code.admin.common.save-failed")); } - return new JsonResult(ResultCodeEnum.SUCCESS.getCode(), localeMessageUtil.getMessage("code.admin.common.save-success")); + return JsonResult.success(localeMessageUtil.getMessage("code.admin.common.save-success")); } } diff --git a/src/main/java/cc/ryanc/halo/web/controller/admin/UserController.java b/src/main/java/cc/ryanc/halo/web/controller/admin/UserController.java index b4e2f21a7..4c20849ea 100644 --- a/src/main/java/cc/ryanc/halo/web/controller/admin/UserController.java +++ b/src/main/java/cc/ryanc/halo/web/controller/admin/UserController.java @@ -2,7 +2,6 @@ package cc.ryanc.halo.web.controller.admin; import cc.ryanc.halo.model.domain.User; import cc.ryanc.halo.model.dto.JsonResult; -import cc.ryanc.halo.model.enums.ResultCodeEnum; import cc.ryanc.halo.service.UserService; import cc.ryanc.halo.utils.LocaleMessageUtil; import cn.hutool.crypto.SecureUtil; @@ -64,7 +63,7 @@ public class UserController { try { if (result.hasErrors()) { for (ObjectError error : result.getAllErrors()) { - return new JsonResult(ResultCodeEnum.FAIL.getCode(), error.getDefaultMessage()); + return JsonResult.fail(error.getDefaultMessage()); } } userService.create(user); @@ -72,9 +71,9 @@ public class UserController { session.removeAttribute(USER_SESSION_KEY); } catch (Exception e) { log.error("Failed to modify user profile: {}", e.getMessage()); - return new JsonResult(ResultCodeEnum.FAIL.getCode(), localeMessageUtil.getMessage("code.admin.common.edit-failed")); + return JsonResult.fail(localeMessageUtil.getMessage("code.admin.common.edit-failed")); } - return new JsonResult(ResultCodeEnum.SUCCESS.getCode(), localeMessageUtil.getMessage("code.admin.common.edit-success")); + return JsonResult.success(localeMessageUtil.getMessage("code.admin.common.edit-success")); } /** @@ -99,12 +98,12 @@ public class UserController { userService.update(user); session.removeAttribute(USER_SESSION_KEY); } else { - return new JsonResult(ResultCodeEnum.FAIL.getCode(), localeMessageUtil.getMessage("code.admin.user.old-password-error")); + return JsonResult.fail(localeMessageUtil.getMessage("code.admin.user.old-password-error")); } } catch (Exception e) { log.error("Password change failed: {}", e.getMessage()); - return new JsonResult(ResultCodeEnum.FAIL.getCode(), localeMessageUtil.getMessage("code.admin.user.update-password-failed")); + return JsonResult.fail(localeMessageUtil.getMessage("code.admin.user.update-password-failed")); } - return new JsonResult(ResultCodeEnum.SUCCESS.getCode(), localeMessageUtil.getMessage("code.admin.user.update-password-success")); + return JsonResult.success(localeMessageUtil.getMessage("code.admin.user.update-password-success")); } } 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 1ac9e79d0..41cc17042 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 @@ -73,7 +73,6 @@ 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 ad8dac853..ad16086e6 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 @@ -1,6 +1,5 @@ package cc.ryanc.halo.web.controller.api; -import cc.ryanc.halo.logging.Logger; import cc.ryanc.halo.model.domain.Comment; import cc.ryanc.halo.model.domain.Post; import cc.ryanc.halo.model.dto.JsonResult; @@ -9,16 +8,17 @@ import cc.ryanc.halo.model.enums.TrueFalseEnum; import cc.ryanc.halo.service.CommentService; import cc.ryanc.halo.service.PostService; import cc.ryanc.halo.utils.OwoUtil; -import cn.hutool.core.text.StrBuilder; import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.URLUtil; import cn.hutool.crypto.SecureUtil; import cn.hutool.extra.servlet.ServletUtil; import cn.hutool.http.HtmlUtil; -import org.springframework.http.HttpStatus; import org.springframework.lang.NonNull; import org.springframework.util.Assert; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletRequest; import javax.validation.Valid; 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 9c099f8ae..7989496de 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 @@ -81,7 +81,6 @@ public class ApiGalleryController { *

* * @param id id - * * @return JsonResult */ @GetMapping(value = "/{id}") 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 21517c840..0dff4cee6 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 @@ -76,11 +76,10 @@ public class ApiOptionController { *

* * @param optionName 设置选项名称 - * * @return JsonResult */ @GetMapping(value = "/one") public JsonResult option(@RequestParam(value = "optionName") String optionName) { - return new JsonResult(HttpStatus.OK.value(), HttpStatus.OK.getReasonPhrase(), optionsService.findOneOption(optionName)); + return JsonResult.ok(HttpStatus.OK.getReasonPhrase(), optionsService.findOneOption(optionName)); } } 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 22bdf8d76..4ddeb9e6f 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 @@ -59,7 +59,6 @@ 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 7233d200a..d2f612885 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 @@ -101,7 +101,6 @@ public class ApiPostController { *

* * @param page 页码 - * * @return JsonResult */ @GetMapping(value = "/page/{page}") @@ -112,7 +111,7 @@ 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); - return new JsonResult(HttpStatus.OK.value(), HttpStatus.OK.getReasonPhrase(), posts); + return JsonResult.ok(HttpStatus.OK.getReasonPhrase(), posts); } /** @@ -149,7 +148,6 @@ 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 5118f6254..08db16e15 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 @@ -72,7 +72,6 @@ public class ApiTagController { *

* * @param tagUrl tagUrl - * * @return JsonResult */ @GetMapping(value = "/{tagUrl}") diff --git a/src/main/java/cc/ryanc/halo/web/controller/core/BaseController.java b/src/main/java/cc/ryanc/halo/web/controller/core/BaseController.java index cb990d51a..e483cd739 100755 --- a/src/main/java/cc/ryanc/halo/web/controller/core/BaseController.java +++ b/src/main/java/cc/ryanc/halo/web/controller/core/BaseController.java @@ -13,12 +13,11 @@ import cn.hutool.core.text.StrBuilder; */ public abstract class BaseController { - protected Logger log = Logger.getLogger(getClass()); - /** * 定义默认主题 */ public static String THEME = "anatole"; + protected Logger log = Logger.getLogger(getClass()); /** * 根据主题名称渲染页面 diff --git a/src/main/java/cc/ryanc/halo/web/controller/core/CommonController.java b/src/main/java/cc/ryanc/halo/web/controller/core/CommonController.java index 0ccbc3e1f..012e1edf6 100644 --- a/src/main/java/cc/ryanc/halo/web/controller/core/CommonController.java +++ b/src/main/java/cc/ryanc/halo/web/controller/core/CommonController.java @@ -20,9 +20,8 @@ import javax.servlet.http.HttpServletRequest; @Controller public class CommonController implements ErrorController { - private final Logger log = Logger.getLogger(getClass()); - private static final String ERROR_PATH = "/error"; + private final Logger log = Logger.getLogger(getClass()); /** * 渲染404，500 diff --git a/src/main/java/cc/ryanc/halo/web/controller/core/InstallController.java b/src/main/java/cc/ryanc/halo/web/controller/core/InstallController.java index 58566cccc..f73f31de2 100644 --- a/src/main/java/cc/ryanc/halo/web/controller/core/InstallController.java +++ b/src/main/java/cc/ryanc/halo/web/controller/core/InstallController.java @@ -3,7 +3,10 @@ package cc.ryanc.halo.web.controller.core; import cc.ryanc.halo.model.domain.*; import cc.ryanc.halo.model.dto.JsonResult; import cc.ryanc.halo.model.dto.LogsRecord; -import cc.ryanc.halo.model.enums.*; +import cc.ryanc.halo.model.enums.AllowCommentEnum; +import cc.ryanc.halo.model.enums.AttachLocationEnum; +import cc.ryanc.halo.model.enums.BlogPropertiesEnum; +import cc.ryanc.halo.model.enums.TrueFalseEnum; import cc.ryanc.halo.service.*; import cc.ryanc.halo.utils.MarkdownUtils; import cn.hutool.core.date.DateUtil; @@ -105,7 +108,7 @@ public class InstallController { HttpServletRequest request) { try { if (StrUtil.equals(TrueFalseEnum.TRUE.getDesc(), OPTIONS.get(BlogPropertiesEnum.IS_INSTALL.getProp()))) { - return new JsonResult(ResultCodeEnum.FAIL.getCode(), "该博客已初始化，不能再次安装！"); + return JsonResult.fail("该博客已初始化，不能再次安装！"); } //创建新的用户 final User user = new User(); @@ -193,8 +196,8 @@ public class InstallController { configuration.setSharedVariable("user", userService.findUser()); } catch (Exception e) { log.error(e.getMessage()); - return new JsonResult(ResultCodeEnum.FAIL.getCode(), e.getMessage()); + return JsonResult.fail(e.getMessage()); } - return new JsonResult(ResultCodeEnum.SUCCESS.getCode(), "安装成功！"); + return JsonResult.success("安装成功！"); } } diff --git a/src/main/java/cc/ryanc/halo/web/controller/front/FrontArchiveController.java b/src/main/java/cc/ryanc/halo/web/controller/front/FrontArchiveController.java index e1774af8f..d1e9f2a6c 100644 --- a/src/main/java/cc/ryanc/halo/web/controller/front/FrontArchiveController.java +++ b/src/main/java/cc/ryanc/halo/web/controller/front/FrontArchiveController.java @@ -14,7 +14,6 @@ import cn.hutool.core.util.PageUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.crypto.SecureUtil; import cn.hutool.extra.servlet.ServletUtil; -import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cache.annotation.CacheEvict; import org.springframework.data.domain.Page; diff --git a/src/main/java/cc/ryanc/halo/web/controller/front/FrontCommentController.java b/src/main/java/cc/ryanc/halo/web/controller/front/FrontCommentController.java index ed678f515..c454ae3c1 100644 --- a/src/main/java/cc/ryanc/halo/web/controller/front/FrontCommentController.java +++ b/src/main/java/cc/ryanc/halo/web/controller/front/FrontCommentController.java @@ -6,7 +6,6 @@ import cc.ryanc.halo.model.domain.Post; import cc.ryanc.halo.model.dto.JsonResult; import cc.ryanc.halo.model.enums.BlogPropertiesEnum; import cc.ryanc.halo.model.enums.PostTypeEnum; -import cc.ryanc.halo.model.enums.ResultCodeEnum; import cc.ryanc.halo.model.enums.TrueFalseEnum; import cc.ryanc.halo.service.CommentService; import cc.ryanc.halo.service.MailService; @@ -20,7 +19,6 @@ import cn.hutool.core.util.URLUtil; import cn.hutool.crypto.SecureUtil; import cn.hutool.extra.servlet.ServletUtil; import cn.hutool.http.HtmlUtil; -import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.validation.BindingResult; @@ -77,7 +75,7 @@ public class FrontCommentController { HttpServletRequest request) { if (result.hasErrors()) { for (ObjectError error : result.getAllErrors()) { - return new JsonResult(ResultCodeEnum.FAIL.getCode(), error.getDefaultMessage()); + return JsonResult.fail(error.getDefaultMessage()); } } try { @@ -115,12 +113,12 @@ public class FrontCommentController { new EmailToAdmin(comment, post).start(); } if (StrUtil.equals(OPTIONS.get(BlogPropertiesEnum.NEW_COMMENT_NEED_CHECK.getProp()), TrueFalseEnum.TRUE.getDesc()) || OPTIONS.get(BlogPropertiesEnum.NEW_COMMENT_NEED_CHECK.getProp()) == null) { - return new JsonResult(ResultCodeEnum.SUCCESS.getCode(), "你的评论已经提交，待博主审核之后可显示。"); + return JsonResult.success("你的评论已经提交，待博主审核之后可显示。"); } else { - return new JsonResult(ResultCodeEnum.SUCCESS.getCode(), "你的评论已经提交，刷新后即可显示。"); + return JsonResult.success("你的评论已经提交，刷新后即可显示。"); } } catch (Exception e) { - return new JsonResult(ResultCodeEnum.FAIL.getCode(), "评论失败！"); + return JsonResult.fail("评论失败！"); } } diff --git a/src/main/java/cc/ryanc/halo/web/controller/front/FrontIndexController.java b/src/main/java/cc/ryanc/halo/web/controller/front/FrontIndexController.java index 97e714e0e..42a1ccfc0 100644 --- a/src/main/java/cc/ryanc/halo/web/controller/front/FrontIndexController.java +++ b/src/main/java/cc/ryanc/halo/web/controller/front/FrontIndexController.java @@ -6,7 +6,6 @@ import cc.ryanc.halo.service.PostService; import cc.ryanc.halo.web.controller.core.BaseController; import cn.hutool.core.util.PageUtil; import cn.hutool.core.util.StrUtil; -import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; diff --git a/src/main/java/cc/ryanc/halo/web/controller/front/FrontOthersController.java b/src/main/java/cc/ryanc/halo/web/controller/front/FrontOthersController.java index 9abfdc15c..6d40924c6 100644 --- a/src/main/java/cc/ryanc/halo/web/controller/front/FrontOthersController.java +++ b/src/main/java/cc/ryanc/halo/web/controller/front/FrontOthersController.java @@ -45,9 +45,7 @@ public class FrontOthersController { * 获取文章rss * * @param model model - * * @return String - * * @throws IOException IOException * @throws TemplateException TemplateException */ @@ -77,9 +75,7 @@ public class FrontOthersController { * 获取 atom.xml * * @param model model - * * @return String - * * @throws IOException IOException * @throws TemplateException TemplateException */ @@ -109,9 +105,7 @@ public class FrontOthersController { * 获取 XML 格式的站点地图 * * @param model model - * * @return String - * * @throws IOException IOException * @throws TemplateException TemplateException */ @@ -135,7 +129,6 @@ public class FrontOthersController { * 获取 HTML 格式的站点地图 * * @param model model - * * @return String */ @GetMapping(value = "sitemap.html", produces = {"text/html"}) @@ -156,9 +149,7 @@ public class FrontOthersController { * robots * * @param model model - * * @return String - * * @throws IOException IOException * @throws TemplateException TemplateException */ diff --git a/src/main/java/cc/ryanc/halo/web/controller/front/FrontSearchController.java b/src/main/java/cc/ryanc/halo/web/controller/front/FrontSearchController.java index 3dcb28b49..ce22c6677 100644 --- a/src/main/java/cc/ryanc/halo/web/controller/front/FrontSearchController.java +++ b/src/main/java/cc/ryanc/halo/web/controller/front/FrontSearchController.java @@ -10,7 +10,6 @@ import cc.ryanc.halo.web.controller.core.BaseController; import cn.hutool.core.util.PageUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.http.HtmlUtil; -import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest;