From a31b41550c99e3c5495d0f60e93eb2a91f6946a1 Mon Sep 17 00:00:00 2001 From: zhaohy6 Date: Wed, 23 Sep 2020 19:04:10 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=98=B5=E7=A7=B0?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C=EF=BC=8C=E4=B8=8D=E5=8F=AF=E9=87=8D=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../forum/controller/UserController.java | 40 +++++++++++-------- .../cn/niter/forum/mapper/UserMapper.java | 2 + .../cn/niter/forum/service/UserService.java | 4 ++ src/main/resources/mapper/UserMapper.xml | 5 +++ 4 files changed, 34 insertions(+), 17 deletions(-) diff --git a/src/main/java/cn/niter/forum/controller/UserController.java b/src/main/java/cn/niter/forum/controller/UserController.java index e0db664..c2bb996 100644 --- a/src/main/java/cn/niter/forum/controller/UserController.java +++ b/src/main/java/cn/niter/forum/controller/UserController.java @@ -123,25 +123,31 @@ public Map set(HttpServletRequest request, String constellation = userInfoService.getConstellation(Integer.parseInt(birthday[1]), Integer.parseInt(birthday[2])); userInfo.setConstellation(constellation); } - int i = userInfoService.updateByUserId(userInfo,user.getId()); - int j = userService.updateUsernameById(user.getId(),obj.getString("username")); - - if(j!=1){ - map.put("code",500); - map.put("msg","妈呀，昵称修改失败啦！"); - } - else if(i!=1) { + int conflictCount = userService.countUserByName(obj.getString("username")); + if (conflictCount == 0) { + int i = userInfoService.updateByUserId(userInfo,user.getId()); + int j = userService.updateUsernameById(user.getId(),obj.getString("username")); + if(j!=1){ + map.put("code",500); + map.put("msg","妈呀，昵称修改失败啦！"); + } + else if(i!=1) { + map.put("code",500); + map.put("msg","妈呀，资料修改失败啦！"); + } + else{ + User dbUser = userService.selectUserByUserId(user.getId()); + UserDTO userDTO = userService.getUserDTO(dbUser); + Cookie cookie = cookieUtils.getCookie("token",tokenUtils.getToken(userDTO),86400*3); + response.addCookie(cookie); + map.put("code",200); + map.put("msg","恭喜您，资料修改成功！！！"); + } + }else{ map.put("code",500); - map.put("msg","妈呀，资料修改失败啦！"); - } - else{ - User dbUser = userService.selectUserByUserId(user.getId()); - UserDTO userDTO = userService.getUserDTO(dbUser); - Cookie cookie = cookieUtils.getCookie("token",tokenUtils.getToken(userDTO),86400*3); - response.addCookie(cookie); - map.put("code",200); - map.put("msg","恭喜您，资料修改成功！！！"); + map.put("msg","妈呀，昵称重复了！"); } + } return map; diff --git a/src/main/java/cn/niter/forum/mapper/UserMapper.java b/src/main/java/cn/niter/forum/mapper/UserMapper.java index 77a0529..6794e59 100644 --- a/src/main/java/cn/niter/forum/mapper/UserMapper.java +++ b/src/main/java/cn/niter/forum/mapper/UserMapper.java @@ -15,6 +15,8 @@ public interface UserMapper { */ long countByExample(UserExample example); + long countUserByName(String name); + /** * This method was generated by MyBatis Generator. * This method corresponds to the database table user diff --git a/src/main/java/cn/niter/forum/service/UserService.java b/src/main/java/cn/niter/forum/service/UserService.java index 1306820..9db91ad 100644 --- a/src/main/java/cn/niter/forum/service/UserService.java +++ b/src/main/java/cn/niter/forum/service/UserService.java @@ -47,6 +47,10 @@ public User selectUserByExample(UserExample userExample){ return null; } + public int countUserByName(String name){ + return (int)userMapper.countUserByName(name); + } + public ResultDTO repass(Long user_id,String nowpass,String pass){ User user = userMapper.selectByPrimaryKey(user_id); if((StringUtils.isBlank(nowpass)&&StringUtils.isBlank(user.getPassword()))||DigestUtils.sha256Hex(nowpass+salt).equals(user.getPassword())){ diff --git a/src/main/resources/mapper/UserMapper.xml b/src/main/resources/mapper/UserMapper.xml index d4c50a8..d3eb464 100644 --- a/src/main/resources/mapper/UserMapper.xml +++ b/src/main/resources/mapper/UserMapper.xml @@ -266,6 +266,11 @@ + + + + + -->