|
@@ -282,6 +282,10 @@ func (s *webForwardingService) buildProxyJSONConfig(ctx context.Context, req *v1
|
|
|
jsonData.SslPolicyRef.IsOn = true
|
|
|
} else {
|
|
|
apiType = protocolHttp
|
|
|
+ jsonData.SslPolicyRef = v1.SslPolicyRef{
|
|
|
+ IsOn: false,
|
|
|
+ SslPolicyId: req.WebForwardingData.SslCertId,
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
// 填充通用的 Listen 配置
|
|
@@ -449,15 +453,19 @@ func (s *webForwardingService) EditWebForwarding(ctx context.Context, req *v1.We
|
|
|
}
|
|
|
|
|
|
//修改网站端口
|
|
|
- if oldData.Port != req.WebForwardingData.Port {
|
|
|
+ if oldData.Port != req.WebForwardingData.Port || oldData.IsHttps != req.WebForwardingData.IsHttps || oldData.HttpsCert != req.WebForwardingData.HttpsCert || oldData.HttpsKey != req.WebForwardingData.HttpsKey {
|
|
|
var typeJson []byte
|
|
|
+ var closeJson []byte
|
|
|
var apiType string
|
|
|
if req.WebForwardingData.IsHttps == isHttps {
|
|
|
typeJson = formData.HttpsJSON
|
|
|
+ closeJson = formData.HttpJSON
|
|
|
apiType = protocolHttps
|
|
|
} else {
|
|
|
typeJson = formData.HttpJSON
|
|
|
+ closeJson = formData.HttpsJSON
|
|
|
apiType = protocolHttp
|
|
|
+
|
|
|
}
|
|
|
err = s.cdn.EditServerType(ctx, v1.EditWebsite{
|
|
|
Id: int64(oldData.CdnWebId),
|
|
@@ -466,6 +474,13 @@ func (s *webForwardingService) EditWebForwarding(ctx context.Context, req *v1.We
|
|
|
if err != nil {
|
|
|
return err
|
|
|
}
|
|
|
+ err = s.cdn.EditServerType(ctx, v1.EditWebsite{
|
|
|
+ Id: int64(oldData.CdnWebId),
|
|
|
+ TypeJSON: closeJson,
|
|
|
+ }, protocolHttp)
|
|
|
+ if err != nil {
|
|
|
+ return err
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
//修改网站域名
|