From aefb93b39900e4099e22cb378e203a2000a06eee Mon Sep 17 00:00:00 2001
From: zy7y <13271962515@163.com>
Date: Sun, 18 Sep 2022 15:01:20 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E8=8F=9C=E5=8D=95=E6=A0=91=E7=BC=BA?=
 =?UTF-8?q?=E5=B0=91=E6=A0=B9=E8=8A=82=E7=82=B9=E5=BC=82=E5=B8=B8=E5=A4=84?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/controller/role.py |  16 +-
 backend/controller/user.py |  11 +-
 backend/core/security.py   |   4 +-
 backend/dbhelper/menu.py   |  12 --
 backend/mini.db            | Bin 0 -> 69632 bytes
 backend/router/url.py      |  21 +-
 backend/schemas/menu.py    |   2 +-
 backend/tests/test_case.py | 393 ++++++++++++++++++-------------------
 8 files changed, 232 insertions(+), 227 deletions(-)
 create mode 100644 backend/mini.db

diff --git a/backend/controller/role.py b/backend/controller/role.py
index 5084400..0dea596 100644
--- a/backend/controller/role.py
+++ b/backend/controller/role.py
@@ -4,8 +4,14 @@ from fastapi import Query
 
 from core.utils import list_to_tree
 from dbhelper.menu import get_menu
-from dbhelper.role import (del_role, get_role, get_role_menus, get_roles,
-                           new_role, put_role)
+from dbhelper.role import (
+    del_role,
+    get_role,
+    get_role_menus,
+    get_roles,
+    new_role,
+    put_role,
+)
 from schemas import ListAll, Response, RoleIn, RoleInfo, RoleQuery, RoleRead
 
 
@@ -22,7 +28,11 @@ async def role_has_menu(rid: int):
     menus = await get_role_menus(rid)
     for obj in menus:
         obj["meta"] = json.loads(obj["meta"]) if obj["meta"] is not None else None
-    return Response(data=list_to_tree(menus))
+    try:
+        result = list_to_tree(menus)
+    except KeyError:
+        return Response(code=400, msg="菜单缺少根节点.")
+    return Response(data=result)
 
 
 async def role_arr(
diff --git a/backend/controller/user.py b/backend/controller/user.py
index 7283737..5f0ca22 100644
--- a/backend/controller/user.py
+++ b/backend/controller/user.py
@@ -2,8 +2,15 @@ from fastapi import Depends, Query
 from starlette.requests import Request
 
 from core.security import check_token, get_password_hash
-from dbhelper.user import (del_user, get_user, get_user_info, get_users,
-                           insert_user, put_user, select_role)
+from dbhelper.user import (
+    del_user,
+    get_user,
+    get_user_info,
+    get_users,
+    insert_user,
+    put_user,
+    select_role,
+)
 from schemas import Response, UserAdd, UserInfo, UserPut, UserQuery, UserRead
 from schemas.common import ListAll
 
diff --git a/backend/core/security.py b/backend/core/security.py
index 8492817..a8cd394 100644
--- a/backend/core/security.py
+++ b/backend/core/security.py
@@ -7,7 +7,7 @@ from jose import JWTError, jwt
 from passlib.context import CryptContext
 
 from core.exceptions import PermissionsError, TokenAuthFailure
-from dbhelper.menu import get_apis, get_has_api
+from dbhelper.menu import get_apis
 from dbhelper.user import get_user, get_user_info
 from models import UserModel
 
@@ -79,8 +79,6 @@ async def check_permissions(request: Request, user: UserModel = Depends(check_to
     api = request.url.path
     for k, v in request.path_params.items():
         api = api.replace(v, "{%s}" % k)
-    #  方法1. 每一次去查数据库
-    # result = await get_has_api(active_rid, api, request.method)
 
     # 2. 登录之后查一次 后面去结果查 todo 更新权限时需要更新 , 最好结果放redis
     cache_key = f"{user.username}_{active_rid}"
diff --git a/backend/dbhelper/menu.py b/backend/dbhelper/menu.py
index 5369052..952d8cd 100644
--- a/backend/dbhelper/menu.py
+++ b/backend/dbhelper/menu.py
@@ -49,18 +49,6 @@ async def del_menu(mid: int):
     return await MenuModel.filter(id=mid).update(status=9)
 
 
-async def get_has_api(pk: int, api: str, method: str):
-    """获取角色接口权限 每次来查数据库"""
-    db = connections.get("default")
-    return await db.execute_query_dict(
-        """
-        select m.api, m.method
-        FROM sys_menu as m, sys_role_menu as srm WHERE m.id = srm.mid
-        AND srm.rid = (?) and m.api = (?) and m.method = (?) and m.status != 9""",
-        [pk, api, method],
-    )
-
-
 async def get_apis(pk: int):
     """返回当前角色拥有的接口权限列表"""
     db = connections.get("default")
diff --git a/backend/mini.db b/backend/mini.db
new file mode 100644
index 0000000000000000000000000000000000000000..0ce5d528ea2d6810e27e089d3d91d4e81db83f47
GIT binary patch
literal 69632
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
U++G+Q7Z&s-xV<qrE-dAL0mF8qH2?qr

literal 0
HcmV?d00001

diff --git a/backend/router/url.py b/backend/router/url.py
index c168e7c..9f6b037 100644
--- a/backend/router/url.py
+++ b/backend/router/url.py
@@ -4,10 +4,23 @@ from fastapi import Depends, routing
 
 from controller.common import login, websocket
 from controller.menu import menu_add, menu_arr, menu_del, menu_put
-from controller.role import (role_add, role_arr, role_del, role_has_menu,
-                             role_put, role_query)
-from controller.user import (user_add, user_arr, user_del, user_info,
-                             user_list, user_put, user_select_role)
+from controller.role import (
+    role_add,
+    role_arr,
+    role_del,
+    role_has_menu,
+    role_put,
+    role_query,
+)
+from controller.user import (
+    user_add,
+    user_arr,
+    user_del,
+    user_info,
+    user_list,
+    user_put,
+    user_select_role,
+)
 from core.security import check_permissions
 
 
diff --git a/backend/schemas/menu.py b/backend/schemas/menu.py
index f8dcb58..0f43829 100644
--- a/backend/schemas/menu.py
+++ b/backend/schemas/menu.py
@@ -9,7 +9,7 @@ class MenuBasic(BaseModel):
     name: str
     meta: dict = Field(default=None, description="元信息")
     path: Optional[str] = Field(default=None, description="前端路由地址")
-    type: int = Field(description="0 目录 1 组件 2 按钮")
+    type: int = Field(description="0 目录 1 组件 2 按钮 3数据")
     component: Optional[str] = Field(default=None, description="前端组件地址")
     pid: int = Field(default=0, description="0 表示没有根节点")
     identifier: Optional[str] = Field(default=None, description="权限标识符 -> 按钮显示")
diff --git a/backend/tests/test_case.py b/backend/tests/test_case.py
index d73701a..359fb31 100644
--- a/backend/tests/test_case.py
+++ b/backend/tests/test_case.py
@@ -8,8 +8,8 @@ from schemas.user import RoleActive, UserAdd
 
 base = "http://localhost:8000"
 
-params = [
-    # 创建菜单
+
+dirs = [
     (
         "/menu",
         MenuIn(  # id 1
@@ -38,267 +38,256 @@ params = [
             method=None,
         ).dict(),
     ),
-    # 组件
+]
+
+
+@pytest.mark.parametrize("path, data", dirs)
+def test_add_dir(path, data):
+    """添加一级目录"""
+    res = client.post(url=base + path, json=data)
+    logger.info(res.json())
+    assert res.status_code == 200
+
+
+menus = [
     (
         "/menu",
         MenuIn(  # id 3
             name="用户管理",
-            meta={"icon": "TeamOutlined"},
+            meta={"icon": "TeamOutlined", "title": "用户管理"},
             path="/system/user",
             type=1,
             component="/system/user/user.vue",
             pid=1,
-            identifier=None,
-            api="/user",
-            method="GET",
         ).dict(),
     ),
     (
         "/menu",
         MenuIn(  # id 4
             name="角色管理",
-            meta={"icon": "UserOutlined"},
+            meta={"icon": "UserOutlined", "title": "角色管理"},
             path="/system/role",
             type=1,
             component="/system/role/role.vue",
             pid=1,
-            identifier=None,
-            api="/role",
-            method="GET",
         ).dict(),
     ),
     (
         "/menu",
         MenuIn(  # id 5
             name="菜单管理",
-            meta={"icon": "MenuOutlined"},
+            meta={"icon": "MenuOutlined", "title": "菜单管理"},
             path="/system/menu",
             type=1,
             component="/system/menu/menu.vue",
             pid=1,
-            identifier=None,
-            api="/menu",
-            method="GET",
         ).dict(),
     ),
     (
         "/menu",
         MenuIn(  # id 6
             name="关于",
-            meta={"icon": "DashboardOutlined"},
+            meta={"icon": "DashboardOutlined", "title": "关于"},
             path="/setting/about",
             type=1,
             component="/setting/about/about.vue",
             pid=2,
-            identifier=None,
-        ).dict(),
-    ),
-    # 按钮
-    (
-        "/menu",
-        MenuIn(
-            name="用户新增",
-            meta={"icon": "Add"},
-            path=None,
-            type=2,
-            component=None,
-            pid=3,
-            identifier="user:create",
-            api="/user",
-            method="POST",
-        ).dict(),
-    ),
-    (
-        "/menu",
-        MenuIn(
-            name="用户删除",
-            meta={"icon": "Delete"},
-            path=None,
-            type=2,
-            component=None,
-            pid=3,
-            identifier="user:delete",
-            api="/user/{pk}",
-            method="DELETE",
-        ).dict(),
-    ),
-    (
-        "/menu",
-        MenuIn(
-            name="用户更新",
-            meta={"icon": "Update"},
-            path=None,
-            type=2,
-            component=None,
-            pid=3,
-            identifier="user:update",
-            api="/user/{pk}",
-            method="PUT",
-        ).dict(),
-    ),
-    (
-        "/menu",
-        MenuIn(
-            name="用户详情",
-            meta={"icon": "Info"},
-            path=None,
-            type=2,
-            component=None,
-            pid=3,
-            identifier="user:get",
-            api="/user/{pk}",
-            method="GET",
-        ).dict(),
-    ),
-    (
-        "/menu",
-        MenuIn(
-            name="用户查询",
-            meta={"icon": "Search"},
-            path=None,
-            type=2,
-            component=None,
-            pid=3,
-            identifier="user:query",
-            api="/user/query",
-            method="POST",
-        ).dict(),
-    ),
-    # 角色管理
-    (
-        "/menu",
-        MenuIn(
-            name="角色新增",
-            meta={"icon": "Add"},
-            path=None,
-            type=2,
-            component=None,
-            pid=4,
-            identifier="role:create",
-            api="/role",
-            method="POST",
-        ).dict(),
-    ),
-    (
-        "/menu",
-        MenuIn(
-            name="角色删除",
-            meta={"icon": "Delete"},
-            path=None,
-            type=2,
-            component=None,
-            pid=4,
-            identifier="role:delete",
-            api="/role/{pk}",
-            method="DELETE",
-        ).dict(),
-    ),
-    (
-        "/menu",
-        MenuIn(
-            name="查询角色拥有权限",
-            meta={"icon": "Delete"},
-            path=None,
-            type=2,
-            component=None,
-            pid=4,
-            identifier=None,
-            api="/role/{rid}/menu",
-            method="GET",
-        ).dict(),
-    ),
-    (
-        "/menu",
-        MenuIn(
-            name="查询角色",
-            meta={"icon": "Search"},
-            path=None,
-            type=2,
-            component=None,
-            pid=4,
-            identifier="role:query",
-            api="/role/query",
-            method="POST",
-        ).dict(),
-    ),
-    (
-        "/menu",
-        MenuIn(
-            name="更新角色",
-            meta={"icon": "Update"},
-            path=None,
-            type=2,
-            component=None,
-            pid=4,
-            identifier="role:update",
-            api="/role/{pk}",
-            method="PUT",
-        ).dict(),
-    ),
-    # 菜单管理的权限
-    (
-        "/menu",
-        MenuIn(
-            name="新增菜单",
-            meta={"icon": "Update"},
-            path=None,
-            type=2,
-            component=None,
-            pid=5,
-            identifier="menu:create",
-            api="/menu",
-            method="POST",
-        ).dict(),
-    ),
-    (
-        "/menu",
-        MenuIn(
-            name="删除菜单",
-            meta={"icon": "Delete"},
-            path=None,
-            type=2,
-            component=None,
-            pid=5,
-            identifier="menu:delete",
-            api="/menu/{pk}",
-            method="DELETE",
         ).dict(),
     ),
 ]
 
+
+@pytest.mark.parametrize("path,data", menus)
+def test_add_menu(path, data):
+    """添加二级菜单"""
+    res = client.post(url=base + path, json=data)
+    logger.info(res.json())
+    assert res.status_code == 200
+
+
+user_manager_pre = [
+    MenuIn(
+        name="用户详情",
+        type=3,
+        identifier="user:get",
+        api="/user/{pk}",
+        method="GET",
+    ),
+    MenuIn(
+        name="用户列表",
+        type=3,  # 数据类
+        api="/user",
+        method="GET",
+    ),
+    MenuIn(
+        name="用户查询",
+        type=2,
+        identifier="user:query",
+        api="/user/query",
+        method="POST",
+    ),
+    MenuIn(
+        name="用户新增",
+        type=2,
+        identifier="user:create",
+        api="/user",
+        method="POST",
+    ),
+    MenuIn(
+        name="用户删除",
+        type=2,
+        identifier="user:delete",
+        api="/user/{pk}",
+        method="DELETE",
+    ),
+    MenuIn(
+        name="用户更新",
+        type=2,
+        identifier="user:update",
+        api="/user/{pk}",
+        method="PUT",
+    ),
+]
+
+
+@pytest.mark.parametrize("data", user_manager_pre)
+def test_add_user_pre(data):
+    """用户管理相关权限"""
+    data.pid = 3
+    res = client.post(url=base + "/menu", json=data.dict())
+    logger.info(res.json())
+    assert res.status_code == 200
+
+
+role_manager_pre = [
+    MenuIn(
+        name="查询角色拥有权限",
+        type=3,
+        api="/role/{rid}/menu",
+        method="GET",
+    ),
+    MenuIn(
+        name="角色列表",
+        type=3,
+        api="/role",
+        method="GET",
+    ),
+    MenuIn(
+        name="角色查询",
+        meta={"icon": "Search"},
+        type=2,
+        identifier="role:query",
+        api="/role/query",
+        method="POST",
+    ),
+    MenuIn(
+        name="角色新增",
+        type=2,
+        identifier="role:create",
+        api="/role",
+        method="POST",
+    ),
+    MenuIn(
+        name="角色删除",
+        type=2,
+        identifier="role:delete",
+        api="/role/{pk}",
+        method="DELETE",
+    ),
+    MenuIn(
+        name="角色更新",
+        type=2,
+        identifier="role:update",
+        api="/role/{pk}",
+        method="PUT",
+    ),
+]
+
+
+@pytest.mark.parametrize("data", role_manager_pre)
+def test_add_role_pre(data):
+    """角色管理相关权限"""
+    logger.debug(data.dict())
+    data.pid = 4
+    res = client.post(url=base + "/menu", json=data.dict())
+    logger.info(res.json())
+    assert res.status_code == 200
+
+
+menu_manager_pre = [
+    MenuIn(
+        name="菜单列表",
+        type=3,
+        api="/menu",
+        method="GET",
+    ),
+    MenuIn(
+        name="菜单新增",
+        type=2,
+        identifier="menu:create",
+        api="/menu",
+        method="POST",
+    ),
+    MenuIn(
+        name="菜单更新",
+        type=2,
+        identifier="menu:update",
+        api="/menu/{pk}",
+        method="PUT",
+    ),
+    MenuIn(
+        name="菜单删除",
+        type=2,
+        identifier="menu:delete",
+        api="/menu/{pk}",
+        method="DELETE",
+    ),
+]
+
+
+@pytest.mark.parametrize("data", menu_manager_pre)
+def test_add_menu_pre(data):
+    """菜单管理相关权限"""
+    data.pid = 5
+    res = client.post(url=base + "/menu", json=data.dict())
+    logger.info(res.json())
+    assert res.status_code == 200
+
+
+menus_len = (
+    len(user_manager_pre)
+    + len(menus)
+    + len(dirs)
+    + len(role_manager_pre)
+    + len(menu_manager_pre)
+)
+
 datas = [
     (
         "/role",
         RoleIn(
-            name="super",
+            name="superStar",
             remark="全部权限",
-            menus=[num for num in range(1, len(params) + 1)],
-        ).dict(),
+            menus=[num for num in range(1, menus_len)],
+        ),
     ),
     # 创建用户
     (
         "/user",
         UserAdd(
             username="admin",
-            nickname="管理员",
+            nickname="666管理员",
             password="123456",
             roles=[RoleActive(rid=1, status=5)],
-        ).dict(),
+        ),
     ),
 ]
 
 
-@pytest.mark.parametrize("path, data", params)
-def test_add_data(path, data):
-    """注册菜单"""
-    res = client.post(url=base + path, json=data)
-    logger.info(res.json())
-    assert res.status_code == 200
-
-
 @pytest.mark.parametrize("path, data", datas)
 def test_add_user(path, data):
     """添加账号"""
-    res = client.post(url=base + path, json=data)
+    res = client.post(url=base + path, json=data.dict())
     logger.info(res.json())
+    logger.info(menus_len)
     assert res.status_code == 200