!55 正式发布v0.0.4版本

1.新增批量删除功能
2.新增智能过滤器(使用方法在群 @q群管家)
3.新增 API日志模块名映射功能
4.新增及兼容定时任务插件功能
5.新增插件安装的自动化数据库迁移
6.优化图片及附件model
7.优化强制初始化时，不删除用户表，只做更新
8.优化验证菜单路由地址必须以/开头
9.优化登录方式配置及initialize 优化
10.修复在获取请求IP时报错bug
11.修复权限管理中部门获取的bug
12.修复错误信息前端提示bug
13.其他优化

Author: Tylerlog

backend/application/celery.py

@@ -0,0 +1,17 @@
+import os
+
+os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'application.settings')
+
+from django.conf import settings
+from celery import platforms
+
+if getattr(settings, 'PLUGINS_LIST', {}).get('dvadmin_tenant_backend', None):
+    from tenant_schemas_celery.app import CeleryApp as TenantAwareCeleryApp
+    app = TenantAwareCeleryApp()
+else:
+    from celery import Celery
+
+    app = Celery(f"application")
+app.config_from_object('django.conf:settings')
+app.autodiscover_tasks(lambda: settings.INSTALLED_APPS)
+platforms.C_FORCE_ROOT = True

backend/application/settings.py

@@ -255,7 +255,13 @@
     ),
     'EXCEPTION_HANDLER': 'dvadmin.utils.exception.CustomExceptionHandler',  # 自定义的异常处理
 }
+# ================================================= #
+# ******************** 登录方式配置 ******************** #
+# ================================================= #
 
+AUTHENTICATION_BACKENDS = [
+    'dvadmin.utils.backends.CustomBackend'
+]
 # ================================================= #
 # ****************** simplejwt配置 ***************** #
 # ================================================= #
@@ -334,10 +340,15 @@
 API_MODEL_MAP = {
     "/token/": "登录模块",
     "/api/login/": "登录模块",
+    "/api/plugins_market/plugins/": "插件市场",
 }
 # 表前缀
 TABLE_PREFIX = "dvadmin_"
 DJANGO_CELERY_BEAT_TZ_AWARE = False
 CELERY_TIMEZONE = 'Asia/Shanghai'  # celery 时区问题
+# 初始化需要执行的列表，用来初始化后执行
+INITIALIZE_LIST = []
+INITIALIZE_RESET_LIST = []
 # 导入租户数据
+SHARED_APPS = []
 from plugins import *

backend/application/urls.py

@@ -91,6 +91,7 @@ def get_classes(arg):
     url_prefix = getattr(getattr(apps, app_config), "url_prefix")
     if url_prefix:
         url_prefix = url_prefix[0] + '/'
