合并开源主线

648540858

2023-04-04 b4048fbe80dba8e7756ae557a15ab60b4f80a44b

 src/main/java/com/genersoft/iot/vmp/vmanager/user/UserController.java

@@ -83,8 +83,8 @@
            if (user == null) {
                throw new ControllerException(ErrorCode.ERROR100);
            }
            int userId = SecurityUtils.getUserId();
            boolean result = userService.changePassword(userId, DigestUtils.md5DigestAsHex(password.getBytes()));
            //int userId = SecurityUtils.getUserId();
            boolean result = userService.changePassword(user.getId(), DigestUtils.md5DigestAsHex(password.getBytes()));
            if (!result) {
                throw new ControllerException(ErrorCode.ERROR100);
            }
@@ -205,4 +205,15 @@
            }
        }
    }

    @PostMapping("/userInfo")
    @Operation(summary = "管理员修改普通用户密码")
    public LoginUser getUserInfo() {
        // 获取当前登录用户id
        LoginUser userInfo = SecurityUtils.getUserInfo();
        if (userInfo == null) {
            throw new ControllerException(ErrorCode.ERROR100);
        }
        return userInfo;
    }
}