Update src/script.py

src/script.py

@@ -13,7 +13,7 @@ app = Flask(__name__)
 STUDENTS_DATA = []
 STUDENTS_FILE = "students.json"
 DOT_NOTIFY_URL = "https://dot.mindreset.tech/api/open/text"
-DOT_AUTH_TOKEN = os.environ.get("DOT_AUTH_TOKEN", "").strip()
+DOT_AUTH_TOKEN = "dot_app_XdfKhLlhOiyNWfSepKUytXlxwBfERNkiFZzYYkRrLOeXVjOIacBEjhqJDedXNKkw"
 DOT_ICON = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAAEj0lEQVR4nO2YXYhVVRTHf/fOTI2Og2apo6IDpZNFZkUfplRYPURRCX0oigZWlPQgEUlRhhVBUA+h9ZAWRBJFX2IPfuLLJGlFYkb6YGWNIPYxpKmYOjO3h/Vfs/c9c+49Z65jQcyCyz37Y/33f6+99lrrHBiU/7kUBgijmILVo99/JgWgLmNOMceczEVqkSLBOk3AlcBUoBnoBg4AO4EfUuafdXGLDAeWA38ApQq/zcDNml9gYFwqF7kZwH6R+AZYAkwHLsIsOQf4ICK6guCnZ41kUf83AieBY8DcDJ2pwOcYyTUEvx1wkr77FuBX7Fgvi8bqtXCRcDHqNX4usFYkn1XfGV2cNHHANVpoltrnZOg5yWHAPuBv4EL1FVM1ahAHmiByn6rdkFPfSd4n/VcS/WcsDdjxPqoFbiJfDHTxizEE+B34WeTSgnsfqWTmAsGvukXsWqAL2C29Uk6CJeGcAr4AWoGRhLhYR5WLk0awTqBdIue7n4BdkD/VX0k/Da9HOt8JuxUL8CX1uxEy8XxCM/AgsAn4Ddt9CQstq7FQExOoRg6gEZgH7CLExi6gA3gfuCMPnpObj/lKSf/rgVWE3ftvI9BWBdT77gR+ifROCW81duTe/xUW7PvgxQ7/qibvAm6n/KbO0dgi4EU9H8EuTRLUn5/UvD3AvUAnsDexkRbgmYjowiSePyzXhJWJxer1GwWcwCwKcAtwGDhKCNp1ke5jwntP7XvUXqY5jZT73OWE9HlrkuR1GnhXbb/FhcTElwlWBPPFbqxyiUPHFM3bpHljMOsdAUYTakhfy0+qTZs+iBUjvTd7mwCaCOkqFgdsAr4Xqbs0tkxk5kYbWYf52jDgPIKvPZC0TCSelR7W3KU+cCnB9FA5wjvpydjtKwFPAedjuXm7xkcSMsbVWE1YAl6oQg6CERqAQ8CPPvdxAVxCuemrkWwF2qV3ELP+aeAG4Gn1/6T/k8AjGeRc3DirpHsxwDtYEh8a7aSaxL6zEKsHT2PBOI5xncAbWI0Y62UR9LTag0USPsaOKF44S5KLPSfAJ4CPRHhsNJ43b7sF52EbnV3EUtdw7ALklR5sI42U3/jXgS3RQl4XdqdgVJICFtIAjhWBrwXSRrYPxuJZwSucLj0f0PhV9P9FyV3kerX3AUwkvDdA/jrNw9E4Ed2s/gvU/qSfeG6cZuAvzLd73W0tdtvG9wPU49ab2AZvi8beUt+0GvCel+6CmHkbdkTthKjeQHrAjt837hfYBrW9rhuPWWEvMCKBF19Cx/M1ZxHeFD0z9d6whwjvsi0JYmnV7yJCvBtLOCLH89y7EwvuWXizsVPsRPGPyEAOuligR7FKZGICZChWJKwnVCmTkmAR3gKC47+E5eiYWCMwE/hQczqwyj2JVwY6A9gRAXcAX2L14PGo/zUsPKWCRXhXYKHH9Q5htd+3mBt4/9tYURHr9jGzv4OApa27taMxWLbZD2wFPsOKUCdXKZzEeNdgBcZ0rKLxbzjtWHGR+ztO3jiY9wtBrre3SnjVFF3Bc2y8WC3f/hzPj9TXrxVvUAblX5F/AN1tJCuIaUiQAAAAAElFTkSuQmCC"
 
 def load_students_data():
