use slice pkg

This commit is contained in:
Leo Chen
2024-10-28 20:28:13 +08:00
parent 38dc8a63d9
commit c419b2c8b4
4 changed files with 13 additions and 17 deletions

View File

@@ -194,14 +194,4 @@ func getDeployVariables(conf domain.DeployConfig) map[string]string {
}
return rs
}
// contains 检查字符串切片中是否包含指定的字符串
func contains(slice []string, item string) bool {
for _, s := range slice {
if s == item {
return true
}
}
return false
}

View File

@@ -5,6 +5,7 @@ import (
"encoding/json"
"fmt"
"strings"
"golang.org/x/exp/slices"
cdn "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cdn/v20180606"
"github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common"
@@ -109,11 +110,11 @@ func (d *TencentCDNDeployer) deploy(certId string) error {
}
request.InstanceIdList = common.StringPtrs(list)
} else { // 否则直接使用传入的域名
if(isDomainDeployed(certId, domain)){
deployed, _ := d.isDomainDeployed(certId, domain)
if(deployed){
d.infos = append(d.infos, "域名已部署")
return nil
}
else{
}else{
request.InstanceIdList = common.StringPtrs([]string{domain})
}
}
@@ -149,7 +150,7 @@ func (d *TencentCDNDeployer) getDomainList(certId string) ([]string, error) {
domains := make([]string, 0)
for _, domain := range response.Response.Domains {
domainStr := *domain
if(contains(deployedDomains, domainStr)){
if(slices.Contains(deployedDomains, domainStr)){
domains = append(domains, domainStr)
}
}
@@ -163,7 +164,7 @@ func (d *TencentCDNDeployer) isDomainDeployed(certId, domain string) (bool, erro
return false, err
}
return contains(deployedDomains, domain), nil
return slices.Contains(deployedDomains, domain), nil
}
func (d *TencentCDNDeployer) getDeployedDomainList(certId string) ([]string, error) {