字段调整

frontend/src/api/user/interface/index.ts

@@ -18,29 +18,21 @@ export namespace Login {
 // 用户管理模块
 export namespace User {
 
-  // 用户列表
-  export interface ResUserList {
-    id: string;       //用户ID，作为唯一标识
-    username: string; //用户名
+  // 用户接口
+  export interface UserBO {
+    id?: string;       //用户ID，作为唯一标识
+    name: string;     //用户名(别名)
+    loginName: string;//登录名
     password: string; //密码
-    realname: string; //真实姓名
-    status: number;   //用户状态
-    rolename: string; //角色名称
-  }
-
-  export interface ReqUserParams extends ReqPage {
-    id: string;       //用户ID，作为唯一标识
-    username: string; //用户名
-    password: string; //密码
-    realname: string; //真实姓名
-    status: number;   //用户状态
-    rolename: string; //角色名称
-  }
-
-  export interface ResStatus {
-    userLabel: string;
-    userValue: number;
+    phone?: string;    //手机号
+    email?: string;    //邮箱
+    loginTime?: string;//最后一次登录时间
+    loginErrorTimes: number;//登录错误次数
+    lockTime?: string; //用户密码错误锁定时间
   }
+   // 用户+分页
+   export interface ReqUserParams extends ReqPage,UserBO {
 
+   }
 }
 

frontend/src/api/user/login.ts

@@ -7,20 +7,20 @@ import http from '@/api'
  */
 // 用户登录
 export const loginApi = (params: Login.ReqLoginForm) => {
-  return http.post<Login.ResLogin>(`${rePrefix}/login`, params, { loading: false })
-  // return http.post<Login.ResLogin>(`/Register1`, params, { loading: false })
+  // return http.post<Login.ResLogin>(`${rePrefix}/login`, params, { loading: false })
+  return http.post<Login.ResLogin>(`/Register1`, params, { loading: false })
 }
 
 // 获取菜单列表
 export const getAuthMenuListApi = () => {
-  return http.get<Menu.MenuOptions[]>(`${rePrefix}/menu/list`, {}, { loading: false })
-  // return http.post<Menu.MenuOptions[]>(`/Register2`, {}, { loading: false })
+  // return http.get<Menu.MenuOptions[]>(`${rePrefix}/menu/list`, {}, { loading: false })
+  return http.post<Menu.MenuOptions[]>(`/Register2`, {}, { loading: false })
 }
 
 // 获取按钮权限
 export const getAuthButtonListApi = () => {
-  return http.get<Login.ResAuthButtons>(`${rePrefix}/auth/buttons`, {}, { loading: false })
-  // return http.post<Login.ResAuthButtons>(`/Register3`, {}, { loading: false })
+  // return http.get<Login.ResAuthButtons>(`${rePrefix}/auth/buttons`, {}, { loading: false })
+  return http.post<Login.ResAuthButtons>(`/Register3`, {}, { loading: false })
 }
 
 // 用户退出登录

frontend/src/api/user/user.ts

@@ -8,7 +8,7 @@ import http from '@/api'
  */
 // 获取用户列表
 export const getUserList = (params: User.ReqUserParams) => {
-  return http.post<ResPage<User.ResUserList>>(`${rePrefix}/user/list`, params)
+  return http.post<ResPage<User.UserBO>>(`/user/list`, params)
 }
 
 // 获取树形用户列表
@@ -17,8 +17,8 @@ export const getUserList = (params: User.ReqUserParams) => {
 // }
 
 // 新增用户
-export const addUser = (params: { id: string }) => {
-  return http.post(`${rePrefix}/user/add`, params)
+export const addUser = (params: User.UserBO) => {
+  return http.post(`/user/add`, params)
 }
 
 // 批量添加用户
@@ -27,24 +27,24 @@ export const BatchAddUser = (params: FormData) => {
 }
 
 // 编辑用户
-export const editUser = (params: { id: string }) => {
-  return http.post(`${rePrefix}/user/edit`, params)
+export const editUser = (params: User.UserBO) => {
+  return http.post(`/user/edit`, params)
 }
 
 // 删除用户
 export const deleteUser = (params: { id: string[] }) => {
-  return http.post(`${rePrefix}/user/delete`, params)
+  return http.post(`/user/delete`, params)
 }
 
 // 切换用户状态
-export const changeUserStatus = (params: { id: string; status: number }) => {
-  return http.post(`${rePrefix}/user/change`, params)
-}
+// export const changeUserStatus = (params: { id: string; status: number }) => {
+//   return http.post(`${rePrefix}/user/change`, params)
+// }
 
 // 重置用户密码
-export const resetUserPassWord = (params: { id: string }) => {
-  return http.post(`${rePrefix}/user/rest_password`, params)
-}
+// export const resetUserPassWord = (params: { id: string }) => {
+//   return http.post(`${rePrefix}/user/rest_password`, params)
+// }
 
 // 导出用户数据
 export const exportUserInfo = (params: User.ReqUserParams) => {
@@ -52,6 +52,6 @@ export const exportUserInfo = (params: User.ReqUserParams) => {
 }
 
 // 获取用户状态字典
-export const getUserStatus = () => {
-  return http.get<User.ResStatus[]>(`${rePrefix}/user/status`)
-}
+// export const getUserStatus = () => {
+//   return http.get<User.ResStatus[]>(`${rePrefix}/user/status`)
+// }