diff --git a/.gitignore b/.gitignore
index f335e1ca490d430c6660db6d83d955dc5c47f8dc..a8d15f2780185d80c4ff0a848f2d9bbd516bb926 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,6 @@
 # Created by .ignore support plugin (hsz.mobi)
 .idea/
-*.iml
\ No newline at end of file
+*.iml
+target/
+out/
+*.log
\ No newline at end of file
diff --git a/bigfans-cloud-api-gateway/pom.xml b/bigfans-cloud-api-gateway/pom.xml
index 61c1bd9b4d028a8087f9857dc577cd1b9f0e9117..5f6b59411187e69af98fdf01e21800611b7a6a3e 100644
--- a/bigfans-cloud-api-gateway/pom.xml
+++ b/bigfans-cloud-api-gateway/pom.xml
@@ -17,11 +17,11 @@
 	<dependencies>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-starter-zuul</artifactId>
+			<artifactId>spring-cloud-starter-gateway</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-starter-eureka</artifactId>
+			<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
 		</dependency>
 		<!--
 		<dependency>
diff --git a/bigfans-cloud-api-gateway/src/main/java/org/bigfans/cloud/api/gateway/GatewayApplication.java b/bigfans-cloud-api-gateway/src/main/java/org/bigfans/cloud/api/gateway/GatewayApplication.java
index 4518f07a6ab3c2f55cd5a5a7c718286e397ef3d3..fec019f7f2788a582475a10b24b1fad3e49fc046 100644
--- a/bigfans-cloud-api-gateway/src/main/java/org/bigfans/cloud/api/gateway/GatewayApplication.java
+++ b/bigfans-cloud-api-gateway/src/main/java/org/bigfans/cloud/api/gateway/GatewayApplication.java
@@ -2,13 +2,11 @@ package org.bigfans.cloud.api.gateway;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.cloud.netflix.zuul.EnableZuulProxy;
 
 /**
  * Hello world!
  *
  */
