From 6e165a4c3f81b4570c6cadc1ae4b7d26996d73e4 Mon Sep 17 00:00:00 2001 From: Chan Jin Date: Sun, 1 Dec 2024 22:41:02 +0900 Subject: [PATCH 1/2] =?UTF-8?q?fix=20:=20=EC=B9=B4=EC=B9=B4=EC=98=A4=20?= =?UTF-8?q?=EC=BD=9C=EB=B0=B1=20url=20=EC=97=90=20//=20=EC=A4=91=EB=B3=B5?= =?UTF-8?q?=EC=9C=BC=EB=A1=9C=20=EB=93=A4=EC=96=B4=EA=B0=84=20=EB=AC=B8?= =?UTF-8?q?=EC=A0=9C=20=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/auth/controller/AuthController.java | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/DuDoong-Api/src/main/java/band/gosrock/api/auth/controller/AuthController.java b/DuDoong-Api/src/main/java/band/gosrock/api/auth/controller/AuthController.java index 565a5730..9cda79fd 100644 --- a/DuDoong-Api/src/main/java/band/gosrock/api/auth/controller/AuthController.java +++ b/DuDoong-Api/src/main/java/band/gosrock/api/auth/controller/AuthController.java @@ -73,17 +73,17 @@ public OauthLoginLinkResponse getKakaoOauthLink( // 스테이징, prod 서버에 배포된 클라이언트에 해당 if (referer.contains(host)) { log.info("/oauth/kakao" + host); - String format = String.format("https://%s/", host); + String format = String.format("https://%s", host); if (referer.contains("admin")) { - // 프론트 개발자가 로컬에서 개발 테스트 할 때 해당 https://두둥.com/admin/ - return registerUseCase.getKaKaoOauthLink(format + "admin"); + // 프론트 개발자가 로컬에서 개발 테스트 할 때 해당 https://dudoong.com/admin + return registerUseCase.getKaKaoOauthLink(format + "/admin"); } return registerUseCase.getKaKaoOauthLink(format); } else if (referer.contains("5173")) { - // 프론트 개발자가 로컬에서 개발 테스트 할 때 해당 https://localhost:5173/admin/ - return registerUseCase.getKaKaoOauthLink(referer + "admin"); + // 프론트 개발자가 로컬에서 개발 테스트 할 때 해당 https://localhost:5173/admin + return registerUseCase.getKaKaoOauthLink(referer + "/admin"); } - // 프론트 개발자가 로컬에서 개발 테스트 할 때 해당 https://localhost:3000/ + // 프론트 개발자가 로컬에서 개발 테스트 할 때 해당 https://localhost:3000 return registerUseCase.getKaKaoOauthLink(referer); } @@ -98,17 +98,17 @@ public OauthTokenResponse getCredentialFromKaKao( // 스테이징, prod 서버에 배포된 클라이언트에 해당 if (referer.contains(host)) { log.info("/oauth/kakao" + host); - String format = String.format("https://%s/", host); + String format = String.format("https://%s", host); if (referer.contains("admin")) { - return registerUseCase.getCredentialFromKaKao(code, format + "admin"); + return registerUseCase.getCredentialFromKaKao(code, format + "/admin"); } return registerUseCase.getCredentialFromKaKao(code, format); } else if (referer.contains("5173")) { - return registerUseCase.getCredentialFromKaKao(code, referer + "admin"); + // 프론트 개발자가 로컬에서 어드민 테스트 할 때 해당 https://localhost:5173/admin + return registerUseCase.getCredentialFromKaKao(code, referer + "/admin"); } + // 프론트 개발자가 로컬에서 개발 테스트 할 때 해당 https://localhost:3000/admin return registerUseCase.getCredentialFromKaKao(code, referer); - - // 프론트 개발자가 로컬에서 개발 테스트 할 때 해당 https://localhost:3000/ } @Operation(summary = "개발용 회원가입입니다 클라이언트가 몰라도 됩니다.", deprecated = true) From 900027288a8b0749ffd0324ced4f4e71d9698e27 Mon Sep 17 00:00:00 2001 From: Chan Jin Date: Sun, 1 Dec 2024 22:47:57 +0900 Subject: [PATCH 2/2] =?UTF-8?q?fix=20:=20docker-compose=20->=20docker=20co?= =?UTF-8?q?mpose=20=EC=82=AC=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/BuildApiServer.yml | 2 +- .github/workflows/BuildBatchServer.yml | 2 +- .github/workflows/BuildSocketServer.yml | 2 +- .github/workflows/ci.yml | 2 +- .github/workflows/dev-merged-test-coverage.yml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/BuildApiServer.yml b/.github/workflows/BuildApiServer.yml index c1cb65f7..b429c802 100644 --- a/.github/workflows/BuildApiServer.yml +++ b/.github/workflows/BuildApiServer.yml @@ -31,7 +31,7 @@ jobs: #테스트 수행용 도커 컴포즈 - name: Start containers - run: docker-compose up -d + run: docker compose up -d - name: Gradle Build uses: gradle/gradle-build-action@v2 diff --git a/.github/workflows/BuildBatchServer.yml b/.github/workflows/BuildBatchServer.yml index 714057d7..ff1a2721 100644 --- a/.github/workflows/BuildBatchServer.yml +++ b/.github/workflows/BuildBatchServer.yml @@ -31,7 +31,7 @@ jobs: #테스트 수행용 도커 컴포즈 - name: Start containers - run: docker-compose up -d + run: docker compose up -d - name: Gradle Build uses: gradle/gradle-build-action@v2 diff --git a/.github/workflows/BuildSocketServer.yml b/.github/workflows/BuildSocketServer.yml index 53fcfc28..3a22d93e 100644 --- a/.github/workflows/BuildSocketServer.yml +++ b/.github/workflows/BuildSocketServer.yml @@ -31,7 +31,7 @@ jobs: #테스트 수행용 도커 컴포즈 - name: Start containers - run: docker-compose up -d + run: docker compose up -d - name: Gradle Build uses: gradle/gradle-build-action@v2 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7e9c8bd6..5a84a3d1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -32,7 +32,7 @@ jobs: run: ./gradlew spotlessCheck - name: Start containers - run: docker-compose up -d + run: docker compose up -d - name: test and analyze env: diff --git a/.github/workflows/dev-merged-test-coverage.yml b/.github/workflows/dev-merged-test-coverage.yml index c12ef3ef..57610748 100644 --- a/.github/workflows/dev-merged-test-coverage.yml +++ b/.github/workflows/dev-merged-test-coverage.yml @@ -33,7 +33,7 @@ jobs: run: ./gradlew spotlessCheck - name: Start containers - run: docker-compose up -d + run: docker compose up -d - name: test and analyze env: