GX生成白帽报表脚本

@@ -36,6 +36,10 @@ class GeoQuestionRes extends Command
     public function handle(){
     public function handle(){
         while (true){
         while (true){
             $task_id = $this->getTaskId();
             $task_id = $this->getTaskId();
+            if(empty($task_id)){
+                sleep(30);
+                continue;
+            }
             $questionModel = new GeoQuestion();//问题
             $questionModel = new GeoQuestion();//问题
             $info = $questionModel->read(['id'=>$task_id]);
             $info = $questionModel->read(['id'=>$task_id]);
             //获取当前项目的执行频率
             //获取当前项目的执行频率
@@ -107,19 +111,26 @@ class GeoQuestionRes extends Command
      * @method :post
      * @method :post
      * @time   :2025/7/3 16:38
      * @time   :2025/7/3 16:38
      */
      */
-    public function getUrl($urlArr = [],$result_annotations = []){
+    public function getUrl($urlArr = [],$result_annotations = [],$result_text = []){
         $url = [];
         $url = [];
-        if(!empty($urlArr) && !empty($result_annotations)){
+        if(!empty($urlArr)){
             foreach ($urlArr as $u_item){
             foreach ($urlArr as $u_item){
-                foreach ($result_annotations as $a_item){
-                    echo 'url'.$a_item['url_citation']['url'].PHP_EOL.'当前的url:'.$u_item;
-                    if (str_contains($a_item['url_citation']['url'], $u_item)) {
+                if(!empty($result_text)){
+                    if (str_contains($result_text, $u_item)) {
                         $url[] = $u_item;
                         $url[] = $u_item;
                     }
                     }
                 }
                 }
+                if(!empty($result_annotations)){
+                    foreach ($result_annotations as $a_item){
+                        echo 'url'.$a_item['url_citation']['url'].PHP_EOL.'当前的url:'.$u_item;
+                        if (str_contains($a_item['url_citation']['url'], $u_item)) {
+                            $url[] = $u_item;
+                        }
+                    }
+                }
             }
             }
         }
         }
-        return $url;
+        return array_values(array_unique($url));
     }
     }
 
 
     /**
     /**