From 82150461274cabb7ddc6af84fbf9d0182e692982 Mon Sep 17 00:00:00 2001
From: tomtoto <597612178@qq.com>
Date: Wed, 17 Apr 2019 17:46:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=AA=8C=E8=AF=81=E7=A0=81?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=20url=E4=B8=8D=E5=AD=98=E5=9C=A8=20=E8=AE=BF?=
 =?UTF-8?q?=E9=97=AE=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98=EF=BC=8C=E5=AE=9E?=
 =?UTF-8?q?=E7=8E=B0=E7=99=BB=E9=99=86=E9=AA=8C=E8=AF=81=E7=A0=81,=20?=
 =?UTF-8?q?=E5=8A=A0=E5=85=A5django-simple-captcha=3D=3D0.5.9=E4=BE=9D?=
 =?UTF-8?q?=E8=B5=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/users/views.py              |  8 ++++++--
 opms/urls.py                     |  2 ++
 requirements.txt                 |  1 +
 templates/users/login/login.html | 10 ++++++++--
 4 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/apps/users/views.py b/apps/users/views.py
index 46c8d96..5e5960f 100644
--- a/apps/users/views.py
+++ b/apps/users/views.py
@@ -11,6 +11,8 @@
 from django.urls import reverse
 from django.core.mail import send_mail, EmailMultiAlternatives
 from django.contrib.sessions.models import Session
+from captcha.models import CaptchaStore
+from captcha.helpers import captcha_image_url
 
 ######################################
 # 第三方模块
@@ -141,11 +143,13 @@ def get(self, request):
 ######################################
 class LoginView(View):
     def get(self, request):
+        hashkey = CaptchaStore.generate_key()
+        image_url = captcha_image_url(hashkey)
         user_login_form = UerLoginForm()
         context = {
-            'user_login_form': user_login_form,
+            'user_login_form': user_login_form
         }
-        return render(request, 'users/login/login.html', context=context)
+        return render(request, 'users/login/login.html', locals())
 
     def post(self, request):
         user_login_form = UerLoginForm(request.POST)
diff --git a/opms/urls.py b/opms/urls.py
index 0a83e8d..f4f8c70 100644
--- a/opms/urls.py
+++ b/opms/urls.py
@@ -25,6 +25,8 @@
     # media 配置
     url(r'^media/(?P<path>.*)$', serve, {'document_root': MEDIA_ROOT}),
 
+    #验证码
+    url(r'^captcha/', include('captcha.urls')),
     # users
     path('', include('users.urls')),
 
diff --git a/requirements.txt b/requirements.txt
index 28ceada..5d6daad 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -15,3 +15,4 @@ pytz==2018.4
 six==1.11.0
 tornado==5.1
 xlwt==1.3.0
+django-simple-captcha==0.5.9
diff --git a/templates/users/login/login.html b/templates/users/login/login.html
index 717e75e..0704dd3 100644
--- a/templates/users/login/login.html
+++ b/templates/users/login/login.html
@@ -41,8 +41,14 @@
 
                         <!-- 验证码 -->
                         <div class="form-group" style="line-height: 34px; height: 34px;">
-                            {{ user_login_form.captcha }}
-
+                            <div class="input-group col-xs-12">
+                                <input id="id_captcha_1" class="form-control user_captcha" placeholder="请输入验证码"
+                                       autocomplete="off" autocapitalize="off" spellcheck="false" name="captcha_1"
+                                       type="text"
+                                       style="width: auto;" required="">
+                                <img class="captcha" alt="captcha" src="{{ image_url }}">
+                                <input id="id_captcha_0" name="captcha_0" value="{{ hashkey }}" type="hidden">
+                            </div>
                             <!-- 刷新验证码 -->
                             <script>
                                 function refresh_captcha() {