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

geo脚本设置



查看合并请求 !2351

@@ -76,7 +76,7 @@ class GeoQuestionRes extends Command
             $geoLogModel = new GeoQuestionLog();
             $geoLogModel = new GeoQuestionLog();
             foreach ($taskInfo['question'] as $question) {
             foreach ($taskInfo['question'] as $question) {
                 foreach ($platformsArr as $platform) {
                 foreach ($platformsArr as $platform) {
-                    $data = $hit_data = $result = [];
+                    $data = $hit_data = [];
                     $error_num = 0;
                     $error_num = 0;
                     // 设置重试， 有的平台不一定能正常获取到数据
                     // 设置重试， 有的平台不一定能正常获取到数据
                     GET_RESULT:
                     GET_RESULT:
@@ -123,6 +123,7 @@ class GeoQuestionRes extends Command
                             $hit++;
                             $hit++;
                         }
                         }
                     }
                     }
+                    echo 'MZ-url'.json_encode($hit_url).PHP_EOL;
                     // 保存数据结果
                     // 保存数据结果
                     $geo_result = $geoResultModel->read(['project_id' => $taskInfo['project_id'], 'question_id' => $task_id, 'platform' => $platform, 'question' => $question],['id']);
                     $geo_result = $geoResultModel->read(['project_id' => $taskInfo['project_id'], 'question_id' => $task_id, 'platform' => $platform, 'question' => $question],['id']);
                     $save_data = [
                     $save_data = [
@@ -134,10 +135,14 @@ class GeoQuestionRes extends Command
                         'keywords' => json_encode($hit_keyword,true),//命中的关键词
                         'keywords' => json_encode($hit_keyword,true),//命中的关键词
                         'url' => json_encode($hit_url,true),//命中的网址
                         'url' => json_encode($hit_url,true),//命中的网址
                         'text' => json_encode($result,true),
                         'text' => json_encode($result,true),
-                        'hit' => $hit
+                        'hit' => $hit,
+                        'created_at'=>date('Y-m-d H:i:s'),
+                        'updated_at'=>date('Y-m-d H:i:s'),
                     ];
                     ];
+//                    echo '当前数据INFO:'.json_encode($save_data,true).PHP_EOL;
                     if($geo_result === false){
                     if($geo_result === false){
-                        $geoResultModel->addReturnId($save_data);
+                        $id= $geoResultModel->insertGetId($save_data);
+                        echo '当前数据id:'.$id.PHP_EOL;
                     }else{
                     }else{
                         $geoResultModel->edit($save_data, ['id' => $geo_result['id']]);
                         $geoResultModel->edit($save_data, ['id' => $geo_result['id']]);
                     }
                     }