Переглянути джерело

改为 App\Tools\WebHook 发消息

visuddhinanda 2 роки тому
батько
коміт
a575602958
1 змінених файлів з 6 додано та 7 видалено
  1. 6 7
      app/Console/Commands/MqPr.php

+ 6 - 7
app/Console/Commands/MqPr.php

@@ -7,6 +7,8 @@ use App\Http\Api\Mq;
 use App\Models\Sentence;
 use App\Models\Sentence;
 use App\Models\WebHook;
 use App\Models\WebHook;
 use App\Models\PaliSentence;
 use App\Models\PaliSentence;
+use App\Tools\WebHook as WebHookSend;
+use App\Http\Api\MdRender;
 
 
 class MqPr extends Command
 class MqPr extends Command
 {
 {
@@ -72,21 +74,18 @@ class MqPr extends Command
                     continue;
                     continue;
                 }
                 }
                 $command = '';
                 $command = '';
+                $whSend = new WebHookSend;
                 switch ($hook->receiver) {
                 switch ($hook->receiver) {
                     case 'dingtalk':
                     case 'dingtalk':
-                        $command = 'webhook:dingtalk';
+                        $ok = $whSend->dingtalk($hook->url,$msgTitle,$msgContent);
                         break;
                         break;
                     case 'wechat':
                     case 'wechat':
-                        $command = 'webhook:wechat';
+                        $ok = $whSend->wechat($hook->url,null,$msgContent);
                         break;
                         break;
                     default:
                     default:
-                        # code...
+                        $ok=2;
                         break;
                         break;
                 }
                 }
-                $ok = $this->call($command,['url'=>$hook->url,
-                                            'title'=>$msgTitle,
-                                            'message'=>$msgContent,
-                                            ]);
                 $this->info("{$command}  ok={$ok}");
                 $this->info("{$command}  ok={$ok}");
                 if($ok===0){
                 if($ok===0){
                     WebHook::where('id',$hook->id)->increment('success');
                     WebHook::where('id',$hook->id)->increment('success');