|
|
@@ -6,7 +6,7 @@ from sqlalchemy.exc import IntegrityError
|
|
|
|
|
|
from app.api.v1 import deps
|
|
|
from app.core import security
|
|
|
-from app.core.utils import generate_english_name
|
|
|
+from app.core.utils import generate_english_name, get_client_ip
|
|
|
from app.models.user import User, UserRole
|
|
|
from app.models.mapping import AppUserMapping
|
|
|
from app.schemas.user import User as UserSchema, UserCreate, UserUpdate, UserList, PromoteUserRequest, BatchResetEnglishNameRequest
|
|
|
@@ -175,7 +175,7 @@ def create_user(
|
|
|
action_type=ActionType.MANUAL_ADD,
|
|
|
target_user_id=db_user.id,
|
|
|
target_mobile=db_user.mobile,
|
|
|
- ip_address=request.client.host,
|
|
|
+ ip_address=get_client_ip(request),
|
|
|
details={"role": db_user.role}
|
|
|
)
|
|
|
|
|
|
@@ -245,7 +245,7 @@ def batch_reset_english_name(
|
|
|
action_type=ActionType.UPDATE,
|
|
|
target_user_id=user.id,
|
|
|
target_mobile=user.mobile,
|
|
|
- ip_address=request.client.host,
|
|
|
+ ip_address=get_client_ip(request),
|
|
|
details={
|
|
|
"field": "english_name",
|
|
|
"old": old_english_name,
|
|
|
@@ -396,7 +396,7 @@ def update_user(
|
|
|
action_type=action_type,
|
|
|
target_user_id=user.id,
|
|
|
target_mobile=user.mobile,
|
|
|
- ip_address=request.client.host,
|
|
|
+ ip_address=get_client_ip(request),
|
|
|
details=details
|
|
|
)
|
|
|
|
|
|
@@ -445,7 +445,7 @@ def promote_user(
|
|
|
action_type=ActionType.CHANGE_ROLE,
|
|
|
target_user_id=user.id,
|
|
|
target_mobile=user.mobile,
|
|
|
- ip_address=request.client.host,
|
|
|
+ ip_address=get_client_ip(request),
|
|
|
details={"old": old_role, "new": "SUPER_ADMIN"}
|
|
|
)
|
|
|
|
|
|
@@ -487,7 +487,7 @@ def delete_user(
|
|
|
action_type=ActionType.DELETE,
|
|
|
target_user_id=user.id,
|
|
|
target_mobile=user.mobile,
|
|
|
- ip_address=request.client.host,
|
|
|
+ ip_address=get_client_ip(request),
|
|
|
details={"status": "DISABLED"}
|
|
|
)
|
|
|
|