From 51177afc8380609e84d52224faec089bccbdd11f Mon Sep 17 00:00:00 2001 From: Frank Wei Date: Wed, 25 Aug 2021 16:30:46 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=F0=9F=93=A6=20update=20axios?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend-ng/package.json | 2 +- frontend-ng/yarn.lock | 35 ++++++++++------------------------- 2 files changed, 11 insertions(+), 26 deletions(-) diff --git a/frontend-ng/package.json b/frontend-ng/package.json index 43dc004..b986a87 100644 --- a/frontend-ng/package.json +++ b/frontend-ng/package.json @@ -16,7 +16,7 @@ }, "dependencies": { "@tinymce/tinymce-vue": "^3.2.1", - "axios": "0.18.1", + "axios": "^0.21.1", "dayjs": "^1.10.4", "echarts": "^4.7.0", "element-ui": "2.13.0", diff --git a/frontend-ng/yarn.lock b/frontend-ng/yarn.lock index c62fd1b..30ea62a 100644 --- a/frontend-ng/yarn.lock +++ b/frontend-ng/yarn.lock @@ -1879,13 +1879,12 @@ aws4@^1.8.0: resolved "https://registry.npmjs.org/aws4/-/aws4-1.9.1.tgz#7e33d8f7d449b3f673cd72deb9abdc552dbe528e" integrity sha512-wMHVg2EOHaMRxbzgFJ9gtjOOCrI80OHLG14rxi28XwOW8ux6IiEbRCGGGqCtdAIg4FQCbW20k9RsT4y3gJlFug== -axios@0.18.1: - version "0.18.1" - resolved "https://registry.npmjs.org/axios/-/axios-0.18.1.tgz#ff3f0de2e7b5d180e757ad98000f1081b87bcea3" - integrity sha512-0BfJq4NSfQXd+SkFdrvFbG7addhYSBA2mQwISr46pD6E5iqkWg02RAs8vyTT/j0RTnoYmeXauBuSv1qKwR179g== +axios@^0.21.1: + version "0.21.1" + resolved "https://registry.yarnpkg.com/axios/-/axios-0.21.1.tgz#22563481962f4d6bde9a76d516ef0e5d3c09b2b8" + integrity sha512-dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA== dependencies: - follow-redirects "1.5.10" - is-buffer "^2.0.2" + follow-redirects "^1.10.0" babel-code-frame@^6.22.0, babel-code-frame@^6.26.0: version "6.26.0" @@ -3431,13 +3430,6 @@ debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8, debug@^2.6.9: dependencies: ms "2.0.0" -debug@=3.1.0: - version "3.1.0" - resolved "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261" - integrity sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g== - dependencies: - ms "2.0.0" - debug@^3.0.0, debug@^3.1.0, debug@^3.1.1, debug@^3.2.5: version "3.2.6" resolved "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b" @@ -4630,13 +4622,6 @@ flush-write-stream@^1.0.0: inherits "^2.0.3" readable-stream "^2.3.6" -follow-redirects@1.5.10: - version "1.5.10" - resolved "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.10.tgz#7b7a9f9aea2fdff36786a94ff643ed07f4ff5e2a" - integrity sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ== - dependencies: - debug "=3.1.0" - follow-redirects@^1.0.0: version "1.11.0" resolved "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.11.0.tgz#afa14f08ba12a52963140fe43212658897bc0ecb" @@ -4644,6 +4629,11 @@ follow-redirects@^1.0.0: dependencies: debug "^3.0.0" +follow-redirects@^1.10.0: + version "1.14.2" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.2.tgz#cecb825047c00f5e66b142f90fed4f515dec789b" + integrity sha512-yLR6WaE2lbF0x4K2qE2p9PEXKLDjUjnR/xmjS3wHAYxtlsI9MLLBJUZirAHKzUZDGLxje7w/cXR49WOUo4rbsA== + for-in@^1.0.1, for-in@^1.0.2: version "1.0.2" resolved "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80" @@ -5548,11 +5538,6 @@ is-buffer@^1.1.5: resolved "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be" integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w== -is-buffer@^2.0.2: - version "2.0.4" - resolved "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.4.tgz#3e572f23c8411a5cfd9557c849e3665e0b290623" - integrity sha512-Kq1rokWXOPXWuaMAqZiJW4XxsmD9zGx9q4aePabbn3qCRGedtH7Cm+zV8WETitMfu1wdh+Rvd6w5egwSngUX2A== - is-callable@^1.1.4, is-callable@^1.1.5: version "1.1.5" resolved "https://registry.npmjs.org/is-callable/-/is-callable-1.1.5.tgz#f7e46b596890456db74e7f6e976cb3273d06faab" From 8dc721b5e0c57b91b038b58bf7a358c79aa599dd Mon Sep 17 00:00:00 2001 From: Frank Wei Date: Wed, 25 Aug 2021 16:31:21 +0800 Subject: [PATCH 2/2] feat: reboot page --- frontend-ng/src/permission.js | 2 +- frontend-ng/src/router/index.js | 5 ++ frontend-ng/src/views/reboot/index.vue | 67 ++++++++++++++++++++++++++ 3 files changed, 73 insertions(+), 1 deletion(-) create mode 100644 frontend-ng/src/views/reboot/index.vue diff --git a/frontend-ng/src/permission.js b/frontend-ng/src/permission.js index 1232def..6b8adf1 100644 --- a/frontend-ng/src/permission.js +++ b/frontend-ng/src/permission.js @@ -5,7 +5,7 @@ import { getToken } from '@/utils/auth' // getToken from cookie NProgress.configure({ showSpinner: false })// NProgress configuration -const whiteList = ['/login'] // 不重定向白名单 +const whiteList = ['/login', '/reboot'] // 不重定向白名单 router.beforeEach((to, from, next) => { NProgress.start() if (getToken()) { diff --git a/frontend-ng/src/router/index.js b/frontend-ng/src/router/index.js index 5184c46..4b01bce 100644 --- a/frontend-ng/src/router/index.js +++ b/frontend-ng/src/router/index.js @@ -224,6 +224,11 @@ export const constantRouterMap = [ } ] }, + { + path: '/reboot', + name: 'Reboot', + component: () => import('@/views/reboot') + }, { path: '*', redirect: '/404', hidden: true } ] diff --git a/frontend-ng/src/views/reboot/index.vue b/frontend-ng/src/views/reboot/index.vue new file mode 100644 index 0000000..ea2331b --- /dev/null +++ b/frontend-ng/src/views/reboot/index.vue @@ -0,0 +1,67 @@ + + + + +