fix: fixed bugs for runtime application

This commit is contained in:
merlin
2025-12-16 18:28:26 +08:00
parent 44133d3667
commit 94d5d8cabe
13 changed files with 85 additions and 37 deletions

View File

@@ -21,6 +21,6 @@ public class WebsocketConfig implements WebSocketConfigurer {
@Override
public void registerWebSocketHandlers(WebSocketHandlerRegistry registry) {
registry.addHandler(handler, "/online").addInterceptors(interceptor);
registry.addHandler(handler, "/ws/online").addInterceptors(interceptor).setAllowedOrigins("*");
}
}

View File

@@ -32,7 +32,8 @@ public class SecurityConfig {
"/health",
"/code/**",
"/v3/api-docs/**",
"/account/mail/verify/**"
"/account/mail/verify/**",
"/ws/**"
).permitAll()
.anyRequest().authenticated()
)

View File

@@ -5,11 +5,13 @@ import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.http.server.ServerHttpRequest;
import org.springframework.http.server.ServerHttpResponse;
import org.springframework.http.server.ServletServerHttpRequest;
import org.springframework.stereotype.Component;
import org.springframework.web.socket.WebSocketHandler;
import org.springframework.web.socket.server.HandshakeInterceptor;
import xin.merlin.myplayerbackend.utils.JwtUtil;
import java.util.List;
import java.util.Map;
@Slf4j
@@ -23,21 +25,32 @@ public class WebsocketInterceptor implements HandshakeInterceptor {
public boolean beforeHandshake(ServerHttpRequest request, ServerHttpResponse response, WebSocketHandler wsHandler, Map<String, Object> attributes) throws Exception {
try {
// 获取 token
String token = request.getHeaders().getFirst("Authorization");
if (token != null && token.startsWith("Bearer ")) {
token = token.substring(7);
if (jwtUtil.isTokenExpired(token)){
log.info("token expired");
return false;
}
} else {
List<String> protocols = request.getHeaders().get("Sec-WebSocket-Protocol");
String token = null;
if (protocols == null){
log.info("no token!");
return false;
}
String tokenHeader = protocols.get(0);
// System.out.println(tokenHeader);
response.getHeaders().add("Sec-WebSocket-Protocol",tokenHeader);
token = tokenHeader.replace("token-", "");
if (jwtUtil.isTokenExpired(token)){
log.info("token expired");
return false;
}
Integer id = jwtUtil.getId(token);
attributes.put("userId", id);
return true;
String account = jwtUtil.getAccount(token);
attributes.put("id", id);
attributes.put("account", account);
if (request instanceof ServletServerHttpRequest servletRequest) {
String userName = servletRequest.getServletRequest().getParameter("name");
if (userName != null) {
attributes.put("name", userName); // 将u_name存储到Attributes中
}
}
return true;
}catch (Exception e){
log.error(e.getMessage());
return false;