From b1ee9b65ffa56b73e823d26009ab4af709c0042c Mon Sep 17 00:00:00 2001 From: "meilin.huang" <954537473@qq.com> Date: Sun, 21 Aug 2022 21:00:28 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=B0=8F=E9=97=AE=E9=A2=98=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mayfly_go_web/package.json | 8 +- .../views/layout/navBars/breadcrumb/user.vue | 6 +- .../views/login/component/AccountLogin.vue | 2 + mayfly_go_web/yarn.lock | 189 ++++++++++++++---- server/internal/devops/application/db_app.go | 8 + 5 files changed, 172 insertions(+), 41 deletions(-) diff --git a/mayfly_go_web/package.json b/mayfly_go_web/package.json index c0b762a6..83ce1ecd 100644 --- a/mayfly_go_web/package.json +++ b/mayfly_go_web/package.json @@ -7,21 +7,21 @@ "lint-fix": "eslint --fix --ext .js --ext .jsx --ext .vue src/" }, "dependencies": { - "@element-plus/icons-vue": "^2.0.6", + "@element-plus/icons-vue": "^2.0.9", "axios": "^0.27.2", "codemirror": "^5.65.5", "countup.js": "^2.0.7", "cropperjs": "^1.5.11", "echarts": "^5.3.3", - "element-plus": "^2.2.13", + "element-plus": "^2.2.14", "jsencrypt": "^3.2.1", "jsoneditor": "^9.9.0", "lodash": "^4.17.21", "mitt": "^3.0.0", "nprogress": "^0.2.0", - "screenfull": "^5.1.0", + "screenfull": "^6.0.2", "sortablejs": "^1.13.0", - "sql-formatter": "^8.2.0", + "sql-formatter": "^9.2.0", "vue": "^3.2.37", "vue-clipboard3": "^1.0.1", "vue-router": "^4.1.2", diff --git a/mayfly_go_web/src/views/layout/navBars/breadcrumb/user.vue b/mayfly_go_web/src/views/layout/navBars/breadcrumb/user.vue index 201d817d..b5162717 100644 --- a/mayfly_go_web/src/views/layout/navBars/breadcrumb/user.vue +++ b/mayfly_go_web/src/views/layout/navBars/breadcrumb/user.vue @@ -14,11 +14,11 @@ -
+
@@ -28,7 +28,7 @@ diff --git a/mayfly_go_web/src/views/login/component/AccountLogin.vue b/mayfly_go_web/src/views/login/component/AccountLogin.vue index c43d37f4..600be29d 100644 --- a/mayfly_go_web/src/views/login/component/AccountLogin.vue +++ b/mayfly_go_web/src/views/login/component/AccountLogin.vue @@ -131,6 +131,8 @@ export default defineComponent({ }); onMounted(() => { + // 移除公钥, 方便后续重新获取 + sessionStorage.removeItem('RsaPublicKey') getCaptcha(); }); diff --git a/mayfly_go_web/yarn.lock b/mayfly_go_web/yarn.lock index 221cab84..8dace9fd 100644 --- a/mayfly_go_web/yarn.lock +++ b/mayfly_go_web/yarn.lock @@ -17,6 +17,11 @@ resolved "https://registry.npmmirror.com/@element-plus/icons-vue/-/icons-vue-2.0.6.tgz" integrity sha512-lPpG8hYkjL/Z97DH5Ei6w6o22Z4YdNglWCNYOPcB33JCF2A4wye6HFgSI7hEt9zdLyxlSpiqtgf9XcYU+m5mew== +"@element-plus/icons-vue@^2.0.9": + version "2.0.9" + resolved "https://registry.npmmirror.com/@element-plus/icons-vue/-/icons-vue-2.0.9.tgz#b7777c57534522e387303d194451d50ff549d49a" + integrity sha512-okdrwiVeKBmW41Hkl0eMrXDjzJwhQMuKiBOu17rOszqM+LS/yBYpNQNV5Jvoh06Wc+89fMmb/uhzf8NZuDuUaQ== + "@eslint/eslintrc@^1.0.5": version "1.0.5" resolved "https://registry.npmmirror.com/@eslint/eslintrc/download/@eslint/eslintrc-1.0.5.tgz" @@ -126,10 +131,10 @@ resolved "https://registry.npmmirror.com/@types/sortablejs/download/@types/sortablejs-1.10.7.tgz" integrity sha1-q5A5yFQp8FFpVextvAuyATlBexU= -"@types/web-bluetooth@^0.0.14": - version "0.0.14" - resolved "https://registry.npmmirror.com/@types/web-bluetooth/-/web-bluetooth-0.0.14.tgz" - integrity sha512-5d2RhCard1nQUC3aHcq/gHzWYO6K0WJmAbjO7mQJgCQKtZpgXxv1rOM6O/dBDhDYYVutk1sciOgNSe+5YyfM8A== +"@types/web-bluetooth@^0.0.15": + version "0.0.15" + resolved "https://registry.npmmirror.com/@types/web-bluetooth/-/web-bluetooth-0.0.15.tgz#d60330046a6ed8a13b4a53df3813c44942ebdf72" + integrity sha512-w7hEHXnPMEZ+4nGKl/KDRVpxkwYxYExuHOYXyzIzCDzEZ9ZCGMAewulr9IqJu2LR4N37fcnb1XVeuZ09qgOxhA== "@typescript-eslint/eslint-plugin@^4.23.0": version "4.33.0" @@ -364,25 +369,25 @@ resolved "https://registry.npmmirror.com/@vue/shared/-/shared-3.2.37.tgz" integrity sha512-4rSJemR2NQIo9Klm1vabqWjD8rs/ZaJSzMxkMNeJS6lHiUjjUeYFbooN19NgFjztubEKh3WlZUeOLVdbbUWHsw== -"@vueuse/core@^8.7.5": - version "8.7.5" - resolved "https://registry.npmmirror.com/@vueuse/core/-/core-8.7.5.tgz" - integrity sha512-tqgzeZGoZcXzoit4kOGLWJibDMLp0vdm6ZO41SSUQhkhtrPhAg6dbIEPiahhUu6sZAmSYvVrZgEr5aKD51nrLA== +"@vueuse/core@^9.1.0": + version "9.1.0" + resolved "https://registry.npmmirror.com/@vueuse/core/-/core-9.1.0.tgz#f0fb13fd99768c0eb617169a2d2c1cbd5f5a52eb" + integrity sha512-BIroqvXEqt826aE9r3K5cox1zobuPuAzdYJ36kouC2TVhlXvFKIILgFVWrpp9HZPwB3aLzasmG3K87q7TSyXZg== dependencies: - "@types/web-bluetooth" "^0.0.14" - "@vueuse/metadata" "8.7.5" - "@vueuse/shared" "8.7.5" + "@types/web-bluetooth" "^0.0.15" + "@vueuse/metadata" "9.1.0" + "@vueuse/shared" "9.1.0" vue-demi "*" -"@vueuse/metadata@8.7.5": - version "8.7.5" - resolved "https://registry.npmmirror.com/@vueuse/metadata/-/metadata-8.7.5.tgz" - integrity sha512-emJZKRQSaEnVqmlu39NpNp8iaW+bPC2kWykWoWOZMSlO/0QVEmO/rt8A5VhOEJTKLX3vwTevqbiRy9WJRwVOQg== +"@vueuse/metadata@9.1.0": + version "9.1.0" + resolved "https://registry.npmmirror.com/@vueuse/metadata/-/metadata-9.1.0.tgz#194d4bd47f7acb91e348c0f436e678ddf7ee235b" + integrity sha512-8OEhlog1iaAGTD3LICZ8oBGQdYeMwByvXetOtAOZCJOzyCRSwqwdggTsmVZZ1rkgYIEqgUBk942AsAPwM21s6A== -"@vueuse/shared@8.7.5": - version "8.7.5" - resolved "https://registry.npmmirror.com/@vueuse/shared/-/shared-8.7.5.tgz" - integrity sha512-THXPvMBFmg6Gf6AwRn/EdTh2mhqwjGsB2Yfp374LNQSQVKRHtnJ0I42bsZTn7nuEliBxqUrGQm/lN6qUHmhJLw== +"@vueuse/shared@9.1.0": + version "9.1.0" + resolved "https://registry.npmmirror.com/@vueuse/shared/-/shared-9.1.0.tgz#d8459a45324f32fb05a2a56ed754637c3d0efaeb" + integrity sha512-pB/3njQu4tfJJ78ajELNda0yMG6lKfpToQW7Soe09CprF1k3QuyoNi1tBNvo75wBDJWD+LOnr+c4B5HZ39jY/Q== dependencies: vue-demi "*" @@ -421,7 +426,7 @@ ansi-regex@^5.0.1: resolved "https://registry.nlark.com/ansi-regex/download/ansi-regex-5.0.1.tgz" integrity sha1-CCyyyJyf6GWaMRpTvWpNxTAdswQ= -ansi-styles@^4.1.0: +ansi-styles@^4.0.0, ansi-styles@^4.1.0: version "4.3.0" resolved "https://registry.nlark.com/ansi-styles/download/ansi-styles-4.3.0.tgz" integrity sha1-7dgDYornHATIWuegkG7a00tkiTc= @@ -526,6 +531,15 @@ clipboard@^2.0.6: select "^1.1.2" tiny-emitter "^2.0.0" +cliui@^7.0.2: + version "7.0.4" + resolved "https://registry.npmmirror.com/cliui/-/cliui-7.0.4.tgz#a0265ee655476fc807aea9df3df8df7783808b4f" + integrity sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ== + dependencies: + string-width "^4.2.0" + strip-ansi "^6.0.0" + wrap-ansi "^7.0.0" + codemirror@^5.65.5: version "5.65.5" resolved "https://registry.npmmirror.com/codemirror/-/codemirror-5.65.5.tgz" @@ -596,6 +610,11 @@ deep-is@^0.1.3: resolved "https://registry.nlark.com/deep-is/download/deep-is-0.1.4.tgz" integrity sha1-pvLc5hL63S7x9Rm3NVHxfoUZmDE= +define-lazy-prop@^2.0.0: + version "2.0.0" + resolved "https://registry.npmmirror.com/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz#3f7ae421129bcaaac9bc74905c98a0009ec9ee7f" + integrity sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og== + delayed-stream@~1.0.0: version "1.0.0" resolved "https://registry.npmmirror.com/delayed-stream/-/delayed-stream-1.0.0.tgz" @@ -633,10 +652,10 @@ echarts@^5.3.3: tslib "2.3.0" zrender "5.3.2" -element-plus@^2.2.13: - version "2.2.13" - resolved "https://registry.npmmirror.com/element-plus/-/element-plus-2.2.13.tgz#9ec3a9fa6587c93a87bb0d30c200ac8ee4f69c8b" - integrity sha512-dKQ7BPZC8deUPhv+6s4GgOL0GyGj3KpUarywxm6s1nWnHjH6FqeZlUcxPqBvJd7W/d81POayx3B13GP+rfkG9g== +element-plus@^2.2.14: + version "2.2.14" + resolved "https://registry.npmmirror.com/element-plus/-/element-plus-2.2.14.tgz#161f2cbf2c12608a570af303f8191c7d7eae725b" + integrity sha512-V5Pis0OHhePg1RgVogZrcefaVl8vjVn4Pn9Qsh/t2CbFgjg9kKOYFqf/tuP3ObSXGm3X89hpe0W+nLVAsaFnpw== dependencies: "@ctrl/tinycolor" "^3.4.1" "@element-plus/icons-vue" "^2.0.6" @@ -644,7 +663,7 @@ element-plus@^2.2.13: "@popperjs/core" "npm:@sxzz/popperjs-es@^2.11.7" "@types/lodash" "^4.14.182" "@types/lodash-es" "^4.17.6" - "@vueuse/core" "^8.7.5" + "@vueuse/core" "^9.1.0" async-validator "^4.2.5" dayjs "^1.11.3" escape-html "^1.0.3" @@ -654,6 +673,11 @@ element-plus@^2.2.13: memoize-one "^6.0.0" normalize-wheel-es "^1.2.0" +emoji-regex@^8.0.0: + version "8.0.0" + resolved "https://registry.npmmirror.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37" + integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A== + enquirer@^2.3.5: version "2.3.6" resolved "https://registry.npm.taobao.org/enquirer/download/enquirer-2.3.6.tgz" @@ -787,6 +811,11 @@ esbuild@^0.14.27: esbuild-windows-64 "0.14.38" esbuild-windows-arm64 "0.14.38" +escalade@^3.1.1: + version "3.1.1" + resolved "https://registry.npmmirror.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40" + integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw== + escape-html@^1.0.3: version "1.0.3" resolved "https://registry.npmmirror.com/escape-html/-/escape-html-1.0.3.tgz" @@ -1029,6 +1058,11 @@ functional-red-black-tree@^1.0.1: resolved "https://registry.npm.taobao.org/functional-red-black-tree/download/functional-red-black-tree-1.0.1.tgz?cache=0&sync_timestamp=1577806294691&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ffunctional-red-black-tree%2Fdownload%2Ffunctional-red-black-tree-1.0.1.tgz" integrity sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc= +get-caller-file@^2.0.5: + version "2.0.5" + resolved "https://registry.npmmirror.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e" + integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg== + glob-parent@^5.1.2, glob-parent@~5.1.2: version "5.1.2" resolved "https://registry.npmmirror.com/glob-parent/download/glob-parent-5.1.2.tgz" @@ -1148,11 +1182,21 @@ is-core-module@^2.8.1: dependencies: has "^1.0.3" +is-docker@^2.0.0, is-docker@^2.1.1: + version "2.2.1" + resolved "https://registry.npmmirror.com/is-docker/-/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa" + integrity sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ== + is-extglob@^2.1.1: version "2.1.1" resolved "https://registry.npm.taobao.org/is-extglob/download/is-extglob-2.1.1.tgz" integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI= +is-fullwidth-code-point@^3.0.0: + version "3.0.0" + resolved "https://registry.npmmirror.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d" + integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg== + is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3, is-glob@~4.0.1: version "4.0.3" resolved "https://registry.npmmirror.com/is-glob/download/is-glob-4.0.3.tgz" @@ -1165,6 +1209,13 @@ is-number@^7.0.0: resolved "https://registry.nlark.com/is-number/download/is-number-7.0.0.tgz" integrity sha1-dTU0W4lnNNX4DE0GxQlVUnoU8Ss= +is-wsl@^2.2.0: + version "2.2.0" + resolved "https://registry.npmmirror.com/is-wsl/-/is-wsl-2.2.0.tgz#74a4c76e77ca9fd3f932f290c17ea326cd157271" + integrity sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww== + dependencies: + is-docker "^2.0.0" + isexe@^2.0.0: version "2.0.0" resolved "https://registry.npm.taobao.org/isexe/download/isexe-2.0.0.tgz" @@ -1368,6 +1419,15 @@ once@^1.3.0: dependencies: wrappy "1" +open@^8.4.0: + version "8.4.0" + resolved "https://registry.npmmirror.com/open/-/open-8.4.0.tgz#345321ae18f8138f82565a910fdc6b39e8c244f8" + integrity sha512-XgFPPM+B28FtCCgSb9I+s9szOC1vZRSwgWsRUA5ylIxRTgKozqjOCrVOqGsYABPYK5qnfqClxZTFBa8PKt2v6Q== + dependencies: + define-lazy-prop "^2.0.0" + is-docker "^2.1.1" + is-wsl "^2.2.0" + optionator@^0.9.1: version "0.9.1" resolved "https://registry.npm.taobao.org/optionator/download/optionator-0.9.1.tgz" @@ -1477,6 +1537,11 @@ regexpp@^3.1.0, regexpp@^3.2.0: resolved "https://registry.nlark.com/regexpp/download/regexpp-3.2.0.tgz?cache=0&sync_timestamp=1623668872577&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fregexpp%2Fdownload%2Fregexpp-3.2.0.tgz" integrity sha1-BCWido2PI7rXDKS5BGH6LxIT4bI= +require-directory@^2.1.1: + version "2.1.1" + resolved "https://registry.npmmirror.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42" + integrity sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q== + resolve-from@^4.0.0: version "4.0.0" resolved "https://registry.nlark.com/resolve-from/download/resolve-from-4.0.0.tgz" @@ -1503,6 +1568,16 @@ rimraf@^3.0.2: dependencies: glob "^7.1.3" +rollup-plugin-visualizer@^5.8.0: + version "5.8.0" + resolved "https://registry.npmmirror.com/rollup-plugin-visualizer/-/rollup-plugin-visualizer-5.8.0.tgz#32f2fe23d4299e977c06c59c07255590354e3445" + integrity sha512-pY6j/7qHz5I9rB7d/bQoA5gX+2FbV3MBG055wrsFxDn550bgl0FNViRj6wDHh85PMswv+JVdZjhnMBzz/hdAHA== + dependencies: + nanoid "^3.3.4" + open "^8.4.0" + source-map "^0.7.3" + yargs "^17.5.1" + rollup@^2.59.0: version "2.61.1" resolved "https://registry.npmmirror.com/rollup/download/rollup-2.61.1.tgz" @@ -1534,10 +1609,10 @@ sass@^1.45.1: immutable "^4.0.0" source-map-js ">=0.6.2 <2.0.0" -screenfull@^5.1.0: - version "5.2.0" - resolved "https://registry.npmmirror.com/screenfull/download/screenfull-5.2.0.tgz?cache=0&sync_timestamp=1635923453416&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fscreenfull%2Fdownload%2Fscreenfull-5.2.0.tgz" - integrity sha1-ZTPVJNMGIfwSg7lpIUbz8TqT0bo= +screenfull@^6.0.2: + version "6.0.2" + resolved "https://registry.npmmirror.com/screenfull/-/screenfull-6.0.2.tgz#3dbe4b8c4f8f49fb8e33caa8f69d0bca730ab238" + integrity sha512-AQdy8s4WhNvUZ6P8F6PB21tSPIYKniic+Ogx0AacBMjKP1GUHN2E9URxQHtCusiwxudnCKkdy4GrHXPPJSkCCw== select@^1.1.2: version "1.1.2" @@ -1588,19 +1663,33 @@ source-map@^0.6.1: resolved "https://registry.npm.taobao.org/source-map/download/source-map-0.6.1.tgz" integrity sha1-dHIq8y6WFOnCh6jQu95IteLxomM= +source-map@^0.7.3: + version "0.7.4" + resolved "https://registry.npmmirror.com/source-map/-/source-map-0.7.4.tgz#a9bbe705c9d8846f4e08ff6765acf0f1b0898656" + integrity sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA== + sourcemap-codec@^1.4.4: version "1.4.8" resolved "https://registry.npm.taobao.org/sourcemap-codec/download/sourcemap-codec-1.4.8.tgz" integrity sha1-6oBL2UhXQC5pktBaOO8a41qatMQ= -sql-formatter@^8.2.0: - version "8.2.0" - resolved "https://registry.npmmirror.com/sql-formatter/-/sql-formatter-8.2.0.tgz#2b664f02bb6b7bb6fcad1346e850b8f583303469" - integrity sha512-5hQOSOk8jfhPkNgUmpm+9Fn2aaLWcf4vKL/dIvUN5q9rsamKHSyN/gL79xpkETNOyL+Zv5BMQfA7z9Rmz/DJJg== +sql-formatter@^9.2.0: + version "9.2.0" + resolved "https://registry.npmmirror.com/sql-formatter/-/sql-formatter-9.2.0.tgz#18a398ae71436dc1936a45e6f230236b4347231b" + integrity sha512-Dn4lEpUeAhfNDR2LnEs9Uaq92TSHjhcNrzhllPuMnp188P4sLU7UcdcB9UqIfMfcN62gWXJlJ3KocaAf/SOzXQ== dependencies: argparse "^2.0.1" -strip-ansi@^6.0.1: +string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: + version "4.2.3" + resolved "https://registry.npmmirror.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" + integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== + dependencies: + emoji-regex "^8.0.0" + is-fullwidth-code-point "^3.0.0" + strip-ansi "^6.0.1" + +strip-ansi@^6.0.0, strip-ansi@^6.0.1: version "6.0.1" resolved "https://registry.npmmirror.com/strip-ansi/download/strip-ansi-6.0.1.tgz" integrity sha1-nibGPTD1NEPpSJSVshBdN7Z6hdk= @@ -1768,6 +1857,15 @@ word-wrap@^1.2.3: resolved "https://registry.npm.taobao.org/word-wrap/download/word-wrap-1.2.3.tgz" integrity sha1-YQY29rH3A4kb00dxzLF/uTtHB5w= +wrap-ansi@^7.0.0: + version "7.0.0" + resolved "https://registry.npmmirror.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" + integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== + dependencies: + ansi-styles "^4.0.0" + string-width "^4.1.0" + strip-ansi "^6.0.0" + wrappy@1: version "1.0.2" resolved "https://registry.nlark.com/wrappy/download/wrappy-1.0.2.tgz?cache=0&sync_timestamp=1619133505879&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fwrappy%2Fdownload%2Fwrappy-1.0.2.tgz" @@ -1783,11 +1881,34 @@ xterm@^4.19.0: resolved "https://registry.npmmirror.com/xterm/-/xterm-4.19.0.tgz" integrity sha512-c3Cp4eOVsYY5Q839dR5IejghRPpxciGmLWWaP9g+ppfMeBChMeLa1DCA+pmX/jyDZ+zxFOmlJL/82qVdayVoGQ== +y18n@^5.0.5: + version "5.0.8" + resolved "https://registry.npmmirror.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55" + integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA== + yallist@^4.0.0: version "4.0.0" resolved "https://registry.nlark.com/yallist/download/yallist-4.0.0.tgz" integrity sha1-m7knkNnA7/7GO+c1GeEaNQGaOnI= +yargs-parser@^21.0.0: + version "21.1.1" + resolved "https://registry.npmmirror.com/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35" + integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw== + +yargs@^17.5.1: + version "17.5.1" + resolved "https://registry.npmmirror.com/yargs/-/yargs-17.5.1.tgz#e109900cab6fcb7fd44b1d8249166feb0b36e58e" + integrity sha512-t6YAJcxDkNX7NFYiVtKvWUz8l+PaKTLiL63mJYWR2GnHq2gjEWISzsLp9wg3aY36dY1j+gfIEL3pIF+XlJJfbA== + dependencies: + cliui "^7.0.2" + escalade "^3.1.1" + get-caller-file "^2.0.5" + require-directory "^2.1.1" + string-width "^4.2.3" + y18n "^5.0.5" + yargs-parser "^21.0.0" + zrender@5.3.2: version "5.3.2" resolved "https://registry.npmmirror.com/zrender/-/zrender-5.3.2.tgz" diff --git a/server/internal/devops/application/db_app.go b/server/internal/devops/application/db_app.go index cff49f1f..118777d0 100644 --- a/server/internal/devops/application/db_app.go +++ b/server/internal/devops/application/db_app.go @@ -219,6 +219,9 @@ func (da *dbAppImpl) GetDbInstance(id uint64, db string) *DbInstance { //------------------------------------------------------------------------------ +// 单次最大查询数据集 +const Max_Rows = 2000 + // 客户端连接缓存，指定时间内没有访问则会被关闭, key为数据库实例id:数据库 var dbCache = cache.NewTimedCache(constant.DbConnExpireTime, 5*time.Second). WithUpdateAccessTime(true). @@ -315,7 +318,11 @@ func SelectDataByDb(db *sql.DB, selectSql string) ([]string, []map[string]interf colNames := make([]string, 0) // 是否第一次遍历，列名数组只需第一次遍历时加入 isFirst := true + rowNum := 0 for rows.Next() { + rowNum++ + biz.IsTrue(rowNum <= Max_Rows, "结果集 > 2000, 请完善条件或分页信息") + // 不Scan也会导致等待，该链接实际处于未工作的状态，然后也会导致连接数迅速达到最大 err := rows.Scan(scans...) if err != nil { @@ -329,6 +336,7 @@ func SelectDataByDb(db *sql.DB, selectSql string) ([]string, []map[string]interf colName := colType.Name() // 字段类型名 colScanType := colType.ScanType().Name() + // 如果是第一行，则将列名加入到列信息中，由于map是无序的，所有需要返回列名的有序数组 if isFirst { colNames = append(colNames, colName) }