diff --git a/build_release.sh b/build_release.sh
index d18d378c..5e25ae16 100755
--- a/build_release.sh
+++ b/build_release.sh
@@ -26,11 +26,14 @@ function echo_yellow() {
function buildWeb() {
cd ${web_folder}
+ copy2Server=$1
+
echo_yellow "-------------------打包前端开始-------------------"
yarn run build
- echo_green '将打包后的静态文件拷贝至server/static'
- rm -rf ${server_folder}/static
- mkdir -p ${server_folder}/static && cp -r ${web_folder}/dist/* ${server_folder}/static
+ if [ "${copy2Server}" == "1" ] ; then
+ echo_green '将打包后的静态文件拷贝至server/static'
+ rm -rf ${server_folder}/static && mkdir -p ${server_folder}/static && cp -r ${web_folder}/dist/* ${server_folder}/static
+ fi
echo_yellow ">>>>>>>>>>>>>>>>>>>打包前端结束<<<<<<<<<<<<<<<<<<<<\n"
}
@@ -46,7 +49,13 @@ function build() {
cd ${server_folder}
echo_green "打包构建可执行文件..."
- CGO_ENABLE=0 GOOS=${os} GOARCH=${arch} go build -o ${exec_file_name} main.go
+
+ execFileName=${exec_file_name}
+ # 如果是windows系统,可执行文件需要添加.exe结尾
+ if [ "${os}" == "windows" ];then
+ execFileName="${execFileName}.exe"
+ fi
+ CGO_ENABLE=0 GOOS=${os} GOARCH=${arch} go build -o ${execFileName} main.go
if [ -d ${toFolder} ] ; then
echo_green "目标文件夹已存在,清空文件夹"
@@ -56,7 +65,7 @@ function build() {
mkdir ${toFolder}
echo_green "移动二进制文件至'${toFolder}'"
- mv ${server_folder}/${exec_file_name} ${toFolder}
+ mv ${server_folder}/${execFileName} ${toFolder}
echo_green "拷贝前端静态页面至'${toFolder}/static'"
mkdir -p ${toFolder}/static && cp -r ${web_folder}/dist/* ${toFolder}/static
@@ -94,12 +103,15 @@ function runBuild() {
cd ${toPath}
toPath=`pwd`
- read -p "是否构建前端[0|其他->否 1->是]: " runBuildWeb
+ read -p "是否构建前端[0|其他->否 1->是 2->构建并拷贝至server/static]: " runBuildWeb
read -p "请选择构建版本[0|其他->全部 1->linux-amd64 2->linux-arm64 3->windows]: " buildType
if [ "${runBuildWeb}" == "1" ];then
buildWeb
fi
+ if [ "${runBuildWeb}" == "2" ];then
+ buildWeb 1
+ fi
if [ "${buildType}" == "1" ];then
buildLinuxAmd64 ${toPath}
diff --git a/mayfly_go_web/package.json b/mayfly_go_web/package.json
index e27fe00a..29a7c057 100644
--- a/mayfly_go_web/package.json
+++ b/mayfly_go_web/package.json
@@ -7,23 +7,23 @@
"lint-fix": "eslint --fix --ext .js --ext .jsx --ext .vue src/"
},
"dependencies": {
- "axios": "^0.26.1",
- "codemirror": "^5.65.2",
+ "@element-plus/icons-vue": "^2.0.4",
+ "axios": "^0.27.2",
+ "codemirror": "^5.65.5",
"countup.js": "^2.0.7",
"cropperjs": "^1.5.11",
"echarts": "^5.3.2",
- "element-plus": "^2.2.2",
- "@element-plus/icons-vue": "^1.1.3",
- "jsonlint": "^1.6.3",
+ "element-plus": "^2.2.4",
+ "jsoneditor": "^9.8.0",
"lodash": "^4.17.21",
"mitt": "^3.0.0",
"nprogress": "^0.2.0",
"screenfull": "^5.1.0",
"sortablejs": "^1.13.0",
+ "sql-formatter": "^6.1.2",
+ "vue": "^3.2.37",
"vue-clipboard3": "^1.0.1",
- "sql-formatter": "^4.0.2",
- "vue": "^3.2.30",
- "vue-router": "^4.0.12",
+ "vue-router": "^4.0.15",
"vuex": "^4.0.2",
"xterm": "^4.18.0",
"xterm-addon-fit": "^0.5.0"
@@ -35,7 +35,7 @@
"@types/sortablejs": "^1.10.6",
"@typescript-eslint/eslint-plugin": "^4.23.0",
"@typescript-eslint/parser": "^4.23.0",
- "@vitejs/plugin-vue": "^1.2.2",
+ "@vitejs/plugin-vue": "^2.3.3",
"@vue/compiler-sfc": "^3.0.11",
"dotenv": "^10.0.0",
"eslint": "^8.5.0",
@@ -44,7 +44,7 @@
"sass": "^1.45.1",
"sass-loader": "^12.4.0",
"typescript": "^4.2.4",
- "vite": "^2.8.6",
+ "vite": "^2.9.10",
"vue-eslint-parser": "^8.0.1"
},
"browserslist": [
diff --git a/mayfly_go_web/shim.d.ts b/mayfly_go_web/shim.d.ts
index bf74c387..ca183fa5 100644
--- a/mayfly_go_web/shim.d.ts
+++ b/mayfly_go_web/shim.d.ts
@@ -5,4 +5,5 @@ declare module '*.vue' {
export default component;
}
declare module 'codemirror';
-declare module 'sql-formatter';
\ No newline at end of file
+declare module 'sql-formatter';
+declare module 'jsoneditor';
\ No newline at end of file
diff --git a/mayfly_go_web/src/components/jsonedit/index.vue b/mayfly_go_web/src/components/jsonedit/index.vue
new file mode 100644
index 00000000..e48f2d89
--- /dev/null
+++ b/mayfly_go_web/src/components/jsonedit/index.vue
@@ -0,0 +1,133 @@
+
+