yumoqing/pcapi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request '测试异步' (#15) from dev1 into main

Browse Source 
Reviewed-on: #15
This commit is contained in:
ysh 2025-07-18 15:06:12 +08:00
commit 10c1f0c268
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/k8sManager/ssh_utils.py
View File

@ -103,23 +103,23 @@ async def ssh_execute_command_noroot(host, port, username, password, commands, r
for temp_path, final_path in temp_scp_map.items(): for temp_path, final_path in temp_scp_map.items():
# 确保目标目录存在 # 确保目标目录存在
mkdir_cmd = f"sudo mkdir -p $(dirname {final_path})" mkdir_cmd = f"sudo mkdir -p $(dirname {final_path})"
execute_sudo_command(ssh, mkdir_cmd, password, real_time_log, sudo_timeout, username) await execute_sudo_command(ssh, mkdir_cmd, password, real_time_log, sudo_timeout, username)
# 移动文件 # 移动文件
move_cmd = f"sudo mv {temp_path} {final_path}" move_cmd = f"sudo mv {temp_path} {final_path}"
execute_sudo_command(ssh, move_cmd, password, real_time_log, sudo_timeout, username) await execute_sudo_command(ssh, move_cmd, password, real_time_log, sudo_timeout, username)
# 设置文件权限 # 设置文件权限
chmod_cmd = f"sudo chmod 644 {final_path}" chmod_cmd = f"sudo chmod 644 {final_path}"
if final_path.endswith('.sh'): # 脚本文件设置可执行权限 if final_path.endswith('.sh'): # 脚本文件设置可执行权限
chmod_cmd = f"sudo chmod 755 {final_path}" chmod_cmd = f"sudo chmod 755 {final_path}"
execute_sudo_command(ssh, chmod_cmd, password, real_time_log, sudo_timeout, username) await execute_sudo_command(ssh, chmod_cmd, password, real_time_log, sudo_timeout, username)
# 执行远程命令（如果需要） # 执行远程命令（如果需要）
if remote_exec: if remote_exec:
for command in commands: for command in commands:
# 执行需要sudo权限的命令 # 执行需要sudo权限的命令
result, error = execute_sudo_command(ssh, command, password, real_time_log, sudo_timeout, username) result, error = await execute_sudo_command(ssh, command, password, real_time_log, sudo_timeout, username)
all_results.append((result, error)) all_results.append((result, error))
# 清理临时目录 # 清理临时目录