Skip to content
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.

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

[BE] 브랜치 Sync용 #80

Open
wants to merge 45 commits into
base: be
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
ee17944
fix: 게임종료 시 소켓 연결 해제 취소
HyowonSin Nov 8, 2023
23ce893
feat: 소켓 에러 처리 및 세션 클로즈
HyowonSin Nov 8, 2023
f8f30ee
feat: 재접속 기능 구현
HyowonSin Nov 8, 2023
07a9aea
feat: 이벤트 룰렛 -> 발생 자동
HyowonSin Nov 8, 2023
1ecf4bd
feat: 룰렛 상황 때 재접속 처리
HyowonSin Nov 8, 2023
db96575
fix: 게임 입장 세션 누락 처리, 룰렛 시간 조절, 종료 라운드 조절
HyowonSin Nov 8, 2023
a93f414
fix: 이벤트 시간 조절
HyowonSin Nov 8, 2023
9800c15
fix: 타이머 중복 감소 수정
HyowonSin Nov 8, 2023
0c9f6c0
fix: 룰렛 시간 1초 넉넉하게
HyowonSin Nov 8, 2023
e368110
fix: 타이머 시간 1초
HyowonSin Nov 8, 2023
5020ea7
fix: 룰렛 재접속 시간 수정
HyowonSin Nov 8, 2023
7054aca
refactor: 전체현황판 응답시 개인현황판 응답 수정
HyowonSin Nov 10, 2023
571c4dc
refactor: 칸도착, 개인현황판 분리
HyowonSin Nov 10, 2023
7398762
refactor: 황금카드 응답 수정, feat: 황금카드 기부 기능 추가
HyowonSin Nov 10, 2023
f47a2af
feat: 황금카드 검찰조사, 주가조작, 악성루머양산 기능 추가, fix: 순간이동 파라미터, dto noargs 수정
HyowonSin Nov 10, 2023
6c64d39
fix: 배당금 오류 수정
HyowonSin Nov 10, 2023
1e39954
test: 황금카드 주가조작으로 고정
yhpark95 Nov 13, 2023
7d2556e
fix: 주사위 중복 요청 버그 수정, 개인 현황판 타입 및 버그 수정
yhpark95 Nov 13, 2023
a9c4cca
test: 테스트를 위해 주사위 9로 고정
yhpark95 Nov 13, 2023
1bc1cc1
test: 테스트를 위해 주사위 9로 고정 해제
yhpark95 Nov 13, 2023
ac28ab9
fix: refresh Token exposed
yhpark95 Nov 14, 2023
7b21f9a
fix: refresh Token exposed-1
yhpark95 Nov 14, 2023
5ac7da9
fix: refresh Token exposed-2
yhpark95 Nov 14, 2023
dc96b92
fix: refresh Token exposed-3
yhpark95 Nov 14, 2023
709d6e7
test: 황금 카드 검찰 조사로 고정
yhpark95 Nov 14, 2023
9c18dd8
fix: 보석금으로 탈출 시 prisonDice 추가
yhpark95 Nov 14, 2023
9445cc7
fix: 보석금으로 탈출 시 prisonDice 추가
yhpark95 Nov 14, 2023
1507daf
Merge pull request #17 from gaemi-marble/feat/#13-goldcard-refactoring
yhpark95 Nov 15, 2023
dfec3ed
refactor: GameStatus에서 Player 분리 #29
yhpark95 Nov 16, 2023
318775c
refactor: player, currentPlayer, stock 분리 #29
yhpark95 Nov 17, 2023
62ca015
Merge branch 'be' into be
yhpark95 Nov 17, 2023
1490d50
refactor: player, currentPlayer, stock 분리 #29
yhpark95 Nov 17, 2023
c700f05
Merge pull request #34 from gaemi-marble/refactor/#29
yhpark95 Nov 17, 2023
5e9eebf
feat: 감정표현 기능 추가
HyowonSin Nov 17, 2023
5da7e4b
feat: 대기실 조회 기능 추가
HyowonSin Nov 17, 2023
90444c0
fix: emotion -> emoticon
HyowonSin Dec 5, 2023
521daf6
feat: 방 시작 번호, 황금카드 랜덤
HyowonSin Dec 5, 2023
7c6ebd0
fix: 대기실 조회 (세션 확인)
HyowonSin Dec 5, 2023
afcbe0a
feat: 플레이중이 아닌 방이면 삭제한다 #40
yhpark95 Dec 7, 2023
f822b32
Merge pull request #41 from gaemi-marble/feat/#40-대기실-세션상태확인
yhpark95 Dec 7, 2023
116babb
fix: 주식 가치 계산 수정-1 #45
yhpark95 Dec 7, 2023
bf6f61d
fix: 게임 시작 상태 변경, 대기실 순서 정렬
HyowonSin Dec 7, 2023
c379e3d
Merge branch 'fix/#45-calculateStockAsset' of https://github.com/gaem…
HyowonSin Dec 7, 2023
3ec94f1
Merge pull request #46 from gaemi-marble/fix/#45-calculateStockAsset
yhpark95 Dec 8, 2023
d25fb0b
Merge pull request #49 from gaemi-marble/fix/#48-대기실-정렬
yhpark95 Dec 8, 2023
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
Prev Previous commit
Next Next commit
fix: refresh Token exposed-2
  • Loading branch information
yhpark95 committed Nov 14, 2023
commit 5ac7da981941ad3958afda59e7d5f61b270b4849
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ public void addCorsMappings(CorsRegistry registry) {
.allowedOrigins("*")
.allowedMethods("GET", "POST", "PUT", "DELETE", "PATCH")
.exposedHeaders(Constants.REFRESH_TOKEN)
.exposedHeaders(HttpHeaders.AUTHORIZATION);
.exposedHeaders(HttpHeaders.AUTHORIZATION)
.allowCredentials(true);
}
}