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

进行了一些小小的逻辑完善,把get_error_msg的字典放到了函数外面

Browse Source
This commit is contained in:
ygm1881
2022-05-07 00:35:52 +08:00
parent f328a0e2b6
commit cb3076a48a
3 changed files with 49 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Apps/enroll/serializers.py
+7 -2
View File
@@ -34,7 +34,7 @@ class NewMemberSerializer(serializers.ModelSerializer):
class Meta:
model = NewMember
exclude = ["id", "schedule"]
exclude = ["id", "status"]
extra_kwargs = {
"name": {
@@ -47,6 +47,11 @@ class NewMemberSerializer(serializers.ModelSerializer):
"max_length": get_error_msg(42035)
}
},
"department": {
"error_messages": {
"invalid_choice": get_error_msg(42036)
}
},
}
@@ -56,7 +61,7 @@ class NewMemberScheduleSerializer(serializers.ModelSerializer):
class Meta:
model = NewMember
fields = ["name", "email", "schedule"]
fields = ["name", "email", "status"]
class SendEmailSerializer(serializers.Serializer):
Apps/enroll/views.py
+16 -16
View File
@@ -39,24 +39,24 @@ class SignUpView(GenericAPIView):
data = request.data
serializer = self.get_serializer(data=data)
code = data['verification_code']
# print(f"code={code}")
try:
oj = EmailVerifyRecord.objects.get(email=data['email'])
send_time = str(oj.send_time).split('+')[0].split('.')[0]
send_time = time.mktime(time.strptime(send_time, '%Y-%m-%d %X'))
now = time.time()
if now - send_time > 120:
return Response(
{"code": 40000, "msg": {"verification_code": get_error_msg(45032)}},
status=status.HTTP_400_BAD_REQUEST)
if code != oj.code:
return Response({"code": 45032, "msg": {"verification_code": get_error_msg(44031)}},
status=status.HTTP_400_BAD_REQUEST)
except EmailVerifyRecord.DoesNotExist:
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:
# print(f"code={code}")
try:
oj = EmailVerifyRecord.objects.get(email=data['email'])
send_time = str(oj.send_time).split('+')[0].split('.')[0]
send_time = time.mktime(time.strptime(send_time, '%Y-%m-%d %X'))
now = time.time()
if now - send_time > 120:
return Response(
{"code": 40000, "msg": {"verification_code": get_error_msg(45032)}},
status=status.HTTP_400_BAD_REQUEST)
if code != oj.code:
return Response({"code": 45031, "msg": {"verification_code": get_error_msg(44031)}},
status=status.HTTP_400_BAD_REQUEST)
except EmailVerifyRecord.DoesNotExist:
return Response({"code": 44032, "msg": {"verification_code": get_error_msg(44032)}},
status=status.HTTP_400_BAD_REQUEST)
serializer.save()
return Response({"code": 20000, "msg": get_error_msg(20000)})
else:
utils/get_error_msg.py
+26 -25
View File
@@ -1,29 +1,30 @@
error_set = {
"20000": "成功",
"50000": "意外错误",
"50403": "Forbidden",
"40000": "请求方法错误",
"40001": "JSON解析错误",
"45030": "信息不存在",
"45032": "邮箱验证码过期",
"44031": "邮箱验证码错误",
"44032": "请先发送验证码",
"43032": "该邮箱已存在",
"43033": "该手机号码已存在",
"42033": "手机号码不合规",
"42034": "姓名过长",
"42035": "说的太多啦",
"42036": "该字段不合规",
"42032": "邮箱过长",
"44033": "请勿频繁发送验证码",
"44036": "请输入正确格式的邮箱",
"40002": "非法字符",
"40003": "弹幕过长",
"40004": "输入不能为空",
"40005": "返回评论数为0",
"40006": "",
}
def get_error_msg(code="20000"):
error_set = {
"20000": "成功",
"50000": "意外错误",
"50403": "Forbidden",
"40000": "请求方法错误",
"40001": "JSON解析错误",
"45030": "信息不存在",
"45032": "邮箱验证码过期",
"44031": "邮箱验证码错误",
"44032": "请先发送验证码",
"43032": "该邮箱已存在",
"43033": "该手机号码已存在",
"42033": "手机号码不合规",
"42034": "姓名过长",
"42035": "说的太多啦",
"42032": "邮箱过长",
"44033": "请勿频繁发送验证码",
"44036": "请输入正确格式的邮箱",
"40002": "非法字符",
"40003": "弹幕过长",
"40004": "输入不能为空",
"40005": "返回评论数为0",
"40006": "",
}
return error_set.get(str(code))