修改lecdn参数、增加腾讯云部署未创建任务的判断

pull/295/head
v-me-50 2025-07-11 11:27:00 +08:00
parent 542262dfef
commit 64d29d2979
2 changed files with 22 additions and 14 deletions

View File

@ -238,9 +238,9 @@ func DeployLeCDN(cfg map[string]any) error {
default: default:
return fmt.Errorf("参数错误provider_id") return fmt.Errorf("参数错误provider_id")
} }
domainName, ok := cfg["domain_name"].(string) domainName, ok := cfg["domain"].(string)
if !ok || domainName == "" { if !ok || domainName == "" {
return fmt.Errorf("参数错误domain_name") return fmt.Errorf("参数错误domain")
} }
var siteId int var siteId int
switch v := cfg["site_id"].(type) { switch v := cfg["site_id"].(type) {

View File

@ -54,7 +54,7 @@ func DeployToTX(cfg map[string]any) error {
if !ok { if !ok {
return fmt.Errorf("证书错误cert") return fmt.Errorf("证书错误cert")
} }
var providerID string var providerID string
switch v := cfg["provider_id"].(type) { switch v := cfg["provider_id"].(type) {
case float64: case float64:
@ -84,16 +84,16 @@ func DeployToTX(cfg map[string]any) error {
region = r region = r
} }
client := ClientTencentcloud(providerConfig["secret_id"], providerConfig["secret_key"], region) client := ClientTencentcloud(providerConfig["secret_id"], providerConfig["secret_key"], region)
// 上传证书 // 上传证书
certificateId, err := UploadToTX(client, strings.TrimSpace(keyPem), strings.TrimSpace(certPem)) certificateId, err := UploadToTX(client, strings.TrimSpace(keyPem), strings.TrimSpace(certPem))
if err != nil { if err != nil {
return err return err
} }
// fmt.Println(certificateId) // fmt.Println(certificateId)
request := ssl.NewDeployCertificateInstanceRequest() request := ssl.NewDeployCertificateInstanceRequest()
request.CertificateId = common.StringPtr(certificateId) request.CertificateId = common.StringPtr(certificateId)
resourceType := cfg["resource_type"].(string) resourceType := cfg["resource_type"].(string)
switch resourceType { switch resourceType {
@ -128,16 +128,24 @@ func DeployToTX(cfg map[string]any) error {
request.InstanceIdList = common.StringPtrs([]string{fmt.Sprintf("%s|%s|%s", region, bucket, domain)}) request.InstanceIdList = common.StringPtrs([]string{fmt.Sprintf("%s|%s|%s", region, bucket, domain)})
request.ResourceType = common.StringPtr("cos") request.ResourceType = common.StringPtr("cos")
} }
// 返回的resp是一个DeployCertificateInstanceResponse的实例与请求对象对应 // 返回的resp是一个DeployCertificateInstanceResponse的实例与请求对象对应
response, err := client.DeployCertificateInstance(request) response, err := client.DeployCertificateInstance(request)
if _, ok := err.(*errors.TencentCloudSDKError); ok { if _, ok := err.(*errors.TencentCloudSDKError); ok {
return err return err
} }
if err != nil { if err != nil {
panic(err) if _, ok := err.(*errors.TencentCloudSDKError); ok {
return fmt.Errorf("腾讯云 API 错误: %v", err)
}
return fmt.Errorf("部署证书失败: %v", err)
}
if response == nil || response.Response == nil {
return fmt.Errorf("部署证书失败: 响应为空")
}
if *response.Response.DeployStatus != 1 {
return fmt.Errorf("腾讯云当前存在部署中的任务未创建新的部署任务部署中的任务ID为%d", *response.Response.DeployRecordId)
} }
fmt.Println(response.Response.DeployRecordId)
return nil return nil
} }
@ -146,27 +154,27 @@ func TencentCloudAPITest(providerID string) error {
if err != nil { if err != nil {
return err return err
} }
providerConfigStr, ok := providerData["config"].(string) providerConfigStr, ok := providerData["config"].(string)
if !ok { if !ok {
return fmt.Errorf("api配置错误") return fmt.Errorf("api配置错误")
} }
// 解析 JSON 配置 // 解析 JSON 配置
var providerConfig map[string]string var providerConfig map[string]string
err = json.Unmarshal([]byte(providerConfigStr), &providerConfig) err = json.Unmarshal([]byte(providerConfigStr), &providerConfig)
if err != nil { if err != nil {
return err return err
} }
// 创建客户端 // 创建客户端
client := ClientTencentcloud(providerConfig["secret_id"], providerConfig["secret_key"], "") client := ClientTencentcloud(providerConfig["secret_id"], providerConfig["secret_key"], "")
request := ssl.NewDescribeCertificatesRequest() request := ssl.NewDescribeCertificatesRequest()
_, err = client.DescribeCertificates(request) _, err = client.DescribeCertificates(request)
if err != nil { if err != nil {
return fmt.Errorf("测试请求失败: %v", err) return fmt.Errorf("测试请求失败: %v", err)
} }
return nil return nil
} }