2 months ago · 872d25fa60
--- a/.env.dev
+++ b/.env.dev
@@ -86,3 +86,7 @@ MAIL_TO_ADDRESS=""
 
				 MAIL_CC_NAME=""
			
 
				 MAIL_CC_ADDRESS=""
			
 
				 
			
 
				+#相册系统RPC调用配置
			
 
				+ALBUM_RPC_URL=http://127.0.0.1:8003/rpc
			
 
				+ALBUM_RPC_SECRET=MtbSecretVBUC
			
 
				+
			
--- a/app/Admin/Actions/Grid/RpcAlbumImport.php
+++ b/app/Admin/Actions/Grid/RpcAlbumImport.php
@@ -0,0 +1,67 @@
 
				+<?php
			
 
				+namespace App\Admin\Actions\Grid;
			
 
				+
			
 
				+
			
 
				+use App\Admin\Forms\ImportAlbum;
			
 
				+use App\Distributor\Forms\ImportProduct;
			
 
				+use Dcat\Admin\Grid\BatchAction;
			
 
				+use Dcat\Admin\Widgets\Modal;
			
 
				+
			
 
				+class RpcAlbumImport extends BatchAction
			
 
				+{
			
 
				+
			
 
				+    protected $title = 'import';
			
 
				+
			
 
				+
			
 
				+
			
 
				+    public function render()
			
 
				+    {
			
 
				+        // 实例化表单类
			
 
				+        $form = ImportAlbum::make();
			
 
				+
			
 
				+        return Modal::make()
			
 
				+            ->lg()
			
 
				+            ->title(admin_trans_label($this->title))
			
 
				+            ->body($form)
			
 
				+            // 因为此处使用了表单异步加载功能，所以一定要用 onLoad 方法
			
 
				+            // 如果是非异步方式加载表单，则需要改成 onShow 方法
			
 
				+            ->onShow($this->getModalScript())
			
 
				+            ->button($this->getButtonHTML());
			
 
				+
			
 
				+    }
			
 
				+
			
 
				+    protected function getModalScript()
			
 
				+    {
			
 
				+        // 弹窗显示后往隐藏的id表单中写入批量选中的行ID
			
 
				+        return <<<JS
			
 
				+        // 获取选中的ID数组
			
 
				+        var key = {$this->getSelectedKeysScript()}
			
 
				+
			
 
				+        $('#album_ids').val(key);
			
 
				+        JS;
			
 
				+    }
			
 
				+
			
 
				+
			
 
				+    /**
			
 
				+     * 获取按钮的 HTML
			
 
				+     * @return string
			
 
				+     */
			
 
				+
			
 
				+    public function title()
			
 
				+    {
			
 
				+        return '<i class="feather icon-shopping-cart"></i> &nbsp;'.admin_trans('admin.import');
			
 
				+    }
			
 
				+
			
 
				+    protected function getButtonHTML()
			
 
				+    {
			
 
				+        $title='<i class="feather icon-shopping-cart"></i> &nbsp;'.admin_trans('admin.import');
			
 
				+
			
 
				+
			
 
				+        return <<<HTML
			
 
				+        <button class="btn btn-success">
			
 
				+            <i class="feather"></i> {$title}
			
 
				+        </button>
			
 
				+        HTML;
			
 
				+    }
			
 
				+
			
 
				+}
			
--- a/app/Admin/Controllers/ImportProductController.php
+++ b/app/Admin/Controllers/ImportProductController.php
@@ -0,0 +1,210 @@
 
				+<?php
			
 
				+
			
 
				+namespace App\Admin\Controllers;
			
 
				+
			
 
				+
			
 
				+use App\Admin\Actions\Grid\RpcAlbumImport;
			
 
				+use App\Admin\Forms\RpcAlbumImportForm;
			
 
				+use App\Admin\Repositories\BaseProductCategory;
			
 
				+use App\Admin\Repositories\RpcAlbum;
			
 
				+use App\Admin\Repositories\RpcAlbumFolder;
			
 
				+use App\Distributor\Actions\Extensions\DistProductImportForm;
			
 
				+use App\Distributor\Repositories\BaseProduct;
			
 
				+use App\Libraries\CommonHelper;
			
 
				+use Dcat\Admin\Admin;
			
 
				+use Dcat\Admin\Grid;
			
 
				+use Dcat\Admin\Http\Controllers\AdminController;
			
 
				+use Dcat\Admin\Layout\Content;
			
 
				+use Dcat\Admin\Show;
			
 
				+
			
 
				+class ImportProductController extends AdminController
			
 
				+{
			
 
				+    /**
			
 
				+     * page index
			
 
				+     */
			
 
				+    public function index(Content $content)
			
 
				+    {
			
 
				+        return $content
			
 
				+            ->header(admin_trans( 'admin.product_import'))
			
 
				+            ->description('<span style="color: red; font-weight: bold;">'.admin_trans_label('select_products_to_import').'</span>')
			
 
				+            ->breadcrumb(['text'=>'list','url'=>''])
			
 
				+            ->body($this->grid());
			
 
				+    }
			
 
				+
			
 
				+
			
 
				+
			
 
				+    //屏蔽删除
			
 
				+    public function destroy($id)
			
 
				+    {
			
 
				+        abort(404);
			
 
				+    }
			
 
				+
			
 
				+    //屏蔽创建
			
 
				+    public function create(Content $content)
			
 
				+    {
			
 
				+        abort(404);
			
 
				+    }
			
 
				+
			
 
				+    //屏蔽编辑
			
 
				+    public function edit($id, Content $content)
			
 
				+    {
			
 
				+        abort(404);
			
 
				+    }
			
 
				+
			
 
				+
			
 
				+    /**
			
 
				+     * Make a grid builder.
			
 
				+     *
			
 
				+     * @return Grid
			
 
				+     */
			
 
				+    protected function grid()
			
 
				+    {
			
 
				+        return Grid::make(new RpcAlbum(), function (Grid $grid) {
			
 
				+            $grid->view('admin.grid.table');
			
 
				+            $grid->column('id')->display(function () {
			
 
				+                return $this->_index+1;
			
 
				+            })->width('8%');
			
 
				+            $grid->column('cover')->display(function ($images) {
			
 
				+                $images = json_decode($images);
			
 
				+                // 限制最多显示2个缩略图
			
 
				+                $dataImages = array_slice($images, 0, 1);
			
 
				+                return CommonHelper::displayImage($dataImages,100);
			
 
				+            });
			
 
				+            $grid->column('title');
			
 
				+            $grid->column('model');
			
 
				+            $grid->column('missing_content')->display(function ($missing_content) {
			
 
				+                $missing_content = [];
			
 
				+                if ($this->cover == '[]') {$missing_content[] = '主图';}
			
 
				+                if ($this->en_detail == '[]') {$missing_content[] = '英文详情';}
			
 
				+                if ($this->cn_detail == '[]') {$missing_content[] = '中文详情';}
			
 
				+                if ($this->video == '[]') {$missing_content[] = '视频';}
			
 
				+                if ($this->poster == '[]') {$missing_content[] = '海报';}
			
 
				+                if ($this->cert == '[]') {$missing_content[] = '证书';}
			
 
				+                if ($this->pdf == '[]') {$missing_content[] = 'PDF';}
			
 
				+                return implode(' / ', $missing_content);
			
 
				+            });
			
 
				+
			
 
				+            $grid->column('created_at')->sortable();
			
 
				+            $grid->column('updated_at')->sortable();
			
 
				+
			
 
				+            // 筛选
			
 
				+            $grid->filter(function (Grid\Filter $filter) {
			
 
				+                $filter->panel();
			
 
				+                $filter->expand();
			
 
				+                $filter->equal('model')->width(2);
			
 
				+                $filter->equal('folder_id',admin_trans_label('product_category'))->select(RpcAlbumFolder::selectOptions())->width(2);
			
 
				+            });
			
 
				+            // 删除新增按钮
			
 
				+            $grid->disableCreateButton();
			
 
				+            //$grid->disableViewButton();
			
 
				+            $grid->disableEditButton();
			
 
				+            $grid->disableDeleteButton();
			
 
				+            $grid->disableBatchDelete();
			
 
				+            // 添加批量复制操作
			
 
				+            $grid->batchActions(function ($batch) {
			
 
				+                //$batch->add(new BatchCopy()); 只能2选1
			
 
				+            });
			
 
				+
			
 
				+            $grid->tools([
			
 
				+                new RpcAlbumImport(),
			
 
				+            ]);
			
 
				+
			
 
				+            $grid->model()->where('enabled',1)->orderBy("order",'desc')->orderBy("created_at",'desc');
			
 
				+        });
			
 
				+    }
			
 
				+
			
 
				+    /**
			
 
				+     * Make a show builder.
			
 
				+     *
			
 
				+     * @param mixed $id
			
 
				+     *
			
 
				+     * @return Show
			
 
				+     */
			
 
				+    protected function detail($id)
			
 
				+    {
			
 
				+        return Show::make($id, new RpcAlbum(), function (Show $show) {
			
 
				+            $show->field('title');
			
 
				+            $show->field('model');
			
 
				+            $show->field('parameters',admin_trans_label('attribute'))->as(function ($items) {
			
 
				+                $items = json_decode($items);
			
 
				+                if (is_array($items)) {
			
 
				+                    // 创建表格的表头
			
 
				+                    $table = '<table class="table table-bordered table-condensed">';
			
 
				+                    // 遍历数组并将数据填充到表格中
			
 
				+                    foreach ($items as $item) {
			
 
				+                        $item = (array)$item;
			
 
				+                        $table .= '<tr>';
			
 
				+                        $table .= '<td style="vertical-align: middle !important;width: 20%">' . $item['key'] . '</td>';    // 商品名称
			
 
				+                        $table .= '<td style="vertical-align: middle !important;">' . $item['value'] . '</td>'; // 数量
			
 
				+                        $table .= '</tr>';
			
 
				+                    }
			
 
				+                    $table .= '</table>';
			
 
				+                    return $table;
			
 
				+                }
			
 
				+                return ''; // 当没有数组数据时
			
 
				+            })->unescape();
			
 
				+            $show->field('cover')->as(function ($images) {
			
 
				+                $images = json_decode($images);
			
 
				+                return CommonHelper::displayImage($images,150);
			
 
				+            })->unescape();
			
 
				+
			
 
				+            $show->field('en_detail')->as(function ($images) {
			
 
				+                $images = json_decode($images);
			
 
				+                return CommonHelper::displayImage($images,150);
			
 
				+            })->unescape();
			
 
				+
			
 
				+            $show->field('cn_detail')->as(function ($images) {
			
 
				+                $images = json_decode($images);
			
 
				+                return CommonHelper::displayImage($images,150);
			
 
				+            })->unescape();
			
 
				+
			
 
				+            $show->field('video')->as(function ($items) {
			
 
				+                $items = json_decode($items);
			
 
				+                return CommonHelper::displayVideo($items,'cover','video_src','150');
			
 
				+            })->unescape();
			
 
				+
			
 
				+            $show->field('poster')->as(function ($images) {
			
 
				+                $images = json_decode($images);
			
 
				+                return CommonHelper::displayImage($images,150);
			
 
				+            })->unescape();
			
 
				+
			
 
				+            $show->field('cert')->as(function ($images) {
			
 
				+                $images = json_decode($images);
			
 
				+                return CommonHelper::displayImage($images,150);
			
 
				+            })->unescape();
			
 
				+
			
 
				+            $show->field('cert')->as(function ($images) {
			
 
				+                $images = json_decode($images);
			
 
				+                return CommonHelper::displayImage($images,150);
			
 
				+            })->unescape();
			
 
				+
			
 
				+            $show->field('pdf')->as(function ($items) {
			
 
				+                $items = json_decode($items);
			
 
				+                if (is_array($items)) {
			
 
				+                    // 创建表格的表头
			
 
				+                    $table = '<table class="table table-bordered table-condensed">';
			
 
				+                    // 遍历数组并将数据填充到表格中
			
 
				+                    foreach ($items as $item) {
			
 
				+                        $table .= '<tr>';
			
 
				+                        $table .= '<td style="vertical-align: middle !important;width: 20%">' . $item->pdf_title . '</td>';    // 商品名称
			
 
				+                        $table .= '<td style="vertical-align: middle !important;"><a target="_blank" href="' . CommonHelper::ossUrl($item->pdf_src). '">查看</a></td>'; // 数量
			
 
				+                        $table .= '</tr>';
			
 
				+                    }
			
 
				+                    $table .= '</table>';
			
 
				+                    return $table;
			
 
				+                }
			
 
				+                return ''; // 当没有数组数据时
			
 
				+            })->unescape();
			
 
				+
			
 
				+            // 禁用操作
			
 
				+            $show->disableEditButton();
			
 
				+            $show->disableDeleteButton();
			
 
				+
			
 
				+
			
 
				+        });
			
 
				+    }
			
 
				+
			
 
				+
			
 
				+
			
 
				+
			
 
				+}
			
--- a/app/Admin/Forms/ImportAlbum.php
+++ b/app/Admin/Forms/ImportAlbum.php
@@ -0,0 +1,123 @@
 
				+<?php
			
 
				+
			
 
				+namespace App\Admin\Forms;
			
 
				+use App\Admin\Repositories\BaseProductCategory;
			
 
				+use App\Admin\Repositories\RpcAlbum;
			
 
				+use App\Libraries\CommonHelper;
			
 
				+use App\Models\BaseProduct;
			
 
				+use App\Distributor\Repositories\DistProductCategory;
			
 
				+use App\Models\BaseProductImage;
			
 
				+use App\Models\DistProduct;
			
 
				+use App\Models\DistProductImage;
			
 
				+use Dcat\Admin\Widgets\Form;
			
 
				+
			
 
				+class ImportAlbum extends Form
			
 
				+{
			
 
				+    /**
			
 
				+     * Handle the form request.
			
 
				+     *
			
 
				+     * @param array $input
			
 
				+     *
			
 
				+     * @return mixed
			
 
				+     */
			
 
				+    public function handle(array $input)
			
 
				+    {
			
 
				+        $albumIds = explode(',', $input['album_ids']);
			
 
				+        $categoryId = $input['category_id'];
			
 
				+
			
 
				+        // 检查 product_ids 是否为空
			
 
				+
			
 
				+        if (empty($input['album_ids'])) {
			
 
				+            return $this
			
 
				+                ->response()
			
 
				+                ->error('请选择要导入的产品');
			
 
				+        }
			
 
				+
			
 
				+        try {
			
 
				+            //RPC读取相册
			
 
				+            $rpcAlbum = new RpcAlbum();
			
 
				+            $albumResult = $rpcAlbum->getByids($albumIds);
			
 
				+
			
 
				+            if ($albumResult['status']= false) {
			
 
				+                return $this
			
 
				+                    ->response()
			
 
				+                    ->error('RPC获取相册失败:'. $albumResult['msg']);
			
 
				+            }
			
 
				+
			
 
				+            foreach ($albumResult['data'] as $item) {
			
 
				+                $title = isset($item['title']) ? $item['title'] : $item['model'];
			
 
				+                // 创建新的 DistProduct 记录
			
 
				+                $distProduct = BaseProduct::create([
			
 
				+                    'category_id' => $categoryId,
			
 
				+                    'title' => $title,
			
 
				+                    'sku' => $item['model'], // 假设 $baseProduct 也有 sku 字段
			
 
				+                    'issuance_date' => null, // 假设 $baseProduct 也有 issuance_date 字段
			
 
				+                    'order' => 0, // 假设 $baseProduct 也有 order 字段
			
 
				+                    'enabled' => 1, // 假设 $baseProduct 也有 enabled 字段
			
 
				+                    'content' => $this->changeToimagesHTML($item['en_detail']), // 假设 $baseProduct 也有 content 字段
			
 
				+                    'parameters' => $item['parameters'], // 假设 $baseProduct 也有 parameters 字段
			
 
				+                    'seo_title'=> $title,
			
 
				+                    'seo_keywords' => '',
			
 
				+                    'seo_description' => '',
			
 
				+                    'created_at' => now(), // 自动填充创建时间
			
 
				+                    'updated_at' => now(), // 自动填充更新时间
			
 
				+                ]);
			
 
				+                //DistProduct::where('id', $distProduct->id)->update(['slug' => $distProduct->id]);
			
 
				+                // 遍历 base_product_image 表中的记录，并插入到 dist_product_image 表中
			
 
				+                $cover = json_decode($item['cover'], true);
			
 
				+                foreach ($cover as $baseImage) {
			
 
				+                    $i = 1;
			
 
				+                    BaseProductImage::create([
			
 
				+                        'image_url' => $baseImage,
			
 
				+                        'product_id' => $distProduct->id, // 使用新创建的 DistProduct 的 ID
			
 
				+                        'order' => $i,
			
 
				+                        'created_at' => now(), // 自动填充创建时间
			
 
				+                        'updated_at' => now(), // 自动填充更新时间
			
 
				+                    ]);
			
 
				+                    $i++;
			
 
				+                }
			
 
				+            }
			
 
				+            return $this
			
 
				+                ->response()
			
 
				+                ->success('导入成功')
			
 
				+                ->refresh();
			
 
				+        } catch (\Exception $e) {
			
 
				+            throw $e;
			
 
				+            return $this
			
 
				+                ->response()
			
 
				+                ->error('导入失败: ' . $e->getMessage());
			
 
				+        }
			
 
				+    }
			
 
				+
			
 
				+    public function changeToimagesHTML($content) {
			
 
				+        $content = json_decode($content, true);
			
 
				+        $html = '';
			
 
				+        foreach ($content as $item) {
			
 
				+            $item = CommonHelper::ossUrl($item);
			
 
				+            $html.= '<img src="'. $item. '">';
			
 
				+        }
			
 
				+        return $html;
			
 
				+    }
			
 
				+
			
 
				+    /**
			
 
				+     * Build a form here.
			
 
				+     */
			
 
				+    public function form()
			
 
				+    {
			
 
				+        // 设置隐藏表单，传递用户id
			
 
				+        $this->select('category_id', admin_trans_label('category_name'))
			
 
				+            ->options(BaseProductCategory::selectOptions())
			
 
				+            ->required();
			
 
				+        $this->hidden('album_ids')->attribute('id', 'album_ids');
			
 
				+    }
			
 
				+
			
 
				+    /**
			
 
				+     * The data of the form.
			
 
				+     *
			
 
				+     * @return array
			
 
				+     */
			
 
				+    public function default()
			
 
				+    {
			
 
				+        return [];
			
 
				+    }
			
 
				+}
			
--- a/app/Admin/Repositories/RpcAlbum.php
+++ b/app/Admin/Repositories/RpcAlbum.php
@@ -0,0 +1,89 @@
 
				+<?php
			
 
				+
			
 
				+namespace App\Admin\Repositories;
			
 
				+
			
 
				+use App\Libraries\RpcClient;
			
 
				+use App\Models\NullModel as Model;
			
 
				+use Dcat\Admin\Form;
			
 
				+use Dcat\Admin\Repositories\EloquentRepository;
			
 
				+use Dcat\Admin\Show;
			
 
				+use JsonRPC\Client;
			
 
				+
			
 
				+/*
			
 
				+ * RPC调用相册
			
 
				+ */
			
 
				+class RpcAlbum extends EloquentRepository
			
 
				+{
			
 
				+    /**
			
 
				+     * Model.
			
 
				+     *
			
 
				+     * @var string
			
 
				+     */
			
 
				+    protected $eloquentClass = Model::class;
			
 
				+
			
 
				+    public function execute($method, $params = [])
			
 
				+    {
			
 
				+        return RpcClient::albumExecute($method, $params);
			
 
				+    }
			
 
				+
			
 
				+
			
 
				+    /*
			
 
				+     * 通过IDS获取相册详情
			
 
				+     */
			
 
				+    public function getByids($ids)
			
 
				+    {
			
 
				+        return $this->execute('siteAlbumGetByIds', [
			
 
				+            'ids' => $ids,
			
 
				+        ]);
			
 
				+    }
			
 
				+
			
 
				+    /*
			
 
				+     * 获取相册列表
			
 
				+     */
			
 
				+    public function get(Grid\Model|\Dcat\Admin\Grid\Model $model)
			
 
				+    {
			
 
				+        // 获取当前页数
			
 
				+        $currentPage = $model->getCurrentPage();
			
 
				+        // 获取每页显示行数
			
 
				+        $perPage = $model->getPerPage();
			
 
				+
			
 
				+        // 获取筛选参数
			
 
				+        $filterModel = $model->filter()->input('model', '');
			
 
				+        $folder_id = $model->filter()->input('folder_id', '');
			
 
				+
			
 
				+        $filter = [
			
 
				+            'model' => $filterModel,
			
 
				+            'folder_id' => $folder_id,
			
 
				+        ];
			
 
				+
			
 
				+        $result = $this->execute('siteAlbumPaginate', [
			
 
				+            'filter' => $filter,
			
 
				+            'perPage'=>$perPage,
			
 
				+            'page' => $currentPage,
			
 
				+        ]);
			
 
				+
			
 
				+        $data = $result['data'] ?? [];
			
 
				+
			
 
				+        return $model->makePaginator(
			
 
				+          $data['total'] ?? 0,
			
 
				+           $data['data'] ?? [] // 传入数据二维数组
			
 
				+        );
			
 
				+    }
			
 
				+
			
 
				+
			
 
				+    /*
			
 
				+     * 获取相册详情
			
 
				+     */
			
 
				+    public function detail(Show $show): array
			
 
				+    {
			
 
				+        // 获取数据主键值
			
 
				+        $id = $show->getKey();
			
 
				+        $result = $this->execute('siteAlbumGet', [
			
 
				+            'id' => $id,
			
 
				+        ]);
			
 
				+        $data = $result['data'] ?? [];
			
 
				+        return $data;
			
 
				+    }
			
 
				+
			
 
				+
			
 
				+}
			
--- a/app/Admin/Repositories/RpcAlbumFolder.php
+++ b/app/Admin/Repositories/RpcAlbumFolder.php
@@ -0,0 +1,43 @@
 
				+<?php
			
 
				+
			
 
				+namespace App\Admin\Repositories;
			
 
				+
			
 
				+use App\Libraries\RpcClient;
			
 
				+use App\Models\NullModel as Model;
			
 
				+use Dcat\Admin\Repositories\EloquentRepository;
			
 
				+use Dcat\Admin\Show;
			
 
				+
			
 
				+/*
			
 
				+ * RPC调用相册
			
 
				+ */
			
 
				+
			
 
				+class RpcAlbumFolder extends EloquentRepository
			
 
				+{
			
 
				+    /**
			
 
				+     * Model.
			
 
				+     *
			
 
				+     * @var string
			
 
				+     */
			
 
				+    protected $eloquentClass = Model::class;
			
 
				+
			
 
				+    public function execute($method, $params = [])
			
 
				+    {
			
 
				+        return RpcClient::albumExecute($method, $params);
			
 
				+    }
			
 
				+
			
 
				+
			
 
				+    /*
			
 
				+     * 获取相册文件夹列表
			
 
				+     */
			
 
				+    public static function selectOptions() {
			
 
				+        $self = new self();
			
 
				+        $result = $self->execute('siteAlbumFolderSelectOptions', []);
			
 
				+        $data = $result['data'] ?? [];
			
 
				+        return $data;
			
 
				+    }
			
 
				+
			
 
				+
			
 
				+
			
 
				+
			
 
				+
			
 
				+}
			
--- a/app/Admin/routes.php
+++ b/app/Admin/routes.php
@@ -50,6 +50,10 @@ Route::group([
 
				 
			
 
				     //api接口
			
 
				     $router->get('api/dist', 'ApiController@dist');
			
 
				+
			
 
				+    //产品导入
			
 
				+    $router->get('import-product', 'ImportProductController@index');
			
 
				+    $router->get('import-product/{id}', 'ImportProductController@show');
			
 
				 });
			
 
				 
			
 
				 /*
			
--- a/app/Libraries/CommonHelper.php
+++ b/app/Libraries/CommonHelper.php
@@ -50,17 +50,6 @@ class CommonHelper
 
				             }
			
 
				 
			
 
				             return $html;
			
 
				-
			
 
				-//
			
 
				-//            //默认用等比例缩放
			
 
				-//            $process = "?x-oss-process=image/resize,h_{$imgSize},m_lfit";
			
 
				-//            $html = '<div style="display: flex; flex-wrap: wrap; gap: 5px;">';
			
 
				-//            foreach ($images as $image) {
			
 
				-//                $html .= "<div style='width: {$boxSize}px; height: {$boxSize}px; padding: 3px; border: 1px solid #ddd; border-radius: 3px; background-color: #f9f9f9; box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1); display: flex; align-items: center; justify-content: center;'>
			
 
				-//                    <img  data-action='preview-img'   src='" . self::ossUrl($image).$process . "' style='max-width: 100%; max-height: 100%; object-fit: contain;'>
			
 
				-//                  </div>";
			
 
				-//            }
			
 
				-//            $html .= '</div>';
			
 
				         }
			
 
				         return $html;
			
 
				     }
			
@@ -80,6 +69,102 @@ class CommonHelper
 
				         return "http://".env('OSS_BUCKET').'.'.env('OSS_ENDPOINT').'/'.$imageUrl;
			
 
				     }
			
 
				 
			
 
				+
			
 
				+
			
 
				+    /*
			
 
				+     * 显示视频
			
 
				+     */
			
 
				+    public static function displayVideo($items,$videoCover,$videoSrc,$boxSize=150)
			
 
				+    {
			
 
				+        $html = '';
			
 
				+        if (is_array($items)) {
			
 
				+            foreach ($items as $item) {
			
 
				+                $item = (array) $item;
			
 
				+                $cover = $item[$videoCover];
			
 
				+                $src = $item[$videoSrc];
			
 
				+                $videoUrl = CommonHelper::ossUrl($src);
			
 
				+                $thumbnailUrl = CommonHelper::ossUrl($cover) ."?x-oss-process=image/resize,m_pad,h_{$boxSize},w_{$boxSize},color_ffffff";;
			
 
				+                $html .= '<div class="video-container"><a href="#" class="playVideo" videoUrl="'.$videoUrl.'")"><img src="'.$thumbnailUrl.'" alt="Video Thumbnail"><div class="play-button"></div></a></div>';
			
 
				+            }
			
 
				+            $html .= '<div class="video-popup" id="videoPopup"><span class="close-btn">&times;</span> <iframe src="" frameborder="0" allowfullscreen></iframe></div>';
			
 
				+        }
			
 
				+        //视频播放CSS
			
 
				+        Admin::style("
			
 
				+        .video-container {
			
 
				+            position: relative;
			
 
				+            display: inline-block;
			
 
				+        }
			
 
				+        .video-container img {
			
 
				+            height: 200px;
			
 
				+            margin-right: 5px;
			
 
				+            border: 1px solid #ececf1;
			
 
				+        }
			
 
				+        .play-button {
			
 
				+            position: absolute;
			
 
				+            top: 50%;
			
 
				+            left: 50%;
			
 
				+            transform: translate(-50%, -50%);
			
 
				+            width: 50px;
			
 
				+            height: 50px;
			
 
				+            background-color: rgba(0, 0, 0, 0.7);
			
 
				+            border-radius: 50%;
			
 
				+            cursor: pointer;
			
 
				+        }
			
 
				+        .play-button::after {
			
 
				+            content: '▶';
			
 
				+            font-size: 30px;
			
 
				+            color: white;
			
 
				+            position: absolute;
			
 
				+            top: 50%;
			
 
				+            left: 50%;
			
 
				+            transform: translate(-50%, -50%);
			
 
				+        }
			
 
				+        .video-popup {
			
 
				+            display: none;
			
 
				+            position: fixed;
			
 
				+            top: 50%;
			
 
				+            left: 50%;
			
 
				+            transform: translate(-50%, -50%);
			
 
				+            background-color: white;
			
 
				+            padding: 25px;
			
 
				+            box-shadow: 0 0 10px rgba(0, 0, 0, 0.5);
			
 
				+            z-index: 1000;
			
 
				+        }
			
 
				+        .video-popup iframe {
			
 
				+            width: 800px;
			
 
				+            height: 450px;
			
 
				+        }
			
 
				+        .close-btn {
			
 
				+            position: absolute;
			
 
				+            top: 0px;
			
 
				+            right: 5px;
			
 
				+            font-size: 24px;
			
 
				+            color: #000;
			
 
				+            cursor: pointer;
			
 
				+        }
			
 
				+        .close-btn:hover {
			
 
				+            color: #f00;
			
 
				+        }
			
 
				+        ");
			
 
				+
			
 
				+        Admin::script("
			
 
				+        $('.playVideo').on('click', function(e) {
			
 
				+            e.preventDefault(); // 阻止默认跳转行为
			
 
				+            var videoUrl = $(this).attr('videoUrl'); // 获取 videoUrl 属性
			
 
				+            $('#videoPopup').css('display', 'block');
			
 
				+            $('#videoPopup iframe').attr('src', videoUrl); // 设置 iframe 的 src
			
 
				+        });
			
 
				+
			
 
				+
			
 
				+        // 点击关闭按钮关闭视频
			
 
				+        $('.close-btn').on('click', function() {
			
 
				+            $('#videoPopup').css('display', 'none');
			
 
				+            $('#videoPopup iframe').attr('src', ''); // 停止播放视频
			
 
				+        });
			
 
				+        ");
			
 
				+        return $html; // 当没有数组数据时
			
 
				+    }
			
 
				+
			
 
				     /*
			
 
				      * 替换新增与编辑的url，在后边加上指定的参数 (适用于弹出框的新增与编辑)
			
 
				      * $addButton = '.tree-quick-create';
			
--- a/app/Libraries/RpcClient.php
+++ b/app/Libraries/RpcClient.php
@@ -0,0 +1,43 @@
 
				+<?php
			
 
				+
			
 
				+// app/Libraries/CommonHelper.php
			
 
				+namespace App\Libraries;
			
 
				+
			
 
				+use Dcat\Admin\Admin;
			
 
				+use JsonRPC\Client;
			
 
				+use Illuminate\Http\Request;
			
 
				+use JsonRPC\HttpClient;
			
 
				+
			
 
				+class RpcClient
			
 
				+{
			
 
				+    // RPC超时时间
			
 
				+    public static $timeout = 3;
			
 
				+
			
 
				+    /*
			
 
				+     * RPC客户端
			
 
				+     * @param $procedure string 远程过程调用名称
			
 
				+     * @param $params array 远程过程调用参数
			
 
				+     */
			
 
				+    public static function albumExecute ($procedure, $params = []) {
			
 
				+        $apiKey =  time();
			
 
				+        $apiSecret = env('ALBUM_RPC_SECRET');
			
 
				+        $payload = json_encode($params);
			
 
				+        $payload = $payload.$apiKey;
			
 
				+        $signature = hash_hmac('sha256', $payload, $apiSecret);
			
 
				+        $clientHost = env('ALBUM_RPC_URL');
			
 
				+        $httpClient = new HttpClient($clientHost);
			
 
				+        $httpClient = $httpClient->withTimeout(self::$timeout);
			
 
				+        $client = new Client($clientHost,true,$httpClient);
			
 
				+        try {
			
 
				+            $result = $client->execute( $procedure, $params,[], null,[
			
 
				+                    'X-API-Key: '.$apiKey,
			
 
				+                    'X-API-Signature: '.$signature,
			
 
				+            ]);
			
 
				+            return $result;
			
 
				+        } catch (\Exception $e) {
			
 
				+            throw new \Exception($e->getMessage());
			
 
				+        }
			
 
				+    }
			
 
				+
			
 
				+}
			
 
				+
			
--- a/app/Models/BaseProduct.php
+++ b/app/Models/BaseProduct.php
@@ -34,6 +34,23 @@ class BaseProduct extends Model
 
				         return $this->hasOne(BaseProductCategory::class,'id','category_id');
			
 
				     }
			
 
				 
			
 
				+    protected $fillable = [
			
 
				+        'id',
			
 
				+        'title',
			
 
				+        'keywords',
			
 
				+        'description',
			
 
				+        'sku',
			
 
				+        'category_id',
			
 
				+        'issuance_date',
			
 
				+        'order',
			
 
				+        'enabled',
			
 
				+        'content',
			
 
				+        'parameters',
			
 
				+        'created_at',
			
 
				+        'updated_at',
			
 
				+        'is_pinned',
			
 
				+    ];
			
 
				+
			
 
				     // 一对多关联
			
 
				     public function images()
			
 
				     {
			
--- a/app/Models/BaseProductImage.php
+++ b/app/Models/BaseProductImage.php
@@ -18,6 +18,8 @@ class BaseProductImage extends Model
 
				         'image_url',
			
 
				         'product_id',
			
 
				         'order',
			
 
				+        'created_at',
			
 
				+        'updated_at',
			
 
				     ];
			
 
				 
			
 
				     // 反向关联，属于某个产品
			
--- a/app/Models/NullModel.php
+++ b/app/Models/NullModel.php
@@ -0,0 +1,12 @@
 
				+<?php
			
 
				+
			
 
				+namespace App\Models;
			
 
				+
			
 
				+use Dcat\Admin\Traits\HasDateTimeFormatter;
			
 
				+use Illuminate\Database\Eloquent\Model;
			
 
				+
			
 
				+class NullModel extends Model
			
 
				+{
			
 
				+    use HasDateTimeFormatter;
			
 
				+
			
 
				+}
			
--- a/composer.json
+++ b/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": "^1.3",
			
 
				         "guzzlehttp/guzzle": "^7.2",
			
 
				         "laravel/framework": "^9.19",
			
 
				         "laravel/sanctum": "^3.0",
			
--- a/composer.lock
+++ b/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": "e553ae528c395a7344fa7214a3e381b3",
			
 
				     "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",
			
--- a/lang/en/global.php
+++ b/lang/en/global.php
@@ -93,6 +93,18 @@ return [
 
				         'target_type'           => 'Type',
			
 
				         'target_ids'            => 'Target Ids',
			
 
				         'message_title'         => 'Message Title',
			
 
				+        'model'                 => 'Model',
			
 
				+        'missing_content'       => 'Missing Content',
			
 
				+        'cover'                 => 'Cover',
			
 
				+        'en_detail'             => 'English Detail',
			
 
				+        'cn_detail'             => 'Chinese Detail',
			
 
				+        'video'                 => 'Video',
			
 
				+        'poster'                => 'Poster',
			
 
				+        'cert'                  => 'Cert',
			
 
				+        'pdf'                   => 'PDF',
			
 
				+        'pdf_title'             => 'PDF Title',
			
 
				+        'pdf_src'               => 'PDF Src',
			
 
				+        'video_src'             => 'Video Src',
			
 
				     ],
			
 
				     'labels' => [
			
 
				         'list'                  => 'List',
			
--- a/lang/zh_CN/global.php
+++ b/lang/zh_CN/global.php
@@ -99,6 +99,20 @@ return [
 
				         'video_category' => '视频分类',
			
 
				         'is_read' => '是否已读',
			
 
				         'time' => '时间',
			
 
				+        'model'                 => '型号',
			
 
				+        'missing_content'       => '缺少内容',
			
 
				+        'cover'                 => '主图',
			
 
				+        'en_detail'             => '英文详情',
			
 
				+        'cn_detail'             => '中文详情',
			
 
				+        'video'                 => '视频',
			
 
				+        'poster'                => '海报',
			
 
				+        'cert'                  => '证书',
			
 
				+        'pdf'                   => 'PDF',
			
 
				+        'pdf_title'             => 'PDF标题',
			
 
				+        'pdf_src'               => 'PDF文件',
			
 
				+        'video_src'             => '视频文件',
			
 
				+
			
 
				+
			
 
				     ],
			
 
				     'labels' => [
			
 
				         'list'         => '列表',