hexiao 1 year ago
parent
commit
1c0f99c043

+ 13 - 8
da/pom.xml

@@ -25,6 +25,11 @@
 	</properties>
 
 	<dependencies>
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-commons</artifactId>
+		</dependency>
+
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-actuator</artifactId>
@@ -41,7 +46,7 @@
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-starter-netflix-eureka-server</artifactId>
 		</dependency>
-		<!-- <dependency> <groupId>org.springframework.cloud</groupId> <artifactId>spring-cloud-starter-config</artifactId> 
+		<!-- <dependency> <groupId>org.springframework.cloud</groupId> <artifactId>spring-cloud-starter-config</artifactId>
 			</dependency> -->
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
@@ -200,7 +205,7 @@
 			<artifactId>hive-jdbc</artifactId>
 			<version>1.1.0</version>
 		</dependency>
-		<!-- <dependency> <groupId>org.eclipse.jetty.aggregate</groupId> <artifactId>jetty-all</artifactId> 
+		<!-- <dependency> <groupId>org.eclipse.jetty.aggregate</groupId> <artifactId>jetty-all</artifactId>
 			<version>9.2.19.v20160908</version> </dependency> -->
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
@@ -242,11 +247,11 @@
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
 			</plugin>
-			<!-- <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-war-plugin</artifactId> 
-				<configuration> <failOnMissingWebXml>false</failOnMissingWebXml> </configuration> 
-				</plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> 
-				<executions> <execution> <id>make-a-jar</id> <phase>compile</phase> <goals> 
-				<goal>jar</goal> </goals> </execution> </executions> <configuration> <failOnMissingWebXml>false</failOnMissingWebXml> 
+			<!-- <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-war-plugin</artifactId>
+				<configuration> <failOnMissingWebXml>false</failOnMissingWebXml> </configuration>
+				</plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId>
+				<executions> <execution> <id>make-a-jar</id> <phase>compile</phase> <goals>
+				<goal>jar</goal> </goals> </execution> </executions> <configuration> <failOnMissingWebXml>false</failOnMissingWebXml>
 				</configuration> </plugin> -->
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
@@ -270,4 +275,4 @@
 	</repositories>
 
 
-</project>
+</project>

+ 3 - 0
da/src/main/resources/bootstrap.yml

@@ -13,6 +13,9 @@ port: 9999
 #                serviceId: cap-config
 #            failFast: true
 eureka:
+    instance:
+        prefer-ip-address: true  #配置是否显示ip地址,默认为false
+        instance-id: ${server}:${server.port}  #注册服务列表显示ip+端口
     client:
         serviceUrl:
             defaultZone: http://${server}:${port}/eureka

+ 1 - 2
dc-account/src/main/resources/bootstrap.yml

@@ -13,10 +13,9 @@ port: 9999
 #            failFast: true
 
 eureka:
-
     instance:
         prefer-ip-address: true  #配置是否显示ip地址,默认为false
-        instance-id: 124.71.171.71:${server.port}  #注册服务列表显示ip+端口
+        instance-id: ${server}:${server.port}  #注册服务列表显示ip+端口
     client:
         serviceUrl:
             defaultZone: http://${server}:${port}/eureka

+ 12 - 7
dc-appshow/pom.xml

@@ -26,6 +26,11 @@
 	</properties>
 
 	<dependencies>
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-commons</artifactId>
+		</dependency>
+
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-actuator</artifactId>
@@ -42,7 +47,7 @@
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-starter-netflix-eureka-server</artifactId>
 		</dependency>
-		<!-- <dependency> <groupId>org.springframework.cloud</groupId> <artifactId>spring-cloud-starter-config</artifactId> 
+		<!-- <dependency> <groupId>org.springframework.cloud</groupId> <artifactId>spring-cloud-starter-config</artifactId>
 			</dependency> -->
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
@@ -196,7 +201,7 @@
 			<artifactId>hive-jdbc</artifactId>
 			<version>1.1.0</version>
 		</dependency>
-		<!-- <dependency> <groupId>org.eclipse.jetty.aggregate</groupId> <artifactId>jetty-all</artifactId> 
+		<!-- <dependency> <groupId>org.eclipse.jetty.aggregate</groupId> <artifactId>jetty-all</artifactId>
 			<version>9.2.19.v20160908</version> </dependency> -->
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
@@ -223,11 +228,11 @@
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
 			</plugin>
-			<!-- <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-war-plugin</artifactId> 
-				<configuration> <failOnMissingWebXml>false</failOnMissingWebXml> </configuration> 
-				</plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> 
-				<executions> <execution> <id>make-a-jar</id> <phase>compile</phase> <goals> 
-				<goal>jar</goal> </goals> </execution> </executions> <configuration> <failOnMissingWebXml>false</failOnMissingWebXml> 
+			<!-- <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-war-plugin</artifactId>
+				<configuration> <failOnMissingWebXml>false</failOnMissingWebXml> </configuration>
+				</plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId>
+				<executions> <execution> <id>make-a-jar</id> <phase>compile</phase> <goals>
+				<goal>jar</goal> </goals> </execution> </executions> <configuration> <failOnMissingWebXml>false</failOnMissingWebXml>
 				</configuration> </plugin> -->
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>

+ 3 - 0
dc-appshow/src/main/resources/bootstrap.yml

@@ -3,6 +3,9 @@
 server: 124.71.171.71
 port: 9999
 eureka:
