作者 lyh

gx

@@ -243,6 +243,6 @@ class Arr extends \Illuminate\Support\Arr @@ -243,6 +243,6 @@ class Arr extends \Illuminate\Support\Arr
243 $array = array_merge(...array_map(function($item) { 243 $array = array_merge(...array_map(function($item) {
244 return array_map('trim', preg_split('/\r?\n/', $item)); 244 return array_map('trim', preg_split('/\r?\n/', $item));
245 }, $arr)); 245 }, $arr));
246 - return array_values(array_unique(array_filter($array))); 246 + return json_encode(array_values(array_unique(array_filter($array))),true);
247 } 247 }
248 } 248 }
@@ -496,7 +496,6 @@ class ProjectLogic extends BaseLogic @@ -496,7 +496,6 @@ class ProjectLogic extends BaseLogic
496 $config['filter_mobiles'] = !empty($config['filter_mobiles']) ? Arr::lineToArray($config['filter_mobiles']) : []; 496 $config['filter_mobiles'] = !empty($config['filter_mobiles']) ? Arr::lineToArray($config['filter_mobiles']) : [];
497 $config['filter_names'] = !empty($config['filter_names']) ? Arr::lineToArray($config['filter_names']) : []; 497 $config['filter_names'] = !empty($config['filter_names']) ? Arr::lineToArray($config['filter_names']) : [];
498 $config['black_ips'] = !empty($config['black_ips']) ? Arr::lineToArray($config['black_ips']) : []; 498 $config['black_ips'] = !empty($config['black_ips']) ? Arr::lineToArray($config['black_ips']) : [];
499 -  
500 $model = InquiryFilterConfig::where('project_id', $config['project_id'])->first(); 499 $model = InquiryFilterConfig::where('project_id', $config['project_id'])->first();
501 if(!$model){ 500 if(!$model){
502 $model = new InquiryFilterConfig(); 501 $model = new InquiryFilterConfig();
@@ -504,9 +503,7 @@ class ProjectLogic extends BaseLogic @@ -504,9 +503,7 @@ class ProjectLogic extends BaseLogic
504 }else{ 503 }else{
505 $model->edit($config,['project_id'=>$config['project_id']]); 504 $model->edit($config,['project_id'=>$config['project_id']]);
506 } 505 }
507 -  
508 Cache::forget(InquiryFilterConfig::cacheKey($config['project_id'])); 506 Cache::forget(InquiryFilterConfig::cacheKey($config['project_id']));
509 -  
510 return $this->success(); 507 return $this->success();
511 } 508 }
512 509