aury-boot 0.0.15__py3-none-any.whl → 0.0.18__py3-none-any.whl

aury/boot/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '0.0.15'
-__version_tuple__ = version_tuple = (0, 0, 15)
+__version__ = version = '0.0.18'
+__version_tuple__ = version_tuple = (0, 0, 18)
 
 __commit_id__ = commit_id = None

aury/boot/application/app/components.py

@@ -281,18 +281,65 @@ class SchedulerComponent(Component):
             except Exception as e:
                 logger.warning(f"加载定时任务模块失败 ({module_name}): {e}")
 
+    def _build_scheduler_config(self, config: BaseConfig) -> dict:
+        """根据配置构建 APScheduler 初始化参数。"""
+        scheduler_kwargs: dict = {}
+        scheduler_config = config.scheduler
+        
+        # jobstores: 根据 URL 自动选择存储后端
+        if scheduler_config.jobstore_url:
+            url = scheduler_config.jobstore_url
+            if url.startswith("redis://"):
+                try:
+                    from apscheduler.jobstores.redis import RedisJobStore
+                    scheduler_kwargs["jobstores"] = {
+                        "default": RedisJobStore.from_url(url)
+                    }
+                    logger.info(f"调度器使用 Redis 存储: {url.split('@')[-1]}")
+                except ImportError:
+                    logger.warning("Redis jobstore 需要安装 redis: pip install redis")
+            else:
+                # SQLAlchemy 存储 (sqlite/postgresql/mysql)
+                try:
+                    from apscheduler.jobstores.sqlalchemy import SQLAlchemyJobStore
+                    scheduler_kwargs["jobstores"] = {
+                        "default": SQLAlchemyJobStore(url=url)
+                    }
+                    logger.info("调度器使用 SQLAlchemy 存储")
+                except ImportError:
+                    logger.warning("SQLAlchemy jobstore 需要安装 sqlalchemy")
+        
+        # timezone
+        if scheduler_config.timezone:
+            scheduler_kwargs["timezone"] = scheduler_config.timezone
+        
+        # job_defaults
+        scheduler_kwargs["job_defaults"] = {
+            "coalesce": scheduler_config.coalesce,
+            "max_instances": scheduler_config.max_instances,
+            "misfire_grace_time": scheduler_config.misfire_grace_time,
+        }
+        
+        return scheduler_kwargs
+    
     async def setup(self, app: FoundationApp, config: BaseConfig) -> None:
         """启动调度器。
         
-        1. 自动发现并加载定时任务模块
-        2. 启动调度器（注册装饰器收集的任务）
+        1. 根据配置初始化调度器（jobstore/timezone/job_defaults）
+        2. 自动发现并加载定时任务模块
+        3. 启动调度器（注册装饰器收集的任务）
         """
         try:
+            # 构建配置
+            scheduler_kwargs = self._build_scheduler_config(config)
+            
+            # 获取/创建调度器实例
+            scheduler = SchedulerManager.get_instance("default", **scheduler_kwargs)
+            
             # 自动发现并加载定时任务模块
             self._autodiscover_schedules(app, config)
             
             # 启动调度器
-            scheduler = SchedulerManager.get_instance()
             scheduler.start()
         except Exception as e:
             logger.warning(f"调度器启动失败（非关键）: {e}")

aury/boot/application/app/startup.py

@@ -152,7 +152,7 @@ def collect_component_status() -> list[ComponentStatus]:
                     name="Cache" if name == "default" else f"Cache [{name}]",
                     status="ok",
                     backend=instance.backend_type,
-                    url=instance._config.get("CACHE_URL") if instance._config else None,
+                    url=(instance._config or {}).get("CACHE_URL"),
                 )
             )
 

aury/boot/application/config/settings.py

@@ -416,6 +416,10 @@ class SchedulerSettings(BaseModel):
     - SCHEDULER__ENABLED=false: 只运行 API，不启动调度器
     
     独立调度器通过 `aury scheduler` 命令运行，不需要此配置。
