From 99fbfdc73248070621e9191c000ec7403be6c39c Mon Sep 17 00:00:00 2001
From: xiaji <rembme@163.com>
Date: Sun, 7 Sep 2025 12:46:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86sock=E7=9A=84?=
 =?UTF-8?q?=E7=AB=99=E7=82=B9=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E6=8C=89=E9=92=AE=20=E5=A2=9E=E5=8A=A0=E4=BA=86?=
 =?UTF-8?q?=E4=B8=8B=E6=8B=89=E7=AB=99=E7=82=B9=E9=85=8D=E7=BD=AE=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E6=8C=89=E9=92=AE=20=E5=A2=9E=E5=8A=A0=E4=BA=86?=
 =?UTF-8?q?=E9=9D=99=E6=80=81=E6=96=87=E4=BB=B6=E7=9A=84=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E5=86=85=E5=AE=B9=EF=BC=8C=E5=86=99=E5=85=A5=E5=88=B0=E7=AB=99?=
 =?UTF-8?q?=E7=82=B9=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E7=9A=84=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 __pycache__/nginx_tab.cpython-38.pyc | Bin 28864 -> 30127 bytes
 app.log                              |  19 +++++++++++++++++++
 nginx_tab.py                         |  10 +++++++---
 3 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/__pycache__/nginx_tab.cpython-38.pyc b/__pycache__/nginx_tab.cpython-38.pyc
index 92287b02621e82b79aaa97c824289e3b34ed45e2..98c948e0f47ac49fbfe8e02894f8c4acdc09c9a0 100644
GIT binary patch
delta 3320
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
GfB!FMiKm+Y

delta 2278
zcmbW2YfzL`7{}iO?1jt1E|?M{>dHk|S1^U4#<;8!O5lc|auL!9jGGR7cJWfH=A@G)
zB=J~U4FcXK5;c3vOjIna)EdpEn%vSR(P<j(Q{#s&6P^Egomz?f!297h&-<L`yw5rR
z_c_lwe3PC2k%ccZnL-rt+%TT3G4&k@kDSDU$U12-<as4XDYF(Swse{?`B&yt6K$Ir
zU78Y0ho(e_8afSLr7pUQF@<hU$)D|Iokp(#ubz<S6tA*$oERS08CGS2PmCgboV1nB
z@m_Yvn$V>%rAiT5!l`5G1!}fuGOPNz-OW^2QW|4*)SdjO`dhNaq}w4Dc}|T;H!$;S
z!sOe4^}y@Y<%pt(GDfp#D#*Cb;wd%rYi6U+tP8B2d|9b1iOdc!dzD%osVq(HcZ_Fj
zHx10*#Ac~AbK>yQoL#7YQ+&)BKpWko>G$kjwug>B;<WA+PMe9(M55h*8Q2Ge0{bZ;
zXRf{*=3C@wh|;wPvs8UCr;5eMb;?N*7=IAR1m2dB?+LSkCd~Uuq%!7C%T_T|2*{)n
zeo42&`vx#HJ$%!E1;D$sHrGA|tFZ-fD?CNO0U$*teMy+B)UR^4FxEpAc`0l!wdG|z
za8S6NwkU0j|E@L|6AuGJ^AgLSmngR_ceG5zbnCQ~M-cxG;FtHPc;8Bcg(+%p{wfxX
ze76$>$dxySZp{ymb9U>8W|v=<OIRi%HP!SV2y<TmWtLg#g!7t^uH&(y=~6JWpJ3}S
zL6*p{s?o%PId{pl2JwE&Z58i_)$Ijan7Ic-?*sL~Ua}X?8i8I5N}|{?>M5LRzFReZ
zT>h7j#JA51eg4q*3ae=bSu0|wCC)$<3&SaSp+SEF?i4@w7z;$?Ck34R6iiuG`hH<v
z(*){U_^n}&9PguDi{i3RBkCET29T<S4^?gGpGKstuvM@=B;8`WU%l&J7T#L{WGRoQ
z-hvQy{o>+bB)d^Oa>=SohL=o#Mq~~QY%7{cw@P|7+3Z4}QPdu9pub9`Z0rPGElnF<
zDc#571F>pGStR>MrQ#*Fxu=C&Q|WP7BT`9BBu7p({jem;Pb^)V@J~|B<xMO~J8{8U
zk!qcSc2>+_T5tG71ZJoM6_!A@Q@y=x7K=n3`*eJH?aC^CC;a;I$y8UFz%Ed0<yclm
z2P=~WuT&=JJ{7_9$?)V_Do;02e*HSyP@~JzO2My`Mbtfen;6%AeKo9ObfzZWe>Wt&
zo2ay5yqZuuo!KE2N14i+<k|);|I;-$)@8-WgCLvDkdrQtgynnjsU3le;*J)E5)j15
zQgk1Usy{9c{l$7)uKY3gYRy=RtX#SLD|pQU#sXIXxdN?kZx`=9YH5QRjj?V;YM5L<
zKZG#tU|~jIAnpg%x8nYQd`-@?2sj6v2R;M50M41u@Kmj5X%lbYjc|P-@N`g;@csPf
z;NW0c@apPHx915@lbcc+i`hYHZd?;7w-xJmDld`6WwrQp?#6~%kIz`WvdX=>)>A_c
zmo0Q3J{t<`rzY2(o))I{;mdIQfbZy{E0!IgUtF>JSA^qyplaqx*l4CZ_CFid4TumO
zJ?l=}Fp(!=eljo}hy*qOxQ}@|unXt_Istj%y#NarDsKUB)p1-s9QOc659h4_+8*x*
z&`0<g0LPN!r0{qg1CC<ms5Op?;P_G6-@{h;04?<-hCD1xBMUPcD`}f&8lCdQurKMd
H=bOI)x63}O

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__:<module>: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"