提交 835baf90 编写于 作者: 雨爱无痕

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

...@@ -119,6 +119,7 @@ compile_server_mac: ...@@ -119,6 +119,7 @@ compile_server_mac:
# gui # gui
package_gui_win64_client: package_gui_win64_client:
@echo 'start package gui win64' @echo 'start package gui win64'
@rm -rf ${CLIENT_BIN_DIR}win32 && mkdir ${CLIENT_BIN_DIR}win32
@cp -rf ${COMMAND_BIN_DIR}win64/${PROJECT}-server.exe ${CLIENT_BIN_DIR}win32/${PROJECT}.exe @cp -rf ${COMMAND_BIN_DIR}win64/${PROJECT}-server.exe ${CLIENT_BIN_DIR}win32/${PROJECT}.exe
@cd client && npm run package-win64 && cd .. @cd client && npm run package-win64 && cd ..
@rm -rf ${CLIENT_OUT_DIR}win64 && mkdir ${CLIENT_OUT_DIR}win64 && \ @rm -rf ${CLIENT_OUT_DIR}win64 && mkdir ${CLIENT_OUT_DIR}win64 && \
...@@ -126,13 +127,15 @@ package_gui_win64_client: ...@@ -126,13 +127,15 @@ package_gui_win64_client:
package_gui_win32_client: package_gui_win32_client:
@echo 'start package gui win32' @echo 'start package gui win32'
@cp -rf ${COMMAND_BIN_DIR}win32/${PROJECT}-server.exe ${CLIENT_BIN_DIR}win32/${PROJECT}.exe @rm -rf ${CLIENT_BIN_DIR}win32 && mkdir ${CLIENT_BIN_DIR}win32
@cp -rf ${COMMAND_BIN_DIR}win64/${PROJECT}-server.exe ${CLIENT_BIN_DIR}win32/${PROJECT}.exe
@cd client && npm run package-win32 && cd .. @cd client && npm run package-win32 && cd ..
@rm -rf ${CLIENT_OUT_DIR}win32 && mkdir ${CLIENT_OUT_DIR}win32 && \ @rm -rf ${CLIENT_OUT_DIR}win32 && mkdir ${CLIENT_OUT_DIR}win32 && \
mv ${CLIENT_OUT_DIR}${PROJECT}-win32-ia32 ${CLIENT_OUT_DIR}win32/gui mv ${CLIENT_OUT_DIR}${PROJECT}-win32-ia32 ${CLIENT_OUT_DIR}win32/gui
package_gui_linux_client: package_gui_linux_client:
@echo 'start package gui linux' @echo 'start package gui linux'
@rm -rf ${CLIENT_BIN_DIR}linux && mkdir ${CLIENT_BIN_DIR}linux
@cp -rf ${COMMAND_BIN_DIR}linux/${PROJECT}-server ${CLIENT_BIN_DIR}linux/${PROJECT} @cp -rf ${COMMAND_BIN_DIR}linux/${PROJECT}-server ${CLIENT_BIN_DIR}linux/${PROJECT}
@cd client && npm run package-linux && cd .. @cd client && npm run package-linux && cd ..
@rm -rf ${CLIENT_OUT_DIR}linux && mkdir ${CLIENT_OUT_DIR}linux && \ @rm -rf ${CLIENT_OUT_DIR}linux && mkdir ${CLIENT_OUT_DIR}linux && \
...@@ -140,6 +143,7 @@ package_gui_linux_client: ...@@ -140,6 +143,7 @@ package_gui_linux_client:
package_gui_mac_client: package_gui_mac_client:
@echo 'start package gui mac' @echo 'start package gui mac'
@rm -rf ${CLIENT_BIN_DIR}darwin && mkdir ${CLIENT_BIN_DIR}darwin
@cp -rf ${COMMAND_BIN_DIR}darwin/${PROJECT}-server ${CLIENT_BIN_DIR}darwin/${PROJECT} @cp -rf ${COMMAND_BIN_DIR}darwin/${PROJECT}-server ${CLIENT_BIN_DIR}darwin/${PROJECT}
@cd client && npm run package-mac && cd .. @cd client && npm run package-mac && cd ..
@rm -rf ${CLIENT_OUT_DIR}darwin && mkdir ${CLIENT_OUT_DIR}darwin && \ @rm -rf ${CLIENT_OUT_DIR}darwin && mkdir ${CLIENT_OUT_DIR}darwin && \
......
...@@ -2,7 +2,6 @@ package index ...@@ -2,7 +2,6 @@ package index
import ( import (
"github.com/easysoft/zentaoatf/internal/server/core/module" "github.com/easysoft/zentaoatf/internal/server/core/module"
"github.com/easysoft/zentaoatf/internal/server/middleware"
"github.com/kataras/iris/v12" "github.com/kataras/iris/v12"
) )
...@@ -16,8 +15,6 @@ func NewHeartBeatModule() *HeartBeatModule { ...@@ -16,8 +15,6 @@ func NewHeartBeatModule() *HeartBeatModule {
// Party 执行 // Party 执行
func (m *HeartBeatModule) Party() module.WebModule { func (m *HeartBeatModule) Party() module.WebModule {
handler := func(index iris.Party) { handler := func(index iris.Party) {
index.Use(middleware.InitCheck())
index.Get("/", func(ctx iris.Context) { index.Get("/", func(ctx iris.Context) {
ctx.JSON(iris.Map{"code": 0, "msg": "ok"}) ctx.JSON(iris.Map{"code": 0, "msg": "ok"})
}) })
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册