20190523解决一直正在loading中的问题

server/pom.xml

@@ -25,21 +25,15 @@
     </properties>
 
     <dependencies>
-        <!--Spring boot dependencies begin -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-        </dependency>
-
-        <!--Spring cloud dependencies begin-->
         <dependency>
             <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-config</artifactId>
+            <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-eureka</artifactId>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
+
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-actuator</artifactId>
@@ -56,59 +50,6 @@
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-turbine</artifactId>
         </dependency>
-        <!--<dependency>-->
-            <!--<groupId>org.springframework.cloud</groupId>-->
-            <!--<artifactId>spring-cloud-starter-netflix-turbine</artifactId>-->
-        <!--</dependency>-->
-
-        <!--<dependency>-->
-            <!--<groupId>org.springframework.cloud</groupId>-->
-            <!--<artifactId>spring-cloud-starter-stream-rabbit</artifactId>-->
-        <!--</dependency>-->
-
-        <!--Third party dependencies begin-->
-        <!--<dependency>-->
-            <!--<groupId>com.zaxxer</groupId>-->
-            <!--<artifactId>HikariCP</artifactId>-->
-            <!--<version>3.1.0</version>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>io.springfox</groupId>-->
-            <!--<artifactId>springfox-swagger2</artifactId>-->
-            <!--<version>2.8.0</version>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>io.springfox</groupId>-->
-            <!--<artifactId>springfox-swagger-ui</artifactId>-->
-            <!--<version>2.8.0</version>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>mysql</groupId>-->
-            <!--<artifactId>mysql-connector-java</artifactId>-->
-            <!--<version>5.1.39</version>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>org.mybatis.spring.boot</groupId>-->
-            <!--<artifactId>mybatis-spring-boot-starter</artifactId>-->
-            <!--<version>1.3.2</version>-->
-        <!--</dependency>-->
-        <!--pica dependencies begin-->
-
-        <!--<dependency>-->
-            <!--<groupId>com.pica.cloud.foundation</groupId>-->
-            <!--<artifactId>pica-cloud-service-starter</artifactId>-->
-            <!--<version>1.2.5-SNAPSHOT</version>-->
-        <!--</dependency>-->
-
-        <!--&lt;!&ndash;zipkin dependencies begin&ndash;&gt;-->
-        <!--<dependency>-->
-            <!--<groupId>org.springframework.cloud</groupId>-->
-            <!--<artifactId>spring-cloud-starter-zipkin</artifactId>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>org.springframework.kafka</groupId>-->
-            <!--<artifactId>spring-kafka</artifactId>-->
-        <!--</dependency>-->
     </dependencies>
 
     <dependencyManagement>

server/src/main/java/com/pica/cloud/foundation/monitor/server/App.java

@@ -2,15 +2,12 @@ package com.pica.cloud.foundation.monitor.server;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
-import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
 import org.springframework.cloud.netflix.hystrix.EnableHystrix;
 import org.springframework.cloud.netflix.hystrix.dashboard.EnableHystrixDashboard;
 import org.springframework.cloud.netflix.turbine.EnableTurbine;
 
-@SpringBootApplication(exclude={DataSourceAutoConfiguration.class})
-@EnableDiscoveryClient
+@SpringBootApplication
 @EnableEurekaClient
 @EnableHystrixDashboard
 @EnableTurbine

server/src/main/resources/bootstrap-dev.properties

@@ -27,6 +27,7 @@ turbine.appConfig=10102-PICA-CLOUD-SHORTURL,10102-PICA-CLOUD-WECHAT,10105-PICA-C
   11901-PICA-CLOUD-CAMPAIGN,11902-PICA-CLOUD-SOCKET,11903-PICA-CLOUD-MIDDLEWARE,12401-PICA-CLOUD-DOPING,12501-PICA-CLOUD-ORG-NOTICE
 turbine.aggregator.clusterConfig=default
 turbine.clusterNameExpression=new String("default")
+turbine.combine-host-port=true
 
 #logback settings
 #logging.level.ROOT=INFO