red-future/ppgo_job
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

V2.7 增加agent执行器

Browse Source
This commit is contained in:
georgehao
2019-07-03 22:31:27 +08:00
parent c3a89e9243
commit 37fb659c4e
48 changed files with 2832 additions and 513 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
controllers/common.go
View File

@@ -9,7 +9,6 @@ package controllers
import (
"github.com/astaxie/beego"
"github.com/axgle/mahonia"
"github.com/george518/PPGo_Job/libs"
"github.com/george518/PPGo_Job/models"
"strconv"
@@ -100,7 +99,10 @@ func (self *BaseController) Auth() {
self.actionName != "loginin" &&
self.actionName != "apistart" &&
self.actionName != "apitask" &&
self.actionName != "apipause") {
self.actionName != "apipause" &&
self.actionName != "apisave" &&
self.actionName != "apistatus" &&
self.actionName != "apiget") {
self.redirect(beego.URLFor("LoginController.Login"))
}
}
@@ -336,7 +338,7 @@ type serverList struct {
func serverLists(authStr string, adminId int) (sls []serverList) {
serverGroup := serverGroupLists(authStr, adminId)
Filters := make([]interface{}, 0)
Filters = append(Filters, "status", 0)
Filters = append(Filters, "status__in", []int{0, 1})
Result, _ := models.TaskServerGetList(1, 1000, Filters...)
for k, v := range serverGroup {
@@ -354,16 +356,3 @@ func serverLists(authStr string, adminId int) (sls []serverList) {
}
return sls
}
func gbkAsUtf8(str string) string {
srcDecoder := mahonia.NewDecoder("gbk")
desDecoder := mahonia.NewDecoder("utf-8")
resStr := srcDecoder.ConvertString(str)
_, resBytes, _ := desDecoder.Translate([]byte(resStr), true)
return string(resBytes)
}
//任务识别码
func jobKey(taskId, serverId int) int {
return taskId*10000 + serverId
}