!13 Dash-FastAPI-Admin v1.0.7

Merge pull request !13 from insistence/develop

Author: insistence

README.md

@@ -1,11 +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 v1.0.6</h1>
+<h1 align="center" style="margin: 30px 0 30px; font-weight: bold;">Dash-FastAPI-Admin v1.0.7</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.6-brightgreen.svg"></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-v1.0.7-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 | 3.9-blue">
     <img src="https://img.shields.io/badge/MySQL-≥5.7-blue">
@@ -75,7 +76,11 @@ Dash-FastAPI-Admin是一套全部开源的快速开发平台，毫无保留给
         <td><img src="https://gitee.com/insistence2022/dash-fastapi-admin/raw/master/demo-pictures/%E7%BC%93%E5%AD%98%E7%9B%91%E6%8E%A7.png"/></td>
     </tr>
     <tr>
+        <td><img src="https://gitee.com/insistence2022/dash-fastapi-admin/raw/master/demo-pictures/%E7%BC%93%E5%AD%98%E5%88%97%E8%A1%A8.png"></td>
         <td><img src="https://gitee.com/insistence2022/dash-fastapi-admin/raw/master/demo-pictures/%E7%B3%BB%E7%BB%9F%E6%8E%A5%E5%8F%A3.png"></td>
+    </tr>
+    <tr>
+        <td><img src="https://gitee.com/insistence2022/dash-fastapi-admin/raw/master/demo-pictures/%E9%A6%96%E9%A1%B5.png"></td>
         <td><img src="https://gitee.com/insistence2022/dash-fastapi-admin/raw/master/demo-pictures/%E4%B8%AA%E4%BA%BA%E8%B5%84%E6%96%99.png"/></td>
     </tr>
 </table>

dash-fastapi-backend/app.py

@@ -71,6 +71,12 @@ async def auth_exception_handler(request: Request, exc: AuthException):
     return response_401(data=exc.data, message=exc.message)
 
 
