diff --git a/src/service/api/auth.ts b/src/service/api/auth.ts index 1272330..01cd180 100644 --- a/src/service/api/auth.ts +++ b/src/service/api/auth.ts @@ -24,7 +24,7 @@ export function doDeleteLogout() { /** Get user info */ export function doGetUserInfo() { - return request({ url: '/system/user/getInfo' }); + return request({ url: '/u/user/getInfo' }); } /** diff --git a/src/service/api/dept.ts b/src/service/api/dept.ts index e588c7c..1a2ff39 100644 --- a/src/service/api/dept.ts +++ b/src/service/api/dept.ts @@ -8,7 +8,7 @@ export type DeptFormType = Pick< /** 获取部门列表 */ export function doGetDeptList(params: Api.SystemManage.DeptSearchParams) { return request({ - url: '/system/dept/list', + url: '/u/dept/list', params }); } @@ -20,7 +20,7 @@ export function doGetDeptList(params: Api.SystemManage.DeptSearchParams) { */ export function doGetDeptInfo(deptId: number) { return request({ - url: `/system/dept/${deptId}` + url: `/u/dept/${deptId}` }); } @@ -31,7 +31,7 @@ export function doGetDeptInfo(deptId: number) { */ export function doAddDept(body: DeptFormType) { return request({ - url: '/system/dept', + url: '/u/dept', method: 'post', data: body }); @@ -44,7 +44,7 @@ export function doAddDept(body: DeptFormType) { */ export function doEditDept(body: DeptFormType & { deptId: number }) { return request({ - url: '/system/dept', + url: '/u/dept', method: 'put', data: body }); @@ -57,7 +57,7 @@ export function doEditDept(body: DeptFormType & { deptId: number }) { */ export function doDeleteDept(deptId: string | number) { return request({ - url: `/system/dept/${deptId}`, + url: `/u/dept/${deptId}`, method: 'delete' }); } diff --git a/src/service/api/dict.ts b/src/service/api/dict.ts index 57f48c8..4e044c2 100644 --- a/src/service/api/dict.ts +++ b/src/service/api/dict.ts @@ -6,7 +6,7 @@ export type DictSubmitModel = Partial< export const doGetDictList = (params: Api.SystemManage.DictSearchParams) => { return request({ - url: '/system/dict/type/list', + url: '/u/dict/type/list', method: 'get', params }); @@ -14,7 +14,7 @@ export const doGetDictList = (params: Api.SystemManage.DictSearchParams) => { export const doAddDict = (data: DictSubmitModel) => { return request({ - url: '/system/dict/type', + url: '/u/dict/type', method: 'post', data }); @@ -22,7 +22,7 @@ export const doAddDict = (data: DictSubmitModel) => { export const doEditDict = (data: DictSubmitModel) => { return request({ - url: '/system/dict/type', + url: '/u/dict/type', method: 'put', data }); @@ -30,7 +30,7 @@ export const doEditDict = (data: DictSubmitModel) => { export const doDeleteDict = (dictId: string | number) => { return request({ - url: `/system/dict/type/${dictId}`, + url: `/u/dict/type/${dictId}`, method: 'post' }); }; diff --git a/src/service/api/menu.ts b/src/service/api/menu.ts index 60657f9..6e5b121 100644 --- a/src/service/api/menu.ts +++ b/src/service/api/menu.ts @@ -7,13 +7,13 @@ export type MenuListQuery = Partial< Api.SystemManage.CommonSearchParams; export function doGetMenuList(params: MenuListQuery) { - return request({ url: '/system/menu/list', method: 'get', params }); + return request({ url: '/u/menu/list', method: 'get', params }); } /** get all pages */ export function fetchGetAllPages() { return request[]>({ - url: '/system/menu/list', + url: '/u/menu/list', method: 'get', params: { menuType: 'C' @@ -24,7 +24,7 @@ export function fetchGetAllPages() { /** get menu tree */ export function fetchGetMenuTree() { return request({ - url: '/system/menu/treeselect', + url: '/u/menu/treeselect', method: 'get' }); } @@ -35,27 +35,27 @@ export function doGetRoleMenuList(roleId: number) { checkedKeys: number[]; menus: Api.SystemManage.MenuTree[]; }>({ - url: `/system/menu/roleMenuTreeselect/${roleId}`, + url: `/u/menu/roleMenuTreeselect/${roleId}`, method: 'get' }); } /** add menu */ export function doAddMenu(data: MenuModelType) { - return request({ url: '/system/menu', method: 'post', data }); + return request({ url: '/u/menu', method: 'post', data }); } /** delete menu */ export function doDeleteMenu(menuId: number) { - return request({ url: `/system/menu/${menuId}`, method: 'delete' }); + return request({ url: `/u/menu/${menuId}`, method: 'delete' }); } /** get menu detail */ export function doGetMenuDetail(menuId: number) { - return request({ url: `/system/menu/${menuId}`, method: 'get' }); + return request({ url: `/u/menu/${menuId}`, method: 'get' }); } /** edit menu */ export function doEditMenu(data: MenuModelType) { - return request({ url: '/system/menu', method: 'put', data }); + return request({ url: '/u/menu', method: 'put', data }); } diff --git a/src/service/api/post.ts b/src/service/api/post.ts index 549adfb..2cd6e9b 100644 --- a/src/service/api/post.ts +++ b/src/service/api/post.ts @@ -6,7 +6,7 @@ export type PostSubmitModel = Partial< export function doGetPostList(params: Api.SystemManage.PostSearchParams) { return request({ - url: '/system/post/list', + url: '/u/post/list', method: 'get', params }); @@ -14,14 +14,14 @@ export function doGetPostList(params: Api.SystemManage.PostSearchParams) { export function doGetPostDetail(postId: number) { return request({ - url: `/system/post/${postId}`, + url: `/u/post/${postId}`, method: 'get' }); } export function doAddPost(data: PostSubmitModel) { return request({ - url: '/system/post', + url: '/u/post', method: 'post', data }); @@ -29,7 +29,7 @@ export function doAddPost(data: PostSubmitModel) { export function doEditPost(data: PostSubmitModel) { return request({ - url: '/system/post', + url: '/u/post', method: 'put', data }); @@ -37,7 +37,7 @@ export function doEditPost(data: PostSubmitModel) { export function doDeletePost(postId: string | number) { return request({ - url: `/system/post/${postId}`, + url: `/u/post/${postId}`, method: 'delete' }); } diff --git a/src/service/api/role.ts b/src/service/api/role.ts index 5bd252f..c066f3b 100644 --- a/src/service/api/role.ts +++ b/src/service/api/role.ts @@ -7,7 +7,7 @@ import { request } from '../request'; * @returns */ export function doPutRole(role: Api.SystemManage.Role) { - return request({ url: '/system/role', method: 'put', data: role }); + return request({ url: '/u/role', method: 'put', data: role }); } /** @@ -17,7 +17,7 @@ export function doPutRole(role: Api.SystemManage.Role) { * @returns */ export function doPostRole(role: Api.SystemManage.Role) { - return request({ url: '/system/role', method: 'post', data: role }); + return request({ url: '/u/role', method: 'post', data: role }); } /** @@ -27,12 +27,12 @@ export function doPostRole(role: Api.SystemManage.Role) { * @returns */ export function doDeleteRole(roleId: number | string) { - return request({ url: `/system/role/${roleId}`, method: 'delete' }); + return request({ url: `/u/role/${roleId}`, method: 'delete' }); } export function doGetRoleList(params?: Api.SystemManage.RoleSearchParams) { return request({ - url: '/system/role/list', + url: '/u/role/list', method: 'get', params }); diff --git a/src/service/api/route.ts b/src/service/api/route.ts index 378a755..059df8d 100644 --- a/src/service/api/route.ts +++ b/src/service/api/route.ts @@ -7,7 +7,7 @@ export function fetchGetConstantRoutes() { /** get user routes */ export function doGetUserRoutes() { - return request({ url: '/system/menu/getRouters' }); + return request({ url: '/u/menu/getRouters' }); } /** diff --git a/src/service/api/user.ts b/src/service/api/user.ts index 6ec6de6..964f969 100644 --- a/src/service/api/user.ts +++ b/src/service/api/user.ts @@ -2,20 +2,20 @@ import { request } from '../request'; // user api export function doPutUser(user: Api.Auth.User) { - return request({ url: '/system/user', method: 'put', data: user }); + return request({ url: '/u/user', method: 'put', data: user }); } export function doPostUser(user: Api.Auth.User) { - return request({ url: '/system/user', method: 'post', data: user }); + return request({ url: '/u/user', method: 'post', data: user }); } export function doDeleteUser(userId: number | string) { - return request({ url: `/system/user/${userId}`, method: 'delete' }); + return request({ url: `/u/user/${userId}`, method: 'delete' }); } export function doGetUserList(params?: Api.SystemManage.UserSearchParams) { return request({ - url: '/system/user/list', + url: '/u/user/list', method: 'get', params }); @@ -29,26 +29,26 @@ export function doGetUserList(params?: Api.SystemManage.UserSearchParams) { export function doGetUserPostsAndRoles(userId: number | string | undefined) { if (!userId) { return request({ - url: '/system/user/', + url: '/u/user/', method: 'get' }); } return request({ - url: `/system/user/${userId}`, + url: `/u/user/${userId}`, method: 'get' }); } export function doGetAdminUserPostsAndRoles() { return request({ - url: `/system/user`, + url: `/u/user`, method: 'get' }); } export function doGetUserDeptTree() { return request({ - url: '/system/user/deptTree', + url: '/u/user/deptTree', method: 'get' }); } diff --git a/src/typings/api.d.ts b/src/typings/api.d.ts index eccdbda..d4262dd 100644 --- a/src/typings/api.d.ts +++ b/src/typings/api.d.ts @@ -136,6 +136,7 @@ declare namespace Api { password: string; code: string; uuid: string; + authType: string; } } diff --git a/src/views/_builtin/login/modules/pwd-login.vue b/src/views/_builtin/login/modules/pwd-login.vue index 8ccd74d..e840b2d 100644 --- a/src/views/_builtin/login/modules/pwd-login.vue +++ b/src/views/_builtin/login/modules/pwd-login.vue @@ -18,10 +18,11 @@ const codeImg = ref(''); getCheckCode(); const model = reactive({ - username: 'ryadmin', - password: 'admin123', + username: '123456', + password: '123456', code: '', - uuid: '' + uuid: '', + authType: 'u' }); const rules = {