API改变

API改变

main.py

@@ -1,7 +1,7 @@
 import os
 
 from study import study
-from utility import md5
+
 
 def getAccounts():
     result = []

study.py

@@ -55,14 +55,23 @@ def study(username, password, ua):
         print('登入失败,退出')
         return 0
 
-    haveLearned = bjySession.get('https://m.bjyouth.net/dxx/my-integral?type=2&page=1&limit=15').json()
+    orgIdTemp = ''
     orgPattern = re.compile(r'\(|（\s*(\d+)\s*）|\)')  # 组织id应该是被括号包的
-    rTemp = orgPattern.search(haveLearned['data'][0]['orgname'])
-    if rTemp:
-        orgID = rTemp.group(1)
-    else:
+    haveLearned = bjySession.get('https://m.bjyouth.net/dxx/my-study?page=1&limit=15&year=2022').json()
+
+    orgID = ""
+    try:
+        orgIdTemp = orgPattern.search(haveLearned['data'][0]['orgname'])
+        orgID = orgIdTemp.group(1)
+    except:
+        print('获取组织id-2')
+        orgIdTemp = orgPattern.search(bjySession.get('https://m.bjyouth.net/dxx/my').json()['data']['org'])
+        if orgIdTemp:
+            orgID = orgIdTemp.group(1)
+
+    if not orgID:
         orgID = '172442'
-        print(f"无法从{haveLearned['data'][0]['orgname']}中获取orgID")
+        print(f"无法获取orgID")
 
     if f"学习课程：《{title}》" in list(map(lambda x: x['text'], haveLearned['data'])):
         print(f'{title} 在运行前已完成,退出')

utility.py

@@ -4,6 +4,7 @@
 from Crypto.Cipher import PKCS1_v1_5 as Cipher_pksc1_v1_5
 from Crypto.PublicKey import RSA
 from PIL import Image
+
 from ddddocr import DdddOcr
 
 
@@ -14,12 +15,14 @@ def encrypt(t):
     cipher_text = b64encode(cipher.encrypt(t.encode()))
     return cipher_text.decode()
 
+
 def md5(s):
     import hashlib
     m = hashlib.md5()
     m.update(s.encode())
     return m.hexdigest()
 
+
 def cap_recognize(cap):
     return DdddOcr().classification(denoise(cap))
 
@@ -53,9 +56,11 @@ def denoise(cap):
     img.save(buf, format='PNG')
     return buf.getvalue()
 
+
 if __name__ == '__main__':
     import requests
     import re
+
     bjySession = requests.session()
     bjySession.timeout = 5  # set session timeout
     touch = bjySession.get(url="https://m.bjyouth.net/site/login")
@@ -68,4 +73,4 @@ def denoise(cap):
     img.show()
 
     img = Image.open(BytesIO(cap2))
-    img.show()
+    img.show()