合并分支 'akun' 到 'master'

Akun



查看合并请求 !1529

@@ -68,8 +68,8 @@ class DomainSettingLogic extends BaseLogic
     public function saveDomain()
     {
         //获取主域名
-        $domain_parse = parse_url($this->param['domain'], PHP_URL_HOST);
-        $domain = trim($domain_parse['host'] ?? '');
+        $domain_parse = parse_url(trim($this->param['domain']));
+        $domain = $domain_parse['host'] ?? $domain_parse['path'];
         if (!$domain) {
             $this->fail('主域名填写错误');
         }
@@ -90,7 +90,9 @@ class DomainSettingLogic extends BaseLogic
 
         //构建blog二级域名
         $domain_array = explode('.', $domain);
-        if (count($domain_array) <= 2) {
+        if (count($domain_array) == 1) {
+            $this->fail('请填写正确的主域名');
+        } elseif (count($domain_array) == 2) {
             array_unshift($domain_array, 'blog');
         } else {
             $domain_array[0] = 'blog';