定时任务调整
This commit is contained in:
parent
81cc61348a
commit
472e684449
|
|
@ -57,8 +57,8 @@ func newApp(
|
||||||
logger log.Logger,
|
logger log.Logger,
|
||||||
httpServer *http.Server,
|
httpServer *http.Server,
|
||||||
consumerServer *server.Consumer,
|
consumerServer *server.Consumer,
|
||||||
wechatNotifyConsumer *server.WechatNotifyConsumer,
|
|
||||||
cronServer *server.CronServer,
|
cronServer *server.CronServer,
|
||||||
|
wechatNotifyConsumer *server.WechatNotifyConsumer,
|
||||||
) *kratos.App {
|
) *kratos.App {
|
||||||
return kratos.New(
|
return kratos.New(
|
||||||
kratos.ID(id),
|
kratos.ID(id),
|
||||||
|
|
@ -68,8 +68,8 @@ func newApp(
|
||||||
kratos.Server(
|
kratos.Server(
|
||||||
httpServer,
|
httpServer,
|
||||||
consumerServer,
|
consumerServer,
|
||||||
wechatNotifyConsumer,
|
|
||||||
cronServer,
|
cronServer,
|
||||||
|
wechatNotifyConsumer,
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
|
||||||
1
go.sum
1
go.sum
|
|
@ -128,6 +128,7 @@ github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeN
|
||||||
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
|
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
|
||||||
github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
|
github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
|
||||||
github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
|
github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
|
||||||
|
github.com/google/subcommands v1.2.0 h1:vWQspBTo2nEqTUFita5/KeEWlUL8kQObDFbub/EN9oE=
|
||||||
github.com/google/subcommands v1.2.0/go.mod h1:ZjhPrFU+Olkh9WazFPsl27BQ4UPiG37m3yTrtFlrHVk=
|
github.com/google/subcommands v1.2.0/go.mod h1:ZjhPrFU+Olkh9WazFPsl27BQ4UPiG37m3yTrtFlrHVk=
|
||||||
github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
|
github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
|
||||||
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
|
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
|
||||||
|
|
|
||||||
|
|
@ -33,15 +33,16 @@ func NewCronServer(
|
||||||
func (cs *CronServer) Start(ctx context.Context) error {
|
func (cs *CronServer) Start(ctx context.Context) error {
|
||||||
|
|
||||||
if !cs.conf.Cron.IsOpen {
|
if !cs.conf.Cron.IsOpen {
|
||||||
log.Warn("cron 未开启...")
|
fmt.Printf("cron 未开启...")
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
if err := cs.VoucherService.CronNotice(ctx); err != nil {
|
if err := cs.VoucherService.CronOrderNotice(ctx); err != nil {
|
||||||
log.Error("cron order notice Start err: %v", err)
|
log.Error("cron order notice Start err: %v", err)
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
cs.cron.Start()
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -50,6 +51,7 @@ func (cs *CronServer) Stop(_ context.Context) error {
|
||||||
if !cs.conf.Cron.IsOpen {
|
if !cs.conf.Cron.IsOpen {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
fmt.Printf("cron 关闭中...")
|
fmt.Printf("cron 关闭中...")
|
||||||
|
|
||||||
cs.cron.Stop()
|
cs.cron.Stop()
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,7 @@ import (
|
||||||
"time"
|
"time"
|
||||||
)
|
)
|
||||||
|
|
||||||
func (s *VoucherService) CronNotice(ctx context.Context) error {
|
func (s *VoucherService) CronOrderNotice(ctx context.Context) error {
|
||||||
|
|
||||||
c, ok := s.bc.Cron.CommandMap["orderNotice"]
|
c, ok := s.bc.Cron.CommandMap["orderNotice"]
|
||||||
|
|
||||||
|
|
@ -27,13 +27,13 @@ func (s *VoucherService) CronNotice(ctx context.Context) error {
|
||||||
|
|
||||||
return s.cron.AddFunc(c.Command, func() {
|
return s.cron.AddFunc(c.Command, func() {
|
||||||
|
|
||||||
s.Notice(ctx)
|
s.OrderNotice(ctx)
|
||||||
|
|
||||||
})
|
})
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *VoucherService) Notice(ctx context.Context) {
|
func (s *VoucherService) OrderNotice(ctx context.Context) {
|
||||||
start := time.Now()
|
start := time.Now()
|
||||||
|
|
||||||
if err := s.VoucherBiz.Notice(ctx); err != nil {
|
if err := s.VoucherBiz.Notice(ctx); err != nil {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue