bug修复

backend/routers/admin.py

@@ -14,7 +14,7 @@ import time
 
 logger = logging.getLogger(__name__)
 
-from backend.database import get_db
+from backend.database import get_db, db_add, db_update, db_delete, db_flush
 from backend.models import Server, Domain, DeployLog, AcmeConfig, AcmeLog
 from backend.config import get_settings
 
@@ -212,9 +212,7 @@ async def get_server(server_id: int, db: AsyncSession = Depends(get_db), _: bool
 @router.post("/servers", status_code=201)
 async def create_server(data: ServerCreate, db: AsyncSession = Depends(get_db), _: bool = Depends(require_auth)):
     server = Server(**data.model_dump())
-    db.add(server)
-    await db.flush()
-    await db.refresh(server)
+    await db_add(db, server, refresh=True)
     return {"id": server.id, "name": server.name}
 
 
@@ -224,8 +222,7 @@ async def update_server(server_id: int, data: ServerUpdate, db: AsyncSession = D
     server = result.scalar_one_or_none()
     if not server:
         raise HTTPException(404, "Server not found")
-    for key, value in data.model_dump(exclude_unset=True).items():
-        setattr(server, key, value)
+    await db_update(db, server, data.model_dump(exclude_unset=True))
     return {"id": server.id}
 
 
@@ -235,7 +232,7 @@ async def delete_server(server_id: int, db: AsyncSession = Depends(get_db), _: b
     server = result.scalar_one_or_none()
     if not server:
         raise HTTPException(404, "Server not found")
-    await db.delete(server)
+    await db_delete(db, server)
     return {"ok": True}
 
 
@@ -311,9 +308,7 @@ async def create_domain(data: DomainCreate, db: AsyncSession = Depends(get_db),
         raise HTTPException(409, "该域名在此服务器下已存在相同 ACME 配置的记录")
 
     domain = Domain(**dump)
-    db.add(domain)
-    await db.flush()
-    await db.refresh(domain)
+    await db_add(db, domain, refresh=True)
     return {"id": domain.id, "domain": domain.domain}
 
 
@@ -343,8 +338,7 @@ async def update_domain(domain_id: int, data: DomainUpdate, db: AsyncSession = D
         if dup:
             raise HTTPException(409, "该域名在此服务器下已存在相同 ACME 配置的记录")
 
-    for key, value in update_fields.items():
-        setattr(domain, key, value)
+    await db_update(db, domain, update_fields)
     return {"id": domain.id}
 
 
@@ -354,7 +348,7 @@ async def delete_domain(domain_id: int, db: AsyncSession = Depends(get_db), _: b
     domain = result.scalar_one_or_none()
     if not domain:
         raise HTTPException(404, "Domain not found")
-    await db.delete(domain)
+    await db_delete(db, domain)
     return {"ok": True}
 
 
@@ -448,9 +442,7 @@ async def get_acme_config(config_id: int, db: AsyncSession = Depends(get_db), _:
 @router.post("/acme/configs", status_code=201)
 async def create_acme_config(data: AcmeConfigCreate, db: AsyncSession = Depends(get_db), _: bool = Depends(require_auth)):
     config = AcmeConfig(**data.model_dump())
-    db.add(config)
-    await db.flush()
-    await db.refresh(config)
+    await db_add(db, config, refresh=True)
     return {"id": config.id, "name": config.name}
 
 
@@ -460,8 +452,7 @@ async def update_acme_config(config_id: int, data: AcmeConfigUpdate, db: AsyncSe
     config = result.scalar_one_or_none()
     if not config:
         raise HTTPException(404, "ACME config not found")
-    for key, value in data.model_dump(exclude_unset=True).items():
-        setattr(config, key, value)
+    await db_update(db, config, data.model_dump(exclude_unset=True))
     return {"id": config.id}
 
 
@@ -475,7 +466,7 @@ async def delete_acme_config(config_id: int, db: AsyncSession = Depends(get_db),
     result = await db.execute(select(Domain).where(Domain.acme_config_id == config_id))
     for d in result.scalars().all():
         d.acme_config_id = None
-    await db.delete(config)
+    await db_delete(db, config)
     return {"ok": True}
 
 
@@ -517,7 +508,7 @@ async def issue_cert(domain_id: int, db: AsyncSession = Depends(get_db), _: bool
     # 记录开始
     log = AcmeLog(domain_id=domain_id, action="issue", status="pending", message=f"Issuing certificate for {domain.domain}")
     db.add(log)
-    await db.flush()
+    await db_flush(db)
 
     try:
         success, msg, cert_info, raw_output = service.issue_certificate(domain.domain)
@@ -537,12 +528,12 @@ async def issue_cert(domain_id: int, db: AsyncSession = Depends(get_db), _: bool
                 domain.version = str(int(domain.version or "0") + 1)
                 logger.warning(f"无法获取证书信息: {domain.domain}")
 
-        await db.flush()
+        await db.commit()
         return {"success": success, "message": msg}
     except Exception as e:
         log.status = "failed"
         log.message = str(e)
-        await db.flush()
+        await db.commit()
         raise HTTPException(500, str(e))
 
 
@@ -583,7 +574,7 @@ async def auto_renew_all(db: AsyncSession = Depends(get_db), _: bool = Depends(r
         if need_renew:
             log = AcmeLog(domain_id=d.id, action="renew", status="pending", message=f"Auto-renewing {d.domain} (config: {config.name})")
             db.add(log)
-            await db.flush()
+            await db_flush(db)
 
             success, msg, cert_info, raw_output = service.renew_certificate(d.domain)
             log.status = "success" if success else "failed"
@@ -601,6 +592,7 @@ async def auto_renew_all(db: AsyncSession = Depends(get_db), _: bool = Depends(r
         else:
             results.append({"domain": d.domain, "success": True, "message": f"Skipped, {days_left} days left", "days_left": days_left})
 
+    await db.commit()
     return {"results": results}