Merge branch 'master' of https://gitee.com/TeaCodeNice/crawler-plugin

2026-03-27 21:51:34 +08:00
parent 5e2f750359 dfe0d652ce
commit a5c2681e88
39 changed files with 474 additions and 12 deletions
--- a/app/assets/_plugin-vue_export-helper-Dh4yMZWw.js
+++ b/app/assets/_plugin-vue_export-helper-Dh4yMZWw.js
--- a/app/assets/_plugin-vue_export-helper-xvHHTGU_.css
+++ b/app/assets/_plugin-vue_export-helper-xvHHTGU_.css
--- a/app/assets/convert-1dkFPbKa.css
+++ b/app/assets/convert-1dkFPbKa.css
--- a/app/assets/convert-6b0yq-M0.css
+++ b/app/assets/convert-6b0yq-M0.css
--- a/app/assets/convert-BxkpMHO9.css
+++ b/app/assets/convert-BxkpMHO9.css
--- a/app/assets/convert-D4Yv2oRy.css
+++ b/app/assets/convert-D4Yv2oRy.css
--- a/app/assets/convert-DwbQug2y.css
+++ b/app/assets/convert-DwbQug2y.css
--- a/app/assets/convert.js
+++ b/app/assets/convert.js
--- a/app/assets/dedupe-B0eqpVpj.css
+++ b/app/assets/dedupe-B0eqpVpj.css
--- a/app/assets/dedupe-BHE_BCAJ.css
+++ b/app/assets/dedupe-BHE_BCAJ.css
--- a/app/assets/dedupe-Day_nGxq.css
+++ b/app/assets/dedupe-Day_nGxq.css
--- a/app/assets/dedupe-DzFvTfoj.css
+++ b/app/assets/dedupe-DzFvTfoj.css
--- a/app/assets/dedupe-rhGu1E8E.css
+++ b/app/assets/dedupe-rhGu1E8E.css
--- a/app/assets/dedupe.js
+++ b/app/assets/dedupe.js
--- a/app/assets/el-alert-Ct0RpqUD.css
+++ b/app/assets/el-alert-Ct0RpqUD.css
--- a/app/assets/pywebview-B6ZNXusn.css
+++ b/app/assets/pywebview-B6ZNXusn.css
--- a/app/assets/pywebview-BRrok0pS.js
+++ b/app/assets/pywebview-BRrok0pS.js
--- a/app/assets/pywebview-BnpJyyGZ.js
+++ b/app/assets/pywebview-BnpJyyGZ.js
--- a/app/assets/pywebview-CGwF8TuM.js
+++ b/app/assets/pywebview-CGwF8TuM.js
--- a/app/assets/pywebview-Chz98E9c.css
+++ b/app/assets/pywebview-Chz98E9c.css
--- a/app/assets/pywebview-D-PKWjUg.js
+++ b/app/assets/pywebview-D-PKWjUg.js
--- a/app/assets/pywebview-DVgP2-kW.js
+++ b/app/assets/pywebview-DVgP2-kW.js
--- a/app/assets/pywebview-IqgMfeBe.css
+++ b/app/assets/pywebview-IqgMfeBe.css
--- a/app/assets/pywebview-Rm5Hhqpf.js
+++ b/app/assets/pywebview-Rm5Hhqpf.js
--- a/app/assets/pywebview-leZCedEt.js
+++ b/app/assets/pywebview-leZCedEt.js
--- a/app/assets/split-BsJfbBqn.css
+++ b/app/assets/split-BsJfbBqn.css
--- a/app/assets/split-DAa_Usoh.css
+++ b/app/assets/split-DAa_Usoh.css
--- a/app/assets/split-DidKJ84l.css
+++ b/app/assets/split-DidKJ84l.css
--- a/app/assets/split-R_8V5xgh.css
+++ b/app/assets/split-R_8V5xgh.css
--- a/app/assets/split-_O6NHqDj.css
+++ b/app/assets/split-_O6NHqDj.css
--- a/app/assets/split.js
+++ b/app/assets/split.js
--- a/app/blueprints/pycache/brand.cpython-311.pyc
+++ b/app/blueprints/pycache/brand.cpython-311.pyc
--- a/app/blueprints/pycache/brand.cpython-39.pyc
+++ b/app/blueprints/pycache/brand.cpython-39.pyc
--- 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:
--- 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
--- 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
    )
--- a/app/new_web_source/convert.html
+++ b/app/new_web_source/convert.html
@@ -5,8 +5,8 @@
    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
    <title>格式转换 - 数富AI</title>
    <script type="module" crossorigin src="/assets/convert.js"></script>
-    <link rel="modulepreload" crossorigin href="/assets/pywebview-Bl6M97uH.js">
-    <link rel="stylesheet" crossorigin href="/assets/pywebview-8G_9KMXd.css">
+    <link rel="modulepreload" crossorigin href="/assets/pywebview-leZCedEt.js">
+    <link rel="stylesheet" crossorigin href="/assets/pywebview-IqgMfeBe.css">
    <link rel="stylesheet" crossorigin href="/assets/convert-Cfr3mUjs.css">
  </head>
  <body>
--- a/app/new_web_source/dedupe.html
+++ b/app/new_web_source/dedupe.html
@@ -5,8 +5,8 @@
    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
    <title>数据去重 - 数富AI</title>
    <script type="module" crossorigin src="/assets/dedupe.js"></script>
-    <link rel="modulepreload" crossorigin href="/assets/pywebview-Bl6M97uH.js">
-    <link rel="stylesheet" crossorigin href="/assets/pywebview-8G_9KMXd.css">
+    <link rel="modulepreload" crossorigin href="/assets/pywebview-leZCedEt.js">
+    <link rel="stylesheet" crossorigin href="/assets/pywebview-IqgMfeBe.css">
    <link rel="stylesheet" crossorigin href="/assets/dedupe-CS18ls2z.css">
  </head>
  <body>
--- a/app/new_web_source/split.html
+++ b/app/new_web_source/split.html
@@ -5,8 +5,8 @@
    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
    <title>数据拆分 - 数富AI</title>
    <script type="module" crossorigin src="/assets/split.js"></script>
-    <link rel="modulepreload" crossorigin href="/assets/pywebview-Bl6M97uH.js">
-    <link rel="stylesheet" crossorigin href="/assets/pywebview-8G_9KMXd.css">
+    <link rel="modulepreload" crossorigin href="/assets/pywebview-leZCedEt.js">
+    <link rel="stylesheet" crossorigin href="/assets/pywebview-IqgMfeBe.css">
    <link rel="stylesheet" crossorigin href="/assets/split-mwLUJT1K.css">
  </head>
  <body>