Changed WeChat push service

Changed from sc.ftqq.com to wxpusher.zjiecode.com

Author: reekystive

config.py

@@ -4,7 +4,10 @@
 min_temperature = 35.5
 max_temperature = 36.9
 
-sckey = 'SCU0123456789abcdef0123456789abcdef0123456789abcdef012'
+timeout = 600
 
 driver_path = 'auto'
 headless = False
+
+app_token = 'AT_ABCDEF0123456789abcdef0123456789'
+uid = 'UID_ABCDEF0123456789abcdef012345'

daily_reporter.py

@@ -6,34 +6,36 @@
 import requests
 import time
 import config
+import strings
 import re
 
-wechat_url = 'https://sc.ftqq.com/' + config.sckey + '.send'
-
 
 def send_wechat(msg):
-    send_url = wechat_url + '?text=' + msg
-    response = requests.get(send_url)
+    wechat_url = 'http://wxpusher.zjiecode.com/api/send/message/'
+    wechat_url += '?appToken=' + config.app_token
+    wechat_url += '&content=' + msg
+    wechat_url += '&uid=' + config.uid
+    response = requests.get(wechat_url)
 
 
 today = time.localtime(time.time())
-print('Now:', time.asctime(today))
+print('[Info]', 'Now:', time.asctime(today))
 
 chrome_options = options.Options()
 if config.headless:
     chrome_options.add_argument('--headless')
     chrome_options.add_argument('--disable-gpu')
 
-print('Launching Browser')
+print('[Info] Launching Browser')
 if (config.driver_path != 'auto'):
     browser = webdriver.Chrome(
-        config.driver_path, chrome_options=chrome_options)
+        config.driver_path, options=chrome_options)
 else:
-    browser = webdriver.Chrome(chrome_options=chrome_options)
+    browser = webdriver.Chrome(options=chrome_options)
 
 browser.set_window_size(480, 720)
 
-print('Logging in')
+print('[Info] Logging in')
 browser.get('https://id.sspu.edu.cn/cas/login')
 time.sleep(1)
 
@@ -50,22 +52,22 @@ def send_wechat(msg):
 try:
     browser.find_element_by_class_name('success')
 except exceptions.NoSuchElementException:
-    print('Login failed')
-    send_wechat('Login_Failed')
+    print('[Error] Login failed')
+    send_wechat(strings.get_msg_failed())
     browser.quit()
     quit(1)
 
-print('Login success')
+print('[Info] Login success')
 time.sleep(0.5)
 
-print('Jumping to HSM page')
+print('[Info] Jumping to HSM page')
 browser.get('https://hsm.sspu.edu.cn/selfreport/Default.aspx')
 time.sleep(0.5)
-print('Jumping to Daily Report page')
+print('[Info] Jumping to Daily Report page')
 browser.get('https://hsm.sspu.edu.cn/selfreport/DayReport.aspx')
 time.sleep(1)
 
-print('Starting auto fill')
+print('[Info] Starting auto fill')
 
 min_value = int(config.min_temperature * 10)
 max_value = int(config.max_temperature * 10)
@@ -77,7 +79,7 @@ def send_wechat(msg):
 if int(temperature * 10) < min_value or int(temperature * 10) > max_value:
     temperature = randint(min_value, max_value) / 10
 
-print('Auto generated temperature:', temperature)
+print('[Info] Auto generated temperature:', temperature)
 temperature_box = browser.find_element_by_id('p1_TiWen-inputEl')
 temperature_box.clear()
 temperature_box.send_keys(str(temperature))
@@ -99,8 +101,8 @@ def send_wechat(msg):
 try:
     browser.find_element_by_id('fineui_27')
 except IndexError:
-    print('Submit failed')
-    send_wechat('Submit_Failed')
+    print('[Error] Submit failed')
+    send_wechat(strings.get_msg_failed())
     browser.quit()
     quit(0)
 
@@ -109,24 +111,25 @@ def send_wechat(msg):
 yes_button_1.click()
 time.sleep(1)
 
-for i in range(100):
+for i in range(int(config.timeout / 3)):
     time.sleep(3)
     try:
         browser.find_element_by_id('fineui_32')
     except exceptions.NoSuchElementException:
-        print('Waiting')
+        print('[Info] Waiting: ' + str(i * 3) +
+              ' / ' + str(config.timeout) + ' seconds')
         continue
     break
 
 try:
     browser.find_element_by_id('fineui_32')
 except exceptions.NoSuchElementException:
-    print('Submit timeout')
-    send_wechat('Submit_Timeout')
+    print('[Error] Submit timeout')
+    send_wechat(strings.get_msg_failed())
     browser.quit()
     quit(0)
 
-print('Reported successfully')
+print('[Info] Reported successfully')
 
 yes_button_2 = browser.find_element_by_id('fineui_32') \
     .find_element_by_id('fineui_34') \
@@ -141,22 +144,25 @@ def send_wechat(msg):
     .find_element_by_class_name('f-datalist-list') \
     .find_elements_by_class_name('f-datalist-item-inner')[0].text
 
-datas = re.match(r'^(\d+)-(\d+)-(\d+)\(.*?(\d+).*?\)$', txt)
-
-if datas == None:
-    print('Check failed')
-    send_wechat('Check_Failed')
+if txt.find(strings.msg['success_msg']) == -1:
+    print('[Error] Check failed')
+    send_wechat(strings.get_msg_failed())
     browser.quit()
-    quit(0)
+    quit(1)
+
+if re.match(r'^(\d+)-(\d+)-(\d+)\(.*?(\d+).*?\)$', txt) != None:
+    datas = re.match(r'^(\d+)-(\d+)-(\d+)\(.*?(\d+).*?\)$', txt)
+    rank = int(datas.group(4))
+else:
+    print('[Warring] Check rank failed')
+    datas = re.match(r'^(\d+)-(\d+)-(\d+)\(.*?\)$', txt)
+    rank = None
 
-res_date = datas.group(1) + '-' + datas.group(2) + '-' + datas.group(3)
-res_date_wechat = datas.group(1) + '.' + datas.group(2) + '.' + datas.group(3)
-rank = int(datas.group(4))
+date = datas.group(1) + '-' + datas.group(2) + '-' + datas.group(3)
 
-print('Date: ' + res_date + ', Rank: ' + str(rank))
-send_wechat('Successfully' + '_' + res_date_wechat +
-            '_' + str(temperature) + '_' + str(rank))
+print('[Info] ' + 'Date: ' + date + ', Rank: ' + str(rank))
+send_wechat(strings.get_msg_success(date, rank, temperature))
 time.sleep(1)
 
 browser.quit()
-print('Browser closed')
+print('[Info] Browser closed')

scheduler.py

@@ -11,7 +11,6 @@ def job():
 
 schedule.every().day.at('00:30').do(job)
 schedule.every().day.at('07:30').do(job)
-schedule.every().day.at('13:30').do(job)
 
 print('Started scheduler')
 

strings.py

@@ -0,0 +1,40 @@
+import config
+import time
+
+msg = {}
+
+# WeChat message strings
+msg['success'] = '报送成功！'
+
+msg['number'] = '报送学号：'
+msg['date'] = '报送日期：'
+msg['time'] = '成功时间：'
+msg['rank'] = '当日排名：'
+msg['temperature'] = '报送体温：'
+
+msg['failed_msg'] = '报送失败，请手动报送！'
+msg['failed_time'] = '失败时间：'
+
+# Website strings
+msg['success_msg'] = '已填报'
+
+
+def get_msg_success(date, rank, temp):
+    now = time.localtime(time.time())
+    res = msg['success'] + '%0a' + '%0a'
+    res += msg['number'] + str(config.username) + '%0a'
+    res += msg['date'] + date + '%0a'
+    res += msg['time'] + str(now[3]) + ':' + str(now[4]) + '%0a'
+    res += msg['rank'] + str(rank) + '%0a'
+    res += msg['temperature'] + str(temp)
+    return res
+
+
+def get_msg_failed():
+    now = time.localtime(time.time())
+    res = msg['failed_msg'] + '%0a' + '%0a'
+    res += msg['number'] + str(config.username) + '%0a'
+    res += msg['date'] + str(now[0]) + '-' + \
+        str(now[1]) + '-' + str(now[2]) + '%0a'
+    res += msg['failed_time'] + str(now[3]) + ':' + str(now[4])
+    return res