From 690b454bb121dd1b7c9c1875d82f85f20db9855a Mon Sep 17 00:00:00 2001
From: jxxghp <jxxghp@gmail.com>
Date: Sat, 17 Feb 2024 13:24:41 +0800
Subject: [PATCH] fix api

---
 app/api/endpoints/system.py |  2 ++
 app/core/config.py          | 27 ++++++---------------------
 2 files changed, 8 insertions(+), 21 deletions(-)

diff --git a/app/api/endpoints/system.py b/app/api/endpoints/system.py
index e73e82de..2db037f9 100644
--- a/app/api/endpoints/system.py
+++ b/app/api/endpoints/system.py
@@ -66,6 +66,8 @@ def set_env_setting(env: dict,
     更新系统环境变量
     """
     for k, v in env.items():
+        if k == "undefined":
+            continue
         if hasattr(settings, k):
             if v == "None":
                 v = None
diff --git a/app/core/config.py b/app/core/config.py
index 24945634..71f68675 100644
--- a/app/core/config.py
+++ b/app/core/config.py
@@ -223,32 +223,17 @@ class Settings(BaseSettings):
     # 自动检查和更新站点资源包（站点索引、认证等）
     AUTO_UPDATE_RESOURCE: bool = True
 
-    @validator("SUBSCRIBE_RSS_INTERVAL", pre=True, always=True)
-    def convert_rss_interval(cls, value):
+    @validator("SUBSCRIBE_RSS_INTERVAL",
+               "COOKIECLOUD_INTERVAL",
+               "MEDIASERVER_SYNC_INTERVAL",
+               pre=True, always=True)
+    def convert_int(cls, value):
         if not value:
             return 0
         try:
             return int(value)
         except (ValueError, TypeError):
-            raise ValueError("SUBSCRIBE_RSS_INTERVAL设置有误，不是数字！")
-
-    @validator("COOKIECLOUD_INTERVAL", pre=True, always=True)
-    def convert_cookiecloud_interval(cls, value):
-        if not value:
-            return 0
-        try:
-            return int(value)
-        except (ValueError, TypeError):
-            raise ValueError("COOKIECLOUD_INTERVAL设置有误，不是数字！")
-
-    @validator("MEDIASERVER_SYNC_INTERVAL", pre=True, always=True)
-    def convert_mediaserver_sync_interval(cls, value):
-        if not value:
-            return 0
-        try:
-            return int(value)
-        except (ValueError, TypeError):
-            raise ValueError("MEDIASERVER_SYNC_INTERVAL设置有误，不是数字！")
+            raise ValueError(f"{value} 格式错误，不是有效数字！")
 
     @property
     def INNER_CONFIG_PATH(self):