Merge pull request #12 from catchroom/develop

Feat : 네고하기
catchroom · Jan 18, 2024 · 36a27d0 · 36a27d0
2 parents 8df7035 + 50d6c39
commit 36a27d0
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/src/main/java/com/catchroom/ChatApplication.java b/src/main/java/com/catchroom/ChatApplication.java
@@ -9,7 +9,7 @@
 @EnableFeignClients
 @SpringBootApplication
 public class ChatApplication {
-    // Bean 생명주기를 이용한 timezone 설정
+
     @PostConstruct
     public void started() {
         TimeZone.setDefault(TimeZone.getTimeZone("Asia/Seoul"));

diff --git a/src/main/java/com/catchroom/chat/message/feign/MainFeignClient.java b/src/main/java/com/catchroom/chat/message/feign/MainFeignClient.java
@@ -7,12 +7,22 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 
+/**
+ * 채팅 서버 입장 (시큐리티 X)
+ * userId로 user 정보를 가져오는 상황
+ * 비로그인 사용자도 접근할 수 있음.
+ *
+ *
+ */
 @FeignClient(
         name = "mainFeign", url = "https://catchroom.xyz/v1",
         configuration = FeignConfig.class
 )
 public interface MainFeignClient {
-
+// user의 닉네임
     @RequestMapping(method = RequestMethod.GET, value = "/accommodation/{accommodationId}")
     AccommodationResponse getAccommodationDto(@PathVariable Long accommodationId);
+
+
+
 }
diff --git a/src/main/java/com/catchroom/chat/message/type/MessageType.java b/src/main/java/com/catchroom/chat/message/type/MessageType.java
@@ -6,5 +6,5 @@
 @AllArgsConstructor
 @Getter
 public enum MessageType {
-    ENTER, TALK, QUIT
+    ENTER, TALK, QUIT, NEGO_REQ, NEGO_ALLOW, NEGO_DENIED
 }