Merge branch '3.0'

.gitignore

@@ -7,14 +7,14 @@
 /demo/out/
 /conf/
 /bin/
-/test/ztf/output/
-/test/ztf/.idea/
+/test/zd/output/
+/test/zd/.idea/
 /nohup.out
-/test/ztf/conf/
-/test/ztf/log/
+/test/zd/conf/
+/test/zd/log/
 /demo/out/
-/test/ztf/._config.yaml
-/test/ztf/._default.yaml
+/test/zd/._config.yaml
+/test/zd/._default.yaml
 /._config.yaml
 /._default.yaml
 /res/res.go

Makefile

@@ -79,7 +79,7 @@ compile_server_win64:
  		-o ${BIN_DIR}/win64/${PROJECT}-server.exe ${SERVER_MAIN_FILE}
 
 	@rm -rf "${CLIENT_OUT_DIR_UPGRADE}win64" && mkdir -p "${CLIENT_OUT_DIR_UPGRADE}win64" && \
-  		cp ${BIN_DIR}/win64/${PROJECT}-server.exe "${CLIENT_OUT_DIR_UPGRADE}win64/${PROJECT}.exe"
+  		cp ${BIN_DIR}/win64/${PROJECT}-server.exe "${CLIENT_OUT_DIR_UPGRADE}win64/server.exe"
 
 compile_server_win32:
 	@echo 'start compile server win32'
@@ -89,7 +89,7 @@ compile_server_win32:
 		-o ${BIN_DIR}/win32/${PROJECT}-server.exe ${SERVER_MAIN_FILE}
 
 	@rm -rf "${CLIENT_OUT_DIR_UPGRADE}win32" && mkdir -p "${CLIENT_OUT_DIR_UPGRADE}win32" && \
-  		cp ${BIN_DIR}/win32/${PROJECT}-server.exe "${CLIENT_OUT_DIR_UPGRADE}win32/${PROJECT}.exe"
+  		cp ${BIN_DIR}/win32/${PROJECT}-server.exe "${CLIENT_OUT_DIR_UPGRADE}win32/server.exe"
 
 compile_server_linux:
 	@echo 'start compile server linux'
@@ -105,7 +105,7 @@ else
 endif
 
 	@rm -rf "${CLIENT_OUT_DIR_UPGRADE}linux" && mkdir -p "${CLIENT_OUT_DIR_UPGRADE}linux" && \
-  		cp ${BIN_DIR}/linux/${PROJECT}-server "${CLIENT_OUT_DIR_UPGRADE}linux/${PROJECT}"
+  		cp ${BIN_DIR}/linux/${PROJECT}-server "${CLIENT_OUT_DIR_UPGRADE}linux/server"
 
 compile_server_mac:
 	@echo 'start compile server mac'
@@ -119,7 +119,7 @@ compile_server_mac:
 # gui
 package_gui_win64_client:
 	@echo 'start package gui win64'
-	@rm -rf ${CLIENT_BIN_DIR}/* && mkdir ${CLIENT_BIN_DIR}win32
+	@rm -rf ${CLIENT_BIN_DIR}/* && mkdir -p ${CLIENT_BIN_DIR}win32
 	@cp -rf ${BIN_DIR}/win64/${PROJECT}-server.exe ${CLIENT_BIN_DIR}win32/${PROJECT}.exe
 
 	@cd client  && npm run package-win64 && cd ..
@@ -222,6 +222,7 @@ copy_files:
 		cp -r .zd.conf "${CLIENT_OUT_DIR_EXECUTABLE}$${platform}"; \
 		cp -r bin/data "${CLIENT_OUT_DIR_EXECUTABLE}$${platform}"; \
 		cp -r bin/runtime "${CLIENT_OUT_DIR_EXECUTABLE}$${platform}"; \
+		cp -r bin/yaml "${CLIENT_OUT_DIR_EXECUTABLE}$${platform}"; \
 		cp -r bin/users "${CLIENT_OUT_DIR_EXECUTABLE}$${platform}"; \
 		cp -r bin/demo "${CLIENT_OUT_DIR_EXECUTABLE}$${platform}"; \
 		cp -r bin/tmp "${CLIENT_OUT_DIR_EXECUTABLE}$${platform}"; \

client/src/app/package.json

@@ -7,7 +7,7 @@
         "name": "青岛易企天创管理咨询有限公司",
         "email": "chenqi@cnezsoft.com"
     },
-    "homepage": "https://ztf.im",
+    "homepage": "https://www.zendata.cn",
     "company": "青岛易企天创管理咨询有限公司",
     "license": "GPL 3.0",
     "copyright": "Copyright (C) 2019-2022",

pkg/utils/file/file.go

@@ -3,6 +3,14 @@ package fileUtils
 import (
 	"errors"
 	"fmt"
+	"io/ioutil"
+	"math/rand"
+	"os"
+	"os/exec"
+	"path/filepath"
+	"strings"
+	"time"
+
 	constant "github.com/easysoft/zendata/internal/pkg/const"
 	commonUtils "github.com/easysoft/zendata/pkg/utils/common"
 	i118Utils "github.com/easysoft/zendata/pkg/utils/i118"
@@ -11,13 +19,6 @@ import (
 	"github.com/fatih/color"
 	"github.com/oklog/ulid/v2"
 	"github.com/snowlyg/helper/str"
-	"io/ioutil"
-	"math/rand"
-	"os"
-	"os/exec"
-	"path/filepath"
-	"strings"
-	"time"
 )
 
 func ReadFile(filePath string) string {

pkg/utils/i118/i118.go

@@ -2,14 +2,15 @@ package i118Utils
 
 import (
 	"encoding/json"
-	"github.com/easysoft/zendata"
+	"os"
+	"path/filepath"
+
+	zd "github.com/easysoft/zendata"
 	constant "github.com/easysoft/zendata/internal/pkg/const"
-	"github.com/easysoft/zendata/pkg/utils/common"
+	commonUtils "github.com/easysoft/zendata/pkg/utils/common"
 	"github.com/easysoft/zendata/pkg/utils/vari"
 	"golang.org/x/text/language"
 	"golang.org/x/text/message"
-	"os"
-	"path/filepath"
 )
 
 var I118Prt *message.Printer

ui/src/layout/Header.vue

@@ -179,6 +179,7 @@ export default {
 
     .window-btn {
       margin-left: 8px;
+      cursor: pointer;
     }
   }
 

ui/src/layout/Update.vue

@@ -44,10 +44,7 @@ export default {
     let isElectron = false
     let ipcRenderer = undefined
     let version = null
-
     return {
-      isVisible,
-      currVersion,
       newVersion,
       forceUpdate,
       downloadingPercent,
@@ -57,9 +54,6 @@ export default {
     }
   },
 
-  created() {
-    console.log('created')
-    this.isElectron = !!window.require
 
     if (this.isElectron) {
       const remote = window.require('@electron/remote')
@@ -114,11 +108,7 @@ export default {
 
     onCancel() {
       console.log('onCancel')
-      this.isVisible = false
     },
-  }
-}
-
 
 </script>
 
@@ -134,4 +124,3 @@ export default {
   }
 }
 
-</style>
\ No newline at end of file