ITStudio_OUC/ITShowPlatform
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更改enroll命名,添加了注释,向get_error_msg中添加了一些错误代码

Browse Source
This commit is contained in:
ygm1881
2022-05-05 20:38:54 +08:00
parent 7fa3281a5f
commit 3472f7e00e
11 changed files with 123 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.idea/workspace.xml
Generated
+14 -108
View File
@@ -31,9 +31,18 @@
</select>
</component>
<component name="ChangeListManager">
<list default="true" id="81247df9-f070-428a-8ff8-85c1a06086e7" name="Default Changelist" comment="重构了app">
<change afterPath="$PROJECT_DIR$/utils/get_error_msg.py" afterDir="false" />
<list default="true" id="81247df9-f070-428a-8ff8-85c1a06086e7" name="Default Changelist" comment="第一次合并+上线&#10;修改了history路由">
<change afterPath="$PROJECT_DIR$/Apps/enroll/email_body" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Apps/enroll/migrations/0006_rename_new_member_newmember.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Apps/enroll/admin.py" beforeDir="false" afterPath="$PROJECT_DIR$/Apps/enroll/admin.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Apps/enroll/email.py" beforeDir="false" afterPath="$PROJECT_DIR$/Apps/enroll/email.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Apps/enroll/models.py" beforeDir="false" afterPath="$PROJECT_DIR$/Apps/enroll/models.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Apps/enroll/serializers.py" beforeDir="false" afterPath="$PROJECT_DIR$/Apps/enroll/serializers.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Apps/enroll/urls.py" beforeDir="false" afterPath="$PROJECT_DIR$/Apps/enroll/urls.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Apps/enroll/views.py" beforeDir="false" afterPath="$PROJECT_DIR$/Apps/enroll/views.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ITShowPlatform/settings.py" beforeDir="false" afterPath="$PROJECT_DIR$/ITShowPlatform/settings.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/utils/get_error_msg.py" beforeDir="false" afterPath="$PROJECT_DIR$/utils/get_error_msg.py" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -153,7 +162,7 @@
<workItem from="1650790774256" duration="451000" />
<workItem from="1650903753930" duration="1368000" />
<workItem from="1651065854470" duration="1813000" />
<workItem from="1651738641048" duration="5717000" />
<workItem from="1651738641048" duration="4689000" />
</task>
<task id="LOCAL-00001" summary="fix">
<created>1650187914913</created>
@@ -169,14 +178,7 @@
<option name="project" value="LOCAL" />
<updated>1650785005055</updated>
</task>
<task id="LOCAL-00003" summary="重构了app">
<created>1651746739401</created>
<option name="number" value="00003" />
<option name="presentableId" value="LOCAL-00003" />
<option name="project" value="LOCAL" />
<updated>1651746739401</updated>
</task>
<option name="localTasksCounter" value="4" />
<option name="localTasksCounter" value="3" />
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
@@ -204,107 +206,11 @@
</entry>
</map>
</option>
<option name="oldMeFiltersMigrated" value="true" />
</component>
<component name="VcsManagerConfiguration">
<option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
<MESSAGE value="fix" />
<MESSAGE value="修改+合并前的提交" />
<MESSAGE value="重构了app" />
<option name="LAST_COMMIT_MESSAGE" value="重构了app" />
</component>
<component name="WindowStateProjectService">
<state x="460" y="12" key="#ITShowPlatform" timestamp="1651644593580">
<screen x="0" y="0" width="1536" height="864" />
</state>
<state x="460" y="12" key="#ITShowPlatform/0.0.1536.864@0.0.1536.864" timestamp="1651644593580" />
<state x="345" y="76" key="#SSH_Configurations" timestamp="1650645097799">
<screen x="0" y="0" width="1536" height="864" />
</state>
<state x="345" y="76" key="#SSH_Configurations/0.0.1536.864@0.0.1536.864" timestamp="1650645097799" />
<state x="223" y="87" key="#com.intellij.execution.impl.EditConfigurationsDialog" timestamp="1651645077454">
<screen x="0" y="0" width="1536" height="864" />
</state>
<state x="223" y="87" key="#com.intellij.execution.impl.EditConfigurationsDialog/0.0.1536.864@0.0.1536.864" timestamp="1651645077454" />
<state x="93" y="93" width="1350" height="678" key="DiffContextDialog" timestamp="1650785927137">
<screen x="0" y="0" width="1536" height="864" />
</state>
<state x="93" y="93" width="1350" height="678" key="DiffContextDialog/0.0.1536.864@0.0.1536.864" timestamp="1650785927137" />
<state x="549" y="187" key="FileChooserDialogImpl" timestamp="1651739204582">
<screen x="0" y="0" width="1536" height="864" />
</state>
<state x="549" y="187" key="FileChooserDialogImpl/0.0.1536.864@0.0.1536.864" timestamp="1651739204582" />
<state x="615" y="398" key="Gitee.ShareDialog" timestamp="1650650539689">
<screen x="0" y="0" width="1536" height="864" />
</state>
<state x="615" y="398" key="Gitee.ShareDialog/0.0.1536.864@0.0.1536.864" timestamp="1650650539689" />
<state x="615" y="342" key="Github.Dialog.Accounts.Choose" timestamp="1650187937570">
<screen x="0" y="0" width="1536" height="864" />
</state>
<state x="615" y="342" key="Github.Dialog.Accounts.Choose/0.0.1536.864@0.0.1536.864" timestamp="1650187937570" />
<state width="1493" height="216" key="GridCell.Tab.0.bottom" timestamp="1651746397547">
<screen x="0" y="0" width="1536" height="864" />
</state>
<state width="1493" height="216" key="GridCell.Tab.0.bottom/0.0.1536.864@0.0.1536.864" timestamp="1651746397546" />
<state width="1493" height="216" key="GridCell.Tab.0.center" timestamp="1651746397545">
<screen x="0" y="0" width="1536" height="864" />
</state>
<state width="1493" height="216" key="GridCell.Tab.0.center/0.0.1536.864@0.0.1536.864" timestamp="1651746397545" />
<state width="1493" height="216" key="GridCell.Tab.0.left" timestamp="1651746397545">
<screen x="0" y="0" width="1536" height="864" />
</state>
<state width="1493" height="216" key="GridCell.Tab.0.left/0.0.1536.864@0.0.1536.864" timestamp="1651746397545" />
<state width="1493" height="216" key="GridCell.Tab.0.right" timestamp="1651746397546">
<screen x="0" y="0" width="1536" height="864" />
</state>
<state width="1493" height="216" key="GridCell.Tab.0.right/0.0.1536.864@0.0.1536.864" timestamp="1651746397546" />
<state width="1493" height="269" key="GridCell.Tab.1.bottom" timestamp="1651745777781">
<screen x="0" y="0" width="1536" height="864" />
</state>
<state width="1493" height="269" key="GridCell.Tab.1.bottom/0.0.1536.864@0.0.1536.864" timestamp="1651745777781" />
<state width="1493" height="269" key="GridCell.Tab.1.center" timestamp="1651745777781">
<screen x="0" y="0" width="1536" height="864" />
</state>
<state width="1493" height="269" key="GridCell.Tab.1.center/0.0.1536.864@0.0.1536.864" timestamp="1651745777781" />
<state width="1493" height="269" key="GridCell.Tab.1.left" timestamp="1651745777781">
<screen x="0" y="0" width="1536" height="864" />
</state>
<state width="1493" height="269" key="GridCell.Tab.1.left/0.0.1536.864@0.0.1536.864" timestamp="1651745777781" />
<state width="1493" height="269" key="GridCell.Tab.1.right" timestamp="1651745777781">
<screen x="0" y="0" width="1536" height="864" />
</state>
<state width="1493" height="269" key="GridCell.Tab.1.right/0.0.1536.864@0.0.1536.864" timestamp="1651745777781" />
<state x="147" y="69" key="MergeDialog" timestamp="1650785054273">
<screen x="0" y="0" width="1536" height="864" />
</state>
<state x="147" y="69" key="MergeDialog/0.0.1536.864@0.0.1536.864" timestamp="1650785054273" />
<state x="396" y="185" key="MultipleFileMergeDialog" timestamp="1650903868503">
<screen x="0" y="0" width="1536" height="864" />
</state>
<state x="396" y="185" key="MultipleFileMergeDialog/0.0.1536.864@0.0.1536.864" timestamp="1650903868503" />
<state x="270" y="76" key="SettingsEditor" timestamp="1651645101984">
<screen x="0" y="0" width="1536" height="864" />
</state>
<state x="270" y="76" key="SettingsEditor/0.0.1536.864@0.0.1536.864" timestamp="1651645101984" />
<state x="361" y="161" key="Vcs.Push.Dialog.v2" timestamp="1651746748238">
<screen x="0" y="0" width="1536" height="864" />
</state>
<state x="361" y="161" key="Vcs.Push.Dialog.v2/0.0.1536.864@0.0.1536.864" timestamp="1651746748238" />
<state x="93" y="93" width="1350" height="678" key="com.intellij.history.integration.ui.views.FileHistoryDialog" timestamp="1651645036813">
<screen x="0" y="0" width="1536" height="864" />
</state>
<state x="93" y="93" width="1350" height="678" key="com.intellij.history.integration.ui.views.FileHistoryDialog/0.0.1536.864@0.0.1536.864" timestamp="1651645036813" />
<state x="563" y="345" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2" timestamp="1650784772214">
<screen x="0" y="0" width="1536" height="864" />
</state>
<state x="563" y="345" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2/0.0.1536.864@0.0.1536.864" timestamp="1650784772214" />
<state x="1000" y="164" key="ftp.server.browser" timestamp="1651644223975">
<screen x="0" y="0" width="1536" height="864" />
</state>
<state x="1000" y="164" key="ftp.server.browser/0.0.1536.864@0.0.1536.864" timestamp="1651644223975" />
<state x="520" y="210" key="git4idea.merge.GitMergeDialog" timestamp="1650785115917">
<screen x="0" y="0" width="1536" height="864" />
</state>
<state x="520" y="210" key="git4idea.merge.GitMergeDialog/0.0.1536.864@0.0.1536.864" timestamp="1650785115917" />
<option name="LAST_COMMIT_MESSAGE" value="修改+合并前的提交" />
</component>
</project>
Apps/enroll/admin.py
+1 -1
View File
@@ -51,5 +51,5 @@ class New_memberAdmin(admin.ModelAdmin):
list_filter = ()
admin.site.register(Department ,DepartmentAdmin)
admin.site.register(New_member)
admin.site.register(NewMember)
admin.site.register(EmailVerifyRecord)
Apps/enroll/email.py
+9 -20
View File
@@ -22,11 +22,10 @@ def random_str(randomlength=8):
# 发送电子邮件
def send_code_email(email, send_type="register"):
def send_code_email(email):
"""
发送电子邮件
:param email: 要发送的邮箱
:param send_type: 邮箱类型
:return: True/False
"""
email_record = EmailVerifyRecord()
@@ -34,26 +33,16 @@ def send_code_email(email, send_type="register"):
code = "".join([str(random.randint(0, 9)) for i in range(4)])
email_record.code = code
email_record.email = email
# email_record.send_type = send_type
# email_record.send_time = time.time()
email_record.save()
# 初始化为空
email_title = ""
email_body = ""
# 如果为注册类型
# if send_type == "register":
# email_title = "注册激活"
# # email_body = "请点击下面的链接激活你的账号:http://127.0.0.1:8000/active/{0}".format(code)
# email_body = "您的邮箱注册验证码为：{0}, 该验证码有效时间为两分钟，请及时进行验证。".format(code)
# # 发送邮件
# send_status = send_mail(email_title, email_body, settings.EMAIL_FROM, [email])
# if not send_status:
# return False
if send_type == "retrieve":
email_title = "找回密码"
email_body = "您的邮箱注册验证码为：{0}, 该验证码有效时间为两分钟，请及时进行验证。".format(code)
# 发送邮件
send_status = send_mail(email_title, email_body, settings.EMAIL_FROM, [email])
if not send_status:
return False
email_title = "注册激活"
file = open("/email_body")
email_body = str(file.read).format(code)
# 发送邮件
send_status = send_mail(email_title, email_body, settings.EMAIL_FROM, [email])
if not send_status:
return False
return True
Apps/enroll/email_body
+1
View File
@@ -0,0 +1 @@
您的邮箱注册验证码为：{0}, 该验证码有效时间为两分钟，请及时进行验证。
Apps/enroll/migrations/0006_rename_new_member_newmember.py
+17
View File
@@ -0,0 +1,17 @@
# Generated by Django 4.0.4 on 2022-05-05 18:52
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('enroll', '0005_alter_emailverifyrecord_code'),
]
operations = [
migrations.RenameModel(
old_name='New_member',
new_name='NewMember',
),
]
Apps/enroll/models.py
+1 -1
View File
@@ -19,7 +19,7 @@ class Department(models.Model):
return self.name
class New_member(models.Model):
class NewMember(models.Model):
schedules = [
(0, "尚未提交"),
(1, "已报名"),
Apps/enroll/serializers.py
+28 -19
View File
@@ -1,67 +1,76 @@
from rest_framework import serializers
from rest_framework.validators import UniqueValidator
from Apps.enroll.models import Department, New_member, EmailVerifyRecord
from Apps.enroll.models import Department, NewMember, EmailVerifyRecord
import time
from utils.get_error_msg import get_error_msg
class Department_serializer(serializers.ModelSerializer):
class department_serializer(serializers.ModelSerializer):
"""获取部门信息"""
class Meta:
model = Department
fields = "__all__"
class New_member_serializer(serializers.ModelSerializer):
class new_member_serializer(serializers.ModelSerializer):
"""用于添加新成员时的校验与序列化"""
# verification_code = serializers.CharField(source="verification_code.code")
email = serializers.EmailField(validators=[
UniqueValidator(
queryset=New_member.objects.all(),
message="该邮箱已存在"
queryset=NewMember.objects.all(),
message=get_error_msg(43032)
)
])
phone_number = serializers.CharField(validators=[
UniqueValidator(
queryset=New_member.objects.all(),
message="该手机号码已存在"
queryset=NewMember.objects.all(),
message=get_error_msg(43033)
),
],
max_length=11, error_messages={"max_length": "手机号码不合规"}
max_length=11, error_messages={"max_length": get_error_msg(42033)}
)
class Meta:
model = New_member
model = NewMember
exclude = ["id", "schedule"]
extra_kwargs = {
"name": {
"error_messages": {
"max_length": "姓名过长"
"max_length": get_error_msg(42034)
}
},
"major": {
"error_messages": {
"max_length": "文字过长"
"max_length": get_error_msg(42035)
}
},
}
class New_member_schedule_serializer(serializers.ModelSerializer):
class new_member_schedule_serializer(serializers.ModelSerializer):
"""获取成员录取状态信息的序列化器"""
class Meta:
model = New_member
model = NewMember
fields = ["name", "email", "schedule"]
class Send_email_serializer(serializers.Serializer):
class send_email_serializer(serializers.Serializer):
"""发送邮件时校验用序列化器"""
# code = serializers.CharField(max_length=10)
email = serializers.EmailField(max_length=50,
validators=[UniqueValidator(
queryset=New_member.objects.all(),
message="该邮箱已存在")],
error_messages={"max_length": "邮箱过长", "invalid": "请输入正确格式的邮箱"})
queryset=NewMember.objects.all(),
message=get_error_msg(43032))],
error_messages={"max_length": get_error_msg(42032), "invalid": get_error_msg(44036)})
def validate_email(self, data):
# print(data)
try:
oj = EmailVerifyRecord.objects.get(email=data)
# print(oj.email)/
@@ -70,7 +79,7 @@ class Send_email_serializer(serializers.Serializer):
now = time.time()
# print(f"now={now},send={send_time}")
if now - send_time < 120:
raise serializers.ValidationError(code="verification_code", detail="请勿频繁发送验证码")
raise serializers.ValidationError(code="verification_code", detail=get_error_msg(44033))
else:
# print(oj.email)
oj.delete()
Apps/enroll/urls.py
+3 -3
View File
@@ -4,8 +4,8 @@ from . import views
# from rest_framework.routers import DefaultRouter
urlpatterns = [
path("department/", views.Department_message.as_view()),
path("sign_up/", views.Sign_up.as_view()),
path("sign_up/verification_code/", views.Send_email.as_view()),
path("department/", views.department_message.as_view()),
path("sign_up/", views.sign_up.as_view()),
path("sign_up/verification_code/", views.send_email.as_view()),
# path("sign_up/<string:pk>", views.Sign_in.as_view({"get": "get"}))
]
Apps/enroll/views.py
+33 -22
View File
@@ -1,36 +1,45 @@
from rest_framework.response import Response
from rest_framework.generics import GenericAPIView
from Apps.enroll.models import Department, EmailVerifyRecord, New_member
from Apps.enroll.serializers import Department_serializer, New_member_serializer, New_member_schedule_serializer, \
Send_email_serializer
from Apps.enroll.models import Department, EmailVerifyRecord, NewMember
from Apps.enroll.serializers import department_serializer, new_member_serializer, new_member_schedule_serializer, \
send_email_serializer
from rest_framework import status
from rest_framework.views import APIView
from Apps.enroll.email import send_code_email
from utils.get_error_msg import get_error_msg
import re
import time
class Department_message(GenericAPIView):
class department_message(GenericAPIView):
"""获取部门信息"""
queryset = Department.objects.all()
serializer_class = Department_serializer
serializer_class = department_serializer
def get(self, request):
serializer = self.get_serializer(instance=self.get_queryset(), many=True)
# print(request.query_params)
if request.query_params:
return Response({"code": 40000, "msg": "请求失败"})
return Response({"code": 20000, "msg": "成功", "data": serializer.data}, status=status.HTTP_200_OK)
return Response({"code": 40000, "msg": get_error_msg("40000")})
return Response({"code": 20000, "msg": get_error_msg("20000"), "data": serializer.data})
class Sign_up(GenericAPIView):
serializer_class = New_member_serializer
queryset = New_member.objects.all()
class sign_up(GenericAPIView):
"""
新成员报名
post:提交新学员信息
get:根据邮箱及手机号获取成员录取状态
"""
serializer_class = new_member_serializer
queryset = NewMember.objects.all()
def post(self, request):
data = request.data
serializer = self.get_serializer(data=data)
code = data['verification_code']
print(f"code={code}")
# print(f"code={code}")
try:
oj = EmailVerifyRecord.objects.get(email=data['email'])
send_time = str(oj.send_time).split('+')[0].split('.')[0]
@@ -38,18 +47,18 @@ class Sign_up(GenericAPIView):
now = time.time()
if now - send_time > 120:
return Response(
{"code": 40000, "msg": {"verification_code": "邮箱验证码过期"}},
{"code": 40000, "msg": {"verification_code": get_error_msg(45032)}},
status=status.HTTP_400_BAD_REQUEST)
if code != oj.code:
return Response({"code": 40000, "msg": {"verification_code": "邮箱验证码错误"}},
return Response({"code": 45032, "msg": {"verification_code": get_error_msg(44031)}},
status=status.HTTP_400_BAD_REQUEST)
except EmailVerifyRecord.DoesNotExist:
return Response({"code": 40000, "msg": {"verification_code": "请先发送验证码"}},
return Response({"code": 44032, "msg": {"verification_code": get_error_msg(44032)}},
status=status.HTTP_400_BAD_REQUEST)
ret = serializer.is_valid(raise_exception=False)
if ret:
serializer.save()
return Response({"code": 20000, "msg": "成功"})
return Response({"code": 20000, "msg": get_error_msg(20000)})
else:
error = {}
for (i, j) in zip(serializer.errors.keys(), serializer.errors.values()):
@@ -65,23 +74,25 @@ class Sign_up(GenericAPIView):
queryset = self.get_queryset().get(phone_number=string)
else:
queryset = self.get_queryset().get(id=-1)
except New_member.DoesNotExist:
return Response({"code": 40000, "msg": "信息不存在"})
serializer = New_member_schedule_serializer(instance=queryset)
except NewMember.DoesNotExist:
return Response({"code": 40000, "msg": get_error_msg(45030)})
serializer = new_member_schedule_serializer(instance=queryset)
return Response({"code": 20000, "msg": "查询成功", "data": serializer.data})
return Response({"code": 20000, "msg": get_error_msg(20000), "data": serializer.data})
class Send_email(APIView):
class send_email(APIView):
"""发送邮件"""
def post(self, request):
data = request.data
serializer = Send_email_serializer(data=data)
serializer = send_email_serializer(data=data)
# code_serializer = Code_email_serializer()
ret = serializer.is_valid()
if ret:
# serializer.save()
send_code_email(data.get("email"))
return Response({"code": 20000, "msg": "成功"})
return Response({"code": 20000, "msg": get_error_msg(20000)})
else:
error = {}
for (i, j) in zip(serializer.errors.keys(), serializer.errors.values()):
ITShowPlatform/settings.py
+3 -1
View File
@@ -30,6 +30,7 @@ ALLOWED_HOSTS = ["*"]
# Application definition
INSTALLED_APPS = [
'simpleui',
'django.contrib.admin',
'django.contrib.auth',
'django.contrib.contenttypes',
@@ -41,6 +42,7 @@ INSTALLED_APPS = [
'Apps.history',
'Apps.comments',
]
MIDDLEWARE = [
@@ -82,7 +84,7 @@ DATABASES = {
'ENGINE': 'django.db.backends.mysql',
'NAME': 'ITShowPlatform',
'USER': 'root',
'PASSWORD': 'HNXhnx123',
'PASSWORD': '123456',
}
}
utils/get_error_msg.py
+13
View File
@@ -5,5 +5,18 @@ def get_error_msg(code="20000"):
"50403": "Forbidden",
"40000": "请求方法错误",
"40001": "JSON解析错误",
"45030": "信息不存在",
"45032": "邮箱验证码过期",
"44031": "邮箱验证码错误",
"44032": "请先发送验证码",
"43032": "该邮箱已存在",
"43033": "该手机号码已存在",
"42033": "手机号码不合规",
"42034": "姓名过长",
"42035": "说的太多啦",
"42032": "邮箱过长",
"44033": "请勿频繁发送验证码",
"44036": "请输入正确格式的邮箱",
}
return error_set.get(str(code))