合并分支 'akun' 到 'master'

白帽-二级域名绑定改版



查看合并请求 !1590

@@ -38,7 +38,7 @@ class DomainSettingLogic extends BaseLogic
     {
         $domain_info = $this->model->read(['project_id' => $this->user['project_id']], ['seo_type', 'seo_domain', 'seo_ftp']);
         $domain = $domain_info['seo_domain'] ?: '';
-        $ftp = $domain_info['seo_ftp'] ? json_decode($domain['seo_ftp'], true) : null;
+        $ftp = $domain_info['seo_ftp'] ? json_decode($domain['seo_ftp'], true) : ['url' => '', 'username' => '', 'password' => '', 'port' => ''];
         $type = $domain_info['seo_type'] ?: 1;
         $record = '';