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

* finish task #6536.

Browse Source
This commit is contained in:
wangyidong
2019-11-15 09:04:48 +08:00
parent 64b8d04f77
commit eb1267ebe7
10 changed files with 55 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/webhook/model.php
+19 -2
View File
@@ -130,8 +130,17 @@ class webhookModel extends model
->remove('allParams, allActions')
->get();
$webhook->params = $this->post->params ? implode(',', $this->post->params) . ',text' : 'text';
if($webhook->type == 'dingapi')
{
$webhook->secret = array();
$webhook->secret['appKey'] = $webhook->appKey;
$webhook->secret['appSecret'] = $webhook->appSecret;
$webhook->secret = json_encode($webhook->secret);
$webhook->url = $this->config->webhook->dingapiUrl;
}
$this->dao->insert(TABLE_WEBHOOK)->data($webhook)
$this->dao->insert(TABLE_WEBHOOK)->data($webhook, 'appKey,appSecret')
->batchCheck($this->config->webhook->create->requiredFields, 'notempty')
->autoCheck()
->exec();
@@ -158,8 +167,16 @@ class webhookModel extends model
->remove('allParams, allActions')
->get();
$webhook->params = $this->post->params ? implode(',', $this->post->params) . ',text' : 'text';
if($webhook->type == 'dingapi')
{
$webhook->secret = array();
$webhook->secret['appKey'] = $webhook->appKey;
$webhook->secret['appSecret'] = $webhook->appSecret;
$this->dao->update(TABLE_WEBHOOK)->data($webhook)
$webhook->secret = json_encode($webhook->secret);
}
$this->dao->update(TABLE_WEBHOOK)->data($webhook, 'appKey,appSecret')
->batchCheck($this->config->webhook->edit->requiredFields, 'notempty')
->autoCheck()
->where('id')->eq($id)