feat: 初步完成调度台适配

app/core/config.py

@@ -124,22 +124,37 @@ class GlobalConfig(ConfigBase):
 
     Data_UID = ConfigItem("Data", "UID", str(uuid.uuid4()), UUIDValidator())
     Data_LastStatisticsUpload = ConfigItem(
-        "Data", "LastStatisticsUpload", "2000-01-01 00:00:00", DateTimeValidator()
+        "Data",
+        "LastStatisticsUpload",
+        "2000-01-01 00:00:00",
+        DateTimeValidator("%Y-%m-%d %H:%M:%S"),
     )
     Data_LastStageUpdated = ConfigItem(
-        "Data", "LastStageUpdated", "2000-01-01 00:00:00", DateTimeValidator()
+        "Data",
+        "LastStageUpdated",
+        "2000-01-01 00:00:00",
+        DateTimeValidator("%Y-%m-%d %H:%M:%S"),
     )
     Data_StageTimeStamp = ConfigItem(
-        "Data", "StageTimeStamp", "2000-01-01 00:00:00", DateTimeValidator()
+        "Data",
+        "StageTimeStamp",
+        "2000-01-01 00:00:00",
+        DateTimeValidator("%Y-%m-%d %H:%M:%S"),
     )
     Data_Stage = ConfigItem("Data", "Stage", "{ }", JSONValidator())
     Data_LastNoticeUpdated = ConfigItem(
-        "Data", "LastNoticeUpdated", "2000-01-01 00:00:00", DateTimeValidator()
+        "Data",
+        "LastNoticeUpdated",
+        "2000-01-01 00:00:00",
+        DateTimeValidator("%Y-%m-%d %H:%M:%S"),
     )
     Data_IfShowNotice = ConfigItem("Data", "IfShowNotice", True, BoolValidator())
     Data_Notice = ConfigItem("Data", "Notice", "{ }", JSONValidator())
     Data_LastWebConfigUpdated = ConfigItem(
-        "Data", "LastWebConfigUpdated", "2000-01-01 00:00:00", DateTimeValidator()
+        "Data",
+        "LastWebConfigUpdated",
+        "2000-01-01 00:00:00",
+        DateTimeValidator("%Y-%m-%d %H:%M:%S"),
     )
     Data_WebConfig = ConfigItem("Data", "WebConfig", "{ }", JSONValidator())
 
@@ -265,11 +280,15 @@ class MaaUserConfig(ConfigBase):
             "Info", "SklandToken", "", EncryptValidator()
         )
 
-        self.Data_LastProxyDate = ConfigItem("Data", "LastProxyDate", "2000-01-01")
-        self.Data_LastAnnihilationDate = ConfigItem(
-            "Data", "LastAnnihilationDate", "2000-01-01"
+        self.Data_LastProxyDate = ConfigItem(
+            "Data", "LastProxyDate", "2000-01-01", DateTimeValidator("%Y-%m-%d")
+        )
+        self.Data_LastAnnihilationDate = ConfigItem(
+            "Data", "LastAnnihilationDate", "2000-01-01", DateTimeValidator("%Y-%m-%d")
+        )
+        self.Data_LastSklandDate = ConfigItem(
+            "Data", "LastSklandDate", "2000-01-01", DateTimeValidator("%Y-%m-%d")
         )
-        self.Data_LastSklandDate = ConfigItem("Data", "LastSklandDate", "2000-01-01")
         self.Data_ProxyTimes = ConfigItem(
             "Data", "ProxyTimes", 0, RangeValidator(0, 9999)
         )

app/models/ConfigBase.py

@@ -30,7 +30,7 @@ from typing import List, Any, Dict, Union, Optional
 
 
 from app.utils import dpapi_encrypt, dpapi_decrypt
-from app.utils.constants import RESERVED_NAMES, ILLEGAL_CHARS
+from app.utils.constants import RESERVED_NAMES, ILLEGAL_CHARS, DEFAULT_DATETIME
 
 
 class ConfigValidator:
@@ -114,24 +114,30 @@ class UUIDValidator(ConfigValidator):
 
 
 class DateTimeValidator(ConfigValidator):
+    """日期时间验证器"""
+
+    def __init__(self, date_format: str) -> None:
+        if not date_format:
+            raise ValueError("日期时间格式不能为空")
+        self.date_format = date_format
 
     def validate(self, value: Any) -> bool:
         if not isinstance(value, str):
             return False
         try:
-            datetime.strptime(value, "%Y-%m-%d %H:%M:%S")
+            datetime.strptime(value, self.date_format)
             return True
         except ValueError:
             return False
 
     def correct(self, value: Any) -> str:
         if not isinstance(value, str):
-            return "2000-01-01 00:00:00"
+            return DEFAULT_DATETIME.strftime(self.date_format)
         try:
-            datetime.strptime(value, "%Y-%m-%d %H:%M:%S")
+            datetime.strptime(value, self.date_format)
             return value
         except ValueError:
-            return "2000-01-01 00:00:00"
+            return DEFAULT_DATETIME.strftime(self.date_format)
 
 
 class JSONValidator(ConfigValidator):

app/utils/constants.py

@@ -20,6 +20,8 @@
 #   Contact: DLmaster_361@163.com
 
 
+from datetime import datetime
+
 RESOURCE_STAGE_INFO = [
     {"value": "-", "text": "当前/上次", "days": [1, 2, 3, 4, 5, 6, 7]},
     {"value": "1-7", "text": "1-7", "days": [1, 2, 3, 4, 5, 6, 7]},
@@ -270,3 +272,6 @@ MIRROR_ERROR_INFO = {
     1: "未知错误类型",
 }
 """MirrorChyan错误代码映射表"""
+
+DEFAULT_DATETIME = datetime.strptime("2000-01-01 00:00:00", "%Y-%m-%d %H:%M:%S")
+"""默认日期时间"""