diff --git a/README.md b/README.md index dba9ffcb76b64d87f20c6a9eddda484b5a92a365..c4454b226675c7cbdba97c1170022cafbbe6a5b3 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,12 @@
-
+
@@ -16,6 +16,7 @@
+
## 平台简介
RuoYi-Vue-FastAPI是一套全部开源的快速开发平台,毫无保留给个人及企业免费使用。
diff --git a/ruoyi-fastapi-backend/.env.dev b/ruoyi-fastapi-backend/.env.dev
index 27c0e220e58dbb59f97d03c3585bb815ced518a5..099fdbbc9b3151fc7a9be6a67fba4312e1cdc40c 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 94c3f33b1c0c7ccd14710f2f6a849efcd2e9b00a..a4c6607e75572b2f3e3ce41ea17cde1564eee8db 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-backend/module_admin/service/job_service.py b/ruoyi-fastapi-backend/module_admin/service/job_service.py
index 62887e8424647845c8442a5e476bb5e9ee3f4217..b2e2dccc6884c531cd05fc5f23cf159e59955658 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='更新成功')
diff --git a/ruoyi-fastapi-backend/module_admin/service/login_service.py b/ruoyi-fastapi-backend/module_admin/service/login_service.py
index d509a3077518c6bc838fae045f95b47403ce83c6..5229c0590ced79a6a6a5bdeacfd69c7c903173a1 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
@@ -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'] = {
diff --git a/ruoyi-fastapi-backend/module_admin/service/role_service.py b/ruoyi-fastapi-backend/module_admin/service/role_service.py
index 71c3381e5d12061d2ae2e8f614ef96f9b6a1379d..c09c11f56969655fa54dae50a06a935ca240f180 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:
diff --git a/ruoyi-fastapi-frontend/package.json b/ruoyi-fastapi-frontend/package.json
index c1499ce298df5791c9b01e0cd56aa666430e3f90..bb0aff529362aa4a62a8e754f9f4d1cea5fa6f67 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",
diff --git a/ruoyi-fastapi-frontend/src/views/system/menu/index.vue b/ruoyi-fastapi-frontend/src/views/system/menu/index.vue
index 3a399db72d3c86931326c1e4a2ab566398a28acb..d2ad50a44dcf4dab0932b217f86a5018f6c7ab62 100644
--- a/ruoyi-fastapi-frontend/src/views/system/menu/index.vue
+++ b/ruoyi-fastapi-frontend/src/views/system/menu/index.vue
@@ -372,8 +372,8 @@ export default {
icon: undefined,
menuType: "M",
orderNum: undefined,
- isFrame: "1",
- isCache: "0",
+ isFrame: 1,
+ isCache: 0,
visible: "0",
status: "0"
};