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

* finish task #6611.

Browse Source
This commit is contained in:
wangyidong
2019-12-03 11:45:28 +08:00
parent b0ed590dc9
commit 5af6fc1218
3 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/webhook/model.php
+7 -5
View File
@@ -253,7 +253,7 @@ class webhookModel extends model
* @access public
* @return bool
*/
public function send($objectType, $objectID, $actionType, $actionID)
public function send($objectType, $objectID, $actionType, $actionID, $actor = '')
{
static $webhooks = array();
if(!$webhooks) $webhooks = $this->getList();
@@ -272,7 +272,7 @@ class webhookModel extends model
if(empty($openIdList)) continue;
}
$this->saveData($id, $actionID, $postData);
$this->saveData($id, $actionID, $postData, $actor);
continue;
}
@@ -517,7 +517,7 @@ class webhookModel extends model
if($webhook->type == 'dingapi')
{
$webhook->secret = json_decode($webhook->secret);
if(is_string($webhook->secret)) $webhook->secret = json_decode($webhook->secret);
$openIdList = $this->getOpenIdList($webhook->id, $actionID);
if(empty($openIdList)) return false;
@@ -571,14 +571,16 @@ class webhookModel extends model
* @access public
* @return bool
*/
public function saveData($webhookID, $actionID, $data)
public function saveData($webhookID, $actionID, $data, $actor = '')
{
if(empty($actor)) $actor = $this->app->user->account;
$webhookData = new stdclass();
$webhookData->objectType = 'webhook';
$webhookData->objectID = $webhookID;
$webhookData->action = $actionID;
$webhookData->data = $data;
$webhookData->createdBy = $this->app->user->account;
$webhookData->createdBy = $actor;
$webhookData->createdDate = helper::now();
$this->dao->insert(TABLE_NOTIFY)->data($webhookData)->exec();