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

🎨 代码优化

pull/41/head
ruibaby 2018-10-25 14:35:18 +08:00
parent f69ee6cfaf
commit e04fc56816
19 changed files with 82 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/cc/ryanc/halo/config/FreeMarkerConfig.java
View File

@ -47,7 +47,7 @@ public class FreeMarkerConfig {
configuration.setSharedVariable("options", optionsService.findAllOptions()); configuration.setSharedVariable("options", optionsService.findAllOptions());
configuration.setSharedVariable("user", userService.findUser()); configuration.setSharedVariable("user", userService.findUser());
} catch (TemplateModelException e) { } catch (TemplateModelException e) {
log.error("自定义标签加载失败：{}", e.getMessage()); log.error("Custom tags failed to load：{}", e.getMessage());
} }
} }
} }

9
src/main/java/cc/ryanc/halo/model/dto/JsonResult.java
View File

@ -28,6 +28,15 @@ public class JsonResult {
*/ */
private Object result; private Object result;
/**
* 只返回状态码
*
* @param code 状态码
*/
public JsonResult(Integer code) {
this.code = code;
}
/** /**
* 不返回数据的构造方法 * 不返回数据的构造方法
* *

1
src/main/java/cc/ryanc/halo/model/enums/AllowCommentEnum.java
View File

@ -9,6 +9,7 @@ package cc.ryanc.halo.model.enums;
* @date : 2018/7/9 * @date : 2018/7/9
*/ */
public enum AllowCommentEnum { public enum AllowCommentEnum {
/** /**
* 允许评论 * 允许评论
*/ */

9
src/main/java/cc/ryanc/halo/repository/AttachmentRepository.java
View File

@ -14,13 +14,4 @@ import org.springframework.data.jpa.repository.JpaRepository;
* @date : 2018/1/10 * @date : 2018/1/10
*/ */
public interface AttachmentRepository extends JpaRepository<Attachment, Long> { public interface AttachmentRepository extends JpaRepository<Attachment, Long> {
/**
* 查询所有附件，分页
*
* @param pageable pageable
* @return Page
*/
@Override
Page<Attachment> findAll(Pageable pageable);
} }

4
src/main/java/cc/ryanc/halo/utils/HaloUtils.java
View File

@ -178,7 +178,7 @@ public class HaloUtils {
} }
} }
} catch (Exception e) { } catch (Exception e) {
log.error("主题获取失败：{}", e.getMessage()); log.error("Themes scan failed：{}", e.getMessage());
} }
return themes; return themes;
} }
@ -214,7 +214,7 @@ public class HaloUtils {
} }
} }
} catch (Exception e) { } catch (Exception e) {
log.error("获取主题模板失败：{}", e.getMessage()); log.error("Failed to get theme template: {}", e.getMessage());
} }
return tpls; return tpls;
} }

6
src/main/java/cc/ryanc/halo/web/controller/admin/AdminController.java
View File

@ -161,7 +161,7 @@ public class AdminController extends BaseController {
//重置用户的登录状态为正常 //重置用户的登录状态为正常
userService.updateUserNormal(); userService.updateUserNormal();
logsService.saveByLogs(new Logs(LogsRecord.LOGIN, LogsRecord.LOGIN_SUCCESS, ServletUtil.getClientIP(request), DateUtil.date())); 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")); return new JsonResult(ResultCodeEnum.SUCCESS.getCode(), localeMessageUtil.getMessage("code.admin.login.success"));
} else { } else {
//更新失败次数 //更新失败次数
@ -194,7 +194,7 @@ public class AdminController extends BaseController {
User user = (User) session.getAttribute(HaloConst.USER_SESSION_KEY); User user = (User) session.getAttribute(HaloConst.USER_SESSION_KEY);
session.removeAttribute(HaloConst.USER_SESSION_KEY); session.removeAttribute(HaloConst.USER_SESSION_KEY);
logsService.saveByLogs(new Logs(LogsRecord.LOGOUT, user.getUserName(), ServletUtil.getClientIP(request), DateUtil.date())); 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"; return "redirect:/admin/login";
} }
@ -227,7 +227,7 @@ public class AdminController extends BaseController {
try { try {
logsService.removeAllLogs(); logsService.removeAllLogs();
} catch (Exception e) { } catch (Exception e) {
log.error("清除日志失败：{}" + e.getMessage()); log.error("Clear log failed:{}" + e.getMessage());
} }
return "redirect:/admin"; return "redirect:/admin";
} }

