diff --git a/README.md b/README.md index 67941466aa1e8875ededd255908d21e51703507a..01071568bc8dc4c448034b86bfcfffb950b89f61 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,12 @@
-
+
diff --git a/ruoyi-fastapi-backend/.env.dev b/ruoyi-fastapi-backend/.env.dev
index 955d39c05c42c639d513b73cc37010501b6ced1f..aa4241c9eceace020063a57677aa00d1d58740ec 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 c2b15602852ed0e77b09f1a40c1dc0f6dd295a0e..b41b5b8ce6b6727534f6f48fd3c57ffbfb253a8c 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 ca3de4d449ca6b9dd8e08eaf0c4b399ce3d396fb..78775d47334cc398f417a0fda68eb0008dd88245 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 5f9eaaa51e1d5ed87163c2930130555a408f370b..baeb7aa0e154fa8949e0993a6ac4bcd1ff252c46 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 c755a8a6ce35190c33adaa765e23729e326c2827..d4bc0f59499e5d401695da88b93822021f893c72 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",