修复若干bug,优化若干代码
This commit is contained in:
@@ -4,3 +4,4 @@ from django.apps import AppConfig
|
||||
class EnrollConfig(AppConfig):
|
||||
default_auto_field = 'django.db.models.BigAutoField'
|
||||
name = 'apps.enroll'
|
||||
verbose_name = '报名管理'
|
||||
|
||||
@@ -44,7 +44,7 @@ def send_code_email(email):
|
||||
email_title = "注册激活"
|
||||
# file = open("/email_body")
|
||||
file = open(os.path.join(BASE_DIR, "enroll", "email_body"))
|
||||
email_body = str(file.read).format(code)
|
||||
email_body = str(file.read()).format(code)
|
||||
# 发送邮件
|
||||
send_status = send_mail(email_title, email_body, settings.EMAIL_FROM, [email])
|
||||
if not send_status:
|
||||
|
||||
@@ -3,15 +3,14 @@ from rest_framework.validators import UniqueValidator
|
||||
from apps.enroll.models import NewMember, EmailVerifyRecord
|
||||
from apps.history.models import Department
|
||||
import time
|
||||
from utils.get_msg import get_msg
|
||||
from utils.util import get_msg
|
||||
|
||||
|
||||
class DepartmentSerializer(serializers.ModelSerializer):
|
||||
"""获取部门信息"""
|
||||
|
||||
class Meta:
|
||||
model = Department
|
||||
fields = ["department_cn", "picture"]
|
||||
fields = ["id","department_cn", "icon"]
|
||||
|
||||
|
||||
class NewMemberSerializer(serializers.ModelSerializer):
|
||||
|
||||
+1
-1
@@ -4,7 +4,7 @@ from . import views
|
||||
# from rest_framework.routers import DefaultRouter
|
||||
|
||||
urlpatterns = [
|
||||
path("department_cn/", views.DepartmentMessageView.as_view()),
|
||||
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"}))
|
||||
|
||||
@@ -8,7 +8,7 @@ from rest_framework import status
|
||||
from rest_framework.views import APIView
|
||||
from apps.enroll.email import send_code_email
|
||||
from django.views.decorators.csrf import csrf_exempt
|
||||
from utils.get_msg import get_msg
|
||||
from utils.util import get_msg
|
||||
import re
|
||||
import time
|
||||
|
||||
@@ -21,7 +21,6 @@ class DepartmentMessageView(GenericAPIView):
|
||||
|
||||
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_msg("40000")})
|
||||
return Response({"code": 20000, "msg": get_msg("20000"), "data": serializer.data})
|
||||
|
||||
Reference in New Issue
Block a user