From f7df523bd114159a6e411fd3da028ca7245090be Mon Sep 17 00:00:00 2001 From: This2sho Date: Fri, 3 May 2024 18:36:19 +0900 Subject: [PATCH 1/3] =?UTF-8?q?refactor:=20Swagger=20prefix=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/parkingcomestrue/parking/config/SwaggerConfig.java | 6 +++++- app-api/src/main/resources/application.yml | 2 ++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/app-api/src/main/java/com/parkingcomestrue/parking/config/SwaggerConfig.java b/app-api/src/main/java/com/parkingcomestrue/parking/config/SwaggerConfig.java index 3a1c838c..3f589303 100644 --- a/app-api/src/main/java/com/parkingcomestrue/parking/config/SwaggerConfig.java +++ b/app-api/src/main/java/com/parkingcomestrue/parking/config/SwaggerConfig.java @@ -9,6 +9,7 @@ import io.swagger.v3.oas.models.security.SecurityScheme.In; import io.swagger.v3.oas.models.security.SecurityScheme.Type; import io.swagger.v3.oas.models.servers.Server; +import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -19,13 +20,16 @@ public class SwaggerConfig { private static final String JSESSIONID = "JSESSIONID"; + @Value("${api-prefix}") + private String API_PREFIX; + @Bean public OpenAPI openAPI() { SecurityScheme auth = new SecurityScheme() .type(Type.APIKEY).in(In.COOKIE).name(JSESSIONID); SecurityRequirement securityRequirement = new SecurityRequirement().addList(JSESSIONID); - return new OpenAPI().addServersItem(new Server().url("/")) + return new OpenAPI().addServersItem(new Server().url(API_PREFIX)) .components(new Components().addSecuritySchemes("JSESSIONID", auth)) .addSecurityItem(securityRequirement); } diff --git a/app-api/src/main/resources/application.yml b/app-api/src/main/resources/application.yml index b9554ae4..54337963 100644 --- a/app-api/src/main/resources/application.yml +++ b/app-api/src/main/resources/application.yml @@ -27,3 +27,5 @@ authcode: # Allow origin cors: allowedOrigins: ${ORIGIN:http://localhost:3000} + +api-prefix: ${API_PREFIX:/api/} From 70e8d6156bf17e23e515be72dadedab814036069 Mon Sep 17 00:00:00 2001 From: This2sho Date: Fri, 3 May 2024 18:37:16 +0900 Subject: [PATCH 2/3] =?UTF-8?q?refactor:=20JSESSIONID=20=EC=83=81=EC=88=98?= =?UTF-8?q?=EB=A1=9C=20=ED=86=B5=EC=9D=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/parkingcomestrue/parking/config/SwaggerConfig.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-api/src/main/java/com/parkingcomestrue/parking/config/SwaggerConfig.java b/app-api/src/main/java/com/parkingcomestrue/parking/config/SwaggerConfig.java index 3f589303..6f1d3db3 100644 --- a/app-api/src/main/java/com/parkingcomestrue/parking/config/SwaggerConfig.java +++ b/app-api/src/main/java/com/parkingcomestrue/parking/config/SwaggerConfig.java @@ -30,7 +30,7 @@ public OpenAPI openAPI() { SecurityRequirement securityRequirement = new SecurityRequirement().addList(JSESSIONID); return new OpenAPI().addServersItem(new Server().url(API_PREFIX)) - .components(new Components().addSecuritySchemes("JSESSIONID", auth)) + .components(new Components().addSecuritySchemes(JSESSIONID, auth)) .addSecurityItem(securityRequirement); } } From a5cbd4cd7a696c9067dd2ac1dfc369f4f08ed36b Mon Sep 17 00:00:00 2001 From: This2sho Date: Fri, 3 May 2024 19:01:03 +0900 Subject: [PATCH 3/3] =?UTF-8?q?fix:=20test=20=ED=94=84=EB=A1=9C=ED=8D=BC?= =?UTF-8?q?=ED=8B=B0=EC=97=90=EB=8F=84=20api=20prefix=20=EC=A0=95=EB=B3=B4?= =?UTF-8?q?=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app-api/src/test/resources/application.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/app-api/src/test/resources/application.yml b/app-api/src/test/resources/application.yml index dfcd4b4d..4746481f 100644 --- a/app-api/src/test/resources/application.yml +++ b/app-api/src/test/resources/application.yml @@ -30,14 +30,10 @@ spring: username: root password: test -kakao: - key: test - -seoul-public-parking-key: test -pusan-public-parking-key: test - authcode: expired-time: 60 cors: allowedOrigins: http://localhost:3000 + +api-prefix: ${API_PREFIX:/api/}