Skip to content

[pull] main from dataease:main #84

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 1 commit into from
Dec 29, 2025
Merged

[pull] main from dataease:main #84

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions backend/common/audit/models/log_model.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from sqlmodel import Field, SQLModel
from sqlmodel import Field, SQLModel,BigInteger
from datetime import datetime
from typing import Optional
from enum import Enum
Expand Down Expand Up @@ -45,15 +45,15 @@ class SystemLog(SQLModel, table=True):
id: Optional[int] = Field(default=None, primary_key=True)
operation_type: str = Field(default=None)
operation_detail: str = Field(default=None)
user_id: Optional[int] = Field(default=None)
user_id: Optional[int] = Field(default=None, sa_type=BigInteger())
operation_status: str = Field(default=None)
ip_address: Optional[str] = Field(default=None)
user_agent: Optional[str] = Field(default=None)
execution_time: int = Field(default=0, description="执行时间(毫秒)")
execution_time: int = Field(default=0, description="执行时间(毫秒)", sa_type=BigInteger())
error_message: Optional[str] = Field(default=None)
create_time: datetime = Field(default_factory=datetime.now)
module: Optional[str] = Field(default=None)
oid: Optional[int] = Field(default=None)
oid: Optional[int] = Field(default=None, sa_type=BigInteger())
resource_id: Optional[str] = Field(default=None)
request_method: Optional[str] = Field(default=None)
request_path: Optional[str] = Field(default=None)
Expand Down
2 changes: 1 addition & 1 deletion backend/common/audit/schemas/logger_decorator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -509,7 +509,7 @@ async def async_wrapper(*args, **kwargs):
else:
resource_id = -1
oid = -1
resource_name = '-' + input_account
resource_name = input_account
if config.operation_type == OperationType.DELETE:
with Session(engine) as session:
resource_name = get_resource_name_by_id_and_module(session, resource_id, config.module)
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/views/system/audit/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,7 @@ const initOptions = () => {
</el-table-column>
<el-table-column prop="word" :label="$t('audit.oid_name')" width="120">
<template #default="scope">
{{ scope.row.oid_name }}
{{ scope.row.oid_name === '-1' ? '-' : scope.row.oid_name }}
</template>
</el-table-column>
<el-table-column prop="word" :label="$t('audit.operation_status')" width="100">
Expand Down