no message

app/Http/Controllers/Api/Nasa/V1/Base/ListController.php

@@ -177,23 +177,23 @@ abstract class ListController
         ], 200);
     }
     
-    public function cloneSave(Request $oRequest)
+//    public function cloneSave(Request $oRequest)
-    {
+//    {
-        $iId = request('id');
+//        $iId = request('id');
-
+//
-        $aParams = $oRequest->all();
+//        $aParams = $oRequest->all();
-        
+//        
-        foreach ($aParams as $k => $v) {
+//        foreach ($aParams as $k => $v) {
-            $this->oModal->{$k} = $v;
+//            $this->oModal->{$k} = $v;
-        }
+//        }
-        $this->oModel->create();
+//        $this->oModel->create();
-
+//
-        return response()->json([
+//        return response()->json([
-            'iCode' => 200,
+//            'iCode' => 200,
-            'aData' => [],
+//            'aData' => [],
-            'sMsg'  => "保存成功：id ".$this->oModel->id
+//            'sMsg'  => "保存成功：id ".$this->oModel->id
-        ], 200);
+//        ], 200);
-    }
+//    }
     
     public function detail(Request $oRequest)
     {
@@ -334,6 +334,15 @@ abstract class ListController
         ], 200);
     }
     
+    public function getMapAll()
+    {
+        if (method_exists($this->oModel, 'getMapAll')) {
+            return $this->oModel->getMapAll();
+        }
+        
+        return [];
+    }
+    
     public function index(Request $oRequest)
     {
         if (! $this->oModel) {
@@ -427,7 +436,7 @@ abstract class ListController
                 'cList' => $oPaginatedData->items(),
                 'aListField' => $this->getListFields(),
                 'aFieldTypes' => $this->aFieldTypes,
-                'aMap' => $this->oModel->getMapAll(),
+                'aMap' => $this->getMapAll(),
                 'aValueStyle'   => $this->aValueStyle,
                 'aSelectField' => $this->aSelectFields,
                 'aFilterParam' => $this->aFilterParams,

app/Http/Controllers/Api/Nasa/V1/SettingNavController.php

@@ -43,11 +43,11 @@ final class SettingNavController extends ListController
     
     protected array $aOrderBy = [
         [
-            "sField"    => "id",
+            "sField"    => "iStatus",
             "sSort"     => "desc",
         ],
         [
-            "sField"    => "iStatus",
+            "sField"    => "id",
             "sSort"     => "desc",
         ]
     ];

app/Http/Controllers/Web/Nasa/V1/Base/ListController.php

@@ -44,7 +44,7 @@ class ListController
         $sApiPath = Arr::pull($aParams, 'api_path');
         $sSiteWww = Arr::pull($aParams, 'site_www');
         
-        $oResponse = Http::nasa($sSiteWww)->put($sApiPath.'/detail/' . $iId, $aParams);
+        $oResponse = Http::nasa($sSiteWww)->put($sApiPath.'/detail/save/' . $iId, $aParams);
         
         return response()->json($oResponse->json(), 200);
     }
@@ -56,7 +56,7 @@ class ListController
         $sApiPath = Arr::pull($aParams, 'api_path');
         $sSiteWww = Arr::pull($aParams, 'site_www');
         
-        $oResponse = Http::nasa($sSiteWww)->delete($sApiPath.'/delete/' . $iId);
+        $oResponse = Http::nasa($sSiteWww)->delete($sApiPath.'/delete/save/' . $iId);
         
         return response()->json($oResponse->json(), 200);
     }
@@ -73,11 +73,12 @@ class ListController
     
     public function addSave(NasaQueryRequest $oRequest)
     {
+//        tt(33);
         $aParams = $oRequest->all() ?? [];
         $sApiPath = Arr::pull($aParams, 'api_path');
         $sSiteWww = Arr::pull($aParams, 'site_www');
         
-        $oResponse = Http::nasa($sSiteWww)->put($sApiPath.'/add', $aParams);
+        $oResponse = Http::nasa($sSiteWww)->put($sApiPath.'/add/save', $aParams);
         
         return response()->json($oResponse->json());
     }
@@ -87,7 +88,6 @@ class ListController
         $iId = intval(request('id'));
         $sApiPath = $oRequest->input('api_path');
         $sSiteWww = $oRequest->input('site_www');
-        
         $oResponse = Http::nasa($sSiteWww)->get($sApiPath.'/clone/' . $iId);
         
         return view('nasa._commons.clone', $aResponse = $oResponse->json());
@@ -99,8 +99,8 @@ class ListController
         $sApiPath = Arr::pull($aParams, 'api_path');
         $sSiteWww = Arr::pull($aParams, 'site_www');
         
-        $oResponse = Http::nasa($sSiteWww)->put($sApiPath.'/add', $aParams);
+        $oResponse = Http::nasa($sSiteWww)->put($sApiPath.'/add/save', $aParams);
-        
+//        tt($oResponse);
         return response()->json($oResponse->json());
     }
     

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

@@ -0,0 +1,24 @@
+<?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 FuEnvConfigController extends ListController
+{
+    
+    protected string $sApiPath = 'env/config';
+    protected string $sView = 'nasa._commons.list';
+    protected string $sSiteWww;
+    protected string $sHeaderActionView = 'nasa.v1._actions.list';
+    
+    public function __construct()
+    {
+        $this->sSiteWww = config("path.url_ship_fu_base") ?? '';
+    }
+    
+}

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

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\Web\Nasa\V1\Node;
+namespace App\Http\Controllers\Web\Nasa\V1;
 
 use Illuminate\Http\Request;
 use App\Http\Requests\Nasa\NasaQueryRequest;
@@ -8,10 +8,10 @@ use Illuminate\View\View;
 use Illuminate\Support\Facades\Http;
 use App\Http\Controllers\Web\Nasa\V1\Base\ListController;
 
