!12 RuoYi-Vue-FastAPI v1.2.2

Merge pull request !12 from insistence/develop
insistence · Jun 29, 2024 · d33e791 · d33e791
2 parents b8a579d + b4ff602
commit d33e791
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -1,12 +1,12 @@
 <p align="center">
 	<img alt="logo" src="https://oscimg.oschina.net/oscnet/up-d3d0a9303e11d522a06cd263f3079027715.png">
 </p>
-<h1 align="center" style="margin: 30px 0 30px; font-weight: bold;">RuoYi-Vue-FastAPI v1.2.1</h1>
+<h1 align="center" style="margin: 30px 0 30px; font-weight: bold;">RuoYi-Vue-FastAPI v1.2.2</h1>
 <h4 align="center">基于RuoYi-Vue+FastAPI前后端分离的快速开发框架</h4>
 <p align="center">
 	<a href="https://gitee.com/insistence2022/RuoYi-Vue-FastAPI/stargazers"><img src="https://gitee.com/insistence2022/RuoYi-Vue-FastAPI/badge/star.svg?theme=dark"></a>
     <a href="https://github.com/insistence/RuoYi-Vue-FastAPI"><img src="https://img.shields.io/github/stars/insistence/RuoYi-Vue-FastAPI?style=social"></a>
-	<a href="https://gitee.com/insistence2022/RuoYi-Vue-FastAPI"><img src="https://img.shields.io/badge/RuoYiVueFastAPI-v1.2.1-brightgreen.svg"></a>
+	<a href="https://gitee.com/insistence2022/RuoYi-Vue-FastAPI"><img src="https://img.shields.io/badge/RuoYiVueFastAPI-v1.2.2-brightgreen.svg"></a>
 	<a href="https://gitee.com/insistence2022/RuoYi-Vue-FastAPI/blob/master/LICENSE"><img src="https://img.shields.io/github/license/mashape/apistatus.svg"></a>
     <img src="https://img.shields.io/badge/python-≥3.8-blue">
     <img src="https://img.shields.io/badge/MySQL-≥5.7-blue">

diff --git 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
@@ -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
@@ -117,6 +117,9 @@ async def delete_job_services(cls, query_db: AsyncSession, page_object: DeleteJo
             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
@@ -475,9 +475,9 @@ def get_component(cls, menu: MenuTreeModel):
         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
@@ -1,6 +1,6 @@
 {
   "name": "vfadmin",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "description": "vfadmin管理系统",
   "author": "insistence",
   "license": "MIT",