bivashy/Blitz-Proxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat : Optimize user edit workflow and eliminate service restart delay

Browse Source
This commit is contained in:
Whispering Wind
2025-04-14 12:53:15 +03:30
committed by GitHub
parent 49b9580b60
commit 35d917b887
3 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/cli.py
View File

@ -148,6 +148,8 @@ def add_user(username: str, traffic_limit: int, expiration_days: int, password:
@click.option('--blocked', '-b', is_flag=True, help='Block the user') @click.option('--blocked', '-b', is_flag=True, help='Block the user')
def edit_user(username: str, new_username: str, new_traffic_limit: int, new_expiration_days: int, renew_password: bool, renew_creation_date: bool, blocked: bool): def edit_user(username: str, new_username: str, new_traffic_limit: int, new_expiration_days: int, renew_password: bool, renew_creation_date: bool, blocked: bool):
try: try:
cli_api.kick_user_by_name(username)
cli_api.traffic_status(display_output=False)
cli_api.edit_user(username, new_username, new_traffic_limit, new_expiration_days, cli_api.edit_user(username, new_username, new_traffic_limit, new_expiration_days,
renew_password, renew_creation_date, blocked) renew_password, renew_creation_date, blocked)
click.echo(f"User '{username}' updated successfully.") click.echo(f"User '{username}' updated successfully.")

2
core/scripts/hysteria2/edit_user.sh
View File

@ -224,7 +224,7 @@ edit_user() {
new_creation_date=${new_creation_date:-$creation_date} new_creation_date=${new_creation_date:-$creation_date}
new_blocked=$(convert_blocked_status "${new_blocked:-$blocked}") new_blocked=$(convert_blocked_status "${new_blocked:-$blocked}")
python3 $CLI_PATH restart-hysteria2 # python3 $CLI_PATH restart-hysteria2
if ! update_user_info "$username" "$new_username" "$new_password" "$new_traffic_limit" "$new_expiration_days" "$new_creation_date" "$new_blocked"; then if ! update_user_info "$username" "$new_username" "$new_password" "$new_traffic_limit" "$new_expiration_days" "$new_creation_date" "$new_blocked"; then
return 1 # Update user failed return 1 # Update user failed

2
core/scripts/webpanel/routers/api/v1/user.py
View File

@ -85,6 +85,8 @@ async def edit_user_api(username: str, body: EditUserInputBody):
HTTPException: if an error occurs while editing the user. HTTPException: if an error occurs while editing the user.
""" """
try: try:
cli_api.kick_user_by_name(username)
cli_api.traffic_status(display_output=False)
cli_api.edit_user(username, body.new_username, body.new_traffic_limit, body.new_expiration_days, cli_api.edit_user(username, body.new_username, body.new_traffic_limit, body.new_expiration_days,
body.renew_password, body.renew_creation_date, body.blocked) body.renew_password, body.renew_creation_date, body.blocked)
return DetailResponse(detail=f'User {username} has been edited.') return DetailResponse(detail=f'User {username} has been edited.')