Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion backend/app/api/v1/module_system/user/schema.py
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ class UserUpdateSchema(UserCreateSchema):
last_login: Optional[DateTimeStr] = Field(default=None, description="最后登录时间")


class UserOutSchema(UserCreateSchema, BaseSchema):
class UserOutSchema(UserUpdateSchema, BaseSchema):
"""响应"""
model_config = ConfigDict(arbitrary_types_allowed=True, from_attributes=True)

Expand Down
1 change: 1 addition & 0 deletions backend/app/config/setting.py
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ class Settings(BaseSettings):
ALLOW_METHODS: List[str] = ["*"] # 允许的HTTP方法
ALLOW_HEADERS: List[str] = ["*"] # 允许的请求头
ALLOW_CREDENTIALS: bool = True # 是否允许携带cookie
CORS_EXPOSE_HEADERS: list[str] = ['X-Request-ID']

# ================================================= #
# ******************* 登录认证配置 ****************** #
Expand Down
3 changes: 2 additions & 1 deletion backend/app/core/middlewares.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@ def __init__(self, app: ASGIApp) -> None:
"allow_origins": settings.ALLOW_ORIGINS,
"allow_methods": settings.ALLOW_METHODS,
"allow_headers": settings.ALLOW_HEADERS,
"allow_credentials": settings.ALLOW_CREDENTIALS
"allow_credentials": settings.ALLOW_CREDENTIALS,
"expose_headers": settings.CORS_EXPOSE_HEADERS,
}
super().__init__(app, **CORSMiddlewareConfig)

Expand Down
Binary file modified fastdocs/src/public/group.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion frontend/src/api/generator/demo.ts
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ const ExampleAPI = {
});
},

importExample(body: any) {
importExample(body: FormData) {
return request<ApiResponse>({
url: `${API_PATH}/import`,
method: "post",
Expand Down
4 changes: 4 additions & 0 deletions frontend/src/api/system/dict.ts
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,8 @@ export interface DictPageQuery extends PageQuery {
start_time?: string;
/** 结束时间 */
end_time?: string;
// 创建人ID
creator?: number;
}

export interface DictDataPageQuery extends PageQuery {
Expand All @@ -151,6 +153,8 @@ export interface DictDataPageQuery extends PageQuery {
status?: boolean;
start_time?: string;
end_time?: string;
// 创建人ID
creator?: number;
}

export interface DictTable {
Expand Down
2 changes: 2 additions & 0 deletions frontend/src/api/system/log.ts
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@ export interface LogPageQuery extends PageQuery {
start_time?: string;
/** 结束时间 */
end_time?: string;
// 创建人ID
creator?: number;
}

export interface LogTable {
Expand Down
2 changes: 2 additions & 0 deletions frontend/src/api/system/notice.ts
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,8 @@ export interface NoticePageQuery extends PageQuery {
start_time?: string;
/** 结束时间 */
end_time?: string;
// 创建人ID
creator?: number;
}

export interface NoticeTable {
Expand Down
2 changes: 2 additions & 0 deletions frontend/src/api/system/params.ts
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,8 @@ export interface ConfigPageQuery extends PageQuery {
start_time?: string;
/** 结束时间 */
end_time?: string;
// 创建人ID
creator?: number;
}

export interface ConfigTable {
Expand Down
2 changes: 2 additions & 0 deletions frontend/src/api/system/position.ts
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,8 @@ export interface PositionPageQuery extends PageQuery {
start_time?: string;
/** 结束时间 */
end_time?: string;
// 创建人ID
creator?: number;
}

export interface PositionTable {
Expand Down
2 changes: 2 additions & 0 deletions frontend/src/api/system/role.ts
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,8 @@ export interface TablePageQuery extends PageQuery {
start_time?: string;
/** 结束时间 */
end_time?: string;
// 创建人ID
creator?: number;
}

export interface RoleTable {
Expand Down
10 changes: 6 additions & 4 deletions frontend/src/api/system/user.ts
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,8 @@ export interface UserPageQuery extends PageQuery {
start_time?: string;
/** 结束时间 */
end_time?: string;
// 创建人ID
creator?: number;
}

export interface searchSelectDataType {
Expand All @@ -181,10 +183,10 @@ export interface UserInfo {
dept_id?: deptTreeType["id"];
dept_name?: deptTreeType["name"];
roles?: roleSelectorType[];
roleNames?: roleSelectorType["name"][];
role_names?: roleSelectorType["name"][];
role_ids?: roleSelectorType["id"][];
positions?: positionSelectorType[];
positionNames?: positionSelectorType["name"][];
position_names?: positionSelectorType["name"][];
position_ids?: positionSelectorType["id"][];
is_superuser?: boolean;
status?: boolean;
Expand Down Expand Up @@ -251,9 +253,9 @@ export interface UserForm {
dept_id?: number;
dept_name?: string;
role_ids?: number[];
roleNames?: string[];
role_names?: string[];
position_ids?: number[];
positionNames?: string[];
position_names?: string[];
password?: string;
gender?: number;
email?: string;
Expand Down
Loading