merge from 2.2.4.RELEASE

spring-cloud-alibaba-examples/sentinel-example/sentinel-feign-example/sentinel-feign-consumer-example/pom.xml

@@ -10,11 +10,13 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
+
     <artifactId>sentinel-feign-consumer-example</artifactId>
     <name>Spring Cloud Starter Alibaba Sentinel x Feign - Consumer Example</name>
     <description>Example demonstrating how to use sentinel with feign</description>
     <packaging>jar</packaging>
 
+
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>

spring-cloud-alibaba-examples/sentinel-example/sentinel-feign-example/sentinel-feign-consumer-example/src/main/java/com/alibaba/cloud/examples/fallback/EchoServiceFallback.java

@@ -20,7 +20,6 @@ import com.alibaba.cloud.examples.service.EchoService;
 
 /**
  * @author lengleng
- * @date 2019-08-01
  * <p>
  * sentinel 降级处理
  */
@@ -35,7 +34,7 @@ public class EchoServiceFallback implements EchoService {
 	/**
 	 * 调用服务提供方的输出接口.
 	 * @param str 用户输入
-	 * @return
+	 * @return String
 	 */
 	@Override
 	public String echo(String str) {

spring-cloud-alibaba-examples/sentinel-example/sentinel-feign-example/sentinel-feign-consumer-example/src/main/java/com/alibaba/cloud/examples/fallback/EchoServiceFallbackFactory.java

@@ -22,7 +22,6 @@ import org.springframework.stereotype.Component;
 
 /**
  * @author lengleng
- * @date 2019-08-01
  */
 @Component
 public class EchoServiceFallbackFactory implements FallbackFactory<EchoServiceFallback> {

spring-cloud-alibaba-examples/sentinel-example/sentinel-feign-example/sentinel-feign-consumer-example/src/main/java/com/alibaba/cloud/examples/service/EchoService.java

@@ -24,7 +24,6 @@ import org.springframework.web.bind.annotation.PathVariable;
 
 /**
  * @author lengleng
- * @date 2019-08-01
  * <p>
  * example feign client
  */

spring-cloud-alibaba-examples/sentinel-example/sentinel-feign-example/sentinel-feign-provider-example/src/main/java/com/alibaba/cloud/examples/controller/EchoController.java

@@ -22,7 +22,6 @@ import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @author lengleng
- * @date 2019-08-01
  */
 @RestController
 public class EchoController {