From c3fd8b3a4975101bc4997a0e8803406340f60f65 Mon Sep 17 00:00:00 2001 From: hellcat Date: Tue, 16 Jun 2026 18:16:14 +0800 Subject: [PATCH] no message --- .../Api/Nasa/V1/Base/ListController.php | 45 +++++++++++-------- .../Api/Nasa/V1/SettingNavController.php | 4 +- .../Web/Nasa/V1/Base/ListController.php | 12 ++--- .../Web/Nasa/V1/FuEnvConfigController.php | 24 ++++++++++ ...ontroller.php => FuNodeBaseController.php} | 6 +-- ...oller.php => MasterPanelNavController.php} | 4 +- app/Providers/AppServiceProvider.php | 2 +- lang/zh_CN/menu.php | 1 + routes/api.php | 6 +-- routes/web.php | 36 ++++++++++----- 10 files changed, 93 insertions(+), 47 deletions(-) create mode 100644 app/Http/Controllers/Web/Nasa/V1/FuEnvConfigController.php rename app/Http/Controllers/Web/Nasa/V1/{Node/FuNodeController.php => FuNodeBaseController.php} (77%) rename app/Http/Controllers/Web/Nasa/V1/{Setting/MasterNavController.php => MasterPanelNavController.php} (83%) diff --git a/app/Http/Controllers/Api/Nasa/V1/Base/ListController.php b/app/Http/Controllers/Api/Nasa/V1/Base/ListController.php index 040eac76..07287daf 100755 --- a/app/Http/Controllers/Api/Nasa/V1/Base/ListController.php +++ b/app/Http/Controllers/Api/Nasa/V1/Base/ListController.php @@ -177,23 +177,23 @@ abstract class ListController ], 200); } - public function cloneSave(Request $oRequest) - { - $iId = request('id'); - - $aParams = $oRequest->all(); - - foreach ($aParams as $k => $v) { - $this->oModal->{$k} = $v; - } - $this->oModel->create(); - - return response()->json([ - 'iCode' => 200, - 'aData' => [], - 'sMsg' => "保存成功：id ".$this->oModel->id - ], 200); - } +// public function cloneSave(Request $oRequest) +// { +// $iId = request('id'); +// +// $aParams = $oRequest->all(); +// +// foreach ($aParams as $k => $v) { +// $this->oModal->{$k} = $v; +// } +// $this->oModel->create(); +// +// return response()->json([ +// 'iCode' => 200, +// 'aData' => [], +// 'sMsg' => "保存成功：id ".$this->oModel->id +// ], 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, diff --git a/app/Http/Controllers/Api/Nasa/V1/SettingNavController.php b/app/Http/Controllers/Api/Nasa/V1/SettingNavController.php index 305ea94a..ed953815 100755 --- a/app/Http/Controllers/Api/Nasa/V1/SettingNavController.php +++ b/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", ] ]; diff --git a/app/Http/Controllers/Web/Nasa/V1/Base/ListController.php b/app/Http/Controllers/Web/Nasa/V1/Base/ListController.php index 50505f36..fdb87042 100644 --- a/app/Http/Controllers/Web/Nasa/V1/Base/ListController.php +++ b/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()); } diff --git a/app/Http/Controllers/Web/Nasa/V1/FuEnvConfigController.php b/app/Http/Controllers/Web/Nasa/V1/FuEnvConfigController.php new file mode 100644 index 00000000..94c03b01 --- /dev/null +++ b/app/Http/Controllers/Web/Nasa/V1/FuEnvConfigController.php @@ -0,0 +1,24 @@ +sSiteWww = config("path.url_ship_fu_base") ?? ''; + } + +} diff --git a/app/Http/Controllers/Web/Nasa/V1/Node/FuNodeController.php b/app/Http/Controllers/Web/Nasa/V1/FuNodeBaseController.php similarity index 77% rename from app/Http/Controllers/Web/Nasa/V1/Node/FuNodeController.php rename to app/Http/Controllers/Web/Nasa/V1/FuNodeBaseController.php index db9dfa4e..1265ebc4 100644 --- a/app/Http/Controllers/Web/Nasa/V1/Node/FuNodeController.php +++ b/app/Http/Controllers/Web/Nasa/V1/FuNodeBaseController.php @@ -1,6 +1,6 @@ 'nasa', 'helper' => '帮助', 'node' => '节点', + 'site' => '站点', ]; diff --git a/routes/api.php b/routes/api.php index 4e987343..71de74cf 100644 --- a/routes/api.php +++ b/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']); }); diff --git a/routes/web.php b/routes/web.php index a533d052..e8643bf6 100755 --- a/routes/web.php +++ b/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\Node\FuNodeController as NasaNodeFuNodeController; +//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\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/master')->name('nasa.setting.master'); - Route::prefix('setting/master')->group(function() { - Route::get('nav', [NasaSettingMasterNavController::class, 'index'])->name('nasa.setting.master.nav'); - }); +// Route::get('setting')->name('nasa.setting'); +// Route::get('setting/master')->name('nasa.setting.master'); +// Route::prefix('setting/master')->group(function() { +// 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/fu')->name('nasa.node.fu'); - Route::prefix('node/fu')->group(function() { - Route::get('node', [NasaNodeFuNodeController::class, 'index'])->name('nasa.node.fu.node'); - }); +// Route::get('node')->name('nasa.node'); +// Route::get('node/fu')->name('nasa.node.fu'); +// Route::prefix('node/fu')->group(function() { +// 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() {