update v0.0.8

Author: brealid

setup.py

@@ -5,7 +5,7 @@
 
 setuptools.setup(
     name="ustcjwxt",
-    version="v0.0.7",
+    version="v0.0.8",
     author="brealid",
     author_email="brealid@mail.ustc.edu.cn",
     description="ustc jwxt api, for study only",

ustcjwxt/__init__.py

@@ -1,3 +1,3 @@
-version_info = (0, 0, '7')
+version_info = (0, 0, '8')
 
 __version__ = ".".join([str(x) for x in version_info])

ustcjwxt/course_select.py

@@ -35,8 +35,21 @@ def get(self, s: StudentSession) -> SingleCacheDataInfo:
 def _get_openTurns(s: StudentSession, force_retrieve: bool = False) -> list:
     if not force_retrieve and cacheData.get(s).openTurns is not None:
         return cacheData.get(s).openTurns
-    url = 'https://jw.ustc.edu.cn/ws/for-std/course-select/open-turns'
-    formData = { 'bizTypeId': 2, 'studentId': s.get_student_assocID() }
+    
+    student_ID = s.get_student_ID()
+    if student_ID.startswith('PB'):
+        log.log_info('学生类型: 本科生 (bizTypeId: 2)')
+        bizTypeId = 2
+    elif student_ID.startswith('SA'):
+        log.log_info('学生类型: 研究生 (bizTypeId: 3)')
+        bizTypeId = 3
+    else:
+        log.log_info('学生类型: 未知 (bizTypeId: -1)')
+        log.log_error('请联系开发者获取进一步信息')
+        bizTypeId = 1
+    
+    url = 'https://jw.ustc.edu.cn/ws/for-std/course-select/open-turns'    
+    formData = { 'bizTypeId': bizTypeId, 'studentId': s.get_student_assocID() }
     response = s.post(url, data=formData)
     cacheData.get(s).openTurns = response.json()
     return cacheData.get(s).openTurns

ustcjwxt/session.py

@@ -66,6 +66,9 @@ def clear_cache(self) -> None:
         self.cache = dict()
 
     def login_with_password(self, username: str, password: str, smcode_hook=None) -> bool:
+        log.log_error('当前使用账号密码登录的功能暂不可用! 请使用 login_with_session')
+        return False
+        
         self.clear_cache()
         self.username = username
         self.password = password
@@ -203,6 +206,17 @@ def get_student_ID(self, force_retrieve = False) -> str:
             self.cache['student_ID'] = student_ID
             return student_ID
         log.log_warning('未能在 cookies 中找到学号')
+        # 从选课界面中获得学号
+        response = self.get('https://jw.ustc.edu.cn/for-std/course-select')
+        if response.url.startswith('https://jw.ustc.edu.cn/for-std/course-select/turns/'):
+            p = response.text.find('<span class="pull-left"><strong>学号</strong></span>')
+            if p != -1:
+                p = response.text.find('<span>', p + 50) + 6
+                q = response.text.find('</span>', p)
+                student_ID = response.text[p:q]
+                self.cache['student_ID'] = student_ID
+                return student_ID
+        log.log_warning('未能在 cookies 中找到学号')
         # 均失败
         log.log_warning('未能获得学号')
         return ''