Browse Source

Discovery server added

Drowsito 1 month ago
parent
commit
6db424059e

+ 5 - 0
pom.xml

@@ -152,6 +152,11 @@
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-starter-openfeign</artifactId>
 		</dependency>
+
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
+		</dependency>
 		<!-- 
 		<dependency>
 		    <groupId>org.jacoco</groupId> 

+ 1 - 1
src/main/java/es/uv/saic/feing/CoreClient.java

@@ -15,7 +15,7 @@ import es.uv.saic.dto.EmailDTO;
 import es.uv.saic.dto.IndicadorEnquestaTmpDup;
 import es.uv.saic.dto.OrganDTO;
 
-@FeignClient(name = "core-service", url = "${saic.url.core.domain}/core")
+@FeignClient(name = "core-service")
 public interface CoreClient {
     
     @GetMapping("/getOrgByRuct/{ruct}")

+ 8 - 6
src/main/resources/application-local.properties

@@ -1,7 +1,12 @@
-server.port = 8081
+server.port = 0
+spring.application.name = data-service
+eureka.client.service-url.defaultZone=http://127.0.0.1:8761/eureka
+eureka.instance.prefer-ip-address=false
+eureka.instance.status-page-url-path=/
+
 # Urls
-saic.url.data.domain = http://127.0.0.1:8081
-saic.url.core.domain = http://127.0.0.1:8080
+saic.url.data.domain = http://data-service
+saic.url.core.domain = http://core-service
 saic.url.public = ${saic.url.data.domain}/public
 
 # JPA Debug
@@ -39,10 +44,7 @@ logging.file.name=C:\\SAIC\\logs\\saic.log
 saic.scheduler.expired.enabled=false
 
 # Actuator
-spring.application.name = UV SAIC [LO]
 spring.boot.admin.client.url=http://127.0.0.1:9091
-spring.boot.admin.client.instance.management-base-url=${saic.url.data.domain}
-spring.boot.admin.client.instance.service-url=${saic.url.data.domain}
 spring.boot.admin.client.username=admin
 spring.boot.admin.client.password=kkdvk
 management.endpoints.web.exposure.include=*