+    
+    分布式调度：
+    - 配置 SCHEDULER__JOBSTORE_URL 使用 Redis/SQLAlchemy 存储
+    - 多节点部署时共享任务状态
     """
     
     enabled: bool = Field(
@@ -426,6 +430,33 @@ class SchedulerSettings(BaseModel):
         default_factory=list,
         description="定时任务模块列表。为空时自动发现 schedules 模块"
     )
+    # APScheduler 配置
+    jobstore_url: str | None = Field(
+        default=None,
+        description=(
+            "任务存储 URL。支持：\n"
+            "- redis://localhost:6379/0（Redis 存储）\n"
+            "- sqlite:///jobs.db（SQLite 存储）\n"
+            "- postgresql://user:pass@host/db（PostgreSQL 存储）\n"
+            "- 不配置则使用内存存储"
+        )
+    )
+    timezone: str | None = Field(
+        default=None,
+        description="调度器时区，如 Asia/Shanghai、UTC"
+    )
+    coalesce: bool = Field(
+        default=True,
+        description="是否合并错过的任务执行（多次错过只执行一次）"
+    )
+    max_instances: int = Field(
+        default=1,
+        description="同一任务的最大并发实例数"
+    )
+    misfire_grace_time: int = Field(
+        default=60,
+        description="任务错过容忍时间（秒），超过此时间则跳过"
+    )
 
 
 class TaskSettings(BaseModel):

aury/boot/commands/templates/project/AGENTS.md.tpl

@@ -122,6 +122,8 @@ mypy {package_name}/
 
 ## 代码规范
 
+> 项目所有业务配置请通过应用 `settings`/配置对象获取，**不要**直接使用 `os.environ` 在业务代码中读环境变量。
+
 ### Model 规范
 
 - **必须**继承框架预定义基类，**不要**直接继承 `Base`
@@ -129,6 +131,16 @@ mypy {package_name}/
 - 软删除模型**必须**使用复合唯一约束（包含 `deleted_at`），不能单独使用 `unique=True`
 - **不建议**使用数据库外键（`ForeignKey`），通过程序控制关系，便于分库分表和微服务拆分
 
+**重要：软删除机制**
+
+框架采用「默认 0」策略，而非 IS NULL：
+- `deleted_at = 0`：未删除
+- `deleted_at > 0`：已删除（Unix 时间戳）
+
+查询未删除记录时，使用 `WHERE deleted_at = 0`，不是 `WHERE deleted_at IS NULL`。
+
+BaseRepository 已自动处理软删除过滤，无需手动添加条件。
+
 ```python
 # ✅ 正确
 from aury.boot.domain.models import AuditableStateModel

aury/boot/commands/templates/project/aury_docs/08-scheduler.md.tpl

@@ -1,32 +1,178 @@
 # 定时任务（Scheduler）
 
+基于 APScheduler，完全透传原生 API。
+
+## 基本用法
+
 **文件**: `{package_name}/schedules/__init__.py`
 
 ```python
 """定时任务模块。"""
 
+from apscheduler.triggers.cron import CronTrigger
+from apscheduler.triggers.interval import IntervalTrigger
+
 from aury.boot.common.logging import logger
 from aury.boot.infrastructure.scheduler import SchedulerManager
 
 scheduler = SchedulerManager.get_instance()
 
 
-@scheduler.scheduled_job("interval", seconds=60)
+@scheduler.scheduled_job(IntervalTrigger(seconds=60))
 async def every_minute():
     """每 60 秒执行。"""
     logger.info("定时任务执行中...")
 
 
-@scheduler.scheduled_job("cron", hour=0, minute=0)
+@scheduler.scheduled_job(CronTrigger(hour=0, minute=0))
 async def daily_task():
     """每天凌晨执行。"""
     logger.info("每日任务执行中...")
 
 
-@scheduler.scheduled_job("cron", day_of_week="mon", hour=9)
+@scheduler.scheduled_job(CronTrigger(day_of_week="mon", hour=9))
 async def weekly_report():
     """每周一 9 点执行。"""
     logger.info("周报任务执行中...")
 ```
 
-启用方式：配置 `SCHEDULER_ENABLED=true`，框架自动加载 `{package_name}/schedules/` 模块。
+启用方式：配置 `SCHEDULER__ENABLED=true`，框架自动加载 `{package_name}/schedules/` 模块。
+
+## 配置项
+
+```bash
+# .env
+SCHEDULER__ENABLED=true                          # 是否启用
+SCHEDULER__TIMEZONE=Asia/Shanghai                # 时区
+SCHEDULER__COALESCE=true                         # 合并错过的任务
+SCHEDULER__MAX_INSTANCES=1                       # 同一任务最大并发数
+SCHEDULER__MISFIRE_GRACE_TIME=60                 # 错过容忍时间(秒)
+SCHEDULER__JOBSTORE_URL=redis://localhost:6379/0 # 分布式存储（可选）
+```
+
+## 触发器类型
+
+### CronTrigger - 定时触发
+
+```python
+from apscheduler.triggers.cron import CronTrigger
+
+# 每天凌晨 2:30
+CronTrigger(hour=2, minute=30)
+
+# 每小时整点
+CronTrigger(hour="*", minute=0)
+
+# 工作日 9:00
+CronTrigger(day_of_week="mon-fri", hour=9)
+
+# 每月 1 号
+CronTrigger(day=1, hour=0)
+
+# 使用 crontab 表达式
+CronTrigger.from_crontab("0 2 * * *")  # 每天 2:00
+```
+
+### IntervalTrigger - 间隔触发
+
+```python
+from apscheduler.triggers.interval import IntervalTrigger
+
+IntervalTrigger(seconds=30)   # 每 30 秒
+IntervalTrigger(minutes=5)    # 每 5 分钟
+IntervalTrigger(hours=1)      # 每小时
+IntervalTrigger(days=1)       # 每天
+```
+
+### DateTrigger - 一次性触发
+
+```python
+from apscheduler.triggers.date import DateTrigger
+from datetime import datetime, timedelta
+
+# 10 秒后执行
+DateTrigger(run_date=datetime.now() + timedelta(seconds=10))
+```
+
+## 多实例支持
+
+支持不同业务线使用独立的调度器实例：
+
+```python
+# 默认实例
+scheduler = SchedulerManager.get_instance()
+
+# 命名实例
+report_scheduler = SchedulerManager.get_instance("report")
+cleanup_scheduler = SchedulerManager.get_instance("cleanup")
+```
+
+## 分布式调度
+
+多节点部署时，配置相同的 `SCHEDULER__JOBSTORE_URL`，所有节点共享任务状态：
+
+```bash
+# 所有节点使用相同配置
+SCHEDULER__JOBSTORE_URL=redis://redis:6379/0
+```
+
+APScheduler 自动协调防止重复执行。
+
+### 代码方式配置（高级）
+
+```python
+from apscheduler.jobstores.redis import RedisJobStore
+from apscheduler.executors.asyncio import AsyncIOExecutor
+
+scheduler = SchedulerManager.get_instance(
+    "distributed",
+    jobstores={{"default": RedisJobStore(host="localhost", port=6379)}},
+    executors={{"default": AsyncIOExecutor()}},
+    job_defaults={{"coalesce": True, "max_instances": 1}},
+    timezone="Asia/Shanghai",
+)
+```
+
+## 任务管理
+
+```python
+# 添加任务
+scheduler.add_job(my_task, CronTrigger(hour=2), id="my_task")
+
+# 获取任务
+job = scheduler.get_job("my_task")
+jobs = scheduler.get_jobs()
+
+# 暂停/恢复
+scheduler.pause_job("my_task")
+scheduler.resume_job("my_task")
+
+# 移除
+scheduler.remove_job("my_task")
+
+# 重新调度
+scheduler.reschedule_job("my_task", CronTrigger(hour=3))
+```
+
+## 监听器（高级）
+
+通过底层 APScheduler 实例访问：
+
+```python
+from apscheduler.events import EVENT_JOB_EXECUTED, EVENT_JOB_ERROR
+
+def job_listener(event):
+    if event.exception:
+        logger.error(f"任务失败: {event.job_id}")
+    else:
+        logger.info(f"任务完成: {event.job_id}")
+
+scheduler.scheduler.add_listener(job_listener, EVENT_JOB_EXECUTED | EVENT_JOB_ERROR)
+```
+
+## 实践建议
+
+1. **使用明确的 ID**：便于管理和调试
+2. **合理设置间隔**：避免太频繁的任务
+3. **异常处理**：在任务函数内捕获异常，避免影响调度器
+4. **超时保护**：长运行任务使用 `asyncio.wait_for`

aury/boot/commands/templates/project/aury_docs/99-cli.md.tpl

@@ -153,7 +153,7 @@ register_commands(app)
 @app.command()
 async def hello(name: str = "world") -> None:
     """示例：项目自定义命令。"""
-    print(f"Hello, {name} from {project_name_snake}!")
+    print(f"Hello, {{name}} from {project_name_snake}!")
 ```
 
 > 注意：这里的 `app` 是 Typer 应用实例，`register_commands` 会把所有内置的 `init/generate/server/...` 等命令挂到你自己的 CLI 下。

aury/boot/commands/templates/project/modules/schedules.py.tpl

@@ -6,13 +6,16 @@
 也可通过 SCHEDULER_SCHEDULE_MODULES 环境变量指定自定义模块。
 """
 
