diff --git a/internal/db/models/acme/acme_task_dao.go b/internal/db/models/acme/acme_task_dao.go index f1b599a2..784b1890 100644 --- a/internal/db/models/acme/acme_task_dao.go +++ b/internal/db/models/acme/acme_task_dao.go @@ -2,6 +2,7 @@ package acme import ( "bytes" + "context" "encoding/json" acmeutils "github.com/TeaOSLab/EdgeAPI/internal/acme" teaconst "github.com/TeaOSLab/EdgeAPI/internal/const" @@ -434,7 +435,7 @@ func (this *ACMETaskDAO) runTaskWithoutLog(tx *dbs.Tx, taskId int64) (isOk bool, CertData: certData, KeyData: keyData, } - err = sslConfig.Init(nil) + err = sslConfig.Init(context.Background()) if err != nil { errMsg = "证书生成成功,但是分析证书信息时发生错误:" + err.Error() return diff --git a/internal/db/models/stats/server_domain_hourly_stat_dao_test.go b/internal/db/models/stats/server_domain_hourly_stat_dao_test.go index 5e265d94..66017847 100644 --- a/internal/db/models/stats/server_domain_hourly_stat_dao_test.go +++ b/internal/db/models/stats/server_domain_hourly_stat_dao_test.go @@ -70,7 +70,7 @@ func TestServerDomainHourlyStatDAO_FindTopDomainStats(t *testing.T) { func TestServerDomainHourlyStatDAO_Clean(t *testing.T) { var dao = NewServerDomainHourlyStatDAO() - err := dao.Clean(nil, 10) + err := dao.CleanDays(nil, 10) if err != nil { t.Fatal(err) } diff --git a/internal/rpc/services/service_http_web.go b/internal/rpc/services/service_http_web.go index 4acb0776..7e01adfc 100644 --- a/internal/rpc/services/service_http_web.go +++ b/internal/rpc/services/service_http_web.go @@ -425,6 +425,9 @@ func (this *HTTPWebService) UpdateHTTPWebPages(ctx context.Context, req *pb.Upda if len(req.PagesJSON) > 0 { var pages = []*serverconfigs.HTTPPageConfig{} err = json.Unmarshal(req.PagesJSON, &pages) + if err != nil { + return nil, err + } for _, page := range pages { err = page.Init() diff --git a/internal/rpc/services/service_server.go b/internal/rpc/services/service_server.go index 568f0d0b..e93f73bc 100644 --- a/internal/rpc/services/service_server.go +++ b/internal/rpc/services/service_server.go @@ -346,6 +346,9 @@ func (this *ServerService) CreateBasicHTTPServer(ctx context.Context, req *pb.Cr Options: nil, } reverseProxyScheduleJSON, err := json.Marshal(reverseProxyScheduleConfig) + if err != nil { + return nil, err + } var primaryOrigins = []*serverconfigs.OriginRef{} for _, originAddr := range req.OriginAddrs { @@ -615,6 +618,9 @@ func (this *ServerService) CreateBasicTCPServer(ctx context.Context, req *pb.Cre Options: nil, } reverseProxyScheduleJSON, err := json.Marshal(reverseProxyScheduleConfig) + if err != nil { + return nil, err + } var primaryOrigins = []*serverconfigs.OriginRef{} for _, originAddr := range req.OriginAddrs {