合并分支 'akun' 到 'master'

Akun



查看合并请求 !457

@@ -60,24 +60,22 @@ class EditDomainBt implements ShouldQueue
         }
         }
 
 
         //编辑主站
         //编辑主站
-        $rewrite = $domain_info['extend_config'] ? json_decode($domain_info['extend_config'], true) : [];
-        $other_domain = $domain_info['other_domain'] ? json_decode($domain_info['other_domain'], true) : [];
         if ($domain_info['type'] == 2) {
         if ($domain_info['type'] == 2) {
             $api_url = 'http://' . $server_info['init_domain'] . '/api/setSsl';
             $api_url = 'http://' . $server_info['init_domain'] . '/api/setSsl';
             $api_param = [
             $api_param = [
                 'domain' => $domain_info['domain'],
                 'domain' => $domain_info['domain'],
                 'private_key' => $domain_info['private_key'],
                 'private_key' => $domain_info['private_key'],
                 'cert' => $domain_info['private_cert'],
                 'cert' => $domain_info['private_cert'],
-                'rewrite' => $rewrite,
-                'other_domain' => $other_domain,
+                'rewrite' => $domain_info['extend_config'],
+                'other_domain' => $domain_info['other_domain'],
                 'is_https' => $domain_info['is_https']
                 'is_https' => $domain_info['is_https']
             ];
             ];
         } else {
         } else {
             $api_url = 'http://' . $server_info['init_domain'] . '/api/applySsl';
             $api_url = 'http://' . $server_info['init_domain'] . '/api/applySsl';
             $api_param = [
             $api_param = [
                 'domain' => $domain_info['domain'],
                 'domain' => $domain_info['domain'],
-                'rewrite' => $rewrite,
-                'other_domain' => $other_domain,
+                'rewrite' => $domain_info['extend_config'],
+                'other_domain' => $domain_info['other_domain'],
                 'is_https' => $domain_info['is_https']
                 'is_https' => $domain_info['is_https']
             ];
             ];
         }
         }