Merge branch 'collector_1106_fr' of https://gitee.com/zxt_5/collector_producer into collector_1106_fr

app/JsonRpc/CollectorService.php

@@ -170,10 +170,17 @@ class CollectorService implements CollectorServiceInterface
                             'name' => $data['name'],
                             'web_id' => $data['web_id'],
                             'first_url' => $data['first_url'],
+<<<<<<< HEAD
                             'parameter' => $data['parameter'],
                             'start' => $data['start'],
                             'title' => $data['title'],
                             'content' => $data['content']
+=======
+                            'parameter' => $data['second_start'],
+                            'start' => $data['second_num'],
+                            'title' => $data['second_end'],
+                            'content' => $data['start']
+>>>>>>> e4885d7b505b4e8a167ccf93db3f2368c0b661a7
                         ];  
                         // var_dump("============2============");       
                         break;        
@@ -520,6 +527,7 @@ class CollectorService implements CollectorServiceInterface
             'rule_id' => $data['rule_id'],
             'state' => 0
         ];
+        //获取某个规则任务下的已采集未导入的文章及文章详情
         $arts_id = Article::where($where)->wherenotNull('catid')->orderBy('id')->select('id')->get();
         $arts = Article::where($where)->wherenotNull('catid')->select('title','catid','level','introduce','keyword','author','copyfrom','fromurl','hits','islink','imgurl','admin_user_id','is_original')->orderBy('id')->get()->toArray();       
         $arts_data = ArticleData::whereIn('article_id',$arts_id)->select('content')->orderBy('article_id')->get()->toArray();

runtime/hyperf.pid

@@ -1 +0,0 @@
-9765

runtime/logs/hyperf.log

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 [2024-11-26T01:48:42.685851+00:00] sql.INFO: [364.41] select * from `col_web` where `id` = '4' [] []
 [2024-11-26T01:48:42.829014+00:00] sql.INFO: [24.11] select * from `col_rule` where `name` = '国家疾病预防控制局57777888\\\\\\\\...' [] []
 [2024-11-26T01:48:45.414604+00:00] sql.INFO: [16.09] select * from `col_web` where `id` = '4' [] []
@@ -1850,3 +1851,5 @@
 [2024-11-27T00:45:39.794539+00:00] sql.INFO: [60.8] select * from `col_article` where (`rule_id` = '12') order by `col_article`.`id` desc limit 10 offset 0 [] []
 [2024-11-27T00:45:39.851477+00:00] sql.INFO: [53.56] select `name` from `category` where `category`.`id` in (0) [] []
 [2024-11-27T00:45:39.864622+00:00] sql.INFO: [12.71] select count(*) as aggregate from `col_article` where (`rule_id` = '12') [] []
+=======
+>>>>>>> e4885d7b505b4e8a167ccf93db3f2368c0b661a7