From 9624d64d41cb852bc114bbaafeb0eecd95625110 Mon Sep 17 00:00:00 2001
From: xueye <xueye404@qq.com>
Date: Tue, 6 Jul 2021 10:16:22 +0800
Subject: [PATCH] =?UTF-8?q?style:=20=E4=BF=AE=E6=94=B9=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E7=B1=BB=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cicdi/notify/dingtalk/DingTalkTest.java   | 47 +++++++++++++------
 .../cicdi/notify/email/DefaultEmailTest.java  | 11 ++++-
 .../com/cicdi/notify/sms/TelecomSmsTest.java  | 42 ++++++++---------
 3 files changed, 62 insertions(+), 38 deletions(-)

diff --git a/notify-dingtalk/src/test/java/com/cicdi/notify/dingtalk/DingTalkTest.java b/notify-dingtalk/src/test/java/com/cicdi/notify/dingtalk/DingTalkTest.java
index 1aa355e..352e1bf 100644
--- a/notify-dingtalk/src/test/java/com/cicdi/notify/dingtalk/DingTalkTest.java
+++ b/notify-dingtalk/src/test/java/com/cicdi/notify/dingtalk/DingTalkTest.java
@@ -1,11 +1,12 @@
 package com.cicdi.notify.dingtalk;
 
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.JSON;
 import com.cicdi.notify.*;
 import com.cicdi.notify.template.AbstractTemplateManager;
 import com.cicdi.notify.template.Template;
 import com.cicdi.notify.template.TemplateManager;
 import com.cicdi.notify.template.TemplateProperties;
+import org.junit.Before;
 import org.junit.Test;
 
 import java.util.HashMap;
