diff --git a/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/AdminBootstrap.java b/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/AdminBootstrap.java
index c85ba9f78da35b0e8548a342415f15bfa46c8e4a..a09d647d3c1c3262bea4afc77546b59233ce650f 100644
--- a/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/AdminBootstrap.java
+++ b/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/AdminBootstrap.java
@@ -1,24 +1,24 @@
-package com.github.wxiaoqi.security.admin;
-
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.builder.SpringApplicationBuilder;
-import org.springframework.boot.web.servlet.ServletComponentScan;
-import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
-import org.springframework.cloud.netflix.hystrix.EnableHystrix;
-
-/**
- * ${DESCRIPTION}
- *
- * @author wanghaobin
- * @create 2017-05-25 12:44
- */
-//@EnableDiscoveryClient  //激活eureka中的DiscoveryClient实现
-@EnableEurekaClient
-@EnableHystrix
-@SpringBootApplication
-@ServletComponentScan("com.github.wxiaoqi.security.admin.config.druid")
-//@EnableRedisHttpSession
-public class AdminBootstrap {
-    public static void main(String[] args) {
-        new SpringApplicationBuilder(AdminBootstrap.class).web(true).run(args);    }
-}
+package com.github.wxiaoqi.security.admin;
+
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.builder.SpringApplicationBuilder;
+import org.springframework.boot.web.servlet.ServletComponentScan;
+import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
+import org.springframework.cloud.client.circuitbreaker.EnableCircuitBreaker;
+
+/**
+ * ${DESCRIPTION}
+ *
+ * @author wanghaobin
+ * @create 2017-05-25 12:44
+ */
+//@EnableDiscoveryClient  //激活eureka中的DiscoveryClient实现
+@EnableEurekaClient
+@EnableCircuitBreaker
+@SpringBootApplication
+@ServletComponentScan("com.github.wxiaoqi.security.admin.config.druid")
+//@EnableRedisHttpSession
+public class AdminBootstrap {
+    public static void main(String[] args) {
+        new SpringApplicationBuilder(AdminBootstrap.class).web(true).run(args);    }
+}
diff --git a/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/config/HystrixConfig.java b/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/config/HystrixConfig.java
deleted file mode 100644
index 6ab9fa100978c759375e2e05b0f446e36d31240c..0000000000000000000000000000000000000000
--- a/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/config/HystrixConfig.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.github.wxiaoqi.security.admin.config;
-
-/**
- * ${DESCRIPTION}
- *
- * @author wanghaobin
- * @create 2017-06-01 8:12
- */
-
-import org.springframework.boot.context.embedded.ServletRegistrationBean;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-import com.netflix.hystrix.contrib.metrics.eventstream.HystrixMetricsStreamServlet;
-
-//@Configuration
-public class HystrixConfig {
-
-//    @Bean
-    public HystrixMetricsStreamServlet hystrixMetricsStreamServlet(){
-        return new HystrixMetricsStreamServlet();
-    }
-
-//    @Bean
-    public ServletRegistrationBean registration(HystrixMetricsStreamServlet servlet){
-        ServletRegistrationBean registrationBean = new ServletRegistrationBean();
-        registrationBean.setServlet(servlet);
-        registrationBean.setEnabled(true);//是否启用该registrationBean
-        registrationBean.addUrlMappings("/hystrix.stream");
-        return registrationBean;
-    }
-}
diff --git a/pom.xml b/pom.xml
index ecaf4babc59dbb5a46f2aa0e8956c0f0c113260e..40f1f5ed859c57a86708d06ee38e5face2ed57fb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,67 +1,67 @@
-<?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>
-
-    <groupId>com.github.wxiaoqi</groupId>
-    <artifactId>ace-security</artifactId>
-    <version>1.0-SNAPSHOT</version>
-    <url>https://github.com/wxiaoqi/ace-security</url>
-    <licenses>
-        <license>
-            <name>Apache 2</name>
-            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-            <distribution>repo</distribution>
-            <comments>A business-friendly OSS license</comments>
-        </license>
-    </licenses>
-    <parent>
-        <groupId>org.springframework.boot</groupId>
-        <artifactId>spring-boot-starter-parent</artifactId>
-        <version>1.4.2.RELEASE</version>
-    </parent>
-    <properties>
-        <docker.image.prefix>ag</docker.image.prefix>
-        <docker.plugin.version>0.4.13</docker.plugin.version>
-    </properties>
-    <modules>
-        <module>ace-admin</module>
-        <module>ace-center</module>
-        <module>ace-api</module>
-        <module>ace-monitor</module>
-        <module>ace-gate</module>
-        <module>ace-ui</module>
-        <module>ace-common</module>
-        <module>ace-blog-parent</module>
-        <module>ace-config</module>
-    </modules>
-    <packaging>pom</packaging>
-    <developers>
-        <developer>
-            <name>ace</name>
-            <email>463540703@qq.com</email>
-        </developer>
-    </developers>
-    <dependencies>
-        <!-- https://mvnrepository.com/artifact/org.projectlombok/lombok -->
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <version>1.16.14</version>
-            <scope>provided</scope>
-        </dependency>
-    </dependencies>
-    <!--依赖管理，用于管理spring-cloud的依赖，其中Camden.SR3是版本号-->
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.springframework.cloud</groupId>
-                <artifactId>spring-cloud-dependencies</artifactId>
-                <version>Camden.SR3</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
+<?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>
+
+    <groupId>com.github.wxiaoqi</groupId>
+    <artifactId>ace-security</artifactId>
+    <version>1.0-SNAPSHOT</version>
+    <url>https://github.com/wxiaoqi/ace-security</url>
+    <licenses>
+        <license>
+            <name>Apache 2</name>
+            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+            <distribution>repo</distribution>
+            <comments>A business-friendly OSS license</comments>
+        </license>
+    </licenses>
+    <parent>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-parent</artifactId>
+        <version>1.5.4.RELEASE</version>
+    </parent>
+    <properties>
+        <docker.image.prefix>ag</docker.image.prefix>
+        <docker.plugin.version>0.4.13</docker.plugin.version>
+    </properties>
+    <modules>
+        <module>ace-admin</module>
+        <module>ace-center</module>
+        <module>ace-api</module>
+        <module>ace-monitor</module>
+        <module>ace-gate</module>
+        <module>ace-ui</module>
+        <module>ace-common</module>
+        <module>ace-blog-parent</module>
+        <module>ace-config</module>
+    </modules>
+    <packaging>pom</packaging>
+    <developers>
+        <developer>
+            <name>ace</name>
+            <email>463540703@qq.com</email>
+        </developer>
+    </developers>
+    <dependencies>
+        <!-- https://mvnrepository.com/artifact/org.projectlombok/lombok -->
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>1.16.14</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+    <!--依赖管理，用于管理spring-cloud的依赖，其中Dalston.SR1是版本号-->
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.springframework.cloud</groupId>
+                <artifactId>spring-cloud-dependencies</artifactId>
+                <version>Dalston.SR1</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
 </project>
\ No newline at end of file