代码同步

backend/internal/cert/apply/apply.go

@@ -39,18 +39,18 @@ func GetDNSProvider(providerName string, creds map[string]string) (challenge.Pro
 		config.SecretID = creds["secret_id"]
 		config.SecretKey = creds["secret_key"]
 		return tencentcloud.NewDNSProviderConfig(config)
-
+	
 	// case "cloudflare":
 	// 	config := cloudflare.NewDefaultConfig()
 	// 	config.AuthToken = creds["CLOUDFLARE_API_TOKEN"]
 	// 	return cloudflare.NewDNSProviderConfig(config)
-
+	
 	case "aliyun":
 		config := alidns.NewDefaultConfig()
 		config.APIKey = creds["access_key"]
 		config.SecretKey = creds["access_secret"]
 		return alidns.NewDNSProviderConfig(config)
-
+	
 	default:
 		return nil, fmt.Errorf("不支持的 DNS Provider: %s", providerName)
 	}
@@ -62,7 +62,7 @@ func Apply(cfg map[string]any, logger *public.Logger) (map[string]any, error) {
 		return nil, err
 	}
 	defer db.Close()
-
+	
 	email, ok := cfg["email"].(string)
 	if !ok {
 		return nil, fmt.Errorf("参数错误：email")
@@ -84,7 +84,11 @@ func Apply(cfg map[string]any, logger *public.Logger) (map[string]any, error) {
 	default:
 		return nil, fmt.Errorf("参数错误：provider_id")
 	}
-
+	domainArr := strings.Split(domains, ",")
+	for i := range domainArr {
+		domainArr[i] = strings.TrimSpace(domainArr[i])
+	}
+	
 	// 获取上次申请的证书
 	runId, ok := cfg["_runId"].(string)
 	if !ok {
@@ -114,11 +118,17 @@ func Apply(cfg map[string]any, logger *public.Logger) (map[string]any, error) {
 				var maxDays float64
 				var maxItem map[string]any
 				for i := range certs {
+					if !public.ContainsAllIgnoreBRepeats(strings.Split(certs[i]["domains"].(string), ","), domainArr) {
+						continue
+					}
 					endTimeStr, ok := certs[i]["end_time"].(string)
 					if !ok {
 						continue
 					}
-					endTime, _ := time.Parse(layout, endTimeStr)
+					endTime, err := time.Parse(layout, endTimeStr)
+					if err != nil {
+						continue
+					}
 					diff := endTime.Sub(time.Now()).Hours() / 24
 					if diff > maxDays {
 						maxDays = diff
@@ -131,10 +141,10 @@ func Apply(cfg map[string]any, logger *public.Logger) (map[string]any, error) {
 				if !ok || cfgEnd <= 0 {
 					cfgEnd = 30
 				}
-
+				
 				if int(maxDays) > cfgEnd {
 					// 证书未过期，直接返回
-					logger.Debug(fmt.Sprintf("上次证书申请成功，剩余天数：%d 大于%d天，已跳过申请复用此证书", int(maxDays), cfgEnd))
+					logger.Debug(fmt.Sprintf("上次证书申请成功,域名：%s，剩余天数：%d 大于%d天，已跳过申请复用此证书", certObj["domains"], int(maxDays), cfgEnd))
 					return map[string]any{
 						"cert":       certObj["cert"],
 						"key":        certObj["key"],
@@ -145,7 +155,7 @@ func Apply(cfg map[string]any, logger *public.Logger) (map[string]any, error) {
 		}
 	}
 	logger.Debug("正在申请证书，域名: " + domains)
-
+	
 	user, err := LoadUserFromDB(db, email)
 	if err != nil {
 		logger.Debug("acme账号不存在，注册新账号")
@@ -154,10 +164,10 @@ func Apply(cfg map[string]any, logger *public.Logger) (map[string]any, error) {
 			Email: email,
 			key:   privateKey,
 		}
-
+		
 		config := lego.NewConfig(user)
 		config.Certificate.KeyType = certcrypto.EC384
-
+		
 		client, err := lego.NewClient(config)
 		if err != nil {
 			return nil, err
@@ -168,14 +178,14 @@ func Apply(cfg map[string]any, logger *public.Logger) (map[string]any, error) {
 			return nil, err
 		}
 		user.Registration = reg
-
+		
 		err = SaveUserToDB(db, user)
 		if err != nil {
 			return nil, err
 		}
 		logger.Debug("账号注册并保存成功")
 	}
-
+	
 	// 初始化 ACME 客户端
 	client, err := lego.NewClient(lego.NewConfig(user))
 	if err != nil {
@@ -196,13 +206,13 @@ func Apply(cfg map[string]any, logger *public.Logger) (map[string]any, error) {
 	if err != nil {
 		return nil, err
 	}
-
+	
 	// DNS 验证
 	provider, err := GetDNSProvider(providerStr, providerConfig)
 	if err != nil {
 		return nil, fmt.Errorf("创建 DNS provider 失败: %v", err)
 	}
-
+	
 	err = client.Challenge.SetDNS01Provider(provider,
 		dns01.WrapPreCheck(func(domain, fqdn, value string, check dns01.PreCheckFunc) (bool, error) {
 			// 跳过预检查
@@ -215,29 +225,29 @@ func Apply(cfg map[string]any, logger *public.Logger) (map[string]any, error) {
 	if err != nil {
 		return nil, err
 	}
-
+	
 	// fmt.Println(strings.Split(domains, ","))
 	request := certificate.ObtainRequest{
-		Domains: strings.Split(domains, ","),
+		Domains: domainArr,
 		Bundle:  true,
 	}
 	certObj, err := client.Certificate.Obtain(request)
 	if err != nil {
 		return nil, err
 	}
-
+	
 	certStr := string(certObj.Certificate)
 	keyStr := string(certObj.PrivateKey)
 	issuerCertStr := string(certObj.IssuerCertificate)
-
+	
 	// 保存证书和私钥
 	data := map[string]any{
 		"cert":       certStr,
 		"key":        keyStr,
 		"issuerCert": issuerCertStr,
 	}
-
-	err = cert.SaveCert("workflow", keyStr, certStr, issuerCertStr, runId)
+	
+	_, err = cert.SaveCert("workflow", keyStr, certStr, issuerCertStr, runId)
 	if err != nil {
 		return nil, err
 	}

backend/internal/cert/cert.go

@@ -26,7 +26,7 @@ func GetList(search string, p, limit int64) ([]map[string]any, int, error) {
 		return data, 0, err
 	}
 	defer s.Close()
-
+	
 	var limits []int64
 	if p >= 0 && limit >= 0 {
 		limits = []int64{0, limit}
@@ -35,7 +35,7 @@ func GetList(search string, p, limit int64) ([]map[string]any, int, error) {
 			limits[1] = p * limit
 		}
 	}
-
+	
 	if search != "" {
 		count, err = s.Where("domains like ?", []interface{}{"%" + search + "%"}).Count()
 		data, err = s.Where("domains like ?", []interface{}{"%" + search + "%"}).Limit(limits).Order("create_time", "desc").Select()
@@ -80,7 +80,7 @@ func AddCert(source, key, cert, issuer, issuerCert, domains, sha256, historyId,
 			workflowId = wh[0]["workflow_id"].(string)
 		}
 	}
-
+	
 	now := time.Now().Format("2006-01-02 15:04:05")
 	_, err = s.Insert(map[string]any{
 		"source":      source,
@@ -104,40 +104,40 @@ func AddCert(source, key, cert, issuer, issuerCert, domains, sha256, historyId,
 	return nil
 }
 
-func SaveCert(source, key, cert, issuerCert, historyId string) error {
+func SaveCert(source, key, cert, issuerCert, historyId string) (string, error) {
 	if err := public.ValidateSSLCertificate(cert, key); err != nil {
-		return err
+		return "", err
 	}
-
+	
 	certObj, err := public.ParseCertificate([]byte(cert))
 	if err != nil {
-		return fmt.Errorf("解析证书失败: %v", err)
+		return "", fmt.Errorf("解析证书失败: %v", err)
 	}
 	// SHA256
 	sha256, err := public.GetSHA256(cert)
 	if err != nil {
-		return fmt.Errorf("获取 SHA256 失败: %v", err)
+		return "", fmt.Errorf("获取 SHA256 失败: %v", err)
 	}
 	if d, _ := GetCert(sha256); d != nil {
-		return nil
+		return sha256, nil
 	}
-
+	
 	domainSet := make(map[string]bool)
-
+	
 	if certObj.Subject.CommonName != "" {
 		domainSet[certObj.Subject.CommonName] = true
 	}
 	for _, dns := range certObj.DNSNames {
 		domainSet[dns] = true
 	}
-
+	
 	// 转成切片并拼接成逗号分隔的字符串
 	var domains []string
 	for domain := range domainSet {
 		domains = append(domains, domain)
 	}
 	domainList := strings.Join(domains, ",")
-
+	
 	// 提取 CA 名称（Issuer 的组织名）
 	caName := "UNKNOWN"
 	if len(certObj.Issuer.Organization) > 0 {
@@ -149,20 +149,20 @@ func SaveCert(source, key, cert, issuerCert, historyId string) error {
 	startTime := certObj.NotBefore.Format("2006-01-02 15:04:05")
 	endTime := certObj.NotAfter.Format("2006-01-02 15:04:05")
 	endDay := fmt.Sprintf("%d", int(certObj.NotAfter.Sub(time.Now()).Hours()/24))
-
+	
 	err = AddCert(source, key, cert, caName, issuerCert, domainList, sha256, historyId, startTime, endTime, endDay)
 	if err != nil {
-		return fmt.Errorf("保存证书失败: %v", err)
+		return "", fmt.Errorf("保存证书失败: %v", err)
 	}
-	return nil
+	return sha256, nil
 }
 
-func UploadCert(key, cert string) error {
-	err := SaveCert("upload", key, cert, "", "")
+func UploadCert(key, cert string) (string, error) {
+	sha256, err := SaveCert("upload", key, cert, "", "")
 	if err != nil {
-		return fmt.Errorf("保存证书失败: %v", err)
+		return sha256, fmt.Errorf("保存证书失败: %v", err)
 	}
-	return nil
+	return sha256, nil
 }
 
 func DelCert(id string) error {
@@ -171,7 +171,7 @@ func DelCert(id string) error {
 		return err
 	}
 	defer s.Close()
-
+	
 	_, err = s.Where("id=?", []interface{}{id}).Delete()
 	if err != nil {
 		return err
@@ -185,7 +185,7 @@ func GetCert(id string) (map[string]string, error) {
 		return nil, err
 	}
 	defer s.Close()
-
+	
 	res, err := s.Where("id=? or sha256=?", []interface{}{id, id}).Select()
 	if err != nil {
 		return nil, err
@@ -193,13 +193,13 @@ func GetCert(id string) (map[string]string, error) {
 	if len(res) == 0 {
 		return nil, fmt.Errorf("证书不存在")
 	}
-
+	
 	data := map[string]string{
 		"domains": res[0]["domains"].(string),
 		"cert":    res[0]["cert"].(string),
 		"key":     res[0]["key"].(string),
 	}
-
+	
 	return data, nil
 }
 

backend/internal/cert/deploy/1panel.go

@@ -10,6 +10,7 @@ import (
 	"fmt"
 	"io"
 	"net/http"
+	"net/url"
 	"strconv"
 	"time"
 )
@@ -50,11 +51,12 @@ func Request1panel(data *map[string]any, method, providerID, requestUrl string)
 	if err != nil {
 		return nil, err
 	}
-	if providerConfig["url"][len(providerConfig["url"])-1:] != "/" {
-		providerConfig["url"] += "/"
+	parsedURL, err := url.Parse(providerConfig["url"])
+	if err != nil {
+		return nil, err
 	}
-
-	req, err := http.NewRequest(method, providerConfig["url"]+requestUrl, bytes.NewBuffer(jsonData))
+	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

backend/internal/cert/deploy/btpanel.go

@@ -41,14 +41,17 @@ func RequestBt(data *url.Values, method, providerID, requestUrl string) (map[str
 	}
 	timestamp := time.Now().Unix()
 	token := generateSignature(fmt.Sprintf("%d", timestamp), providerConfig["api_key"])
-	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
 	}
@@ -112,7 +115,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 +153,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)
 	}

backend/internal/cert/deploy/deploy.go

@@ -37,8 +37,9 @@ func Deploy(cfg map[string]any, logger *public.Logger) error {
 	case "aliyun-cdn":
 		logger.Debug("部署到阿里云CDN...")
 		return DeployAliCdn(cfg)
-	// case "aliyun-oss":
-
+	case "aliyun-oss":
+		logger.Debug("部署到阿里云OSS...")
+		return DeployOss(cfg)
 	default:
 		return fmt.Errorf("不支持的部署: %s", providerName)
 	}

backend/internal/cert/deploy/ssh.go

@@ -14,7 +14,7 @@ type SSHConfig struct {
 	Password   string // 可选
 	PrivateKey string // 可选
 	Host       string
-	Port       string
+	Port       float64
 }
 
 type RemoteFile struct {
@@ -24,7 +24,7 @@ type RemoteFile struct {
 
 func buildAuthMethods(password, privateKey string) ([]ssh.AuthMethod, error) {
 	var methods []ssh.AuthMethod
-
+	
 	if privateKey != "" {
 		signer, err := ssh.ParsePrivateKey([]byte(privateKey))
 		if err != nil {
@@ -32,71 +32,71 @@ func buildAuthMethods(password, privateKey string) ([]ssh.AuthMethod, error) {
 		}
 		methods = append(methods, ssh.PublicKeys(signer))
 	}
-
+	
 	if password != "" {
 		methods = append(methods, ssh.Password(password))
 	}
-
+	
 	if len(methods) == 0 {
 		return nil, fmt.Errorf("no authentication methods provided")
 	}
-
+	
 	return methods, nil
 }
 
 func writeMultipleFilesViaSSH(config SSHConfig, files []RemoteFile, preCmd, postCmd string) error {
-	addr := fmt.Sprintf("%s:%s", config.Host, config.Port)
-
+	addr := fmt.Sprintf("%s:%d", config.Host, int(config.Port))
+	
 	authMethods, err := buildAuthMethods(config.Password, config.PrivateKey)
 	if err != nil {
 		return err
 	}
-
+	
 	sshConfig := &ssh.ClientConfig{
 		User:            config.User,
 		Auth:            authMethods,
 		HostKeyCallback: ssh.InsecureIgnoreHostKey(),
 	}
-
+	
 	client, err := ssh.Dial("tcp", addr, sshConfig)
 	if err != nil {
 		return fmt.Errorf("failed to dial: %v", err)
 	}
 	defer client.Close()
-
+	
 	session, err := client.NewSession()
 	if err != nil {
 		return fmt.Errorf("会话创建失败: %v", err)
 	}
 	defer session.Close()
-
+	
 	var script bytes.Buffer
-
+	
 	if preCmd != "" {
 		script.WriteString(preCmd + " && ")
 	}
-
+	
 	for i, file := range files {
 		if i > 0 {
 			script.WriteString(" && ")
 		}
-
+		
 		dirCmd := fmt.Sprintf("mkdir -p $(dirname %q)", file.Path)
 		writeCmd := fmt.Sprintf("printf %%s '%s' > %s", file.Content, file.Path)
-
+		
 		script.WriteString(dirCmd + " && " + writeCmd)
 	}
-
+	
 	if postCmd != "" {
 		script.WriteString(" && " + postCmd)
 	}
-
+	
 	cmd := script.String()
-
+	
 	if err := session.Run(cmd); err != nil {
 		return fmt.Errorf("运行出错: %v", err)
 	}
-
+	
 	return nil
 }
 
@@ -127,17 +127,17 @@ func DeploySSH(cfg map[string]any) error {
 	if !ok {
 		return fmt.Errorf("参数错误：keyPath")
 	}
-	certPath, ok := cfg["keyPath"].(string)
+	certPath, ok := cfg["certPath"].(string)
 	if !ok {
 		return fmt.Errorf("参数错误：certPath")
 	}
 	beforeCmd, ok := cfg["beforeCmd"].(string)
 	if !ok {
-		return fmt.Errorf("参数错误：beforeCmd")
+		beforeCmd = ""
 	}
 	afterCmd, ok := cfg["afterCmd"].(string)
 	if !ok {
-		return fmt.Errorf("参数错误：afterCmd")
+		afterCmd = ""
 	}
 	providerData, err := access.GetAccess(providerID)
 	if err != nil {
@@ -155,8 +155,8 @@ func DeploySSH(cfg map[string]any) error {
 	}
 	// 自动创建多级目录
 	files := []RemoteFile{
-		{Path: keyPath, Content: certPem},
-		{Path: certPath, Content: keyPem},
+		{Path: certPath, Content: certPem},
+		{Path: keyPath, Content: keyPem},
 	}
 	err = writeMultipleFilesViaSSH(providerConfig, files, beforeCmd, afterCmd)
 	if err != nil {