init commit

@@ -28,7 +28,7 @@ spring:
 
 
 # 日志配置
 # 日志配置
 logback:
 logback:
-  appname: cloud-config-center
+  appname: cloud-config-server
   logdir: ./log
   logdir: ./log
 
 
 
 

@@ -8,11 +8,8 @@
 		<version>2.1.7.RELEASE</version>
 		<version>2.1.7.RELEASE</version>
 		<relativePath/> <!-- lookup parent from repository -->
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 	</parent>
-<<<<<<< HEAD
+
 	<groupId>com.sunyo.wlpt.cloud.config.server</groupId>
 	<groupId>com.sunyo.wlpt.cloud.config.server</groupId>
-=======
-	<groupId>com.sunyo.wlpt.cloud.config.center</groupId>
->>>>>>> 0c7d87d9e2a5f6087f286c23ebe436594b4099c5
 	<artifactId>cloud-config-server</artifactId>
 	<artifactId>cloud-config-server</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
 	<version>0.0.1-SNAPSHOT</version>
 	<name>cloud-config-server</name>
 	<name>cloud-config-server</name>
@@ -121,11 +118,7 @@
                 <groupId>org.springframework.boot</groupId>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
                 <configuration>
                 <configuration>
-<<<<<<< HEAD
                     <mainClass>com.sunyo.wlpt.cloud.config.server.CloudConfigServerApplication</mainClass>
                     <mainClass>com.sunyo.wlpt.cloud.config.server.CloudConfigServerApplication</mainClass>
-=======
-                    <mainClass>com.sunyo.wlpt.cgonms.provide.CgonmsProvideApplication</mainClass>
->>>>>>> 0c7d87d9e2a5f6087f286c23ebe436594b4099c5
                 </configuration>
                 </configuration>
             </plugin>
             </plugin>
         </plugins>
         </plugins>

-package com.sunyo.wlpt.cloud.config.center;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.cloud.config.server.EnableConfigServer;
-import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
-
-@SpringBootApplication
-@EnableConfigServer
-@EnableEurekaClient
-public class CloudConfigCenterApplication {
-
-    public static void main(String[] args) {
-        SpringApplication.run(CloudConfigCenterApplication.class, args);
-    }
-
-}

@@ -5,6 +5,9 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.config.server.EnableConfigServer;
 import org.springframework.cloud.config.server.EnableConfigServer;
 import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
 import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
 
 
+/**
+ * @author zicheng
+ */
 @SpringBootApplication
 @SpringBootApplication
 @EnableConfigServer
 @EnableConfigServer
 @EnableEurekaClient
 @EnableEurekaClient