From ab87ea1472ecbce6a725e0875902cddc0f690b07 Mon Sep 17 00:00:00 2001
From: mubai <1609539827@qq.com>
Date: Sun, 17 Nov 2024 23:34:10 +0800
Subject: [PATCH] Change the time zone of the timing task to CST

---
 film/server/logic/CronLogic.go     | 4 +++-
 server/logic/CronLogic.go          | 4 +++-
 server/main.go                     | 4 ++--
 server/plugin/spider/SpiderCron.go | 5 ++---
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/film/server/logic/CronLogic.go b/film/server/logic/CronLogic.go
index 792baa1..1fc1168 100644
--- a/film/server/logic/CronLogic.go
+++ b/film/server/logic/CronLogic.go
@@ -48,11 +48,13 @@ func (cl *CronLogic) AddFilmCrontab(cv system.FilmCronVo) error {
 
 // GetFilmCrontab 获取所有定时任务信息
 func (cl *CronLogic) GetFilmCrontab() []system.CronTaskVo {
+	// 获取东八区上海时区
+	cst := time.FixedZone("UTC", 8*3600)
 	var l []system.CronTaskVo
 	tl := system.GetAllFilmTask()
 	for _, t := range tl {
 		e := spider.GetEntryById(t.Cid)
-		taskVo := system.CronTaskVo{FilmCollectTask: t, PreV: e.Prev.Format(time.DateTime), Next: e.Next.Format(time.DateTime)}
+		taskVo := system.CronTaskVo{FilmCollectTask: t, PreV: e.Prev.In(cst).Format(time.DateTime), Next: e.Next.In(cst).Format(time.DateTime)}
 		l = append(l, taskVo)
 	}
 	return l
diff --git a/server/logic/CronLogic.go b/server/logic/CronLogic.go
index 792baa1..1fc1168 100644
--- a/server/logic/CronLogic.go
+++ b/server/logic/CronLogic.go
@@ -48,11 +48,13 @@ func (cl *CronLogic) AddFilmCrontab(cv system.FilmCronVo) error {
 
 // GetFilmCrontab 获取所有定时任务信息
 func (cl *CronLogic) GetFilmCrontab() []system.CronTaskVo {
+	// 获取东八区上海时区
+	cst := time.FixedZone("UTC", 8*3600)
 	var l []system.CronTaskVo
 	tl := system.GetAllFilmTask()
 	for _, t := range tl {
 		e := spider.GetEntryById(t.Cid)
-		taskVo := system.CronTaskVo{FilmCollectTask: t, PreV: e.Prev.Format(time.DateTime), Next: e.Next.Format(time.DateTime)}
+		taskVo := system.CronTaskVo{FilmCollectTask: t, PreV: e.Prev.In(cst).Format(time.DateTime), Next: e.Next.In(cst).Format(time.DateTime)}
 		l = append(l, taskVo)
 	}
 	return l
diff --git a/server/main.go b/server/main.go
index b322cdc..259aa64 100644
--- a/server/main.go
+++ b/server/main.go
@@ -43,9 +43,9 @@ func DefaultDataInit() {
 		SystemInit.TableInIt()
 		// 初始化网站基本配置信息
 		SystemInit.BasicConfigInit()
-		// 初始化影视来源列表信息
-		SystemInit.SpiderInit()
 		// 初始化轮播组件信息
 		SystemInit.BannersInit()
 	}
+	// 初始化影视来源列表信息, 并回复恢复定时任务
+	SystemInit.SpiderInit()
 }
diff --git a/server/plugin/spider/SpiderCron.go b/server/plugin/spider/SpiderCron.go
index 8c7b2a8..dda38ba 100644
--- a/server/plugin/spider/SpiderCron.go
+++ b/server/plugin/spider/SpiderCron.go
@@ -7,7 +7,6 @@ import (
 	"log"
 	"server/config"
 	"server/model/system"
-	"time"
 )
 
 var (
@@ -69,8 +68,8 @@ func RemoveCron(id cron.EntryID) {
 
 // GetEntryById 返回定时任务的相关时间信息
 func GetEntryById(id cron.EntryID) cron.Entry {
-	log.Printf("%+v\n", CronCollect.Entries())
-	log.Println("", CronCollect.Entry(id).Next.Format(time.DateTime))
+	//log.Printf("CronInfo: %+v\n", CronCollect.Entries())
+	//log.Println("Corn Next Execute Time:", CronCollect.Entry(id).Next.Format(time.DateTime))
 	return CronCollect.Entry(id)
 }