Merge pull request #59 from easysoft/sam/fix-for-unauthorized

Fix bug#64461

Author: wanshancd

VERSION

@@ -1 +1 @@
-3.4
+3.4bug64461

client/package.json

@@ -1,7 +1,7 @@
 {
   "name": "ztf",
   "productName": "ztf",
-  "version": "3.4",
+  "version": "3.4bug64461",
   "description": "ztf",
   "main": ".webpack/main",
   "scripts": {

client/src/app/package.json

@@ -1,7 +1,7 @@
 {
   "name": "ztf",
   "displayName": "ZTF",
-  "version": "3.4",
+  "version": "3.4bug64461",
   "main": "./main.js",
   "author": {
     "name": "青岛易企天创管理咨询有限公司",
@@ -12,4 +12,4 @@
   "license": "GPL 3.0",
   "copyright": "Copyright (C) 2019-2022",
   "buildTime": "2022/04/18 09:01::01"
-}
+}

cmd/test/helper/http/http.go

@@ -32,6 +32,7 @@ func GetCheckForward(url, token string) (ret []byte, isForward bool, err error)
 
 	if !strings.Contains(url, "/tokens") {
 		req.Header.Add(commConsts.Token, token)
+		req.Header.Add(commConsts.Cookie, "zentaosid="+commConsts.SessionId)
 	}
 
 	resp, err := client.Do(req)
@@ -104,6 +105,7 @@ func PostOrPut(url, token string, method string, data interface{}) (ret []byte,
 
 	if !strings.Contains(url, "/tokens") {
 		req.Header.Add(commConsts.Token, token)
+		req.Header.Add(commConsts.Cookie, "zentaosid="+commConsts.SessionId)
 	}
 
 	//req.Header.Set("Content-Type", "application/json")

internal/pkg/consts/var.go

@@ -38,6 +38,7 @@ var (
 
 	ZenTaoVersion string
 	Token         = "Token"
+	Cookie        = "Cookie"
 	SessionVar    = "zentaosid"
 	SessionId     string
 	RequestFix    string

internal/pkg/helper/script/generator.go

@@ -125,12 +125,14 @@ func generateTestStepAndScript(testSteps []commDomain.ZtfStep, steps *[]string,
 
 	// convert steps to nested
 	for index := 0; index < len(testSteps); index++ {
+		fmt.Printf("index=%d\n", index)
 		ts := testSteps[index]
+		fmt.Printf("ts=%v\n", ts)
 		item := commDomain.ZtfStep{Desc: ts.Desc, Expect: ts.Expect, Children: make([]commDomain.ZtfStep, 0)}
 
 		if ts.Type == "group" {
 			nestedSteps = append(nestedSteps, item)
-		} else if ts.Type == "item" {
+		} else if ts.Type == "item" && len(nestedSteps) > 0 {
 			nestedSteps[len(nestedSteps)-1].Children = append(nestedSteps[len(nestedSteps)-1].Children, item)
 		} else if ts.Type == "step" {
 			nestedSteps = append(nestedSteps, item)

pkg/lib/common/utils.go

@@ -129,6 +129,12 @@ func IgnoreCodeFile(path string) bool {
 }
 
 func AddSlashForUrl(url string) string {
+	// 确保URL包含协议前缀
+	if !strings.HasPrefix(url, "http://") && !strings.HasPrefix(url, "https://") {
+		url = "http://" + url
+	}
+
+	// 确保URL以斜杠结尾
 	if strings.LastIndex(url, "/") < len(url)-1 {
 		url += "/"
 	}

pkg/lib/http/http.go

@@ -36,6 +36,7 @@ func GetCheckForward(url string) (ret []byte, isForward bool, err error) {
 	} else {
 		if !strings.Contains(url, "/tokens") {
 			req.Header.Add(commConsts.Token, commConsts.SessionId)
+			req.Header.Add(commConsts.Cookie, "zentaosid="+commConsts.SessionId)
 		}
 	}
 
@@ -112,6 +113,7 @@ func PostOrPut(url string, method string, data interface{}) (ret []byte, err err
 	} else {
 		if !strings.Contains(url, "/tokens") {
 			req.Header.Add(commConsts.Token, commConsts.SessionId)
+			req.Header.Add(commConsts.Cookie, "zentaosid="+commConsts.SessionId)
 		}
 	}