RPC连接

app/Admin/Controllers/ApiController.php

@@ -1,46 +0,0 @@
-<?php
-
-namespace App\Admin\Controllers;
-
-use App\Admin\Repositories\DistAdminDistributor;
-use Illuminate\Http\Request;
-use Illuminate\Routing\Controller;
-
-class ApiController extends Controller
-{
-    /**
-     * dist 分销商
-     */
-    public function dist(Request $request)
-    {
-        $q = $request->get('q');
-        if ($q != null) {
-            // 模糊搜索
-            $obj = new DistAdminDistributor();
-            return $obj->model()->where('client_code', 'like', "%$q%")->paginate(null, ['id', 'client_code as text']);
-        } else {
-            // 获取最新的N个
-            $selectOptionsNew =  DistAdminDistributor::selectOptionsNew();
-            return $this->changeOptions($selectOptionsNew);
-        }
-    }
-
-
-    /*
- * 把数据转换成select需要的格式
- */
-    private function changeOptions($data) {
-        // 初始化结果数组
-        $result = [];
-        // 遍历原始数据并转换格式
-        foreach ($data as $id => $text) {
-            $result[] = [
-                'id' => (int)$id,  // 将字符串转换为整数
-                'text' => $text
-            ];
-        }
-        return $result;
-    }
-
-
-}

app/Admin/Controllers/SiteAlbumController.php

@@ -49,10 +49,8 @@ class SiteAlbumController extends AdminController
             $pattern = '/\$\(\'#' . preg_quote($formId, '/') . '\'\)\.form\(\{.*?\}\);/s';
             $html = preg_replace($pattern, '', $html);
         }
-
         //把第一个form标签替换成div标签
         $html = preg_replace('/<form([^>]*)>(.*?)<\/form>/s', '<div$1>$2</div>', $html, 1);
-
         return $html;
     }
 
@@ -80,7 +78,7 @@ class SiteAlbumController extends AdminController
             $form->block(10, function (Form\BlockForm $form)  {
                 $form->html($this->grid())->width(12);
             });
-            //加入JS
+            //以下JS代码用于点击文件夹时，自动跳转到相应页面
             Admin::script(
 <<<JS
         setTimeout(() => {
@@ -98,17 +96,17 @@ class SiteAlbumController extends AdminController
                 });
             });
         }, 200);
-const firstCheckbox = document.querySelector('.vs-checkbox-primary');
-// 如果找到元素，则隐藏它
-if (firstCheckbox) {
-    firstCheckbox.style.display = 'none';
-}
-//清空_previous_
-const input = document.querySelector('input[name="_previous_"]');
-if (input) {
-    // 清空其值
-    input.value = '';
-}
+        const firstCheckbox = document.querySelector('.vs-checkbox-primary');
+        // 如果找到元素，则隐藏它
+        if (firstCheckbox) {
+            firstCheckbox.style.display = 'none';
+        }
+        //清空_previous_
+        const input = document.querySelector('input[name="_previous_"]');
+        if (input) {
+            // 清空其值
+            input.value = '';
+        }
 JS
                 );
         });
@@ -127,6 +125,12 @@ JS
                 return CommonHelper::displayImage($dataImages,80);
             });
             $grid->column('model');
+            $grid->column('folder_id',admin_trans_label('folder'))
+                ->display(function ($folder_id) {
+                    $folderModel = new SiteAlbumFolderModel();
+                    $folderName = $folderModel->find($folder_id)->title;
+                    return $folderName;
+                });
             $grid->column('enabled')->using(admin_trans_array(config('dictionary.enabled'))) ->label([
                 0 => 'danger',
                 1 => 'success',
@@ -144,10 +148,12 @@ JS
             });
             // 筛选
             $grid->filter(function (Grid\Filter $filter) {
+                $selectOptions = SiteAlbumFolderModel::selectOptions();
+                unset($selectOptions[0]);
                 $filter->panel();
                 $filter->expand();
                 $filter->like('model')->width(2);
-                $filter->equal('folder_id',admin_trans_label('folder'))->select(SiteAlbumFolderModel::selectOptions())->width(3);
+                $filter->equal('folder_id',admin_trans_label('folder'))->select($selectOptions)->width(3);
             });
             $grid->disableViewButton();
             $grid->disablePerPages();
@@ -190,8 +196,13 @@ JS
                 $form->input('pdf', $pdfs);
             });
             $form->tab(admin_trans_label('basic_info'), function (Form $form) {
+                $selectOptions = SiteAlbumFolder::selectOptions();
+                unset($selectOptions[0]);
                 $folderId = getTempValue('folderId');
-                $form->select('folder_id')->options(SiteAlbumFolder::selectOptions())->default($folderId)->required();
+                if ($folderId == 0) {
+                    $folderId = array_key_first($selectOptions);
+                }
+                $form->select('folder_id')->options($selectOptions)->default($folderId)->required();
                 $form->text('model')->required();
                 $form->table('parameters',admin_trans_label('attribute_name'), function (Form\NestedForm $table) {
                     $table->text('key')->required();
@@ -261,7 +272,7 @@ JS
                     $form->html($imgHtml,admin_trans_label('image_preview'));
                     $count++;
 
-                    $form->text('cover',admin_trans_label('video_cover'))->placeholder('为空则自动生成');
+                    $form->text('cover',admin_trans_label('video_cover'))->placeholder('自动生成')->readOnly();
                     $form->tradFile('video_src')
                         ->retainable()//禁止删OSS图
                         ->removable() // 可移除图片
@@ -342,25 +353,74 @@ JS
                          return json_encode($data);
                      });
             });
+            $folderTabs = SiteAlbumFolder::getAllFolderTabs();
+            $folderTabs = json_encode($folderTabs);
 
-            $folderId = getTempValue('folderId');
-            if ($folderId >0) {
+                //以下JS作用：1.点击列表时，把folder_id参数传递给表单 2.切换文件夹时，显示隐藏相应的tab
                 Admin::script(
 <<<JS
 const featherIcon = document.querySelector('i.feather.icon-list');
-
 if (featherIcon) {
     // 找到 <i> 的上级 <a> 元素
     const parentLink = featherIcon.closest('a');
+    if (parentLink) {
+        // 绑定 onclick 事件
+        parentLink.onclick = function(event) {
+            // 阻止默认行为（如跳转）
+            event.preventDefault();
 
-    if (parentLink && parentLink.href) {
-        // 在 href 后追加 ?folder_id=3
-        parentLink.href = parentLink.href + '?folder_id={$folderId}';
+            // 获取 folder_id 的值
+            let folderIdValue = $('select[name="folder_id"]').val();
+
+            // 在 href 后追加 ?folder_id=xxx
+            if (parentLink.href) {
+                const newHref = parentLink.href + '?folder_id=' + folderIdValue;
+                window.location.href = newHref; // 跳转到新的 URL
+            }
+        };
     }
 }
+// 监听 <select name="folder_id"> 的变化事件
+$('select[name="folder_id"]').change(function() {
+    showHideTabs($(this).val());
+});
+folderIdValue = $('select[name="folder_id"]').val();
+showHideTabs(folderIdValue);
+function showHideTabs(fid) {
+           // 获取当前选中的值
+        let folderTabs = {$folderTabs};
+        const folderIdValue = fid;
+        // 获取当前 folderIdValue 对应的标签索引
+        const tabIndexes = folderTabs[folderIdValue];
+        //console.log(tabIndexes);
+
+        if (tabIndexes) {
+            // 处理上方的 <li>，限定在 .nav-tabs 内
+            $('.nav-tabs .nav-item').each(function(index) {
+                if (index > 0) { // 跳过第一个固定元素
+                    $(this).hide();
+                }
+            });
+
+            tabIndexes.forEach(function(index) {
+                $('.nav-tabs .nav-item:eq(' + (Number(index) + 1) + ')').show(); // 使用字符串拼接
+            });
+
+            // 处理下方的 tab-pane，限定在 .tab-content 内
+            // $('.tab-content .tab-pane').each(function(index) {
+            //     if (index > 0) { // 跳过第一个固定元素
+            //         $(this).hide();
+            //     }
+            // });
+            //
+            // tabIndexes.forEach(function(index) {
+            //     $('.tab-content .tab-pane:eq(' + (Number(index) + 1) + ')').show(); // 使用字符串拼接
+            // });
+        }
+}
 JS
                 );
-            }
+
 
         });
 

app/Admin/Repositories/SiteAlbum.php

@@ -13,4 +13,29 @@ class SiteAlbum extends EloquentRepository
      * @var string
      */
     protected $eloquentClass = Model::class;
+
+
+    public static function siteAlbumPaginate($filter = [],$perPage = 15,$page = 1)
+    {
+        $siteAlbum = new Model();
+        $filterModel = isset($filter['model'])? $filter['model'] : '';
+        if ($filterModel) {
+            $siteAlbum = $siteAlbum->where('model', 'like', '%'. $filterModel. '%');
+        }
+        $folder_id = isset($filter['folder_id'])? $filter['folder_id'] : '';
+        if ($folder_id) {
+            $siteAlbum = $siteAlbum->where('folder_id', $folder_id);
+        }
+        $albumFolder = isset($filter['album_folder'])? $filter['album_folder'] : -1;
+        if ($albumFolder != -1) {
+
+            $siteAlbum = $siteAlbum->whereIn('folder_id', $albumFolder);
+        }
+
+        $result = $siteAlbum->paginate(
+            $perPage, $columns = ['*'], $pageName = 'page', $page
+        );
+        return $result;
+    }
+
 }

app/Admin/Repositories/SiteAlbumFolder.php

@@ -41,7 +41,7 @@ class SiteAlbumFolder extends EloquentRepository
     {
         if (!$closure) {
             $closure = function ($query) {
-                $query =  $query->orderBy('order', 'desc')->orderBy('id', 'desc');
+                $query =  $query->where("enabled", 1)->orderBy('order', 'desc')->orderBy('id', 'desc');
                 return $query;
             };
         }
@@ -65,10 +65,73 @@ class SiteAlbumFolder extends EloquentRepository
                 return $query;
             };
         }
-
         $selectOptions =  Model::class::selectOptions($closure);
         return $selectOptions;
     }
 
 
+
+    public static function siteAlbumFolderSelectOptions($inIds) {
+        $ids = self::findIdsWithParents($inIds);
+        $result = self::selectOptions(function ($query) use ($ids) {
+            $query = $query->wherein('id', $ids);
+            $query = $query->where('enabled', 1);
+            $query =  $query->orderBy('order', 'desc')->orderBy('id', 'desc');
+            return $query;
+        });
+        unset($result[0]);
+        return $result;
+    }
+
+
+    public static function siteAlbumFolderSelectOptionsAll() {
+        $result = self::selectOptions(function ($query) {
+            $query = $query->where('enabled', 1);
+            $query =  $query->orderBy('order', 'desc')->orderBy('id', 'desc');
+            return $query;
+        });
+        unset($result[0]);
+        return $result;
+    }
+
+
+    /**
+     * 递归查找包括 $inIds 在内的所有记录及其父 ID 的记录
+     *
+     * @param array $inIds 初始 ID 数组
+     * @param array $resultIds 结果 ID 数组（递归时使用）
+     * @return array
+     */
+    public static function findIdsWithParents(array $inIds, array &$resultIds = []): array
+    {
+        $model = new Model();
+        // 查询当前 ID 数组对应的记录
+        $folders = $model->whereIn('id', $inIds)->get();
+
+        foreach ($folders as $folder) {
+            // 如果当前记录的 ID 尚未加入结果数组，则加入
+            if (!in_array($folder->id, $resultIds)) {
+                $resultIds[] = $folder->id;
+            }
+
+            // 如果当前记录有父 ID，则递归查找父记录
+            if ($folder->parent_id) {
+                self::findIdsWithParents([$folder->parent_id], $resultIds);
+            }
+        }
+
+        return $resultIds;
+    }
+
+    public static function getAllFolderTabs()
+    {
+        $model = new Model();
+        $folders = $model->where('enabled', 1)->orderBy('order', 'desc')->orderBy('id', 'desc')->get();
+        $tabs = [];
+        foreach ($folders as $folder) {
+            $tabs[$folder->id] = json_decode($folder->show_tabs);
+        }
+        return $tabs;
+    }
+
 }

app/Admin/Services/RpcService.php

@@ -0,0 +1,134 @@
+<?php
+
+namespace App\Admin\Services;
+
+use App\Admin\Repositories\SiteAlbumFolder;
+use App\Admin\Repositories\SiteAlbum;
+use Illuminate\Http\Request;
+use Illuminate\Support\Arr;
+
+/**
+ * 外部rpc服务
+ */
+class RpcService
+{
+    protected $request;
+    protected $apiSecret = 'MtbSecretVBUC';
+
+
+    /*
+     * 构造函数,验证签名
+     */
+    public function __construct()
+    {
+//        try {
+//            $request = request();
+//            // 验证签名
+//            $apiKey = $request->header('X-API-Key');
+//            $clientSignature = $request->header('X-API-Signature');
+//            $all = $request->all();
+//            $params = isset($all['params'])? $all['params'] : [];
+//            $payload = json_encode($params);
+//            $payload = $payload.$apiKey;
+//            $serverSignature = hash_hmac('sha256', $payload, $this->apiSecret);
+//            if ($clientSignature !== $serverSignature) {
+//                return $this->responseError('签名验证失败');
+//            }
+//            if (time() - $apiKey > 100) {
+//                return $this->responseError('签名已过期');
+//            }
+//        } catch (\Exception $e) {
+//            return $this->responseError('签名验证失败 e - '. $e->getMessage());
+//        }
+    }
+
+    /*
+     * 相册分页
+     * @param int $page 页码
+     * @param int $perPage 每页数量
+     */
+    public function siteAlbumPaginate($filter = [],$perPage = 15,$page = 1): string
+    {
+        $result = SiteAlbum::siteAlbumPaginate($filter,$perPage,$page);
+        $result = $result->toArray();
+        return $this->responseSuccess( $result);
+    }
+
+    /*
+     * 通过ids获取相册列表
+     */
+    public function siteAlbumGetByIds($ids): string
+    {
+        if (is_string($ids)) {
+            $ids = explode(',', $ids);
+        }
+        $siteAlbum = new SiteAlbum();
+        $result = $siteAlbum->model()->whereIn('id', $ids)->get();
+        $result = $result->toArray();
+        return $this->responseSuccess( $result);
+    }
+
+    /*
+     * 相册详情
+     */
+    public function siteAlbumGet($id)
+    {
+        $siteAlbum = new SiteAlbum();
+        $result = $siteAlbum->model()->find($id);
+        if (!$result) {
+            return $this->responseError('相册不存在');
+        }
+        $result = $result->toArray();
+        return $this->responseSuccess( $result);
+    }
+
+
+    /*
+     * 相册文件夹列表
+     * $inIds 查询指定id及父级id的相册文件夹
+     */
+    public function siteAlbumFolderSelectOptions($inIds = [])
+    {
+        $result = SiteAlbumFolder::siteAlbumFolderSelectOptions($inIds);
+        return $this->responseSuccess( $result);
+    }
+
+    /*
+     * 全部相册文件夹列表
+     */
+    public function siteAlbumFolderSelectOptionsAll()
+    {
+        $result = SiteAlbumFolder::siteAlbumFolderSelectOptionsAll();
+        return $this->responseSuccess( $result);
+    }
+
+
+    /*
+     * 相册文件夹全部节点
+     */
+    public function siteAlbumFolderAllNodes()
+    {
+        $siteAlbumFolder = new SiteAlbumFolder();
+        $result = $siteAlbumFolder->model()->allNodes();
+        return $this->responseSuccess($result);
+    }
+
+    /*
+     * rcp服务响应错误信息
+     */
+    public function responseError($result) {
+        $result = ['status'=>false,'msg'=>$result,'data'=>[]];
+        $response = ["jsonrpc"=>"2.0", "result"=> $result, "id"=>1];
+        die(json_encode($response));
+    }
+
+
+    /*
+     * rcp服务响应成功信息
+     */
+    public function responseSuccess($data) {
+        $result = ['status'=>true,'msg'=>'Success','data'=>$data];
+        $response = ["jsonrpc"=>"2.0", "result"=> $result, "id"=>1];
+        die(json_encode($response));
+    }
+}

app/Admin/routes.php

@@ -1,9 +1,12 @@
 <?php
 
 use App\Admin\Controllers\DistAppearanceTemplateController;
+use App\Admin\Controllers\RpcController;
+use App\Admin\Services\RpcService;
 use Illuminate\Routing\Router;
 use Illuminate\Support\Facades\Route;
 use Dcat\Admin\Admin;
+use JsonRPC\Server;
 
 Admin::routes();
 
@@ -25,6 +28,24 @@ Route::group([
     $router->resource('site-album', 'SiteAlbumController');
 });
 
+// 定义RPC服务
+Route::post('/rpc', function (Request $request) {
+    // 创建 JSON-RPC 服务端
+    $server = new Server();
+
+    // 注册服务类
+    $server->getProcedureHandler()
+        ->withClassAndMethod('siteAlbumPaginate', new RpcService(), 'siteAlbumPaginate')
+        ->withClassAndMethod('siteAlbumGet', new RpcService(), 'siteAlbumGet')
+        ->withClassAndMethod('siteAlbumFolderSelectOptions', new RpcService(), 'siteAlbumFolderSelectOptions')
+        ->withClassAndMethod('siteAlbumFolderSelectOptionsAll', new RpcService(), 'siteAlbumFolderSelectOptionsAll')
+        ->withClassAndMethod('siteAlbumGetByIds', new RpcService(), 'siteAlbumGetByIds')
+        ->withClassAndMethod('siteAlbumFolderAllNodes', new RpcService(), 'siteAlbumFolderAllNodes');
+
+    // 处理请求并返回响应
+    return response()->json(json_decode($server->execute()));
+});
+
 /*
  * 重写上传路由，修改tinymce上传路径
  */
@@ -33,7 +54,10 @@ $attributes = [
     'middleware' => config('admin.route.middleware'),
     'as'         => 'dcat-api.',
 ];
+
 app('router')->group($attributes, function ($router) {
     $router->post('editor-md/upload', function () {exit;})->name('editor-md.upload');
     $router->post('tinymce/upload', 'App\Http\Controllers\TinymceController@upload')->name('tinymce.upload');
 });
+
+

app/Http/Kernel.php

@@ -20,8 +20,10 @@ class Kernel extends HttpKernel
         \App\Http\Middleware\PreventRequestsDuringMaintenance::class,
         \Illuminate\Foundation\Http\Middleware\ValidatePostSize::class,
         \App\Http\Middleware\TrimStrings::class,
-        \Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,
+
     ];
+    //去掉这个，因为他会把空字符串转成null
+//\Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,
 
     /**
      * The application's route middleware groups.

app/Models/SiteAlbumFolder.php

@@ -19,9 +19,12 @@ class SiteAlbumFolder extends Model
 
     public function allNodes()
     {
-        return $this->callQueryCallbacks(new static())
+        $result =  $this->callQueryCallbacks(new static())
+            ->where('enabled',1)
             ->orderBy($this->getOrderColumn(), 'desc')
             ->get();
+
+        return $result;
     }
 
 }

composer.json

@@ -8,6 +8,7 @@
         "php": "^8.0.2",
         "alphasnow/aliyun-oss-laravel": "^4.7",
         "dcat-plus/laravel-admin": "^1.2",
+        "fguillot/json-rpc": "*",
         "guzzlehttp/guzzle": "^7.2",
         "laravel/framework": "^9.19",
         "laravel/sanctum": "^3.0",

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "844cf77b80234d7e06f624e36d3e2e9c",
+    "content-hash": "2044f9fbb6f4fbe7457e500096b791e9",
     "packages": [
         {
             "name": "aliyuncs/oss-sdk-php",
@@ -1047,6 +1047,57 @@
             ],
             "time": "2023-10-06T06:47:41+00:00"
         },
+        {
+            "name": "fguillot/json-rpc",
+            "version": "v1.3.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/matasarei/json-rpc.git",
+                "reference": "85112c916c3c55f7e899c827550c52e9edb4928a"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/matasarei/json-rpc/zipball/85112c916c3c55f7e899c827550c52e9edb4928a",
+                "reference": "85112c916c3c55f7e899c827550c52e9edb4928a",
+                "shasum": "",
+                "mirrors": [
+                    {
+                        "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%",
+                        "preferred": true
+                    }
+                ]
+            },
+            "require": {
+                "ext-json": "*",
+                "php": ">=7.4"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.6",
+                "squizlabs/php_codesniffer": "^3.9"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-0": {
+                    "JsonRPC": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Frédéric Guillot"
+                }
+            ],
+            "description": "Simple JSON-RPC client/server library that just works",
+            "homepage": "https://github.com/matasarei/JsonRPC",
+            "support": {
+                "issues": "https://github.com/matasarei/json-rpc/issues",
+                "source": "https://github.com/matasarei/json-rpc/tree/v1.3.0"
+            },
+            "time": "2024-06-08T19:21:47+00:00"
+        },
         {
             "name": "fruitcake/php-cors",
             "version": "v1.3.0",
@@ -8809,12 +8860,12 @@
     ],
     "aliases": [],
     "minimum-stability": "stable",
-    "stability-flags": [],
+    "stability-flags": {},
     "prefer-stable": true,
     "prefer-lowest": false,
     "platform": {
         "php": "^8.0.2"
     },
-    "platform-dev": [],
+    "platform-dev": {},
     "plugin-api-version": "2.6.0"
 }

lang/zh_CN/global.php

@@ -116,7 +116,6 @@ return [
         'pdf_src'               => 'PDF文件',
         'video_src'             => '视频文件',
         'missing_content'       => '缺少内容',
-
     ],
     'labels' => [
         'list'         => '列表',