diff --git a/src/services/index.js b/src/services/index.js deleted file mode 100644 index beb3881..0000000 --- a/src/services/index.js +++ /dev/null @@ -1,38 +0,0 @@ -import request from 'utils/request' -import { apiPrefix } from 'utils/config' - -import api from './api' - -const gen = (params) => { - let url = apiPrefix + params - let method = 'GET' - - const paramsArray = params.split(' ') - if (paramsArray.length === 2) { - method = paramsArray[0] - url = apiPrefix + paramsArray[1] - } - - return function (data) { - return request({ - url, - data, - method, - }) - } -} - -const APIFunction = {} -for (const key in api) { - APIFunction[key] = gen(api[key]) -} - -APIFunction.queryWeather = (params) => { - params.key = 'i7sau1babuzwhycn' - return request({ - url: `${apiPrefix}/weather/now.json`, - data: params, - }) -} - -export default APIFunction diff --git a/src/services/index.ts b/src/services/index.ts new file mode 100644 index 0000000..3709327 --- /dev/null +++ b/src/services/index.ts @@ -0,0 +1,44 @@ +import user, { TUserAPI } from '@/services/user' +import createService, { TService } from '@/utils/createService' + +const APIs = { + ...user, +} + +type RecordService = { + [P in keyof T]: TService +} +type TAPIService = RecordService +const APIService = {} as TAPIService +for (const key in APIs) { + APIService[key] = createService(APIs[key]) +} + +export const { + logoutUser, + queryUser, + queryUserList, + updateUser, + createUser, + removeUser, + removeUserList, +} = APIService + +export interface IUserInfo { + avatar: string + id: number + username: string + permissions: { + role?: string + visit?: string[] + } +} + +export const queryUserInfo = createService(user.queryUserInfo) + +export interface ILoginUserParams { + password: string + username: string +} + +export const loginUser = createService(user.loginUser) diff --git a/src/services/api.js b/src/services/user/index.ts similarity index 53% rename from src/services/api.js rename to src/services/user/index.ts index e34b942..7745b0c 100644 --- a/src/services/api.js +++ b/src/services/user/index.ts @@ -1,18 +1,24 @@ -export default { - queryRouteList: '/routes', +export type TUserAPIProperty = + | 'queryUserInfo' + | 'logoutUser' + | 'loginUser' + | 'queryUser' + | 'queryUserList' + | 'updateUser' + | 'createUser' + | 'removeUser' + | 'removeUserList' +export type TUserAPI = Record + +export default { queryUserInfo: '/user', logoutUser: '/user/logout', loginUser: 'POST /user/login', - queryUser: '/user/:id', queryUserList: '/users', updateUser: 'Patch /user/:id', createUser: 'POST /user', removeUser: 'DELETE /user/:id', removeUserList: 'POST /users/delete', - - queryPostList: '/posts', - - queryDashboard: '/dashboard', -} +} as TUserAPI diff --git a/src/typings/index.ts b/src/typings/index.ts index 972576d..34541fa 100644 --- a/src/typings/index.ts +++ b/src/typings/index.ts @@ -12,5 +12,6 @@ export interface IConfig { title: string logo: string copyright: string + apiPrefix: string layouts: ILayouItem[] } diff --git a/src/utils/context.ts b/src/utils/context.ts index ecf9921..b112fcd 100644 --- a/src/utils/context.ts +++ b/src/utils/context.ts @@ -1,13 +1,18 @@ import React from 'react' import { config } from '@/configs' import { ISupportedLocales } from '@/typings' +import { IUserInfo } from '@/services' interface IConfigContext { language: ISupportedLocales setLanguage: (language: ISupportedLocales) => void + userInfo: IUserInfo | null + queryUserInfo: () => void } export const ConfigContext = React.createContext({ language: config.language, setLanguage: (language) => null, + userInfo: null, + queryUserInfo: () => null, }) diff --git a/src/utils/createService.ts b/src/utils/createService.ts new file mode 100644 index 0000000..1b7ac31 --- /dev/null +++ b/src/utils/createService.ts @@ -0,0 +1,25 @@ +import request from '@/utils/request' +import { AxiosPromise, AxiosRequestConfig } from 'axios' +import { config } from '@/configs' + +const createService = (params: string) => { + let url = params + let method = 'GET' + + const paramsArray = params.split(' ') + if (paramsArray.length === 2) { + method = paramsArray[0] + url = paramsArray[1] + } + + return (data: U) => + request({ + url: config.apiPrefix + url, + data, + method: method as AxiosRequestConfig['method'], + }) +} + +export type TService = (data?: any) => AxiosPromise + +export default createService diff --git a/src/utils/request.ts b/src/utils/request.ts index 454bf2e..f83cbdf 100644 --- a/src/utils/request.ts +++ b/src/utils/request.ts @@ -1,92 +1,67 @@ -import axios from 'axios' -import { cloneDeep } from 'lodash' -import { message } from 'antd' -import { CANCEL_REQUEST_MESSAGE } from '@/utils/constant' -const { parse, compile } = require('path-to-regexp') +import axios, { AxiosRequestConfig, AxiosPromise } from 'axios' -const { CancelToken } = axios -window.cancelRequest = new Map() - -export default function request(options) { - let { data, url } = options - const cloneData = cloneDeep(data) - - try { - let domain = '' - const urlMatch = url.match(/[a-zA-z]+:\/\/[^/]*/) - if (urlMatch) { - ;[domain] = urlMatch - url = url.slice(domain.length) - } - - const match = parse(url) - url = compile(url)(data) - - for (const item of match) { - if (item instanceof Object && item.name in cloneData) { - delete cloneData[item.name] - } - } - url = domain + url - } catch (e) { - message.error(e.message) +const transformURL = (url: string, data: any) => { + if (!data) { + return { url, data } } + let cloneData = data + let cloneUrl = url + try { + cloneData = JSON.parse(JSON.stringify(data)) + } catch (error) {} - options.url = url - options.cancelToken = new CancelToken((cancel) => { - window.cancelRequest.set(Symbol(Date.now()), { - pathname: window.location.pathname, - cancel, - }) + Object.entries(cloneData).forEach(([key]) => { + const reg = new RegExp(`/:${key}`) + if (reg.test(cloneUrl)) { + cloneUrl = cloneUrl.replace(`/:${key}`, `/${cloneData[key]}`) + delete cloneData[key] + } }) - return axios(options) - .then((response) => { - const { statusText, status, data } = response - - let result = {} - if (typeof data === 'object') { - result = data - if (Array.isArray(data)) { - result.list = data - } - } else { - result.data = data - } - - return Promise.resolve({ - success: true, - message: statusText, - statusCode: status, - ...result, - }) - }) - .catch((error) => { - const { response, message } = error - - if (String(message) === CANCEL_REQUEST_MESSAGE) { - return { - success: false, - } - } - - let msg - let statusCode - - if (response && response instanceof Object) { - const { data, statusText } = response - statusCode = response.status - msg = data.message || statusText - } else { - statusCode = 600 - msg = error.message || 'Network Error' - } - - /* eslint-disable */ - return Promise.reject({ - success: false, - statusCode, - message: msg, - }) - }) + return { url: cloneUrl, data: cloneData } } + +export type RequestConfig = AxiosRequestConfig | string + +const request = (config: RequestConfig): AxiosPromise => { + let params = config + if (typeof config === 'object') { + const axiosConfig = config as AxiosRequestConfig + const { data, url } = transformURL( + axiosConfig.url as string, + axiosConfig.data + ) + params = { + ...axiosConfig, + data, + url, + } + + if ( + (!params.method || params.method.toLocaleUpperCase() === 'GET') && + !params.params + ) { + params.params = data + } + } + + return axios(params as AxiosRequestConfig).catch((error) => { + const { response } = error + let message + let statusCode = 0 + + if (response && response instanceof Object) { + const { data, statusText } = response + statusCode = response.status + message = data.message || statusText + } else { + message = error.message + } + return Promise.reject({ + statusCode, + message, + }) + }) +} + +export default request