Merge branch 'main' into main

This commit is contained in:
RHQYZ 2024-10-15 21:30:16 +08:00 committed by GitHub
commit a4d1c9a7c0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 5 deletions

View File

@ -98,7 +98,8 @@ func (t *tencentCdn) deploy(certId string) error {
request.Status = common.Int64Ptr(1) request.Status = common.Int64Ptr(1)
// 如果是泛域名就从cdn列表下获取SSL证书中的可用域名 // 如果是泛域名就从cdn列表下获取SSL证书中的可用域名
if strings.Contains(t.option.Domain, "*") { domain := getDeployString(t.option.DeployConfig, "domain")
if strings.Contains(domain, "*") {
list, errGetList := t.getDomainList() list, errGetList := t.getDomainList()
if errGetList != nil { if errGetList != nil {
return fmt.Errorf("failed to get certificate domain list: %w", errGetList) return fmt.Errorf("failed to get certificate domain list: %w", errGetList)
@ -108,7 +109,7 @@ func (t *tencentCdn) deploy(certId string) error {
} }
request.InstanceIdList = common.StringPtrs(list) request.InstanceIdList = common.StringPtrs(list)
} else { // 否则直接使用传入的域名 } else { // 否则直接使用传入的域名
request.InstanceIdList = common.StringPtrs([]string{t.option.Domain}) request.InstanceIdList = common.StringPtrs([]string{domain})
} }
// 返回的resp是一个DeployCertificateInstanceResponse的实例与请求对象对应 // 返回的resp是一个DeployCertificateInstanceResponse的实例与请求对象对应

7
ui/dist/index.html vendored
View File

@ -5,10 +5,11 @@
<link rel="icon" type="image/svg+xml" href="/vite.svg" /> <link rel="icon" type="image/svg+xml" href="/vite.svg" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Certimate - Your Trusted SSL Automation Partner</title> <title>Certimate - Your Trusted SSL Automation Partner</title>
<script type="module" crossorigin src="/assets/index-C9iolg9g.js"></script> <script type="module" crossorigin src="/assets/index-C9iolg9g.js"></script>
<link rel="stylesheet" crossorigin href="/assets/index-CV_7sKTK.css"> <link rel="stylesheet" crossorigin href="/assets/index-CV_7sKTK.css">
</head> </head>
<body class="bg-background"> <body class="bg-background">
<div id="root"></div> <div id="root"></div>
</body> </body>
</html> </html>