From 7007db947ea409a973aee8a681ee86cf9d2708bf Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期四, 08 六月 2023 18:54:52 +0800
Subject: [PATCH] 优化1.5 的bug
---
service-job/src/main/java/com/java110/job/task/wechat/WeChatPushMessageTemplate.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 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 b31a1af..d5b4a66 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
@@ -39,6 +39,7 @@
import com.java110.po.wechatSubscribe.WechatSubscribePo;
import com.java110.service.smo.ISaveSystemErrorSMO;
import com.java110.utils.cache.MappingCache;
+import com.java110.utils.cache.UrlCache;
import com.java110.utils.constant.MappingConstant;
import com.java110.utils.constant.WechatConstant;
import com.java110.utils.util.DateUtil;
@@ -207,7 +208,8 @@
String objType = noticeDto.getObjType();
switch (objType) {
case NoticeDto.OBJ_TYPE_ALL: //鍏ㄩ儴鎺ㄩ��
- sendAllOwners(noticeDto, templateId, accessToken, weChatDto);
+ sendAllOwner(noticeDto, templateId, accessToken, weChatDto);
+ //sendAllOwners(noticeDto, templateId, accessToken, weChatDto);
break;
case NoticeDto.OBJ_TYPE_FLOOR: //妤兼爧
sendFloorOwner(noticeDto, templateId, accessToken, weChatDto);
@@ -363,10 +365,10 @@
if (wechatSubscribeDtos == null || wechatSubscribeDtos.size() < 1) {
return;
}
- String wechatUrl = MappingCache.getValue(MappingConstant.URL_DOMAIN,"OWNER_WECHAT_URL");
+ String wechatUrl = UrlCache.getOwnerUrl();
Miniprogram miniprogram = null;
if (wechatUrl.startsWith("https://") || wechatUrl.startsWith("http://")) {
- miniprogram = new Miniprogram();
+ //miniprogram = new Miniprogram();
} else {
miniprogram = new Miniprogram();
miniprogram.setAppid(wechatUrl);
@@ -477,7 +479,7 @@
data.setRemark(new Content("濡傛湁鐤戦棶璇疯仈绯荤浉鍏崇墿涓氫汉鍛�"));
templateMessage.setData(data);
//鑾峰彇涓氫富鍏紬鍙峰湴鍧�
- String wechatUrl = MappingCache.getValue(MappingConstant.URL_DOMAIN,"OWNER_WECHAT_URL");
+ String wechatUrl = UrlCache.getOwnerUrl();
if (!StringUtil.isEmpty(wechatUrl) && wechatUrl.contains("?")) {
wechatUrl += ("&wAppId=" + weChatDto.getAppId());
} else {
@@ -547,7 +549,7 @@
}
private void doSend(List<OwnerAppUserDto> ownerAppUserDtos, NoticeDto noticeDto, String templateId, String accessToken, SmallWeChatDto weChatDto) {
- String wechatUrl = MappingCache.getValue(MappingConstant.URL_DOMAIN,"OWNER_WECHAT_URL") + "/#/pages/notice/detail/detail?noticeId=";
+ String wechatUrl = UrlCache.getOwnerUrl() + "/#/pages/notice/detail/detail?noticeId=";
ResponseEntity<String> responseEntity = null;
String sendTemplate = MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, WechatConstant.SEND_TEMPLATE_URL);
if (StringUtil.isEmpty(sendTemplate)) {
--
Gitblit v1.8.0