From dd22ac91219ffd3a2a56712c1523ddc3029e2cf3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9B=A8=E7=88=B1=E6=97=A0=E7=97=95?=
 <yuaiwuhen@hotmail.com>
Date: Wed, 19 Oct 2022 14:46:19 +0800
Subject: [PATCH] Fix issue

---
 internal/server/modules/v1/service/site.go | 10 ++++++++--
 test/helper/ztf/ztf.go                     |  3 ++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/internal/server/modules/v1/service/site.go b/internal/server/modules/v1/service/site.go
index 612d72cb..23f7aead 100644
--- a/internal/server/modules/v1/service/site.go
+++ b/internal/server/modules/v1/service/site.go
@@ -2,6 +2,8 @@ package service
 
 import (
 	"errors"
+	"strings"
+
 	configHelper "github.com/easysoft/zentaoatf/internal/pkg/helper/config"
 	zentaoHelper "github.com/easysoft/zentaoatf/internal/pkg/helper/zentao"
 	serverDomain "github.com/easysoft/zentaoatf/internal/server/modules/v1/domain"
@@ -9,7 +11,6 @@ import (
 	"github.com/easysoft/zentaoatf/internal/server/modules/v1/repo"
 	"github.com/easysoft/zentaoatf/pkg/domain"
 	fileUtils "github.com/easysoft/zentaoatf/pkg/lib/file"
-	"strings"
 )
 
 type SiteService struct {
@@ -54,7 +55,12 @@ func (s *SiteService) Create(site model.Site) (id uint, isDuplicate bool, err er
 	config := configHelper.LoadBySite(site)
 	err = zentaoHelper.Login(config)
 	if err != nil {
-		return
+		config.Url += "zentao/"
+		site.Url += "zentao/"
+		err = zentaoHelper.Login(config)
+		if err != nil {
+			return
+		}
 	}
 
 	id, isDuplicate, err = s.SiteRepo.Create(&site)
diff --git a/test/helper/ztf/ztf.go b/test/helper/ztf/ztf.go
index 0296b98c..494c5b6d 100644
--- a/test/helper/ztf/ztf.go
+++ b/test/helper/ztf/ztf.go
@@ -155,7 +155,8 @@ func DeleteWorkspace(webpage plwHelper.Webpage, workspaceName string) {
 		return
 	}
 	locator.Hover()
-	webpage.Click(`[title="删除"]`)
+	locator = locator.Locator(`[title="删除"]`)
+	locator.Click()
 	webpage.Click(".modal-action>>span:has-text(\"确定\")")
 	webpage.WaitForTimeout(1000)
 }
-- 
GitLab