diff --git a/app/blueprints/__pycache__/brand.cpython-311.pyc b/app/blueprints/__pycache__/brand.cpython-311.pyc index d6c2ef1..8731fea 100644 Binary files a/app/blueprints/__pycache__/brand.cpython-311.pyc and b/app/blueprints/__pycache__/brand.cpython-311.pyc differ diff --git a/app/blueprints/__pycache__/brand.cpython-39.pyc b/app/blueprints/__pycache__/brand.cpython-39.pyc index d06ce7d..bac8622 100644 Binary files a/app/blueprints/__pycache__/brand.cpython-39.pyc and b/app/blueprints/__pycache__/brand.cpython-39.pyc differ diff --git a/app/blueprints/brand.py b/app/blueprints/brand.py index 3d179e4..bc15ad1 100644 --- a/app/blueprints/brand.py +++ b/app/blueprints/brand.py @@ -362,7 +362,7 @@ def api_brand_expand_folder_recursive(): @brand_bp.route('/api/brand/run', methods=['POST']) -@login_required +# @login_required def api_brand_run(): """立即运行:创建任务并后台执行,立即返回 task_id,前端可轮询进度与取消""" try: @@ -400,6 +400,7 @@ def api_brand_run(): "content-type":"application/json", },data=json.dumps({ "files": urls, "strategy": strategy,"taskType": 1,"archiveName": ""})) print({ "files": urls, "strategy": strategy,"taskType": 1,"archiveName": ""}) + print(f"{JAVA_API_BASE}/api/brand/tasks?userId={user_id}") resp_data = resp.json() # print(f"{JAVA_API_BASE}/api/brand/tasks?userId={user_id} 返回:",resp_data,"状态:",resp.status_code) if resp_data.get("success"): @@ -408,6 +409,7 @@ def api_brand_run(): threading.Thread(target=_background_brand_task, args=(task_id,data), daemon=True).start() return jsonify({'success': True, 'task_id': task_id}) else: + print(resp_data) return jsonify({'success': False, 'error': "请求接口失败"}), 500 except Exception as e: diff --git a/app/config.py b/app/config.py index 64fc653..fea1dec 100644 --- a/app/config.py +++ b/app/config.py @@ -39,7 +39,7 @@ os.environ['SECRET_KEY'] = "ddffc7c1d02121d9554d7b080b2511b6" debug = False -version = "1.0.13" +version = "1.0.17" APP_UPDATE_URL = f"{_base_url}/api/version/latest" # 检测更新接口地址,返回 { "file_url": "...", "version": "x.x.x" } os.environ['APP_VERSION'] = version os.environ['APP_UPDATE_URL'] = APP_UPDATE_URL diff --git a/app/main.py b/app/main.py index 68e7e47..e13472b 100644 --- a/app/main.py +++ b/app/main.py @@ -358,7 +358,7 @@ def main(): window.expose(api.close, api.minimize, api.maximize, api.toggle_maximize, generate_images, api.save_image, api.save_image_to_folder, api.select_folder, api.select_brand_xlsx_files, api.select_brand_folder, api.save_file_from_url, api.save_template_xlsx,api.save_template_zip,api.upload_file_to_java) webview.start( - debug=True, + debug=False, storage_path=cache_path, private_mode=False )