update:修改飞书普通消息推送
This commit is contained in:
+4
-3
@@ -479,10 +479,11 @@ public class FeiShuDockingServiceImpl implements IFeiShuDockingService {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
// 将url替换为单点登录的地址
|
// 将url替换为单点登录的地址
|
||||||
|
if (StringUtils.isNotBlank(botMessageDto.getHrefUrl())) {
|
||||||
// 使用 URL 编码来处理特殊字符,将url替换为单点登录的地址
|
// 使用 URL 编码来处理特殊字符,将url替换为单点登录的地址
|
||||||
String hrefUrl = URLEncoder.encode(botMessageDto.getHrefUrl(), "UTF-8");
|
String hrefUrl = URLEncoder.encode(botMessageDto.getHrefUrl(), "UTF-8");
|
||||||
if (StringUtils.isNotBlank(hrefUrl)) {
|
|
||||||
hrefUrl = signLoginUrl.replace("{REDIRECT_URI}", hrefUrl);
|
hrefUrl = signLoginUrl.replace("{REDIRECT_URI}", hrefUrl);
|
||||||
|
botMessageDto.setHrefUrl(hrefUrl);
|
||||||
}
|
}
|
||||||
// 构建消息内容部分
|
// 构建消息内容部分
|
||||||
JSONArray contentArray = new JSONArray();
|
JSONArray contentArray = new JSONArray();
|
||||||
@@ -494,10 +495,10 @@ public class FeiShuDockingServiceImpl implements IFeiShuDockingService {
|
|||||||
contentArray.add(textBeforeHrefObject);
|
contentArray.add(textBeforeHrefObject);
|
||||||
}
|
}
|
||||||
// 构建超链接文本
|
// 构建超链接文本
|
||||||
if (StringUtils.isNotBlank(botMessageDto.getHrefText()) && StringUtils.isNotBlank(hrefUrl)) {
|
if (StringUtils.isNotBlank(botMessageDto.getHrefText()) && StringUtils.isNotBlank(botMessageDto.getHrefUrl())) {
|
||||||
JSONObject hrefContentObject = new JSONObject();
|
JSONObject hrefContentObject = new JSONObject();
|
||||||
hrefContentObject.put("tag", "a");
|
hrefContentObject.put("tag", "a");
|
||||||
hrefContentObject.put("href", hrefUrl);
|
hrefContentObject.put("href", botMessageDto.getHrefUrl());
|
||||||
hrefContentObject.put("text", botMessageDto.getHrefText());
|
hrefContentObject.put("text", botMessageDto.getHrefText());
|
||||||
contentArray.add(hrefContentObject);
|
contentArray.add(hrefContentObject);
|
||||||
}
|
}
|
||||||
|
|||||||
+9
-4
@@ -4,15 +4,12 @@ import com.alibaba.fastjson.JSON;
|
|||||||
import com.jero.common.util.SpringContextUtils;
|
import com.jero.common.util.SpringContextUtils;
|
||||||
import com.jero.modules.docking.feishu.dto.BotMessageDto;
|
import com.jero.modules.docking.feishu.dto.BotMessageDto;
|
||||||
import com.jero.modules.docking.feishu.service.IFeiShuDockingService;
|
import com.jero.modules.docking.feishu.service.IFeiShuDockingService;
|
||||||
import com.jero.modules.docking.hiwork.entity.LawsUnifiedTodoLog;
|
|
||||||
import com.jero.modules.docking.hiwork.service.LawsUnifiedTodoLogService;
|
|
||||||
import com.jero.modules.message.handle.ISendMsgHandle;
|
import com.jero.modules.message.handle.ISendMsgHandle;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import org.springframework.core.env.Environment;
|
import org.springframework.core.env.Environment;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
import javax.annotation.Resource;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @Author: liao
|
* @Author: liao
|
||||||
* @Date: 2023/10/17 11:23
|
* @Date: 2023/10/17 11:23
|
||||||
@@ -27,10 +24,18 @@ public class SendFeiShuHandle implements ISendMsgHandle {
|
|||||||
IFeiShuDockingService bean = SpringContextUtils.getBean(IFeiShuDockingService.class);
|
IFeiShuDockingService bean = SpringContextUtils.getBean(IFeiShuDockingService.class);
|
||||||
Environment env = SpringContextUtils.getBean(Environment.class);
|
Environment env = SpringContextUtils.getBean(Environment.class);
|
||||||
BotMessageDto botMessageDto = new BotMessageDto();
|
BotMessageDto botMessageDto = new BotMessageDto();
|
||||||
|
if (StringUtils.isBlank(openType)) {
|
||||||
|
// 不带超链接的普通消息
|
||||||
|
botMessageDto.setTextBeforeHref(esContent);
|
||||||
|
botMessageDto.setTitle(esTitle);
|
||||||
|
botMessageDto.setReceiveIds(esReceiver);
|
||||||
|
}else {
|
||||||
|
// 带超链接的跳转消息
|
||||||
botMessageDto.setHrefText(esContent);
|
botMessageDto.setHrefText(esContent);
|
||||||
botMessageDto.setHrefUrl(env.getProperty("feishu.redirect_prefix") + openPage);
|
botMessageDto.setHrefUrl(env.getProperty("feishu.redirect_prefix") + openPage);
|
||||||
botMessageDto.setTitle(esTitle);
|
botMessageDto.setTitle(esTitle);
|
||||||
botMessageDto.setReceiveIds(esReceiver);
|
botMessageDto.setReceiveIds(esReceiver);
|
||||||
|
}
|
||||||
log.info("飞书====================" + JSON.toJSONString(botMessageDto));
|
log.info("飞书====================" + JSON.toJSONString(botMessageDto));
|
||||||
bean.sendHrefMessageByBot(botMessageDto);
|
bean.sendHrefMessageByBot(botMessageDto);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user