pkg/timerx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

间隔的base为固定的2025年开始

Browse Source
This commit is contained in:
Yun
2025-12-01 13:40:31 +08:00
parent f873130a20
commit 092771ebd8
2 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cluster.go
+4 -6
View File
@@ -352,15 +352,14 @@ func (c *Cluster) EveryMinute(ctx context.Context, taskId string, second int, ca
// 特定时间间隔 // 特定时间间隔
func (c *Cluster) EverySpace(ctx context.Context, taskId string, spaceTime time.Duration, callback func(ctx context.Context, extendData interface{}) error, extendData interface{}) error { func (c *Cluster) EverySpace(ctx context.Context, taskId string, spaceTime time.Duration, callback func(ctx context.Context, extendData interface{}) error, extendData interface{}) error {
nowTime := time.Now().In(c.location)
if spaceTime < 0 { if spaceTime < 0 {
c.logger.Errorf(ctx, "间隔时间不能小于0") c.logger.Errorf(ctx, "间隔时间不能小于0")
return errors.New("间隔时间不能小于0") return errors.New("间隔时间不能小于0")
} }
// 获取当天的零点时间 // 固定时间点为20250101 00:00:00，便于计算下一次执行时间
zeroTime := time.Date(nowTime.Year(), nowTime.Month(), nowTime.Day(), 0, 0, 0, 0, nowTime.Location()) zeroTime := time.Date(2025, 1, 1, 0, 0, 0, 0, c.location)
jobData := JobData{ jobData := JobData{
JobType: JobTypeInterval, JobType: JobTypeInterval,
@@ -381,9 +380,8 @@ func (c *Cluster) EverySpace(ctx context.Context, taskId string, spaceTime time.
// @param extendData interface{} 扩展数据 // @param extendData interface{} 扩展数据
// @return error // @return error
func (l *Cluster) Cron(ctx context.Context, taskId string, cronExpression string, callback func(ctx context.Context, extendData any) error, extendData any, opt ...Option) error { func (l *Cluster) Cron(ctx context.Context, taskId string, cronExpression string, callback func(ctx context.Context, extendData any) error, extendData any, opt ...Option) error {
nowTime := time.Now().In(l.location) // 固定时间点为20250101 00:00:00，便于计算下一次执行时间
// 获取当天的零点时间 zeroTime := time.Date(2025, 1, 1, 0, 0, 0, 0, l.location)
zeroTime := time.Date(nowTime.Year(), nowTime.Month(), nowTime.Day(), 0, 0, 0, 0, nowTime.Location())
options := newEmptyOptions(opt...) options := newEmptyOptions(opt...)
cronParser := l.cronParser cronParser := l.cronParser
single.go
+4 -6
View File
@@ -252,15 +252,14 @@ func (c *Single) EveryMinute(ctx context.Context, taskId string, second int, cal
// 特定时间间隔 // 特定时间间隔
func (c *Single) EverySpace(ctx context.Context, taskId string, spaceTime time.Duration, callback func(ctx context.Context, extendData interface{}) error, extendData interface{}) (int64, error) { func (c *Single) EverySpace(ctx context.Context, taskId string, spaceTime time.Duration, callback func(ctx context.Context, extendData interface{}) error, extendData interface{}) (int64, error) {
nowTime := time.Now().In(c.location)
if spaceTime < 0 { if spaceTime < 0 {
c.logger.Errorf(ctx, "间隔时间不能小于0") c.logger.Errorf(ctx, "间隔时间不能小于0")
return 0, ErrIntervalTime return 0, ErrIntervalTime
} }
// 获取当天的零点时间 // 固定时间点为20250101 00:00:00，便于计算下一次执行时间
zeroTime := time.Date(nowTime.Year(), nowTime.Month(), nowTime.Day(), 0, 0, 0, 0, nowTime.Location()) zeroTime := time.Date(2025, 1, 1, 0, 0, 0, 0, c.location)
jobData := JobData{ jobData := JobData{
JobType: JobTypeInterval, JobType: JobTypeInterval,
@@ -274,9 +273,8 @@ func (c *Single) EverySpace(ctx context.Context, taskId string, spaceTime time.D
} }
func (l *Single) Cron(ctx context.Context, taskId string, cronExpression string, callback func(ctx context.Context, extendData any) error, extendData any, opt ...Option) (int64, error) { func (l *Single) Cron(ctx context.Context, taskId string, cronExpression string, callback func(ctx context.Context, extendData any) error, extendData any, opt ...Option) (int64, error) {
nowTime := time.Now().In(l.location) // 固定时间点为20250101 00:00:00，便于计算下一次执行时间
// 获取当天的零点时间 zeroTime := time.Date(2025, 1, 1, 0, 0, 0, 0, l.location)
zeroTime := time.Date(nowTime.Year(), nowTime.Month(), nowTime.Day(), 0, 0, 0, 0, nowTime.Location())
options := Options{} options := Options{}
for _, o := range opt { for _, o := range opt {