From d13d9bda2f96a2dd1dffc6d7afdede0ca931d2d0 Mon Sep 17 00:00:00 2001
From: smallchill <smallchill@163.com>
Date: Fri, 15 Nov 2019 14:12:48 +0800
Subject: [PATCH] =?UTF-8?q?:zap:=20=E5=A2=9E=E5=8A=A0=E9=92=89=E9=92=89sdk?=
 =?UTF-8?q?=E7=A7=81=E6=9C=8D=E4=BE=9D=E8=B5=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 blade-ops/blade-admin/pom.xml                 |  6 ++++++
 .../{config => notifier}/CustomNotifier.java  | 20 ++++++++++---------
 2 files changed, 17 insertions(+), 9 deletions(-)
 rename blade-ops/blade-admin/src/main/java/org/springblade/admin/{config => notifier}/CustomNotifier.java (83%)

diff --git a/blade-ops/blade-admin/pom.xml b/blade-ops/blade-admin/pom.xml
index 6e8810d3..8eb65b09 100644
--- a/blade-ops/blade-admin/pom.xml
+++ b/blade-ops/blade-admin/pom.xml
@@ -37,6 +37,12 @@
             <groupId>de.codecentric</groupId>
             <artifactId>spring-boot-admin-starter-server</artifactId>
         </dependency>
+        <!--Taobao-Sdk-->
+        <dependency>
+            <groupId>com.taobao</groupId>
+            <artifactId>taobao-sdk</artifactId>
+            <version>20191114</version>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/blade-ops/blade-admin/src/main/java/org/springblade/admin/config/CustomNotifier.java b/blade-ops/blade-admin/src/main/java/org/springblade/admin/notifier/CustomNotifier.java
similarity index 83%
rename from blade-ops/blade-admin/src/main/java/org/springblade/admin/config/CustomNotifier.java
rename to blade-ops/blade-admin/src/main/java/org/springblade/admin/notifier/CustomNotifier.java
index b3240870..cd40dba6 100644
--- a/blade-ops/blade-admin/src/main/java/org/springblade/admin/config/CustomNotifier.java
+++ b/blade-ops/blade-admin/src/main/java/org/springblade/admin/notifier/CustomNotifier.java
@@ -14,7 +14,7 @@
  *  this software without specific prior written permission.
  *  Author: Jeckxu (chinajeckxu@163.com)
  */
-package org.springblade.admin.config;
+package org.springblade.admin.notifier;
 
 import com.dingtalk.api.DefaultDingTalkClient;
 import com.dingtalk.api.DingTalkClient;
@@ -38,11 +38,12 @@ import reactor.core.publisher.Mono;
  * {@code com.dingtalk.api.DingTalkClient}
  * {@code com.dingtalk.api.request.OapiRobotSendRequest}
  * {@code com.taobao.api.ApiException}
+ *
  * @author jeckxu
  */
-@Component
 @Slf4j
-public class CustomNotifier  extends AbstractEventNotifier {
+@Component
+public class CustomNotifier extends AbstractEventNotifier {
 
 	/**
 	 * massage template
@@ -71,25 +72,25 @@ public class CustomNotifier  extends AbstractEventNotifier {
 					// 健康检查没通过
 					case "DOWN":
 						log.info("发送 健康检查没通过 的通知！");
-						messageText = String.format(template, instance.getRegistration().getName(),event.getInstance(), ((InstanceStatusChangedEvent) event).getStatusInfo().getStatus(),"健康检查没通过",instance.getRegistration().getServiceUrl());
+						messageText = String.format(template, instance.getRegistration().getName(), event.getInstance(), ((InstanceStatusChangedEvent) event).getStatusInfo().getStatus(), "健康检查没通过", instance.getRegistration().getServiceUrl());
 						this.sendMessage(messageText);
 						break;
 					// 服务离线
 					case "OFFLINE":
 						log.info("发送 服务离线 的通知！");
-						messageText = String.format(template, instance.getRegistration().getName(),event.getInstance(), ((InstanceStatusChangedEvent) event).getStatusInfo().getStatus(),"服务离线",instance.getRegistration().getServiceUrl());
+						messageText = String.format(template, instance.getRegistration().getName(), event.getInstance(), ((InstanceStatusChangedEvent) event).getStatusInfo().getStatus(), "服务离线", instance.getRegistration().getServiceUrl());
 						this.sendMessage(messageText);
 						break;
 					//服务上线
 					case "UP":
 						log.info("发送 服务上线 的通知！");
-						messageText = String.format(template, instance.getRegistration().getName(),event.getInstance(), ((InstanceStatusChangedEvent) event).getStatusInfo().getStatus(),"服务上线",instance.getRegistration().getServiceUrl());
+						messageText = String.format(template, instance.getRegistration().getName(), event.getInstance(), ((InstanceStatusChangedEvent) event).getStatusInfo().getStatus(), "服务上线", instance.getRegistration().getServiceUrl());
 						this.sendMessage(messageText);
 						break;
 					// 服务未知异常
 					case "UNKNOWN":
 						log.info("发送 服务未知异常 的通知！");
-						messageText = String.format(template, instance.getRegistration().getName(),event.getInstance(), ((InstanceStatusChangedEvent) event).getStatusInfo().getStatus(),"服务未知异常",instance.getRegistration().getServiceUrl());
+						messageText = String.format(template, instance.getRegistration().getName(), event.getInstance(), ((InstanceStatusChangedEvent) event).getStatusInfo().getStatus(), "服务未知异常", instance.getRegistration().getServiceUrl());
 						this.sendMessage(messageText);
 						break;
 					default:
@@ -104,10 +105,11 @@ public class CustomNotifier  extends AbstractEventNotifier {
 
 	/**
 	 * massage send
+	 *
 	 * @param messageText
 	 */
-	private void sendMessage(String messageText){
-		DingTalkClient client = new DefaultDingTalkClient("https://oapi.dingtalk.com/robot/send?access_token="+dingTalkToken);
+	private void sendMessage(String messageText) {
+		DingTalkClient client = new DefaultDingTalkClient("https://oapi.dingtalk.com/robot/send?access_token=" + dingTalkToken);
 		OapiRobotSendRequest request = new OapiRobotSendRequest();
 		request.setMsgtype("text");
 		OapiRobotSendRequest.Text text = new OapiRobotSendRequest.Text();