Merge branch 'main' into ztf-42_zhaoke

Makefile

@@ -140,21 +140,16 @@ package_gui_mac_client:
 
 # command line
 compile_command_win64:
-	@echo ${QINIU_DIR}
 	@echo 'start compile win64'
-	@cd ${COMMAND_MAIN_DIR} && \
-        CGO_ENABLED=1 CC=x86_64-w64-mingw32-gcc CXX=x86_64-w64-mingw32-g++ GOOS=windows GOARCH=amd64 \
+	@CGO_ENABLED=1 CC=x86_64-w64-mingw32-gcc CXX=x86_64-w64-mingw32-g++ GOOS=windows GOARCH=amd64 \
 		${BUILD_CMD} -x -v \
-		-o ../../${COMMAND_BIN_DIR}win64/${PROJECT}.exe && \
-		cd ..
+		-o ${COMMAND_BIN_DIR}win64/${PROJECT}.exe ${COMMAND_MAIN_FILE}
 
 compile_command_win32:
 	@echo 'start compile win32'
-	@cd ${COMMAND_MAIN_DIR} && \
-        CGO_ENABLED=1 CC=i686-w64-mingw32-gcc CXX=i686-w64-mingw32-g++ GOOS=windows GOARCH=386 \
+	@CGO_ENABLED=1 CC=i686-w64-mingw32-gcc CXX=i686-w64-mingw32-g++ GOOS=windows GOARCH=386 \
 		${BUILD_CMD} -x -v \
-		-o ../../${COMMAND_BIN_DIR}win32/${PROJECT}.exe && \
-        cd ..
+		-o ${COMMAND_BIN_DIR}win32/${PROJECT}.exe ${COMMAND_MAIN_FILE}
 
 compile_command_linux:
 	@echo 'start compile linux'

cmd/test/mq.go

@@ -2,7 +2,7 @@ package main
 
 import (
 	"fmt"
-	"github.com/easysoft/zentaoatf/internal/pkg/mq"
+	"github.com/easysoft/zentaoatf/pkg/core/mq"
 	"time"
 )
 

go.mod

@@ -52,8 +52,6 @@ require (
 	go.uber.org/multierr v1.7.0 // indirect
 	go.uber.org/zap v1.21.0 // indirect
 	golang.org/x/text v0.3.7
-	google.golang.org/grpc v1.41.0
-	google.golang.org/protobuf v1.27.1
 	gopkg.in/ini.v1 v1.63.0
 	gorm.io/driver/sqlite v1.2.6
 	gorm.io/gorm v1.22.3

pkg/lib/shell/shell.go

@@ -14,19 +14,6 @@ import (
 	"strings"
 )
 
-func ExecWinCmd(cmdStr string) (string, error) {
-	cmd := exec.Command("cmd", "/C", cmdStr)
-
-	var out bytes.Buffer
-	cmd.Stdout = &out
-
-	err := cmd.Run()
-
-	output := out.String()
-
-	return output, err
-}
-
 func ExeSysCmd(cmdStr string) (string, error) {
 	cmd := getCmd(cmdStr)
 

res/server/zh/messages.json

@@ -108,7 +108,7 @@
     },
     {
       "id": "task_id",
-      "translation": "测试单Id"
+      "translation": "测试任务Id"
     },
     {
       "id": "test_case",