Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

Merge branch 'fix_feishu_webhook' into 'master'

Browse Source 
* Fix feishu webhook missing msg_type when no secret.

See merge request easycorp/zentaopms!6623
This commit is contained in:
朱金勇
2022-12-29 06:42:49 +00:00
parent b3a1c696b2 7623eacfe5
commit 3cbc18f277
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/webhook/model.php
+4 -6
View File
@@ -453,7 +453,7 @@ class webhookModel extends model
{
$data = $this->getWeixinData($title, $text, $mobile);
}
elseif($webhook->type == 'feishuuser')
elseif($webhook->type == 'feishuuser' or $webhook->type == 'feishugroup')
{
$data = $this->getFeishuData($title, $text);
}
@@ -705,11 +705,9 @@ class webhookModel extends model
$sign = $timestamp . "\n" . $webhook->secret;
$sign = base64_encode(hash_hmac('sha256', '', $sign, true));
$content = array();
$content['timestamp'] = $timestamp;
$content['sign'] = $sign;
$content['msg_type'] = 'text';
$content['content'] = json_decode($sendData);
$content = json_decode($sendData);
$content->timestamp = $timestamp;
$content->sign = $sign;
$sendData = json_encode($content);
}