Merge remote-tracking branch 'origin/master'

src/service/zentao/testResult.go

@@ -16,9 +16,13 @@ import (
 )
 
 func CommitTestResult(report model.TestReport, testTaskId int) {
-	//if len(report.FuncResult) > 0 && vari.ProductId == "" {
-	//	vari.ProductId = strconv.Itoa(report.FuncResult[0].ProductId)
-	//}
+	if vari.ProductId == "" {
+		if len(report.FuncResult) > 0 {
+			vari.ProductId = strconv.Itoa(report.FuncResult[0].ProductId)
+		} else if len(report.UnitResult) > 0 {
+			vari.ProductId = strconv.Itoa(report.ProductId)
+		}
+	}
 
 	if vari.ProductId == "" {
 		logUtils.Screen(color.CyanString(i118Utils.I118Prt.Sprintf("ignore_to_submit_result")))

xdoc/build.sh

-rm -rf ztf
-mkdir ztf
-mkdir ztf/log
-cp -r conf ztf/
-cp -r runtime ztf/
-cp -r demo ztf/
+rm -rf bin
+mkdir bin
+mkdir bin/log
+cp -r conf bin/
+cp -r runtime bin/
+cp -r demo bin/
 
 go-bindata -o=res/res.go -pkg=res res/ res/doc res/json res/template
 
-CGO_ENABLED=0 GOOS=windows GOARCH=386 go build -o ztf/ztf-x86.exe src/ztf.go
-CGO_ENABLED=0 GOOS=windows GOARCH=amd64 go build -o ztf/ztf-amd64.exe src/ztf.go
+CGO_ENABLED=0 GOOS=windows GOARCH=386 go build -o bin/ztf-x86.exe src/ztf.go
+CGO_ENABLED=0 GOOS=windows GOARCH=amd64 go build -o bin/ztf-amd64.exe src/ztf.go
 
-GO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o ztf/ztf-linux src/ztf.go
-CGO_ENABLED=0 GOOS=darwin GOARCH=amd64 go build -o ztf/ztf-mac src/ztf.go
+GO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o bin/ztf-linux src/ztf.go
+CGO_ENABLED=0 GOOS=darwin GOARCH=amd64 go build -o bin/ztf-mac src/ztf.go
 
-cd ztf
+cd bin
 
 cp ztf-x86.exe ztf.exe
 zip -r ztf-win-x86-2.2.zip ztf.exe conf demo runtime log -x runtime/selenium/chrome84

xdoc/setup.txt

@@ -7,4 +7,6 @@ Ruby:
 sudo apt-get install libgmp3-dev
 sudo gem install json
 
-runtime\php\php7\php.exe demo\selenium\chrome.php
\ No newline at end of file
+runtime\php\php7\php.exe demo\selenium\chrome.php
+
+scp aaron@172.16.13.1:/Users/aaron/rd/project/zentao/go/ztf/ztf/ztf-amd64.exe .
\ No newline at end of file