Release 2.5.10

api/v1/pages/app_manage/app_list.py

@@ -57,6 +57,11 @@
         'create':actions.CreateAction(
             path='/api/v1/tenant/{tenant_id}/apps/'
         ),
+        "order_name":actions.OrderSetAction(
+            path='/api/v1/tenant/{tenant_id}/apps/',
+            method=actions.FrontActionMethod.GET,
+            order_parms=["name"]
+        )
     },
     node_actions=[
         actions.DirectAction(

api/v1/pages/auth_manage/auth_factor.py

@@ -28,6 +28,11 @@
     global_actions={
         'create': actions.CreateAction(
             path='/api/v1/tenant/{tenant_id}/auth_factors/',
+        ),
+        "order_name":actions.OrderSetAction(
+            path='/api/v1/tenant/{tenant_id}/auth_factors/',
+            method=actions.FrontActionMethod.GET,
+            order_parms=["name"]
         )
     },
     local_actions={

api/v1/pages/auth_manage/auth_rules.py

@@ -28,7 +28,7 @@
     global_actions={
         'create': actions.CreateAction(
             path='/api/v1/tenant/{tenant_id}/auth_rules/',
-        )
+        ),
     },
     local_actions={
         "edit": actions.EditAction(

api/v1/pages/desktop/mine_app_group_list.py

@@ -42,6 +42,14 @@
         actions.DirectAction(
             path='/api/v1/tenant/{tenant_id}/arkstore/apps/{id}/click/',
             method=actions.FrontActionMethod.GET,
-        )
+        ),
     ],
+    global_actions={
+        "order_name":actions.OrderAction(
+            up="/api/v1/mine/tenant/{tenant_id}/mine_group_apps/?app_group_id={app_group_id}&order=name",
+            down="/api/v1/mine/tenant/{tenant_id}/mine_group_apps/?app_group_id={app_group_id}&order=-name",
+            method=actions.FrontActionMethod.GET,
+            order_parm="name"
+        )
+    }
 )

api/v1/pages/log_manage/__init__.py

@@ -1,14 +1,8 @@
 from arkid.core import routers
 from arkid.core.translation import gettext_default as _
-from . import log_config,manager_log,user_log
 
 router = routers.FrontRouter(
     path='log_manage',
     name=_('日志管理'),
     icon='log',
-    children=[
-        log_config.router,
-        manager_log.router,
-        user_log.router,
-    ]
 )

api/v1/pages/mine/switch_tenant.py

@@ -25,6 +25,7 @@
     ),
     global_actions={
         'create': actions.CreateAction(
+            name=_("新建租户"),
             path='/api/v1/tenants/',
         )
     },

api/v1/pages/permission_manage/grant_manage/app_grant.py

@@ -7,13 +7,15 @@
 
 page = pages.TreePage(tag=tag,name=name)
 app_permission_page = pages.TablePage(name=_("该应用权限"))
+update_app_permission_page = pages.TablePage(name=_("更新应用权限"), select=True)
 
 pages.register_front_pages(page)
 pages.register_front_pages(app_permission_page)
