diff --git a/README.md b/README.md index 6794146..0107156 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,12 @@

logo

-

RuoYi-Vue3-FastAPI v1.2.1

+

RuoYi-Vue3-FastAPI v1.2.2

基于RuoYi-Vue3+FastAPI前后端分离的快速开发框架

- + diff --git a/ruoyi-fastapi-backend/.env.dev b/ruoyi-fastapi-backend/.env.dev index 955d39c..aa4241c 100644 --- a/ruoyi-fastapi-backend/.env.dev +++ b/ruoyi-fastapi-backend/.env.dev @@ -10,7 +10,7 @@ APP_HOST = '0.0.0.0' # 应用端口 APP_PORT = 9099 # 应用版本 -APP_VERSION= '1.2.1' +APP_VERSION= '1.2.2' # 应用是否开启热重载 APP_RELOAD = true # 应用是否开启IP归属区域查询 diff --git a/ruoyi-fastapi-backend/.env.prod b/ruoyi-fastapi-backend/.env.prod index c2b1560..b41b5b8 100644 --- a/ruoyi-fastapi-backend/.env.prod +++ b/ruoyi-fastapi-backend/.env.prod @@ -10,7 +10,7 @@ APP_HOST = '0.0.0.0' # 应用端口 APP_PORT = 9099 # 应用版本 -APP_VERSION= '1.2.1' +APP_VERSION= '1.2.2' # 应用是否开启热重载 APP_RELOAD = false # 应用是否开启IP归属区域查询 diff --git a/ruoyi-fastapi-backend/module_admin/service/job_service.py b/ruoyi-fastapi-backend/module_admin/service/job_service.py index ca3de4d..78775d4 100644 --- a/ruoyi-fastapi-backend/module_admin/service/job_service.py +++ b/ruoyi-fastapi-backend/module_admin/service/job_service.py @@ -117,6 +117,9 @@ class JobService: try: for job_id in job_id_list: await JobDao.delete_job_dao(query_db, JobModel(jobId=job_id)) + query_job = SchedulerUtil.get_scheduler_job(job_id=job_id) + if query_job: + SchedulerUtil.remove_scheduler_job(job_id=job_id) await query_db.commit() result = dict(is_success=True, message='删除成功') except Exception as e: diff --git a/ruoyi-fastapi-backend/module_admin/service/login_service.py b/ruoyi-fastapi-backend/module_admin/service/login_service.py index 5f9eaaa..baeb7aa 100644 --- a/ruoyi-fastapi-backend/module_admin/service/login_service.py +++ b/ruoyi-fastapi-backend/module_admin/service/login_service.py @@ -475,9 +475,9 @@ class RouterUtil: component = 'Layout' if menu.component and not cls.is_menu_frame(menu): component = menu.component - elif menu.component and menu.parent_id != 0 and cls.is_inner_link(menu): + elif (menu.component is None or menu.component == '') and menu.parent_id != 0 and cls.is_inner_link(menu): component = 'InnerLink' - elif menu.component and cls.is_parent_view(menu): + elif (menu.component is None or menu.component == '') and cls.is_parent_view(menu): component = 'ParentView' return component diff --git a/ruoyi-fastapi-frontend/package.json b/ruoyi-fastapi-frontend/package.json index c755a8a..d4bc0f5 100644 --- a/ruoyi-fastapi-frontend/package.json +++ b/ruoyi-fastapi-frontend/package.json @@ -1,6 +1,6 @@ { "name": "vfadmin", - "version": "1.2.1", + "version": "1.2.2", "description": "vfadmin管理系统", "author": "insistence", "license": "MIT",