+# from apscheduler.triggers.cron import CronTrigger
+# from apscheduler.triggers.interval import IntervalTrigger
+#
 # from aury.boot.common.logging import logger
 # from aury.boot.infrastructure.scheduler import SchedulerManager
 #
 # scheduler = SchedulerManager.get_instance()
 #
 #
-# @scheduler.scheduled_job("interval", seconds=60)
+# @scheduler.scheduled_job(IntervalTrigger(seconds=60))
 # async def example_job():
 #     """示例定时任务，每 60 秒执行一次。"""
 #     logger.info("定时任务执行中...")

aury/boot/infrastructure/cache/manager.py

@@ -110,13 +110,15 @@ class CacheManager:
                 supported = ", ".join(b.value for b in CacheBackend)
                 raise ValueError(f"不支持的缓存后端: {backend}。支持: {supported}")
         
-        # 保存配置
+        # 保存配置（用于启动横幅等场景展示）
         self._config = {"CACHE_TYPE": backend.value}
         
         # 根据后端类型构建配置并创建后端
         if backend == CacheBackend.REDIS:
             if not url:
                 raise ValueError("Redis 缓存需要提供 url 参数")
+            # 记录 URL 以便在启动横幅中展示（会通过 mask_url 脱敏）
+            self._config["CACHE_URL"] = url
             self._backend = await CacheFactory.create(
                 "redis", url=url, serializer=serializer
             )
@@ -128,6 +130,8 @@ class CacheManager:
             cache_url = url or (servers[0] if servers else None)
             if not cache_url:
                 raise ValueError("Memcached 缓存需要提供 url 参数")
+            # 同样记录 URL，便于在启动横幅中展示
+            self._config["CACHE_URL"] = cache_url
             self._backend = await CacheFactory.create(
                 "memcached", servers=cache_url
             )

aury/boot/infrastructure/scheduler/manager.py

@@ -6,6 +6,7 @@
 - 生命周期管理
 - 自动设置日志上下文（调度器任务日志自动写入 scheduler_xxx.log）
 - 支持多个命名实例
+- 支持 APScheduler 完整配置（jobstores、executors、job_defaults、timezone）
 """
 
 from __future__ import annotations
@@ -20,52 +21,53 @@ from aury.boot.common.logging import logger, set_service_context
 # 延迟导入 apscheduler（可选依赖）
 try:
     from apscheduler.schedulers.asyncio import AsyncIOScheduler
-    from apscheduler.triggers.cron import CronTrigger
-    from apscheduler.triggers.interval import IntervalTrigger
     _APSCHEDULER_AVAILABLE = True
 except ImportError:
     _APSCHEDULER_AVAILABLE = False
-    # 创建占位符类型，避免类型检查错误
     if TYPE_CHECKING:
         from apscheduler.schedulers.asyncio import AsyncIOScheduler
-        from apscheduler.triggers.cron import CronTrigger
-        from apscheduler.triggers.interval import IntervalTrigger
     else:
         AsyncIOScheduler = None
-        CronTrigger = None
-        IntervalTrigger = None
 
 
 class SchedulerManager:
     """调度器管理器（命名多实例）。
     
-    职责：
-    1. 管理调度器实例
-    2. 注册任务
-    3. 生命周期管理
-    4. 支持多个命名实例，如不同业务线的调度器
+    完全透传 APScheduler 的所有配置，支持：
+    - jobstores: 任务存储（内存/Redis/SQLAlchemy/MongoDB）
+    - executors: 执行器（AsyncIO/ThreadPool/ProcessPool）
+    - job_defaults: 任务默认配置（coalesce/max_instances/misfire_grace_time）
+    - timezone: 时区
     
     使用示例:
