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 000000000..e3bdb6e83 Binary files /dev/null and b/src/assets/img/robot.png differ diff --git a/src/components/SummaryCard/index.vue b/src/components/SummaryCard/index.vue index ce5877a03..3562fba98 100644 --- a/src/components/SummaryCard/index.vue +++ b/src/components/SummaryCard/index.vue @@ -10,9 +10,9 @@

- + {{ 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 @@ -