diff --git a/src/api/login.ts b/src/api/login.ts index 1e215a7..8bf8002 100644 --- a/src/api/login.ts +++ b/src/api/login.ts @@ -1,12 +1,12 @@ import { request } from "@/utils/service" -interface IUserRequestData { +interface ILoginData { username: string password: string } -/** 登录,返回 token */ -export function accountLogin(data: IUserRequestData) { +/** 登录并返回 Token */ +export function login(data: ILoginData) { return request({ url: "users/login", method: "post", @@ -14,7 +14,7 @@ export function accountLogin(data: IUserRequestData) { }) } /** 获取用户详情 */ -export function userInfoRequest() { +export function getUserInfo() { return request({ url: "users/info", method: "post" diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts index afb6307..5aacefd 100644 --- a/src/store/modules/user.ts +++ b/src/store/modules/user.ts @@ -3,7 +3,7 @@ import { defineStore } from "pinia" import { usePermissionStore } from "./permission" import { getToken, removeToken, setToken } from "@/utils/cookies" import router, { resetRouter } from "@/router" -import { accountLogin, userInfoRequest } from "@/api/login" +import { login, getUserInfo } from "@/api/login" import { RouteRecordRaw } from "vue-router" interface IUserState { @@ -27,7 +27,7 @@ export const useUserStore = defineStore({ /** 登录 */ login(userInfo: { username: string; password: string }) { return new Promise((resolve, reject) => { - accountLogin({ + login({ username: userInfo.username.trim(), password: userInfo.password }) @@ -44,7 +44,7 @@ export const useUserStore = defineStore({ /** 获取用户详情 */ getInfo() { return new Promise((resolve, reject) => { - userInfoRequest() + getUserInfo() .then((res: any) => { this.roles = res.data.user.roles resolve(res)