From d9af90c76b96314181f776b6321edbc54c30539b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E7=A5=A5=E8=B6=85?= Date: Mon, 27 Mar 2023 17:37:48 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- internal/web/actions/default/api/node/index.go | 5 ++++- internal/web/actions/default/api/node/update.go | 5 ++++- .../web/actions/default/servers/server/settings/tls/index.go | 5 ++++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/internal/web/actions/default/api/node/index.go b/internal/web/actions/default/api/node/index.go index 008edd59..5feaed18 100644 --- a/internal/web/actions/default/api/node/index.go +++ b/internal/web/actions/default/api/node/index.go @@ -65,7 +65,10 @@ func (this *IndexAction) RunGet(params struct { // 证书信息 var certs = []*sslconfigs.SSLCertConfig{} if httpsConfig.SSLPolicyRef != nil && httpsConfig.SSLPolicyRef.SSLPolicyId > 0 { - sslPolicyConfigResp, err := this.RPC().SSLPolicyRPC().FindEnabledSSLPolicyConfig(this.AdminContext(), &pb.FindEnabledSSLPolicyConfigRequest{SslPolicyId: httpsConfig.SSLPolicyRef.SSLPolicyId}) + sslPolicyConfigResp, err := this.RPC().SSLPolicyRPC().FindEnabledSSLPolicyConfig(this.AdminContext(), &pb.FindEnabledSSLPolicyConfigRequest{ + SslPolicyId: httpsConfig.SSLPolicyRef.SSLPolicyId, + IgnoreData: true, + }) if err != nil { this.ErrorPage(err) return diff --git a/internal/web/actions/default/api/node/update.go b/internal/web/actions/default/api/node/update.go index 354b5251..ecb64e8b 100644 --- a/internal/web/actions/default/api/node/update.go +++ b/internal/web/actions/default/api/node/update.go @@ -85,7 +85,10 @@ func (this *UpdateAction) RunGet(params struct { var certs = []*sslconfigs.SSLCertConfig{} var sslPolicyId = int64(0) if httpsConfig.SSLPolicyRef != nil && httpsConfig.SSLPolicyRef.SSLPolicyId > 0 { - sslPolicyConfigResp, err := this.RPC().SSLPolicyRPC().FindEnabledSSLPolicyConfig(this.AdminContext(), &pb.FindEnabledSSLPolicyConfigRequest{SslPolicyId: httpsConfig.SSLPolicyRef.SSLPolicyId}) + sslPolicyConfigResp, err := this.RPC().SSLPolicyRPC().FindEnabledSSLPolicyConfig(this.AdminContext(), &pb.FindEnabledSSLPolicyConfigRequest{ + SslPolicyId: httpsConfig.SSLPolicyRef.SSLPolicyId, + IgnoreData: true, + }) if err != nil { this.ErrorPage(err) return diff --git a/internal/web/actions/default/servers/server/settings/tls/index.go b/internal/web/actions/default/servers/server/settings/tls/index.go index a4b6ba4f..70ab56c3 100644 --- a/internal/web/actions/default/servers/server/settings/tls/index.go +++ b/internal/web/actions/default/servers/server/settings/tls/index.go @@ -43,7 +43,10 @@ func (this *IndexAction) RunGet(params struct { // SSL配置 var sslPolicy *sslconfigs.SSLPolicy if tlsConfig.SSLPolicyRef != nil && tlsConfig.SSLPolicyRef.SSLPolicyId > 0 { - sslPolicyConfigResp, err := this.RPC().SSLPolicyRPC().FindEnabledSSLPolicyConfig(this.AdminContext(), &pb.FindEnabledSSLPolicyConfigRequest{SslPolicyId: tlsConfig.SSLPolicyRef.SSLPolicyId}) + sslPolicyConfigResp, err := this.RPC().SSLPolicyRPC().FindEnabledSSLPolicyConfig(this.AdminContext(), &pb.FindEnabledSSLPolicyConfigRequest{ + SslPolicyId: tlsConfig.SSLPolicyRef.SSLPolicyId, + IgnoreData: true, + }) if err != nil { this.ErrorPage(err) return