👌 安排oauth2模块

pull/59/head
smallchill 7 years ago
parent 7b7d08db01
commit 5ad248e418
  1. 55
      package-lock.json
  2. 93
      package.json
  3. 50
      src/api/system/client.js
  4. 27
      src/api/user.js
  5. 61
      src/config/website.js
  6. 134
      src/page/index/index.vue
  7. 7
      src/page/login/userlogin.vue
  8. 75
      src/router/axios.js
  9. 373
      src/store/modules/user.js
  10. 11
      src/util/auth.js
  11. 273
      src/views/system/client.vue
  12. 4
      vue.config.js

55
package-lock.json generated

@ -2713,7 +2713,8 @@
"version": "4.6.0", "version": "4.6.0",
"resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz", "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
"integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=", "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=",
"dev": true "dev": true,
"optional": true
}, },
"coa": { "coa": {
"version": "2.0.2", "version": "2.0.2",
@ -4851,7 +4852,8 @@
"ansi-regex": { "ansi-regex": {
"version": "2.1.1", "version": "2.1.1",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"aproba": { "aproba": {
"version": "1.2.0", "version": "1.2.0",
@ -4872,12 +4874,14 @@
"balanced-match": { "balanced-match": {
"version": "1.0.0", "version": "1.0.0",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"brace-expansion": { "brace-expansion": {
"version": "1.1.11", "version": "1.1.11",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"balanced-match": "^1.0.0", "balanced-match": "^1.0.0",
"concat-map": "0.0.1" "concat-map": "0.0.1"
@ -4892,17 +4896,20 @@
"code-point-at": { "code-point-at": {
"version": "1.1.0", "version": "1.1.0",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"concat-map": { "concat-map": {
"version": "0.0.1", "version": "0.0.1",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"console-control-strings": { "console-control-strings": {
"version": "1.1.0", "version": "1.1.0",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"core-util-is": { "core-util-is": {
"version": "1.0.2", "version": "1.0.2",
@ -5019,7 +5026,8 @@
"inherits": { "inherits": {
"version": "2.0.3", "version": "2.0.3",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"ini": { "ini": {
"version": "1.3.5", "version": "1.3.5",
@ -5031,6 +5039,7 @@
"version": "1.0.0", "version": "1.0.0",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"number-is-nan": "^1.0.0" "number-is-nan": "^1.0.0"
} }
@ -5045,6 +5054,7 @@
"version": "3.0.4", "version": "3.0.4",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"brace-expansion": "^1.1.7" "brace-expansion": "^1.1.7"
} }
@ -5052,12 +5062,14 @@
"minimist": { "minimist": {
"version": "0.0.8", "version": "0.0.8",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"minipass": { "minipass": {
"version": "2.3.5", "version": "2.3.5",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"safe-buffer": "^5.1.2", "safe-buffer": "^5.1.2",
"yallist": "^3.0.0" "yallist": "^3.0.0"
@ -5076,6 +5088,7 @@
"version": "0.5.1", "version": "0.5.1",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"minimist": "0.0.8" "minimist": "0.0.8"
} }
@ -5156,7 +5169,8 @@
"number-is-nan": { "number-is-nan": {
"version": "1.0.1", "version": "1.0.1",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"object-assign": { "object-assign": {
"version": "4.1.1", "version": "4.1.1",
@ -5168,6 +5182,7 @@
"version": "1.4.0", "version": "1.4.0",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"wrappy": "1" "wrappy": "1"
} }
@ -5253,7 +5268,8 @@
"safe-buffer": { "safe-buffer": {
"version": "5.1.2", "version": "5.1.2",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"safer-buffer": { "safer-buffer": {
"version": "2.1.2", "version": "2.1.2",
@ -5289,6 +5305,7 @@
"version": "1.0.2", "version": "1.0.2",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"code-point-at": "^1.0.0", "code-point-at": "^1.0.0",
"is-fullwidth-code-point": "^1.0.0", "is-fullwidth-code-point": "^1.0.0",
@ -5308,6 +5325,7 @@
"version": "3.0.1", "version": "3.0.1",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"ansi-regex": "^2.0.0" "ansi-regex": "^2.0.0"
} }
@ -5351,12 +5369,14 @@
"wrappy": { "wrappy": {
"version": "1.0.2", "version": "1.0.2",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"yallist": { "yallist": {
"version": "3.0.3", "version": "3.0.3",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
} }
} }
}, },
@ -6557,8 +6577,7 @@
"js-base64": { "js-base64": {
"version": "2.5.1", "version": "2.5.1",
"resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.5.1.tgz", "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.5.1.tgz",
"integrity": "sha512-M7kLczedRMYX4L8Mdh4MzyAMM9O5osx+4FcOQuTvr3A9F2D9S5JXheN0ewNbrvK2UatkTRhL5ejGmGSjNMiZuw==", "integrity": "sha512-M7kLczedRMYX4L8Mdh4MzyAMM9O5osx+4FcOQuTvr3A9F2D9S5JXheN0ewNbrvK2UatkTRhL5ejGmGSjNMiZuw=="
"dev": true
}, },
"js-cookie": { "js-cookie": {
"version": "2.2.0", "version": "2.2.0",
@ -6732,6 +6751,7 @@
"resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz", "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
"integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=", "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"prelude-ls": "~1.1.2", "prelude-ls": "~1.1.2",
"type-check": "~0.3.2" "type-check": "~0.3.2"
@ -8746,7 +8766,8 @@
"version": "1.1.2", "version": "1.1.2",
"resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz", "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
"integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=", "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=",
"dev": true "dev": true,
"optional": true
}, },
"prettier": { "prettier": {
"version": "1.16.3", "version": "1.16.3",
@ -9448,7 +9469,8 @@
"version": "4.0.8", "version": "4.0.8",
"resolved": "https://registry.npmjs.org/rx-lite/-/rx-lite-4.0.8.tgz", "resolved": "https://registry.npmjs.org/rx-lite/-/rx-lite-4.0.8.tgz",
"integrity": "sha1-Cx4Rr4vESDbwSmQH6S2kJGe3lEQ=", "integrity": "sha1-Cx4Rr4vESDbwSmQH6S2kJGe3lEQ=",
"dev": true "dev": true,
"optional": true
}, },
"rx-lite-aggregates": { "rx-lite-aggregates": {
"version": "4.0.8", "version": "4.0.8",
@ -10834,6 +10856,7 @@
"resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz", "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
"integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=", "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"prelude-ls": "~1.1.2" "prelude-ls": "~1.1.2"
} }

@ -1,48 +1,49 @@
{ {
"name": "saber-admin", "name": "saber-admin",
"version": "1.0.0", "version": "1.0.0",
"private": true, "private": true,
"scripts": { "scripts": {
"serve": "vue-cli-service serve", "serve": "vue-cli-service serve",
"build": "vue-cli-service build", "build": "vue-cli-service build",
"lint": "vue-cli-service lint", "lint": "vue-cli-service lint",
"analyz": "npm_config_report=true npm run build", "analyz": "npm_config_report=true npm run build",
"test:unit": "vue-cli-service test:unit", "test:unit": "vue-cli-service test:unit",
"test:e2e": "vue-cli-service test:e2e" "test:e2e": "vue-cli-service test:e2e"
}, },
"dependencies": { "dependencies": {
"axios": "^0.18.0", "axios": "^0.18.0",
"babel-polyfill": "^6.26.0", "babel-polyfill": "^6.26.0",
"classlist-polyfill": "^1.2.0", "classlist-polyfill": "^1.2.0",
"element-ui": "^2.4.5", "element-ui": "^2.4.5",
"js-cookie": "^2.2.0", "js-cookie": "^2.2.0",
"mockjs": "^1.0.1-beta3", "mockjs": "^1.0.1-beta3",
"nprogress": "^0.2.0", "nprogress": "^0.2.0",
"script-loader": "^0.7.2", "script-loader": "^0.7.2",
"vue": "^2.5.16", "vue": "^2.5.16",
"vue-axios": "^2.1.2", "vue-axios": "^2.1.2",
"vue-i18n": "^8.7.0", "vue-i18n": "^8.7.0",
"vue-router": "^3.0.1", "vue-router": "^3.0.1",
"vuex": "^3.0.1" "vuex": "^3.0.1",
}, "js-base64": "^2.5.1"
"devDependencies": { },
"@vue/cli-plugin-babel": "^3.1.1", "devDependencies": {
"@vue/cli-plugin-eslint": "^3.1.5", "@vue/cli-plugin-babel": "^3.1.1",
"@vue/cli-service": "^3.1.4", "@vue/cli-plugin-eslint": "^3.1.5",
"chai": "^4.1.2", "@vue/cli-service": "^3.1.4",
"node-sass": "^4.9.0", "chai": "^4.1.2",
"sass-loader": "^7.0.1", "node-sass": "^4.9.0",
"vue-template-compiler": "^2.5.17", "sass-loader": "^7.0.1",
"webpack-bundle-analyzer": "^3.0.3" "vue-template-compiler": "^2.5.17",
}, "webpack-bundle-analyzer": "^3.0.3"
"lint-staged": { },
"*.js": [ "lint-staged": {
"vue-cli-service lint", "*.js": [
"git add" "vue-cli-service lint",
], "git add"
"*.vue": [ ],
"vue-cli-service lint", "*.vue": [
"git add" "vue-cli-service lint",
] "git add"
} ]
}
} }

@ -0,0 +1,50 @@
import request from '@/router/axios';
export const getList = (current, size, params) => {
return request({
url: '/api/blade-system/client/list',
method: 'get',
params: {
...params,
current,
size,
}
})
}
export const getDetail = (id) => {
return request({
url: '/api/blade-system/client/detail',
method: 'get',
params: {
id
}
})
}
export const remove = (ids) => {
return request({
url: '/api/blade-system/client/remove',
method: 'post',
params: {
ids,
}
})
}
export const add = (row) => {
return request({
url: '/api/blade-system/client/submit',
method: 'post',
data: row
})
}
export const update = (row) => {
return request({
url: '/api/blade-system/client/submit',
method: 'post',
data: row
})
}

@ -1,17 +1,31 @@
import request from '@/router/axios'; import request from '@/router/axios';
import {baseUrl} from '@/config/env'; import {baseUrl} from '@/config/env';
export const loginByUsername = (tenantCode, account, password, type) => request({ export const loginByUsername = (tenantCode, username, password, type) => request({
url: '/api/blade-auth/token', url: '/api/blade-auth/oauth/token',
method: 'post', method: 'post',
headers: {
'Tenant-Code': tenantCode
},
params: { params: {
tenantCode, username,
account,
password, password,
grant_type: "password",
scope: "all",
type type
} }
}) })
export const refeshToken = (refresh_token) => request({
url: '/api/blade-auth/oauth/token',
method: 'post',
params: {
refresh_token,
grant_type: "refresh_token",
scope: "all",
}
})
export const getButtons = () => request({ export const getButtons = () => request({
url: '/api/blade-system/menu/buttons', url: '/api/blade-system/menu/buttons',
method: 'get' method: 'get'
@ -22,11 +36,6 @@ export const getUserInfo = () => request({
method: 'get' method: 'get'
}); });
export const refeshToken = () => request({
url: baseUrl + '/user/refesh',
method: 'post'
})
export const getMenu = () => request({ export const getMenu = () => request({
url: '/api/blade-system/menu/routes', url: '/api/blade-system/menu/routes',
method: 'get' method: 'get'

@ -2,35 +2,38 @@
* 全局配置文件 * 全局配置文件
*/ */
export default { export default {
title: "saber", title: "saber",
logo: "S", logo: "S",
key: 'saber',//配置主键,目前用于存储 key: 'saber',//配置主键,目前用于存储
indexTitle: 'Saber Admin', indexTitle: 'Saber Admin',
lockPage: '/lock', clientId: 'saber', // 客户端id
tokenTime: 6000, clientSecret: 'saber_secret', // 客户端密钥
//http的status默认放行不才用统一处理的, tenantMode: true, // 是否开启租户模式
statusWhiteList: [], lockPage: '/lock',
//配置首页不可关闭 tokenTime: 1500,
isFirstPage: false, //http的status默认放行不才用统一处理的,
fistPage: { statusWhiteList: [],
label: "首页", //配置首页不可关闭
value: "/wel/index", isFirstPage: false,
params: {}, fistPage: {
query: {}, label: "首页",
meta: { value: "/wel/index",
i18n: 'dashboard' params: {},
}, query: {},
group: [], meta: {
close: false i18n: 'dashboard'
}, },
//配置菜单的属性 group: [],
menu: { close: false
iconDefault: 'iconfont icon-caidan', },
props: { //配置菜单的属性
label: 'name', menu: {
path: 'path', iconDefault: 'iconfont icon-caidan',
icon: 'source', props: {
children: 'children' label: 'name',
} path: 'path',
icon: 'source',
children: 'children'
} }
}
} }

@ -3,25 +3,25 @@
:class="{'avue--collapse':isCollapse}"> :class="{'avue--collapse':isCollapse}">
<div class="avue-header"> <div class="avue-header">
<!-- 顶部导航栏 --> <!-- 顶部导航栏 -->
<top /> <top/>
</div> </div>
<div class="avue-layout"> <div class="avue-layout">
<div class="avue-left"> <div class="avue-left">
<!-- 左侧导航栏 --> <!-- 左侧导航栏 -->
<sidebar /> <sidebar/>
</div> </div>
<div class="avue-main"> <div class="avue-main">
<!-- 顶部标签卡 --> <!-- 顶部标签卡 -->
<tags /> <tags/>
<!-- 主体视图层 --> <!-- 主体视图层 -->
<el-scrollbar style="height:100%"> <el-scrollbar style="height:100%">
<keep-alive> <keep-alive>
<router-view class="avue-view" <router-view class="avue-view"
v-if="$route.meta.keepAlive" /> v-if="$route.meta.keepAlive"/>
</keep-alive> </keep-alive>
<router-view class="avue-view" <router-view class="avue-view"
v-if="!$route.meta.keepAlive" /> v-if="!$route.meta.keepAlive"/>
</el-scrollbar> </el-scrollbar>
</div> </div>
@ -38,73 +38,67 @@
</template> </template>
<script> <script>
import { mapGetters } from "vuex"; import {mapGetters} from "vuex";
import tags from "./tags"; import tags from "./tags";
import top from "./top/"; import top from "./top/";
import sidebar from "./sidebar/"; import sidebar from "./sidebar/";
import admin from "@/util/admin"; import admin from "@/util/admin";
// import { validatenull } from "@/util/validate"; // import { validatenull } from "@/util/validate";
// import { calcDate } from "@/util/date.js"; // import { calcDate } from "@/util/date.js";
// import { getStore } from "@/util/store.js"; // import { getStore } from "@/util/store.js";
export default { export default {
components: { components: {
top, top,
tags, tags,
sidebar sidebar
},
name: "index",
data() {
return {
//token
refreshLock: false,
//token
refreshTime: ""
};
},
created() {
//token
this.refreshToken();
},
mounted() {
this.init();
},
computed: mapGetters(["isLock", "isCollapse", "website"]),
props: [],
methods: {
showCollapse() {
this.$store.commit("SET_COLLAPSE");
}, },
// name: "index",
init() { data() {
this.$store.commit("SET_SCREEN", admin.getScreen()); return {
window.onresize = () => { //token
setTimeout(() => { refreshLock: false,
this.$store.commit("SET_SCREEN", admin.getScreen()); //token
}, 0); refreshTime: ""
}; };
}, },
// 10token created() {
refreshToken() { //token
/*this.refreshTime = setInterval(() => { this.refreshToken();
const token = getStore({ },
name: "token", mounted() {
debug: true this.init();
}); },
const date = calcDate(token.datetime, new Date().getTime()); computed: mapGetters(["isLock", "isCollapse", "website"]),
if (validatenull(date)) return; props: [],
if (!(date.seconds >= this.website.tokenTime) && !this.refreshLock) { methods: {
this.refreshLock = true; showCollapse() {
this.$store this.$store.commit("SET_COLLAPSE");
.dispatch("RefeshToken") },
.then(() => { //
this.refreshLock = false; init() {
}) this.$store.commit("SET_SCREEN", admin.getScreen());
.catch(() => { window.onresize = () => {
this.refreshLock = false; setTimeout(() => {
}); this.$store.commit("SET_SCREEN", admin.getScreen());
} }, 0);
}, 10000);*/ };
},
// token
refreshToken() {
/*this.refreshTime = setInterval(() => {
if (!this.refreshLock) {
this.refreshLock = true;
this.$store
.dispatch("RefeshToken")
.then(() => {
this.refreshLock = false;
})
.catch(() => {
this.refreshLock = false;
});
}
}, this.website.tokenTime * 1000);*/
}
} }
} };
};
</script> </script>

@ -5,7 +5,7 @@
ref="loginForm" ref="loginForm"
:model="loginForm" :model="loginForm"
label-width="0"> label-width="0">
<el-form-item prop="tenantCode"> <el-form-item v-if="tenantMode" prop="tenantCode">
<el-input size="small" <el-input size="small"
@keyup.enter.native="handleLogin" @keyup.enter.native="handleLogin"
v-model="loginForm.tenantCode" v-model="loginForm.tenantCode"
@ -50,10 +50,13 @@
<script> <script>
import { mapGetters } from "vuex"; import { mapGetters } from "vuex";
import website from '@/config/website';
export default { export default {
name: "userlogin", name: "userlogin",
data() { data() {
return { return {
tenantMode: website.tenantMode,
loginForm: { loginForm: {
tenantCode: "000000", tenantCode: "000000",
username: "admin", username: "admin",
@ -62,7 +65,7 @@ export default {
}, },
loginRules: { loginRules: {
tenantCode: [ tenantCode: [
{ required: true, message: "请输入租户编号", trigger: "blur" } { required: false, message: "请输入租户编号", trigger: "blur" }
], ],
username: [ username: [
{ required: true, message: "请输入用户名", trigger: "blur" } { required: true, message: "请输入用户名", trigger: "blur" }

@ -8,61 +8,64 @@
import axios from 'axios' import axios from 'axios'
import store from '@/store/'; import store from '@/store/';
import router from '@/router/router' import router from '@/router/router'
import { serialize } from '@/util/util' import {serialize} from '@/util/util'
import { getToken } from '@/util/auth' import {getToken} from '@/util/auth'
import { Message } from 'element-ui' import {Message} from 'element-ui'
import website from '@/config/website'; import website from '@/config/website';
import NProgress from 'nprogress' // progress bar import NProgress from 'nprogress' // progress bar
import 'nprogress/nprogress.css' // progress bar style import 'nprogress/nprogress.css' // progress bar style
import {Base64} from 'js-base64';
axios.defaults.timeout = 10000; axios.defaults.timeout = 10000;
//返回其他状态吗 //返回其他状态吗
axios.defaults.validateStatus = function (status) { axios.defaults.validateStatus = function (status) {
return status >= 200 && status <= 500; // 默认的 return status >= 200 && status <= 500; // 默认的
}; };
//跨域请求,允许保存cookie //跨域请求,允许保存cookie
axios.defaults.withCredentials = true; axios.defaults.withCredentials = true;
// NProgress Configuration // NProgress Configuration
NProgress.configure({ NProgress.configure({
showSpinner: false showSpinner: false
}); });
//HTTPrequest拦截 //HTTPrequest拦截
axios.interceptors.request.use(config => { axios.interceptors.request.use(config => {
NProgress.start() // start progress bar NProgress.start() // start progress bar
const meta = (config.meta || {}); const meta = (config.meta || {});
const isToken = meta.isToken === false; const isToken = meta.isToken === false;
if (getToken() && !isToken) { config.headers['Authorization'] = `Basic ${Base64.encode(`${website.clientId}:${website.clientSecret}`)}`;
config.headers['blade-auth'] = 'Bearer ' + getToken() // 让每个请求携带token--['Authorization']为自定义key 请根据实际情况自行修改 if (getToken() && !isToken) {
} config.headers['Blade-Auth'] = 'bearer ' + getToken() // 让每个请求携带token--['Authorization']为自定义key 请根据实际情况自行修改
//headers中配置serialize为true开启序列化 }
if (config.method === 'post' && meta.isSerialize === true) { //headers中配置serialize为true开启序列化
config.data = serialize(config.data); if (config.method === 'post' && meta.isSerialize === true) {
} config.data = serialize(config.data);
return config }
return config
}, error => { }, error => {
return Promise.reject(error) return Promise.reject(error)
}); });
//HTTPresponse拦截 //HTTPresponse拦截
axios.interceptors.response.use(res => { axios.interceptors.response.use(res => {
NProgress.done(); NProgress.done();
const status = res.data.code || 200 const status = res.data.code || 200
const statusWhiteList = website.statusWhiteList || []; const statusWhiteList = website.statusWhiteList || [];
const message = res.data.msg || '未知错误'; const message = res.data.msg || '未知错误';
//如果在白名单里则自行catch逻辑处理 //如果在白名单里则自行catch逻辑处理
if (statusWhiteList.includes(status)) return Promise.reject(res); if (statusWhiteList.includes(status)) return Promise.reject(res);
//如果是401则跳转到登录页面 //如果是401则跳转到登录页面
if (status === 401) store.dispatch('FedLogOut').then(() => router.push({ path: '/login' })); if (status === 401) store.dispatch('FedLogOut').then(() => router.push({path: '/login'}));
// 如果请求为非200否者默认统一处理 // 如果请求为非200否者默认统一处理
if (status !== 200) { if (status !== 200) {
Message({ Message({
message: message, message: message,
type: 'error' type: 'error'
}) })
return Promise.reject(new Error(message)) return Promise.reject(new Error(message))
} }
return res; return res;
}, error => { }, error => {
NProgress.done(); NProgress.done();
return Promise.reject(new Error(error)); return Promise.reject(new Error(error));
}) })
export default axios; export default axios;

@ -1,196 +1,207 @@
import { setToken, removeToken } from '@/util/auth' import {setToken, setRefreshToken, removeToken} from '@/util/auth'
import { setStore, getStore } from '@/util/store' import {setStore, getStore} from '@/util/store'
import { isURL, validatenull } from '@/util/validate' import {isURL, validatenull} from '@/util/validate'
import { deepClone } from '@/util/util' import {deepClone} from '@/util/util'
import webiste from '@/config/website' 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) { function addPath(ele, first) {
const menu = webiste.menu; const menu = webiste.menu;
const propsConfig = menu.props; const propsConfig = menu.props;
const propsDefault = { const propsDefault = {
label: propsConfig.label || 'name', label: propsConfig.label || 'name',
path: propsConfig.path || 'path', path: propsConfig.path || 'path',
icon: propsConfig.icon || 'icon', icon: propsConfig.icon || 'icon',
children: propsConfig.children || 'children' children: propsConfig.children || 'children'
} }
const icon = ele[propsDefault.icon]; const icon = ele[propsDefault.icon];
ele[propsDefault.icon] = validatenull(icon) ? menu.iconDefault : icon; ele[propsDefault.icon] = validatenull(icon) ? menu.iconDefault : icon;
const isChild = ele[propsDefault.children] && ele[propsDefault.children].length !== 0; const isChild = ele[propsDefault.children] && ele[propsDefault.children].length !== 0;
if (!isChild) ele[propsDefault.children] = []; if (!isChild) ele[propsDefault.children] = [];
if (!isChild && first && !isURL(ele[propsDefault.path])) { if (!isChild && first && !isURL(ele[propsDefault.path])) {
ele[propsDefault.path] = ele[propsDefault.path] + '/index' ele[propsDefault.path] = ele[propsDefault.path] + '/index'
} else { } else {
ele[propsDefault.children].forEach(child => { ele[propsDefault.children].forEach(child => {
addPath(child); addPath(child);
}) })
} }
} }
const user = { const user = {
state: { state: {
userInfo: getStore({ name: 'userInfo' }) || [], userInfo: getStore({name: 'userInfo'}) || [],
permission: getStore({ name: 'permission' }) || {}, permission: getStore({name: 'permission'}) || {},
roles: [], roles: [],
menu: getStore({ name: 'menu' }) || [], menu: getStore({name: 'menu'}) || [],
menuAll: [], menuAll: [],
token: getStore({ name: 'token' }) || '', 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: { SET_REFRESH_TOKEN: (state, refreshToken) => {
//根据用户名登录 setRefreshToken(refreshToken)
LoginByUsername({ commit }, userInfo) { state.refreshToken = refreshToken;
return new Promise((resolve) => { setStore({name: 'refreshToken', content: state.refreshToken, type: 'session'})
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)
})
})
},
}, },
mutations: { SET_USERIFNO: (state, userInfo) => {
SET_TOKEN: (state, token) => { state.userInfo = userInfo;
setToken(token) setStore({name: 'userInfo', content: state.userInfo})
state.token = token; },
setStore({ name: 'token', content: state.token, type: 'session' }) SET_MENU: (state, menu) => {
}, state.menu = menu
SET_USERIFNO: (state, userInfo) => { setStore({name: 'menu', content: state.menu, type: 'session'})
state.userInfo = userInfo; },
setStore({ name: 'userInfo', content: state.userInfo }) SET_MENU_ALL: (state, menuAll) => {
}, state.menuAll = menuAll;
SET_MENU: (state, menu) => { },
state.menu = menu SET_ROLES: (state, roles) => {
setStore({ name: 'menu', content: state.menu, type: 'session' }) state.roles = roles;
}, },
SET_MENU_ALL: (state, menuAll) => { SET_PERMISSION: (state, permission) => {
state.menuAll = menuAll; let result = [];
},
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);
}
}
}) 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 export default user

@ -1,5 +1,6 @@
import Cookies from 'js-cookie' import Cookies from 'js-cookie'
const TokenKey = 'x-access-token' const TokenKey = 'x-access-token'
const RefreshTokenKey = 'x-refresh-token'
var inFifteenMinutes = new Date(new Date().getTime() + 120 * 60 * 1000); var inFifteenMinutes = new Date(new Date().getTime() + 120 * 60 * 1000);
export function getToken() { export function getToken() {
return Cookies.get(TokenKey) return Cookies.get(TokenKey)
@ -9,6 +10,14 @@ export function setToken(token) {
return Cookies.set(TokenKey, token, { expires: inFifteenMinutes }) 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() { export function removeToken() {
return Cookies.remove(TokenKey) return Cookies.remove(TokenKey)
} }

@ -0,0 +1,273 @@
<template>
<basic-container>
<avue-crud :option="option"
:data="data"
:page="page"
@row-del="rowDel"
v-model="form"
:permission="permissionList"
@row-update="rowUpdate"
@row-save="rowSave"
:before-open="beforeOpen"
@search-change="searchChange"
@search-reset="searchReset"
@selection-change="selectionChange"
@on-load="onLoad">
<template slot="menuLeft">
<el-button type="danger"
size="small"
icon="el-icon-delete"
plain
v-if="permission.client_delete"
@click="handleDelete">
</el-button>
</template>
</avue-crud>
</basic-container>
</template>
<script>
import {getList, getDetail, add, update, remove} from "@/api/system/client";
import {mapGetters} from "vuex";
export default {
data() {
return {
form: {},
page: {
pageSize: 10,
currentPage: 1,
total: 0
},
selectionList: [],
option: {
tip: false,
border: true,
index: true,
viewBtn: true,
selection: true,
column: [
{
label: "应用id",
prop: "clientId",
search: true,
rules: [{
required: true,
message: "请输入客户端id",
trigger: "blur"
}]
},
{
label: "应用密钥",
prop: "clientSecret",
search: true,
rules: [{
required: true,
message: "请输入客户端密钥",
trigger: "blur"
}]
},
{
label: "授权类型",
prop: "authorizedGrantTypes",
valueDefault: "refresh_token,password,authorization_code",
rules: [{
required: true,
message: "请输入授权类型",
trigger: "blur"
}]
},
{
label: "授权范围",
prop: "scope",
valueDefault: "all",
rules: [{
required: true,
message: "请输入授权范围",
trigger: "blur"
}]
},
{
label: "令牌秒数",
prop: "accessTokenValidity",
type: "number",
valueDefault: 3600,
rules: [{
required: true,
message: "请输入令牌过期秒数",
trigger: "blur"
}]
},
{
label: "刷新秒数",
prop: "refreshTokenValidity",
type: "number",
valueDefault: 604800,
hide: true,
rules: [{
required: true,
message: "请输入刷新令牌过期秒数",
trigger: "blur"
}]
},
{
label: "回调地址",
prop: "webServerRedirectUri",
hide: true,
rules: [{
required: true,
message: "请输入回调地址",
trigger: "blur"
}]
},
{
label: "资源集合",
prop: "resourceIds",
hide: true,
rules: [{
message: "请输入资源集合",
trigger: "blur"
}]
},
{
label: "权限",
prop: "authorities",
hide: true,
rules: [{
message: "请输入权限",
trigger: "blur"
}]
},
{
label: "自动授权",
prop: "autoapprove",
hide: true,
rules: [{
message: "请输入自动授权",
trigger: "blur"
}]
},
{
label: "附加说明",
hide: true,
prop: "additionalInformation",
span: 24,
rules: [{
message: "请输入附加说明",
trigger: "blur"
}]
},
]
},
data: []
};
},
computed: {
...mapGetters(["permission"]),
permissionList() {
return {
addBtn: this.vaildData(this.permission.client_add),
viewBtn: this.vaildData(this.permission.client_view),
delBtn: this.vaildData(this.permission.client_delete),
editBtn: this.vaildData(this.permission.client_edit)
};
},
ids() {
let ids = [];
this.selectionList.forEach(ele => {
ids.push(ele.id);
});
return ids.join(",");
}
},
methods: {
rowSave(row, loading) {
add(row).then(() => {
loading();
this.onLoad(this.page);
this.$message({
type: "success",
message: "操作成功!"
});
});
},
rowUpdate(row, index, loading) {
update(row).then(() => {
loading();
this.onLoad(this.page);
this.$message({
type: "success",
message: "操作成功!"
});
});
},
rowDel(row) {
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
})
.then(() => {
return remove(row.id);
})
.then(() => {
this.onLoad(this.page);
this.$message({
type: "success",
message: "操作成功!"
});
});
},
searchReset() {
this.onLoad(this.page);
},
searchChange(params) {
this.onLoad(this.page, params);
},
selectionChange(list) {
this.selectionList = list;
},
handleDelete() {
if (this.selectionList.length === 0) {
this.$message.warning("请选择至少一条数据");
return;
}
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
})
.then(() => {
return remove(this.ids);
})
.then(() => {
this.onLoad(this.page);
this.$message({
type: "success",
message: "操作成功!"
});
this.$refs.crud.toggleSelection();
});
},
beforeOpen(done, type) {
if (["edit", "view"].includes(type)) {
getDetail(this.form.id).then(res => {
this.form = res.data.data;
});
}
done();
},
onLoad(page, params = {}) {
getList(page.currentPage, page.pageSize, params).then(res => {
const data = res.data.data;
this.page.total = data.total;
this.data = data.records;
});
}
}
};
</script>
<style>
</style>

@ -1,5 +1,3 @@
// 基础路径 注意发布之前要先修改这里
let url = 'http://localhost:8800'
module.exports = { module.exports = {
lintOnSave: true, lintOnSave: true,
productionSourceMap: false, productionSourceMap: false,
@ -26,7 +24,7 @@ module.exports = {
devServer: { devServer: {
proxy: { proxy: {
'/api': { '/api': {
target: url, target: 'http://localhost',
ws: true, ws: true,
pathRewrite: { pathRewrite: {
'^/api': '/' '^/api': '/'

Loading…
Cancel
Save