合并分支 'lyh-server' 到 'master'

GXgeo设置



查看合并请求 !2316

@@ -77,12 +77,9 @@ class GeoQuestionRes extends Command
                         if(isset($result_data) && $result_data['code'] == 200){
                         if(isset($result_data) && $result_data['code'] == 200){
                             $result_data_annotations[] = $result_data['text'];
                             $result_data_annotations[] = $result_data['text'];
                             if(!empty($result_data['annotations'])){
                             if(!empty($result_data['annotations'])){
-                                $url = array_column($result_data['annotations'], 'url');
-                                $title = array_column($result_data['annotations'], 'title');
+                                $url = array_column($result_data['annotations']['url_citation'], 'url');
+                                $title = array_column($result_data['annotations']['url_citation'], 'title');
                                 $result_data_annotations = array_merge($url,$title,$result_data_annotations);
                                 $result_data_annotations = array_merge($url,$title,$result_data_annotations);
-                                dd($result_data['annotations']);
-                            }else{
-                                continue;
                             }
                             }
                             $keywords = $this->getKeywords($keywordArr,$result_data_annotations ?? []);
                             $keywords = $this->getKeywords($keywordArr,$result_data_annotations ?? []);
                             $urls = $this->getUrl($urlArr,$result_data_annotations ?? []);
                             $urls = $this->getUrl($urlArr,$result_data_annotations ?? []);