合并分支 'akun' 到 'master'

Akun



查看合并请求 !514

@@ -192,22 +192,11 @@ class DomainInfo extends Command
     public function updatePrivate($param)
     public function updatePrivate($param)
     {
     {
         $url = 'https://' . $param['domain'] . '/api/applySsl/';
         $url = 'https://' . $param['domain'] . '/api/applySsl/';
-        $top_domain = $this->getTopDomain($param['domain']);
-        if ((empty($extend_config) || empty($extend_config[0]['origin'])) && $param['id'] != 3) {
-            $extend_config = [
-                ['origin' => $top_domain, 'target' => $param['domain']]
-            ];
-        }
         $param = [
         $param = [
-            'project_id' => $param['project_id'],
-            'type' => 1,
-            'route' => 1,
             "domain" => $param['domain'],
             "domain" => $param['domain'],
-            "rewrite" => $extend_config ?? [],
-            'other_domain' => [$top_domain, '*.' . $top_domain],
+            "rewrite" => $param['extend_config'],
+            'other_domain' => $param['other_domain'],
             'is_https' => $param['is_https'],
             'is_https' => $param['is_https'],
-            'private_key' => '',
-            'cert' => ''
         ];
         ];
         return $this->curlRequest($url, $param);
         return $this->curlRequest($url, $param);
     }
     }
@@ -250,34 +239,6 @@ class DomainInfo extends Command
         return $this->curlRequest($url, $param);
         return $this->curlRequest($url, $param);
     }
     }
 
 
-    public static function getTopDomain($url)
-    {
-        $url = strtolower($url);  //首先转成小写
-        $url = mb_ereg_replace('^(　| )+', '', trim($url));
-        $url = mb_ereg_replace('(　| )+$', '', $url);
-        if (!preg_match('/^(http:\/\/|https)/', $url)) {
-            $url = "https://" . $url;
-        }
-        $hosts = parse_url($url);
-        $host = $hosts['host'] ?? '';
-        //查看是几级域名
-        $data = explode('.', $host);
-        $n = count($data);
-        if ($n < 2) {
-            return $host;
-        }
-        //判断是否是双后缀
-        $preg = '/[\w].+\.(com|net|org|gov|edu|co|ne)\.[\w]/';
-        if (($n > 2) && preg_match($preg, $host)) {
-            //双后缀取后3位
-            $host = $data[$n - 3] . '.' . $data[$n - 2] . '.' . $data[$n - 1];
-        } else {
-            //非双后缀取后两位
-            $host = $data[$n - 2] . '.' . $data[$n - 1];
-        }
-        return $host;
-    }
-
     public function curlRequest($url, $data, $method = 'POST', $header = [], $time_out = 60)
     public function curlRequest($url, $data, $method = 'POST', $header = [], $time_out = 60)
     {
     {
         $ch = curl_init();
         $ch = curl_init();