合并主线

2023-05-25 17:28:57 +08:00
parent d295f3c512 512b0cc8f5
commit 30ae9e929f
129 changed files with 5909 additions and 2399 deletions
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/user/UserController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/user/UserController.java
@@ -57,7 +57,7 @@ public class UserController {
        if (user == null) {
            throw new ControllerException(ErrorCode.ERROR100.getCode(), "用户名或密码错误");
        }else {
-            String jwt = JwtUtils.createToken(username, password);
+            String jwt = JwtUtils.createToken(username, password, user.getRole().getId());
            response.setHeader(JwtUtils.getHeader(), jwt);
            user.setAccessToken(jwt);
        }