Merge branch 'master' of http://47.244.231.31:8099/zhl/globalso-v6

@@ -2,13 +2,9 @@
 
 
 namespace App\Console\Commands\DayCount;
 namespace App\Console\Commands\DayCount;
 
 
-use App\Helper\Common;
 use App\Helper\FormGlobalsoApi;
 use App\Helper\FormGlobalsoApi;
 use App\Models\Domain\DomainInfo;
 use App\Models\Domain\DomainInfo;
-use App\Models\Inquiry\InquiryForm;
 use App\Models\Inquiry\InquiryFormData;
 use App\Models\Inquiry\InquiryFormData;
-use App\Models\Project\DeployBuild;
-use App\Models\Project\DeployOptimize;
 use App\Models\Project\Project;
 use App\Models\Project\Project;
 use App\Services\ProjectServer;
 use App\Services\ProjectServer;
 use Carbon\Carbon;
 use Carbon\Carbon;

@@ -12,7 +12,6 @@ namespace App\Console\Commands\DayCount;
 use App\Helper\FormGlobalsoApi;
 use App\Helper\FormGlobalsoApi;
 use App\Models\Inquiry\InquiryFormData;
 use App\Models\Inquiry\InquiryFormData;
 use App\Models\Project\Project;
 use App\Models\Project\Project;
-use App\Models\Visit\Visit;
 use App\Services\ProjectServer;
 use App\Services\ProjectServer;
 use Illuminate\Console\Command;
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\DB;

@@ -2,16 +2,11 @@
 
 
 namespace App\Console\Commands\DayCount;
 namespace App\Console\Commands\DayCount;
 
 
-use App\Helper\Common;
 use App\Helper\FormGlobalsoApi;
 use App\Helper\FormGlobalsoApi;
 use App\Models\Domain\DomainInfo;
 use App\Models\Domain\DomainInfo;
-use App\Models\Inquiry\InquiryForm;
 use App\Models\Inquiry\InquiryFormData;
 use App\Models\Inquiry\InquiryFormData;
-use App\Models\Project\DeployBuild;
-use App\Models\Project\DeployOptimize;
 use App\Models\Project\Project;
 use App\Models\Project\Project;
 use App\Services\ProjectServer;
 use App\Services\ProjectServer;
-use Carbon\Carbon;
 use Illuminate\Console\Command;
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Log;

@@ -14,7 +14,6 @@ use App\Models\Domain\DomainInfo;
 use App\Models\Inquiry\InquiryFormData;
 use App\Models\Inquiry\InquiryFormData;
 use App\Models\Project\DeployOptimize;
 use App\Models\Project\DeployOptimize;
 use App\Models\Project\Project;
 use App\Models\Project\Project;
-use App\Models\Visit\Visit;
 use App\Services\ProjectServer;
 use App\Services\ProjectServer;
 use Illuminate\Console\Command;
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\DB;

@@ -390,6 +390,7 @@ class RankDataLogic extends BaseLogic
     public function syncRankData($api_no, $site_res, $force=false){
     public function syncRankData($api_no, $site_res, $force=false){
         $project_ids = DeployOptimize::where('api_no', $api_no)->pluck('project_id');
         $project_ids = DeployOptimize::where('api_no', $api_no)->pluck('project_id');
         foreach ($project_ids as $project_id) {
         foreach ($project_ids as $project_id) {
+            Log::channel('rank_data')->info('开始查项目：' . $project_id);
             $project = Project::find($project_id);
             $project = Project::find($project_id);
             if (!$project) {
             if (!$project) {
                 throw new \Exception($api_no . '关联的项目不存在');
                 throw new \Exception($api_no . '关联的项目不存在');
@@ -397,12 +398,14 @@ class RankDataLogic extends BaseLogic
             $api = new QuanqiusouApi();
             $api = new QuanqiusouApi();
             $model = RankData::where('project_id', $project_id)->where('lang', '')->first();
             $model = RankData::where('project_id', $project_id)->where('lang', '')->first();
             if (!$model || $model->updated_date != date('Y-m-d') || $force) {
             if (!$model || $model->updated_date != date('Y-m-d') || $force) {
+                Log::channel('rank_data')->info('开始接口数据：' . $project_id);
                 $res = $api->getGoogleRank($project_id, $api_no, '', 7, $force);
                 $res = $api->getGoogleRank($project_id, $api_no, '', 7, $force);
                 if (!$res) {
                 if (!$res) {
                     throw new \Exception("接口数据获取失败,api_no:{$api_no}");
                     throw new \Exception("接口数据获取失败,api_no:{$api_no}");
                 }
                 }
                 //收录数
                 //收录数
                 $indexed_pages_num = $site_res[$api_no] ?? 0;
                 $indexed_pages_num = $site_res[$api_no] ?? 0;
+                Log::channel('rank_data')->info('开始保存：' . $project_id);
                 $this->save_rank($project_id, $res, $indexed_pages_num);
                 $this->save_rank($project_id, $res, $indexed_pages_num);
             }
             }
             //有小语种的
             //有小语种的

@@ -201,7 +201,7 @@ class SyncSubmitTaskService
         if(!empty($data['is_cf'])){
         if(!empty($data['is_cf'])){
             $visit_data['is_inquiry'] = 1;
             $visit_data['is_inquiry'] = 1;
         }
         }
-        Visit::saveData($visit_data, $date);
+        Visit::saveData($visit_data, $visit_data['updated_date']);
 
 
         return true;
         return true;
     }
     }