From 9900b236efad0c72e1a6a44fb6ae4c050eb58851 Mon Sep 17 00:00:00 2001 From: "meilin.huang" <954537473@qq.com> Date: Wed, 24 May 2023 12:32:17 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E7=BB=84=E4=BB=B6=E5=8D=87?= =?UTF-8?q?=E7=BA=A7=E3=80=81=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mayfly_go_web/package.json | 22 +- .../src/components/monaco/MonacoEditor.vue | 4 +- mayfly_go_web/src/views/layout/index.vue | 2 +- .../src/views/layout/navMenu/horizontal.vue | 10 +- mayfly_go_web/src/views/ops/db/DbList.vue | 2 +- .../src/views/ops/machine/ScriptEdit.vue | 8 +- mayfly_go_web/yarn.lock | 405 +++++++++--------- server/go.mod | 16 +- server/internal/common/api/index.go | 2 +- server/internal/db/api/db.go | 12 +- server/internal/db/application/db.go | 11 +- server/internal/db/application/meta.go | 88 +++- .../db/application/metasql/mysql_meta.sql | 69 +++ .../db/application/metasql/pgsql_meta.sql | 169 ++++++++ server/internal/db/application/mysql_meta.go | 111 +++-- server/internal/db/application/pgsql_meta.go | 127 +++--- .../{auth_cert_app.go => auth_cert.go} | 0 .../{auth_cert_repo.go => auth_cert.go} | 0 .../application/{mongo_app.go => mongo.go} | 0 .../persistence/{mongo_repo.go => mongo.go} | 0 .../application/{redis_app.go => redis.go} | 0 .../{account_app.go => account.go} | 0 .../application/{config_app.go => config.go} | 0 .../sys/application/{msg_app.go => msg.go} | 0 .../{resource_app.go => resource.go} | 0 .../sys/application/{role_app.go => role.go} | 0 .../application/{syslog_app.go => syslog.go} | 0 .../{account_repo.go => account.go} | 0 .../persistence/{config_repo.go => config.go} | 0 .../persistence/{msg_repo.go => msg.go} | 0 .../{resource_repo.go => resource.go} | 0 .../persistence/{role_repo.go => role.go} | 0 .../persistence/{syslog_repo.go => syslog.go} | 0 server/mayfly-go.sql | 2 +- server/pkg/req/token.go | 2 +- server/pkg/utils/any.go | 54 +++ server/pkg/utils/{array_utils.go => array.go} | 0 .../{array_utils_test.go => array_test.go} | 0 server/pkg/utils/assert/assert.go | 6 +- server/pkg/utils/{byte_utils.go => byte.go} | 0 .../pkg/utils/{crypto_utils.go => crypto.go} | 0 server/pkg/utils/{json_utils.go => json.go} | 0 server/pkg/utils/{map_utils.go => map.go} | 0 .../{stack_trace_utils.go => stack_trace.go} | 0 server/pkg/utils/{str_utils.go => str.go} | 0 .../pkg/utils/{struct_utils.go => struct.go} | 0 .../{struct_utils_test.go => struct_test.go} | 0 server/pkg/utils/{tree_utils.go => tree.go} | 0 48 files changed, 777 insertions(+), 345 deletions(-) create mode 100644 server/internal/db/application/metasql/mysql_meta.sql create mode 100644 server/internal/db/application/metasql/pgsql_meta.sql rename server/internal/machine/application/{auth_cert_app.go => auth_cert.go} (100%) rename server/internal/machine/infrastructure/persistence/{auth_cert_repo.go => auth_cert.go} (100%) rename server/internal/mongo/application/{mongo_app.go => mongo.go} (100%) rename server/internal/mongo/infrastructure/persistence/{mongo_repo.go => mongo.go} (100%) rename server/internal/redis/application/{redis_app.go => redis.go} (100%) rename server/internal/sys/application/{account_app.go => account.go} (100%) rename server/internal/sys/application/{config_app.go => config.go} (100%) rename server/internal/sys/application/{msg_app.go => msg.go} (100%) rename server/internal/sys/application/{resource_app.go => resource.go} (100%) rename server/internal/sys/application/{role_app.go => role.go} (100%) rename server/internal/sys/application/{syslog_app.go => syslog.go} (100%) rename server/internal/sys/infrastructure/persistence/{account_repo.go => account.go} (100%) rename server/internal/sys/infrastructure/persistence/{config_repo.go => config.go} (100%) rename server/internal/sys/infrastructure/persistence/{msg_repo.go => msg.go} (100%) rename server/internal/sys/infrastructure/persistence/{resource_repo.go => resource.go} (100%) rename server/internal/sys/infrastructure/persistence/{role_repo.go => role.go} (100%) rename server/internal/sys/infrastructure/persistence/{syslog_repo.go => syslog.go} (100%) create mode 100644 server/pkg/utils/any.go rename server/pkg/utils/{array_utils.go => array.go} (100%) rename server/pkg/utils/{array_utils_test.go => array_test.go} (100%) rename server/pkg/utils/{byte_utils.go => byte.go} (100%) rename server/pkg/utils/{crypto_utils.go => crypto.go} (100%) rename server/pkg/utils/{json_utils.go => json.go} (100%) rename server/pkg/utils/{map_utils.go => map.go} (100%) rename server/pkg/utils/{stack_trace_utils.go => stack_trace.go} (100%) rename server/pkg/utils/{str_utils.go => str.go} (100%) rename server/pkg/utils/{struct_utils.go => struct.go} (100%) rename server/pkg/utils/{struct_utils_test.go => struct_test.go} (100%) rename server/pkg/utils/{tree_utils.go => tree.go} (100%) diff --git a/mayfly_go_web/package.json b/mayfly_go_web/package.json index d5fb8278..7dde4419 100644 --- a/mayfly_go_web/package.json +++ b/mayfly_go_web/package.json @@ -10,26 +10,26 @@ }, "dependencies": { "@element-plus/icons-vue": "^2.1.0", - "asciinema-player": "^3.2.0", - "axios": "^1.3.4", + "asciinema-player": "^3.3.0", + "axios": "^1.4.0", "countup.js": "^2.0.7", "cropperjs": "^1.5.11", "echarts": "^5.4.0", - "element-plus": "^2.3.2", + "element-plus": "^2.3.5", "jsencrypt": "^3.3.1", "lodash": "^4.17.21", "mitt": "^3.0.0", - "monaco-editor": "^0.37.1", + "monaco-editor": "^0.38.0", "monaco-sql-languages": "^0.11.0", - "monaco-themes": "^0.4.2", + "monaco-themes": "^0.4.4", "nprogress": "^0.2.0", - "pinia": "^2.0.33", + "pinia": "^2.1.3", "screenfull": "^6.0.2", "sortablejs": "^1.13.0", "sql-formatter": "^12.1.2", - "vue": "^3.2.47", + "vue": "^3.3.4", "vue-clipboard3": "^1.0.1", - "vue-router": "^4.1.6", + "vue-router": "^4.2.1", "xterm": "^5.1.0", "xterm-addon-fit": "^0.7.0" }, @@ -46,11 +46,11 @@ "eslint": "^8.35.0", "eslint-plugin-vue": "^8.2.0", "prettier": "^2.3.0", - "sass": "^1.58.0", + "sass": "^1.62.0", "sass-loader": "^13.2.0", "typescript": "^5.0.2", - "vite": "^4.2.0", - "vue-eslint-parser": "^8.0.1" + "vite": "^4.3.8", + "vue-eslint-parser": "^9.1.1" }, "browserslist": [ "> 1%", diff --git a/mayfly_go_web/src/components/monaco/MonacoEditor.vue b/mayfly_go_web/src/components/monaco/MonacoEditor.vue index bf56298e..a3dcc473 100644 --- a/mayfly_go_web/src/components/monaco/MonacoEditor.vue +++ b/mayfly_go_web/src/components/monaco/MonacoEditor.vue @@ -2,7 +2,7 @@
- +
@@ -54,7 +54,7 @@ const props = defineProps({ //定义事件 const emit = defineEmits(['update:modelValue']) -const languages = [ +const languageArr = [ { value: 'shell', label: 'Shell', diff --git a/mayfly_go_web/src/views/layout/index.vue b/mayfly_go_web/src/views/layout/index.vue index 4e9715fe..f4b5732f 100644 --- a/mayfly_go_web/src/views/layout/index.vue +++ b/mayfly_go_web/src/views/layout/index.vue @@ -7,7 +7,7 @@