From 9194482522ed3bdc55b5c321152d71abb1265faa Mon Sep 17 00:00:00 2001
From: tanghc <thc8775@163.com>
Date: Wed, 21 Aug 2019 20:52:48 +0800
Subject: [PATCH] 2.0

---
 doc/docs/files/10070_easyopen支持.md        | 52 ++++++++++++-------
 .../files/10096_使用SpringCloudGateway.md   |  2 -
 .../gatewaycommon/validate/ApiValidator.java  |  3 +-
 3 files changed, 35 insertions(+), 22 deletions(-)

diff --git a/doc/docs/files/10070_easyopen支持.md b/doc/docs/files/10070_easyopen支持.md
index 6edb8f01..65bddb70 100644
--- a/doc/docs/files/10070_easyopen支持.md
+++ b/doc/docs/files/10070_easyopen支持.md
@@ -10,21 +10,39 @@ SOP对easyopen项目提供了很好的支持，如果您的服务端使用了eas
 
 ```xml
 <!-- sop接入依赖 -->
-<dependency>
-    <groupId>com.gitee.sop</groupId>
-    <artifactId>sop-service-common</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
-</dependency>
-<dependency>
-    <groupId>org.springframework.cloud</groupId>
-    <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
-</dependency>
-<dependency>
-    <groupId>net.oschina.durcframework</groupId>
-    <artifactId>easyopen</artifactId>
-    <version>1.16.1</version>
-</dependency>
-<!-- sop接入依赖 end -->
+		<dependency>
+			<groupId>com.gitee.sop</groupId>
+			<artifactId>sop-service-common</artifactId>
+			<version>2.0.0-SNAPSHOT</version>
+		</dependency>
+
+		<!-- 使用nacos注册中心
+            版本 0.2.x.RELEASE 对应的是 Spring Boot 2.x 版本，版本 0.1.x.RELEASE 对应的是 Spring Boot 1.x 版本。
+           https://mvnrepository.com/artifact/org.springframework.cloud/spring-cloud-starter-alibaba-nacos-discovery
+        -->
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
+			<version>0.2.2.RELEASE</version>
+			<exclusions>
+				<exclusion>
+					<groupId>com.alibaba.nacos</groupId>
+					<artifactId>nacos-client</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>com.alibaba.nacos</groupId>
+			<artifactId>nacos-client</artifactId>
+			<version>1.1.0</version>
+		</dependency>
+
+		<dependency>
+			<groupId>net.oschina.durcframework</groupId>
+			<artifactId>easyopen</artifactId>
+			<version>1.16.1</version>
+		</dependency>
+        <!-- sop接入依赖 end -->
 ```
 
 easyopen版本必须升级到1.16.1
@@ -49,9 +67,7 @@ public class SopConfig extends EasyopenServiceConfiguration {
 ```java
 @Configuration
 public class ZuulConfig extends EasyopenZuulConfiguration {
-    static {
-        new ManagerInitializer();
-    }
+
 }
 ```
 
diff --git a/doc/docs/files/10096_使用SpringCloudGateway.md b/doc/docs/files/10096_使用SpringCloudGateway.md
index ee88a206..ab83ff58 100644
--- a/doc/docs/files/10096_使用SpringCloudGateway.md
+++ b/doc/docs/files/10096_使用SpringCloudGateway.md
@@ -69,5 +69,3 @@ public class GatewayConfig extends AlipayGatewayConfiguration {...}
 ```
 
 修改完毕，重启sop-gateway
-
-运行SpringCloudGatewayClientPostTest测试用例。
\ No newline at end of file
diff --git a/sop-common/sop-gateway-common/src/main/java/com/gitee/sop/gatewaycommon/validate/ApiValidator.java b/sop-common/sop-gateway-common/src/main/java/com/gitee/sop/gatewaycommon/validate/ApiValidator.java
index 75ee6e42..264e65da 100644
--- a/sop-common/sop-gateway-common/src/main/java/com/gitee/sop/gatewaycommon/validate/ApiValidator.java
+++ b/sop-common/sop-gateway-common/src/main/java/com/gitee/sop/gatewaycommon/validate/ApiValidator.java
@@ -59,7 +59,7 @@ public class ApiValidator implements Validator {
     @Override
     public void validate(ApiParam param) {
         checkIP(param);
-
+        checkEnable(param);
         ApiConfig apiConfig = ApiContext.getApiConfig();
         if (apiConfig.isIgnoreValidate() || param.fetchIgnoreValidate()) {
             if (log.isDebugEnabled()) {
@@ -67,7 +67,6 @@ public class ApiValidator implements Validator {
             }
             return;
         }
-        checkEnable(param);
         // 需要验证签名,先校验appKey，后校验签名,顺序不能变
         checkAppKey(param);
         checkSign(param);