Merge branch 'LC044:master' into master

app/DataBase/merge.py

@@ -13,7 +13,7 @@ def merge_databases(source_paths, target_path):
             if not os.path.exists(source_path):
                 break
             db = sqlite3.connect(source_path)
-            db.text_factory = bytes 
+            # db.text_factory = bytes
             cursor = db.cursor()
             sql = '''
             SELECT TalkerId,MsgsvrID,Type,SubType,IsSender,CreateTime,Sequence,StrTalker,StrContent,DisplayContent,BytesExtra

app/DataBase/msg.py

@@ -231,4 +231,4 @@ if __name__ == '__main__':
     pprint(msg.get_message_by_num('wxid_0o18ef858vnu22', local_id))
     print(msg.get_messages_by_keyword(wxid, '干嘛'))
     pprint(msg.get_messages_by_keyword(wxid, '干嘛')[0])
-    print(msg.get_first_time_of_message('wxid_0o18ef858vnu22'))
+    print(msg.get_first_time_of_message('wxid_fervbwign7m822'))

app/DataBase/output_pc.py

@@ -890,7 +890,7 @@ const chatMessages = [
                 if match:
                     continue
                 image_path = hard_link_db.get_image(content=str_content, thumb=False)
-                image_path = path.get_relative_path(image_path, base_path=f'./data/聊天记录/{self.contact.remark}/image')
+                image_path = path.get_relative_path(image_path, base_path=f'/data/聊天记录/{self.contact.remark}/image')
                 image_path = image_path.replace('\\', '/')
                 # print(f"tohtml:---{image_path}")
                 if self.is_5_min(timestamp):