Merge branch 'main' of https://github.com/easysoft/zentaoatf

Makefile

@@ -35,10 +35,10 @@ BUILD_CMD_WIN=go build -ldflags "-s -w -X 'main.AppVersion=${VERSION}' -X 'main.
 
 default: win64 win32 linux mac
 
-win64: prepare build_gui_win64 compile_launcher_win64 compile_command_win64 copy_files_win64 zip_win64
-win32: prepare build_gui_win32 compile_launcher_win32 compile_command_win32 copy_files_win32 zip_win32
-linux: prepare build_gui_linux                        compile_command_linux copy_files_linux zip_linux
-mac:   prepare build_gui_mac                          compile_command_mac   copy_files_mac   zip_mac
+win64: prepare compile_server_win64 package_gui_win64_client compile_launcher_win64 compile_command_win64 copy_files_win64 zip_server_win64 zip_client_win64
+win32: prepare compile_server_win64 package_gui_win32_client compile_launcher_win32 compile_command_win32 copy_files_win32 zip_server_win32 zip_client_win32
+linux: prepare compile_server_linux package_gui_linux_client                        compile_command_linux copy_files_linux zip_server_linux zip_client_linux
+mac:   prepare compile_server_mac   package_gui_mac_client                          compile_command_mac   copy_files_mac   zip_server_mac   zip_client_mac
 
 prepare: update_version prepare_res
 
@@ -81,74 +81,66 @@ compile_launcher_win32:
 		-o ../../${COMMAND_BIN_DIR}win32/${PROJECT}-gui.exe && \
         cd ..
 
