diff --git a/whatsmars-spring-cloud/configfile/server-test.properties b/whatsmars-spring-cloud/configfile/server-test.properties
new file mode 100644
index 0000000000000000000000000000000000000000..8efcbbdc7c52b33f8792c715dca6cd0f50b54b80
--- /dev/null
+++ b/whatsmars-spring-cloud/configfile/server-test.properties
@@ -0,0 +1 @@
+foo=toutiao
\ No newline at end of file
diff --git a/whatsmars-spring-cloud/pom.xml b/whatsmars-spring-cloud/pom.xml
index d35baf021e482ad1905817bdcba4f338cc5a1822..ed8e3da2c9fed376e7583be7aebb54c1c07517a4 100644
--- a/whatsmars-spring-cloud/pom.xml
+++ b/whatsmars-spring-cloud/pom.xml
@@ -16,6 +16,7 @@
     <description>The demo module of springcloud project</description>
     <modules>
         <module>whatsmars-springcloud-eureka</module>
+        <module>whatsmars-springcloud-configserver</module>
     </modules>
     <properties>
         <skip_maven_deploy>true</skip_maven_deploy>
diff --git a/whatsmars-spring-cloud/whatsmars-springcloud-configserver/pom.xml b/whatsmars-spring-cloud/whatsmars-springcloud-configserver/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..f65b85ca40d557416b7cbb4a2cad86a3987d248b
--- /dev/null
+++ b/whatsmars-spring-cloud/whatsmars-springcloud-configserver/pom.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>whatsmars-springcloud-configserver</artifactId>
+    <packaging>jar</packaging>
+    <name>${project.artifactId}</name>
+
+    <parent>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-parent</artifactId>
+        <version>1.5.2.RELEASE</version>
+        <relativePath/> <!-- lookup parent from repository -->
+    </parent>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <java.version>1.8</java.version>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-config-server</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+    </dependencies>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.springframework.cloud</groupId>
+                <artifactId>spring-cloud-dependencies</artifactId>
+                <version>Dalston.RC1</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+
+    <repositories>
+        <repository>
+            <id>spring-milestones</id>
+            <name>Spring Milestones</name>
+            <url>https://repo.spring.io/milestone</url>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </repository>
+    </repositories>
+
+
+</project>
\ No newline at end of file
diff --git a/whatsmars-spring-cloud/whatsmars-springcloud-configserver/src/main/java/com/itlong/whatsmars/springcloud/configserver/ConfigApplication.java b/whatsmars-spring-cloud/whatsmars-springcloud-configserver/src/main/java/com/itlong/whatsmars/springcloud/configserver/ConfigApplication.java
new file mode 100644
index 0000000000000000000000000000000000000000..447ada6570eb1a281af6430db81616656e2f4429
--- /dev/null
+++ b/whatsmars-spring-cloud/whatsmars-springcloud-configserver/src/main/java/com/itlong/whatsmars/springcloud/configserver/ConfigApplication.java
@@ -0,0 +1,18 @@
+package com.itlong.whatsmars.springcloud.configserver;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.config.server.EnableConfigServer;
+
+import javax.swing.*;
+
+/**
+ * Created by shenhongxi on 2017/9/14.
+ */
+@EnableConfigServer
+@SpringBootApplication
+public class ConfigApplication {
+    public static void main(String[] args) {
+        SpringApplication.run(ConfigApplication.class, args);
+    }
+}
diff --git a/whatsmars-spring-cloud/whatsmars-springcloud-configserver/src/main/resources/application.yml b/whatsmars-spring-cloud/whatsmars-springcloud-configserver/src/main/resources/application.yml
new file mode 100644
index 0000000000000000000000000000000000000000..6ce2cdcbae50025632ae658e42439fbe31defd40
--- /dev/null
+++ b/whatsmars-spring-cloud/whatsmars-springcloud-configserver/src/main/resources/application.yml
@@ -0,0 +1,13 @@
+server:
+  port: 8762
+
+spring:
+  cloud:
+    config:
+      server:
+        git:
+          uri: https://github.com/javahongxi/whatsmars
+          searchPaths: whatsmars-spring-cloud/configfile
+          username: javahongxi
+          password: jd854749
+      label: master
\ No newline at end of file
diff --git a/whatsmars-spring-cloud/whatsmars-springcloud-eureka/src/main/java/com/itlong/whatsmars/springcloud/eureka/EurekaServerApp.java b/whatsmars-spring-cloud/whatsmars-springcloud-eureka/src/main/java/com/itlong/whatsmars/springcloud/eureka/EurekaApplication.java
similarity index 77%
rename from whatsmars-spring-cloud/whatsmars-springcloud-eureka/src/main/java/com/itlong/whatsmars/springcloud/eureka/EurekaServerApp.java
rename to whatsmars-spring-cloud/whatsmars-springcloud-eureka/src/main/java/com/itlong/whatsmars/springcloud/eureka/EurekaApplication.java
index 9bd643977f82d1df8c7edcb76497dcb578b25f1a..4d0d4f707be110163e60562ce552dc5b0ccceeeb 100644
--- a/whatsmars-spring-cloud/whatsmars-springcloud-eureka/src/main/java/com/itlong/whatsmars/springcloud/eureka/EurekaServerApp.java
+++ b/whatsmars-spring-cloud/whatsmars-springcloud-eureka/src/main/java/com/itlong/whatsmars/springcloud/eureka/EurekaApplication.java
@@ -6,8 +6,8 @@ import org.springframework.cloud.netflix.eureka.server.EnableEurekaServer;
 
 @EnableEurekaServer
 @SpringBootApplication
-public class EurekaServerApp {
+public class EurekaApplication {
     public static void main(String[] args) {
-        SpringApplication.run(EurekaServerApp.class, args);
+        SpringApplication.run(EurekaApplication.class, args);
     }
 }
\ No newline at end of file