From 5be6d7831acd42ae1ed6b93b2ece531441ec7941 Mon Sep 17 00:00:00 2001 From: wanghaoyu <825151728@qq.com> Date: Thu, 26 Dec 2019 18:06:51 +0800 Subject: [PATCH] =?UTF-8?q?feature:=20xterm=E4=BE=9D=E8=B5=96=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=20token=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nezha-fronted/package-lock.json | 5 +++++ nezha-fronted/package.json | 3 ++- nezha-fronted/src/components/common/js/Xterm.js | 7 +++++++ nezha-fronted/src/main.js | 2 +- 4 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 nezha-fronted/src/components/common/js/Xterm.js diff --git a/nezha-fronted/package-lock.json b/nezha-fronted/package-lock.json index 7a1459fbe..d87d3c643 100644 --- a/nezha-fronted/package-lock.json +++ b/nezha-fronted/package-lock.json @@ -11664,6 +11664,11 @@ "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==", "dev": true }, + "xterm": { + "version": "3.1.0", + "resolved": "https://registry.npm.taobao.org/xterm/download/xterm-3.1.0.tgz", + "integrity": "sha1-f34cjPS4C9iBpOiJEhO4UUI+kMk=" + }, "xxhashjs": { "version": "0.2.2", "resolved": "https://registry.npmjs.org/xxhashjs/-/xxhashjs-0.2.2.tgz", diff --git a/nezha-fronted/package.json b/nezha-fronted/package.json index 2697ca5ba..69d028fed 100644 --- a/nezha-fronted/package.json +++ b/nezha-fronted/package.json @@ -15,7 +15,8 @@ "vue": "^2.5.2", "vue-i18n": "^8.15.1", "vue-router": "^3.0.1", - "vuex": "^3.1.2" + "vuex": "^3.1.2", + "xterm": "^3.1.0" }, "devDependencies": { "autoprefixer": "^7.1.2", diff --git a/nezha-fronted/src/components/common/js/Xterm.js b/nezha-fronted/src/components/common/js/Xterm.js new file mode 100644 index 000000000..57736023d --- /dev/null +++ b/nezha-fronted/src/components/common/js/Xterm.js @@ -0,0 +1,7 @@ +import { Terminal } from 'xterm' +import * as fit from 'xterm/lib/addons/fit/fit' +import * as attach from 'xterm/lib/addons/attach/attach' +Terminal.applyAddon(fit) +Terminal.applyAddon(attach) + +export default Terminal \ No newline at end of file diff --git a/nezha-fronted/src/main.js b/nezha-fronted/src/main.js index e2952bd85..a80bc0bc1 100644 --- a/nezha-fronted/src/main.js +++ b/nezha-fronted/src/main.js @@ -95,7 +95,7 @@ router.beforeEach((to, from, next) => { if (to.path === '/login') { next() } else { - let token = sessionStorage.getItem('token'); + let token = sessionStorage.getItem('nz-token'); if (token) { next() } else {