更改表结构

This commit is contained in:
ygm1881
2022-05-09 12:11:01 +08:00
parent feac79096d
commit 108cffff31
52 changed files with 103 additions and 84 deletions
View File
+55
View File
@@ -0,0 +1,55 @@
from django.contrib import admin
from .models import *
# Register your models here.
class DepartmentAdmin(admin.ModelAdmin):
# 定制哪些字段需要展示
list_display = ('id', 'name', 'picture')
# sortable_by # 排序
list_editable = ('name', 'picture',)
list_per_page = 10
list_max_show_all = 200 # default
search_fields = ['title']
# date_hierarchy = 'create_date'
'''默认空值'''
empty_value_display = 'NA'
'''过滤选项'''
list_filter = ()
class New_memberAdmin(admin.ModelAdmin):
# 定制哪些字段需要展示
list_display = ('id', 'name', 'picture')
# sortable_by # 排序
list_editable = ('name', 'picture',)
list_per_page = 10
list_max_show_all = 200 # default
search_fields = ['title']
# date_hierarchy = 'create_date'
'''默认空值'''
empty_value_display = 'NA'
'''过滤选项'''
list_filter = ()
admin.site.register(Department ,DepartmentAdmin)
admin.site.register(NewMember)
# admin.site.register(EmailVerifyRecord)
+6
View File
@@ -0,0 +1,6 @@
from django.apps import AppConfig
class EnrollConfig(AppConfig):
default_auto_field = 'django.db.models.BigAutoField'
name = 'apps.enroll'
+53
View File
@@ -0,0 +1,53 @@
from pathlib import Path
from random import Random # 用于生成随机码
from django.core.mail import send_mail # 发送邮件模块
from apps.enroll.models import EmailVerifyRecord # 邮箱验证model
from django.conf import settings # setting.py添加的的配置信息
import random
import os
BASE_DIR = Path(__file__).resolve().parent.parent
# 生成随机字符串
def random_str(randomlength=8):
"""
随机字符串
:param randomlength: 字符串长度
:return: String 类型字符串
"""
str = ''
chars = 'AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz0123456789'
length = len(chars) - 1
random = Random()
for i in range(randomlength):
str += chars[random.randint(0, length)]
return str
# 发送电子邮件
def send_code_email(email):
"""
发送电子邮件
:param email: 要发送的邮箱
:return: True/False
"""
email_record = EmailVerifyRecord()
# 将给用户发的信息保存在数据库中
code = "".join([str(random.randint(0, 9)) for i in range(4)])
email_record.code = code
email_record.email = email
email_record.save()
# 初始化为空
email_title = ""
email_body = ""
email_title = "注册激活"
# file = open("/email_body")
file = open(os.path.join(BASE_DIR, "enroll", "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
+1
View File
@@ -0,0 +1 @@
您的邮箱注册验证码为:{0}, 该验证码有效时间为两分钟,请及时进行验证。
+46
View File
@@ -0,0 +1,46 @@
# Generated by Django 4.0.4 on 2022-04-15 17:46
from django.db import migrations, models
import django.db.models.deletion
class Migration(migrations.Migration):
initial = True
dependencies = [
]
operations = [
migrations.CreateModel(
name='Department',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('name', models.CharField(max_length=10, verbose_name='部门名称')),
('picture', models.ImageField(upload_to='', verbose_name='部门图标')),
],
),
migrations.CreateModel(
name='EmailVerifyRecord',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('code', models.CharField(max_length=20, verbose_name='验证码')),
('email', models.EmailField(max_length=50, verbose_name='邮箱')),
('send_time', models.DateTimeField(auto_now=True, verbose_name='发送时间')),
],
),
migrations.CreateModel(
name='New_member',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('name', models.CharField(max_length=20, verbose_name='姓名')),
('major', models.CharField(max_length=20, verbose_name='年级专业')),
('phone_number', models.CharField(max_length=11, verbose_name='手机号码')),
('email', models.EmailField(max_length=254, verbose_name='邮箱')),
('department', models.CharField(max_length=10, verbose_name='意向部门')),
('expectation', models.CharField(max_length=10, verbose_name='期待的话')),
('schedule', models.SmallIntegerField(choices=[(0, '尚未提交'), (1, '已报名'), (2, '初审中'), (3, '面试中'), (4, '笔试中'), (5, '成功录取'), (-1, '初审失败'), (-2, '面试失败'), (-3, '笔试失败'), (-4, '复试失败'), (-5, '未录取')], verbose_name='报名状态')),
('verification_code', models.ForeignKey(on_delete=django.db.models.deletion.DO_NOTHING, to='enroll.emailverifyrecord', verbose_name='邮箱验证码')),
],
),
]
@@ -0,0 +1,23 @@
# Generated by Django 4.0.4 on 2022-04-15 18:20
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('enroll', '0001_initial'),
]
operations = [
migrations.AlterField(
model_name='new_member',
name='schedule',
field=models.SmallIntegerField(choices=[(0, '尚未提交'), (1, '已报名'), (2, '初审中'), (3, '面试中'), (4, '笔试中'), (5, '成功录取'), (-1, '初审失败'), (-2, '面试失败'), (-3, '笔试失败'), (-4, '复试失败'), (-5, '未录取')], default=0, verbose_name='报名状态'),
),
migrations.AlterField(
model_name='new_member',
name='verification_code',
field=models.CharField(max_length=4),
),
]
@@ -0,0 +1,23 @@
# Generated by Django 4.0.4 on 2022-04-16 06:33
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('enroll', '0002_alter_new_member_schedule_and_more'),
]
operations = [
migrations.AlterField(
model_name='new_member',
name='email',
field=models.EmailField(max_length=254, unique=True, verbose_name='邮箱'),
),
migrations.AlterField(
model_name='new_member',
name='phone_number',
field=models.CharField(max_length=11, unique=True, verbose_name='手机号码'),
),
]
@@ -0,0 +1,18 @@
# Generated by Django 4.0.4 on 2022-04-17 13:12
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('enroll', '0003_alter_new_member_email_alter_new_member_phone_number'),
]
operations = [
migrations.AlterField(
model_name='emailverifyrecord',
name='send_time',
field=models.DateTimeField(auto_now_add=True, verbose_name='发送时间'),
),
]
@@ -0,0 +1,18 @@
# Generated by Django 4.0.4 on 2022-04-17 21:29
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('enroll', '0004_alter_emailverifyrecord_send_time'),
]
operations = [
migrations.AlterField(
model_name='emailverifyrecord',
name='code',
field=models.CharField(max_length=5, verbose_name='验证码'),
),
]
@@ -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',
),
]
View File
+75
View File
@@ -0,0 +1,75 @@
from django.db import models
# Create your models here.
# class Department(models.Model):
# class Meta:
# verbose_name_plural = u"部门信息"
#
# # department = [
# # (0, "系统维护"),
# # (1, "APP开发"),
# # (2, "Web开发"),
# # (3, "程序开发"),
# # (4, "游戏开发"),
# # (5, "UI设计")
# # ]
# # id = models.IntegerField(verbose_name="部门ID", choices=department, primary_key=True)
# name = models.CharField(max_length=10, verbose_name="部门名称")
# picture = models.ImageField(verbose_name="部门图标")
#
# def __str__(self):
# return self.name
class NewMember(models.Model):
class Meta:
verbose_name_plural = u"报名信息"
schedules = [
(1, "已报名"),
(2, "初审中"),
(3, "面试中"),
(4, "笔试中"),
(5, "成功录取"),
(6, "初审失败"),
(7, "面试失败"),
(8, "笔试失败"),
(9, "复试失败"),
(10, "未录取")
]
departments = [
(0, "系统维护"),
(1, "APP开发"),
(2, "Web开发"),
(3, "程序开发"),
(4, "游戏开发"),
(5, "UI设计")
]
sex = [
(0, ""),
(1, ""),
(2, "保密")
]
name = models.CharField(max_length=20, verbose_name="姓名")
sex = models.SmallIntegerField(choices=sex, default=2, verbose_name="性别")
major = models.CharField(max_length=20, verbose_name="年级专业")
phone_number = models.CharField(max_length=11, unique=True, verbose_name="手机号码")
email = models.EmailField(unique=True, verbose_name="邮箱")
department = models.SmallIntegerField(choices=departments, default=0,
verbose_name="意向部门")
expectation = models.TextField(max_length=200, verbose_name="期待的话")
status = models.SmallIntegerField(choices=schedules, default=0, verbose_name="报名状态")
def __str__(self):
return self.name
class EmailVerifyRecord(models.Model):
# 验证码
code = models.CharField(max_length=5, verbose_name="验证码")
email = models.EmailField(max_length=50, verbose_name="邮箱")
# 包含注册验证和找回验证
# send_type = models.CharField(verbose_name="验证码类型", max_length=10,
# choices=(("register", "注册"), ("forget", "找回密码")))
send_time = models.DateTimeField(verbose_name="发送时间", auto_now_add=True)
+92
View File
@@ -0,0 +1,92 @@
from rest_framework import serializers
from rest_framework.validators import UniqueValidator
from apps.enroll.models import Department, NewMember, EmailVerifyRecord
import time
from utils.get_error_msg import get_error_msg
class DepartmentSerializer(serializers.ModelSerializer):
"""获取部门信息"""
class Meta:
model = Department
fields = "__all__"
class NewMemberSerializer(serializers.ModelSerializer):
"""用于添加新成员时的校验与序列化"""
# verification_code = serializers.CharField(source="verification_code.code")
email = serializers.EmailField(validators=[
UniqueValidator(
queryset=NewMember.objects.all(),
message=get_error_msg(43032)
)
])
phone_number = serializers.CharField(validators=[
UniqueValidator(
queryset=NewMember.objects.all(),
message=get_error_msg(43033)
),
],
max_length=11, error_messages={"max_length": get_error_msg(42033)}
)
class Meta:
model = NewMember
exclude = ["id", "status"]
extra_kwargs = {
"name": {
"error_messages": {
"max_length": get_error_msg(42034)
}
},
"major": {
"error_messages": {
"max_length": get_error_msg(42035)
}
},
"department": {
"error_messages": {
"invalid_choice": get_error_msg(42036)
}
},
}
class NewMemberScheduleSerializer(serializers.ModelSerializer):
"""获取成员录取状态信息的序列化器"""
class Meta:
model = NewMember
fields = ["name", "email", "status"]
class SendEmailSerializer(serializers.Serializer):
"""发送邮件时校验用序列化器"""
# code = serializers.CharField(max_length=10)
email = serializers.EmailField(max_length=50,
validators=[UniqueValidator(
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):
try:
oj = EmailVerifyRecord.objects.get(email=data)
# print(oj.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()
# print(f"now={now},send={send_time}")
if now - send_time < 120:
raise serializers.ValidationError(code="verification_code", detail=get_error_msg(44033))
else:
# print(oj.email)
oj.delete()
except EmailVerifyRecord.DoesNotExist:
pass
+3
View File
@@ -0,0 +1,3 @@
from django.test import TestCase
# Create your tests here.
+11
View File
@@ -0,0 +1,11 @@
from django.urls import path
from . import views
# from rest_framework.routers import DefaultRouter
urlpatterns = [
path("department/", views.DepartmentMessageView.as_view()),
path("sign_up/", views.SignUpView.as_view()),
path("sign_up/verification_code/", views.SendEmailView.as_view()),
# path("sign_up/<string:pk>", views.Sign_in.as_view({"get": "get"}))
]
+100
View File
@@ -0,0 +1,100 @@
from rest_framework.response import Response
from rest_framework.generics import GenericAPIView
from apps.enroll.models import Department, EmailVerifyRecord, NewMember
from apps.enroll.serializers import DepartmentSerializer, NewMemberSerializer, NewMemberScheduleSerializer, \
SendEmailSerializer
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 DepartmentMessageView(GenericAPIView):
"""获取部门信息"""
queryset = Department.objects.all()
serializer_class = DepartmentSerializer
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": get_error_msg("40000")})
return Response({"code": 20000, "msg": get_error_msg("20000"), "data": serializer.data})
class SignUpView(GenericAPIView):
"""
新成员报名
post:提交新学员信息
get:根据邮箱及手机号获取成员录取状态
"""
serializer_class = NewMemberSerializer
queryset = NewMember.objects.all()
def post(self, request):
data = request.data
serializer = self.get_serializer(data=data)
code = data['verification_code']
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:
error = {}
for (i, j) in zip(serializer.errors.keys(), serializer.errors.values()):
error[str(i)] = str(j[0])
return Response({"code": 40000, "msg": error}, status=status.HTTP_400_BAD_REQUEST)
def get(self, request):
string = request.query_params.get('string', '')
try:
if re.match('^\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*$', string):
queryset = self.get_queryset().get(email=string)
elif re.match('^(13[0-9]|14[5|7]|15[0|1|2|3|4|5|6|7|8|9]|18[0|1|2|3|5|6|7|8|9])\d{8}$', string):
queryset = self.get_queryset().get(phone_number=string)
else:
queryset = self.get_queryset().get(id=-1)
except NewMember.DoesNotExist:
return Response({"code": 40000, "msg": get_error_msg(45030)})
serializer = NewMemberScheduleSerializer(instance=queryset)
return Response({"code": 20000, "msg": get_error_msg(20000), "data": serializer.data})
class SendEmailView(APIView):
"""发送邮件"""
def post(self, request):
data = request.data
serializer = SendEmailSerializer(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": get_error_msg(20000)})
else:
error = {}
for (i, j) in zip(serializer.errors.keys(), serializer.errors.values()):
error[str(i)] = str(j[0])
return Response({"code": 40000, "msg": error}, status=status.HTTP_400_BAD_REQUEST)