From b5bfa8faa3436bc31ee03827698c829e0a9bcb43 Mon Sep 17 00:00:00 2001
From: smallchill <smallchill@163.com>
Date: Sun, 10 Feb 2019 19:06:17 +0800
Subject: [PATCH] :tada: 2.0.0.RELEASE

---
 blade-core-boot/pom.xml                           |  2 +-
 blade-core-cloud/pom.xml                          | 15 ++++++++++-----
 blade-core-launch/pom.xml                         |  2 +-
 .../springblade/core/launch/BladeApplication.java |  2 ++
 .../core/launch/constant/SentinelConstant.java    | 14 ++++++++++++++
 blade-core-log/pom.xml                            |  2 +-
 blade-core-mybatis/pom.xml                        |  2 +-
 blade-core-secure/pom.xml                         |  2 +-
 blade-core-swagger/pom.xml                        |  2 +-
 blade-core-tool/pom.xml                           |  2 +-
 pom.xml                                           |  6 +++---
 11 files changed, 36 insertions(+), 15 deletions(-)
 create mode 100644 blade-core-launch/src/main/java/org/springblade/core/launch/constant/SentinelConstant.java

diff --git a/blade-core-boot/pom.xml b/blade-core-boot/pom.xml
index ff4a876..d2992e4 100644
--- a/blade-core-boot/pom.xml
+++ b/blade-core-boot/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.springblade</groupId>
         <artifactId>blade-tool</artifactId>
-        <version>1.0.0</version>
+        <version>2.0.0</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/blade-core-cloud/pom.xml b/blade-core-cloud/pom.xml
index e96cbb5..2dac701 100644
--- a/blade-core-cloud/pom.xml
+++ b/blade-core-cloud/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>blade-tool</artifactId>
         <groupId>org.springblade</groupId>
-        <version>1.0.0</version>
+        <version>2.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -35,7 +35,7 @@
             <artifactId>spring-boot-admin-starter-client</artifactId>
             <version>${spring.boot.admin.version}</version>
         </dependency>
-        <dependency>
+        <!--<dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-netflix-hystrix</artifactId>
             <exclusions>
@@ -44,7 +44,7 @@
                     <artifactId>commons-logging</artifactId>
                 </exclusion>
             </exclusions>
