From c6a67e46e8ab6beb170a9e947ca2fa03fdbfdca8 Mon Sep 17 00:00:00 2001
From: zhouxiunai <154707516@qq.com>
Date: Mon, 14 Jan 2019 10:48:31 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E5=85=A5=E6=9C=8D=E5=8A=A1=E5=8F=91?=
 =?UTF-8?q?=E7=8E=B0=E5=8A=9F=E8=83=BD=EF=BC=8C=E4=BE=9D=E8=B5=96SYSAPI?=
 =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=90=8D=E8=80=8C=E9=9D=9E=E5=9B=BA=E5=AE=9A?=
 =?UTF-8?q?ip?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                        | 18 ++++++++++++++++++
 .../omms/adminapi/AdminApiApplication.java     |  2 ++
 src/main/resources/application-dev.yml         |  9 ++++++++-
 src/main/resources/application-pro.yml         |  9 ++++++++-
 src/main/resources/application.yml             |  2 ++
 5 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 79f95b1..1c50458 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,6 +24,7 @@
 		<java.version>1.8</java.version>
 		<org.mapstruct.version>1.2.0.Final</org.mapstruct.version>
 		<m2e.apt.activation>jdt_apt</m2e.apt.activation>
+		<spring-cloud.version>Edgware.SR5</spring-cloud.version>
 	</properties>
 
 	<dependencies>
@@ -136,6 +137,12 @@
 			<artifactId>pagehelper-spring-boot-starter</artifactId>
 			<version>1.1.0</version>
 		</dependency>
+		
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-starter-eureka</artifactId>
+		</dependency>
+		
 	</dependencies>
 
 	<build>
@@ -207,5 +214,16 @@
         </resources>
 	</build>
 
+ <dependencyManagement>
+		<dependencies>
+			<dependency>
+				<groupId>org.springframework.cloud</groupId>
+				<artifactId>spring-cloud-dependencies</artifactId>
+				<version>${spring-cloud.version}</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+		</dependencies>
+	</dependencyManagement>
 
 </project>
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: