Merge remote-tracking branch 'origin/master' into akun

@@ -38,7 +38,24 @@ class CheckListController extends BaseController
      */
     public function lists(){
         $field = ['id','status','sort','text','created_at'];
-        $data = $this->model->list($this->map,$this->page,$this->row,'id',$field);
+        $data = $this->model->lists($this->map,$this->page,$this->row,'id',$field);
+        $this->response('success',Code::SUCCESS,$data);
+    }
+
+    /**
+     * @remark :获取数据详情
+     * @name   :info
+     * @author :lyh
+     * @method :post
+     * @time   :2025/4/17 16:18
+     */
+    public function info(){
+        $this->request->validate([
+            'id'=>'required',
+        ],[
+            'id.required' => '主键不能为空',
+        ]);
+        $data = $this->model->read($this->map);
         $this->response('success',Code::SUCCESS,$data);
     }
 

@@ -82,12 +82,8 @@ class CustomModuleContentController extends BaseController
      * @time   :2024/1/31 15:48
      */
     public function getHandleImageFile($v){
-        if(!empty($v['image'])){
-            $v['image_link'] = getImageUrl($v['image'],$this->user['storage_type'] ?? 0,$this->user['project_location']);
-        }
-        if(!empty($v['og_image'])){
-            $v['og_image'] = getImageUrl($v['og_image'],$this->user['storage_type'] ?? 0,$this->user['project_location']);
-        }
+        $v['image_link'] = getImageUrl($v['image'] ?? '',$this->user['storage_type'] ?? 0,$this->user['project_location']);
+        $v['og_image'] = getImageUrl(empty($v['og_image']) ? $v['image'] : $v['og_image'],$this->user['storage_type'],$this->user['project_location']);
         if(!empty($v['video'])){
             $v['video']['url'] = getFileUrl($v['video']['url'],$this->user['storage_type'] ?? 0,$this->user['project_location'],$this->user['file_cdn'] ?? 0);
             $v['video']['video_image'] = getImageUrl($v['video']['video_image'],$this->user['storage_type'] ?? 0,$this->user['project_location']);

@@ -100,7 +100,7 @@ class BlogLogic extends BaseLogic
         $blogLabelLogic = new BlogLabelLogic();
         $info['label_name'] = $blogLabelLogic->getLabelName($info['label_id']);
         $info['image_link'] = getImageUrl($info['image'],$this->user['storage_type'],$this->user['project_location']);
-        $info['og_image'] = getImageUrl($info['og_image'],$this->user['storage_type'],$this->user['project_location']);
+        $info['og_image'] = getImageUrl(empty($info['og_image']) ? $info['image'] : $info['og_image'],$this->user['storage_type'],$this->user['project_location']);
         return $this->success($info);
     }
 

@@ -147,6 +147,7 @@ class NewsLogic extends BaseLogic
         }
         $info['category_id'] = explode(',',trim($info['category_id'],','));
         $info['image_link'] = getImageUrl($info['image'],$this->user['storage_type'],$this->user['project_location']);
+        $info['og_image'] = getImageUrl(empty($info['og_image']) ? $info['image'] : $info['og_image'],$this->user['storage_type'],$this->user['project_location']);
         return $this->success($info);
     }
 

@@ -306,6 +306,14 @@ Route::middleware(['aloginauth'])->group(function () {
         Route::any('/getAnchorLink', [Aside\Optimize\OptimizeController::class, 'getAnchorLink'])->name('admin.optimize_getAnchorLink');//设置robots开关
         Route::any('/getAfterCount', [Aside\Optimize\AfterCountController::class, 'getAfterCount'])->name('admin.optimize_getAfterCount');//售后统计数据
         Route::any('/getAfterCountInfo', [Aside\Optimize\AfterCountController::class, 'getAfterCountInfo'])->name('admin.optimize_getAfterCountInfo');//售后统计数据详情
+
+        //聚合页关键词设置
+        Route::prefix('check_list')->group(function () {
+            Route::any('/', [Aside\Optimize\CheckListController::class, 'lists'])->name('admin.check_list');
+            Route::any('/info', [Aside\Optimize\CheckListController::class, 'info'])->name('admin.check_list_info');
+            Route::any('/save', [Aside\Optimize\CheckListController::class, 'save'])->name('admin.check_list_save');
+            Route::any('/del', [Aside\Optimize\CheckListController::class, 'del'])->name('admin.check_list_del');
+        });
     });
     //生成关键字
     Route::prefix('create_keyword')->group(function () {
@@ -551,6 +559,7 @@ Route::middleware(['aloginauth'])->group(function () {
         Route::any('/save', [Aside\Project\AggregateKeywordController::class, 'save'])->name('admin.aggregateKeyword_save');
         Route::any('/del', [Aside\Project\AggregateKeywordController::class, 'del'])->name('admin.aggregateKeyword_del');
     });
+
 });
 
 //无需登录验证的路由组