xinyouhe/fdesk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

Browse Source 
# Conflicts:
#	app/command/DomainCommand.php
#	app/common/utils/FeishuMessage.php
#	app/queue/redis/FeishuMessage.php
#	app/queue/redis/InquiryToCrm.php
This commit is contained in:
mzl
2025-07-29 19:39:17 +08:00
parent e191788e0a
commit caa04809a9
5 changed files with 125 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/queue/redis/FeishuMessage.php
+9 -5
View File
@@ -49,6 +49,7 @@ class FeishuMessage implements Consumer
'app_id' => $feishuAppInfo->app_id,
'app_secret' => $feishuAppInfo->app_secret,
'state' => $feishuAppInfo->state,
'msg_type' => 'interactive',
'receive_id_type' => 'open_id',
'receive_id' => $reInfo->open_id
@@ -62,9 +63,10 @@ class FeishuMessage implements Consumer
// 接受者处理
if ($data['receive_type'] == 'group') {
$appId = 'cli_a72f13d6c022500d';
$appSecret = 'Kxtbq70OQWrEhpltrufRZc76z7kjDqPT';
$receiveId = 'oc_4f574e6f8bc5b8f3e5175e67ebc5725c';
$appId = 'cli_a6183b882cb8500d';
$appSecret = 'VqYib48u4EtDIa6nG9qH3f0fYCA1bCvs';
$state = 'hesu';
$receiveId = 'oc_a52d9f89ad76735279088c78beade8dc';
$receiveIdType = 'chat_id';
} else {
// 跟单人
@@ -75,6 +77,7 @@ class FeishuMessage implements Consumer
// 推送信息
$appId = $feishuAppInfo->app_id;
$appSecret = $feishuAppInfo->app_secret;
$state = $feishuAppInfo->state;
$receiveId = $reInfo->open_id;
$receiveIdType = 'open_id';
}
@@ -91,13 +94,14 @@ class FeishuMessage implements Consumer
'app_id' => $appId,
'app_secret' => $appSecret,
'state' => $state,
'msg_type' => 'interactive',
'receive_id_type' => $receiveIdType,
'receive_id' => $receiveId
];
}
$feishuMsg = new FeishuMsg();
$feishuMsg = new FeishuMsg($options);
$feishuMsg->messageSend($data['scene'], $options);
} catch (\Throwable $th) {
throw $th;