-        # 默认实例
+        from apscheduler.triggers.cron import CronTrigger
+        from apscheduler.triggers.interval import IntervalTrigger
+        from apscheduler.jobstores.redis import RedisJobStore
+        from apscheduler.executors.asyncio import AsyncIOExecutor
+        
+        # 默认实例（内存存储）
         scheduler = SchedulerManager.get_instance()
-        await scheduler.initialize()
         
-        # 命名实例
-        report_scheduler = SchedulerManager.get_instance("report")
-        cleanup_scheduler = SchedulerManager.get_instance("cleanup")
+        # 带配置的实例
+        scheduler = SchedulerManager.get_instance(
+            "persistent",
+            jobstores={"default": RedisJobStore(host="localhost")},
+            executors={"default": AsyncIOExecutor()},
+            job_defaults={"coalesce": True, "max_instances": 3},
+            timezone="Asia/Shanghai",
+        )
         
         # 注册任务
-        scheduler.add_job(
-            func=my_task,
-            trigger="interval",
-            seconds=60
-        )
+        @scheduler.scheduled_job(IntervalTrigger(seconds=60))
+        async def my_task():
+            ...
         
         # 启动调度器
         scheduler.start()
     """
     
     _instances: dict[str, SchedulerManager] = {}
+    _instance_configs: dict[str, dict[str, Any]] = {}  # 存储实例配置
     
     def __init__(self, name: str = "default") -> None:
         """初始化调度器管理器。
@@ -80,16 +82,56 @@ class SchedulerManager:
         self._started: bool = False  # 调度器是否已启动
     
     @classmethod
-    def get_instance(cls, name: str = "default") -> SchedulerManager:
+    def get_instance(
+        cls,
+        name: str = "default",
+        *,
+        jobstores: dict[str, Any] | None = None,
+        executors: dict[str, Any] | None = None,
+        job_defaults: dict[str, Any] | None = None,
+        timezone: str | Any | None = None,
+    ) -> SchedulerManager:
         """获取指定名称的实例。
         
         首次获取时会同步初始化调度器实例，使装饰器可以在模块导入时使用。
         
         Args:
             name: 实例名称，默认为 "default"
+            jobstores: APScheduler jobstores 配置，如 {"default": RedisJobStore(...)}
+            executors: APScheduler executors 配置，如 {"default": AsyncIOExecutor()}
+            job_defaults: 任务默认配置，如 {"coalesce": True, "max_instances": 3}
+            timezone: 时区，如 "Asia/Shanghai" 或 pytz 时区对象
             
         Returns:
             SchedulerManager: 调度器管理器实例
+        
+        示例:
+            # 默认配置（内存存储）
+            scheduler = SchedulerManager.get_instance()
+            
+            # Redis 持久化存储
+            from apscheduler.jobstores.redis import RedisJobStore
+            scheduler = SchedulerManager.get_instance(
+                "persistent",
+                jobstores={"default": RedisJobStore(host="localhost", port=6379)},
+            )
+            
+            # SQLAlchemy 数据库存储
+            from apscheduler.jobstores.sqlalchemy import SQLAlchemyJobStore
+            scheduler = SchedulerManager.get_instance(
+                "db",
+                jobstores={"default": SQLAlchemyJobStore(url="sqlite:///jobs.db")},
+            )
+            
+            # 完整配置
+            from apscheduler.executors.asyncio import AsyncIOExecutor
+            scheduler = SchedulerManager.get_instance(
+                "full",
+                jobstores={"default": RedisJobStore(host="localhost")},
+                executors={"default": AsyncIOExecutor()},
+                job_defaults={"coalesce": True, "max_instances": 3, "misfire_grace_time": 60},
+                timezone="Asia/Shanghai",
+            )
         """
         if name not in cls._instances:
             if not _APSCHEDULER_AVAILABLE:
@@ -97,9 +139,22 @@ class SchedulerManager:
                     "apscheduler 未安装。请安装可选依赖: pip install 'aury-boot[scheduler-apscheduler]'"
                 )
             instance = cls(name)
-            instance._scheduler = AsyncIOScheduler()
+            
+            # 构建 APScheduler 配置
+            scheduler_kwargs: dict[str, Any] = {}
+            if jobstores:
+                scheduler_kwargs["jobstores"] = jobstores
+            if executors:
+                scheduler_kwargs["executors"] = executors
+            if job_defaults:
+                scheduler_kwargs["job_defaults"] = job_defaults
+            if timezone:
+                scheduler_kwargs["timezone"] = timezone
+            
+            instance._scheduler = AsyncIOScheduler(**scheduler_kwargs)
             instance._initialized = True
             cls._instances[name] = instance
+            cls._instance_configs[name] = scheduler_kwargs
             logger.debug(f"调度器实例已创建: {name}")
         return cls._instances[name]
     
@@ -114,8 +169,10 @@ class SchedulerManager:
         """
         if name is None:
             cls._instances.clear()
+            cls._instance_configs.clear()
         elif name in cls._instances:
             del cls._instances[name]
+            cls._instance_configs.pop(name, None)
     
     async def initialize(self) -> SchedulerManager:
         """初始化调度器（链式调用）。
