diff --git a/enroll/__init__.py b/enroll/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/enroll/admin.py b/enroll/admin.py deleted file mode 100644 index 8c38f3f..0000000 --- a/enroll/admin.py +++ /dev/null @@ -1,3 +0,0 @@ -from django.contrib import admin - -# Register your models here. diff --git a/enroll/apps.py b/enroll/apps.py deleted file mode 100644 index 4cfaf47..0000000 --- a/enroll/apps.py +++ /dev/null @@ -1,6 +0,0 @@ -from django.apps import AppConfig - - -class EnrollConfig(AppConfig): - default_auto_field = 'django.db.models.BigAutoField' - name = 'enroll' diff --git a/enroll/email.py b/enroll/email.py deleted file mode 100644 index 064229f..0000000 --- a/enroll/email.py +++ /dev/null @@ -1,59 +0,0 @@ -from random import Random # 用于生成随机码 -from django.core.mail import send_mail # 发送邮件模块 -from enroll.models import EmailVerifyRecord # 邮箱验证model -from django.conf import settings # setting.py添加的的配置信息 -import random - - -# 生成随机字符串 -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, send_type="register"): - """ - 发送电子邮件 - :param email: 要发送的邮箱 - :param send_type: 邮箱类型 - :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.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 - return True diff --git a/enroll/migrations/0001_initial.py b/enroll/migrations/0001_initial.py deleted file mode 100644 index 752db97..0000000 --- a/enroll/migrations/0001_initial.py +++ /dev/null @@ -1,46 +0,0 @@ -# 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='邮箱验证码')), - ], - ), - ] diff --git a/enroll/migrations/0002_alter_new_member_schedule_and_more.py b/enroll/migrations/0002_alter_new_member_schedule_and_more.py deleted file mode 100644 index c89c004..0000000 --- a/enroll/migrations/0002_alter_new_member_schedule_and_more.py +++ /dev/null @@ -1,23 +0,0 @@ -# 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), - ), - ] diff --git a/enroll/migrations/0003_alter_new_member_email_alter_new_member_phone_number.py b/enroll/migrations/0003_alter_new_member_email_alter_new_member_phone_number.py deleted file mode 100644 index bf7c080..0000000 --- a/enroll/migrations/0003_alter_new_member_email_alter_new_member_phone_number.py +++ /dev/null @@ -1,23 +0,0 @@ -# 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='手机号码'), - ), - ] diff --git a/enroll/migrations/0004_alter_emailverifyrecord_send_time.py b/enroll/migrations/0004_alter_emailverifyrecord_send_time.py deleted file mode 100644 index 5f4475f..0000000 --- a/enroll/migrations/0004_alter_emailverifyrecord_send_time.py +++ /dev/null @@ -1,18 +0,0 @@ -# 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='发送时间'), - ), - ] diff --git a/enroll/migrations/0005_alter_emailverifyrecord_code.py b/enroll/migrations/0005_alter_emailverifyrecord_code.py deleted file mode 100644 index 3d1201a..0000000 --- a/enroll/migrations/0005_alter_emailverifyrecord_code.py +++ /dev/null @@ -1,18 +0,0 @@ -# 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='验证码'), - ), - ] diff --git a/enroll/migrations/__init__.py b/enroll/migrations/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/enroll/models.py b/enroll/models.py deleted file mode 100644 index 209a5ce..0000000 --- a/enroll/models.py +++ /dev/null @@ -1,57 +0,0 @@ -from django.db import models - - -# Create your models here. -class Department(models.Model): - # 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 New_member(models.Model): - schedules = [ - (0, "尚未提交"), - (1, "已报名"), - (2, "初审中"), - (3, "面试中"), - (4, "笔试中"), - (5, "成功录取"), - (-1, "初审失败"), - (-2, "面试失败"), - (-3, "笔试失败"), - (-4, "复试失败"), - (-5, "未录取") - ] - name = models.CharField(max_length=20, 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.CharField(max_length=10, verbose_name="意向部门") - expectation = models.CharField(max_length=10, verbose_name="期待的话") - schedule = models.SmallIntegerField(choices=schedules, default=0, verbose_name="报名状态") - # verification_code = models.ForeignKey("EmailVerifyRecord", on_delete=models.DO_NOTHING, verbose_name="邮箱验证码") - verification_code = models.CharField(max_length=4) - - 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) diff --git a/enroll/serializer.py b/enroll/serializer.py deleted file mode 100644 index e4c07bb..0000000 --- a/enroll/serializer.py +++ /dev/null @@ -1,79 +0,0 @@ -from rest_framework import serializers -from rest_framework.response import Response -from rest_framework.validators import UniqueValidator -from enroll.models import Department, New_member, EmailVerifyRecord -import time - - -class Department_serializer(serializers.ModelSerializer): - class Meta: - model = Department - fields = "__all__" - - -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="该邮箱已存在" - ) - ]) - phone_number = serializers.CharField(validators=[ - UniqueValidator( - queryset=New_member.objects.all(), - message="该手机号码已存在" - ), - ], - max_length=11, error_messages={"max_length": "手机号码不合规"} - ) - - class Meta: - model = New_member - exclude = ["id", "schedule"] - - extra_kwargs = { - "name": { - "error_messages": { - "max_length": "姓名过长" - } - }, - "major": { - "error_messages": { - "max_length": "文字过长" - } - }, - - } - - -class New_member_schedule_serializer(serializers.ModelSerializer): - class Meta: - model = New_member - fields = ["name", "email", "schedule"] - - -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": "请输入正确格式的邮箱"}) - - def validate_email(self, data): - # print(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="请勿频繁发送验证码") - else: - # print(oj.email) - oj.delete() - except EmailVerifyRecord.DoesNotExist: - pass diff --git a/enroll/tests.py b/enroll/tests.py deleted file mode 100644 index 7ce503c..0000000 --- a/enroll/tests.py +++ /dev/null @@ -1,3 +0,0 @@ -from django.test import TestCase - -# Create your tests here. diff --git a/enroll/urls.py b/enroll/urls.py deleted file mode 100644 index bf6e2c7..0000000 --- a/enroll/urls.py +++ /dev/null @@ -1,16 +0,0 @@ -from django.contrib import admin -from django.urls import path, include -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("sign_up/", views.Sign_in.as_view({"get": "get"})) -] - -# router = DefaultRouter() -# router.register("sign_in", views.Sign_in, "sign_in") -# urlpatterns += router.urls diff --git a/enroll/views.py b/enroll/views.py deleted file mode 100644 index 3b89260..0000000 --- a/enroll/views.py +++ /dev/null @@ -1,89 +0,0 @@ -from rest_framework.response import Response -from rest_framework.generics import GenericAPIView -from enroll.models import Department, EmailVerifyRecord, New_member -from enroll.serializer 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 enroll.email import send_code_email -import re -import time - - -class Department_message(GenericAPIView): - queryset = Department.objects.all() - 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) - - -class Sign_up(GenericAPIView): - serializer_class = New_member_serializer - queryset = New_member.objects.all() - - def post(self, request): - 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": "邮箱验证码过期"}}, - status=status.HTTP_400_BAD_REQUEST) - if code != oj.code: - return Response({"code": 40000, "msg": {"verification_code": "邮箱验证码错误"}}, - status=status.HTTP_400_BAD_REQUEST) - except EmailVerifyRecord.DoesNotExist: - return Response({"code": 40000, "msg": {"verification_code": "请先发送验证码"}}, - status=status.HTTP_400_BAD_REQUEST) - ret = serializer.is_valid(raise_exception=False) - if ret: - serializer.save() - return Response({"code": 20000, "msg": "成功"}) - 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 New_member.DoesNotExist: - return Response({"code": 40000, "msg": "信息不存在"}) - serializer = New_member_schedule_serializer(instance=queryset) - - return Response({"code": 20000, "msg": "查询成功", "data": serializer.data}) - - -class Send_email(APIView): - def post(self, request): - data = request.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": "成功"}) - 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)