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

@@ -227,7 +227,8 @@ class RankDataController extends BaseController
         $rand = array_rand($ips, 3);
         $rand = array_rand($ips, 3);
         foreach ($rand as $val) {
         foreach ($rand as $val) {
             $rand_key = array_rand($ips[$val], 1);
             $rand_key = array_rand($ips[$val], 1);
-            $urls[] = 'http://' . $ips[$val][$rand_key] . '/search/?q=' . $param['keyword'];
+            // https://www.quanqiusou.cn/search/?ip=64.34.204.224&q=China%20Bollard
+            $urls[] = 'https://www.quanqiusou.cn/search/?ip=' . $ips[$val][$rand_key] . '&q=' . $param['keyword'];
         }
         }
         $data['urls'] = $urls;
         $data['urls'] = $urls;
         $this->response('success',Code::SUCCESS,$data);
         $this->response('success',Code::SUCCESS,$data);

@@ -556,7 +556,7 @@ class InquiryForwardLogic extends BaseLogic
 
 
             //周统计
             //周统计
             $last_week_day = date('Y-m-d', strtotime('-1 week'));
             $last_week_day = date('Y-m-d', strtotime('-1 week'));
-            $week_manage_ids = ForwardCount::select('manage_id')->where('created_at', '>', $last_week_day . ' +1 day')->where('count', '>', 0)->orderBy('manage_id', 'asc')->distinct()->pluck('manage_id')->toArray();
+            $week_manage_ids = ForwardCount::select('manage_id')->where('created_at', '>', date('Y-m-d', strtotime($last_week_day . ' +1 day')))->where('count', '>', 0)->orderBy('manage_id', 'asc')->distinct()->pluck('manage_id')->toArray();
 
 
             $data_week = [];
             $data_week = [];
             $data_week_total = [];
             $data_week_total = [];

@@ -554,7 +554,7 @@ class RankDataLogic extends BaseLogic
         $without_project_ids = [];  //不用处理排名的项目
         $without_project_ids = [];  //不用处理排名的项目
         $without_extension_project_ids = [658]; //是否达标只统计主词的
         $without_extension_project_ids = [658]; //是否达标只统计主词的
         $extension_project_ids = [354]; //扩展词也到达标的
         $extension_project_ids = [354]; //扩展词也到达标的
-        $compliance_project_ids = [2163,257,823,1750,497,1006]; //直接达标处理的
+        $compliance_project_ids = [2163,257,823,1750,497,1006,2663]; //直接达标处理的
         $ceaseProjectId = [354, 378, 649, 1226, 1283, 1703, 1893, 2066, 2250,2193,2399,1685, 3931,2273,3647,1934];//暂停的项目
         $ceaseProjectId = [354, 378, 649, 1226, 1283, 1703, 1893, 2066, 2250,2193,2399,1685, 3931,2273,3647,1934];//暂停的项目
         $uptimeProjectId = [1434,1812,276,2414,2974];//按上线时间统计的项目
         $uptimeProjectId = [1434,1812,276,2414,2974];//按上线时间统计的项目
         //一个项目多个api_no
         //一个项目多个api_no