作者 王勇

init commit

@@ -5,8 +5,10 @@ server: @@ -5,8 +5,10 @@ server:
5 spring: 5 spring:
6 application: 6 application:
7 name: cloud-config-server 7 name: cloud-config-server
  8 +
8 profiles: 9 profiles:
9 active: dev 10 active: dev
  11 +
10 cloud: 12 cloud:
11 config: 13 config:
12 label: master 14 label: master
@@ -8,7 +8,11 @@ @@ -8,7 +8,11 @@
8 <version>2.1.7.RELEASE</version> 8 <version>2.1.7.RELEASE</version>
9 <relativePath/> <!-- lookup parent from repository --> 9 <relativePath/> <!-- lookup parent from repository -->
10 </parent> 10 </parent>
  11 +<<<<<<< HEAD
11 <groupId>com.sunyo.wlpt.cloud.config.server</groupId> 12 <groupId>com.sunyo.wlpt.cloud.config.server</groupId>
  13 +=======
  14 + <groupId>com.sunyo.wlpt.cloud.config.center</groupId>
  15 +>>>>>>> 0c7d87d9e2a5f6087f286c23ebe436594b4099c5
12 <artifactId>cloud-config-server</artifactId> 16 <artifactId>cloud-config-server</artifactId>
13 <version>0.0.1-SNAPSHOT</version> 17 <version>0.0.1-SNAPSHOT</version>
14 <name>cloud-config-server</name> 18 <name>cloud-config-server</name>
@@ -117,7 +121,11 @@ @@ -117,7 +121,11 @@
117 <groupId>org.springframework.boot</groupId> 121 <groupId>org.springframework.boot</groupId>
118 <artifactId>spring-boot-maven-plugin</artifactId> 122 <artifactId>spring-boot-maven-plugin</artifactId>
119 <configuration> 123 <configuration>
  124 +<<<<<<< HEAD
120 <mainClass>com.sunyo.wlpt.cloud.config.server.CloudConfigServerApplication</mainClass> 125 <mainClass>com.sunyo.wlpt.cloud.config.server.CloudConfigServerApplication</mainClass>
  126 +=======
  127 + <mainClass>com.sunyo.wlpt.cgonms.provide.CgonmsProvideApplication</mainClass>
  128 +>>>>>>> 0c7d87d9e2a5f6087f286c23ebe436594b4099c5
121 </configuration> 129 </configuration>
122 </plugin> 130 </plugin>
123 </plugins> 131 </plugins>
  1 +package com.sunyo.wlpt.cloud.config.center;
  2 +
  3 +import org.springframework.boot.SpringApplication;
  4 +import org.springframework.boot.autoconfigure.SpringBootApplication;
  5 +import org.springframework.cloud.config.server.EnableConfigServer;
  6 +import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
  7 +
  8 +@SpringBootApplication
  9 +@EnableConfigServer
  10 +@EnableEurekaClient
  11 +public class CloudConfigCenterApplication {
  12 +
  13 + public static void main(String[] args) {
  14 + SpringApplication.run(CloudConfigCenterApplication.class, args);
  15 + }
  16 +
  17 +}
  1 +package com.sunyo.wlpt.cloud.config.center;
  2 +
  3 +import org.junit.Test;
  4 +import org.junit.runner.RunWith;
  5 +import org.springframework.boot.test.context.SpringBootTest;
  6 +import org.springframework.test.context.junit4.SpringRunner;
  7 +
  8 +@RunWith(SpringRunner.class)
  9 +@SpringBootTest
  10 +public class CloudConfigCenterApplicationTests {
  11 +
  12 + @Test
  13 + public void contextLoads() {
  14 + }
  15 +
  16 +}