调整整体架构写法

调整db用法
调整日志用法
调整模版
This commit is contained in:
linwenxiang committed 2021-03-04 23:45:16 +08:00
1 parent 734a48dbb8
commit e2952fa393
137 files changed
+3638 -3544

No files matched your search

+11 -12
View File
@@ -1,39 +1,39 @@
package service
import (
"github.com/robfig/cron/v3"
"time"
"go-admin/app/admin/models"
"go-admin/app/jobs"
"go-admin/common/dto"
"go-admin/common/log"
"go-admin/common/service"
"go-admin/tools/app/msg"
)
type SysJob struct {
service.Service
Cron *cron.Cron
}
// RemoveJob 删除job
func (e *SysJob) RemoveJob(c *dto.GeneralDelDto) error {
var err error
var data models.SysJob
msgID := e.MsgID
data.JobId = c.Id
err = e.Orm.Table(data.TableName()).First(&data).Error
if err != nil {
log.Errorf("msgID[%s] db error:%s", msgID, err)
e.Log.Errorf("db error: %s", err)
return err
}
cn := jobs.Remove(data.EntryId)
cn := jobs.Remove(e.Cron, data.EntryId)
select {
case res := <-cn:
if res {
err = e.Orm.Table(data.TableName()).Where("entry_id = ?", data.EntryId).Update("entry_id", 0).Error
if err != nil {
log.Errorf("msgID[%s] db error:%s", msgID, err)
e.Log.Errorf("db error: %s", err)
}
return err
}
@@ -48,10 +48,9 @@ func (e *SysJob) RemoveJob(c *dto.GeneralDelDto) error {
func (e *SysJob) StartJob(c *dto.GeneralGetDto) error {
var data models.SysJob
var err error
msgID := e.MsgID
err = e.Orm.Table(data.TableName()).First(&data, c.Id).Error
if err != nil {
log.Errorf("msgID[%s] db error:%s", msgID, err)
e.Log.Errorf("db error: %s", err)
return err
}
if data.JobType == 1 {
@@ -60,9 +59,9 @@ func (e *SysJob) StartJob(c *dto.GeneralGetDto) error {
j.CronExpression = data.CronExpression
j.JobId = data.JobId
j.Name = data.JobName
data.EntryId, err = jobs.AddJob(j)
data.EntryId, err = jobs.AddJob(e.Cron, j)
if err != nil {
log.Errorf("msgID[%s] jobs AddJob[HttpJob] error:%s", msgID, err)
e.Log.Errorf("jobs AddJob[HttpJob] error: %s", err)
}
} else {
var j = &jobs.ExecJob{}
@@ -71,9 +70,9 @@ func (e *SysJob) StartJob(c *dto.GeneralGetDto) error {
j.JobId = data.JobId
j.Name = data.JobName
j.Args = data.Args
data.EntryId, err = jobs.AddJob(j)
data.EntryId, err = jobs.AddJob(e.Cron, j)
if err != nil {
log.Errorf("msgID[%s] jobs AddJob[ExecJob] error:%s", msgID, err)
e.Log.Errorf("jobs AddJob[ExecJob] error: %s", err)
}
}
if err != nil {
@@ -82,7 +81,7 @@ func (e *SysJob) StartJob(c *dto.GeneralGetDto) error {
err = e.Orm.Table(data.TableName()).Where(c.Id).Updates(&data).Error
if err != nil {
log.Errorf("msgID[%s] db error:%s", msgID, err)
e.Log.Errorf("db error: %s", err)
}
return err
}