-        </dependency>
+        </dependency>-->
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-openfeign</artifactId>
@@ -58,12 +58,17 @@
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
-            <version>${nacos.version}</version>
+            <version>${alibaba.cloud.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
-            <version>${nacos.version}</version>
+            <version>${alibaba.cloud.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
+            <version>${alibaba.cloud.version}</version>
         </dependency>
     </dependencies>
 
diff --git a/blade-core-launch/pom.xml b/blade-core-launch/pom.xml
index 7391a37..5bd8912 100644
--- a/blade-core-launch/pom.xml
+++ b/blade-core-launch/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>blade-tool</artifactId>
         <groupId>org.springblade</groupId>
-        <version>1.0.0</version>
+        <version>2.0.0</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/blade-core-launch/src/main/java/org/springblade/core/launch/BladeApplication.java b/blade-core-launch/src/main/java/org/springblade/core/launch/BladeApplication.java
index 2ac26e0..8b21bd2 100644
--- a/blade-core-launch/src/main/java/org/springblade/core/launch/BladeApplication.java
+++ b/blade-core-launch/src/main/java/org/springblade/core/launch/BladeApplication.java
@@ -17,6 +17,7 @@ package org.springblade.core.launch;
 
 import org.springblade.core.launch.constant.AppConstant;
 import org.springblade.core.launch.constant.NacosConstant;
+import org.springblade.core.launch.constant.SentinelConstant;
 import org.springblade.core.launch.service.LauncherService;
 import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.context.ConfigurableApplicationContext;
@@ -96,6 +97,7 @@ public class BladeApplication {
 		props.setProperty("spring.cloud.nacos.config.server-addr", NacosConstant.NACOS_ADDR);
 		props.setProperty("spring.cloud.nacos.config.prefix", NacosConstant.NACOS_CONFIG_PREFIX);
 		props.setProperty("spring.cloud.nacos.config.file-extension", NacosConstant.NACOS_CONFIG_FORMAT);
+		props.setProperty("spring.cloud.sentinel.transport.dashboard", SentinelConstant.SENTINEL_ADDR);
 		// 加载自定义组件
 		ServiceLoader<LauncherService> loader = ServiceLoader.load(LauncherService.class);
 		loader.forEach(launcherService -> launcherService.launcher(builder, appName, profile));
diff --git a/blade-core-launch/src/main/java/org/springblade/core/launch/constant/SentinelConstant.java b/blade-core-launch/src/main/java/org/springblade/core/launch/constant/SentinelConstant.java
new file mode 100644
index 0000000..eaf7ed4
--- /dev/null
+++ b/blade-core-launch/src/main/java/org/springblade/core/launch/constant/SentinelConstant.java
@@ -0,0 +1,14 @@
+package org.springblade.core.launch.constant;
+
+/**
+ * sentinel配置.
+ *
+ * @author zhuangqian
+ */
+public interface SentinelConstant {
+
+	/**
+	 * sentinel 地址
+	 */
+	String SENTINEL_ADDR = "127.0.0.1:8858";
+}
diff --git a/blade-core-log/pom.xml b/blade-core-log/pom.xml
index 9ccecf8..cdef0f3 100644
--- a/blade-core-log/pom.xml
+++ b/blade-core-log/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>blade-tool</artifactId>
         <groupId>org.springblade</groupId>
-        <version>1.0.0</version>
+        <version>2.0.0</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/blade-core-mybatis/pom.xml b/blade-core-mybatis/pom.xml
index 7dfe013..6df4006 100644
--- a/blade-core-mybatis/pom.xml
+++ b/blade-core-mybatis/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>blade-tool</artifactId>
         <groupId>org.springblade</groupId>
-        <version>1.0.0</version>
+        <version>2.0.0</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/blade-core-secure/pom.xml b/blade-core-secure/pom.xml
index 0cb2b6a..604753d 100644
--- a/blade-core-secure/pom.xml
+++ b/blade-core-secure/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>blade-tool</artifactId>
         <groupId>org.springblade</groupId>
-        <version>1.0.0</version>
+        <version>2.0.0</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/blade-core-swagger/pom.xml b/blade-core-swagger/pom.xml
index 1ef6534..12340c8 100644
--- a/blade-core-swagger/pom.xml
+++ b/blade-core-swagger/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>blade-tool</artifactId>
         <groupId>org.springblade</groupId>
-        <version>1.0.0</version>
+        <version>2.0.0</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/blade-core-tool/pom.xml b/blade-core-tool/pom.xml
index 7b08fd9..e3554f6 100644
--- a/blade-core-tool/pom.xml
+++ b/blade-core-tool/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.springblade</groupId>
         <artifactId>blade-tool</artifactId>
-        <version>1.0.0</version>
+        <version>2.0.0</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/pom.xml b/pom.xml
index ceb5598..b28ba65 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>org.springblade</groupId>
     <artifactId>blade-tool</artifactId>
-    <version>1.0.0</version>
+    <version>2.0.0</version>
     <packaging>pom</packaging>
     <name>blade-tool</name>
     <description>
@@ -36,7 +36,7 @@
     </scm>
 
     <properties>
-        <blade.tool.version>1.0.0</blade.tool.version>
+        <blade.tool.version>2.0.0</blade.tool.version>
 
         <java.version>1.8</java.version>
         <maven.plugin.version>3.8.0</maven.plugin.version>
@@ -49,7 +49,7 @@
         <disruptor.version>3.4.2</disruptor.version>
         <spring.boot.admin.version>2.0.2</spring.boot.admin.version>
         <mica.auto.version>1.0.1</mica.auto.version>
-        <nacos.version>0.2.1.RELEASE</nacos.version>
+        <alibaba.cloud.version>0.2.1.RELEASE</alibaba.cloud.version>
 
         <spring.boot.version>2.0.8.RELEASE</spring.boot.version>
         <spring.cloud.version>Finchley.SR2</spring.cloud.version>