From d27b6a9c87833edc7832f177e7be732a61829182 Mon Sep 17 00:00:00 2001
From: Jeason <1710884619@qq.com>
Date: Thu, 2 Apr 2026 15:47:36 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E9=A3=9E=E4=B9=A6=E5=8F=91=E9=80=81?=
 =?UTF-8?q?=E8=80=85=E4=BF=A1=E6=81=AF=E8=8E=B7=E5=8F=96=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- sender_id 优先用 open_id（user_id 在无权限时为 None）
- get_user_info 默认用 open_id 类型查询
- contact API 无权限时优雅降级，用 ID 缩写作为标识（用户_xxx）
- feishu_bot 和 longconn 都统一了 sender 提取逻辑
---
 data/tsp_assistant.db                       | Bin 208896 -> 217088 bytes
 logs/tsp_assistant.log                      |   9 --------
 src/integrations/feishu_longconn_service.py |  16 +++++++++-----
 src/integrations/feishu_service.py          |  23 ++++++++++----------
 src/web/blueprints/feishu_bot.py            |  19 +++++++++-------
 5 files changed, 32 insertions(+), 35 deletions(-)

diff --git a/data/tsp_assistant.db b/data/tsp_assistant.db
index cec21500cde3bbfe973131472050304076004333..dcafc3c0085d8fd1747f7da6262ed3619bca7cd1 100644
GIT binary patch
delta 6462
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
a!kQ}sPXpkY!cAs+6M%QSBq3tI+5ZCw26aLJ