14
src/main/java/cc/ryanc/halo/web/controller/admin/AttachmentController.java
View File

@ -165,7 +165,7 @@ public class AttachmentController {
attachment.setAttachSize(HaloUtils.parseSize(new File(mediaPath, fileName).length())); attachment.setAttachSize(HaloUtils.parseSize(new File(mediaPath, fileName).length()));
attachment.setAttachWh(HaloUtils.getImageWh(new File(mediaPath, fileName))); attachment.setAttachWh(HaloUtils.getImageWh(new File(mediaPath, fileName)));
attachmentService.saveByAttachment(attachment); attachmentService.saveByAttachment(attachment);
log.info("上传文件[{}]到[{}]成功", fileName, mediaPath.getAbsolutePath()); log.info("Upload file {} to {} successfully", fileName, mediaPath.getAbsolutePath());
logsService.saveByLogs( logsService.saveByLogs(
new Logs(LogsRecord.UPLOAD_FILE, fileName, ServletUtil.getClientIP(request), DateUtil.date()) new Logs(LogsRecord.UPLOAD_FILE, fileName, ServletUtil.getClientIP(request), DateUtil.date())
); );
@ -173,14 +173,14 @@ public class AttachmentController {
result.put("success", 1); result.put("success", 1);
result.put("message", localeMessageUtil.getMessage("code.admin.attachment.upload-success")); result.put("message", localeMessageUtil.getMessage("code.admin.attachment.upload-success"));
result.put("url", attachment.getAttachPath()); result.put("url", attachment.getAttachPath());
result.put("filename",filePath); result.put("filename", filePath);
} catch (Exception e) { } catch (Exception e) {
log.error("上传文件失败：{}", e.getMessage()); log.error("Upload file failed:{}", e.getMessage());
result.put("success", 0); result.put("success", 0);
result.put("message", localeMessageUtil.getMessage("code.admin.attachment.upload-failed")); result.put("message", localeMessageUtil.getMessage("code.admin.attachment.upload-failed"));
} }
} else { } else {
log.error("文件不能为空"); log.error("File cannot be empty!");
} }
return result; return result;
} }
@ -223,17 +223,17 @@ public class AttachmentController {
File delSmallFile = new File(new StringBuffer(mediaPath.getAbsolutePath()).append("/").append(delSmallFileName).toString()); File delSmallFile = new File(new StringBuffer(mediaPath.getAbsolutePath()).append("/").append(delSmallFileName).toString());
if (delFile.exists() && delFile.isFile()) { if (delFile.exists() && delFile.isFile()) {
if (delFile.delete() && delSmallFile.delete()) { if (delFile.delete() && delSmallFile.delete()) {
log.info("删除文件[{}]成功！", delFileName); log.info("Delete file {} successfully!", delFileName);
logsService.saveByLogs( logsService.saveByLogs(
new Logs(LogsRecord.REMOVE_FILE, delFileName, ServletUtil.getClientIP(request), DateUtil.date()) new Logs(LogsRecord.REMOVE_FILE, delFileName, ServletUtil.getClientIP(request), DateUtil.date())
); );
} else { } else {
log.error("删除附件[{}]失败！", delFileName); log.error("Deleting attachment {} failed!", delFileName);
return new JsonResult(ResultCodeEnum.FAIL.getCode(), localeMessageUtil.getMessage("code.admin.common.delete-failed")); return new JsonResult(ResultCodeEnum.FAIL.getCode(), localeMessageUtil.getMessage("code.admin.common.delete-failed"));
} }
} }
} catch (Exception e) { } 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.FAIL.getCode(), localeMessageUtil.getMessage("code.admin.common.delete-failed"));
} }
return new JsonResult(ResultCodeEnum.SUCCESS.getCode(), localeMessageUtil.getMessage("code.admin.common.delete-success")); return new JsonResult(ResultCodeEnum.SUCCESS.getCode(), localeMessageUtil.getMessage("code.admin.common.delete-success"));

