fix: 修复所有sor.U()调用, 合并id到更新字典(sor.U只接受2个参数)

reallife_asset/init.py

@@ -143,12 +143,13 @@ async def rl_check_validate_result(local_group_id, vendor, project_name="default
     now = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
     async with db.sqlorContext(dbname) as sor:
         await sor.U("rl_asset_group", {
+            "id": local_group_id,
             "vendor_group_id": vendor_group_id,
             "status": "active",
             "name": f"已认证-{vendor_group_id}",
             "title": f"已认证-{vendor_group_id}",
             "update_time": now,
-        }, {"id": local_group_id})
+        })
 
     return {"success": True, "vendor_group_id": vendor_group_id}
 
@@ -249,13 +250,14 @@ async def rl_sync_asset_status(asset_id):
     now = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
     async with db.sqlorContext(dbname) as sor:
         upd = {
+            "id": asset_id,
             "status": status,
             "update_time": now,
             "vendor_response": json.dumps(result, ensure_ascii=False),
         }
         if url:
             upd["url"] = url
-        await sor.U("rl_asset", upd, {"id": asset_id})
+        await sor.U("rl_asset", upd)
 
     return {"success": True, "status": status, "url": url}
 
@@ -337,11 +339,12 @@ async def rl_sync_group_from_vendor(org_id, vendor, project_name="default"):
             now = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
             if existing:
                 await sor.U("rl_asset_group", {
+                    "id": existing[0].id,
                     "name": item.get("Name", ""),
                     "title": item.get("Title", item.get("Name", "")),
                     "description": item.get("Description", ""),
                     "update_time": now,
-                }, {"id": existing[0].id})
+                })
             else:
                 gid = getID()
                 await sor.C("rl_asset_group", {
@@ -401,11 +404,12 @@ async def rl_sync_assets_from_vendor(org_id, local_group_id):
             now = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
             if existing:
                 await sor.U("rl_asset", {
+                    "id": existing[0].id,
                     "status": item.get("Status", ""),
                     "url": item.get("URL", ""),
                     "name": item.get("Name", existing[0].name),
                     "update_time": now,
-                }, {"id": existing[0].id})
+                })
             else:
                 aid = getID()
                 await sor.C("rl_asset", {
@@ -572,10 +576,10 @@ async def rl_sync_asset_status_user(org_id, asset_id, user_id):
 
     now = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
     async with db.sqlorContext(dbname) as sor:
-        upd = {"status": status, "update_time": now, "vendor_response": json.dumps(result, ensure_ascii=False)}
+        upd = {"id": asset_id, "status": status, "update_time": now, "vendor_response": json.dumps(result, ensure_ascii=False)}
         if url:
             upd["url"] = url
-        await sor.U("rl_asset", upd, {"id": asset_id})
+        await sor.U("rl_asset", upd)
 
     return {"success": True, "status": status, "url": url}
 
@@ -635,11 +639,12 @@ async def rl_handle_callback(byted_token, project_name="default"):
         })
         if existing:
             await sor.U("rl_org_group", {
+                "id": existing[0].id,
                 "vendor_group_id": vendor_group_id,
                 "local_group_id": local_group_id,
                 "name": group_name,
                 "update_time": now,
-            }, {"id": existing[0].id})
+            })
         else:
             await sor.C("rl_org_group", {
                 "id": mapping_id,
@@ -655,10 +660,11 @@ async def rl_handle_callback(byted_token, project_name="default"):
     # 4. Update rl_asset_group status
     async with db.sqlorContext(dbname) as sor:
         await sor.U("rl_asset_group", {
+            "id": local_group_id,
             "vendor_group_id": vendor_group_id,
             "status": "active",
             "update_time": now,
-        }, {"id": local_group_id})
+        })
 
     debug(f"callback processed: org={org_id}, group={local_group_id}, "
           f"vendor_group={vendor_group_id}")

wwwroot/api/rl_asset_group_update.dspy

@@ -10,6 +10,6 @@ async with db.sqlorContext(dbname) as sor:
         v = params_kw.get(f)
         if v is not None:
             upd[f] = v
-    await sor.U("rl_asset_group", upd, {"id": rid, "org_id": org_id})
+    await sor.U("rl_asset_group", {**upd, "id": rid})
 
 return {"success": True, "message": "更新成功"}

wwwroot/api/rl_org_group_update.dspy

@@ -13,6 +13,6 @@ for k in ['status', 'vendor_group_id', 'local_group_id', 'vendor']:
         upd[k] = params_kw.get(k)
 
 async with db.sqlorContext(dbname) as sor:
-    await sor.U("rl_org_group", upd, {"id": id})
+    await sor.U("rl_org_group", {**upd, "id": id})
 
 return {"success": True}

wwwroot/api/rl_vendor_config_update.dspy

@@ -15,7 +15,6 @@ for k in ['status', 'callback_url', 'vendor', 'vendor_title', 'upappid']:
 # Update api_mapping if provided
 api_mapping = params_kw.get('api_mapping', None)
 if api_mapping is not None:
-    import json
     try:
         api_mapping_dict = json.loads(api_mapping) if api_mapping else {}
         upd['api_mapping'] = json.dumps(api_mapping_dict, ensure_ascii=False)
@@ -25,6 +24,6 @@ if api_mapping is not None:
 upd['update_time'] = datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")
 
 async with db.sqlorContext(dbname) as sor:
-    await sor.U("rl_vendor_config", upd, {"id": id})
+    await sor.U("rl_vendor_config", {**upd, "id": id})
 
 return {"success": True}