i118

res/messages_en.json

@@ -415,7 +415,7 @@
 
     {
       "id": "start_server",
-      "translation": "Start ZTF HTTP service, press CTRL+C to exist.\nPlease access http://%s:%s/data for more information."
+      "translation": "Start HTTP service on http://%s:%s, press CTRL+C to exist.\nPlease access https://ztf.im/book/ztf/api for more information."
     },
     {
       "id": "start_server_fail",

res/messages_zh.json

@@ -422,7 +422,7 @@
 
     {
       "id": "start_server",
-      "translation": "正在启动ZTF HTTP服务，按CTRL+C键退出。请调用http://%s:%s/获取更多信息。"
+      "translation": "启动HTTP服务于http://%s:%s，按CTRL+C键退出。\n请访问https://ztf.im/book/ztf/api获取更多信息。"
     },
     {
       "id": "start_server_fail",

src/server/cron/cron.go

@@ -59,15 +59,15 @@ func (s *CronService) heartBeat() {
 		}
 
 		// has task to run，register busy, then run
-		build := s.taskService.Peek()
+		//build := s.taskService.Peek()
 		s.heartBeatService.HeartBeat(true)
 
 		// run
-		s.taskService.Start()
-
-		s.execService.Exec(build)
-
-		s.taskService.Remove()
-		s.taskService.End()
+		//s.taskService.Start()
+		//
+		//s.execService.Exec(build)
+		//
+		//s.taskService.Remove()
+		//s.taskService.End()
 	}
 }

src/server/domain/build.go

@@ -6,49 +6,49 @@ import (
 )
 
 type Build struct {
-	Debug     bool     `json:"debug"`
-	ProductId string   `json:"productId"`
-	SuiteId   string   `json:"suiteId"`
-	TaskId    string   `json:"taskId"`
-	Files     []string `json:"files"`
-
-	UnitTestType string `json:"unitTestType"`
-	UnitTestTool string `json:"unitTestTool"`
-	UnitTestCmd  string `json:"unitTestCmd"`
-
-	WorkDir    string `json:"workDir"`
-	ProjectDir string `json:"projectDir"`
-	AppPath    string `json:"appPath"`
-
-	ID           uint   `json:"id"`
-	QueueId      uint   `json:"queueId"`
-	Priority     int    `json:"priority"`
-	NodeIp       string `json:"priority"`
-	NodePort     int    `json:"nodePort"`
-	DeviceSerial string `json:"deviceSerial"`
-	DeviceIp     string `json:"deviceIp"`
-
-	BuildType             serverConst.BuildType   `json:"buildType"`
-	AppiumPort            int                     `json:"appiumPort"`
-	SeleniumDriverType    serverConst.BrowserType `json:"seleniumDriverType"`
-	SeleniumDriverVersion string                  `json:"seleniumDriverVersion"`
-	SeleniumDriverPath    string                  `json:"seleniumDriverPath"`
-
-	ScriptUrl   string `json:"scriptUrl"`
-	ScmAddress  string `json:"scmAddress"`
-	ScmAccount  string `json:"scmAccount"`
-	ScmPassword string `json:"scmPassword"`
-
-	AppUrl          string `json:"appUrl"`
-	BuildCommands   string `json:"buildCommands"`
-	ResultFiles     string `json:"resultFiles"`
-	KeepResultFiles MyBool `json:"keepResultFiles"`
-	ResultPath      string `json:"resultPath"`
-	ResultMsg       string `json:"resultMsg"`
-
-	StartTime time.Time `json:"startTime"`
-	EndTime   time.Time `json:"endTime"`
-
-	Progress serverConst.BuildProgress `json:"progress"`
-	Status   serverConst.BuildStatus   `json:"status"`
+	Debug     bool     `json:"debug,omitempty"`
+	ProductId string   `json:"productId,omitempty"`
+	SuiteId   string   `json:"suiteId,omitempty"`
+	TaskId    string   `json:"taskId,omitempty"`
+	Files     []string `json:"files,omitempty"`
+
+	UnitTestType string `json:"unitTestType,omitempty"`
+	UnitTestTool string `json:"unitTestTool,omitempty"`
+	UnitTestCmd  string `json:"unitTestCmd,omitempty"`
+
+	WorkDir    string `json:"workDir",omitempty`
+	ProjectDir string `json:"projectDir,omitempty"`
+	AppPath    string `json:"appPath,omitempty"`
+
+	ID           uint   `json:"id,omitempty"`
+	QueueId      uint   `json:"queueId,omitempty"`
+	Priority     int    `json:"priority,omitempty"`
+	NodeIp       string `json:"priority,omitempty"`
+	NodePort     int    `json:"nodePort,omitempty"`
+	DeviceSerial string `json:"deviceSerial,omitempty"`
+	DeviceIp     string `json:"deviceIp,omitempty"`
+
+	BuildType             serverConst.BuildType   `json:"buildType,omitempty"`
+	AppiumPort            int                     `json:"appiumPort,omitempty"`
+	SeleniumDriverType    serverConst.BrowserType `json:"seleniumDriverType,omitempty"`
+	SeleniumDriverVersion string                  `json:"seleniumDriverVersion,omitempty"`
+	SeleniumDriverPath    string                  `json:"seleniumDriverPath,omitempty"`
+
+	ScriptUrl   string `json:"scriptUrl,omitempty"`
+	ScmAddress  string `json:"scmAddress,omitempty"`
+	ScmAccount  string `json:"scmAccount,omitempty"`
+	ScmPassword string `json:"scmPassword,omitempty"`
+
+	AppUrl          string `json:"appUrl,omitempty"`
+	BuildCommands   string `json:"buildCommands,omitempty"`
+	ResultFiles     string `json:"resultFiles,omitempty"`
+	KeepResultFiles MyBool `json:"keepResultFiles,omitempty"`
+	ResultPath      string `json:"resultPath,omitempty"`
+	ResultMsg       string `json:"resultMsg,omitempty"`
+
+	StartTime time.Time `json:"startTime,omitempty"`
+	EndTime   time.Time `json:"endTime,omitempty"`
+
+	Progress serverConst.BuildProgress `json:"progress,omitempty"`
+	Status   serverConst.BuildStatus   `json:"status,omitempty"`
 }