+    instance:
+        prefer-ip-address: true  #配置是否显示ip地址,默认为false
+        instance-id: ${server}:${server.port}  #注册服务列表显示ip+端口
     client:
         serviceUrl:
             defaultZone: http://${server}:${port}/eureka

+ 9 - 4
dc-gateway/pom.xml

@@ -26,11 +26,16 @@
 	</properties>
 
 	<dependencies>
-	    <dependency>
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-commons</artifactId>
+		</dependency>
+
+		<dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-aop</artifactId>
         </dependency>
-        
+
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-starter-netflix-zuul</artifactId>
@@ -67,7 +72,7 @@
 			<artifactId>spring-boot-starter-test</artifactId>
 			<scope>test</scope>
 		</dependency>
-		
+
 		<dependency>
             <groupId>org.springframework.retry</groupId>
             <artifactId>spring-retry</artifactId>
@@ -103,7 +108,7 @@
 			<plugin>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
-			</plugin> 
+			</plugin>
 			<!-- <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-war-plugin</artifactId>

+ 3 - 0
dc-gateway/src/main/resources/bootstrap.yml

@@ -14,6 +14,9 @@ port: 9999
 #            failFast: true
 
 eureka:
+    instance:
+        prefer-ip-address: true  #配置是否显示ip地址,默认为false
+        instance-id: ${server}:${server.port}  #注册服务列表显示ip+端口
     client:
         serviceUrl:
             defaultZone: http://${server}:${port}/eureka

+ 5 - 0
dc-mdm/pom.xml

@@ -199,6 +199,11 @@
 			<artifactId>spring-boot-configuration-processor</artifactId>
 			<optional>true</optional>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-commons</artifactId>
+		</dependency>
+
 	</dependencies>
 
 	<dependencyManagement>

+ 1 - 2
dc-mdm/src/main/resources/bootstrap.yml

@@ -16,8 +16,7 @@ port: 9999
 eureka:
     instance:
         prefer-ip-address: true  #配置是否显示ip地址,默认为false
-        instance-id: ${spring.cloud.client.ip-address}:${server.port}  #注册服务列表显示ip+端口
-
+        instance-id: ${server}:${server.port}  #注册服务列表显示ip+端口
     client:
         serviceUrl:
             defaultZone: http://${server}:${port}/eureka

+ 5 - 0
kpim/pom.xml

@@ -26,6 +26,11 @@
 	</properties>
 
 	<dependencies>
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-commons</artifactId>
+		</dependency>
+
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-actuator</artifactId>

+ 3 - 0
kpim/src/main/resources/bootstrap.yml

@@ -3,6 +3,9 @@ port: 9999
 #server: localhost
 #port: 9876
 eureka:
+  instance:
+    prefer-ip-address: true  #配置是否显示ip地址,默认为false
+    instance-id: ${server}:${server.port}  #注册服务列表显示ip+端口
   client:
     serviceUrl:
       defaultZone: http://${server}:${port}/eureka

+ 12 - 7
rpm/pom.xml

@@ -26,6 +26,11 @@
 	</properties>
 
 	<dependencies>
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-commons</artifactId>
+		</dependency>
+
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-actuator</artifactId>
@@ -42,7 +47,7 @@
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-starter-netflix-eureka-server</artifactId>
 		</dependency>
-		<!-- <dependency> <groupId>org.springframework.cloud</groupId> <artifactId>spring-cloud-starter-config</artifactId> 
+		<!-- <dependency> <groupId>org.springframework.cloud</groupId> <artifactId>spring-cloud-starter-config</artifactId>
 			</dependency> -->
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
@@ -196,7 +201,7 @@
 			<artifactId>hive-jdbc</artifactId>
 			<version>1.1.0</version>
 		</dependency>
-		<!-- <dependency> <groupId>org.eclipse.jetty.aggregate</groupId> <artifactId>jetty-all</artifactId> 
+		<!-- <dependency> <groupId>org.eclipse.jetty.aggregate</groupId> <artifactId>jetty-all</artifactId>
 			<version>9.2.19.v20160908</version> </dependency> -->
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
@@ -223,11 +228,11 @@
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
 			</plugin>
-			<!-- <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-war-plugin</artifactId> 
-				<configuration> <failOnMissingWebXml>false</failOnMissingWebXml> </configuration> 
-				</plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> 
-				<executions> <execution> <id>make-a-jar</id> <phase>compile</phase> <goals> 
-				<goal>jar</goal> </goals> </execution> </executions> <configuration> <failOnMissingWebXml>false</failOnMissingWebXml> 
+			<!-- <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-war-plugin</artifactId>
+				<configuration> <failOnMissingWebXml>false</failOnMissingWebXml> </configuration>
+				</plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId>
+				<executions> <execution> <id>make-a-jar</id> <phase>compile</phase> <goals>
+				<goal>jar</goal> </goals> </execution> </executions> <configuration> <failOnMissingWebXml>false</failOnMissingWebXml>
 				</configuration> </plugin> -->
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>

+ 3 - 0
rpm/src/main/resources/bootstrap.yml

@@ -3,6 +3,9 @@
 server: 124.71.171.71
 port: 9999
 eureka:
+    instance:
+        prefer-ip-address: true  #配置是否显示ip地址,默认为false
+        instance-id: ${server}:${server.port}  #注册服务列表显示ip+端口
     client:
         serviceUrl:
             defaultZone: http://${server}:${port}/eureka