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

@@ -68,7 +68,7 @@ class EmergencyRenewSite extends Command
                 ];
                 ];
                 $task_info = $create_model->read($map_create, ['id']);
                 $task_info = $create_model->read($map_create, ['id']);
                 if (!$task_info) {
                 if (!$task_info) {
-                    $map_create['other_domain'] = json_encode($other_domain);
+                    $other_domain && $map_create['other_domain'] = json_encode($other_domain);
                     $create_model->add($map_create);
                     $create_model->add($map_create);
                 }
                 }
 
 

@@ -179,15 +179,17 @@ class DomainInfoLogic extends BaseLogic
             $this->fail('域名' . $info['domain'] . '未解析至目标服务器');
             $this->fail('域名' . $info['domain'] . '未解析至目标服务器');
         }
         }
         $domain_301 = '';
         $domain_301 = '';
-        foreach ($this->param['other_domain']??[] as $other_domain){
-            if($other_domain && substr($other_domain,0,2) != '*.'){
-                if($this->check_a($other_domain,DomainInfo::SERVER_IP_301)){
-                    $domain_301 = $other_domain;
-                }else{
-                    if(!$this->check_cname($other_domain, $serversIpInfo)){
-                        $this->fail('域名' . $other_domain . '未解析至目标服务器');
-                    }
+        $other_domain = [];
+        foreach ($this->param['other_domain']??[] as $vo){
+            if(!$vo){
+                continue;
             }
             }
+            if(substr($vo,0,2) == '*.' || $this->check_cname($vo,$serversIpInfo)){
+                $other_domain[] = $vo;
+            }elseif($this->check_a($vo,DomainInfo::SERVER_IP_301)){
+                $domain_301 = $vo;
+            }else{
+                $this->fail('域名' . $vo . '未解析至目标服务器');
             }
             }
         }
         }
 
 
@@ -231,7 +233,7 @@ class DomainInfoLogic extends BaseLogic
 
 
         //保存301跳转数据+其他域名
         //保存301跳转数据+其他域名
         $data = [
         $data = [
-            'other_domain'=>json_encode(array_filter($this->param['other_domain'] ?? [])),
+            'other_domain'=>json_encode($other_domain),
             'extend_config'=>json_encode($extend_config),
             'extend_config'=>json_encode($extend_config),
             'type'=>$this->param['type'],
             'type'=>$this->param['type'],
             'private_key' => $this->param['key'] ?? '',
             'private_key' => $this->param['key'] ?? '',