diff --git a/backend/ddl_killer/utils/automail.py b/backend/ddl_killer/utils/automail.py index e5cb95ccc9544bc14443d921f48e7621a6b7b1bf..53d150f7c6a05eaa5afde96d3d08a06352d321bf 100644 --- a/backend/ddl_killer/utils/automail.py +++ b/backend/ddl_killer/utils/automail.py @@ -11,7 +11,7 @@ import traceback import datetime import time -YAG = yagmail.SMTP( user="ddl_killer@yeah.net", password="WHIBVFMXGYAKTCLR", host='smtp.yeah.net') +YAG = yagmail.SMTP( user="ddl_killer@yeah.net", password="XLIUFNFWCLLAEKVG", host='smtp.yeah.net') errorTitle = '⚠️ ddl_killer 错误提醒' errorText = "😥 我们非常抱歉地告诉您,您有一个任务提醒在发送过程中出现了错误,请登陆 ddl_killer 网站查看。\n\n感谢您的理解,祝学业顺利。\n\n" diff --git a/backend/ddl_killer/utils/sendmail.py b/backend/ddl_killer/utils/sendmail.py new file mode 100644 index 0000000000000000000000000000000000000000..7d25ecf8f007e9b0515cb3b84cf9a04dd03c8d8d --- /dev/null +++ b/backend/ddl_killer/utils/sendmail.py @@ -0,0 +1,24 @@ +import yagmail +YAG = yagmail.SMTP( user="ddl_killer@yeah.net", password="XLIUFNFWCLLAEKVG", host='smtp.yeah.net') + +def register_mail(email, uid, name, token): + subject = u'ddl_killer 注册用户验证信息' + message = "\n".join([ + u'❤️亲爱的 {0} {1}, 欢迎使用ddl_killer'.format(uid, name), + u'👐请访问该链接,完成用户验证:', + u'🔗ddl_killer 注册链接'.format(token), + u'⚠️若不是您本人的操作,请忽略该封邮件', + u'👩‍🎓👨‍🎓👨‍🎓👨‍🎓👨‍🎓👨‍🎓ddl_killer 团队.']) + YAG.send(email, subject, message, None) + + +def edit_mail(email, uid, name, token): + subject = u'ddl_killer 修改用户个人信息' + message = "\n".join([ + u'❤️亲爱的 {0} {1}, 您正在使用ddl_killer个人信息修改服务'.format(uid, name), + u'👐请访问该链接,完成个人信息修改:', + u'🔗ddl_killer 个人信息修改链接'.format(token), + u'⚠️若不是您本人的操作,请忽略该封邮件', + u'👩‍🎓👨‍🎓👨‍🎓👨‍🎓👨‍🎓👨‍🎓 ddl_killer 团队.']) + YAG.send(email, subject, message, None) + diff --git a/backend/ddl_killer/views.py b/backend/ddl_killer/views.py index ba1bdb162450be7dc8464cfb27a42662a60c3cf8..68f3277ab65d4bb3532b47634372993d8a3ffeac 100644 --- a/backend/ddl_killer/views.py +++ b/backend/ddl_killer/views.py @@ -15,6 +15,7 @@ import json import yagmail import traceback from .utils.jsDecryopt import decode as jsDecode +from .utils.sendmail import register_mail, edit_mail from .utils.webScrap import updateFromCourse @@ -72,14 +73,8 @@ def create_user(request): #用户注册 user = User.objects.create(uid = data["uid"], name = data["name"], password = jsDecode(data['password']), email = data["email"], is_active = False) token = token_confirm.generate_validate_token(data["uid"]) - message = "\n".join([ - u'❤️亲爱的 {0} {1}, 欢迎使用ddl_killer'.format(data["uid"], data['name']), - u'👐请访问该链接,完成用户验证:', - u'🔗ddl_killer 注册链接'.format(token), - u'⚠️若不是您本人的操作,请忽略该封邮件', - u'👩‍🎓👨‍🎓👨‍🎓👨‍🎓👨‍🎓👨‍🎓ddl_killer 团队.']) try: - settings.YAG.send([data['email']], u'ddl_killer 注册用户验证信息', message, None) + register_mail(data['email'], data['uid'], data['name'], token) response['code'] = 200 # 成功发送邮件 response["msg"] = "Success. Please check your email to activate the account." with open('./ddl_killer/log/account.log', 'a+') as f: @@ -114,14 +109,8 @@ def edit_user(request): if isModify: token_confirm = Token(settings.SECRET_KEY) token = token_confirm.generate_validate_token(data["uid"]) - message = "\n".join([ - u'❤️亲爱的 {0} {1}, 您正在使用ddl_killer个人信息修改服务'.format(data["uid"], data['name']), - u'👐请访问该链接,完成个人信息修改:', - u'🔗ddl_killer 个人信息修改链接'.format(token), - u'⚠️若不是您本人的操作,请忽略该此封邮件', - u'👩‍🎓👨‍🎓👨‍🎓👨‍🎓👨‍🎓👨‍🎓 ddl_killer 团队.']) try: - settings.YAG.send([data['email']], u'ddl_killer 修改用户个人信息', message, None) + edit_mail(data['email'], data['uid'], data['name'], token) response['code'] = 200 # 成功发送邮件 response["msg"] = "Success. Please check your email to activate the account." logout_user(request) diff --git a/backend/restartpy.sh b/backend/restartpy.sh index 6aa1795da8b2e9698c568b182f2e6ae5512cbbf9..e60eba8348de87d1f0944a15dc2aeff20e9b8d13 100755 --- a/backend/restartpy.sh +++ b/backend/restartpy.sh @@ -1,6 +1,6 @@ -pkill uwsgi +pkill python python manage.py makemigrations python manage.py migrate -# nohup python manage.py runserver 0.0.0.0:8000 & -systemctl start nginx.service -uwsgi --ini uwsgi.ini +nohup python manage.py runserver 0.0.0.0:8000 & +# systemctl start nginx.service +# uwsgi --ini uwsgi.ini diff --git a/backend/run.sh b/backend/run.sh index 1adc64072ee6ab3fac4f6137f6551bd8274c03b5..2815688aa80cd2f28c218f6427f5c9c69bcbf9e0 100755 --- a/backend/run.sh +++ b/backend/run.sh @@ -1,6 +1,6 @@ ./halt.sh pkill -9 python -systemctl start nginx.service +# systemctl start nginx.service rm -rf vue2-forntend/dist cd vue2-forntend && cnpm run build:prod && cd .. rm -rf static @@ -8,5 +8,5 @@ rm -rf static python manage.py makemigrations python manage.py collectstatic python manage.py migrate -# nohup python manage.py runserver 0.0.0.0:8000 & -uwsgi --ini uwsgi.ini +nohup python manage.py runserver 0.0.0.0:8000 & +# uwsgi --ini uwsgi.ini