From f58331c1c144d7cc0a36327ef356a899127b20bc Mon Sep 17 00:00:00 2001
From: "meilin.huang" <954537473@qq.com>
Date: Wed, 8 Jun 2022 10:21:02 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20mongo=E6=96=B0=E5=A2=9Ejson=E7=BC=96?=
=?UTF-8?q?=E8=BE=91=E5=99=A8=E3=80=81=E5=85=B6=E4=BB=96=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
build_release.sh | 24 +-
mayfly_go_web/package.json | 20 +-
mayfly_go_web/shim.d.ts | 3 +-
.../src/components/jsonedit/index.vue | 133 ++++
.../src/views/ops/mongo/MongoDataOp.vue | 53 +-
mayfly_go_web/yarn.lock | 473 ++++++-----
server/internal/devops/api/machine.go | 4 +-
server/internal/devops/api/mongo.go | 11 +
...654152713563.css => 401.1654651563679.css} | 0
....1654152713563.js => 401.1654651563679.js} | 2 +-
...654152713563.png => 401.1654651563679.png} | Bin
...654152713563.css => 404.1654651563679.css} | 0
....1654152713563.js => 404.1654651563679.js} | 2 +-
...654152713563.png => 404.1654651563679.png} | Bin
....1654152713563.js => Api.1654651563679.js} | 2 +-
...63.css => DataOperation.1654651563679.css} | 0
...3563.js => DataOperation.1654651563679.js} | 2 +-
...54152713563.js => DbList.1654651563679.js} | 2 +-
...1654152713563.js => Enum.1654651563679.js} | 0
... JetBrainsMono-Regular.1654651563679.woff} | Bin
.../assets/MongoDataOp.1654152713563.css | 1 -
.../assets/MongoDataOp.1654152713563.js | 1 -
.../assets/MongoDataOp.1654651563679.css | 6 +
.../assets/MongoDataOp.1654651563679.js | 235 ++++++
...52713563.js => MongoList.1654651563679.js} | 2 +-
...3.js => ProjectEnvSelect.1654651563679.js} | 2 +-
...713563.js => ProjectList.1654651563679.js} | 2 +-
.../static/assets/SqlExecBox.1654152713563.js | 8 -
...13563.css => SqlExecBox.1654651563679.css} | 0
.../static/assets/SqlExecBox.1654651563679.js | 24 +
...3563.css => SshTerminal.1654651563679.css} | 0
...713563.js => SshTerminal.1654651563679.js} | 2 +-
...63.js => SshTerminalPage.1654651563679.js} | 2 +-
...6541527135632.js => api.16546515636792.js} | 2 +-
...6541527135633.js => api.16546515636793.js} | 2 +-
...6541527135634.js => api.16546515636794.js} | 2 +-
...6541527135635.js => api.16546515636795.js} | 2 +-
...54152713563.js => assert.1654651563679.js} | 0
...2713563.png => bg-login.1654651563679.png} | Bin
.../static/assets/codemirror.1654152713563.js | 27 -
...13563.css => codemirror.1654651563679.css} | 0
.../static/assets/codemirror.1654651563679.js | 27 +
...654152713563.js => enums.1654651563679.js} | 2 +-
...54152713563.js => format.1654651563679.js} | 0
server/static/assets/index.1654152713563.js | 137 ----
server/static/assets/index.16541527135639.js | 3 -
...1527135635.css => index.1654651563679.css} | 0
server/static/assets/index.1654651563679.js | 137 ++++
...5271356310.js => index.165465156367910.js} | 2 +-
...152713563.css => index.16546515636792.css} | 0
...41527135632.js => index.16546515636792.js} | 2 +-
...527135636.css => index.16546515636793.css} | 0
...41527135633.js => index.16546515636793.js} | 2 +-
...527135637.css => index.16546515636794.css} | 0
...41527135634.js => index.16546515636794.js} | 2 +-
...527135633.css => index.16546515636795.css} | 2 +-
...41527135635.js => index.16546515636795.js} | 2 +-
...527135632.css => index.16546515636796.css} | 0
...41527135636.js => index.16546515636796.js} | 2 +-
...527135634.css => index.16546515636797.css} | 0
...41527135637.js => index.16546515636797.js} | 2 +-
...527135638.css => index.16546515636798.css} | 2 +-
...41527135638.js => index.16546515636798.js} | 2 +-
server/static/assets/index.16546515636799.js | 3 +
.../assets/jsoneditor-icons.1654651563679.svg | 749 ++++++++++++++++++
...54152713563.svg => logo.1654651563679.svg} | 0
server/static/index.html | 4 +-
67 files changed, 1695 insertions(+), 438 deletions(-)
create mode 100644 mayfly_go_web/src/components/jsonedit/index.vue
rename server/static/assets/{401.1654152713563.css => 401.1654651563679.css} (100%)
rename server/static/assets/{401.1654152713563.js => 401.1654651563679.js} (88%)
rename server/static/assets/{401.1654152713563.png => 401.1654651563679.png} (100%)
rename server/static/assets/{404.1654152713563.css => 404.1654651563679.css} (100%)
rename server/static/assets/{404.1654152713563.js => 404.1654651563679.js} (89%)
rename server/static/assets/{404.1654152713563.png => 404.1654651563679.png} (100%)
rename server/static/assets/{Api.1654152713563.js => Api.1654651563679.js} (82%)
rename server/static/assets/{DataOperation.1654152713563.css => DataOperation.1654651563679.css} (100%)
rename server/static/assets/{DataOperation.1654152713563.js => DataOperation.1654651563679.js} (97%)
rename server/static/assets/{DbList.1654152713563.js => DbList.1654651563679.js} (98%)
rename server/static/assets/{Enum.1654152713563.js => Enum.1654651563679.js} (100%)
rename server/static/assets/{JetBrainsMono-Regular.1654152713563.woff => JetBrainsMono-Regular.1654651563679.woff} (100%)
delete mode 100644 server/static/assets/MongoDataOp.1654152713563.css
delete mode 100644 server/static/assets/MongoDataOp.1654152713563.js
create mode 100644 server/static/assets/MongoDataOp.1654651563679.css
create mode 100644 server/static/assets/MongoDataOp.1654651563679.js
rename server/static/assets/{MongoList.1654152713563.js => MongoList.1654651563679.js} (98%)
rename server/static/assets/{ProjectEnvSelect.1654152713563.js => ProjectEnvSelect.1654651563679.js} (94%)
rename server/static/assets/{ProjectList.1654152713563.js => ProjectList.1654651563679.js} (97%)
delete mode 100644 server/static/assets/SqlExecBox.1654152713563.js
rename server/static/assets/{SqlExecBox.1654152713563.css => SqlExecBox.1654651563679.css} (100%)
create mode 100644 server/static/assets/SqlExecBox.1654651563679.js
rename server/static/assets/{SshTerminal.1654152713563.css => SshTerminal.1654651563679.css} (100%)
rename server/static/assets/{SshTerminal.1654152713563.js => SshTerminal.1654651563679.js} (99%)
rename server/static/assets/{SshTerminalPage.1654152713563.js => SshTerminalPage.1654651563679.js} (80%)
rename server/static/assets/{api.16541527135632.js => api.16546515636792.js} (94%)
rename server/static/assets/{api.16541527135633.js => api.16546515636793.js} (88%)
rename server/static/assets/{api.16541527135634.js => api.16546515636794.js} (91%)
rename server/static/assets/{api.16541527135635.js => api.16546515636795.js} (89%)
rename server/static/assets/{assert.1654152713563.js => assert.1654651563679.js} (100%)
rename server/static/assets/{bg-login.1654152713563.png => bg-login.1654651563679.png} (100%)
delete mode 100644 server/static/assets/codemirror.1654152713563.js
rename server/static/assets/{codemirror.1654152713563.css => codemirror.1654651563679.css} (100%)
create mode 100644 server/static/assets/codemirror.1654651563679.js
rename server/static/assets/{enums.1654152713563.js => enums.1654651563679.js} (83%)
rename server/static/assets/{format.1654152713563.js => format.1654651563679.js} (100%)
delete mode 100644 server/static/assets/index.1654152713563.js
delete mode 100644 server/static/assets/index.16541527135639.js
rename server/static/assets/{index.16541527135635.css => index.1654651563679.css} (100%)
create mode 100644 server/static/assets/index.1654651563679.js
rename server/static/assets/{index.165415271356310.js => index.165465156367910.js} (98%)
rename server/static/assets/{index.1654152713563.css => index.16546515636792.css} (100%)
rename server/static/assets/{index.16541527135632.js => index.16546515636792.js} (99%)
rename server/static/assets/{index.16541527135636.css => index.16546515636793.css} (100%)
rename server/static/assets/{index.16541527135633.js => index.16546515636793.js} (98%)
rename server/static/assets/{index.16541527135637.css => index.16546515636794.css} (100%)
rename server/static/assets/{index.16541527135634.js => index.16546515636794.js} (97%)
rename server/static/assets/{index.16541527135633.css => index.16546515636795.css} (97%)
rename server/static/assets/{index.16541527135635.js => index.16546515636795.js} (98%)
rename server/static/assets/{index.16541527135632.css => index.16546515636796.css} (100%)
rename server/static/assets/{index.16541527135636.js => index.16546515636796.js} (99%)
rename server/static/assets/{index.16541527135634.css => index.16546515636797.css} (100%)
rename server/static/assets/{index.16541527135637.js => index.16546515636797.js} (98%)
rename server/static/assets/{index.16541527135638.css => index.16546515636798.css} (99%)
rename server/static/assets/{index.16541527135638.js => index.16546515636798.js} (98%)
create mode 100644 server/static/assets/index.16546515636799.js
create mode 100644 server/static/assets/jsoneditor-icons.1654651563679.svg
rename server/static/assets/{logo.1654152713563.svg => logo.1654651563679.svg} (100%)
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 @@
+
+