update api

src/api/RoleAPI.ts

@@ -1,5 +1,5 @@
 import { axios } from "./BaseAPI";
-import type { ModuleCode, Page, PageResult, Permission, Role, RolePayload, UserRoleAuthorizeReq } from "../types";
+import type { ModuleCode, Page, PageResult, Permission, Role, RolePayload, AuthorizeUserRole } from "../types";
 
 const BASE_URI = "/user/role";
 
@@ -36,7 +36,7 @@ async function authorizedList(userId: string, moduleCode?: ModuleCode): Promise<
 	});
 }
 
-async function authorize(req: UserRoleAuthorizeReq): Promise<void> {
+async function authorize(req: AuthorizeUserRole): Promise<void> {
 	return axios.post(`${BASE_URI}/authorized/create`, req);
 }
 

src/api/UserAPI.ts

@@ -1,4 +1,4 @@
-import type {Attachment, CaptchaData, LoginRequest, LoginResponse, RegisterRequest, UpdatePasswordRequest, User, UserAttachType} from "../types";
+import type {Attachment, CaptchaData, Gender, LoginRequest, LoginResponse, RegisterRequest, UpdatePasswordRequest, User, UserAttachType} from "../types";
 import {axios} from "./BaseAPI";
 import CommonAPI from "./CommonAPI";
 
@@ -6,6 +6,9 @@ const BASE_URI = "/user";
 type UserAttachmentOwner = {
 	attachmentList?: readonly Attachment[];
 };
+type UpdateCurrentRequest = Omit<Partial<User>, "gender"> & {
+	gender?: Gender | "";
+};
 
 async function register(req: CaptchaData<RegisterRequest>): Promise<LoginResponse> {
 	return await axios.post(`${BASE_URI}/register`, req);
@@ -34,7 +37,7 @@ async function logout(): Promise<void> {
 	return await axios.post(`${BASE_URI}/logout`);
 }
 
-async function updateCurrent(req: Partial<User>): Promise<LoginResponse> {
+async function updateCurrent(req: UpdateCurrentRequest): Promise<LoginResponse> {
 	return await axios.post(`${BASE_URI}/current/update`, req);
 }
 

src/types/Role.ts

@@ -1,21 +1,19 @@
 import type { ModuleCode, Permission } from "./Permission";
+import { Model } from "./Model";
 
-export interface Role {
+export type Role = {
-	id: string;
 	moduleCode: ModuleCode;
 	code: string;
 	nameLangId?: string;
 	name?: string;
 	description?: string;
+
 	permissionList?: Permission[];
 	allPermissionList?: Permission[];
 	childRoleList?: Role[];
 	permissionIdList?: string[];
 	childRoleIdList?: string[];
-	createdAt?: number;
+} & Model;
-	updatedAt?: number;
-	deletedAt?: number;
-}
 
 export type RolePayload = Pick<Role, "moduleCode" | "code" | "nameLangId" | "name" | "description"> & {
 	id?: string;
@@ -23,9 +21,8 @@ export type RolePayload = Pick<Role, "moduleCode" | "code" | "nameLangId" | "nam
 	childRoleIdList?: string[];
 };
 
-export interface UserRoleAuthorizeReq {
+export interface AuthorizeUserRole {
 	userId: string;
 	moduleCode?: ModuleCode;
 	roleIdList?: string[];
-	roleCodeList?: string[];
 }

src/types/User.ts

@@ -1,6 +1,9 @@
 import { ImageType, Model } from "./Model";
 import { Attachment } from "./Attachment";
 import type { Setting } from "./Setting";
+import { Role } from "./Role";
+
+export type Gender = "MALE" | "FEMALE";
 
 export type User = {
 	name: string;
@@ -13,7 +16,7 @@ export type User = {
 	wrapperType?: ImageType;
 	avatarType?: ImageType;
 	exp?: number;
-	sex?: number;
+	gender?: Gender;
 	birthdate?: number;
 	qq?: string;
 	description?: string;
@@ -21,7 +24,9 @@ export type User = {
 	lastLoginAt?: number;
 	unmuteAt?: number;
 	unbanAt?: number;
+
 	roleList?: string[];
+	roleEntityList?: Role[];
 	permissionList?: string[];
 	attachmentList?: Attachment[];
 	settingList?: Setting[];