no message

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);
+        
+    }
 }

app/Http/Controllers/Web/Nasa/V1/ActionsController.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace App\Http\Controllers\Web\Nasa\V1;
+
+use Illuminate\Http\Request;
+use App\Http\Requests\Nasa\NasaQueryRequest;
+use Illuminate\View\View;
+use Illuminate\Support\Facades\Http;
+use App\Http\Controllers\Web\Nasa\V1\Base\ListController;
+
+class ActionsController
+{
+    public function artsyncSave(NasaQueryRequest $oRequest)
+    {
+        $aParams = $oRequest->all() ?? [];
+        
+//        $iId = intval(request('id'));
+
+        $sSiteWww = $oRequest->input('nasa_site_www');
+
+        $oResponse = Http::nasa($sSiteWww)->post('/article/base/sync/save', $aParams);
+
+        return $oResponse->json();
+
+    }
+    
+}
+ 

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爬取说明书",
     ];

app/Services/Tg/Hook/Mod/Arma.php

@@ -80,13 +80,11 @@ class Arma extends Base {
         }
         
         $oArticle = ModelArticleSchema::where("id", $id)->first();
-        
+        $r = ServiceArticleCmd::startWithO($oArticle)->setSiteGroupCode($sSiteGroup)->syncOpen()->save($sCmdType);
-        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)

resources/views/nasa/_commons/list.blade.php

@@ -179,6 +179,38 @@
     </div>
 </div>
 
+<div class="tom-modal" tom-modal-name="art-sync" tabindex="-1" tom-modal-lock="true" hidden>
+    <div class="tom-modal-inner">
+        <div class="tom-modal-header">
+            <span class="text-muted">json</span>
+            <a class="text-muted js-tom-modal-close">✕</a>
+        </div>
+        <div class="tom-modal-body-flex">
+            <table>
+            <tr>
+                <td>ID：</td>
+                <td><input class="art-sync-id" type="text" class="mac-input-medium text-secondary js-tom-modal-save-input"></td>
+            </tr>
+            <tr>
+                <td>siteGroupCode：</td>
+                <td><input class="art-sync-sitegroupcode" type="text" class="mac-input-medium text-secondary js-tom-modal-save-input"></td>
+            </tr>
+            <tr>
+                <td>TYPE：</td>
+                <td>
+                    <select class="art-sync-type">
+                        <option value="put">put</option>
+                    </select>
+                </td>
+            </tr>
+            </table>
+        </div>
+        <div class="tom-modal-footer">
+            <button class="mac-btn-primary width-full js-art-sync-save js-enter">确定</button>
+        </div>
+    </div>
+</div>
+
 <div class="tom-modal" tom-modal-name="json" tabindex="-1" tom-modal-lock="true" hidden>
     <div class="tom-modal-inner">
         <div class="tom-modal-header">

resources/views/nasa/v1/_actions/artsync.blade.php

@@ -0,0 +1,49 @@
+<button class="mac-btn-secondary text-secondary mac-input-medium js-list-add-trigger">添加</button>
+<button class="mac-btn-secondary text-secondary mac-input-medium js-art-sync">同步</button>
+
+<script type="module">
+
+$(function() {
+    $(document).on('click', '.js-art-sync', function(oEvent){
+      tomModalShow("art-sync");
+    });
+
+    $(document).on('click', '.js-art-sync-save', function(oEvent){
+           let sPathWww = $("#nasa_site_www").val();
+           let iId = $(".art-sync-id").val();
+           let sType = $(".art-sync-type").val();
+           let sSiteGroupCode = $(".art-sync-sitegroupcode").val();
+
+           $.ajax({
+               url: "/nasa/master/article/artsync/save",
+               type: 'GET',
+               dataType: 'json',
+               data: {
+                  'nasa_site_www': sPathWww,
+                  'id': iId,
+                  'type': sType,
+                  'siteGroupCode': sSiteGroupCode
+               },
+               success: function(j) {
+                   TomAlert.show({
+                       sMsg: j.sMsg,
+                       sType: 'success',
+                   });
+               }
+           });
+    });
+  
+    $(document).on('keydown', '.tom-modal', function(oEvent) {
+        if (oEvent.which === 13) {
+            let bHasCommandKey = oEvent.metaKey || oEvent.ctrlKey;
+                if (bHasCommandKey) {
+//                    oEvent.preventDefault();
+                    $(".js-art-sync-save").trigger('click');
+                    return false;
+                }
+        }
+    });
+  
+});
+
+</script>

routes/api.php

@@ -100,6 +100,7 @@ Route::prefix('nasa/v1')->middleware('nasa.auth')->group(function () {
          Route::get('clone/{id}', [NasaV1ArticleBaseController::class, 'clone']);
          Route::put('clone/save', [NasaV1ArticleBaseController::class, 'cloneSave']);
          Route::get('hit/{id}/{field}', [NasaV1ArticleBaseController::class, 'hit']);
+         Route::post('sync/save', [NasaV1ArticleBaseController::class, 'syncSave']);
      });
                                                                                                  
      Route::prefix('article/cache')->group(function() {

routes/web.php

@@ -48,6 +48,7 @@ use App\Http\Controllers\Web\Nasa\V1\MasterCachetgBaseController as NasaMasterCa
 use App\Http\Controllers\Web\Nasa\V1\MasterTelegramKeysController as NasaMasterTelegramKeysController;
 use App\Http\Controllers\Web\Nasa\V1\ResourceArticleBaseController as NasaResourceArticleBaseController;
 use App\Http\Controllers\Web\Nasa\V1\ResourceUploadimagesBaseController as NasaResourceUploadimagesBaseController;
+use App\Http\Controllers\Web\Nasa\V1\ActionsController as NasaActionsController;
 
 Route::get('/birds/create', [BirdController::class, 'create'])->name('birds.create'); // 录入界面
 Route::get('/birds/{id}', [BirdController::class, 'show'])->name('birds.show');       // 详情展示界面
@@ -87,6 +88,7 @@ Route::prefix('nasa')->middleware(['auth'])->group(function () {
     Route::get('/master/article/base', [NasaMasterArticleBaseController::class, 'index'])->name('nasa.master.article.base');
     Route::get('/master/article/cache', [NasaMasterArticleCacheController::class, 'index'])->name('nasa.master.article.cache');
     Route::get('/master/article/sitemapgroup', [NasaMasterArticleSitemapgroupController::class, 'index'])->name('nasa.master.article.sitemapgroup');
+    Route::get('/master/article/artsync/save', [NasaActionsController::class, 'artsyncSave']);
     Route::get('/master/option/base', [NasaMasterOptionBaseController::class, 'index'])->name('nasa.master.option.base');
     Route::get('/master/sitemap/base', [NasaMasterSitemapBaseController::class, 'index'])->name('nasa.master.sitemap.base');
     Route::get('/master/cachetg/base', [NasaMasterCachetgBaseController::class, 'index'])->name('nasa.master.cachetg.base');