+pages.register_front_pages(update_app_permission_page)
 
 page.create_actions(
     init_action=actions.DirectAction(
-        path='/api/v1/tenant/{tenant_id}/all_apps_in_arkid/',
+        path='/api/v1/tenant/{tenant_id}/all_apps_in_arkid/?not_arkid=1',
         method=actions.FrontActionMethod.GET,
     ),
     node_actions=[
@@ -25,7 +27,30 @@
 
 app_permission_page.create_actions(
     init_action=actions.DirectAction(
-        path='/api/v1/tenant/{tenant_id}/permissions?app_id={app_id}',
+        path='/api/v1/tenant/{tenant_id}/apps/{id}/permissions',
         method=actions.FrontActionMethod.GET
     ),
+    local_actions={
+        "delete": actions.DeleteAction(
+            path='/api/v1/tenant/{tenant_id}/permission/app/{select_app_id}/{permission_id}/remove_permission'
+        )
+    },
+    global_actions={
+        'open': actions.OpenAction(
+            name=("添加应用权限"),
+            page=update_app_permission_page
+        ),
+    }
+)
+
+update_app_permission_page.create_actions(
+    init_action=actions.DirectAction(
+        path='/api/v1/tenant/{tenant_id}/permissions',
+        method=actions.FrontActionMethod.GET
+    ),
+    global_actions={
+        'confirm':actions.ConfirmAction(
+            path='/api/v1/tenant/{tenant_id}/permission/app/{select_app_id}/add_permission',
+        ),
+    }
 )

api/v1/pages/user_manage/user_list.py

@@ -29,6 +29,12 @@
         'create': actions.CreateAction(
             path='/api/v1/tenant/{tenant_id}/users/',
         ),
+        "order_username":actions.OrderAction(
+            up="/api/v1/tenant/{tenant_id}/users/?order=username",
+            down="/api/v1/tenant/{tenant_id}/users/?order=-username",
+            method=actions.FrontActionMethod.GET,
+            order_parm="username"
+        )
     },
     local_actions={
         "edit": actions.EditAction(

api/v1/schema/app.py

@@ -34,6 +34,12 @@ class AppListsOut(ResponseSchema):
 class AppItemOut(ModelSchema):
 
     id: UUID = Field(readonly=True)
+    read_secret: str = Field(readonly=True, title=_('secret', '接口访问密钥'), default='', append={
+        "http": {
+            "url": '/api/v1/tenant/{tenant_id}/apps/{id}/read_secret/',
+            "method": "get",
+        },
+    })
 
     class Config:
         model = App
@@ -44,6 +50,15 @@ class AppOut(ResponseSchema):
     data: AppItemOut
 
 
+class AppReadSecretItemOut(Schema):
+
+    read_secret: str = Field(readonly=True, title=_('secret', '接口访问密钥'))
+
+
+class AppReadSecretOut(ResponseSchema):
+    data: AppReadSecretItemOut
+
+
 class AppUpdateIn(ModelSchema):
 
     class Config:

api/v1/schema/mine.py

@@ -42,13 +42,17 @@ class Config:
 
 
 class MineTenantListItemOut(ModelSchema):
+
+    role:str = Field(title='角色')
+
     class Config:
         model = Tenant
         model_fields = ["id", "name", "slug", "icon"]
 
 class MinePermissionListSchemaOut(Schema):
 
     id: UUID = Field(hidden=True)
+    operation_id: str = Field(default='', title=_("操作ID"))
     name: str
     # app_name: str = Field(default=None, alias="app.name", title=_("应用名称"))
     category: str

api/v1/schema/permission.py

@@ -24,16 +24,32 @@ class PermissionsListSchemaOut(ModelSchema):
 
     app_name: str = Field(default=None, alias="app.name", title=_("应用名称"))
     sort_id: int = Field(hidden=True)
-    is_open: bool = Field(item_action={"path":"/api/v1/tenant/{tenant_id}/permission/{id}/toggle_open", "method":actions.FrontActionMethod.POST.value}, title=_("是否授权给其它租户"))
+    # is_open: bool = Field(item_action={"path":"/api/v1/tenant/{tenant_id}/permission/{id}/toggle_open", "method":actions.FrontActionMethod.POST.value}, title=_("是否授权给其它租户"))
     category: str = Field(title=_("分类名称"))
+    operation_id: str = Field(default='', title=_("操作ID"))
 
     class Config:
         model = Permission
-        model_fields = ['id', 'name', 'is_system']
+        model_fields = ['id', 'operation_id', 'name', 'is_system']
+
+
+class AppPermissionsItemSchemaOut(Schema):
+
+    id: UUID = Field(hidden=True)
+    operation_id: str = Field(default='', title=_("操作ID"))
+    name: str = Field(title=_("名称"))
+    app_name: str = Field(default=None, alias='app.name', title=_("应用名称"))
+    sort_id: int = Field(hidden=True)
+    category: str = Field(title=_("分类名称"))
+
+
+class AppPermissionsListSchemaOut(ResponseSchema):
+    data: List[AppPermissionsItemSchemaOut]
 
 class UserAppLastPermissionsItemSchemaOut(Schema):
 
     id: UUID = Field(default=None)
+    operation_id: str = Field(default='', title=_("操作ID"))
     name: str = Field(title=_("名称"))
     is_system: bool = Field(title=_("是否是系统权限"))
     app_name: str = Field(default=None, alias="app.name", title=_("应用名称"))

api/v1/schema/permission_group.py

@@ -93,8 +93,10 @@ class PermissionGroupEditSchemaIn(Schema):
 
 class PermissionListSchemaOut(Schema):
     category: str = Field(title=_("分类名称"))
+    operation_id: str = Field(default='', title=_("操作ID"))
     id: UUID = Field(title=_("id"))
     name: str = Field(title=_("名称"))
+    is_open: bool = Field(item_action={"path":"/api/v1/tenant/{tenant_id}/permission/{id}/toggle_open", "method":actions.FrontActionMethod.POST.value}, title=_("是否授权给其它租户"))
     is_system: bool = Field(title=_("是否是系统权限 "))
     # class Config:
     #     model = SystemPermission

api/v1/schema/tenant.py

@@ -26,6 +26,14 @@ class Config:
         model = Tenant
         model_fields = ["id","name","slug","icon"]
 
+    is_platform_tenant:bool = Field(
+        title=_("是否是平台租户")
+    )
+
+    @staticmethod
+    def resolve_is_platform_tenant(obj):
+        return obj.is_platform_tenant
+
 class TenantOut(ResponseSchema):
 
     data: TenantItemOut
@@ -98,6 +106,10 @@ class DefaultTenantItemOut(ModelSchema):
     class Config:
         model = Tenant
         model_fields = ["id", "name"]
+
+    is_platform_tenant:bool = Field(
+        title=_("是否是平台租户")
+    )
 
 class DefaultTenantOut(ResponseSchema):
     data: DefaultTenantItemOut

api/v1/schema/user.py

@@ -1,4 +1,4 @@
-from typing import List, Optional
+from typing import Any, List, Optional
 from uuid import UUID
 from ninja import ModelSchema, Schema
 from arkid.core.models import User
@@ -15,8 +15,12 @@ class UserListItemOut(ModelSchema):
 
     class Config:
         model = User
-        model_fields = ['id', 'username', 'avatar']
-
+        model_fields = ['id', 'username', 'avatar','created']
+
+    created:Any = Field(
+        title=_("注册时间")
+    )
+
 class UserListOut(ResponseSchema):
     data: List[UserListItemOut]
 

api/v1/views/__init__.py

@@ -28,7 +28,7 @@
     permission_group,
     platform_config,
     languape,
-    log,
+    # log,
     front_theme,
     approve_request,
     approve_system,

api/v1/views/app.py

@@ -26,9 +26,9 @@
 
 
 @api.get("/tenant/{tenant_id}/apps/", response=List[AppListItemOut], tags=['应用'])
-@operation(AppListOut, roles=[NORMAL_USER, TENANT_ADMIN, PLATFORM_ADMIN])
+@operation(AppListOut, roles=[TENANT_ADMIN, PLATFORM_ADMIN])
 @paginate(CustomPagination)
-def list_apps(request, tenant_id: str):
+def list_apps(request, tenant_id: str,order:str=None):
     '''
     app列表
     '''
@@ -37,6 +37,11 @@ def list_apps(request, tenant_id: str):
         is_active=True,
         is_del=False
     )
+
+    if order:
+        apps = apps.order_by(order)
+    else:
+        apps = apps.order_by('-created')
     # # 取得请求地址和方式
     # method = request.method
     # url = request.resolver_match.route
@@ -45,11 +50,11 @@ def list_apps(request, tenant_id: str):
     # from arkid.core.perm.permission_data import PermissionData
     # pd = PermissionData()
     # pd.update_arkid_system_permission()
-    return apps.order_by('created')
+    return apps
 
 
 @api.get("/tenant/{tenant_id}/open_apps/", response=List[AppListItemOut], tags=['应用'])
-@operation(AppListOut, roles=[NORMAL_USER, TENANT_ADMIN, PLATFORM_ADMIN])
+@operation(AppListOut, roles=[TENANT_ADMIN, PLATFORM_ADMIN])
 @paginate(CustomPagination)
 def list_open_apps(request, tenant_id: str):
     '''
@@ -62,7 +67,7 @@ def list_open_apps(request, tenant_id: str):
 
 
 @api.get("/tenant/{tenant_id}/all_apps/", response=List[AppListItemOut], tags=['应用'])
-@operation(AppListOut, roles=[NORMAL_USER, TENANT_ADMIN, PLATFORM_ADMIN])
+@operation(AppListOut, roles=[TENANT_ADMIN, PLATFORM_ADMIN])
 @paginate(CustomPagination)
 def list_all_apps(request, tenant_id: str):
     '''
@@ -75,7 +80,7 @@ def list_all_apps(request, tenant_id: str):
 
 
 @api.get("/tenant/{tenant_id}/all_apps_in_arkid/", response=AppListsOut, tags=['应用'])
-@operation(AppListOut, roles=[NORMAL_USER, TENANT_ADMIN, PLATFORM_ADMIN])
+@operation(AppListOut, roles=[TENANT_ADMIN, PLATFORM_ADMIN])
 def all_apps_in_arkid(request, tenant_id: str, not_arkid: int=None):
     '''
     所有app列表(含arkid)
@@ -108,8 +113,21 @@ def get_app(request, tenant_id: str, id: str):
     app = App.expand_objects.get(id=id)
     return {"data":app}
 
+
+@api.get("/tenant/{tenant_id}/apps/{id}/read_secret/", response=AppReadSecretOut, tags=['应用'])
+@operation(roles=[TENANT_ADMIN, PLATFORM_ADMIN])
+def get_app_read_secret(request, tenant_id: str, id: str):
+    '''
+    获取应用秘钥
+    '''
+    from arkid.common.utils import generate_secret
+    app = App.valid_objects.get(id=id)
+    app.secret = generate_secret()
+    app.save()
+    return {"data": {"read_secret": app.secret}}
+
 @api.get("/tenant/{tenant_id}/apps/{app_id}/openapi_version/", response=ConfigOpenApiVersionDataSchemaOut, tags=['应用'])
-@operation(roles=[PLATFORM_ADMIN, NORMAL_USER])
+@operation(roles=[TENANT_ADMIN, PLATFORM_ADMIN])
 def get_app_openapi_version(request, tenant_id: str, app_id: str):
     '''
     获取app的openapi地址和版本
@@ -273,7 +291,7 @@ def get_app_config(request, tenant_id: str, id: str):
 
 
 @api.get("/apps/{id}/sync_permission/", tags=['应用'], auth=None)
-@operation(roles=[TENANT_ADMIN, PLATFORM_ADMIN, NORMAL_USER])
+@operation(roles=[TENANT_ADMIN, PLATFORM_ADMIN])
 def sync_app_permission(request, id: str):
     '''
     同步应用权限