From 67577dd730bb98348195f7c64493a53a24efd697 Mon Sep 17 00:00:00 2001 From: zhangchenhao Date: Tue, 27 May 2025 14:24:16 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=8A=E4=BC=A0=E8=AF=81?= =?UTF-8?q?=E4=B9=A6=E5=88=B0=E5=AE=9D=E5=A1=94=E9=9D=A2=E6=9D=BF=20?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=BD=91=E7=AB=99=E7=9B=91=E6=8E=A7=E9=80=9A?= =?UTF-8?q?=E7=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/internal/cert/deploy/btpanel.go | 17 ++++++++++------- backend/scheduler/site_monitor.go | 10 ++++++++-- 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/backend/internal/cert/deploy/btpanel.go b/backend/internal/cert/deploy/btpanel.go index c7c3012..d92ea89 100644 --- a/backend/internal/cert/deploy/btpanel.go +++ b/backend/internal/cert/deploy/btpanel.go @@ -96,8 +96,11 @@ func UploadBt(key, csr, providerID string) (string, error) { if response == nil { 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 } @@ -162,10 +165,10 @@ func DeployBtSite(cfg map[string]any) error { if !ok { return fmt.Errorf("参数错误:siteName") } - + sslHash, err := UploadBt(keyPem, certPem, providerID) batchInfo := []map[string]string{} - + siteNamesList := strings.Split(siteNames, ",") for _, siteName := range siteNamesList { batchInfo = append(batchInfo, map[string]string{ @@ -174,7 +177,7 @@ func DeployBtSite(cfg map[string]any) error { }) } batchs, err := json.Marshal(batchInfo) - + data := url.Values{} data.Set("BatchInfo", string(batchs)) _, err = RequestBt(&data, "POST", providerID, "ssl?action=SetBatchCertToSite") @@ -239,7 +242,7 @@ func BtPanelSiteList(providerID string) ([]any, error) { fmt.Println("获取网站列表失败:", err) return nil, err } - + fmt.Printf("siteList:%#v\n", siteList["all"].([]any)) return siteList["all"].([]any), nil -} \ No newline at end of file +} diff --git a/backend/scheduler/site_monitor.go b/backend/scheduler/site_monitor.go index 7fb8ecf..d4e4f6c 100644 --- a/backend/scheduler/site_monitor.go +++ b/backend/scheduler/site_monitor.go @@ -17,6 +17,12 @@ func SiteMonitor() { fmt.Println(err) } defer s.Close() + s1, err := report.GetSqlite() + if err != nil { + fmt.Println(err) + return + } + defer s1.Close() data, err := s.Select() if err != nil { fmt.Println(err) @@ -63,8 +69,8 @@ func SiteMonitor() { } reportType, ok := v["report_type"].(string) if ok && errCount >= int(repeatSendGap) { - s.TableName = "report" - rdata, err := s.Where("type=?", []interface{}{reportType}).Select() + s1.TableName = "report" + rdata, err := s1.Where("type=?", []interface{}{reportType}).Select() if err != nil { return }