From 9542079e203f3d1942f5799cf4f083d6066c5067 Mon Sep 17 00:00:00 2001 From: Bigsk Date: Fri, 13 Jun 2025 23:43:24 +0800 Subject: [PATCH] fixed 1panel system ssl deploy --- .../deployer/providers/1panel-console/1panel_console.go | 7 ++++++- internal/pkg/sdk3rd/1panel/api.go | 8 +++++++- internal/pkg/sdk3rd/1panel/client.go | 6 ++++-- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/internal/pkg/core/deployer/providers/1panel-console/1panel_console.go b/internal/pkg/core/deployer/providers/1panel-console/1panel_console.go index b1df4153..81d0a247 100644 --- a/internal/pkg/core/deployer/providers/1panel-console/1panel_console.go +++ b/internal/pkg/core/deployer/providers/1panel-console/1panel_console.go @@ -62,10 +62,15 @@ func (d *DeployerProvider) WithLogger(logger *slog.Logger) deployer.Deployer { func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPEM string) (*deployer.DeployResult, error) { // 设置面板 SSL 证书 + SSLEnable := "enable" + if d.config.ApiVersion == "v2" { + SSLEnable = "Enable" + } + updateSystemSSLReq := &onepanelsdk.UpdateSystemSSLRequest{ Cert: certPEM, Key: privkeyPEM, - SSL: "enable", + SSL: SSLEnable, SSLType: "import-paste", } if d.config.AutoRestart { diff --git a/internal/pkg/sdk3rd/1panel/api.go b/internal/pkg/sdk3rd/1panel/api.go index 68bcca36..91eff206 100644 --- a/internal/pkg/sdk3rd/1panel/api.go +++ b/internal/pkg/sdk3rd/1panel/api.go @@ -7,7 +7,13 @@ import ( func (c *Client) UpdateSystemSSL(req *UpdateSystemSSLRequest) (*UpdateSystemSSLResponse, error) { resp := &UpdateSystemSSLResponse{} - err := c.sendRequestWithResult(http.MethodPost, "/settings/ssl/update", req, resp) + + path := "/settings/ssl/update" + if c.version == "v2" { + path = "/core" + path + } + + err := c.sendRequestWithResult(http.MethodPost, path, req, resp) return resp, err } diff --git a/internal/pkg/sdk3rd/1panel/client.go b/internal/pkg/sdk3rd/1panel/client.go index 8090340e..5d9acb6d 100644 --- a/internal/pkg/sdk3rd/1panel/client.go +++ b/internal/pkg/sdk3rd/1panel/client.go @@ -14,7 +14,8 @@ import ( ) type Client struct { - client *resty.Client + client *resty.Client + version string } func NewClient(serverUrl, apiVersion, apiKey string) *Client { @@ -36,7 +37,8 @@ func NewClient(serverUrl, apiVersion, apiKey string) *Client { }) return &Client{ - client: client, + client: client, + version: apiVersion, } }