From 27a0cdfd2051911a14ff9642c95cd9194cd42d18 Mon Sep 17 00:00:00 2001
From: "DESKTOP-H26ORQ8\\JiangHaochen" <jianghc724@foxmail.com>
Date: Sat, 31 Dec 2016 20:26:38 +0800
Subject: [PATCH 1/4] notice nbsp fixnotice[content]

---
 HappyXueTang/settings.py | 4 ++--
 requirements.txt         | 1 +
 user/views.py            | 4 +++-
 wechat/tasks.py          | 2 +-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/HappyXueTang/settings.py b/HappyXueTang/settings.py
index 9be3117..c5ba691 100644
--- a/HappyXueTang/settings.py
+++ b/HappyXueTang/settings.py
@@ -172,8 +172,8 @@ def get_url(path, params=None):
 CELERYBEAT_SCHEDULER = 'djcelery.schedulers.DatabaseScheduler'
 
 CELERYBEAT_SCHEDULE = {
-    'add-every-2-hours': {
+    'remind-every-6-hours': {
         'task': 'wechat.tasks.get_notice',
-        'schedule': timedelta(minutes=1)
+        'schedule': timedelta(minutes=360)
     },
 }
diff --git a/requirements.txt b/requirements.txt
index 0ed8682..6603f52 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,3 +2,4 @@ django~=1.9.5
 mysqlclient~=1.3.7
 requests~=2.7.0
 celery ~= 3.1.0
+HTMLParser~=0.0.2
diff --git a/user/views.py b/user/views.py
index 2f74ce8..b1aa337 100644
--- a/user/views.py
+++ b/user/views.py
@@ -3,6 +3,7 @@
 
 import requests
 import json
+import HTMLParser
 from datetime import datetime
 
 from wechat.models import *
@@ -182,11 +183,12 @@ def get(self):
                     'notice_detail':[],
                     'teacher': cous[0].teacher,
                 }
+                html_parser = HTMLParser.HTMLParser()
                 for notice in notices:
                     result['notice_detail'].append({
                         'title': notice['title'],
                         'publishtime': notice['publishtime'],
-                        'content': notice['content'],
+                        'content': html_parser.unescape(notice['content']),
                     })
                 return result
             else:
diff --git a/wechat/tasks.py b/wechat/tasks.py
index 32cb523..3bfa44a 100644
--- a/wechat/tasks.py
+++ b/wechat/tasks.py
@@ -39,7 +39,7 @@ def get_notice():
             access_json = r.json()
             # print(access_json)
             access_token = access_json['access_token']
-            return_str = "未读公告:" + str(total_notice) + ",未交作业:" + str(total_homework)
+            return_str = "Notices:" + str(total_notice) + " Homework:" + str(total_homework)
             print (return_str)
             we_addr = "https://api.weixin.qq.com/cgi-bin/message/custom/send?access_token=" + access_token
             we_data = {

From 8c94133be6490f746396a347a9557111789189bd Mon Sep 17 00:00:00 2001
From: "DESKTOP-H26ORQ8\\JiangHaochen" <jianghc724@foxmail.com>
Date: Sat, 31 Dec 2016 20:28:34 +0800
Subject: [PATCH 2/4] notice fix

---
 wechat/__init__.py | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 wechat/__init__.py

diff --git a/wechat/__init__.py b/wechat/__init__.py
new file mode 100644
index 0000000..e69de29

From 9d45e6e6913160baad5ecd09a41c250ee2959718 Mon Sep 17 00:00:00 2001
From: "DESKTOP-H26ORQ8\\JiangHaochen" <jianghc724@foxmail.com>
Date: Sat, 31 Dec 2016 20:47:01 +0800
Subject: [PATCH 3/4] notice fix

---
 requirements.txt | 1 -
 user/views.py    | 6 +++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 6603f52..0ed8682 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,4 +2,3 @@ django~=1.9.5
 mysqlclient~=1.3.7
 requests~=2.7.0
 celery ~= 3.1.0
-HTMLParser~=0.0.2
diff --git a/user/views.py b/user/views.py
index e5a6ca1..24c1d21 100644
--- a/user/views.py
+++ b/user/views.py
@@ -3,7 +3,7 @@
 
 import requests
 import json
-import HTMLParser
+import html
 from datetime import datetime
 
 from wechat.models import *
@@ -183,12 +183,12 @@ def get(self):
                     'notice_detail':[],
                     'teacher': cous[0].teacher,
                 }
-                html_parser = HTMLParser.HTMLParser()
+
                 for notice in notices:
                     result['notice_detail'].append({
                         'title': notice['title'],
                         'publishtime': notice['publishtime'],
-                        'content': html_parser.unescape(notice['content']),
+                        'content': html.unescape(notice['content']),
                     })
                 return result
             else:

From 7814cff5df5c0de999c2c4f1f0a4b61705415356 Mon Sep 17 00:00:00 2001
From: "DESKTOP-H26ORQ8\\JiangHaochen" <jianghc724@foxmail.com>
Date: Sat, 31 Dec 2016 20:51:16 +0800
Subject: [PATCH 4/4] notice title fix

---
 user/views.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/user/views.py b/user/views.py
index 24c1d21..a898169 100644
--- a/user/views.py
+++ b/user/views.py
@@ -186,7 +186,7 @@ def get(self):
 
                 for notice in notices:
                     result['notice_detail'].append({
-                        'title': notice['title'],
+                        'title': html.unescape(notice['title']),
                         'publishtime': notice['publishtime'],
                         'content': html.unescape(notice['content']),
                     })