提交暂存

app/.env

@@ -17,4 +17,5 @@ java_api_base=http://127.0.0.1:18080
 # java_api_base=http://8.136.19.173:18080
 # java_api_base=http://121.196.149.225:18080
 
+debug=true
 

app/amazon/price_match.py

@@ -1332,12 +1332,12 @@ class PriceTask:
 
         url = f"{DELETE_BRAND_API_BASE}/api/price-track/tasks/{task_id}/result"
 
-        payload = {
+        country_aliases = {name: code for code, name in self.country_info.items()}
-          "shops": [
+        country_key = country_aliases.get(str(country_code).strip(), str(country_code).strip())
-            {
+
-              "shopName": shop_name,
+        countries = {}
-              "countries": {
+        if asin or status:
-                "additionalProperties1": [
+            countries[country_key] = [
               {
                 "shopMallName": shopMallName,
                 "asin": asin,
@@ -1348,14 +1348,19 @@ class PriceTask:
                 "secondPlace": status.get("secondPlace") if status.get("secondPlace") else "",
                 "cartShopName": status.get("cartShopName") if status.get("cartShopName") else "",
                 "priceChangeStatus": "UPDATED",
-                    "deleteSkipAsin": status.get("deleteSkipAsin",False),
+                "deleteSkipAsin": status.get("deleteSkipAsin", False),
                 "removeAsin": status.get("removeAsin") if status.get("removeAsin") else "",
                 # "modifyCount": "2",
-                    "shippingFee" : status.get("shippingFee") if status.get("shippingFee") else "",
+                "shippingFee": status.get("shippingFee") if status.get("shippingFee") else "",
                 "status": status.get("statu")
               }
             ]
-              },
+
+        payload = {
+          "shops": [
+            {
+              "shopName": shop_name,
+              "countries": countries,
               "error": ""
             }
           ]

app/config.py

@@ -51,7 +51,7 @@ os.environ['OSS_ACCESS_KEY_SECRET'] = accessKeySecret
 os.environ['SECRET_KEY'] = "ddffc7c1d02121d9554d7b080b2511b6"
 
 
-debug = False
+debug = os.getenv("debug", "false").strip().lower() in ("1", "true", "yes", "on")
 version = "1.0.56"
 APP_UPDATE_URL = f"{_base_url}/api/version/latest"  # 检测更新接口地址，返回 { "file_url": "...", "version": "x.x.x" }
 os.environ['APP_VERSION'] = version

app/main.py

@@ -50,8 +50,8 @@ class WindowAPI:
     def __init__(self, window):
         self._window = window
         self._is_maximized = False
-        window.events.maximized += lambda _: setattr(self, '_is_maximized', True)
+        window.events.maximized += lambda *args: setattr(self, '_is_maximized', True)
-        window.events.restored += lambda _: setattr(self, '_is_maximized', False)
+        window.events.restored += lambda *args: setattr(self, '_is_maximized', False)
 
     def close(self):
         """关闭窗口，异步执行清理逻辑"""