From d3cabc6a2db7a0b213f99dba0db3c6d659e7876b Mon Sep 17 00:00:00 2001 From: Samuel Modesto Date: Mon, 28 Jul 2025 19:15:13 -0300 Subject: [PATCH] =?UTF-8?q?implementa=C3=A7=C3=A3o=20do=20gateway?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-dev.yml | 2 +- cadastral/src/main/resources/application.yml | 5 ++-- gateway/pom.xml | 4 +++ .../imovato/gateway/GatewayApplication.java | 2 ++ .../src/main/resources/application-dev.yml | 26 +++++++++++++++++++ gateway/src/main/resources/application.yml | 25 +++--------------- .../rent/config/security/SecurityConfig.java | 5 ---- .../src/main/resources/application-dev.yml | 2 +- .../src/main/resources/application.yml | 4 +-- 9 files changed, 41 insertions(+), 34 deletions(-) create mode 100644 gateway/src/main/resources/application-dev.yml diff --git a/cadastral/src/main/resources/application-dev.yml b/cadastral/src/main/resources/application-dev.yml index 6fb2e12f..9e2fa64c 100644 --- a/cadastral/src/main/resources/application-dev.yml +++ b/cadastral/src/main/resources/application-dev.yml @@ -1,6 +1,6 @@ ## SONAR LOCAL: mvn clean verify sonar:sonar -Dsonar.projectKey=Imovato -Dsonar.host.url=http://localhost:9000 -Dsonar.login=sqp_8065f01e13e240636a05812095cc3af86e62507c server: - port: 8585 + port: 5757 spring: application: diff --git a/cadastral/src/main/resources/application.yml b/cadastral/src/main/resources/application.yml index c93b57e1..db40f783 100644 --- a/cadastral/src/main/resources/application.yml +++ b/cadastral/src/main/resources/application.yml @@ -2,11 +2,10 @@ spring: application: name: cadastral - profiles: - active: dev config: - import: "optional:configserver:" # caso o config-server nao responder, use o profile dev. + import: "configserver:" cloud: config: discovery: + enabled: true service-id: config-server \ No newline at end of file diff --git a/gateway/pom.xml b/gateway/pom.xml index 0d53a93f..7eaa9f0e 100644 --- a/gateway/pom.xml +++ b/gateway/pom.xml @@ -50,6 +50,10 @@ reactor-test test + + org.springframework.cloud + spring-cloud-starter-config + diff --git a/gateway/src/main/java/com/imovato/gateway/GatewayApplication.java b/gateway/src/main/java/com/imovato/gateway/GatewayApplication.java index 4e4885ac..0eb59eae 100644 --- a/gateway/src/main/java/com/imovato/gateway/GatewayApplication.java +++ b/gateway/src/main/java/com/imovato/gateway/GatewayApplication.java @@ -2,7 +2,9 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.client.discovery.EnableDiscoveryClient; +@EnableDiscoveryClient @SpringBootApplication public class GatewayApplication { diff --git a/gateway/src/main/resources/application-dev.yml b/gateway/src/main/resources/application-dev.yml new file mode 100644 index 00000000..dfaa83ac --- /dev/null +++ b/gateway/src/main/resources/application-dev.yml @@ -0,0 +1,26 @@ +spring: + application: + name: gateway + cloud: + gateway: + discovery: + locator: + enabled: true + lower-case-service-id: true + +server: + port: 5959 + +ead: + serviceRegistry: + username: un_user + password: 'un_user' + +eureka: + client: + registerWithEureka: true + fetchRegistry: true + service-url: + defaultZone: 'http://${ead.serviceRegistry.username}:${ead.serviceRegistry.password}@localhost:8761/eureka' + + diff --git a/gateway/src/main/resources/application.yml b/gateway/src/main/resources/application.yml index f01fbd62..c65d5a22 100644 --- a/gateway/src/main/resources/application.yml +++ b/gateway/src/main/resources/application.yml @@ -1,26 +1,9 @@ spring: application: name: gateway + config: + import: "configserver:" cloud: - gateway: + config: discovery: - locator: - enabled: true - lower-case-service-id: true - -server: - port: 8989 - -ead: - serviceRegistry: - username: admin - password: '123456' - -eureka: - client: - registerWithEureka: true - fetchRegistry: true - service-url: - defaultZone: 'http://${ead.serviceRegistry.username}:${ead.serviceRegistry.password}@localhost:8761/eureka' - - + service-id: config-server \ No newline at end of file diff --git a/transacional/src/main/java/com/example/rent/config/security/SecurityConfig.java b/transacional/src/main/java/com/example/rent/config/security/SecurityConfig.java index 9d940135..d9a4826d 100644 --- a/transacional/src/main/java/com/example/rent/config/security/SecurityConfig.java +++ b/transacional/src/main/java/com/example/rent/config/security/SecurityConfig.java @@ -1,12 +1,9 @@ package com.example.rent.config.security; -import jakarta.ws.rs.HttpMethod; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.security.authentication.AuthenticationManager; import org.springframework.security.config.Customizer; -import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer; @@ -27,8 +24,6 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Excepti http .csrf(AbstractHttpConfigurer::disable) .authorizeHttpRequests(auth -> auth - .requestMatchers(HttpMethod.POST, "/users/**", "/auth/**").permitAll() - .requestMatchers(HttpMethod.GET, "/accommodations", "/accommodations/**", "/images/**").permitAll() .anyRequest().authenticated() ) .addFilterBefore(jwtAuthenticationFilter, UsernamePasswordAuthenticationFilter.class) diff --git a/transacional/src/main/resources/application-dev.yml b/transacional/src/main/resources/application-dev.yml index fc69f1a6..728ce723 100644 --- a/transacional/src/main/resources/application-dev.yml +++ b/transacional/src/main/resources/application-dev.yml @@ -1,5 +1,5 @@ server: - port: 8689 + port: 5858 spring: application: diff --git a/transacional/src/main/resources/application.yml b/transacional/src/main/resources/application.yml index 2bf286fd..1fcbefb0 100644 --- a/transacional/src/main/resources/application.yml +++ b/transacional/src/main/resources/application.yml @@ -1,10 +1,8 @@ spring: application: name: transacional - profiles: - active: dev config: - import: "optional:configserver:" # caso o config-server nao responder, use o profile dev. + import: "configserver:" cloud: config: discovery: