diff --git a/app/Http/Controllers/SakaiController.php b/app/Http/Controllers/SakaiController.php index fe477987..750efcee 100755 --- a/app/Http/Controllers/SakaiController.php +++ b/app/Http/Controllers/SakaiController.php @@ -343,9 +343,9 @@ class SakaiController $s = "/dove#check cfn"; $s = "/dove%zzz"; $s = "/dove%cmd#list"; - $s = "/dove#add xxx"; - $s = "/dove#set__xxx__memo fff"; - $s = "/dove#del xxx"; +// $s = "/dove#add xxx"; +// $s = "/dove#set__xxx__memo fff"; +// $s = "/dove#list"; diff --git a/app/Services/TG/Hook/Mod/Dove.php b/app/Services/TG/Hook/Mod/Dove.php index 7827903f..d4bff215 100644 --- a/app/Services/TG/Hook/Mod/Dove.php +++ b/app/Services/TG/Hook/Mod/Dove.php @@ -5,6 +5,7 @@ namespace App\Services\TG\Hook\Mod; //use App\Models\Hook as ModelHook; use App\Models\DoveSite as ModelDoveSite; use App\Services\TomTool\Http; +use App\Services\TG\Http as TGHttp; class Dove extends Base { @@ -20,18 +21,27 @@ class Dove extends Base { $aData['dove_token'] = env('dove_token'); + $oTGHttp = new TGHttp(); $oHttp = new Http(); $oHttp->sMethod = "post"; $oHttp->bIsJson = true; + $r = []; foreach ($oDoveSiteCheckedList as $row) { $sApiUrl = "https://".$row->www.$row->api_path; $oHttp->sToUrl = $sApiUrl; $oHttp->aData = $aData; - $r[] = $oHttp->send(); + $tmp = $oHttp->send(); + +// $r[] = [$row->www => $tmp]; + $r = "\n".$row->www."\n".$tmp; +// tomd($r); + $oTGHttp->sendToTG($r); + + } - return $r; + Http::response(200, 'ok'); } public function del($aParam) @@ -127,7 +137,7 @@ class Dove extends Base { $r = ModelDoveSite::query()->update(["dove_checked" => 0]); - return $this->now(); + return $this->list(); } public function uncheck($aParam)