仍有两个测试过不了

1. NacosConfigurationXmlJsonTest#contextLoads
2. NacosConfigurationNoSuffixTest#contextLoads
Merge branch 'master' into finchley

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

@@ -59,4 +59,5 @@
         </plugins>
     </build>
 
+
 </project>

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

@@ -34,7 +34,7 @@ public class EchoServiceFallback implements EchoService {
 	/**
 	 * 调用服务提供方的输出接口.
 	 * @param str 用户输入
-	 * @return response
+	 * @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/service/EchoService.java

@@ -27,7 +27,8 @@ import org.springframework.web.bind.annotation.PathVariable;
  * <p>
  * example feign client
  */
-@FeignClient(name = "service-provider", fallbackFactory = EchoServiceFallbackFactory.class)
+@FeignClient(name = "service-provider",
+		fallbackFactory = EchoServiceFallbackFactory.class)
 public interface EchoService {
 
 	/**