@@ -38,10 +38,13 @@ class DingTalkFormQueryClient:
 
         # 字段映射表
         self.field_mapping = {
-            'radioField_ts1jbr0': '姓名',
+            # 基本信息
+            'textField_mhsv4lgl': '姓名',            # 新版表单
+            'radioField_ts1jbr0': '姓名',            # 旧版表单
             'textField_lqrf9fj': '学号',
             'textField_sm64ysf': '考试名称',
-            'radioField_8a4voiy': '身份证号',
+            'textField_mhsv4lgk': '身份证号',        # 新版表单
+            'radioField_8a4voiy': '身份证号',        # 旧版表单
             
             # 语文
             'textField_4ecclpd': '语文',
@@ -84,6 +87,11 @@ class DingTalkFormQueryClient:
             'textField_y4uc1lx': '组合排名', 
             'textField_a2l7vuc': '大类排名',
         }
+        # 查询身份证号时优先尝试的字段顺序（兼容新旧表单）
+        self.id_field_priority = [
+            'textField_mhsv4lgk',  # 新版
+            'radioField_8a4voiy',  # 旧版
+        ]
 
     def load_cookies_from_file(self):
         """从文件加载cookies"""
@@ -127,9 +135,11 @@ class DingTalkFormQueryClient:
             return False
         return True
 
-    def build_request_url(self, id_number, csrf_token):
+    def build_request_url(self, id_number, csrf_token, search_field_id):
         """构建请求URL"""
-        search_json = json.dumps({"radioField_8a4voiy": id_number})
+        if not search_field_id:
+            raise ValueError("search_field_id 不能为空")
+        search_json = json.dumps({search_field_id: id_number})
 
         params = {
             'formUuid': self.form_uuid,
@@ -158,8 +168,6 @@ class DingTalkFormQueryClient:
         if not csrf_token:
             return {"success": False, "error": "无法提取CSRF令牌，请检查cookie中的tianshu_csrf_token"}
 
-        # 构建请求
-        url = self.build_request_url(id_number, csrf_token)
         headers = {
             'Accept': 'application/json, text/json',
             'Accept-Encoding': 'gzip, deflate, br, zstd',
@@ -169,22 +177,45 @@ class DingTalkFormQueryClient:
             'X-Requested-With': 'XMLHttpRequest'
         }
 
+        last_success_empty = None
+        for search_field in self.id_field_priority:
+            result = self._perform_query(
+                id_number=id_number,
+                cookies=cookies,
+                csrf_token=csrf_token,
+                headers=headers,
+                search_field=search_field
+            )
+            if not result.get("success", False):
+                # 直接返回错误信息
+                return result
+            if result.get("data"):
+                if search_field != self.id_field_priority[0]:
+                    print(f"ℹ️ 通过备用字段 {search_field} 匹配到成绩数据")
+                return result
+            last_success_empty = result
+
+        # 所有字段都无数据，返回最后一次成功但无记录的结果或通用提示
+        if last_success_empty:
+            return last_success_empty
+        return {"success": True, "data": [], "message": "未找到相关成绩记录"}
+
+    def _perform_query(self, id_number, cookies, csrf_token, headers, search_field):
+        """执行实际的HTTP查询，并统一处理异常"""
         try:
-            student_name = None
-            for s in STUDENTS_DATA:
-                if s.get('学号') == id_number:
-                    student_name = s.get('学生姓名')
-                    break
-            print(f"🔍 正在查询: {student_name} {id_number}")
+            url = self.build_request_url(id_number, csrf_token, search_field)
+        except ValueError as e:
+            return {"success": False, "error": str(e)}
 
+        try:
+            print(f"🔍 正在使用字段 {search_field} 查询身份证号: {id_number}") # 控制台日志
             response = requests.get(
-                url, 
-                headers=headers, 
+                url,
+                headers=headers,
                 cookies=cookies,
                 timeout=(10, 30)
             )
-
-            # print(f"📡 HTTP状态码: {response.status_code}") # 控制台日志
+            print(f"📡 HTTP状态码: {response.status_code}") # 控制台日志
 
             if response.status_code != 200:
                 return {"success": False, "error": f"HTTP请求失败，状态码: {response.status_code}"}
@@ -194,9 +225,12 @@ class DingTalkFormQueryClient:
                 print(f"📦 收到响应数据") # 控制台日志
             except json.JSONDecodeError as e:
                 print(f"❌ JSON解析失败: {e}") # 控制台日志
-                return {"success": False, "error": f"服务器返回的不是有效的JSON格式"}
+                return {"success": False, "error": "服务器返回的不是有效的JSON格式"}
 
-            return self._parse_response(data)
+            parsed = self._parse_response(data)
+            if parsed.get("success") and not parsed.get("data"):
+                parsed.setdefault("message", "未找到相关成绩记录")
+            return parsed
 
         except requests.exceptions.Timeout:
             return {"success": False, "error": "请求超时，请检查网络连接"}
@@ -211,7 +245,7 @@ class DingTalkFormQueryClient:
             if not isinstance(data, dict):
                 return {"success": False, "error": "服务器返回的数据格式错误：不是字典类型"}
 
-            # print(f"📋 响应字段: {list(data.keys())}") # 控制台日志
+            print(f"📋 响应字段: {list(data.keys())}") # 控制台日志
 
             success = data.get('success')
             if success is False:
@@ -236,7 +270,7 @@ class DingTalkFormQueryClient:
             if len(records) == 0:
                 return {"success": True, "data": [], "message": "未找到相关成绩记录"}
 
-            # print(f"📊 找到 {len(records)} 条成绩记录") # 控制台日志
+            print(f"📊 找到 {len(records)} 条成绩记录") # 控制台日志
             processed_data = self.process_score_data(records)
             return {"success": True, "data": processed_data}
 
@@ -350,6 +384,48 @@ class DingTalkFormQueryClient:
         except Exception:
             return "计算错误"
 
+    def _get_local_ip(self):
+        """获取本机局域网IP地址"""
+        try:
+            import subprocess
+            # 使用ifconfig获取所有IP地址
+            result = subprocess.run(['ifconfig'], capture_output=True, text=True)
+            if result.returncode == 0:
+                ips = []
+                lines = result.stdout.split('\n')
+                for line in lines:
+                    if 'inet ' in line and '127.0.0.1' not in line and 'inet 169.254.' not in line:
+                        parts = line.strip().split()
+                        for i, part in enumerate(parts):
+                            if part == 'inet' and i + 1 < len(parts):
+                                ip = parts[i + 1]
+                                ips.append(ip)
+                
+                # 优先级：192.168.x.x > 10.x.x.x > 172.x.x.x > 其他
+                for ip in ips:
+                    if ip.startswith('192.168.'):
+                        return ip
+                for ip in ips:
+                    if ip.startswith('10.'):
+                        return ip
+                for ip in ips:
+                    if ip.startswith('172.'):
+                        return ip
+                if ips:
+                    return ips[0]
+        except Exception:
+            # 备用方法
+            try:
+                s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
+                s.connect(("8.8.8.8", 80))
+                local_ip = s.getsockname()[0]
+                s.close()
+                return local_ip
+            except Exception:
+                pass
+        
+        return "127.0.0.1"
+
     def send_dot_notification(self, title, message, signature, icon=None):
         """发送到 dot.mindreset.tech 的通知请求。"""
         try:
@@ -358,6 +434,8 @@ class DingTalkFormQueryClient:
                 "Authorization": f"Bearer {DOT_AUTH_TOKEN}",
                 "Content-Type": "application/json"
             }
