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

@@ -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))));
     }
     }
 }
 }

@@ -488,25 +488,23 @@ class ProjectLogic extends BaseLogic
      * @date 2024/1/19
      * @date 2024/1/19
      */
      */
     public function saveInquiryFilterConfig($config){
     public function saveInquiryFilterConfig($config){
-
-        $config['filter_countries'] = !empty($config['filter_countries']) ? Arr::lineToArray($config['filter_countries']) : [];
-        $config['filter_contents'] = !empty($config['filter_contents']) ? Arr::lineToArray($config['filter_contents']) : [];
-        $config['filter_referers'] = !empty($config['filter_referers']) ? Arr::lineToArray($config['filter_referers']) : [];
-        $config['filter_emails'] = !empty($config['filter_emails']) ? Arr::lineToArray($config['filter_emails']) : [];
-        $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['black_ips'] = !empty($config['black_ips']) ? Arr::lineToArray($config['black_ips']) : [];
-
-        $model = InquiryFilterConfig::where('project_id', $config['project_id'])->first();
-        if(!$model){
-            $model = new InquiryFilterConfig();
-            $model->add($config);
+//
+        $config['filter_countries'] = !empty($config['filter_countries']) ? Arr::lineToArray($config['filter_countries']) : json_encode([]);
+        $config['filter_contents'] = !empty($config['filter_contents']) ? Arr::lineToArray($config['filter_contents']) : json_encode([]);
+        $config['filter_referers'] = !empty($config['filter_referers']) ? Arr::lineToArray($config['filter_referers']) : json_encode([]);
+        $config['filter_emails'] = !empty($config['filter_emails']) ? Arr::lineToArray($config['filter_emails']) : json_encode([]);
+        $config['filter_mobiles'] = !empty($config['filter_mobiles']) ? Arr::lineToArray($config['filter_mobiles']) : json_encode([]);
+        $config['filter_names'] = !empty($config['filter_names']) ? Arr::lineToArray($config['filter_names']) : json_encode([]);
+        $config['black_ips'] = !empty($config['black_ips']) ? Arr::lineToArray($config['black_ips']) : json_encode([]);
+
+        $InquiryFilterConfigModel = new InquiryFilterConfig();
+        $info = $InquiryFilterConfigModel->read(['project_id'=>$config['project_id']]);
+        if($info === false){
+            $InquiryFilterConfigModel->add($config);
         }else{
         }else{
-            $model->edit($config,['project_id'=>$config['project_id']]);
+            $InquiryFilterConfigModel->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();
     }
     }