!115 Merge remote-tracking branch 'origin/develop' into develop

Merge pull request !115 from dvadmin/develop

README.zh.md

@@ -47,23 +47,28 @@
 
 - 密码：admin123456
 
-👩‍👦‍👦文档地址：[coding](https://dvadmin-private.coding.net/share/km/cec69f3d-30fe-47d5-bd97-e9e851f0b776/K-2)
+👩‍👦‍👦文档地址：[DVAdmin官网](https://www.django-vue-admin.com)
 
 
 
 ## 交流
 
 - 交流社区：[戳我](https://bbs.django-vue-admin.com)👩‍👦‍👦
-
 - 插件市场：[戳我](https://bbs.django-vue-admin.com/plugMarket.html)👩‍👦‍👦
-
 -  django-vue-admin交流01群(已满)：812482043 [点击链接加入群聊](https://qm.qq.com/cgi-bin/qm/qr?k=aJVwjDvH-Es4MPJQuoO32N0SucK22TE5&jump_from=webapi)
 -  django-vue-admin交流02群(已满)：687252418  [点击链接加入群聊](https://qm.qq.com/cgi-bin/qm/qr?k=4jJN4IjWGfxJ8YJXbb_gTsuWjR34WLdc&jump_from=webapi)
--  django-vue-admin交流03群：442108213  [点击链接加入群聊](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=wsm5oSz3K8dElBYUDtLTcQSEPhINFkl8&authKey=M6sbER0z59ZakgBr5erFeZyFZU15CI52bErNZa%2FxSvvGIuVAbY0N5866v89hm%2FK4&noverify=0&group_code=442108213)
+- django-vue-admin交流03群(已满)：442108213  [点击链接加入群聊](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=wsm5oSz3K8dElBYUDtLTcQSEPhINFkl8&authKey=M6sbER0z59ZakgBr5erFeZyFZU15CI52bErNZa%2FxSvvGIuVAbY0N5866v89hm%2FK4&noverify=0&group_code=442108213)
+- django-vue-admin交流04群：442108213  [点击链接加入群聊](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=wsm5oSz3K8dElBYUDtLTcQSEPhINFkl8&authKey=M6sbER0z59ZakgBr5erFeZyFZU15CI52bErNZa%2FxSvvGIuVAbY0N5866v89hm%2FK4&noverify=0&group_code=442108213)
 
-- 二维码
 
-  <img src='https://images.gitee.com/uploads/images/2022/0530/233203_5fb11883_5074988.jpeg' width='200'>
+
+## 给框架点赞
+
+<div style="display: flex; gap: 10px;">
+ <img src='https://django-vue-admin.com/alipay.jpg' width='200'>
+ <img src='https://django-vue-admin.com/wechat.jpg' width='200'>
+</div>
+
 
 ## 源码地址
 
@@ -88,7 +93,19 @@ github地址：[https://github.com/huge-dream/django-vue3-admin](https://github.
 13.  🔌[插件市场 ](https://bbs.django-vue-admin.com/plugMarket.html)：基于Django-Vue-Admin框架开发的应用和插件。
 
 ##  插件市场 🔌
-更新中...
+1. #### [dvadmin3-folw 后台审批流插件](https://bbs.django-vue-admin.com/plugMarket/139.html)
+
+2. #### [dvadmin3 celery插件前端](https://bbs.django-vue-admin.com/plugMarket/134.html)
+
+3. #### [dvadmin3 celery插件后端](https://bbs.django-vue-admin.com/plugMarket/133.html)
+
+4. #### [dvadmin3-build插件](https://bbs.django-vue-admin.com/plugMarket/136.html)
+
+5. #### [dvadmin3-uniapp](https://e.coding.net/dvadmin-private/code/dvadmin3-uniapp-app.git)
+
+6. #### dvadmin3-folw-uniapp 审批(开发中，近期上线)
+
+
 
 ##  仓库分支说明 💈
 主分支：master（稳定版本）
@@ -114,7 +131,7 @@ cd web
 
 # 安装依赖
 npm install yarn
-yarn install --registry=https://registry.npm.taobao.org
+yarn install --registry=https://registry.npmmirror.com
 
 # 启动服务
 yarn build
@@ -210,5 +227,19 @@ docker-compose up -d --build
 
 ![image-10](https://foruda.gitee.com/images/1701350501421625746/f8dd215e_5074988.png)
 
+## 审批流插件
+
+![输入链接说明](https://bbs.django-vue-admin.com/uploads/20250321/97fbbf29673edfd66a1edd49237791bb.png)
+
+![输入链接说明](https://bbs.django-vue-admin.com/uploads/20250321/c43aa51278cbc478287c718d22397479.png)
+
+
+![输入链接说明](https://bbs.django-vue-admin.com/uploads/20250321/9732a5cca9c1166d1a65c35e313ab90d.png)
+
+
+![输入链接说明](https://bbs.django-vue-admin.com/uploads/20250321/3ca9dd0801ce76d21435abcc8a3d505a.png)
+
+![输入链接说明](https://bbs.django-vue-admin.com/uploads/20250321/a87a8d2329ef66880af5b0f16c5ff823.png)
+
 
 

backend/application/__init__.py

@@ -0,0 +1,5 @@
+# This will make sure the app is always imported when
+# Django starts so that shared_task will use this app.
+from .celery import app as celery_app
+
+__all__ = ('celery_app',)

backend/application/celery.py

@@ -1,6 +1,8 @@
 import functools
 import os
 
+from celery.signals import task_postrun
+
 os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'application.settings')
 
 from django.conf import settings
@@ -15,7 +17,7 @@ else:
     from celery import Celery
 
     app = Celery(f"application")
-app.config_from_object('django.conf:settings')
+app.config_from_object('django.conf:settings', namespace='CELERY')
 app.autodiscover_tasks(lambda: settings.INSTALLED_APPS)
 platforms.C_FORCE_ROOT = True
 
@@ -38,3 +40,12 @@ def retry_base_task_error():
         return wrapper
 
     return wraps
+
+
+@task_postrun.connect
+def add_periodic_task_name(sender, task_id, task, args, kwargs, **extras):
+    periodic_task_name = kwargs.get('periodic_task_name')
+    if periodic_task_name:
+        from django_celery_results.models import TaskResult
+        # 更新 TaskResult 表中的 periodic_task_name 字段
+        TaskResult.objects.filter(task_id=task_id).update(periodic_task_name=periodic_task_name)

backend/application/dispatch.py

@@ -2,6 +2,10 @@
 # -*- coding: utf-8 -*-
 from django.conf import settings
 from django.db import connection
+from django.core.cache import cache
+from dvadmin.utils.validator import CustomValidationError
+
+dispatch_db_type = getattr(settings, 'DISPATCH_DB_TYPE', 'memory')  # redis
 
 
 def is_tenants_mode():
@@ -68,6 +72,9 @@ def init_dictionary():
     :return:
     """
     try:
+        if dispatch_db_type == 'redis':
+            cache.set(f"init_dictionary", _get_all_dictionary())
+            return
         if is_tenants_mode():
             from django_tenants.utils import tenant_context, get_tenant_model
 
@@ -88,7 +95,9 @@ def init_system_config():
     :return:
     """
     try:
-
+        if dispatch_db_type == 'redis':
+            cache.set(f"init_system_config", _get_all_system_config())
+            return
         if is_tenants_mode():
             from django_tenants.utils import tenant_context, get_tenant_model
 
@@ -107,6 +116,9 @@ def refresh_dictionary():
     刷新字典配置
     :return:
     """
+    if dispatch_db_type == 'redis':
+        cache.set(f"init_dictionary", _get_all_dictionary())
+        return
     if is_tenants_mode():
         from django_tenants.utils import tenant_context, get_tenant_model
 
@@ -122,6 +134,9 @@ def refresh_system_config():
     刷新系统配置
     :return:
     """
+    if dispatch_db_type == 'redis':
+        cache.set(f"init_system_config", _get_all_system_config())
+        return
     if is_tenants_mode():
         from django_tenants.utils import tenant_context, get_tenant_model
 
@@ -141,6 +156,11 @@ def get_dictionary_config(schema_name=None):
     :param schema_name: 对应字典配置的租户schema_name值
     :return:
     """
+    if dispatch_db_type == 'redis':
+        init_dictionary_data = cache.get(f"init_dictionary")
+        if not init_dictionary_data:
+            refresh_dictionary()
+        return cache.get(f"init_dictionary") or {}
     if not settings.DICTIONARY_CONFIG:
         refresh_dictionary()
     if is_tenants_mode():
@@ -157,6 +177,12 @@ def get_dictionary_values(key, schema_name=None):
     :param schema_name: 对应字典配置的租户schema_name值
     :return:
     """
+    if dispatch_db_type == 'redis':
+        dictionary_config = cache.get(f"init_dictionary")
+        if not dictionary_config:
+            refresh_dictionary()
+            dictionary_config = cache.get(f"init_dictionary")
+        return dictionary_config.get(key)
     dictionary_config = get_dictionary_config(schema_name)
     return dictionary_config.get(key)
 
@@ -169,8 +195,8 @@ def get_dictionary_label(key, name, schema_name=None):
     :param schema_name: 对应字典配置的租户schema_name值
     :return:
     """
-    children = get_dictionary_values(key, schema_name) or []
-    for ele in children:
+    res = get_dictionary_values(key, schema_name) or []
+    for ele in res.get('children'):
         if ele.get("value") == str(name):
             return ele.get("label")
     return ""
@@ -187,6 +213,11 @@ def get_system_config(schema_name=None):
     :param schema_name: 对应字典配置的租户schema_name值
     :return:
     """
+    if dispatch_db_type == 'redis':
+        init_dictionary_data = cache.get(f"init_system_config")
+        if not init_dictionary_data:
+            refresh_system_config()
+        return cache.get(f"init_system_config") or {}
     if not settings.SYSTEM_CONFIG:
         refresh_system_config()
     if is_tenants_mode():
@@ -203,10 +234,32 @@ def get_system_config_values(key, schema_name=None):
     :param schema_name: 对应系统配置的租户schema_name值
     :return:
     """
+    if dispatch_db_type == 'redis':
+        system_config = cache.get(f"init_system_config")
+        if not system_config:
+            refresh_system_config()
+            system_config = cache.get(f"init_system_config")
+        return system_config.get(key)
     system_config = get_system_config(schema_name)
     return system_config.get(key)
 
 
+def get_system_config_values_to_dict(key, schema_name=None):
+    """
+    获取系统配置数据并转换为字典 **仅限于数组类型系统配置
+    :param key: 对应系统配置的key值(字典编号)
+    :param schema_name: 对应系统配置的租户schema_name值
+    :return:
+    """
+    values_dict = {}
+    config_values = get_system_config_values(key, schema_name)
+    if not isinstance(config_values, list):
+        raise CustomValidationError("该方式仅限于数组类型系统配置")
+    for ele in get_system_config_values(key, schema_name):
+        values_dict[ele.get('key')] = ele.get('value')
+    return values_dict
+
+
 def get_system_config_label(key, name, schema_name=None):
     """
     获取获取系统配置label值

backend/application/settings.py

@@ -404,10 +404,11 @@ PLUGINS_URL_PATTERNS = []
 # ********** 一键导入插件配置开始 **********
 # 例如:
 # from dvadmin_upgrade_center.settings import *    # 升级中心
-# from dvadmin_celery.settings import *            # celery 异步任务
+from dvadmin3_celery.settings import *            # celery 异步任务
 # from dvadmin_third.settings import *            # 第三方用户管理
 # from dvadmin_ak_sk.settings import *            # 秘钥管理管理
 # from dvadmin_tenants.settings import *            # 租户管理
 #from dvadmin_social_auth.settings import *
+#from dvadmin_uniapp.settings import *
 # ...
 # ********** 一键导入插件配置结束 **********

backend/application/urls.py

@@ -50,9 +50,36 @@ schema_view = get_schema_view(
         license=openapi.License(name="BSD License"),
     ),
     public=True,
-    permission_classes=(permissions.AllowAny,),
+    permission_classes=(permissions.IsAuthenticated,),
     generator_class=CustomOpenAPISchemaGenerator,
 )
+# 前端页面映射
+from django.http import Http404, HttpResponse
+from django.shortcuts import render
+import mimetypes
+import os
+
+
+def web_view(request):
+    return render(request, 'web/index.html')
+
+
+def serve_web_files(request, filename):
+    # 设定文件路径
+    filepath = os.path.join(settings.BASE_DIR, 'templates', 'web', filename)
+
+    # 检查文件是否存在
+    if not os.path.exists(filepath):
+        raise Http404("File does not exist")
+
+    # 根据文件扩展名，确定 MIME 类型
+    mime_type, _ = mimetypes.guess_type(filepath)
+
+    # 打开文件并读取内容
+    with open(filepath, 'rb') as f:
+        response = HttpResponse(f.read(), content_type=mime_type)
+        return response
+
 
 urlpatterns = (
         [
@@ -85,6 +112,9 @@ urlpatterns = (
 
             # 仅用于开发，上线需关闭
             path("api/token/", LoginTokenView.as_view()),
+            # 前端页面映射
+            path('web/', web_view, name='web_view'),
+            path('web/<path:filename>', serve_web_files, name='serve_web_files'),
         ]
         + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
         + static(settings.STATIC_URL, document_root=settings.STATIC_URL)

backend/conf/env.example.py

@@ -7,30 +7,32 @@ from application.settings import BASE_DIR
 # ================================================= #
 # 数据库 ENGINE ，默认演示使用 sqlite3 数据库，正式环境建议使用 mysql 数据库
 # sqlite3 设置
-DATABASE_ENGINE = "django.db.backends.sqlite3"
-DATABASE_NAME = os.path.join(BASE_DIR, "db.sqlite3")
+# DATABASE_ENGINE = "django.db.backends.sqlite3"
+# DATABASE_NAME = os.path.join(BASE_DIR, "db.sqlite3")
 
 # 使用mysql时，改为此配置
-# DATABASE_ENGINE = "django.db.backends.mysql"
-# DATABASE_NAME = 'django-vue-admin' # mysql 时使用
+DATABASE_ENGINE = "django.db.backends.mysql"
+DATABASE_NAME = 'django-vue3-admin' # mysql 时使用
 
 # 数据库地址 改为自己数据库地址
-DATABASE_HOST = "127.0.0.1"
+DATABASE_HOST = '127.0.0.1'
 # # 数据库端口
 DATABASE_PORT = 3306
 # # 数据库用户名
 DATABASE_USER = "root"
 # # 数据库密码
-DATABASE_PASSWORD = "123456"
+DATABASE_PASSWORD = 'DVADMIN3'
 
 # 表前缀
 TABLE_PREFIX = "dvadmin_"
 # ================================================= #
 # ******** redis配置，无redis 可不进行配置  ******** #
 # ================================================= #
-# REDIS_PASSWORD = ''
-# REDIS_HOST = '127.0.0.1'
-# REDIS_URL = f'redis://:{REDIS_PASSWORD or ""}@{REDIS_HOST}:6380'
+REDIS_DB = 1
+CELERY_BROKER_DB = 3
+REDIS_PASSWORD = 'DVADMIN3'
+REDIS_HOST = '127.0.0.1'
+REDIS_URL = f'redis://:{REDIS_PASSWORD or ""}@{REDIS_HOST}:6379'
 # ================================================= #
 # ****************** 功能 启停  ******************* #
 # ================================================= #

backend/dvadmin/__init__.py

@@ -0,0 +1 @@
+# -*- coding: utf-8 -*-

backend/dvadmin/system/fixtures/initSerializer.py

@@ -19,6 +19,20 @@ class UsersInitSerializer(CustomModelSerializer):
     """
     初始化获取数信息(用于生成初始化json文件)
     """
+    role_key = serializers.SerializerMethodField()
+    dept_key = serializers.SerializerMethodField()
+
+    def get_dept_key(self, obj):
+        if obj.dept:
+            return obj.dept.key
+        else:
+            return None
+
+    def get_role_key(self, obj):
+        if obj.role.all():
+            return [role.key for role in obj.role.all()]
+        else:
+            return []
 
     def save(self, **kwargs):
         instance = super().save(**kwargs)
@@ -35,7 +49,7 @@ class UsersInitSerializer(CustomModelSerializer):
         model = Users
         fields = ["username", "email", 'mobile', 'avatar', "name", 'gender', 'user_type', "dept", 'user_type',
                   'first_name', 'last_name', 'email', 'is_staff', 'is_active', 'creator', 'dept_belong_id',
-                  'password', 'last_login', 'is_superuser']
+                  'password', 'last_login', 'is_superuser', 'role_key' ,'dept_key']
         read_only_fields = ['id']
         extra_kwargs = {
             'creator': {'write_only': True},
@@ -175,22 +189,30 @@ class RoleMenuInitSerializer(CustomModelSerializer):
     """
     初始化角色菜单(用于生成初始化json文件)
     """
-    role_key = serializers.CharField(max_length=100, required=True)
-    menu_component_name = serializers.CharField(max_length=100, required=True)
+    role__key = serializers.CharField(source='role.key')
+    menu__web_path = serializers.CharField(source='menu.web_path')
+    menu__component_name = serializers.CharField(source='menu.component_name', allow_blank=True)
+
+    def update(self, instance, validated_data):
+        init_data = self.initial_data
+        role_id = Role.objects.filter(key=init_data['role__key']).first()
+        menu_id = Menu.objects.filter(web_path=init_data['menu__web_path'], component_name=init_data['menu__component_name']).first()
+        validated_data['role'] = role_id
+        validated_data['menu'] = menu_id
+        return super().update(instance, validated_data)
+    
 
     def create(self, validated_data):
         init_data = self.initial_data
-        validated_data.pop('menu_component_name')
-        validated_data.pop('role_key')
-        role_id = Role.objects.filter(key=init_data['role_key']).first()
-        menu_id = Menu.objects.filter(component_name=init_data['menu_component_name']).first()
+        role_id = Role.objects.filter(key=init_data['role__key']).first()
+        menu_id = Menu.objects.filter(web_path=init_data['menu__web_path'], component_name=init_data['menu__component_name']).first()
         validated_data['role'] = role_id
         validated_data['menu'] = menu_id
         return super().create(validated_data)
 
     class Meta:
         model = RoleMenuPermission
-        fields = ['role_key', 'menu_component_name', 'creator', 'dept_belong_id']
+        fields = ['role__key', 'menu__web_path', 'menu__component_name','creator', 'dept_belong_id']
         read_only_fields = ["id"]
         extra_kwargs = {
             'role': {'required': False},
@@ -204,25 +226,38 @@ class RoleMenuButtonInitSerializer(CustomModelSerializer):
     """
     初始化角色菜单按钮(用于生成初始化json文件)
     """
-    role_key = serializers.CharField(max_length=100, required=True)
-    menu_button_value = serializers.CharField(max_length=100, required=True)
+    role__key = serializers.CharField(source='role.key')
+    menu_button__value = serializers.CharField(source='menu_button.value')
     data_range = serializers.CharField(max_length=100, required=False)
 
+    def update(self, instance, validated_data):
+        init_data = self.initial_data
+        role_id = Role.objects.filter(key=init_data['role__key']).first()
+        menu_button_id = MenuButton.objects.filter(value=init_data['menu_button__value']).first()
+        validated_data['role'] = role_id
+        validated_data['menu_button'] = menu_button_id
+        instance = super().create(validated_data)
+        instance.dept.set([])
+        return super().update(instance, validated_data)
+    
     def create(self, validated_data):
         init_data = self.initial_data
-        validated_data.pop('menu_button_value')
-        validated_data.pop('role_key')
-        role_id = Role.objects.filter(key=init_data['role_key']).first()
-        menu_button_id = MenuButton.objects.filter(value=init_data['menu_button_value']).first()
+        role_id = Role.objects.filter(key=init_data['role__key']).first()
+        menu_button_id = MenuButton.objects.filter(value=init_data['menu_button__value']).first()
         validated_data['role'] = role_id
         validated_data['menu_button'] = menu_button_id
         instance = super().create(validated_data)
         instance.dept.set([])
         return instance
 
+    def save(self, **kwargs):
+        if not self.instance or self.initial_data.get('reset'):
+            return super().save(**kwargs)
+        return self.instance
+
     class Meta:
         model = RoleMenuButtonPermission
-        fields = ['role_key', 'menu_button_value', 'data_range', 'dept', 'creator', 'dept_belong_id']
+        fields = ['role__key', 'menu_button__value', 'data_range', 'dept', 'creator', 'dept_belong_id']
         read_only_fields = ["id"]
         extra_kwargs = {
             'role': {'required': False},

backend/dvadmin/system/fixtures/init_menu.json

@@ -167,19 +167,13 @@
                         "method": 0
                     },
                     {
-                        "name": "查询所有",
+                        "name": "获取所有部门",
                         "value": "dept:SearchAll",
                         "api": "/api/system/dept/all_dept/",
                         "method": 0
                     },
                     {
-                        "name": "懒加载查询所有",
-                        "value": "dept:LazySearchAll",
-                        "api": "/api/system/dept/dept_lazy_tree/",
-                        "method": 0
-                    },
-                    {
-                        "name": "头信息",
+                        "name": "部门顶部信息",
                         "value": "dept:HeaderInfo",
                         "api": "/api/system/dept/dept_info/",
                         "method": 0
@@ -678,6 +672,53 @@
                         "model": "ApiWhiteList"
                     }
                 ]
+            },
+            {
+                "name": "下载中心",
+                "icon": "ele-Download",
+                "sort": 9,
+                "is_link": false,
+                "is_catalog": false,
+                "web_path": "/downloadCenter",
+                "component": "system/downloadCenter/index",
+                "component_name": "downloadCenter",
+                "status": true,
+                "cache": false,
+                "visible": true,
+                "parent": 277,
+                "children": [],
+                "menu_button": [
+                    {
+                        "name": "查询",
+                        "value": "Search",
+                        "api": "/api/system/downloadCenter/",
+                        "method": 0
+                    },
+                    {
+                        "name": "详情",
+                        "value": "Retrieve",
+                        "api": "/api/system/downloadCenter/{id}/",
+                        "method": 0
+                    },
+                    {
+                        "name": "新增",
+                        "value": "Create",
+                        "api": "/api/system/downloadCenter/",
+                        "method": 1
+                    },
+                    {
+                        "name": "编辑",
+                        "value": "Update",
+                        "api": "/api/system/downloadCenter/{id}/",
+                        "method": 2
+                    },
+                    {
+                        "name": "删除",
+                        "value": "Delete",
+                        "api": "/api/system/downloadCenter/{id}/",
+                        "method": 3
+                    }
+                ]
             }
         ],
         "menu_button": [],

backend/dvadmin/system/fixtures/init_rolemenubuttonpermission.json

@@ -1,12 +1,7 @@
 [
     {
-        "role_key": "admin",
-        "menu_button_value": "menu:Search",
-        "data_range": 0
-    },
-    {
-        "role_key": "public",
-        "menu_button_value":"menu:Search",
+        "role__key": "admin",
+        "menu_button__value": "menu:Search",
         "data_range": 0
     }
 ]

backend/dvadmin/system/fixtures/init_rolemenupermission.json

@@ -1,10 +1,12 @@
 [
     {
-        "role_key": "admin",
-        "menu_component_name": "menu"
+        "role__key": "admin",
+        "menu__web_path": "/system",
+        "menu__component_name": ""
     },
     {
-        "role_key": "public",
-        "menu_component_name": "menu"
+        "role__key": "admin",
+        "menu__web_path": "/menu",
+        "menu__component_name": "menu"
     }
 ]

backend/dvadmin/system/fixtures/init_systemconfig.json

@@ -12,6 +12,34 @@
         "placeholder": null,
         "setting": null,
         "children": [
+            {
+                "parent": 10,
+                "title": "网页标题",
+                "key": "web_title",
+                "value": "DVAdmin",
+                "sort": 1,
+                "status": true,
+                "data_options": null,
+                "form_item_type": 0,
+                "rule": [],
+                "placeholder": "请输入网站标题",
+                "setting": null,
+                "children": []
+            },
+        {
+                "parent": 10,
+                "title": "网站小图标",
+                "key": "web_favicon",
+                "value": "",
+                "sort": 1,
+                "status": true,
+                "data_options": null,
+                "form_item_type": 0,
+                "rule": [],
+                "placeholder": "请输入网站小图标",
+                "setting": null,
+                "children": []
+            },
             {
                 "parent": 10,
                 "title": "开启验证码",

backend/dvadmin/system/fixtures/initialize.py

@@ -45,13 +45,13 @@ class Initialize(CoreInitialize):
         """
         初始化角色菜单信息
         """
-        self.init_base(RoleMenuInitSerializer, unique_fields=['role', 'menu'])
+        self.init_base(RoleMenuInitSerializer, unique_fields=['role__key', 'menu__web_path', 'menu__component_name'])
 
     def init_role_menu_button(self):
         """
         初始化角色菜单按钮信息
         """
-        self.init_base(RoleMenuButtonInitSerializer, unique_fields=['role', 'menu_button'])
+        self.init_base(RoleMenuButtonInitSerializer, unique_fields=['role__key', 'menu_button__value'])
 
     def init_api_white_list(self):
         """

backend/dvadmin/system/management/commands/generate_init_json.py

@@ -10,7 +10,7 @@ django.setup()
 from django.core.management.base import BaseCommand
 
 from application.settings import BASE_DIR
-from dvadmin.system.models import Menu, Users, Dept, Role, ApiWhiteList, Dictionary, SystemConfig
+from dvadmin.system.models import Menu, Users, Dept, Role, ApiWhiteList, Dictionary, SystemConfig, RoleMenuButtonPermission, RoleMenuPermission
 from dvadmin.system.fixtures.initSerializer import UsersInitSerializer, DeptInitSerializer, RoleInitSerializer, \
     MenuInitSerializer, ApiWhiteListInitSerializer, DictionaryInitSerializer, SystemConfigInitSerializer, \
     RoleMenuInitSerializer, RoleMenuButtonInitSerializer
@@ -57,6 +57,12 @@ class Command(BaseCommand):
     def generate_system_config(self):
         self.serializer_data(SystemConfigInitSerializer, SystemConfig.objects.filter(parent_id__isnull=True))
 
+    def generate_role_menu(self):
+        self.serializer_data(RoleMenuInitSerializer, RoleMenuPermission.objects.all())
+
+    def generate_role_menu_button(self):
+        self.serializer_data(RoleMenuButtonInitSerializer, RoleMenuButtonPermission.objects.all())
+
     def handle(self, *args, **options):
         generate_name = options.get('generate_name')
         generate_name_dict = {
@@ -67,6 +73,8 @@ class Command(BaseCommand):
             "api_white_list": self.generate_api_white_list,
             "dictionary": self.generate_dictionary,
             "system_config": self.generate_system_config,
+            "role_menu": self.generate_role_menu,
+            "role_menu_button": self.generate_role_menu_button,
         }
         if not generate_name:
             for ele in generate_name_dict.keys():

backend/dvadmin/system/management/commands/init.py

@@ -22,6 +22,8 @@ class Command(BaseCommand):
         parser.add_argument("-Y", nargs="*")
         parser.add_argument("-n", nargs="*")
         parser.add_argument("-N", nargs="*")
+        parser.add_argument("-app", nargs="*")
+        parser.add_argument("-A", nargs="*")
 
     def handle(self, *args, **options):
         reset = False
@@ -29,9 +31,10 @@ class Command(BaseCommand):
             reset = True
         if isinstance(options.get("n"), list) or isinstance(options.get("N"), list):
             reset = False
-
+        assign_apps = options.get("app") or options.get("A") or []
         for app in settings.INSTALLED_APPS:
-
+            if assign_apps and app not in assign_apps:
+                continue
             try:
                 exec(
                     f"""

backend/dvadmin/system/models.py

@@ -1,5 +1,7 @@
 import hashlib
 import os
+from time import time
+from pathlib import PurePosixPath
 
 from django.contrib.auth.models import AbstractUser, UserManager
 from django.db import models
@@ -7,8 +9,8 @@ from django.core.exceptions import ObjectDoesNotExist, ValidationError
 from application import dispatch
 from dvadmin.utils.models import CoreModel, table_prefix, get_custom_app_models
 
-
-class Role(CoreModel):
+from dvadmin3_flow.base_model import FlowBaseModel
+class Role(CoreModel,FlowBaseModel):
     name = models.CharField(max_length=64, verbose_name="角色名称", help_text="角色名称")
     key = models.CharField(max_length=64, unique=True, verbose_name="权限字符", help_text="权限字符")
     sort = models.IntegerField(default=1, verbose_name="角色顺序", help_text="角色顺序")
@@ -70,6 +72,8 @@ class Users(CoreModel, AbstractUser):
         blank=True,
         help_text="关联部门",
     )
+    login_error_count = models.IntegerField(default=0, verbose_name="登录错误次数", help_text="登录错误次数")
+    pwd_change_count = models.IntegerField(default=0,blank=True, verbose_name="密码修改次数", help_text="密码修改次数")
     objects = CustomUserManager()
 
     def set_password(self, raw_password):
@@ -118,6 +122,27 @@ class Dept(CoreModel):
         help_text="上级部门",
     )
 
+    @classmethod
+    def _recursion(cls, instance, parent, result):
+        new_instance = getattr(instance, parent, None)
+        res = []
+        data = getattr(instance, result, None)
+        if data:
+            res.append(data)
+        if new_instance:
+            array = cls._recursion(new_instance, parent, result)
+            res += array
+        return res
+
+    @classmethod
+    def get_region_name(cls, obj):
+        """
+        获取某个用户的递归所有部门名称
+        """
+        dept_name_all = cls._recursion(obj, "parent", "name")
+        dept_name_all.reverse()
+        return "/".join(dept_name_all)
+
     @classmethod
     def recursion_all_dept(cls, dept_id: int, dept_all_list=None, dept_list=None):
         """
@@ -404,6 +429,18 @@ class FileList(CoreModel):
     mime_type = models.CharField(max_length=100, blank=True, verbose_name="Mime类型", help_text="Mime类型")
     size = models.CharField(max_length=36, blank=True, verbose_name="文件大小", help_text="文件大小")
     md5sum = models.CharField(max_length=36, blank=True, verbose_name="文件md5", help_text="文件md5")
+    UPLOAD_METHOD_CHOIDES = (
+        (0, '默认上传'),
+        (1, '文件选择器上传'),
+    )
+    upload_method = models.SmallIntegerField(default=0, blank=True, null=True, choices=UPLOAD_METHOD_CHOIDES, verbose_name='上传方式', help_text='上传方式')
+    FILE_TYPE_CHOIDES = (
+        (0, '图片'),
+        (1, '视频'),
+        (2, '音频'),
+        (3, '其他'),
+    )
+    file_type = models.SmallIntegerField(default=3, choices=FILE_TYPE_CHOIDES, blank=True, null=True, verbose_name='文件类型', help_text='文件类型')
 
     def save(self, *args, **kwargs):
         if not self.md5sum:  # file is new
@@ -485,7 +522,7 @@ class SystemConfig(CoreModel):
         help_text="父级",
     )
     title = models.CharField(max_length=50, verbose_name="标题", help_text="标题")
-    key = models.CharField(max_length=20, verbose_name="键", help_text="键", db_index=True)
+    key = models.CharField(max_length=100, verbose_name="键", help_text="键", db_index=True)
     value = models.JSONField(max_length=100, verbose_name="值", help_text="值", null=True, blank=True)
     sort = models.IntegerField(default=0, verbose_name="排序", help_text="排序", blank=True)
     status = models.BooleanField(default=True, verbose_name="启用状态", help_text="启用状态")
@@ -594,3 +631,41 @@ class MessageCenterTargetUser(CoreModel):
         db_table = table_prefix + "message_center_target_user"
         verbose_name = "消息中心目标用户表"
         verbose_name_plural = verbose_name
+
+
+def media_file_name_downloadcenter(instance:'DownloadCenter', filename):
+    h = instance.md5sum
+    basename, ext = os.path.splitext(filename)
+    return PurePosixPath("files", "dlct", h[:1], h[1:2], basename + '-' + str(time()).replace('.', '') + ext.lower())
+
+
+class DownloadCenter(CoreModel):
+    TASK_STATUS_CHOICES = [
+        (0, '任务已创建'),
+        (1, '任务进行中'),
+        (2, '任务完成'),
+        (3, '任务失败'),
+    ]
+    task_name = models.CharField(max_length=255, verbose_name="任务名称", help_text="任务名称")
+    task_status = models.SmallIntegerField(default=0, choices=TASK_STATUS_CHOICES, verbose_name='是否可下载', help_text='是否可下载')
+    file_name = models.CharField(max_length=255, null=True, blank=True, verbose_name="文件名", help_text="文件名")
+    url = models.FileField(upload_to=media_file_name_downloadcenter, null=True, blank=True)
+    size = models.BigIntegerField(default=0, verbose_name="文件大小", help_text="文件大小")
+    md5sum = models.CharField(max_length=36, null=True, blank=True, verbose_name="文件md5", help_text="文件md5")
+
+    def save(self, *args, **kwargs):
+        if self.url:
+            if not self.md5sum:  # file is new
+                md5 = hashlib.md5()
+                for chunk in self.url.chunks():
+                    md5.update(chunk)
+                self.md5sum = md5.hexdigest()
+            if not self.size:
+                self.size = self.url.size
+        super(DownloadCenter, self).save(*args, **kwargs)
+
+    class Meta:
+        db_table = table_prefix + "download_center"
+        verbose_name = "下载中心"
+        verbose_name_plural = verbose_name
+        ordering = ("-create_datetime",)

backend/dvadmin/system/signals.py

@@ -0,0 +1,12 @@
+from django.dispatch import Signal
+# 初始化信号
+pre_init_complete = Signal()
+detail_init_complete = Signal()
+post_init_complete = Signal()
+# 租户初始化信号
+pre_tenants_init_complete = Signal()
+detail_tenants_init_complete = Signal()
+post_tenants_init_complete = Signal()
+post_tenants_all_init_complete = Signal()
+# 租户创建完成信号
+tenants_create_complete = Signal()

backend/dvadmin/system/tasks.py

@@ -0,0 +1,107 @@
+from hashlib import md5
+from io import BytesIO
+from datetime import datetime
+from time import sleep
+
+from openpyxl import Workbook
+from openpyxl.worksheet.table import Table, TableStyleInfo
+from openpyxl.utils import get_column_letter
+from django.core.files.base import ContentFile
+
+from application.celery import app
+from dvadmin.system.models import DownloadCenter
+
+def is_number(num):
+    try:
+        float(num)
+        return True
+    except ValueError:
+        pass
+
+    try:
+        import unicodedata
+        unicodedata.numeric(num)
+        return True
+    except (TypeError, ValueError):
+        pass
+    return False
+
+def get_string_len(string):
+    """
+    获取字符串最大长度
+    :param string:
+    :return:
+    """
+    length = 4
+    if string is None:
+        return length
+    if is_number(string):
+        return length
+    for char in string:
+        length += 2.1 if ord(char) > 256 else 1
+    return round(length, 1) if length <= 50 else 50
+
+@app.task
+def async_export_data(data: list, filename: str, dcid: int, export_field_label: dict):
+    instance = DownloadCenter.objects.get(pk=dcid)
+    instance.task_status = 1
+    instance.save()
+    sleep(2)
+    try:
+        wb = Workbook()
+        ws = wb.active
+        header_data = ["序号", *export_field_label.values()]
+        hidden_header = ["#", *export_field_label.keys()]
+        df_len_max = [get_string_len(ele) for ele in header_data]
+        row = get_column_letter(len(export_field_label) + 1)
+        column = 1
+        ws.append(header_data)
+        for index, results in enumerate(data):
+            results_list = []
+            for h_index, h_item in enumerate(hidden_header):
+                for key, val in results.items():
+                    if key == h_item:
+                        if val is None or val == "":
+                            results_list.append("")
+                        elif isinstance(val, datetime):
+                            val = val.strftime("%Y-%m-%d %H:%M:%S")
+                            results_list.append(val)
+                        else:
+                            results_list.append(val)
+                        # 计算最大列宽度
+                        result_column_width = get_string_len(val)
+                        if h_index != 0 and result_column_width > df_len_max[h_index]:
+                            df_len_max[h_index] = result_column_width
+            ws.append([index + 1, *results_list])
+            column += 1
+        # 　更新列宽
+        for index, width in enumerate(df_len_max):
+            ws.column_dimensions[get_column_letter(index + 1)].width = width
+        tab = Table(displayName="Table", ref=f"A1:{row}{column}")  # 名称管理器
+        style = TableStyleInfo(
+            name="TableStyleLight11",
+            showFirstColumn=True,
+            showLastColumn=True,
+            showRowStripes=True,
+            showColumnStripes=True,
+        )
+        tab.tableStyleInfo = style
+        ws.add_table(tab)
+        stream = BytesIO()
+        wb.save(stream)
+        stream.seek(0)
+        s = md5()
+        while True:
+            chunk = stream.read(1024)
+            if not chunk:
+                break
+            s.update(chunk)
+        stream.seek(0)
+        instance.md5sum = s.hexdigest()
+        instance.file_name = filename
+        instance.url.save(filename, ContentFile(stream.read()))
+        instance.task_status = 2
+    except Exception as e:
+        instance.task_status = 3
+        instance.description = str(e)[:250]
+    instance.save()

backend/dvadmin/system/tests.py

@@ -1 +1,56 @@
+from functools import wraps
+
+from django.db.models import Func, F, OuterRef, Exists
 from django.test import TestCase
+import django
+import os
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "application.settings")
+django.setup()
+from dvadmin.system.models import Menu, RoleMenuPermission, RoleMenuButtonPermission, MenuButton
+
+
+import time
+
+def timing_decorator(func):
+    @wraps(func)
+    def wrapper(*args, **kwargs):
+        start_time = time.time()
+        result = func(*args, **kwargs)
+        end_time = time.time()
+        run_time = end_time - start_time
+        print(f"{func.__name__} ran in {run_time:.6f} seconds")
+        return result
+    return wrapper
+
+@timing_decorator
+def getMenu():
+    data = []
+    queryset = Menu.objects.filter(status=1, is_catalog=False).values('name', 'id')
+    for item in queryset:
+        parent_list = Menu.get_all_parent(item['id'])
+        names = [d["name"] for d in parent_list]
+        completeName = "/".join(names)
+        isCheck = RoleMenuPermission.objects.filter(
+            menu__id=item['id'],
+            role__id=1,
+        ).exists()
+        mbCheck = RoleMenuButtonPermission.objects.filter(
+        menu_button = OuterRef("pk"),
+        role__id=1,
+        )
+        btns = MenuButton.objects.filter(
+            menu__id=item['id'],
+        ).annotate(isCheck=Exists(mbCheck)).values('id', 'name', 'value', 'isCheck',data_range=F('menu_button_permission__data_range'))
+        # print(b)
+        dicts = {
+            'name': completeName,
+            'id': item['id'],
+            'isCheck': isCheck,
+            'btns':btns
+        }
+        print(dicts)
+        data.append(dicts)
+    # print(data)
+
+if __name__ == '__main__':
+    getMenu()

backend/dvadmin/system/urls.py

@@ -18,6 +18,7 @@ from dvadmin.system.views.role_menu_button_permission import RoleMenuButtonPermi
 from dvadmin.system.views.system_config import SystemConfigViewSet
 from dvadmin.system.views.user import UserViewSet
 from dvadmin.system.views.menu_field import MenuFieldViewSet
+from dvadmin.system.views.download_center import DownloadCenterViewSet
 
 system_url = routers.SimpleRouter()
 system_url.register(r'menu', MenuViewSet)
@@ -35,6 +36,8 @@ system_url.register(r'message_center', MessageCenterViewSet)
 system_url.register(r'role_menu_button_permission', RoleMenuButtonPermissionViewSet)
 system_url.register(r'role_menu_permission', RoleMenuPermissionViewSet)
 system_url.register(r'column', MenuFieldViewSet)
+system_url.register(r'login_log', LoginLogViewSet)
+system_url.register(r'download_center', DownloadCenterViewSet)
 
 
 urlpatterns = [
@@ -44,9 +47,9 @@ urlpatterns = [
     path('system_config/get_association_table/', SystemConfigViewSet.as_view({'get': 'get_association_table'})),
     path('system_config/get_table_data/<int:pk>/', SystemConfigViewSet.as_view({'get': 'get_table_data'})),
     path('system_config/get_relation_info/', SystemConfigViewSet.as_view({'get': 'get_relation_info'})),
-    path('login_log/', LoginLogViewSet.as_view({'get': 'list'})),
-    path('login_log/<int:pk>/', LoginLogViewSet.as_view({'get': 'retrieve'})),
-    path('dept_lazy_tree/', DeptViewSet.as_view({'get': 'dept_lazy_tree'})),
+    # path('login_log/', LoginLogViewSet.as_view({'get': 'list'})),
+    # path('login_log/<int:pk>/', LoginLogViewSet.as_view({'get': 'retrieve'})),
+    # path('dept_lazy_tree/', DeptViewSet.as_view({'get': 'dept_lazy_tree'})),
     path('clause/privacy.html', PrivacyView.as_view()),
     path('clause/terms_service.html', TermsServiceView.as_view()),
 ]

backend/dvadmin/system/views/area.py

@@ -1,8 +1,10 @@
 # -*- coding: utf-8 -*-
+import pypinyin
 from django.db.models import Q
 from rest_framework import serializers
 
 from dvadmin.system.models import Area
+from dvadmin.utils.field_permission import FieldPermissionMixin
 from dvadmin.utils.json_response import SuccessResponse
 from dvadmin.utils.serializers import CustomModelSerializer
 from dvadmin.utils.viewset import CustomModelViewSet
@@ -14,13 +16,21 @@ class AreaSerializer(CustomModelSerializer):
     """
     pcode_count = serializers.SerializerMethodField(read_only=True)
     hasChild = serializers.SerializerMethodField()
+    pcode_info = serializers.SerializerMethodField()
+
+    def get_pcode_info(self, instance):
+        pcode = Area.objects.filter(code=instance.pcode_id).values("name", "code")
+        return pcode
+
     def get_pcode_count(self, instance: Area):
         return Area.objects.filter(pcode=instance).count()
+
     def get_hasChild(self, instance):
         hasChild = Area.objects.filter(pcode=instance.code)
         if hasChild:
             return True
         return False
+
     class Meta:
         model = Area
         fields = "__all__"
@@ -32,12 +42,24 @@ class AreaCreateUpdateSerializer(CustomModelSerializer):
     地区管理 创建/更新时的列化器
     """
 
+    def to_internal_value(self, data):
+        pinyin = ''.join([''.join(i) for i in pypinyin.pinyin(data["name"], style=pypinyin.NORMAL)])
+        data["level"] = 1
+        data["pinyin"] = pinyin
+        data["initials"] = pinyin[0].upper() if pinyin else "#"
+        pcode = data["pcode"] if 'pcode' in data else None
+        if pcode:
+            pcode = Area.objects.get(pk=pcode)
+            data["pcode"] = pcode.code
+            data["level"] = pcode.level + 1
+        return super().to_internal_value(data)
+
     class Meta:
         model = Area
         fields = '__all__'
 
 
-class AreaViewSet(CustomModelViewSet):
+class AreaViewSet(CustomModelViewSet, FieldPermissionMixin):
     """
     地区管理接口
     list:查询
@@ -48,24 +70,28 @@ class AreaViewSet(CustomModelViewSet):
     """
     queryset = Area.objects.all()
     serializer_class = AreaSerializer
+    create_serializer_class = AreaCreateUpdateSerializer
+    update_serializer_class = AreaCreateUpdateSerializer
     extra_filter_class = []
 
-    def get_queryset(self):
+    def list(self, request, *args, **kwargs):
         self.request.query_params._mutable = True
         params = self.request.query_params
-        pcode = params.get('pcode', None)
-        page = params.get('page', None)
-        limit = params.get('limit', None)
-        if page:
-            del params['page']
-        if limit:
-            del params['limit']
-        if params:
-            if pcode:
+        known_params = {'page', 'limit', 'pcode'}
+        # 使用集合操作检查是否有未知参数
+        other_params_exist = any(param not in known_params for param in params)
+        if other_params_exist:
+            queryset = self.queryset.filter(enable=True)
+        else:
+            pcode = params.get('pcode', None)
+            params['limit'] = 999
+            if params and pcode:
                 queryset = self.queryset.filter(enable=True, pcode=pcode)
             else:
-                queryset = self.queryset.filter(enable=True)
-        else:
-            queryset = self.queryset.filter(enable=True, pcode__isnull=True)
-        return queryset
-
+                queryset = self.queryset.filter(enable=True, level=1)
+        page = self.paginate_queryset(queryset)
+        if page is not None:
+            serializer = self.get_serializer(page, many=True, request=request)
+            return self.get_paginated_response(serializer.data)
+        serializer = self.get_serializer(queryset, many=True, request=request)
+        return SuccessResponse(data=serializer.data, msg="获取成功")

backend/dvadmin/system/views/dept.py

@@ -10,6 +10,7 @@ from rest_framework.decorators import action
 from rest_framework.permissions import IsAuthenticated
 
 from dvadmin.system.models import Dept, RoleMenuButtonPermission, Users
+from dvadmin.utils.filters import DataLevelPermissionsFilter
 from dvadmin.utils.json_response import DetailResponse, SuccessResponse, ErrorResponse
 from dvadmin.utils.serializers import CustomModelSerializer
 from dvadmin.utils.viewset import CustomModelViewSet
@@ -124,33 +125,7 @@ class DeptViewSet(CustomModelViewSet):
         data = serializer.data
         return SuccessResponse(data=data)
 
-    @action(methods=["GET"], detail=False, permission_classes=[IsAuthenticated], extra_filter_class=[])
-    def dept_lazy_tree(self, request, *args, **kwargs):
-        parent = self.request.query_params.get('parent')
-        is_superuser = request.user.is_superuser
-        if is_superuser:
-            queryset = Dept.objects.values('id', 'name', 'parent')
-        else:
-            role_ids = request.user.role.values_list('id', flat=True)
-            data_range = RoleMenuButtonPermission.objects.filter(role__in=role_ids).values_list('data_range', flat=True)
-            user_dept_id = request.user.dept.id
-            dept_list = [user_dept_id]
-            data_range_list = list(set(data_range))
-            for item in data_range_list:
-                if item in [0, 2]:
-                    dept_list = [user_dept_id]
-                elif item == 1:
-                    dept_list = Dept.recursion_all_dept(dept_id=user_dept_id)
-                elif item == 3:
-                    dept_list = Dept.objects.values_list('id', flat=True)
-                elif item == 4:
-                    dept_list = request.user.role.values_list('dept', flat=True)
-                else:
-                    dept_list = []
-            queryset = Dept.objects.filter(id__in=dept_list).values('id', 'name', 'parent')
-        return DetailResponse(data=queryset, msg="获取成功")
-
-    @action(methods=["GET"], detail=False, permission_classes=[IsAuthenticated], extra_filter_class=[])
+    @action(methods=["GET"], detail=False, permission_classes=[IsAuthenticated])
     def all_dept(self, request, *args, **kwargs):
         queryset = self.filter_queryset(self.get_queryset())
         data = queryset.filter(status=True).order_by('sort').values('name', 'id', 'parent')

backend/dvadmin/system/views/download_center.py

@@ -0,0 +1,49 @@
+from rest_framework import serializers
+from django.conf import settings
+from django_filters.rest_framework import FilterSet, CharFilter
+
+from dvadmin.utils.serializers import CustomModelSerializer
+from dvadmin.utils.viewset import CustomModelViewSet
+from dvadmin.system.models import DownloadCenter
+
+
+class DownloadCenterSerializer(CustomModelSerializer):
+    url = serializers.SerializerMethodField(read_only=True)
+
+    def get_url(self, instance):
+        if self.request.query_params.get('prefix'):
+            if settings.ENVIRONMENT in ['local']:
+                prefix = 'http://127.0.0.1:8000'
+            elif settings.ENVIRONMENT in ['test']:
+                prefix = 'http://{host}/api'.format(host=self.request.get_host())
+            else:
+                prefix = 'https://{host}/api'.format(host=self.request.get_host())
+            return (f'{prefix}/media/{str(instance.url)}')
+        return f'media/{str(instance.url)}'
+
+    class Meta:
+        model = DownloadCenter
+        fields = "__all__"
+        read_only_fields = ["id"]
+
+
+class DownloadCenterFilterSet(FilterSet):
+    task_name = CharFilter(field_name='task_name', lookup_expr='icontains')
+    file_name = CharFilter(field_name='file_name', lookup_expr='icontains')
+
+    class Meta:
+        model = DownloadCenter
+        fields = ['task_status', 'task_name', 'file_name']
+
+
+class DownloadCenterViewSet(CustomModelViewSet):
+    queryset = DownloadCenter.objects.all()
+    serializer_class = DownloadCenterSerializer
+    filter_class = DownloadCenterFilterSet
+    permission_classes = []
+    extra_filter_class = []
+
+    def get_queryset(self):
+        if self.request.user.is_superuser:
+            return super().get_queryset()
+        return super().get_queryset().filter(creator=self.request.user)

backend/dvadmin/system/views/file_list.py

@@ -1,12 +1,15 @@
 import hashlib
 import mimetypes
 
+import django_filters
+from django.conf import settings
+from django.db import connection
 from rest_framework import serializers
 from rest_framework.decorators import action
 
 from application import dispatch
 from dvadmin.system.models import FileList
-from dvadmin.utils.json_response import DetailResponse
+from dvadmin.utils.json_response import DetailResponse, SuccessResponse
 from dvadmin.utils.serializers import CustomModelSerializer
 from dvadmin.utils.viewset import CustomModelViewSet
 
@@ -15,7 +18,16 @@ class FileSerializer(CustomModelSerializer):
     url = serializers.SerializerMethodField(read_only=True)
 
     def get_url(self, instance):
-        # return 'media/' + str(instance.url)
+        if self.request.query_params.get('prefix'):
+            if settings.ENVIRONMENT in ['local']:
+                prefix = 'http://127.0.0.1:8000'
+            elif settings.ENVIRONMENT in ['test']:
+                prefix = 'http://{host}/api'.format(host=self.request.get_host())
+            else:
+                prefix = 'https://{host}/api'.format(host=self.request.get_host())
+            if instance.file_url:
+                return instance.file_url if instance.file_url.startswith('http') else f"{prefix}/{instance.file_url}"
+            return (f'{prefix}/media/{str(instance.url)}')
         return instance.file_url or (f'media/{str(instance.url)}')
 
     class Meta:
@@ -35,6 +47,8 @@ class FileSerializer(CustomModelSerializer):
         validated_data['md5sum'] = md5.hexdigest()
         validated_data['engine'] = file_engine
         validated_data['mime_type'] = file.content_type
+        ft = {'image':0,'video':1,'audio':2}.get(file.content_type.split('/')[0], None)
+        validated_data['file_type'] = 3 if ft is None else ft
         if file_backup:
             validated_data['url'] = file
         if file_engine == 'oss':
@@ -64,6 +78,22 @@ class FileSerializer(CustomModelSerializer):
         return super().create(validated_data)
 
 
+class FileAllSerializer(CustomModelSerializer):
+    
+    class Meta:
+        model = FileList
+        fields = ['id', 'name']
+
+
+class FileFilter(django_filters.FilterSet):
+    name = django_filters.CharFilter(field_name="name", lookup_expr="icontains", help_text="文件名")
+    mime_type = django_filters.CharFilter(field_name="mime_type", lookup_expr="icontains", help_text="文件类型")
+
+    class Meta:
+        model = FileList
+        fields = ['name', 'mime_type', 'upload_method', 'file_type']
+
+
 class FileViewSet(CustomModelViewSet):
     """
     文件管理接口
@@ -75,5 +105,22 @@ class FileViewSet(CustomModelViewSet):
     """
     queryset = FileList.objects.all()
     serializer_class = FileSerializer
-    filter_fields = ['name', ]
+    filter_class = FileFilter
     permission_classes = []
+
+    @action(methods=['GET'], detail=False)
+    def get_all(self, request):
+        data1 = self.get_serializer(self.get_queryset(), many=True).data
+        data2 = []
+        if dispatch.is_tenants_mode():
+            from django_tenants.utils import schema_context
+            with schema_context('public'):
+                data2 = self.get_serializer(FileList.objects.all(), many=True).data
+        return DetailResponse(data=data2+data1)
+
+    def list(self, request, *args, **kwargs):
+        if self.request.query_params.get('system', 'False') == 'True' and dispatch.is_tenants_mode():
+            from django_tenants.utils import schema_context
+            with schema_context('public'):
+                return super().list(request, *args, **kwargs)
+        return super().list(request, *args, **kwargs)

backend/dvadmin/system/views/login.py

@@ -4,11 +4,15 @@ from datetime import datetime, timedelta
 from captcha.views import CaptchaStore, captcha_image
 from django.contrib import auth
 from django.contrib.auth import login
+from django.contrib.auth.hashers import check_password, make_password
+from django.db.models import Q
 from django.shortcuts import redirect
 from django.utils.translation import gettext_lazy as _
 from drf_yasg import openapi
 from drf_yasg.utils import swagger_auto_schema
 from rest_framework import serializers
+from rest_framework.decorators import action
+from rest_framework.permissions import IsAuthenticated
 from rest_framework.views import APIView
 from rest_framework_simplejwt.serializers import TokenObtainPairSerializer
 from rest_framework_simplejwt.views import TokenObtainPairView
@@ -83,31 +87,50 @@ class LoginSerializer(TokenObtainPairSerializer):
                 else:
                     self.image_code and self.image_code.delete()
                     raise CustomValidationError("图片验证码错误")
-
-        user = Users.objects.get(username=attrs['username'])
+        try:
+            user = Users.objects.get(
+                Q(username=attrs['username']) | Q(email=attrs['username']) | Q(mobile=attrs['username']))
+        except Users.DoesNotExist:
+            raise CustomValidationError("您登录的账号不存在")
+        except Users.MultipleObjectsReturned:
+            raise CustomValidationError("您登录的账号存在多个,请联系管理员检查登录账号唯一性")
         if not user.is_active:
-            raise CustomValidationError("账号被锁定")
-
-        data = super().validate(attrs)
-        data["name"] = self.user.name
-        data["userId"] = self.user.id
-        data["avatar"] = self.user.avatar
-        data['user_type'] = self.user.user_type
-        dept = getattr(self.user, 'dept', None)
-        if dept:
-            data['dept_info'] = {
-                'dept_id': dept.id,
-                'dept_name': dept.name,
-
-            }
-        role = getattr(self.user, 'role', None)
-        if role:
-            data['role_info'] = role.values('id', 'name', 'key')
-        request = self.context.get("request")
-        request.user = self.user
-        # 记录登录日志
-        save_login_log(request=request)
-        return {"code": 2000, "msg": "请求成功", "data": data}
+            raise CustomValidationError("账号已被锁定,联系管理员解锁")
+        try:
+            # 必须重置用户名为username,否则使用邮箱手机号登录会提示密码错误
+            attrs['username'] = user.username
+            data = super().validate(attrs)
+            data["username"] = self.user.username
+            data["name"] = self.user.name
+            data["userId"] = self.user.id
+            data["avatar"] = self.user.avatar
+            data['user_type'] = self.user.user_type
+            data['pwd_change_count'] = self.user.pwd_change_count
+            dept = getattr(self.user, 'dept', None)
+            if dept:
+                data['dept_info'] = {
+                    'dept_id': dept.id,
+                    'dept_name': dept.name,
+                }
+            role = getattr(self.user, 'role', None)
+            if role:
+                data['role_info'] = role.values('id', 'name', 'key')
+            request = self.context.get("request")
+            request.user = self.user
+            # 记录登录日志
+            save_login_log(request=request)
+            user.login_error_count = 0
+            user.save()
+            return {"code": 2000, "msg": "请求成功", "data": data}
+        except Exception as e:
+            user.login_error_count += 1
+            if user.login_error_count >= 5:
+                user.is_active = False
+                user.save()
+                raise CustomValidationError("账号已被锁定,联系管理员解锁")
+            user.save()
+            count = 5 - user.login_error_count
+            raise CustomValidationError(f"账号/密码错误;重试{count}次后将被锁定~")
 
 
 class LoginView(TokenObtainPairView):

backend/dvadmin/system/views/login_log.py

@@ -7,6 +7,7 @@
 @Remark: 按钮权限管理
 """
 from dvadmin.system.models import LoginLog
+from dvadmin.utils.field_permission import FieldPermissionMixin
 from dvadmin.utils.serializers import CustomModelSerializer
 from dvadmin.utils.viewset import CustomModelViewSet
 
@@ -22,7 +23,7 @@ class LoginLogSerializer(CustomModelSerializer):
         read_only_fields = ["id"]
 
 
-class LoginLogViewSet(CustomModelViewSet):
+class LoginLogViewSet(CustomModelViewSet, FieldPermissionMixin):
     """
     登录日志接口
     list:查询
@@ -33,4 +34,4 @@ class LoginLogViewSet(CustomModelViewSet):
     """
     queryset = LoginLog.objects.all()
     serializer_class = LoginLogSerializer
-    extra_filter_class = []
+    # extra_filter_class = []

backend/dvadmin/system/views/menu.py

@@ -120,11 +120,11 @@ class MenuViewSet(CustomModelViewSet):
         """用于前端获取当前角色的路由"""
         user = request.user
         if user.is_superuser:
-            queryset = self.queryset.filter(status=1)
+            queryset = self.queryset.filter(status=1).order_by("sort")
         else:
             role_list = user.role.values_list('id', flat=True)
             menu_list = RoleMenuPermission.objects.filter(role__in=role_list).values_list('menu_id', flat=True)
-            queryset = Menu.objects.filter(id__in=menu_list)
+            queryset = Menu.objects.filter(id__in=menu_list).order_by("sort")
         serializer = WebRouterSerializer(queryset, many=True, request=request)
         data = serializer.data
         return SuccessResponse(data=data, total=len(data), msg="获取成功")

backend/dvadmin/system/views/menu_button.py

@@ -10,12 +10,14 @@ from django.db.models import F
 from rest_framework.decorators import action
 from rest_framework.permissions import IsAuthenticated
 
-from dvadmin.system.models import MenuButton, RoleMenuButtonPermission
+from dvadmin.system.models import MenuButton, RoleMenuButtonPermission, Menu
 from dvadmin.utils.json_response import DetailResponse, SuccessResponse
 from dvadmin.utils.serializers import CustomModelSerializer
 from dvadmin.utils.viewset import CustomModelViewSet
 
 
+
+
 class MenuButtonSerializer(CustomModelSerializer):
     """
     菜单按钮-序列化器
@@ -81,3 +83,26 @@ class MenuButtonViewSet(CustomModelViewSet):
             role_id = request.user.role.values_list('id', flat=True)
             queryset = RoleMenuButtonPermission.objects.filter(role__in=role_id).values_list('menu_button__value',flat=True).distinct()
         return DetailResponse(data=queryset)
+
+    @action(methods=['post'], detail=False, permission_classes=[IsAuthenticated])
+    def batch_create(self, request, *args, **kwargs):
+        """
+        批量创建菜单“增删改查查”权限
+        创建的数据来源于菜单，需要规范创建菜单参数
+        value：菜单的component_name:method
+        api:菜单的web_path增加'/api'前缀，并根据method增加{id}
+        """
+        menu_obj = Menu.objects.filter(id=request.data['menu']).first()
+        result_list = [
+            {'menu': menu_obj.id, 'name': '新增', 'value': f'{menu_obj.component_name}:Create', 'api': f'/api/{menu_obj.component_name}/', 'method': 1},
+            {'menu': menu_obj.id, 'name': '删除', 'value': f'{menu_obj.component_name}:Delete', 'api': f'/api/{menu_obj.component_name}/{{id}}/', 'method': 3},
+            {'menu': menu_obj.id, 'name': '编辑', 'value': f'{menu_obj.component_name}:Update', 'api': f'/api/{menu_obj.component_name}/{{id}}/', 'method': 2},
+            {'menu': menu_obj.id, 'name': '查询', 'value': f'{menu_obj.component_name}:Search', 'api': f'/api/{menu_obj.component_name}/', 'method': 0},
+            {'menu': menu_obj.id, 'name': '详情', 'value': f'{menu_obj.component_name}:Retrieve', 'api': f'/api/{menu_obj.component_name}/{{id}}/', 'method': 0},
+            {'menu': menu_obj.id, 'name': '复制', 'value': f'{menu_obj.component_name}:Copy', 'api': f'/api/{menu_obj.component_name}/', 'method': 1},
+            {'menu': menu_obj.id, 'name': '导入', 'value': f'{menu_obj.component_name}:Import', 'api': f'/api/{menu_obj.component_name}/import_data/', 'method': 1},
+            {'menu': menu_obj.id, 'name': '导出', 'value': f'{menu_obj.component_name}:Export', 'api': f'/api{menu_obj.component_name}/export_data/', 'method': 1},]
+        serializer = self.get_serializer(data=result_list, many=True)
+        serializer.is_valid(raise_exception=True)
+        serializer.save()
+        return SuccessResponse(serializer.data, msg="批量创建成功")

backend/dvadmin/system/views/message_center.py

@@ -36,6 +36,8 @@ class MessageCenterSerializer(CustomModelSerializer):
         return serializer.data
 
     def get_user_info(self, instance, parsed_query):
+        if instance.target_type  in (1,2,3):
+            return []
         users = instance.target_user.all()
         # You can do what ever you want in here
         # `parsed_query` param is passed to BookSerializer to allow further querying
@@ -80,6 +82,9 @@ class MessageCenterTargetUserListSerializer(CustomModelSerializer):
     """
     目标用户序列化器-序列化器
     """
+    role_info = DynamicSerializerMethodField()
+    user_info = DynamicSerializerMethodField()
+    dept_info = DynamicSerializerMethodField()
     is_read = serializers.SerializerMethodField()
 
     def get_is_read(self, instance):
@@ -90,6 +95,44 @@ class MessageCenterTargetUserListSerializer(CustomModelSerializer):
             return queryset.is_read
         return False
 
+    def get_role_info(self, instance, parsed_query):
+        roles = instance.target_role.all()
+        # You can do what ever you want in here
+        # `parsed_query` param is passed to BookSerializer to allow further querying
+        from dvadmin.system.views.role import RoleSerializer
+        serializer = RoleSerializer(
+            roles,
+            many=True,
+            parsed_query=parsed_query
+        )
+        return serializer.data
+
+    def get_user_info(self, instance, parsed_query):
+        if instance.target_type  in (1,2,3):
+            return []
+        users = instance.target_user.all()
+        # You can do what ever you want in here
+        # `parsed_query` param is passed to BookSerializer to allow further querying
+        from dvadmin.system.views.user import UserSerializer
+        serializer = UserSerializer(
+            users,
+            many=True,
+            parsed_query=parsed_query
+        )
+        return serializer.data
+
+    def get_dept_info(self, instance, parsed_query):
+        dept = instance.target_dept.all()
+        # You can do what ever you want in here
+        # `parsed_query` param is passed to BookSerializer to allow further querying
+        from dvadmin.system.views.dept import DeptSerializer
+        serializer = DeptSerializer(
+            dept,
+            many=True,
+            parsed_query=parsed_query
+        )
+        return serializer.data
+
     class Meta:
         model = MessageCenter
         fields = "__all__"

backend/dvadmin/system/views/role.py

@@ -10,22 +10,29 @@ from rest_framework import serializers
 from rest_framework.decorators import action
 from rest_framework.permissions import IsAuthenticated
 
-from dvadmin.system.models import Role, Menu, MenuButton, Dept
+from dvadmin.system.models import Role, Menu, MenuButton, Dept, Users
 from dvadmin.system.views.dept import DeptSerializer
 from dvadmin.system.views.menu import MenuSerializer
 from dvadmin.system.views.menu_button import MenuButtonSerializer
 from dvadmin.utils.crud_mixin import FastCrudMixin
 from dvadmin.utils.field_permission import FieldPermissionMixin
-from dvadmin.utils.json_response import SuccessResponse, DetailResponse
+from dvadmin.utils.json_response import SuccessResponse, DetailResponse, ErrorResponse
 from dvadmin.utils.serializers import CustomModelSerializer
 from dvadmin.utils.validator import CustomUniqueValidator
 from dvadmin.utils.viewset import CustomModelViewSet
+from dvadmin.utils.permission import CustomPermission
 
 
 class RoleSerializer(CustomModelSerializer):
     """
     角色-序列化器
     """
+    users = serializers.SerializerMethodField()
+
+    @staticmethod
+    def get_users(instance):
+        users = instance.users_set.exclude(id=1).values('id', 'name', 'dept__name')
+        return users
 
     class Meta:
         model = Role
@@ -47,12 +54,12 @@ class RoleCreateUpdateSerializer(CustomModelSerializer):
     def validate(self, attrs: dict):
         return super().validate(attrs)
 
-    def save(self, **kwargs):
-        is_superuser = self.request.user.is_superuser
-        if not is_superuser:
-            self.validated_data.pop('admin')
-        data = super().save(**kwargs)
-        return data
+    # def save(self, **kwargs):
+    #     is_superuser = self.request.user.is_superuser
+    #     if not is_superuser:
+    #         self.validated_data.pop('admin')
+    #     data = super().save(**kwargs)
+    #     return data
 
     class Meta:
         model = Role
@@ -101,7 +108,6 @@ class MenuButtonPermissionSerializer(CustomModelSerializer):
         fields = '__all__'
 
 
-
 class RoleViewSet(CustomModelViewSet, FastCrudMixin,FieldPermissionMixin):
     """
     角色管理接口
@@ -116,3 +122,82 @@ class RoleViewSet(CustomModelViewSet, FastCrudMixin,FieldPermissionMixin):
     create_serializer_class = RoleCreateUpdateSerializer
     update_serializer_class = RoleCreateUpdateSerializer
     search_fields = ['name', 'key']
+
+    @action(methods=['PUT'], detail=True, permission_classes=[IsAuthenticated])
+    def set_role_users(self, request, pk):
+        """
+        设置 角色-用户
+        :param request:
+        :return:
+        """
+        data = request.data
+        direction = data.get('direction')
+        movedKeys = data.get('movedKeys')
+        role = Role.objects.get(pk=pk)
+        if direction == "left":
+            # left : 移除用户权限
+            role.users_set.remove(*movedKeys)
+        else:
+            # right : 添加用户权限
+            role.users_set.add(*movedKeys)
+        serializer = RoleSerializer(role)
+        return DetailResponse(data=serializer.data, msg="更新成功")
+
+    @action(methods=['GET'], detail=False, permission_classes=[IsAuthenticated, CustomPermission])
+    def get_role_users(self, request):
+        """
+        获取角色已授权、未授权的用户
+        已授权的用户:1
+        未授权的用户:0
+        """
+        role_id = request.query_params.get('role_id', None)
+
+        if not role_id:
+            return ErrorResponse(msg="请选择角色")
+
+        if request.query_params.get('authorized', 0) == "1":
+            queryset = Users.objects.filter(role__id=role_id).exclude(is_superuser=True)
+        else:
+            queryset = Users.objects.exclude(role__id=role_id).exclude(is_superuser=True)
+
+        if name := request.query_params.get('name', None):
+            queryset = queryset.filter(name__icontains=name)
+
+        if dept := request.query_params.get('dept', None):
+            queryset = queryset.filter(dept=dept)
+
+        page = self.paginate_queryset(queryset.values('id', 'name', 'dept__name'))
+        if page is not None:
+            return self.get_paginated_response(page)
+
+        return SuccessResponse(data=page)
+
+    @action(methods=['DELETE'], detail=True, permission_classes=[IsAuthenticated, CustomPermission])
+    def remove_role_user(self, request, pk):
+        """
+        角色-删除用户
+        """
+        user_id = request.data.get('user_id', None)
+
+        if not user_id:
+            return ErrorResponse(msg="请选择用户")
+
+        role = self.get_object()
+        role.users_set.remove(*user_id)
+
+        return SuccessResponse(msg="删除成功")
+
+    @action(methods=['POST'], detail=True, permission_classes=[IsAuthenticated, CustomPermission])
+    def add_role_users(self, request, pk):
+        """
+        角色-添加用户
+        """
+        users_id = request.data.get('users_id', None)
+
+        if not users_id:
+            return ErrorResponse(msg="请选择用户")
+
+        role = self.get_object()
+        role.users_set.add(*users_id)
+
+        return DetailResponse(msg="添加成功")

backend/dvadmin/system/views/role_menu_button_permission.py

@@ -6,33 +6,31 @@
 @Created on: 2021/6/3 003 0:30
 @Remark: 菜单按钮管理
 """
-from django.db.models import F, Subquery, OuterRef, Exists
 from rest_framework import serializers
 from rest_framework.decorators import action
 from rest_framework.permissions import IsAuthenticated
 
-from dvadmin.system.models import RoleMenuButtonPermission, Menu, MenuButton, Dept, RoleMenuPermission, FieldPermission, \
-    MenuField
-from dvadmin.system.views.menu import MenuSerializer
-from dvadmin.utils.json_response import DetailResponse, ErrorResponse
+from dvadmin.system.models import RoleMenuButtonPermission, Menu, Dept, MenuButton, RoleMenuPermission, \
+    MenuField, FieldPermission
+from dvadmin.utils.json_response import DetailResponse
 from dvadmin.utils.serializers import CustomModelSerializer
 from dvadmin.utils.viewset import CustomModelViewSet
 
 
 class RoleMenuButtonPermissionSerializer(CustomModelSerializer):
     """
-    菜单按钮-序列化器
+    角色-菜单-按钮-权限 查询序列化
     """
+
     class Meta:
         model = RoleMenuButtonPermission
         fields = "__all__"
         read_only_fields = ["id"]
 
 
-
 class RoleMenuButtonPermissionCreateUpdateSerializer(CustomModelSerializer):
     """
-    初始化菜单按钮-序列化器
+    角色-菜单-按钮-权限 创建/修改序列化
     """
     menu_button__name = serializers.CharField(source='menu_button.name', read_only=True)
     menu_button__value = serializers.CharField(source='menu_button.value', read_only=True)
@@ -43,107 +41,108 @@ class RoleMenuButtonPermissionCreateUpdateSerializer(CustomModelSerializer):
         read_only_fields = ["id"]
 
 
-class RoleButtonPermissionSerializer(CustomModelSerializer):
+class RoleMenuSerializer(CustomModelSerializer):
     """
-    角色按钮权限
+    角色-菜单 序列化
     """
     isCheck = serializers.SerializerMethodField()
-    data_range = serializers.SerializerMethodField()
 
     def get_isCheck(self, instance):
         params = self.request.query_params
+        data = self.request.data
+        return RoleMenuPermission.objects.filter(
+            menu_id=instance.id,
+            role_id=params.get('roleId', data.get('roleId')),
+        ).exists()
+
+    class Meta:
+        model = Menu
+        fields = ["id", "name", "parent", "is_catalog", "isCheck"]
+
+
+class RoleMenuButtonSerializer(CustomModelSerializer):
+    """
+    角色-菜单-按钮 序列化
+    """
+    isCheck = serializers.SerializerMethodField()
+    data_range = serializers.SerializerMethodField()
+    role_menu_btn_perm_id = serializers.SerializerMethodField()
+    dept = serializers.SerializerMethodField()
+
+    def get_isCheck(self, instance):
+        params = self.request.query_params
+        data = self.request.data
         return RoleMenuButtonPermission.objects.filter(
-            menu_button__id=instance['id'],
-            role__id=params.get('role'),
+            menu_button_id=instance.id,
+            role_id=params.get('roleId', data.get('roleId')),
         ).exists()
 
     def get_data_range(self, instance):
-        params = self.request.query_params
-        obj = RoleMenuButtonPermission.objects.filter(
-            menu_button__id=instance['id'],
-            role__id=params.get('role'),
-        ).first()
+        obj = self.get_role_menu_btn_prem(instance)
         if obj is None:
             return None
         return obj.data_range
 
+    def get_role_menu_btn_perm_id(self, instance):
+        obj = self.get_role_menu_btn_prem(instance)
+        if obj is None:
+            return None
+        return obj.id
+
+    def get_dept(self, instance):
+        obj = self.get_role_menu_btn_prem(instance)
+        if obj is None:
+            return None
+        return obj.dept.all().values_list('id', flat=True)
+
+    def get_role_menu_btn_prem(self, instance):
+        params = self.request.query_params
+        data = self.request.data
+        obj = RoleMenuButtonPermission.objects.filter(
+            menu_button_id=instance.id,
+            role_id=params.get('roleId', data.get('roleId')),
+        ).first()
+        return obj
 
     class Meta:
         model = MenuButton
-        fields = ['id','name','value','isCheck','data_range']
+        fields = ['id', 'menu', 'name', 'isCheck', 'data_range', 'role_menu_btn_perm_id', 'dept']
 
-class RoleFieldPermissionSerializer(CustomModelSerializer):
-
-    class Meta:
-        model = FieldPermission
-        fields = "__all__"
 
 class RoleMenuFieldSerializer(CustomModelSerializer):
+    """
+    角色-菜单-字段 序列化
+    """
     is_query = serializers.SerializerMethodField()
     is_create = serializers.SerializerMethodField()
     is_update = serializers.SerializerMethodField()
 
     def get_is_query(self, instance):
         params = self.request.query_params
-        queryset = instance.menu_field.filter(role=params.get('role')).first()
+        queryset = instance.menu_field.filter(role=params.get('roleId')).first()
         if queryset:
             return queryset.is_query
         return False
 
     def get_is_create(self, instance):
         params = self.request.query_params
-        queryset = instance.menu_field.filter(role=params.get('role')).first()
+        queryset = instance.menu_field.filter(role=params.get('roleId')).first()
         if queryset:
             return queryset.is_create
         return False
 
     def get_is_update(self, instance):
         params = self.request.query_params
-        queryset = instance.menu_field.filter(role=params.get('role')).first()
+        queryset = instance.menu_field.filter(role=params.get('roleId')).first()
         if queryset:
             return queryset.is_update
         return False
+
     class Meta:
         model = MenuField
-        fields = ['id','field_name','title','is_query','is_create','is_update']
+        fields = ['id', 'field_name', 'title', 'is_query', 'is_create', 'is_update']
 
 
-class RoleMenuPermissionSerializer(CustomModelSerializer):
-    """
-    菜单和按钮权限
-    """
-    name = serializers.SerializerMethodField()
-    isCheck = serializers.SerializerMethodField()
-    btns = serializers.SerializerMethodField()
-    columns = serializers.SerializerMethodField()
-
-    def get_name(self, instance):
-        parent_list = Menu.get_all_parent(instance['id'])
-        names = [d["name"] for d in parent_list]
-        return "/".join(names)
-    def get_isCheck(self, instance):
-        params = self.request.query_params
-        return RoleMenuPermission.objects.filter(
-            menu__id=instance['id'],
-            role__id=params.get('role'),
-        ).exists()
-
-    def get_btns(self, instance):
-        btn_list = MenuButton.objects.filter(menu__id=instance['id']).values('id', 'name', 'value')
-        serializer = RoleButtonPermissionSerializer(btn_list,many=True,request=self.request)
-        return  serializer.data
-
-    def get_columns(self, instance):
-        col_list = MenuField.objects.filter(menu=instance['id'])
-        serializer = RoleMenuFieldSerializer(col_list,many=True,request=self.request)
-        return serializer.data
-
-
-
-    class Meta:
-        model = Menu
-        fields = ['id','name','isCheck','btns','columns']
-
 class RoleMenuButtonPermissionViewSet(CustomModelViewSet):
     """
     菜单按钮接口
@@ -160,167 +159,110 @@ class RoleMenuButtonPermissionViewSet(CustomModelViewSet):
     extra_filter_class = []
 
     @action(methods=['GET'], detail=False, permission_classes=[IsAuthenticated])
-    def get_role_premission(self, request):
+    def get_role_menu(self, request):
         """
-        角色授权获取:
-        :param request: role
-        :return: menu,btns,columns
+        获取 角色-菜单
+        :param request:
+        :return:
+        """
+        menu_queryset = Menu.objects.all()
+        serializer = RoleMenuSerializer(menu_queryset, many=True, request=request)
+        return DetailResponse(data=serializer.data)
+
+    @action(methods=['PUT'], detail=False, permission_classes=[IsAuthenticated])
+    def set_role_menu(self, request):
+        """
+        设置 角色-菜单
+        :param request:
+        :return:
+        """
+        data = request.data
+        roleId = data.get('roleId')
+        menuId = data.get('menuId')
+        isCheck = data.get('isCheck')
+        if isCheck:
+            # 添加权限：创建关联记录
+            instance = RoleMenuPermission.objects.create(role_id=roleId, menu_id=menuId)
+        else:
+            # 删除权限：移除关联记录
+            RoleMenuPermission.objects.filter(role_id=roleId, menu_id=menuId).delete()
+        menu_instance = Menu.objects.get(id=menuId)
+        serializer = RoleMenuSerializer(menu_instance, request=request)
+        return DetailResponse(data=serializer.data, msg="更新成功")
+
+    @action(methods=['GET'], detail=False, permission_classes=[IsAuthenticated])
+    def get_role_menu_btn_field(self, request):
+        """
+        获取 角色-菜单-按钮-列字段
+        :param request:
+        :return:
         """
         params = request.query_params
-        role = params.get('role',None)
-        if  role is None:
-            return ErrorResponse(msg="未获取到角色信息")
-        is_superuser = request.user.is_superuser
-        if is_superuser:
-            queryset = Menu.objects.filter(status=1,is_catalog=False).values('name', 'id').all()
-        else:
-            role_id = request.user.role.values_list('id', flat=True)
-            menu_list = RoleMenuPermission.objects.filter(role__in=role_id).values_list('id',flat=True)
-            queryset = Menu.objects.filter(status=1, is_catalog=False,id__in=menu_list).values('name', 'id').all()
-        serializer = RoleMenuPermissionSerializer(queryset,many=True,request=request)
-        data = serializer.data
-        return DetailResponse(data=data)
+        menuId = params.get('menuId', None)
+        menu_btn_queryset = MenuButton.objects.filter(menu_id=menuId)
+        menu_btn_serializer = RoleMenuButtonSerializer(menu_btn_queryset, many=True, request=request)
+        menu_field_queryset = MenuField.objects.filter(menu_id=menuId)
+        menu_field_serializer = RoleMenuFieldSerializer(menu_field_queryset, many=True, request=request)
+        return DetailResponse(data={'menu_btn': menu_btn_serializer.data, 'menu_field': menu_field_serializer.data})
 
     @action(methods=['PUT'], detail=True, permission_classes=[IsAuthenticated])
-    def set_role_premission(self,request,pk):
+    def set_role_menu_field(self, request, pk):
         """
-        对角色的菜单和按钮及按钮范围授权:
-        :param request:
-        :param pk: role
-        :return:
+        设置 角色-菜单-列字段
         """
-        body = request.data
-        RoleMenuPermission.objects.filter(role=pk).delete()
-        RoleMenuButtonPermission.objects.filter(role=pk).delete()
-        for menu in body:
-            if menu.get('isCheck'):
-                menu_parent = Menu.get_all_parent(menu.get('id'))
-                role_menu_permission_list = []
-                for d in menu_parent:
-                    role_menu_permission_list.append(RoleMenuPermission(role_id=pk, menu_id=d["id"]))
-                RoleMenuPermission.objects.bulk_create(role_menu_permission_list)
-                # RoleMenuPermission.objects.create(role_id=pk, menu_id=menu.get('id'))
-            for btn in menu.get('btns'):
-                if btn.get('isCheck'):
-                    data_range = btn.get('data_range',0) or 0
-                    instance = RoleMenuButtonPermission.objects.create(role_id=pk, menu_button_id=btn.get('id'),data_range=data_range)
-                    instance.dept.set(btn.get('dept',[]))
-            for col in menu.get('columns'):
-                FieldPermission.objects.update_or_create(role_id=pk,field_id=col.get('id'),is_query=col.get('is_query'),is_create=col.get('is_create'),is_update=col.get('is_update'))
-        return DetailResponse(msg="授权成功")
+        data = request.data
+        for col in data:
+            FieldPermission.objects.update_or_create(
+                role_id=pk, field_id=col.get('id'),
+                defaults={
+                    'is_create': col.get('is_create'),
+                    'is_update': col.get('is_update'),
+                    'is_query': col.get('is_query'),
+                })
 
+        return DetailResponse(data=[], msg="更新成功")
 
+    @action(methods=['PUT'], detail=False, permission_classes=[IsAuthenticated])
+    def set_role_menu_btn(self, request):
+        """
+        设置 角色-菜单-按钮
+        """
+        data = request.data
+        isCheck = data.get('isCheck', None)
+        roleId = data.get('roleId', None)
+        btnId = data.get('btnId', None)
+        data_range = data.get('data_range', None) or 0  # 默认仅本人权限
+        dept = data.get('dept', None) or []  # 默认空部门
 
-    @action(methods=['GET'], detail=False, permission_classes=[IsAuthenticated])
-    def role_menu_get_button(self, request):
-        """
-        当前用户角色和菜单获取可下拉选项的按钮:角色授权页面使用
-        :param request:
-        :return:
-        """
-        if params := request.query_params:
-            if menu_id := params.get('menu', None):
-                is_superuser = request.user.is_superuser
-                if is_superuser:
-                    queryset = MenuButton.objects.filter(menu=menu_id).values('id', 'name')
-                else:
-                    role_list = request.user.role.values_list('id', flat=True)
-                    queryset = RoleMenuButtonPermission.objects.filter(
-                        role__in=role_list, menu_button__menu=menu_id
-                    ).values(btn_id=F('menu_button__id'), name=F('menu_button__name'))
-                return DetailResponse(data=queryset)
-        return ErrorResponse(msg="参数错误")
-
-    @action(methods=['GET'], detail=False, permission_classes=[IsAuthenticated])
-    def data_scope(self, request):
-        """
-        获取数据权限范围:角色授权页面使用
-        :param request:
-        :return:
-        """
-        is_superuser = request.user.is_superuser
-        if is_superuser:
-            data = [
-                {
-                    "value": 0,
-                    "label": '仅本人数据权限'
-                },
-                {
-                    "value": 1,
-                    "label": '本部门及以下数据权限'
-                },
-                {
-                    "value": 2,
-                    "label": '本部门数据权限'
-                },
-                {
-                    "value": 3,
-                    "label": '全部数据权限'
-                },
-                {
-                    "value": 4,
-                    "label": '自定义数据权限'
-                }
-            ]
-            return DetailResponse(data=data)
+        if isCheck:
+            # 添加权限：创建关联记录
+            instance = RoleMenuButtonPermission.objects.create(role_id=roleId,
+                                                               menu_button_id=btnId,
+                                                               data_range=data_range)
+            # 自定义部门权限
+            if data_range == 4 and dept:
+                instance.dept.set(dept)
         else:
-            data = []
-            role_list = request.user.role.values_list('id', flat=True)
-            if params := request.query_params:
-                if menu_button_id := params.get('menu_button', None):
-                    role_queryset = RoleMenuButtonPermission.objects.filter(
-                        role__in=role_list, menu_button__id=menu_button_id
-                    ).values_list('data_range', flat=True)
-                    data_range_list = list(set(role_queryset))
-                    for item in data_range_list:
-                        if item == 0:
-                            data = [{
-                                "value": 0,
-                                "label": '仅本人数据权限'
-                            }]
-                        elif item == 1:
-                            data = [{
-                                "value": 0,
-                                "label": '仅本人数据权限'
-                            }, {
-                                "value": 1,
-                                "label": '本部门及以下数据权限'
-                            },
-                                {
-                                    "value": 2,
-                                    "label": '本部门数据权限'
-                                }]
-                        elif item == 2:
-                            data = [{
-                                "value": 0,
-                                "label": '仅本人数据权限'
-                            },
-                                {
-                                    "value": 2,
-                                    "label": '本部门数据权限'
-                                }]
-                        elif item == 3:
-                            data = [{
-                                "value": 0,
-                                "label": '仅本人数据权限'
-                            },
-                                {
-                                    "value": 3,
-                                    "label": '全部数据权限'
-                                }, ]
-                        elif item == 4:
-                            data = [{
-                                "value": 0,
-                                "label": '仅本人数据权限'
-                            },
-                                {
-                                    "value": 4,
-                                    "label": '自定义数据权限'
-                                }]
-                        else:
-                            data = []
-                    return DetailResponse(data=data)
-        return ErrorResponse(msg="参数错误")
+            # 删除权限：移除关联记录
+            RoleMenuButtonPermission.objects.filter(role_id=roleId, menu_button_id=btnId).delete()
+        menu_btn_instance = MenuButton.objects.get(id=btnId)
+        serializer = RoleMenuButtonSerializer(menu_btn_instance, request=request)
+        return DetailResponse(data=serializer.data, msg="更新成功")
+
+    @action(methods=['PUT'], detail=False, permission_classes=[IsAuthenticated])
+    def set_role_menu_btn_data_range(self, request):
+        """
+        设置 角色-菜单-按钮-权限
+        """
+        data = request.data
+        instance = RoleMenuButtonPermission.objects.get(id=data.get('role_menu_btn_perm_id'))
+        instance.data_range = data.get('data_range')
+        instance.dept.add(*data.get('dept'))
+        if not data.get('dept'):
+            instance.dept.clear()
+        instance.save()
+        serializer = RoleMenuButtonPermissionSerializer(instance, request=request)
+        return DetailResponse(data=serializer.data, msg="更新成功")
 
     @action(methods=['get'], detail=False, permission_classes=[IsAuthenticated])
     def role_to_dept_all(self, request):
@@ -329,72 +271,20 @@ class RoleMenuButtonPermissionViewSet(CustomModelViewSet):
         :param request:
         :return:
         """
-        params = request.query_params
         is_superuser = request.user.is_superuser
-        if is_superuser:
-            queryset = Dept.objects.values('id', 'name', 'parent')
-        else:
-            if not params:
-                return ErrorResponse(msg="参数错误")
-            menu_button = params.get('menu_button')
-            if menu_button is None:
-                return ErrorResponse(msg="参数错误")
-            role_list = request.user.role.values_list('id', flat=True)
-            queryset = RoleMenuButtonPermission.objects.filter(role__in=role_list, menu_button=None).values(
-                dept_id=F('dept__id'),
-                name=F('dept__name'),
-                parent=F('dept__parent')
-            )
-        return DetailResponse(data=queryset)
-
-    @action(methods=['get'], detail=False, permission_classes=[IsAuthenticated])
-    def menu_to_button(self, request):
-        """
-        根据所选择菜单获取已配置的按钮/接口权限:角色授权页面使用
-        :param request:
-        :return:
-        """
         params = request.query_params
-        menu_id = params.get('menu', None)
-        if menu_id is None:
-            return ErrorResponse(msg="未获取到参数")
-        is_superuser = request.user.is_superuser
-        if is_superuser:
-            queryset = RoleMenuButtonPermission.objects.filter(menu_button__menu=menu_id).values(
-                'id',
-                'data_range',
-                'menu_button',
-                'menu_button__name',
-                'menu_button__value'
-            )
-            return DetailResponse(data=queryset)
-        else:
-            if params:
+        # 当前登录用户的角色
+        role_list = request.user.role.values_list('id', flat=True)
 
-                role_id = params.get('role', None)
-                if role_id is None:
-                    return ErrorResponse(msg="未获取到参数")
-                queryset = RoleMenuButtonPermission.objects.filter(role=role_id, menu_button__menu=menu_id).values(
-                    'id',
-                    'data_range',
-                    'menu_button',
-                    'menu_button__name',
-                    'menu_button__value'
-                )
-                return DetailResponse(data=queryset)
-        return ErrorResponse(msg="未获取到参数")
+        menu_button_id = params.get('menu_button')
+        # 当前登录用户角色可以分配的自定义部门权限
+        dept_checked_disabled = RoleMenuButtonPermission.objects.filter(
+            role_id__in=role_list, menu_button_id=menu_button_id
+        ).values_list('dept', flat=True)
+        dept_list = Dept.objects.values('id', 'name', 'parent')
 
-    @action(methods=['get'], detail=False, permission_classes=[IsAuthenticated])
-    def role_to_menu(self, request):
-        """
-        获取角色对应的按钮权限
-        :param request:
-        :return:
-        """
-        params = request.query_params
-        role_id = params.get('role', None)
-        if role_id is None:
-            return ErrorResponse(msg="未获取到参数")
-        queryset = RoleMenuPermission.objects.filter(role_id=role_id).values_list('menu_id', flat=True).distinct()
-
-        return DetailResponse(data=queryset)
+        data = []
+        for dept in dept_list:
+            dept["disabled"] = False if is_superuser else dept["id"] not in dept_checked_disabled
+            data.append(dept)
+        return DetailResponse(data=data)

backend/dvadmin/system/views/user.py

@@ -115,14 +115,13 @@ class UserUpdateSerializer(CustomModelSerializer):
         ],
     )
 
-    # password = serializers.CharField(required=False, allow_blank=True)
-    # mobile = serializers.CharField(
-    #     max_length=50,
-    #     validators=[
-    #         CustomUniqueValidator(queryset=Users.objects.all(), message="手机号必须唯一")
-    #     ],
-    #     allow_blank=True
-    # )
+    def validate_is_active(self, value):
+        """
+        更改激活状态
+        """
+        if value:
+            self.initial_data["login_error_count"] = 0
+        return value
 
     def save(self, **kwargs):
         data = super().save(**kwargs)
@@ -287,6 +286,7 @@ class UserViewSet(CustomModelViewSet):
             "dept": user.dept_id,
             "is_superuser": user.is_superuser,
             "role": user.role.values_list('id', flat=True),
+            "pwd_change_count":user.pwd_change_count
         }
         if hasattr(connection, 'tenant'):
             result['tenant_id'] = connection.tenant and connection.tenant.id
@@ -326,22 +326,47 @@ class UserViewSet(CustomModelViewSet):
             return ErrorResponse(msg="参数不能为空")
         if new_pwd != new_pwd2:
             return ErrorResponse(msg="两次密码不匹配")
-        verify_password = check_password(old_pwd, self.request.user.password)
+        verify_password = check_password(old_pwd, request.user.password)
         if not verify_password:
-            verify_password = check_password(hashlib.md5(old_pwd.encode(encoding='UTF-8')).hexdigest(), self.request.user.password)
+            old_pwd_md5 = hashlib.md5(old_pwd.encode(encoding='UTF-8')).hexdigest()
+            verify_password = check_password(str(old_pwd_md5), request.user.password)
+            # 创建用户时、自定义密码无法修改问题
+            if not verify_password:
+                old_pwd_md5 = hashlib.md5(old_pwd_md5.encode(encoding='UTF-8')).hexdigest()
+                verify_password = check_password(str(old_pwd_md5), request.user.password)
         if verify_password:
+            # request.user.password = make_password(hashlib.md5(new_pwd.encode(encoding='UTF-8')).hexdigest())
             request.user.password = make_password(hashlib.md5(new_pwd.encode(encoding='UTF-8')).hexdigest())
+            request.user.pwd_change_count += 1
             request.user.save()
             return DetailResponse(data=None, msg="修改成功")
         else:
             return ErrorResponse(msg="旧密码不正确")
 
+    @action(methods=["post"], detail=False, permission_classes=[IsAuthenticated])
+    def login_change_password(self, request, *args, **kwargs):
+        """初次登录进行密码修改"""
+        data = request.data
+        new_pwd = data.get("password")
+        new_pwd2 = data.get("password_regain")
+        if new_pwd != new_pwd2:
+            return ErrorResponse(msg="两次密码不匹配")
+        else:
+            request.user.password = make_password(new_pwd)
+            request.user.pwd_change_count += 1
+            request.user.save()
+            return DetailResponse(data=None, msg="修改成功")
+
     @action(methods=["PUT"], detail=True, permission_classes=[IsAuthenticated])
-    def reset_to_default_password(self, request, *args, **kwargs):
+    def reset_to_default_password(self, request,pk):
         """恢复默认密码"""
-        instance = Users.objects.filter(id=kwargs.get("pk")).first()
+        if not self.request.user.is_superuser:
+            return ErrorResponse(msg="只允许超级管理员对其进行密码重置")
+        instance = Users.objects.filter(id=pk).first()
         if instance:
-            instance.set_password(dispatch.get_system_config_values("base.default_password"))
+            default_password = dispatch.get_system_config_values("base.default_password")
+            md5_pwd = hashlib.md5(default_password.encode(encoding='UTF-8')).hexdigest()
+            instance.password = make_password(md5_pwd)
             instance.save()
             return DetailResponse(data=None, msg="密码重置成功")
         else:
@@ -401,9 +426,12 @@ class UserViewSet(CustomModelViewSet):
                 queryset = self.filter_queryset(self.get_queryset())
         else:
             queryset = self.filter_queryset(self.get_queryset())
+        # print(queryset.values('id','name','dept__id'))
         page = self.paginate_queryset(queryset)
         if page is not None:
             serializer = self.get_serializer(page, many=True, request=request)
+            # print(serializer.data)
             return self.get_paginated_response(serializer.data)
         serializer = self.get_serializer(queryset, many=True, request=request)
+
         return SuccessResponse(data=serializer.data, msg="获取成功")

backend/dvadmin/utils/field_permission.py

@@ -5,34 +5,39 @@ from rest_framework.permissions import IsAuthenticated
 
 from dvadmin.system.models import FieldPermission, MenuField
 from dvadmin.utils.json_response import DetailResponse
-from dvadmin.utils.models import get_custom_app_models
+
+
+def merge_permission(data):
+    """
+    合并权限
+    """
+    result = {}
+    for item in data:
+        field_name = item.pop('field_name')
+        if field_name not in result:
+            result[field_name] = item
+        else:
+            for key, value in item.items():
+                result[field_name][key] = result[field_name][key] or value
+    return result
 
 
 class FieldPermissionMixin:
-    @action(methods=['get'], detail=False,permission_classes=[IsAuthenticated])
+    @action(methods=['get'], detail=False, permission_classes=[IsAuthenticated])
     def field_permission(self, request):
         """
         获取字段权限
         """
-        finded = False
-        for model in get_custom_app_models():
-            if model['object'] is self.serializer_class.Meta.model:
-                finded = True
-                break
-            if finded:
-                break
-        if finded is False:
-            return []
+        model = self.serializer_class.Meta.model.__name__
         user = request.user
-        if user.is_superuser==1:
-            data = MenuField.objects.filter( model=model['model']).values('field_name')
-            for item in data:
-                item['is_create'] = True
-                item['is_query'] = True
-                item['is_update'] = True
+        # 创建一个默认字典来存储最终的结果
+        if user.is_superuser == 1:
+            data = MenuField.objects.filter(model=model).values('field_name')
+            result = {item['field_name']: {"is_create": True, "is_query": True, "is_update": True} for item in data}
         else:
             roles = request.user.role.values_list('id', flat=True)
-            data= FieldPermission.objects.filter(
-                 field__model=model['model'],role__in=roles
-            ).values( 'is_create', 'is_query', 'is_update',field_name=F('field__field_name'))
-        return DetailResponse(data=data)
+            data = FieldPermission.objects.filter(
+                field__model=model, role__in=roles
+            ).values('is_create', 'is_query', 'is_update', field_name=F('field__field_name'))
+            result = merge_permission(data)
+        return DetailResponse(data=result)

backend/dvadmin/utils/filters.py

@@ -12,16 +12,49 @@ from collections import OrderedDict
 from functools import reduce
 
 import six
+from django.db import models
 from django.db.models import Q, F
 from django.db.models.constants import LOOKUP_SEP
-from django_filters import utils
-from django_filters.filters import CharFilter
+from django_filters import utils, FilterSet
+from django_filters.constants import ALL_FIELDS
+from django_filters.filters import CharFilter, DateTimeFromToRangeFilter
 from django_filters.rest_framework import DjangoFilterBackend
 from django_filters.utils import get_model_field
 from rest_framework.filters import BaseFilterBackend
+from django_filters.conf import settings
+from dvadmin.system.models import Dept, ApiWhiteList, RoleMenuButtonPermission, MenuButton
+from dvadmin.utils.models import CoreModel
 
-from dvadmin.system.models import Dept, ApiWhiteList, RoleMenuButtonPermission
+class CoreModelFilterBankend(BaseFilterBackend):
+    """
+    自定义时间范围过滤器
+    """
+    def filter_queryset(self, request, queryset, view):
+        create_datetime_after = request.query_params.get('create_datetime_after', None)
+        create_datetime_before = request.query_params.get('create_datetime_before', None)
+        update_datetime_after = request.query_params.get('update_datetime_after', None)
+        update_datetime_before = request.query_params.get('update_datetime_before', None)
+        if any([create_datetime_after, create_datetime_before, update_datetime_after, update_datetime_before]):
+            create_filter = Q()
+            if create_datetime_after and create_datetime_before:
+                create_filter &= Q(create_datetime__gte=create_datetime_after) & Q(create_datetime__lte=f'{create_datetime_before} 23:59:59')
+            elif create_datetime_after:
+                create_filter &= Q(create_datetime__gte=create_datetime_after)
+            elif create_datetime_before:
+                create_filter &= Q(create_datetime__lte=f'{create_datetime_before} 23:59:59')
 
+            # 更新时间范围过滤条件
+            update_filter = Q()
+            if update_datetime_after and update_datetime_before:
+                update_filter &= Q(update_datetime__gte=update_datetime_after) & Q(update_datetime__lte=update_datetime_before)
+            elif update_datetime_after:
+                update_filter &= Q(update_datetime__gte=update_datetime_after)
+            elif update_datetime_before:
+                update_filter &= Q(update_datetime__lte=update_datetime_before)
+            # 结合两个时间范围过滤条件
+            queryset = queryset.filter(create_filter & update_filter)
+            return queryset
+        return queryset
 
 def get_dept(dept_id: int, dept_all_list=None, dept_list=None):
     """
@@ -116,13 +149,16 @@ class DataLevelPermissionsFilter(BaseFilterBackend):
         if _pk: # 判断是否是单例查询
             re_api = re.sub(_pk,'{id}', api)
         role_id_list = request.user.role.values_list('id', flat=True)
-        role_permission_list=RoleMenuButtonPermission.objects.filter(
-            role__in=role_id_list,
-            role__status=1,
-            menu_button__api=re_api,
-            menu_button__method=method).values(
-            'data_range'
-        )
+        # 修复权限获取bug
+        menu_button_ids = MenuButton.objects.filter(api=re_api,method=method).values_list('id', flat=True)
+        role_permission_list = []
+        if menu_button_ids:
+            role_permission_list=RoleMenuButtonPermission.objects.filter(
+                role__in=role_id_list,
+                role__status=1,
+                menu_button_id__in=menu_button_ids).values(
+                'data_range'
+            )
         dataScope_list = []  # 权限范围列表
         for ele in role_permission_list:
                 # 判断用户是否为超级管理员角色/如果拥有[全部数据权限]则返回所有数据
@@ -172,6 +208,7 @@ class CustomDjangoFilterBackend(DjangoFilterBackend):
         "$": "iregex",
         "~": "icontains",
     }
+    filter_fields = "__all__"
 
     def construct_search(self, field_name, lookup_expr=None):
         lookup = self.lookup_prefixes.get(field_name[0])
@@ -179,14 +216,16 @@ class CustomDjangoFilterBackend(DjangoFilterBackend):
             field_name = field_name[1:]
         else:
             lookup = lookup_expr
-        if field_name.endswith(lookup):
-            return field_name
-        return LOOKUP_SEP.join([field_name, lookup])
+        if lookup:
+            if field_name.endswith(lookup):
+                return field_name
+            return LOOKUP_SEP.join([field_name, lookup])
+        return field_name
 
     def find_filter_lookups(self, orm_lookups, search_term_key):
         for lookup in orm_lookups:
             # if lookup.find(search_term_key) >= 0:
-            new_lookup = lookup.split("__")[0]
+            new_lookup = LOOKUP_SEP.join(lookup.split(LOOKUP_SEP)[:-1]) if len(lookup.split(LOOKUP_SEP)) > 1 else lookup
             # 修复条件搜索错误 bug
             if new_lookup == search_term_key:
                 return lookup
@@ -202,18 +241,22 @@ class CustomDjangoFilterBackend(DjangoFilterBackend):
         # TODO: remove assertion in 2.1
         if filterset_class is None and hasattr(view, "filter_class"):
             utils.deprecate(
-                "`%s.filter_class` attribute should be renamed `filterset_class`."
-                % view.__class__.__name__
+                "`%s.filter_class` attribute should be renamed `filterset_class`." % view.__class__.__name__
             )
             filterset_class = getattr(view, "filter_class", None)
 
         # TODO: remove assertion in 2.1
         if filterset_fields is None and hasattr(view, "filter_fields"):
             utils.deprecate(
-                "`%s.filter_fields` attribute should be renamed `filterset_fields`."
-                % view.__class__.__name__
+                "`%s.filter_fields` attribute should be renamed `filterset_fields`." % view.__class__.__name__
             )
-            filterset_fields = getattr(view, "filter_fields", None)
+            self.filter_fields = getattr(view, "filter_fields", None)
+            if isinstance(self.filter_fields, (list, tuple)):
+                filterset_fields = [
+                    field[1:] if field[0] in self.lookup_prefixes.keys() else field for field in self.filter_fields
+                ]
+            else:
+                filterset_fields = self.filter_fields
 
         if filterset_class:
             filterset_model = filterset_class._meta.model
@@ -233,6 +276,51 @@ class CustomDjangoFilterBackend(DjangoFilterBackend):
             MetaBase = getattr(self.filterset_base, "Meta", object)
 
             class AutoFilterSet(self.filterset_base):
+                @classmethod
+                def get_all_model_fields(cls, model):
+                    opts = model._meta
+
+                    return [
+                        f.name
+                        for f in sorted(opts.fields + opts.many_to_many)
+                        if (f.name == "id")
+                        or not isinstance(f, models.AutoField)
+                        and not (getattr(f.remote_field, "parent_link", False))
+                    ]
+
+                @classmethod
+                def get_fields(cls):
+                    """
+                    Resolve the 'fields' argument that should be used for generating filters on the
+                    filterset. This is 'Meta.fields' sans the fields in 'Meta.exclude'.
+                    """
+                    model = cls._meta.model
+                    fields = cls._meta.fields
+                    exclude = cls._meta.exclude
+
+                    assert not (fields is None and exclude is None), (
+                        "Setting 'Meta.model' without either 'Meta.fields' or 'Meta.exclude' "
+                        "has been deprecated since 0.15.0 and is now disallowed. Add an explicit "
+                        "'Meta.fields' or 'Meta.exclude' to the %s class." % cls.__name__
+                    )
+
+                    # Setting exclude with no fields implies all other fields.
+                    if exclude is not None and fields is None:
+                        fields = ALL_FIELDS
+
+                    # Resolve ALL_FIELDS into all fields for the filterset's model.
+                    if fields == ALL_FIELDS:
+                        fields = cls.get_all_model_fields(model)
+
+                    # Remove excluded fields
+                    exclude = exclude or []
+                    if not isinstance(fields, dict):
+                        fields = [(f, [settings.DEFAULT_LOOKUP_EXPR]) for f in fields if f not in exclude]
+                    else:
+                        fields = [(f, lookups) for f, lookups in fields.items() if f not in exclude]
+
+                    return OrderedDict(fields)
+
                 @classmethod
                 def get_filters(cls):
                     """
@@ -255,15 +343,18 @@ class CustomDjangoFilterBackend(DjangoFilterBackend):
                         from timezone_field import TimeZoneField
 
                         # 不进行 过滤的model 类
-                        if isinstance(field, (models.JSONField, TimeZoneField)):
+                        if isinstance(field, (models.JSONField, TimeZoneField, models.FileField)):
                             continue
                         # warn if the field doesn't exist.
                         if field is None:
                             undefined.append(field_name)
                         # 更新默认字符串搜索为模糊搜索
-                        if isinstance(field, (models.CharField)) and filterset_fields == '__all__' and lookups == [
-                            'exact']:
-                            lookups = ['icontains']
+                        if (
+                            isinstance(field, (models.CharField))
+                            and filterset_fields == "__all__"
+                            and lookups == ["exact"]
+                        ):
+                            lookups = ["icontains"]
                         for lookup_expr in lookups:
                             filter_name = cls.get_filter_name(field_name, lookup_expr)
 
@@ -273,20 +364,15 @@ class CustomDjangoFilterBackend(DjangoFilterBackend):
                                 continue
 
                             if field is not None:
-                                filters[filter_name] = cls.filter_for_field(
-                                    field, field_name, lookup_expr
-                                )
+                                filters[filter_name] = cls.filter_for_field(field, field_name, lookup_expr)
 
                     # Allow Meta.fields to contain declared filters *only* when a list/tuple
                     if isinstance(cls._meta.fields, (list, tuple)):
-                        undefined = [
-                            f for f in undefined if f not in cls.declared_filters
-                        ]
+                        undefined = [f for f in undefined if f not in cls.declared_filters]
 
                     if undefined:
                         raise TypeError(
-                            "'Meta.fields' must not contain non-model field names: %s"
-                            % ", ".join(undefined)
+                            "'Meta.fields' must not contain non-model field names: %s" % ", ".join(undefined)
                         )
 
                     # Add in declared filters. This is necessary since we don't enforce adding
@@ -308,22 +394,31 @@ class CustomDjangoFilterBackend(DjangoFilterBackend):
             return queryset
         if filterset.__class__.__name__ == "AutoFilterSet":
             queryset = filterset.queryset
-            orm_lookups = []
-            for search_field in filterset.filters:
-                if isinstance(filterset.filters[search_field], CharFilter):
-                    orm_lookups.append(
-                        self.construct_search(six.text_type(search_field), filterset.filters[search_field].lookup_expr)
-                    )
-                else:
-                    orm_lookups.append(search_field)
+            filter_fields = filterset.filters if self.filter_fields == "__all__" else self.filter_fields
+            orm_lookup_dict = dict(
+                zip(
+                    [field for field in filter_fields],
+                    [filterset.filters[lookup].lookup_expr for lookup in filterset.filters.keys()],
+                )
+            )
+            orm_lookups = [
+                self.construct_search(lookup, lookup_expr) for lookup, lookup_expr in orm_lookup_dict.items()
+            ]
+            # print(orm_lookups)
             conditions = []
             queries = []
             for search_term_key in filterset.data.keys():
                 orm_lookup = self.find_filter_lookups(orm_lookups, search_term_key)
-                if not orm_lookup:
+                if not orm_lookup or filterset.data.get(search_term_key) == '':
                     continue
-                query = Q(**{orm_lookup: filterset.data[search_term_key]})
-                queries.append(query)
+                filterset_data_len = len(filterset.data.getlist(search_term_key))
+                if filterset_data_len == 1:
+                    query = Q(**{orm_lookup: filterset.data[search_term_key]})
+                    queries.append(query)
+                elif filterset_data_len == 2:
+                    orm_lookup += '__range'
+                    query = Q(**{orm_lookup: filterset.data.getlist(search_term_key)})
+                    queries.append(query)
             if len(queries) > 0:
                 conditions.append(reduce(operator.and_, queries))
                 queryset = queryset.filter(reduce(operator.and_, conditions))

backend/dvadmin/utils/import_export.py

@@ -86,4 +86,5 @@ def import_to_data(file_url, field_data, m2m_fields=None):
             else:
                 array[key] = cell_value
         tables.append(array)
-    return tables
+    data = [i for i in tables if len(i) != 0]
+    return data

backend/dvadmin/utils/import_export_mixin.py

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+import datetime
 from urllib.parse import quote
 
 from django.db import transaction
@@ -11,8 +12,10 @@ from rest_framework.decorators import action
 from rest_framework.request import Request
 
 from dvadmin.utils.import_export import import_to_data
-from dvadmin.utils.json_response import DetailResponse
+from dvadmin.utils.json_response import DetailResponse, SuccessResponse
 from dvadmin.utils.request_util import get_verbose_name
+from dvadmin.system.tasks import async_export_data
+from dvadmin.system.models import DownloadCenter
 
 
 class ImportSerializerMixin:
@@ -301,6 +304,16 @@ class ExportSerializerMixin:
         assert self.export_field_label, "'%s' 请配置对应的导出模板字段。" % self.__class__.__name__
         assert self.export_serializer_class, "'%s' 请配置对应的导出序列化器。" % self.__class__.__name__
         data = self.export_serializer_class(queryset, many=True, request=request).data
+        try:
+            async_export_data.delay(
+                data,
+                str(f"导出{get_verbose_name(queryset)}-{datetime.datetime.now().strftime('%Y%m%d%H%M%S')}.xlsx"),
+                DownloadCenter.objects.create(creator=request.user, task_name=f'{get_verbose_name(queryset)}数据导出任务', dept_belong_id=request.user.dept_id).pk,
+                self.export_field_label
+            )
+            return SuccessResponse(msg="导入任务已创建，请前往‘下载中心’等待下载")
+        except:
+            pass
         # 导出excel 表
         response = HttpResponse(content_type="application/msexcel")
         response["Access-Control-Expose-Headers"] = f"Content-Disposition"

backend/dvadmin/utils/middleware.py

@@ -32,6 +32,14 @@ class ApiLoggingMiddleware(MiddlewareMixin):
         request.request_path = get_request_path(request)
 
     def __handle_response(self, request, response):
+
+        # 判断有无log_id属性，使用All记录时，会出现此情况
+        if request.request_data.get('log_id', None) is None:
+            return
+        
+        # 移除log_id，不记录此ID
+        log_id = request.request_data.pop('log_id')
+
         # request_data,request_ip由PermissionInterfaceMiddleware中间件中添加的属性
         body = getattr(request, 'request_data', {})
         # 请求含有password则用*替换掉(暂时先用于所有接口的password请求参数)
@@ -60,7 +68,7 @@ class ApiLoggingMiddleware(MiddlewareMixin):
             'status': True if response.data.get('code') in [2000, ] else False,
             'json_result': {"code": response.data.get('code'), "msg": response.data.get('msg')},
         }
-        operation_log, creat = OperationLog.objects.update_or_create(defaults=info, id=self.operation_log_id)
+        operation_log, creat = OperationLog.objects.update_or_create(defaults=info, id=log_id)
         if not operation_log.request_modular and settings.API_MODEL_MAP.get(request.request_path, None):
             operation_log.request_modular = settings.API_MODEL_MAP[request.request_path]
             operation_log.save()
@@ -71,7 +79,8 @@ class ApiLoggingMiddleware(MiddlewareMixin):
                 if self.methods == 'ALL' or request.method in self.methods:
                     log = OperationLog(request_modular=get_verbose_name(view_func.cls.queryset))
                     log.save()
-                    self.operation_log_id = log.id
+                    # self.operation_log_id = log.id
+                    request.request_data['log_id'] = log.id
 
         return
 

backend/dvadmin/utils/models.py

@@ -6,13 +6,14 @@
 @Created on: 2021/5/31 031 22:08
 @Remark: 公共基础model类
 """
+from datetime import datetime
 from importlib import import_module
 
-from django.apps import apps
-from django.db import models
-from django.conf import settings
-
 from application import settings
+from django.apps import apps
+from django.conf import settings
+from django.db import models
+from rest_framework.request import Request
 
 table_prefix = settings.TABLE_PREFIX  # 数据库表名前缀
 
@@ -60,8 +61,24 @@ class SoftDeleteModel(models.Model):
         """
         重写删除方法,直接开启软删除
         """
-        self.is_deleted = True
-        self.save(using=using)
+        if soft_delete:
+            self.is_deleted = True
+            self.save(using=using)
+            # 级联软删除关联对象
+            for related_object in self._meta.related_objects:
+                related_model = getattr(self, related_object.get_accessor_name())
+                # 处理一对多和多对多的关联对象
+                if related_object.one_to_many or related_object.many_to_many:
+                    related_objects = related_model.all()
+                elif related_object.one_to_one:
+                    related_objects = [related_model]
+                else:
+                    continue
+
+                for obj in related_objects:
+                    obj.delete(soft_delete=True)
+        else:
+            super().delete(using=using, *args, **kwargs)
 
 
 class CoreModel(models.Model):
@@ -87,6 +104,111 @@ class CoreModel(models.Model):
         verbose_name = '核心模型'
         verbose_name_plural = verbose_name
 
+    def get_request_user(self, request: Request):
+        if getattr(request, "user", None):
+            return request.user
+        return None
+
+    def get_request_user_id(self, request: Request):
+        if getattr(request, "user", None):
+            return getattr(request.user, "id", None)
+        return None
+
+    def get_request_user_name(self, request: Request):
+        if getattr(request, "user", None):
+            return getattr(request.user, "name", None)
+        return None
+
+    def get_request_user_username(self, request: Request):
+        if getattr(request, "user", None):
+            return getattr(request.user, "username", None)
+        return None
+
+    def common_insert_data(self, request: Request):
+        data = {
+            'create_datetime': datetime.now(),
+            'creator': self.get_request_user(request)
+        }
+        return {**data, **self.common_update_data(request)}
+
+    def common_update_data(self, request: Request):
+        return {
+            'update_datetime': datetime.now(),
+            'modifier': self.get_request_user_username(request)
+        }
+
+    exclude_fields = [
+        '_state',
+        'pk',
+        'id',
+        'create_datetime',
+        'update_datetime',
+        'creator',
+        'creator_id',
+        'creator_pk',
+        'creator_name',
+        'modifier',
+        'modifier_id',
+        'modifier_pk',
+        'modifier_name',
+        'dept_belong_id',
+    ]
+
+    def get_exclude_fields(self):
+        return self.exclude_fields
+
+    def get_all_fields(self):
+        return self._meta.fields
+
+    def get_all_fields_names(self):
+        return [field.name for field in self.get_all_fields()]
+
+    def get_need_fields_names(self):
+        return [field.name for field in self.get_all_fields() if field.name not in self.exclude_fields]
+
+    def to_data(self):
+        """将模型转化为字典（去除不包含字段）(注意与to_dict_data区分)。
+        """
+        res = {}
+        for field in self.get_need_fields_names():
+            field_value = getattr(self, field)
+            res[field] = field_value.id if (issubclass(field_value.__class__, CoreModel)) else field_value
+        return res
+
+    @property
+    def DATA(self):
+        return self.to_data()
+
+    def to_dict_data(self):
+        """需要导出的字段（去除不包含字段）（注意与to_data区分）
+        """
+        return {field: getattr(self, field) for field in self.get_need_fields_names()}
+
+    @property
+    def DICT_DATA(self):
+        return self.to_dict_data()
+
+    def insert(self, request):
+        """插入模型
+        """
+        assert self.pk is None, f'模型{self.__class__.__name__}还没有保存到数据中，不能手动指定ID'
+        validated_data = {**self.common_insert_data(request), **self.DICT_DATA}
+        return self.__class__._default_manager.create(**validated_data)
+
+    def update(self, request, update_data: dict[str, any] = None):
+        """更新模型
+        """
+        assert isinstance(update_data, dict), 'update_data必须为字典'
+        validated_data = {**self.common_insert_data(request), **update_data}
+        for key, value in validated_data.items():
+            # 不允许修改id,pk,uuid字段
+            if key in ['id', 'pk', 'uuid']:
+                continue
+            if hasattr(self, key):
+                setattr(self, key, value)
+        self.save()
+        return self
+
 
 def get_all_models_objects(model_name=None):
     """
@@ -97,16 +219,9 @@ def get_all_models_objects(model_name=None):
     if not settings.ALL_MODELS_OBJECTS:
         all_models = apps.get_models()
         for item in list(all_models):
-            table = {
-                "tableName": item._meta.verbose_name,
-                "table": item.__name__,
-                "tableFields": []
-            }
+            table = {"tableName": item._meta.verbose_name, "table": item.__name__, "tableFields": []}
             for field in item._meta.fields:
-                fields = {
-                    "title": field.verbose_name,
-                    "field": field.name
-                }
+                fields = {"title": field.verbose_name, "field": field.name}
                 table['tableFields'].append(fields)
             settings.ALL_MODELS_OBJECTS.setdefault(item.__name__, {"table": table, "object": item})
     if model_name:
@@ -117,25 +232,20 @@ def get_all_models_objects(model_name=None):
 def get_model_from_app(app_name):
     """获取模型里的字段"""
     model_module = import_module(app_name + '.models')
+    exclude_models = getattr(model_module, 'exclude_models', [])
     filter_model = [
-        getattr(model_module, item) for item in dir(model_module)
-        if item != 'CoreModel' and issubclass(getattr(model_module, item).__class__, models.base.ModelBase)
+        value for key, value in model_module.__dict__.items()
+        if key != 'CoreModel'
+        and isinstance(value, type)
+        and issubclass(value, models.Model)
+        and key not in exclude_models
     ]
     model_list = []
     for model in filter_model:
         if model.__name__ == 'AbstractUser':
             continue
-        fields = [
-            {'title': field.verbose_name, 'name': field.name, 'object': field}
-            for field in model._meta.fields
-        ]
-        model_list.append({
-            'app': app_name,
-            'verbose': model._meta.verbose_name,
-            'model': model.__name__,
-            'object': model,
-            'fields': fields
-        })
+        fields = [{'title': field.verbose_name, 'name': field.name, 'object': field} for field in model._meta.fields]
+        model_list.append({'app': app_name, 'verbose': model._meta.verbose_name, 'model': model.__name__, 'object': model, 'fields': fields})
     return model_list
 
 

backend/dvadmin/utils/permission.py

@@ -44,6 +44,35 @@ class AnonymousUserPermission(BasePermission):
         return True
 
 
+class SuperuserPermission(BasePermission):
+    """
+    超级管理员权限类
+    """
+
+    def has_permission(self, request, view):
+        if isinstance(request.user, AnonymousUser):
+            return False
+        # 判断是否是超级管理员
+        if request.user.is_superuser:
+            return True
+
+
+class AdminPermission(BasePermission):
+    """
+    普通管理员权限类
+    """
+
+    def has_permission(self, request, view):
+        if isinstance(request.user, AnonymousUser):
+            return False
+        # 判断是否是超级管理员
+        is_superuser = request.user.is_superuser
+        # 判断是否是管理员角色
+        is_admin = request.user.role.values_list('admin', flat=True)
+        if is_superuser or True in is_admin:
+            return True
+
+
 def ReUUID(api):
     """
     将接口的uuid替换掉
@@ -81,8 +110,9 @@ class CustomPermission(BasePermission):
             # ********#
             if not hasattr(request.user, "role"):
                 return False
-            role_id_list = request.user.role.values_list('id',flat=True)
-            userApiList = RoleMenuButtonPermission.objects.filter(role__in=role_id_list).values(permission__api=F('menu_button__api'), permission__method=F('menu_button__method'))  # 获取当前用户的角色拥有的所有接口
+            role_id_list = request.user.role.values_list('id', flat=True)
+            userApiList = RoleMenuButtonPermission.objects.filter(role__in=role_id_list).values(
+                permission__api=F('menu_button__api'), permission__method=F('menu_button__method'))  # 获取当前用户的角色拥有的所有接口
             ApiList = [
                 str(item.get('permission__api').replace('{id}', '([a-zA-Z0-9-]+)')) + ":" + str(
                     item.get('permission__method')) + '$' for item in userApiList if item.get('permission__api')]

backend/dvadmin/utils/serializers.py

@@ -26,7 +26,6 @@ class CustomModelSerializer(DynamicFieldsMixin, ModelSerializer):
     # 修改人的审计字段名称, 默认modifier, 继承使用时可自定义覆盖
     modifier_field_id = "modifier"
     modifier_name = serializers.SerializerMethodField(read_only=True)
-    dept_belong_id = serializers.IntegerField(required=False, default=None)
 
     def get_modifier_name(self, instance):
         if not hasattr(instance, "modifier"):
@@ -52,7 +51,7 @@ class CustomModelSerializer(DynamicFieldsMixin, ModelSerializer):
         format="%Y-%m-%d %H:%M:%S", required=False, read_only=True
     )
     update_datetime = serializers.DateTimeField(
-        format="%Y-%m-%d %H:%M:%S", required=False
+        format="%Y-%m-%d %H:%M:%S", required=False, read_only=True
     )
 
     def __init__(self, instance=None, data=empty, request=None, **kwargs):
@@ -71,11 +70,11 @@ class CustomModelSerializer(DynamicFieldsMixin, ModelSerializer):
                     validated_data[self.creator_field_id] = self.request.user
 
                 if (
-                    self.dept_belong_id_field_name in self.fields.fields
-                    and validated_data.get(self.dept_belong_id_field_name, None) is None
+                        self.dept_belong_id_field_name in self.fields.fields
+                        and validated_data.get(self.dept_belong_id_field_name, None) is None
                 ):
                     validated_data[self.dept_belong_id_field_name] = getattr(
-                        self.request.user, "dept_id", None
+                        self.request.user, "dept_id", validated_data.get(self.dept_belong_id_field_name, None)
                     )
         return super().create(validated_data)
 

backend/dvadmin/utils/viewset.py

@@ -6,17 +6,21 @@
 @Created on: 2021/6/1 001 22:57
 @Remark: 自定义视图集
 """
+import copy
+
 from django.db import transaction
+from django_filters import DateTimeFromToRangeFilter
+from django_filters.rest_framework import FilterSet
 from drf_yasg import openapi
 from drf_yasg.utils import swagger_auto_schema
 from rest_framework.decorators import action
 from rest_framework.viewsets import ModelViewSet
 
-from dvadmin.utils.filters import DataLevelPermissionsFilter
+from dvadmin.utils.filters import DataLevelPermissionsFilter, CoreModelFilterBankend
 from dvadmin.utils.import_export_mixin import ExportSerializerMixin, ImportSerializerMixin
 from dvadmin.utils.json_response import SuccessResponse, ErrorResponse, DetailResponse
 from dvadmin.utils.permission import CustomPermission
-from dvadmin.utils.models import get_custom_app_models
+from dvadmin.utils.models import get_custom_app_models, CoreModel
 from dvadmin.system.models import FieldPermission, MenuField
 from django_restql.mixins import QueryArgumentsMixin
 
@@ -37,7 +41,7 @@ class CustomModelViewSet(ModelViewSet, ImportSerializerMixin, ExportSerializerMi
     update_serializer_class = None
     filter_fields = '__all__'
     search_fields = ()
-    extra_filter_class = [DataLevelPermissionsFilter]
+    extra_filter_class = [CoreModelFilterBankend,DataLevelPermissionsFilter]
     permission_classes = [CustomPermission]
     import_field_dict = {}
     export_field_label = {}
@@ -65,12 +69,14 @@ class CustomModelViewSet(ModelViewSet, ImportSerializerMixin, ExportSerializerMi
         kwargs.setdefault('context', self.get_serializer_context())
         # 全部以可见字段为准
         can_see = self.get_menu_field(serializer_class)
-        # 排除掉序列化器级的字段
-        # sub_set = set(serializer_class._declared_fields.keys()) - set(can_see)
-        # for field in sub_set:
-        #     serializer_class._declared_fields.pop(field)
+        # 排除掉序列化器级的字段(排除字段权限中未授权的字段)
         # if not self.request.user.is_superuser:
-        #     serializer_class.Meta.fields = can_see
+        #     exclude_set = set(serializer_class._declared_fields.keys()) - set(can_see)
+        #     for field in exclude_set:
+        #         serializer_class._declared_fields.pop(field)
+        #     meta = copy.deepcopy(serializer_class.Meta)
+        #     meta.fields = list(can_see)
+        #     serializer_class.Meta = meta
         # 在分页器中使用
         self.request.permission_fields = can_see
         if isinstance(self.request.data, list):
@@ -81,15 +87,17 @@ class CustomModelViewSet(ModelViewSet, ImportSerializerMixin, ExportSerializerMi
 
     def get_menu_field(self, serializer_class):
         """获取字段权限"""
-        finded = False
-        for model in get_custom_app_models():
-            if model['object'] is serializer_class.Meta.model:
-                finded = True
-                break
-        if finded is False:
+
+        if not any(model['object'] is serializer_class.Meta.model for model in get_custom_app_models()):
             return []
-        return MenuField.objects.filter(model=model['model']
-        ).values('field_name', 'title')
+
+        # 匿名用户没有角色
+        ret = FieldPermission.objects.filter(field__model=serializer_class.Meta.model.__name__)
+        if hasattr(self.request.user, 'role'):
+            roles = self.request.user.role.values_list('id', flat=True)
+            ret = ret.filter(is_query=True, role__in=roles)
+
+        return ret.values_list('field__field_name', flat=True)
 
     def create(self, request, *args, **kwargs):
         serializer = self.get_serializer(data=request.data, request=request)
@@ -129,8 +137,7 @@ class CustomModelViewSet(ModelViewSet, ImportSerializerMixin, ExportSerializerMi
         instance.delete()
         return DetailResponse(data=[], msg="删除成功")
 
-    keys = openapi.Schema(description='主键列表', type=openapi.TYPE_ARRAY, items=openapi.TYPE_STRING)
-
+    keys = openapi.Schema(description='主键列表', type=openapi.TYPE_ARRAY, items=openapi.Schema(type=openapi.TYPE_STRING))
     @swagger_auto_schema(request_body=openapi.Schema(
         type=openapi.TYPE_OBJECT,
         required=['keys'],

backend/main.py

@@ -0,0 +1,17 @@
+import multiprocessing
+import os
+import sys
+
+root_path = os.getcwd()
+sys.path.append(root_path)
+import uvicorn
+from application.settings import LOGGING
+
+if __name__ == '__main__':
+    multiprocessing.freeze_support()
+    workers = 4
+    if os.sys.platform.startswith('win'):
+        # Windows操作系统
+        workers = None
+    uvicorn.run("application.asgi:application", reload=False, host="0.0.0.0", port=8000, workers=workers,
+                log_config=LOGGING)

backend/requirements.txt

@@ -1,30 +1,32 @@
-Django==4.2.7
+Django==4.2.14
 django-comment-migrate==0.1.7
-django-cors-headers==4.3.0
-django-filter==23.3
+django-cors-headers==4.4.0
+django-filter==24.2
 django-ranged-response==0.2.0
-djangorestframework==3.14.0
-django-restql==0.15.3
-django-simple-captcha==0.5.20
-django-timezone-field==6.0.1
-djangorestframework-simplejwt==5.3.0
+djangorestframework==3.15.2
+django-restql==0.15.4
+django-simple-captcha==0.6.0
+django-timezone-field==7.0
+djangorestframework-simplejwt==5.3.1
 drf-yasg==1.21.7
 mysqlclient==2.2.0
-pypinyin==0.49.0
+pypinyin==0.51.0
 ua-parser==0.18.0
-pyparsing==3.1.1
-openpyxl==3.1.2
-requests==2.31.0
-typing-extensions==4.8.0
-tzlocal==5.1
-channels==3.0.5
-channels-redis==4.1.0
+pyparsing==3.1.2
+openpyxl==3.1.5
+requests==2.32.3
+typing-extensions==4.12.2
+tzlocal==5.2
+channels==4.1.0
+channels-redis==4.2.0
 websockets==11.0.3
 user-agents==2.2.0
 six==1.16.0
-whitenoise==6.6.0
+whitenoise==6.7.0
 psycopg2==2.9.9
-uvicorn==0.23.2
-gunicorn==21.2.0
-gevent==23.9.1
-Pillow==10.1.0
+uvicorn==0.30.3
+gunicorn==22.0.0
+gevent==24.2.1
+Pillow==10.4.0
+pyinstaller==6.9.0
+dvadmin3-celery==3.1.6

backend/static/captcha/fonts/COPYRIGHT.TXT

@@ -0,0 +1,123 @@
+Bitstream Vera Fonts Copyright
+
+The fonts have a generous copyright, allowing derivative works (as
+long as "Bitstream" or "Vera" are not in the names), and full
+redistribution (so long as they are not *sold* by themselves). They
+can be be bundled, redistributed and sold with any software.
+
+The fonts are distributed under the following copyright:
+
+Copyright
+=========
+
+Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Bitstream
+Vera is a trademark of Bitstream, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the fonts accompanying this license ("Fonts") and associated
+documentation files (the "Font Software"), to reproduce and distribute
+the Font Software, including without limitation the rights to use,
+copy, merge, publish, distribute, and/or sell copies of the Font
+Software, and to permit persons to whom the Font Software is furnished
+to do so, subject to the following conditions:
+
+The above copyright and trademark notices and this permission notice
+shall be included in all copies of one or more of the Font Software
+typefaces.
+
+The Font Software may be modified, altered, or added to, and in
+particular the designs of glyphs or characters in the Fonts may be
+modified and additional glyphs or characters may be added to the
+Fonts, only if the fonts are renamed to names not containing either
+the words "Bitstream" or the word "Vera".
+
+This License becomes null and void to the extent applicable to Fonts
+or Font Software that has been modified and is distributed under the
+"Bitstream Vera" names.
+
+The Font Software may be sold as part of a larger software package but
+no copy of one or more of the Font Software typefaces may be sold by
+itself.
+
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL
+BITSTREAM OR THE GNOME FOUNDATION BE LIABLE FOR ANY CLAIM, DAMAGES OR
+OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL,
+OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+OTHERWISE, ARISING FROM, OUT OF THE USE OR INABILITY TO USE THE FONT
+SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE.
+
+Except as contained in this notice, the names of Gnome, the Gnome
+Foundation, and Bitstream Inc., shall not be used in advertising or
+otherwise to promote the sale, use or other dealings in this Font
+Software without prior written authorization from the Gnome Foundation
+or Bitstream Inc., respectively. For further information, contact:
+fonts at gnome dot org.
+
+Copyright FAQ
+=============
+
+   1. I don't understand the resale restriction... What gives?
+
+      Bitstream is giving away these fonts, but wishes to ensure its
+      competitors can't just drop the fonts as is into a font sale system
+      and sell them as is. It seems fair that if Bitstream can't make money
+      from the Bitstream Vera fonts, their competitors should not be able to
+      do so either. You can sell the fonts as part of any software package,
+      however.
+
+   2. I want to package these fonts separately for distribution and
+      sale as part of a larger software package or system.  Can I do so?
+
+      Yes. A RPM or Debian package is a "larger software package" to begin
+      with, and you aren't selling them independently by themselves.
+      See 1. above.
+
+   3. Are derivative works allowed?
+      Yes!
+
+   4. Can I change or add to the font(s)?
+      Yes, but you must change the name(s) of the font(s).
+
+   5. Under what terms are derivative works allowed?
+
+      You must change the name(s) of the fonts. This is to ensure the
+      quality of the fonts, both to protect Bitstream and Gnome. We want to
+      ensure that if an application has opened a font specifically of these
+      names, it gets what it expects (though of course, using fontconfig,
+      substitutions could still could have occurred during font
+      opening). You must include the Bitstream copyright. Additional
+      copyrights can be added, as per copyright law. Happy Font Hacking!
+
+   6. If I have improvements for Bitstream Vera, is it possible they might get
+       adopted in future versions?
+
+      Yes. The contract between the Gnome Foundation and Bitstream has
+      provisions for working with Bitstream to ensure quality additions to
+      the Bitstream Vera font family. Please contact us if you have such
+      additions. Note, that in general, we will want such additions for the
+      entire family, not just a single font, and that you'll have to keep
+      both Gnome and Jim Lyles, Vera's designer, happy! To make sense to add
+      glyphs to the font, they must be stylistically in keeping with Vera's
+      design. Vera cannot become a "ransom note" font. Jim Lyles will be
+      providing a document describing the design elements used in Vera, as a
+      guide and aid for people interested in contributing to Vera.
+
+   7. I want to sell a software package that uses these fonts: Can I do so?
+
+      Sure. Bundle the fonts with your software and sell your software
+      with the fonts. That is the intent of the copyright.
+
+   8. If applications have built the names "Bitstream Vera" into them,
+      can I override this somehow to use fonts of my choosing?
+
+      This depends on exact details of the software. Most open source
+      systems and software (e.g., Gnome, KDE, etc.) are now converting to
+      use fontconfig (see www.fontconfig.org) to handle font configuration,
+      selection and substitution; it has provisions for overriding font
+      names and substituting alternatives. An example is provided by the
+      supplied local.conf file, which chooses the family Bitstream Vera for
+      "sans", "serif" and "monospace".  Other software (e.g., the XFree86
+      core server) has other mechanisms for font substitution.

backend/static/captcha/fonts/README.TXT

@@ -0,0 +1,11 @@
+Contained herin is the Bitstream Vera font family.
+
+The Copyright information is found in the COPYRIGHT.TXT file (along
+with being incorporated into the fonts themselves).
+
+The releases notes are found in the file "RELEASENOTES.TXT".
+
+We hope you enjoy Vera!
+
+                        Bitstream, Inc.
+			The Gnome Project

backend/static/drf-yasg/README

@@ -0,0 +1,18 @@
+Information about external resources
+
+The following files are taken from external resources or trees.
+
+Files: insQ.js
+ insQ.min.js
+License: MIT
+Copyright: Zbyszek Tenerowicz
+ Eryk Napierała <eryk.piast@gmail.com>
+ Askar Yusupov <devex.soft@gmail.com>
+ Dan Dascalescu <ddascalescu+github@gmail.com>
+Source: https://github.com/naugtur/insertionQuery v1.0.3
+
+Files: immutable.js
+ immutable.min.js
+License: MIT
+Copyright: 2014-present, Facebook, Inc
+Source: https://github.com/immutable-js/immutable-js/releases/tag/v3.8.2

backend/static/drf-yasg/insQ.js

@@ -0,0 +1,163 @@
+var insertionQ = (function () {
+    "use strict";
+
+    var sequence = 100,
+        isAnimationSupported = false,
+        animation_string = 'animationName',
+        keyframeprefix = '',
+        domPrefixes = 'Webkit Moz O ms Khtml'.split(' '),
+        pfx = '',
+        elm = document.createElement('div'),
+        options = {
+            strictlyNew: true,
+            timeout: 20
+        };
+
+    if (elm.style.animationName) {
+        isAnimationSupported = true;
+    }
+
+    if (isAnimationSupported === false) {
+        for (var i = 0; i < domPrefixes.length; i++) {
+            if (elm.style[domPrefixes[i] + 'AnimationName'] !== undefined) {
+                pfx = domPrefixes[i];
+                animation_string = pfx + 'AnimationName';
+                keyframeprefix = '-' + pfx.toLowerCase() + '-';
+                isAnimationSupported = true;
+                break;
+            }
+        }
+    }
+
+
+    function listen(selector, callback) {
+        var styleAnimation, animationName = 'insQ_' + (sequence++);
+
+        var eventHandler = function (event) {
+            if (event.animationName === animationName || event[animation_string] === animationName) {
+                if (!isTagged(event.target)) {
+                    callback(event.target);
+                }
+            }
+        };
+
+        styleAnimation = document.createElement('style');
+        styleAnimation.innerHTML = '@' + keyframeprefix + 'keyframes ' + animationName + ' {  from {  outline: 1px solid transparent  } to {  outline: 0px solid transparent }  }' +
+            "\n" + selector + ' { animation-duration: 0.001s; animation-name: ' + animationName + '; ' +
+            keyframeprefix + 'animation-duration: 0.001s; ' + keyframeprefix + 'animation-name: ' + animationName + '; ' +
+            ' } ';
+
+        document.head.appendChild(styleAnimation);
+
+        var bindAnimationLater = setTimeout(function () {
+            document.addEventListener('animationstart', eventHandler, false);
+            document.addEventListener('MSAnimationStart', eventHandler, false);
+            document.addEventListener('webkitAnimationStart', eventHandler, false);
+            //event support is not consistent with DOM prefixes
+        }, options.timeout); //starts listening later to skip elements found on startup. this might need tweaking
+
+        return {
+            destroy: function () {
+                clearTimeout(bindAnimationLater);
+                if (styleAnimation) {
+                    document.head.removeChild(styleAnimation);
+                    styleAnimation = null;
+                }
+                document.removeEventListener('animationstart', eventHandler);
+                document.removeEventListener('MSAnimationStart', eventHandler);
+                document.removeEventListener('webkitAnimationStart', eventHandler);
+            }
+        };
+    }
+
+
+    function tag(el) {
+        el.QinsQ = true; //bug in V8 causes memory leaks when weird characters are used as field names. I don't want to risk leaking DOM trees so the key is not '-+-' anymore
+    }
+
+    function isTagged(el) {
+        return (options.strictlyNew && (el.QinsQ === true));
+    }
+
+    function topmostUntaggedParent(el) {
+        if (isTagged(el.parentNode)) {
+            return el;
+        } else {
+            return topmostUntaggedParent(el.parentNode);
+        }
+    }
+
+    function tagAll(e) {
+        tag(e);
+        e = e.firstChild;
+        for (; e; e = e.nextSibling) {
+            if (e !== undefined && e.nodeType === 1) {
+                tagAll(e);
+            }
+        }
+    }
+
+    //aggregates multiple insertion events into a common parent
+    function catchInsertions(selector, callback) {
+        var insertions = [];
+        //throttle summary
+        var sumUp = (function () {
+            var to;
+            return function () {
+                clearTimeout(to);
+                to = setTimeout(function () {
+                    insertions.forEach(tagAll);
+                    callback(insertions);
+                    insertions = [];
+                }, 10);
+            };
+        })();
+
+        return listen(selector, function (el) {
+            if (isTagged(el)) {
+                return;
+            }
+            tag(el);
+            var myparent = topmostUntaggedParent(el);
+            if (insertions.indexOf(myparent) < 0) {
+                insertions.push(myparent);
+            }
+            sumUp();
+        });
+    }
+
+    //insQ function
+    var exports = function (selector) {
+        if (isAnimationSupported && selector.match(/[^{}]/)) {
+
+            if (options.strictlyNew) {
+                tagAll(document.body); //prevents from catching things on show
+            }
+            return {
+                every: function (callback) {
+                    return listen(selector, callback);
+                },
+                summary: function (callback) {
+                    return catchInsertions(selector, callback);
+                }
+            };
+        } else {
+            return false;
+        }
+    };
+
+    //allows overriding defaults
+    exports.config = function (opt) {
+        for (var o in opt) {
+            if (opt.hasOwnProperty(o)) {
+                options[o] = opt[o];
+            }
+        }
+    };
+
+    return exports;
+})();
+
+if (typeof module !== 'undefined' && typeof module.exports !== 'undefined') {
+    module.exports = insertionQ;
+}

backend/static/drf-yasg/redoc-init.js

@@ -1,3 +1,9 @@
+// redoc-init.js
+// https://github.com/axnsan12/drf-yasg
+// Copyright 2017 - 2021, Cristian V. <cristi@cvjd.me>
+// This file is licensed under the BSD 3-Clause License.
+// License text available at https://opensource.org/licenses/BSD-3-Clause
+
 "use strict";
 
 var currentPath = window.location.protocol + "//" + window.location.host + window.location.pathname;

backend/static/drf-yasg/redoc-old/LICENSE

@@ -0,0 +1,22 @@
+The MIT License (MIT)
+
+Copyright (c) 2015, Rebilly, Inc. 
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+

backend/static/drf-yasg/redoc-old/redoc.min.js.map

@@ -0,0 +1,23 @@
+<html>
+<head>
+  <script type="text/javascript" charset="utf-8">
+    // Map of projects that support handling 404s.
+    var supportedProjects = {
+      'ReDoc': 'https://redocly.github.io/redoc'
+    };
+
+    var project = window.location.pathname.split('/')[1];
+
+    // Always fallback to rebilly.com redirect.
+    var loc = 'https://www.rebilly.com/';
+
+    if (supportedProjects.hasOwnProperty(project)) {
+      if (typeof supportedProjects[project] === 'string') {
+        loc = supportedProjects[project];
+      }
+    }
+    window.location.href = loc;
+  </script>
+</head>
+<body></body>
+</html>

backend/static/drf-yasg/redoc/LICENSE

@@ -0,0 +1,22 @@
+The MIT License (MIT)
+
+Copyright (c) 2015-present, Rebilly, Inc. 
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+

backend/static/drf-yasg/swagger-ui-dist/LICENSE

@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

backend/static/drf-yasg/swagger-ui-dist/NOTICE

@@ -0,0 +1,2 @@
+swagger-ui
+Copyright 2020-2021 SmartBear Software Inc.

backend/static/drf-yasg/swagger-ui-dist/index.css

@@ -0,0 +1,16 @@
+html {
+    box-sizing: border-box;
+    overflow: -moz-scrollbars-vertical;
+    overflow-y: scroll;
+}
+
+*,
+*:before,
+*:after {
+    box-sizing: inherit;
+}
+
+body {
+    margin: 0;
+    background: #fafafa;
+}

backend/static/drf-yasg/swagger-ui-dist/oauth2-redirect.html

@@ -4,8 +4,6 @@
     <title>Swagger UI: OAuth2 Redirect</title>
 </head>
 <body>
-</body>
-</html>
 <script>
     'use strict';
     function run () {
@@ -15,31 +13,32 @@
         var isValid, qp, arr;
 
         if (/code|token|error/.test(window.location.hash)) {
-            qp = window.location.hash.substring(1);
+            qp = window.location.hash.substring(1).replace('?', '&');
         } else {
             qp = location.search.substring(1);
         }
 
-        arr = qp.split("&")
-        arr.forEach(function (v,i,_arr) { _arr[i] = '"' + v.replace('=', '":"') + '"';})
+        arr = qp.split("&");
+        arr.forEach(function (v,i,_arr) { _arr[i] = '"' + v.replace('=', '":"') + '"';});
         qp = qp ? JSON.parse('{' + arr.join() + '}',
                 function (key, value) {
-                    return key === "" ? value : decodeURIComponent(value)
+                    return key === "" ? value : decodeURIComponent(value);
                 }
-        ) : {}
+        ) : {};
 
-        isValid = qp.state === sentState
+        isValid = qp.state === sentState;
 
         if ((
-          oauth2.auth.schema.get("flow") === "accessCode"||
-          oauth2.auth.schema.get("flow") === "authorizationCode"
+          oauth2.auth.schema.get("flow") === "accessCode" ||
+          oauth2.auth.schema.get("flow") === "authorizationCode" ||
+          oauth2.auth.schema.get("flow") === "authorization_code"
         ) && !oauth2.auth.code) {
             if (!isValid) {
                 oauth2.errCb({
                     authId: oauth2.auth.name,
                     source: "auth",
                     level: "warning",
-                    message: "Authorization may be unsafe, passed state was changed in server Passed state wasn't returned from auth server"
+                    message: "Authorization may be unsafe, passed state was changed in server. The passed state wasn't returned from auth server."
                 });
             }
 
@@ -48,7 +47,7 @@
                 oauth2.auth.code = qp.code;
                 oauth2.callback({auth: oauth2.auth, redirectUrl: redirectUrl});
             } else {
-                let oauthErrorMsg
+                let oauthErrorMsg;
                 if (qp.error) {
                     oauthErrorMsg = "["+qp.error+"]: " +
                         (qp.error_description ? qp.error_description+ ". " : "no accessCode received from the server. ") +
@@ -59,7 +58,7 @@
                     authId: oauth2.auth.name,
                     source: "auth",
                     level: "error",
-                    message: oauthErrorMsg || "[Authorization failed]: no accessCode received from the server"
+                    message: oauthErrorMsg || "[Authorization failed]: no accessCode received from the server."
                 });
             }
         } else {
@@ -68,7 +67,13 @@
         window.close();
     }
 
-    window.addEventListener('DOMContentLoaded', function () {
-      run();
-    });
+    if (document.readyState !== 'loading') {
+        run();
+    } else {
+        document.addEventListener('DOMContentLoaded', function () {
+            run();
+        });
+    }
 </script>
+</body>
+</html>

backend/static/drf-yasg/swagger-ui-dist/swagger-initializer.js

@@ -0,0 +1,20 @@
+window.onload = function() {
+  //<editor-fold desc="Changeable Configuration Block">
+
+  // the following lines will be replaced by docker/configurator, when it runs in a docker-container
+  window.ui = SwaggerUIBundle({
+    url: "https://petstore.swagger.io/v2/swagger.json",
+    dom_id: '#swagger-ui',
+    deepLinking: true,
+    presets: [
+      SwaggerUIBundle.presets.apis,
+      SwaggerUIStandalonePreset
+    ],
+    plugins: [
+      SwaggerUIBundle.plugins.DownloadUrl
+    ],
+    layout: "StandaloneLayout"
+  });
+
+  //</editor-fold>
+};