+        
 # 注册路由
 try:
     url = [
@@ -99,5 +100,7 @@ def get_classes(arg):
     urlpatterns += url
     print(f"【{plugins_values.get('name', None)}】路由导入成功")
 except Exception as e:
+    print(f"【{plugins_values.get('name', None)}】路由导入失败:")
+    print(e)
     pass
 """)

backend/dvadmin/system/initialize.py

@@ -80,10 +80,12 @@ def init_menu(self):
             {"id": "805390f3-a6e6-411e-9798-eebd34b76204", "name": "附件管理", "sort": 7, "web_path": "",
              "icon": "envelope", "parent_id": "54f769b0-3dff-416c-8102-e55ec44827cc", },
             {"id": "ac956a17-87d3-4b61-8f72-44a97b9fbcd1", "name": "图片管理", "sort": 1, "web_path": "/img",
-             "icon": "file-image-o", "parent_id": "805390f3-a6e6-411e-9798-eebd34b76204", "component": "system/fileList/img/index",
+             "icon": "file-image-o", "parent_id": "805390f3-a6e6-411e-9798-eebd34b76204",
+             "component": "system/fileList/img/index",
              "component_name": "imgs"},
             {"id": "28723f68-e470-493a-bbe7-7b759fe26674", "name": "文件管理", "sort": 2, "web_path": "/file",
-             "icon": "file-excel-o", "parent_id": "805390f3-a6e6-411e-9798-eebd34b76204", "component": "system/fileList/file/index",
+             "icon": "file-excel-o", "parent_id": "805390f3-a6e6-411e-9798-eebd34b76204",
+             "component": "system/fileList/file/index",
              "component_name": "file"},
         ]
         self.save(Menu, self.menu_data, "菜单表")
@@ -253,7 +255,7 @@ def init_users(self):
              "role": ["36001d1a-1b3e-4413-bdfe-b3bc04375f46"],
              },
         ]
-        self.save(Users, data, "用户表")
+        self.save(Users, data, "用户表", no_reset=True)
 
     def run(self):
         self.init_dept()

backend/dvadmin/system/models.py

@@ -1,4 +1,5 @@
 import hashlib
+import os
 
 from django.contrib.auth.models import AbstractUser
 from django.db import models
@@ -35,7 +36,7 @@ class Meta:
         db_table = table_prefix + "system_users"
         verbose_name = '用户表'
         verbose_name_plural = verbose_name
-        ordering = ('create_datetime',)
+        ordering = ('-create_datetime',)
 
 
 class Post(CoreModel):
@@ -126,6 +127,7 @@ class Menu(CoreModel):
         (1, "是"),
     )
     is_link = models.IntegerField(choices=ISLINK_CHOICES, default=0, verbose_name="是否外链", help_text="是否外链")
+    is_catalog = models.IntegerField(choices=ISLINK_CHOICES,default=0,verbose_name="是否目录",help_text="是否目录")
     web_path = models.CharField(max_length=128, verbose_name="路由地址", null=True, blank=True, help_text="路由地址")
     component = models.CharField(max_length=128, verbose_name="组件地址", null=True, blank=True, help_text="组件地址")
     component_name = models.CharField(max_length=50, verbose_name="组件名称", null=True, blank=True, help_text="组件名称")
@@ -211,9 +213,24 @@ class Meta:
         ordering = ('-create_datetime',)
 
 
+def media_img_name(instance, filename):
+    h = instance.md5sum
+    basename, ext = os.path.splitext(filename)
+    return os.path.join('media/imgs', h[0:1], h[1:2], h + ext.lower())
+
+
 class ImgList(CoreModel):
     name = models.CharField(max_length=50, null=True, blank=True, verbose_name="名称", help_text="名称")
-    url = models.ImageField(upload_to='media/imgs/%Y%m%d/')
+    url = models.ImageField(upload_to=media_img_name)
+    md5sum = models.CharField(max_length=36, blank=True, verbose_name="文件md5", help_text="文件md5")
+
+    def save(self, *args, **kwargs):
+        if not self.md5sum:  # file is new
+            md5 = hashlib.md5()
+            for chunk in self.url.chunks():
+                md5.update(chunk)
+            self.md5sum = md5.hexdigest()
+        super(ImgList, self).save(*args, **kwargs)
 
     class Meta:
         db_table = table_prefix + 'img_list'
@@ -222,14 +239,27 @@ class Meta:
         ordering = ('-create_datetime',)
 
 
+def media_file_name(instance, filename):
+    h = instance.md5sum
+    basename, ext = os.path.splitext(filename)
+    return os.path.join('media/files', h[0:1], h[1:2], h + ext.lower())
+
+
 class FileList(CoreModel):
     name = models.CharField(max_length=50, null=True, blank=True, verbose_name="名称", help_text="名称")
-    url = models.FileField(upload_to='media/files/%Y%m%d/')
+    url = models.FileField(upload_to=media_file_name)
+    md5sum = models.CharField(max_length=36, blank=True, verbose_name="文件md5", help_text="文件md5")
+
+    def save(self, *args, **kwargs):
+        if not self.md5sum:  # file is new
+            md5 = hashlib.md5()
+            for chunk in self.url.chunks():
+                md5.update(chunk)
+            self.md5sum = md5.hexdigest()
+        super(FileList, self).save(*args, **kwargs)
 
     class Meta:
         db_table = table_prefix + 'file_list'
         verbose_name = '文件管理'
         verbose_name_plural = verbose_name
         ordering = ('-create_datetime',)
-
-

backend/dvadmin/system/urls.py

@@ -33,12 +33,11 @@
 system_url.register(r'file',FileViewSet)
 
 
+
 urlpatterns = [
     re_path('role/role_id_to_menu/(?P<pk>.*?)/', RoleViewSet.as_view({'get': 'roleId_to_menu'})),
-    re_path('menu/web_router/', MenuViewSet.as_view({'get': 'web_router'})),
+    path('menu/web_router/', MenuViewSet.as_view({'get': 'web_router'})),
     path('user/user_info/',UserViewSet.as_view({'get':'user_info','put':'update_user_info'})),
     re_path('user/change_password/(?P<pk>.*?)/',UserViewSet.as_view({'put':'change_password'})),
-
-
 ]
 urlpatterns += system_url.urls

backend/dvadmin/system/views/file_list.py

@@ -14,18 +14,19 @@
 
 
 class FileSerializer(CustomModelSerializer):
-    img = serializers.SerializerMethodField(read_only=True)
+    url = serializers.SerializerMethodField(read_only=True)
 
-    def get_img(self,instance):
+    def get_url(self, instance):
         return str(instance.url)
 
     class Meta:
         model = FileList
         fields = "__all__"
 
-    def create(self,validated_data):
-        validated_data['name'] = str(validated_data.get('url'))
-        return FileList.objects.create(**validated_data)
+    def create(self, validated_data):
+        validated_data['name'] = str(self.initial_data.get('url'))
+        validated_data['url'] = self.initial_data.get('url')
+        return super().create(validated_data)
 
 
 class FileViewSet(CustomModelViewSet):
@@ -39,4 +40,4 @@ class FileViewSet(CustomModelViewSet):
     """
     queryset = FileList.objects.all()
     serializer_class = FileSerializer
-    filter_fields = ['name',]
+    filter_fields = ['name', ]

backend/dvadmin/system/views/img_list.py

@@ -16,16 +16,16 @@
 class ImgSerializer(CustomModelSerializer):
     img = serializers.SerializerMethodField(read_only=True)
 
-    def get_img(self,instance):
+    def get_img(self, instance):
         return str(instance.url)
 
     class Meta:
         model = ImgList
         fields = "__all__"
 
-    def create(self,validated_data):
+    def create(self, validated_data):
         validated_data['name'] = str(validated_data.get('url'))
-        return ImgList.objects.create(**validated_data)
+        return super().create(validated_data)
 
 
 class ImgViewSet(CustomModelViewSet):
@@ -39,4 +39,4 @@ class ImgViewSet(CustomModelViewSet):
     """
     queryset = ImgList.objects.all()
     serializer_class = ImgSerializer
-    filter_fields = ['name',]
+    filter_fields = ['name', ]

backend/dvadmin/system/views/login.py

@@ -69,12 +69,13 @@ def validate_captcha(self, captcha):
             id=self.initial_data['captchaKey']).first()
         five_minute_ago = datetime.now() - timedelta(hours=0, minutes=5, seconds=0)
         if self.image_code and five_minute_ago > self.image_code.expiration:
+            self.image_code and self.image_code.delete()
             raise CustomValidationError('验证码过期')
         else:
             if self.image_code and (self.image_code.response == captcha or self.image_code.challenge == captcha):
-                pass
+                self.image_code and self.image_code.delete()
             else:
-                self.image_code.delete()
+                self.image_code and self.image_code.delete()
                 raise CustomValidationError("图片验证码错误")
 
     def validate(self, attrs):
@@ -95,7 +96,6 @@ def validate(self, attrs):
                 "data": data
             }
         else:
-            self.image_code.delete()
             result = {
                 "code": 4000,
                 "msg": "账号/密码不正确",
@@ -113,6 +113,7 @@ class LoginView(TokenObtainPairView):
 
 
 class ApiLoginSerializer(CustomModelSerializer):
+    """接口文档登录-序列化器"""
     username = serializers.CharField()
     password = serializers.CharField()
 
@@ -125,6 +126,8 @@ class Meta:
 class ApiLogin(APIView):
     """接口文档的登录接口"""
     serializer_class = ApiLoginSerializer
+    authentication_classes = []
+    permission_classes = []
 
     def post(self, request):
         username = request.data.get('username')
@@ -134,4 +137,4 @@ def post(self, request):
             login(request,user_obj)
             return redirect('/')
         else:
-            return ErrorResponse(msg="账号/密码错误")
+            return ErrorResponse(msg="账号/密码错误")

backend/dvadmin/utils/backends.py

@@ -0,0 +1,29 @@
+import logging
+
+from django.contrib.auth import get_user_model
+from django.contrib.auth.backends import ModelBackend
+from django.utils import timezone
+
+logger = logging.getLogger(__name__)
+UserModel = get_user_model()
+
+
+class CustomBackend(ModelBackend):
+    """
+    Django原生认证方式
+    """
+
+    def authenticate(self, request, username=None, password=None, **kwargs):
+        msg = '%s 正在使用本地登录...' % username
+        logger.info(msg)
+        if username is None:
+            username = kwargs.get(UserModel.USERNAME_FIELD)
+        try:
+            user = UserModel._default_manager.get_by_natural_key(username)
+        except UserModel.DoesNotExist:
+            UserModel().set_password(password)
+        else:
+            if user.check_password(password) and self.user_can_authenticate(user):
+                user.last_login = timezone.now()
+                user.save()
+                return user