处理时区问题

Author: CodFrm

Makefile

@@ -14,7 +14,7 @@ docker:
 	docker build -t cloudcat .
 
 docker-test:
-	docker run -it -v $(PWD)/bilibili.zip:/cloudcat/bilibili.zip $(REMOTE_REPO) exec bilibili.zip
+	docker run -it -v $(PWD)/bilibili.zip:/cloudcat/bilibili.zip -v /etc/localtime:/etc/localtime -v /etc/timezone:/etc/timezone $(REMOTE_REPO) exec bilibili.zip
 
 docker-push: docker
 	docker tag cloudcat $(REMOTE_REPO)

cmd/scriptcat/main.go

@@ -6,7 +6,6 @@ import (
 )
 
 func main() {
-
 	rootCmd := &cobra.Command{
 		Use: "scriptcat",
 	}

pkg/scriptcat/option.go

@@ -3,13 +3,15 @@ package scriptcat
 import (
 	"context"
 	"net/http"
+	"time"
 
 	"github.com/sirupsen/logrus"
 )
 
 type Options struct {
 	context.Context
 	cookieJar http.CookieJar
+	location  *time.Location
 	_log      func(level logrus.Level, format string, args ...interface{})
 }
 
@@ -38,3 +40,9 @@ func (o *Options) log(level logrus.Level, format string, args ...interface{}) {
 		o._log(level, format, args)
 	}
 }
+
+func WithLocation(loc *time.Location) Option {
+	return func(opts *Options) {
+		opts.location = loc
+	}
+}

pkg/scriptcat/scriptcat.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"errors"
 	"strings"
+	"time"
 
 	"github.com/robfig/cron/v3"
 	"github.com/scriptscat/cloudcat/pkg/executor"
@@ -23,7 +24,9 @@ func NewScriptCat() (*ScriptCat, error) {
 }
 
 func (s *ScriptCat) options(opt ...Option) *Options {
-	options := &Options{}
+	options := &Options{
+		location: time.Local,
+	}
 	for _, o := range opt {
 		o(options)
 	}
@@ -42,7 +45,7 @@ func (s *ScriptCat) Run(ctx context.Context, script string, opt ...Option) (stri
 		opts.log(logrus.InfoLevel, "start run script")
 		return s.runOnce(ctx, exec, code)
 	}
-	cron := cron.New(cron.WithSeconds())
+	cron := cron.New(cron.WithSeconds(), cron.WithLocation(opts.location))
 	unit := strings.Split(c[0], " ")
 	if len(unit) == 5 {
 		unit = append([]string{"0"}, unit...)