diff --git a/__pycache__/nginx_tab.cpython-38.pyc b/__pycache__/nginx_tab.cpython-38.pyc index 92287b0..98c948e 100644 Binary files a/__pycache__/nginx_tab.cpython-38.pyc and b/__pycache__/nginx_tab.cpython-38.pyc differ diff --git a/app.log b/app.log index fa8c7f1..26c419d 100644 --- a/app.log +++ b/app.log @@ -5014,3 +5014,22 @@ Sep 07 12:20:19 statuspage systemd[1]: Started nginx.service - A high performanc 2025-09-07 12:40:56.006 | INFO | nginx_tab:set_username:556 - Nginx标签页已设置用户名: xiaji 2025-09-07 12:40:56.006 | INFO | nginx_tab:set_project_info:562 - Nginx标签页已设置项目信息: statuspage, 192.168.3.157 2025-09-07 12:40:56.009 | INFO | __main__:on_tab_changed:185 - 状态栏更新为Nginx服务: nginx, 项目: statuspage +2025-09-07 12:44:12.543 | INFO | __main__::189 - 启动应用程序 +2025-09-07 12:44:12.565 | INFO | __main__:__init__:17 - 初始化主窗口 +2025-09-07 12:44:12.570 | INFO | __main__:__init__:32 - 设置状态栏显示当前目录: C:\Users\xiaji\Documents\个人文件夹\夏骥\桌面部署 +2025-09-07 12:44:12.570 | INFO | server_connection_tab:__init__:14 - 初始化服务器连接标签页 +2025-09-07 12:44:12.572 | INFO | server_connection_tab:init_ui:93 - 服务器连接标签页UI初始化完成 +2025-09-07 12:44:12.572 | INFO | server_connection_tab:load_config:96 - 加载配置文件 +2025-09-07 12:44:12.572 | INFO | server_connection_tab:load_config:103 - 成功加载配置文件: c:\Users\xiaji\Documents\个人文件夹\夏骥\桌面部署\config.json +2025-09-07 12:44:12.573 | INFO | server_connection_tab:on_alias_changed:122 - 选择别名: 测试机 +2025-09-07 12:44:12.574 | INFO | remote_commands_tab:__init__:151 - 初始化远程命令标签页 +2025-09-07 12:44:12.575 | INFO | remote_commands_tab:init_ui:290 - 远程命令标签页UI初始化完成 +2025-09-07 12:44:12.578 | INFO | __main__:__init__:57 - 主窗口初始化完成 +2025-09-07 12:44:14.451 | INFO | server_connection_tab:connect_to_server:188 - 尝试连接服务器 +2025-09-07 12:44:14.544 | INFO | server_connection_tab:connect_to_server:207 - 成功连接到服务器: 192.168.3.157 +2025-09-07 12:44:16.898 | INFO | __main__:on_tab_changed:60 - 标签页切换到: 4 +2025-09-07 12:44:16.898 | INFO | nginx_tab:set_ssh_client:556 - Nginx标签页已设置SSH客户端 +2025-09-07 12:44:16.899 | INFO | nginx_tab:set_username:561 - Nginx标签页已设置用户名: xiaji +2025-09-07 12:44:16.899 | INFO | nginx_tab:set_project_info:567 - Nginx标签页已设置项目信息: statuspage, 192.168.3.157 +2025-09-07 12:44:16.902 | INFO | __main__:on_tab_changed:185 - 状态栏更新为Nginx服务: nginx, 项目: statuspage +2025-09-07 12:44:24.020 | INFO | nginx_tab:modify_to_unix_socket:947 - 已将proxy_pass修改为: unix:/home/xiaji/webstatus/sock/gunicorn.sock diff --git a/nginx_tab.py b/nginx_tab.py index e534417..c33213d 100644 --- a/nginx_tab.py +++ b/nginx_tab.py @@ -860,7 +860,11 @@ http { project_name = server_config.get('project', '') remote_dir = server_config.get('remote_dir', '') - # 构建静态文件路径 + # 根据要求构建静态文件路径 + # BASE_DIR = Path(__file__).resolve().parent.parent + # STATIC_ROOT = BASE_DIR / "static" + # MEDIA_ROOT = BASE_DIR / "media" + # 在实际路径中，这对应于项目目录下的static和media文件夹 static_path = f"{remote_dir}/{project_name}/static" media_path = f"{remote_dir}/{project_name}/media" @@ -870,14 +874,14 @@ http { # 检查是否已经包含静态文件映射 if "location /static/" not in current_config: # 添加静态文件映射配置 - static_mapping = f"\n # 静态文件映射\n" + static_mapping = f"\n # 静态文件映射 (STATIC_ROOT = BASE_DIR / \"static\")\n" static_mapping += f" location /static/ {{\n" static_mapping += f" alias {static_path}/;\n" static_mapping += f" expires 30d;\n" static_mapping += f" }}\n" # 添加媒体文件映射配置 - static_mapping += f"\n # 媒体文件映射\n" + static_mapping += f"\n # 媒体文件映射 (MEDIA_ROOT = BASE_DIR / \"media\")\n" static_mapping += f" location /media/ {{\n" static_mapping += f" alias {media_path}/;\n" static_mapping += f" expires 30d;\n"