From 1b42a382a10a81e190f9a46c396c14e6d928f402 Mon Sep 17 00:00:00 2001
From: jxxghp <jxxghp@gmail.com>
Date: Fri, 7 Jul 2023 09:54:12 +0800
Subject: [PATCH] fix site

---
 app/api/endpoints/site.py | 13 +++++--------
 app/db/models/site.py     |  6 +++++-
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/app/api/endpoints/site.py b/app/api/endpoints/site.py
index 3ca9e7e6..48ac697b 100644
--- a/app/api/endpoints/site.py
+++ b/app/api/endpoints/site.py
@@ -29,10 +29,10 @@ async def read_sites(db: Session = Depends(get_db),
     """
     获取站点列表
     """
-    return Site.list(db)
+    return Site.list_order_by_pri(db)
 
 
-@router.put("/", summary="更新站点", response_model=schemas.Site)
+@router.put("/", summary="更新站点", response_model=schemas.Response)
 async def update_site(
         *,
         db: Session = Depends(get_db),
@@ -44,12 +44,9 @@ async def update_site(
     """
     site = Site.get(db, site_in.id)
     if not site:
-        raise HTTPException(
-            status_code=404,
-            detail=f"站点 {site_in.id} 不存在",
-        )
-    site.update(db, **site_in.dict())
-    return site
+        return schemas.Response(success=False, message="站点不存在")
+    site.update(db, site_in.dict())
+    return schemas.Response(success=True)
 
 
 @router.delete("/", summary="删除站点", response_model=schemas.Response)
diff --git a/app/db/models/site.py b/app/db/models/site.py
index 40477252..7c47b7ee 100644
--- a/app/db/models/site.py
+++ b/app/db/models/site.py
@@ -18,7 +18,7 @@ class Site(Base):
     # 站点地址
     url = Column(String, nullable=False)
     # 站点优先级
-    pri = Column(Integer)
+    pri = Column(Integer, default=1)
     # RSS地址，未启用
     rss = Column(String)
     # Cookie
@@ -53,3 +53,7 @@ class Site(Base):
     @staticmethod
     def get_actives(db: Session):
         return db.query(Site).filter(Site.is_active == 1).all()
+
+    @staticmethod
+    def list_order_by_pri(db: Session):
+        return db.query(Site).order_by(Site.pri).all()