@@ -146,65 +203,43 @@ class SchedulerManager:
     def add_job(
         self,
         func: Callable,
-        trigger: str = "interval",
+        trigger: Any,
         *,
-        seconds: int | None = None,
-        minutes: int | None = None,
-        hours: int | None = None,
-        days: int | None = None,
-        cron: str | None = None,
         id: str | None = None,
         **kwargs: Any,
     ) -> None:
         """添加任务。
         
+        直接使用 APScheduler 原生 trigger 对象，不做任何封装。
+        
         Args:
             func: 任务函数
-            trigger: 触发器类型（interval/cron）
-            seconds: 间隔秒数
-            minutes: 间隔分钟数
-            hours: 间隔小时数
-            days: 间隔天数
-            cron: Cron表达式（如 "0 0 * * *"）
-            id: 任务ID
-            **kwargs: 其他参数
+            trigger: APScheduler 触发器对象，如：
+                - IntervalTrigger(seconds=60)
+                - CronTrigger(hour="*")
+                - CronTrigger.from_crontab("0 * * * *")
+            id: 任务ID（可选，默认使用函数完整路径）
+            **kwargs: 其他 APScheduler add_job 参数
+        
+        示例:
+            from apscheduler.triggers.cron import CronTrigger
+            from apscheduler.triggers.interval import IntervalTrigger
+            
+            # 每小时执行
+            scheduler.add_job(my_task, CronTrigger(hour="*"))
+            
+            # 每 30 分钟执行
+            scheduler.add_job(my_task, IntervalTrigger(minutes=30))
+            
+            # 每天凌晨 2 点执行
+            scheduler.add_job(my_task, CronTrigger(hour=2, minute=0))
+            
+            # 使用 crontab 表达式
+            scheduler.add_job(my_task, CronTrigger.from_crontab("0 2 * * *"))
         """
         if not self._initialized:
             raise RuntimeError("调度器未初始化")
         
-        # 使用函数式编程构建触发器
-        def build_interval_trigger() -> IntervalTrigger:
-            """构建间隔触发器。"""
-            if seconds:
-                return IntervalTrigger(seconds=seconds)
-            if minutes:
-                return IntervalTrigger(minutes=minutes)
-            if hours:
-                return IntervalTrigger(hours=hours)
-            if days:
-                return IntervalTrigger(days=days)
-            raise ValueError("必须指定间隔时间")
-        
-        def build_cron_trigger() -> CronTrigger:
-            """构建Cron触发器。"""
-            if not cron:
-                raise ValueError("Cron触发器必须提供cron表达式")
-            return CronTrigger.from_crontab(cron)
-        
-        trigger_builders: dict[str, Callable[[], Any]] = {
-            "interval": build_interval_trigger,
-            "cron": build_cron_trigger,
-        }
-        
-        builder = trigger_builders.get(trigger)
-        if builder is None:
-            available = ", ".join(trigger_builders.keys())
-            raise ValueError(
-                f"不支持的触发器类型: {trigger}。可用类型: {available}"
-            )
-        
-        trigger_obj = builder()
-        
         # 包装任务函数，自动设置日志上下文
         wrapped_func = self._wrap_with_context(func)
 
@@ -212,12 +247,12 @@ class SchedulerManager:
         job_id = id or f"{func.__module__}.{func.__name__}"
         self._scheduler.add_job(
             func=wrapped_func,
-            trigger=trigger_obj,
+            trigger=trigger,
             id=job_id,
             **kwargs,
         )
         
-        logger.info(f"任务已注册: {job_id} | 触发器: {trigger}")
+        logger.info(f"任务已注册: {job_id} | 触发器: {type(trigger).__name__}")
     
     def _wrap_with_context(self, func: Callable) -> Callable:
         """包装任务函数，自动设置 scheduler 日志上下文。"""
@@ -304,49 +339,19 @@ class SchedulerManager:
     def reschedule_job(
         self,
         job_id: str,
-        trigger: str = "interval",
-        *,
-        seconds: int | None = None,
-        minutes: int | None = None,
-        hours: int | None = None,
-        days: int | None = None,
-        cron: str | None = None,
+        trigger: Any,
     ) -> None:
-        """重新调度任务（修改触发器）。
+        """重新调度任务。
         
         Args:
             job_id: 任务ID
-            trigger: 触发器类型（interval/cron）
-            seconds: 间隔秒数
-            minutes: 间隔分钟数
-            hours: 间隔小时数
-            days: 间隔天数
-            cron: Cron表达式
+            trigger: APScheduler 触发器对象
         """
         if not self._scheduler:
             raise RuntimeError("调度器未初始化")
         
-        # 构建触发器
-        if trigger == "interval":
-            if seconds:
-                trigger_obj = IntervalTrigger(seconds=seconds)
-            elif minutes:
-                trigger_obj = IntervalTrigger(minutes=minutes)
-            elif hours:
-                trigger_obj = IntervalTrigger(hours=hours)
-            elif days:
-                trigger_obj = IntervalTrigger(days=days)
-            else:
-                raise ValueError("必须指定间隔时间")
-        elif trigger == "cron":
-            if not cron:
-                raise ValueError("Cron触发器必须提供cron表达式")
-            trigger_obj = CronTrigger.from_crontab(cron)
-        else:
-            raise ValueError(f"不支持的触发器类型: {trigger}")
-        
-        self._scheduler.reschedule_job(job_id, trigger=trigger_obj)
-        logger.info(f"任务已重新调度: {job_id} | 触发器: {trigger}")
+        self._scheduler.reschedule_job(job_id, trigger=trigger)
+        logger.info(f"任务已重新调度: {job_id} | 触发器: {type(trigger).__name__}")
     
     def pause_job(self, job_id: str) -> None:
         """暂停单个任务。
