diff --git a/README.md b/README.md index f611a2728a278a0020eac695053496f22e0a8345..f65dead3d4a71999e53d029255c9dd84a950edcd 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,12 @@

logo

-

RuoYi-Vue3-FastAPI v1.0.2

+

RuoYi-Vue3-FastAPI v1.0.3

基于RuoYi-Vue3+FastAPI前后端分离的快速开发框架

- + @@ -14,6 +14,7 @@ + ## 平台简介 RuoYi-Vue-FastAPI是一套全部开源的快速开发平台，毫无保留给个人及企业免费使用。 diff --git a/ruoyi-fastapi-backend/.env.dev b/ruoyi-fastapi-backend/.env.dev index 216ec8b075a9e602bfeb2cf7be0d12e33122c9bc..cbfee4e7c136e396cc79721284dc3bf511490a1e 100644 --- a/ruoyi-fastapi-backend/.env.dev +++ b/ruoyi-fastapi-backend/.env.dev @@ -2,7 +2,7 @@ # 应用运行环境 APP_ENV = 'dev' # 应用名称 -APP_NAME = 'RuoYi-FasAPI' +APP_NAME = 'RuoYi-FastAPI' # 应用代理路径 APP_ROOT_PATH = '/dev-api' # 应用主机 @@ -10,7 +10,7 @@ APP_HOST = '0.0.0.0' # 应用端口 APP_PORT = 9099 # 应用版本 -APP_VERSION= '1.0.2' +APP_VERSION= '1.0.3' # 应用是否开启热重载 APP_RELOAD = true diff --git a/ruoyi-fastapi-backend/.env.prod b/ruoyi-fastapi-backend/.env.prod index 352b33d9c1d22e82ead8a536f1924348707d2eb2..75f65aa67aac6d644db766f6121d608e3459e245 100644 --- a/ruoyi-fastapi-backend/.env.prod +++ b/ruoyi-fastapi-backend/.env.prod @@ -2,7 +2,7 @@ # 应用运行环境 APP_ENV = 'prod' # 应用名称 -APP_NAME = 'RuoYi-FasAPI' +APP_NAME = 'RuoYi-FastAPI' # 应用代理路径 APP_ROOT_PATH = '/prod-api' # 应用主机 @@ -10,7 +10,7 @@ APP_HOST = '0.0.0.0' # 应用端口 APP_PORT = 9099 # 应用版本 -APP_VERSION= '1.0.2' +APP_VERSION= '1.0.3' # 应用是否开启热重载 APP_RELOAD = false diff --git a/ruoyi-fastapi-backend/module_admin/service/login_service.py b/ruoyi-fastapi-backend/module_admin/service/login_service.py index f0ecaced1e230840f03eac0e73a863508a60a092..cfb6d90e53db0d06dfb5bced2edf30a55d4df0a3 100644 --- a/ruoyi-fastapi-backend/module_admin/service/login_service.py +++ b/ruoyi-fastapi-backend/module_admin/service/login_service.py @@ -56,6 +56,7 @@ class LoginService: :param login_user: 登录用户对象 :return: 校验结果 """ + await cls.__check_login_ip(request) account_lock = await request.app.state.redis.get( f"{RedisInitKeyConfig.ACCOUNT_LOCK.get('key')}:{login_user.user_name}") if login_user.user_name == account_lock: @@ -100,6 +101,21 @@ class LoginService: f"{RedisInitKeyConfig.PASSWORD_ERROR_COUNT.get('key')}:{login_user.user_name}") return user + @classmethod + async def __check_login_ip(cls, request: Request): + """ + 校验用户登录ip是否在黑名单内 + :param request: Request对象 + :return: 校验结果 + """ + black_ip_value = await request.app.state.redis.get( + f"{RedisInitKeyConfig.SYS_CONFIG.get('key')}:sys.login.blackIPList") + black_ip_list = black_ip_value.split(',') if black_ip_value else [] + if request.headers.get('X-Forwarded-For') in black_ip_list: + logger.warning("当前IP禁止登录") + raise LoginException(data="", message="当前IP禁止登录") + return True + @classmethod async def __check_login_captcha(cls, request: Request, login_user: UserLogin): """ @@ -229,14 +245,16 @@ class LoginService: if permission.menu_type == 'M': router_list_data['name'] = permission.path.capitalize() router_list_data['hidden'] = False if permission.visible == '0' else True - if permission.is_frame == 1: - router_list_data['redirect'] = 'noRedirect' if permission.parent_id == 0: router_list_data['component'] = 'Layout' router_list_data['path'] = f'/{permission.path}' else: router_list_data['component'] = 'ParentView' router_list_data['path'] = permission.path + if permission.is_frame == 1: + router_list_data['redirect'] = 'noRedirect' + else: + router_list_data['path'] = permission.path if children: router_list_data['alwaysShow'] = True router_list_data['children'] = children diff --git a/ruoyi-fastapi-frontend/package.json b/ruoyi-fastapi-frontend/package.json index 3e294e04f27653e117c0e1391f89aae8cb18dd67..a9de45e92ae6256ac7643378565adf3fbe8e416f 100644 --- a/ruoyi-fastapi-frontend/package.json +++ b/ruoyi-fastapi-frontend/package.json @@ -1,6 +1,6 @@ { "name": "vfadmin", - "version": "1.0.2", + "version": "1.0.3", "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 bb486e904bcee980a456e741684c5afa0b6ae2f1..b71c32f83e82ddfd1e5942fa44fe9e80c6e44fb6 100644 --- a/ruoyi-fastapi-frontend/src/views/system/menu/index.vue +++ b/ruoyi-fastapi-frontend/src/views/system/menu/index.vue @@ -152,8 +152,8 @@ - 是 - 否 + 是 + 否 @@ -220,8 +220,8 @@ - 缓存 - 不缓存 + 缓存 + 不缓存