diff --git a/src/config/website.js b/src/config/website.js index e19dfd4..7733ca6 100644 --- a/src/config/website.js +++ b/src/config/website.js @@ -13,7 +13,8 @@ export default { captchaMode: true, // 是否开启验证码模式 lockPage: '/lock', tokenTime: 3000, - //http的status默认放行不才用统一处理的, + tokenHeader: 'Blade-Auth', + //http的status默认放行列表 statusWhiteList: [], //配置首页不可关闭 isFirstPage: false, diff --git a/src/router/axios.js b/src/router/axios.js index 95f0595..f0fa893 100644 --- a/src/router/axios.js +++ b/src/router/axios.js @@ -37,7 +37,7 @@ axios.interceptors.request.use(config => { config.headers['Authorization'] = `Basic ${Base64.encode(`${website.clientId}:${website.clientSecret}`)}`; if (getToken() && !isToken) { //让每个请求携带token--['Authorization']为自定义key 请根据实际情况自行修改 - config.headers['Blade-Auth'] = 'bearer ' + getToken() + config.headers[website.tokenHeader] = 'bearer ' + getToken() } //headers中配置serialize为true开启序列化 if (config.method === 'post' && meta.isSerialize === true) { diff --git a/src/views/base/region.vue b/src/views/base/region.vue index 6bf49f2..efb3bb4 100644 --- a/src/views/base/region.vue +++ b/src/views/base/region.vue @@ -392,11 +392,11 @@ cancelButtonText: "取消", type: "warning" }).then(() => { - window.open(`/api/blade-system/region/export-region?Blade-Auth=${getToken()}`); + window.open(`/api/blade-system/region/export-region?${this.website.tokenHeader}=${getToken()}`); }); }, handleTemplate() { - window.open(`/api/blade-system/region/export-template?Blade-Auth=${getToken()}`); + window.open(`/api/blade-system/region/export-template?${this.website.tokenHeader}=${getToken()}`); }, } }; diff --git a/src/views/system/user.vue b/src/views/system/user.vue index 885c33e..93b0a81 100644 --- a/src/views/system/user.vue +++ b/src/views/system/user.vue @@ -250,7 +250,6 @@ { label: "登录账号", prop: "account", - search: true, rules: [{ required: true, message: "请输入登录账号", @@ -271,7 +270,6 @@ addDisplay: website.tenantMode, editDisplay: website.tenantMode, viewDisplay: website.tenantMode, - search: website.tenantMode, rules: [{ required: true, message: "请输入所属租户", @@ -314,7 +312,6 @@ { label: "用户姓名", prop: "realName", - search: true, rules: [{ required: true, message: "请输入用户姓名", @@ -698,11 +695,11 @@ type: "warning" }).then(() => { const searchForm = this.$refs.crud.searchForm; - window.open(`/api/blade-user/export-user?Blade-Auth=${getToken()}&account=${searchForm.account}&realName=${searchForm.realName}`); + window.open(`/api/blade-user/export-user?${this.website.tokenHeader}=${getToken()}&account=${searchForm.account}&realName=${searchForm.realName}`); }); }, handleTemplate() { - window.open(`/api/blade-user/export-template?Blade-Auth=${getToken()}`); + window.open(`/api/blade-user/export-template?${this.website.tokenHeader}=${getToken()}`); }, beforeOpen(done, type) { if (["edit", "view"].includes(type)) {