From 0909671be65fdf23025280fdef507b49ca3e0d6c Mon Sep 17 00:00:00 2001 From: Fu Diwei Date: Sun, 25 May 2025 23:32:41 +0800 Subject: [PATCH] refactor: clean code --- .../providers/1panel-console/1panel_console.go | 8 ++++---- .../core/deployer/providers/1panel-site/1panel_site.go | 8 ++++---- .../providers/baotapanel-console/baotapanel_console.go | 8 ++++---- .../providers/baotapanel-site/baotapanel_site.go | 8 ++++---- .../providers/baotawaf-console/baotawaf_console.go | 8 ++++---- .../deployer/providers/baotawaf-site/baotawaf_site.go | 8 ++++---- internal/pkg/core/deployer/providers/cdnfly/cdnfly.go | 8 ++++---- .../pkg/core/deployer/providers/flexcdn/flexcdn.go | 8 ++++---- internal/pkg/core/deployer/providers/goedge/goedge.go | 8 ++++---- internal/pkg/core/deployer/providers/lecdn/lecdn.go | 10 +++++----- .../pkg/core/deployer/providers/proxmoxve/proxmoxve.go | 8 ++++---- .../providers/ratpanel-console/ratpanel_console.go | 8 ++++---- .../deployer/providers/ratpanel-site/ratpanel_site.go | 8 ++++---- .../pkg/core/deployer/providers/safeline/safeline.go | 8 ++++---- .../core/uploader/providers/1panel-ssl/1panel_ssl.go | 8 ++++---- internal/pkg/sdk3rd/1panel/client.go | 4 ++-- internal/pkg/sdk3rd/btpanel/client.go | 4 ++-- internal/pkg/sdk3rd/btwaf/client.go | 4 ++-- internal/pkg/sdk3rd/cdnfly/client.go | 4 ++-- internal/pkg/sdk3rd/flexcdn/client.go | 4 ++-- internal/pkg/sdk3rd/goedge/client.go | 4 ++-- internal/pkg/sdk3rd/lecdn/v3/client/client.go | 4 ++-- internal/pkg/sdk3rd/lecdn/v3/master/client.go | 4 ++-- internal/pkg/sdk3rd/ratpanel/client.go | 4 ++-- internal/pkg/sdk3rd/safeline/client.go | 4 ++-- ui/src/components/workflow/node/_SharedNode.tsx | 7 ------- ui/src/i18n/locales/en/nls.workflow.nodes.json | 2 -- ui/src/i18n/locales/zh/nls.workflow.nodes.json | 2 -- 28 files changed, 81 insertions(+), 92 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 0f7efed1..cdeb8af5 100644 --- a/internal/pkg/core/deployer/providers/1panel-console/1panel_console.go +++ b/internal/pkg/core/deployer/providers/1panel-console/1panel_console.go @@ -82,9 +82,9 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE return &deployer.DeployResult{}, nil } -func createSdkClient(apiUrl, apiVersion, apiKey string, skipTlsVerify bool) (*onepanelsdk.Client, error) { - if _, err := url.Parse(apiUrl); err != nil { - return nil, errors.New("invalid 1panel api url") +func createSdkClient(serverUrl, apiVersion, apiKey string, skipTlsVerify bool) (*onepanelsdk.Client, error) { + if _, err := url.Parse(serverUrl); err != nil { + return nil, errors.New("invalid 1panel server url") } if apiVersion == "" { @@ -95,7 +95,7 @@ func createSdkClient(apiUrl, apiVersion, apiKey string, skipTlsVerify bool) (*on return nil, errors.New("invalid 1panel api key") } - client := onepanelsdk.NewClient(apiUrl, apiVersion, apiKey) + client := onepanelsdk.NewClient(serverUrl, apiVersion, apiKey) if skipTlsVerify { client.WithTLSConfig(&tls.Config{InsecureSkipVerify: true}) } diff --git a/internal/pkg/core/deployer/providers/1panel-site/1panel_site.go b/internal/pkg/core/deployer/providers/1panel-site/1panel_site.go index a546c1bb..30414689 100644 --- a/internal/pkg/core/deployer/providers/1panel-site/1panel_site.go +++ b/internal/pkg/core/deployer/providers/1panel-site/1panel_site.go @@ -177,9 +177,9 @@ func (d *DeployerProvider) deployToCertificate(ctx context.Context, certPEM stri return nil } -func createSdkClient(apiUrl, apiVersion, apiKey string, skipTlsVerify bool) (*onepanelsdk.Client, error) { - if _, err := url.Parse(apiUrl); err != nil { - return nil, errors.New("invalid 1panel api url") +func createSdkClient(serverUrl, apiVersion, apiKey string, skipTlsVerify bool) (*onepanelsdk.Client, error) { + if _, err := url.Parse(serverUrl); err != nil { + return nil, errors.New("invalid 1panel server url") } if apiVersion == "" { @@ -190,7 +190,7 @@ func createSdkClient(apiUrl, apiVersion, apiKey string, skipTlsVerify bool) (*on return nil, errors.New("invalid 1panel api key") } - client := onepanelsdk.NewClient(apiUrl, apiVersion, apiKey) + client := onepanelsdk.NewClient(serverUrl, apiVersion, apiKey) if skipTlsVerify { client.WithTLSConfig(&tls.Config{InsecureSkipVerify: true}) } diff --git a/internal/pkg/core/deployer/providers/baotapanel-console/baotapanel_console.go b/internal/pkg/core/deployer/providers/baotapanel-console/baotapanel_console.go index b5deb005..5709f82d 100644 --- a/internal/pkg/core/deployer/providers/baotapanel-console/baotapanel_console.go +++ b/internal/pkg/core/deployer/providers/baotapanel-console/baotapanel_console.go @@ -82,16 +82,16 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE return &deployer.DeployResult{}, nil } -func createSdkClient(apiUrl, apiKey string, skipTlsVerify bool) (*btsdk.Client, error) { - if _, err := url.Parse(apiUrl); err != nil { - return nil, errors.New("invalid baota api url") +func createSdkClient(serverUrl, apiKey string, skipTlsVerify bool) (*btsdk.Client, error) { + if _, err := url.Parse(serverUrl); err != nil { + return nil, errors.New("invalid baota server url") } if apiKey == "" { return nil, errors.New("invalid baota api key") } - client := btsdk.NewClient(apiUrl, apiKey) + client := btsdk.NewClient(serverUrl, apiKey) if skipTlsVerify { client.WithTLSConfig(&tls.Config{InsecureSkipVerify: true}) } diff --git a/internal/pkg/core/deployer/providers/baotapanel-site/baotapanel_site.go b/internal/pkg/core/deployer/providers/baotapanel-site/baotapanel_site.go index f9936e2d..d6ee1533 100644 --- a/internal/pkg/core/deployer/providers/baotapanel-site/baotapanel_site.go +++ b/internal/pkg/core/deployer/providers/baotapanel-site/baotapanel_site.go @@ -124,16 +124,16 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE return &deployer.DeployResult{}, nil } -func createSdkClient(apiUrl, apiKey string, skipTlsVerify bool) (*btsdk.Client, error) { - if _, err := url.Parse(apiUrl); err != nil { - return nil, errors.New("invalid baota api url") +func createSdkClient(serverUrl, apiKey string, skipTlsVerify bool) (*btsdk.Client, error) { + if _, err := url.Parse(serverUrl); err != nil { + return nil, errors.New("invalid baota server url") } if apiKey == "" { return nil, errors.New("invalid baota api key") } - client := btsdk.NewClient(apiUrl, apiKey) + client := btsdk.NewClient(serverUrl, apiKey) if skipTlsVerify { client.WithTLSConfig(&tls.Config{InsecureSkipVerify: true}) } diff --git a/internal/pkg/core/deployer/providers/baotawaf-console/baotawaf_console.go b/internal/pkg/core/deployer/providers/baotawaf-console/baotawaf_console.go index bf8a3892..482ca8e4 100644 --- a/internal/pkg/core/deployer/providers/baotawaf-console/baotawaf_console.go +++ b/internal/pkg/core/deployer/providers/baotawaf-console/baotawaf_console.go @@ -70,16 +70,16 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE return &deployer.DeployResult{}, nil } -func createSdkClient(apiUrl, apiKey string, skipTlsVerify bool) (*btsdk.Client, error) { - if _, err := url.Parse(apiUrl); err != nil { - return nil, errors.New("invalid baota api url") +func createSdkClient(serverUrl, apiKey string, skipTlsVerify bool) (*btsdk.Client, error) { + if _, err := url.Parse(serverUrl); err != nil { + return nil, errors.New("invalid baota server url") } if apiKey == "" { return nil, errors.New("invalid baota api key") } - client := btsdk.NewClient(apiUrl, apiKey) + client := btsdk.NewClient(serverUrl, apiKey) if skipTlsVerify { client.WithTLSConfig(&tls.Config{InsecureSkipVerify: true}) } 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 faaf5681..435f7a69 100644 --- a/internal/pkg/core/deployer/providers/baotawaf-site/baotawaf_site.go +++ b/internal/pkg/core/deployer/providers/baotawaf-site/baotawaf_site.go @@ -133,16 +133,16 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE return &deployer.DeployResult{}, nil } -func createSdkClient(apiUrl, apiKey string, skipTlsVerify bool) (*btsdk.Client, error) { - if _, err := url.Parse(apiUrl); err != nil { - return nil, errors.New("invalid baota api url") +func createSdkClient(serverUrl, apiKey string, skipTlsVerify bool) (*btsdk.Client, error) { + if _, err := url.Parse(serverUrl); err != nil { + return nil, errors.New("invalid baota server url") } if apiKey == "" { return nil, errors.New("invalid baota api key") } - client := btsdk.NewClient(apiUrl, apiKey) + client := btsdk.NewClient(serverUrl, apiKey) if skipTlsVerify { client.WithTLSConfig(&tls.Config{InsecureSkipVerify: true}) } diff --git a/internal/pkg/core/deployer/providers/cdnfly/cdnfly.go b/internal/pkg/core/deployer/providers/cdnfly/cdnfly.go index 6b7c3ec7..1ced8caf 100644 --- a/internal/pkg/core/deployer/providers/cdnfly/cdnfly.go +++ b/internal/pkg/core/deployer/providers/cdnfly/cdnfly.go @@ -160,9 +160,9 @@ func (d *DeployerProvider) deployToCertificate(ctx context.Context, certPEM stri return nil } -func createSdkClient(apiUrl, apiKey, apiSecret string, skipTlsVerify bool) (*cfsdk.Client, error) { - if _, err := url.Parse(apiUrl); err != nil { - return nil, errors.New("invalid cachefly api url") +func createSdkClient(serverUrl, apiKey, apiSecret string, skipTlsVerify bool) (*cfsdk.Client, error) { + if _, err := url.Parse(serverUrl); err != nil { + return nil, errors.New("invalid cachefly server url") } if apiKey == "" { @@ -173,7 +173,7 @@ func createSdkClient(apiUrl, apiKey, apiSecret string, skipTlsVerify bool) (*cfs return nil, errors.New("invalid cachefly api secret") } - client := cfsdk.NewClient(apiUrl, apiKey, apiSecret) + client := cfsdk.NewClient(serverUrl, apiKey, apiSecret) if skipTlsVerify { client.WithTLSConfig(&tls.Config{InsecureSkipVerify: true}) } diff --git a/internal/pkg/core/deployer/providers/flexcdn/flexcdn.go b/internal/pkg/core/deployer/providers/flexcdn/flexcdn.go index 7925a72a..8b692e90 100644 --- a/internal/pkg/core/deployer/providers/flexcdn/flexcdn.go +++ b/internal/pkg/core/deployer/providers/flexcdn/flexcdn.go @@ -119,9 +119,9 @@ func (d *DeployerProvider) deployToCertificate(ctx context.Context, certPEM stri return nil } -func createSdkClient(apiUrl, apiRole, accessKeyId, accessKey string, skipTlsVerify bool) (*flexcdnsdk.Client, error) { - if _, err := url.Parse(apiUrl); err != nil { - return nil, errors.New("invalid flexcdn api url") +func createSdkClient(serverUrl, apiRole, accessKeyId, accessKey string, skipTlsVerify bool) (*flexcdnsdk.Client, error) { + if _, err := url.Parse(serverUrl); err != nil { + return nil, errors.New("invalid flexcdn server url") } if apiRole != "user" && apiRole != "admin" { @@ -136,7 +136,7 @@ func createSdkClient(apiUrl, apiRole, accessKeyId, accessKey string, skipTlsVeri return nil, errors.New("invalid flexcdn access key") } - client := flexcdnsdk.NewClient(apiUrl, apiRole, accessKeyId, accessKey) + client := flexcdnsdk.NewClient(serverUrl, apiRole, accessKeyId, accessKey) if skipTlsVerify { client.WithTLSConfig(&tls.Config{InsecureSkipVerify: true}) } diff --git a/internal/pkg/core/deployer/providers/goedge/goedge.go b/internal/pkg/core/deployer/providers/goedge/goedge.go index 5b3e2dc9..25caeb01 100644 --- a/internal/pkg/core/deployer/providers/goedge/goedge.go +++ b/internal/pkg/core/deployer/providers/goedge/goedge.go @@ -119,9 +119,9 @@ func (d *DeployerProvider) deployToCertificate(ctx context.Context, certPEM stri return nil } -func createSdkClient(apiUrl, apiRole, accessKeyId, accessKey string, skipTlsVerify bool) (*goedgesdk.Client, error) { - if _, err := url.Parse(apiUrl); err != nil { - return nil, errors.New("invalid goedge api url") +func createSdkClient(serverUrl, apiRole, accessKeyId, accessKey string, skipTlsVerify bool) (*goedgesdk.Client, error) { + if _, err := url.Parse(serverUrl); err != nil { + return nil, errors.New("invalid goedge server url") } if apiRole != "user" && apiRole != "admin" { @@ -136,7 +136,7 @@ func createSdkClient(apiUrl, apiRole, accessKeyId, accessKey string, skipTlsVeri return nil, errors.New("invalid goedge access key") } - client := goedgesdk.NewClient(apiUrl, apiRole, accessKeyId, accessKey) + client := goedgesdk.NewClient(serverUrl, apiRole, accessKeyId, accessKey) if skipTlsVerify { client.WithTLSConfig(&tls.Config{InsecureSkipVerify: true}) } diff --git a/internal/pkg/core/deployer/providers/lecdn/lecdn.go b/internal/pkg/core/deployer/providers/lecdn/lecdn.go index 15c5dba9..c85f6558 100644 --- a/internal/pkg/core/deployer/providers/lecdn/lecdn.go +++ b/internal/pkg/core/deployer/providers/lecdn/lecdn.go @@ -141,9 +141,9 @@ func (d *DeployerProvider) deployToCertificate(ctx context.Context, certPEM stri return nil } -func createSdkClient(apiUrl, apiVersion, apiRole, username, password string, skipTlsVerify bool) (interface{}, error) { - if _, err := url.Parse(apiUrl); err != nil { - return nil, errors.New("invalid lecdn api url") +func createSdkClient(serverUrl, apiVersion, apiRole, username, password string, skipTlsVerify bool) (interface{}, error) { + if _, err := url.Parse(serverUrl); err != nil { + return nil, errors.New("invalid lecdn server url") } if username == "" { @@ -156,7 +156,7 @@ func createSdkClient(apiUrl, apiVersion, apiRole, username, password string, ski if apiVersion == apiVersionV3 && apiRole == apiRoleClient { // v3 版客户端 - client := leclientsdkv3.NewClient(apiUrl, username, password) + client := leclientsdkv3.NewClient(serverUrl, username, password) if skipTlsVerify { client.WithTLSConfig(&tls.Config{InsecureSkipVerify: true}) } @@ -164,7 +164,7 @@ func createSdkClient(apiUrl, apiVersion, apiRole, username, password string, ski return client, nil } else if apiVersion == apiVersionV3 && apiRole == apiRoleMaster { // v3 版主控端 - client := lemastersdkv3.NewClient(apiUrl, username, password) + client := lemastersdkv3.NewClient(serverUrl, username, password) if skipTlsVerify { client.WithTLSConfig(&tls.Config{InsecureSkipVerify: true}) } diff --git a/internal/pkg/core/deployer/providers/proxmoxve/proxmoxve.go b/internal/pkg/core/deployer/providers/proxmoxve/proxmoxve.go index 455ccf6d..349c3a16 100644 --- a/internal/pkg/core/deployer/providers/proxmoxve/proxmoxve.go +++ b/internal/pkg/core/deployer/providers/proxmoxve/proxmoxve.go @@ -91,9 +91,9 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE return &deployer.DeployResult{}, nil } -func createSdkClient(apiUrl, apiToken, apiTokenSecret string, skipTlsVerify bool) (*proxmox.Client, error) { - if _, err := url.Parse(apiUrl); err != nil { - return nil, errors.New("invalid pve api url") +func createSdkClient(serverUrl, apiToken, apiTokenSecret string, skipTlsVerify bool) (*proxmox.Client, error) { + if _, err := url.Parse(serverUrl); err != nil { + return nil, errors.New("invalid pve server url") } if apiToken == "" { @@ -112,7 +112,7 @@ func createSdkClient(apiUrl, apiToken, apiTokenSecret string, skipTlsVerify bool } } client := proxmox.NewClient( - strings.TrimRight(apiUrl, "/")+"/api2/json", + strings.TrimRight(serverUrl, "/")+"/api2/json", proxmox.WithHTTPClient(httpClient), proxmox.WithAPIToken(apiToken, apiTokenSecret), ) diff --git a/internal/pkg/core/deployer/providers/ratpanel-console/ratpanel_console.go b/internal/pkg/core/deployer/providers/ratpanel-console/ratpanel_console.go index a6c560ae..651ae0ac 100644 --- a/internal/pkg/core/deployer/providers/ratpanel-console/ratpanel_console.go +++ b/internal/pkg/core/deployer/providers/ratpanel-console/ratpanel_console.go @@ -72,9 +72,9 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE return &deployer.DeployResult{}, nil } -func createSdkClient(apiUrl string, accessTokenId int32, accessToken string, skipTlsVerify bool) (*rpsdk.Client, error) { - if _, err := url.Parse(apiUrl); err != nil { - return nil, errors.New("invalid ratpanel api url") +func createSdkClient(serverUrl string, accessTokenId int32, accessToken string, skipTlsVerify bool) (*rpsdk.Client, error) { + if _, err := url.Parse(serverUrl); err != nil { + return nil, errors.New("invalid ratpanel server url") } if accessTokenId == 0 { @@ -85,7 +85,7 @@ func createSdkClient(apiUrl string, accessTokenId int32, accessToken string, ski return nil, errors.New("invalid ratpanel access token") } - client := rpsdk.NewClient(apiUrl, accessTokenId, accessToken) + client := rpsdk.NewClient(serverUrl, accessTokenId, accessToken) if skipTlsVerify { client.WithTLSConfig(&tls.Config{InsecureSkipVerify: true}) } diff --git a/internal/pkg/core/deployer/providers/ratpanel-site/ratpanel_site.go b/internal/pkg/core/deployer/providers/ratpanel-site/ratpanel_site.go index a296c95e..8d605b3d 100644 --- a/internal/pkg/core/deployer/providers/ratpanel-site/ratpanel_site.go +++ b/internal/pkg/core/deployer/providers/ratpanel-site/ratpanel_site.go @@ -79,9 +79,9 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE return &deployer.DeployResult{}, nil } -func createSdkClient(apiUrl string, accessTokenId int32, accessToken string, skipTlsVerify bool) (*rpsdk.Client, error) { - if _, err := url.Parse(apiUrl); err != nil { - return nil, errors.New("invalid ratpanel api url") +func createSdkClient(serverUrl string, accessTokenId int32, accessToken string, skipTlsVerify bool) (*rpsdk.Client, error) { + if _, err := url.Parse(serverUrl); err != nil { + return nil, errors.New("invalid ratpanel server url") } if accessTokenId == 0 { @@ -92,7 +92,7 @@ func createSdkClient(apiUrl string, accessTokenId int32, accessToken string, ski return nil, errors.New("invalid ratpanel access token") } - client := rpsdk.NewClient(apiUrl, accessTokenId, accessToken) + client := rpsdk.NewClient(serverUrl, accessTokenId, accessToken) if skipTlsVerify { client.WithTLSConfig(&tls.Config{InsecureSkipVerify: true}) } diff --git a/internal/pkg/core/deployer/providers/safeline/safeline.go b/internal/pkg/core/deployer/providers/safeline/safeline.go index 0abee743..f1b6b039 100644 --- a/internal/pkg/core/deployer/providers/safeline/safeline.go +++ b/internal/pkg/core/deployer/providers/safeline/safeline.go @@ -98,16 +98,16 @@ func (d *DeployerProvider) deployToCertificate(ctx context.Context, certPEM stri return nil } -func createSdkClient(apiUrl, apiToken string, skipTlsVerify bool) (*safelinesdk.Client, error) { - if _, err := url.Parse(apiUrl); err != nil { - return nil, errors.New("invalid safeline api url") +func createSdkClient(serverUrl, apiToken string, skipTlsVerify bool) (*safelinesdk.Client, error) { + if _, err := url.Parse(serverUrl); err != nil { + return nil, errors.New("invalid safeline server url") } if apiToken == "" { return nil, errors.New("invalid safeline api token") } - client := safelinesdk.NewClient(apiUrl, apiToken) + client := safelinesdk.NewClient(serverUrl, apiToken) if skipTlsVerify { client.WithTLSConfig(&tls.Config{InsecureSkipVerify: true}) } diff --git a/internal/pkg/core/uploader/providers/1panel-ssl/1panel_ssl.go b/internal/pkg/core/uploader/providers/1panel-ssl/1panel_ssl.go index 387944e3..c0283ccd 100644 --- a/internal/pkg/core/uploader/providers/1panel-ssl/1panel_ssl.go +++ b/internal/pkg/core/uploader/providers/1panel-ssl/1panel_ssl.go @@ -132,9 +132,9 @@ func (u *UploaderProvider) getCertIfExists(ctx context.Context, certPEM string, return nil, nil } -func createSdkClient(apiUrl, apiVersion, apiKey string) (*onepanelsdk.Client, error) { - if _, err := url.Parse(apiUrl); err != nil { - return nil, errors.New("invalid 1panel api url") +func createSdkClient(serverUrl, apiVersion, apiKey string) (*onepanelsdk.Client, error) { + if _, err := url.Parse(serverUrl); err != nil { + return nil, errors.New("invalid 1panel server url") } if apiVersion == "" { @@ -145,6 +145,6 @@ func createSdkClient(apiUrl, apiVersion, apiKey string) (*onepanelsdk.Client, er return nil, errors.New("invalid 1panel api key") } - client := onepanelsdk.NewClient(apiUrl, apiVersion, apiKey) + client := onepanelsdk.NewClient(serverUrl, apiVersion, apiKey) return client, nil } diff --git a/internal/pkg/sdk3rd/1panel/client.go b/internal/pkg/sdk3rd/1panel/client.go index 003203d3..3fe549a0 100644 --- a/internal/pkg/sdk3rd/1panel/client.go +++ b/internal/pkg/sdk3rd/1panel/client.go @@ -19,13 +19,13 @@ type Client struct { client *resty.Client } -func NewClient(apiHost, apiVersion, apiKey string) *Client { +func NewClient(serverUrl, apiVersion, apiKey string) *Client { if apiVersion == "" { apiVersion = "v1" } client := resty.New(). - SetBaseURL(strings.TrimRight(apiHost, "/") + "/api/" + apiVersion). + SetBaseURL(strings.TrimRight(serverUrl, "/") + "/api/" + apiVersion). SetPreRequestHook(func(c *resty.Client, req *http.Request) error { timestamp := fmt.Sprintf("%d", time.Now().Unix()) tokenMd5 := md5.Sum([]byte("1panel" + apiKey + timestamp)) diff --git a/internal/pkg/sdk3rd/btpanel/client.go b/internal/pkg/sdk3rd/btpanel/client.go index 1da625da..aafee04f 100644 --- a/internal/pkg/sdk3rd/btpanel/client.go +++ b/internal/pkg/sdk3rd/btpanel/client.go @@ -19,9 +19,9 @@ type Client struct { client *resty.Client } -func NewClient(apiHost, apiKey string) *Client { +func NewClient(serverUrl, apiKey string) *Client { client := resty.New(). - SetBaseURL(strings.TrimRight(apiHost, "/")) + SetBaseURL(strings.TrimRight(serverUrl, "/")) return &Client{ apiKey: apiKey, diff --git a/internal/pkg/sdk3rd/btwaf/client.go b/internal/pkg/sdk3rd/btwaf/client.go index 5ae545cc..083db0c1 100644 --- a/internal/pkg/sdk3rd/btwaf/client.go +++ b/internal/pkg/sdk3rd/btwaf/client.go @@ -17,9 +17,9 @@ type Client struct { client *resty.Client } -func NewClient(apiHost, apiKey string) *Client { +func NewClient(serverUrl, apiKey string) *Client { client := resty.New(). - SetBaseURL(strings.TrimRight(apiHost, "/") + "/api"). + SetBaseURL(strings.TrimRight(serverUrl, "/") + "/api"). SetPreRequestHook(func(c *resty.Client, req *http.Request) error { timestamp := fmt.Sprintf("%d", time.Now().Unix()) keyMd5 := md5.Sum([]byte(apiKey)) diff --git a/internal/pkg/sdk3rd/cdnfly/client.go b/internal/pkg/sdk3rd/cdnfly/client.go index c8753ed5..2dabf6fd 100644 --- a/internal/pkg/sdk3rd/cdnfly/client.go +++ b/internal/pkg/sdk3rd/cdnfly/client.go @@ -15,9 +15,9 @@ type Client struct { client *resty.Client } -func NewClient(apiHost, apiKey, apiSecret string) *Client { +func NewClient(serverUrl, apiKey, apiSecret string) *Client { client := resty.New(). - SetBaseURL(strings.TrimRight(apiHost, "/")). + SetBaseURL(strings.TrimRight(serverUrl, "/")). SetHeader("api-key", apiKey). SetHeader("api-secret", apiSecret) diff --git a/internal/pkg/sdk3rd/flexcdn/client.go b/internal/pkg/sdk3rd/flexcdn/client.go index beae469a..b478ffac 100644 --- a/internal/pkg/sdk3rd/flexcdn/client.go +++ b/internal/pkg/sdk3rd/flexcdn/client.go @@ -24,14 +24,14 @@ type Client struct { client *resty.Client } -func NewClient(apiHost, apiRole, accessKeyId, accessKey string) *Client { +func NewClient(serverUrl, apiRole, accessKeyId, accessKey string) *Client { client := &Client{ apiRole: apiRole, accessKeyId: accessKeyId, accessKey: accessKey, } client.client = resty.New(). - SetBaseURL(strings.TrimRight(apiHost, "/")). + SetBaseURL(strings.TrimRight(serverUrl, "/")). SetPreRequestHook(func(c *resty.Client, req *http.Request) error { if client.accessToken != "" { req.Header.Set("X-Cloud-Access-Token", client.accessToken) diff --git a/internal/pkg/sdk3rd/goedge/client.go b/internal/pkg/sdk3rd/goedge/client.go index 3dc961e3..3cd4900a 100644 --- a/internal/pkg/sdk3rd/goedge/client.go +++ b/internal/pkg/sdk3rd/goedge/client.go @@ -24,14 +24,14 @@ type Client struct { client *resty.Client } -func NewClient(apiHost, apiRole, accessKeyId, accessKey string) *Client { +func NewClient(serverUrl, apiRole, accessKeyId, accessKey string) *Client { client := &Client{ apiRole: apiRole, accessKeyId: accessKeyId, accessKey: accessKey, } client.client = resty.New(). - SetBaseURL(strings.TrimRight(apiHost, "/")). + SetBaseURL(strings.TrimRight(serverUrl, "/")). SetPreRequestHook(func(c *resty.Client, req *http.Request) error { if client.accessToken != "" { req.Header.Set("X-Edge-Access-Token", client.accessToken) diff --git a/internal/pkg/sdk3rd/lecdn/v3/client/client.go b/internal/pkg/sdk3rd/lecdn/v3/client/client.go index ad3a752e..3fa822eb 100644 --- a/internal/pkg/sdk3rd/lecdn/v3/client/client.go +++ b/internal/pkg/sdk3rd/lecdn/v3/client/client.go @@ -22,13 +22,13 @@ type Client struct { client *resty.Client } -func NewClient(apiHost, username, password string) *Client { +func NewClient(serverUrl, username, password string) *Client { client := &Client{ username: username, password: password, } client.client = resty.New(). - SetBaseURL(strings.TrimRight(apiHost, "/") + "/prod-api"). + SetBaseURL(strings.TrimRight(serverUrl, "/") + "/prod-api"). SetPreRequestHook(func(c *resty.Client, req *http.Request) error { if client.accessToken != "" { req.Header.Set("Authorization", "Bearer "+client.accessToken) diff --git a/internal/pkg/sdk3rd/lecdn/v3/master/client.go b/internal/pkg/sdk3rd/lecdn/v3/master/client.go index 2da0c0c4..ee1abaca 100644 --- a/internal/pkg/sdk3rd/lecdn/v3/master/client.go +++ b/internal/pkg/sdk3rd/lecdn/v3/master/client.go @@ -22,13 +22,13 @@ type Client struct { client *resty.Client } -func NewClient(apiHost, username, password string) *Client { +func NewClient(serverUrl, username, password string) *Client { client := &Client{ username: username, password: password, } client.client = resty.New(). - SetBaseURL(strings.TrimRight(apiHost, "/") + "/prod-api"). + SetBaseURL(strings.TrimRight(serverUrl, "/") + "/prod-api"). SetPreRequestHook(func(c *resty.Client, req *http.Request) error { if client.accessToken != "" { req.Header.Set("Authorization", "Bearer "+client.accessToken) diff --git a/internal/pkg/sdk3rd/ratpanel/client.go b/internal/pkg/sdk3rd/ratpanel/client.go index 47202a04..f1d20359 100644 --- a/internal/pkg/sdk3rd/ratpanel/client.go +++ b/internal/pkg/sdk3rd/ratpanel/client.go @@ -20,9 +20,9 @@ type Client struct { client *resty.Client } -func NewClient(apiHost string, accessTokenId int32, accessToken string) *Client { +func NewClient(serverUrl string, accessTokenId int32, accessToken string) *Client { client := resty.New(). - SetBaseURL(strings.TrimRight(apiHost, "/")+"/api"). + SetBaseURL(strings.TrimRight(serverUrl, "/")+"/api"). SetHeader("Accept", "application/json"). SetHeader("Content-Type", "application/json"). SetPreRequestHook(func(c *resty.Client, req *http.Request) error { diff --git a/internal/pkg/sdk3rd/safeline/client.go b/internal/pkg/sdk3rd/safeline/client.go index efcd3bd6..93d884a3 100644 --- a/internal/pkg/sdk3rd/safeline/client.go +++ b/internal/pkg/sdk3rd/safeline/client.go @@ -14,9 +14,9 @@ type Client struct { client *resty.Client } -func NewClient(apiHost, apiToken string) *Client { +func NewClient(serverUrl, apiToken string) *Client { client := resty.New(). - SetBaseURL(strings.TrimRight(apiHost, "/")). + SetBaseURL(strings.TrimRight(serverUrl, "/")). SetHeader("X-SLCE-API-TOKEN", apiToken) return &Client{ diff --git a/ui/src/components/workflow/node/_SharedNode.tsx b/ui/src/components/workflow/node/_SharedNode.tsx index 7bec1e90..44c894ef 100644 --- a/ui/src/components/workflow/node/_SharedNode.tsx +++ b/ui/src/components/workflow/node/_SharedNode.tsx @@ -4,7 +4,6 @@ import { CloseCircleOutlined as CloseCircleOutlinedIcon, EllipsisOutlined as EllipsisOutlinedIcon, FormOutlined as FormOutlinedIcon, - MergeOutlined as MergeOutlinedIcon, MoreOutlined as MoreOutlinedIcon, } from "@ant-design/icons"; import { useControllableValue } from "ahooks"; @@ -149,12 +148,6 @@ const SharedNodeMenu = ({ menus, trigger, node, disabled, branchId, branchIndex, setTimeout(() => nameInputRef.current?.focus(), 1); }, }, - // { - // key: "duplicate", - // disabled: disabled || isNodeReadOnly(node), - // label: isNodeBranchLike(node) ? t("workflow_node.action.duplicate_branch") : t("workflow_node.action.duplicate_node"), - // icon: , - // }, { type: "divider", }, diff --git a/ui/src/i18n/locales/en/nls.workflow.nodes.json b/ui/src/i18n/locales/en/nls.workflow.nodes.json index ca60aedb..80237287 100644 --- a/ui/src/i18n/locales/en/nls.workflow.nodes.json +++ b/ui/src/i18n/locales/en/nls.workflow.nodes.json @@ -1,11 +1,9 @@ { "workflow_node.action.configure_node": "Configure node", "workflow_node.action.add_node": "Add node", - "workflow_node.action.duplicate_node": "Duplicate node", "workflow_node.action.rename_node": "Rename node", "workflow_node.action.remove_node": "Delete node", "workflow_node.action.add_branch": "Add branch", - "workflow_node.action.duplicate_branch": "Duplicate branch", "workflow_node.action.rename_branch": "Rename branch", "workflow_node.action.remove_branch": "Delete branch", diff --git a/ui/src/i18n/locales/zh/nls.workflow.nodes.json b/ui/src/i18n/locales/zh/nls.workflow.nodes.json index 3da2c838..faf40816 100644 --- a/ui/src/i18n/locales/zh/nls.workflow.nodes.json +++ b/ui/src/i18n/locales/zh/nls.workflow.nodes.json @@ -1,11 +1,9 @@ { "workflow_node.action.configure_node": "配置节点", "workflow_node.branch.add_node": "添加节点", - "workflow_node.action.duplicate_node": "复制节点", "workflow_node.action.rename_node": "重命名", "workflow_node.action.remove_node": "删除节点", "workflow_node.action.add_branch": "添加并行分支", - "workflow_node.action.duplicate_branch": "复制分支", "workflow_node.action.rename_branch": "重命名", "workflow_node.action.remove_branch": "删除分支",