@@ -15,14 +16,32 @@ import java.util.Map;
  * @author xueye
  */
 public class DingTalkTest {
+    /**
+     * 模板管理器
+     */
+    private TemplateManager templateManager;
+    /**
+     * 通知器管理器
+     */
+    private NotifierManager notifierManager;
+
+    /**
+     * 测试钉钉消息发送
+     */
     @Test
     public void test() {
+        Notifier<Template> notifier = notifierManager.getNotifier(DefaultNotifyType.dingTalk, "123");
+        notifier.send(templateManager.getTemplate(DefaultNotifyType.dingTalk, "124"), new HashMap<>());
+    }
+
+    @Before
+    public void init() {
         // 通知器配置管理器
         NotifyConfigManager notifyConfigManager = (notifyType, configId) -> {
             NotifierProperties notifierProperties = new NotifierProperties();
             notifierProperties.setType(DefaultNotifyType.dingTalk.getId());
             notifierProperties.setProvider(DingTalkProvider.dingTalkMessage.getId());
-            notifierProperties.setId("12");
+            notifierProperties.setId("123");
 
             Map<String, Object> config = new HashMap<>();
             config.put("appKey", "dinga5vkkpbrwqc0fmni");
@@ -33,35 +52,33 @@ public class DingTalkTest {
             return notifierProperties;
         };
 
-        // 模板管理器
-        TemplateManager templateManager = new AbstractTemplateManager() {
+        templateManager = new AbstractTemplateManager() {
             @Override
             protected TemplateProperties getProperties(NotifyType type, String id) {
                 TemplateProperties templateProperties = new TemplateProperties();
                 templateProperties.setType(DefaultNotifyType.dingTalk.getId());
                 templateProperties.setProvider(DingTalkProvider.dingTalkMessage.getId());
 
-                JSONObject jsonObject = new JSONObject();
-                jsonObject.put("agentId", "1211676948");
-                jsonObject.put("userIdList", "manager276");
-                jsonObject.put("departmentIdList", "");
-                jsonObject.put("toAllUser", "false");
-                jsonObject.put("message", "Hello World!");
+                DingTalkMessageTemplate template = new DingTalkMessageTemplate();
+                template.setAgentId("1211676948");
+                template.setUserIdList("manager276");
+                template.setDepartmentIdList("");
+                template.setToAllUser(false);
+                template.setMessage("Hello World! - " + System.currentTimeMillis());
 
-                templateProperties.setTemplate(jsonObject.toJSONString());
+                templateProperties.setTemplate(JSON.toJSONString(template));
 
                 return templateProperties;
             }
         };
 
-        NotifierManager notifierManager = new AbstractNotifierManager(notifyConfigManager){};
+        notifierManager = new AbstractNotifierManager(notifyConfigManager) {
+        };
 
         // register
         DingTalkNotifierProvider provider = new DingTalkNotifierProvider(templateManager);
         notifierManager.register(provider);
         templateManager.register(provider);
-
-        Notifier<Template> notifier = notifierManager.getNotifier(DefaultNotifyType.dingTalk, "123");
-        notifier.send(templateManager.getTemplate(DefaultNotifyType.dingTalk, "124"), new HashMap<>());
     }
+
 }
diff --git a/notify-email/src/test/java/com/cicdi/notify/email/DefaultEmailTest.java b/notify-email/src/test/java/com/cicdi/notify/email/DefaultEmailTest.java
index 50afaa6..fcd30ae 100644
--- a/notify-email/src/test/java/com/cicdi/notify/email/DefaultEmailTest.java
+++ b/notify-email/src/test/java/com/cicdi/notify/email/DefaultEmailTest.java
@@ -1,5 +1,6 @@
 package com.cicdi.notify.email;
 
+import com.alibaba.fastjson.JSON;
 import com.cicdi.notify.*;
 import com.cicdi.notify.template.AbstractTemplateManager;
 import com.cicdi.notify.template.Template;
@@ -9,6 +10,7 @@ import com.cicdi.notify.email.embedded.DefaultEmailNotifierProvider;
 import org.junit.Test;
 
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -55,7 +57,14 @@ public class DefaultEmailTest {
                 TemplateProperties templateProperties = new TemplateProperties();
                 templateProperties.setType(DefaultNotifyType.email.getId());
                 templateProperties.setProvider(EmailProvider.embedded.getId());
-                templateProperties.setTemplate("{\"subject\":\"Hello\",\"sendTo\":[\"xueye404@qq.com\"],\"text\":\"<p>This is a test</p>\",\"attachments\":[]}");
+
+                EmailTemplate template = new EmailTemplate();
+                template.setSubject("Hello");
+                template.setSendTo(Collections.singletonList("xueye404@qq.com"));
+                template.setText("This is a test and do not reply this message!");
+
+                templateProperties.setTemplate(JSON.toJSONString(template));
+
                 return templateProperties;
             }
         };
diff --git a/notify-sms/src/test/java/com/cicdi/notify/sms/TelecomSmsTest.java b/notify-sms/src/test/java/com/cicdi/notify/sms/TelecomSmsTest.java
index ef8accc..dc78cfe 100644
--- a/notify-sms/src/test/java/com/cicdi/notify/sms/TelecomSmsTest.java
+++ b/notify-sms/src/test/java/com/cicdi/notify/sms/TelecomSmsTest.java
@@ -1,8 +1,9 @@
 package com.cicdi.notify.sms;
 
+import com.alibaba.fastjson.JSON;
 import com.cicdi.notify.*;
-import com.cicdi.notify.sms.aliyun.AliyunSmsNotifierProvider;
 import com.cicdi.notify.sms.telecom.TelecomSmsNotifierProvider;
+import com.cicdi.notify.sms.telecom.TelecomSmsTemplate;
 import com.cicdi.notify.template.AbstractTemplateManager;
 import com.cicdi.notify.template.Template;
 import com.cicdi.notify.template.TemplateManager;
@@ -19,23 +20,20 @@ public class TelecomSmsTest {
     @Test
     public void test() {
         // 通知器配置管理器
-        NotifyConfigManager notifyConfigManager = new NotifyConfigManager() {
-            @Override
-            public NotifierProperties getNotifyConfig(NotifyType notifyType, String configId) {
-                NotifierProperties notifierProperties = new NotifierProperties();
-                notifierProperties.setType(DefaultNotifyType.sms.getId());
-                notifierProperties.setProvider(SmsProvider.telecom.getId());
-                notifierProperties.setId("12");
+        NotifyConfigManager notifyConfigManager = (notifyType, configId) -> {
+            NotifierProperties notifierProperties = new NotifierProperties();
+            notifierProperties.setType(DefaultNotifyType.sms.getId());
+            notifierProperties.setProvider(SmsProvider.telecom.getId());
+            notifierProperties.setId("12");
 
-                Map<String, Object> config = new HashMap<>();
-                config.put("serviceUrl", "http://www.js139.com.cn:8022/hysms/SendMsg");
-                config.put("userId", "HYjlzx");
-                config.put("password", "5CA45EA4944D2C32567E8DBBDDBD65DD");
+            Map<String, Object> config = new HashMap<>();
+            config.put("serviceUrl", "http://www.js139.com.cn:8022/hysms/SendMsg");
+            config.put("userId", "HYjlzx");
+            config.put("password", "5CA45EA4944D2C32567E8DBBDDBD65DD");
 
-                notifierProperties.setConfiguration(config);
+            notifierProperties.setConfiguration(config);
 
-                return notifierProperties;
-            }
+            return notifierProperties;
         };
 
         // 模板管理器
@@ -46,22 +44,22 @@ public class TelecomSmsTest {
                 templateProperties.setType(DefaultNotifyType.sms.getId());
                 templateProperties.setProvider(SmsProvider.telecom.getId());
 
-                templateProperties.setTemplate("{\"text\":\"Hello\",\"mobile\":\"18605120786\"}");
+                TelecomSmsTemplate template = new TelecomSmsTemplate();
+                template.setText("Hello World!");
+                template.setMobile("18605120786");
+
+                templateProperties.setTemplate(JSON.toJSONString(template));
 
                 return templateProperties;
             }
         };
 
-        NotifierManager notifierManager = new AbstractNotifierManager(notifyConfigManager){};
+        NotifierManager notifierManager = new AbstractNotifierManager(notifyConfigManager) {
+        };
 
         // register
-        AliyunSmsNotifierProvider aliyunSmsNotifierProvider = new AliyunSmsNotifierProvider(templateManager);
         TelecomSmsNotifierProvider telecomSmsNotifierProvider = new TelecomSmsNotifierProvider(templateManager);
-
-        notifierManager.register(aliyunSmsNotifierProvider);
         notifierManager.register(telecomSmsNotifierProvider);
-
-        templateManager.register(aliyunSmsNotifierProvider);
         templateManager.register(telecomSmsNotifierProvider);
 
         Notifier<Template> notifier = notifierManager.getNotifier(DefaultNotifyType.sms, "123");