From 3212e62ef7ed2a87bc67758093c9f4ca4658a703 Mon Sep 17 00:00:00 2001 From: insistence <3055204202@qq.com> Date: Thu, 31 Oct 2024 15:42:20 +0800 Subject: [PATCH 1/6] =?UTF-8?q?style:=20=E4=BF=AE=E5=A4=8D=E4=B9=A6?= =?UTF-8?q?=E5=86=99=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module_admin/service/menu_service.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dash-fastapi-backend/module_admin/service/menu_service.py b/dash-fastapi-backend/module_admin/service/menu_service.py index 2cf7639..af636f7 100644 --- a/dash-fastapi-backend/module_admin/service/menu_service.py +++ b/dash-fastapi-backend/module_admin/service/menu_service.py @@ -99,9 +99,9 @@ class MenuService: :return: 新增菜单校验结果 """ if not await cls.check_menu_name_unique_services(query_db, page_object): - raise ServiceException(message=f'新增菜单{page_object.post_name}失败，菜单名称已存在') + raise ServiceException(message=f'新增菜单{page_object.menu_name}失败，菜单名称已存在') elif page_object.is_frame == MenuConstant.YES_FRAME and not StringUtil.is_http(page_object.path): - raise ServiceException(message=f'新增菜单{page_object.post_name}失败，地址必须以http(s)://开头') + raise ServiceException(message=f'新增菜单{page_object.menu_name}失败，地址必须以http(s)://开头') else: try: await MenuDao.add_menu_dao(query_db, page_object) @@ -124,11 +124,11 @@ class MenuService: menu_info = await cls.menu_detail_services(query_db, page_object.menu_id) if menu_info.menu_id: if not await cls.check_menu_name_unique_services(query_db, page_object): - raise ServiceException(message=f'修改菜单{page_object.post_name}失败，菜单名称已存在') + raise ServiceException(message=f'修改菜单{page_object.menu_name}失败，菜单名称已存在') elif page_object.is_frame == MenuConstant.YES_FRAME and not StringUtil.is_http(page_object.path): - raise ServiceException(message=f'修改菜单{page_object.post_name}失败，地址必须以http(s)://开头') + raise ServiceException(message=f'修改菜单{page_object.menu_name}失败，地址必须以http(s)://开头') elif page_object.menu_id == page_object.parent_id: - raise ServiceException(message=f'修改菜单{page_object.post_name}失败，上级菜单不能选择自己') + raise ServiceException(message=f'修改菜单{page_object.menu_name}失败，上级菜单不能选择自己') else: try: await MenuDao.edit_menu_dao(query_db, edit_menu) -- Gitee From f7d8ca258280b388fecf2814af38fe5fe0584e97 Mon Sep 17 00:00:00 2001 From: insistence <3055204202@qq.com> Date: Tue, 5 Nov 2024 17:41:19 +0800 Subject: [PATCH 2/6] =?UTF-8?q?chore:=20=E6=9B=B4=E6=96=B0=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- requirements-pg.txt | 10 +++++----- requirements.txt | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/requirements-pg.txt b/requirements-pg.txt index 24b2c64..26e3ff0 100644 --- a/requirements-pg.txt +++ b/requirements-pg.txt @@ -1,11 +1,11 @@ APScheduler==3.10.4 asyncpg==0.30.0 -cachebox==4.1.2 -dash==2.18.1 +cachebox==4.2.3 +dash==2.18.2 DateTime==5.5 fastapi[all]==0.115.0 feffery-antd-charts==0.1.0rc5 -feffery-antd-components==0.3.8 +feffery-antd-components==0.3.10 feffery-markdown-components==0.2.10 feffery-utils-components==0.2.0rc24 Flask-Compress==1.15 @@ -16,11 +16,11 @@ pandas==2.2.2 passlib[bcrypt]==1.7.4 Pillow==10.4.0 psutil==6.0.0 -pydantic-validation-decorator==0.1.2 +pydantic-validation-decorator==0.1.4 PyJWT[crypto]==2.8.0 psycopg2==2.9.10 redis==5.0.7 requests==2.32.3 SQLAlchemy[asyncio]==2.0.31 user-agents==2.2.0 -waitress==3.0.0 +waitress==3.0.1 diff --git a/requirements.txt b/requirements.txt index 790b650..d88aec7 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,11 +1,11 @@ APScheduler==3.10.4 asyncmy==0.2.9 -cachebox==4.1.2 -dash==2.18.1 +cachebox==4.2.3 +dash==2.18.2 DateTime==5.5 fastapi[all]==0.115.0 feffery-antd-charts==0.1.0rc5 -feffery-antd-components==0.3.8 +feffery-antd-components==0.3.10 feffery-markdown-components==0.2.10 feffery-utils-components==0.2.0rc24 Flask-Compress==1.15 @@ -16,11 +16,11 @@ pandas==2.2.2 passlib[bcrypt]==1.7.4 Pillow==10.4.0 psutil==6.0.0 -pydantic-validation-decorator==0.1.2 +pydantic-validation-decorator==0.1.4 PyJWT[crypto]==2.8.0 PyMySQL==1.1.1 redis==5.0.7 requests==2.32.3 SQLAlchemy[asyncio]==2.0.31 user-agents==2.2.0 -waitress==3.0.0 +waitress==3.0.1 -- Gitee From d39dff295be80657743d27e0dd39e9d38d3a2a7c Mon Sep 17 00:00:00 2001 From: insistence <3055204202@qq.com> Date: Wed, 6 Nov 2024 22:43:53 +0800 Subject: [PATCH 3/6] =?UTF-8?q?feat:=20=E5=AE=9A=E6=97=B6=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E6=96=B0=E5=A2=9E=E6=94=AF=E6=8C=81=E8=B0=83=E7=94=A8?= =?UTF-8?q?=E5=BC=82=E6=AD=A5=E5=87=BD=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dash-fastapi-backend/config/get_scheduler.py | 46 ++++++++++++++----- .../module_admin/service/job_service.py | 12 ++--- .../module_task/scheduler_test.py | 14 +++++- 3 files changed, 50 insertions(+), 22 deletions(-) diff --git a/dash-fastapi-backend/config/get_scheduler.py b/dash-fastapi-backend/config/get_scheduler.py index bf7547d..a4687ad 100644 --- a/dash-fastapi-backend/config/get_scheduler.py +++ b/dash-fastapi-backend/config/get_scheduler.py @@ -1,11 +1,14 @@ import json from apscheduler.events import EVENT_ALL +from apscheduler.executors.asyncio import AsyncIOExecutor from apscheduler.executors.pool import ThreadPoolExecutor, ProcessPoolExecutor -from apscheduler.schedulers.background import BackgroundScheduler from apscheduler.jobstores.memory import MemoryJobStore from apscheduler.jobstores.redis import RedisJobStore from apscheduler.jobstores.sqlalchemy import SQLAlchemyJobStore +from apscheduler.schedulers.asyncio import AsyncIOScheduler +from apscheduler.schedulers.background import BackgroundScheduler from apscheduler.triggers.cron import CronTrigger +from asyncio import iscoroutinefunction from datetime import datetime, timedelta from sqlalchemy.engine import create_engine from sqlalchemy.orm import sessionmaker @@ -109,9 +112,12 @@ job_stores = { ) ), } +async_executors = {'default': AsyncIOExecutor()} executors = {'default': ThreadPoolExecutor(20), 'processpool': ProcessPoolExecutor(5)} job_defaults = {'coalesce': False, 'max_instance': 1} +async_scheduler = AsyncIOScheduler() scheduler = BackgroundScheduler() +async_scheduler.configure(jobstores=job_stores, executors=async_executors, job_defaults=job_defaults) scheduler.configure(jobstores=job_stores, executors=executors, job_defaults=job_defaults) @@ -129,14 +135,14 @@ class SchedulerUtil: """ logger.info('开始启动定时任务...') scheduler.start() + async_scheduler.start() async with AsyncSessionLocal() as session: job_list = await JobDao.get_job_list_for_scheduler(session) for item in job_list: - query_job = cls.get_scheduler_job(job_id=str(item.job_id)) - if query_job: - cls.remove_scheduler_job(job_id=str(item.job_id)) + cls.remove_scheduler_job(job_id=str(item.job_id)) cls.add_scheduler_job(item) scheduler.add_listener(cls.scheduler_event_listener, EVENT_ALL) + async_scheduler.add_listener(cls.scheduler_event_listener, EVENT_ALL) logger.info('系统初始定时任务加载成功') @classmethod @@ -147,6 +153,7 @@ class SchedulerUtil: :return: """ scheduler.shutdown() + async_scheduler.shutdown() logger.info('关闭定时任务成功') @classmethod @@ -157,7 +164,7 @@ class SchedulerUtil: :param job_id: 任务id :return: 任务对象 """ - query_job = scheduler.get_job(job_id=str(job_id)) + query_job = scheduler.get_job(job_id=str(job_id)) or async_scheduler.get_job(job_id=str(job_id)) return query_job @@ -169,8 +176,9 @@ class SchedulerUtil: :param job_info: 任务对象信息 :return: """ - scheduler.add_job( - func=eval(job_info.invoke_target), + job_func = eval(job_info.invoke_target) + job_param = dict( + func=job_func, trigger=MyCronTrigger.from_crontab(job_info.cron_expression), args=job_info.job_args.split(',') if job_info.job_args else None, kwargs=json.loads(job_info.job_kwargs) if job_info.job_kwargs else None, @@ -180,8 +188,11 @@ class SchedulerUtil: coalesce=True if job_info.misfire_policy == '2' else False, max_instances=3 if job_info.concurrent == '0' else 1, jobstore=job_info.job_group, - executor=job_info.job_executor, ) + if iscoroutinefunction(job_func): + async_scheduler.add_job(**job_param) + else: + scheduler.add_job(executor=job_info.job_executor, **job_param) @classmethod def execute_scheduler_job_once(cls, job_info: JobModel): @@ -191,8 +202,9 @@ class SchedulerUtil: :param job_info: 任务对象信息 :return: """ - scheduler.add_job( - func=eval(job_info.invoke_target), + job_func = eval(job_info.invoke_target) + job_param = dict( + func=job_func, trigger='date', run_date=datetime.now() + timedelta(seconds=1), args=job_info.job_args.split(',') if job_info.job_args else None, @@ -203,8 +215,11 @@ class SchedulerUtil: coalesce=True if job_info.misfire_policy == '2' else False, max_instances=3 if job_info.concurrent == '0' else 1, jobstore=job_info.job_group, - executor=job_info.job_executor, ) + if iscoroutinefunction(job_func): + async_scheduler.add_job(**job_param) + else: + scheduler.add_job(executor=job_info.job_executor, **job_param) @classmethod def remove_scheduler_job(cls, job_id: Union[str, int]): @@ -214,7 +229,14 @@ class SchedulerUtil: :param job_id: 任务id :return: """ - scheduler.remove_job(job_id=str(job_id)) + query_job = cls.get_scheduler_job(job_id=job_id) + if query_job: + query_job_info = query_job.__getstate__() + job_func = eval(query_job_info.get('func').replace(':', '.')) + if iscoroutinefunction(job_func): + async_scheduler.remove_job(job_id=str(job_id)) + else: + scheduler.remove_job(job_id=str(job_id)) @classmethod def scheduler_event_listener(cls, event): diff --git a/dash-fastapi-backend/module_admin/service/job_service.py b/dash-fastapi-backend/module_admin/service/job_service.py index 5a8c3bd..91f784f 100644 --- a/dash-fastapi-backend/module_admin/service/job_service.py +++ b/dash-fastapi-backend/module_admin/service/job_service.py @@ -129,9 +129,7 @@ class JobService: raise ServiceException(message=f'修改定时任务{page_object.job_name}失败，定时任务已存在') try: await JobDao.edit_job_dao(query_db, edit_job) - query_job = SchedulerUtil.get_scheduler_job(job_id=edit_job.get('job_id')) - if query_job: - SchedulerUtil.remove_scheduler_job(job_id=edit_job.get('job_id')) + SchedulerUtil.remove_scheduler_job(job_id=edit_job.get('job_id')) if edit_job.get('status') == '0': job_info = await cls.job_detail_services(query_db, edit_job.get('job_id')) SchedulerUtil.add_scheduler_job(job_info=job_info) @@ -152,9 +150,7 @@ class JobService: :param page_object: 定时任务对象 :return: 执行一次定时任务结果 """ - query_job = SchedulerUtil.get_scheduler_job(job_id=page_object.job_id) - if query_job: - SchedulerUtil.remove_scheduler_job(job_id=page_object.job_id) + SchedulerUtil.remove_scheduler_job(job_id=page_object.job_id) job_info = await cls.job_detail_services(query_db, page_object.job_id) if job_info: SchedulerUtil.execute_scheduler_job_once(job_info=job_info) @@ -176,9 +172,7 @@ class JobService: try: for job_id in job_id_list: await JobDao.delete_job_dao(query_db, JobModel(job_id=job_id)) - query_job = SchedulerUtil.get_scheduler_job(job_id=job_id) - if query_job: - SchedulerUtil.remove_scheduler_job(job_id=job_id) + SchedulerUtil.remove_scheduler_job(job_id=job_id) await query_db.commit() return CrudResponseModel(is_success=True, message='删除成功') except Exception as e: diff --git a/dash-fastapi-backend/module_task/scheduler_test.py b/dash-fastapi-backend/module_task/scheduler_test.py index 1c8441f..b282732 100644 --- a/dash-fastapi-backend/module_task/scheduler_test.py +++ b/dash-fastapi-backend/module_task/scheduler_test.py @@ -2,6 +2,18 @@ from datetime import datetime def job(*args, **kwargs): + """ + 定时任务执行同步函数示例 + """ print(args) print(kwargs) - print(f'{datetime.now()}执行了') + print(f'{datetime.now()}同步函数执行了') + + +async def async_job(*args, **kwargs): + """ + 定时任务执行异步函数示例 + """ + print(args) + print(kwargs) + print(f'{datetime.now()}异步函数执行了') -- Gitee From 164004982a902cf5eb930d718ca8641a8fe4798b Mon Sep 17 00:00:00 2001 From: insistence <3055204202@qq.com> Date: Thu, 7 Nov 2024 10:18:45 +0800 Subject: [PATCH 4/6] =?UTF-8?q?refactor:=20=E5=AE=9A=E6=97=B6=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E6=94=B9=E7=94=A8AsyncIOScheduler=E5=92=8CAsyncIOExec?= =?UTF-8?q?utor?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dash-fastapi-backend/config/get_scheduler.py | 46 ++++++++------------ 1 file changed, 17 insertions(+), 29 deletions(-) diff --git a/dash-fastapi-backend/config/get_scheduler.py b/dash-fastapi-backend/config/get_scheduler.py index a4687ad..3fb66c4 100644 --- a/dash-fastapi-backend/config/get_scheduler.py +++ b/dash-fastapi-backend/config/get_scheduler.py @@ -1,12 +1,11 @@ import json from apscheduler.events import EVENT_ALL from apscheduler.executors.asyncio import AsyncIOExecutor -from apscheduler.executors.pool import ThreadPoolExecutor, ProcessPoolExecutor +from apscheduler.executors.pool import ProcessPoolExecutor from apscheduler.jobstores.memory import MemoryJobStore from apscheduler.jobstores.redis import RedisJobStore from apscheduler.jobstores.sqlalchemy import SQLAlchemyJobStore from apscheduler.schedulers.asyncio import AsyncIOScheduler -from apscheduler.schedulers.background import BackgroundScheduler from apscheduler.triggers.cron import CronTrigger from asyncio import iscoroutinefunction from datetime import datetime, timedelta @@ -112,12 +111,9 @@ job_stores = { ) ), } -async_executors = {'default': AsyncIOExecutor()} -executors = {'default': ThreadPoolExecutor(20), 'processpool': ProcessPoolExecutor(5)} +executors = {'default': AsyncIOExecutor(), 'processpool': ProcessPoolExecutor(5)} job_defaults = {'coalesce': False, 'max_instance': 1} -async_scheduler = AsyncIOScheduler() -scheduler = BackgroundScheduler() -async_scheduler.configure(jobstores=job_stores, executors=async_executors, job_defaults=job_defaults) +scheduler = AsyncIOScheduler() scheduler.configure(jobstores=job_stores, executors=executors, job_defaults=job_defaults) @@ -135,14 +131,12 @@ class SchedulerUtil: """ logger.info('开始启动定时任务...') scheduler.start() - async_scheduler.start() async with AsyncSessionLocal() as session: job_list = await JobDao.get_job_list_for_scheduler(session) for item in job_list: cls.remove_scheduler_job(job_id=str(item.job_id)) cls.add_scheduler_job(item) scheduler.add_listener(cls.scheduler_event_listener, EVENT_ALL) - async_scheduler.add_listener(cls.scheduler_event_listener, EVENT_ALL) logger.info('系统初始定时任务加载成功') @classmethod @@ -153,7 +147,6 @@ class SchedulerUtil: :return: """ scheduler.shutdown() - async_scheduler.shutdown() logger.info('关闭定时任务成功') @classmethod @@ -164,7 +157,7 @@ class SchedulerUtil: :param job_id: 任务id :return: 任务对象 """ - query_job = scheduler.get_job(job_id=str(job_id)) or async_scheduler.get_job(job_id=str(job_id)) + query_job = scheduler.get_job(job_id=str(job_id)) return query_job @@ -177,8 +170,11 @@ class SchedulerUtil: :return: """ job_func = eval(job_info.invoke_target) - job_param = dict( - func=job_func, + job_executor = job_info.job_executor + if iscoroutinefunction(job_func): + job_executor = 'default' + scheduler.add_job( + func=eval(job_info.invoke_target), trigger=MyCronTrigger.from_crontab(job_info.cron_expression), args=job_info.job_args.split(',') if job_info.job_args else None, kwargs=json.loads(job_info.job_kwargs) if job_info.job_kwargs else None, @@ -188,11 +184,8 @@ class SchedulerUtil: coalesce=True if job_info.misfire_policy == '2' else False, max_instances=3 if job_info.concurrent == '0' else 1, jobstore=job_info.job_group, + executor=job_executor, ) - if iscoroutinefunction(job_func): - async_scheduler.add_job(**job_param) - else: - scheduler.add_job(executor=job_info.job_executor, **job_param) @classmethod def execute_scheduler_job_once(cls, job_info: JobModel): @@ -203,8 +196,11 @@ class SchedulerUtil: :return: """ job_func = eval(job_info.invoke_target) - job_param = dict( - func=job_func, + job_executor = job_info.job_executor + if iscoroutinefunction(job_func): + job_executor = 'default' + scheduler.add_job( + func=eval(job_info.invoke_target), trigger='date', run_date=datetime.now() + timedelta(seconds=1), args=job_info.job_args.split(',') if job_info.job_args else None, @@ -215,11 +211,8 @@ class SchedulerUtil: coalesce=True if job_info.misfire_policy == '2' else False, max_instances=3 if job_info.concurrent == '0' else 1, jobstore=job_info.job_group, + executor=job_executor, ) - if iscoroutinefunction(job_func): - async_scheduler.add_job(**job_param) - else: - scheduler.add_job(executor=job_info.job_executor, **job_param) @classmethod def remove_scheduler_job(cls, job_id: Union[str, int]): @@ -231,12 +224,7 @@ class SchedulerUtil: """ query_job = cls.get_scheduler_job(job_id=job_id) if query_job: - query_job_info = query_job.__getstate__() - job_func = eval(query_job_info.get('func').replace(':', '.')) - if iscoroutinefunction(job_func): - async_scheduler.remove_job(job_id=str(job_id)) - else: - scheduler.remove_job(job_id=str(job_id)) + scheduler.remove_job(job_id=str(job_id)) @classmethod def scheduler_event_listener(cls, event): -- Gitee From 345d2b3362a60370a0e00ae5835b23a5d6632a93 Mon Sep 17 00:00:00 2001 From: insistence <3055204202@qq.com> Date: Tue, 12 Nov 2024 22:07:20 +0800 Subject: [PATCH 5/6] =?UTF-8?q?chore:=20=E5=8D=87=E7=BA=A7=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E8=87=B32.1.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dash-fastapi-backend/.env.dev | 2 +- dash-fastapi-backend/.env.prod | 2 +- dash-fastapi-frontend/.env.dev | 2 +- dash-fastapi-frontend/.env.prod | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dash-fastapi-backend/.env.dev b/dash-fastapi-backend/.env.dev index f79f19e..8b2d308 100644 --- a/dash-fastapi-backend/.env.dev +++ b/dash-fastapi-backend/.env.dev @@ -10,7 +10,7 @@ APP_HOST = '0.0.0.0' # 应用端口 APP_PORT = 9099 # 应用版本 -APP_VERSION= '2.1.0' +APP_VERSION= '2.1.1' # 应用是否开启热重载 APP_RELOAD = true # 应用是否开启IP归属区域查询 diff --git a/dash-fastapi-backend/.env.prod b/dash-fastapi-backend/.env.prod index 55c011d..fb89360 100644 --- a/dash-fastapi-backend/.env.prod +++ b/dash-fastapi-backend/.env.prod @@ -10,7 +10,7 @@ APP_HOST = '0.0.0.0' # 应用端口 APP_PORT = 9099 # 应用版本 -APP_VERSION= '2.1.0' +APP_VERSION= '2.1.1' # 应用是否开启热重载 APP_RELOAD = false # 应用是否开启IP归属区域查询 diff --git a/dash-fastapi-frontend/.env.dev b/dash-fastapi-frontend/.env.dev index 1c39a51..b2cb98f 100644 --- a/dash-fastapi-frontend/.env.dev +++ b/dash-fastapi-frontend/.env.dev @@ -16,7 +16,7 @@ APP_HOST = '0.0.0.0' # 应用端口 APP_PORT = 8088 # 应用版本 -APP_VERSION= '2.1.0' +APP_VERSION= '2.1.1' # 应用是否开启debug模式 APP_DEBUG = true # flask-compress压缩配置 diff --git a/dash-fastapi-frontend/.env.prod b/dash-fastapi-frontend/.env.prod index 8d9b01e..71e3dc3 100644 --- a/dash-fastapi-frontend/.env.prod +++ b/dash-fastapi-frontend/.env.prod @@ -16,7 +16,7 @@ APP_HOST = '0.0.0.0' # 应用端口 APP_PORT = 8088 # 应用版本 -APP_VERSION= '2.1.0' +APP_VERSION= '2.1.1' # 应用是否开启debug模式 APP_DEBUG = false # flask-compress压缩配置 -- Gitee From 5c46eb3985bef7d79ce1f6d7b1fbf3762caed932 Mon Sep 17 00:00:00 2001 From: insistence <3055204202@qq.com> Date: Tue, 12 Nov 2024 22:07:26 +0800 Subject: [PATCH 6/6] =?UTF-8?q?docs:=20=E6=9B=B4=E6=96=B0README=E6=96=87?= =?UTF-8?q?=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index b7cb215..4bd2a86 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,12 @@

logo

-

Dash-FastAPI-Admin v2.1.0

+

Dash-FastAPI-Admin v2.1.1

基于Dash+FastAPI前后端分离的纯Python快速开发框架

- + -- Gitee