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 e39139978..58540fd64 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 @@ -93,7 +93,7 @@ public class AdminController extends BaseController { model.addAttribute("mediaCount", HaloConst.ATTACHMENTS.size()); Long postViewsSum = postService.getPostViews(); - model.addAttribute("postViewsSum",postViewsSum); + model.addAttribute("postViewsSum", postViewsSum); return "admin/admin_index"; } @@ -130,7 +130,7 @@ public class AdminController extends BaseController { User aUser = userService.findUser(); //首先判断是否已经被禁用已经是否已经过了10分钟 Date loginLast = DateUtil.date(); - if(null!=aUser.getLoginLast()){ + if (null != aUser.getLoginLast()) { loginLast = aUser.getLoginLast(); } Long between = DateUtil.between(loginLast, DateUtil.date(), DateUnit.MINUTE); @@ -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"; } 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 96070bbd9..1a2761f97 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 @@ -84,14 +84,14 @@ public class AttachmentController { @GetMapping(value = "/select") public String selectAttachment(Model model, @RequestParam(value = "page", defaultValue = "0") Integer page, - @RequestParam(value = "id",defaultValue = "none") String id, - @RequestParam(value = "type",defaultValue = "normal") String type) { + @RequestParam(value = "id", defaultValue = "none") String id, + @RequestParam(value = "type", defaultValue = "normal") String type) { Sort sort = new Sort(Sort.Direction.DESC, "attachId"); Pageable pageable = PageRequest.of(page, 18, sort); Page attachments = attachmentService.findAllAttachments(pageable); model.addAttribute("attachments", attachments); model.addAttribute("id", id); - if(StringUtils.equals(type,"post")){ + if (StringUtils.equals(type, "post")) { return "admin/widget/_attachment-select-post"; } return "admin/widget/_attachment-select"; @@ -148,13 +148,13 @@ public class AttachmentController { mediaPath.mkdirs(); } SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHmmss"); - String nameWithOutSuffix = file.getOriginalFilename().substring(0, file.getOriginalFilename().lastIndexOf('.')).replaceAll(" ","_").replaceAll(",","")+dateFormat.format(DateUtil.date())+new Random().nextInt(1000); + String nameWithOutSuffix = file.getOriginalFilename().substring(0, file.getOriginalFilename().lastIndexOf('.')).replaceAll(" ", "_").replaceAll(",", "") + dateFormat.format(DateUtil.date()) + new Random().nextInt(1000); String fileSuffix = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf('.') + 1); - String fileName = nameWithOutSuffix+"."+fileSuffix; + String fileName = nameWithOutSuffix + "." + fileSuffix; file.transferTo(new File(mediaPath.getAbsoluteFile(), fileName)); //压缩图片 - Thumbnails.of(new StringBuffer(mediaPath.getAbsolutePath()).append("/").append(fileName).toString()).size(256,256).keepAspectRatio(false).toFile(new StringBuffer(mediaPath.getAbsolutePath()).append("/").append(nameWithOutSuffix).append("_small.").append(fileSuffix).toString()); + Thumbnails.of(new StringBuffer(mediaPath.getAbsolutePath()).append("/").append(fileName).toString()).size(256, 256).keepAspectRatio(false).toFile(new StringBuffer(mediaPath.getAbsolutePath()).append("/").append(nameWithOutSuffix).append("_small.").append(fileSuffix).toString()); //保存在数据库 Attachment attachment = new Attachment(); @@ -164,11 +164,11 @@ public class AttachmentController { attachment.setAttachType(file.getContentType()); attachment.setAttachSuffix(new StringBuffer(".").append(fileSuffix).toString()); attachment.setAttachCreated(DateUtil.date()); - attachment.setAttachSize(HaloUtils.parseSize(new File(mediaPath,fileName).length())); - attachment.setAttachWh(HaloUtils.getImageWh(new File(mediaPath,fileName))); + attachment.setAttachSize(HaloUtils.parseSize(new File(mediaPath, fileName).length())); + 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,19 +229,19 @@ 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 + "]失败！"); - return new JsonResult(ResultCode.FAIL.getCode(),"删除失败！"); + log.error("删除附件[{}]失败！", delFileName); + return new JsonResult(ResultCode.FAIL.getCode(), "删除失败！"); } } } catch (Exception e) { - log.error("删除附件[" + delFileName + "]失败！:", e.getMessage()); - return new JsonResult(ResultCode.FAIL.getCode(),"删除失败！"); + log.error("删除附件[{}]失败:{}", delFileName, e.getMessage()); + return new JsonResult(ResultCode.FAIL.getCode(), "删除失败！"); } - return new JsonResult(ResultCode.SUCCESS.getCode(),"删除成功！"); + return new JsonResult(ResultCode.SUCCESS.getCode(), "删除成功！"); } } 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 bcdfa0fcd..432f7cb6d 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 @@ -54,15 +54,15 @@ public class BackupController { * @return 模板路径admin/admin_backup */ @GetMapping - public String backup(@RequestParam(value = "type",defaultValue = "resources") String type,Model model) { + public String backup(@RequestParam(value = "type", defaultValue = "resources") String type, Model model) { List backups = null; - if(StringUtils.equals(type,"resources")){ + if (StringUtils.equals(type, "resources")) { backups = HaloUtils.getBackUps("resources"); - }else if(StringUtils.equals(type,"databases")){ + } else if (StringUtils.equals(type, "databases")) { backups = HaloUtils.getBackUps("databases"); - }else if(StringUtils.equals(type,"posts")){ + } else if (StringUtils.equals(type, "posts")) { backups = HaloUtils.getBackUps("posts"); - }else{ + } else { backups = new ArrayList<>(); } model.addAttribute("backups", backups); @@ -97,14 +97,14 @@ public class BackupController { */ public JsonResult backupDatabase() { try { - if(HaloUtils.getBackUps("databases").size()>10){ + if (HaloUtils.getBackUps("databases").size() > 10) { FileUtil.del(System.getProperties().getProperty("user.home") + "/halo/backup/databases/"); } String srcPath = System.getProperties().getProperty("user.home") + "/halo/"; 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()); @@ -119,7 +119,7 @@ public class BackupController { */ public JsonResult backupResources() { try { - if(HaloUtils.getBackUps("resources").size()>10){ + if (HaloUtils.getBackUps("resources").size() > 10) { FileUtil.del(System.getProperties().getProperty("user.home") + "/halo/backup/resources/"); } File path = new File(ResourceUtils.getURL("classpath:").getPath()); @@ -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()); @@ -144,7 +144,7 @@ public class BackupController { List posts = postService.findAllPosts(PostType.POST_TYPE_POST.getDesc()); posts.addAll(postService.findAllPosts(PostType.POST_TYPE_PAGE.getDesc())); try { - if(HaloUtils.getBackUps("posts").size()>10){ + if (HaloUtils.getBackUps("posts").size() > 10) { FileUtil.del(System.getProperties().getProperty("user.home") + "/halo/backup/posts/"); } //打包好的文件名 @@ -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()); 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 ee822c32e..0a5bf2cf8 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 @@ -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()); } 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 b5d01d4e0..58e607647 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 @@ -94,13 +94,13 @@ public class CommentController extends BaseController { @GetMapping(value = "/throw") public String moveToTrash(@PathParam("commentId") Long commentId, @PathParam("status") String status, - @RequestParam(value = "page",defaultValue = "0") Integer page) { + @RequestParam(value = "page", defaultValue = "0") Integer page) { try { commentService.updateCommentStatus(commentId, CommentStatus.RECYCLE.getCode()); } catch (Exception e) { log.error("删除评论失败：{}", e.getMessage()); } - return "redirect:/admin/comments?status=" + status+"&page="+page; + return "redirect:/admin/comments?status=" + status + "&page=" + page; } /** @@ -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; @@ -156,13 +156,13 @@ public class CommentController extends BaseController { @GetMapping("/remove") public String moveToAway(@PathParam("commentId") Long commentId, @PathParam("status") Integer status, - @RequestParam(value = "page",defaultValue = "0") Integer page) { + @RequestParam(value = "page", defaultValue = "0") Integer page) { try { commentService.removeByCommentId(commentId); } catch (Exception e) { log.error("删除评论失败：{}", e.getMessage()); } - return "redirect:/admin/comments?status=" + status+"&page="+page; + return "redirect:/admin/comments?status=" + status + "&page=" + page; } 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 906803659..da4a5a3ee 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 @@ -53,10 +53,10 @@ public class OptionController { HaloConst.OPTIONS.clear(); HaloConst.OPTIONS = optionsService.findAllOptions(); log.info("所保存的设置选项列表：" + options); - return new JsonResult(ResultCode.SUCCESS.getCode(),"保存成功！"); + return new JsonResult(ResultCode.SUCCESS.getCode(), "保存成功！"); } catch (Exception e) { log.error("保存设置选项失败：{}", e.getMessage()); - return new JsonResult(ResultCode.FAIL.getCode(),"保存失败！"); + return new JsonResult(ResultCode.FAIL.getCode(), "保存失败！"); } } } 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 e027cc673..ea43e3cdd 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 @@ -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"; } @@ -219,21 +219,21 @@ public class PageController { User user = (User) session.getAttribute(HaloConst.USER_SESSION_KEY); post.setUser(user); post.setPostType(PostType.POST_TYPE_PAGE.getDesc()); - if(null!=post.getPostId()){ + if (null != post.getPostId()) { post.setPostViews(postService.findByPostId(post.getPostId()).get().getPostViews()); post.setPostDate(postService.findByPostId(post.getPostId()).get().getPostDate()); post.setPostUpdate(DateUtil.date()); msg = "更新成功"; - }else{ + } else { post.setPostDate(DateUtil.date()); post.setPostUpdate(DateUtil.date()); } postService.saveByPost(post); logsService.saveByLogs(new Logs(LogsRecord.PUSH_PAGE, post.getPostTitle(), ServletUtil.getClientIP(request), DateUtil.date())); - return new JsonResult(ResultCode.SUCCESS.getCode(),msg); + return new JsonResult(ResultCode.SUCCESS.getCode(), msg); } catch (Exception e) { log.error("保存页面失败：{}", e.getMessage()); - return new JsonResult(ResultCode.FAIL.getCode(),"保存失败"); + return new JsonResult(ResultCode.FAIL.getCode(), "保存失败"); } } diff --git a/src/main/java/cc/ryanc/halo/web/controller/admin/PostController.java b/src/main/java/cc/ryanc/halo/web/controller/admin/PostController.java index 84330f97d..24e163d81 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 @@ -207,12 +207,12 @@ public class PostController extends BaseController { /** * 自动保存文章为草稿 * - * @param postId 文章编号 - * @param postTitle 文章标题 - * @param postUrl 文章路径 + * @param postId 文章编号 + * @param postTitle 文章标题 + * @param postUrl 文章路径 * @param postContentMd 文章内容 - * @param postType 文章类型 - * @param session session + * @param postType 文章类型 + * @param session session * @return JsonResult */ @PostMapping(value = "/new/autoPush") @@ -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"; 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 e33f81a5e..74a170dd8 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 @@ -78,14 +78,14 @@ 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); + return new JsonResult(ResultCode.SUCCESS.getCode(), "主题已设置为" + siteTheme); } catch (Exception e) { - log.error("主题设置失败，当前主题为：" + siteTheme); - return new JsonResult(ResultCode.FAIL.getCode(),"主题设置失败"); + log.error("主题设置失败，当前主题为：{}", siteTheme); + return new JsonResult(ResultCode.FAIL.getCode(), "主题设置失败"); } } @@ -99,7 +99,7 @@ public class ThemeController extends BaseController { @RequestMapping(value = "/upload", method = RequestMethod.POST) @ResponseBody public JsonResult uploadTheme(@RequestParam("file") MultipartFile file, - HttpServletRequest request) { + HttpServletRequest request) { try { if (!file.isEmpty()) { //获取项目根路径 @@ -110,19 +110,19 @@ public class ThemeController extends BaseController { logsService.saveByLogs( new Logs(LogsRecord.UPLOAD_THEME, file.getOriginalFilename(), ServletUtil.getClientIP(request), DateUtil.date()) ); - ZipUtil.unzip(themePath,new File(basePath.getAbsolutePath(), "templates/themes/")); + ZipUtil.unzip(themePath, new File(basePath.getAbsolutePath(), "templates/themes/")); FileUtil.del(themePath); HaloConst.THEMES.clear(); HaloConst.THEMES = HaloUtils.getThemes(); } else { log.error("上传主题失败，没有选择文件"); - return new JsonResult(ResultCode.FAIL.getCode(),"请选择上传的主题！"); + return new JsonResult(ResultCode.FAIL.getCode(), "请选择上传的主题！"); } } catch (Exception e) { log.error("上传主题失败：{}", e.getMessage()); - return new JsonResult(ResultCode.FAIL.getCode(),"主题上传失败！"); + return new JsonResult(ResultCode.FAIL.getCode(), "主题上传失败！"); } - return new JsonResult(ResultCode.SUCCESS.getCode(),"主题上传成功！"); + return new JsonResult(ResultCode.SUCCESS.getCode(), "主题上传成功！"); } /** @@ -201,9 +201,9 @@ public class ThemeController extends BaseController { @PostMapping(value = "/editor/save") @ResponseBody public JsonResult saveTpl(@RequestParam("tplName") String tplName, - @RequestParam("tplContent") String tplContent) { + @RequestParam("tplContent") String tplContent) { if (StringUtils.isBlank(tplContent)) { - return new JsonResult(ResultCode.FAIL.getCode(),"模板不能为空！"); + return new JsonResult(ResultCode.FAIL.getCode(), "模板不能为空！"); } try { //获取项目根路径 @@ -214,8 +214,8 @@ public class ThemeController extends BaseController { Files.write(Paths.get(tplPath.getAbsolutePath()), tplContentByte); } catch (Exception e) { log.error("模板保存失败：{}", e.getMessage()); - return new JsonResult(ResultCode.FAIL.getCode(),"模板保存失败！"); + return new JsonResult(ResultCode.FAIL.getCode(), "模板保存失败！"); } - return new JsonResult(ResultCode.SUCCESS.getCode(),"模板保存成功！"); + return new JsonResult(ResultCode.SUCCESS.getCode(), "模板保存成功！"); } } 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 9e9ae9fec..aa8adef3d 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 @@ -54,13 +54,13 @@ public class UserController { configuration.setSharedVariable("user", userService.findUser()); session.invalidate(); } else { - return new JsonResult(ResultCode.FAIL.getCode(),"修改失败！"); + return new JsonResult(ResultCode.FAIL.getCode(), "修改失败！"); } } catch (Exception e) { log.error("修改用户资料失败：{}", e.getMessage()); - return new JsonResult(ResultCode.FAIL.getCode(),"修改失败！"); + return new JsonResult(ResultCode.FAIL.getCode(), "修改失败！"); } - return new JsonResult(ResultCode.SUCCESS.getCode(),"修改成功！"); + return new JsonResult(ResultCode.SUCCESS.getCode(), "修改成功！"); } /** @@ -75,9 +75,9 @@ public class UserController { @PostMapping(value = "changePass") @ResponseBody public JsonResult changePass(@ModelAttribute("beforePass") String beforePass, - @ModelAttribute("newPass") String newPass, - @ModelAttribute("userId") Long userId, - HttpSession session) { + @ModelAttribute("newPass") String newPass, + @ModelAttribute("userId") Long userId, + HttpSession session) { try { User user = userService.findByUserIdAndUserPass(userId, SecureUtil.md5(beforePass)); if (null != user) { @@ -85,12 +85,12 @@ public class UserController { userService.saveByUser(user); session.invalidate(); } else { - return new JsonResult(ResultCode.FAIL.getCode(),"原密码错误！"); + return new JsonResult(ResultCode.FAIL.getCode(), "原密码错误！"); } } catch (Exception e) { log.error("修改密码失败：{}", e.getMessage()); - return new JsonResult(ResultCode.FAIL.getCode(),"密码修改失败！"); + return new JsonResult(ResultCode.FAIL.getCode(), "密码修改失败！"); } - return new JsonResult(ResultCode.SUCCESS.getCode(),"修改密码成功！"); + return new JsonResult(ResultCode.SUCCESS.getCode(), "修改密码成功！"); } }