Merge branch 'dev' into feat-hg-keygenerator

Project-Catcher · Dec 3, 2023 · c036497 · c036497
2 parents b989006 + 424a9a5
commit c036497
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 5 deletions.
diff --git 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

diff --git 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

diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties
@@ -84,4 +84,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
+auth-code-expiration-millis=1800000
+
+### swagger
+springdoc.api-docs.path=/core/v3/api-docs
diff --git a/src/main/resources/application-prod.properties b/src/main/resources/application-prod.properties
@@ -84,4 +84,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
+auth-code-expiration-millis=1800000
+
+### swagger
+springdoc.api-docs.path=/core/v3/api-docs
diff --git 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