Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
HenryJi529 committed Jun 4, 2024
1 parent 2f6baa6 commit 9fc69e7
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 12 deletions.
37 changes: 28 additions & 9 deletions Morningstar/forms.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
from django import forms
from django_recaptcha.fields import ReCaptchaField
from django.core.validators import RegexValidator
from django.http import HttpRequest
from django_redis import get_redis_connection
import re

Expand All @@ -16,7 +17,9 @@ class LoginForm(forms.Form):
label="账户",
initial="",
required=True,
widget=forms.TextInput(attrs={"placeholder": "用户名/邮箱/手机号", "class": "w-full"}),
widget=forms.TextInput(
attrs={"placeholder": "用户名/邮箱/手机号", "class": "w-full"}
),
)
password = forms.CharField(
label="密码",
Expand Down Expand Up @@ -56,9 +59,9 @@ def clean_identity(self):

def clean_image_captcha(self):
image_captcha = self.cleaned_data["image_captcha"]
request = self.request
request: HttpRequest = self.request

session_key = request.session._session_key
session_key = request.session.session_key

conn = get_redis_connection("default")
redis_image_captcha = conn.get(f"{session_key}-image-captcha")
Expand All @@ -84,7 +87,9 @@ class RegisterForm(forms.Form):
required=True,
widget=forms.EmailInput(attrs={"placeholder": FAKE_EMAIL, "class": "w-full"}),
validators=[
RegexValidator(r"^\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*$", "邮箱格式错误"),
RegexValidator(
r"^\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*$", "邮箱格式错误"
),
],
)

Expand All @@ -99,7 +104,10 @@ class RegisterForm(forms.Form):
],
min_length=6,
max_length=16,
error_messages={"min_length": "密码长度不能小于6个字符", "max_length": "密码长度不能大于16个字符"},
error_messages={
"min_length": "密码长度不能小于6个字符",
"max_length": "密码长度不能大于16个字符",
},
)

confirm_password = forms.CharField(
Expand All @@ -110,7 +118,10 @@ class RegisterForm(forms.Form):
),
min_length=6,
max_length=16,
error_messages={"min_length": "密码长度不能小于6个字符", "max_length": "密码长度不能大于16个字符"},
error_messages={
"min_length": "密码长度不能小于6个字符",
"max_length": "密码长度不能大于16个字符",
},
)

captcha = ReCaptchaField(label="人机验证")
Expand Down Expand Up @@ -182,7 +193,9 @@ class UpdateEmailForm(forms.Form):
email = forms.EmailField(
label="邮箱",
validators=[
RegexValidator(r"^\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*$", "邮箱格式错误"),
RegexValidator(
r"^\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*$", "邮箱格式错误"
),
],
)
email_code = forms.CharField(
Expand Down Expand Up @@ -246,7 +259,10 @@ class UpdatePasswordForm(forms.Form):
],
min_length=6,
max_length=16,
error_messages={"min_length": "密码长度不能小于6个字符", "max_length": "密码长度不能大于16个字符"},
error_messages={
"min_length": "密码长度不能小于6个字符",
"max_length": "密码长度不能大于16个字符",
},
)

confirm_password = forms.CharField(
Expand All @@ -257,7 +273,10 @@ class UpdatePasswordForm(forms.Form):
),
min_length=6,
max_length=16,
error_messages={"min_length": "密码长度不能小于6个字符", "max_length": "密码长度不能大于16个字符"},
error_messages={
"min_length": "密码长度不能小于6个字符",
"max_length": "密码长度不能大于16个字符",
},
)

def clean_confirm_password(self):
Expand Down
2 changes: 1 addition & 1 deletion Morningstar/views/tool.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
def get_image_captcha(request: HttpRequest):
"""生成图片验证码"""
image_object, code = generate_image()
session_key = request.session._session_key
session_key = request.session.session_key

conn = get_redis_connection("default")
conn.set(f"{session_key}-image-captcha", code, ex=60)
Expand Down
4 changes: 2 additions & 2 deletions apps/share/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ def route(request: HttpRequest, id):


def get_qrcode(request: HttpRequest):
session_key = request.session._session_key
session_key = request.session.session_key
conn = get_redis_connection("default")
link = conn.get(f"{session_key}-share-qrcode")
back_color = (255, 255, 255)
Expand Down Expand Up @@ -69,7 +69,7 @@ def submit(request: HttpRequest):
item.save()
id = item.id
link = f"redirect/{id}/"
session_key = request.session._session_key
session_key = request.session.session_key
conn = get_redis_connection("default")
conn.set(
f"{session_key}-share-qrcode",
Expand Down

0 comments on commit 9fc69e7

Please sign in to comment.