From ed47275c149b1995fb2c73d4a05b5e569458caf2 Mon Sep 17 00:00:00 2001 From: xaoyaoo Date: Tue, 9 Jan 2024 18:47:43 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=86=E5=BA=8F=E5=8A=A0=E8=BD=BD=E8=81=8A?= =?UTF-8?q?=E5=A4=A9=E8=AE=B0=E5=BD=95=EF=BC=8Capi=E8=81=8A=E5=A4=A9?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E6=B7=BB=E5=8A=A0id?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pywxdump/__init__.py | 2 +- pywxdump/analyzer/export_chat.py | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pywxdump/__init__.py b/pywxdump/__init__.py index 3cc3c7d..fb4ed0f 100644 --- a/pywxdump/__init__.py +++ b/pywxdump/__init__.py @@ -22,4 +22,4 @@ except: VERSION_LIST = {} VERSION_LIST_PATH = None -__version__ = "2.4.7" +__version__ = "2.4.8" diff --git a/pywxdump/analyzer/export_chat.py b/pywxdump/analyzer/export_chat.py index 05019a2..949d19e 100644 --- a/pywxdump/analyzer/export_chat.py +++ b/pywxdump/analyzer/export_chat.py @@ -94,13 +94,13 @@ def get_msg_list(MSG_db_path, selected_talker="", start_index=0, page_size=500): cursor1 = db1.cursor() if selected_talker: sql = ( - "SELECT localId, IsSender, StrContent, StrTalker, Sequence, Type, SubType,CreateTime,MsgSvrID,DisplayContent,CompressContent,BytesExtra " + "SELECT localId, IsSender, StrContent, StrTalker, Sequence, Type, SubType,CreateTime,MsgSvrID,DisplayContent,CompressContent,BytesExtra,ROW_NUMBER() OVER (ORDER BY CreateTime ASC) AS id " "FROM MSG WHERE StrTalker=? " "ORDER BY CreateTime ASC LIMIT ?,?") cursor1.execute(sql, (selected_talker, start_index, page_size)) else: sql = ( - "SELECT localId, IsSender, StrContent, StrTalker, Sequence, Type, SubType,CreateTime,MsgSvrID,DisplayContent,CompressContent,BytesExtra " + "SELECT localId, IsSender, StrContent, StrTalker, Sequence, Type, SubType,CreateTime,MsgSvrID,DisplayContent,CompressContent,BytesExtra,ROW_NUMBER() OVER (ORDER BY CreateTime ASC) AS id " "FROM MSG ORDER BY CreateTime ASC LIMIT ?,?") cursor1.execute(sql, (start_index, page_size)) result1 = cursor1.fetchall() @@ -109,7 +109,7 @@ def get_msg_list(MSG_db_path, selected_talker="", start_index=0, page_size=500): data = [] for row in result1: - localId, IsSender, StrContent, StrTalker, Sequence, Type, SubType, CreateTime, MsgSvrID, DisplayContent, CompressContent, BytesExtra = row + localId, IsSender, StrContent, StrTalker, Sequence, Type, SubType, CreateTime, MsgSvrID, DisplayContent, CompressContent, BytesExtra, id = row CreateTime = time.strftime("%Y-%m-%d %H:%M:%S", time.localtime(CreateTime)) type_id = (Type, SubType) @@ -189,7 +189,7 @@ def get_msg_list(MSG_db_path, selected_talker="", start_index=0, page_size=500): else: talker = StrTalker - row_data = {"MsgSvrID": MsgSvrID, "type_name": type_name, "is_sender": IsSender, "talker": talker, + row_data = {"MsgSvrID": MsgSvrID, "type_name": type_name, "is_sender": IsSender, "talker": talker,"id": id, "room_name": StrTalker, "content": content, "CreateTime": CreateTime} data.append(row_data) return data