From 312b093c4130e63b45d82d9c5d7f3ebbcad83b6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=8D=EA=B9=80=EC=9A=A9=EB=B9=88?= Date: Fri, 4 Oct 2024 00:27:50 +0900 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=EA=B2=8C=EC=8B=9C=EB=AC=BC=20api=20?= =?UTF-8?q?url=20=EB=8C=80=EC=9D=91=20(#45)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 2 +- .../java/project/backend/common/config/SecurityConfig.java | 6 +++--- src/main/java/project/backend/security/jwt/JwtFilter.java | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/build.gradle b/build.gradle index aef4a43..d891f7e 100644 --- a/build.gradle +++ b/build.gradle @@ -46,7 +46,7 @@ dependencies { // Swagger implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.0.2' - implementation group: 'org.json', name: 'json', version: '20090211' + implementation group: 'org.json', name: 'json', version: '20231013' compileOnly 'org.projectlombok:lombok' annotationProcessor 'org.projectlombok:lombok' diff --git a/src/main/java/project/backend/common/config/SecurityConfig.java b/src/main/java/project/backend/common/config/SecurityConfig.java index d2f6e42..2b3e886 100644 --- a/src/main/java/project/backend/common/config/SecurityConfig.java +++ b/src/main/java/project/backend/common/config/SecurityConfig.java @@ -50,9 +50,9 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Excepti .requestMatchers("/exception/**").permitAll() .requestMatchers("/swagger-ui/**").permitAll() .requestMatchers("/api-docs/**").permitAll() - .requestMatchers(HttpMethod.POST, "/post").permitAll() - .requestMatchers(HttpMethod.GET, "/post/*").permitAll() - .requestMatchers(HttpMethod.PATCH, "/post/*/summary").permitAll() + .requestMatchers(HttpMethod.POST, "/posts").permitAll() + .requestMatchers(HttpMethod.GET, "/posts/*").permitAll() + .requestMatchers(HttpMethod.PATCH, "/posts/*/summary").permitAll() .anyRequest().authenticated() ) .addFilterBefore(jwtFilter, UsernamePasswordAuthenticationFilter.class) diff --git a/src/main/java/project/backend/security/jwt/JwtFilter.java b/src/main/java/project/backend/security/jwt/JwtFilter.java index c737e3d..d6b9a7c 100644 --- a/src/main/java/project/backend/security/jwt/JwtFilter.java +++ b/src/main/java/project/backend/security/jwt/JwtFilter.java @@ -84,12 +84,12 @@ private void setErrorResponse(HttpServletResponse response) throws IOException { private static boolean isRequestSummaryURI(HttpServletRequest request) { // 요약하기 - if (request.getRequestURI().equals("/post") && request.getMethod() - .equals(HttpMethod.POST.name())) { + if (request.getRequestURI().equals("/posts") && request.getMethod() + .equals(HttpMethod.POST.name())) { return true; } // 재요약하기 - if (request.getRequestURI().matches("/post/[0-9]+/summary") && request.getMethod().equals( + if (request.getRequestURI().matches("/posts/[0-9]+/summary") && request.getMethod().equals( HttpMethod.PATCH.name())) { return true; } From dc6ba9bbfc43aa05f79a6ec346464bf08c846144 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=8D=EA=B9=80=EC=9A=A9=EB=B9=88?= Date: Fri, 4 Oct 2024 00:46:56 +0900 Subject: [PATCH 2/2] fix: swagger config (#44) --- build.gradle | 2 +- .../backend/common/config/SwaggerConfig.java | 13 ++++++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index d891f7e..ac8c824 100644 --- a/build.gradle +++ b/build.gradle @@ -44,7 +44,7 @@ dependencies { implementation 'org.springframework.ai:spring-ai-vertex-ai-gemini-spring-boot-starter:1.0.0-SNAPSHOT' // Swagger - implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.0.2' + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.6.0' implementation group: 'org.json', name: 'json', version: '20231013' diff --git a/src/main/java/project/backend/common/config/SwaggerConfig.java b/src/main/java/project/backend/common/config/SwaggerConfig.java index b4c9095..9b61700 100644 --- a/src/main/java/project/backend/common/config/SwaggerConfig.java +++ b/src/main/java/project/backend/common/config/SwaggerConfig.java @@ -9,9 +9,11 @@ import java.util.List; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; @Configuration -public class SwaggerConfig { +public class SwaggerConfig implements WebMvcConfigurer { private static final String BEARER_TOKEN_PREFIX = "Bearer"; @@ -45,4 +47,13 @@ private Info apiInfo() { .description("스위프 6기 5팀 API") // API에 대한 설명 .version("1.0.0"); // API의 버전 } + + @Override + public void addResourceHandlers(ResourceHandlerRegistry registry) { + registry.addResourceHandler("swagger-ui.html") + .addResourceLocations("classpath:/META-INF/resources/"); + + registry.addResourceHandler("/webjars/**") + .addResourceLocations("classpath:/META-INF/resources/webjars/"); + } } \ No newline at end of file