expressa 2.0.20 → 2.0.21

package/modules/admin/src/icons/index.js

@@ -1,7 +1,7 @@
 import Vue from 'vue'
 import SvgIcon from '@/components/SvgIcon' // svg组件
 
-// register globally
+// eslint-disable-next-line vue/component-definition-name-casing
 Vue.component('svg-icon', SvgIcon)
 
 const requireAll = requireContext => requireContext.keys().map(requireContext)

package/modules/admin/src/utils/request.js

@@ -8,15 +8,15 @@ const get = (o, p) =>
 
 const service = axios.create({
   // eslint-disable-next-line
-  baseURL: (typeof settings !== 'undefined' ? settings.apiurl : process.env.BASE_API),
-  timeout: 5000 // 请求超时时间
+  baseURL: (typeof settings !== 'undefined' ? window.settings.apiurl : process.env.BASE_API),
+  timeout: window.settings?.api_timeout_ms || 5000
 })
+window.axios = service
 
-// request拦截器
 service.interceptors.request.use(
   config => {
     if (store.getters.token) {
-      config.headers['x-access-token'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
+      config.headers['x-access-token'] = getToken()
     }
     return config
   },
@@ -27,7 +27,6 @@ service.interceptors.request.use(
   }
 )
 
-// response 拦截器
 service.interceptors.response.use(
   response => {
     return response

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expressa",
-  "version": "2.0.20",
+  "version": "2.0.21",
   "description": "API framework using JSON schemas",
   "main": "index.js",
   "repository": "https://github.com/thomas4019/expressa",

package/test/testserver.js

@@ -7,7 +7,20 @@ const api = expressa.api({
 const express = require('express')
 const app = express()
 app.use('/api', api)
-app.use('/admin', expressa.admin({ apiurl: 'http://localhost:3001/api/' }))
+app.use('/admin', expressa.admin({
+  apiurl: 'http://localhost:3001/api/',
+  api_timeout_ms: 10000,
+}))
+
+function sleep(ms) {
+  return new Promise(resolve => setTimeout(resolve, ms))
+}
+
+api.get('/slow_endpoint', async (req, res) => {
+  await sleep(7000)
+
+  res.send('Hello World!')
+})
 
 api.addListener('ready', function onStart() {
   app.listen(3001, function () {

package/test/testutils.js

@@ -56,7 +56,7 @@ exports.getUserWithPermissions = async function(api, permissions) {
     permissions: permissionsMap
   }
 
-  const roleRes = await service.post('/role')
+  await service.post('/role')
     .set('x-access-token', tokens.admin)
     .send(role)
     .expect(200)
@@ -69,7 +69,7 @@ exports.getUserWithPermissions = async function(api, permissions) {
     .send(user)
     .expect(200)
 
-  const updateRes = await service.post(`/users/${registerRes.body.id}/update`)
+  await service.post(`/users/${registerRes.body.id}/update`)
     .send({ $push: { roles: roleName } })
     .set('x-access-token', tokens.admin)
     .expect(200)
@@ -100,7 +100,7 @@ exports.getAccessKeyForUserWithPermissions = async function(api, permissions) {
     permissions: permissionsMap
   }
 
-  const roleRes = await service.post('/role')
+  await service.post('/role')
     .set('x-access-token', tokens.admin)
     .send(role)
     .expect(200)
@@ -113,7 +113,7 @@ exports.getAccessKeyForUserWithPermissions = async function(api, permissions) {
     .send(user)
     .expect(200)
 
-  const updateRes = await service.post(`/users/${registerRes.body.id}/update`)
+  await service.post(`/users/${registerRes.body.id}/update`)
     .send({ $push: { roles: roleName } })
     .set('x-access-token', tokens.admin)
     .expect(200)