From ea6e1675bbd411e30b21369698ed4b0587c21c0e Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期六, 08 五月 2021 13:45:34 +0800
Subject: [PATCH] 优化代码
---
service-job/src/main/java/com/java110/job/task/wechat/WeChatPushMessageTemplate.java | 20 +++++++++++++++++---
1 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/service-job/src/main/java/com/java110/job/task/wechat/WeChatPushMessageTemplate.java b/service-job/src/main/java/com/java110/job/task/wechat/WeChatPushMessageTemplate.java
index 2908d62..58e65fa 100755
--- a/service-job/src/main/java/com/java110/job/task/wechat/WeChatPushMessageTemplate.java
+++ b/service-job/src/main/java/com/java110/job/task/wechat/WeChatPushMessageTemplate.java
@@ -28,6 +28,7 @@
import com.java110.job.quartz.TaskSystemQuartz;
import com.java110.po.transactionLog.TransactionLogPo;
import com.java110.utils.cache.MappingCache;
+import com.java110.utils.constant.WechatConstant;
import com.java110.utils.util.DateUtil;
import com.java110.utils.util.StringUtil;
import org.slf4j.Logger;
@@ -301,6 +302,10 @@
private void doSend(List<OwnerAppUserDto> ownerAppUserDtos, NoticeDto noticeDto, String templateId, String accessToken, SmallWeChatDto weChatDto) {
String wechatUrl = MappingCache.getValue("OWNER_WECHAT_URL") + "/#/pages/notice/detail/detail?noticeId=";
ResponseEntity<String> responseEntity = null;
+ String sendTemplate = MappingCache.getValue(WechatConstant.WECHAT_DOMAIN,WechatConstant.SEND_TEMPLATE_URL);
+ if(StringUtil.isEmpty(sendTemplate)){
+ sendTemplate = sendMsgUrl;
+ }
for (OwnerAppUserDto appUserDto : ownerAppUserDtos) {
Date startTime = DateUtil.getCurrentDate();
PropertyFeeTemplateMessage templateMessage = new PropertyFeeTemplateMessage();
@@ -316,7 +321,7 @@
templateMessage.setData(data);
templateMessage.setUrl(wechatUrl + noticeDto.getNoticeId() + "&wAppId=" + weChatDto.getAppId());
logger.info("鍙戦�佹ā鏉挎秷鎭唴瀹�:{}", JSON.toJSONString(templateMessage));
- responseEntity = outRestTemplate.postForEntity(sendMsgUrl + accessToken, JSON.toJSONString(templateMessage), String.class);
+ responseEntity = outRestTemplate.postForEntity(sendTemplate + accessToken, JSON.toJSONString(templateMessage), String.class);
logger.info("寰俊妯℃澘杩斿洖鍐呭:{}", responseEntity);
} catch (Exception e) {
logger.error("鍙戦�佸け璐�", e);
@@ -327,7 +332,11 @@
}
private void doSendToOpenId(NoticeDto noticeDto, String templateId, String accessToken, String nextOpenid, SmallWeChatDto weChatDto) {
- String url = getUser.replace("ACCESS_TOKEN", accessToken);
+ String url = MappingCache.getValue(WechatConstant.WECHAT_DOMAIN,WechatConstant.GET_USER_URL);
+ if(StringUtil.isEmpty(url)){
+ url = getUser;
+ }
+ url = url.replace("ACCESS_TOKEN", accessToken);
if (!StringUtil.isEmpty(nextOpenid)) {
url += ("&next_openid=" + nextOpenid);
}
@@ -358,6 +367,11 @@
miniprogram = new Miniprogram();
miniprogram.setAppid(wechatUrl);
}
+
+ String sendTemplate = MappingCache.getValue(WechatConstant.WECHAT_DOMAIN,WechatConstant.SEND_TEMPLATE_URL);
+ if(StringUtil.isEmpty(sendTemplate)){
+ sendTemplate = sendMsgUrl;
+ }
ResponseEntity<String> responseEntity = null;
for (int openIndex = 0; openIndex < openids.size(); openIndex++) {
Date startTime = DateUtil.getCurrentDate();
@@ -382,7 +396,7 @@
}
}
logger.info("鍙戦�佹ā鏉挎秷鎭唴瀹�:{}", JSON.toJSONString(templateMessage));
- responseEntity = outRestTemplate.postForEntity(sendMsgUrl + accessToken, JSON.toJSONString(templateMessage), String.class);
+ responseEntity = outRestTemplate.postForEntity(sendTemplate + accessToken, JSON.toJSONString(templateMessage), String.class);
logger.info("寰俊妯℃澘杩斿洖鍐呭:{}", responseEntity);
} catch (Exception e) {
logger.error("鍙戦�佸け璐�", e);
--
Gitblit v1.8.0