From 0e8ebaa8851dee89c1420709c5c9a40470a1f851 Mon Sep 17 00:00:00 2001 From: Fu Diwei Date: Wed, 28 May 2025 14:51:18 +0800 Subject: [PATCH 1/2] fix: #732 --- internal/domain/access.go | 2 +- .../core/deployer/providers/baotawaf-site/baotawaf_site_test.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/domain/access.go b/internal/domain/access.go index e31bb1a0..3910ffc3 100644 --- a/internal/domain/access.go +++ b/internal/domain/access.go @@ -384,7 +384,7 @@ type AccessConfigForWeComBot struct { type AccessConfigForWestcn struct { Username string `json:"username"` - ApiPassword string `json:"password"` + ApiPassword string `json:"apiPassword"` } type AccessConfigForZeroSSL struct { diff --git a/internal/pkg/core/deployer/providers/baotawaf-site/baotawaf_site_test.go b/internal/pkg/core/deployer/providers/baotawaf-site/baotawaf_site_test.go index 6bead4b5..e9b4b836 100644 --- a/internal/pkg/core/deployer/providers/baotawaf-site/baotawaf_site_test.go +++ b/internal/pkg/core/deployer/providers/baotawaf-site/baotawaf_site_test.go @@ -39,7 +39,7 @@ Shell command to run this test: --CERTIMATE_DEPLOYER_BAOTAWAFSITE_INPUTKEYPATH="/path/to/your-input-key.pem" \ --CERTIMATE_DEPLOYER_BAOTAWAFSITE_SERVERURL="http://127.0.0.1:8888" \ --CERTIMATE_DEPLOYER_BAOTAWAFSITE_APIKEY="your-api-key" \ - --CERTIMATE_DEPLOYER_BAOTAWAFSITE_SITENAME="your-site-name"\ + --CERTIMATE_DEPLOYER_BAOTAWAFSITE_SITENAME="your-site-name" \ --CERTIMATE_DEPLOYER_BAOTAWAFSITE_SITEPORT=443 */ func TestDeploy(t *testing.T) { From 28811c46d821a4c17b94e5cb67f3ee2681a02210 Mon Sep 17 00:00:00 2001 From: Fu Diwei Date: Sat, 31 May 2025 16:29:17 +0800 Subject: [PATCH 2/2] fix: #746 --- .../core/deployer/providers/baotawaf-site/baotawaf_site.go | 2 +- internal/pkg/sdk3rd/btwaf/models.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/pkg/core/deployer/providers/baotawaf-site/baotawaf_site.go b/internal/pkg/core/deployer/providers/baotawaf-site/baotawaf_site.go index 435f7a69..20572ca5 100644 --- a/internal/pkg/core/deployer/providers/baotawaf-site/baotawaf_site.go +++ b/internal/pkg/core/deployer/providers/baotawaf-site/baotawaf_site.go @@ -116,7 +116,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE SiteId: siteId, Type: typeutil.ToPtr("openCert"), Server: &btsdk.SiteServerInfo{ - ListenSSLPort: typeutil.ToPtr(d.config.SitePort), + ListenSSLPorts: typeutil.ToPtr([]int32{d.config.SitePort}), SSL: &btsdk.SiteServerSSLInfo{ IsSSL: typeutil.ToPtr(int32(1)), FullChain: typeutil.ToPtr(certPEM), diff --git a/internal/pkg/sdk3rd/btwaf/models.go b/internal/pkg/sdk3rd/btwaf/models.go index 16290e88..6217e1a5 100644 --- a/internal/pkg/sdk3rd/btwaf/models.go +++ b/internal/pkg/sdk3rd/btwaf/models.go @@ -37,8 +37,8 @@ type GetSiteListResponse struct { } type SiteServerInfo struct { - ListenSSLPort *int32 `json:"listen_ssl_port,omitempty"` - SSL *SiteServerSSLInfo `json:"ssl,omitempty"` + ListenSSLPorts *[]int32 `json:"listen_ssl_port,omitempty"` + SSL *SiteServerSSLInfo `json:"ssl,omitempty"` } type SiteServerSSLInfo struct {