From cfe049492f81d2c650a2b17348593edbc5054498 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期三, 18 三月 2026 07:52:44 +0800
Subject: [PATCH] #3.5
---
rsf-server/src/main/java/com/vincent/rsf/server/system/controller/AuthController.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/AuthController.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/AuthController.java
index adc1257..e5859c5 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/AuthController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/AuthController.java
@@ -33,8 +33,8 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletRequest;
import java.util.List;
import java.util.stream.Collectors;
@@ -64,7 +64,8 @@
public R login(@RequestBody LoginParam param, HttpServletRequest request) {
String username = param.getUsername();
User user = userService.getByUsername(username
- , configProperties.getSystemMode().equals(SystemModeType.OFFLINE) ? param.getTenantId() : null
+ , configProperties.getSystemMode()
+ .equals(SystemModeType.OFFLINE) ? param.getTenantId() : null
);
if (user == null) {
return R.parse(BusinessRes.USERNAME_NOT_EXIST);
@@ -79,6 +80,7 @@
configProperties.getTokenExpireTime(), configProperties.getTokenKey());
userLoginService.saveAsync(user.getId(), accessToken, UserLogin.TYPE_LOGIN, user.getTenantId(), null, request);
Tenant tenant = tenantService.getById(user.getTenantId());
+ user = userService.fillRoleIdsForResponse(user);
return R.ok("Sign In Success").add(new LoginResult(accessToken, user, tenant.getName()));
}
@@ -250,3 +252,4 @@
}
}
+
--
Gitblit v1.9.1