fix(core): anti-crawler policy upgrade

Author: Fatpandac

README.md

@@ -12,9 +12,10 @@
 > 🎙️ Teacher, leave those kids alone
 </details>
 
-## [Core 的样例](./sample.py)
+## [Core 的使用样例](./sample.py)
 
-只需要运行 `python3 sample.py` 它将会告诉你 Core 的运行方式。
+在终端环境中分别设置变量 `USERS` 和 `PASSWORD`
+后运行 `python3 sample.py` 它将会告诉你 Core 的运行方式。
 
 ## 使用方法
 

sample.py

@@ -4,7 +4,7 @@
 import os
 import json
 
-username = os.environ.get("USERNAME")
+username = os.environ.get("USERS")
 password = os.environ.get("PASSWORD")
 
 

src/api_url.py

@@ -20,7 +20,7 @@ def info_api(self) -> str:
         )
 
     def get_nonce_api(self):
-        return f"http://www.cqooc.net/user/login?ts={self.__get_ts()}"
+        return f"http://www.cqooc.com/user/login?ts={self.__get_ts()}"
 
     def login_api(self, username: str, hash: str, nonce: str, cn: str) -> str:
         return (

src/core.py

@@ -20,29 +20,38 @@ def __process_user_info(self) -> None:
         id_res = self.__request.do_get(
             self.__api_url.id_api(self.__user.get_xsid())
         )
-        id_data = json.loads(id_res.text)
+        id_data = id_res.json()
         self.__user.set_id(id_data["id"])
 
         info_res = self.__request.do_get(self.__api_url.info_api())
-        info_data = json.loads(info_res.text)
+        info_data = info_res.json()
         self.__user.set_name(info_data["name"])
         self.__user.set_avatar(
             self.__request.get_host() + info_data["headimgurl"]
         )
 
     def login(self) -> dict:
-        nonce_res = self.__request.do_get(self.__api_url.get_nonce_api())
-        data = json.loads(nonce_res.text)
+        api = self.__api_url.get_nonce_api()
+        nonce_res = self.__request.do_get(
+            api,
+            {
+                "Referer": "http://www.cqooc.com/login",
+            },
+        )
+        data = nonce_res.json()
         cn = test.cnonce()
         hash = test.getEncodePwd(
             data["nonce"] + test.getEncodePwd(self.__user.get_pwd()) + cn
         )
         login_res = self.__request.do_post(
             self.__api_url.login_api(
                 self.__user.get_username(), hash, data["nonce"], cn
-            )
+            ),
+            headers={
+                "Referer": "http://www.cqooc.com/login",
+            },
         )
-        data = json.loads(login_res.text)
+        data = login_res.json()
         login_success = data["code"] == 0
         if login_success:
             self.__user.set_xsid(data["xsid"])
@@ -75,7 +84,7 @@ def get_course_lessons(self, course_id: str) -> dict:
                 "Host": "www.cqooc.com",
             },
         )
-        mcs_id_data = json.loads(mcs_id_res.text)
+        mcs_id_data = mcs_id_res.json()
         self.__user.set_mcs_id(mcs_id_data["data"][0]["id"])
         lessons_res = self.__request.do_get(
             self.__api_url.lessons_api(course_id),
@@ -124,7 +133,7 @@ def skip_section(self, section_id: str) -> dict:
                 "Host": "www.cqooc.com",
             },
         )
-        status_code = json.loads(skip_res.text)["code"]
+        status_code = skip_res.json()["code"]
         if status_code == 2:
             return Msg().processing("已经跳过该课程", 200)
         elif status_code == 0:

src/request.py

@@ -8,9 +8,9 @@ class Request:
 
     def __init__(self):
         self.__headers = {
-            "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64)"
-            + " AppleWebKit/537.36 (KHTML, like Gecko) "
-            + "Chrome/79.0.3945.130 Safari/537.36",
+            "User-Agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7)"
+            + " AppleWebKit/537.36 (KHTML, like Gecko)"
+            + " Chrome/101.0.0.0 Safari/537.36",
         }
         self.__proxies = {
             "http": "",

tests/test_api_url.py

@@ -40,7 +40,7 @@ def test_info_api():
 def test_nonce_api():
     api_url = ApiUrl()
     assert api_url.get_nonce_api() == (
-        "http://www.cqooc.net/user/login" + f"?ts={get_ts()}"
+        "http://www.cqooc.com/user/login" + f"?ts={get_ts()}"
     )
 
 

tests/test_core.py

@@ -6,11 +6,13 @@
 
 # ROOT_PATH = os.path.dirname(os.path.dirname(__file__))
 
-username = os.environ.get("USERNAME")
+username = os.environ.get("USERS")
 password = os.environ.get("PASSWORD")
 
 
 def test_login_success():
+    if (username is None) or (password is None):
+        print("!!! 请设置环境变量：USERS 和 PASSWORD !!!")
     core = Core(username, password)
     res = core.login()
     assert res["code"] == 200

tests/test_request.py

@@ -4,8 +4,9 @@
 
 
 ua = (
-    "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit"
-    + "/537.36 (KHTML, like Gecko) Chrome/79.0.3945.130 Safari/537.36"
+    "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7)"
+    + " AppleWebKit/537.36 (KHTML, like Gecko)"
+    + " Chrome/101.0.0.0 Safari/537.36"
 )
 
 proxies = {