From 581ef159170ed94fc82d09e6922f348688398ada Mon Sep 17 00:00:00 2001
From: insistence <3055204202@qq.com>
Date: Sat, 29 Jun 2024 17:03:28 +0800
Subject: [PATCH 1/4] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=88=A0=E9=99=A4?=
=?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=E6=97=B6=E6=9C=AA=E7=A7=BB?=
=?UTF-8?q?=E9=99=A4=E8=B0=83=E5=BA=A6=E4=B8=AD=E4=BB=BB=E5=8A=A1=E7=9A=84?=
=?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ruoyi-fastapi-backend/module_admin/service/job_service.py | 3 +++
1 file changed, 3 insertions(+)
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:
From 2360c7a12d7cc53d34fff1a1cc78841bd0153979 Mon Sep 17 00:00:00 2001
From: insistence <3055204202@qq.com>
Date: Sat, 29 Jun 2024 19:49:52 +0800
Subject: [PATCH 2/4] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=8F=9C=E5=8D=95?=
=?UTF-8?q?=E7=94=9F=E6=88=90=E8=B7=AF=E7=94=B1=E6=97=B6=E7=BB=84=E4=BB=B6?=
=?UTF-8?q?=E6=9D=A1=E4=BB=B6=E5=88=A4=E6=96=AD=E9=94=99=E8=AF=AF=E7=9A=84?=
=?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ruoyi-fastapi-backend/module_admin/service/login_service.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
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
From 847445df82531d6acb241e76b543cb52585a3471 Mon Sep 17 00:00:00 2001
From: insistence <3055204202@qq.com>
Date: Sat, 29 Jun 2024 20:13:03 +0800
Subject: [PATCH 3/4] =?UTF-8?q?chore:=20=E5=8D=87=E7=BA=A7=E7=89=88?=
=?UTF-8?q?=E6=9C=AC=E8=87=B31.2.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ruoyi-fastapi-backend/.env.dev | 2 +-
ruoyi-fastapi-backend/.env.prod | 2 +-
ruoyi-fastapi-frontend/package.json | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
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-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",
From 114cda0b764df34513d70c4ce9e4feb37d4de82d Mon Sep 17 00:00:00 2001
From: insistence <3055204202@qq.com>
Date: Sat, 29 Jun 2024 20:13:42 +0800
Subject: [PATCH 4/4] =?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 6794146..0107156 100644
--- a/README.md
+++ b/README.md
@@ -1,12 +1,12 @@
-RuoYi-Vue3-FastAPI v1.2.1
+RuoYi-Vue3-FastAPI v1.2.2
基于RuoYi-Vue3+FastAPI前后端分离的快速开发框架
- 
+ 
