public/AllinSSL
1
0
Fork 0
mirror of https://gitee.com/mirrors/AllinSSL.git synced 2026-03-07 23:31:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

【调整】1.1.2

Browse Source
This commit is contained in:
v-me-50
2026-01-14 17:34:46 +08:00
parent 1e167b7351
commit a0879bfb1c
3 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
backend/internal/cert/apply/apply.go
View File

@@ -287,9 +287,11 @@ func GetZeroSSLEabFromEmail(email string, httpClient *http.Client) (map[string]a
}, nil }, nil
} }
func GetEabFromBt(httpClient *http.Client) (map[string]any, error) { func GetEabFromBt(email string, httpClient *http.Client) (map[string]any, error) {
APIPath := "https://www.bt.cn/api/v3/litessl/eab" APIPath := "https://www.bt.cn/api/v3/litessl/eab"
data := map[string]any{} data := map[string]any{
"email": email,
}
jsonData, err := json.Marshal(data) jsonData, err := json.Marshal(data)
if err != nil { if err != nil {
return nil, err return nil, err
@@ -298,6 +300,7 @@ func GetEabFromBt(httpClient *http.Client) (map[string]any, error) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
req.Header.Set("Content-Type", "application/json")
if httpClient == nil { if httpClient == nil {
httpClient = &http.Client{} httpClient = &http.Client{}
} }
@@ -415,6 +418,7 @@ func GetAcmeClient(email, algorithm, eabId, ca string, httpClient *http.Client,
config := lego.NewConfig(user) config := lego.NewConfig(user)
config.Certificate.KeyType = AlgorithmMap[algorithm] config.Certificate.KeyType = AlgorithmMap[algorithm]
config.CADirURL = CADirURL config.CADirURL = CADirURL
config.Certificate.Timeout = time.Duration(60) * time.Second
if httpClient != nil { if httpClient != nil {
config.HTTPClient = httpClient config.HTTPClient = httpClient
} }
@@ -434,7 +438,7 @@ func GetAcmeClient(email, algorithm, eabId, ca string, httpClient *http.Client,
return nil, fmt.Errorf("获取ZeroSSL EAB信息失败: %v", err) return nil, fmt.Errorf("获取ZeroSSL EAB信息失败: %v", err)
} }
case "litessl": case "litessl":
eabData, err = GetEabFromBt(httpClient) eabData, err = GetEabFromBt(email, httpClient)
if err != nil { if err != nil {
return nil, fmt.Errorf("获取LiteSSL EAB信息失败: %v", err) return nil, fmt.Errorf("获取LiteSSL EAB信息失败: %v", err)
} }
@@ -839,6 +843,7 @@ func Apply(cfg map[string]any, logger *public.Logger) (map[string]any, error) {
Domains: domainArr, Domains: domainArr,
Bundle: true, Bundle: true,
} }
certObj, err := client.Certificate.Obtain(request) certObj, err := client.Certificate.Obtain(request)
if err != nil { if err != nil {
return nil, err return nil, err

2
backend/internal/cert/cert.go
View File

@@ -191,7 +191,7 @@ func DelCert(id string) error {
} }
defer s.Close() defer s.Close()
_, err = s.Where("id in (?)", []interface{}{id}).Delete() _, err = s.Where("id in ("+id+")", []interface{}{}).Delete()
if err != nil { if err != nil {
return err return err
} }

6
version.json
View File

@@ -1,5 +1,5 @@
{ {
"version": "v1.1.1", "version": "v1.1.2",
"date": "2025-09-18", "date": "2026-01-11",
"log": "【新增】宝塔dns\n【修复】查看证书于下载证书内容不一致\n【修复】多个ca无法选中\n【修复】创建中间证书私有ca加密算法没有默认继承\n【调整】下载自签证书附带pfx\n【调整】禁止在同一个ca下添加相同的邮箱" "log": "【新增】若干功能\n【修复】若干功能\n【调整】若干功能"
} }