From d3a9b17ea1bbb92887d97ca4cfae0d52d9439928 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E1=84=80=E1=85=AF=E1=86=AB=E1=84=83=E1=85=A5=E1=86=A8?= =?UTF-8?q?=E1=84=8C=E1=85=AE?= Date: Sun, 3 Dec 2023 02:16:34 +0900 Subject: [PATCH 1/5] =?UTF-8?q?chore:=20dev/prod=20=ED=99=98=EA=B2=BD?= =?UTF-8?q?=EC=97=90=EC=84=9C=20swagger=20=EC=98=AC=EB=B0=94=EB=A5=B4?= =?UTF-8?q?=EA=B2=8C=20=EB=8F=99=EC=9E=91=ED=95=98=EB=8F=84=EB=A1=9D=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application-dev.properties | 5 ++++- src/main/resources/application-prod.properties | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties index 54eb1ddb..81d37d55 100644 --- a/src/main/resources/application-dev.properties +++ b/src/main/resources/application-dev.properties @@ -83,4 +83,7 @@ spring.mail.properties.mail.smtp.starttls.required=true spring.mail.properties.mail.smtp.connectiontimeout=5000 spring.mail.properties.mail.smtp.timeout=5000 spring.mail.properties.mail.smtp.writetimeout=5000 -auth-code-expiration-millis=1800000 \ No newline at end of file +auth-code-expiration-millis=1800000 + +### swagger +springdoc.api-docs.path=/core/v3/api-docs \ No newline at end of file diff --git a/src/main/resources/application-prod.properties b/src/main/resources/application-prod.properties index 54eb1ddb..81d37d55 100644 --- a/src/main/resources/application-prod.properties +++ b/src/main/resources/application-prod.properties @@ -83,4 +83,7 @@ spring.mail.properties.mail.smtp.starttls.required=true spring.mail.properties.mail.smtp.connectiontimeout=5000 spring.mail.properties.mail.smtp.timeout=5000 spring.mail.properties.mail.smtp.writetimeout=5000 -auth-code-expiration-millis=1800000 \ No newline at end of file +auth-code-expiration-millis=1800000 + +### swagger +springdoc.api-docs.path=/core/v3/api-docs \ No newline at end of file From 712a28bf211209d92ac84bbb9aa99499e2100f38 Mon Sep 17 00:00:00 2001 From: manyb2ns Date: Sun, 3 Dec 2023 18:34:57 +0900 Subject: [PATCH 2/5] =?UTF-8?q?update:=20kusto=20=EB=A0=88=ED=8F=AC?= =?UTF-8?q?=EC=99=80=20ecr=20=EC=9D=B4=EB=AF=B8=EC=A7=80=20=EB=B3=80?= =?UTF-8?q?=EC=88=98=EB=AA=85=20sync?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/ecr.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ecr.yml b/.github/workflows/ecr.yml index 9f5573f9..ac0d8022 100644 --- a/.github/workflows/ecr.yml +++ b/.github/workflows/ecr.yml @@ -84,7 +84,7 @@ jobs: KUSTOMIZE_PATH="core-service-kusto/overlays/dev" cd $KUSTOMIZE_PATH - kustomize edit set image core-svc-image="${{ env.ECR_URL }}:${{ github.sha }}" + kustomize edit set image app-core-img="${{ env.ECR_URL }}:${{ github.sha }}" kustomize build . - name: Commit minifest files From 6fd8458450f9126de323fa0a59bbda0e4d722bd2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E1=84=80=E1=85=AF=E1=86=AB=E1=84=83=E1=85=A5=E1=86=A8?= =?UTF-8?q?=E1=84=8C=E1=85=AE?= Date: Sun, 3 Dec 2023 21:31:55 +0900 Subject: [PATCH 3/5] =?UTF-8?q?chore:=20embedded=20redis=20=EC=8B=A4?= =?UTF-8?q?=ED=96=89=20=ED=8F=AC=ED=8A=B8=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application-test.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/application-test.properties b/src/main/resources/application-test.properties index 8a24dfb4..bf39ba44 100644 --- a/src/main/resources/application-test.properties +++ b/src/main/resources/application-test.properties @@ -21,7 +21,7 @@ logging.level.org.hibernate.SQL=DEBUG ### Redis spring.data.redis.host=localhost -spring.data.redis.port=6379 +spring.data.redis.port=6380 ### JWT # TODO : need to fill secret From 841c3dffeb70fd618418ed6f78928c1e056bd5d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E1=84=80=E1=85=AF=E1=86=AB=E1=84=83=E1=85=A5=E1=86=A8?= =?UTF-8?q?=E1=84=8C=E1=85=AE?= Date: Sun, 3 Dec 2023 21:32:08 +0900 Subject: [PATCH 4/5] =?UTF-8?q?chore:=20=EC=98=A4=ED=83=80=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/catcher/core/service/CaptchaService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/catcher/core/service/CaptchaService.java b/src/main/java/com/catcher/core/service/CaptchaService.java index 98c627a1..52684233 100644 --- a/src/main/java/com/catcher/core/service/CaptchaService.java +++ b/src/main/java/com/catcher/core/service/CaptchaService.java @@ -50,8 +50,8 @@ public BufferedImage getImage(Captcha captcha) { public boolean validateCaptcha(String userEmail, String userAnswer) { final var user = userRepository.findByEmail(userEmail).orElseThrow(() -> new BaseException(BaseResponseStatus.USERS_NOT_EXISTS)); - final String generatedUserKEy = generateCaptchaUserKey(user.getId()); - final String answer = keyValueDataStorePort.findValidationCodeWithKey(generatedUserKEy); + final String generatedUserKey = generateCaptchaUserKey(user.getId()); + final String answer = keyValueDataStorePort.findValidationCodeWithKey(generatedUserKey); return Objects.equals(answer, userAnswer); } From cfa1f82d33163c09779ca50a3c603369a844ee1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E1=84=80=E1=85=AF=E1=86=AB=E1=84=83=E1=85=A5=E1=86=A8?= =?UTF-8?q?=E1=84=8C=E1=85=AE?= Date: Sun, 3 Dec 2023 21:36:22 +0900 Subject: [PATCH 5/5] =?UTF-8?q?chore:=20allowedUrl=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/catcher/security/SecurityConfig.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/catcher/security/SecurityConfig.java b/src/main/java/com/catcher/security/SecurityConfig.java index f6bdc07a..cacc1193 100644 --- a/src/main/java/com/catcher/security/SecurityConfig.java +++ b/src/main/java/com/catcher/security/SecurityConfig.java @@ -31,7 +31,7 @@ public class SecurityConfig { private final DBManager dbManager; private final String[] allowedUrls = { "/", "/swagger-ui/**", "/users/**", "favicon.ico", - "/health/**", "/auth/**", "/oauth/**", "/v3/api-docs/**" + "/health/**", "/auth/**", "/oauth/**", "/v3/api-docs/**", "/core/v3/api-docs/**" }; @Bean