fix: 解决定时任务停止网站失败的问题 (#933)

1Panel-dev · May 8, 2023 · 8c5c244 · 8c5c244
1 parent f22caed
commit 8c5c244
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/backend/cron/job/website.go b/backend/cron/job/website.go
@@ -22,15 +22,19 @@ func (w *website) Run() {
 	nyc, _ := time.LoadLocation(common.LoadTimeZone())
 	websites, _ := repo.NewIWebsiteRepo().List()
 	global.LOG.Info("Website scheduled task in progress ...")
-	now := time.Now().Add(10 * time.Second)
+	now := time.Now().Add(10 * time.Minute)
 	if len(websites) > 0 {
 		neverExpireDate, _ := time.Parse(constant.DateLayout, constant.DefaultDate)
 		var wg sync.WaitGroup
 		for _, site := range websites {
 			if site.Status != constant.WebRunning || neverExpireDate.Equal(site.ExpireDate) {
 				continue
 			}
-			expireDate, _ := time.ParseInLocation(constant.DateTimeLayout, site.ExpireDate.String(), nyc)
+			expireDate, err := time.ParseInLocation(constant.DateLayout, site.ExpireDate.Format(constant.DateLayout), nyc)
+			if err != nil {
+				global.LOG.Errorf("time parse err %v", err)
+				continue
+			}
 			if expireDate.Before(now) {
 				wg.Add(1)
 				go func(ws model.Website) {