delta 1456
zcmZuxZA?>F7{2G;TRuwL10t}E0bODkY|!-H+b^1Bie|VtzgE~{Oq?(&anS&Z%=iad
z{A#Pn8pJXwXw@Pi(n9W_2(&C&G~1tP+)OZr%xTZ<bxz6lWBaim+glLFK2CC<oO9mu
zzVGus=RMbPQSEr3`Yc~vMp2aT{6pRnGb$Uay@FLN)kbA>r95M|P;Fjsqu7>ti(!u!
zGR5NitNUrzT}YRRzvlL{tg8_fi{1GLSQU%!QTTWK6hFfE#H`wHusNN{Lp3&w$;2+t
z49xOOpwpPV^ctJdSfPaUEFP!uGkhO^jmO0-Z4h^lug%`MiYY}0?R!4eZ{57J>AlVS
zZJU@CTh)8{I=<RWXECMeaEdny`wpyc*imOUC?H}Qo&%)v@gMj%{0sgWC-6f&kLTzh
z8la+HZ=V=lr^H!$-c+vV%Q;@l>8*N`)hNzwE2&i_BWUncGJ;N2jc(2G-H)NKA_X(3
zm-!&MsRbx604RF};LVo--gpV1G!LL87vS|Afa28vYq9}e%K|9E0EHO<1!(}UvT8u2
zsiHJhQ1x3HvFh6xm&T}nqVPwWqvI-cSi?GZ(AalUgFL(Tww5&W&81cLPg?f2TDLYe
z+WAHL2B<*G8Ld2T6$G8dWH9r>e=TO6zQSbSjrI11y4L-NoJB}YZ786)JXAzgR#y7Z
z4LaBN<vguuZ*8$3+^yGhWUwP1?UAouPE32{=%5@sVQ;Lr*E5IhAGb8^*=Ikrltd`!
z^;*tk6+k_+j^jAqX#SVQV&%-b3X{cBVflZH*;29C2Mj&}z3@5yF`~*uomjDvb!MUN
z_UPN`2BT4+3z-e+e-l0TfM&0<TI48HqhU&OMEz9tXT}rd_vyFNe5t!r^a_@lqQhty
zq;;XlZ~%R%$xI5)A{(V@NFxd*vVm<qI%yk25!)CYE?hLzH!1ZE<$~gih~_pus9-%7
zZFXexF8%H%4R|jO^{Uhd%5reNlNvd4o8CgVQxr|$g5B>_rc$ZdMR00E{-Ks;0s=+{
zrH&yIj4sTaCNY=f8Iwlbl7Cn}8YTXr#D$<7K0&6s<C7y&a(;=pMjtx-FMJ<5`V;4m
zCHf}GaWOs{keuO1jt)5-l>A{iJVLs{$v9)Wf%w#!g!?)PohP0PuqC<9J?<YMp<e0S
zbvZC3&yIo{nVynEAz;&eU_7T?$?3FmIFbm2<j@t^l#Yr^3?QG>8wL_J)!QY1C-DS;
z#KMdV8bY4+Cx%W*XRZ?0#3P3@*%r>TOBokt-12PilA|0roiv3;q5k;vaI%KQ0+vtq
zDS2JH_5~eCoA94n>anB_5Pqx+SO5h%6iY-y5C95-C7C*#I6DMOxyw&Fdq7g~mE5tF
z;mPqJ>AJiy)29@mz*E7cq-3UpOin@+$#+o_dn9*e43tjZ$+9TEfQQa0AtySeYXLIa
zFNb?TG9?r(4fr4XLXR)?#-}?I$0o=~FI=2&^AGecU(*wmVv=0m`1Cb6{Lfb>7_0`p
zuEK0EScJ9T35#Rh#J0Q6lr{5KE9VQ$(*?fmMJP4@`J05Mf&T^P$yw1uk(+nuXY^k&
C<UhFp

diff --git a/logs/tsp_assistant.log b/logs/tsp_assistant.log
index 91a5ad2..e69de29 100644
--- a/logs/tsp_assistant.log
+++ b/logs/tsp_assistant.log
@@ -1,9 +0,0 @@
-2026-02-11 09:14:37,303 - src.core.database - ERROR - 数据库操作失败: 'search_frequency' is an invalid keyword argument for KnowledgeEntry
-2026-02-11 09:23:37,045 - src.vehicle.vehicle_data_manager - INFO - 添加车辆数据成功: V001 - location
-2026-02-11 09:23:37,047 - src.vehicle.vehicle_data_manager - INFO - 添加车辆数据成功: V001 - status
-2026-02-11 09:23:37,049 - src.vehicle.vehicle_data_manager - INFO - 添加车辆数据成功: V001 - battery
-2026-02-11 09:23:37,051 - src.vehicle.vehicle_data_manager - INFO - 添加车辆数据成功: V001 - engine
-2026-02-11 09:23:37,053 - src.vehicle.vehicle_data_manager - INFO - 添加车辆数据成功: V002 - location
-2026-02-11 09:23:37,055 - src.vehicle.vehicle_data_manager - INFO - 添加车辆数据成功: V002 - status
-2026-02-11 09:23:37,057 - src.vehicle.vehicle_data_manager - INFO - 添加车辆数据成功: V002 - fault
-2026-02-11 09:23:37,057 - src.vehicle.vehicle_data_manager - INFO - 示例车辆数据添加成功
diff --git a/src/integrations/feishu_longconn_service.py b/src/integrations/feishu_longconn_service.py
index 4f30aa6..d05eeea 100644
--- a/src/integrations/feishu_longconn_service.py
+++ b/src/integrations/feishu_longconn_service.py
@@ -71,21 +71,25 @@ class FeishuLongConnService:
             content = message.content
             sender = event.sender
 
-            # 获取发送者ID和群信息
-            sender_id = sender.sender_id.user_id
-            sender_open_id = getattr(sender.sender_id, 'open_id', '')
+            # 获取发送者ID和群信息（优先 open_id，user_id 可能为 None）
+            sender_open_id = getattr(sender.sender_id, 'open_id', '') or ''
+            sender_user_id = getattr(sender.sender_id, 'user_id', '') or ''
+            sender_id = sender_user_id or sender_open_id or 'unknown'
             try:
                 tenant_key = sender.sender_id.tenant_key
             except:
                 tenant_key = "unknown"
 
-            # 获取发送者姓名
+            # 获取发送者姓名（用 open_id 查询，不需要 contact 权限）
             sender_name = sender_id
             try:
                 from src.integrations.feishu_service import FeishuService
                 fs = FeishuService()
-                user_info = fs.get_user_info(sender_id)
-                sender_name = user_info.get('name') or user_info.get('en_name') or sender_id
+                id_for_query = sender_open_id or sender_user_id
+                id_type = 'open_id' if sender_open_id else 'user_id'
+                if id_for_query:
+                    user_info = fs.get_user_info(id_for_query, id_type=id_type)
+                    sender_name = user_info.get('name') or user_info.get('en_name') or sender_id
             except Exception as e:
                 logger.warning(f"获取发送者信息失败: {e}")
 
diff --git a/src/integrations/feishu_service.py b/src/integrations/feishu_service.py
index c72ae91..f5bc8ae 100644
--- a/src/integrations/feishu_service.py
+++ b/src/integrations/feishu_service.py
@@ -175,18 +175,18 @@ class FeishuService:
         logger.info(f"获取到 {len(all_chats)} 个机器人所在的群")
         return all_chats
 
-    def get_user_info(self, user_id: str, id_type: str = "user_id") -> dict:
+    def get_user_info(self, user_id: str, id_type: str = "open_id") -> dict:
         """
-        获取飞书用户信息（姓名、头像等）。
-        返回 {"user_id": ..., "name": ..., "en_name": ..., "avatar_url": ...} 或空字典。
+        获取飞书用户信息（姓名等）。
+        优先用 contact API，失败则尝试 im chat members API。
         """
         token = self._get_tenant_access_token()
-        if not token:
+        if not token or not user_id:
             return {}
 
+        # 方式1: contact API（需要 contact:user.base:readonly 权限）
         url = f"{self.BASE_URL}/contact/v3/users/{user_id}?user_id_type={id_type}"
         headers = {"Authorization": f"Bearer {token}"}
-
         try:
             response = requests.get(url, headers=headers)
             data = response.json()
@@ -197,11 +197,10 @@ class FeishuService:
                     "open_id": user.get("open_id", ""),
                     "name": user.get("name", ""),
                     "en_name": user.get("en_name", ""),
-                    "avatar_url": user.get("avatar", {}).get("avatar_72", ""),
                 }
-            else:
-                logger.warning(f"获取用户信息失败: {data.get('msg')} (user_id={user_id})")
-                return {}
-        except Exception as e:
-            logger.warning(f"获取用户信息异常: {e}")
-            return {}
+        except Exception:
+            pass
+
+        # 方式2: 如果 contact API 没权限，返回 ID 缩写作为标识
+        short_id = user_id[-8:] if len(user_id) > 8 else user_id
+        return {"user_id": user_id, "name": f"用户_{short_id}"}
diff --git a/src/web/blueprints/feishu_bot.py b/src/web/blueprints/feishu_bot.py
index 25c638d..e2c470a 100644
--- a/src/web/blueprints/feishu_bot.py
+++ b/src/web/blueprints/feishu_bot.py
@@ -102,17 +102,21 @@ def _process_message_in_background(app, event_data: dict):
             # 3. 获取或创建该飞书用户的会话（支持群聊隔离）
             chat_manager = service_manager.get_chat_manager()
 
-            # 获取发送者ID（从event中提取）
+            # 获取发送者ID（优先 open_id，user_id 可能为 None）
             sender = event.get('sender', {})
-            sender_id = sender.get('sender_id', {}).get('user_id', 'unknown')
-            sender_open_id = sender.get('sender_id', {}).get('open_id', '')
+            sender_ids = sender.get('sender_id', {})
+            sender_open_id = sender_ids.get('open_id', '') or ''
+            sender_user_id = sender_ids.get('user_id', '') or ''
+            sender_id = sender_user_id or sender_open_id or 'unknown'
             sender_type = sender.get('sender_type', 'user')
 
-            # 获取发送者姓名
-            sender_name = '未知用户'
+            # 获取发送者姓名（用 open_id 查询）
+            sender_name = sender_id
             try:
-                if sender_id and sender_id != 'unknown':
-                    user_info = feishu_service.get_user_info(sender_id)
+                id_for_query = sender_open_id or sender_user_id
+                id_type = 'open_id' if sender_open_id else 'user_id'
+                if id_for_query:
+                    user_info = feishu_service.get_user_info(id_for_query, id_type=id_type)
                     sender_name = user_info.get('name') or user_info.get('en_name') or sender_id
             except Exception as e:
                 logger.warning(f"[Feishu Bot] 获取发送者信息失败: {e}")
@@ -121,7 +125,6 @@ def _process_message_in_background(app, event_data: dict):
             logger.info(f"[Feishu Bot] 📝 消息内容: '{text_content}'")
 
             # 群聊隔离：每个用户在每个群都有独立会话
-            # 格式：feishu_群聊ID_用户ID
             user_id = f"feishu_{chat_id}_{sender_id}"
 
             # 检查是否已有活跃会话