fixed changing avatar working

Author: zh-h

src/main/java/xyz/springabc/service/UserServ.java

@@ -105,24 +105,24 @@ public void changeRole(User user, String role) {
      * @throws ValidateError
      */
     @Transactional
-    public User update(User oldUser, User newUser, Errors errors) {
+    public User update(User oldUser, User newUserForm, Errors errors) {
         if (errors.hasErrors()) {
             return null;
         }
         //旧信息和信息的昵称不相同，并且数据库已经有了这样的昵称
-        if (userRepo.findOneByNick(newUser.getNick()) != null && !newUser.getNick().equals(oldUser.getNick())) {
+        if (userRepo.findOneByNick(newUserForm.getNick()) != null && !newUserForm.getNick().equals(oldUser.getNick())) {
             errors.rejectValue("nick", "nick", "昵称已经存在");
             return null;
         }
         //引用复制更新属性
-        oldUser.setNick(newUser.getNick());
-        oldUser.setAvatar(newUser.getAvatar());
-        oldUser.setLocation(newUser.getLocation());
-        oldUser.setHomePage(newUser.getHomePage());
-        oldUser.setGithub(newUser.getGithub());
-        oldUser.setTwitter(newUser.getTwitter());
-        oldUser.setSignature(newUser.getSignature());
-        oldUser.setDescription(newUser.getDescription());
+        oldUser.setNick(newUserForm.getNick());
+        oldUser.setAvatar(newUserForm.getAvatar());
+        oldUser.setLocation(newUserForm.getLocation());
+        oldUser.setHomePage(newUserForm.getHomePage());
+        oldUser.setGithub(newUserForm.getGithub());
+        oldUser.setTwitter(newUserForm.getTwitter());
+        oldUser.setSignature(newUserForm.getSignature());
+        oldUser.setDescription(newUserForm.getDescription());
         userRepo.save(oldUser);
         //更新了旧用户
         return oldUser;

src/main/java/xyz/springabc/web/front/AccountC.java

@@ -304,38 +304,36 @@ public String active(@RequestParam("code") String code,
     /**
      * 更新用户信息，需要登录授权
      *
-     * @param user
+     * @param newUserForm
      * @param errors
      * @param file
      * @param request
      * @param model
      * @return
      */
     @RequestMapping(value = "/setting/update", method = RequestMethod.POST)
-    public String updateInfomatio(@Validated User user,
+    public String updateInfomatio(@Validated User newUserForm,
                                   Errors errors,
                                   MultipartFile file,
                                   HttpServletRequest request,
                                   Model model) {
         User oldUser = (User) request.getSession().getAttribute("user");
-        String avatar = "";
+        String avatar = oldUser.getAvatar();
         if (!file.isEmpty()) {//判断有没有上传了头像
             try {
-                avatar = uploadFileServ.upload(file).url;
-                avatar = oldUser.getAvatar();//没有上传新头像就用回原来的
+                avatar = uploadFileServ.upload(file).url;//上传了头像就更新
             } catch (Exception e1) {
                 model.addAttribute("error", "头像上传失败");
                 return "/account/setting";
             }
         }
-        avatar = oldUser.getAvatar();//没有上传新头像就用回原来的
-        user.setAvatar(avatar);
-        User newUser = userServ.update(oldUser, user, errors);
+        newUserForm.setAvatar(avatar);
+        userServ.update(oldUser, newUserForm, errors);
         if (errors.hasErrors()) {
             model.addAttribute("error", errors.getAllErrors());
             return "/account/setting";
         }
-        request.getSession().setAttribute("user", newUser);
+        request.getSession().setAttribute("user", oldUser);
         model.addAttribute("msg", "信息已更新");
         return "/account/setting";
     }