diff --git a/src/main/java/cc/ryanc/halo/config/FreeMarkerConfig.java b/src/main/java/cc/ryanc/halo/config/FreeMarkerConfig.java index 21a8167ec..59c1df8ff 100644 --- a/src/main/java/cc/ryanc/halo/config/FreeMarkerConfig.java +++ b/src/main/java/cc/ryanc/halo/config/FreeMarkerConfig.java @@ -47,7 +47,7 @@ public class FreeMarkerConfig { configuration.setSharedVariable("options", optionsService.findAllOptions()); configuration.setSharedVariable("user", userService.findUser()); } catch (TemplateModelException e) { - log.error("自定义标签加载失败：{}", e.getMessage()); + log.error("Custom tags failed to load：{}", e.getMessage()); } } } diff --git a/src/main/java/cc/ryanc/halo/model/dto/JsonResult.java b/src/main/java/cc/ryanc/halo/model/dto/JsonResult.java index f5bd8ded3..3218ff1d4 100644 --- a/src/main/java/cc/ryanc/halo/model/dto/JsonResult.java +++ b/src/main/java/cc/ryanc/halo/model/dto/JsonResult.java @@ -28,6 +28,15 @@ public class JsonResult { */ private Object result; + /** + * 只返回状态码 + * + * @param code 状态码 + */ + public JsonResult(Integer code) { + this.code = code; + } + /** * 不返回数据的构造方法 * diff --git a/src/main/java/cc/ryanc/halo/model/enums/AllowCommentEnum.java b/src/main/java/cc/ryanc/halo/model/enums/AllowCommentEnum.java index 02d95f894..1944f22d7 100644 --- a/src/main/java/cc/ryanc/halo/model/enums/AllowCommentEnum.java +++ b/src/main/java/cc/ryanc/halo/model/enums/AllowCommentEnum.java @@ -9,6 +9,7 @@ package cc.ryanc.halo.model.enums; * @date : 2018/7/9 */ public enum AllowCommentEnum { + /** * 允许评论 */ diff --git a/src/main/java/cc/ryanc/halo/repository/AttachmentRepository.java b/src/main/java/cc/ryanc/halo/repository/AttachmentRepository.java index ff4c5dd1f..1f501151a 100644 --- a/src/main/java/cc/ryanc/halo/repository/AttachmentRepository.java +++ b/src/main/java/cc/ryanc/halo/repository/AttachmentRepository.java @@ -14,13 +14,4 @@ import org.springframework.data.jpa.repository.JpaRepository; * @date : 2018/1/10 */ public interface AttachmentRepository extends JpaRepository { - - /** - * 查询所有附件，分页 - * - * @param pageable pageable - * @return Page - */ - @Override - Page findAll(Pageable pageable); } diff --git a/src/main/java/cc/ryanc/halo/utils/HaloUtils.java b/src/main/java/cc/ryanc/halo/utils/HaloUtils.java index aa66e1fd6..409a85fb8 100755 --- a/src/main/java/cc/ryanc/halo/utils/HaloUtils.java +++ b/src/main/java/cc/ryanc/halo/utils/HaloUtils.java @@ -178,7 +178,7 @@ public class HaloUtils { } } } catch (Exception e) { - log.error("主题获取失败：{}", e.getMessage()); + log.error("Themes scan failed：{}", e.getMessage()); } return themes; } @@ -214,7 +214,7 @@ public class HaloUtils { } } } catch (Exception e) { - log.error("获取主题模板失败：{}", e.getMessage()); + log.error("Failed to get theme template: {}", e.getMessage()); } return tpls; } 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 2eecb761f..1acbfead7 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 @@ -161,7 +161,7 @@ public class AdminController extends BaseController { //重置用户的登录状态为正常 userService.updateUserNormal(); logsService.saveByLogs(new Logs(LogsRecord.LOGIN, LogsRecord.LOGIN_SUCCESS, ServletUtil.getClientIP(request), DateUtil.date())); - log.info("用户[{}]登录成功。", aUser.getUserDisplayName()); + log.info("User {} login succeeded.", aUser.getUserDisplayName()); return new JsonResult(ResultCodeEnum.SUCCESS.getCode(), localeMessageUtil.getMessage("code.admin.login.success")); } else { //更新失败次数 @@ -194,7 +194,7 @@ public class AdminController extends BaseController { User user = (User) session.getAttribute(HaloConst.USER_SESSION_KEY); session.removeAttribute(HaloConst.USER_SESSION_KEY); logsService.saveByLogs(new Logs(LogsRecord.LOGOUT, user.getUserName(), ServletUtil.getClientIP(request), DateUtil.date())); - log.info("用户[{}]退出登录", user.getUserName()); + log.info("User {} has logged out", user.getUserName()); return "redirect:/admin/login"; } @@ -227,7 +227,7 @@ public class AdminController extends BaseController { try { logsService.removeAllLogs(); } catch (Exception e) { - log.error("清除日志失败：{}" + e.getMessage()); + log.error("Clear log failed:{}" + e.getMessage()); } return "redirect:/admin"; } diff --git a/src/main/java/cc/ryanc/halo/web/controller/admin/AttachmentController.java b/src/main/java/cc/ryanc/halo/web/controller/admin/AttachmentController.java index 6a3796ab7..392caaf85 100755 --- a/src/main/java/cc/ryanc/halo/web/controller/admin/AttachmentController.java +++ b/src/main/java/cc/ryanc/halo/web/controller/admin/AttachmentController.java @@ -165,7 +165,7 @@ public class AttachmentController { attachment.setAttachSize(HaloUtils.parseSize(new File(mediaPath, fileName).length())); attachment.setAttachWh(HaloUtils.getImageWh(new File(mediaPath, fileName))); attachmentService.saveByAttachment(attachment); - log.info("上传文件[{}]到[{}]成功", fileName, mediaPath.getAbsolutePath()); + log.info("Upload file {} to {} successfully", fileName, mediaPath.getAbsolutePath()); logsService.saveByLogs( new Logs(LogsRecord.UPLOAD_FILE, fileName, ServletUtil.getClientIP(request), DateUtil.date()) ); @@ -173,14 +173,14 @@ public class AttachmentController { result.put("success", 1); result.put("message", localeMessageUtil.getMessage("code.admin.attachment.upload-success")); result.put("url", attachment.getAttachPath()); - result.put("filename",filePath); + result.put("filename", filePath); } catch (Exception e) { - log.error("上传文件失败：{}", e.getMessage()); + log.error("Upload file failed:{}", e.getMessage()); result.put("success", 0); result.put("message", localeMessageUtil.getMessage("code.admin.attachment.upload-failed")); } } else { - log.error("文件不能为空"); + log.error("File cannot be empty!"); } return result; } @@ -223,17 +223,17 @@ public class AttachmentController { File delSmallFile = new File(new StringBuffer(mediaPath.getAbsolutePath()).append("/").append(delSmallFileName).toString()); if (delFile.exists() && delFile.isFile()) { if (delFile.delete() && delSmallFile.delete()) { - log.info("删除文件[{}]成功！", delFileName); + log.info("Delete file {} successfully!", delFileName); logsService.saveByLogs( new Logs(LogsRecord.REMOVE_FILE, delFileName, ServletUtil.getClientIP(request), DateUtil.date()) ); } else { - log.error("删除附件[{}]失败！", delFileName); + log.error("Deleting attachment {} failed!", delFileName); return new JsonResult(ResultCodeEnum.FAIL.getCode(), localeMessageUtil.getMessage("code.admin.common.delete-failed")); } } } catch (Exception e) { - log.error("删除附件[{}]失败:{}", delFileName, e.getMessage()); + log.error("Deleting attachment {} failed: {}", delFileName, e.getMessage()); return new JsonResult(ResultCodeEnum.FAIL.getCode(), localeMessageUtil.getMessage("code.admin.common.delete-failed")); } return new JsonResult(ResultCodeEnum.SUCCESS.getCode(), localeMessageUtil.getMessage("code.admin.common.delete-success")); diff --git a/src/main/java/cc/ryanc/halo/web/controller/admin/BackupController.java b/src/main/java/cc/ryanc/halo/web/controller/admin/BackupController.java index 6d97324f2..9225aa2dd 100644 --- a/src/main/java/cc/ryanc/halo/web/controller/admin/BackupController.java +++ b/src/main/java/cc/ryanc/halo/web/controller/admin/BackupController.java @@ -117,10 +117,10 @@ public class BackupController { String distName = "databases_backup_" + DateUtil.format(DateUtil.date(), "yyyyMMddHHmmss"); //压缩文件 ZipUtil.zip(srcPath + "halo.mv.db", System.getProperties().getProperty("user.home") + "/halo/backup/databases/" + distName + ".zip"); - log.info("当前时间：{}，执行了数据库备份。", DateUtil.now()); + log.info("Current time: {}, database backup was performed.", DateUtil.now()); return new JsonResult(ResultCodeEnum.SUCCESS.getCode(), localeMessageUtil.getMessage("code.admin.backup.backup-success")); } catch (Exception e) { - log.error("备份数据库失败：{}", e.getMessage()); + log.error("Backup database failed: {}", e.getMessage()); return new JsonResult(ResultCodeEnum.FAIL.getCode(), localeMessageUtil.getMessage("code.admin.backup.backup-failed")); } } @@ -140,10 +140,10 @@ public class BackupController { String distName = "resources_backup_" + DateUtil.format(DateUtil.date(), "yyyyMMddHHmmss"); //执行打包 ZipUtil.zip(srcPath, System.getProperties().getProperty("user.home") + "/halo/backup/resources/" + distName + ".zip"); - log.info("当前时间：{}，执行了资源文件备份。", DateUtil.now()); + log.info("Current time: {}, the resource file backup was performed.", DateUtil.now()); return new JsonResult(ResultCodeEnum.SUCCESS.getCode(), localeMessageUtil.getMessage("code.admin.backup.backup-success")); } catch (Exception e) { - log.error("备份资源文件失败：{}", e.getMessage()); + log.error("Backup resource file failed: {}", e.getMessage()); return new JsonResult(ResultCodeEnum.FAIL.getCode(), localeMessageUtil.getMessage("code.admin.backup.backup-failed")); } } @@ -169,10 +169,10 @@ public class BackupController { //打包导出好的文章 ZipUtil.zip(srcPath, srcPath + ".zip"); FileUtil.del(srcPath); - log.info("当前时间：{}，执行了文章备份。", DateUtil.now()); + log.info("Current time: {}, performed an article backup.", DateUtil.now()); return new JsonResult(ResultCodeEnum.SUCCESS.getCode(), localeMessageUtil.getMessage("code.admin.backup.backup-success")); } catch (Exception e) { - log.error("备份文章失败：{}", e.getMessage()); + log.error("Backup article failed: {}", e.getMessage()); return new JsonResult(ResultCodeEnum.FAIL.getCode(), localeMessageUtil.getMessage("code.admin.backup.backup-failed")); } } @@ -270,7 +270,7 @@ public class BackupController { content.put("size", HaloUtils.parseSize(file.length())); mailService.sendAttachMail(user.getUserEmail(), localeMessageUtil.getMessage("code.admin.backup.have-new-backup"), content, "common/mail_template/mail_attach.ftl", srcPath); } catch (Exception e) { - log.error("邮件服务器未配置：{}", e.getMessage()); + log.error("Mail server not configured: {}", e.getMessage()); } } } 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 1a0eb4cd9..46705f15b 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 @@ -54,7 +54,7 @@ public class CategoryController { try { categoryService.saveByCategory(category); } catch (Exception e) { - log.error("修改分类失败：{}", e.getMessage()); + log.error("Modify category failed: {}", e.getMessage()); } return "redirect:/admin/category"; } @@ -86,7 +86,7 @@ public class CategoryController { try { categoryService.removeByCateId(cateId); } catch (Exception e) { - log.error("删除分类失败：{}", e.getMessage()); + log.error("Delete category failed: {}", e.getMessage()); } return "redirect:/admin/category"; } diff --git a/src/main/java/cc/ryanc/halo/web/controller/admin/CommentController.java b/src/main/java/cc/ryanc/halo/web/controller/admin/CommentController.java index faf0da599..a50d22ac4 100755 --- a/src/main/java/cc/ryanc/halo/web/controller/admin/CommentController.java +++ b/src/main/java/cc/ryanc/halo/web/controller/admin/CommentController.java @@ -5,10 +5,7 @@ import cc.ryanc.halo.model.domain.Post; import cc.ryanc.halo.model.domain.User; import cc.ryanc.halo.model.dto.HaloConst; import cc.ryanc.halo.model.dto.JsonResult; -import cc.ryanc.halo.model.enums.BlogPropertiesEnum; -import cc.ryanc.halo.model.enums.CommentStatusEnum; -import cc.ryanc.halo.model.enums.PostTypeEnum; -import cc.ryanc.halo.model.enums.TrueFalseEnum; +import cc.ryanc.halo.model.enums.*; import cc.ryanc.halo.service.CommentService; import cc.ryanc.halo.service.MailService; import cc.ryanc.halo.service.PostService; @@ -96,7 +93,7 @@ public class CommentController extends BaseController { try { commentService.updateCommentStatus(commentId, CommentStatusEnum.RECYCLE.getCode()); } catch (Exception e) { - log.error("删除评论失败：{}", e.getMessage()); + log.error("Delete comment failed: {}", e.getMessage()); } return "redirect:/admin/comments?status=" + status + "&page=" + page; } @@ -137,7 +134,7 @@ public class CommentController extends BaseController { try { commentService.removeByCommentId(commentId); } catch (Exception e) { - log.error("删除评论失败：{}", e.getMessage()); + log.error("Delete comment failed: {}", e.getMessage()); } return "redirect:/admin/comments?status=" + status + "&page=" + page; } @@ -190,10 +187,10 @@ public class CommentController extends BaseController { //邮件通知 new EmailToAuthor(comment, lastComment, post, user, commentContent).start(); - return new JsonResult(1, "回复成功！"); + return new JsonResult(ResultCodeEnum.SUCCESS.getCode()); } catch (Exception e) { - log.error("回复评论失败：{}", e.getMessage()); - return new JsonResult(0, "回复失败！"); + log.error("Reply to comment failed: {}", e.getMessage()); + return new JsonResult(ResultCodeEnum.FAIL.getCode()); } } @@ -278,7 +275,7 @@ public class CommentController extends BaseController { "您在" + HaloConst.OPTIONS.get(BlogPropertiesEnum.BLOG_URL.getProp()) + "的评论已审核通过！", map, "common/mail_template/mail_passed.ftl"); } } catch (Exception e) { - log.error("邮件服务器未配置：{}", e.getMessage()); + log.error("Mail server not configured: {}", e.getMessage()); } } } 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 5aefedebc..d9a6a4b2d 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 @@ -46,7 +46,7 @@ public class MenuController { try { menuService.saveByMenu(menu); } catch (Exception e) { - log.error("保存菜单失败：{}" + e.getMessage()); + log.error("Saving menu failed: {}" + e.getMessage()); } return "redirect:/admin/menus"; } @@ -76,7 +76,7 @@ public class MenuController { try { menuService.removeByMenuId(menuId); } catch (Exception e) { - log.error("删除菜单失败：{}", e.getMessage()); + log.error("Deleting menu failed: {}", e.getMessage()); } return "redirect:/admin/menus"; } 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 3de80a516..db0f94acf 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 @@ -60,10 +60,10 @@ public class OptionController { configuration.setSharedVariable("options", optionsService.findAllOptions()); HaloConst.OPTIONS.clear(); HaloConst.OPTIONS = optionsService.findAllOptions(); - log.info("所保存的设置选项列表：" + options); + log.info("List of saved options: " + options); return new JsonResult(ResultCodeEnum.SUCCESS.getCode(), localeMessageUtil.getMessage("code.admin.common.save-success")); } catch (Exception e) { - log.error("保存设置选项失败：{}", e.getMessage()); + log.error("Save settings option failed: {}", e.getMessage()); return new JsonResult(ResultCodeEnum.FAIL.getCode(), 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 c2de7d947..617c999e7 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 @@ -44,24 +44,19 @@ import java.util.Optional; @RequestMapping(value = "/admin/page") public class PageController { + @Autowired + LocaleMessageUtil localeMessageUtil; @Autowired private LinkService linkService; - @Autowired private GalleryService galleryService; - @Autowired private PostService postService; - @Autowired private LogsService logsService; - @Autowired private HttpServletRequest request; - @Autowired - LocaleMessageUtil localeMessageUtil; - /** * 页面管理页面 * @@ -110,7 +105,7 @@ public class PageController { try { linkService.saveByLink(link); } catch (Exception e) { - log.error("保存/修改友情链接失败：{}", e.getMessage()); + log.error("Save/modify friendship link failed: {}", e.getMessage()); } return "redirect:/admin/page/links"; } @@ -126,7 +121,7 @@ public class PageController { try { linkService.removeByLinkId(linkId); } catch (Exception e) { - log.error("删除友情链接失败：{}", e.getMessage()); + log.error("Deleting a friendship link failed: {}", e.getMessage()); } return "redirect:/admin/page/links"; } @@ -195,7 +190,7 @@ public class PageController { try { galleryService.removeByGalleryId(galleryId); } catch (Exception e) { - log.error("删除图片失败：{}", e.getMessage()); + log.error("Failed to delete image: {}", e.getMessage()); return new JsonResult(ResultCodeEnum.FAIL.getCode(), localeMessageUtil.getMessage("code.admin.common.delete-failed")); } return new JsonResult(ResultCodeEnum.SUCCESS.getCode(), localeMessageUtil.getMessage("code.admin.common.delete-success")); @@ -245,7 +240,7 @@ public class PageController { logsService.saveByLogs(new Logs(LogsRecord.PUSH_PAGE, post.getPostTitle(), ServletUtil.getClientIP(request), DateUtil.date())); return new JsonResult(ResultCodeEnum.SUCCESS.getCode(), msg); } catch (Exception e) { - log.error("保存页面失败：{}", e.getMessage()); + log.error("Save page failed: {}", e.getMessage()); return new JsonResult(ResultCodeEnum.FAIL.getCode(), localeMessageUtil.getMessage("code.admin.common.save-failed")); } } 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 9acf5ae7e..f3aa541a6 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 @@ -209,7 +209,7 @@ public class PostController extends BaseController { logsService.saveByLogs(new Logs(LogsRecord.PUSH_POST, post.getPostTitle(), ServletUtil.getClientIP(request), DateUtil.date())); return new JsonResult(ResultCodeEnum.SUCCESS.getCode(), msg); } catch (Exception e) { - log.error("保存文章失败：{}", e.getMessage()); + log.error("Save article failed: {}", e.getMessage()); return new JsonResult(ResultCodeEnum.FAIL.getCode(), localeMessageUtil.getMessage("code.admin.common.save-failed")); } } @@ -224,9 +224,9 @@ public class PostController extends BaseController { public String moveToTrash(@RequestParam("postId") Long postId, @RequestParam("status") Integer status) { try { postService.updatePostStatus(postId, PostStatusEnum.RECYCLE.getCode()); - log.info("编号为" + postId + "的文章已被移到回收站"); + log.info("Article number {} has been moved to the recycle bin", postId); } catch (Exception e) { - log.error("删除文章到回收站失败：{}", e.getMessage()); + log.error("Deleting article to recycle bin failed: {}", e.getMessage()); } return "redirect:/admin/posts?status=" + status; } @@ -242,9 +242,9 @@ public class PostController extends BaseController { @RequestParam("status") Integer status) { try { postService.updatePostStatus(postId, PostStatusEnum.PUBLISHED.getCode()); - log.info("编号为" + postId + "的文章已改变为发布状态"); + log.info("Article number {} has been changed to release status", postId); } catch (Exception e) { - log.error("发布文章失败：{}", e.getMessage()); + log.error("Publishing article failed: {}", e.getMessage()); } return "redirect:/admin/posts?status=" + status; } @@ -262,7 +262,7 @@ public class PostController extends BaseController { postService.removeByPostId(postId); logsService.saveByLogs(new Logs(LogsRecord.REMOVE_POST, post.get().getPostTitle(), ServletUtil.getClientIP(request), DateUtil.date())); } catch (Exception e) { - log.error("删除文章失败：{}", e.getMessage()); + log.error("Delete article failed: {}", e.getMessage()); } if (StrUtil.equals(PostTypeEnum.POST_TYPE_POST.getDesc(), postType)) { return "redirect:/admin/posts?status=2"; @@ -296,7 +296,7 @@ public class PostController extends BaseController { try { postService.updateAllSummary(postSummary); } catch (Exception e) { - log.error("更新摘要失败：{}", e.getMessage()); + log.error("Update summary failed: {}", e.getMessage()); e.printStackTrace(); return new JsonResult(ResultCodeEnum.FAIL.getCode(), localeMessageUtil.getMessage("code.admin.common.update-failed")); } 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 c0279c508..217e4e38d 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 @@ -51,7 +51,7 @@ public class TagController { try { tagService.saveByTag(tag); } catch (Exception e) { - log.error("新增/修改标签失败：{}", e.getMessage()); + log.error("Add/modify tag failed: {}", e.getMessage()); } return "redirect:/admin/tag"; } @@ -83,7 +83,7 @@ public class TagController { try { tagService.removeByTagId(tagId); } catch (Exception e) { - log.error("删除标签失败：{}", e.getMessage()); + log.error("Failed to delete tag: {}", e.getMessage()); } return "redirect:/admin/tag"; } 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 57831c900..576ee4c37 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 @@ -48,6 +48,8 @@ import java.util.List; @RequestMapping(value = "/admin/themes") public class ThemeController extends BaseController { + private static final String NOT_FOUND_GIT = "-bash: git: command not found"; + @Autowired private OptionsService optionsService; @@ -60,8 +62,6 @@ public class ThemeController extends BaseController { @Autowired private LocaleMessageUtil localeMessageUtil; - private static final String NOT_FOUND_GIT = "-bash: git: command not found"; - /** * 渲染主题设置页面 * @@ -98,7 +98,7 @@ public class ThemeController extends BaseController { HaloConst.OPTIONS = optionsService.findAllOptions(); configuration.setSharedVariable("themeName", siteTheme); configuration.setSharedVariable("options", HaloConst.OPTIONS); - log.info("已将主题改变为：{}", siteTheme); + log.info("Changed theme to {}", siteTheme); logsService.saveByLogs( new Logs(LogsRecord.CHANGE_THEME, "更换为" + siteTheme, ServletUtil.getClientIP(request), DateUtil.date()) ); @@ -125,7 +125,7 @@ public class ThemeController extends BaseController { File basePath = new File(ResourceUtils.getURL("classpath:").getPath()); File themePath = new File(basePath.getAbsolutePath(), new StringBuffer("templates/themes/").append(file.getOriginalFilename()).toString()); file.transferTo(themePath); - log.info("上传主题成功，路径：" + themePath.getAbsolutePath()); + log.info("Upload topic success, path is " + themePath.getAbsolutePath()); logsService.saveByLogs( new Logs(LogsRecord.UPLOAD_THEME, file.getOriginalFilename(), ServletUtil.getClientIP(request), DateUtil.date()) ); @@ -134,11 +134,11 @@ public class ThemeController extends BaseController { HaloConst.THEMES.clear(); HaloConst.THEMES = HaloUtils.getThemes(); } else { - log.error("上传主题失败，没有选择文件"); + log.error("Upload theme failed, no file selected"); return new JsonResult(ResultCodeEnum.FAIL.getCode(), localeMessageUtil.getMessage("code.admin.theme.upload-no-file")); } } catch (Exception e) { - log.error("上传主题失败：{}", e.getMessage()); + log.error("Upload theme failed: {}", e.getMessage()); return new JsonResult(ResultCodeEnum.FAIL.getCode(), localeMessageUtil.getMessage("code.admin.theme.upload-failed")); } return new JsonResult(ResultCodeEnum.SUCCESS.getCode(), localeMessageUtil.getMessage("code.admin.theme.upload-success")); @@ -159,7 +159,7 @@ public class ThemeController extends BaseController { HaloConst.THEMES.clear(); HaloConst.THEMES = HaloUtils.getThemes(); } catch (Exception e) { - log.error("删除主题失败：{}", e.getMessage()); + log.error("Delete theme failed: {}", e.getMessage()); } return "redirect:/admin/themes"; } @@ -186,22 +186,22 @@ 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(0, localeMessageUtil.getMessage("code.admin.common.info-no-complete")); + return new JsonResult(ResultCodeEnum.FAIL.getCode(), localeMessageUtil.getMessage("code.admin.common.info-no-complete")); } try { File basePath = new File(ResourceUtils.getURL("classpath:").getPath()); File themePath = new File(basePath.getAbsolutePath(), "templates/themes"); String cmdResult = RuntimeUtil.execForStr("git clone " + remoteAddr + " " + themePath.getAbsolutePath() + "/" + themeName); if (NOT_FOUND_GIT.equals(cmdResult)) { - return new JsonResult(0, localeMessageUtil.getMessage("code.admin.theme.no-git")); + return new JsonResult(ResultCodeEnum.FAIL.getCode(), localeMessageUtil.getMessage("code.admin.theme.no-git")); } HaloConst.THEMES.clear(); HaloConst.THEMES = HaloUtils.getThemes(); } catch (FileNotFoundException e) { - log.error("克隆主题失败：{}", e.getMessage()); - return new JsonResult(0, localeMessageUtil.getMessage("code.admin.theme.clone-theme-failed") + e.getMessage()); + log.error("Cloning theme failed: {}", e.getMessage()); + return new JsonResult(ResultCodeEnum.FAIL.getCode(), localeMessageUtil.getMessage("code.admin.theme.clone-theme-failed") + e.getMessage()); } - return new JsonResult(1, localeMessageUtil.getMessage("code.admin.common.install-success")); + return new JsonResult(ResultCodeEnum.SUCCESS.getCode(), localeMessageUtil.getMessage("code.admin.common.install-success")); } /** @@ -218,15 +218,15 @@ public class ThemeController extends BaseController { File themePath = new File(basePath.getAbsolutePath(), "templates/themes"); String cmdResult = RuntimeUtil.execForStr("cd " + themePath.getAbsolutePath() + "/" + themeName + " && git pull"); if (NOT_FOUND_GIT.equals(cmdResult)) { - return new JsonResult(0, localeMessageUtil.getMessage("code.admin.theme.no-git")); + return new JsonResult(ResultCodeEnum.FAIL.getCode(), localeMessageUtil.getMessage("code.admin.theme.no-git")); } HaloConst.THEMES.clear(); HaloConst.THEMES = HaloUtils.getThemes(); } catch (Exception e) { - log.error("更新主题失败：{}", e.getMessage()); - return new JsonResult(0, localeMessageUtil.getMessage("code.admin.theme.update-theme-failed") + e.getMessage()); + log.error("Update theme failed: {}", e.getMessage()); + return new JsonResult(ResultCodeEnum.FAIL.getCode(), localeMessageUtil.getMessage("code.admin.theme.update-theme-failed") + e.getMessage()); } - return new JsonResult(1, localeMessageUtil.getMessage("code.admin.common.update-success")); + return new JsonResult(ResultCodeEnum.SUCCESS.getCode(), localeMessageUtil.getMessage("code.admin.common.update-success")); } /** @@ -278,7 +278,7 @@ public class ThemeController extends BaseController { FileReader fileReader = new FileReader(themesPath); tplContent = fileReader.readString(); } catch (Exception e) { - log.error("获取模板文件错误：{}", e.getMessage()); + log.error("Get template file error: {}", e.getMessage()); } return tplContent; } @@ -305,7 +305,7 @@ public class ThemeController extends BaseController { FileWriter fileWriter = new FileWriter(tplPath); fileWriter.write(tplContent); } catch (Exception e) { - log.error("模板保存失败：{}", e.getMessage()); + log.error("Template save failed: {}", e.getMessage()); return new JsonResult(ResultCodeEnum.FAIL.getCode(), localeMessageUtil.getMessage("code.admin.common.save-failed")); } return new JsonResult(ResultCodeEnum.SUCCESS.getCode(), 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 d62e11028..7e88d46b5 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 @@ -70,7 +70,7 @@ public class UserController { configuration.setSharedVariable("user", userService.findUser()); session.removeAttribute(HaloConst.USER_SESSION_KEY); } catch (Exception e) { - log.error("修改用户资料失败：{}", e.getMessage()); + log.error("Failed to modify user profile: {}", e.getMessage()); return new JsonResult(ResultCodeEnum.FAIL.getCode(), localeMessageUtil.getMessage("code.admin.common.edit-failed")); } return new JsonResult(ResultCodeEnum.SUCCESS.getCode(), localeMessageUtil.getMessage("code.admin.common.edit-success")); @@ -101,7 +101,7 @@ public class UserController { return new JsonResult(ResultCodeEnum.FAIL.getCode(), localeMessageUtil.getMessage("code.admin.user.old-password-error")); } } catch (Exception e) { - log.error("修改密码失败：{}", e.getMessage()); + log.error("Password change failed: {}", e.getMessage()); return new JsonResult(ResultCodeEnum.FAIL.getCode(), localeMessageUtil.getMessage("code.admin.user.update-password-failed")); } return new JsonResult(ResultCodeEnum.SUCCESS.getCode(), localeMessageUtil.getMessage("code.admin.user.update-password-success")); 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 6f127fd1f..1b02f573c 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 @@ -1,5 +1,7 @@ package cc.ryanc.halo.web.controller.core; +import cn.hutool.core.text.StrBuilder; + /** * 
  *     Controller抽象类
@@ -22,7 +24,7 @@ public abstract class BaseController {
      * @return 返回拼接好的模板路径
      */
     public String render(String pageName) {
-        StringBuffer themeStr = new StringBuffer("themes/");
+        StrBuilder themeStr = new StrBuilder("themes/");
         themeStr.append(THEME);
         themeStr.append("/");
         return themeStr.append(pageName).toString();
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 cb2a805d8..faf6e05d1 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
@@ -181,7 +181,7 @@ public class FrontCommentController {
                     map.put("commentContent", comment.getCommentContent());
                     mailService.sendTemplateMail(userService.findUser().getUserEmail(), "有新的评论", map, "common/mail_template/mail_admin.ftl");
                 } catch (Exception e) {
-                    log.error("邮件服务器未配置：{}", e.getMessage());
+                    log.error("Mail server not configured: {}", e.getMessage());
                 }
             }
         }