14
src/main/java/cc/ryanc/halo/web/controller/admin/BackupController.java
View File

@ -117,10 +117,10 @@ public class BackupController {
String distName = "databases_backup_" + DateUtil.format(DateUtil.date(), "yyyyMMddHHmmss"); 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"); 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")); return new JsonResult(ResultCodeEnum.SUCCESS.getCode(), localeMessageUtil.getMessage("code.admin.backup.backup-success"));
} catch (Exception e) { } 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")); 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"); String distName = "resources_backup_" + DateUtil.format(DateUtil.date(), "yyyyMMddHHmmss");
//执行打包 //执行打包
ZipUtil.zip(srcPath, System.getProperties().getProperty("user.home") + "/halo/backup/resources/" + distName + ".zip"); 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")); return new JsonResult(ResultCodeEnum.SUCCESS.getCode(), localeMessageUtil.getMessage("code.admin.backup.backup-success"));
} catch (Exception e) { } 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")); 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"); ZipUtil.zip(srcPath, srcPath + ".zip");
FileUtil.del(srcPath); 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")); return new JsonResult(ResultCodeEnum.SUCCESS.getCode(), localeMessageUtil.getMessage("code.admin.backup.backup-success"));
} catch (Exception e) { } 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")); 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())); 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); mailService.sendAttachMail(user.getUserEmail(), localeMessageUtil.getMessage("code.admin.backup.have-new-backup"), content, "common/mail_template/mail_attach.ftl", srcPath);
} catch (Exception e) { } catch (Exception e) {
log.error("邮件服务器未配置：{}", e.getMessage()); log.error("Mail server not configured: {}", e.getMessage());
} }
} }
} }

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

@ -54,7 +54,7 @@ public class CategoryController {
try { try {
categoryService.saveByCategory(category); categoryService.saveByCategory(category);
} catch (Exception e) { } catch (Exception e) {
log.error("修改分类失败：{}", e.getMessage()); log.error("Modify category failed: {}", e.getMessage());
} }
return "redirect:/admin/category"; return "redirect:/admin/category";
} }
@ -86,7 +86,7 @@ public class CategoryController {
try { try {
categoryService.removeByCateId(cateId); categoryService.removeByCateId(cateId);
} catch (Exception e) { } catch (Exception e) {
log.error("删除分类失败：{}", e.getMessage()); log.error("Delete category failed: {}", e.getMessage());
} }
return "redirect:/admin/category"; return "redirect:/admin/category";
} }

17
src/main/java/cc/ryanc/halo/web/controller/admin/CommentController.java
View File

@ -5,10 +5,7 @@ import cc.ryanc.halo.model.domain.Post;
import cc.ryanc.halo.model.domain.User; import cc.ryanc.halo.model.domain.User;
import cc.ryanc.halo.model.dto.HaloConst; import cc.ryanc.halo.model.dto.HaloConst;
import cc.ryanc.halo.model.dto.JsonResult; import cc.ryanc.halo.model.dto.JsonResult;
import cc.ryanc.halo.model.enums.BlogPropertiesEnum; import cc.ryanc.halo.model.enums.*;
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.service.CommentService; import cc.ryanc.halo.service.CommentService;
import cc.ryanc.halo.service.MailService; import cc.ryanc.halo.service.MailService;
import cc.ryanc.halo.service.PostService; import cc.ryanc.halo.service.PostService;
@ -96,7 +93,7 @@ public class CommentController extends BaseController {
try { try {
commentService.updateCommentStatus(commentId, CommentStatusEnum.RECYCLE.getCode()); commentService.updateCommentStatus(commentId, CommentStatusEnum.RECYCLE.getCode());
} catch (Exception e) { } catch (Exception e) {
log.error("删除评论失败：{}", e.getMessage()); log.error("Delete comment failed: {}", e.getMessage());
} }
return "redirect:/admin/comments?status=" + status + "&page=" + page; return "redirect:/admin/comments?status=" + status + "&page=" + page;
} }
@ -137,7 +134,7 @@ public class CommentController extends BaseController {
try { try {
commentService.removeByCommentId(commentId); commentService.removeByCommentId(commentId);
} catch (Exception e) { } catch (Exception e) {
log.error("删除评论失败：{}", e.getMessage()); log.error("Delete comment failed: {}", e.getMessage());
} }
return "redirect:/admin/comments?status=" + status + "&page=" + page; 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(); new EmailToAuthor(comment, lastComment, post, user, commentContent).start();
return new JsonResult(1, "回复成功！"); return new JsonResult(ResultCodeEnum.SUCCESS.getCode());
} catch (Exception e) { } catch (Exception e) {
log.error("回复评论失败：{}", e.getMessage()); log.error("Reply to comment failed: {}", e.getMessage());
return new JsonResult(0, "回复失败！"); 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"); "您在" + HaloConst.OPTIONS.get(BlogPropertiesEnum.BLOG_URL.getProp()) + "的评论已审核通过！", map, "common/mail_template/mail_passed.ftl");
} }
} catch (Exception e) { } catch (Exception e) {
log.error("邮件服务器未配置：{}", e.getMessage()); log.error("Mail server not configured: {}", e.getMessage());
} }
} }
} }

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

@ -46,7 +46,7 @@ public class MenuController {
try { try {
menuService.saveByMenu(menu); menuService.saveByMenu(menu);
} catch (Exception e) { } catch (Exception e) {
log.error("保存菜单失败：{}" + e.getMessage()); log.error("Saving menu failed: {}" + e.getMessage());
} }
return "redirect:/admin/menus"; return "redirect:/admin/menus";
} }
@ -76,7 +76,7 @@ public class MenuController {
try { try {
menuService.removeByMenuId(menuId); menuService.removeByMenuId(menuId);
} catch (Exception e) { } catch (Exception e) {
log.error("删除菜单失败：{}", e.getMessage()); log.error("Deleting menu failed: {}", e.getMessage());
} }
return "redirect:/admin/menus"; return "redirect:/admin/menus";
} }

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

@ -60,10 +60,10 @@ public class OptionController {
configuration.setSharedVariable("options", optionsService.findAllOptions()); configuration.setSharedVariable("options", optionsService.findAllOptions());
HaloConst.OPTIONS.clear(); HaloConst.OPTIONS.clear();
HaloConst.OPTIONS = optionsService.findAllOptions(); 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")); return new JsonResult(ResultCodeEnum.SUCCESS.getCode(), localeMessageUtil.getMessage("code.admin.common.save-success"));
} catch (Exception e) { } 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")); return new JsonResult(ResultCodeEnum.FAIL.getCode(), localeMessageUtil.getMessage("code.admin.common.save-failed"));
} }
} }

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

