diff --git a/pom.xml b/pom.xml index ec9d3836..edb3d2ca 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.1 + 3.3.2 diff --git a/src/main/java/com/youlai/system/config/WebSocketConfig.java b/src/main/java/com/youlai/system/config/WebSocketConfig.java index bdadd200..057279ef 100644 --- a/src/main/java/com/youlai/system/config/WebSocketConfig.java +++ b/src/main/java/com/youlai/system/config/WebSocketConfig.java @@ -5,6 +5,7 @@ import cn.hutool.jwt.JWTPayload; import cn.hutool.jwt.JWTUtil; import com.youlai.system.common.constant.SecurityConstants; import lombok.extern.slf4j.Slf4j; +import org.jetbrains.annotations.NotNull; import org.springframework.context.annotation.Configuration; import org.springframework.http.HttpHeaders; import org.springframework.messaging.Message; @@ -39,11 +40,10 @@ public class WebSocketConfig implements WebSocketMessageBrokerConfigurer { registry // 注册 /ws 的端点 .addEndpoint("/ws") - // 允许跨域的 WebSocket 连接 + // 允许跨域 .setAllowedOriginPatterns("*") // 启用 SockJS (浏览器不支持WebSocket,SockJS 将会提供兼容性支持) .withSockJS(); - registry.addEndpoint("/ws-app").setAllowedOriginPatterns("*"); // 注册了一个 /ws-app 的端点,支持 uni-app 的 ws 连接协议 } @@ -74,7 +74,7 @@ public class WebSocketConfig implements WebSocketMessageBrokerConfigurer { public void configureClientInboundChannel(ChannelRegistration registration) { registration.interceptors(new ChannelInterceptor() { @Override - public Message preSend(Message message, MessageChannel channel) { + public Message preSend(@NotNull Message message, @NotNull MessageChannel channel) { StompHeaderAccessor accessor = MessageHeaderAccessor.getAccessor(message, StompHeaderAccessor.class); // 如果是连接请求(CONNECT 命令),从请求头中取出 token 并设置到认证信息中 if (accessor != null && StompCommand.CONNECT.equals(accessor.getCommand())) { diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 3eed7c30..f383b6f6 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -81,6 +81,7 @@ security: key: SecretKey012345678901234567890123456789012345678901234567890123456789 # JWT 有效期(单位:秒) ttl: 7200 + # 白名单列表 ignore-urls: - /v3/api-docs/** - /doc.html @@ -91,7 +92,6 @@ security: - /swagger-ui.html - /api/v1/auth/captcha - /ws/** - - /ws-app/** # 文件存储配置 oss: diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml index 541cd2a0..97dacfe9 100644 --- a/src/main/resources/application-prod.yml +++ b/src/main/resources/application-prod.yml @@ -59,11 +59,13 @@ mybatis-plus: # 安全配置 security: + # JWT 配置 jwt: # JWT 秘钥 key: SecretKey012345678901234567890123456789012345678901234567890123456789 # JWT 有效期(单位:秒) ttl: 7200 + # 白名单列表 ignore-urls: - /v3/api-docs/** - /doc.html @@ -74,7 +76,6 @@ security: - /swagger-ui.html - /api/v1/auth/captcha - /ws/** - - /ws-app/** # 文件存储配置 oss: