mirror of https://github.com/allinssl/allinssl
parent
e6e24b7f0b
commit
67577dd730
|
@ -96,8 +96,11 @@ func UploadBt(key, csr, providerID string) (string, error) {
|
||||||
if response == nil {
|
if response == nil {
|
||||||
return "", fmt.Errorf("证书上传失败: %v", err)
|
return "", fmt.Errorf("证书上传失败: %v", err)
|
||||||
}
|
}
|
||||||
sslHash := response["ssl_hash"].(string)
|
sslHash, ok := response["ssl_hash"].(string)
|
||||||
|
if !ok {
|
||||||
|
return "", fmt.Errorf("证书上传失败: ssl_hash 不存在")
|
||||||
|
}
|
||||||
|
|
||||||
return sslHash, nil
|
return sslHash, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -162,10 +165,10 @@ func DeployBtSite(cfg map[string]any) error {
|
||||||
if !ok {
|
if !ok {
|
||||||
return fmt.Errorf("参数错误:siteName")
|
return fmt.Errorf("参数错误:siteName")
|
||||||
}
|
}
|
||||||
|
|
||||||
sslHash, err := UploadBt(keyPem, certPem, providerID)
|
sslHash, err := UploadBt(keyPem, certPem, providerID)
|
||||||
batchInfo := []map[string]string{}
|
batchInfo := []map[string]string{}
|
||||||
|
|
||||||
siteNamesList := strings.Split(siteNames, ",")
|
siteNamesList := strings.Split(siteNames, ",")
|
||||||
for _, siteName := range siteNamesList {
|
for _, siteName := range siteNamesList {
|
||||||
batchInfo = append(batchInfo, map[string]string{
|
batchInfo = append(batchInfo, map[string]string{
|
||||||
|
@ -174,7 +177,7 @@ func DeployBtSite(cfg map[string]any) error {
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
batchs, err := json.Marshal(batchInfo)
|
batchs, err := json.Marshal(batchInfo)
|
||||||
|
|
||||||
data := url.Values{}
|
data := url.Values{}
|
||||||
data.Set("BatchInfo", string(batchs))
|
data.Set("BatchInfo", string(batchs))
|
||||||
_, err = RequestBt(&data, "POST", providerID, "ssl?action=SetBatchCertToSite")
|
_, err = RequestBt(&data, "POST", providerID, "ssl?action=SetBatchCertToSite")
|
||||||
|
@ -239,7 +242,7 @@ func BtPanelSiteList(providerID string) ([]any, error) {
|
||||||
fmt.Println("获取网站列表失败:", err)
|
fmt.Println("获取网站列表失败:", err)
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
fmt.Printf("siteList:%#v\n", siteList["all"].([]any))
|
fmt.Printf("siteList:%#v\n", siteList["all"].([]any))
|
||||||
return siteList["all"].([]any), nil
|
return siteList["all"].([]any), nil
|
||||||
}
|
}
|
||||||
|
|
|
@ -17,6 +17,12 @@ func SiteMonitor() {
|
||||||
fmt.Println(err)
|
fmt.Println(err)
|
||||||
}
|
}
|
||||||
defer s.Close()
|
defer s.Close()
|
||||||
|
s1, err := report.GetSqlite()
|
||||||
|
if err != nil {
|
||||||
|
fmt.Println(err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
defer s1.Close()
|
||||||
data, err := s.Select()
|
data, err := s.Select()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
fmt.Println(err)
|
fmt.Println(err)
|
||||||
|
@ -63,8 +69,8 @@ func SiteMonitor() {
|
||||||
}
|
}
|
||||||
reportType, ok := v["report_type"].(string)
|
reportType, ok := v["report_type"].(string)
|
||||||
if ok && errCount >= int(repeatSendGap) {
|
if ok && errCount >= int(repeatSendGap) {
|
||||||
s.TableName = "report"
|
s1.TableName = "report"
|
||||||
rdata, err := s.Where("type=?", []interface{}{reportType}).Select()
|
rdata, err := s1.Where("type=?", []interface{}{reportType}).Select()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue