-
+
-
+
+ v-if="$route.meta.keepAlive"/>
+ v-if="!$route.meta.keepAlive"/>
@@ -38,73 +38,67 @@
diff --git a/src/page/login/userlogin.vue b/src/page/login/userlogin.vue
index 15d7015..b67e37d 100644
--- a/src/page/login/userlogin.vue
+++ b/src/page/login/userlogin.vue
@@ -5,7 +5,7 @@
ref="loginForm"
:model="loginForm"
label-width="0">
-
+
import { mapGetters } from "vuex";
+import website from '@/config/website';
+
export default {
name: "userlogin",
data() {
return {
+ tenantMode: website.tenantMode,
loginForm: {
tenantCode: "000000",
username: "admin",
@@ -62,7 +65,7 @@ export default {
},
loginRules: {
tenantCode: [
- { required: true, message: "请输入租户编号", trigger: "blur" }
+ { required: false, message: "请输入租户编号", trigger: "blur" }
],
username: [
{ required: true, message: "请输入用户名", trigger: "blur" }
diff --git a/src/router/axios.js b/src/router/axios.js
index 75ee549..912fb50 100644
--- a/src/router/axios.js
+++ b/src/router/axios.js
@@ -8,61 +8,64 @@
import axios from 'axios'
import store from '@/store/';
import router from '@/router/router'
-import { serialize } from '@/util/util'
-import { getToken } from '@/util/auth'
-import { Message } from 'element-ui'
+import {serialize} from '@/util/util'
+import {getToken} from '@/util/auth'
+import {Message} from 'element-ui'
import website from '@/config/website';
import NProgress from 'nprogress' // progress bar
import 'nprogress/nprogress.css' // progress bar style
+import {Base64} from 'js-base64';
+
axios.defaults.timeout = 10000;
//返回其他状态吗
axios.defaults.validateStatus = function (status) {
- return status >= 200 && status <= 500; // 默认的
+ return status >= 200 && status <= 500; // 默认的
};
//跨域请求，允许保存cookie
axios.defaults.withCredentials = true;
// NProgress Configuration
NProgress.configure({
- showSpinner: false
+ showSpinner: false
});
//HTTPrequest拦截
axios.interceptors.request.use(config => {
- NProgress.start() // start progress bar
- const meta = (config.meta || {});
- const isToken = meta.isToken === false;
- if (getToken() && !isToken) {
- config.headers['blade-auth'] = 'Bearer ' + getToken() // 让每个请求携带token--['Authorization']为自定义key 请根据实际情况自行修改
- }
- //headers中配置serialize为true开启序列化
- if (config.method === 'post' && meta.isSerialize === true) {
- config.data = serialize(config.data);
- }
- return config
+ NProgress.start() // start progress bar
+ const meta = (config.meta || {});
+ const isToken = meta.isToken === false;
+ config.headers['Authorization'] = `Basic ${Base64.encode(`${website.clientId}:${website.clientSecret}`)}`;
+ if (getToken() && !isToken) {
+ config.headers['Blade-Auth'] = 'bearer ' + getToken() // 让每个请求携带token--['Authorization']为自定义key 请根据实际情况自行修改
+ }
+ //headers中配置serialize为true开启序列化
+ if (config.method === 'post' && meta.isSerialize === true) {
+ config.data = serialize(config.data);
+ }
+ return config
}, error => {
- return Promise.reject(error)
+ return Promise.reject(error)
});
//HTTPresponse拦截
axios.interceptors.response.use(res => {
- NProgress.done();
- const status = res.data.code || 200
- const statusWhiteList = website.statusWhiteList || [];
- const message = res.data.msg || '未知错误';
- //如果在白名单里则自行catch逻辑处理
- if (statusWhiteList.includes(status)) return Promise.reject(res);
- //如果是401则跳转到登录页面
- if (status === 401) store.dispatch('FedLogOut').then(() => router.push({ path: '/login' }));
- // 如果请求为非200否者默认统一处理
- if (status !== 200) {
- Message({
- message: message,
- type: 'error'
- })
- return Promise.reject(new Error(message))
- }
- return res;
+ NProgress.done();
+ const status = res.data.code || 200
+ const statusWhiteList = website.statusWhiteList || [];
+ const message = res.data.msg || '未知错误';
+ //如果在白名单里则自行catch逻辑处理
+ if (statusWhiteList.includes(status)) return Promise.reject(res);
+ //如果是401则跳转到登录页面
+ if (status === 401) store.dispatch('FedLogOut').then(() => router.push({path: '/login'}));
+ // 如果请求为非200否者默认统一处理
+ if (status !== 200) {
+ Message({
+ message: message,
+ type: 'error'
+ })
+ return Promise.reject(new Error(message))
+ }
+ return res;
}, error => {
- NProgress.done();
- return Promise.reject(new Error(error));
+ NProgress.done();
+ return Promise.reject(new Error(error));
})
export default axios;
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 7e12fe3..92c55be 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -1,196 +1,207 @@
-import { setToken, removeToken } from '@/util/auth'
-import { setStore, getStore } from '@/util/store'
-import { isURL, validatenull } from '@/util/validate'
-import { deepClone } from '@/util/util'
+import {setToken, setRefreshToken, removeToken} from '@/util/auth'
+import {setStore, getStore} from '@/util/store'
+import {isURL, validatenull} from '@/util/validate'
+import {deepClone} from '@/util/util'
import webiste from '@/config/website'
-import { loginByUsername, getUserInfo, getMenu, getTopMenu, logout, refeshToken, getButtons } from '@/api/user'
+import {loginByUsername, getUserInfo, getMenu, getTopMenu, logout, refeshToken, getButtons} from '@/api/user'
function addPath(ele, first) {
- const menu = webiste.menu;
- const propsConfig = menu.props;
- const propsDefault = {
- label: propsConfig.label || 'name',
- path: propsConfig.path || 'path',
- icon: propsConfig.icon || 'icon',
- children: propsConfig.children || 'children'
- }
- const icon = ele[propsDefault.icon];
- ele[propsDefault.icon] = validatenull(icon) ? menu.iconDefault : icon;
- const isChild = ele[propsDefault.children] && ele[propsDefault.children].length !== 0;
- if (!isChild) ele[propsDefault.children] = [];
- if (!isChild && first && !isURL(ele[propsDefault.path])) {
- ele[propsDefault.path] = ele[propsDefault.path] + '/index'
- } else {
- ele[propsDefault.children].forEach(child => {
- addPath(child);
- })
- }
+ const menu = webiste.menu;
+ const propsConfig = menu.props;
+ const propsDefault = {
+ label: propsConfig.label || 'name',
+ path: propsConfig.path || 'path',
+ icon: propsConfig.icon || 'icon',
+ children: propsConfig.children || 'children'
+ }
+ const icon = ele[propsDefault.icon];
+ ele[propsDefault.icon] = validatenull(icon) ? menu.iconDefault : icon;
+ const isChild = ele[propsDefault.children] && ele[propsDefault.children].length !== 0;
+ if (!isChild) ele[propsDefault.children] = [];
+ if (!isChild && first && !isURL(ele[propsDefault.path])) {
+ ele[propsDefault.path] = ele[propsDefault.path] + '/index'
+ } else {
+ ele[propsDefault.children].forEach(child => {
+ addPath(child);
+ })
+ }
}
+
const user = {
- state: {
- userInfo: getStore({ name: 'userInfo' }) || [],
- permission: getStore({ name: 'permission' }) || {},
- roles: [],
- menu: getStore({ name: 'menu' }) || [],
- menuAll: [],
- token: getStore({ name: 'token' }) || '',
+ state: {
+ userInfo: getStore({name: 'userInfo'}) || [],
+ permission: getStore({name: 'permission'}) || {},
+ roles: [],
+ menu: getStore({name: 'menu'}) || [],
+ menuAll: [],
+ token: getStore({name: 'token'}) || '',
+ refreshToken: getStore({name: 'refreshToken'}) || '',
+ },
+ actions: {
+ //根据用户名登录
+ LoginByUsername({commit}, userInfo) {
+ return new Promise((resolve) => {
+ loginByUsername(userInfo.tenantCode, userInfo.username, userInfo.password, userInfo.type).then(res => {
+ const data = res.data;
+ commit('SET_TOKEN', data.access_token);
+ commit('SET_REFRESH_TOKEN', data.refresh_token);
+ commit('SET_USERIFNO', data);
+ commit('DEL_ALL_TAG');
+ commit('CLEAR_LOCK');
+ resolve();
+ })
+ })
+ },
+ GetButtons({commit}) {
+ return new Promise((resolve) => {
+ getButtons().then(res => {
+ const data = res.data.data;
+ commit('SET_PERMISSION', data);
+ resolve();
+ })
+ })
+ },
+ //根据手机号登录
+ LoginByPhone({commit}, userInfo) {
+ return new Promise((resolve) => {
+ loginByUsername(userInfo.phone, userInfo.code).then(res => {
+ const data = res.data.data;
+ commit('SET_TOKEN', data);
+ commit('DEL_ALL_TAG');
+ commit('CLEAR_LOCK');
+ resolve();
+ })
+ })
+ },
+ GetUserInfo({commit}) {
+ return new Promise((resolve, reject) => {
+ getUserInfo().then((res) => {
+ const data = res.data.data;
+ commit('SET_ROLES', data.roles);
+ resolve(data);
+ }).catch(err => {
+ reject(err);
+ })
+ })
+ },
+ //刷新token
+ RefeshToken({state, commit}) {
+ return new Promise((resolve, reject) => {
+ refeshToken(state.refreshToken).then(res => {
+ const data = res.data;
+ commit('SET_TOKEN', data.access_token);
+ commit('SET_REFRESH_TOKEN', data.refresh_token);
+ resolve();
+ }).catch(error => {
+ reject(error)
+ })
+ })
+ },
+ // 登出
+ LogOut({commit}) {
+ return new Promise((resolve, reject) => {
+ logout().then(() => {
+ commit('SET_TOKEN', '')
+ commit('SET_MENU', [])
+ commit('SET_ROLES', [])
+ commit('DEL_ALL_TAG');
+ commit('CLEAR_LOCK');
+ removeToken()
+ resolve()
+ }).catch(error => {
+ reject(error)
+ })
+ })
+ },
+ //注销session
+ FedLogOut({commit}) {
+ return new Promise(resolve => {
+ commit('SET_TOKEN', '')
+ commit('SET_MENU', [])
+ commit('SET_ROLES', [])
+ commit('DEL_ALL_TAG');
+ commit('CLEAR_LOCK');
+ removeToken()
+ resolve()
+ })
+ },
+ GetTopMenu() {
+ return new Promise(resolve => {
+ getTopMenu().then((res) => {
+ const data = res.data.data || []
+ resolve(data)
+ })
+ })
+ },
+ //获取系统菜单
+ GetMenu({commit, dispatch}, parentId) {
+ return new Promise(resolve => {
+ getMenu(parentId).then((res) => {
+ const data = res.data.data
+ let menu = deepClone(data);
+ menu.forEach(ele => {
+ addPath(ele, true);
+ })
+ commit('SET_MENU', menu)
+ dispatch('GetButtons');
+ resolve(menu)
+ })
+ })
+ },
+ },
+ mutations: {
+ SET_TOKEN: (state, token) => {
+ setToken(token)
+ state.token = token;
+ setStore({name: 'token', content: state.token, type: 'session'})
},
- actions: {
- //根据用户名登录
- LoginByUsername({ commit }, userInfo) {
- return new Promise((resolve) => {
- loginByUsername(userInfo.tenantCode, userInfo.username, userInfo.password, userInfo.type).then(res => {
- const data = res.data.data;
- commit('SET_TOKEN', data.accessToken);
- commit('SET_USERIFNO', data);
- commit('DEL_ALL_TAG');
- commit('CLEAR_LOCK');
- resolve();
- })
- })
- },
- GetButtons({ commit }) {
- return new Promise((resolve) => {
- getButtons().then(res => {
- const data = res.data.data;
- commit('SET_PERMISSION', data);
- resolve();
- })
- })
- },
- //根据手机号登录
- LoginByPhone({ commit }, userInfo) {
- return new Promise((resolve) => {
- loginByUsername(userInfo.phone, userInfo.code).then(res => {
- const data = res.data.data;
- commit('SET_TOKEN', data);
- commit('DEL_ALL_TAG');
- commit('CLEAR_LOCK');
- resolve();
- })
- })
- },
- GetUserInfo({ commit }) {
- return new Promise((resolve, reject) => {
- getUserInfo().then((res) => {
- const data = res.data.data;
- commit('SET_ROLES', data.roles);
- resolve(data);
- }).catch(err => {
- reject(err);
- })
- })
- },
- //刷新token
- RefeshToken({ state, commit }) {
- return new Promise((resolve, reject) => {
- refeshToken(state.refeshToken).then(res => {
- const data = res.data.data;
- commit('SET_TOKEN', data);
- resolve(data);
- }).catch(error => {
- reject(error)
- })
- })
- },
- // 登出
- LogOut({ commit }) {
- return new Promise((resolve, reject) => {
- logout().then(() => {
- commit('SET_TOKEN', '')
- commit('SET_MENU', [])
- commit('SET_ROLES', [])
- commit('DEL_ALL_TAG');
- commit('CLEAR_LOCK');
- removeToken()
- resolve()
- }).catch(error => {
- reject(error)
- })
- })
- },
- //注销session
- FedLogOut({ commit }) {
- return new Promise(resolve => {
- commit('SET_TOKEN', '')
- commit('SET_MENU', [])
- commit('SET_ROLES', [])
- commit('DEL_ALL_TAG');
- commit('CLEAR_LOCK');
- removeToken()
- resolve()
- })
- },
- GetTopMenu() {
- return new Promise(resolve => {
- getTopMenu().then((res) => {
- const data = res.data.data || []
- resolve(data)
- })
- })
- },
- //获取系统菜单
- GetMenu({ commit, dispatch }, parentId) {
- return new Promise(resolve => {
- getMenu(parentId).then((res) => {
- const data = res.data.data
- let menu = deepClone(data);
- menu.forEach(ele => {
- addPath(ele, true);
- })
- commit('SET_MENU', menu)
- dispatch('GetButtons');
- resolve(menu)
- })
- })
- },
+ SET_REFRESH_TOKEN: (state, refreshToken) => {
+ setRefreshToken(refreshToken)
+ state.refreshToken = refreshToken;
+ setStore({name: 'refreshToken', content: state.refreshToken, type: 'session'})
},
- mutations: {
- SET_TOKEN: (state, token) => {
- setToken(token)
- state.token = token;
- setStore({ name: 'token', content: state.token, type: 'session' })
- },
- SET_USERIFNO: (state, userInfo) => {
- state.userInfo = userInfo;
- setStore({ name: 'userInfo', content: state.userInfo })
- },
- SET_MENU: (state, menu) => {
- state.menu = menu
- setStore({ name: 'menu', content: state.menu, type: 'session' })
- },
- SET_MENU_ALL: (state, menuAll) => {
- state.menuAll = menuAll;
- },
- SET_ROLES: (state, roles) => {
- state.roles = roles;
- },
- SET_PERMISSION: (state, permission) => {
- let result = [];
- function getCode(list) {
- list.forEach(ele => {
- if (typeof (ele) === 'object') {
- const chiildren = ele.children;
- const code = ele.code;
- if (chiildren) {
- getCode(chiildren)
- } else {
- result.push(code);
- }
- }
+ SET_USERIFNO: (state, userInfo) => {
+ state.userInfo = userInfo;
+ setStore({name: 'userInfo', content: state.userInfo})
+ },
+ SET_MENU: (state, menu) => {
+ state.menu = menu
+ setStore({name: 'menu', content: state.menu, type: 'session'})
+ },
+ SET_MENU_ALL: (state, menuAll) => {
+ state.menuAll = menuAll;
+ },
+ SET_ROLES: (state, roles) => {
+ state.roles = roles;
+ },
+ SET_PERMISSION: (state, permission) => {
+ let result = [];
- })
+ function getCode(list) {
+ list.forEach(ele => {
+ if (typeof (ele) === 'object') {
+ const chiildren = ele.children;
+ const code = ele.code;
+ if (chiildren) {
+ getCode(chiildren)
+ } else {
+ result.push(code);
}
- getCode(permission);
- state.permission = {};
- result.forEach(ele => {
- state.permission[ele] = true;
- });
- setStore({ name: 'permission', content: state.permission, type: 'session' })
- }
+ }
+
+ })
+ }
+
+ getCode(permission);
+ state.permission = {};
+ result.forEach(ele => {
+ state.permission[ele] = true;
+ });
+ setStore({name: 'permission', content: state.permission, type: 'session'})
}
+ }
}
export default user
diff --git a/src/util/auth.js b/src/util/auth.js
index 63c2222..5ffeb0f 100644
--- a/src/util/auth.js
+++ b/src/util/auth.js
@@ -1,5 +1,6 @@
import Cookies from 'js-cookie'
const TokenKey = 'x-access-token'
+const RefreshTokenKey = 'x-refresh-token'
var inFifteenMinutes = new Date(new Date().getTime() + 120 * 60 * 1000);
export function getToken() {
return Cookies.get(TokenKey)
@@ -9,6 +10,14 @@ export function setToken(token) {
return Cookies.set(TokenKey, token, { expires: inFifteenMinutes })
}
+export function getRefreshToken() {
+ return Cookies.get(RefreshTokenKey)
+}
+
+export function setRefreshToken(token) {
+ return Cookies.set(RefreshTokenKey, token)
+}
+
export function removeToken() {
return Cookies.remove(TokenKey)
-}
\ No newline at end of file
+}
diff --git a/src/views/system/client.vue b/src/views/system/client.vue
new file mode 100644
index 0000000..8320bb6
--- /dev/null
+++ b/src/views/system/client.vue
@@ -0,0 +1,273 @@
+
+
+
+
+ 删 除
+
+
+
+
+
+
+
+
+
diff --git a/vue.config.js b/vue.config.js
index 7018ac1..ebfd9fe 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -1,5 +1,3 @@
-// 基础路径 注意发布之前要先修改这里
-let url = 'http://localhost:8800'
module.exports = {
lintOnSave: true,
productionSourceMap: false,
@@ -26,7 +24,7 @@ module.exports = {
devServer: {
proxy: {
'/api': {
- target: url,
+ target: 'http://localhost',
ws: true,
pathRewrite: {
'^/api': '/'