|
@@ -31,17 +31,13 @@ public class PushMessageService {
|
|
|
|
|
|
private DateFormat dateFormat1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss SSS");
|
|
|
|
|
|
- public PushMessageService() {
|
|
|
- System.out.println("===PushMessageService===");
|
|
|
- }
|
|
|
-
|
|
|
/**
|
|
|
* 发送文本消息
|
|
|
*
|
|
|
* @param message
|
|
|
*/
|
|
|
- public void sendTextMessage(String message) {
|
|
|
- sendTextMessage(message, null, null);
|
|
|
+ public void sendTextMessage(String accessToken, String prefix, String message) {
|
|
|
+ sendTextMessage(accessToken, prefix, message, null, null);
|
|
|
}
|
|
|
|
|
|
/**
|
|
@@ -50,8 +46,8 @@ public class PushMessageService {
|
|
|
* @param message
|
|
|
* @param atList
|
|
|
*/
|
|
|
- public void sendTextMessage(String message, @Nullable List<Integer> atList) {
|
|
|
- sendTextMessage(message, atList, null);
|
|
|
+ public void sendTextMessage(String accessToken, String prefix, String message, @Nullable List<Integer> atList) {
|
|
|
+ sendTextMessage(accessToken, prefix, message, atList, null);
|
|
|
}
|
|
|
|
|
|
/**
|
|
@@ -60,8 +56,8 @@ public class PushMessageService {
|
|
|
* @param message
|
|
|
* @param atAll
|
|
|
*/
|
|
|
- public void sendTextMessage(String message, @Nullable Boolean atAll) {
|
|
|
- sendTextMessage(message, null, atAll);
|
|
|
+ public void sendTextMessage(String accessToken, String prefix, String message, @Nullable Boolean atAll) {
|
|
|
+ sendTextMessage(accessToken, prefix, message, null, atAll);
|
|
|
}
|
|
|
|
|
|
/**
|
|
@@ -71,14 +67,15 @@ public class PushMessageService {
|
|
|
* @param atList
|
|
|
* @param atAll
|
|
|
*/
|
|
|
- public void sendTextMessage(String messge, @Nullable List<Integer> atList, @Nullable Boolean atAll) {
|
|
|
+ public void sendTextMessage(String accessToken, String prefix, String messge, @Nullable List<Integer> atList,
|
|
|
+ @Nullable Boolean atAll) {
|
|
|
Map<String, Object> map = new HashMap<>();
|
|
|
map.put("MSG_TYPE", "text");
|
|
|
Map<String, Object> data = new HashMap<>();
|
|
|
map.put("DATA", data);
|
|
|
Map<String, Object> text = new HashMap<>();
|
|
|
data.put("TEXT", text);
|
|
|
- messge = messge.startsWith(properties.getPrefix()) ? messge : properties.getPrefix() + messge;
|
|
|
+ messge = messge.startsWith(prefix) ? messge : prefix + messge;
|
|
|
text.put("CONTENT", messge);
|
|
|
if (atList != null) {
|
|
|
data.put("AT_LIST", atList);
|
|
@@ -86,7 +83,7 @@ public class PushMessageService {
|
|
|
if (atAll != null) {
|
|
|
data.put("AT_ALL", atAll);
|
|
|
}
|
|
|
- sendMessage(map);
|
|
|
+ sendMessage(map, accessToken);
|
|
|
}
|
|
|
|
|
|
/**
|
|
@@ -94,8 +91,8 @@ public class PushMessageService {
|
|
|
*
|
|
|
* @param messge
|
|
|
*/
|
|
|
- public void sendMarkdownMessage(String messge) {
|
|
|
- sendMarkdownMessage(messge, null, null, null);
|
|
|
+ public void sendMarkdownMessage(String accessToken, String prefix, String messge) {
|
|
|
+ sendMarkdownMessage(accessToken, prefix, messge, null, null, null);
|
|
|
}
|
|
|
|
|
|
/**
|
|
@@ -104,8 +101,8 @@ public class PushMessageService {
|
|
|
* @param messge
|
|
|
* @param title
|
|
|
*/
|
|
|
- public void sendMarkdownMessage(String messge, String title) {
|
|
|
- sendMarkdownMessage(messge, title, null, null);
|
|
|
+ public void sendMarkdownMessage(String accessToken, String prefix, String messge, String title) {
|
|
|
+ sendMarkdownMessage(accessToken, prefix, messge, title, null, null);
|
|
|
}
|
|
|
|
|
|
/**
|
|
@@ -114,8 +111,8 @@ public class PushMessageService {
|
|
|
* @param messge
|
|
|
* @param atList
|
|
|
*/
|
|
|
- public void sendMarkdownMessage(String messge, List<Integer> atList) {
|
|
|
- sendMarkdownMessage(messge, null, atList, null);
|
|
|
+ public void sendMarkdownMessage(String accessToken, String prefix, String messge, List<Integer> atList) {
|
|
|
+ sendMarkdownMessage(accessToken, prefix, messge, null, atList, null);
|
|
|
}
|
|
|
|
|
|
/**
|
|
@@ -124,8 +121,8 @@ public class PushMessageService {
|
|
|
* @param messge
|
|
|
* @param atAll
|
|
|
*/
|
|
|
- public void sendMarkdownMessage(String messge, @Nullable Boolean atAll) {
|
|
|
- sendMarkdownMessage(messge, null, null, atAll);
|
|
|
+ public void sendMarkdownMessage(String accessToken, String prefix, String messge, @Nullable Boolean atAll) {
|
|
|
+ sendMarkdownMessage(accessToken, prefix, messge, null, null, atAll);
|
|
|
}
|
|
|
|
|
|
/**
|
|
@@ -136,7 +133,8 @@ public class PushMessageService {
|
|
|
* @param atList
|
|
|
* @param atAll
|
|
|
*/
|
|
|
- public void sendMarkdownMessage(String messge, @Nullable String title, @Nullable List<Integer> atList,
|
|
|
+ public void sendMarkdownMessage(String accessToken, String prefix, String messge, @Nullable String title,
|
|
|
+ @Nullable List<Integer> atList,
|
|
|
@Nullable Boolean atAll) {
|
|
|
Map<String, Object> map = new HashMap<>();
|
|
|
map.put("MSG_TYPE", "markdown");
|
|
@@ -144,8 +142,8 @@ public class PushMessageService {
|
|
|
map.put("DATA", data);
|
|
|
Map<String, Object> markdown = new HashMap<>();
|
|
|
data.put("MARK_DOWN", markdown);
|
|
|
- title = title == null || "".equals(title) ? properties.getPrefix() : title;
|
|
|
- title = title.startsWith(properties.getPrefix()) ? title : properties.getPrefix() + title;
|
|
|
+ title = title == null || "".equals(title) ? prefix : title;
|
|
|
+ title = title.startsWith(prefix) ? title : prefix + title;
|
|
|
markdown.put("TITLE", title);
|
|
|
markdown.put("TEXT", messge);
|
|
|
if (atList != null) {
|
|
@@ -154,11 +152,12 @@ public class PushMessageService {
|
|
|
if (atAll != null) {
|
|
|
data.put("AT_ALL", atAll);
|
|
|
}
|
|
|
- sendMessage(map);
|
|
|
+ sendMessage(map, accessToken);
|
|
|
}
|
|
|
|
|
|
- private void sendMessage(Map<String, Object> reqMap) {
|
|
|
- JsonNode respon = restTemplate.postForObject(properties.getUrl(), getRequest(reqMap), JsonNode.class);
|
|
|
+ private void sendMessage(Map<String, Object> reqMap, String accessToken) {
|
|
|
+ JsonNode respon = restTemplate.postForObject(properties.getUrl(), getRequest(reqMap, accessToken),
|
|
|
+ JsonNode.class);
|
|
|
if (respon == null) {
|
|
|
throw new RuntimeException("调用结果为空");
|
|
|
}
|
|
@@ -176,17 +175,17 @@ public class PushMessageService {
|
|
|
throw new RuntimeException(respon.toString());
|
|
|
}
|
|
|
|
|
|
- private Map<String, Object> getRequest(Map<String, Object> reqMap) {
|
|
|
+ private Map<String, Object> getRequest(Map<String, Object> reqMap, String accessToken) {
|
|
|
Map<String, Object> map = new HashMap<>();
|
|
|
map.put("UNI_BSS_HEAD", getUniBssHead());
|
|
|
- map.put("UNI_BSS_BODY", getUniBssBody(reqMap));
|
|
|
+ map.put("UNI_BSS_BODY", getUniBssBody(reqMap, accessToken));
|
|
|
return map;
|
|
|
}
|
|
|
|
|
|
- private Map<String, Object> getUniBssBody(Map<String, Object> reqMap) {
|
|
|
+ private Map<String, Object> getUniBssBody(Map<String, Object> reqMap, String accessToken) {
|
|
|
Map<String, Object> map = new HashMap<>();
|
|
|
map.put("PUSH_MESSAGE_REQ", reqMap);
|
|
|
- reqMap.put("ACCESS_TOKEN", properties.getAccessToken());
|
|
|
+ reqMap.put("ACCESS_TOKEN", accessToken);
|
|
|
reqMap.put("BUSI_CODE", properties.getBusiCode());
|
|
|
reqMap.put("MODULE_ID", properties.getModuleId());
|
|
|
reqMap.put("SYSTEM_ID", properties.getSystemId());
|