src/server/domain/optResult.go

@@ -3,9 +3,9 @@ package domain
 import serverConst "github.com/easysoft/zentaoatf/src/server/utils/const"
 
 type OptResult struct {
-	Code    int         `json:"code"`
-	Msg     string      `json:"msg"`
-	Payload interface{} `json:"payload"`
+	Code    int         `json:"code,omitempty"`
+	Msg     string      `json:"msg,omitempty"`
+	Payload interface{} `json:"payload,omitempty"`
 }
 
 func (result *OptResult) Success(msg string) {

src/server/domain/request.go

 package domain
 
 type ReqData struct {
-	Action string      `json:"action"`
-	Id     int         `json:"id"`
-	Mode   string      `json:"mode"`
-	Data   interface{} `json:"data"`
+	Action string      `json:"action,omitempty"`
+	Id     int         `json:"id,omitempty"`
+	Mode   string      `json:"mode,omitempty"`
+	Data   interface{} `json:"data,omitempty"`
 }
 
 type RespData struct {
-	Code int         `json:"code"`
-	Msg  string      `json:"msg"`
-	Data interface{} `json:"data"`
+	Code int         `json:"code,omitempty"`
+	Msg  string      `json:"msg,omitempty"`
+	Data interface{} `json:"data,omitempty"`
 
-	WorkDir string `json:"workDir"`
+	WorkDir string `json:"workDir,omitempty"`
 }

src/server/domain/sysInfo.go

 package domain
 
 type SysInfo struct {
-	AgentDir string `json:"agentDir"`
+	AgentDir string `json:"agentDir,omitempty"`
 
-	SysArch  string `json:"sysArch"`
-	SysCores int    `json:"sysCores"`
+	SysArch  string `json:"sysArch,omitempty"`
+	SysCores int    `json:"sysCores,omitempty"`
 
-	OsType    string `json:"osType"`
-	OsName    string `json:"osName"`
-	OsVersion string `json:"osVersion"`
+	OsType    string `json:"osType,omitempty"`
+	OsName    string `json:"osName,omitempty"`
+	OsVersion string `json:"osVersion,omitempty"`
 
-	Local string `json:"local"`
-	Lang  string `json:"lang"`
+	Local string `json:"local,omitempty"`
+	Lang  string `json:"lang,omitempty"`
 
-	IP  string `json:"ip"`
-	MAC string `json:"mac"`
+	IP  string `json:"ip,omitempty"`
+	MAC string `json:"mac,omitempty"`
 }

src/server/server.go

@@ -107,7 +107,7 @@ func (s *Server) get(writer http.ResponseWriter, req *http.Request) (resp domain
 	case "listHistory":
 		resp.Data = s.taskService.ListHistory()
 
-	case "down":
+	case "download":
 		Download(writer, params["f"])
 
 	case "":

src/server/service/heartbeat.go

@@ -31,7 +31,7 @@ func (s *HeartBeatService) HeartBeat(isBusy bool) {
 	// send request
 	zentaoService.GetConfig(vari.Config.Url)
 
-	url := vari.Config.Url + zentaoUtils.GenApiUri("agent", "heartBeat", "")
+	url := vari.Config.Url + zentaoUtils.GenApiUri("agent", "heartbeat", "")
 	data := map[string]interface{}{"type": vari.Platform, "sys": sysInfo}
 
 	status := serverConst.VmActive

src/server/utils/common/sys.go

@@ -33,6 +33,9 @@ func GetSysInfo() (info serverModel.SysInfo) {
 	info.IP = vari.IP
 	info.MAC = vari.MAC
 
+	//jsonStr, _ := json.Marshal(info)
+	//logUtils.PrintTo(string(jsonStr))
+
 	return
 }