Skip to content

Commit

Permalink
Merge pull request #50 from catchroom/develop
Browse files Browse the repository at this point in the history
Feat : CORS 에러 해결 코드 추가
  • Loading branch information
HyemIin authored Jan 24, 2024
2 parents a761de2 + 70be8ae commit 922abce
Show file tree
Hide file tree
Showing 6 changed files with 5 additions and 64 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
@RestController
@RequestMapping("/v1/chat/room")
@RequiredArgsConstructor
@CrossOrigin(origins = "https://localhost:3000", allowedHeaders = "*")
@CrossOrigin(origins = {"https://localhost:3000","https://dev.dhlbrqe2v28e4.amplifyapp.com"}, allowedHeaders = "*")
public class ChatRoomController {
private final ChatRoomService chatRoomService;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
package com.catchroom.chat.chatroom.type;

public enum DealState {
UNSOLD,ONSALE,EXPIRED,DONEDEAL,UNABLESELL
ONSALE,EXPIRED,UNSOLD,DONEDEAL
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
@RequiredArgsConstructor
@RequestMapping("/v1")
@RestController
@CrossOrigin(origins = "https://localhost:3000", allowedHeaders = "*")
@CrossOrigin(origins = {"https://localhost:3000","https://dev.dhlbrqe2v28e4.amplifyapp.com"}, allowedHeaders = "*")
public class MainFeignController {
private final MainFeignService mainFeignService;
@GetMapping("/accommodation/{accommodationId}")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
@RequiredArgsConstructor
@Controller
@Slf4j
@CrossOrigin(origins = "https://localhost:3000", allowedHeaders = "*")
@CrossOrigin(origins = {"https://localhost:3000","https://dev.dhlbrqe2v28e4.amplifyapp.com"}, allowedHeaders = "*")
public class ChatController {

private final ChatMongoService chatMongoService;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

@RestController
@RequestMapping("/v1/chat")
@CrossOrigin(origins = "https://localhost:3000", allowedHeaders = "*")
@CrossOrigin(origins = {"https://localhost:3000","https://dev.dhlbrqe2v28e4.amplifyapp.com"}, allowedHeaders = "*")
@RequiredArgsConstructor
@Slf4j
public class ChatFindController {
Expand Down
59 changes: 0 additions & 59 deletions src/main/java/com/catchroom/chat/test/MessageSortController.java

This file was deleted.

0 comments on commit 922abce

Please sign in to comment.