|
@@ -25,10 +25,10 @@ TENCENT_IM_SECRET_KEY = os.getenv("TENCENT_IM_SECRET_KEY")
|
|
|
class TencentIMClient:
|
|
class TencentIMClient:
|
|
|
"""腾讯云IM API客户端"""
|
|
"""腾讯云IM API客户端"""
|
|
|
|
|
|
|
|
- def __init__(self, app_id: str = None, admin_id: str = None, secret_key: str = None):
|
|
|
|
|
- self.app_id = app_id or TENCENT_IM_APP_ID
|
|
|
|
|
- self.admin_id = admin_id or TENCENT_IM_ADMIN_ID
|
|
|
|
|
- self.secret_key = secret_key or TENCENT_IM_SECRET_KEY
|
|
|
|
|
|
|
+ def __init__(self):
|
|
|
|
|
+ self.app_id = TENCENT_IM_APP_ID
|
|
|
|
|
+ self.admin_id = TENCENT_IM_ADMIN_ID
|
|
|
|
|
+ self.secret_key = TENCENT_IM_SECRET_KEY
|
|
|
|
|
|
|
|
if not all([self.app_id, self.admin_id, self.secret_key]):
|
|
if not all([self.app_id, self.admin_id, self.secret_key]):
|
|
|
print("警告:腾讯云IM配置不完整,请检查环境变量")
|
|
print("警告:腾讯云IM配置不完整,请检查环境变量")
|
|
@@ -300,14 +300,15 @@ class TencentIMClient:
|
|
|
"msg_seq": msg.get("MsgSeq", 0),
|
|
"msg_seq": msg.get("MsgSeq", 0),
|
|
|
})
|
|
})
|
|
|
|
|
|
|
|
- # 按时间升序排列(最早的在前)
|
|
|
|
|
- formatted.sort(key=lambda x: x["timestamp"])
|
|
|
|
|
-
|
|
|
|
|
# 过滤最近30分钟的消息
|
|
# 过滤最近30分钟的消息
|
|
|
current_time = int(time.time())
|
|
current_time = int(time.time())
|
|
|
- time_threshold = current_time - 1800 # 30分钟 = 1800秒
|
|
|
|
|
|
|
+ time_threshold = current_time - 7200 # 30分钟 = 1800秒
|
|
|
formatted = [msg for msg in formatted if msg["timestamp"] >= time_threshold]
|
|
formatted = [msg for msg in formatted if msg["timestamp"] >= time_threshold]
|
|
|
|
|
|
|
|
|
|
+ # 按时间升序排列(最早的在前)
|
|
|
|
|
+ formatted.sort(key=lambda x: x["timestamp"])
|
|
|
|
|
+
|
|
|
|
|
+
|
|
|
return formatted
|
|
return formatted
|
|
|
|
|
|
|
|
|
|
|