+            # 获取本机局域网IP
+            local_ip = self._get_local_ip()
 
             data = {
                 "refreshNow": False,
@@ -366,7 +444,7 @@ class DingTalkFormQueryClient:
                 "message": message,
                 "signature": signature,
                 "icon": icon or DOT_ICON,
-                "link": "https://jzyg123-grade-query.hf.space"
+                "link": f"https://{local_ip}:1111"
             }
             resp = requests.post(url, json=data, headers=headers, timeout=10)
             try:
@@ -414,8 +492,8 @@ def search_student():
         return jsonify({"success": False, "message": "未找到匹配的学生"})
     
     # 添加调试信息
-    # print(f"🔍 搜索姓名: {name}")
-    # print(f"📋 找到 {len(matched_students)} 个匹配的学生")
+    print(f"🔍 搜索姓名: {name}")
+    print(f"📋 找到 {len(matched_students)} 个匹配的学生")
     
     return jsonify({"success": True, "students": matched_students})
 
@@ -443,15 +521,17 @@ def query():
     else:
         result = client.query_scores(id_number)
         
+        # 如果返回成功且检测到周洋光，则计算趋势并发送通知
         try:
+            # 查询学生姓名是否为周洋光：在 students.json 中查找
             student_name = None
             for s in STUDENTS_DATA:
                 if s.get('学号') == id_number:
                     student_name = s.get('学生姓名')
                     break
 
-            if student_name == os.environ.get("NAME", "").strip() and result.get('success') and result.get('data'):
-                print("✅ 准备发送通知...")
+            if student_name == '周洋光' and result.get('success') and result.get('data'):
+                print("✅ 检测到周洋光，准备发送通知...")
                 trend = client.compute_rank_trend(result.get('data'))
                 # 取最新考试名称
                 latest_exam = result.get('data')[0].get('考试名称', '') if result.get('data') else ''
@@ -501,7 +581,7 @@ def main():
     print("3. 服务器日志会显示在此控制台")
     print("=" * 60)
     
-    app.run(host='0.0.0.0', port=7860, debug=False)
+    app.run(host='0.0.0.0', port=1111, debug=True)
 
 if __name__ == "__main__":
     main()