合并分支 'akun' 到 'master'

Akun



查看合并请求 !650

@@ -303,8 +303,8 @@ class DomainInfoLogic extends BaseLogic
 
 
         //保存301跳转数据+其他域名
         //保存301跳转数据+其他域名
         $data = [
         $data = [
-            'other_domain'=>json_encode($this->param['other_domain'] ?? []),
-            'extend_config'=>json_encode($this->param['extend_config'] ?? []),
+            'other_domain'=>json_encode(array_filter($this->param['other_domain'] ?? [])),
+            'extend_config'=>json_encode(array_filter($this->param['extend_config'] ?? [])),
             'type'=>$this->param['type'],
             'type'=>$this->param['type'],
             'private_key' => $this->param['key'] ?? '',
             'private_key' => $this->param['key'] ?? '',
             'private_cert' => $this->param['cert'] ?? '',
             'private_cert' => $this->param['cert'] ?? '',
@@ -313,8 +313,8 @@ class DomainInfoLogic extends BaseLogic
             'amp_type' => $this->param['amp_type'] ?? 0,
             'amp_type' => $this->param['amp_type'] ?? 0,
             'amp_private_key' => $this->param['amp_key'] ?? '',
             'amp_private_key' => $this->param['amp_key'] ?? '',
             'amp_private_cert' => $this->param['amp_cert'] ?? '',
             'amp_private_cert' => $this->param['amp_cert'] ?? '',
-            'not_allow_country'=>json_encode($this->param['not_allow_country'] ?? []),
-            'not_allow_ip'=>json_encode($this->param['not_allow_ip'] ?? []),
+            'not_allow_country'=>json_encode(array_filter($this->param['not_allow_country'] ?? [])),
+            'not_allow_ip'=>json_encode(array_filter($this->param['not_allow_ip'] ?? [])),
         ];
         ];
         $this->model->edit($data,['id'=>$this->param['id']]);
         $this->model->edit($data,['id'=>$this->param['id']]);
         //主站生成证书
         //主站生成证书