🎉 2.0.0.RC2

6 years ago · 5e696b797e
19 changed files with 38 additions and 36 deletions
--- a/blade-auth/pom.xml
+++ b/blade-auth/pom.xml
@ -8,7 +8,7 @@
    <parent>
        <artifactId>BladeX</artifactId>
        <groupId>org.springblade</groupId>
-        <version>2.0.0.RC1</version>
+        <version>2.0.0.RC2</version>
    </parent>

    <artifactId>blade-auth</artifactId>
--- a/blade-common/pom.xml
+++ b/blade-common/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>BladeX</artifactId>
        <groupId>org.springblade</groupId>
-        <version>2.0.0.RC1</version>
+        <version>2.0.0.RC2</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/blade-gateway/pom.xml
+++ b/blade-gateway/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>BladeX</artifactId>
        <groupId>org.springblade</groupId>
-        <version>2.0.0.RC1</version>
+        <version>2.0.0.RC2</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

@ -56,6 +56,18 @@
            <artifactId>spring-boot-admin-starter-client</artifactId>
            <version>${spring.boot.admin.version}</version>
        </dependency>
+        <!--Hystrix-->
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-netflix-hystrix</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>commons-logging</groupId>
+                    <artifactId>commons-logging</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <!-- Nacos -->
        <dependency>
            <groupId>org.springframework.cloud</groupId>
            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
--- a/blade-ops/blade-admin/pom.xml
+++ b/blade-ops/blade-admin/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>blade-ops</artifactId>
        <groupId>org.springblade</groupId>
-        <version>2.0.0.RC1</version>
+        <version>2.0.0.RC2</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/blade-ops/blade-develop/pom.xml
+++ b/blade-ops/blade-develop/pom.xml
@ -6,7 +6,7 @@
    <parent>
        <groupId>org.springblade</groupId>
        <artifactId>blade-ops</artifactId>
-        <version>2.0.0.RC1</version>
+        <version>2.0.0.RC2</version>
    </parent>

    <modelVersion>4.0.0</modelVersion>
--- a/blade-ops/pom.xml
+++ b/blade-ops/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>BladeX</artifactId>
        <groupId>org.springblade</groupId>
-        <version>2.0.0.RC1</version>
+        <version>2.0.0.RC2</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/blade-service-api/blade-desk-api/pom.xml
+++ b/blade-service-api/blade-desk-api/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>blade-service-api</artifactId>
        <groupId>org.springblade</groupId>
-        <version>2.0.0.RC1</version>
+        <version>2.0.0.RC2</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/blade-service-api/blade-dict-api/pom.xml
+++ b/blade-service-api/blade-dict-api/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>blade-service-api</artifactId>
        <groupId>org.springblade</groupId>
-        <version>2.0.0.RC1</version>
+        <version>2.0.0.RC2</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/blade-service-api/blade-system-api/pom.xml
+++ b/blade-service-api/blade-system-api/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>blade-service-api</artifactId>
        <groupId>org.springblade</groupId>
-        <version>2.0.0.RC1</version>
+        <version>2.0.0.RC2</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/blade-service-api/blade-user-api/pom.xml
+++ b/blade-service-api/blade-user-api/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>blade-service-api</artifactId>
        <groupId>org.springblade</groupId>
-        <version>2.0.0.RC1</version>
+        <version>2.0.0.RC2</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/blade-service-api/pom.xml
+++ b/blade-service-api/pom.xml
@ -5,13 +5,13 @@
    <parent>
        <artifactId>BladeX</artifactId>
        <groupId>org.springblade</groupId>
-        <version>2.0.0.RC1</version>
+        <version>2.0.0.RC2</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

    <artifactId>blade-service-api</artifactId>
    <name>${project.artifactId}</name>
-    <version>2.0.0.RC1</version>
+    <version>2.0.0.RC2</version>
    <packaging>pom</packaging>
    <description>SpringBlade 微服务API集合</description>

--- a/blade-service/blade-desk/pom.xml
+++ b/blade-service/blade-desk/pom.xml
@ -6,7 +6,7 @@
    <parent>
        <groupId>org.springblade</groupId>
        <artifactId>blade-service</artifactId>
-        <version>2.0.0.RC1</version>
+        <version>2.0.0.RC2</version>
    </parent>

    <modelVersion>4.0.0</modelVersion>
--- a/blade-service/blade-log/pom.xml
+++ b/blade-service/blade-log/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>blade-service</artifactId>
        <groupId>org.springblade</groupId>
-        <version>2.0.0.RC1</version>
+        <version>2.0.0.RC2</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/blade-service/blade-system/pom.xml
+++ b/blade-service/blade-system/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>blade-service</artifactId>
        <groupId>org.springblade</groupId>
-        <version>2.0.0.RC1</version>
+        <version>2.0.0.RC2</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/blade-service/blade-user/pom.xml
+++ b/blade-service/blade-user/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>blade-service</artifactId>
        <groupId>org.springblade</groupId>
-        <version>2.0.0.RC1</version>
+        <version>2.0.0.RC2</version>
    </parent>

    <modelVersion>4.0.0</modelVersion>
--- a/blade-service/pom.xml
+++ b/blade-service/pom.xml
@ -6,14 +6,14 @@

    <artifactId>blade-service</artifactId>
    <name>${project.artifactId}</name>
-    <version>2.0.0.RC1</version>
+    <version>2.0.0.RC2</version>
    <packaging>pom</packaging>
    <description>SpringBlade 微服务集合</description>

    <parent>
        <groupId>org.springblade</groupId>
        <artifactId>BladeX</artifactId>
-        <version>2.0.0.RC1</version>
+        <version>2.0.0.RC2</version>
    </parent>

    <modules>
--- a/doc/nacos/blade.yaml
+++ b/doc/nacos/blade.yaml
@ -18,10 +18,10 @@ spring:

 #feign配置
 feign:
-  #hystrix:
-    #enabled: true
-  sentinel:
+  hystrix:
    enabled: true
+  #sentinel:
+    #enabled: true
  okhttp:
    enabled: true
  httpclient:
@ -39,7 +39,7 @@ hystrix:
      execution:
        isolation:
          thread:
-            timeoutInMilliseconds: 720000
+            timeoutInMilliseconds: 5000

 #ribbon配置
 ribbon:
--- a/pom.xml
+++ b/pom.xml
@ -5,12 +5,12 @@

    <groupId>org.springblade</groupId>
    <artifactId>BladeX</artifactId>
-    <version>2.0.0.RC1</version>
+    <version>2.0.0.RC2</version>
    <packaging>pom</packaging>

    <properties>
-        <bladex.tool.version>2.0.0.RC2</bladex.tool.version>
-        <bladex.project.version>2.0.0.RC1</bladex.project.version>
+        <bladex.tool.version>2.0.0.RC3</bladex.tool.version>
+        <bladex.project.version>2.0.0.RC2</bladex.project.version>

        <java.version>1.8</java.version>
        <swagger.version>2.9.2</swagger.version>
@ -78,16 +78,6 @@
            <artifactId>spring-boot-devtools</artifactId>
            <optional>true</optional>
        </dependency>
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-netflix-hystrix</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>commons-logging</groupId>
-                    <artifactId>commons-logging</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
    </dependencies>

    <build>
--- a/script/docker/.env
+++ b/script/docker/.env
@ -1,2 +1,2 @@
 REGISTER=192.168.186.129/blade
-TAG=2.0.0.RC1
+TAG=2.0.0.RC2