From 90702185254e0e301d0f2b5ce5b2f17b462005ef Mon Sep 17 00:00:00 2001
From: zhangchenhao <zch@bt.cn>
Date: Thu, 8 May 2025 18:50:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BF=BD=E7=95=A5=E5=AE=89=E5=85=A8=E5=85=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/internal/cert/deploy/1panel.go  |  9 +++++++--
 backend/internal/cert/deploy/btpanel.go | 26 +++++++++++++++----------
 2 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/backend/internal/cert/deploy/1panel.go b/backend/internal/cert/deploy/1panel.go
index 51094dc..a680902 100644
--- a/backend/internal/cert/deploy/1panel.go
+++ b/backend/internal/cert/deploy/1panel.go
@@ -10,6 +10,7 @@ import (
 	"fmt"
 	"io"
 	"net/http"
+	"net/url"
 	"strconv"
 	"time"
 )
@@ -53,8 +54,12 @@ func Request1panel(data *map[string]any, method, providerID, requestUrl string)
 	if providerConfig["url"][len(providerConfig["url"])-1:] != "/" {
 		providerConfig["url"] += "/"
 	}
-
-	req, err := http.NewRequest(method, providerConfig["url"]+requestUrl, bytes.NewBuffer(jsonData))
+	parsedURL, err := url.Parse(providerConfig["url"])
+	if err != nil {
+		return nil, err
+	}
+	baseURL := fmt.Sprintf("%s://%s", parsedURL.Scheme, parsedURL.Host)
+	req, err := http.NewRequest(method, baseURL+requestUrl, bytes.NewBuffer(jsonData))
 	if err != nil {
 		// fmt.Println(err)
 		return nil, err
diff --git a/backend/internal/cert/deploy/btpanel.go b/backend/internal/cert/deploy/btpanel.go
index 2b7a6aa..244207f 100644
--- a/backend/internal/cert/deploy/btpanel.go
+++ b/backend/internal/cert/deploy/btpanel.go
@@ -18,7 +18,7 @@ import (
 func generateSignature(timestamp, apiKey string) string {
 	keyMd5 := md5.Sum([]byte(apiKey))
 	keyMd5Hex := strings.ToLower(hex.EncodeToString(keyMd5[:]))
-
+	
 	signMd5 := md5.Sum([]byte(timestamp + keyMd5Hex))
 	signMd5Hex := strings.ToLower(hex.EncodeToString(signMd5[:]))
 	return signMd5Hex
@@ -44,15 +44,21 @@ func RequestBt(data *url.Values, method, providerID, requestUrl string) (map[str
 	if providerConfig["url"][len(providerConfig["url"])-1:] != "/" {
 		providerConfig["url"] += "/"
 	}
-
+	
 	data.Set("request_time", fmt.Sprintf("%d", timestamp))
 	data.Set("request_token", token)
-
-	req, err := http.NewRequest(method, providerConfig["url"]+requestUrl, strings.NewReader(data.Encode()))
+	
+	parsedURL, err := url.Parse(providerConfig["url"])
 	if err != nil {
 		return nil, err
 	}
-
+	baseURL := fmt.Sprintf("%s://%s", parsedURL.Scheme, parsedURL.Host)
+	
+	req, err := http.NewRequest(method, baseURL+requestUrl, strings.NewReader(data.Encode()))
+	if err != nil {
+		return nil, err
+	}
+	
 	req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
 	req.Header.Set("user-agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/134.0.0.0 Safari/537.36")
 	// 自定义 Transport，跳过 SSL 证书验证
@@ -63,7 +69,7 @@ func RequestBt(data *url.Values, method, providerID, requestUrl string) (map[str
 	tr := &http.Transport{
 		TLSClientConfig: &tls.Config{InsecureSkipVerify: ignoreSsl},
 	}
-
+	
 	client := &http.Client{Transport: tr}
 	resp, err := client.Do(req)
 	if err != nil {
@@ -72,13 +78,13 @@ func RequestBt(data *url.Values, method, providerID, requestUrl string) (map[str
 	}
 	body, _ := io.ReadAll(resp.Body)
 	defer resp.Body.Close()
-
+	
 	var res map[string]interface{}
 	err = json.Unmarshal(body, &res)
 	if err != nil {
 		return nil, fmt.Errorf("返回值解析失败: %v", err)
 	}
-
+	
 	if res["status"] != nil && !res["status"].(bool) {
 		return nil, fmt.Errorf("请求出错: %s", res["msg"].(string))
 	}
@@ -112,7 +118,7 @@ func DeployBt(cfg map[string]any) error {
 	data.Set("cert_type", "1")
 	data.Set("privateKey", keyPem)
 	data.Set("certPem", certPem)
-	_, err := RequestBt(&data, "POST", providerID, "/config?action=SetPanelSSL")
+	_, err := RequestBt(&data, "POST", providerID, "config?action=SetPanelSSL")
 	if err != nil {
 		return fmt.Errorf("证书部署失败: %v", err)
 	}
@@ -150,7 +156,7 @@ func DeployBtSite(cfg map[string]any) error {
 	data.Set("key", keyPem)
 	data.Set("csr", certPem)
 	data.Set("siteName", siteName)
-	_, err := RequestBt(&data, "POST", providerID, "/site?action=SetSSL")
+	_, err := RequestBt(&data, "POST", providerID, "site?action=SetSSL")
 	if err != nil {
 		return fmt.Errorf("证书部署失败: %v", err)
 	}