升级版本到4.8.0-RC1

README.md

@@ -6,7 +6,7 @@
 [![Build Status](https://travis-ci.org/Nepxion/Discovery.svg?branch=master)](https://travis-ci.org/Nepxion/Discovery)
 [![Codacy Badge](https://api.codacy.com/project/badge/Grade/8e39a24e1be740c58b83fb81763ba317)](https://www.codacy.com/project/HaojunRen/Discovery/dashboard?utm_source=github.com&utm_medium=referral&utm_content=Nepxion/Discovery&utm_campaign=Badge_Grade_Dashboard)
 
-Nepxion Discovery是一款对Spring Cloud Discovery服务注册发现、Ribbon负载均衡、Feign和RestTemplate调用、Hystrix熔断隔离的增强中间件，其功能包括灰度发布（包括切换发布和平滑发布）、服务隔离、服务路由、服务权重、黑/白名单的IP地址过滤、限制注册、限制发现等，支持Eureka、Consul、Zookeeper和阿里巴巴的Nacos为服务注册发现中间件，支持阿里巴巴的Nacos、携程的Apollo和Redis为远程配置中心，支持Spring Cloud Gateway（Finchley版）、Zuul网关和微服务的灰度发布，支持多数据源的数据库灰度发布等客户特色化灰度发布，支持用户自定义和编程灰度路由策略（包括RPC和REST两种调用方式），兼容Spring Cloud Edgware版和Finchley版（不支持Dalston版，因为它的生命周期将在2018年12月结束，如果您无法回避使用Dalston版，请自行修改源码或者联系我）。现有的Spring Cloud微服务很方便引入该中间件，代码零侵入
+Nepxion Discovery是一款对Spring Cloud Discovery服务注册发现、Ribbon负载均衡、Feign和RestTemplate调用、Hystrix或者阿里巴巴Sentinel熔断隔离的增强中间件，其功能包括灰度发布（包括切换发布和平滑发布）、服务隔离、服务路由、服务权重、黑/白名单的IP地址过滤、限制注册、限制发现等，支持Eureka、Consul、Zookeeper和阿里巴巴的Nacos为服务注册发现中间件，支持阿里巴巴的Nacos、携程的Apollo和Redis为远程配置中心，支持Spring Cloud Gateway（Finchley版）、Zuul网关和微服务的灰度发布，支持多数据源的数据库灰度发布等客户特色化灰度发布，支持用户自定义和编程灰度路由策略（包括RPC和REST两种调用方式），兼容Spring Cloud Edgware版和Finchley版（不支持Dalston版，因为它的生命周期将在2018年12月结束，如果您无法回避使用Dalston版，请自行修改源码或者联系我）。现有的Spring Cloud微服务很方便引入该中间件，代码零侵入
 
 对于使用者来说，他所需要做的如下：
 - 引入相关依赖到pom.xml，参考 [依赖兼容](#依赖兼容)
@@ -275,8 +275,8 @@ Spring Boot Admin监控平台
 ### 版本
 | Spring Cloud版本 | Nepxion Discovery版本 |
 | --- | --- |
-| Finchley | 4.7.12 |
-| Edgware | 3.7.12 |
+| Finchley | 当前版本 4.8.0-RC1 稳定版本 4.7.12 |
+| Edgware | 当前版本 3.8.0-RC1 稳定版本 3.7.12 |
 
 ### 依赖
 ```xml

discovery-common-apollo/pom.xml

@@ -11,7 +11,7 @@
     <parent>
         <groupId>com.nepxion</groupId>
         <artifactId>discovery</artifactId>
-        <version>4.7.12</version>
+        <version>4.8.0-RC1</version>
     </parent>
 
     <dependencies>

discovery-common-nacos/pom.xml

@@ -11,7 +11,7 @@
     <parent>
         <groupId>com.nepxion</groupId>
         <artifactId>discovery</artifactId>
-        <version>4.7.12</version>
+        <version>4.8.0-RC1</version>
     </parent>
 
     <dependencies>

discovery-common-redis/pom.xml

@@ -11,7 +11,7 @@
     <parent>
         <groupId>com.nepxion</groupId>
         <artifactId>discovery</artifactId>
-        <version>4.7.12</version>
+        <version>4.8.0-RC1</version>
     </parent>
 
     <dependencies>

discovery-common/pom.xml

@@ -11,7 +11,7 @@
     <parent>
         <groupId>com.nepxion</groupId>
         <artifactId>discovery</artifactId>
-        <version>4.7.12</version>
+        <version>4.8.0-RC1</version>
     </parent>
 
     <dependencies>

discovery-common/src/main/java/com/nepxion/discovery/common/constant/DiscoveryConstant.java

@@ -10,7 +10,7 @@ package com.nepxion.discovery.common.constant;
  */
 
 public class DiscoveryConstant {
-    public static final String DISCOVERY_VERSION = "4.7.12";
+    public static final String DISCOVERY_VERSION = "4.8.0-RC1";
 
     public static final String SPRING_APPLICATION_DISCOVERY_PLUGIN = "spring.application.discovery.plugin";
     public static final String SPRING_APPLICATION_REGISTER_CONTROL_ENABLED = "spring.application.register.control.enabled";

discovery-console-desktop/pom.xml

@@ -11,7 +11,7 @@
     <parent>
         <groupId>com.nepxion</groupId>
         <artifactId>discovery</artifactId>
-        <version>4.7.12</version>
+        <version>4.8.0-RC1</version>
     </parent>
 
     <properties>

discovery-console-starter-apollo/pom.xml

@@ -11,7 +11,7 @@
     <parent>
         <groupId>com.nepxion</groupId>
         <artifactId>discovery</artifactId>
-        <version>4.7.12</version>
+        <version>4.8.0-RC1</version>
     </parent>
 
     <dependencies>

discovery-console-starter-nacos/pom.xml

@@ -11,7 +11,7 @@
     <parent>
         <groupId>com.nepxion</groupId>
         <artifactId>discovery</artifactId>
-        <version>4.7.12</version>
+        <version>4.8.0-RC1</version>
     </parent>
 
     <dependencies>

discovery-console-starter-redis/pom.xml

@@ -11,7 +11,7 @@
     <parent>
         <groupId>com.nepxion</groupId>
         <artifactId>discovery</artifactId>
-        <version>4.7.12</version>
+        <version>4.8.0-RC1</version>
     </parent>
 
     <dependencies>

discovery-console/pom.xml

@@ -11,7 +11,7 @@
     <parent>
         <groupId>com.nepxion</groupId>
         <artifactId>discovery</artifactId>
-        <version>4.7.12</version>
+        <version>4.8.0-RC1</version>
     </parent>
 
     <dependencies>

discovery-plugin-admin-center/pom.xml

@@ -11,7 +11,7 @@
     <parent>
         <groupId>com.nepxion</groupId>
         <artifactId>discovery</artifactId>
-        <version>4.7.12</version>
+        <version>4.8.0-RC1</version>
     </parent>
 
     <dependencies>

discovery-plugin-config-center-starter-apollo/pom.xml

@@ -11,7 +11,7 @@
     <parent>
         <groupId>com.nepxion</groupId>
         <artifactId>discovery</artifactId>
-        <version>4.7.12</version>
+        <version>4.8.0-RC1</version>
     </parent>
 
     <dependencies>

discovery-plugin-config-center-starter-nacos/pom.xml

@@ -11,7 +11,7 @@
     <parent>
         <groupId>com.nepxion</groupId>
         <artifactId>discovery</artifactId>
-        <version>4.7.12</version>
+        <version>4.8.0-RC1</version>
     </parent>
 
     <dependencies>

discovery-plugin-config-center-starter-redis/pom.xml

@@ -11,7 +11,7 @@
     <parent>
         <groupId>com.nepxion</groupId>
         <artifactId>discovery</artifactId>
-        <version>4.7.12</version>
+        <version>4.8.0-RC1</version>
     </parent>
 
     <dependencies>

discovery-plugin-config-center/pom.xml

@@ -11,7 +11,7 @@
     <parent>
         <groupId>com.nepxion</groupId>
         <artifactId>discovery</artifactId>
-        <version>4.7.12</version>
+        <version>4.8.0-RC1</version>
     </parent>
 
     <dependencies>

discovery-plugin-framework-consul/pom.xml

@@ -11,7 +11,7 @@
     <parent>
         <groupId>com.nepxion</groupId>
         <artifactId>discovery</artifactId>
-        <version>4.7.12</version>
+        <version>4.8.0-RC1</version>
     </parent>
 
     <dependencies>

discovery-plugin-framework-eureka/pom.xml

@@ -11,7 +11,7 @@
     <parent>
         <groupId>com.nepxion</groupId>
         <artifactId>discovery</artifactId>
-        <version>4.7.12</version>
+        <version>4.8.0-RC1</version>
     </parent>
 
     <dependencies>

discovery-plugin-framework-nacos/pom.xml

@@ -11,7 +11,7 @@
     <parent>
         <groupId>com.nepxion</groupId>
         <artifactId>discovery</artifactId>
-        <version>4.7.12</version>
+        <version>4.8.0-RC1</version>
     </parent>
 
     <dependencies>

discovery-plugin-framework-zookeeper/pom.xml

@@ -11,7 +11,7 @@
     <parent>
         <groupId>com.nepxion</groupId>
         <artifactId>discovery</artifactId>
-        <version>4.7.12</version>
+        <version>4.8.0-RC1</version>
     </parent>
 
     <dependencies>

discovery-plugin-framework/pom.xml

@@ -11,7 +11,7 @@
     <parent>
         <groupId>com.nepxion</groupId>
         <artifactId>discovery</artifactId>
-        <version>4.7.12</version>
+        <version>4.8.0-RC1</version>
     </parent>
 
     <dependencies>

discovery-plugin-starter-consul/pom.xml

@@ -11,7 +11,7 @@
     <parent>
         <groupId>com.nepxion</groupId>
         <artifactId>discovery</artifactId>
-        <version>4.7.12</version>
+        <version>4.8.0-RC1</version>
     </parent>
 
     <dependencies>

discovery-plugin-starter-eureka/pom.xml

@@ -11,7 +11,7 @@
     <parent>
         <groupId>com.nepxion</groupId>
         <artifactId>discovery</artifactId>
-        <version>4.7.12</version>
+        <version>4.8.0-RC1</version>
     </parent>
 
     <dependencies>

discovery-plugin-starter-nacos/pom.xml

@@ -11,7 +11,7 @@
     <parent>
         <groupId>com.nepxion</groupId>
         <artifactId>discovery</artifactId>
-        <version>4.7.12</version>
+        <version>4.8.0-RC1</version>
     </parent>
 
     <dependencies>

discovery-plugin-starter-zookeeper/pom.xml

@@ -11,7 +11,7 @@
     <parent>
         <groupId>com.nepxion</groupId>
         <artifactId>discovery</artifactId>
-        <version>4.7.12</version>
+        <version>4.8.0-RC1</version>
     </parent>
 
     <dependencies>

discovery-plugin-strategy-starter-gateway/pom.xml

@@ -11,7 +11,7 @@
     <parent>
         <groupId>com.nepxion</groupId>
         <artifactId>discovery</artifactId>
-        <version>4.7.12</version>
+        <version>4.8.0-RC1</version>
     </parent>
 
     <dependencies>

discovery-plugin-strategy-starter-hystrix/pom.xml

@@ -11,7 +11,7 @@
     <parent>
         <groupId>com.nepxion</groupId>
         <artifactId>discovery</artifactId>
-        <version>4.7.12</version>
+        <version>4.8.0-RC1</version>
     </parent>
 
     <dependencies>

discovery-plugin-strategy-starter-service/pom.xml

@@ -11,7 +11,7 @@
     <parent>
         <groupId>com.nepxion</groupId>
         <artifactId>discovery</artifactId>
-        <version>4.7.12</version>
+        <version>4.8.0-RC1</version>
     </parent>
 
     <dependencies>

discovery-plugin-strategy-starter-zuul/pom.xml

@@ -11,7 +11,7 @@
     <parent>
         <groupId>com.nepxion</groupId>
         <artifactId>discovery</artifactId>
-        <version>4.7.12</version>
+        <version>4.8.0-RC1</version>
     </parent>
 
     <dependencies>

discovery-plugin-strategy/pom.xml

@@ -11,7 +11,7 @@
     <parent>
         <groupId>com.nepxion</groupId>
         <artifactId>discovery</artifactId>
-        <version>4.7.12</version>
+        <version>4.8.0-RC1</version>
     </parent>
 
     <dependencies>

discovery-springcloud-example-console/pom.xml

@@ -17,7 +17,7 @@
     </parent>
 
     <properties>
-        <discovery.plugin.version>4.7.12</discovery.plugin.version>
+        <discovery.plugin.version>4.8.0-RC1</discovery.plugin.version>
         <spring.cloud.version>Finchley.SR2</spring.cloud.version>
         <spring.cloud.alibaba.version>0.2.0.RELEASE</spring.cloud.alibaba.version>
         <spring.boot.admin.version>2.0.2</spring.boot.admin.version>

discovery-springcloud-example-gateway/pom.xml

@@ -17,7 +17,7 @@
     </parent>
 
     <properties>
-        <discovery.plugin.version>4.7.12</discovery.plugin.version>
+        <discovery.plugin.version>4.8.0-RC1</discovery.plugin.version>
         <spring.cloud.version>Finchley.SR2</spring.cloud.version>
         <spring.cloud.alibaba.version>0.2.0.RELEASE</spring.cloud.alibaba.version>
         <spring.boot.admin.version>2.0.2</spring.boot.admin.version>

discovery-springcloud-example-service/pom.xml

@@ -17,7 +17,7 @@
     </parent>
 
     <properties>
-        <discovery.plugin.version>4.7.12</discovery.plugin.version>
+        <discovery.plugin.version>4.8.0-RC1</discovery.plugin.version>
         <spring.cloud.version>Finchley.SR2</spring.cloud.version>
         <spring.cloud.alibaba.version>0.2.0.RELEASE</spring.cloud.alibaba.version>
         <spring.boot.admin.version>2.0.2</spring.boot.admin.version>

discovery-springcloud-example-zuul/pom.xml

@@ -17,7 +17,7 @@
     </parent>
 
     <properties>
-        <discovery.plugin.version>4.7.12</discovery.plugin.version>
+        <discovery.plugin.version>4.8.0-RC1</discovery.plugin.version>
         <spring.cloud.version>Finchley.SR2</spring.cloud.version>
         <spring.cloud.alibaba.version>0.2.0.RELEASE</spring.cloud.alibaba.version>
         <spring.boot.admin.version>2.0.2</spring.boot.admin.version>

pom.xml

@@ -6,7 +6,7 @@
     <name>Nepxion Discovery</name>
     <packaging>pom</packaging>
     <modelVersion>4.0.0</modelVersion>
-    <version>4.7.12</version>
+    <version>4.8.0-RC1</version>
     <description>Nepxion Discovery is an enhancement for Spring Cloud Discovery</description>
     <url>http://www.nepxion.com</url>
 

version.bat

@@ -15,6 +15,6 @@
 @title Nepxion Discovery
 @color 0a
 
-call mvn versions:set -DnewVersion=4.7.12
+call mvn versions:set -DnewVersion=4.8.0-RC1
 
 pause
\ No newline at end of file