From 88b27685c12922e19eb5f291b7098ed6bf610161 Mon Sep 17 00:00:00 2001
From: insistence <3055204202@qq.com>
Date: Mon, 8 Apr 2024 11:02:41 +0800
Subject: [PATCH 1/7] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=BC=96=E8=BE=91?=
=?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=E6=97=B6=E6=9B=B4=E6=96=B0?=
=?UTF-8?q?=E7=9A=84=E4=BF=A1=E6=81=AF=E6=9C=AA=E5=90=8C=E6=AD=A5=E8=87=B3?=
=?UTF-8?q?scheduler=E7=9A=84=E9=97=AE=E9=A2=98=20#I9EK56?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ruoyi-fastapi-backend/module_admin/service/job_service.py | 1 +
1 file changed, 1 insertion(+)
diff --git a/ruoyi-fastapi-backend/module_admin/service/job_service.py b/ruoyi-fastapi-backend/module_admin/service/job_service.py
index 62887e8..b2e2dcc 100644
--- a/ruoyi-fastapi-backend/module_admin/service/job_service.py
+++ b/ruoyi-fastapi-backend/module_admin/service/job_service.py
@@ -72,6 +72,7 @@ class JobService:
if query_job:
SchedulerUtil.remove_scheduler_job(job_id=edit_job.get('job_id'))
if edit_job.get('status') == '0':
+ job_info = cls.job_detail_services(query_db, edit_job.get('job_id'))
SchedulerUtil.add_scheduler_job(job_info=job_info)
query_db.commit()
result = dict(is_success=True, message='更新成功')
From fa27fd3b6857c4d73eed2dc6cfcf5e916c3c94e3 Mon Sep 17 00:00:00 2001
From: insistence <3055204202@qq.com>
Date: Mon, 8 Apr 2024 11:04:32 +0800
Subject: [PATCH 2/7] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=BC=96=E8=BE=91?=
=?UTF-8?q?=E8=A7=92=E8=89=B2=E6=95=B0=E6=8D=AE=E6=9D=83=E9=99=90=E6=97=B6?=
=?UTF-8?q?=E5=90=8E=E7=AB=AF=E5=BC=82=E5=B8=B8=E7=9A=84=E9=97=AE=E9=A2=98?=
=?UTF-8?q?=20#I9ENQN?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ruoyi-fastapi-backend/module_admin/service/role_service.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ruoyi-fastapi-backend/module_admin/service/role_service.py b/ruoyi-fastapi-backend/module_admin/service/role_service.py
index 71c3381..c09c11f 100644
--- a/ruoyi-fastapi-backend/module_admin/service/role_service.py
+++ b/ruoyi-fastapi-backend/module_admin/service/role_service.py
@@ -131,7 +131,7 @@ class RoleService:
:param page_object: 角色数据权限对象
:return: 分配角色数据权限结果
"""
- edit_role = page_object.model_dump(exclude_unset=True)
+ edit_role = page_object.model_dump(exclude_unset=True, exclude={'admin'})
del edit_role['dept_ids']
role_info = cls.role_detail_services(query_db, edit_role.get('role_id'))
if role_info:
From 423491302dc405ab384ab2249cfa59cb9f9ebc62 Mon Sep 17 00:00:00 2001
From: insistence <3055204202@qq.com>
Date: Wed, 17 Apr 2024 10:51:16 +0800
Subject: [PATCH 3/7] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=8F=9C=E5=8D=95?=
=?UTF-8?q?=E9=85=8D=E7=BD=AE=E8=B7=AF=E7=94=B1=E5=8F=82=E6=95=B0=E4=B8=8D?=
=?UTF-8?q?=E7=94=9F=E6=95=88=E7=9A=84=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 | 1 +
1 file changed, 1 insertion(+)
diff --git a/ruoyi-fastapi-backend/module_admin/service/login_service.py b/ruoyi-fastapi-backend/module_admin/service/login_service.py
index d509a30..7806003 100644
--- a/ruoyi-fastapi-backend/module_admin/service/login_service.py
+++ b/ruoyi-fastapi-backend/module_admin/service/login_service.py
@@ -271,6 +271,7 @@ class LoginService:
elif permission.menu_type == 'C':
router_list_data['name'] = permission.path.capitalize()
router_list_data['path'] = permission.path
+ router_list_data['query'] = permission.query
router_list_data['hidden'] = False if permission.visible == '0' else True
router_list_data['component'] = permission.component
router_list_data['meta'] = {
From b423647ad5ff71689295faef194d4de75f0de8a9 Mon Sep 17 00:00:00 2001
From: insistence <3055204202@qq.com>
Date: Wed, 17 Apr 2024 16:03:49 +0800
Subject: [PATCH 4/7] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=8E=B7=E5=8F=96?=
=?UTF-8?q?=E8=B7=AF=E7=94=B1=E4=BF=A1=E6=81=AF=E6=97=B6=E8=8F=9C=E5=8D=95?=
=?UTF-8?q?=E6=8E=92=E5=BA=8F=E4=B8=8D=E7=94=9F=E6=95=88=E7=9A=84=E9=97=AE?=
=?UTF-8?q?=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 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ruoyi-fastapi-backend/module_admin/service/login_service.py b/ruoyi-fastapi-backend/module_admin/service/login_service.py
index 7806003..5229c05 100644
--- a/ruoyi-fastapi-backend/module_admin/service/login_service.py
+++ b/ruoyi-fastapi-backend/module_admin/service/login_service.py
@@ -229,7 +229,7 @@ class LoginService:
:return: 当前用户路由信息对象
"""
query_user = UserDao.get_user_by_id(query_db, user_id=user_id)
- user_router_menu = [row for row in query_user.get('user_menu_info') if row.menu_type in ['M', 'C']]
+ user_router_menu = sorted([row for row in query_user.get('user_menu_info') if row.menu_type in ['M', 'C']], key=lambda x: x.order_num)
user_router = cls.__generate_user_router_menu(0, user_router_menu)
return user_router
From dfb8af23b31e8ffb2fc61f5f5930fb61aa1f6edf Mon Sep 17 00:00:00 2001
From: insistence <3055204202@qq.com>
Date: Fri, 19 Apr 2024 11:31:24 +0800
Subject: [PATCH 5/7] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=B7=BB=E5=8A=A0?=
=?UTF-8?q?=E8=8F=9C=E5=8D=95=E6=97=B6=E6=98=AF=E5=90=A6=E5=A4=96=E9=93=BE?=
=?UTF-8?q?=E5=92=8C=E6=98=AF=E5=90=A6=E7=BC=93=E5=AD=98=E5=9B=9E=E6=98=BE?=
=?UTF-8?q?=E5=BC=82=E5=B8=B8=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ruoyi-fastapi-frontend/src/views/system/menu/index.vue | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/ruoyi-fastapi-frontend/src/views/system/menu/index.vue b/ruoyi-fastapi-frontend/src/views/system/menu/index.vue
index b71c32f..529d633 100644
--- a/ruoyi-fastapi-frontend/src/views/system/menu/index.vue
+++ b/ruoyi-fastapi-frontend/src/views/system/menu/index.vue
@@ -339,8 +339,8 @@ function reset() {
icon: undefined,
menuType: "M",
orderNum: undefined,
- isFrame: "1",
- isCache: "0",
+ isFrame: 1,
+ isCache: 0,
visible: "0",
status: "0"
};
From 7fd3109b52dd0c1e3ae8ccf99dc68ebc2f36920d Mon Sep 17 00:00:00 2001
From: insistence <3055204202@qq.com>
Date: Fri, 19 Apr 2024 11:38:12 +0800
Subject: [PATCH 6/7] =?UTF-8?q?chore:=20=E5=8D=87=E7=BA=A7=E7=89=88?=
=?UTF-8?q?=E6=9C=AC=E8=87=B31.1.1?=
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 27c0e22..099fdbb 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.1.0'
+APP_VERSION= '1.1.1'
# 应用是否开启热重载
APP_RELOAD = true
# 应用是否开启IP归属区域查询
diff --git a/ruoyi-fastapi-backend/.env.prod b/ruoyi-fastapi-backend/.env.prod
index 2bc3aca..dd85976 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.1.0'
+APP_VERSION= '1.1.1'
# 应用是否开启热重载
APP_RELOAD = false
# 应用是否开启IP归属区域查询
diff --git a/ruoyi-fastapi-frontend/package.json b/ruoyi-fastapi-frontend/package.json
index c8b740b..3474e01 100644
--- a/ruoyi-fastapi-frontend/package.json
+++ b/ruoyi-fastapi-frontend/package.json
@@ -1,6 +1,6 @@
{
"name": "vfadmin",
- "version": "1.1.0",
+ "version": "1.1.1",
"description": "vfadmin管理系统",
"author": "insistence",
"license": "MIT",
From f4afa20ac22432b16b3c1da131987bbc9782afb8 Mon Sep 17 00:00:00 2001
From: insistence <3055204202@qq.com>
Date: Fri, 19 Apr 2024 11:39:04 +0800
Subject: [PATCH 7/7] =?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 | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/README.md b/README.md
index f012002..fdffeb1 100644
--- a/README.md
+++ b/README.md
@@ -1,12 +1,12 @@
-RuoYi-Vue3-FastAPI v1.1.0
+RuoYi-Vue3-FastAPI v1.1.1
基于RuoYi-Vue3+FastAPI前后端分离的快速开发框架
- 
+ 
@@ -16,6 +16,7 @@
+
## 平台简介
RuoYi-Vue3-FastAPI是一套全部开源的快速开发平台，毫无保留给个人及企业免费使用。