作者 刘锟

update

@@ -214,7 +214,7 @@ class DomainInfo extends Command @@ -214,7 +214,7 @@ class DomainInfo extends Command
214 'is_https' => $param['is_https'], 214 'is_https' => $param['is_https'],
215 'not_allow_country' => $param['not_allow_country'], 215 'not_allow_country' => $param['not_allow_country'],
216 'not_allow_ip' => $param['not_allow_ip'], 216 'not_allow_ip' => $param['not_allow_ip'],
217 - 'amp_status' => $param['amp_status'] 217 + 'is_redirect' => $param['is_redirect']
218 ]; 218 ];
219 return $this->curlRequest($url, $param); 219 return $this->curlRequest($url, $param);
220 } 220 }
@@ -233,6 +233,7 @@ class DomainInfo extends Command @@ -233,6 +233,7 @@ class DomainInfo extends Command
233 "domain" => $param['domain'], 233 "domain" => $param['domain'],
234 'not_allow_country' => $param['not_allow_country'], 234 'not_allow_country' => $param['not_allow_country'],
235 'not_allow_ip' => $param['not_allow_ip'], 235 'not_allow_ip' => $param['not_allow_ip'],
  236 + 'is_redirect' => $param['is_redirect']
236 ]; 237 ];
237 return $this->curlRequest($url, $param); 238 return $this->curlRequest($url, $param);
238 } 239 }
@@ -315,6 +315,7 @@ class DomainInfoLogic extends BaseLogic @@ -315,6 +315,7 @@ class DomainInfoLogic extends BaseLogic
315 'amp_private_cert' => $this->param['amp_cert'] ?? '', 315 'amp_private_cert' => $this->param['amp_cert'] ?? '',
316 'not_allow_country'=>json_encode(array_filter($this->param['not_allow_country'] ?? [])), 316 'not_allow_country'=>json_encode(array_filter($this->param['not_allow_country'] ?? [])),
317 'not_allow_ip'=>json_encode(array_filter($this->param['not_allow_ip'] ?? [])), 317 'not_allow_ip'=>json_encode(array_filter($this->param['not_allow_ip'] ?? [])),
  318 + 'is_redirect' => $this->param['is_redirect'] ?? 0,
318 ]; 319 ];
319 $this->model->edit($data,['id'=>$this->param['id']]); 320 $this->model->edit($data,['id'=>$this->param['id']]);
320 //主站生成证书 321 //主站生成证书
@@ -67,7 +67,8 @@ class EditAmpDomainBt implements ShouldQueue @@ -67,7 +67,8 @@ class EditAmpDomainBt implements ShouldQueue
67 $api_param_amp = [ 67 $api_param_amp = [
68 'domain' => $domain_info['domain'], 68 'domain' => $domain_info['domain'],
69 'not_allow_country' => $domain_info['not_allow_country'], 69 'not_allow_country' => $domain_info['not_allow_country'],
70 - 'not_allow_ip' => $domain_info['not_allow_ip'] 70 + 'not_allow_ip' => $domain_info['not_allow_ip'],
  71 + 'is_redirect' => $domain_info['is_redirect']
71 ]; 72 ];
72 if ($domain_info['amp_type'] == 2) { 73 if ($domain_info['amp_type'] == 2) {
73 $api_param_amp['private_key'] = $domain_info['amp_private_key']; 74 $api_param_amp['private_key'] = $domain_info['amp_private_key'];
@@ -75,7 +75,7 @@ class EditDomainBt implements ShouldQueue @@ -75,7 +75,7 @@ class EditDomainBt implements ShouldQueue
75 'is_https' => $domain_info['is_https'], 75 'is_https' => $domain_info['is_https'],
76 'not_allow_country' => $domain_info['not_allow_country'], 76 'not_allow_country' => $domain_info['not_allow_country'],
77 'not_allow_ip' => $domain_info['not_allow_ip'], 77 'not_allow_ip' => $domain_info['not_allow_ip'],
78 - 'amp_status' => $domain_info['amp_status'] 78 + 'is_redirect' => $domain_info['is_redirect']
79 ]; 79 ];
80 } else { 80 } else {
81 $api_url = 'http://' . $server_info['domain'] . '/api/applySsl'; 81 $api_url = 'http://' . $server_info['domain'] . '/api/applySsl';
@@ -86,7 +86,7 @@ class EditDomainBt implements ShouldQueue @@ -86,7 +86,7 @@ class EditDomainBt implements ShouldQueue
86 'is_https' => $domain_info['is_https'], 86 'is_https' => $domain_info['is_https'],
87 'not_allow_country' => $domain_info['not_allow_country'], 87 'not_allow_country' => $domain_info['not_allow_country'],
88 'not_allow_ip' => $domain_info['not_allow_ip'], 88 'not_allow_ip' => $domain_info['not_allow_ip'],
89 - 'amp_status' => $domain_info['amp_status'] 89 + 'is_redirect' => $domain_info['is_redirect']
90 ]; 90 ];
91 } 91 }
92 92