diff --git a/app/Http/Controllers/Api/Nasa/V1/ArticleBaseController.php b/app/Http/Controllers/Api/Nasa/V1/ArticleBaseController.php index 1ad95ac4..563c2ed2 100755 --- a/app/Http/Controllers/Api/Nasa/V1/ArticleBaseController.php +++ b/app/Http/Controllers/Api/Nasa/V1/ArticleBaseController.php @@ -5,6 +5,7 @@ declare(strict_types=1); namespace App\Http\Controllers\Api\Nasa\V1; use Illuminate\Http\Request; use App\Http\Controllers\Api\Nasa\V1\Base\ListController; +use App\Services\Tg\Hook\Mod\Arma; final class ArticleBaseController extends ListController { @@ -81,4 +82,23 @@ final class ArticleBaseController extends ListController // protected array $aLimit = [3, 15, 40, 100]; // list长度,第一个为默认 + public function syncSave(Request $oRequest) + { + $id = request('id'); + $siteGroupCode = request('siteGroupCode'); + $cmd = request('type'); + + $aParam['aOption'][1] = $id; + $aParam['aArg'][1] = $siteGroupCode; + $aParam['aArg'][2] = $cmd; + $oArma = new Arma([]); + $r = $oArma->cmd($aParam, []); + + return response()->json([ + 'iCode' => 200, + 'aData' => [], + 'sMsg' => $r + ], 200); + + } } diff --git a/app/Http/Controllers/Web/Nasa/V1/ActionsController.php b/app/Http/Controllers/Web/Nasa/V1/ActionsController.php new file mode 100644 index 00000000..6911a81c --- /dev/null +++ b/app/Http/Controllers/Web/Nasa/V1/ActionsController.php @@ -0,0 +1,28 @@ +all() ?? []; + +// $iId = intval(request('id')); + + $sSiteWww = $oRequest->input('nasa_site_www'); + + $oResponse = Http::nasa($sSiteWww)->post('/article/base/sync/save', $aParams); + + return $oResponse->json(); + + } + +} + diff --git a/app/Http/Controllers/Web/Nasa/V1/MasterArticleBaseController.php b/app/Http/Controllers/Web/Nasa/V1/MasterArticleBaseController.php index 143ece20..f17f614d 100644 --- a/app/Http/Controllers/Web/Nasa/V1/MasterArticleBaseController.php +++ b/app/Http/Controllers/Web/Nasa/V1/MasterArticleBaseController.php @@ -14,7 +14,7 @@ class MasterArticleBaseController extends ListController protected string $sApiPath = "article/base"; protected string $sView = 'nasa._commons.list'; protected string $sSiteWww; - protected string $sHeaderActionView = 'nasa.v1._actions.list'; + protected string $sHeaderActionView = 'nasa.v1._actions.artsync'; protected array $aBookCode = [ // "fn爬取说明书", ]; diff --git a/app/Services/Tg/Hook/Mod/Arma.php b/app/Services/Tg/Hook/Mod/Arma.php index 55a56059..2ec82c67 100755 --- a/app/Services/Tg/Hook/Mod/Arma.php +++ b/app/Services/Tg/Hook/Mod/Arma.php @@ -80,13 +80,11 @@ class Arma extends Base { } $oArticle = ModelArticleSchema::where("id", $id)->first(); - - ServiceArticleCmd::startWithO($oArticle)->setSiteGroupCode($sSiteGroup)->syncOpen()->save($sCmdType); - + $r = ServiceArticleCmd::startWithO($oArticle)->setSiteGroupCode($sSiteGroup)->syncOpen()->save($sCmdType); $aArticle = $oArticle->toArray(); unset($aArticle["schema"]); - return $this->toJson($aArticle); + return $this->toJson($aArticle['cmd']); } public function thumbUse($aParam) diff --git a/resources/views/nasa/_commons/list.blade.php b/resources/views/nasa/_commons/list.blade.php index e7e503b3..cdfad77f 100644 --- a/resources/views/nasa/_commons/list.blade.php +++ b/resources/views/nasa/_commons/list.blade.php @@ -179,6 +179,38 @@ +
| ID: | ++ |
| siteGroupCode: | ++ |
| TYPE: | ++ + | +