import changes from master

reorganizing modules

spring-cloud-alibaba-examples/sentinel-example/sentinel-zuul-example/pom.xml

@@ -60,7 +60,6 @@
         <!--<groupId>com.fasterxml.jackson.dataformat</groupId>-->
         <!--<artifactId>jackson-dataformat-xml</artifactId>-->
         <!--</dependency>-->
-
     </dependencies>
 
     <build>

spring-cloud-alibaba-examples/sentinel-example/sentinel-zuul-example/src/main/java/com/alibaba/cloud/examples/RulesController.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018 the original author or authors.
+ * Copyright 2013-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

spring-cloud-alibaba-examples/sentinel-example/sentinel-zuul-example/src/main/java/com/alibaba/cloud/examples/SentinelZuulApplication.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018 the original author or authors.
+ * Copyright 2013-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

spring-cloud-alibaba-examples/sentinel-example/sentinel-zuul-example/src/main/java/com/alibaba/cloud/examples/ZuulConfiguration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018 the original author or authors.
+ * Copyright 2013-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

spring-cloud-alibaba-examples/sentinel-example/sentinel-zuul-example/src/main/resources/api.json

@@ -29,4 +29,4 @@
       }
     ]
   }
-]
+]

spring-cloud-alibaba-examples/sentinel-example/sentinel-zuul-example/src/main/resources/application.yaml

@@ -13,8 +13,8 @@ spring:
         ruleType: gw-api-group
       transport:
         dashboard: localhost:8080
-#      filter:
-#        enabled: true
+      filter:
+        enabled: false
 
 management.endpoints.web.exposure.include: "*"
 

spring-cloud-alibaba-examples/sentinel-example/sentinel-zuul-example/src/main/resources/gateway.json

@@ -23,4 +23,4 @@
       "fieldName": "name"
     }
   }
-]
+]