【更新】更新

This commit is contained in:
PandaGoAdmin
2022-08-02 17:19:14 +08:00
parent 791a23306c
commit 0555922a90
50 changed files with 678 additions and 450 deletions

View File

@@ -6,7 +6,6 @@ import (
"pandax/apps/job/jobs"
"pandax/apps/job/services"
"pandax/base/biz"
"pandax/base/ctx"
"pandax/base/ginx"
"pandax/base/utils"
)
@@ -25,7 +24,7 @@ type JobApi struct {
// @Success 200 {string} string "{"code": 400, "message": "添加失败"}"
// @Router /job/job [post]
// @Security X-TOKEN
func (j *JobApi) CreateJob(rc *ctx.ReqCtx) {
func (j *JobApi) CreateJob(rc *ginx.ReqCtx) {
var job entity.SysJob
ginx.BindJsonAndValid(rc.GinCtx, &job)
@@ -44,7 +43,7 @@ func (j *JobApi) CreateJob(rc *ctx.ReqCtx) {
// @Success 200 {string} string "{"code": 200, "data": [...]}"
// @Router /job/list [get]
// @Security
func (j *JobApi) GetJobList(rc *ctx.ReqCtx) {
func (j *JobApi) GetJobList(rc *ginx.ReqCtx) {
pageNum := ginx.QueryInt(rc.GinCtx, "pageNum", 1)
pageSize := ginx.QueryInt(rc.GinCtx, "pageSize", 10)
jobName := rc.GinCtx.Query("jobName")
@@ -67,7 +66,7 @@ func (j *JobApi) GetJobList(rc *ctx.ReqCtx) {
// @Success 200 {string} string "{"code": 200, "data": [...]}"
// @Router /job/{jobId} [get]
// @Security
func (j *JobApi) GetJob(rc *ctx.ReqCtx) {
func (j *JobApi) GetJob(rc *ginx.ReqCtx) {
jobId := ginx.PathParamInt(rc.GinCtx, rc.GinCtx.Param("jobId"))
rc.ResData = j.JobApp.FindOne(int64(jobId))
}
@@ -82,7 +81,7 @@ func (j *JobApi) GetJob(rc *ctx.ReqCtx) {
// @Success 200 {string} string "{"code": 400, "message": "添加失败"}"
// @Router /job [put]
// @Security X-TOKEN
func (l *JobApi) UpdateJob(rc *ctx.ReqCtx) {
func (l *JobApi) UpdateJob(rc *ginx.ReqCtx) {
var job entity.SysJob
ginx.BindJsonAndValid(rc.GinCtx, &job)
l.JobApp.Update(job)
@@ -95,7 +94,7 @@ func (l *JobApi) UpdateJob(rc *ctx.ReqCtx) {
// @Success 200 {string} string "{"code": 200, "message": "删除成功"}"
// @Success 200 {string} string "{"code": 400, "message": "删除失败"}"
// @Router /job/{jobId} [delete]
func (l *JobApi) DeleteJob(rc *ctx.ReqCtx) {
func (l *JobApi) DeleteJob(rc *ginx.ReqCtx) {
jobIds := rc.GinCtx.Param("jobId")
group := utils.IdsStrToIdsIntGroup(jobIds)
l.JobApp.Delete(group)
@@ -108,7 +107,7 @@ func (l *JobApi) DeleteJob(rc *ctx.ReqCtx) {
// @Success 200 {string} string "{"code": 200, "message": "删除成功"}"
// @Success 200 {string} string "{"code": 400, "message": "删除失败"}"
// @Router /job/stop/{jobId} [get]
func (l *JobApi) StopJobForService(rc *ctx.ReqCtx) {
func (l *JobApi) StopJobForService(rc *ginx.ReqCtx) {
jobId := ginx.PathParamInt(rc.GinCtx, "jobId")
job := l.JobApp.FindOne(int64(jobId))
jobs.Remove(jobs.Crontab, job.EntryId)
@@ -120,7 +119,7 @@ func (l *JobApi) StopJobForService(rc *ctx.ReqCtx) {
// @Success 200 {string} string "{"code": 200, "message": "删除成功"}"
// @Success 200 {string} string "{"code": 400, "message": "删除失败"}"
// @Router /job/stop/{jobId} [get]
func (l *JobApi) StartJobForService(rc *ctx.ReqCtx) {
func (l *JobApi) StartJobForService(rc *ginx.ReqCtx) {
jobId := ginx.PathParamInt(rc.GinCtx, "jobId")
job := l.JobApp.FindOne(int64(jobId))
@@ -163,7 +162,7 @@ func (l *JobApi) StartJobForService(rc *ctx.ReqCtx) {
// @Success 200 {string} string "{"code": 400, "message": "添加失败"}"
// @Router /job/changeStatus [put]
// @Security X-TOKEN
func (l *JobApi) UpdateStatusJob(rc *ctx.ReqCtx) {
func (l *JobApi) UpdateStatusJob(rc *ginx.ReqCtx) {
var job from.JobStatus
ginx.BindJsonAndValid(rc.GinCtx, &job)

View File

@@ -4,7 +4,7 @@ import (
"github.com/gin-gonic/gin"
"pandax/apps/job/api"
"pandax/apps/job/services"
"pandax/base/ctx"
"pandax/base/ginx"
)
func InitJobRouter(router *gin.RouterGroup) {
@@ -14,43 +14,35 @@ func InitJobRouter(router *gin.RouterGroup) {
}
job := router.Group("")
jobListLog := ctx.NewLogInfo("获取Job列表")
job.GET("list", func(c *gin.Context) {
ctx.NewReqCtxWithGin(c).WithLog(jobListLog).Handle(jobApi.GetJobList)
ginx.NewReqCtx(c).WithLog("获取Job列表").Handle(jobApi.GetJobList)
})
getJobLog := ctx.NewLogInfo("获取Job信息")
job.GET(":jobId", func(c *gin.Context) {
ctx.NewReqCtxWithGin(c).WithLog(getJobLog).Handle(jobApi.GetJob)
ginx.NewReqCtx(c).WithLog("获取Job信息").Handle(jobApi.GetJob)
})
insertJobLog := ctx.NewLogInfo("添加Job信息")
job.POST("", func(c *gin.Context) {
ctx.NewReqCtxWithGin(c).WithLog(insertJobLog).Handle(jobApi.CreateJob)
ginx.NewReqCtx(c).WithLog("添加Job信息").Handle(jobApi.CreateJob)
})
updateJobLog := ctx.NewLogInfo("修改Job信息")
job.PUT("", func(c *gin.Context) {
ctx.NewReqCtxWithGin(c).WithLog(updateJobLog).Handle(jobApi.UpdateJob)
ginx.NewReqCtx(c).WithLog("修改Job信息").Handle(jobApi.UpdateJob)
})
deleteJobLog := ctx.NewLogInfo("删除Job信息")
job.DELETE(":jobId", func(c *gin.Context) {
ctx.NewReqCtxWithGin(c).WithLog(deleteJobLog).Handle(jobApi.DeleteJob)
ginx.NewReqCtx(c).WithLog("删除Job信息").Handle(jobApi.DeleteJob)
})
stopJobLog := ctx.NewLogInfo("停止一个job")
job.GET("/stop/:jobId", func(c *gin.Context) {
ctx.NewReqCtxWithGin(c).WithLog(stopJobLog).Handle(jobApi.StopJobForService)
ginx.NewReqCtx(c).WithLog("停止一个job").Handle(jobApi.StopJobForService)
})
starteJobLog := ctx.NewLogInfo("开启一个job")
job.GET("/start/:jobId", func(c *gin.Context) {
ctx.NewReqCtxWithGin(c).WithLog(starteJobLog).Handle(jobApi.StartJobForService)
ginx.NewReqCtx(c).WithLog("开启一个job").Handle(jobApi.StartJobForService)
})
updateStatusJobLog := ctx.NewLogInfo("修改状态")
job.PUT("/changeStatus", func(c *gin.Context) {
ctx.NewReqCtxWithGin(c).WithLog(updateStatusJobLog).Handle(jobApi.UpdateStatusJob)
ginx.NewReqCtx(c).WithLog("修改状态").Handle(jobApi.UpdateStatusJob)
})
}