Skip to content

코드 병합1 #112

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rjswjddn merged 17 commits into from
Jul 30, 2025
Merged

코드 병합1 #112

Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
aea5f02
feat: workflow에 EC2 자동 배포 추가 (#78)
chw0912 Jul 18, 2025
4d341f8
feat: 발표방 캐싱 및 인덱싱 적용 feat 새로운 기능 추가 (#80)
rjswjddn Jul 19, 2025
bdcf47a
feat: 카카오 로그인 API (#86)
rjswjddn Jul 23, 2025
2622931
refactor: Presigned URL 업로드용, 조회용 로직 분리 (#84)
chw0912 Jul 23, 2025
1980af7
merge: release 브랜치 충돌 해결
rjswjddn Jul 23, 2025
12c801a
refactor: profiles 환경 변수 주입으로 변경 (#90)
chw0912 Jul 24, 2025
65e05fd
feat: 카카오 로그인 재시도 로직, 방 참가자 관리 동시성 수정 (#91)
rjswjddn Jul 24, 2025
a0ef2c6
refactor,fix: 2회차 멘토링 기반 리팩토링 (#94)
chcch529 Jul 26, 2025
a34d680
fix: MemberController 수정 (#96)
rjswjddn Jul 27, 2025
0dc5c81
Merge branch 'release' into dev
rjswjddn Jul 27, 2025
492992a
답변 조회 기능 수정 (#98)
gffd94 Jul 28, 2025
b0bb3b1
feat: cors 설정 (#102)
rjswjddn Jul 29, 2025
12ad4ba
Refactor/101 room detail (#104)
rjswjddn Jul 30, 2025
e9fdf79
Refactor/101 room detail (#106)
rjswjddn Jul 30, 2025
bf2a942
Refactor/101 room detail (#108)
rjswjddn Jul 30, 2025
9181de9
Merge branch 'release' into dev
rjswjddn Jul 30, 2025
790be9a
Refactor/101 room detail (#110)
rjswjddn Jul 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/main/java/com/oronaminc/join/websocket/config/WebSocketConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,15 +47,15 @@ public void registerStompEndpoints(StompEndpointRegistry registry) {
registry.addEndpoint("/ws")
.setAllowedOriginPatterns("*")
// websocket 연결 전 쿠키 체크
// .addInterceptors(new HttpSessionHandshakeInterceptor())
.addInterceptors(new HttpSessionHandshakeInterceptor())
// websocket 연결 후 principal 생성
// .setHandshakeHandler(handshakeHandler)
.setHandshakeHandler(handshakeHandler)
.withSockJS();

registry.addEndpoint("/ws")
.setAllowedOriginPatterns("*")
// .addInterceptors(new HttpSessionHandshakeInterceptor())
// .setHandshakeHandler(handshakeHandler)
.addInterceptors(new HttpSessionHandshakeInterceptor())
.setHandshakeHandler(handshakeHandler)
;

registry.setErrorHandler(stompErrorHandler);
Expand Down