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

@@ -178,11 +178,11 @@ class DomainInfoLogic extends BaseLogic
         if(!$this->check_cname($info['domain'], $serversIpInfo)){
         if(!$this->check_cname($info['domain'], $serversIpInfo)){
             $this->fail('域名' . $info['domain'] . '未解析至目标服务器');
             $this->fail('域名' . $info['domain'] . '未解析至目标服务器');
         }
         }
-        $domain_301 = [];
+        $domain_301 = '';
         foreach ($this->param['other_domain']??[] as $other_domain){
         foreach ($this->param['other_domain']??[] as $other_domain){
             if($other_domain && substr($other_domain,0,2) != '*.'){
             if($other_domain && substr($other_domain,0,2) != '*.'){
                 if($this->check_a($other_domain,DomainInfo::SERVER_IP_301)){
                 if($this->check_a($other_domain,DomainInfo::SERVER_IP_301)){
-                    $domain_301[] = $other_domain;
+                    $domain_301 = $other_domain;
                 }else{
                 }else{
                     if(!$this->check_cname($other_domain, $serversIpInfo)){
                     if(!$this->check_cname($other_domain, $serversIpInfo)){
                         $this->fail('域名' . $other_domain . '未解析至目标服务器');
                         $this->fail('域名' . $other_domain . '未解析至目标服务器');
@@ -273,11 +273,11 @@ class DomainInfoLogic extends BaseLogic
         //新增重定向任务
         //新增重定向任务
         $redirect_model = new DomainRedirectTask();
         $redirect_model = new DomainRedirectTask();
         if($domain_301){
         if($domain_301){
-            $domain_301 = Arr::a2s($domain_301);
-            $task_redirect_info = $redirect_model->read(['origin_domain'=>$domain_301,'status'=>['<',DomainRedirectTask::STATUS_SUC]]);
+            $task_redirect_info = $redirect_model->read(['origin_domain'=>$domain_301]);
             if(!$task_redirect_info){
             if(!$task_redirect_info){
                 $redirect_model->add([
                 $redirect_model->add([
                     'origin_domain'=> $domain_301,
                     'origin_domain'=> $domain_301,
+                    'other_domain' => json_encode([]),
                     'target_domain' => $info['domain']
                     'target_domain' => $info['domain']
                 ]);
                 ]);
             }
             }

@@ -122,11 +122,11 @@ class SyncSubmitTaskService
      */
      */
     public function inquiry($data, $date)
     public function inquiry($data, $date)
     {
     {
-        $this->inquiryFilter($data['project_id'], $data);
-
         //数组key转为小写
         //数组key转为小写
         $data['data'] = array_change_key_case($data['data'], CASE_LOWER);
         $data['data'] = array_change_key_case($data['data'], CASE_LOWER);
 
 
+        $this->inquiryFilter($data['project_id'], $data);
+
         //特殊处理1986的表单
         //特殊处理1986的表单
         if($data['project_id'] == 1986){
         if($data['project_id'] == 1986){
             $fields = ['乘用车', '商用车', '能源存储', '探索新业务'];
             $fields = ['乘用车', '商用车', '能源存储', '探索新业务'];