diff --git a/src/api/auth/index.ts b/src/api/auth/index.ts index 645628e1..b4d819d2 100644 --- a/src/api/auth/index.ts +++ b/src/api/auth/index.ts @@ -1,5 +1,4 @@ import request from "@/utils/request"; -import { AxiosPromise } from "axios"; import { CaptchaResult, LoginData, LoginResult } from "./types"; /** @@ -8,13 +7,13 @@ import { CaptchaResult, LoginData, LoginResult } from "./types"; * @param data {LoginData} * @returns */ -export function loginApi(data: LoginData): AxiosPromise { +export function loginApi(data: LoginData) { const formData = new FormData(); formData.append("username", data.username); formData.append("password", data.password); formData.append("captchaKey", data.captchaKey || ""); formData.append("captchaCode", data.captchaCode || ""); - return request({ + return request>({ url: "/api/v1/auth/login", method: "post", data: formData, @@ -37,8 +36,8 @@ export function logoutApi() { /** * 获取验证码 */ -export function getCaptchaApi(): AxiosPromise { - return request({ +export function getCaptchaApi() { + return request>({ url: "/api/v1/auth/captcha", method: "get", }); diff --git a/src/api/dept/index.ts b/src/api/dept/index.ts index f5e0466d..2dc5b5a6 100644 --- a/src/api/dept/index.ts +++ b/src/api/dept/index.ts @@ -1,5 +1,4 @@ import request from "@/utils/request"; -import { AxiosPromise } from "axios"; import { DeptForm, DeptQuery, DeptVO } from "./types"; /** @@ -7,8 +6,8 @@ import { DeptForm, DeptQuery, DeptVO } from "./types"; * * @param queryParams */ -export function listDepts(queryParams?: DeptQuery): AxiosPromise { - return request({ +export function listDepts(queryParams?: DeptQuery) { + return request>({ url: "/api/v1/dept", method: "get", params: queryParams, @@ -18,8 +17,8 @@ export function listDepts(queryParams?: DeptQuery): AxiosPromise { /** * 部门下拉列表 */ -export function getDeptOptions(): AxiosPromise { - return request({ +export function getDeptOptions() { + return request>({ url: "/api/v1/dept/options", method: "get", }); @@ -30,8 +29,8 @@ export function getDeptOptions(): AxiosPromise { * * @param id */ -export function getDeptForm(id: number): AxiosPromise { - return request({ +export function getDeptForm(id: number) { + return request>({ url: "/api/v1/dept/" + id + "/form", method: "get", }); diff --git a/src/api/dict/index.ts b/src/api/dict/index.ts index 635297eb..a00be1c7 100644 --- a/src/api/dict/index.ts +++ b/src/api/dict/index.ts @@ -1,5 +1,4 @@ import request from "@/utils/request"; -import { AxiosPromise } from "axios"; import { DictTypeQuery, DictTypePageResult, @@ -14,10 +13,8 @@ import { * * @param queryParams */ -export function getDictTypePage( - queryParams: DictTypeQuery -): AxiosPromise { - return request({ +export function getDictTypePage(queryParams: DictTypeQuery) { + return request>({ url: "/api/v1/dict/types/page", method: "get", params: queryParams, @@ -29,8 +26,8 @@ export function getDictTypePage( * * @param id */ -export function getDictTypeForm(id: number): AxiosPromise { - return request({ +export function getDictTypeForm(id: number) { + return request>({ url: "/api/v1/dict/types/" + id + "/form", method: "get", }); @@ -78,8 +75,8 @@ export function deleteDictTypes(ids: string) { * * @param typeCode 字典类型编码 */ -export function getDictOptions(typeCode: string): AxiosPromise { - return request({ +export function getDictOptions(typeCode: string) { + return request>({ url: "/api/v1/dict/" + typeCode + "/options", method: "get", }); @@ -88,10 +85,8 @@ export function getDictOptions(typeCode: string): AxiosPromise { /** * 字典分页列表 */ -export function getDictPage( - queryParams: DictQuery -): AxiosPromise { - return request({ +export function getDictPage(queryParams: DictQuery) { + return request>({ url: "/api/v1/dict/page", method: "get", params: queryParams, @@ -103,8 +98,8 @@ export function getDictPage( * * @param id */ -export function getDictFormData(id: number): AxiosPromise { - return request({ +export function getDictFormData(id: number) { + return request>({ url: "/api/v1/dict/" + id + "/form", method: "get", }); diff --git a/src/api/file/index.ts b/src/api/file/index.ts index adcc30b9..07705504 100644 --- a/src/api/file/index.ts +++ b/src/api/file/index.ts @@ -1,5 +1,4 @@ import request from "@/utils/request"; -import { AxiosPromise } from "axios"; import { FileInfo } from "./types"; /** @@ -7,10 +6,10 @@ import { FileInfo } from "./types"; * * @param file */ -export function uploadFileApi(file: File): AxiosPromise { +export function uploadFileApi(file: File) { const formData = new FormData(); formData.append("file", file); - return request({ + return request>({ url: "/api/v1/files", method: "post", data: formData, diff --git a/src/api/menu/index.ts b/src/api/menu/index.ts index 032e0a91..33883ca3 100644 --- a/src/api/menu/index.ts +++ b/src/api/menu/index.ts @@ -1,12 +1,12 @@ import request from "@/utils/request"; -import { AxiosPromise } from "axios"; +import type { RouteRecordRaw } from "vue-router"; import { MenuQuery, MenuVO, MenuForm } from "./types"; /** * 获取路由列表 */ export function listRoutes() { - return request({ + return request>({ url: "/api/v1/menus/routes", method: "get", }); @@ -17,8 +17,8 @@ export function listRoutes() { * * @param queryParams */ -export function listMenus(queryParams: MenuQuery): AxiosPromise { - return request({ +export function listMenus(queryParams: MenuQuery) { + return request>({ url: "/api/v1/menus", method: "get", params: queryParams, @@ -28,8 +28,8 @@ export function listMenus(queryParams: MenuQuery): AxiosPromise { /** * 获取菜单下拉树形列表 */ -export function getMenuOptions(): AxiosPromise { - return request({ +export function getMenuOptions() { + return request>({ url: "/api/v1/menus/options", method: "get", }); @@ -40,8 +40,8 @@ export function getMenuOptions(): AxiosPromise { * * @param id */ -export function getMenuForm(id: number): AxiosPromise { - return request({ +export function getMenuForm(id: number) { + return request>({ url: "/api/v1/menus/" + id + "/form", method: "get", }); diff --git a/src/api/role/index.ts b/src/api/role/index.ts index fdbc65cd..a6231754 100644 --- a/src/api/role/index.ts +++ b/src/api/role/index.ts @@ -1,5 +1,4 @@ import request from "@/utils/request"; -import { AxiosPromise } from "axios"; import { RoleQuery, RolePageResult, RoleForm } from "./types"; /** @@ -7,10 +6,8 @@ import { RoleQuery, RolePageResult, RoleForm } from "./types"; * * @param queryParams */ -export function getRolePage( - queryParams?: RoleQuery -): AxiosPromise { - return request({ +export function getRolePage(queryParams?: RoleQuery) { + return request>({ url: "/api/v1/roles/page", method: "get", params: queryParams, @@ -22,10 +19,8 @@ export function getRolePage( * * @param queryParams */ -export function getRoleOptions( - queryParams?: RoleQuery -): AxiosPromise { - return request({ +export function getRoleOptions(queryParams?: RoleQuery) { + return request>({ url: "/api/v1/roles/options", method: "get", params: queryParams, @@ -37,8 +32,8 @@ export function getRoleOptions( * * @param queryParams */ -export function getRoleMenuIds(roleId: number): AxiosPromise { - return request({ +export function getRoleMenuIds(roleId: number) { + return request>({ url: "/api/v1/roles/" + roleId + "/menuIds", method: "get", }); @@ -49,10 +44,7 @@ export function getRoleMenuIds(roleId: number): AxiosPromise { * * @param queryParams */ -export function updateRoleMenus( - roleId: number, - data: number[] -): AxiosPromise { +export function updateRoleMenus(roleId: number, data: number[]) { return request({ url: "/api/v1/roles/" + roleId + "/menus", method: "put", @@ -65,8 +57,8 @@ export function updateRoleMenus( * * @param id */ -export function getRoleForm(id: number): AxiosPromise { - return request({ +export function getRoleForm(id: number) { + return request>({ url: "/api/v1/roles/" + id + "/form", method: "get", }); diff --git a/src/api/user/index.ts b/src/api/user/index.ts index e119ce8d..6862a12f 100644 --- a/src/api/user/index.ts +++ b/src/api/user/index.ts @@ -1,12 +1,11 @@ import request from "@/utils/request"; -import { AxiosPromise } from "axios"; import { UserForm, UserInfo, UserPageVO, UserQuery } from "./types"; /** * 登录成功后获取用户信息(昵称、头像、权限集合和角色集合) */ -export function getUserInfoApi(): AxiosPromise { - return request({ +export function getUserInfoApi() { + return request>({ url: "/api/v1/users/me", method: "get", }); @@ -17,10 +16,8 @@ export function getUserInfoApi(): AxiosPromise { * * @param queryParams */ -export function getUserPage( - queryParams: UserQuery -): AxiosPromise> { - return request({ +export function getUserPage(queryParams: UserQuery) { + return request>>({ url: "/api/v1/users/page", method: "get", params: queryParams, @@ -32,8 +29,8 @@ export function getUserPage( * * @param userId */ -export function getUserForm(userId: number): AxiosPromise { - return request({ +export function getUserForm(userId: number) { + return request>({ url: "/api/v1/users/" + userId + "/form", method: "get", }); diff --git a/src/typings/global.d.ts b/src/typings/global.d.ts index fc27d1fb..146d5bfc 100644 --- a/src/typings/global.d.ts +++ b/src/typings/global.d.ts @@ -1,4 +1,13 @@ declare global { + /** + * 响应数据 + */ + interface ResponseData { + code: string; + data: T; + msg: string; + } + /** * 分页查询参数 */