diff --git a/pig-config/pom.xml b/pig-config/pom.xml index 4ceb106f..944a4a80 100644 --- a/pig-config/pom.xml +++ b/pig-config/pom.xml @@ -22,10 +22,7 @@ org.springframework.cloud spring-cloud-config-server - - org.springframework.cloud - spring-cloud-starter-eureka - + org.springframework.cloud spring-cloud-starter-bus-amqp diff --git a/pig-config/src/main/resources/application.yml b/pig-config/src/main/resources/application.yml index 1fd83dc7..5b91d3e3 100644 --- a/pig-config/src/main/resources/application.yml +++ b/pig-config/src/main/resources/application.yml @@ -4,7 +4,6 @@ server: spring: application: name: pig-config-server - index: 1 cloud: config: server: diff --git a/pig-gateway/pom.xml b/pig-gateway/pom.xml index 567cf97a..0b543bb7 100644 --- a/pig-gateway/pom.xml +++ b/pig-gateway/pom.xml @@ -18,31 +18,15 @@ - - org.springframework.boot - spring-boot-starter - org.springframework.cloud spring-cloud-starter-zuul - - org.springframework.cloud - spring-cloud-starter-eureka - - - org.springframework.cloud - spring-cloud-starter-config - + org.springframework.cloud spring-cloud-starter-bus-amqp - - org.springframework.boot - spring-boot-starter-test - test - diff --git a/pig-gateway/src/main/resources/bootstrap.yml b/pig-gateway/src/main/resources/bootstrap.yml index d687efc5..d542be8b 100644 --- a/pig-gateway/src/main/resources/bootstrap.yml +++ b/pig-gateway/src/main/resources/bootstrap.yml @@ -1,7 +1,6 @@ spring: application: name: pig-gateway - index: 3 cloud: config: fail-fast: true diff --git a/pig-service-auth/pom.xml b/pig-service-auth/pom.xml index e393760b..37d3425b 100644 --- a/pig-service-auth/pom.xml +++ b/pig-service-auth/pom.xml @@ -18,27 +18,12 @@ - - org.springframework.boot - spring-boot-starter - - - org.springframework.boot - spring-boot-starter-web - - - org.springframework.cloud - spring-cloud-starter-eureka - - - org.springframework.cloud - spring-cloud-starter-config - io.jsonwebtoken jjwt 0.7.0 + org.springframework.cloud spring-cloud-starter-bus-amqp diff --git a/pig-service-auth/src/main/resources/bootstrap.yml b/pig-service-auth/src/main/resources/bootstrap.yml index 689a494d..0703c708 100644 --- a/pig-service-auth/src/main/resources/bootstrap.yml +++ b/pig-service-auth/src/main/resources/bootstrap.yml @@ -1,7 +1,6 @@ spring: application: name: pig-service-auth - index: 2 cloud: config: fail-fast: true @@ -18,8 +17,6 @@ spring: host: localhost username: guest password: guest - - eureka: instance: prefer-ip-address: true diff --git a/pom.xml b/pom.xml index 466a8684..4789feb9 100644 --- a/pom.xml +++ b/pom.xml @@ -20,8 +20,29 @@ UTF-8 UTF-8 1.8 + 1.0-SNAPSHOT + + + + + org.springframework.cloud + spring-cloud-starter-eureka + + + + org.springframework.cloud + spring-cloud-starter-config + + + + org.springframework.boot + spring-boot-starter-test + test + + + pig-eureka pig-config