@@ -409,38 +414,35 @@ class SchedulerManager:
     
     def scheduled_job(
         self,
-        trigger: str = "interval",
+        trigger: Any,
         *,
-        seconds: int | None = None,
-        minutes: int | None = None,
-        hours: int | None = None,
-        days: int | None = None,
-        cron: str | None = None,
         id: str | None = None,
         **kwargs: Any,
     ) -> Callable[[Callable], Callable]:
         """任务注册装饰器。
         
         使用示例:
+            from apscheduler.triggers.cron import CronTrigger
+            from apscheduler.triggers.interval import IntervalTrigger
+            
             scheduler = SchedulerManager.get_instance()
             
-            @scheduler.scheduled_job("interval", seconds=60)
+            @scheduler.scheduled_job(IntervalTrigger(seconds=60))
             async def my_task():
                 print("Task executed")
             
-            @scheduler.scheduled_job("cron", cron="0 0 * * *")
+            @scheduler.scheduled_job(CronTrigger(hour="*"))
+            async def hourly_task():
+                print("Hourly task")
+            
+            @scheduler.scheduled_job(CronTrigger.from_crontab("0 0 * * *"))
             async def daily_task():
                 print("Daily task")
         
         Args:
-            trigger: 触发器类型（interval/cron）
-            seconds: 间隔秒数
-            minutes: 间隔分钟数
-            hours: 间隔小时数
-            days: 间隔天数
-            cron: Cron表达式
+            trigger: APScheduler 触发器对象
             id: 任务ID
-            **kwargs: 其他参数
+            **kwargs: 其他 APScheduler add_job 参数
         
         Returns:
             装饰器函数
@@ -449,11 +451,6 @@ class SchedulerManager:
             job_config = {
                 "func": func,
                 "trigger": trigger,
-                "seconds": seconds,
-                "minutes": minutes,
-                "hours": hours,
-                "days": days,
-                "cron": cron,
                 "id": id,
                 **kwargs,
             }

{aury_boot-0.0.15.dist-info → aury_boot-0.0.18.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aury-boot
-Version: 0.0.15
+Version: 0.0.18
 Summary: Aury Boot - 基于 FastAPI 生态的企业级 API 开发框架
 Requires-Python: >=3.13
 Requires-Dist: alembic>=1.17.2

{aury_boot-0.0.15.dist-info → aury_boot-0.0.18.dist-info}/RECORD

@@ -1,5 +1,5 @@
 aury/boot/__init__.py,sha256=pCno-EInnpIBa1OtxNYF-JWf9j95Cd2h6vmu0xqa_-4,1791
-aury/boot/_version.py,sha256=vo0_oMD-jYQGv4X3gUeREI1I3x7jd_dShIWAxsGI-zY,706
+aury/boot/_version.py,sha256=tzG3REjXftgEO32YP2rgLirgULNff34B-C5Yb8oweEc,706
 aury/boot/application/__init__.py,sha256=0o_XmiwFCeAu06VHggS8I1e7_nSMoRq0Hcm0fYfCywU,3071
 aury/boot/application/adapter/__init__.py,sha256=e1bcSb1bxUMfofTwiCuHBZJk5-STkMCWPF2EJXHQ7UU,3976
 aury/boot/application/adapter/base.py,sha256=Ar_66fiHPDEmV-1DKnqXKwc53p3pozG31bgTJTEUriY,15763
@@ -9,12 +9,12 @@ aury/boot/application/adapter/exceptions.py,sha256=Kzm-ytRxdUnSMIcWCSOHPxo4Jh_A6
 aury/boot/application/adapter/http.py,sha256=4TADsSzdSRU63307dmmo-2U_JpVP12mwTFy66B5Ps-w,10759
 aury/boot/application/app/__init__.py,sha256=I8FfCKDuDQsGzAK6BevyfdtAwieMUVYu6qgVQzBazpE,830
 aury/boot/application/app/base.py,sha256=wBF7q_kZp5uWUeWy95oElBAsc43xJ4RZ1s6tMGIiCac,17253
-aury/boot/application/app/components.py,sha256=tt4a4ZVcRJZbvStj5W9AYf9omGqKVu0qFu5pn1q2VSU,20312
+aury/boot/application/app/components.py,sha256=-blDjMF87GYFmFyk4DHm2KJDcm27HpMxGpNaEFluwEE,22403
 aury/boot/application/app/middlewares.py,sha256=BXe2H14FHzJUVpQM6DZUm-zfZRXSXIi1QIZ4_3izfHw,3306
-aury/boot/application/app/startup.py,sha256=bkRT4cCzXPnTOBSNs-TLcKvFGwqBgwXeO8_gQq9Gc1s,7895
+aury/boot/application/app/startup.py,sha256=DHKt3C2G7V5XfFr1SQMl14tNzcuDd9MqUVAxi274HDQ,7873
 aury/boot/application/config/__init__.py,sha256=Dd-myRSBCM18DXXsi863h0cJG5VFrI10xMRtjnvelGo,1894
 aury/boot/application/config/multi_instance.py,sha256=RXSp-xP8-bKMDEhq3SeL7T3lS8-vpRlvBEVBuZVjVK4,6475
-aury/boot/application/config/settings.py,sha256=CckslmXl0H1XN58DKK4IBK9WqKX72nhDSIpx0dxtFPA,29544
+aury/boot/application/config/settings.py,sha256=WILVLfZCMyximKKZ6uuzxa82mcdhPNqa2G5iX90L1Wc,30619
 aury/boot/application/constants/__init__.py,sha256=DCXs13_VVaQWHqO-qpJoZwRd7HIexiirtw_nu8msTXE,340
 aury/boot/application/constants/components.py,sha256=hDRs3YxpnfIFcGaUa1DYqBRwmV2_dceOlcCXabHE3fk,1006
 aury/boot/application/constants/scheduler.py,sha256=S77FBIvHlyruvlabRWZJ2J1YAs2xWXPQI2yuGdGUDNA,471
@@ -61,7 +61,7 @@ aury/boot/commands/templates/generate/model.py.tpl,sha256=knFwMyGZ7wMpzH4_bQD_V1
 aury/boot/commands/templates/generate/repository.py.tpl,sha256=xoEg6lPAaLIRDeFy4I0FBsPPVLSy91h6xosAlaCL_mM,590
 aury/boot/commands/templates/generate/schema.py.tpl,sha256=HIaY5B0UG_S188nQLrZDEJ0q73WPdb7BmCdc0tseZA4,545
 aury/boot/commands/templates/generate/service.py.tpl,sha256=2hwQ8e4a5d_bIMx_jGDobdmKPMFLBlfQrQVQH4Ym5k4,1842
-aury/boot/commands/templates/project/AGENTS.md.tpl,sha256=lzRh23-8Buw5JgZ_BRuMH15gh6WmxJRU4dbZ57fyntA,7309
+aury/boot/commands/templates/project/AGENTS.md.tpl,sha256=AzjUt98ojms1CSUT1kNzCNLZFLBW5BGXpSwm0yJzYeI,7797
 aury/boot/commands/templates/project/README.md.tpl,sha256=oCeBiukk6Pa3hrCKybkfM2sIRHsPZ15nlwuFTUSFDwY,2459
 aury/boot/commands/templates/project/admin_console_init.py.tpl,sha256=K81L14thyEhRA8lFCQJVZL_NU22-sBz0xS68MJPeoCo,1541
 aury/boot/commands/templates/project/config.py.tpl,sha256=H_B05FypBJxTjb7qIL91zC1C9e37Pk7C9gO0-b3CqNs,1009
@@ -76,7 +76,7 @@ aury/boot/commands/templates/project/aury_docs/04-schema.md.tpl,sha256=ZwwKhUbLI
 aury/boot/commands/templates/project/aury_docs/05-api.md.tpl,sha256=oPzda3V6ZPDDEW-5MwyzmsMRuu5mXrsRGEq3lj0M-58,2997
 aury/boot/commands/templates/project/aury_docs/06-exception.md.tpl,sha256=Tv_Q5lsScHzvtcaFWmuQzN4YqvpcWZIdXS8jw99K29E,3340
 aury/boot/commands/templates/project/aury_docs/07-cache.md.tpl,sha256=EQMI7vJIwJT-VdG4p1GMCDEo58DCO1n6V-MvUzGSaS0,3411
-aury/boot/commands/templates/project/aury_docs/08-scheduler.md.tpl,sha256=zk7RHjtx_QGjmeLy04Nk_qSc8sofTrubS2Tg7DxfEl4,858
+aury/boot/commands/templates/project/aury_docs/08-scheduler.md.tpl,sha256=ocltWA8ubYwPWwfmhYmhgF-N9KFUO8PKCvE2DxA5BiM,4444
 aury/boot/commands/templates/project/aury_docs/09-tasks.md.tpl,sha256=swHOQ_pWPtW8Bsy1arPu2OeIgs1FoKsJ2AsVSYUWPHY,931
 aury/boot/commands/templates/project/aury_docs/10-storage.md.tpl,sha256=mhe0j0S51ndPJLjaQ6yD8OPYBEO02NHumJVbBvz2qkw,4320
 aury/boot/commands/templates/project/aury_docs/11-logging.md.tpl,sha256=bwxFCGQsO9cTEbwqJF1xcjsZKP82HRWhIMRUS0c9_ZI,2435
@@ -85,7 +85,7 @@ aury/boot/commands/templates/project/aury_docs/13-channel.md.tpl,sha256=rdtlog3a
 aury/boot/commands/templates/project/aury_docs/14-mq.md.tpl,sha256=4bxLQBbCi0Fue0VQWOPt6acZ5P00BoLkCoLPQe_8k4U,2396
 aury/boot/commands/templates/project/aury_docs/15-events.md.tpl,sha256=a4wQRgVPuYUGTGmw_lX1HJH_yFTbD30mBz7Arc4zgfs,3361
 aury/boot/commands/templates/project/aury_docs/16-adapter.md.tpl,sha256=pkmJkZw2Ca6_uYk2jZvAb8DozjBa2tWq_t3gtq1lFSk,11456
-aury/boot/commands/templates/project/aury_docs/99-cli.md.tpl,sha256=LEZ-ygl_pF_t_abrpajlaEkGv1qD4onylmxG6p5wzgc,5671
+aury/boot/commands/templates/project/aury_docs/99-cli.md.tpl,sha256=9JSdiAbu3SGmmF_iCslw5LBPlks2DYf4WYw05pA_2_I,5673
 aury/boot/commands/templates/project/env_templates/_header.tpl,sha256=Pt0X_I25o1th3CLR228L2-nlcC-lIkN8cPailohBEkU,513
 aury/boot/commands/templates/project/env_templates/admin.tpl,sha256=wWt3iybOpBHtuw6CkoUJ1bzEL0aNgOzKDEkMKhI2oag,2032
 aury/boot/commands/templates/project/env_templates/cache.tpl,sha256=_sK-p_FECj4mVvggNvgb4Wu0yGii0Ocz560syG7DU2c,498
@@ -99,7 +99,7 @@ aury/boot/commands/templates/project/env_templates/storage.tpl,sha256=x983u0Y2AF
 aury/boot/commands/templates/project/env_templates/third_party.tpl,sha256=w5lcKLYRHrA_iB-FmqMM_0WMs6bvxpf3ZwgicthFxgU,1959
 aury/boot/commands/templates/project/modules/api.py.tpl,sha256=G_IE-UC_pRhN7oOxy3dl_VLmR_omlKmHhWYi-AlyZIQ,471
 aury/boot/commands/templates/project/modules/exceptions.py.tpl,sha256=TKY3XaQU50Z-sDHWi3_Ns-A4v50PFru08H2lzmKxAUw,2646
-aury/boot/commands/templates/project/modules/schedules.py.tpl,sha256=P-R-0SDsoQ_lWfKYJXZT5DoNAVKGUjYiC3HBbUZCc3Y,633
+aury/boot/commands/templates/project/modules/schedules.py.tpl,sha256=CizmYzeuibWBsa_XxJTycr_WuzLPKtjJE1Vc78Lhdic,752
 aury/boot/commands/templates/project/modules/tasks.py.tpl,sha256=w16VsW0K1_ukZe1Md2A_DnNPCAQUTNuo1JYfHOb7ZTI,564
 aury/boot/common/__init__.py,sha256=MhNP3c_nwx8CyDkDF6p1f4DcTZ1CZZScg66FWdbdaZI,629
 aury/boot/common/exceptions/__init__.py,sha256=aS3rIXWc5qNNJbfMs_PNmBlFsyNdKUMErziNMd1yoB8,3176
@@ -137,7 +137,7 @@ aury/boot/infrastructure/cache/backends.py,sha256=9QMQ8G9DtZgzVXZ_Ng7n1gXRu-_OQZ
 aury/boot/infrastructure/cache/base.py,sha256=Yn-h_SGcOoGGZW1unOnz_zgcuHaMKOEmwiUP0P7_pIM,1624
 aury/boot/infrastructure/cache/exceptions.py,sha256=KZsFIHXW3_kOh_KB93EVZJKbiDvDw8aloAefJ3kasP8,622
 aury/boot/infrastructure/cache/factory.py,sha256=aF74JoiiSKFgctqqh2Z8OtGRS2Am_ou-I40GyygLzC0,2489
-aury/boot/infrastructure/cache/manager.py,sha256=H2Gi6EEoZBSP5s5BoRlx0MPqKXoNg-mBvogoXmO8w0Y,11822
+aury/boot/infrastructure/cache/manager.py,sha256=GGoOgYyIdWKMmhej5cRvEfpNeMN1GaSaU9hc0dy8_sA,12106
 aury/boot/infrastructure/channel/__init__.py,sha256=Ztcfn1-TomgV91qhePpFK-3_nKgBt862yEFYUzIwPlo,566
 aury/boot/infrastructure/channel/base.py,sha256=lBpP6vQB2AReoE7pJorkj9mAylXgC31B9Iwhyy2XKlk,2087
 aury/boot/infrastructure/channel/manager.py,sha256=aZ-5lVn2lVRnq_tyCcEgBjZngrt_B6tuoWxlDOf3ykw,6260
@@ -176,7 +176,7 @@ aury/boot/infrastructure/mq/backends/rabbitmq.py,sha256=0NWgPKEwtbmI63EVvKINdfXX
 aury/boot/infrastructure/mq/backends/redis.py,sha256=i8KECToIFEZ6CnHyNCk34_xdff5ioK172_knOy6EeUU,5279
 aury/boot/infrastructure/scheduler/__init__.py,sha256=eTRJ5dSPcKvyFvLVtraoQteXTTDDGwIrmw06J2hoNdA,323
 aury/boot/infrastructure/scheduler/exceptions.py,sha256=ROltrhSctVWA-6ulnjuYeHAk3ZF-sykDoesuierYzew,634
-aury/boot/infrastructure/scheduler/manager.py,sha256=vvVditIJC4WaeqWWpUXSmMdkqnlUHREPd0BRPSNpnyY,15554
+aury/boot/infrastructure/scheduler/manager.py,sha256=xXSFdzliLoFKVsKkpriig5PJjyro9CMT0SQGaMnTAec,16290
 aury/boot/infrastructure/storage/__init__.py,sha256=bA-n3v2S1FX6XsQbLqt0hkgx512MjUn_b8kJo53G6gA,1238
 aury/boot/infrastructure/storage/base.py,sha256=X9aswSMWtKZ6TdG5Rrh6qJpqIVLt1QcFkQAKdyUWPi0,5039
 aury/boot/infrastructure/storage/exceptions.py,sha256=Av1r94bRkeeeDo6vgAD9e_9YA9Ge6D7F2U1qzUs-8FE,622
@@ -192,7 +192,7 @@ aury/boot/testing/client.py,sha256=KOg1EemuIVsBG68G5y0DjSxZGcIQVdWQ4ASaHE3o1R0,4
 aury/boot/testing/factory.py,sha256=8GvwX9qIDu0L65gzJMlrWB0xbmJ-7zPHuwk3eECULcg,5185
 aury/boot/toolkit/__init__.py,sha256=AcyVb9fDf3CaEmJPNkWC4iGv32qCPyk4BuFKSuNiJRQ,334
 aury/boot/toolkit/http/__init__.py,sha256=zIPmpIZ9Qbqe25VmEr7jixoY2fkRbLm7NkCB9vKpg6I,11039
-aury_boot-0.0.15.dist-info/METADATA,sha256=KpgZbUBGqUhwH-65xmNrP3H8699sx82WkG3cj-a5-gw,7981
-aury_boot-0.0.15.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-aury_boot-0.0.15.dist-info/entry_points.txt,sha256=f9KXEkDIGc0BGkgBvsNx_HMz9VhDjNxu26q00jUpDwQ,49
-aury_boot-0.0.15.dist-info/RECORD,,
+aury_boot-0.0.18.dist-info/METADATA,sha256=rT6cWP49gdwbb-55IWIRuoD4c_Cl1O3bSaqD3fnh4Zs,7981
+aury_boot-0.0.18.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+aury_boot-0.0.18.dist-info/entry_points.txt,sha256=f9KXEkDIGc0BGkgBvsNx_HMz9VhDjNxu26q00jUpDwQ,49
+aury_boot-0.0.18.dist-info/RECORD,,