-@EnableZuulProxy
 @SpringBootApplication
 public class GatewayApplication 
 {
diff --git a/bigfans-cloud-api-gateway/src/main/java/org/bigfans/cloud/api/gateway/config/FiltersConfig.java b/bigfans-cloud-api-gateway/src/main/java/org/bigfans/cloud/api/gateway/config/FiltersConfig.java
deleted file mode 100644
index 0ee3cad6b0379ab666aae674d339722ea1137f7b..0000000000000000000000000000000000000000
--- a/bigfans-cloud-api-gateway/src/main/java/org/bigfans/cloud/api/gateway/config/FiltersConfig.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package org.bigfans.cloud.api.gateway.config;
-
-import org.bigfans.cloud.api.gateway.filter.AccessFilter;
-import org.bigfans.cloud.api.gateway.filter.ErrorHandleFilter;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-@Configuration
-public class FiltersConfig {
-
-	@Bean
-	public AccessFilter accessFilter() {
-		return new AccessFilter();
-	}
-
-	@Bean
-	public ErrorHandleFilter errorHandleFilter(){
-		return new ErrorHandleFilter();
-	}
-
-}
diff --git a/bigfans-cloud-api-gateway/src/main/java/org/bigfans/cloud/api/gateway/config/ResourceServerConfig.java b/bigfans-cloud-api-gateway/src/main/java/org/bigfans/cloud/api/gateway/config/ResourceServerConfig.java
deleted file mode 100644
index aedc699d1a3c4e8366fa7ac0bd2bb4e5a9d08519..0000000000000000000000000000000000000000
--- a/bigfans-cloud-api-gateway/src/main/java/org/bigfans/cloud/api/gateway/config/ResourceServerConfig.java
+++ /dev/null
@@ -1,32 +0,0 @@
-//package org.bigfans.cloud.api.gateway.config;
-//
-//import org.springframework.context.annotation.Configuration;
-//import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-//import org.springframework.security.oauth2.config.annotation.web.configuration.EnableResourceServer;
-//import org.springframework.security.oauth2.config.annotation.web.configuration.ResourceServerConfigurerAdapter;
-//import org.springframework.security.oauth2.config.annotation.web.configurers.ResourceServerSecurityConfigurer;
-//
-////@EnableResourceServer
-////@Configuration
-//public class ResourceServerConfig extends ResourceServerConfigurerAdapter {
-//
-//	@Override
-//	public void configure(ResourceServerSecurityConfigurer resources) throws Exception {
-//		super.configure(resources);
-//	}
-//
-//	@Override
-//	public void configure(HttpSecurity http) throws Exception {
-//		http
-//        .authorizeRequests()
-//        .antMatchers("/user-service/**").hasAuthority("AUTHORITY_SUPER")
-//        .antMatchers("/addresse-service/**").hasAuthority("AUTHORITY_SUPER")
-//        .antMatchers("/point-service/**").hasAuthority("AUTHORITY_SUPER")
-//        .antMatchers("/itemservice-service/**").hasAuthority("AUTHORITY_SUPER")
-//        .antMatchers("/order-service/**").hasAuthority("AUTHORITY_SUPER")
-//        .antMatchers("/payment-service/**").hasAuthority("AUTHORITY_SUPER")
-//        .antMatchers("/deliveriy-service/**").hasAuthority("AUTHORITY_SUPER")
-//        .anyRequest().authenticated();
-//	}
-//
-//}
diff --git a/bigfans-cloud-api-gateway/src/main/java/org/bigfans/cloud/api/gateway/config/RouteConfig.java b/bigfans-cloud-api-gateway/src/main/java/org/bigfans/cloud/api/gateway/config/RouteConfig.java
new file mode 100644
index 0000000000000000000000000000000000000000..4103fa94a8d0d7847066c805ed691096f02d2d2a
--- /dev/null
+++ b/bigfans-cloud-api-gateway/src/main/java/org/bigfans/cloud/api/gateway/config/RouteConfig.java
@@ -0,0 +1,23 @@
+package org.bigfans.cloud.api.gateway.config;
+
+import org.springframework.cloud.gateway.route.RouteLocator;
+import org.springframework.cloud.gateway.route.builder.RouteLocatorBuilder;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * @author lichong
+ * @create 2018-07-29 下午7:46
+ **/
+@Configuration
+public class RouteConfig {
+
+    public RouteLocator customRouteLocator(RouteLocatorBuilder builder) {
+        return builder.routes()
+                .route(t -> t.path("/hello")
+                        .and()
+                        .uri("http://localhost:8080"))
+                .build();
+    }
+
+}
diff --git a/bigfans-cloud-api-gateway/src/main/java/org/bigfans/cloud/api/gateway/config/SecurityConfig.java b/bigfans-cloud-api-gateway/src/main/java/org/bigfans/cloud/api/gateway/config/SecurityConfig.java
deleted file mode 100644
index 16f84d2e67829f54aeb4a2061b0fc890c68341d8..0000000000000000000000000000000000000000
--- a/bigfans-cloud-api-gateway/src/main/java/org/bigfans/cloud/api/gateway/config/SecurityConfig.java
+++ /dev/null
@@ -1,36 +0,0 @@
-//package org.bigfans.cloud.api.gateway.config;
-//
-//import org.springframework.boot.autoconfigure.security.oauth2.client.EnableOAuth2Sso;
-//import org.springframework.context.annotation.Configuration;
-//import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
-//import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-//import org.springframework.security.config.annotation.web.builders.WebSecurity;
-//import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
-//import org.springframework.security.web.authentication.preauth.AbstractPreAuthenticatedProcessingFilter;
-//import org.springframework.security.web.csrf.CsrfFilter;
-//
-//@Configuration
-//@EnableOAuth2Sso
-//public class SecurityConfig extends WebSecurityConfigurerAdapter{
-//
-//	@Override
-//	protected void configure(HttpSecurity http) throws Exception {
-//		http.authorizeRequests().antMatchers("/sso/**", "/login").permitAll().anyRequest().authenticated()
-//        .and()
-//        .csrf().disable()
-//        .logout().permitAll()
-//        .logoutSuccessUrl("/");
-//	}
-//
-//	@Override
-//	protected void configure(AuthenticationManagerBuilder auth) throws Exception {
-//		// TODO Auto-generated method stub
-//		super.configure(auth);
-//	}
-//
-//	@Override
-//	public void configure(WebSecurity web) throws Exception {
-//		// TODO Auto-generated method stub
-//		super.configure(web);
-//	}
-//}
diff --git a/bigfans-cloud-api-gateway/src/main/java/org/bigfans/cloud/api/gateway/filter/AccessFilter.java b/bigfans-cloud-api-gateway/src/main/java/org/bigfans/cloud/api/gateway/filter/AccessFilter.java
index 1e6711f8aa7f78b1191dae0a2185c62504e4aa91..ebba3c2abb9a87ac5a1acca8f97e42da0aad7fbb 100644
--- a/bigfans-cloud-api-gateway/src/main/java/org/bigfans/cloud/api/gateway/filter/AccessFilter.java
+++ b/bigfans-cloud-api-gateway/src/main/java/org/bigfans/cloud/api/gateway/filter/AccessFilter.java
@@ -2,53 +2,53 @@ package org.bigfans.cloud.api.gateway.filter;
 
 import com.bigfans.Constants;
 import com.bigfans.framework.CurrentUser;
-import com.bigfans.framework.CurrentUserFactory;
 import com.bigfans.framework.utils.JsonUtils;
 import com.bigfans.framework.utils.JwtUtils;
 import com.bigfans.framework.utils.StringHelper;
-import com.netflix.zuul.ZuulFilter;
-import com.netflix.zuul.context.RequestContext;
-import org.springframework.cloud.netflix.zuul.filters.support.FilterConstants;
+import org.springframework.cloud.gateway.filter.GatewayFilterChain;
+import org.springframework.cloud.gateway.filter.GlobalFilter;
+import org.springframework.core.Ordered;
+import org.springframework.http.HttpCookie;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.ResponseCookie;
+import org.springframework.http.server.reactive.ServerHttpRequest;
+import org.springframework.http.server.reactive.ServerHttpResponse;
+import org.springframework.stereotype.Component;
+import org.springframework.web.server.ServerWebExchange;
+import reactor.core.publisher.Mono;
 
 import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import java.util.Date;
+import java.util.Map;
+import java.util.UUID;
 
 /**
- * 检查用户是否登录
- *
  * @author lichong
- */
-public class AccessFilter extends ZuulFilter {
+ * @create 2018-07-31 下午9:53
+ **/
+@Component
+public class AccessFilter implements GlobalFilter, Ordered {
 
     @Override
-    public boolean shouldFilter() {
-        RequestContext ctx = RequestContext.getCurrentContext();
-        String method = ctx.getRequest().getMethod();
-        String url = (String) ctx.get(FilterConstants.REQUEST_URI_KEY);
-        String serviceId = (String) ctx.get(FilterConstants.PROXY_KEY);
-        return !"options".equalsIgnoreCase(method.toLowerCase()) && !url.equals("/login");
-    }
-
-    @Override
-    public Object run() {
-        RequestContext ctx = RequestContext.getCurrentContext();
-        HttpServletRequest request = ctx.getRequest();
-        String authorization = request.getHeader(Constants.OAUTH.HEADER_KEY_NAME);
+    public Mono<Void> filter(ServerWebExchange exchange, GatewayFilterChain chain) {
+        ServerHttpRequest request = exchange.getRequest();
+        ServerHttpResponse response = exchange.getResponse();
+        HttpMethod method = request.getMethod();
+        String path = request.getPath().value();
+        if(path.contains("/login")){
+            return chain.filter(exchange);
+        }
+        String authorization = this.extractAuthorization(request.getHeaders());
         String token = "";
         boolean hasAuth = false;
+        Map<String, HttpCookie> cookies = request.getCookies().toSingleValueMap();
         if (authorization == null) {
-            Cookie[] cookies = request.getCookies();
             if (cookies != null) {
-                for (Cookie cookie : cookies) {
-                    if (cookie.getName().equals(Constants.TOKEN.TMP_COOKIE_NAME)) {
-                        String tmpToken = cookie.getValue();
-                        if (tmpToken != null) {
-                            hasAuth = true;
-                            token = tmpToken;
-                        }
-                    }
+                String tmpToken = this.extraTempToken(cookies);
+                if (tmpToken != null) {
+                    hasAuth = true;
+                    token = tmpToken;
                 }
             }
         } else {
@@ -58,56 +58,52 @@ public class AccessFilter extends ZuulFilter {
                     token = authorization.substring(7, authorization.length());
                     if (StringHelper.isNotEmpty(token)) {
                         hasAuth = true;
-                        Cookie[] cookies = request.getCookies();
-                        if (cookies != null) {
-                            for (Cookie cookie : cookies) {
-                                if (cookie.getName().equals(Constants.TOKEN.TMP_COOKIE_NAME)) {
-                                    cookie.setMaxAge(0);
-                                    cookie.setPath("/");
-                                }
-                            }
-                        }
+                        cookies.remove(Constants.TOKEN.TMP_COOKIE_NAME);
                     }
                 }
             }
         }
         if (!hasAuth) {
-            token = this.createTempToken(request, ctx.getResponse());
-            Cookie cookie = new Cookie(Constants.TOKEN.TMP_COOKIE_NAME, token);
-            cookie.setHttpOnly(false);
-            // 如果不设置路径,只有当前路径和自路径可以访问,访问其他地址时候cookie不会被传递到服务端
-            cookie.setPath("/");
-            cookie.setDomain("localhost");
-            // 设置7天内有效
-            cookie.setMaxAge(60 * 60 * 24 * 7);
-            // 浏览器退出时清空cookie
-            // cookie.setMaxAge(-1);
-            ctx.getResponse().addCookie(cookie);
+            token = this.createTempToken(UUID.randomUUID().toString());
+            ResponseCookie responseCookie = ResponseCookie
+                    .from(Constants.TOKEN.TMP_COOKIE_NAME, token)
+                    .maxAge(60 * 60 * 24 * 7)
+                    .domain("localhost")
+                    .path("/")
+                    .httpOnly(false)
+                    .build();
+            response.addCookie(responseCookie);
         }
-        ctx.addZuulRequestHeader(Constants.TOKEN.HEADER_KEY_NAME, token);
-        return null;
+        ServerHttpRequest requestWithToken = exchange.getRequest().mutate()
+                .header(Constants.TOKEN.HEADER_KEY_NAME, token)
+                .build();
+        return chain.filter(exchange.mutate().request(requestWithToken).build());
+    }
+
+
+
+    protected String extractAuthorization(HttpHeaders headers){
+        return headers.get(Constants.OAUTH.HEADER_KEY_NAME) == null ? null : headers.get(Constants.OAUTH.HEADER_KEY_NAME).get(0);
     }
 
-    protected String createTempToken(HttpServletRequest request, HttpServletResponse response) {
+    protected String extraTempToken(Map<String, HttpCookie> cookies){
+        return cookies.get(Constants.TOKEN.TMP_COOKIE_NAME) == null ? null : cookies.get(Constants.TOKEN.TMP_COOKIE_NAME).getValue();
+    }
+
+    @Override
+    public int getOrder() {
+        return 0;
+    }
+
+    protected String createTempToken(String uid) {
         CurrentUser currentUser = new CurrentUser();
         currentUser.setAccount("tempUser");
         currentUser.setLoginTime(new Date());
         currentUser.setPeriod(60 * 60 * 24 * 7);
         currentUser.setType(CurrentUser.TYPE.TMP_USER);
-        currentUser.setUid(request.getSession().getId());
+        currentUser.setUid(uid);
         // 创建临时的token作为用户唯一凭证
         String tempToken = JwtUtils.create(JsonUtils.toJsonString(currentUser), Constants.TOKEN.JWT_SECURITY_KEY);
         return tempToken;
     }
-
-    @Override
-    public String filterType() {
-        return FilterConstants.ROUTE_TYPE;
-    }
-
-    @Override
-    public int filterOrder() {
-        return 0;
-    }
-
 }
diff --git a/bigfans-cloud-api-gateway/src/main/java/org/bigfans/cloud/api/gateway/filter/ErrorHandleFilter.java b/bigfans-cloud-api-gateway/src/main/java/org/bigfans/cloud/api/gateway/filter/ErrorHandleFilter.java
deleted file mode 100644
index 20020f128fc176d5759f3bd2842601690d894b68..0000000000000000000000000000000000000000
--- a/bigfans-cloud-api-gateway/src/main/java/org/bigfans/cloud/api/gateway/filter/ErrorHandleFilter.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package org.bigfans.cloud.api.gateway.filter;
-
-import com.netflix.zuul.ZuulFilter;
-import com.netflix.zuul.context.RequestContext;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.cloud.netflix.zuul.filters.support.FilterConstants;
-
-import javax.servlet.http.HttpServletResponse;
-
-/**
- * @author lichong
- * @create 2018-04-25 下午9:39
- **/
-public class ErrorHandleFilter extends ZuulFilter {
-
-    private Logger logger = LoggerFactory.getLogger(ErrorHandleFilter.class);
-
-    @Override
-    public String filterType() {
-        return FilterConstants.ERROR_TYPE;
-    }
-
-    @Override
-    public int filterOrder() {
-        return 0;
-    }
-
-    @Override
-    public boolean shouldFilter() {
-        return true;
-    }
-
-    @Override
-    public Object run() {
-        RequestContext ctx = RequestContext.getCurrentContext();
-        Throwable throwable = ctx.getThrowable();
-        logger.error("this is a ErrorFilter :" + throwable.getCause().getMessage(), throwable);
-        ctx.set("error.status_code", HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
-        ctx.set("error.exception", throwable.getCause());
-        return null;
-    }
-}
diff --git a/bigfans-cloud-api-gateway/src/main/resources/application.yml b/bigfans-cloud-api-gateway/src/main/resources/application.yml
index 5cd6b5fd53203241ed3dc81ae24c0400876d9b20..baeccd4177cee0e083916c008301792786de1077 100644
--- a/bigfans-cloud-api-gateway/src/main/resources/application.yml
+++ b/bigfans-cloud-api-gateway/src/main/resources/application.yml
@@ -3,6 +3,77 @@ server:
 spring:
   application:
     name: bigfans-api-gateway
+  cloud:
+    gateway:
+      discovery:
+        locator: true
+      routes:
+      - id: catalog-service
+        uri: lb://catalog-service
+        predicates:
+        - Path=/api/catalog-service/**
+        filters:
+        - StripPrefix=2
+      - id: cart-service
+        uri: lb://cart-service
+        predicates:
+        - Path=/api/cart-service/**
+        filters:
+        - StripPrefix=2
+      - id: order-service
+        uri: lb://order-service
+        predicates:
+        - Path=/api/order-service/**
+        filters:
+        - StripPrefix=2
+      - id: payment-service
+        uri: lb://payment-service
+        predicates:
+        - Path= /api/payment-service/**
+        filters:
+        - StripPrefix=2
+      - id: notification-service
+        uri: lb://notification-service
+        predicates:
+        - Path=/api/notification-service/**
+        filters:
+        - StripPrefix=2
+      - id: pricing-service
+        uri: lb://pricing-service
+        predicates:
+        - Path=/api/pricing-service/**
+        filters:
+        - StripPrefix=2
+      - id: review-service
+        uri: lb://review-service
+        predicates:
+        - Path=/api/review-service/**
+        filters:
+        - StripPrefix=2
+      - id: search-service
+        uri: lb://search-service
+        predicates:
+        - Path=/api/search-service/**
+        filters:
+        - StripPrefix=2
+      - id: shipping-service
+        uri: lb://shipping-service
+        predicates:
+        - Path=/api/shipping-service/**
+        filters:
+        - StripPrefix=2
+      - id: user-service
+        uri: lb://user-service
+        predicates:
+        - Path=/api/user-service/**
+        filters:
+        - StripPrefix=2
+      - id: system-service
+        uri: lb://system-service
+        predicates:
+        - Path=/api/system-service/**
+        filters:
+        - StripPrefix=2
 eureka:
   client:
     registerWithEureka: true #是否注册到服务中心
@@ -11,59 +82,59 @@ eureka:
       defaultZone: http://localhost:8761/eureka/
   instance:
     prefer-ip-address: true
-zuul:
-  max:
-    host:
-      connections: 500
-  host:
-    socket-timeout-millis: 60000
-    connect-timeout-millis: 60000
-  prefix: /api   #前缀, 这样请求url需要为/api/core-service才会匹配到/core-service
-  routes:
-    catalog-service:
-      path: /catalog-service/**
-      service-id: catalog-service
-      sensitiveHeaders: Cookie,Set-Cookie
-    cart-service:
-      path: /cart-service/**
-      service-id: cart-service
-      sensitiveHeaders: Cookie,Set-Cookie
-    order-service:
-      path: /order-service/**
-      service-id: order-service
-      sensitiveHeaders: Cookie,Set-Cookie
-    payment-service:
-      path: /payment-service/**
-      service-id: payment-service
-      sensitiveHeaders: Cookie,Set-Cookie
-    notification-service:
-      path: /notification-service/**
-      service-id: notification-service
-      sensitiveHeaders: Cookie,Set-Cookie
-    pricing-service:
-      path: /pricing-service/**
-      service-id: pricing-service
-      sensitiveHeaders: Cookie,Set-Cookie
-    review-service:
-      path: /review-service/**
-      service-id: review-service
-      sensitiveHeaders: Cookie,Set-Cookie
-    search-service:
-      path: /search-service/**
-      service-id: search-service
-      sensitiveHeaders: Cookie,Set-Cookie
-    shipping-service:
-      path: /shipping-service/**
-      service-id: shipping-service
-      sensitiveHeaders: Cookie,Set-Cookie
-    user-service:
-      path: /user-service/**
-      service-id: user-service
-      sensitiveHeaders: Cookie,Set-Cookie
-    system-service:
-      path: /system-service/**
-      service-id: system-service
-      sensitiveHeaders: Cookie,Set-Cookie
+#zuul:
+#  max:
+#    host:
+#      connections: 500
+#  host:
+#    socket-timeout-millis: 60000
+#    connect-timeout-millis: 60000
+#  prefix: /api   #前缀, 这样请求url需要为/api/core-service才会匹配到/core-service
+#  routes:
+#    catalog-service:
+#      path: /catalog-service/**
+#      service-id: catalog-service
+#      sensitiveHeaders: Cookie,Set-Cookie
+#    cart-service:
+#      path: /cart-service/**
+#      service-id: cart-service
+#      sensitiveHeaders: Cookie,Set-Cookie
+#    order-service:
+#      path: /order-service/**
+#      service-id: order-service
+#      sensitiveHeaders: Cookie,Set-Cookie
+#    payment-service:
+#      path: /payment-service/**
+#      service-id: payment-service
+#      sensitiveHeaders: Cookie,Set-Cookie
+#    notification-service:
+#      path: /notification-service/**
+#      service-id: notification-service
+#      sensitiveHeaders: Cookie,Set-Cookie
+#    pricing-service:
+#      path: /pricing-service/**
+#      service-id: pricing-service
+#      sensitiveHeaders: Cookie,Set-Cookie
+#    review-service:
+#      path: /review-service/**
+#      service-id: review-service
+#      sensitiveHeaders: Cookie,Set-Cookie
+#    search-service:
+#      path: /search-service/**
+#      service-id: search-service
+#      sensitiveHeaders: Cookie,Set-Cookie
+#    shipping-service:
+#      path: /shipping-service/**
+#      service-id: shipping-service
+#      sensitiveHeaders: Cookie,Set-Cookie
+#    user-service:
+#      path: /user-service/**
+#      service-id: user-service
+#      sensitiveHeaders: Cookie,Set-Cookie
+#    system-service:
+#      path: /system-service/**
+#      service-id: system-service
+#      sensitiveHeaders: Cookie,Set-Cookie
 #security:
 #  basic:
 #    enabled: false
diff --git a/bigfans-cloud-api-gateway/src/main/resources/application_zuul.yml b/bigfans-cloud-api-gateway/src/main/resources/application_zuul.yml
new file mode 100644
index 0000000000000000000000000000000000000000..5cd6b5fd53203241ed3dc81ae24c0400876d9b20
--- /dev/null
+++ b/bigfans-cloud-api-gateway/src/main/resources/application_zuul.yml
@@ -0,0 +1,95 @@
+server:
+  port: 8080
+spring:
+  application:
+    name: bigfans-api-gateway
+eureka:
+  client:
+    registerWithEureka: true #是否注册到服务中心
+    fetchRegistry: true  #是否拉取服务注册信息
+    serviceUrl:
+      defaultZone: http://localhost:8761/eureka/
+  instance:
+    prefer-ip-address: true
+zuul:
+  max:
+    host:
+      connections: 500
+  host:
+    socket-timeout-millis: 60000
+    connect-timeout-millis: 60000
+  prefix: /api   #前缀, 这样请求url需要为/api/core-service才会匹配到/core-service
+  routes:
+    catalog-service:
+      path: /catalog-service/**
+      service-id: catalog-service
+      sensitiveHeaders: Cookie,Set-Cookie
+    cart-service:
+      path: /cart-service/**
+      service-id: cart-service
+      sensitiveHeaders: Cookie,Set-Cookie
+    order-service:
+      path: /order-service/**
+      service-id: order-service
+      sensitiveHeaders: Cookie,Set-Cookie
+    payment-service:
+      path: /payment-service/**
+      service-id: payment-service
+      sensitiveHeaders: Cookie,Set-Cookie
+    notification-service:
+      path: /notification-service/**
+      service-id: notification-service
+      sensitiveHeaders: Cookie,Set-Cookie
+    pricing-service:
+      path: /pricing-service/**
+      service-id: pricing-service
+      sensitiveHeaders: Cookie,Set-Cookie
+    review-service:
+      path: /review-service/**
+      service-id: review-service
+      sensitiveHeaders: Cookie,Set-Cookie
+    search-service:
+      path: /search-service/**
+      service-id: search-service
+      sensitiveHeaders: Cookie,Set-Cookie
+    shipping-service:
+      path: /shipping-service/**
+      service-id: shipping-service
+      sensitiveHeaders: Cookie,Set-Cookie
+    user-service:
+      path: /user-service/**
+      service-id: user-service
+      sensitiveHeaders: Cookie,Set-Cookie
+    system-service:
+      path: /system-service/**
+      service-id: system-service
+      sensitiveHeaders: Cookie,Set-Cookie
+#security:
+#  basic:
+#    enabled: false
+#  ignored:
+#  - /sso/oauth/token/**
+#  oauth2:
+#    client:
+#      clientId: bigfans
+#      clientSecret: bigfans
+#      accessTokenUri: http://localhost:8010/sso/oauth/token # 通过authentication_code获取token的地址
+#      userAuthorizationUri: http://localhost:8010/sso/oauth/authorize #用于返回authentication_code的地址
+#    resource:
+#      #userInfoUri: http://localhost:8010/sso/me
+#      token-info-uri: http://localhost:8010/sso/oauth/check_token
+#logging:
+#  level:
+#    com.netflix : debug
+hystrix:
+  command:
+    default:
+      execution:
+        timeout:
+          enabled: true
+        isolation:
+          thread:
+            timeoutInMilliseconds: 60000
+ribbon:
+  ReadTimeout: 60000
+  ConnectTimeout: 60000
diff --git a/bigfans-cloud-base/pom.xml b/bigfans-cloud-base/pom.xml
index 80e92eeef3fd06a6f6d5147e811b164b4f69dc24..cd22ca4b05782d39a0248a6bace7b031d4155fe7 100644
--- a/bigfans-cloud-base/pom.xml
+++ b/bigfans-cloud-base/pom.xml
@@ -18,11 +18,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-starter-feign</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-starter-eureka</artifactId>
+			<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.projectlombok</groupId>
@@ -34,4 +30,32 @@
 			<version>0.0.1-SNAPSHOT</version>
 		</dependency>
 	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>3.7.0</version>
+				<configuration>
+					<source>${java.version}</source>
+					<target>${java.version}</target>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-maven-plugin</artifactId>
+				<executions>
+					<execution>
+						<goals>
+							<goal>repackage</goal>
+						</goals>
+						<configuration>
+							<classifier>exec</classifier>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
 </project>
diff --git a/bigfans-cloud-discovery-eureka/pom.xml b/bigfans-cloud-discovery-eureka/pom.xml
index f63ddb0ac87550c78449554ee38ff52e571b352b..d5a205af6229bdc0cbf045a44e775a87d5c254cf 100644
--- a/bigfans-cloud-discovery-eureka/pom.xml
+++ b/bigfans-cloud-discovery-eureka/pom.xml
@@ -18,7 +18,7 @@
 	<dependencies>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-starter-eureka-server</artifactId>
+			<artifactId>spring-cloud-starter-netflix-eureka-server</artifactId>
 		</dependency>
 	</dependencies>
 	<build>
diff --git a/bigfans-cloud-service-cart/pom.xml b/bigfans-cloud-service-cart/pom.xml
index f823c546274921cfcdb20ff272fc0a2e17696ad1..706ee32308bc95c110683f71eae8c894152007a4 100644
--- a/bigfans-cloud-service-cart/pom.xml
+++ b/bigfans-cloud-service-cart/pom.xml
@@ -17,13 +17,17 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
     <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-hystrix</artifactId>
+            <artifactId>spring-cloud-starter-netflix-hystrix</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-eureka</artifactId>
+            <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
@@ -72,10 +76,5 @@
                 </exclusion>
             </exclusions>
         </dependency>
-        <dependency>
-            <groupId>bigfans-cloud</groupId>
-            <artifactId>bigfans-cloud-base</artifactId>
-            <version>0.0.1-SNAPSHOT</version>
-        </dependency>
     </dependencies>
 </project>
diff --git a/bigfans-cloud-service-cart/src/main/java/com/bigfans/cartservice/CartServiceApp.java b/bigfans-cloud-service-cart/src/main/java/com/bigfans/cartservice/CartServiceApp.java
index 52085fff4ec3dc4dc9cd3224e8b6e736507868fc..c3e2bc563ac87b3cc8a1826a3ecd3e82abc6262b 100644
--- a/bigfans-cloud-service-cart/src/main/java/com/bigfans/cartservice/CartServiceApp.java
+++ b/bigfans-cloud-service-cart/src/main/java/com/bigfans/cartservice/CartServiceApp.java
@@ -1,9 +1,5 @@
 package com.bigfans.cartservice;
 
-import com.bigfans.Constants;
-import com.bigfans.cartservice.api.auth.CartServiceFunctionalUser;
-import com.bigfans.framework.CurrentUser;
-import com.bigfans.framework.CurrentUserFactory;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.client.circuitbreaker.EnableCircuitBreaker;
diff --git a/bigfans-cloud-service-catalog/pom.xml b/bigfans-cloud-service-catalog/pom.xml
index 526867e6cd2d5deb690eebc128ffdcb4b2ec3532..760a68619023f1dd8c2869af399dc7b121220315 100644
--- a/bigfans-cloud-service-catalog/pom.xml
+++ b/bigfans-cloud-service-catalog/pom.xml
@@ -15,13 +15,17 @@
     </properties>
     <dependencies>
         <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>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-eureka</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-hystrix</artifactId>
diff --git a/bigfans-cloud-service-catalog/src/main/java/com/bigfans/catalogservice/CatalogServiceApp.java b/bigfans-cloud-service-catalog/src/main/java/com/bigfans/catalogservice/CatalogServiceApp.java
index a71890c7cbb1f501b03073d7404afe7236fcd795..4204c19c3075c2d600c961bccc5437c47b429bb7 100644
--- a/bigfans-cloud-service-catalog/src/main/java/com/bigfans/catalogservice/CatalogServiceApp.java
+++ b/bigfans-cloud-service-catalog/src/main/java/com/bigfans/catalogservice/CatalogServiceApp.java
@@ -5,7 +5,6 @@ import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
-import org.springframework.cloud.netflix.feign.EnableFeignClients;
 
 /**
  * Hello world!
diff --git a/bigfans-cloud-service-catalog/src/main/java/com/bigfans/catalogservice/api/SkuApi.java b/bigfans-cloud-service-catalog/src/main/java/com/bigfans/catalogservice/api/SkuApi.java
index 798077931555f52fb69597636b556fdd8ea4b4a0..592e72333b888cdcf481d73b75d881b8ff6f4d36 100644
--- a/bigfans-cloud-service-catalog/src/main/java/com/bigfans/catalogservice/api/SkuApi.java
+++ b/bigfans-cloud-service-catalog/src/main/java/com/bigfans/catalogservice/api/SkuApi.java
@@ -1,15 +1,17 @@
 package com.bigfans.catalogservice.api;
 
 import com.bigfans.catalogservice.model.*;
+import com.bigfans.catalogservice.model.entity.SpecOptionEntity;
+import com.bigfans.catalogservice.model.vo.SpecGroupVO;
+import com.bigfans.catalogservice.model.vo.SpecOptionVO;
+import com.bigfans.catalogservice.model.vo.SpecValueVO;
 import com.bigfans.catalogservice.service.product.ProductService;
 import com.bigfans.catalogservice.service.sku.SkuService;
-import com.bigfans.catalogservice.service.sku.StockLogService;
 import com.bigfans.catalogservice.service.sku.StockService;
 import com.bigfans.catalogservice.service.spec.SpecOptionService;
 import com.bigfans.catalogservice.service.spec.SpecService;
 import com.bigfans.catalogservice.service.spec.SpecValueService;
-import com.bigfans.framework.Applications;
-import com.bigfans.framework.CurrentUser;
+import com.bigfans.framework.utils.CollectionUtils;
 import com.bigfans.framework.web.RestResponse;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -38,162 +40,69 @@ public class SkuApi {
     @Autowired
     private StockService stockService;
 
-
     @GetMapping("/sku/{prodId}")
     public RestResponse getSku(@PathVariable(value = "prodId") String prodId) throws Exception {
-        SkuResult result = new SkuResult();
-        SKU selectedSku = skuService.getByPid(prodId);
-        if (selectedSku == null) {
-            return RestResponse.ok();
-        }
-        List<SKU> skuList = skuService.listByPgId(selectedSku.getPgId());
-        if (skuList == null) {
+        // 1. 获取当前商品组下所有sku
+        List<SKU> skuList = skuService.listByProdId(prodId);
+        if(CollectionUtils.isEmpty(skuList)){
             return RestResponse.ok();
         }
-        Map<String , SKU> skuMap = skuList.stream().collect(Collectors.toMap(SKU::getSkuKey , Function.identity()));
-        // 1. 保存所有的sku字符串
-        Set<String> pgSkuVals = new HashSet<>();
-        Map<String, Set<String>> optValsMap = new HashMap<>();
-        for (SKU sku : skuList) {
-            Map<String, String> optValMap = sku.getSkuMap();
-            pgSkuVals.add(sku.getValKey());
-            for (Map.Entry<String, String> entry : optValMap.entrySet()) {
-                if (optValsMap.containsKey(entry.getKey())) {
-                    optValsMap.get(entry.getKey()).add(entry.getValue());
+        SKU selectedSku = skuList.stream().filter(sku -> prodId.equals(sku.getProdId())).findFirst().get();
+        // 保存每个选项下面的所有可选值
+        Map<String , Set<String>> allOptValMaps = new HashMap<>();
+        List<String> optionIdList = new ArrayList<>();
+        List<String> valueIdList = new ArrayList<>();
+        skuList.forEach((sku) -> {
+            Map<String , String> skuMap = sku.getSkuMap();
+            for (Map.Entry<String, String> entry : skuMap.entrySet()) {
+                if (allOptValMaps.containsKey(entry.getKey())) {
+                    allOptValMaps.get(entry.getKey()).add(entry.getValue());
                 } else {
                     Set<String> vals = new HashSet<>();
                     vals.add(entry.getValue());
-                    optValsMap.put(entry.getKey(), vals);
+                    allOptValMaps.put(entry.getKey(), vals);
+                    optionIdList.add(entry.getKey());
                 }
+                optionIdList.add(entry.getValue());
             }
-        }
-        // 2. 根据当前选中的sku属性,确定出所有可选的sku组合
-        Set<String> combinedValKeys = new HashSet<>();
-        Map<String, String> selectedSkuMap = selectedSku.getSkuMap();
-        for (Map.Entry<String, String> entry : selectedSkuMap.entrySet()) {
+        });
 
-            // 取出当前pg中所有商品中的sku属性,和当前选中商品属性依次组合,产生可选的商品sku组合
-            List<List<String>> skus = new ArrayList<>();
-            for (Map.Entry<String, String> interEntry : selectedSkuMap.entrySet()) {
-                if (entry.getKey().equals(interEntry.getKey())) {
-                    skus.add(new ArrayList<>(optValsMap.get(interEntry.getKey())));
-                    continue;
-                }
-                // 保证sku的顺序
-                List<String> clonedKey = new ArrayList<>();
-                clonedKey.add(interEntry.getValue());
-                skus.add(clonedKey);
-            }
+        List<SpecOption> specOptionList = specOptionService.listByIdList(optionIdList);
+        List<SpecValue> specValueList = specValueService.listByIdList(valueIdList);
+        Map<String , String> specOptionNameMap = specOptionList.stream().collect(Collectors.toMap(SpecOption::getId , SpecOption::getName));
+        Map<String , String> specValueNameMap = specValueList.stream().collect(Collectors.toMap(SpecValue::getId , SpecValue::getValue));
 
-            combinedValKeys.addAll(this.combine(skus));
-        }
-
-        // 3. 确定可以disable的valId
-        List<String> valToDisable = new ArrayList<>();
-        List<String> valToEnable = new ArrayList<>();
-        List<String> outOfStock = new ArrayList<>();
-        for (String valKey : combinedValKeys) {
-            boolean disable = false;
-            boolean oos = false;
-            if (pgSkuVals.contains(valKey)) {
-                Stock stock = stockService.getBySkuValKey(valKey);
-                // 如果没有库存,添加到不可选列表
-                if (stock == null || stock.getRest() <= 0) {
-                    oos = true;
-                }
-            } else {
-                disable = true;
-            }
-            String[] optValPairs = valKey.split(";");
-            for (String optValPair : optValPairs) {
-                if (disable) {
-                    valToDisable.add(optValPair);
-                } else if (oos) {
-                    outOfStock.add(optValPair);
+        // 根据当前选中的商品计算出所有可选sku组合
+        Map<String, String> selectedSkuMap = selectedSku.getSkuMap();
+        List<SpecGroupVO> groupVOList = new ArrayList<>();
+        for(Map.Entry<String , String> entry : selectedSkuMap.entrySet()){
+            String selectedOpt = entry.getKey();
+            String selectedVal = entry.getValue();
+            SpecGroupVO group = new SpecGroupVO();
+            group.setOption(specOptionNameMap.get(selectedOpt));
+
+            Set<String> allValues = allOptValMaps.get(selectedOpt);
+            for (String val : allValues) {
+                Map<String , String> currentSkuMap = new HashMap<>(selectedSkuMap);
+                currentSkuMap.put(selectedOpt , val);
+                SKU availableSku = skuList.stream().filter((item) -> item.skuMapEquals(currentSkuMap)).findFirst().orElse(null);
+                SpecValueVO valueVO = new SpecValueVO();
+                valueVO.setValue(specValueNameMap.get(val));
+                valueVO.setSelected(val.equals(selectedVal));
+                if(availableSku != null){
+                    valueVO.setSelectable(true);
+                    valueVO.setOutOfStock(availableSku.outOfStock());
+                    valueVO.setProdId(availableSku.getProdId());
                 } else {
-                    valToEnable.add(optValPair);
-                }
-            }
-        }
-        // 4. 确定最终的不可选valId
-        Set<String> disabledValIdList = new HashSet<>();
-        Set<String> outOfStockList = new HashSet<>();
-        // 4.1 不可点的valId
-        for (String valD : valToDisable) {
-            if (valToEnable.contains(valD)) {
-                continue;
-            }
-            disabledValIdList.add(valD);
-        }
-
-        // 4.2 缺货的valId
-        for (String valD : outOfStock) {
-            if (valToEnable.contains(valD)) {
-                continue;
-            }
-            outOfStockList.add(valD);
-        }
-
-        // 5. 创建返回结果
-        List<SpecGroup> specGroups = new ArrayList<>();
-        for (Map.Entry<String, Set<String>> entry : optValsMap.entrySet()) {
-            String optId = entry.getKey();
-            Set<String> valIds = entry.getValue();
-            SpecOption specOption = specOptionService.load(optId);
-            List<ProductSpec> productSpecs = new ArrayList<>();
-            for (String valId : valIds) {
-                List<String> selectedVals = selectedSku.getValIdList();
-
-                boolean selectable = true;
-                boolean selected = false;
-                boolean oos = false;
-                if (disabledValIdList.contains(valId)) {
-                    selectable = false;
+                    valueVO.setSelectable(false);
                 }
-                if(outOfStockList.contains(valId)){
-                    oos = true;
-                }
-                if (selectedVals.contains(valId)) {
-                    selected = true;
-                }
-
-                Map<String, String> currentSkuMap = new HashMap<>(selectedSku.getSkuMap());
-                currentSkuMap.put(optId , valId);
-                StringBuilder skuKey = new StringBuilder(32);
-                for(Map.Entry<String , String> currentSkuEntry : currentSkuMap.entrySet()){
-                    skuKey.append(currentSkuEntry.getKey());
-                    skuKey.append(SKU.SKU_SEPARATOR);
-                    skuKey.append(currentSkuEntry.getValue());
-                    skuKey.append(SKU.KEYS_SEPARATOR);
-                }
-                skuKey.deleteCharAt(skuKey.length()-1);
-                skuKey.trimToSize();
-                SKU currentSku = skuMap.get(skuKey.toString());
-                SpecValue specValue = specValueService.load(valId);
-                ProductSpec productSpec = new ProductSpec();
-                if(currentSku != null){
-                    productSpec.setProdId(currentSku.getProdId());
-                }
-                productSpec.setOptionId(optId);
-                productSpec.setOption(specOption.getName());
-                productSpec.setValueId(specValue.getId());
-                productSpec.setValue(specValue.getValue());
-                productSpec.setOutOfStock(oos);
-                productSpec.setSelectable(selectable);
-                productSpec.setSelected(selected);
-                productSpecs.add(productSpec);
+                group.addValue(valueVO);
             }
-            SpecGroup group = new SpecGroup();
-            group.setOption(specOption);
-            group.setValues(productSpecs);
-            specGroups.add(group);
+            groupVOList.add(group);
         }
 
-        result.setDisabledValIdList(disabledValIdList);
-        result.setSelectedSku(selectedSku);
-        result.setSkuMap(optValsMap);
-        result.setSpecGroups(specGroups);
-
+        SkuResult result = new SkuResult();
+        result.setSpecGroups(groupVOList);
         return RestResponse.ok(result);
     }
 
diff --git a/bigfans-cloud-service-catalog/src/main/java/com/bigfans/catalogservice/dao/SkuDAO.java b/bigfans-cloud-service-catalog/src/main/java/com/bigfans/catalogservice/dao/SkuDAO.java
index 63e03b526c46f64e8bbe35e40b009385cff67e0b..ef6ccc2eab1a67a05a444040338910927f35465e 100644
--- a/bigfans-cloud-service-catalog/src/main/java/com/bigfans/catalogservice/dao/SkuDAO.java
+++ b/bigfans-cloud-service-catalog/src/main/java/com/bigfans/catalogservice/dao/SkuDAO.java
@@ -15,6 +15,8 @@ public interface SkuDAO extends BaseDAO<SKU> {
 
 	List<SKU> listByPgId(String pgId);
 
+	List<SKU> listByProdId(String prodId);
+
 	SKU getByValKey(String valKey);
 
 	SKU getByPid(String prodId);
diff --git a/bigfans-cloud-service-catalog/src/main/java/com/bigfans/catalogservice/dao/SpecOptionDAO.java b/bigfans-cloud-service-catalog/src/main/java/com/bigfans/catalogservice/dao/SpecOptionDAO.java
index e4bd3ed57d86134d69f519c40c7532397e2b50c2..803a385d7f09bfb722161ef3174bb4dacaae2299 100644
--- a/bigfans-cloud-service-catalog/src/main/java/com/bigfans/catalogservice/dao/SpecOptionDAO.java
+++ b/bigfans-cloud-service-catalog/src/main/java/com/bigfans/catalogservice/dao/SpecOptionDAO.java
@@ -42,6 +42,9 @@ public interface SpecOptionDAO extends BaseDAO<SpecOption>{
 	 */
 	List<SpecOption> listByPid(String pid, Long start, Long pagesize);
 
+
+	List<SpecOption> listByIdList(List<String> idList);
+
 	/**
 	 * 查询商品下的所有的规格项
 	 * @param pid
diff --git a/bigfans-cloud-service-catalog/src/main/java/com/bigfans/catalogservice/dao/SpecValueDAO.java b/bigfans-cloud-service-catalog/src/main/java/com/bigfans/catalogservice/dao/SpecValueDAO.java
index 6a5ffe02c1a7f9bbd09c26968ef356ed91d66945..ef2ba1807c8fc3b8955ad1a48de60c510546d9ee 100644
--- a/bigfans-cloud-service-catalog/src/main/java/com/bigfans/catalogservice/dao/SpecValueDAO.java
+++ b/bigfans-cloud-service-catalog/src/main/java/com/bigfans/catalogservice/dao/SpecValueDAO.java
@@ -14,7 +14,7 @@ import java.util.List;
  */
 public interface SpecValueDAO extends BaseDAO<SpecValue>{
 	
-	List<SpecValue> listById(String[] idList);
+	List<SpecValue> listByIdList(List<String> idList);
 	
 	List<SpecValue> listByOptionId(String optionId);
 
diff --git a/bigfans-cloud-service-catalog/src/main/java/com/bigfans/catalogservice/dao/impl/SkuDAOImpl.java b/bigfans-cloud-service-catalog/src/main/java/com/bigfans/catalogservice/dao/impl/SkuDAOImpl.java
index 40f0c4c978a1d0b97ff17f20b6ef5110b807340b..a913691aee94b75254538eff7c3655ab01f97e8e 100644
--- a/bigfans-cloud-service-catalog/src/main/java/com/bigfans/catalogservice/dao/impl/SkuDAOImpl.java
+++ b/bigfans-cloud-service-catalog/src/main/java/com/bigfans/catalogservice/dao/impl/SkuDAOImpl.java
@@ -32,6 +32,12 @@ public class SkuDAOImpl extends MybatisDAOImpl<SKU> implements SkuDAO {
 		return getSqlSession().selectList(className +".list", params);
 	}
 
+	public List<SKU> listByProdId(String prodId) {
+		ParameterMap params = new ParameterMap();
+		params.put("prodId", prodId);
+		return getSqlSession().selectList(className +".list", params);
+	}
+
 	@Override
 	@Cacheable
 	public SKU getByValKey(String valKey) {
diff --git a/bigfans-cloud-service-catalog/src/main/java/com/bigfans/catalogservice/dao/impl/SpecOptionDAOImpl.java b/bigfans-cloud-service-catalog/src/main/java/com/bigfans/catalogservice/dao/impl/SpecOptionDAOImpl.java
index 8485e6dba62c408fe6f3821114af1a9c84eb76d5..88e42d45143e82118af320813a51ca355d5fa77c 100644
--- a/bigfans-cloud-service-catalog/src/main/java/com/bigfans/catalogservice/dao/impl/SpecOptionDAOImpl.java
+++ b/bigfans-cloud-service-catalog/src/main/java/com/bigfans/catalogservice/dao/impl/SpecOptionDAOImpl.java
@@ -49,6 +49,13 @@ public class SpecOptionDAOImpl extends MybatisDAOImpl<SpecOption> implements Spe
 		return getSqlSession().selectList(className + ".list", params);
 	}
 
+	@Override
+	public List<SpecOption> listByIdList(List<String> idList) {
+		ParameterMap params = new ParameterMap();
+		params.put("idList", idList);
+		return getSqlSession().selectList(className + ".list", params);
+	}
+
 	@Override
 	public List<SpecOption> list(String catId, String pgId, String pid, Long start, Long pagesize) {
 		ParameterMap params = new ParameterMap(start , pagesize);
diff --git a/bigfans-cloud-service-catalog/src/main/java/com/bigfans/catalogservice/dao/impl/SpecValueDAOImpl.java b/bigfans-cloud-service-catalog/src/main/java/com/bigfans/catalogservice/dao/impl/SpecValueDAOImpl.java
index 6920baab94d1e14e37a5f566bf69159f1dbaa67d..5831a1ee6bab7a7784888f349a34c2793fd9bbc9 100644
--- a/bigfans-cloud-service-catalog/src/main/java/com/bigfans/catalogservice/dao/impl/SpecValueDAOImpl.java
+++ b/bigfans-cloud-service-catalog/src/main/java/com/bigfans/catalogservice/dao/impl/SpecValueDAOImpl.java
@@ -21,7 +21,7 @@ public class SpecValueDAOImpl extends MybatisDAOImpl<SpecValue> implements SpecV
 	public static final String BEAN_NAME = "specValueDAO";
 
 	@Override
-	public List<SpecValue> listById(String[] idList) {
+	public List<SpecValue> listByIdList(List<String> idList) {
 		ParameterMap params = new ParameterMap();
 		params.put("idList", idList);
 		return getSqlSession().selectList(className + ".list", params);
diff --git a/bigfans-cloud-service-catalog/src/main/java/com/bigfans/catalogservice/model/SKU.java b/bigfans-cloud-service-catalog/src/main/java/com/bigfans/catalogservice/model/SKU.java
index 5b75ddccfdfb6430bd5ce0ce92981983b5956f5a..4695fa8a849c79cfbe610cb49a050c62f397e305 100644
--- a/bigfans-cloud-service-catalog/src/main/java/com/bigfans/catalogservice/model/SKU.java
+++ b/bigfans-cloud-service-catalog/src/main/java/com/bigfans/catalogservice/model/SKU.java
@@ -21,7 +21,8 @@ public class SKU extends SKUEntity {
 	
 	public static final String KEYS_SEPARATOR = ";";
 	public static final String SKU_SEPARATOR = ":";
-	
+
+	private Integer stock;
 	private Map<String , String> skuMap;
 	private List<String> optIdList;
 	private List<String> valIdList;
@@ -32,6 +33,24 @@ public class SKU extends SKUEntity {
 		}
 		return skuMap.get(optId);
 	}
+
+	public boolean skuMapEquals(Map<String , String> targetMap){
+		if(this.skuMap == null){
+			this.parseSkuMap();
+		}
+		boolean eq = false;
+		if(targetMap.size() != this.skuMap.size()){
+			return eq;
+		}
+		eq = true;
+		for (Map.Entry<String , String> entry: this.skuMap.entrySet()) {
+			if(!targetMap.get(entry.getKey()).equals(entry.getValue())){
+				eq = false;
+				break;
+			}
+		}
+		return eq;
+	}
 	
 	public void parseSkuMap(){
 		if(skuMap != null){
@@ -68,4 +87,16 @@ public class SKU extends SKUEntity {
 		parseSkuMap();
 		return valIdList;
 	}
+
+	public Integer getStock() {
+		return stock;
+	}
+
+	public void setStock(Integer stock) {
+		this.stock = stock;
+	}
+
+	public boolean outOfStock(){
+		return this.stock == null || this.stock == 0;
+	}
 }
diff --git a/bigfans-cloud-service-catalog/src/main/java/com/bigfans/catalogservice/model/SkuResult.java b/bigfans-cloud-service-catalog/src/main/java/com/bigfans/catalogservice/model/SkuResult.java
index 669bad9d5e88691586b3de59606ee3d5f5f71ea5..e7f04c7ee4bab059f215df007c0d8e2f4a73a305 100644
--- a/bigfans-cloud-service-catalog/src/main/java/com/bigfans/catalogservice/model/SkuResult.java
+++ b/bigfans-cloud-service-catalog/src/main/java/com/bigfans/catalogservice/model/SkuResult.java
@@ -1,5 +1,6 @@
 package com.bigfans.catalogservice.model;
 
+import com.bigfans.catalogservice.model.vo.SpecGroupVO;
 import com.bigfans.framework.utils.CollectionUtils;
 import lombok.Data;
 
@@ -22,7 +23,7 @@ public class SkuResult implements Serializable {
 	private Map<String, Set<String>> skuMap;
 	private SKU selectedSku;
 	private Set<String> disabledValIdList;
-	private List<SpecGroup> specGroups;
+	private List<SpecGroupVO> specGroups;
 	
 	public Boolean getHasSku() {
 		return CollectionUtils.isNotEmpty(skuMap);
diff --git a/bigfans-cloud-service-catalog/src/main/java/com/bigfans/catalogservice/model/SpecGroup.java b/bigfans-cloud-service-catalog/src/main/java/com/bigfans/catalogservice/model/SpecGroup.java
deleted file mode 100644
index 4f23e53813f86329828173b96e71bc3fd4e226ad..0000000000000000000000000000000000000000
--- a/bigfans-cloud-service-catalog/src/main/java/com/bigfans/catalogservice/model/SpecGroup.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.bigfans.catalogservice.model;
-
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.List;
-
-/**
- * 商品规格组,封装商品规格项->规格值
- * 
- * @author lichong
- *
- */
-@Data
-public class SpecGroup implements Serializable{
-
-	private static final long serialVersionUID = 7399149219218538867L;
-	
-	private SpecOption option;
-	private List<ProductSpec> values;
-
-}
diff --git a/bigfans-cloud-service-catalog/src/main/java/com/bigfans/catalogservice/model/vo/SpecGroupVO.java b/bigfans-cloud-service-catalog/src/main/java/com/bigfans/catalogservice/model/vo/SpecGroupVO.java
new file mode 100644
index 0000000000000000000000000000000000000000..941d7179c7769d554874878f90bcd891fe235e32
--- /dev/null
+++ b/bigfans-cloud-service-catalog/src/main/java/com/bigfans/catalogservice/model/vo/SpecGroupVO.java
@@ -0,0 +1,29 @@
+package com.bigfans.catalogservice.model.vo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 商品规格组,封装商品规格项->规格值
+ * 
+ * @author lichong
+ *
+ */
+@Data
+public class SpecGroupVO implements Serializable{
+
+	private static final long serialVersionUID = 7399149219218538867L;
+	
+	protected String option;
+	protected List<SpecValueVO> values;
+
+	public void addValue(SpecValueVO valueVO){
+		if(this.values == null){
+			this.values = new ArrayList<>();
+		}
+		this.values.add(valueVO);
+	}
+}
diff --git a/bigfans-cloud-service-catalog/src/main/java/com/bigfans/catalogservice/model/vo/SpecOptionVO.java b/bigfans-cloud-service-catalog/src/main/java/com/bigfans/catalogservice/model/vo/SpecOptionVO.java
new file mode 100644
index 0000000000000000000000000000000000000000..572b31147eb5a0e25135444b6a88df5d492ad1ca
--- /dev/null
+++ b/bigfans-cloud-service-catalog/src/main/java/com/bigfans/catalogservice/model/vo/SpecOptionVO.java
@@ -0,0 +1,18 @@
+package com.bigfans.catalogservice.model.vo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author lichong
+ * @create 2018-07-28 下午1:32
+ **/
+@Data
+public class SpecOptionVO implements Serializable {
+
+    private static final long serialVersionUID = 1;
+
+    private String id;
+    private String name;
+}
diff --git a/bigfans-cloud-service-catalog/src/main/java/com/bigfans/catalogservice/model/vo/SpecValueVO.java b/bigfans-cloud-service-catalog/src/main/java/com/bigfans/catalogservice/model/vo/SpecValueVO.java
new file mode 100644
index 0000000000000000000000000000000000000000..ece8a1ead5b6898b5fb4d8dc8f5b0dc4e2ed2859
--- /dev/null
+++ b/bigfans-cloud-service-catalog/src/main/java/com/bigfans/catalogservice/model/vo/SpecValueVO.java
@@ -0,0 +1,22 @@
+package com.bigfans.catalogservice.model.vo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author lichong
+ * @create 2018-07-28 下午1:33
+ **/
+@Data
+public class SpecValueVO implements Serializable {
+
+    private static final long serialVersionUID = 1;
+
+    protected Boolean selected;
+    protected Boolean selectable;
+    protected Boolean outOfStock;
+    protected String value;
+    protected String prodId;
+
+}
diff --git a/bigfans-cloud-service-catalog/src/main/java/com/bigfans/catalogservice/service/sku/SkuService.java b/bigfans-cloud-service-catalog/src/main/java/com/bigfans/catalogservice/service/sku/SkuService.java
index 618a171fa0cdcf80fe8c15659b7325644e5cf75d..efbfe3fbe79fccdbedbb94160b54cefe8c3da494 100644
--- a/bigfans-cloud-service-catalog/src/main/java/com/bigfans/catalogservice/service/sku/SkuService.java
+++ b/bigfans-cloud-service-catalog/src/main/java/com/bigfans/catalogservice/service/sku/SkuService.java
@@ -18,5 +18,7 @@ public interface SkuService extends BaseService<SKU> {
 	SKU getByValKey(String valKey) throws Exception;
 	
 	List<SKU> listByPgId(String pgId) throws Exception;
+
+	List<SKU> listByProdId(String prodId) throws Exception;
 	
 }
diff --git a/bigfans-cloud-service-catalog/src/main/java/com/bigfans/catalogservice/service/sku/SkuServiceImpl.java b/bigfans-cloud-service-catalog/src/main/java/com/bigfans/catalogservice/service/sku/SkuServiceImpl.java
index b74d1f2838ed50cc5fa8816c32b6b6d9740a23fe..5f8aad621bf5a3507744b58e6c2974ee9e2ce80c 100644
--- a/bigfans-cloud-service-catalog/src/main/java/com/bigfans/catalogservice/service/sku/SkuServiceImpl.java
+++ b/bigfans-cloud-service-catalog/src/main/java/com/bigfans/catalogservice/service/sku/SkuServiceImpl.java
@@ -69,6 +69,12 @@ public class SkuServiceImpl extends BaseServiceImpl<SKU> implements SkuService {
         return skudao.listByPgId(pgId);
     }
 
+    @Override
+    @Transactional(readOnly = true)
+    public List<SKU> listByProdId(String prodId) throws Exception {
+        return skudao.listByProdId(prodId);
+    }
+
     @Override
     @Transactional(readOnly = true)
     public SKU getByValKey(String valKey) throws Exception {
diff --git a/bigfans-cloud-service-catalog/src/main/java/com/bigfans/catalogservice/service/spec/SpecOptionService.java b/bigfans-cloud-service-catalog/src/main/java/com/bigfans/catalogservice/service/spec/SpecOptionService.java
index 2b32324d85e1276748bb4727c79f810f77291854..26ffc1d48a95b73f07474097af7af06bd1f7e3ab 100644
--- a/bigfans-cloud-service-catalog/src/main/java/com/bigfans/catalogservice/service/spec/SpecOptionService.java
+++ b/bigfans-cloud-service-catalog/src/main/java/com/bigfans/catalogservice/service/spec/SpecOptionService.java
@@ -39,5 +39,7 @@ public interface SpecOptionService extends BaseService<SpecOption> {
 	List<SpecOption> listByCatId(String catId, Long start , Long pagesize) throws Exception;
 
 	List<SpecOption> list(String catId , String pgId ,String pid ,  Long start , Long pagesize) throws Exception;
+
+	List<SpecOption> listByIdList(List<String> idList) throws Exception;
 	
 }
diff --git a/bigfans-cloud-service-catalog/src/main/java/com/bigfans/catalogservice/service/spec/SpecOptionServiceImpl.java b/bigfans-cloud-service-catalog/src/main/java/com/bigfans/catalogservice/service/spec/SpecOptionServiceImpl.java
index b802cf8bbf218bc783dc30927e9fbaead5c399ae..38872b31c4eb5645921efdd32f5f785aef5067f4 100644
--- a/bigfans-cloud-service-catalog/src/main/java/com/bigfans/catalogservice/service/spec/SpecOptionServiceImpl.java
+++ b/bigfans-cloud-service-catalog/src/main/java/com/bigfans/catalogservice/service/spec/SpecOptionServiceImpl.java
@@ -103,4 +103,9 @@ public class SpecOptionServiceImpl extends BaseServiceImpl<SpecOption> implement
 		return specOptionDAO.list(catId , pgId ,pid , start , pagesize);
 	}
 
+	@Override
+	public List<SpecOption> listByIdList(List<String> idList) throws Exception {
+		return specOptionDAO.listByIdList(idList);
+	}
+
 }
diff --git a/bigfans-cloud-service-catalog/src/main/java/com/bigfans/catalogservice/service/spec/SpecValueService.java b/bigfans-cloud-service-catalog/src/main/java/com/bigfans/catalogservice/service/spec/SpecValueService.java
index f72a068cf1e931d0b7bbb70bf79a392793bd5ad1..fad4933520689ddf084b9bc9430ab24ab3d93b4e 100644
--- a/bigfans-cloud-service-catalog/src/main/java/com/bigfans/catalogservice/service/spec/SpecValueService.java
+++ b/bigfans-cloud-service-catalog/src/main/java/com/bigfans/catalogservice/service/spec/SpecValueService.java
@@ -14,7 +14,7 @@ import java.util.List;
  */
 public interface SpecValueService extends BaseService<SpecValue> {
 	
-	List<SpecValue> listById(String[] ids) throws Exception;
+	List<SpecValue> listByIdList(List<String> idList) throws Exception;
 	
 	List<SpecValue> listByOptionId(String optionId) throws Exception;
 
diff --git a/bigfans-cloud-service-catalog/src/main/java/com/bigfans/catalogservice/service/spec/SpecValueServiceImpl.java b/bigfans-cloud-service-catalog/src/main/java/com/bigfans/catalogservice/service/spec/SpecValueServiceImpl.java
index 6676be43296b515a6dd33571ed42f2b173208d0a..4f33bcb12a7a128aa8b969ba39fa51ee815edb2f 100644
--- a/bigfans-cloud-service-catalog/src/main/java/com/bigfans/catalogservice/service/spec/SpecValueServiceImpl.java
+++ b/bigfans-cloud-service-catalog/src/main/java/com/bigfans/catalogservice/service/spec/SpecValueServiceImpl.java
@@ -33,8 +33,8 @@ public class SpecValueServiceImpl extends BaseServiceImpl<SpecValue> implements
 	@Override
 	@Cacheable
 	@Transactional(readOnly = true)
-	public List<SpecValue> listById(String[] ids) throws Exception{
-		return specValueDAO.listById(ids);
+	public List<SpecValue> listByIdList(List<String> idList) throws Exception{
+		return specValueDAO.listByIdList(idList);
 	}
 	
 	@Override
diff --git a/bigfans-cloud-service-catalog/src/main/resources/mybatis/mapper/Sku-Mapper.xml b/bigfans-cloud-service-catalog/src/main/resources/mybatis/mapper/Sku-Mapper.xml
index 8a20fc2bd07606ca5c4d44b1df0ac03febb0b5b9..ab7d3b95be9859e06977c4d1883d35a6b2267354 100644
--- a/bigfans-cloud-service-catalog/src/main/resources/mybatis/mapper/Sku-Mapper.xml
+++ b/bigfans-cloud-service-catalog/src/main/resources/mybatis/mapper/Sku-Mapper.xml
@@ -39,15 +39,19 @@
 	<select id="list" parameterType="map" resultType="SKU">
 		select
 			<include refid="basic_columns"/>
+		,stock.rest as stock
 		from
 			SKU sku
+		LEFT JOIN Stock stock on (sku.prod_id = stock.prod_id)
 		<where>
-			deleted = 0
+			sku.deleted = 0
 			<if test="pgId !=null and pgId != '' ">
 				AND sku.pg_id = #{pgId}
 			</if>
-			<if test="pid !=null and pid != '' ">
-				AND sku.prod_id = #{pid}
+			<if test="prodId !=null and prodId != '' ">
+				AND sku.pg_id = (
+					select pg_id from Product prod where prod.id = #{prodId}
+				)
 			</if>
 		</where>
 	</select>
diff --git a/bigfans-cloud-service-catalog/src/main/resources/mybatis/mapper/SpecOption-Mapper.xml b/bigfans-cloud-service-catalog/src/main/resources/mybatis/mapper/SpecOption-Mapper.xml
index db66637de12687fb144ae26c26ec1fa35684a5d5..db411e2fd4da4241f29d71ad980c02c83f1a1a4e 100644
--- a/bigfans-cloud-service-catalog/src/main/resources/mybatis/mapper/SpecOption-Mapper.xml
+++ b/bigfans-cloud-service-catalog/src/main/resources/mybatis/mapper/SpecOption-Mapper.xml
@@ -47,6 +47,12 @@
 					#{categoryId}
 				</foreach>
 			</if>
+			<if test="idList != null and idList.size > 0">
+				AND so.id in
+				<foreach collection="idList" item="id" open="(" close=")" separator=",">
+					#{id}
+				</foreach>
+			</if>
 		</where>
 		order by so.update_date desc , so.order_num asc
 	</select>
diff --git a/bigfans-cloud-service-catalog/src/main/resources/mybatis/mapper/SpecValue-Mapper.xml b/bigfans-cloud-service-catalog/src/main/resources/mybatis/mapper/SpecValue-Mapper.xml
index 7a98dde44ffb8e487bb7bb8740b7b1046f212773..368c2ca478403db357f02a08c5716bbe5c7e0309 100644
--- a/bigfans-cloud-service-catalog/src/main/resources/mybatis/mapper/SpecValue-Mapper.xml
+++ b/bigfans-cloud-service-catalog/src/main/resources/mybatis/mapper/SpecValue-Mapper.xml
@@ -39,7 +39,7 @@
 			SpecValue sv
 		<where>
 			deleted = 0
-			<if test="idList !=null"> 
+			<if test="idList !=null and idList.size > 0">
 				AND sv.id in 
 				<foreach collection="idList" item="id" separator="," open="(" close=")">
 					#{id}
diff --git a/bigfans-cloud-service-notification/pom.xml b/bigfans-cloud-service-notification/pom.xml
index df26248dd8db41358f21be27bed7cddc0b7acc88..36184b41708194b01bd20aa7899c02a732c0dc5e 100644
--- a/bigfans-cloud-service-notification/pom.xml
+++ b/bigfans-cloud-service-notification/pom.xml
@@ -17,7 +17,11 @@
     <dependencies>
         <dependency>
             <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-eureka</artifactId>
+            <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
diff --git a/bigfans-cloud-service-order/pom.xml b/bigfans-cloud-service-order/pom.xml
index b0262c9fc8076680da27c1bdde693359faeb1a93..b9bfe515ff921b8b51d7fa675bcf6b161146075b 100644
--- a/bigfans-cloud-service-order/pom.xml
+++ b/bigfans-cloud-service-order/pom.xml
@@ -19,15 +19,19 @@
     <dependencies>
         <dependency>
             <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-eureka</artifactId>
+            <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-netflix-hystrix</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-actuator</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-hystrix</artifactId>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
         <!--
         <dependency>
diff --git a/bigfans-cloud-service-order/src/main/java/com/bigfans/orderservice/OrderServiceApp.java b/bigfans-cloud-service-order/src/main/java/com/bigfans/orderservice/OrderServiceApp.java
index 6d6914449effc34a9a7ff4424cbecd03a3b6a7c5..285e231bd5a1816811029e531e50ca0d1701cc0d 100644
--- a/bigfans-cloud-service-order/src/main/java/com/bigfans/orderservice/OrderServiceApp.java
+++ b/bigfans-cloud-service-order/src/main/java/com/bigfans/orderservice/OrderServiceApp.java
@@ -1,9 +1,5 @@
 package com.bigfans.orderservice;
 
-import com.bigfans.Constants;
-import com.bigfans.framework.CurrentUser;
-import com.bigfans.framework.CurrentUserFactory;
-import com.bigfans.orderservice.api.auth.OrderServiceFunctionalUser;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
diff --git a/bigfans-cloud-service-payment/pom.xml b/bigfans-cloud-service-payment/pom.xml
index e3abfa173424a6a5d4b8c868e955e1d4e9edc7cd..189b76dab84f81634e0d82879c79a8eec65bdeea 100644
--- a/bigfans-cloud-service-payment/pom.xml
+++ b/bigfans-cloud-service-payment/pom.xml
@@ -19,15 +19,15 @@
     <dependencies>
         <dependency>
             <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-feign</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-actuator</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-actuator</artifactId>
+            <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -38,6 +38,12 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
+        <!--
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-all</artifactId>
+        </dependency>
+        -->
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
@@ -55,6 +61,18 @@
             <groupId>org.apache.kafka</groupId>
             <artifactId>kafka_2.12</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.alipay.sdk</groupId>
+            <artifactId>sdk-java20161213173952</artifactId>
+            <scope>system</scope>
+            <systemPath>${project.basedir}/lib/alipay-sdk-java20161213173952.jar</systemPath>
+        </dependency>
+        <dependency>
+            <groupId>org.alipay.sdk</groupId>
+            <artifactId>sdk-20161215</artifactId>
+            <scope>system</scope>
+            <systemPath>${project.basedir}/lib/alipay-trade-sdk-20161215.jar</systemPath>
+        </dependency>
         <dependency>
             <groupId>bigfans-cloud</groupId>
             <artifactId>bigfans-cloud-base</artifactId>
diff --git a/bigfans-cloud-service-payment/src/main/java/com/bigfans/paymentservice/PayServiceApp.java b/bigfans-cloud-service-payment/src/main/java/com/bigfans/paymentservice/PayServiceApp.java
index 8ff874c1b624b298012359a693efa622fa0d6417..5f22016e1c55c5dcd59cd62dbdac169d1d54a692 100644
--- a/bigfans-cloud-service-payment/src/main/java/com/bigfans/paymentservice/PayServiceApp.java
+++ b/bigfans-cloud-service-payment/src/main/java/com/bigfans/paymentservice/PayServiceApp.java
@@ -1,9 +1,5 @@
 package com.bigfans.paymentservice;
 
-import com.bigfans.Constants;
-import com.bigfans.framework.CurrentUser;
-import com.bigfans.framework.CurrentUserFactory;
-import com.bigfans.paymentservice.api.auth.PaymentServiceFunctionalUser;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/bigfans-cloud-service-payment/src/main/java/com/bigfans/paymentservice/api/PaymentApi.java b/bigfans-cloud-service-payment/src/main/java/com/bigfans/paymentservice/api/PaymentApi.java
index 1eb5a7ca8a4cb7a5c8cb90908df1b62be25e55d0..197f0e3511fb2108c0d4cc701ab51e2612620c4f 100644
--- a/bigfans-cloud-service-payment/src/main/java/com/bigfans/paymentservice/api/PaymentApi.java
+++ b/bigfans-cloud-service-payment/src/main/java/com/bigfans/paymentservice/api/PaymentApi.java
@@ -47,9 +47,6 @@ public class PaymentApi extends BaseController {
 	@Autowired
 	private OrderServiceClient orderServiceClient;
 
-	@Autowired
-    private SimpMessagingTemplate messagingTemplate;
-
 	@PostMapping("/pay")
 	public RestResponse create(@RequestBody Payment payment) throws Exception{
 		paymentService.create(payment);
diff --git a/bigfans-cloud-service-payment/src/main/java/com/bigfans/paymentservice/config/WebConfig.java b/bigfans-cloud-service-payment/src/main/java/com/bigfans/paymentservice/config/WebConfig.java
index e65ea080cc06fd75d54fc34b32772d9bdc597c21..01f64f75efbadbf914c2261ab73e814b70dbd165 100644
--- a/bigfans-cloud-service-payment/src/main/java/com/bigfans/paymentservice/config/WebConfig.java
+++ b/bigfans-cloud-service-payment/src/main/java/com/bigfans/paymentservice/config/WebConfig.java
@@ -35,7 +35,7 @@ public class WebConfig implements WebMvcConfigurer {
     @Override
     public void addInterceptors(InterceptorRegistry registry) {
         registry.addInterceptor(new DefaultInterceptor()).addPathPatterns("/**");
-        registry.addInterceptor(new LoginInterceptor()).addPathPatterns("/**").excludePathPatterns("/login");
+        registry.addInterceptor(new LoginInterceptor()).addPathPatterns("/**").excludePathPatterns("/login","/static","/images");
     }
 }
 
diff --git a/bigfans-cloud-service-payment/src/main/java/com/bigfans/paymentservice/config/WebSocketConfig.java b/bigfans-cloud-service-payment/src/main/java/com/bigfans/paymentservice/config/WebSocketConfig.java
deleted file mode 100644
index b54ff16b6bfe71979d64ca461cd34910c89ab252..0000000000000000000000000000000000000000
--- a/bigfans-cloud-service-payment/src/main/java/com/bigfans/paymentservice/config/WebSocketConfig.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.bigfans.paymentservice.config;
-
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.socket.config.annotation.AbstractWebSocketMessageBrokerConfigurer;
-import org.springframework.web.socket.config.annotation.EnableWebSocketMessageBroker;
-import org.springframework.web.socket.config.annotation.StompEndpointRegistry;
-
-@Configuration
-@EnableWebSocketMessageBroker
-public class WebSocketConfig extends AbstractWebSocketMessageBrokerConfigurer {
-
-
-
-
-    @Override
-    public void registerStompEndpoints(StompEndpointRegistry stompEndpointRegistry) {
-        stompEndpointRegistry.addEndpoint("/checkPaymentStatus").withSockJS();
-    }
-}
diff --git a/bigfans-cloud-service-pricing/pom.xml b/bigfans-cloud-service-pricing/pom.xml
index 3e0bf1f8b2930d9bab5776d8b60fe8d52b6b3df7..ff397696098d35d71a0d3050bd76bd0e7b12a422 100644
--- a/bigfans-cloud-service-pricing/pom.xml
+++ b/bigfans-cloud-service-pricing/pom.xml
@@ -17,7 +17,11 @@
     <dependencies>
         <dependency>
             <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-eureka</artifactId>
+            <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
diff --git a/bigfans-cloud-service-pricing/src/main/java/com/bigfans/pricingservice/api/mgr/CouponManageApi.java b/bigfans-cloud-service-pricing/src/main/java/com/bigfans/pricingservice/api/mgr/CouponManageApi.java
new file mode 100644
index 0000000000000000000000000000000000000000..33a0cdc7cbc07826d7525c529e863eb34b6c5e38
--- /dev/null
+++ b/bigfans-cloud-service-pricing/src/main/java/com/bigfans/pricingservice/api/mgr/CouponManageApi.java
@@ -0,0 +1,30 @@
+package com.bigfans.pricingservice.api.mgr;
+
+import com.bigfans.framework.annotations.NeedLogin;
+import com.bigfans.framework.web.BaseController;
+import com.bigfans.framework.web.RestResponse;
+import com.bigfans.pricingservice.model.Coupon;
+import com.bigfans.pricingservice.service.CouponService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author lichong
+ * @create 2018-08-04 下午6:10
+ **/
+@RestController("/coupon")
+public class CouponManageApi extends BaseController {
+
+    @Autowired
+    private CouponService couponService;
+
+    @PostMapping("/create")
+    @NeedLogin(roles = "admin")
+    public RestResponse create(@RequestBody Coupon coupon) throws Exception {
+        couponService.create(coupon);
+        return RestResponse.ok();
+    }
+
+}
diff --git a/bigfans-cloud-service-review/pom.xml b/bigfans-cloud-service-review/pom.xml
index 9276031c23b7baa5c23c7e0630ca26908d536e04..469ebabeea11f38fd480b61b491262caf5386f6a 100644
--- a/bigfans-cloud-service-review/pom.xml
+++ b/bigfans-cloud-service-review/pom.xml
@@ -18,12 +18,16 @@
     <dependencies>
         <dependency>
             <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-eureka</artifactId>
+            <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-actuator</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
         <!--
         <dependency>
             <groupId>org.springframework.cloud</groupId>
diff --git a/bigfans-cloud-service-search/pom.xml b/bigfans-cloud-service-search/pom.xml
index 5b47436899930ed3de02a654b021d43a5903addd..d52ce1b7a7733789b1440eee158da8e7a1c4684c 100644
--- a/bigfans-cloud-service-search/pom.xml
+++ b/bigfans-cloud-service-search/pom.xml
@@ -17,7 +17,11 @@
 	<dependencies>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-starter-eureka</artifactId>
+			<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-web</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
diff --git a/bigfans-cloud-service-shipping/pom.xml b/bigfans-cloud-service-shipping/pom.xml
index 83015b6a681ed8d8603bed186e068f547602b641..f893d858baa51eff586d416c39768dfdb8f9cd2c 100644
--- a/bigfans-cloud-service-shipping/pom.xml
+++ b/bigfans-cloud-service-shipping/pom.xml
@@ -2,27 +2,32 @@
 <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>
     <parent>
         <artifactId>bigfans-cloud</artifactId>
         <groupId>bigfans-cloud</groupId>
         <version>0.0.1-SNAPSHOT</version>
     </parent>
+    <modelVersion>4.0.0</modelVersion>
 
     <artifactId>bigfans-cloud-service-shipping</artifactId>
-    <name>bigfans-cloud-service-shipping</name>
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
+
     <dependencies>
         <dependency>
             <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-eureka</artifactId>
+            <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-netflix-hystrix</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-actuator</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
         <!--
         <dependency>
             <groupId>org.springframework.cloud</groupId>
@@ -39,20 +44,9 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.kafka</groupId>
-            <artifactId>kafka_2.12</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.elasticsearch.client</groupId>
-            <artifactId>transport</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.elasticsearch</groupId>
-            <artifactId>elasticsearch</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.elasticsearch.plugin</groupId>
-            <artifactId>transport-netty4-client</artifactId>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>mysql</groupId>
@@ -62,6 +56,14 @@
             <groupId>com.alibaba</groupId>
             <artifactId>druid</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.kafka</groupId>
+            <artifactId>kafka_2.12</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.lmax</groupId>
+            <artifactId>disruptor</artifactId>
+        </dependency>
         <dependency>
             <groupId>bigfans-cloud</groupId>
             <artifactId>bigfans-cloud-base</artifactId>
@@ -72,8 +74,12 @@
                     <artifactId>neo4j-java-driver</artifactId>
                 </exclusion>
                 <exclusion>
-                    <groupId>com.qiniu</groupId>
-                    <artifactId>qiniu-java-sdk</artifactId>
+                    <groupId>org.elasticsearch.client</groupId>
+                    <artifactId>transport</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.belerweb</groupId>
+                    <artifactId>pinyin4j</artifactId>
                 </exclusion>
                 <exclusion>
                     <groupId>net.coobird</groupId>
diff --git a/bigfans-cloud-service-shipping/src/main/java/com/bigfans/shippingservice/config/CORSConfiguration.java b/bigfans-cloud-service-shipping/src/main/java/com/bigfans/shippingservice/config/CORSConfiguration.java
deleted file mode 100644
index d0eaaf664da0052c3cf9c911669f0dad605bba24..0000000000000000000000000000000000000000
--- a/bigfans-cloud-service-shipping/src/main/java/com/bigfans/shippingservice/config/CORSConfiguration.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.bigfans.shippingservice.config;
-
-import org.springframework.boot.web.servlet.FilterRegistrationBean;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.cors.CorsConfiguration;
-import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
-import org.springframework.web.filter.CorsFilter;
-
-@Configuration
-public class CORSConfiguration {
-
-	@Bean
-	public FilterRegistrationBean corsFilter() {
-		UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
-		CorsConfiguration config = new CorsConfiguration();
-		config.setAllowCredentials(true);
-		config.addAllowedOrigin("*");
-		config.addAllowedHeader("*");
-		config.addAllowedMethod("*");
-		source.registerCorsConfiguration("/**", config);
-		FilterRegistrationBean bean = new FilterRegistrationBean(new CorsFilter(source));
-		bean.setOrder(0);
-		return bean;
-	}
-
-}
diff --git a/bigfans-cloud-service-system/pom.xml b/bigfans-cloud-service-system/pom.xml
index 701c266d8eb76fa3d02f790cea76a2dbab25280b..171cd2a59a12be6f13f747f170763e9accb9c68c 100644
--- a/bigfans-cloud-service-system/pom.xml
+++ b/bigfans-cloud-service-system/pom.xml
@@ -17,15 +17,19 @@
     <dependencies>
         <dependency>
             <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-eureka</artifactId>
+            <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-actuator</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-hystrix</artifactId>
+            <artifactId>spring-cloud-starter-netflix-hystrix</artifactId>
         </dependency>
         <!--
         <dependency>
diff --git a/bigfans-cloud-service-user/pom.xml b/bigfans-cloud-service-user/pom.xml
index a904d2305b8be8d9ec4962f806437166877c0c58..1cd6d5dfe944f47783962d999f9b71d0e07f8efb 100644
--- a/bigfans-cloud-service-user/pom.xml
+++ b/bigfans-cloud-service-user/pom.xml
@@ -14,15 +14,15 @@
 	<dependencies>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-starter-feign</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-actuator</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-actuator</artifactId>
+			<artifactId>spring-boot-starter-web</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
diff --git a/bigfans-cloud-service-user/src/main/java/com/bigfans/userservice/api/WeChatApi.java b/bigfans-cloud-service-user/src/main/java/com/bigfans/userservice/api/WeChatApi.java
new file mode 100644
index 0000000000000000000000000000000000000000..36c8e22ca019c065434101e9d2dbd7e9b0148ac7
--- /dev/null
+++ b/bigfans-cloud-service-user/src/main/java/com/bigfans/userservice/api/WeChatApi.java
@@ -0,0 +1,22 @@
+package com.bigfans.userservice.api;
+
+import com.bigfans.framework.web.BaseController;
+import com.bigfans.framework.web.RestResponse;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author lichong
+ * @create 2018-08-04 下午8:45
+ **/
+@RestController("/wechat")
+public class WeChatApi extends BaseController {
+
+    private String appId = "wxb394f3ec882dfc42";
+
+    @GetMapping("/exchangeOpenId")
+    public RestResponse exchangeOpenId(){
+        return RestResponse.ok();
+    }
+
+}
diff --git a/bigfans-cloud-zipkin-server/pom.xml b/bigfans-cloud-zipkin-server/pom.xml
index f643305d2ba6d432ee56d97cca211bee2ee8475a..5e147d3bafccdc19e368b089199484aec669a172 100644
--- a/bigfans-cloud-zipkin-server/pom.xml
+++ b/bigfans-cloud-zipkin-server/pom.xml
@@ -30,7 +30,6 @@
         <dependency>
             <groupId>io.zipkin.java</groupId>
             <artifactId>zipkin-autoconfigure-ui</artifactId>
-            <scope>runtime</scope>
         </dependency>
     </dependencies>
     <build>
diff --git a/bigfans-cloud-zipkin-server/src/main/java/com/bigfans/sleuth/server/ZipkinServerApp.java b/bigfans-cloud-zipkin-server/src/main/java/com/bigfans/sleuth/server/ZipkinServerApp.java
index 70bcc28f9dfe1a4ea4fb06b57ee3fb5798e9cf2c..f6cb08bd62ace9eec48b3c754faba7d78dea3dac 100644
--- a/bigfans-cloud-zipkin-server/src/main/java/com/bigfans/sleuth/server/ZipkinServerApp.java
+++ b/bigfans-cloud-zipkin-server/src/main/java/com/bigfans/sleuth/server/ZipkinServerApp.java
@@ -2,14 +2,12 @@ package com.bigfans.sleuth.server;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import zipkin.server.EnableZipkinServer;
 
 /**
  * @author lichong
  * @create 2018-02-04 下午6:23
  **/
 @SpringBootApplication
-@EnableZipkinServer
 public class ZipkinServerApp {
 
     public static void main(String[] args) throws Exception{
diff --git a/bigfans-framework/src/main/java/com/bigfans/framework/dao/DistributeIDGenerator.java b/bigfans-framework/src/main/java/com/bigfans/framework/dao/DistributeIDGenerator.java
index a9844a34c112c9e9415fbd3fb10d1243c498882f..ddc3f348a269f69e3901832210516dc02a6434a9 100644
--- a/bigfans-framework/src/main/java/com/bigfans/framework/dao/DistributeIDGenerator.java
+++ b/bigfans-framework/src/main/java/com/bigfans/framework/dao/DistributeIDGenerator.java
@@ -28,9 +28,4 @@ public class DistributeIDGenerator implements IDGenerator {
 		return null;
 	}
 	
-	public static void main(String[] args) {
-		DistributeIDGenerator gen = new DistributeIDGenerator();
-		gen.generate();
-	}
-
 }
diff --git a/bigfans-framework/src/main/java/com/bigfans/framework/lock/DistributedLock.java b/bigfans-framework/src/main/java/com/bigfans/framework/lock/DistributedLock.java
new file mode 100644
index 0000000000000000000000000000000000000000..0d017f4456e3894b70d93687cd79f1a4f0878e7b
--- /dev/null
+++ b/bigfans-framework/src/main/java/com/bigfans/framework/lock/DistributedLock.java
@@ -0,0 +1,8 @@
+package com.bigfans.framework.lock;
+
+/**
+ * @author lichong
+ * @create 2018-07-22 上午9:49
+ **/
+public interface DistributedLock {
+}
diff --git a/bigfans-framework/src/main/java/com/bigfans/framework/lock/ZookeeperDistributedLock.java b/bigfans-framework/src/main/java/com/bigfans/framework/lock/ZookeeperDistributedLock.java
new file mode 100644
index 0000000000000000000000000000000000000000..7e19fbb7e662f7dcbff4bfcbd0baa1f8233c800d
--- /dev/null
+++ b/bigfans-framework/src/main/java/com/bigfans/framework/lock/ZookeeperDistributedLock.java
@@ -0,0 +1,8 @@
+package com.bigfans.framework.lock;
+
+/**
+ * @author lichong
+ * @create 2018-07-22 上午9:49
+ **/
+public class ZookeeperDistributedLock implements DistributedLock {
+}
diff --git a/bigfans-framework/src/main/java/com/bigfans/framework/utils/QiniuUtils.java b/bigfans-framework/src/main/java/com/bigfans/framework/utils/QiniuUtils.java
index 20ccf295805ab0ca71ac786c5e2abe3747be8122..411d04af54e190cd7b8c500d6c9554d1b67f9b36 100644
--- a/bigfans-framework/src/main/java/com/bigfans/framework/utils/QiniuUtils.java
+++ b/bigfans-framework/src/main/java/com/bigfans/framework/utils/QiniuUtils.java
@@ -411,35 +411,4 @@ public class QiniuUtils {
 	public static String getFileAccessUrl(String key) throws QiniuException {
 		return BUCKET_HOST_NAME + "/" + key;
 	}
-	
-	public static void main(String[] args) throws IOException {
-		//uploadFile("C:/test.jpg");
-		
-		/*String[] buckets = listBucket();
-		for(String bucket : buckets) {
-			System.out.println(bucket);
-		}*/
-		
-		/*List<FileInfo> list = listFileOfBucket(BUCKET_NAME, null, 1000);
-		for(FileInfo fileInfo : list) {
-			System.out.println("key：" + fileInfo.key);
-			System.out.println("hash：" + fileInfo.hash);
-			System.out.println("................");
-		}*/
-		
-		//copyFile(BUCKET_NAME, "images-test", BUCKET_NAME, "images-test-1111");
-		
-		//renameFile(BUCKET_NAME, "images-test-1111", "images-test-2222.jpg");
-		
-		//deleteFile(BUCKET_NAME, "images-test-2222.jpg");
-		
-		//fetchToBucket("http://www.nanrenwo.net/uploads/allimg/121026/14-1210261JJD03.jpg", BUCKET_NAME,"1111111111111111.jpg");
-		
-		FileInfo[] fileInfos = findFiles(BUCKET_NAME, "10", LIMIT_SIZE);
-		for(FileInfo fileInfo : fileInfos) {
-			System.out.println(fileInfo.key);
-			System.out.println(fileInfo.hash);
-			System.out.println("..............");
-		}
-	}
 }
diff --git a/pom.xml b/pom.xml
index 01eafc66a274ea4215134cf6b4819eb89f474868..31f22b23db2c5957d501ff371fae1a880c2040fc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,15 +22,15 @@
         <module>bigfans-cloud-service-review</module>
 		<module>bigfans-cloud-service-pricing</module>
 		<module>bigfans-cloud-service-notification</module>
-		<module>bigfans-cloud-service-shipping</module>
         <module>bigfans-cloud-config-server</module>
+		<module>bigfans-cloud-service-shipping</module>
 	</modules>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<java.version>1.8</java.version>
-		<spring-cloud.version>Finchley.M2</spring-cloud.version>
-		<spring-boot.version>2.0.0.M3</spring-boot.version>
+		<spring-cloud.version>Finchley.RELEASE</spring-cloud.version>
+		<spring-boot.version>2.0.1.RELEASE</spring-boot.version>
 		<neo4j.version>1.4.4</neo4j.version>
 		<mysql.version>5.1.26</mysql.version>
 		<druid.version>1.0.7</druid.version>
@@ -38,6 +38,7 @@
 		<elasticsearch.version>6.2.2</elasticsearch.version>
 		<jjwt.version>0.9.0</jjwt.version>
 		<disruptor.version>3.4.2</disruptor.version>
+		<netty.version>4.1.23.Final</netty.version>
 	</properties>
 
 	<dependencyManagement>
@@ -111,35 +112,41 @@
 				<artifactId>thumbnailator</artifactId>
 				<version>0.4.6</version>
 			</dependency>
+			<dependency>
+				<groupId>io.netty</groupId>
+				<artifactId>netty-all</artifactId>
+			</dependency>
 		</dependencies>
 	</dependencyManagement>
 
 	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.7.0</version>
-				<configuration>
-					<source>${java.version}</source>
-					<target>${java.version}</target>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.springframework.boot</groupId>
-				<artifactId>spring-boot-maven-plugin</artifactId>
-				<executions>
-					<execution>
-						<goals>
-							<goal>repackage</goal>
-						</goals>
-						<configuration>
-							<classifier>exec</classifier>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
+		<pluginManagement>
+			<plugins>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-compiler-plugin</artifactId>
+					<version>3.7.0</version>
+					<configuration>
+						<source>${java.version}</source>
+						<target>${java.version}</target>
+					</configuration>
+				</plugin>
+				<plugin>
+					<groupId>org.springframework.boot</groupId>
+					<artifactId>spring-boot-maven-plugin</artifactId>
+					<executions>
+						<execution>
+							<goals>
+								<goal>repackage</goal>
+							</goals>
+							<configuration>
+								<classifier>exec</classifier>
+							</configuration>
+						</execution>
+					</executions>
+				</plugin>
+			</plugins>
+		</pluginManagement>
 	</build>
 
 	<repositories>
@@ -148,7 +155,7 @@
 			<name>Spring Snapshots</name>
 			<url>https://repo.spring.io/snapshot</url>
 			<snapshots>
-				<enabled>true</enabled>
+				<enabled>false</enabled>
 			</snapshots>
 		</repository>
 		<repository>
@@ -161,7 +168,7 @@
 		</repository>
 	</repositories>
 
-	<!--
+
 	<pluginRepositories>
 		<pluginRepository>
 			<id>spring-snapshots</id>
@@ -179,6 +186,6 @@
 				<enabled>false</enabled>
 			</snapshots>
 		</pluginRepository>
-	</pluginRepositories>
+	</pluginRepositories><!--
 	-->
 </project>
\ No newline at end of file