diff --git a/pom.xml b/pom.xml index 79f95b1..1c50458 100644 --- a/pom.xml +++ b/pom.xml @@ -24,6 +24,7 @@ 1.8 1.2.0.Final jdt_apt + Edgware.SR5 @@ -136,6 +137,12 @@ pagehelper-spring-boot-starter 1.1.0 + + + org.springframework.cloud + spring-cloud-starter-eureka + + @@ -207,5 +214,16 @@ + + + + org.springframework.cloud + spring-cloud-dependencies + ${spring-cloud.version} + pom + import + + + diff --git a/src/main/java/com/gzzn/omms/adminapi/AdminApiApplication.java b/src/main/java/com/gzzn/omms/adminapi/AdminApiApplication.java index 0a86c8e..6b41c7d 100644 --- a/src/main/java/com/gzzn/omms/adminapi/AdminApiApplication.java +++ b/src/main/java/com/gzzn/omms/adminapi/AdminApiApplication.java @@ -2,8 +2,10 @@ package com.gzzn.omms.adminapi; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.netflix.eureka.EnableEurekaClient; @SpringBootApplication +@EnableEurekaClient public class AdminApiApplication { public static void main(String[] args) { diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index b4062db..7740c09 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -36,11 +36,18 @@ spring: test-on-return: true pool-prepared-statements: false max-pool-prepared-statement-per-connection-size: 20 +eureka: + client: + service-url: + defaultZone: http://130.120.3.231:94/eureka/ + instance: + prefer-ip-address: true sysApi: host: 130.120.3.231 port: 93 schema: http - baseUrl: ${sysApi.schema}://${sysApi.host}:${sysApi.port} + #baseUrl: ${sysApi.schema}://${sysApi.host}:${sysApi.port} + baseUrl: ${sysApi.schema}://SYSAPI getOpLogSwitchByLevleAndNameUrl: ${sysApi.baseUrl}/oplog/getOpLogSwitch/{level}/{name} logstash: diff --git a/src/main/resources/application-pro.yml b/src/main/resources/application-pro.yml index 3d2f08e..25c2244 100644 --- a/src/main/resources/application-pro.yml +++ b/src/main/resources/application-pro.yml @@ -36,11 +36,18 @@ spring: test-on-return: true pool-prepared-statements: false max-pool-prepared-statement-per-connection-size: 20 +eureka: + client: + service-url: + defaultZone: http://130.120.3.231:94/eureka/ + instance: + prefer-ip-address: true sysApi: host: 172.17.35.163 port: 93 schema: http - baseUrl: ${sysApi.schema}://${sysApi.host}:${sysApi.port} + #baseUrl: ${sysApi.schema}://${sysApi.host}:${sysApi.port} + baseUrl: ${sysApi.schema}://SYSAPI getOpLogSwitchByLevleAndNameUrl: ${sysApi.baseUrl}/oplog/getOpLogSwitch/{level}/{name} logstash: diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index f8b769b..40e07f4 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,4 +1,6 @@ spring: + application: + name: adminapi profiles: active: dev jpa: