!8 Dash-FastAPI-Admin v1.0.4

Merge pull request !8 from insistence/develop

Author: insistence

README.md

@@ -1,12 +1,14 @@
 <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;">Dash-FastAPI-Admin v1.0.2</h1>
+<h1 align="center" style="margin: 30px 0 30px; font-weight: bold;">Dash-FastAPI-Admin v1.0.4</h1>
 <h4 align="center">基于Dash+FastAPI前后端分离的纯Python快速开发框架</h4>
 <p align="center">
 	<a href="https://gitee.com/insistence2022/dash-fastapi-admin/stargazers"><img src="https://gitee.com/insistence2022/dash-fastapi-admin/badge/star.svg?theme=dark"></a>
-	<a href="https://gitee.com/insistence2022/dash-fastapi-admin"><img src="https://img.shields.io/badge/DashFastAPIAdmin-v1.0.2-brightgreen.svg"></a>
+	<a href="https://gitee.com/insistence2022/dash-fastapi-admin"><img src="https://img.shields.io/badge/DashFastAPIAdmin-v1.0.4-brightgreen.svg"></a>
 	<a href="https://gitee.com/insistence2022/dash-fastapi-admin/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">
 </p>
 
 ## 平台简介
@@ -85,7 +87,7 @@ Dash-FastAPI-Admin是一套全部开源的快速开发平台，毫无保留给
 git clone https://gitee.com/insistence2022/dash-fastapi-admin.git
 
 # 进入项目根目录
-cd Dash-FastAPI-Admin
+cd dash-fastapi-admin
 
 # 安装项目依赖环境
 pip3 install -r requirements.txt

dash-fastapi-backend/module_admin/controller/login_controller.py

