diff --git a/package.json b/package.json index 27af43f..eaf80c8 100644 --- a/package.json +++ b/package.json @@ -1,48 +1,49 @@ { - "name": "saber-admin", - "version": "1.0.0", - "private": true, - "scripts": { - "serve": "vue-cli-service serve", - "build": "vue-cli-service build", - "lint": "vue-cli-service lint", - "analyz": "npm_config_report=true npm run build", - "test:unit": "vue-cli-service test:unit", - "test:e2e": "vue-cli-service test:e2e" - }, - "dependencies": { - "axios": "^0.18.0", - "babel-polyfill": "^6.26.0", - "classlist-polyfill": "^1.2.0", - "element-ui": "^2.4.5", - "js-cookie": "^2.2.0", - "mockjs": "^1.0.1-beta3", - "nprogress": "^0.2.0", - "script-loader": "^0.7.2", - "vue": "^2.5.16", - "vue-axios": "^2.1.2", - "vue-i18n": "^8.7.0", - "vue-router": "^3.0.1", - "vuex": "^3.0.1" - }, - "devDependencies": { - "@vue/cli-plugin-babel": "^3.1.1", - "@vue/cli-plugin-eslint": "^3.1.5", - "@vue/cli-service": "^3.1.4", - "chai": "^4.1.2", - "node-sass": "^4.9.0", - "sass-loader": "^7.0.1", - "vue-template-compiler": "^2.5.17", - "webpack-bundle-analyzer": "^3.0.3" - }, - "lint-staged": { - "*.js": [ - "vue-cli-service lint", - "git add" - ], - "*.vue": [ - "vue-cli-service lint", - "git add" - ] - } -} \ No newline at end of file + "name": "saber-admin", + "version": "1.0.0", + "private": true, + "scripts": { + "serve": "vue-cli-service serve", + "build": "vue-cli-service build", + "lint": "vue-cli-service lint", + "analyz": "npm_config_report=true npm run build", + "test:unit": "vue-cli-service test:unit", + "test:e2e": "vue-cli-service test:e2e" + }, + "dependencies": { + "axios": "^0.18.0", + "babel-polyfill": "^6.26.0", + "classlist-polyfill": "^1.2.0", + "element-ui": "^2.4.5", + "js-cookie": "^2.2.0", + "mockjs": "^1.0.1-beta3", + "nprogress": "^0.2.0", + "script-loader": "^0.7.2", + "vue": "^2.5.16", + "vue-axios": "^2.1.2", + "vue-i18n": "^8.7.0", + "vue-router": "^3.0.1", + "vuex": "^3.0.1", + "js-base64": "^2.5.1" + }, + "devDependencies": { + "@vue/cli-plugin-babel": "^3.1.1", + "@vue/cli-plugin-eslint": "^3.1.5", + "@vue/cli-service": "^3.1.4", + "chai": "^4.1.2", + "node-sass": "^4.9.0", + "sass-loader": "^7.0.1", + "vue-template-compiler": "^2.5.17", + "webpack-bundle-analyzer": "^3.0.3" + }, + "lint-staged": { + "*.js": [ + "vue-cli-service lint", + "git add" + ], + "*.vue": [ + "vue-cli-service lint", + "git add" + ] + } +} diff --git a/src/api/system/client.js b/src/api/system/client.js new file mode 100644 index 0000000..194cf3d --- /dev/null +++ b/src/api/system/client.js @@ -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 + }) +} + diff --git a/src/config/website.js b/src/config/website.js index 00a7bc0..386e558 100644 --- a/src/config/website.js +++ b/src/config/website.js @@ -4,6 +4,8 @@ export default { title: "saber", indexTitle: 'Saber Admin', + clientId: 'saber', // 客户端id + clientSecret: 'saber_secret', // 客户端密钥 tenantMode: true, // 是否开启租户模式 logo: "S", key: 'saber',//配置主键,目前用于存储 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/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/yarn.lock b/yarn.lock index 0bf4180..c46072f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4490,9 +4490,9 @@ joi@^14.3.0: isemail "3.x.x" topo "3.x.x" -js-base64@^2.1.8: +js-base64@^2.1.8, js-base64@^2.5.1: version "2.5.1" - resolved "http://registry.npm.taobao.org/js-base64/download/js-base64-2.5.1.tgz#1efa39ef2c5f7980bb1784ade4a8af2de3291121" + resolved "http://registry.npm.taobao.org/js-base64/download/js-base64-2.5.1.tgz?cache=0&other_urls=http%3A%2F%2Fregistry.npm.taobao.org%2Fjs-base64%2Fdownload%2Fjs-base64-2.5.1.tgz#1efa39ef2c5f7980bb1784ade4a8af2de3291121" integrity sha1-Hvo57yxfeYC7F4St5KivLeMpESE= js-cookie@^2.2.0: