Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev

backend/src/main/java/io/metersphere/controller/UserController.java

@@ -118,10 +118,8 @@ public class UserController {
         return userService.getUserList();
     }
 
-    @PostMapping("/update/currentuser")
+    @PostMapping("/update/current")
     public UserDTO updateCurrentUser(@RequestBody User user) {
-        SessionUser sessionUser = SessionUtils.getUser();
-        BeanUtils.copyProperties(user, sessionUser);
         userService.updateUser(user);
         return SessionUtils.getUser();
     }

backend/src/main/java/io/metersphere/service/UserService.java

@@ -124,6 +124,9 @@ public class UserService {
     }
 
     public void updateUser(User user) {
+        UserDTO userDTO = getUserDTO(user.getId());
+        BeanUtils.copyProperties(user, userDTO);
+        SessionUtils.putUser(SessionUser.fromUser(userDTO));
         user.setUpdateTime(System.currentTimeMillis());
         userMapper.updateByPrimaryKeySelective(user);
     }

frontend/src/business/components/settings/personal/PersonSetting.vue

@@ -65,7 +65,7 @@
         result: {},
         updateVisible: false,
         tableData: [],
-        updatePath: '/user/update/currentuser',
+        updatePath: '/user/update/current',
         form: {},
         rule: {
           name: [