From dbe17fbc04bbd8383c58e44806e03be004e8e509 Mon Sep 17 00:00:00 2001 From: ibuler Date: Wed, 27 May 2020 19:29:49 +0800 Subject: [PATCH] =?UTF-8?q?[Update]=20=E4=BF=AE=E6=94=B9core?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 4 + .env.production | 5 + src/assets/img/robot.png | Bin 0 -> 6327 bytes src/components/SummaryCard/index.vue | 4 +- .../components/NavHeader/AccountDropdown.vue | 2 +- src/permission.js | 4 +- src/router/index.js | 2 +- src/utils/request.js | 2 +- src/views/404.vue | 260 ++++-------------- src/views/dashboard/ResourceSummary.vue | 8 +- src/views/sessions/SessionList/BaseList.vue | 2 +- .../ChangeAuthPlanExecutionTaskList.vue | 3 +- vue.config.js | 2 +- 13 files changed, 77 insertions(+), 221 deletions(-) create mode 100644 src/assets/img/robot.png diff --git a/.env.development b/.env.development index bd407f28f..b421e3c41 100644 --- a/.env.development +++ b/.env.development @@ -12,3 +12,7 @@ VUE_APP_BASE_API = '/rpc' # Detail: https://github.com/vuejs/vue-cli/blob/dev/packages/@vue/babel-preset-app/index.js VUE_CLI_BABEL_TRANSPILE_MODULES = true + +# External auth +LOGIN_PATH = '/core/auth/login/' +LOGOUT_PATH = '/core/auth/logout/' diff --git a/.env.production b/.env.production index 38338dee0..8a085506a 100644 --- a/.env.production +++ b/.env.production @@ -1,5 +1,10 @@ # just a flag ENV = 'production' + # base api VUE_APP_BASE_API = '/' +# External auth +LOGIN_PATH = '/core/auth/login/' +LOGOUT_PATH = '/core/auth/logout/ + diff --git a/src/assets/img/robot.png b/src/assets/img/robot.png new file mode 100644 index 0000000000000000000000000000000000000000..e3bdb6e83bfcef0067b43f064de07e281cab2342 GIT binary patch literal 6327 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

- + {{ body.count }} - +

{{ body.comment }} diff --git a/src/layout/components/NavHeader/AccountDropdown.vue b/src/layout/components/NavHeader/AccountDropdown.vue index 87c887a62..24f5828de 100644 --- a/src/layout/components/NavHeader/AccountDropdown.vue +++ b/src/layout/components/NavHeader/AccountDropdown.vue @@ -62,7 +62,7 @@ export default { window.location.href = `/` break case 'logout': - window.location.href = `/auth/logout/?next=${this.$route.fullPath}` + window.location.href = `/core/auth/logout/?next=${this.$route.fullPath}` break case 'apiKey': this.$refs.api.showApi() diff --git a/src/permission.js b/src/permission.js index 8d8a023b9..aef219137 100644 --- a/src/permission.js +++ b/src/permission.js @@ -11,7 +11,7 @@ NProgress.configure({ showSpinner: false }) // NProgress Configuration -const whiteList = ['/login', '/auth/login/'] // no redirect whitelist +const whiteList = ['/login'] // no redirect whitelist router.beforeEach(async(to, from, next) => { // start progress bar @@ -29,7 +29,7 @@ router.beforeEach(async(to, from, next) => { next() } else { // other pages that do not have permission to access are redirected to the login page. - next(`/auth/login/`) + next(process.env.LOGIN_PATH) NProgress.done() return } diff --git a/src/router/index.js b/src/router/index.js index 48b9599cf..6b3434889 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -237,7 +237,7 @@ export const userRoutes = [ const createRouter = () => new Router({ // mode: 'history', // require service support scrollBehavior: () => ({ y: 0 }), - mode: 'history', + // mode: 'history', base: '/ui/', routes: constantRoutes }) diff --git a/src/utils/request.js b/src/utils/request.js index ec8c4f8a4..7a5640b90 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -70,7 +70,7 @@ service.interceptors.response.use( const response = error.response if (response.status === 401) { // 未授权重定向到登录页面 - window.location = '/auth/login/' + window.location = process.env.LOGIN_PATH // const title = '' // const msg = i18n.t('auth.LoginRequiredMsg') // MessageBox.confirm(msg, title, { diff --git a/src/views/404.vue b/src/views/404.vue index 1791f55a3..dee0f7621 100644 --- a/src/views/404.vue +++ b/src/views/404.vue @@ -1,21 +1,12 @@ @@ -33,196 +24,51 @@ export default { diff --git a/src/views/dashboard/ResourceSummary.vue b/src/views/dashboard/ResourceSummary.vue index 1e4efa219..2c54e88aa 100644 --- a/src/views/dashboard/ResourceSummary.vue +++ b/src/views/dashboard/ResourceSummary.vue @@ -32,7 +32,7 @@ export default { type: 'success' }, body: { - link: '/users/users', + route: `/users/users`, count: this.counter.total_count_users, comment: 'All users' } @@ -44,7 +44,7 @@ export default { type: 'info' }, body: { - link: '/users/assets', + route: `/assets/assets`, count: this.counter.total_count_assets, comment: 'All assets' } @@ -56,7 +56,7 @@ export default { type: 'primary' }, body: { - link: '/terminal/sessions', + route: `/terminal/sessions`, count: this.counter.total_count_online_users, comment: 'Online users' } @@ -68,7 +68,7 @@ export default { type: 'danger' }, body: { - link: '/terminal/sessions', + route: `/terminal/sessions`, count: this.counter.total_count_online_sessions, comment: 'Online sessions' } diff --git a/src/views/sessions/SessionList/BaseList.vue b/src/views/sessions/SessionList/BaseList.vue index 9c88b960f..ded3339ca 100644 --- a/src/views/sessions/SessionList/BaseList.vue +++ b/src/views/sessions/SessionList/BaseList.vue @@ -2,7 +2,7 @@ -