diff --git a/app/Http/Controllers/Api/TG/HookController.php b/app/Http/Controllers/Api/TG/HookController.php index 4ed210c..a1fcb6d 100755 --- a/app/Http/Controllers/Api/TG/HookController.php +++ b/app/Http/Controllers/Api/TG/HookController.php @@ -51,8 +51,19 @@ final class HookController // $sText = "////Article#Add jxxjjjj"; // $sText = "//\\\//Article#Del 9"; // $sText = "/Article#Set__1__user_name xxx"; +// $sText = "$ cmd#list__si__sk 234"; + // 拆分后直接 @$aArg = explode(" ", $sText); + + if ($aArg[0] != '$') { + exit(); + } + + unset($aArg[0]); // 丢掉$ + + $aArg = array_values($aArg); + @$aOption = explode("__", $aArg[0]); $sCmd = $this->cleanCmd($aOption[0]); @@ -73,7 +84,7 @@ final class HookController $r = $oInstans->$sFunc($aParams); } else { - $this->sendMessage("没有这个方法"); + $oTGHttp->sendToTG("没有这个方法"); } } catch (\Exception $e) { diff --git a/app/Http/Controllers/TestsController.php b/app/Http/Controllers/TestsController.php index 3fc4583..91e6b09 100755 --- a/app/Http/Controllers/TestsController.php +++ b/app/Http/Controllers/TestsController.php @@ -24,7 +24,7 @@ class TestsController //test // $s = "\/AticleSet__1115zz__sale_rate 1118.118"; - $s = "\/Cmd#List"; + $s = "/ cmd#list__si__sk 234"; $oHttp = new Http(); $oHttp->sMethod = "post"; diff --git a/app/Services/TG/Hook/Article.php b/app/Services/TG/Hook/Article.php index d209ae9..b984d7b 100644 --- a/app/Services/TG/Hook/Article.php +++ b/app/Services/TG/Hook/Article.php @@ -2,7 +2,6 @@ namespace App\Services\TG\Hook; use App\Models\Article as ModelArticle; -//use App\Services\TomTool\Http; class Article extends Base { diff --git a/app/Services/TG/Hook/System.php b/app/Services/TG/Hook/Git.php similarity index 79% rename from app/Services/TG/Hook/System.php rename to app/Services/TG/Hook/Git.php index 68ab0d2..a69f54e 100644 --- a/app/Services/TG/Hook/System.php +++ b/app/Services/TG/Hook/Git.php @@ -1,8 +1,9 @@