From 54f48377f0ce99d5f1d3a40b56950bf979d52f8d Mon Sep 17 00:00:00 2001 From: zhangwenjian Date: Thu, 6 Aug 2020 22:30:57 +0800 Subject: [PATCH] feat:added auto job --- .gitignore | 1 + apis/sysjob/sysjob.go | 124 ++++++++------- cmd/api/server.go | 14 +- config/settings.full.yml | 2 + config/settings.yml | 2 + global/adm.go | 5 +- go.mod | 1 + middleware/customerror.go | 2 +- middleware/logger.go | 2 +- models/sysjob.go | 45 +++++- pkg/cronjob/gadmjob.go | 135 +++++++++++++++++ pkg/cronjob/testjob.go | 20 --- pkg/http.go | 52 +++++++ pkg/logger/logger.go | 21 ++- pkg/ws/ws.go | 311 ++++++++++++++++++++++++++++++++++++++ router/sysjob.go | 22 +-- router/sysrouter.go | 10 ++ tools/config/config.go | 5 - tools/config/logger.go | 18 ++- tools/string.go | 2 +- 20 files changed, 671 insertions(+), 123 deletions(-) create mode 100644 pkg/cronjob/gadmjob.go delete mode 100644 pkg/cronjob/testjob.go create mode 100644 pkg/http.go create mode 100644 pkg/ws/ws.go diff --git a/.gitignore b/.gitignore index af7635f..954d821 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ go-admin middleware/demo.go config/settings.dev.b.yml temp/logs +config/settings.dev.yml.log diff --git a/apis/sysjob/sysjob.go b/apis/sysjob/sysjob.go index 35776ec..565a6ab 100644 --- a/apis/sysjob/sysjob.go +++ b/apis/sysjob/sysjob.go @@ -1,78 +1,96 @@ package sysjob import ( -"github.com/gin-gonic/gin" -"github.com/gin-gonic/gin/binding" -"go-admin/models" -"go-admin/tools" -"go-admin/tools/app" -"go-admin/tools/app/msg" + "github.com/gin-gonic/gin" + "go-admin/global" + "go-admin/models" + "go-admin/pkg/cronjob" + "go-admin/tools" + "go-admin/tools/app" + "go-admin/tools/app/msg" ) func GetSysJobList(c *gin.Context) { -var data models.SysJob -var err error -var pageSize = 10 -var pageIndex = 1 + var data models.SysJob + var err error + var pageSize = 10 + var pageIndex = 1 -if size := c.Request.FormValue("pageSize"); size != "" { -pageSize = tools.StrToInt(err, size) -} -if index := c.Request.FormValue("pageIndex"); index != "" { -pageIndex = tools.StrToInt(err, index) -} + if size := c.Request.FormValue("pageSize"); size != "" { + pageSize = tools.StrToInt(err, size) + } + if index := c.Request.FormValue("pageIndex"); index != "" { + pageIndex = tools.StrToInt(err, index) + } -data.JobId, _ = tools.StringToInt(c.Request.FormValue("jobId")) - data.JobName = c.Request.FormValue("jobName") - data.JobGroup = c.Request.FormValue("jobGroup") - data.CronExpression = c.Request.FormValue("cronExpression") - data.InvokeTarget = c.Request.FormValue("invokeTarget") - data.Status = c.Request.FormValue("status") - + data.JobId, _ = tools.StringToInt(c.Request.FormValue("jobId")) + data.JobName = c.Request.FormValue("jobName") + data.JobGroup = c.Request.FormValue("jobGroup") + data.CronExpression = c.Request.FormValue("cronExpression") + data.InvokeTarget = c.Request.FormValue("invokeTarget") + data.Status, _ = tools.StringToInt(c.Request.FormValue("status")) -data.DataScope = tools.GetUserIdStr(c) -result, count, err := data.GetPage(pageSize, pageIndex) -tools.HasError(err, "", -1) + data.DataScope = tools.GetUserIdStr(c) + result, count, err := data.GetPage(pageSize, pageIndex) + tools.HasError(err, "", -1) -app.PageOK(c, result, count, pageIndex, pageSize, "") + app.PageOK(c, result, count, pageIndex, pageSize, "") } func GetSysJob(c *gin.Context) { -var data models.SysJob -data.JobId, _ = tools.StringToInt(c.Param("jobId")) -result, err := data.Get() -tools.HasError(err, "抱歉未找到相关信息", -1) + var data models.SysJob + data.JobId, _ = tools.StringToInt(c.Param("jobId")) + result, err := data.Get() + tools.HasError(err, "抱歉未找到相关信息", -1) -app.OK(c, result, "") + app.OK(c, result, "") } func InsertSysJob(c *gin.Context) { -var data models.SysJob -err := c.ShouldBindJSON(&data) -data.CreateBy = tools.GetUserIdStr(c) -tools.HasError(err, "", 500) -result, err := data.Create() -tools.HasError(err, "", -1) -app.OK(c, result, "") + var data models.SysJob + err := c.ShouldBindJSON(&data) + data.CreateBy = tools.GetUserIdStr(c) + tools.HasError(err, "", 500) + result, err := data.Create() + tools.HasError(err, "", -1) + app.OK(c, result, "") } func UpdateSysJob(c *gin.Context) { -var data models.SysJob -err := c.BindWith(&data, binding.JSON) -tools.HasError(err, "数据解析失败", -1) -data.UpdateBy = tools.GetUserIdStr(c) -result, err := data.Update(data.JobId) -tools.HasError(err, "", -1) + var data models.SysJob + err := c.ShouldBindJSON(&data) + tools.HasError(err, "数据解析失败", -1) + data.UpdateBy = tools.GetUserIdStr(c) + result, err := data.Update(data.JobId) + tools.HasError(err, "", -1) -app.OK(c, result, "") + app.OK(c, result, "") } func DeleteSysJob(c *gin.Context) { -var data models.SysJob -data.UpdateBy = tools.GetUserIdStr(c) + var data models.SysJob + data.UpdateBy = tools.GetUserIdStr(c) -IDS := tools.IdsStrToIdsIntGroup("jobId", c) -_, err := data.BatchDelete(IDS) -tools.HasError(err, msg.DeletedFail, 500) -app.OK(c, nil, msg.DeletedSuccess) -} \ No newline at end of file + IDS := tools.IdsStrToIdsIntGroup("jobId", c) + _, err := data.BatchDelete(IDS) + tools.HasError(err, msg.DeletedFail, 500) + app.OK(c, nil, msg.DeletedSuccess) +} + +func RemoveJob(c *gin.Context) { + var data models.SysJob + data.JobId, _ = tools.StringToInt(c.Param("jobId")) + result, err := data.Get() + tools.HasError(err, "", 500) + cronjob.Remove(global.GADMCron, result.EntryId) + app.OK(c, nil, msg.DeletedSuccess) +} + +func StartJob(c *gin.Context) { + var data models.SysJob + data.JobId, _ = tools.StringToInt(c.Param("jobId")) + result, err := data.Get() + tools.HasError(err, "", 500) + cronjob.AddJob(result) + app.OK(c, nil, msg.DeletedSuccess) +} diff --git a/cmd/api/server.go b/cmd/api/server.go index fba0c8f..eccb885 100644 --- a/cmd/api/server.go +++ b/cmd/api/server.go @@ -9,6 +9,7 @@ import ( "go-admin/database" "go-admin/global" mycasbin "go-admin/pkg/casbin" + "go-admin/pkg/cronjob" "go-admin/pkg/logger" "go-admin/router" "go-admin/tools" @@ -36,11 +37,10 @@ var ( return run() }, } - - ) var echoTimes int + func init() { StartCmd.PersistentFlags().StringVarP(&configYml, "config", "c", "config/settings.yml", "Start server with provided configuration file") StartCmd.PersistentFlags().StringVarP(&port, "port", "p", "8000", "Tcp port server listening on") @@ -60,24 +60,25 @@ func setup() { usageStr := `starting api server` global.Logger.Info(usageStr) + } func run() error { - if mode != "" { - config.SetConfig(configYml, "settings.application.mode", mode) - } if viper.GetString("settings.application.mode") == string(tools.ModeProd) { gin.SetMode(gin.ReleaseMode) } r := router.InitRouter() - defer global.Eloquent.Close() srv := &http.Server{ Addr: config.ApplicationConfig.Host + ":" + config.ApplicationConfig.Port, Handler: r, } + go func() { + cronjob.JobSetup() + }() + go func() { // 服务连接 @@ -113,6 +114,7 @@ func run() error { global.Logger.Fatal("Server Shutdown:", err) } global.Logger.Println("Server exiting") + return nil } diff --git a/config/settings.full.yml b/config/settings.full.yml index ae6472c..54b3ab5 100644 --- a/config/settings.full.yml +++ b/config/settings.full.yml @@ -34,6 +34,8 @@ settings: enabledreq: false # 数据库日志开关 dev模式,将自动开启 enableddb: false + # 自动任务日志开关 dev模式,将自动开启 + enabledjob: false jwt: # token 密钥,生产环境时及的修改 secret: go-admin diff --git a/config/settings.yml b/config/settings.yml index cce9753..e16f3d6 100644 --- a/config/settings.yml +++ b/config/settings.yml @@ -25,6 +25,8 @@ settings: enabledreq: false # 数据库日志开关 dev模式,将自动开启 enableddb: false + # 自动任务日志开关 dev模式,将自动开启 + enabledjob: false jwt: # token 密钥,生产环境时及的修改 secret: go-admin diff --git a/global/adm.go b/global/adm.go index 29996d7..f5fa08e 100644 --- a/global/adm.go +++ b/global/adm.go @@ -5,12 +5,15 @@ import ( "github.com/gin-gonic/gin" "github.com/gogf/gf/os/glog" "github.com/jinzhu/gorm" + "github.com/robfig/cron/v3" ) var GinEngine *gin.Engine var CasbinEnforcer *casbin.SyncedEnforcer var Eloquent *gorm.DB +var GADMCron *cron.Cron + var ( Source string Driver string @@ -26,7 +29,7 @@ func init() { var ( Logger *glog.Logger - DBLogger *glog.Logger + JobLogger *glog.Logger RequestLogger *glog.Logger ) diff --git a/go.mod b/go.mod index 8a07bda..20aad07 100644 --- a/go.mod +++ b/go.mod @@ -15,6 +15,7 @@ require ( github.com/go-sql-driver/mysql v1.5.0 github.com/gogf/gf v1.13.2 github.com/google/uuid v1.1.1 + github.com/gorilla/websocket v1.4.1 github.com/jinzhu/gorm v1.9.10 github.com/mailru/easyjson v0.7.1 // indirect github.com/mattn/go-sqlite3 v1.14.0 // indirect diff --git a/middleware/customerror.go b/middleware/customerror.go index 2dac7bc..d48028d 100644 --- a/middleware/customerror.go +++ b/middleware/customerror.go @@ -26,7 +26,7 @@ func CustomError(c *gin.Context) { } c.Status(statusCode) fmt.Println( - time.Now().Format("2006-01-02 15:04:05.9999"), + time.Now().Format("2006-01-02 15:04:05"), "[ERROR]", c.Request.Method, c.Request.URL, diff --git a/middleware/logger.go b/middleware/logger.go index 29f316f..8796bc4 100644 --- a/middleware/logger.go +++ b/middleware/logger.go @@ -41,7 +41,7 @@ func LoggerToFile() gin.HandlerFunc { // 日志格式 fmt.Printf("%s [INFO] %s %s %3d %13v %15s \r\n", - startTime.Format("2006-01-02 15:04:05.9999"), + startTime.Format("2006-01-02 15:04:05"), reqMethod, reqUri, statusCode, diff --git a/models/sysjob.go b/models/sysjob.go index cdd2df2..32b453f 100644 --- a/models/sysjob.go +++ b/models/sysjob.go @@ -11,13 +11,13 @@ type SysJob struct { JobGroup string `json:"jobGroup" gorm:"type:varchar(255);"` // 任务分组 CronExpression string `json:"cronExpression" gorm:"type:varchar(255);"` // cron表达式 InvokeTarget string `json:"invokeTarget" gorm:"type:varchar(255);"` // 调用目标 - MisfirePolicy string `json:"misfirePolicy" gorm:"type:varchar(255);"` // 执行策略 - Concurrent string `json:"concurrent" gorm:"type:int(1);"` // 是否并发 - Status string `json:"status" gorm:"type:int(1);"` // 状态 + MisfirePolicy int `json:"misfirePolicy" gorm:"type:varchar(255);"` // 执行策略 + Concurrent int `json:"concurrent" gorm:"type:int(1);"` // 是否并发 + Status int `json:"status" gorm:"type:int(1);"` // 状态 + EntryId int `json:"entry_id" gorm:"type:int(11);"` // job启动时返回的id CreateBy string `json:"createBy" gorm:"type:varchar(128);"` // UpdateBy string `json:"updateBy" gorm:"type:varchar(128);"` // DataScope string `json:"dataScope" gorm:"-"` - Params string `json:"params" gorm:"-"` BaseModel } @@ -62,7 +62,7 @@ func (e *SysJob) Get() (SysJob, error) { table = table.Where("invoke_target = ?", e.InvokeTarget) } - if e.Status != "" { + if e.Status != -1 { table = table.Where("status = ?", e.Status) } @@ -98,7 +98,7 @@ func (e *SysJob) GetPage(pageSize int, pageIndex int) ([]SysJob, int, error) { table = table.Where("invoke_target = ?", e.InvokeTarget) } - if e.Status != "" { + if e.Status != -1 { table = table.Where("status = ?", e.Status) } @@ -118,6 +118,19 @@ func (e *SysJob) GetPage(pageSize int, pageIndex int) ([]SysJob, int, error) { return doc, count, nil } +func (e *SysJob) GetList() ([]SysJob, error) { + var doc []SysJob + + table := orm.Eloquent.Select("*").Table(e.TableName()) + + table = table.Where("status = ?", 0) + + if err := table.Find(&doc).Error; err != nil { + return nil, err + } + return doc, nil +} + // 更新SysJob func (e *SysJob) Update(id int) (update SysJob, err error) { if err = orm.Eloquent.Table(e.TableName()).Where("job_id = ?", id).First(&update).Error; err != nil { @@ -132,6 +145,26 @@ func (e *SysJob) Update(id int) (update SysJob, err error) { return } +func (e *SysJob) RemoveAllEntryID() (update SysJob, err error) { + + //参数1:是要修改的数据 + //参数2:是修改的数据 + if err = orm.Eloquent.Table(e.TableName()).Updates(map[string]interface{}{"entry_id": 0}).Error; err != nil { + return + } + return +} + +func (e *SysJob) RemoveEntryID(entryID int) (update SysJob, err error) { + + //参数1:是要修改的数据 + //参数2:是修改的数据 + if err = orm.Eloquent.Table(e.TableName()).Where("entry_id = ?", entryID).Updates(map[string]interface{}{"entry_id": 0}).Error; err != nil { + return + } + return +} + // 删除SysJob func (e *SysJob) Delete(id int) (success bool, err error) { if err = orm.Eloquent.Table(e.TableName()).Where("job_id = ?", id).Delete(&SysJob{}).Error; err != nil { diff --git a/pkg/cronjob/gadmjob.go b/pkg/cronjob/gadmjob.go new file mode 100644 index 0000000..2e816bc --- /dev/null +++ b/pkg/cronjob/gadmjob.go @@ -0,0 +1,135 @@ +package cronjob + +import ( + "fmt" + "github.com/robfig/cron/v3" + "go-admin/global" + "go-admin/models" + "go-admin/pkg" + "go-admin/pkg/ws" + "time" +) + +var timeFormat = "2006-01-02 15:04:05" +var retryCount = 3 + +// 初始化 +func JobSetup() { + + fmt.Println(time.Now().Format(timeFormat), " [INFO] Job Starting...") + + global.GADMCron = newWithSeconds() + + sysjob := models.SysJob{} + joblist, err := sysjob.GetList() + if err != nil { + fmt.Println(time.Now().Format(timeFormat), " [ERROR] Job init error", err) + } + if len(joblist) == 0 { + fmt.Println(time.Now().Format(timeFormat), " [INFO] Job total:0") + } + + _, err = sysjob.RemoveAllEntryID() + if err != nil { + fmt.Println(time.Now().Format(timeFormat), " [ERROR] Job remove entry_id error", err) + } + + for i := 0; i < len(joblist); i++ { + AddJob(joblist[i]) + + } + + // 其中任务 + global.GADMCron.Start() + fmt.Println(time.Now().Format(timeFormat), " [INFO] Job start success.") + // 关闭任务 + defer global.GADMCron.Stop() + select {} +} + +// 添加任务 +func AddJob(job models.SysJob) error { + h := HttpJob{Url: job.InvokeTarget, JobId: job.JobId, Name: job.JobName} + // 添加定时任务 + id, err := global.GADMCron.AddJob(job.CronExpression, h) + + if err != nil { + fmt.Println(time.Now().Format(timeFormat), " [ERROR] Job AddJob error", err) + return err + } + job.EntryId = int(id) + h.EntryId = job.EntryId + _, err = job.Update(job.JobId) + fmt.Println(time.Now().Format(timeFormat), " [INFO] Job AddJob success ,info:", job) + return err +} + +// 任务类型 http +type HttpJob struct { + Url string + Name string + JobId int + EntryId int +} + +//http 任务接口 +func (h HttpJob) Run() { + + startTime := time.Now() + var count = 0 + /* 循环 */ +LOOP: + if count < retryCount { + /* 跳过迭代 */ + str, err := pkg.Get(h.Url) + if err != nil { + // 如果失败暂停一段时间重试 + fmt.Println(time.Now().Format(timeFormat), " [ERROR] mission failed! ", err) + fmt.Printf(time.Now().Format(timeFormat)+" [INFO] Retry after the task fails %d seconds! %s \n", time.Duration(count)*time.Second, str) + time.Sleep(time.Duration(count) * time.Second) + goto LOOP + } + count = count + 1 + //fmt.Printf("a的值为 : %s \n", str) + } + + fmt.Println(h.Url) + // 结束时间 + endTime := time.Now() + + // 执行时间 + latencyTime := endTime.Sub(startTime) + str := time.Now().Format(timeFormat) + " [INFO] Job " + string(h.EntryId) + "exec success , spend :" + latencyTime.String() + ws.SendAll(str) + global.JobLogger.Info(time.Now().Format(timeFormat), " [INFO] Job ", h, "exec success , spend :", latencyTime) +} + +// 调度停止 +func Stop(cron *cron.Cron) chan bool { + ch := make(chan bool) + go func() { + cron.Stop() + ch <- true + }() + return ch +} + +//移除Job +func Remove(e *cron.Cron, entryID int) { + ch := make(chan bool) + job := models.SysJob{} + go func() { + + e.Remove(cron.EntryID(entryID)) + _, _ = job.RemoveEntryID(entryID) + fmt.Println(time.Now().Format(timeFormat), " [INFO] Job Remove success ,info entryID :", entryID) + ch <- true + }() +} + +// newWithSeconds returns a Cron with the seconds field enabled. +func newWithSeconds() *cron.Cron { + secondParser := cron.NewParser(cron.Second | cron.Minute | + cron.Hour | cron.Dom | cron.Month | cron.DowOptional | cron.Descriptor) + return cron.New(cron.WithParser(secondParser), cron.WithChain()) +} diff --git a/pkg/cronjob/testjob.go b/pkg/cronjob/testjob.go deleted file mode 100644 index 1d39774..0000000 --- a/pkg/cronjob/testjob.go +++ /dev/null @@ -1,20 +0,0 @@ -package cronjob - -import ( - "github.com/robfig/cron/v3" - "log" - tools2 "go-admin/tools" -) - -func TestJob(c *cron.Cron) { - id, err := c.AddFunc("1 * * * *", func() { - - tools2.Logger.Println("Every hour on the one hour") - }) - if err != nil { - tools2.Logger.Println(err) - log.Println("start error") - } else { - log.Printf("Start Success; ID: %v \r\n", id) - } -} diff --git a/pkg/http.go b/pkg/http.go new file mode 100644 index 0000000..62adadc --- /dev/null +++ b/pkg/http.go @@ -0,0 +1,52 @@ +package pkg + +import ( + "bytes" + "encoding/json" + "io/ioutil" + "net/http" + "time" +) + +// 发送GET请求 +// url: 请求地址 +// response: 请求返回的内容 +func Get(url string) (string, error) { + + client := &http.Client{} + req, err := http.NewRequest("GET", url, nil) + req.Header.Set("Accept", "*/*") + req.Header.Set("Content-Type", "application/json") + if err != nil { + return "", err + } + + resp, err := client.Do(req) + if err != nil { + return "", err + } + defer resp.Body.Close() + result, _ := ioutil.ReadAll(resp.Body) + + return string(result), nil +} + +// 发送POST请求 +// url: 请求地址 +// data: POST请求提交的数据 +// contentType: 请求体格式,如:application/json +// content: 请求放回的内容 +func Post(url string, data interface{}, contentType string) string { + + // 超时时间:5秒 + client := &http.Client{Timeout: 5 * time.Second} + jsonStr, _ := json.Marshal(data) + resp, err := client.Post(url, contentType, bytes.NewBuffer(jsonStr)) + if err != nil { + panic(err) + } + defer resp.Body.Close() + + result, _ := ioutil.ReadAll(resp.Body) + return string(result) +} diff --git a/pkg/logger/logger.go b/pkg/logger/logger.go index d1a5289..3b3ab9a 100644 --- a/pkg/logger/logger.go +++ b/pkg/logger/logger.go @@ -8,21 +8,21 @@ import ( ) var Logger *glog.Logger -var DBLogger *glog.Logger +var JobLogger *glog.Logger var RequestLogger *glog.Logger func Setup() { Logger = glog.New() - Logger.SetPath(config.LoggerConfig.Path + "/bus") - Logger.SetStdoutPrint(config.LoggerConfig.EnabledBUS) - Logger.SetFile("logger-{Ymd}.log") + _ = Logger.SetPath(config.LoggerConfig.Path + "/bus") + Logger.SetStdoutPrint(config.LoggerConfig.EnabledBUS && config.LoggerConfig.Stdout) + Logger.SetFile("bus-{Ymd}.log") _ = Logger.SetLevelStr(config.LoggerConfig.Level) - DBLogger = glog.New() - _ = DBLogger.SetPath(config.LoggerConfig.Path + "/db") - DBLogger.SetStdoutPrint(false) - DBLogger.SetFile("db-{Ymd}.log") - _ = DBLogger.SetLevelStr(config.LoggerConfig.Level) + JobLogger = glog.New() + _ = JobLogger.SetPath(config.LoggerConfig.Path + "/job") + JobLogger.SetStdoutPrint(false) + JobLogger.SetFile("db-{Ymd}.log") + _ = JobLogger.SetLevelStr(config.LoggerConfig.Level) RequestLogger = glog.New() _ = RequestLogger.SetPath(config.LoggerConfig.Path + "/request") @@ -30,10 +30,9 @@ func Setup() { RequestLogger.SetFile("access-{Ymd}.log") _ = RequestLogger.SetLevelStr(config.LoggerConfig.Level) - Logger.Info(tools.Green("Logger init success!")) global.Logger = Logger.Line() - global.DBLogger = DBLogger.Line() + global.JobLogger = JobLogger.Line() global.RequestLogger = RequestLogger.Line() } diff --git a/pkg/ws/ws.go b/pkg/ws/ws.go new file mode 100644 index 0000000..79e5ad4 --- /dev/null +++ b/pkg/ws/ws.go @@ -0,0 +1,311 @@ +package ws + +import ( + "fmt" + "github.com/gin-gonic/gin" + "github.com/gorilla/websocket" + uuid "github.com/satori/go.uuid" + "log" + "net/http" + "sync" + "time" +) + +// Manager 所有 websocket 信息 +type Manager struct { + Group map[string]map[string]*Client + groupCount, clientCount uint + Lock sync.Mutex + Register, UnRegister chan *Client + Message chan *MessageData + GroupMessage chan *GroupMessageData + BroadCastMessage chan *BroadCastMessageData +} + +// Client 单个 websocket 信息 +type Client struct { + Id, Group string + Socket *websocket.Conn + Message chan []byte +} + +// messageData 单个发送数据信息 +type MessageData struct { + Id, Group string + Message []byte +} + +// groupMessageData 组广播数据信息 +type GroupMessageData struct { + Group string + Message []byte +} + +// 广播发送数据信息 +type BroadCastMessageData struct { + Message []byte +} + +// 读信息,从 websocket 连接直接读取数据 +func (c *Client) Read() { + defer func() { + WebsocketManager.UnRegister <- c + log.Printf("client [%s] disconnect", c.Id) + if err := c.Socket.Close(); err != nil { + log.Printf("client [%s] disconnect err: %s", c.Id, err) + } + }() + + for { + messageType, message, err := c.Socket.ReadMessage() + if err != nil || messageType == websocket.CloseMessage { + break + } + log.Printf("client [%s] receive message: %s", c.Id, string(message)) + c.Message <- message + } +} + +// 写信息,从 channel 变量 Send 中读取数据写入 websocket 连接 +func (c *Client) Write() { + defer func() { + log.Printf("client [%s] disconnect", c.Id) + if err := c.Socket.Close(); err != nil { + log.Printf("client [%s] disconnect err: %s", c.Id, err) + } + }() + + for { + select { + case message, ok := <-c.Message: + if !ok { + _ = c.Socket.WriteMessage(websocket.CloseMessage, []byte{}) + return + } + log.Printf("client [%s] write message: %s", c.Id, string(message)) + err := c.Socket.WriteMessage(websocket.TextMessage, message) + if err != nil { + log.Printf("client [%s] writemessage err: %s", c.Id, err) + } + } + } +} + +// 启动 websocket 管理器 +func (manager *Manager) Start() { + log.Printf("websocket manage start") + for { + select { + // 注册 + case client := <-manager.Register: + log.Printf("client [%s] connect", client.Id) + log.Printf("register client [%s] to group [%s]", client.Id, client.Group) + + manager.Lock.Lock() + if manager.Group[client.Group] == nil { + manager.Group[client.Group] = make(map[string]*Client) + manager.groupCount += 1 + } + manager.Group[client.Group][client.Id] = client + manager.clientCount += 1 + manager.Lock.Unlock() + + // 注销 + case client := <-manager.UnRegister: + log.Printf("unregister client [%s] from group [%s]", client.Id, client.Group) + manager.Lock.Lock() + if _, ok := manager.Group[client.Group]; ok { + if _, ok := manager.Group[client.Group][client.Id]; ok { + close(client.Message) + delete(manager.Group[client.Group], client.Id) + manager.clientCount -= 1 + if len(manager.Group[client.Group]) == 0 { + //log.Printf("delete empty group [%s]", client.Group) + delete(manager.Group, client.Group) + manager.groupCount -= 1 + } + } + } + manager.Lock.Unlock() + + // 发送广播数据到某个组的 channel 变量 Send 中 + //case data := <-manager.boardCast: + // if groupMap, ok := manager.wsGroup[data.GroupId]; ok { + // for _, conn := range groupMap { + // conn.Send <- data.Data + // } + // } + } + } +} + +// 处理单个 client 发送数据 +func (manager *Manager) SendService() { + for { + select { + case data := <-manager.Message: + if groupMap, ok := manager.Group[data.Group]; ok { + if conn, ok := groupMap[data.Id]; ok { + conn.Message <- data.Message + } + } + } + } +} + +// 处理 group 广播数据 +func (manager *Manager) SendGroupService() { + for { + select { + // 发送广播数据到某个组的 channel 变量 Send 中 + case data := <-manager.GroupMessage: + if groupMap, ok := manager.Group[data.Group]; ok { + for _, conn := range groupMap { + conn.Message <- data.Message + } + } + } + } +} + +// 处理广播数据 +func (manager *Manager) SendAllService() { + for { + select { + case data := <-manager.BroadCastMessage: + for _, v := range manager.Group { + for _, conn := range v { + conn.Message <- data.Message + } + } + } + } +} + +// 向指定的 client 发送数据 +func (manager *Manager) Send(id string, group string, message []byte) { + data := &MessageData{ + Id: id, + Group: group, + Message: message, + } + manager.Message <- data +} + +// 向指定的 Group 广播 +func (manager *Manager) SendGroup(group string, message []byte) { + data := &GroupMessageData{ + Group: group, + Message: message, + } + manager.GroupMessage <- data +} + +// 广播 +func (manager *Manager) SendAll(message []byte) { + data := &BroadCastMessageData{ + Message: message, + } + manager.BroadCastMessage <- data +} + +// 注册 +func (manager *Manager) RegisterClient(client *Client) { + manager.Register <- client +} + +// 注销 +func (manager *Manager) UnRegisterClient(client *Client) { + manager.UnRegister <- client +} + +// 当前组个数 +func (manager *Manager) LenGroup() uint { + return manager.groupCount +} + +// 当前连接个数 +func (manager *Manager) LenClient() uint { + return manager.clientCount +} + +// 获取 wsManager 管理器信息 +func (manager *Manager) Info() map[string]interface{} { + managerInfo := make(map[string]interface{}) + managerInfo["groupLen"] = manager.LenGroup() + managerInfo["clientLen"] = manager.LenClient() + managerInfo["chanRegisterLen"] = len(manager.Register) + managerInfo["chanUnregisterLen"] = len(manager.UnRegister) + managerInfo["chanMessageLen"] = len(manager.Message) + managerInfo["chanGroupMessageLen"] = len(manager.GroupMessage) + managerInfo["chanBroadCastMessageLen"] = len(manager.BroadCastMessage) + return managerInfo +} + +// 初始化 wsManager 管理器 +var WebsocketManager = Manager{ + Group: make(map[string]map[string]*Client), + Register: make(chan *Client, 128), + UnRegister: make(chan *Client, 128), + GroupMessage: make(chan *GroupMessageData, 128), + Message: make(chan *MessageData, 128), + BroadCastMessage: make(chan *BroadCastMessageData, 128), + groupCount: 0, + clientCount: 0, +} + +// gin 处理 websocket handler +func (manager *Manager) WsClient(ctx *gin.Context) { + upGrader := websocket.Upgrader{ + // cross origin domain + CheckOrigin: func(r *http.Request) bool { + return true + }, + // 处理 Sec-WebSocket-Protocol Header + Subprotocols: []string{ctx.GetHeader("Sec-WebSocket-Protocol")}, + } + + conn, err := upGrader.Upgrade(ctx.Writer, ctx.Request, nil) + if err != nil { + log.Printf("websocket connect error: %s", ctx.Param("channel")) + return + } + + fmt.Println("token: ",ctx.Query("token")) + + client := &Client{ + Id: uuid.NewV4().String(), + Group: ctx.Param("channel"), + Socket: conn, + Message: make(chan []byte, 1024), + } + + manager.RegisterClient(client) + //go client.Read() + go client.Write() + time.Sleep(time.Second * 15) + // 测试单个 client 发送数据 + //manager.Send(client.Id, client.Group, []byte("Send message ----"+time.Now().Format("2006-01-02 15:04:05"))) +} + +// 测试组广播 +func TestSendGroup() { + for { + time.Sleep(time.Second * 20) + WebsocketManager.SendGroup("leffss", []byte("SendGroup message ----"+time.Now().Format("2006-01-02 15:04:05"))) + } +} + +// 测试广播 +func TestSendAll() { + for { + time.Sleep(time.Second * 25) + WebsocketManager.SendAll([]byte("SendAll message ----" + time.Now().Format("2006-01-02 15:04:05"))) + fmt.Println(WebsocketManager.Info()) + } +} + +func SendAll(msg string) { + WebsocketManager.SendAll([]byte("{\"code\":200,\"data\":"+msg+"}")) + fmt.Println(WebsocketManager.Info()) +} diff --git a/router/sysjob.go b/router/sysjob.go index 6699db4..ff4ec8a 100644 --- a/router/sysjob.go +++ b/router/sysjob.go @@ -1,20 +1,22 @@ package router import ( -"github.com/gin-gonic/gin" -"go-admin/apis/sysjob" + "github.com/gin-gonic/gin" + "go-admin/apis/sysjob" ) // 无需认证的路由代码 func registerSysJobRouter(v1 *gin.RouterGroup) { -v1.GET("/sysjobList",sysjob.GetSysJobList) + r := v1.Group("/sysjob") + { + r.GET("", sysjob.GetSysJobList) + r.GET("/:jobId", sysjob.GetSysJob) + r.POST("", sysjob.InsertSysJob) + r.PUT("", sysjob.UpdateSysJob) + r.DELETE("/:jobId", sysjob.DeleteSysJob) + } -r := v1.Group("/sysjob") -{ -r.GET("/:jobId", sysjob.GetSysJob) -r.POST("", sysjob.InsertSysJob) -r.PUT("", sysjob.UpdateSysJob) -r.DELETE("/:jobId", sysjob.DeleteSysJob) -} + v1.GET("/job/remove/:jobId",sysjob.RemoveJob) + v1.GET("/job/start/:jobId",sysjob.StartJob) } diff --git a/router/sysrouter.go b/router/sysrouter.go index ea8df57..655d748 100644 --- a/router/sysrouter.go +++ b/router/sysrouter.go @@ -13,6 +13,7 @@ import ( "go-admin/handler" "go-admin/middleware" jwt "go-admin/pkg/jwtauth" + "go-admin/pkg/ws" ) func InitSysRouter(r *gin.Engine, authMiddleware *jwt.GinJWTMiddleware) *gin.RouterGroup { @@ -33,7 +34,16 @@ func InitSysRouter(r *gin.Engine, authMiddleware *jwt.GinJWTMiddleware) *gin.Rou } func sysBaseRouter(r *gin.RouterGroup) { + + go ws.WebsocketManager.Start() + go ws.WebsocketManager.SendService() + go ws.WebsocketManager.SendAllService() + r.GET("/", system.HelloWorld) + + r.GET("/ws", ws.WebsocketManager.WsClient) + + r.GET("/info", handler.Ping) } diff --git a/tools/config/config.go b/tools/config/config.go index a1057eb..8abb23a 100644 --- a/tools/config/config.go +++ b/tools/config/config.go @@ -82,8 +82,3 @@ func Setup(path string) { GenConfig = InitGen(cfgGen) } -func SetConfig(configPath string, key string, value interface{}) { - viper.AddConfigPath(configPath) - viper.Set(key, value) - viper.WriteConfig() -} diff --git a/tools/config/logger.go b/tools/config/logger.go index 1889f33..0479d2a 100644 --- a/tools/config/logger.go +++ b/tools/config/logger.go @@ -3,22 +3,24 @@ package config import "github.com/spf13/viper" type Logger struct { - Path string - Level string - Stdout bool + Path string + Level string + Stdout bool EnabledBUS bool EnabledREQ bool - EnabledDB bool + EnabledDB bool + EnabledJOB bool `default:"false"` } func InitLog(cfg *viper.Viper) *Logger { return &Logger{ - Path: cfg.GetString("path"), - Level: cfg.GetString("level"), - Stdout: cfg.GetBool("stdout"), + Path: cfg.GetString("path"), + Level: cfg.GetString("level"), + Stdout: cfg.GetBool("stdout"), EnabledBUS: cfg.GetBool("enabledbus"), EnabledREQ: cfg.GetBool("enabledreq"), - EnabledDB: cfg.GetBool("enableddb"), + EnabledDB: cfg.GetBool("enableddb"), + EnabledJOB: cfg.GetBool("enabledjob"), } } diff --git a/tools/string.go b/tools/string.go index dd3c9e7..bb741bf 100644 --- a/tools/string.go +++ b/tools/string.go @@ -22,7 +22,7 @@ func StringToBool(e string) (bool, error) { } func GetCurrentTimeStr() string { - return time.Now().Format("2006-01-02 15:04:05.9999") + return time.Now().Format("2006-01-02 15:04:05") } func GetCurrentTime() time.Time {