diff --git a/module/webhook/control.php b/module/webhook/control.php index a23b4e0f4b..2e60dd345e 100644 --- a/module/webhook/control.php +++ b/module/webhook/control.php @@ -350,14 +350,12 @@ class webhook extends control if(empty($webhooks)) { echo "NO WEBHOOK EXIST.\n"; - return false; } $dataList = $this->webhook->getDataList(); if(empty($dataList)) { echo "OK\n"; - return true; } $this->webhook->setSentStatus(array_keys($dataList), 'senting'); @@ -385,6 +383,5 @@ class webhook extends control $this->dao->delete()->from(TABLE_NOTIFY)->where('status')->eq('sended')->exec(); echo "OK\n"; - return true; } } diff --git a/module/webhook/js/create.js b/module/webhook/js/create.js index 0084948e72..7b2c78783c 100644 --- a/module/webhook/js/create.js +++ b/module/webhook/js/create.js @@ -3,7 +3,7 @@ $(function() $('#type').change(function() { var type = $(this).val(); - $('#sendTypeTR').toggle(type != 'dinggroup' && type != 'dinguser' && type != 'wechatuser' && type != 'wechatgroup' && type != 'feishuuser' && type != 'feishugroup'); + //$('#sendTypeTR').toggle(type != 'dinggroup' && type != 'dinguser' && type != 'wechatuser' && type != 'wechatgroup' && type != 'feishuuser' && type != 'feishugroup'); $('#secretTR').toggle(type == 'dinggroup' || type == 'feishugroup'); $('#urlTR').toggle(type != 'dinguser' && type != 'wechatuser' && type != 'feishuuser'); $('.dinguserTR').toggle(type == 'dinguser'); diff --git a/module/webhook/model.php b/module/webhook/model.php index db2f144890..81fba337bb 100644 --- a/module/webhook/model.php +++ b/module/webhook/model.php @@ -789,7 +789,7 @@ class webhookModel extends model $log->url = $webhook->url; $log->contentType = $webhook->contentType; $log->data = $data; - $log->result = $result; + $log->result = (string)$result; $this->dao->insert(TABLE_LOG)->data($log)->exec(); return !dao::isError(); diff --git a/module/webhook/view/edit.html.php b/module/webhook/view/edit.html.php index b0ddfc3add..660418b84b 100644 --- a/module/webhook/view/edit.html.php +++ b/module/webhook/view/edit.html.php @@ -91,13 +91,11 @@