From cde968fc029efb65d2649ec3b372dc342e8ff410 Mon Sep 17 00:00:00 2001
From: zhang200554 <lihuan.zhang@student.unimelb.edu.au>
Date: Thu, 11 Oct 2018 14:53:14 +1100
Subject: [PATCH] test1
---
PMPBackend/settings.py | 12 ++++++++++--
cargo/views.py | 19 +++++++++++++++----
2 files changed, 25 insertions(+), 6 deletions(-)
diff --git a/PMPBackend/settings.py b/PMPBackend/settings.py
index 1a807e4..48dae15 100644
--- a/PMPBackend/settings.py
+++ b/PMPBackend/settings.py
@@ -79,9 +79,9 @@ DATABASES = {
# }
'default': {
'ENGINE': 'django.db.backends.mysql',
- 'NAME': 'lihuanz',
+ 'NAME': 'pmpback',
'USER': 'lihuanz',
- 'HOST': 'info20003db.eng.unimelb.edu.au',
+ 'HOST': '127.0.0.1',
'PASSWORD': 'zlh2005zlh',
'PORT': 3306,
}
@@ -125,3 +125,11 @@ USE_TZ = True
# https://docs.djangoproject.com/en/2.1/howto/static-files/
STATIC_URL = '/static/'
+
+# Email
+EMAIL_USE_SSL = True
+EMAIL_HOST = 'smtp.gmail.com' # 如果是 163 改成 smtp.163.com
+EMAIL_PORT = 587
+EMAIL_HOST_USER = 'susantoonlinecargo@gmail.com' # 帐号
+EMAIL_HOST_PASSWORD = 'G27HLFeb8dIx' # 密码
+DEFAULT_FROM_EMAIL = EMAIL_HOST_USER
diff --git a/cargo/views.py b/cargo/views.py
index f1c5ae9..65fbc45 100644
--- a/cargo/views.py
+++ b/cargo/views.py
@@ -1,6 +1,8 @@
+#charset utf8
from django.shortcuts import render, redirect
import datetime
from cargo.models import user, shipment, requestbook
+from django.core.mail import send_mail
import json
from django.http import HttpResponse
import sys
@@ -11,7 +13,7 @@ import sys
def shipInfo(request):
if request.method == 'GET':
today = datetime.date.today()
- shipmentInfo = shipment.objects.all()
+ shipmentInfo = shipment.objects.all().order_by('leaveDate')
s = []
for i in shipmentInfo:
s.append([i.shipmentID, 'From ' + i.leaveDate.__str__() + ' To ' + i.arriveDate.__str__()])
@@ -29,7 +31,7 @@ def signIn(request):
#print(request.get_full_path(), file=sys.stderr)
passwordNow = request.GET['password']
- emailNow = request.GET['email']
+ emailNow = request.GET['email'].__str__().replace('%40', '@')
#print(passwordNow, file=sys.stderr)
#print(emailNow, file=sys.stderr)
@@ -54,7 +56,7 @@ def signUp(request):
req = json.loads(request.body.decode())
newUser = user()
- newUser.email = req.get('email')
+ newUser.email = req.get('email').__str__()# + '@gmail.com'
newUser.password = req.get('password')
newUser.userName = req.get('realname')
newUser.phoneNumber = req.get('phonenumber')
@@ -197,9 +199,18 @@ def updatebook(request):
bookCur.status = req.get('bookingStatus', bookCur.status)
bookCur.pickupDate = req.get('bookingPickupDate', bookCur.pickupDate)
bookCur.shiperMessage = req.get('bookingInformationShipper', bookCur.shiperMessage)
-
+ userid = bookCur.userID
bookCur.save()
+ userNow = user.objects.get(userID=userid)
+
+
+ send_mail('You booking have been updated.',
+ 'Hi ' + userNow.userName + ',\n Your booking status have been changed, please check it.',
+ 'susantoonlinecargo@gmail.com',
+ [userNow.email.__str__()],
+ fail_silently=False)
+
res = {
'status': '0',
'msg': 'success'
--
GitLab