+# 自定义权限检验异常
+@app.exception_handler(PermissionException)
+async def permission_exception_handler(request: Request, exc: PermissionException):
+    return response_403(data=exc.data, message=exc.message)
+
+
 @app.exception_handler(HTTPException)
 async def http_exception_handler(request: Request, exc: HTTPException):
     return JSONResponse(
@@ -97,4 +103,4 @@ async def http_exception_handler(request: Request, exc: HTTPException):
 app.include_router(commonController, prefix="/common", tags=['通用模块'])
 
 if __name__ == '__main__':
-    uvicorn.run(app='app:app', host="127.0.0.1", port=9099, reload=True)
+    uvicorn.run(app='app:app', host="0.0.0.0", port=9099, reload=True)

dash-fastapi-backend/caches/avatar/admin/admin_avatar.jpeg

@@ -1,9 +1,10 @@
 from sqlalchemy import create_engine
 from sqlalchemy.ext.declarative import declarative_base
 from sqlalchemy.orm import sessionmaker
+from urllib.parse import quote_plus
 from config.env import DataBaseConfig
 
-SQLALCHEMY_DATABASE_URL = f"mysql+pymysql://{DataBaseConfig.USERNAME}:{DataBaseConfig.PASSWORD}@" \
+SQLALCHEMY_DATABASE_URL = f"mysql+pymysql://{DataBaseConfig.USERNAME}:{quote_plus(DataBaseConfig.PASSWORD)}@" \
                           f"{DataBaseConfig.HOST}:{DataBaseConfig.PORT}/{DataBaseConfig.DB}"
 
 engine = create_engine(

dash-fastapi-backend/caches/avatar/admin_avatar.jpeg

@@ -39,3 +39,16 @@ class CachePathConfig:
     """
     PATH = os.path.join(os.path.abspath(os.getcwd()), 'caches')
     PATHSTR = 'caches'
+
+
+class RedisInitKeyConfig:
+    """
+    系统内置Redis键名
+    """
+    ACCESS_TOKEN = {'key': 'access_token', 'remark': '登录令牌信息'}
+    SYS_DICT = {'key': 'sys_dict', 'remark': '数据字典'}
+    SYS_CONFIG = {'key': 'sys_config', 'remark': '配置信息'}
+    CAPTCHA_CODES = {'key': 'captcha_codes', 'remark': '图片验证码'}
+    ACCOUNT_LOCK = {'key': 'account_lock', 'remark': '用户锁定'}
+    PASSWORD_ERROR_COUNT = {'key': 'password_error_count', 'remark': '密码错误次数'}
+    SMS_CODE = {'key': 'sms_code', 'remark': '短信验证码'}

dash-fastapi-backend/caches/avatar/ry_avatar.jpeg renamed to dash-fastapi-backend/caches/avatar/ry/ry_avatar.jpeg

@@ -8,9 +8,11 @@ class GetDataScope:
     """
     获取当前用户数据权限对应的查询sql语句
     """
-    def __init__(self, query_alias: Optional[str] = '', db_alias: Optional[str] = 'db'):
+    def __init__(self, query_alias: Optional[str] = '', db_alias: Optional[str] = 'db', user_alias: Optional[str] = 'user_id', dept_alias: Optional[str] = 'dept_id'):
         self.query_alias = query_alias
         self.db_alias = db_alias
+        self.user_alias = user_alias
+        self.dept_alias = dept_alias
 
     def __call__(self, current_user: CurrentUserInfoServiceResponse = Depends(get_current_user)):
         user_id = current_user.user.user_id
@@ -22,13 +24,13 @@ def __call__(self, current_user: CurrentUserInfoServiceResponse = Depends(get_cu
         if self.query_alias == '' or max_data_scope == 1 or user_id == 1:
             param_sql = '1 == 1'
         elif max_data_scope == 2:
-            param_sql = f'{self.query_alias}.dept_id.in_({self.db_alias}.query(SysRoleDept.dept_id).filter(SysRoleDept.role_id == {max_role_id}))'
+            param_sql = f"{self.query_alias}.{self.dept_alias}.in_({self.db_alias}.query(SysRoleDept.dept_id).filter(SysRoleDept.role_id == {max_role_id})) if hasattr({self.query_alias}, '{self.dept_alias}') else 1 == 1"
         elif max_data_scope == 3:
-            param_sql = f'{self.query_alias}.dept_id == {dept_id}'
+            param_sql = f"{self.query_alias}.{self.dept_alias} == {dept_id} if hasattr({self.query_alias}, '{self.dept_alias}') else 1 == 1"
         elif max_data_scope == 4:
-            param_sql = f'{self.query_alias}.dept_id.in_({self.db_alias}.query(SysDept.dept_id).filter(or_(SysDept.dept_id == {dept_id}, func.find_in_set({dept_id}, SysDept.ancestors))))'
+            param_sql = f"{self.query_alias}.{self.dept_alias}.in_({self.db_alias}.query(SysDept.dept_id).filter(or_(SysDept.dept_id == {dept_id}, func.find_in_set({dept_id}, SysDept.ancestors)))) if hasattr({self.query_alias}, '{self.dept_alias}') else 1 == 1"
         elif max_data_scope == 5:
-            param_sql = f'{self.query_alias}.user_id == {user_id}'
+            param_sql = f"{self.query_alias}.{self.user_alias} == {user_id} if hasattr({self.query_alias}, '{self.user_alias}') else 1 == 1"
         else:
             param_sql = '1 == 0'
 

dash-fastapi-backend/config/database.py

@@ -1,7 +1,7 @@
 from fastapi import Depends
 from module_admin.entity.vo.user_vo import CurrentUserInfoServiceResponse
 from module_admin.service.login_service import get_current_user
-from utils.response_util import AuthException
+from utils.response_util import PermissionException
 
 
 class CheckUserInterfaceAuth:
@@ -16,4 +16,4 @@ def __call__(self, current_user: CurrentUserInfoServiceResponse = Depends(get_cu
         user_auth_list.append('common')
         if self.perm_str in user_auth_list:
             return True
-        raise AuthException(data="", message="该用户无此接口权限")
+        raise PermissionException(data="", message="该用户无此接口权限")

dash-fastapi-backend/config/env.py

@@ -20,3 +20,75 @@ async def get_monitor_cache_info(request: Request):
     except Exception as e:
         logger.exception(e)
         return response_500(data="", message=str(e))
+
+
+@cacheController.post("/getNames", response_model=List[CacheInfoModel], dependencies=[Depends(CheckUserInterfaceAuth('monitor:cache:list'))])
+async def get_monitor_cache_name(request: Request):
+    try:
+        # 获取全量数据
+        cache_name_list_result = CacheService.get_cache_monitor_cache_name_services()
+        logger.info('获取成功')
+        return response_200(data=cache_name_list_result, message="获取成功")
+    except Exception as e:
+        logger.exception(e)
+        return response_500(data="", message=str(e))
+
+
+@cacheController.post("/getKeys/{cache_name}", response_model=List[str], dependencies=[Depends(CheckUserInterfaceAuth('monitor:cache:list'))])
+async def get_monitor_cache_key(request: Request, cache_name: str):
+    try:
+        # 获取全量数据
+        cache_key_list_result = await CacheService.get_cache_monitor_cache_key_services(request, cache_name)
+        logger.info('获取成功')
+        return response_200(data=cache_key_list_result, message="获取成功")
+    except Exception as e:
+        logger.exception(e)
+        return response_500(data="", message=str(e))
+
+
+@cacheController.post("/getValue/{cache_name}/{cache_key}", response_model=CacheInfoModel, dependencies=[Depends(CheckUserInterfaceAuth('monitor:cache:list'))])
+async def get_monitor_cache_value(request: Request, cache_name: str, cache_key: str):
+    try:
+        # 获取全量数据
+        cache_value_list_result = await CacheService.get_cache_monitor_cache_value_services(request, cache_name, cache_key)
+        logger.info('获取成功')
+        return response_200(data=cache_value_list_result, message="获取成功")
+    except Exception as e:
+        logger.exception(e)
+        return response_500(data="", message=str(e))
+
+
+@cacheController.post("/clearCacheName/{cache_name}", response_model=CrudCacheResponse, dependencies=[Depends(CheckUserInterfaceAuth('monitor:cache:list'))])
+async def clear_monitor_cache_name(request: Request, cache_name: str):
+    try:
+        clear_cache_name_result = await CacheService.clear_cache_monitor_cache_name_services(request, cache_name)
+        if clear_cache_name_result.is_success:
+            logger.info(clear_cache_name_result.message)
+            return response_200(data=clear_cache_name_result, message=clear_cache_name_result.message)
+    except Exception as e:
+        logger.exception(e)
+        return response_500(data="", message=str(e))
+
+
+@cacheController.post("/clearCacheKey/{cache_name}/{cache_key}", response_model=CrudCacheResponse, dependencies=[Depends(CheckUserInterfaceAuth('monitor:cache:list'))])
+async def clear_monitor_cache_key(request: Request, cache_name: str, cache_key: str):
+    try:
+        clear_cache_key_result = await CacheService.clear_cache_monitor_cache_key_services(request, cache_name, cache_key)
+        if clear_cache_key_result.is_success:
+            logger.info(clear_cache_key_result.message)
+            return response_200(data=clear_cache_key_result, message=clear_cache_key_result.message)
+    except Exception as e:
+        logger.exception(e)
+        return response_500(data="", message=str(e))
+
+
+@cacheController.post("/clearCacheAll", response_model=CrudCacheResponse, dependencies=[Depends(CheckUserInterfaceAuth('monitor:cache:list'))])
+async def clear_monitor_cache_all(request: Request):
+    try:
+        clear_cache_all_result = await CacheService.clear_cache_monitor_all_services(request)
+        if clear_cache_all_result.is_success:
+            logger.info(clear_cache_all_result.message)
+            return response_200(data=clear_cache_all_result, message=clear_cache_all_result.message)
+    except Exception as e:
+        logger.exception(e)
+        return response_500(data="", message=str(e))