-class FuNodeController extends ListController
+class FuNodeBaseController extends ListController
 {
     
-    protected string $sApiPath = 'node';
+    protected string $sApiPath = 'node/base';
     protected string $sView = 'nasa._commons.list';
     protected string $sSiteWww;
     protected string $sHeaderActionView = 'nasa.v1._actions.list';

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

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\Web\Nasa\V1\Setting;
+namespace App\Http\Controllers\Web\Nasa\V1;
 
 use Illuminate\Http\Request;
 use App\Http\Requests\Nasa\NasaQueryRequest;
@@ -8,7 +8,7 @@ use Illuminate\View\View;
 use Illuminate\Support\Facades\Http;
 use App\Http\Controllers\Web\Nasa\V1\Base\ListController;
 
-class MasterNavController extends ListController
+class MasterPanelNavController extends ListController
 {
     
     protected string $sApiPath = "setting/nav";

app/Providers/AppServiceProvider.php

@@ -29,7 +29,7 @@ class AppServiceProvider extends ServiceProvider
             $sToken = md5("timestamp={$iTimestamp}&secret={$sSecret}");
             $bVerifySsl = config('nasa.verify_ssl');
 
-            if (env('is_loc') == true) {
+            if ($sSiteWww == 'dd.loc') {
                 $h = "http";
             } else {
                 $h = "https";

lang/zh_CN/menu.php

@@ -11,4 +11,5 @@ return [
     'nasa'          => 'nasa',
     'helper'        => '帮助',
     'node'          => '节点',
+    'site'          => '站点',
 ];

routes/api.php

@@ -9,12 +9,12 @@ Route::prefix('nasa/v1')->middleware('nasa.auth')->group(function () {
     Route::prefix('setting')->group(function() {
         Route::get('nav', [NasaV1SettingNavController::class, 'index']);
         Route::get('nav/detail/{id}', [NasaV1SettingNavController::class, 'detail']);
-        Route::put('nav/detail/{id}', [NasaV1SettingNavController::class, 'detailSave']);
+        Route::put('nav/detail/save/{id}', [NasaV1SettingNavController::class, 'detailSave']);
         Route::delete('nav/delete/{id}', [NasaV1SettingNavController::class, 'delete']);
         Route::get('nav/add', [NasaV1SettingNavController::class, 'add']);
-        Route::put('nav/add', [NasaV1SettingNavController::class, 'addSave']);
+        Route::put('nav/add/save', [NasaV1SettingNavController::class, 'addSave']);
         Route::get('nav/clone/{id}', [NasaV1SettingNavController::class, 'clone']);
-        Route::put('nav/clone', [NasaV1SettingNavController::class, 'cloneSave']);
+        Route::put('nav/clone/save', [NasaV1SettingNavController::class, 'cloneSave']);
         Route::get('nav/hit/{id}/{field}', [NasaV1SettingNavController::class, 'hit']);
     });
 

routes/web.php

@@ -21,12 +21,15 @@ use App\Http\Controllers\Api\FreenodeController as ApiFreenodeController;
 use App\Http\Controllers\Api\v1\FreenodeCountrySpeedController;
 use App\Http\Controllers\Api\v1\FreenodeHelperController;
 use App\Http\Controllers\NimaController;
-use App\Http\Controllers\Web\Nasa\V1\Setting\MasterNavController as NasaSettingMasterNavController;
+//use App\Http\Controllers\Web\Nasa\V1\Setting\MasterNavController as NasaSettingMasterNavController;
-use App\Http\Controllers\Web\Nasa\V1\Node\FuNodeController as NasaNodeFuNodeController;
+//use App\Http\Controllers\Web\Nasa\V1\Node\FuNodeController as NasaNodeFuNodeController;
 use App\Http\Controllers\Web\Nasa\V1\Stats\DashboardTotalController as NasaStatsDashboardTotalController;
 use App\Http\Controllers\Web\Nasa\V1\Demo\NasaStyleController as NasaDemoNasaStyleController;
 use App\Http\Controllers\Web\Nasa\V1\Base\ListController as NasaListController;
 use App\Http\Controllers\Web\Nasa\V1\AuthController;
+use App\Http\Controllers\Web\Nasa\V1\MasterPanelNavController as NasaMasterPanelNavController;
+use App\Http\Controllers\Web\Nasa\V1\FuNodeBaseController as NasaFuNodeBaseController;
+use App\Http\Controllers\Web\Nasa\V1\FuEnvConfigController as NasaFuEnvConfigController;
 
 Route::get('/birds/create', [BirdController::class, 'create'])->name('birds.create'); // 录入界面
 Route::get('/birds/{id}', [BirdController::class, 'show'])->name('birds.show');       // 详情展示界面
@@ -57,17 +60,26 @@ Route::prefix('nasa')->middleware(['auth'])->group(function () {
         Route::get('dashboard/total', [NasaStatsDashboardTotalController::class, 'index'])->name('nasa.stats.dashboard.total');
     });
                              
-    Route::get('setting')->name('nasa.setting');
+//    Route::get('setting')->name('nasa.setting');
-    Route::get('setting/master')->name('nasa.setting.master');
+//    Route::get('setting/master')->name('nasa.setting.master');
-    Route::prefix('setting/master')->group(function() {
+//    Route::prefix('setting/master')->group(function() {
-        Route::get('nav', [NasaSettingMasterNavController::class, 'index'])->name('nasa.setting.master.nav');
+//        Route::get('nav', [NasaSettingMasterNavController::class, 'index'])->name('nasa.setting.master.nav');
-    });
+//    });
+                                                   
+//    Route::get('sites')->name('nasa.sites');
+//    Route::get('sites/master')->name('nasa.sites.master);
+//    Route::prefix('/master')->group(function() {
+//        Route::get('/master/panel/nav', [NasaMasterPanelNavController::class, 'index'])->name('nasa.master.panel.nav');
+//    });
 
-    Route::get('node')->name('nasa.node');
+//    Route::get('node')->name('nasa.node');
-    Route::get('node/fu')->name('nasa.node.fu');
+//    Route::get('node/fu')->name('nasa.node.fu');
-    Route::prefix('node/fu')->group(function() {
+//    Route::prefix('node/fu')->group(function() {
-        Route::get('node', [NasaNodeFuNodeController::class, 'index'])->name('nasa.node.fu.node');
+//        Route::get('node', [NasaNodeFuNodeController::class, 'index'])->name('nasa.node.fu.node');
-    });
+//    });
+    Route::get('/master/panel/nav', [NasaMasterPanelNavController::class, 'index'])->name('nasa.master.panel.nav');
+    Route::get('/fu/node/base', [NasaFuNodeBaseController::class, 'index'])->name('nasa.fu.node.base');
+    Route::get('/fu/env/config', [NasaFuEnvConfigController::class, 'index'])->name('nasa.fu.env.config');
    
     Route::get('demo')->name('nasa.demo');
     Route::prefix('demo')->group(function() {