From c7dc9b875a312fd22c60bcc848824991a888b150 Mon Sep 17 00:00:00 2001 From: whm <973418690@qq.com> Date: Sat, 1 Nov 2025 13:52:18 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E6=96=B9=E6=B3=95=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/comprehensive_data.py | 2 +- app/utils/scheduler.py | 7 ++++++- deploy.sh | 3 +-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/app/api/comprehensive_data.py b/app/api/comprehensive_data.py index cc71229..082caf0 100644 --- a/app/api/comprehensive_data.py +++ b/app/api/comprehensive_data.py @@ -411,7 +411,7 @@ def get_all_section_by_account(request: SectionByAccountRequest, db: Session = D try: account_id = request.account_id section_service = SectionDataService() - result_data = section_service.get_all_section_by_account(db, account_id=account_id) + result_data = section_service.get_by_section_id(db, account_id=account_id) return DataResponse( code=ResponseCode.SUCCESS, message="查询成功", diff --git a/app/utils/scheduler.py b/app/utils/scheduler.py index aeed49a..05c9130 100644 --- a/app/utils/scheduler.py +++ b/app/utils/scheduler.py @@ -76,12 +76,13 @@ class TaskScheduler: """设置系统定时任务""" try: # 检查是否已存在每日重置任务 + existing_job = self.scheduler.get_job("daily_reset_today_updated") + existing_job = self.scheduler.get_job("get_max_nyid") if not existing_job: # 添加每天午夜12点重置today_updated字段的任务 self.scheduler.add_job( reset_today_updated_task, - scheduled_get_max_nyid_by_point_id, 'cron', id='daily_reset_today_updated', hour=0, @@ -89,6 +90,10 @@ class TaskScheduler: second=0, name='每日重置账号更新状态' ) + self.scheduler.add_job( + scheduled_get_max_nyid_by_point_id, + id='get_max_nyid', + ) logger.info("系统定时任务:每日重置账号更新状态已添加") except Exception as e: logger.error(f"设置系统定时任务失败: {e}") diff --git a/deploy.sh b/deploy.sh index fb764b6..7bca707 100644 --- a/deploy.sh +++ b/deploy.sh @@ -16,7 +16,7 @@ if [ "$1" = "0" ]; then else echo "默认执行代码拉取" fi - +echo "whm" # 如果不跳过git pull,则拉取最新代码 if [ $SKIP_GIT_PULL -eq 0 ]; then echo "" @@ -42,7 +42,6 @@ echo -n "请输入sudo密码: " read -s SUDO_PASSWORD echo "" echo "" - # 检查密码是否为空 if [ -z "$SUDO_PASSWORD" ]; then echo "错误: 密码不能为空"