Browse Source
!8 RuoYi-Vue3-FastAPI v1.1.1
Merge pull request !8 from insistence/develop
master
insistence
10 months ago
committed by
Gitee
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
8 changed files with
12 additions and
9 deletions
-
README.md
-
ruoyi-fastapi-backend/.env.dev
-
ruoyi-fastapi-backend/.env.prod
-
ruoyi-fastapi-backend/module_admin/service/job_service.py
-
ruoyi-fastapi-backend/module_admin/service/login_service.py
-
ruoyi-fastapi-backend/module_admin/service/role_service.py
-
ruoyi-fastapi-frontend/package.json
-
ruoyi-fastapi-frontend/src/views/system/menu/index.vue
|
|
|
@ -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-Vue3-FastAPI v1.1.0</h1> |
|
|
|
<h1 align="center" style="margin: 30px 0 30px; font-weight: bold;">RuoYi-Vue3-FastAPI v1.1.1</h1> |
|
|
|
<h4 align="center">基于RuoYi-Vue3+FastAPI前后端分离的快速开发框架</h4> |
|
|
|
<p align="center"> |
|
|
|
<a href="https://gitee.com/insistence2022/RuoYi-Vue3-FastAPI/stargazers"><img src="https://gitee.com/insistence2022/RuoYi-Vue3-FastAPI/badge/star.svg?theme=dark"></a> |
|
|
|
<a href="https://github.com/insistence/RuoYi-Vue3-FastAPI"><img src="https://img.shields.io/github/stars/insistence/RuoYi-Vue3-FastAPI?style=social"></a> |
|
|
|
<a href="https://gitee.com/insistence2022/RuoYi-Vue3-FastAPI"><img src="https://img.shields.io/badge/RuoYiVue3FastAPI-v1.1.0-brightgreen.svg"></a> |
|
|
|
<a href="https://gitee.com/insistence2022/RuoYi-Vue3-FastAPI"><img src="https://img.shields.io/badge/RuoYiVue3FastAPI-v1.1.1-brightgreen.svg"></a> |
|
|
|
<a href="https://gitee.com/insistence2022/RuoYi-Vue3-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"> |
|
|
|
@ -16,6 +16,7 @@ |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
## 平台简介 |
|
|
|
|
|
|
|
RuoYi-Vue3-FastAPI是一套全部开源的快速开发平台，毫无保留给个人及企业免费使用。 |
|
|
|
|
|
|
|
@ -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归属区域查询 |
|
|
|
|
|
|
|
@ -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归属区域查询 |
|
|
|
|
|
|
|
@ -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='更新成功') |
|
|
|
|
|
|
|
@ -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'] = { |
|
|
|
|
|
|
|
@ -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: |
|
|
|
|
|
|
|
@ -1,6 +1,6 @@ |
|
|
|
{ |
|
|
|
"name": "vfadmin", |
|
|
|
"version": "1.1.0", |
|
|
|
"version": "1.1.1", |
|
|
|
"description": "vfadmin管理系统", |
|
|
|
"author": "insistence", |
|
|
|
"license": "MIT", |
|
|
|
|
|
|
|
@ -339,8 +339,8 @@ function reset() { |
|
|
|
icon: undefined, |
|
|
|
menuType: "M", |
|
|
|
orderNum: undefined, |
|
|
|
isFrame: "1", |
|
|
|
isCache: "0", |
|
|
|
isFrame: 1, |
|
|
|
isCache: 0, |
|
|
|
visible: "0", |
|
|
|
status: "0" |
|
|
|
}; |
|
|
|
|
