!31 Dash-FastAPI-Admin v2.1.0

Merge pull request !31 from insistence/develop

Author: insistence

README.md

@@ -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;">Dash-FastAPI-Admin v2.0.1</h1>
+<h1 align="center" style="margin: 30px 0 30px; font-weight: bold;">Dash-FastAPI-Admin v2.1.0</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://github.com/insistence/Dash-FastAPI-Admin"><img src="https://img.shields.io/github/stars/insistence/Dash-FastAPI-Admin?style=social"></a>
-	<a href="https://gitee.com/insistence2022/dash-fastapi-admin"><img src="https://img.shields.io/badge/DashFastAPIAdmin-v2.0.1-brightgreen.svg"></a>
+	<a href="https://gitee.com/insistence2022/dash-fastapi-admin"><img src="https://img.shields.io/badge/DashFastAPIAdmin-v2.1.0-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.9-blue">
     <img src="https://img.shields.io/badge/MySQL-≥5.7-blue">
@@ -17,7 +17,7 @@
 Dash-FastAPI-Admin是一套全部开源的快速开发平台，毫无保留给个人及企业免费使用。
 
 * 前端采用Dash、feffery-antd-components、feffery-utils-components。
-* 后端采用FastAPI、sqlalchemy、MySQL、Redis、OAuth2 & Jwt。
+* 后端采用FastAPI、sqlalchemy、MySQL（PostgreSQL）、Redis、OAuth2 & Jwt。
 * 权限认证使用OAuth2 & Jwt，支持多终端认证系统。
 * 支持加载动态权限菜单，多方式轻松权限控制。
 * Vue2版本：
@@ -105,8 +105,10 @@ git clone https://gitee.com/insistence2022/dash-fastapi-admin.git
 # 进入项目根目录
 cd dash-fastapi-admin
 
-# 安装项目依赖环境
+# 如果使用的是MySQL数据库，请执行以下命令安装项目依赖环境
 pip3 install -r requirements.txt
+# 如果使用的是PostgreSQL数据库，请执行以下命令安装项目依赖环境
+pip3 install -r requirements-pg.txt
 ```
 
 ### 开发
@@ -134,7 +136,7 @@ cd dash-fastapi-backend
 
 # 运行sql文件
 1.新建数据库dash-fastapi(默认，可修改)
-2.使用命令或数据库连接工具运行sql文件夹下的dash-fastapi.sql
+2.如果使用的是MySQL数据库，使用命令或数据库连接工具运行sql文件夹下的dash-fastapi.sql；如果使用的是PostgreSQL数据库，使用命令或数据库连接工具运行sql文件夹下的dash-fastapi-pg.sql
 
 # 运行后端
 python3 app.py --env=dev
@@ -193,7 +195,7 @@ cd dash-fastapi-backend
 
 # 运行sql文件
 1.新建数据库dash-fastapi(默认，可修改)
-2.使用命令或数据库连接工具运行sql文件夹下的dash-fastapi.sql
+2.如果使用的是MySQL数据库，使用命令或数据库连接工具运行sql文件夹下的dash-fastapi.sql；如果使用的是PostgreSQL数据库，使用命令或数据库连接工具运行sql文件夹下的dash-fastapi-pg.sql
 
 # 运行后端
 python3 app.py --env=prod
@@ -213,14 +215,14 @@ python3 app.py --env=prod
 如果有对本项目及FastAPI感兴趣的朋友，欢迎加入知识星球一起交流学习，让我们一起变得更强。如果你觉得这个项目帮助到了你，你可以请作者喝杯咖啡表示鼓励☕。扫描下面微信二维码添加微信备注DF-Admin即可进群，也欢迎大家加入dash大神费弗里的知识星球学习更多dash开发知识。
 <table>
     <tr>
-        <td><img alt="zanzhu_wx" src="https://gitee.com/insistence2022/dash-fastapi-admin/raw/master/demo-pictures/zanzhu_wx.jpg"></td>
-        <td><img alt="zanzhu_zfb" src="https://gitee.com/insistence2022/dash-fastapi-admin/raw/master/demo-pictures/zanzhu_zfb.jpg"></td>
+        <td style="width: 50%"><img alt="zanzhu_wx" src="https://gitee.com/insistence2022/dash-fastapi-admin/raw/master/demo-pictures/zanzhu_wx.jpg"></td>
+        <td style="width: 50%"><img alt="zanzhu_zfb" src="https://gitee.com/insistence2022/dash-fastapi-admin/raw/master/demo-pictures/zanzhu_zfb.jpg"></td>
     </tr>
     <tr>
-        <td><img alt="zsxq" src="https://gitee.com/insistence2022/dash-fastapi-admin/raw/master/demo-pictures/zsxq.jpg"></td>
-        <td><img alt="dashzsxq" src="https://gitee.com/insistence2022/dash-fastapi-admin/raw/master/demo-pictures/dashzsxq.jpg"></td>
+        <td style="width: 50%"><img alt="zsxq" src="https://gitee.com/insistence2022/dash-fastapi-admin/raw/master/demo-pictures/zsxq.jpg"></td>
+        <td style="width: 50%"><img alt="dashzsxq" src="https://gitee.com/insistence2022/dash-fastapi-admin/raw/master/demo-pictures/dashzsxq.jpg"></td>
     </tr>
     <tr>
-        <td><img alt="wxcode" src="https://gitee.com/insistence2022/dash-fastapi-admin/raw/master/demo-pictures/wxcode.jpg"></td>
+        <td style="width: 50%"><img alt="wxcode" src="https://gitee.com/insistence2022/dash-fastapi-admin/raw/master/demo-pictures/wxcode.jpg"></td>
     </tr>
 </table>

dash-fastapi-backend/.env.dev

@@ -10,7 +10,7 @@ APP_HOST = '0.0.0.0'
 # 应用端口
 APP_PORT = 9099
 # 应用版本
-APP_VERSION= '2.0.1'
+APP_VERSION= '2.1.0'
 # 应用是否开启热重载
 APP_RELOAD = true
 # 应用是否开启IP归属区域查询
@@ -30,6 +30,8 @@ JWT_REDIS_EXPIRE_MINUTES = 30
 
 
 # -------- 数据库配置 --------
+# 数据库类型，可选的有'mysql'、'postgresql'，默认为'mysql'
+DB_TYPE = 'mysql'
 # 数据库主机
 DB_HOST = '127.0.0.1'
 # 数据库端口

dash-fastapi-backend/.env.prod

@@ -10,7 +10,7 @@ APP_HOST = '0.0.0.0'
 # 应用端口
 APP_PORT = 9099
 # 应用版本
-APP_VERSION= '2.0.1'
+APP_VERSION= '2.1.0'
 # 应用是否开启热重载
 APP_RELOAD = false
 # 应用是否开启IP归属区域查询
@@ -30,6 +30,8 @@ JWT_REDIS_EXPIRE_MINUTES = 30
 
 
 # -------- 数据库配置 --------
+# 数据库类型，可选的有'mysql'、'postgresql'，默认为'mysql'
+DB_TYPE = 'mysql'
 # 数据库主机
 DB_HOST = '127.0.0.1'
 # 数据库端口

dash-fastapi-backend/config/database.py

@@ -9,6 +9,11 @@
     f'mysql+asyncmy://{DataBaseConfig.db_username}:{quote_plus(DataBaseConfig.db_password)}@'
     f'{DataBaseConfig.db_host}:{DataBaseConfig.db_port}/{DataBaseConfig.db_database}'
 )
+if DataBaseConfig.db_type == 'postgresql':
+    ASYNC_SQLALCHEMY_DATABASE_URL = (
+        f'postgresql+asyncpg://{DataBaseConfig.db_username}:{quote_plus(DataBaseConfig.db_password)}@'
+        f'{DataBaseConfig.db_host}:{DataBaseConfig.db_port}/{DataBaseConfig.db_database}'
+    )
 
 async_engine = create_async_engine(
     ASYNC_SQLALCHEMY_DATABASE_URL,

dash-fastapi-backend/config/env.py

@@ -4,6 +4,7 @@
 from dotenv import load_dotenv
 from functools import lru_cache
 from pydantic_settings import BaseSettings
+from typing import Literal
 
 
 class AppSettings(BaseSettings):
@@ -38,6 +39,7 @@ class DataBaseSettings(BaseSettings):
     数据库配置
     """
 
+    db_type: Literal['mysql', 'postgresql'] = 'mysql'
     db_host: str = '127.0.0.1'
     db_port: int = 3306
     db_username: str = 'root'

dash-fastapi-backend/config/get_scheduler.py

@@ -82,6 +82,11 @@ def __find_recent_workday(cls, day: int):
     f'mysql+pymysql://{DataBaseConfig.db_username}:{quote_plus(DataBaseConfig.db_password)}@'
     f'{DataBaseConfig.db_host}:{DataBaseConfig.db_port}/{DataBaseConfig.db_database}'
 )
+if DataBaseConfig.db_type == 'postgresql':
+    SQLALCHEMY_DATABASE_URL = (
+        f'postgresql+psycopg2://{DataBaseConfig.db_username}:{quote_plus(DataBaseConfig.db_password)}@'
+        f'{DataBaseConfig.db_host}:{DataBaseConfig.db_port}/{DataBaseConfig.db_database}'
+    )
 engine = create_engine(
     SQLALCHEMY_DATABASE_URL,
     echo=DataBaseConfig.db_echo,

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

@@ -2,7 +2,7 @@
 from datetime import datetime
 from fastapi import APIRouter, Depends, File, Form, Query, Request, UploadFile
 from sqlalchemy.ext.asyncio import AsyncSession
-from typing import Optional, Union
+from typing import Literal, Optional, Union
 from pydantic_validation_decorator import ValidateFields
 from config.get_db import get_db
 from config.env import UploadConfig
@@ -220,7 +220,7 @@ async def query_detail_system_user_profile(
 )
 async def query_detail_system_user(
     request: Request,
-    user_id: Optional[Union[int, str]] = '',
+    user_id: Optional[Union[int, Literal['']]] = '',
     query_db: AsyncSession = Depends(get_db),
     current_user: CurrentUserModel = Depends(LoginService.get_current_user),
     data_scope_sql: str = Depends(GetDataScope('SysUser')),

dash-fastapi-backend/module_admin/dao/config_dao.py

@@ -71,6 +71,7 @@ async def get_config_list(cls, db: AsyncSession, query_object: ConfigPageQueryMo
                 if query_object.begin_time and query_object.end_time
                 else True,
             )
+            .order_by(SysConfig.config_id)
             .distinct()
         )
         config_list = await PageUtil.paginate(db, query, query_object.page_num, query_object.page_size, is_page)

dash-fastapi-backend/module_admin/dao/dict_dao.py

@@ -84,6 +84,7 @@ async def get_dict_type_list(cls, db: AsyncSession, query_object: DictTypePageQu
                 if query_object.begin_time and query_object.end_time
                 else True,
             )
+            .order_by(SysDictType.dict_id)
             .distinct()
         )
         dict_type_list = await PageUtil.paginate(db, query, query_object.page_num, query_object.page_size, is_page)

dash-fastapi-backend/module_admin/dao/job_dao.py

@@ -69,6 +69,7 @@ async def get_job_list(cls, db: AsyncSession, query_object: JobPageQueryModel, i
                 SysJob.job_group == query_object.job_group if query_object.job_group else True,
                 SysJob.status == query_object.status if query_object.status else True,
             )
+            .order_by(SysJob.job_id)
             .distinct()
         )
         job_list = await PageUtil.paginate(db, query, query_object.page_num, query_object.page_size, is_page)