diff --git a/blade-auth/pom.xml b/blade-auth/pom.xml
index d2194d77..ba96d01f 100644
--- a/blade-auth/pom.xml
+++ b/blade-auth/pom.xml
@@ -8,7 +8,7 @@
BladeX
org.springblade
- 2.0.0.RC1
+ 2.0.0.RC2
blade-auth
diff --git a/blade-common/pom.xml b/blade-common/pom.xml
index c9d1508d..e731409f 100644
--- a/blade-common/pom.xml
+++ b/blade-common/pom.xml
@@ -5,7 +5,7 @@
BladeX
org.springblade
- 2.0.0.RC1
+ 2.0.0.RC2
4.0.0
diff --git a/blade-gateway/pom.xml b/blade-gateway/pom.xml
index 7c336d66..e8cc8e2c 100644
--- a/blade-gateway/pom.xml
+++ b/blade-gateway/pom.xml
@@ -5,7 +5,7 @@
BladeX
org.springblade
- 2.0.0.RC1
+ 2.0.0.RC2
4.0.0
@@ -56,6 +56,18 @@
spring-boot-admin-starter-client
${spring.boot.admin.version}
+
+
+ org.springframework.cloud
+ spring-cloud-starter-netflix-hystrix
+
+
+ commons-logging
+ commons-logging
+
+
+
+
org.springframework.cloud
spring-cloud-starter-alibaba-nacos-discovery
diff --git a/blade-ops/blade-admin/pom.xml b/blade-ops/blade-admin/pom.xml
index e0f174a1..975ffe06 100644
--- a/blade-ops/blade-admin/pom.xml
+++ b/blade-ops/blade-admin/pom.xml
@@ -5,7 +5,7 @@
blade-ops
org.springblade
- 2.0.0.RC1
+ 2.0.0.RC2
4.0.0
diff --git a/blade-ops/blade-develop/pom.xml b/blade-ops/blade-develop/pom.xml
index c4227223..d46bf233 100644
--- a/blade-ops/blade-develop/pom.xml
+++ b/blade-ops/blade-develop/pom.xml
@@ -6,7 +6,7 @@
org.springblade
blade-ops
- 2.0.0.RC1
+ 2.0.0.RC2
4.0.0
diff --git a/blade-ops/pom.xml b/blade-ops/pom.xml
index d37667d0..4efe9481 100644
--- a/blade-ops/pom.xml
+++ b/blade-ops/pom.xml
@@ -5,7 +5,7 @@
BladeX
org.springblade
- 2.0.0.RC1
+ 2.0.0.RC2
4.0.0
diff --git a/blade-service-api/blade-desk-api/pom.xml b/blade-service-api/blade-desk-api/pom.xml
index cc840085..0b3bfced 100644
--- a/blade-service-api/blade-desk-api/pom.xml
+++ b/blade-service-api/blade-desk-api/pom.xml
@@ -5,7 +5,7 @@
blade-service-api
org.springblade
- 2.0.0.RC1
+ 2.0.0.RC2
4.0.0
diff --git a/blade-service-api/blade-dict-api/pom.xml b/blade-service-api/blade-dict-api/pom.xml
index 723ccd0a..f523144c 100644
--- a/blade-service-api/blade-dict-api/pom.xml
+++ b/blade-service-api/blade-dict-api/pom.xml
@@ -5,7 +5,7 @@
blade-service-api
org.springblade
- 2.0.0.RC1
+ 2.0.0.RC2
4.0.0
diff --git a/blade-service-api/blade-system-api/pom.xml b/blade-service-api/blade-system-api/pom.xml
index 5ef53b23..1a36ee51 100644
--- a/blade-service-api/blade-system-api/pom.xml
+++ b/blade-service-api/blade-system-api/pom.xml
@@ -5,7 +5,7 @@
blade-service-api
org.springblade
- 2.0.0.RC1
+ 2.0.0.RC2
4.0.0
diff --git a/blade-service-api/blade-user-api/pom.xml b/blade-service-api/blade-user-api/pom.xml
index b6d47234..491f2d0e 100644
--- a/blade-service-api/blade-user-api/pom.xml
+++ b/blade-service-api/blade-user-api/pom.xml
@@ -5,7 +5,7 @@
blade-service-api
org.springblade
- 2.0.0.RC1
+ 2.0.0.RC2
4.0.0
diff --git a/blade-service-api/pom.xml b/blade-service-api/pom.xml
index 61fc49bc..a24633aa 100644
--- a/blade-service-api/pom.xml
+++ b/blade-service-api/pom.xml
@@ -5,13 +5,13 @@
BladeX
org.springblade
- 2.0.0.RC1
+ 2.0.0.RC2
4.0.0
blade-service-api
${project.artifactId}
- 2.0.0.RC1
+ 2.0.0.RC2
pom
SpringBlade 微服务API集合
diff --git a/blade-service/blade-desk/pom.xml b/blade-service/blade-desk/pom.xml
index 0daee605..88da64c7 100644
--- a/blade-service/blade-desk/pom.xml
+++ b/blade-service/blade-desk/pom.xml
@@ -6,7 +6,7 @@
org.springblade
blade-service
- 2.0.0.RC1
+ 2.0.0.RC2
4.0.0
diff --git a/blade-service/blade-log/pom.xml b/blade-service/blade-log/pom.xml
index 76f78146..380537d5 100644
--- a/blade-service/blade-log/pom.xml
+++ b/blade-service/blade-log/pom.xml
@@ -5,7 +5,7 @@
blade-service
org.springblade
- 2.0.0.RC1
+ 2.0.0.RC2
4.0.0
diff --git a/blade-service/blade-system/pom.xml b/blade-service/blade-system/pom.xml
index 7f7c67b4..a459bb25 100644
--- a/blade-service/blade-system/pom.xml
+++ b/blade-service/blade-system/pom.xml
@@ -5,7 +5,7 @@
blade-service
org.springblade
- 2.0.0.RC1
+ 2.0.0.RC2
4.0.0
diff --git a/blade-service/blade-user/pom.xml b/blade-service/blade-user/pom.xml
index 93841a59..f5b668f1 100644
--- a/blade-service/blade-user/pom.xml
+++ b/blade-service/blade-user/pom.xml
@@ -5,7 +5,7 @@
blade-service
org.springblade
- 2.0.0.RC1
+ 2.0.0.RC2
4.0.0
diff --git a/blade-service/pom.xml b/blade-service/pom.xml
index b92034d3..44343ebd 100644
--- a/blade-service/pom.xml
+++ b/blade-service/pom.xml
@@ -6,14 +6,14 @@
blade-service
${project.artifactId}
- 2.0.0.RC1
+ 2.0.0.RC2
pom
SpringBlade 微服务集合
org.springblade
BladeX
- 2.0.0.RC1
+ 2.0.0.RC2
diff --git a/doc/nacos/blade.yaml b/doc/nacos/blade.yaml
index ab14ff83..2f403f1a 100644
--- 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:
diff --git a/pom.xml b/pom.xml
index 206a8063..5c67d3ae 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,12 +5,12 @@
org.springblade
BladeX
- 2.0.0.RC1
+ 2.0.0.RC2
pom
- 2.0.0.RC2
- 2.0.0.RC1
+ 2.0.0.RC3
+ 2.0.0.RC2
1.8
2.9.2
@@ -78,16 +78,6 @@
spring-boot-devtools
true
-
- org.springframework.cloud
- spring-cloud-starter-netflix-hystrix
-
-
- commons-logging
- commons-logging
-
-
-
diff --git a/script/docker/.env b/script/docker/.env
index b7b8eff5..75f9d145 100644
--- 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