From 9013b1917ed8b4f6a991e069a8b1d85e1fa72804 Mon Sep 17 00:00:00 2001
From: insistence <3055204202@qq.com>
Date: Sat, 17 Aug 2024 16:51:38 +0800
Subject: [PATCH 1/6] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E5=9C=A8?=
=?UTF-8?q?=E7=BA=BF=E7=94=A8=E6=88=B7=E6=A8=A1=E5=9D=97=E5=89=8D=E5=90=8E?=
=?UTF-8?q?=E7=AB=AF=E5=AD=97=E6=AE=B5=E6=8F=8F=E8=BF=B0=E4=B8=80=E8=87=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ruoyi-fastapi-backend/module_admin/entity/vo/online_vo.py | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/ruoyi-fastapi-backend/module_admin/entity/vo/online_vo.py b/ruoyi-fastapi-backend/module_admin/entity/vo/online_vo.py
index ca68f1e..11bb475 100644
--- a/ruoyi-fastapi-backend/module_admin/entity/vo/online_vo.py
+++ b/ruoyi-fastapi-backend/module_admin/entity/vo/online_vo.py
@@ -13,10 +13,10 @@ class OnlineModel(BaseModel):
model_config = ConfigDict(alias_generator=to_camel)
token_id: Optional[str] = Field(default=None, description='会话编号')
- user_name: Optional[str] = Field(default=None, description='部门名称')
- dept_name: Optional[str] = Field(default=None, description='用户名称')
- ipaddr: Optional[str] = Field(default=None, description='登录IP地址')
- login_location: Optional[str] = Field(default=None, description='登录地址')
+ user_name: Optional[str] = Field(default=None, description='登录名称')
+ dept_name: Optional[str] = Field(default=None, description='所属部门')
+ ipaddr: Optional[str] = Field(default=None, description='主机')
+ login_location: Optional[str] = Field(default=None, description='登录地点')
browser: Optional[str] = Field(default=None, description='浏览器类型')
os: Optional[str] = Field(default=None, description='操作系统')
login_time: Optional[datetime] = Field(default=None, description='登录时间')
--
Gitee
From f404aba689804457526a17dbe4c72644de47f6ad Mon Sep 17 00:00:00 2001
From: insistence <3055204202@qq.com>
Date: Sat, 17 Aug 2024 16:52:46 +0800
Subject: [PATCH 2/6] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=9C=A8=E7=BA=BF?=
=?UTF-8?q?=E7=94=A8=E6=88=B7=E6=A8=A1=E5=9D=97=E6=9D=A1=E4=BB=B6=E6=9F=A5?=
=?UTF-8?q?=E8=AF=A2=E6=97=A0=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
---
.../module_admin/service/online_service.py | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/ruoyi-fastapi-backend/module_admin/service/online_service.py b/ruoyi-fastapi-backend/module_admin/service/online_service.py
index 0d1c913..56742b0 100644
--- a/ruoyi-fastapi-backend/module_admin/service/online_service.py
+++ b/ruoyi-fastapi-backend/module_admin/service/online_service.py
@@ -22,7 +22,7 @@ class OnlineService:
:param query_object: 查询参数对象
:return: 在线用户列表信息
"""
- access_token_keys = await request.app.state.redis.keys(f"{RedisInitKeyConfig.ACCESS_TOKEN.key}*")
+ access_token_keys = await request.app.state.redis.keys(f'{RedisInitKeyConfig.ACCESS_TOKEN.key}*')
if not access_token_keys:
access_token_keys = []
access_token_values_list = [await request.app.state.redis.get(key) for key in access_token_keys]
@@ -40,11 +40,11 @@ class OnlineService:
login_time=payload.get('login_info').get('loginTime'),
)
if query_object.user_name and not query_object.ipaddr:
- if query_object.user_name == payload.get('login_info').get('ipaddr'):
+ if query_object.user_name == payload.get('user_name'):
online_info_list = [online_dict]
break
elif not query_object.user_name and query_object.ipaddr:
- if query_object.ipaddr == payload.get('ipaddr'):
+ if query_object.ipaddr == payload.get('login_info').get('ipaddr'):
online_info_list = [online_dict]
break
elif query_object.user_name and query_object.ipaddr:
@@ -70,7 +70,7 @@ class OnlineService:
if page_object.token_ids:
token_id_list = page_object.token_ids.split(',')
for token_id in token_id_list:
- await request.app.state.redis.delete(f"{RedisInitKeyConfig.ACCESS_TOKEN.key}:{token_id}")
+ await request.app.state.redis.delete(f'{RedisInitKeyConfig.ACCESS_TOKEN.key}:{token_id}')
return CrudResponseModel(is_success=True, message='强退成功')
else:
raise ServiceException(message='传入session_id为空')
--
Gitee
From 82c84b2afe79b1193333af9462d1f3ccad923be1 Mon Sep 17 00:00:00 2001
From: insistence <3055204202@qq.com>
Date: Wed, 4 Sep 2024 09:01:41 +0800
Subject: [PATCH 3/6] =?UTF-8?q?perf:=20=E6=97=A5=E5=BF=97=E8=A3=85?=
=?UTF-8?q?=E9=A5=B0=E5=99=A8=E5=BC=82=E5=B8=B8=E5=A4=84=E7=90=86=E5=A2=9E?=
=?UTF-8?q?=E5=8A=A0logger=E6=89=93=E5=8D=B0=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../module_admin/annotation/log_annotation.py | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/ruoyi-fastapi-backend/module_admin/annotation/log_annotation.py b/ruoyi-fastapi-backend/module_admin/annotation/log_annotation.py
index 1f3e220..952dfb8 100644
--- a/ruoyi-fastapi-backend/module_admin/annotation/log_annotation.py
+++ b/ruoyi-fastapi-backend/module_admin/annotation/log_annotation.py
@@ -16,6 +16,7 @@ from module_admin.service.login_service import LoginService
from config.enums import BusinessType
from config.env import AppConfig
from exceptions.exception import LoginException, ServiceException, ServiceWarning
+from utils.log_util import logger
from utils.response_util import ResponseUtil
@@ -116,13 +117,14 @@ class Log:
try:
# 调用原始函数
result = await func(*args, **kwargs)
- except LoginException as e:
+ except (LoginException, ServiceWarning) as e:
+ logger.warning(e.message)
result = ResponseUtil.failure(data=e.data, msg=e.message)
except ServiceException as e:
+ logger.error(e.message)
result = ResponseUtil.error(data=e.data, msg=e.message)
- except ServiceWarning as e:
- result = ResponseUtil.failure(data=e.data, msg=e.message)
except Exception as e:
+ logger.exception(e)
result = ResponseUtil.error(msg=str(e))
# 获取请求耗时
cost_time = float(time.time() - start_time) * 100
@@ -295,13 +297,14 @@ def log_decorator(
try:
# 调用原始函数
result = await func(*args, **kwargs)
- except LoginException as e:
+ except (LoginException, ServiceWarning) as e:
+ logger.warning(e.message)
result = ResponseUtil.failure(data=e.data, msg=e.message)
except ServiceException as e:
+ logger.error(e.message)
result = ResponseUtil.error(data=e.data, msg=e.message)
- except ServiceWarning as e:
- result = ResponseUtil.failure(data=e.data, msg=e.message)
except Exception as e:
+ logger.exception(e)
result = ResponseUtil.error(msg=str(e))
# 获取请求耗时
cost_time = float(time.time() - start_time) * 100
--
Gitee
From 09380dc94f41efa19743ddacf0a26b686b138e51 Mon Sep 17 00:00:00 2001
From: insistence <3055204202@qq.com>
Date: Wed, 4 Sep 2024 09:02:13 +0800
Subject: [PATCH 4/6] =?UTF-8?q?chore:=20=E6=9B=B4=E6=96=B0pydantic-validat?=
=?UTF-8?q?ion-decorator=E7=89=88=E6=9C=AC=E4=B8=BA0.1.4=EF=BC=8C=E4=BF=AE?=
=?UTF-8?q?=E5=A4=8D=E4=BA=86=E4=B8=80=E4=BA=9B=E5=BA=95=E5=B1=82bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ruoyi-fastapi-backend/requirements.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ruoyi-fastapi-backend/requirements.txt b/ruoyi-fastapi-backend/requirements.txt
index 1a7fc30..3daf29e 100644
--- a/ruoyi-fastapi-backend/requirements.txt
+++ b/ruoyi-fastapi-backend/requirements.txt
@@ -8,7 +8,7 @@ pandas==2.2.2
passlib[bcrypt]==1.7.4
Pillow==10.4.0
psutil==6.0.0
-pydantic-validation-decorator==0.1.2
+pydantic-validation-decorator==0.1.4
PyJWT[crypto]==2.8.0
PyMySQL==1.1.1
redis==5.0.7
--
Gitee
From af89388294bd0091afd9209831c536dede1a4ceb Mon Sep 17 00:00:00 2001
From: insistence <3055204202@qq.com>
Date: Wed, 4 Sep 2024 09:07:34 +0800
Subject: [PATCH 5/6] =?UTF-8?q?chore:=20=E5=8D=87=E7=BA=A7=E7=89=88?=
=?UTF-8?q?=E6=9C=AC=E8=87=B31.3.3?=
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 0a1849e..311ac45 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.3.2'
+APP_VERSION= '1.3.3'
# 应用是否开启热重载
APP_RELOAD = true
# 应用是否开启IP归属区域查询
diff --git a/ruoyi-fastapi-backend/.env.prod b/ruoyi-fastapi-backend/.env.prod
index de24b3e..68a04b6 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.3.2'
+APP_VERSION= '1.3.3'
# 应用是否开启热重载
APP_RELOAD = false
# 应用是否开启IP归属区域查询
diff --git a/ruoyi-fastapi-frontend/package.json b/ruoyi-fastapi-frontend/package.json
index ae463d2..0e5b014 100644
--- a/ruoyi-fastapi-frontend/package.json
+++ b/ruoyi-fastapi-frontend/package.json
@@ -1,6 +1,6 @@
{
"name": "vfadmin",
- "version": "1.3.2",
+ "version": "1.3.3",
"description": "vfadmin管理系统",
"author": "insistence",
"license": "MIT",
--
Gitee
From c750908c04b7c7e73edf7eef586000c70bcbb6bf Mon Sep 17 00:00:00 2001
From: insistence <3055204202@qq.com>
Date: Wed, 4 Sep 2024 09:07:42 +0800
Subject: [PATCH 6/6] =?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 ed227c6..d8a3076 100644
--- a/README.md
+++ b/README.md
@@ -1,12 +1,12 @@
-RuoYi-Vue3-FastAPI v1.3.2
+RuoYi-Vue3-FastAPI v1.3.3
基于RuoYi-Vue3+FastAPI前后端分离的快速开发框架
- 
+ 
--
Gitee