Skip to content

Commit a9b66d0

Browse files
committed
fix: get user
1 parent 36bd2db commit a9b66d0

2 files changed

Lines changed: 5 additions & 9 deletions

File tree

backend/api-gateway/src/main/java/com/datamate/gateway/ApiGatewayApplication.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,10 +76,6 @@ public RouteLocator customRouteLocator(RouteLocatorBuilder builder) {
7676
.filters(f -> f.stripPrefix(1).prefixPath("/api"))
7777
.uri("http://deer-flow-backend:8000"))
7878

79-
// 网关服务(用户)
80-
.route("gateway", r -> r.path("/api/user/**")
81-
.uri("http://localhost:8080"))
82-
8379
// 其他后端服务
8480
.route("default", r -> r.path("/api/**")
8581
.uri("http://datamate-backend:8080"))

backend/api-gateway/src/main/java/com/datamate/gateway/interfaces/rest/UserController.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@
99
import com.datamate.gateway.interfaces.dto.LoginResponse;
1010
import com.datamate.gateway.interfaces.dto.RegisterRequest;
1111
import com.datamate.gateway.interfaces.dto.UserResponse;
12-
import jakarta.servlet.http.HttpServletRequest;
1312
import jakarta.validation.Valid;
1413
import lombok.RequiredArgsConstructor;
1514
import lombok.extern.slf4j.Slf4j;
1615
import org.apache.commons.lang3.StringUtils;
1716
import org.springframework.http.HttpStatus;
1817
import org.springframework.http.ResponseEntity;
18+
import org.springframework.http.server.reactive.ServerHttpRequest;
1919
import org.springframework.validation.annotation.Validated;
2020
import org.springframework.web.bind.annotation.GetMapping;
2121
import org.springframework.web.bind.annotation.PostMapping;
@@ -66,10 +66,10 @@ public ResponseEntity<Response<LoginResponse>> register(@Valid @RequestBody Regi
6666
* @return 用户信息(包含认证模式)
6767
*/
6868
@GetMapping("/me")
69-
public Response<UserResponse> getCurrentUser(HttpServletRequest request) {
69+
public Response<UserResponse> getCurrentUser(ServerHttpRequest request) {
7070
// 优先检查 SSO 模式(OMS 请求头)
71-
String ssoUsername = request.getHeader("X-User-Name");
72-
String ssoGroupId = request.getHeader("X-User-Group-Id");
71+
String ssoUsername = request.getHeaders().getFirst("X-User-Name");
72+
String ssoGroupId = request.getHeaders().getFirst("X-User-Group-Id");
7373

7474
if (StringUtils.isNotBlank(ssoUsername)) {
7575
log.info("SSO mode: user={}, groupId={}", ssoUsername, ssoGroupId);
@@ -82,7 +82,7 @@ public Response<UserResponse> getCurrentUser(HttpServletRequest request) {
8282
}
8383

8484
// 检查独立登录模式(JWT Token)
85-
String authHeader = request.getHeader("Authorization");
85+
String authHeader = request.getHeaders().getFirst("Authorization");
8686
if (authHeader != null && authHeader.startsWith("Bearer ")) {
8787
String token = authHeader.substring(7);
8888
String username = userService.validateToken(token);

0 commit comments

Comments
 (0)