调整log代码,兼容zap扩展支持fields

This commit is contained in:
linwenxiang
2021-03-05 15:13:36 +08:00
parent 39dd1ee6f8
commit 75711922b4
47 changed files with 267 additions and 275 deletions
+3 -3
View File
@@ -3,6 +3,7 @@ package jobs
import (
"fmt"
log "github.com/go-admin-team/go-admin-core/logger"
"go-admin/tools/app"
"gorm.io/gorm"
"sync"
"time"
@@ -10,7 +11,6 @@ import (
"github.com/robfig/cron/v3"
"go-admin/app/admin/models"
"go-admin/common/global"
"go-admin/pkg"
"go-admin/pkg/cronjob"
)
@@ -101,13 +101,13 @@ func Setup(dbs map[string]*gorm.DB) {
fmt.Println(time.Now().Format(timeFormat), " [INFO] JobCore Starting...")
for k, db := range dbs {
global.Runtime.SetCrontab(k, cronjob.NewWithSeconds())
app.Runtime.SetCrontab(k, cronjob.NewWithSeconds())
setup(k, db)
}
}
func setup(key string, db *gorm.DB) {
crontab := global.Runtime.GetCrontabKey(key)
crontab := app.Runtime.GetCrontabKey(key)
sysJob := models.SysJob{}
jobList := make([]models.SysJob, 0)
err := sysJob.GetList(db, &jobList)