优化首页内容

agent/config/conf.ini

@@ -6,19 +6,18 @@ Version         = 1.0.0
 LogLevel        = ALL
 # 执行器配置
 # auto-自动起名，或者自己起名
-ServerName      = agent-10.32.40.165-1564
+ServerName      = agent-192.168.1.101-1564
 # 启动后回写
-ServerId        = 7
+ServerId        = 4
 # 端口，必须配置！！
 TcpPort         = 1564
 # auto-自动获取
-TcpIp           = 10.32.40.165
+TcpIp           = 192.168.1.101
 # Ip地址是外网还是内网，1-外网，0-内网，若填写TcpIp则本项配置无意义
 IpType          = 0
 # 添加的执行器属于分组Id，默认为1
 GroupId         = 1
-
 # 以下配置必填，地址格式：http://yourdomain/server/apisave
-RegisterUrl     = http://localhost:8081/server/apisave
-UpdateStatusUrl = http://localhost:8081/server/apistatus
+RegisterUrl     = http://localhost:8080/server/apisave
+UpdateStatusUrl = http://localhost:8080/server/apistatus
 

agent/server/job.go

@@ -80,8 +80,8 @@ func ResetCommandJob(id int, serverId int, name string, command string) *Job {
 		err, isTimeout := runCmdWithTimeout(cmd, timeout)
 
 		jobResult = new(JobResult)
-		jobResult.ErrMsg = libs.GbkAsUtf8(bufErr.String())
-		jobResult.OutMsg = libs.GbkAsUtf8(bufOut.String())
+		jobResult.ErrMsg = bufErr.String()
+		jobResult.OutMsg = bufOut.String()
 		jobResult.IsOk = true
 		if err != nil {
 			jobResult.IsOk = false

agent/test/sqls/ts.go

@@ -0,0 +1,15 @@
+/************************************************************
+** @Description: ts
+** @Author: george hao
+** @Date:   2019-07-04 17:23
+** @Last Modified by:  george hao
+** @Last Modified time: 2019-07-04 17:23
+*************************************************************/
+package main
+
+import "github.com/george518/PPGo_Job/models"
+
+func main() {
+
+	models.TaskTotalRunNum()
+}