From 554638babb5696172d919d3efe7226433a24d61b Mon Sep 17 00:00:00 2001
From: yhydev <yhydev@outlook.com>
Date: Sat, 13 Dec 2025 10:36:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96WORKING=5FDIR=E5=A4=84?=
 =?UTF-8?q?=E7=90=86=EF=BC=9A1)=20=E6=8F=90=E5=8F=96get=5Fworking=5Fdir?=
 =?UTF-8?q?=E8=BE=85=E5=8A=A9=E5=87=BD=E6=95=B0=202)=20=E7=A1=AE=E4=BF=9D?=
 =?UTF-8?q?=E6=89=80=E6=9C=89=E5=9C=B0=E6=96=B9=E7=BB=9F=E4=B8=80=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8=E9=BB=98=E8=AE=A4=E5=80=BC=203)=20=E9=81=BF=E5=85=8D?=
 =?UTF-8?q?=E9=87=8D=E5=A4=8D=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 myscripts/working_tool.py | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/myscripts/working_tool.py b/myscripts/working_tool.py
index fff0ea4..18c9ed6 100644
--- a/myscripts/working_tool.py
+++ b/myscripts/working_tool.py
@@ -19,14 +19,19 @@ def get_file_hash(file_path):
     return hash_md5.hexdigest()
 
 
-def get_working_files():
-    """从环境变量WORKING_FILES获取要打包的文件列表"""
-    working_files_env = os.environ.get('WORKING_FILES', '')
+def get_working_dir():
+    """获取工作目录，处理默认值和路径转换"""
     working_dir = os.environ.get('WORKING_DIR', '.')
-    
     # 确保WORKING_DIR是绝对路径
     if not os.path.isabs(working_dir):
         working_dir = os.path.abspath(working_dir)
+    return working_dir
+
+
+def get_working_files():
+    """从环境变量WORKING_FILES获取要打包的文件列表"""
+    working_files_env = os.environ.get('WORKING_FILES', '')
+    working_dir = get_working_dir()
     
     if not working_files_env:
         return []
@@ -224,9 +229,7 @@ def upload_working_files(password=None):
     
     try:
         # 获取WORKING_DIR
-        working_dir = os.environ.get('WORKING_DIR', '.')
-        if not os.path.isabs(working_dir):
-            working_dir = os.path.abspath(working_dir)
+        working_dir = get_working_dir()
         
         # 打包文件
         with zipfile.ZipFile(zip_path, 'w', zipfile.ZIP_DEFLATED) as zipf:
@@ -241,9 +244,7 @@ def upload_working_files(password=None):
             os.unlink(zip_path)
             
             # 获取WORKING_DIR
-            working_dir = os.environ.get('WORKING_DIR', '.')
-            if not os.path.isabs(working_dir):
-                working_dir = os.path.abspath(working_dir)
+            working_dir = get_working_dir()
             
             # 使用内置的zipfile模块创建加密ZIP
             with zipfile.ZipFile(zip_path, 'w', zipfile.ZIP_DEFLATED, compresslevel=9) as zipf: