diff --git a/.env.development b/.env.development index 90d1146..17faa14 100644 --- a/.env.development +++ b/.env.development @@ -6,3 +6,5 @@ VITE_PUBLIC_PATH = / # 开发环境路由历史模式(Hash模式传"hash"、HTML5模式传"h5"、Hash模式带base参数传"hash,base参数"、HTML5模式带base参数传"h5,base参数") VITE_ROUTER_HISTORY = "hash" + +VITE_API_BASEURL = "http://localhost:5199/api" diff --git a/build/plugins.ts b/build/plugins.ts index 93f5981..4c82e36 100644 --- a/build/plugins.ts +++ b/build/plugins.ts @@ -11,7 +11,7 @@ import removeNoMatch from "vite-plugin-router-warn"; import { visualizer } from "rollup-plugin-visualizer"; import removeConsole from "vite-plugin-remove-console"; import { codeInspectorPlugin } from "code-inspector-plugin"; -import { vitePluginFakeServer } from "vite-plugin-fake-server"; +// import { vitePluginFakeServer } from "vite-plugin-fake-server"; export function getPluginsList( VITE_CDN: boolean, @@ -41,12 +41,12 @@ export function getPluginsList( */ removeNoMatch(), // mock支持 - vitePluginFakeServer({ - logger: false, - include: "mock", - infixName: false, - enableProd: true - }), + // vitePluginFakeServer({ + // logger: false, + // include: "mock", + // infixName: false, + // enableProd: true + // }), // svg组件化支持 svgLoader(), // 自动按需加载图标 diff --git a/mock/login.ts b/mock/login.ts index 55897d8..3d4b1bc 100644 --- a/mock/login.ts +++ b/mock/login.ts @@ -6,13 +6,13 @@ export default defineFakeRoute([ url: "/login", method: "post", response: ({ body }) => { - if (body.username === "admin") { + if (body.userName === "admin") { return { success: true, data: { avatar: "https://avatars.githubusercontent.com/u/44761321", - username: "admin", - nickname: "小铭", + userName: "admin", + nickName: "小铭", // 一个用户可能有多个角色 roles: ["admin"], // 按钮级别权限 @@ -27,8 +27,8 @@ export default defineFakeRoute([ success: true, data: { avatar: "https://avatars.githubusercontent.com/u/52823142", - username: "common", - nickname: "小林", + userName: "common", + nickName: "小林", roles: ["common"], permissions: ["permission:btn:add", "permission:btn:edit"], accessToken: "eyJhbGciOiJIUzUxMiJ9.common", diff --git a/src/api/routes.ts b/src/api/routes.ts index 501ea3c..d53364e 100644 --- a/src/api/routes.ts +++ b/src/api/routes.ts @@ -6,5 +6,5 @@ type Result = { }; export const getAsyncRoutes = () => { - return http.request("get", "/get-async-routes"); + return http.request("get", "/Menu/AdminMenu"); }; diff --git a/src/api/user.ts b/src/api/user.ts index 87184b5..5b74588 100644 --- a/src/api/user.ts +++ b/src/api/user.ts @@ -1,25 +1,23 @@ import { http } from "@/utils/http"; +import type { Res } from "@/utils/http/types"; export type UserResult = { - success: boolean; - data: { - /** 头像 */ - avatar: string; - /** 用户名 */ - username: string; - /** 昵称 */ - nickname: string; - /** 当前登录用户的角色 */ - roles: Array; - /** 按钮级别权限 */ - permissions: Array; - /** `token` */ - accessToken: string; - /** 用于调用刷新`accessToken`的接口时所需的`token` */ - refreshToken: string; - /** `accessToken`的过期时间(格式'xxxx/xx/xx xx:xx:xx') */ - expires: Date; - }; + /** 头像 */ + avatar: string; + /** 用户名 */ + userName: string; + /** 昵称 */ + nickName: string; + /** 当前登录用户的角色 */ + roles: Array; + /** 按钮级别权限 */ + permissions: Array; + /** `token` */ + accessToken: string; + /** 用于调用刷新`accessToken`的接口时所需的`token` */ + refreshToken: string; + /** `accessToken`的过期时间(格式'xxxx/xx/xx xx:xx:xx') */ + expires: Date; }; export type RefreshTokenResult = { @@ -36,7 +34,7 @@ export type RefreshTokenResult = { /** 登录 */ export const getLogin = (data?: object) => { - return http.request("post", "/login", { data }); + return http.request>("post", "/Admin/Login", { data }); }; /** 刷新`token` */ diff --git a/src/layout/components/lay-navbar/index.vue b/src/layout/components/lay-navbar/index.vue index 21fd10f..07cb985 100644 --- a/src/layout/components/lay-navbar/index.vue +++ b/src/layout/components/lay-navbar/index.vue @@ -16,7 +16,7 @@ const { logout, onPanel, pureApp, - username, + userName, userAvatar, avatarsStyle, toggleSideBar @@ -50,7 +50,7 @@ const { -

{{ username }}

+

{{ userName }}