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

👽 代码优化

pull/21/head
ruibaby 2018-07-16 11:13:35 +08:00
parent b7d7e9fa1c
commit c3deec86a7
10 changed files with 74 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -151,6 +151,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());
return new JsonResult(ResultCode.SUCCESS.getCode(), "登录成功！");
} else {
//更新失败次数
@ -182,7 +183,7 @@ public class AdminController extends BaseController {
User user = (User) session.getAttribute(HaloConst.USER_SESSION_KEY);
logsService.saveByLogs(new Logs(LogsRecord.LOGOUT, user.getUserName(), ServletUtil.getClientIP(request), DateUtil.date()));
session.invalidate();
log.info("用户[" + user.getUserName() + "]退出登录");
log.info("用户[{}]退出登录", user.getUserName());
return "redirect:/admin/login";
}

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

@ -168,7 +168,7 @@ public class AttachmentController {
attachment.setAttachWh(HaloUtils.getImageWh(new File(mediaPath, fileName)));
attachmentService.saveByAttachment(attachment);
updateConst();
log.info("上传文件[" + fileName + "]到[" + mediaPath.getAbsolutePath() + "]成功");
log.info("上传文件[{}]到[{}]成功", fileName, mediaPath.getAbsolutePath());
logsService.saveByLogs(
new Logs(LogsRecord.UPLOAD_FILE, fileName, ServletUtil.getClientIP(request), DateUtil.date())
);
@ -229,17 +229,17 @@ public class AttachmentController {
if (delFile.exists() && delFile.isFile()) {
if (delFile.delete() && delSmallFile.delete()) {
updateConst();
log.info("删除文件[" + delFileName + "]成功！");
log.info("删除文件[{}]成功！", delFileName);
logsService.saveByLogs(
new Logs(LogsRecord.REMOVE_FILE, delFileName, ServletUtil.getClientIP(request), DateUtil.date())
);
} else {
log.error("删除附件[" + delFileName + "]失败！");
log.error("删除附件[{}]失败！", delFileName);
return new JsonResult(ResultCode.FAIL.getCode(), "删除失败！");
}
}
} catch (Exception e) {
log.error("删除附件[" + delFileName + "]失败！:", e.getMessage());
log.error("删除附件[{}]失败:{}", delFileName, e.getMessage());
return new JsonResult(ResultCode.FAIL.getCode(), "删除失败！");
}
return new JsonResult(ResultCode.SUCCESS.getCode(), "删除成功！");

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

@ -104,7 +104,7 @@ public class BackupController {
String distName = "databases_backup_" + HaloUtils.getStringDate("yyyyMMddHHmmss");
//压缩文件
ZipUtil.zip(srcPath + "halo.mv.db", System.getProperties().getProperty("user.home") + "/halo/backup/databases/" + distName + ".zip");
log.info("当前时间："+DateUtil.now()+"，执行了数据库备份。");
log.info("当前时间：{}，执行了数据库备份。", DateUtil.now());
return new JsonResult(ResultCode.SUCCESS.getCode(), "备份成功！");
} catch (Exception e) {
log.error("备份数据库失败：{}", e.getMessage());
@ -127,7 +127,7 @@ public class BackupController {
String distName = "resources_backup_" + HaloUtils.getStringDate("yyyyMMddHHmmss");
//执行打包
ZipUtil.zip(srcPath, System.getProperties().getProperty("user.home") + "/halo/backup/resources/" + distName + ".zip");
log.info("当前时间："+DateUtil.now()+"，执行了资源文件备份。");
log.info("当前时间：{}，执行了资源文件备份。", DateUtil.now());
return new JsonResult(ResultCode.SUCCESS.getCode(), "备份成功！");
} catch (Exception e) {
log.error("备份资源文件失败：{}", e.getMessage());
@ -156,7 +156,7 @@ public class BackupController {
//打包导出好的文章
ZipUtil.zip(srcPath, srcPath + ".zip");
FileUtil.del(srcPath);
log.info("当前时间："+DateUtil.now()+"，执行了文章备份。");
log.info("当前时间：{}，执行了文章备份。", DateUtil.now());
return new JsonResult(ResultCode.SUCCESS.getCode(), "备份成功！");
} catch (Exception e) {
log.error("备份文章失败：{}", e.getMessage());

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

@ -44,7 +44,7 @@ public class CategoryController {
try {
categoryService.saveByCategory(category);
} catch (Exception e) {
log.error("修改分类失败：{0}", e.getMessage());
log.error("修改分类失败：{}", e.getMessage());
}
return "redirect:/admin/category";
}
@ -72,7 +72,6 @@ public class CategoryController {
public String removeCategory(@PathParam("cateId") Long cateId) {
try {
Category category = categoryService.removeByCateId(cateId);
log.info("删除的分类目录：" + category);
} catch (Exception e) {
log.error("删除分类失败：{}", e.getMessage());
}

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

@ -139,7 +139,7 @@ public class CommentController extends BaseController {
"您在" + HaloConst.OPTIONS.get(BlogProperties.BLOG_URL.getProp()) + "的评论已审核通过！", map, "common/mail/mail_passed.ftl");
}
} catch (Exception e) {
log.error("邮件服务器未配置：", e.getMessage());
log.error("邮件服务器未配置：{}", e.getMessage());
}
}
return "redirect:/admin/comments?status=" + status;

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

@ -117,7 +117,7 @@ public class PageController {
try {
linkService.removeByLinkId(linkId);
} catch (Exception e) {
log.error("删除友情链接失败：", e.getMessage());
log.error("删除友情链接失败：{}", e.getMessage());
}
return "redirect:/admin/page/links";
}

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

@ -251,7 +251,7 @@ public class PostController extends BaseController {
post.setPostUpdate(DateUtil.date());
post.setUser(user);
} catch (Exception e) {
log.error("未知错误：", e.getMessage());
log.error("未知错误：{}", e.getMessage());
return new JsonResult(ResultCode.FAIL.getCode(), "保存失败");
}
return new JsonResult(ResultCode.SUCCESS.getCode(), "保存成功", postService.saveByPost(post));
@ -270,7 +270,7 @@ public class PostController extends BaseController {
postService.updatePostStatus(postId, PostStatus.RECYCLE.getCode());
log.info("编号为" + postId + "的文章已被移到回收站");
} catch (Exception e) {
log.error("未知错误：{}", e.getMessage());
log.error("删除文章到回收站失败：{}", e.getMessage());
}
return "redirect:/admin/posts?status=" + status;
}
@ -288,7 +288,7 @@ public class PostController extends BaseController {
postService.updatePostStatus(postId, PostStatus.PUBLISHED.getCode());
log.info("编号为" + postId + "的文章已改变为发布状态");
} catch (Exception e) {
log.error("未知错误：{}", e.getMessage());
log.error("发布文章失败：{}", e.getMessage());
}
return "redirect:/admin/posts?status=" + status;
}
@ -306,7 +306,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("删除文章失败：{}", e.getMessage());
}
if (StringUtils.equals(PostType.POST_TYPE_POST.getDesc(), postType)) {
return "redirect:/admin/posts?status=2";

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

@ -78,13 +78,13 @@ public class ThemeController extends BaseController {
optionsService.saveOption(BlogProperties.THEME.getProp(), siteTheme);
//设置主题
BaseController.THEME = siteTheme;
log.info("已将主题改变为：" + siteTheme);
log.info("已将主题改变为：{}", siteTheme);
logsService.saveByLogs(
new Logs(LogsRecord.CHANGE_THEME, "更换为" + siteTheme, ServletUtil.getClientIP(request), DateUtil.date())
);
return new JsonResult(ResultCode.SUCCESS.getCode(), "主题已设置为" + siteTheme);
} catch (Exception e) {
log.error("主题设置失败，当前主题为：" + siteTheme);
log.error("主题设置失败，当前主题为：{}", siteTheme);
return new JsonResult(ResultCode.FAIL.getCode(), "主题设置失败");
}
}