修改采集器排序

app/JsonRpc/CollectorService.php

@@ -58,18 +58,17 @@ class CollectorService implements CollectorServiceInterface
      */
     public function getWeb(array $data): array
     {
-        
         if(isset($data['keyWord'])){
             $where = [
                 ['name','like','%'.$data['keyWord'].'%']
             ];
-            $rep = Web::where($where)->limit($data['pageSize'])->orderBy("created_at","desc")->offset(($data['page']-1)*$data['pageSize'])->get();
+            $rep = Web::where($where)->limit($data['pageSize'])->orderBy("updated_at","desc")->offset(($data['page']-1)*$data['pageSize'])->get();
             $count =  Web::where($where)->count();
             if($count==0){
                 return Result::error('未查找到相关网站！');
             }
         }else{
-            $rep = Web::limit($data['pageSize'])->orderBy("created_at","desc")->offset(($data['page']-1)*$data['pageSize'])->get();
+            $rep = Web::limit($data['pageSize'])->orderBy("updated_at","desc")->offset(($data['page']-1)*$data['pageSize'])->get();
             $count =  Web::count();
             
         }
@@ -81,7 +80,6 @@ class CollectorService implements CollectorServiceInterface
             return Result::error('您还未添加网站，请先去添加！');
             
         }
-        
         return Result::success($data);
     }
     /**
@@ -261,12 +259,14 @@ class CollectorService implements CollectorServiceInterface
                 ['name','like','%'.$data['keyWord'].'%']
             ];
         }
+
         if(empty($where)){
-            $rep = Rule::withCount(relations:'arts')->limit($data['pageSize'])->orderBy("created_at","desc")->offset(($data['page']-1)*$data['pageSize'])->get();
+            $rep = Rule::withCount(relations:'arts')->limit($data['pageSize'])->orderBy("updated_at","desc")->offset(($data['page']-1)*$data['pageSize'])->get();
         }else{
-            $rep = Rule::withCount(relations:'arts')->where($where)->limit($data['pageSize'])->orderBy("created_at","desc")->offset(($data['page']-1)*$data['pageSize'])->get();
+            $rep = Rule::withCount(relations:'arts')->where($where)->limit($data['pageSize'])->orderBy("updated_at","desc")->offset(($data['page']-1)*$data['pageSize'])->get();
         }
         
+
         $count = Rule::where($where)->count();
         if($count==0){
             return Result::error('暂无相关规则任务！');
@@ -668,18 +668,18 @@ class CollectorService implements CollectorServiceInterface
         if(isset($data['state']) && !empty($data['state'])){
             $where[] = ['state','=',$data['state']];
         }
-        
         //跨库查询栏目导航及采集的新闻
         $info = Article::query()
         ->where($where)
         ->with('category')
-        ->orderBy("article.id","desc")
+        ->orderBy("article.updated_at","desc")
         ->limit($data['pageSize'])
         ->offset(($data['page']-1)*$data['pageSize'])->get();
         $count = Article::where($where)->count();
         if($count == 0){
             return Result::error('暂无资讯');
         }
+
         $data = [
             'rep' => $info->toArray(),
             'count' => $count