Merge pull request #150 from kakao-tech-campus-2nd-step3/week10

hotfix: 채팅 웹소켓 수정
kakao-tech-campus-2nd-step3 · Nov 15, 2024 · fdd89ad · fdd89ad
2 parents b247da9 + 7e626dd
commit fdd89ad
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/boomerang/src/main/java/boomerang/global/config/WebConfig.java b/boomerang/src/main/java/boomerang/global/config/WebConfig.java
@@ -20,8 +20,11 @@ public void addFormatters(FormatterRegistry registry) {
     public void addCorsMappings(CorsRegistry corsRegistry) {
         corsRegistry.addMapping("/**")
             // 8080 추가
-            .allowedOrigins("http://localhost:5173", "http://localhost:8080",
-                "http://54.252.224.76:80", "http://54.252.224.76")
+            .allowedOrigins("http://localhost:5173",
+                    "http://localhost:8080",
+                    "http://54.252.224.76:80",
+                    "http://54.252.224.76",
+                    "http://52.79.80.3:8080")
             .allowedMethods("GET", "POST", "PUT", "DELETE")
             .allowedHeaders("*")
             .allowCredentials(true)

diff --git a/boomerang/src/main/java/boomerang/global/config/WebSocketConfig.java b/boomerang/src/main/java/boomerang/global/config/WebSocketConfig.java
@@ -31,7 +31,10 @@ public WebSocketConfig(JwtUtil jwtUtil, MemberService memberService, ChatRoomSer
     public void registerWebSocketHandlers(WebSocketHandlerRegistry registry) {
         registry.addHandler(new ChatWebSocketHandler(chatRoomService), "/ws/chat/*")
                 .addInterceptors(new WebSocketHandshakeInterceptor(jwtUtil, memberService, chatRoomService, consultationService))
-                .setAllowedOrigins("http://localhost:8080", "http://localhost:5173", "http://54.252.224.76:80")
-                .withSockJS();
+                .setAllowedOrigins("http://localhost:8080",
+                        "http://localhost:5173",
+                        "http://54.252.224.76:80",
+                        "http://52.79.80.3:8080")
+                ;
     }
 }