99import com .datamate .gateway .interfaces .dto .LoginResponse ;
1010import com .datamate .gateway .interfaces .dto .RegisterRequest ;
1111import com .datamate .gateway .interfaces .dto .UserResponse ;
12- import jakarta .servlet .http .HttpServletRequest ;
1312import jakarta .validation .Valid ;
1413import lombok .RequiredArgsConstructor ;
1514import lombok .extern .slf4j .Slf4j ;
1615import org .apache .commons .lang3 .StringUtils ;
1716import org .springframework .http .HttpStatus ;
1817import org .springframework .http .ResponseEntity ;
18+ import org .springframework .http .server .reactive .ServerHttpRequest ;
1919import org .springframework .validation .annotation .Validated ;
2020import org .springframework .web .bind .annotation .GetMapping ;
2121import 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