From f65360cb09133a4692c558f581164c42e7c38300 Mon Sep 17 00:00:00 2001 From: saysky <847064370@qq.com> Date: Sat, 6 Mar 2021 23:50:47 +0800 Subject: [PATCH 01/14] fix add user bug --- .../controller/admin/AdminController.java | 2 +- .../controller/admin/BackUserController.java | 50 ++++++++++--------- .../WEB-INF/view/Admin/Public/framework.jsp | 2 +- .../webapp/WEB-INF/view/Admin/User/insert.jsp | 4 +- .../webapp/WEB-INF/view/Admin/register.jsp | 2 + 5 files changed, 32 insertions(+), 28 deletions(-) diff --git a/ForestBlog/src/main/java/com/liuyanzhao/ssm/blog/controller/admin/AdminController.java b/ForestBlog/src/main/java/com/liuyanzhao/ssm/blog/controller/admin/AdminController.java index 9b4450ee..caa40f1d 100755 --- a/ForestBlog/src/main/java/com/liuyanzhao/ssm/blog/controller/admin/AdminController.java +++ b/ForestBlog/src/main/java/com/liuyanzhao/ssm/blog/controller/admin/AdminController.java @@ -210,7 +210,7 @@ public ModelAndView userProfileView(HttpSession session) { /** * 编辑个人信息页面显示 * - * @param loginUser + * @param session * @return */ @RequestMapping(value = "/admin/profile/edit") diff --git a/ForestBlog/src/main/java/com/liuyanzhao/ssm/blog/controller/admin/BackUserController.java b/ForestBlog/src/main/java/com/liuyanzhao/ssm/blog/controller/admin/BackUserController.java index d4dd902e..852b438a 100755 --- a/ForestBlog/src/main/java/com/liuyanzhao/ssm/blog/controller/admin/BackUserController.java +++ b/ForestBlog/src/main/java/com/liuyanzhao/ssm/blog/controller/admin/BackUserController.java @@ -2,6 +2,7 @@ import com.liuyanzhao.ssm.blog.entity.User; +import com.liuyanzhao.ssm.blog.enums.UserRole; import com.liuyanzhao.ssm.blog.service.UserService; import org.json.JSONObject; import org.springframework.beans.factory.annotation.Autowired; @@ -33,11 +34,11 @@ public class BackUserController { * @return */ @RequestMapping(value = "") - public ModelAndView userList() { + public ModelAndView userList() { ModelAndView modelandview = new ModelAndView(); List userList = userService.listUser(); - modelandview.addObject("userList",userList); + modelandview.addObject("userList", userList); modelandview.setViewName("Admin/User/index"); return modelandview; @@ -50,7 +51,7 @@ public ModelAndView userList() { * @return */ @RequestMapping(value = "/insert") - public ModelAndView insertUserView() { + public ModelAndView insertUserView() { ModelAndView modelAndView = new ModelAndView(); modelAndView.setViewName("Admin/User/insert"); return modelAndView; @@ -62,22 +63,22 @@ public ModelAndView insertUserView() { * @param request * @return */ - @RequestMapping(value = "/checkUserName",method = RequestMethod.POST, produces = {"text/plain;charset=UTF-8"}) + @RequestMapping(value = "/checkUserName", method = RequestMethod.POST, produces = {"text/plain;charset=UTF-8"}) @ResponseBody - public String checkUserName(HttpServletRequest request) { + public String checkUserName(HttpServletRequest request) { Map map = new HashMap(); String username = request.getParameter("username"); User user = userService.getUserByName(username); int id = Integer.valueOf(request.getParameter("id")); //用户名已存在,但不是当前用户(编辑用户的时候，不提示) - if(user!=null) { - if(user.getUserId()!=id) { + if (user != null) { + if (user.getUserId() != id) { map.put("code", 1); map.put("msg", "用户名已存在！"); } } else { - map.put("code",0); - map.put("msg",""); + map.put("code", 0); + map.put("msg", ""); } String result = new JSONObject(map).toString(); return result; @@ -89,22 +90,22 @@ public String checkUserName(HttpServletRequest request) { * @param request * @return */ - @RequestMapping(value = "/checkUserEmail",method = RequestMethod.POST, produces = {"text/plain;charset=UTF-8"}) + @RequestMapping(value = "/checkUserEmail", method = RequestMethod.POST, produces = {"text/plain;charset=UTF-8"}) @ResponseBody - public String checkUserEmail(HttpServletRequest request) { + public String checkUserEmail(HttpServletRequest request) { Map map = new HashMap(); String email = request.getParameter("email"); User user = userService.getUserByEmail(email); int id = Integer.valueOf(request.getParameter("id")); //用户名已存在,但不是当前用户(编辑用户的时候，不提示) - if(user!=null) { - if(user.getUserId()!=id) { + if (user != null) { + if (user.getUserId() != id) { map.put("code", 1); map.put("msg", "电子邮箱已存在！"); } } else { - map.put("code",0); - map.put("msg",""); + map.put("code", 0); + map.put("msg", ""); } String result = new JSONObject(map).toString(); return result; @@ -117,13 +118,14 @@ public String checkUserEmail(HttpServletRequest request) { * @param user * @return */ - @RequestMapping(value = "/insertSubmit",method = RequestMethod.POST) - public String insertUserSubmit(User user) { + @RequestMapping(value = "/insertSubmit", method = RequestMethod.POST) + public String insertUserSubmit(User user) { User user2 = userService.getUserByName(user.getUserName()); User user3 = userService.getUserByEmail(user.getUserEmail()); - if(user2==null&&user3==null) { + if (user2 == null && user3 == null) { user.setUserRegisterTime(new Date()); user.setUserStatus(1); + user.setUserRole(UserRole.USER.getValue()); userService.insertUser(user); } return "redirect:/admin/user"; @@ -136,7 +138,7 @@ public String insertUserSubmit(User user) { * @return */ @RequestMapping(value = "/delete/{id}") - public String deleteUser(@PathVariable("id") Integer id) { + public String deleteUser(@PathVariable("id") Integer id) { userService.deleteUser(id); return "redirect:/admin/user"; } @@ -148,11 +150,11 @@ public String deleteUser(@PathVariable("id") Integer id) { * @return */ @RequestMapping(value = "/edit/{id}") - public ModelAndView editUserView(@PathVariable("id") Integer id) { + public ModelAndView editUserView(@PathVariable("id") Integer id) { ModelAndView modelAndView = new ModelAndView(); - User user = userService.getUserById(id); - modelAndView.addObject("user",user); + User user = userService.getUserById(id); + modelAndView.addObject("user", user); modelAndView.setViewName("Admin/User/edit"); return modelAndView; @@ -165,8 +167,8 @@ public ModelAndView editUserView(@PathVariable("id") Integer id) { * @param user * @return */ - @RequestMapping(value = "/editSubmit",method = RequestMethod.POST) - public String editUserSubmit(User user) { + @RequestMapping(value = "/editSubmit", method = RequestMethod.POST) + public String editUserSubmit(User user) { userService.updateUser(user); return "redirect:/admin/user"; } diff --git a/ForestBlog/src/main/webapp/WEB-INF/view/Admin/Public/framework.jsp b/ForestBlog/src/main/webapp/WEB-INF/view/Admin/Public/framework.jsp index 0ac292d5..5785279d 100755 --- a/ForestBlog/src/main/webapp/WEB-INF/view/Admin/Public/framework.jsp +++ b/ForestBlog/src/main/webapp/WEB-INF/view/Admin/Public/framework.jsp @@ -104,7 +104,7 @@ 用户
全部用户
-
添加公告
+
添加用户
  • diff --git a/ForestBlog/src/main/webapp/WEB-INF/view/Admin/User/insert.jsp b/ForestBlog/src/main/webapp/WEB-INF/view/Admin/User/insert.jsp index 3a4ce0a1..bd1e429c 100755 --- a/ForestBlog/src/main/webapp/WEB-INF/view/Admin/User/insert.jsp +++ b/ForestBlog/src/main/webapp/WEB-INF/view/Admin/User/insert.jsp @@ -6,7 +6,7 @@ <%@ taglib prefix="rapid" uri="http://www.rapid-framework.org.cn/rapid" %> - - 编辑用户 + - 添加用户