暂替

app/main.py

@@ -144,32 +144,6 @@ class WindowAPI:
         )
         return result[0] if result else ''
 
-<<<<<<< HEAD
-    def upload_file_to_java(self, file_path, relative_path=None):
-        """按本地路径读取文件并上传到 Java 后端临时目录。"""
-        if not file_path or not str(file_path).strip():
-            return {'success': False, 'error': '文件路径为空'}
-        normalized_path = os.path.abspath(str(file_path).strip())
-        if not os.path.isfile(normalized_path):
-            return {'success': False, 'error': '文件不存在'}
-        try:
-            with open(normalized_path, 'rb') as file_obj:
-                response = requests.post(
-                    f"{JAVA_API_BASE}/api/files/upload",
-                    files={'file': (os.path.basename(normalized_path), file_obj)},
-                    data={'relativePath': str(relative_path).strip()} if relative_path else None,
-                    timeout=120,
-                )
-            response.raise_for_status()
-            payload = response.json()
-            if not isinstance(payload, dict):
-                return {'success': False, 'error': 'Java 返回格式错误'}
-            return payload
-        except Exception as e:
-            return {'success': False, 'error': str(e)}
-
-=======
->>>>>>> 574b372f425e4b0a35d1b371580628c4cfbcc45d
     def save_file_from_url(self, url, default_filename='download.zip'):
         """弹窗选择保存位置，从 url 下载文件并保存。用于品牌任务结果 zip 等。"""
         if not url or not url.strip():