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

* finish task #6539,6537.

Browse Source
This commit is contained in:
wangyidong
2019-11-18 14:14:03 +08:00
parent eb1267ebe7
commit 6434e06342
12 changed files with 329 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/webhook/model.php
+51 -3
View File
@@ -113,6 +113,19 @@ class webhookModel extends model
return $this->dao->select('*')->from(TABLE_NOTIFY)->where('status')->eq('wait')->andWhere('objectType')->eq('webhook')->orderBy('id')->fetchAll('id');
}
/**
* Get bind users.
*
* @param int $webhookID
* @access public
* @return array
*/
public function getBindUsers($webhookID)
{
return $this->dao->select('*')->from(TABLE_DINGUSERID)->where('webhook')->eq($webhookID)
->fetchPairs('account', 'userid');
}
/**
* Create a webhook.
*
@@ -133,14 +146,20 @@ class webhookModel extends model
if($webhook->type == 'dingapi')
{
$webhook->secret = array();
$webhook->secret['agentId'] = $webhook->agentId;
$webhook->secret['appKey'] = $webhook->appKey;
$webhook->secret['appSecret'] = $webhook->appSecret;
if(empty($webhook->agentId)) dao::$errors['agentId'] = sprintf($this->lang->error->notempty, $this->lang->webhook->dingAgentId);
if(empty($webhook->appKey)) dao::$errors['appKey'] = sprintf($this->lang->error->notempty, $this->lang->webhook->dingAppKey);
if(empty($webhook->appSecret)) dao::$errors['appSecret'] = sprintf($this->lang->error->notempty, $this->lang->webhook->dingAppSecret);
if(dao::isError()) return false;
$webhook->secret = json_encode($webhook->secret);
$webhook->url = $this->config->webhook->dingapiUrl;
}
$this->dao->insert(TABLE_WEBHOOK)->data($webhook, 'appKey,appSecret')
$this->dao->insert(TABLE_WEBHOOK)->data($webhook, 'agentId,appKey,appSecret')
->batchCheck($this->config->webhook->create->requiredFields, 'notempty')
->autoCheck()
->exec();
@@ -170,13 +189,19 @@ class webhookModel extends model
if($webhook->type == 'dingapi')
{
$webhook->secret = array();
$webhook->secret['agentId'] = $webhook->agentId;
$webhook->secret['appKey'] = $webhook->appKey;
$webhook->secret['appSecret'] = $webhook->appSecret;
if(empty($webhook->agentId)) dao::$errors['agentId'] = sprintf($this->lang->error->notempty, $this->lang->webhook->dingAgentId);
if(empty($webhook->appKey)) dao::$errors['appKey'] = sprintf($this->lang->error->notempty, $this->lang->webhook->dingAppKey);
if(empty($webhook->appSecret)) dao::$errors['appSecret'] = sprintf($this->lang->error->notempty, $this->lang->webhook->dingAppSecret);
if(dao::isError()) return false;
$webhook->secret = json_encode($webhook->secret);
}
$this->dao->update(TABLE_WEBHOOK)->data($webhook, 'appKey,appSecret')
$this->dao->update(TABLE_WEBHOOK)->data($webhook, 'agentId,appKey,appSecret')
->batchCheck($this->config->webhook->edit->requiredFields, 'notempty')
->autoCheck()
->where('id')->eq($id)
@@ -184,6 +209,29 @@ class webhookModel extends model
return !dao::isError();
}
/**
* Bind ding userid.
*
* @param int $webhookID
* @access public
* @return bool
*/
public function bind($webhookID)
{
$data = fixer::input('post')->get();
foreach($data->userid as $account => $userid)
{
if(empty($userid)) continue;
$dingUser = new stdclass();
$dingUser->webhook = $webhookID;
$dingUser->account = $account;
$dingUser->userid = $userid;
$this->dao->replace(TABLE_DINGUSERID)->data($dingUser)->exec();
}
return !dao::isError();
}
/**
* Send data.
*
@@ -288,7 +336,7 @@ class webhookModel extends model
foreach(explode(',', $webhook->params) as $param) $data->$param = $action->$param;
}
return helper::jsonEncode($data);
return json_encode($data);
}
/**