diff --git a/app_admin/views.py b/app_admin/views.py index c580622..f2b4644 100644 --- a/app_admin/views.py +++ b/app_admin/views.py @@ -49,6 +49,13 @@ def log_in(request): try: username = request.POST.get('username','') pwd = request.POST.get('password','') + # 判断是否需要验证码 + require_login_check_code = SysSetting.objects.filter(types="basic",name="enable_login_check_code") + if (len(require_login_check_code) > 0) and (require_login_check_code[0].value == 'on'): + checkcode = request.POST.get("check_code", None) + if checkcode != request.session['CheckCode'].lower(): + errormsg = '验证码错误！' + return render(request, 'login.html', locals()) if username != '' and pwd != '': user = authenticate(username=username,password=pwd) if user is not None: @@ -713,6 +720,7 @@ def admin_setting(request): img_scale = request.POST.get('img_scale',None) # 图片缩略 enable_register_code = request.POST.get('enable_register_code',None) # 注册邀请码 enable_project_report = request.POST.get('enable_project_report',None) # 文集导出 + enable_login_check_code = request.POST.get('enable_login_check_code',None) # 登录验证码 # 更新首页文集默认排序 SysSetting.objects.update_or_create( name='index_project_sort', @@ -793,6 +801,12 @@ def admin_setting(request): name = 'enable_project_report', defaults={'value':enable_project_report,'types':'basic'} ) + # 更新登录验证码状态 + SysSetting.objects.update_or_create( + name = 'enable_login_check_code', + defaults={'value':enable_login_check_code,'types':'basic'} + ) + return render(request,'app_admin/admin_setting.html',locals()) # 邮箱设置 diff --git a/app_doc/views.py b/app_doc/views.py index 0126b92..4e3879f 100644 --- a/app_doc/views.py +++ b/app_doc/views.py @@ -2515,7 +2515,7 @@ def manage_attachment(request): attachment_suffix_list = ['zip'] allow_attachment = False for suffix in attachment_suffix_list: - if attachment_name.split('.')[-1] in attachment_suffix_list: + if attachment_name.split('.')[-1].lower() in attachment_suffix_list: allow_attachment = True if allow_attachment: a = Attachment.objects.create( diff --git a/template/app_admin/admin_setting.html b/template/app_admin/admin_setting.html index fc18b5d..396cf30 100644 --- a/template/app_admin/admin_setting.html +++ b/template/app_admin/admin_setting.html @@ -101,6 +101,15 @@
开启此选项，新用户注册将需要填写注册码
+ +
+ +
+ +
+
开启此选项，登录将需要填写验证码
+
+
diff --git a/template/app_doc/project.html b/template/app_doc/project.html index 31f55a3..39b8ebd 100644 --- a/template/app_doc/project.html +++ b/template/app_doc/project.html @@ -10,7 +10,7 @@ {% if request.user == project.create_user or colla_user > 0 %} | - {% trans "添加" %} + {% trans "添加" %} {% endif %} {% if request.user == project.create_user %} diff --git a/template/login.html b/template/login.html index 3fae421..80b000d 100644 --- a/template/login.html +++ b/template/login.html @@ -72,6 +72,20 @@
+ {% if enable_login_check_code == 'on' %} +
+
+ + + +
+
+ {% endif %}
diff --git a/template/register.html b/template/register.html index 61be7a1..5cc1643 100644 --- a/template/register.html +++ b/template/register.html @@ -80,7 +80,7 @@
- +