|
...
|
...
|
@@ -140,7 +140,7 @@ class GeoQuestionRes extends Command |
|
|
|
}else{
|
|
|
|
$geoResultModel->edit($save_data, ['id' => $geo_result['id']]);
|
|
|
|
}
|
|
|
|
$save_data['text'] = json_encode(FALSE == empty($data) ? $data : $result,true);
|
|
|
|
$save_data['text'] = json_encode(!empty($data) ? $data : $result,true);
|
|
|
|
$geoLogModel->addReturnId($save_data);
|
|
|
|
echo '执行结束：'.$platform.PHP_EOL;
|
|
|
|
}
|
|
...
|
...
|
@@ -211,18 +211,27 @@ class GeoQuestionRes extends Command |
|
|
|
}
|
|
|
|
switch ($item['type']){
|
|
|
|
case 'paragraph':
|
|
|
|
array_push($texts, $item['text']);
|
|
|
|
if(isset($item['text']) && !empty($item['text'])){
|
|
|
|
array_push($texts, $item['text']);
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case 'title':
|
|
|
|
array_unshift($texts, $item['text']);
|
|
|
|
if(isset($item['text']) && !empty($item['text'])) {
|
|
|
|
array_unshift($texts, $item['text']);
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case 'list':
|
|
|
|
if(!empty($item['list'])){
|
|
|
|
foreach ($item['list'] as $sonItem){
|
|
|
|
array_push($texts, $sonItem['title']);
|
|
|
|
array_push($texts, $sonItem['text']);
|
|
|
|
if(isset($sonItem['text']) && !empty($sonItem['text'])) {
|
|
|
|
array_push($texts, $sonItem['text']);
|
|
|
|
}
|
|
|
|
if(isset($item['title']) && !empty($item['title'])) {
|
|
|
|
array_push($texts, $sonItem['title']);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
...
|
...
|
@@ -230,7 +239,7 @@ class GeoQuestionRes extends Command |
|
|
|
}
|
|
|
|
if(!empty($data['data']['reference_links']) && is_array($data['data']['reference_links'])){
|
|
|
|
foreach ($data['data']['reference_links'] as $link) {
|
|
|
|
if (!empty($link['text']) && !empty($link['link'])) {
|
|
|
|
if (isset($link['text']) && !empty($link['text']) && isset($link['link']) && !empty($link['link'])) {
|
|
|
|
$result['annotations'][] = [
|
|
|
|
'type' => 'url_citation',
|
|
|
|
'url_citation' => [
|
...
|
...
|
|
