acepanel/panel
2
0
Fork 0
mirror of https://github.com/acepanel/panel.git synced 2026-02-04 04:22:33 +08:00
Code Issues Packages Releases Activity

fix: 网站默认使用lets证书，close #659

Browse Source
This commit is contained in:
耗子
2025-04-12 00:30:59 +08:00
parent e1f6afe08f
commit dc584a9382
5 changed files with 22 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
go.mod
View File

@@ -40,7 +40,7 @@ require (
github.com/libdns/namedotcom v0.3.3
github.com/libdns/namesilo v0.1.1
github.com/libdns/porkbun v0.2.0
github.com/libdns/tencentcloud v1.2.1
github.com/libdns/tencentcloud v1.2.0
github.com/libdns/vercel v0.0.2
github.com/mholt/acmez/v3 v3.1.1
github.com/ncruces/go-sqlite3 v0.25.0
@@ -98,7 +98,4 @@ require (
gopkg.in/ini.v1 v1.67.0 // indirect
)
replace (
github.com/libdns/alidns => github.com/devhaozi/alidns v0.0.0-20250403080318-49764d98fb5f
github.com/mholt/acmez/v3 => github.com/tnb-labs/acmez/v3 v3.0.0-20250329064837-dd8e7d30835a
)
replace github.com/mholt/acmez/v3 => github.com/tnb-labs/acmez/v3 v3.0.0-20250329064837-dd8e7d30835a

8
go.sum
View File

@@ -10,8 +10,6 @@ github.com/creack/pty v1.1.24 h1:bJrF4RRfyJnbTJqzRLHzcGaZK1NeM5kTC9jGgovnR1s=
github.com/creack/pty v1.1.24/go.mod h1:08sCNb52WyoAwi2QDyzUCTgcvVFhUzewun7wtTfvcwE=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/devhaozi/alidns v0.0.0-20250403080318-49764d98fb5f h1:mxUJww+iBLn7XNJh3SGTf6EMPlzoP8fDrJEwVt+Kxt0=
github.com/devhaozi/alidns v0.0.0-20250403080318-49764d98fb5f/go.mod h1:ldjj5ww43w4znu7VUSpR7dJK3VRNHlKCAHik13xacdE=
github.com/devhaozi/westcn v0.0.0-20250407083704-b49375823872 h1:cns0Vj69pUuQ+bfS3KQrZyQycjZRxyPMiF3Njjz5Voc=
github.com/devhaozi/westcn v0.0.0-20250407083704-b49375823872/go.mod h1:3DfSvYwyUHt1JtN+JCWAGtOLFWlRXz19wJa/Xk159ao=
github.com/expr-lang/expr v1.17.2 h1:o0A99O/Px+/DTjEnQiodAgOIK9PPxL8DtXhBRKC+Iso=
@@ -96,6 +94,8 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw=
github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
github.com/libdns/alidns v1.0.4 h1:Rc3Yy2SzMoho+3q3+fNy9vOVr2h9dcL8OLTgNKgxYbU=
github.com/libdns/alidns v1.0.4/go.mod h1:e18uAG6GanfRhcJj6/tps2rCMzQJaYVcGKT+ELjdjGE=
github.com/libdns/cloudflare v0.1.3 h1:XPFa2f3Mm/3FDNwl9Ki2bfAQJ0Cm5GQB0e8PQVy25Us=
github.com/libdns/cloudflare v0.1.3/go.mod h1:XbvSCSMcxspwpSialM3bq0LsS3/Houy9WYxW8Ok8b6M=
github.com/libdns/cloudns v1.0.0 h1:Qrf8TepFnXVhQJi+IwCa/TXhaDy0RXZIXf+DGD/bcE4=
@@ -125,8 +125,8 @@ github.com/libdns/namesilo v0.1.1 h1:G6ECxNXpphWDVhSXyAdQBLA4KpHU0Az+TB9YMZMMH/4
github.com/libdns/namesilo v0.1.1/go.mod h1:JSyG04w+33JDbA2fYWaD9A4zufcxwK7ATNQ1RDuZbps=
github.com/libdns/porkbun v0.2.0 h1:oa2F0doE93RiJkauVVbM+P2AZ7jovDSiH6u3aaQezvQ=
github.com/libdns/porkbun v0.2.0/go.mod h1:mwrhwXpsSA2Xw23t9+qmgFnz+erkn25Sxuh7IBA+x2I=
github.com/libdns/tencentcloud v1.2.1 h1:tFxtXeQG5Xin5xKVcenRjTshcpGodHdf9bt4uZFGD7g=
github.com/libdns/tencentcloud v1.2.1/go.mod h1:o0+WCxQ7LGLtyjnjYU4HbGW9uVjN44SdUDhxdUYLGPw=
github.com/libdns/tencentcloud v1.2.0 h1:SBbZ9gUZ+ba/p2d8NpiOcj+WZTdYqB5Fz7zypdbK3YU=
github.com/libdns/tencentcloud v1.2.0/go.mod h1:o0+WCxQ7LGLtyjnjYU4HbGW9uVjN44SdUDhxdUYLGPw=
github.com/libdns/vercel v0.0.2 h1:slfQWxgUdYFgKfPbK1vLE7k1CZSspHFlwC+nEWlm79w=
github.com/libdns/vercel v0.0.2/go.mod h1:z2NBq/OQ8G0JPglZmit0YnqHm/k+eOz8s4XyLvYxhQo=
github.com/linode/linodego v1.23.0 h1:s0ReCZtuN9Z1IoUN9w1RLeYO1dMZUGPwOQ/IBFsBHtU=

4
internal/data/cert_account.go
View File

@@ -44,12 +44,12 @@ func (r certAccountRepo) GetDefault(userID uint) (*biz.CertAccount, error) {
}
account := new(biz.CertAccount)
if err = r.db.Model(&biz.CertAccount{}).Where("ca = ?", "googlecn").Where("email = ?", user.Email).First(account).Error; err == nil {
if err = r.db.Model(&biz.CertAccount{}).Where("ca = ?", "letsencrypt").Where("email = ?", user.Email).First(account).Error; err == nil {
return account, nil
}
req := &request.CertAccountCreate{
CA: "googlecn",
CA: "letsencrypt",
Email: user.Email,
KeyType: string(acme.KeyEC256),
}

20
internal/data/website.go
View File

@@ -744,14 +744,18 @@ func (r *websiteRepo) ObtainCert(ctx context.Context, id uint) error {
newCert, err := r.cert.GetByWebsite(website.ID)
if err != nil {
newCert, err = r.cert.Create(&request.CertCreate{
Type: string(acme.KeyEC256),
Domains: website.Domains,
AutoRenew: true,
AccountID: account.ID,
WebsiteID: website.ID,
})
if err != nil {
if errors.Is(err, gorm.ErrRecordNotFound) {
newCert, err = r.cert.Create(&request.CertCreate{
Type: string(acme.KeyEC256),
Domains: website.Domains,
AutoRenew: true,
AccountID: account.ID,
WebsiteID: website.ID,
})
if err != nil {
return err
}
} else {
return err
}
}

3
renovate.json
View File

@@ -31,6 +31,7 @@
],
"ignoreDeps": [
"github.com/libdns/libdns",
"github.com/libdns/cloudflare"
"github.com/libdns/cloudflare",
"github.com/libdns/tencentcloud"
]
}