@ -44,24 +44,19 @@ import java.util.Optional;
@RequestMapping(value = "/admin/page") @RequestMapping(value = "/admin/page")
public class PageController { public class PageController {
@Autowired
LocaleMessageUtil localeMessageUtil;
@Autowired @Autowired
private LinkService linkService; private LinkService linkService;
@Autowired @Autowired
private GalleryService galleryService; private GalleryService galleryService;
@Autowired @Autowired
private PostService postService; private PostService postService;
@Autowired @Autowired
private LogsService logsService; private LogsService logsService;
@Autowired @Autowired
private HttpServletRequest request; private HttpServletRequest request;
@Autowired
LocaleMessageUtil localeMessageUtil;
/** /**
* 页面管理页面 * 页面管理页面
* *
@ -110,7 +105,7 @@ public class PageController {
try { try {
linkService.saveByLink(link); linkService.saveByLink(link);
} catch (Exception e) { } catch (Exception e) {
log.error("保存/修改友情链接失败：{}", e.getMessage()); log.error("Save/modify friendship link failed: {}", e.getMessage());
} }
return "redirect:/admin/page/links"; return "redirect:/admin/page/links";
} }
@ -126,7 +121,7 @@ public class PageController {
try { try {
linkService.removeByLinkId(linkId); linkService.removeByLinkId(linkId);
} catch (Exception e) { } catch (Exception e) {
log.error("删除友情链接失败：{}", e.getMessage()); log.error("Deleting a friendship link failed: {}", e.getMessage());
} }
return "redirect:/admin/page/links"; return "redirect:/admin/page/links";
} }
@ -195,7 +190,7 @@ public class PageController {
try { try {
galleryService.removeByGalleryId(galleryId); galleryService.removeByGalleryId(galleryId);
} catch (Exception e) { } 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.FAIL.getCode(), localeMessageUtil.getMessage("code.admin.common.delete-failed"));
} }
return new JsonResult(ResultCodeEnum.SUCCESS.getCode(), localeMessageUtil.getMessage("code.admin.common.delete-success")); 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())); logsService.saveByLogs(new Logs(LogsRecord.PUSH_PAGE, post.getPostTitle(), ServletUtil.getClientIP(request), DateUtil.date()));
return new JsonResult(ResultCodeEnum.SUCCESS.getCode(), msg); return new JsonResult(ResultCodeEnum.SUCCESS.getCode(), msg);
} catch (Exception e) { } 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")); return new JsonResult(ResultCodeEnum.FAIL.getCode(), localeMessageUtil.getMessage("code.admin.common.save-failed"));
} }
} }

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

@ -209,7 +209,7 @@ public class PostController extends BaseController {
logsService.saveByLogs(new Logs(LogsRecord.PUSH_POST, post.getPostTitle(), ServletUtil.getClientIP(request), DateUtil.date())); logsService.saveByLogs(new Logs(LogsRecord.PUSH_POST, post.getPostTitle(), ServletUtil.getClientIP(request), DateUtil.date()));
return new JsonResult(ResultCodeEnum.SUCCESS.getCode(), msg); return new JsonResult(ResultCodeEnum.SUCCESS.getCode(), msg);
} catch (Exception e) { } 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")); 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) { public String moveToTrash(@RequestParam("postId") Long postId, @RequestParam("status") Integer status) {
try { try {
postService.updatePostStatus(postId, PostStatusEnum.RECYCLE.getCode()); postService.updatePostStatus(postId, PostStatusEnum.RECYCLE.getCode());
log.info("编号为" + postId + "的文章已被移到回收站"); log.info("Article number {} has been moved to the recycle bin", postId);
} catch (Exception e) { } catch (Exception e) {
log.error("删除文章到回收站失败：{}", e.getMessage()); log.error("Deleting article to recycle bin failed: {}", e.getMessage());
} }
return "redirect:/admin/posts?status=" + status; return "redirect:/admin/posts?status=" + status;
} }
@ -242,9 +242,9 @@ public class PostController extends BaseController {
@RequestParam("status") Integer status) { @RequestParam("status") Integer status) {
try { try {
postService.updatePostStatus(postId, PostStatusEnum.PUBLISHED.getCode()); postService.updatePostStatus(postId, PostStatusEnum.PUBLISHED.getCode());
log.info("编号为" + postId + "的文章已改变为发布状态"); log.info("Article number {} has been changed to release status", postId);
} catch (Exception e) { } catch (Exception e) {
log.error("发布文章失败：{}", e.getMessage()); log.error("Publishing article failed: {}", e.getMessage());
} }
return "redirect:/admin/posts?status=" + status; return "redirect:/admin/posts?status=" + status;
} }
@ -262,7 +262,7 @@ public class PostController extends BaseController {
postService.removeByPostId(postId); postService.removeByPostId(postId);
logsService.saveByLogs(new Logs(LogsRecord.REMOVE_POST, post.get().getPostTitle(), ServletUtil.getClientIP(request), DateUtil.date())); logsService.saveByLogs(new Logs(LogsRecord.REMOVE_POST, post.get().getPostTitle(), ServletUtil.getClientIP(request), DateUtil.date()));
} catch (Exception e) { } catch (Exception e) {
log.error("删除文章失败：{}", e.getMessage()); log.error("Delete article failed: {}", e.getMessage());
} }
if (StrUtil.equals(PostTypeEnum.POST_TYPE_POST.getDesc(), postType)) { if (StrUtil.equals(PostTypeEnum.POST_TYPE_POST.getDesc(), postType)) {
return "redirect:/admin/posts?status=2"; return "redirect:/admin/posts?status=2";
@ -296,7 +296,7 @@ public class PostController extends BaseController {
try { try {
postService.updateAllSummary(postSummary); postService.updateAllSummary(postSummary);
} catch (Exception e) { } catch (Exception e) {
log.error("更新摘要失败：{}", e.getMessage()); log.error("Update summary failed: {}", e.getMessage());
e.printStackTrace(); e.printStackTrace();
return new JsonResult(ResultCodeEnum.FAIL.getCode(), localeMessageUtil.getMessage("code.admin.common.update-failed")); return new JsonResult(ResultCodeEnum.FAIL.getCode(), localeMessageUtil.getMessage("code.admin.common.update-failed"));
} }

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

@ -51,7 +51,7 @@ public class TagController {
try { try {
tagService.saveByTag(tag); tagService.saveByTag(tag);
} catch (Exception e) { } catch (Exception e) {
log.error("新增/修改标签失败：{}", e.getMessage()); log.error("Add/modify tag failed: {}", e.getMessage());
} }
return "redirect:/admin/tag"; return "redirect:/admin/tag";
} }
@ -83,7 +83,7 @@ public class TagController {
try { try {
tagService.removeByTagId(tagId); tagService.removeByTagId(tagId);
} catch (Exception e) { } catch (Exception e) {
log.error("删除标签失败：{}", e.getMessage()); log.error("Failed to delete tag: {}", e.getMessage());
} }
return "redirect:/admin/tag"; return "redirect:/admin/tag";
} }

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

@ -48,6 +48,8 @@ import java.util.List;
@RequestMapping(value = "/admin/themes") @RequestMapping(value = "/admin/themes")
public class ThemeController extends BaseController { public class ThemeController extends BaseController {
private static final String NOT_FOUND_GIT = "-bash: git: command not found";
@Autowired @Autowired
private OptionsService optionsService; private OptionsService optionsService;
@ -60,8 +62,6 @@ public class ThemeController extends BaseController {
@Autowired @Autowired
private LocaleMessageUtil localeMessageUtil; 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(); HaloConst.OPTIONS = optionsService.findAllOptions();
configuration.setSharedVariable("themeName", siteTheme); configuration.setSharedVariable("themeName", siteTheme);
configuration.setSharedVariable("options", HaloConst.OPTIONS); configuration.setSharedVariable("options", HaloConst.OPTIONS);
log.info("已将主题改变为：{}", siteTheme); log.info("Changed theme to {}", siteTheme);
logsService.saveByLogs( logsService.saveByLogs(
new Logs(LogsRecord.CHANGE_THEME, "更换为" + siteTheme, ServletUtil.getClientIP(request), DateUtil.date()) 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 basePath = new File(ResourceUtils.getURL("classpath:").getPath());
File themePath = new File(basePath.getAbsolutePath(), new StringBuffer("templates/themes/").append(file.getOriginalFilename()).toString()); File themePath = new File(basePath.getAbsolutePath(), new StringBuffer("templates/themes/").append(file.getOriginalFilename()).toString());
file.transferTo(themePath); file.transferTo(themePath);
log.info("上传主题成功，路径：" + themePath.getAbsolutePath()); log.info("Upload topic success, path is " + themePath.getAbsolutePath());
logsService.saveByLogs( logsService.saveByLogs(
new Logs(LogsRecord.UPLOAD_THEME, file.getOriginalFilename(), ServletUtil.getClientIP(request), DateUtil.date()) 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.clear();
HaloConst.THEMES = HaloUtils.getThemes(); HaloConst.THEMES = HaloUtils.getThemes();
} else { } 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")); return new JsonResult(ResultCodeEnum.FAIL.getCode(), localeMessageUtil.getMessage("code.admin.theme.upload-no-file"));
} }
} catch (Exception e) { } 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.FAIL.getCode(), localeMessageUtil.getMessage("code.admin.theme.upload-failed"));
} }
return new JsonResult(ResultCodeEnum.SUCCESS.getCode(), localeMessageUtil.getMessage("code.admin.theme.upload-success")); 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.clear();
HaloConst.THEMES = HaloUtils.getThemes(); HaloConst.THEMES = HaloUtils.getThemes();
} catch (Exception e) { } catch (Exception e) {
log.error("删除主题失败：{}", e.getMessage()); log.error("Delete theme failed: {}", e.getMessage());
} }
return "redirect:/admin/themes"; return "redirect:/admin/themes";
} }
@ -186,22 +186,22 @@ public class ThemeController extends BaseController {
public JsonResult cloneFromRemote(@RequestParam(value = "remoteAddr") String remoteAddr, public JsonResult cloneFromRemote(@RequestParam(value = "remoteAddr") String remoteAddr,
@RequestParam(value = "themeName") String themeName) { @RequestParam(value = "themeName") String themeName) {
if (StrUtil.isBlank(remoteAddr) || StrUtil.isBlank(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 { try {
File basePath = new File(ResourceUtils.getURL("classpath:").getPath()); File basePath = new File(ResourceUtils.getURL("classpath:").getPath());
File themePath = new File(basePath.getAbsolutePath(), "templates/themes"); File themePath = new File(basePath.getAbsolutePath(), "templates/themes");
String cmdResult = RuntimeUtil.execForStr("git clone " + remoteAddr + " " + themePath.getAbsolutePath() + "/" + themeName); String cmdResult = RuntimeUtil.execForStr("git clone " + remoteAddr + " " + themePath.getAbsolutePath() + "/" + themeName);
if (NOT_FOUND_GIT.equals(cmdResult)) { 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.clear();
HaloConst.THEMES = HaloUtils.getThemes(); HaloConst.THEMES = HaloUtils.getThemes();
} catch (FileNotFoundException e) { } catch (FileNotFoundException e) {
log.error("克隆主题失败：{}", e.getMessage()); log.error("Cloning theme failed: {}", e.getMessage());
return new JsonResult(0, localeMessageUtil.getMessage("code.admin.theme.clone-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"); File themePath = new File(basePath.getAbsolutePath(), "templates/themes");
String cmdResult = RuntimeUtil.execForStr("cd " + themePath.getAbsolutePath() + "/" + themeName + " && git pull"); String cmdResult = RuntimeUtil.execForStr("cd " + themePath.getAbsolutePath() + "/" + themeName + " && git pull");
if (NOT_FOUND_GIT.equals(cmdResult)) { 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.clear();
HaloConst.THEMES = HaloUtils.getThemes(); HaloConst.THEMES = HaloUtils.getThemes();
} catch (Exception e) { } catch (Exception e) {
log.error("更新主题失败：{}", e.getMessage()); log.error("Update theme failed: {}", e.getMessage());
return new JsonResult(0, localeMessageUtil.getMessage("code.admin.theme.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); FileReader fileReader = new FileReader(themesPath);
tplContent = fileReader.readString(); tplContent = fileReader.readString();
} catch (Exception e) { } catch (Exception e) {
log.error("获取模板文件错误：{}", e.getMessage()); log.error("Get template file error: {}", e.getMessage());
} }
return tplContent; return tplContent;
} }
@ -305,7 +305,7 @@ public class ThemeController extends BaseController {
FileWriter fileWriter = new FileWriter(tplPath); FileWriter fileWriter = new FileWriter(tplPath);
fileWriter.write(tplContent); fileWriter.write(tplContent);
} catch (Exception e) { } 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.FAIL.getCode(), localeMessageUtil.getMessage("code.admin.common.save-failed"));
} }
return new JsonResult(ResultCodeEnum.SUCCESS.getCode(), localeMessageUtil.getMessage("code.admin.common.save-success")); return new JsonResult(ResultCodeEnum.SUCCESS.getCode(), localeMessageUtil.getMessage("code.admin.common.save-success"));

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

@ -70,7 +70,7 @@ public class UserController {
configuration.setSharedVariable("user", userService.findUser()); configuration.setSharedVariable("user", userService.findUser());
session.removeAttribute(HaloConst.USER_SESSION_KEY); session.removeAttribute(HaloConst.USER_SESSION_KEY);
} catch (Exception e) { } 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.FAIL.getCode(), localeMessageUtil.getMessage("code.admin.common.edit-failed"));
} }
return new JsonResult(ResultCodeEnum.SUCCESS.getCode(), localeMessageUtil.getMessage("code.admin.common.edit-success")); 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")); return new JsonResult(ResultCodeEnum.FAIL.getCode(), localeMessageUtil.getMessage("code.admin.user.old-password-error"));
} }
} catch (Exception e) { } 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.FAIL.getCode(), localeMessageUtil.getMessage("code.admin.user.update-password-failed"));
} }
return new JsonResult(ResultCodeEnum.SUCCESS.getCode(), localeMessageUtil.getMessage("code.admin.user.update-password-success")); return new JsonResult(ResultCodeEnum.SUCCESS.getCode(), localeMessageUtil.getMessage("code.admin.user.update-password-success"));

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

@ -1,5 +1,7 @@
package cc.ryanc.halo.web.controller.core; package cc.ryanc.halo.web.controller.core;
import cn.hutool.core.text.StrBuilder;
/** /**
* <pre> * <pre>
* Controller抽象类 * Controller抽象类
@ -22,7 +24,7 @@ public abstract class BaseController {
* @return 返回拼接好的模板路径 * @return 返回拼接好的模板路径
*/ */
public String render(String pageName) { public String render(String pageName) {
StringBuffer themeStr = new StringBuffer("themes/"); StrBuilder themeStr = new StrBuilder("themes/");
themeStr.append(THEME); themeStr.append(THEME);
themeStr.append("/"); themeStr.append("/");
return themeStr.append(pageName).toString(); return themeStr.append(pageName).toString();

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

@ -181,7 +181,7 @@ public class FrontCommentController {
map.put("commentContent", comment.getCommentContent()); map.put("commentContent", comment.getCommentContent());
mailService.sendTemplateMail(userService.findUser().getUserEmail(), "有新的评论", map, "common/mail_template/mail_admin.ftl"); mailService.sendTemplateMail(userService.findUser().getUserEmail(), "有新的评论", map, "common/mail_template/mail_admin.ftl");
} catch (Exception e) { } catch (Exception e) {
log.error("邮件服务器未配置：{}", e.getMessage()); log.error("Mail server not configured: {}", e.getMessage());
} }
} }
} }