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

🔨 代码优化

pull/137/head
ruibaby 2019-03-03 09:47:32 +08:00
parent d39ffbb382
commit c2e7bce7bc
23 changed files with 72 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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"));
}
/**

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

@ -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("菜单保存失败！");
}
}

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

@ -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"));
}
}
}

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

@ -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(), "");
}

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

@ -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<Post> 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

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

@ -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"));
}
/**

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

@ -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"));
}
}

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

@ -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"));
}
}

1
src/main/java/cc/ryanc/halo/web/controller/api/ApiCategoryController.java
View File

@ -73,7 +73,6 @@ public class ApiCategoryController {
* </p>
*
* @param cateUrl 分类路径
*
* @return JsonResult
*/
@GetMapping(value = "/{cateUrl}")

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

@ -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;

1
src/main/java/cc/ryanc/halo/web/controller/api/ApiGalleryController.java
View File

@ -81,7 +81,6 @@ public class ApiGalleryController {
* </p>
*
* @param id id
*
* @return JsonResult
*/
@GetMapping(value = "/{id}")

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

@ -76,11 +76,10 @@ public class ApiOptionController {
* </p>
*
* @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));
}
}

1
src/main/java/cc/ryanc/halo/web/controller/api/ApiPageController.java
View File

@ -59,7 +59,6 @@ public class ApiPageController {
* </p>
*
* @param postId postId
*
* @return JsonResult
*/
@GetMapping(value = "/{postId}")

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

@ -101,7 +101,6 @@ public class ApiPostController {
* </p>
*
* @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<Post> 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 {
* </p>
*
* @param postId 文章编号
*
* @return JsonResult
*/
@GetMapping(value = "/{postId}")

1
src/main/java/cc/ryanc/halo/web/controller/api/ApiTagController.java
View File

@ -72,7 +72,6 @@ public class ApiTagController {
* </p>
*
* @param tagUrl tagUrl
*
* @return JsonResult
*/
@GetMapping(value = "/{tagUrl}")

3
src/main/java/cc/ryanc/halo/web/controller/core/BaseController.java
View File

@ -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());
/**
* 根据主题名称渲染页面

3
src/main/java/cc/ryanc/halo/web/controller/core/CommonController.java
View File

@ -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

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

@ -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("安装成功！");
}
}

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

@ -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;

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

@ -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("评论失败！");
}
}

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

@ -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;

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

@ -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
*/

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

@ -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;