public/go-admin
1
0
Fork 0
mirror of https://github.com/go-admin-team/go-admin.git synced 2026-09-21 02:04:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

增加go-admin日志规范用法

Browse Source
This commit is contained in:
linwenxiang
2020-09-21 13:04:48 +08:00
parent a8d5846483
commit fdbb76086e
5 changed files with 120 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/admin/apis/sysjob/sysjob.go
+18 -32
View File
@@ -1,16 +1,16 @@
package sysjob
import (
"go-admin/app/admin/service"
"go-admin/common/apis"
"go-admin/common/dto"
"gorm.io/gorm"
"time"
"github.com/gin-gonic/gin"
"go-admin/app/admin/models"
"go-admin/app/admin/service"
"go-admin/app/jobs"
"go-admin/common/apis"
"go-admin/common/dto"
"go-admin/common/log"
"go-admin/tools"
"go-admin/tools/app"
"go-admin/tools/app/msg"
@@ -22,40 +22,54 @@ type SysJob struct {
// RemoveJobForService 调用service实现
func (e *SysJob) RemoveJobForService(c *gin.Context) {
msgID := e.GenerateMsgIDFromContext(c)
db, err := e.GetOrm(c)
if err != nil {
log.Errorf("msgID[%s] error:%#v", msgID, err)
app.Error(c, 500, err, "")
return
}
var v dto.GeneralDelDto
err = c.BindUri(&v)
if err != nil {
log.Errorf("msgID[%s] 参数验证错误, error:%#v", msgID, err)
app.Error(c, 422, err, "参数验证失败")
return
}
s := service.SysJob{}
s.MsgID = msgID
s.Orm = db
err = s.RemoveJob(&v)
if err != nil {
app.Error(c, 500, err, "")
return
}
app.OK(c, nil, s.Msg)
}
// StartJobForService 启动job service实现
func (e *SysJob) StartJobForService(c *gin.Context) {
msgID := e.GenerateMsgIDFromContext(c)
db, err := e.GetOrm(c)
if err != nil {
log.Errorf("msgID[%s] error:%#v", msgID, err)
app.Error(c, 500, err, "")
return
}
var v dto.GeneralGetDto
err = c.BindUri(&v)
if err != nil {
log.Errorf("msgID[%s] 参数验证错误, error:%#v", msgID, err)
app.Error(c, 422, err, "参数验证失败")
return
}
s := service.SysJob{}
s.Orm = db
s.MsgID = msgID
err = s.StartJob(&v)
if err != nil {
app.Error(c, 500, err, "")
return
}
app.OK(c, nil, s.Msg)
}
@@ -82,34 +96,6 @@ func RemoveJob(c *gin.Context) {
}
// StartJobForService 启动job service实现
func StartJobForService(c *gin.Context) {
var err error
idb, exist := c.Get("db")
if !exist {
app.Error(c, 500, nil, "db connect not exist")
}
switch idb.(type) {
case *gorm.DB:
//新增操作
db := idb.(*gorm.DB)
var v dto.GeneralGetDto
err = c.BindUri(&v)
if err != nil {
app.Error(c, 422, err, "参数验证失败")
}
s := service.SysJob{}
s.Orm = db
err = s.StartJob(&v)
if err != nil {
app.Error(c, 500, err, "")
}
app.OK(c, nil, s.Msg)
default:
app.Error(c, 500, nil, "db connect not exist")
}
}
func StartJob(c *gin.Context) {
var data models.SysJob
var v dto.GeneralGetDto
app/admin/service/sysjob.go
+17
View File
@@ -4,6 +4,7 @@ import (
"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"
"time"
@@ -17,9 +18,11 @@ type SysJob struct {
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:%#v", msgID, err)
return err
}
cn := jobs.Remove(data.EntryId)
@@ -28,6 +31,9 @@ func (e *SysJob) RemoveJob(c *dto.GeneralDelDto) error {
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:%#v", msgID, err)
}
return err
}
case <-time.After(time.Second * 1):
@@ -41,8 +47,10 @@ 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:%#v", msgID, err)
return err
}
if data.JobType == 1 {
@@ -52,6 +60,9 @@ func (e *SysJob) StartJob(c *dto.GeneralGetDto) error {
j.JobId = data.JobId
j.Name = data.JobName
data.EntryId, err = jobs.AddJob(j)
if err != nil {
log.Errorf("msgID[%s] jobs AddJob[HttpJob] error:%#v", msgID, err)
}
} else {
var j = &jobs.ExecJob{}
j.InvokeTarget = data.InvokeTarget
@@ -60,11 +71,17 @@ func (e *SysJob) StartJob(c *dto.GeneralGetDto) error {
j.Name = data.JobName
j.Args = data.Args
data.EntryId, err = jobs.AddJob(j)
if err != nil {
log.Errorf("msgID[%s] jobs AddJob[ExecJob] error:%#v", msgID, err)
}
}
if err != nil {
return err
}
err = e.Orm.Table(data.TableName()).Where(c.Id).Updates(&data).Error
if err != nil {
log.Errorf("msgID[%s] db error:%#v", msgID, err)
}
return err
}