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

@@ -39,8 +39,9 @@ class IndexedPages extends BaseCommands
         Log::channel('rank_data')->info('开始-页面收录数据-'.count($list));
         Log::channel('rank_data')->info('开始-页面收录数据-'.count($list));
 
 
         foreach ($list as $project_id => $api_no) {
         foreach ($list as $project_id => $api_no) {
+            Log::channel('rank_data')->info('开始-页面收录数据-' . $project_id . '->' .$api_no);
             $rankDataLogic = new RankDataLogic();
             $rankDataLogic = new RankDataLogic();
-            $rankDataLogic->syncIndexedPages($api_no);
+            $rankDataLogic->syncIndexedPages($api_no, true);
         }
         }
 
 
         return true;
         return true;

@@ -243,6 +243,6 @@ class Arr extends \Illuminate\Support\Arr
         $array = array_merge(...array_map(function($item) {
         $array = array_merge(...array_map(function($item) {
             return array_map('trim', preg_split('/\r?\n/', $item));
             return array_map('trim', preg_split('/\r?\n/', $item));
         }, $arr));
         }, $arr));
-        return array_values(array_unique(array_filter($array)));
+        return json_encode(array_values(array_unique(array_filter($array))),true);
     }
     }
 }
 }

@@ -496,7 +496,6 @@ class ProjectLogic extends BaseLogic
         $config['filter_mobiles'] = !empty($config['filter_mobiles']) ? Arr::lineToArray($config['filter_mobiles']) : [];
         $config['filter_mobiles'] = !empty($config['filter_mobiles']) ? Arr::lineToArray($config['filter_mobiles']) : [];
         $config['filter_names'] = !empty($config['filter_names']) ? Arr::lineToArray($config['filter_names']) : [];
         $config['filter_names'] = !empty($config['filter_names']) ? Arr::lineToArray($config['filter_names']) : [];
         $config['black_ips'] = !empty($config['black_ips']) ? Arr::lineToArray($config['black_ips']) : [];
         $config['black_ips'] = !empty($config['black_ips']) ? Arr::lineToArray($config['black_ips']) : [];
-
         $model = InquiryFilterConfig::where('project_id', $config['project_id'])->first();
         $model = InquiryFilterConfig::where('project_id', $config['project_id'])->first();
         if(!$model){
         if(!$model){
             $model = new InquiryFilterConfig();
             $model = new InquiryFilterConfig();
@@ -504,9 +503,7 @@ class ProjectLogic extends BaseLogic
         }else{
         }else{
             $model->edit($config,['project_id'=>$config['project_id']]);
             $model->edit($config,['project_id'=>$config['project_id']]);
         }
         }
-
         Cache::forget(InquiryFilterConfig::cacheKey($config['project_id']));
         Cache::forget(InquiryFilterConfig::cacheKey($config['project_id']));
-
         return $this->success();
         return $this->success();
     }
     }