From 62a893d2bceeb9afdcf78db77955237dcc132a04 Mon Sep 17 00:00:00 2001 From: sjdlr Date: Fri, 30 Jun 2023 21:25:03 +0900 Subject: [PATCH 1/3] =?UTF-8?q?refactor:=20ws=20=EC=97=90=EC=84=9C=20wss?= =?UTF-8?q?=20=EB=A1=9C=20=ED=86=B5=EC=8B=A0=EB=B0=A9=EC=8B=9D=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/fab/banggabgo/config/chat/WebSocketConfig.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/fab/banggabgo/config/chat/WebSocketConfig.java b/src/main/java/com/fab/banggabgo/config/chat/WebSocketConfig.java index d281f4d..8bd21c7 100644 --- a/src/main/java/com/fab/banggabgo/config/chat/WebSocketConfig.java +++ b/src/main/java/com/fab/banggabgo/config/chat/WebSocketConfig.java @@ -40,10 +40,10 @@ public void configureMessageBroker(MessageBrokerRegistry registry) { @Override public void registerStompEndpoints(StompEndpointRegistry registry) { registry - .addEndpoint("/ws") + .addEndpoint("/wss") .setAllowedOriginPatterns("*"); registry - .addEndpoint("/ws") + .addEndpoint("/wss") .setAllowedOriginPatterns("*") .withSockJS(); } From df013dd53e2b12d1df91a4895386c00c99d8c245 Mon Sep 17 00:00:00 2001 From: sjdlr Date: Sat, 1 Jul 2023 01:40:43 +0900 Subject: [PATCH 2/3] =?UTF-8?q?refactor:=20=EC=B1=84=ED=8C=85=EA=B5=AC?= =?UTF-8?q?=EB=B6=84=EC=9D=84=20userName=20->=20userEmail=EB=A1=9C=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/fab/banggabgo/dto/chat/ChatDto.java | 7 ++++--- .../java/com/fab/banggabgo/dto/chat/RequestChatDto.java | 2 +- .../com/fab/banggabgo/service/impl/ChatServiceImpl.java | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/fab/banggabgo/dto/chat/ChatDto.java b/src/main/java/com/fab/banggabgo/dto/chat/ChatDto.java index 51e3c09..fbda9f3 100644 --- a/src/main/java/com/fab/banggabgo/dto/chat/ChatDto.java +++ b/src/main/java/com/fab/banggabgo/dto/chat/ChatDto.java @@ -14,15 +14,16 @@ @NoArgsConstructor @AllArgsConstructor public class ChatDto { + private String roomId; - private String userName; + private String userEmail; private String msg; private LocalDateTime createDate; - public static ChatDto toDto(Chat chat){ + public static ChatDto toDto(Chat chat) { return ChatDto.builder() .roomId(chat.getRoomId()) - .userName(chat.getUserEmail()) + .userEmail(chat.getUserEmail()) .msg(chat.getMsg()) .createDate(chat.getCreateDate()) .build(); diff --git a/src/main/java/com/fab/banggabgo/dto/chat/RequestChatDto.java b/src/main/java/com/fab/banggabgo/dto/chat/RequestChatDto.java index 5aac8c3..29e653f 100644 --- a/src/main/java/com/fab/banggabgo/dto/chat/RequestChatDto.java +++ b/src/main/java/com/fab/banggabgo/dto/chat/RequestChatDto.java @@ -12,6 +12,6 @@ @NoArgsConstructor @AllArgsConstructor public class RequestChatDto { - private String username; + private String userEmail; private String msg; } diff --git a/src/main/java/com/fab/banggabgo/service/impl/ChatServiceImpl.java b/src/main/java/com/fab/banggabgo/service/impl/ChatServiceImpl.java index 365e921..3298a58 100644 --- a/src/main/java/com/fab/banggabgo/service/impl/ChatServiceImpl.java +++ b/src/main/java/com/fab/banggabgo/service/impl/ChatServiceImpl.java @@ -27,7 +27,7 @@ public List getChatLogs(String roomId){ public Chat saveMsg(String roomId,RequestChatDto dto){ var chat =Chat.builder() .roomId(roomId) - .userEmail(dto.getUsername()) + .userEmail(dto.getUserEmail()) .msg(dto.getMsg()) .build(); return chatRepository.save(chat); From 3a1c7b62bddd82b9701fb828a68b31c4581e1046 Mon Sep 17 00:00:00 2001 From: sjdlr Date: Sat, 1 Jul 2023 01:44:54 +0900 Subject: [PATCH 3/3] =?UTF-8?q?fix:=20wss=EC=98=A4=EB=A5=98=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/fab/banggabgo/config/chat/WebSocketConfig.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/fab/banggabgo/config/chat/WebSocketConfig.java b/src/main/java/com/fab/banggabgo/config/chat/WebSocketConfig.java index 8bd21c7..d281f4d 100644 --- a/src/main/java/com/fab/banggabgo/config/chat/WebSocketConfig.java +++ b/src/main/java/com/fab/banggabgo/config/chat/WebSocketConfig.java @@ -40,10 +40,10 @@ public void configureMessageBroker(MessageBrokerRegistry registry) { @Override public void registerStompEndpoints(StompEndpointRegistry registry) { registry - .addEndpoint("/wss") + .addEndpoint("/ws") .setAllowedOriginPatterns("*"); registry - .addEndpoint("/wss") + .addEndpoint("/ws") .setAllowedOriginPatterns("*") .withSockJS(); }