-# gui
-build_gui_win64: compile_gui_win64 package_gui_win64_client
-compile_gui_win64:
-	@echo 'start compile win64'
-	@rm -rf ./${CLIENT_BIN_DIR}/*
+# server
+compile_server_win64:
+	@echo 'start compile server win64'
+	@rm -rf ${COMMAND_BIN_DIR}win64/${PROJECT}-server.exe
 	@CGO_ENABLED=1 CC=x86_64-w64-mingw32-gcc CXX=x86_64-w64-mingw32-g++ GOOS=windows GOARCH=amd64 \
 		${BUILD_CMD_WIN} -x -v \
-		-o ${CLIENT_BIN_DIR}win32/${PROJECT}.exe ${SERVER_MAIN_FILE}
-	@cd ${CLIENT_BIN_DIR}win32 && zip -ry ${QINIU_DIST_DIR}win64/${PROJECT}-server.zip ./${PROJECT}.exe && cd ../../..
-	@md5sum ${QINIU_DIST_DIR}win64/${PROJECT}-server.zip | awk '{print $$1}' | \
-			xargs echo > ${QINIU_DIST_DIR}win64/${PROJECT}-server.zip.md5
-
-package_gui_win64_client:
-	@cd client && npm run package-win64 && cd ..
-	@rm -rf ${CLIENT_OUT_DIR}win64 && mkdir ${CLIENT_OUT_DIR}win64 && \
-		mv ${CLIENT_OUT_DIR}${PROJECT}-win32-x64 ${CLIENT_OUT_DIR}win64/gui
+		-o ${COMMAND_BIN_DIR}win64/${PROJECT}-server.exe ${SERVER_MAIN_FILE}
 
-build_gui_win32: compile_gui_win32 package_gui_win32_client
-compile_gui_win32:
-	@echo 'start compile win32'
-	@rm -rf ./${CLIENT_BIN_DIR}/*
+compile_server_win32:
+	@echo 'start compile server win32'
+	@rm -rf ${COMMAND_BIN_DIR}win32/${PROJECT}-server.exe
 	@CGO_ENABLED=1 CC=i686-w64-mingw32-gcc CXX=i686-w64-mingw32-g++ GOOS=windows GOARCH=386 \
 		${BUILD_CMD_WIN} -x -v \
-		-o ${CLIENT_BIN_DIR}win32/${PROJECT}.exe ${SERVER_MAIN_FILE}
-	@cd ${CLIENT_BIN_DIR}win32 && zip -ry ${QINIU_DIST_DIR}win32/${PROJECT}-server.zip ./${PROJECT}.exe && cd ../../..
-	@md5sum ${QINIU_DIST_DIR}win32/${PROJECT}-server.zip | awk '{print $$1}' | \
-				xargs echo > ${QINIU_DIST_DIR}win32/${PROJECT}-server.zip.md5
-
-package_gui_win32_client:
-	@cd client && npm run package-win32 && cd ..
-	@rm -rf ${CLIENT_OUT_DIR}win32 && mkdir ${CLIENT_OUT_DIR}win32 && \
-		mv ${CLIENT_OUT_DIR}${PROJECT}-win32-ia32 ${CLIENT_OUT_DIR}win32/gui
+		-o ${COMMAND_BIN_DIR}win32/${PROJECT}-server.exe ${SERVER_MAIN_FILE}
 
-build_gui_linux: compile_gui_linux package_gui_linux_client
-compile_gui_linux:
-	@echo 'start compile linux'
-	@rm -rf ./${CLIENT_BIN_DIR}/*
+compile_server_linux:
+	@echo 'start compile server linux'
+	@rm -rf ${COMMAND_BIN_DIR}linux/${PROJECT}-server
 ifeq ($(PLATFORM),"Mac")
 	CGO_ENABLED=1 GOOS=linux GOARCH=amd64 CC=/usr/local/gcc-4.8.1-for-linux64/bin/x86_64-pc-linux-gcc CXX=/usr/local/gcc-4.8.1-for-linux64/bin/x86_64-pc-linux-g++ \
 		${BUILD_CMD} \
-		-o ${CLIENT_BIN_DIR}linux/${PROJECT} ${SERVER_MAIN_FILE}
+		-o ${COMMAND_BIN_DIR}linux/${PROJECT}-server ${SERVER_MAIN_FILE}
 else
 	CGO_ENABLED=1 GOOS=linux GOARCH=amd64 CC=gcc CXX=g++ \
 		${BUILD_CMD} \
-		-o ${CLIENT_BIN_DIR}linux/${PROJECT} ${SERVER_MAIN_FILE}
+		-o ${COMMAND_BIN_DIR}linux/${PROJECT}-server ${SERVER_MAIN_FILE}
 endif
-	@cd ${CLIENT_BIN_DIR}linux && zip -ry ${QINIU_DIST_DIR}linux/${PROJECT}-server.zip ./${PROJECT} && cd ../../..
-	@md5sum ${QINIU_DIST_DIR}linux/${PROJECT}-server.zip | awk '{print $$1}' | \
-				xargs echo > ${QINIU_DIST_DIR}linux/${PROJECT}-server.zip.md5
+
+compile_server_mac:
+	@echo 'start compile mac'
+	@rm -rf ${COMMAND_BIN_DIR}darwin/${PROJECT}-server
+	@CGO_ENABLED=1 GOOS=darwin GOARCH=amd64 \
+		${BUILD_CMD} \
+		-o ${COMMAND_BIN_DIR}darwin/${PROJECT}-server ${SERVER_MAIN_FILE}
+
+# gui
+package_gui_win64_client:
+	@echo 'start package gui win64'
+	@cp -rf ${COMMAND_BIN_DIR}win64/${PROJECT}-server.exe ${CLIENT_BIN_DIR}win32/${PROJECT}.exe
+	@cd client && npm run package-win64 && cd ..
+	@rm -rf ${CLIENT_OUT_DIR}win64 && mkdir ${CLIENT_OUT_DIR}win64 && \
+		mv ${CLIENT_OUT_DIR}${PROJECT}-win32-x64 ${CLIENT_OUT_DIR}win64/gui
+
+package_gui_win32_client:
+	@echo 'start package gui win32'
+	@cp -rf ${COMMAND_BIN_DIR}win32/${PROJECT}-server.exe ${CLIENT_BIN_DIR}win32/${PROJECT}.exe
+	@cd client && npm run package-win32 && cd ..
+	@rm -rf ${CLIENT_OUT_DIR}win32 && mkdir ${CLIENT_OUT_DIR}win32 && \
+		mv ${CLIENT_OUT_DIR}${PROJECT}-win32-ia32 ${CLIENT_OUT_DIR}win32/gui
 
 package_gui_linux_client:
+	@echo 'start package gui linux'
+	@cp -rf ${COMMAND_BIN_DIR}linux/${PROJECT}-server ${CLIENT_BIN_DIR}linux/${PROJECT}
 	@cd client && npm run package-linux && cd ..
 	@rm -rf ${CLIENT_OUT_DIR}linux && mkdir ${CLIENT_OUT_DIR}linux && \
 		mv ${CLIENT_OUT_DIR}${PROJECT}-linux-x64 ${CLIENT_OUT_DIR}linux/gui
 
-build_gui_mac: compile_gui_mac package_gui_mac_client
-compile_gui_mac:
-	@echo 'start compile mac'
-	@rm -rf ./${CLIENT_BIN_DIR}/*
-	@echo
-	@CGO_ENABLED=1 GOOS=darwin GOARCH=amd64 \
-		${BUILD_CMD} \
-		-o ${CLIENT_BIN_DIR}darwin/${PROJECT} ${SERVER_MAIN_FILE}
-	@cd ${CLIENT_BIN_DIR}darwin && zip -ry ${QINIU_DIST_DIR}darwin/${PROJECT}-server.zip ./${PROJECT} && cd ../../..
-	@md5sum ${QINIU_DIST_DIR}darwin/${PROJECT}-server.zip | awk '{print $$1}' | \
-				xargs echo > ${QINIU_DIST_DIR}darwin/${PROJECT}-server.zip.md5
-
 package_gui_mac_client:
+	@echo 'start package gui mac'
+	@cp -rf ${COMMAND_BIN_DIR}darwin/${PROJECT}-server ${CLIENT_BIN_DIR}darwin/${PROJECT}
 	@cd client && npm run package-mac && cd ..
 	@rm -rf ${CLIENT_OUT_DIR}darwin && mkdir ${CLIENT_OUT_DIR}darwin && \
 		mv ${CLIENT_OUT_DIR}${PROJECT}-darwin-x64 ${CLIENT_OUT_DIR}darwin/gui && \
@@ -188,25 +180,51 @@ compile_command_mac:
 
 copy_files_win64:
 	@echo 'start copy files win64'
-	cp -r demo "${CLIENT_OUT_DIR}win64"
-	cp ${COMMAND_BIN_DIR}win64/* "${CLIENT_OUT_DIR}win64"
+	@cp -r demo "${CLIENT_OUT_DIR}win64"
+	@cp -r demo "${COMMAND_BIN_DIR}win64"
+	@cp ${COMMAND_BIN_DIR}win64/{ztf.exe,ztf-gui.exe} "${CLIENT_OUT_DIR}win64"
 
 copy_files_win32:
 	@echo 'start copy files win32'
-	cp -r demo "${CLIENT_OUT_DIR}win32"
-	cp ${COMMAND_BIN_DIR}win32/* "${CLIENT_OUT_DIR}win32"
+	@cp -r demo "${CLIENT_OUT_DIR}win32"
+	@cp -r demo "${COMMAND_BIN_DIR}win32"
+	@cp ${COMMAND_BIN_DIR}win32/{ztf.exe,ztf-gui.exe} "${CLIENT_OUT_DIR}win32"
 
 copy_files_linux:
 	@echo 'start copy files linux'
-	cp -r demo "${CLIENT_OUT_DIR}linux"
-	cp ${COMMAND_BIN_DIR}linux/* "${CLIENT_OUT_DIR}linux"
+	@cp -r demo "${CLIENT_OUT_DIR}linux"
+	@cp -r demo "${COMMAND_BIN_DIR}linux"
+	@cp ${COMMAND_BIN_DIR}linux/ztf "${CLIENT_OUT_DIR}linux"
 
 copy_files_mac:
 	@echo 'start copy files darwin'
-	cp -r demo "${CLIENT_OUT_DIR}darwin"
-	cp ${COMMAND_BIN_DIR}darwin/* "${CLIENT_OUT_DIR}darwin"
+	@cp -r demo "${CLIENT_OUT_DIR}darwin"
+	@cp -r demo "${COMMAND_BIN_DIR}darwin"
+	@cp ${COMMAND_BIN_DIR}darwin/ztf "${CLIENT_OUT_DIR}darwin"
+
+# zip server
+zip_server_win64:
+	@cd ${COMMAND_BIN_DIR}win64 && zip -ry ${QINIU_DIST_DIR}win64/${PROJECT}-server.zip ./demo ./${PROJECT}-server.exe && cd ../..
+	@md5sum ${QINIU_DIST_DIR}win64/${PROJECT}-server.zip | awk '{print $$1}' | \
+			xargs echo > ${QINIU_DIST_DIR}win64/${PROJECT}-server.zip.md5
+
+zip_server_win32:
+	@cd ${COMMAND_BIN_DIR}win32 && zip -ry ${QINIU_DIST_DIR}win32/${PROJECT}-server.zip ./demo ./${PROJECT}-server.exe && cd ../..
+	@md5sum ${QINIU_DIST_DIR}win32/${PROJECT}-server.zip | awk '{print $$1}' | \
+			xargs echo > ${QINIU_DIST_DIR}win32/${PROJECT}-server.zip.md5
+
+zip_server_linux:
+	@cd ${COMMAND_BIN_DIR}linux && zip -ry ${QINIU_DIST_DIR}linux/${PROJECT}-server.zip ./demo ./${PROJECT}-server && cd ../..
+	@md5sum ${QINIU_DIST_DIR}linux/${PROJECT}-server.zip | awk '{print $$1}' | \
+			xargs echo > ${QINIU_DIST_DIR}linux/${PROJECT}-server.zip.md5
+
+zip_server_mac:
+	@cd ${COMMAND_BIN_DIR}darwin && zip -ry ${QINIU_DIST_DIR}darwin/${PROJECT}-server.zip ./demo ./${PROJECT}-server && cd ../..
+	@md5sum ${QINIU_DIST_DIR}darwin/${PROJECT}-server.zip | awk '{print $$1}' | \
+			xargs echo > ${QINIU_DIST_DIR}darwin/${PROJECT}-server.zip.md5
 
-zip_win64:
+# zip client
+zip_client_win64:
 	@echo 'start zip win64'
 	@find . -name .DS_Store -print0 | xargs -0 rm -f
 	@mkdir -p ${QINIU_DIST_DIR}win64 && rm -rf ${QINIU_DIST_DIR}win64/${PROJECT}.zip
@@ -216,7 +234,7 @@ zip_win64:
 			xargs echo > ${QINIU_DIST_DIR}win64/${PROJECT}.zip.md5 && \
         cd ../..; \
 
-zip_win32:
+zip_client_win32:
 	@echo 'start zip win32'
 	@find . -name .DS_Store -print0 | xargs -0 rm -f
 	@mkdir -p ${QINIU_DIST_DIR}win32 && rm -rf ${QINIU_DIST_DIR}win32/${PROJECT}.zip
@@ -226,7 +244,7 @@ zip_win32:
 			xargs echo > ${QINIU_DIST_DIR}win32/${PROJECT}.zip.md5 && \
         cd ../..; \
 
-zip_linux:
+zip_client_linux:
 	@echo 'start zip linux'
 	@find . -name .DS_Store -print0 | xargs -0 rm -f
 	@mkdir -p ${QINIU_DIST_DIR}linux && rm -rf ${QINIU_DIST_DIR}linux/${PROJECT}.zip
@@ -236,7 +254,7 @@ zip_linux:
 			xargs echo > ${QINIU_DIST_DIR}linux/${PROJECT}.zip.md5 && \
         cd ../..; \
 
-zip_mac:
+zip_client_mac:
 	@echo 'start zip darwin'
 	@find . -name .DS_Store -print0 | xargs -0 rm -f
 	@mkdir -p ${QINIU_DIST_DIR}darwin && rm -rf ${QINIU_DIST_DIR}darwin/${PROJECT}.zip

cmd/server/main.go

@@ -6,6 +6,7 @@ import (
 	websocketHelper "github.com/easysoft/zentaoatf/internal/pkg/helper/websocket"
 	serverConfig "github.com/easysoft/zentaoatf/internal/server/config"
 	"github.com/easysoft/zentaoatf/internal/server/core/web"
+	httpUtils "github.com/easysoft/zentaoatf/pkg/lib/http"
 	logUtils "github.com/easysoft/zentaoatf/pkg/lib/log"
 	"github.com/fatih/color"
 	"os"
@@ -41,7 +42,7 @@ func main() {
 
 	flagSet.StringVar(&uuid, "uuid", "", "区分服务进程的唯一ID")
 
-	flagSet.StringVar(&serverConfig.CONFIG.Server, "s", "http://pms.deeptest.loc", "")
+	flagSet.StringVar(&serverConfig.CONFIG.Server, "s", "", "")
 	flagSet.StringVar(&serverConfig.CONFIG.Ip, "i", commConsts.Ip, "服务机器IP")
 	flagSet.IntVar(&serverConfig.CONFIG.Port, "p", commConsts.Port, "服务端口")
 	flagSet.StringVar(&serverConfig.CONFIG.Secret, "secret", "", "禅道认证安全码")
@@ -58,6 +59,8 @@ func main() {
 	default:
 		commConsts.ExecFrom = commConsts.FromClient
 
+		serverConfig.CONFIG.Server = httpUtils.AddSepIfNeeded(serverConfig.CONFIG.Server)
+
 		webServer := web.Init(serverConfig.CONFIG.Port)
 		if webServer == nil {
 			return

internal/server/core/cron/cron.go

@@ -23,12 +23,14 @@ func (s *ServerCron) Init() {
 	cache.SyncMap.Store(cache.IsRunning, false)
 	cache.SyncMap.Store(cache.LastLoopEndTime, int64(0))
 
-	cronUtils.AddTask(
-		"heartbeat", fmt.Sprintf("@every %ds", serverConfig.HeartbeatInterval),
-		func() {
-			s.HeartbeatService.Heartbeat()
-		},
-	)
+	if serverConfig.CONFIG.Server != "" {
+		cronUtils.AddTask(
+			"heartbeat", fmt.Sprintf("@every %ds", serverConfig.HeartbeatInterval),
+			func() {
+				s.HeartbeatService.Heartbeat()
+			},
+		)
+	}
 
 	cronUtils.AddTask(
 		"checkJob", fmt.Sprintf("@every %ds", serverConfig.JobCheckInterval),

internal/server/modules/v1/service/heartbeat.go

@@ -29,7 +29,7 @@ func (s *HeartbeatService) Heartbeat() {
 		req.Secret = serverConfig.CONFIG.Secret
 	}
 
-	url := zentaoHelper.GenApiUrl("api.php/v1/ztf/heartbeat", nil, serverConfig.CONFIG.Server)
+	url := zentaoHelper.GenApiUrl("ztf/heartbeat", nil, serverConfig.CONFIG.Server)
 	respBytes, err := httpUtils.Post(url, req)
 	ok := err == nil
 
@@ -48,8 +48,8 @@ func (s *HeartbeatService) Heartbeat() {
 	}
 
 	if ok {
-		logUtils.Info(i118Utils.I118Prt.Sprintf("success_to_register", serverConfig.CONFIG.Server))
+		logUtils.Info(i118Utils.I118Prt.Sprintf("success_to_register", url))
 	} else {
-		logUtils.Info(i118Utils.I118Prt.Sprintf("fail_to_register", serverConfig.CONFIG.Server, respBytes))
+		logUtils.Info(i118Utils.I118Prt.Sprintf("fail_to_register", url, respBytes))
 	}
 }