Pre Merge pull request !47 from zghmvp/main

backend/conf/env.example.py

@@ -7,8 +7,11 @@ from application.settings import BASE_DIR
 # ================================================= #
 #
 # 数据库 ENGINE ，默认演示使用 sqlite3 数据库，正式环境建议使用 mysql 数据库
+# Mysql 设置
+# DATABASE_ENGINE = "django.db.backends.mysql"
+# DATABASE_NAME = "django-vue-admin"
+# sqlite3 设置
 DATABASE_ENGINE = "django.db.backends.sqlite3"
-# 数据库名
 DATABASE_NAME = os.path.join(BASE_DIR, 'db.sqlite3')
 
 # 使用mysql时，改为此配置

backend/dvadmin/system/views/login.py

@@ -11,6 +11,7 @@ import hashlib
 from datetime import datetime, timedelta
 
 from captcha.views import CaptchaStore, captcha_image
+from django.conf import settings
 from django.contrib import auth
 from django.contrib.auth import login
 from django.shortcuts import redirect
@@ -56,7 +57,7 @@ class LoginSerializer(TokenObtainPairSerializer):
     登录的序列化器:
     重写djangorestframework-simplejwt的序列化器
     """
-    captcha = serializers.CharField(max_length=6)
+    captcha = serializers.CharField(max_length=6, required=False, allow_null=True)
 
     class Meta:
         model = Users
@@ -68,18 +69,19 @@ class LoginSerializer(TokenObtainPairSerializer):
     }
 
     def validate_captcha(self, captcha):
-        self.image_code = CaptchaStore.objects.filter(
-            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):
-                self.image_code and self.image_code.delete()
-            else:
-                self.image_code and self.image_code.delete()
-                raise CustomValidationError("图片验证码错误")
+        if settings.CAPTCHA_STATE is True:
+          self.image_code = CaptchaStore.objects.filter(
+              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):
+                  self.image_code and self.image_code.delete()
+              else:
+                  self.image_code and self.image_code.delete()
+                  raise CustomValidationError("图片验证码错误")
 
     def validate(self, attrs):
         data = super().validate(attrs)

web/src/views/system/menu/crud.js

@@ -130,7 +130,7 @@ export const crudOptions = (vm) => {
         type: 'cascader',
         dict: {
           url: menuPrefix + '?limit=999&status=1&is_catalog=1',
-          cache: false,
+          // cache: false,
           isTree: true,
           value: 'id', // 数据字典中value字段的属性名
           label: 'name', // 数据字典中label字段的属性名