xiaji/django.remote
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

完成git的功能

Browse Source
This commit is contained in:
xiaji
2025-08-31 11:02:17 +08:00
parent e9c0e13341
commit b7cdaa02c8
7 changed files with 80 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
__pycache__/remote_commands_tab.cpython-38.pyc
View File

Binary file not shown.

BIN
__pycache__/server_connection_tab.cpython-38.pyc
View File

Binary file not shown.

22
app.log
View File

@@ -64,3 +64,25 @@
2025-08-31 11:00:00.984 | INFO | remote_commands_tab:clone_repository:216 - 克隆仓库
2025-08-31 11:00:00.986 | INFO | remote_commands_tab:run:53 - 执行远程命令: git clone http://192.168.3.241:3000/xiaji/webstatus.git
2025-08-31 11:00:01.039 | INFO | remote_commands_tab:run:101 - 命令执行成功: git clone http://192.168.3.241:3000/xiaji/webstatus.git
2025-08-31 11:01:37.176 | INFO | __main__:<module>:52 - 启动应用程序
2025-08-31 11:01:37.199 | INFO | __main__:__init__:13 - 初始化主窗口
2025-08-31 11:01:37.200 | INFO | server_connection_tab:__init__:14 - 初始化服务器连接标签页
2025-08-31 11:01:37.207 | INFO | server_connection_tab:init_ui:93 - 服务器连接标签页UI初始化完成
2025-08-31 11:01:37.207 | INFO | server_connection_tab:load_config:96 - 加载配置文件
2025-08-31 11:01:37.208 | INFO | server_connection_tab:load_config:103 - 成功加载配置文件: c:\Users\xiaji\Documents\个人文件夹\夏骥\桌面部署\config.json
2025-08-31 11:01:37.208 | INFO | server_connection_tab:on_alias_changed:122 - 选择别名: 测试机
2025-08-31 11:01:37.210 | INFO | remote_commands_tab:__init__:116 - 初始化远程命令标签页
2025-08-31 11:01:37.210 | INFO | remote_commands_tab:init_ui:184 - 远程命令标签页UI初始化完成
2025-08-31 11:01:37.211 | INFO | __main__:__init__:32 - 主窗口初始化完成
2025-08-31 11:01:39.317 | INFO | server_connection_tab:connect_to_server:188 - 尝试连接服务器
2025-08-31 11:01:39.402 | INFO | server_connection_tab:connect_to_server:207 - 成功连接到服务器: 192.168.3.157
2025-08-31 11:01:54.528 | INFO | server_connection_tab:save_config:155 - 保存配置
2025-08-31 11:01:54.529 | INFO | server_connection_tab:save_config:181 - 配置已保存到: c:\Users\xiaji\Documents\个人文件夹\夏骥\桌面部署\config.json
2025-08-31 11:01:57.411 | INFO | server_connection_tab:connect_to_server:188 - 尝试连接服务器
2025-08-31 11:01:57.492 | INFO | server_connection_tab:connect_to_server:207 - 成功连接到服务器: 192.168.3.157
2025-08-31 11:01:58.932 | INFO | __main__:on_tab_changed:35 - 标签页切换到: 1
2025-08-31 11:01:58.933 | INFO | remote_commands_tab:set_ssh_client:187 - 设置SSH客户端
2025-08-31 11:01:58.933 | INFO | remote_commands_tab:set_server_config:198 - 设置服务器配置: git_url=http://192.168.3.241:3000/xiaji/webstatus.git, remote_dir=/home/xiaji
2025-08-31 11:02:03.902 | INFO | remote_commands_tab:clone_repository:235 - 克隆仓库
2025-08-31 11:02:03.903 | INFO | remote_commands_tab:run:53 - 执行远程命令: mkdir -p /home/xiaji && cd /home/xiaji && git clone http://192.168.3.241:3000/xiaji/webstatus.git
2025-08-31 11:02:03.914 | ERROR | remote_commands_tab:run:104 - 命令执行失败，退出状态: 128

4
config.json
View File

@@ -4,6 +4,8 @@
"username": "xiaji",
"password": "xiaji",
"port": 22,
"project": "statuspage"
"project": "statuspage",
"git_url": "http://192.168.3.241:3000/xiaji/webstatus.git",
"remote_dir": "/home/xiaji"
}
}

14
main.py
View File

@@ -32,12 +32,20 @@ class MainWindow(QMainWindow):
logger.info("主窗口初始化完成")
def on_tab_changed(self, index):
logger.info(f"切换到标签页: {index}")
logger.info(f"标签页切换到: {index}")
# 当切换到远程命令标签页时，传递SSH客户端
if index == 1: # 远程命令标签页的索引
# 当切换到远程命令标签页时，传递SSH客户端和服务器配置
if index == 1: # 远程命令标签页
ssh_client = self.server_connection_tab.get_ssh_client()
self.remote_commands_tab.set_ssh_client(ssh_client)
# 获取当前选中的服务器配置
current_alias = self.server_connection_tab.alias_combo.currentText()
if current_alias and current_alias in self.server_connection_tab.config_data:
server_config = self.server_connection_tab.config_data[current_alias]
git_url = server_config.get("git_url", "")
remote_dir = server_config.get("remote_dir", "")
self.remote_commands_tab.set_server_config(git_url, remote_dir)
if __name__ == "__main__":
logger.add("app.log", rotation="10 MB")

38
remote_commands_tab.py
View File

@@ -135,13 +135,27 @@ class RemoteCommandsTab(QWidget):
git_layout.addLayout(install_git_layout)
# 克隆项目
clone_layout = QFormLayout()
self.repo_url_input = QLineEdit()
clone_layout.addRow("仓库URL:", self.repo_url_input)
clone_layout = QHBoxLayout()
# 左侧：仓库URL和目录信息
left_layout = QFormLayout()
self.repo_url_input = QLineEdit()
left_layout.addRow("仓库URL:", self.repo_url_input)
self.remote_dir_display = QLineEdit()
self.remote_dir_display.setReadOnly(True)
left_layout.addRow("远程目录:", self.remote_dir_display)
clone_layout.addLayout(left_layout)
# 右侧：按钮
right_layout = QVBoxLayout()
self.clone_button = QPushButton("克隆项目")
self.clone_button.clicked.connect(self.clone_repository)
clone_layout.addRow(self.clone_button)
right_layout.addWidget(self.clone_button)
right_layout.addStretch()
clone_layout.addLayout(right_layout)
git_layout.addLayout(clone_layout)
git_group.setLayout(git_layout)
@@ -180,6 +194,11 @@ class RemoteCommandsTab(QWidget):
self.status_label.setText("未连接到服务器")
self.status_label.setStyleSheet("color: red;")
def set_server_config(self, git_url, remote_dir):
logger.info(f"设置服务器配置: git_url={git_url}, remote_dir={remote_dir}")
self.repo_url_input.setText(git_url)
self.remote_dir_display.setText(remote_dir)
def install_git(self):
logger.info("安装Git")
@@ -224,11 +243,20 @@ class RemoteCommandsTab(QWidget):
QMessageBox.warning(self, "警告", "请输入仓库URL")
return
remote_dir = self.remote_dir_display.text().strip()
self.output_text.clear()
self.status_label.setText("正在克隆仓库...")
# 构建克隆命令
if remote_dir:
# 如果指定了远程目录，先创建目录（如果不存在），然后克隆到指定目录
clone_command = f"mkdir -p {remote_dir} && cd {remote_dir} && git clone {repo_url}"
else:
clone_command = f"git clone {repo_url}"
# 创建并启动线程执行命令
self.command_thread = RemoteCommandThread(self.ssh_client, f"git clone {repo_url}")
self.command_thread = RemoteCommandThread(self.ssh_client, clone_command)
self.command_thread.output_signal.connect(self.append_output)
self.command_thread.finished_signal.connect(self.on_command_finished)
self.command_thread.start()

12
server_connection_tab.py
View File

@@ -59,6 +59,12 @@ class ServerConnectionTab(QWidget):
self.project_input = QLineEdit()
config_layout.addRow("项目名称:", self.project_input)
self.git_url_input = QLineEdit()
config_layout.addRow("Git地址:", self.git_url_input)
self.remote_dir_input = QLineEdit()
config_layout.addRow("远程目录:", self.remote_dir_input)
config_group.setLayout(config_layout)
main_layout.addWidget(config_group)
@@ -121,6 +127,8 @@ class ServerConnectionTab(QWidget):
self.password_input.setText(server_info.get("password", ""))
self.port_input.setText(str(server_info.get("port", "22")))
self.project_input.setText(server_info.get("project", ""))
self.git_url_input.setText(server_info.get("git_url", ""))
self.remote_dir_input.setText(server_info.get("remote_dir", ""))
def add_new_alias(self):
logger.info("添加新别名")
@@ -157,7 +165,9 @@ class ServerConnectionTab(QWidget):
"username": self.username_input.text(),
"password": self.password_input.text(),
"port": int(self.port_input.text()),
"project": self.project_input.text()
"project": self.project_input.text(),
"git_url": self.git_url_input.text(),
"remote_dir": self.remote_dir_input.text()
}
# 更新配置数据