@@ -47,8 +47,8 @@ async def login(request: Request, form_data: CustomOAuth2PasswordRequestForm = D
         await request.app.state.redis.set(f'access_token:{session_id}', access_token,
                                           ex=timedelta(minutes=JwtConfig.REDIS_TOKEN_EXPIRE_MINUTES))
         # 此方法可实现同一账号同一时间只能登录一次
-        # await request.app.state.redis.set(f'{result.user_id}_access_token', access_token, ex=timedelta(minutes=30))
-        # await request.app.state.redis.set(f'{result.user_id}_session_id', session_id, ex=timedelta(minutes=30))
+        # await request.app.state.redis.set(f'access_token:{result[0].user_id}', access_token,
+        #                                   ex=timedelta(minutes=JwtConfig.REDIS_TOKEN_EXPIRE_MINUTES))
         logger.info('登录成功')
         # 判断请求是否来自于api文档，如果是返回指定格式的结果，用于修复api文档认证成功后token显示undefined的bug
         request_from_swagger = request.headers.get('referer').endswith('docs') if request.headers.get('referer') else False

dash-fastapi-backend/module_admin/service/login_service.py

@@ -75,15 +75,12 @@ async def get_current_user(request: Request = Request, token: str = Depends(oaut
         raise AuthException(data="", message="用户token不合法")
     redis_token = await request.app.state.redis.get(f'access_token:{session_id}')
     # 此方法可实现同一账号同一时间只能登录一次
-    # redis_token = await request.app.state.redis.get(f'{user.user_basic_info[0].user_id}_access_token')
-    # redis_session = await request.app.state.redis.get(f'{user.user_basic_info[0].user_id}_session_id')
+    # redis_token = await request.app.state.redis.get(f'access_token:{user.user_basic_info[0].user_id}')
     if token == redis_token:
         await request.app.state.redis.set(f'access_token:{session_id}', redis_token,
                                           ex=timedelta(minutes=JwtConfig.REDIS_TOKEN_EXPIRE_MINUTES))
-        # await request.app.state.redis.set(f'{user.user_basic_info[0].user_id}_access_token', redis_token,
-        #                                   ex=timedelta(minutes=30))
-        # await request.app.state.redis.set(f'{user.user_basic_info[0].user_id}_session_id', redis_session,
-        #                                   ex=timedelta(minutes=30))
+        # await request.app.state.redis.set(f'access_token:{user.user_basic_info[0].user_id}', redis_token,
+        #                                   ex=timedelta(minutes=JwtConfig.REDIS_TOKEN_EXPIRE_MINUTES))
 
         return CurrentUserInfoServiceResponse(
             user=user.user_basic_info[0],

dash-fastapi-backend/sql/dash-fastapi.sql

@@ -260,9 +260,9 @@ CREATE TABLE `sys_job`  (
 -- ----------------------------
 -- Records of sys_job
 -- ----------------------------
-INSERT INTO `sys_job` VALUES (1, '系统默认（无参）', 'default', 'default', 'module_task.scheduler_test.job', 'test', NULL, '0/10 * * * * ?', '2', '0', '1', 'admin', '2023-05-23 16:13:34', 'admin', '2023-05-23 16:13:34', '');
-INSERT INTO `sys_job` VALUES (2, '系统默认（有参）', 'sqlalchemy', 'default', 'module_task.scheduler_test.job', 'new', '{\"test\": 111}', '0/15 * * * * ?', '1', '1', '1', 'admin', '2023-05-23 16:13:34', 'admin', '2023-05-23 16:13:34', '');
-INSERT INTO `sys_job` VALUES (3, '系统默认（多参）', 'redis', 'default', 'module_task.scheduler_test.job', NULL, NULL, '0/20 * * * * ?', '3', '1', '1', 'admin', '2023-05-23 16:13:34', '', NULL, '');
+INSERT INTO `sys_job` VALUES (1, '系统默认（无参）', 'default', 'default', 'module_task.scheduler_test.job', 'test', NULL, '0/10 * * * * *', '2', '0', '1', 'admin', '2023-05-23 16:13:34', 'admin', '2023-05-23 16:13:34', '');
+INSERT INTO `sys_job` VALUES (2, '系统默认（有参）', 'sqlalchemy', 'default', 'module_task.scheduler_test.job', 'new', '{\"test\": 111}', '0/15 * * * * *', '1', '1', '1', 'admin', '2023-05-23 16:13:34', 'admin', '2023-05-23 16:13:34', '');
+INSERT INTO `sys_job` VALUES (3, '系统默认（多参）', 'redis', 'default', 'module_task.scheduler_test.job', NULL, NULL, '0/20 * * * * *', '3', '1', '1', 'admin', '2023-05-23 16:13:34', '', NULL, '');
 
 -- ----------------------------
 -- Table structure for sys_job_log

dash-fastapi-backend/utils/common_util.py

@@ -5,6 +5,7 @@
 from openpyxl.styles import Alignment, PatternFill
 from openpyxl.utils import get_column_letter
 from openpyxl.worksheet.datavalidation import DataValidation
+from typing import List
 from config.env import CachePathConfig
 
 
@@ -59,7 +60,7 @@ def bytes2file_response(bytes_info):
     yield bytes_info
 
 
-def export_list2excel(list_data: list):
+def export_list2excel(list_data: List):
     """
     工具方法：将需要导出的list数据转化为对应excel的二进制数据
     :param list_data: 数据列表
@@ -73,7 +74,7 @@ def export_list2excel(list_data: list):
     return binary_data
 
 
-def get_excel_template(header_list: list, selector_header_list: list, option_list: list[dict]):
+def get_excel_template(header_list: List, selector_header_list: List, option_list: List[dict]):
     """
     工具方法：将需要导出的list数据转化为对应excel的二进制数据
     :param header_list: 表头数据列表

dash-fastapi-frontend/callbacks/monitor_c/logininfor_c.py

@@ -171,7 +171,7 @@ def login_log_delete_modal(operation_click, selected_row_keys):
             info_ids = ','.join(selected_row_keys)
 
             return [
-                f'是否确认删除访问编号为{info_ids}的操作日志？',
+                f'是否确认删除访问编号为{info_ids}的登录日志？',
                 True,
                 {'oper_type': 'delete', 'info_ids': info_ids}
             ]

dash-fastapi-frontend/views/__init__.py

@@ -1,5 +1,6 @@
 from . import (
     layout,
+    dashboard,
     system,
     monitor,
     tool,

dash-fastapi-frontend/views/dashboard/__init__.py

@@ -0,0 +1,8 @@
+from .components import page_top, page_bottom
+
+
+def render_dashboard():
+    return [
+        page_top.render_page_top(),
+        page_bottom.render_page_bottom()
+    ]