diff --git a/app/Http/Controllers/Api/TG/HookController.php b/app/Http/Controllers/Api/TG/HookController.php index 949d0ca..a5e750c 100755 --- a/app/Http/Controllers/Api/TG/HookController.php +++ b/app/Http/Controllers/Api/TG/HookController.php @@ -28,6 +28,16 @@ final class HookController $aData['chatId'] = $aUpdate["message"]["chat"]["id"]; $aData['fromId'] = $aUpdate["message"]["from"]["id"]; + $mSendType = false; + + if (isset($aUpdate["is_dove"])) { + $mSendType = "dove"; + } + +// tomd($mSendType, 1); + +// $mSendType = $aUpdate[] + if (!isset($aUpdate["message"]["text"])) { throw new \Exception("?"); } @@ -71,10 +81,10 @@ final class HookController // 返回可以是数组 if (is_array($r)) { foreach ($r as $row) { - $oTGHttp->sendToTG($row); + $oTGHttp->sendToTG($row, $mSendType); } } else { - $oTGHttp->sendToTG($r); + $oTGHttp->sendToTG($r, $mSendType); } Http::response(200, 'ok'); @@ -87,7 +97,7 @@ final class HookController } catch (\Throwable $e) { $sMessage = "错误(line:".$e->getLine()."): " . $e->getMessage(); - $oTGHttp->sendToTG($sMessage); + $oTGHttp->sendToTG($sMessage, $mSendType); Http::response(200, 'error'); } diff --git a/app/Services/TG/Hook/Mod/Cmd.php b/app/Services/TG/Hook/Mod/Cmd.php index 70c861d..7b09894 100644 --- a/app/Services/TG/Hook/Mod/Cmd.php +++ b/app/Services/TG/Hook/Mod/Cmd.php @@ -25,9 +25,7 @@ class Cmd extends Base { '测试cron' => "test#cron_i 01", ]; - $this->oTGHttp->sendToTG(json_encode($aCmdList, JSON_UNESCAPED_UNICODE | JSON_PRETTY_PRINT)); - - $this->oHttp::response(200, 'ok'); + return $this->toJson($aCmdList); } diff --git a/app/Services/TG/Http.php b/app/Services/TG/Http.php index 390fd97..3be2369 100644 --- a/app/Services/TG/Http.php +++ b/app/Services/TG/Http.php @@ -13,15 +13,23 @@ class Http { $this->sApiChatId = env('telegram_chatid'); } - public function sendToTG($sMsg) + public function sendToTG($sMsg, $mType = false) { - if (env('is_loc') == true) { + if ($mType == "dove") { + + echo $sMsg; + + } else if (env('is_loc') == true) { + echo "
";
             echo($sMsg);
+            
         } else {
+            
             $url = "https://api.telegram.org/bot$this->sApiToken/sendMessage?chat_id=$this->sApiChatId&text=" . urlencode($sMsg);
             file_get_contents($url);
+            
         }
         
     }