diff --git a/build.gradle b/build.gradle index 04eee54..ba55ccf 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'org.springframework.boot' version '2.4.2' + id 'org.springframework.boot' version '2.6.6' id 'io.spring.dependency-management' version '1.0.11.RELEASE' } @@ -25,4 +25,8 @@ allprojects { jar { enabled(false) } + + ext { + set('springCloudVersion', "2021.0.1") + } } \ No newline at end of file diff --git a/catalog-service/build.gradle b/catalog-service/build.gradle index 503145a..179cf39 100644 --- a/catalog-service/build.gradle +++ b/catalog-service/build.gradle @@ -1,7 +1,3 @@ -ext { - set('springCloudVersion', "2020.0.5") -} - dependencies { implementation(project(":util")) diff --git a/discovery/build.gradle b/discovery/build.gradle index 97ffc41..0bf4762 100644 --- a/discovery/build.gradle +++ b/discovery/build.gradle @@ -1,7 +1,3 @@ -ext { - set('springCloudVersion', "2020.0.5") -} - dependencies { implementation 'org.springframework.cloud:spring-cloud-starter-netflix-eureka-server' testImplementation 'org.springframework.boot:spring-boot-starter-test' diff --git a/gateway/build.gradle b/gateway/build.gradle index 73d0369..31c3577 100644 --- a/gateway/build.gradle +++ b/gateway/build.gradle @@ -1,7 +1,3 @@ -ext { - set('springCloudVersion', "2020.0.5") -} - dependencies { implementation 'org.springframework.boot:spring-boot-starter-security' implementation 'org.springframework.cloud:spring-cloud-starter-gateway' diff --git a/gateway/src/main/java/com/roy/springcloud/gateway/GatewayApplication.java b/gateway/src/main/java/com/roy/springcloud/gateway/GatewayApplication.java index 37f1057..dfa30d6 100644 --- a/gateway/src/main/java/com/roy/springcloud/gateway/GatewayApplication.java +++ b/gateway/src/main/java/com/roy/springcloud/gateway/GatewayApplication.java @@ -2,6 +2,9 @@ package com.roy.springcloud.gateway; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.context.annotation.Bean; +import org.springframework.security.config.web.server.ServerHttpSecurity; +import org.springframework.security.web.server.SecurityWebFilterChain; @SpringBootApplication public class GatewayApplication { @@ -10,4 +13,9 @@ public class GatewayApplication { SpringApplication.run(GatewayApplication.class, args); } + @Bean + public SecurityWebFilterChain securityWebFilterChain(ServerHttpSecurity security) { + return security.csrf().disable().build(); + } + } diff --git a/order-service/build.gradle b/order-service/build.gradle index 224d4e2..3a02e2e 100644 --- a/order-service/build.gradle +++ b/order-service/build.gradle @@ -1,7 +1,3 @@ -ext { - set('springCloudVersion', "2020.0.5") -} - dependencies { implementation(project(":util")) diff --git a/test-server1/build.gradle b/test-server1/build.gradle index 06aa4af..ec95a40 100644 --- a/test-server1/build.gradle +++ b/test-server1/build.gradle @@ -1,7 +1,3 @@ -ext { - set('springCloudVersion', "2020.0.5") -} - dependencies { implementation 'org.springframework.boot:spring-boot-starter-web' implementation 'org.springframework.cloud:spring-cloud-starter-netflix-eureka-client' diff --git a/test-server2/build.gradle b/test-server2/build.gradle index 06aa4af..ec95a40 100644 --- a/test-server2/build.gradle +++ b/test-server2/build.gradle @@ -1,7 +1,3 @@ -ext { - set('springCloudVersion', "2020.0.5") -} - dependencies { implementation 'org.springframework.boot:spring-boot-starter-web' implementation 'org.springframework.cloud:spring-cloud-starter-netflix-eureka-client' diff --git a/user-service/build.gradle b/user-service/build.gradle index 7a09da8..c68e795 100644 --- a/user-service/build.gradle +++ b/user-service/build.gradle @@ -1,7 +1,3 @@ -ext { - set('springCloudVersion', "2020.0.5") -} - dependencies { implementation(project(":util")) diff --git a/user-service/src/main/java/com/roy/springcloud/userservice/controller/UserController.java b/user-service/src/main/java/com/roy/springcloud/userservice/controller/UserController.java index 23991e3..dfe22ef 100644 --- a/user-service/src/main/java/com/roy/springcloud/userservice/controller/UserController.java +++ b/user-service/src/main/java/com/roy/springcloud/userservice/controller/UserController.java @@ -16,7 +16,7 @@ import java.util.List; import static com.roy.springcloud.util.mapper.MapperUtil.toObject; @RestController -@RequestMapping("/") +@RequestMapping("") @RequiredArgsConstructor public class UserController { private final Environment environment;