diff --git a/sms4j-spring-boot-example/src/test/java/org/dromara/sms4j/example/SmsOaTest.java b/sms4j-spring-boot-example/src/test/java/org/dromara/sms4j/example/SmsOaTest.java
index 6685268f..dc41cc8b 100644
--- a/sms4j-spring-boot-example/src/test/java/org/dromara/sms4j/example/SmsOaTest.java
+++ b/sms4j-spring-boot-example/src/test/java/org/dromara/sms4j/example/SmsOaTest.java
@@ -3,6 +3,7 @@ package org.dromara.sms4j.example;
import lombok.extern.slf4j.Slf4j;
import org.dromara.oa.api.OaSender;
import org.dromara.oa.comm.entity.Request;
+import org.dromara.oa.comm.entity.WeTalkRequestArticle;
import org.dromara.oa.comm.enums.MessageType;
import org.dromara.oa.core.byteTalk.config.ByteTalkConfig;
import org.dromara.oa.core.dingTalk.config.DingTalkConfig;
@@ -58,7 +59,7 @@ public class SmsOaTest {
// request.setIsNoticeAll(true);
request.setContent("测试消息");
- alarm.sender(request, MessageType.DINGTALK_TEXT);
+ alarm.sender(request, MessageType.DING_TALK_TEXT);
}
@@ -82,7 +83,7 @@ public class SmsOaTest {
request.setIsNoticeAll(true);
request.setContent("#### 杭州天气 @150XXXXXXXX \n > 9度，西北风1级，空气良89，相对温度73%\n > \n > ###### 10点20分发布 [天气](https://www.dingtalk.com) \n");
request.setTitle("标题");
- alarm.sender(request, MessageType.DINGTALK_MARKDOWN);
+ alarm.sender(request, MessageType.DING_TALK_MARKDOWN);
}
@@ -106,10 +107,9 @@ public class SmsOaTest {
request.setTitle("点击跳转到钉钉");
request.setMessageUrl("https://www.dingtalk.com/s?__biz=MzA4NjMwMTA2Ng==&mid=2650316842&idx=1&sn=60da3ea2b29f1dcc43a7c8e4a7c97a16&scene=2&srcid=09189AnRJEdIiWVaKltFzNTw&from=timeline&isappinstalled=0&key=&ascene=2&uin=&devicetype=android-23&version=26031933&nettype=WIFI");
request.setPicUrl("https://img.alicdn.com/tfs/TB1NwmBEL9TBuNjy1zbXXXpepXa-2400-1218.png");
+ alarm.sender(request, MessageType.DING_TALK_LINK);
- alarm.sender(request, MessageType.DINGTALK_LINK);
-
}
/**
@@ -138,8 +138,8 @@ public class SmsOaTest {
request.setContent("测试消息");
// 异步发送方式
- alarm.senderAsync(request, MessageType.DINGTALK_TEXT);
- alarm.senderAsync(request, MessageType.DINGTALK_TEXT, smsResponse -> System.out.println("ConfigId为" + smsResponse.getOaConfigId() + "的异步任务发送成功"));
+ alarm.senderAsync(request, MessageType.DING_TALK_TEXT);
+ alarm.senderAsync(request, MessageType.DING_TALK_TEXT, smsResponse -> System.out.println("ConfigId为" + smsResponse.getOaConfigId() + "的异步任务发送成功"));
try {
Thread.sleep(3000L);
@@ -183,7 +183,7 @@ public class SmsOaTest {
request.setPriority(priority);
//测试-1-TEXT
request.setContent("该消息优先级为" + priority);
- alarm.senderAsyncByPriority(request, MessageType.DINGTALK_TEXT);
+ alarm.senderAsyncByPriority(request, MessageType.DING_TALK_TEXT);
System.out.println("优先级为" + priority + "的异步任务已提交");
}).start();
@@ -210,7 +210,7 @@ public class SmsOaTest {
// 支持@all
// request.setIsNoticeAll(true);
request.setContent("测试消息");
- alarm.sender(request, MessageType.DINGTALK_TEXT);
+ alarm.sender(request, MessageType.DING_TALK_TEXT);
}
//***********************ByteTalk-Test************************//
/**
@@ -247,7 +247,7 @@ public class SmsOaTest {
request.setUserIdList(userIds);
request.setIsNoticeAll(true);
request.setContent("测试消息");
- alarm.sender(request, MessageType.BYTETALK_TEXT);
+ alarm.sender(request, MessageType.BYTE_TALK_TEXT);
}
@@ -273,8 +273,8 @@ public class SmsOaTest {
request.setIsNoticeAll(true);
request.setContent("测试消息");
- alarm.senderAsync(request, MessageType.BYTETALK_TEXT);
- alarm.senderAsync(request, MessageType.BYTETALK_TEXT, smsResponse -> System.out.println("ConfigId为" + smsResponse.getOaConfigId() + "的异步任务发送成功"));
+ alarm.senderAsync(request, MessageType.BYTE_TALK_TEXT);
+ alarm.senderAsync(request, MessageType.BYTE_TALK_TEXT, smsResponse -> System.out.println("ConfigId为" + smsResponse.getOaConfigId() + "的异步任务发送成功"));
// 防止主线程挂掉
try {
@@ -294,7 +294,7 @@ public class SmsOaTest {
request.setUserIdList(userIds);
request.setIsNoticeAll(true);
request.setContent("测试消息");
- alarm.sender(request, MessageType.BYTETALK_TEXT);
+ alarm.sender(request, MessageType.BYTE_TALK_TEXT);
}
//***********************WeTalk-Test************************//
/**
@@ -332,7 +332,7 @@ public class SmsOaTest {
request.setIsNoticeAll(true);
request.setContent("测试消息");
- alarm.sender(request, MessageType.WETETALK_TEXT);
+ alarm.sender(request, MessageType.WE_TALK_TEXT);
}
@@ -362,11 +362,32 @@ public class SmsOaTest {
">普通用户反馈:117例" +
">VIP用户反馈:15例");
- alarm.sender(request, MessageType.WETETALK_MARKDOWN);
+ alarm.sender(request, MessageType.WE_TALK_MARKDOWN);
+
-
}
+ /**
+ * WeTalk的News测试
+ */
+ @Test
+ public void oaWeTalkNews() {
+ String key = "oaWeTalk";
+ WeTalkConfig WeTalkConfig = new WeTalkConfig();
+ WeTalkConfig.setConfigId(key);
+ WeTalkConfig.setTokenId(WeTalkTOKENID);
+
+ // 根据配置创建服务实例并注册
+ OaFactory.createAndRegisterOaSender(WeTalkConfig);
+ OaSender alarm = OaFactory.getSmsOaBlend(key);
+
+ Request request = new Request();
+ ArrayList articles = new ArrayList<>();
+ articles.add(new WeTalkRequestArticle("中秋节礼品领取", "今年中秋节公司有豪礼相送", "www.qq.com", "http://res.mail.qq.com/node/ww/wwopenmng/images/independent/doc/test_pic_msg1.png"));
+ request.setArticleList(articles);
+
+ alarm.sender(request, MessageType.WE_TALK_NEWS);
+ }
/**
* WeTalk的异步消息发送
@@ -391,8 +412,8 @@ public class SmsOaTest {
request.setContent("测试消息");
// 异步发送方式
- alarm.senderAsync(request, MessageType.WETETALK_TEXT);
- alarm.senderAsync(request, MessageType.WETETALK_TEXT, smsResponse -> System.out.println("ConfigId为" + smsResponse.getOaConfigId() + "的异步任务发送成功"));
+ alarm.senderAsync(request, MessageType.WE_TALK_TEXT);
+ alarm.senderAsync(request, MessageType.WE_TALK_TEXT, smsResponse -> System.out.println("ConfigId为" + smsResponse.getOaConfigId() + "的异步任务发送成功"));
// 防止主线程挂掉
try {
@@ -401,6 +422,7 @@ public class SmsOaTest {
throw new RuntimeException(e);
}
}
+
@Test
public void oaWeTalkByYamlTest() {
String configId = "oaWeTalkByYaml";
@@ -411,7 +433,7 @@ public class SmsOaTest {
request.setPhoneList(phones);
request.setIsNoticeAll(true);
request.setContent("SMS4JContent");
- alarm.sender(request, MessageType.WETETALK_TEXT);
+ alarm.sender(request, MessageType.WE_TALK_TEXT);
}
}