v0.9.6.3 Release！

1.新增引用消息支持。 2.词云分词异常时错误提示。
2023-12-23 00:07:43 +08:00
18 changed files with 170 additions and 489 deletions
--- a/Export/ExportInterface.cs
+++ b/Export/ExportInterface.cs
@@ -11,7 +11,7 @@ namespace WechatBakTool.Export
    public interface IExport
    {
        void InitTemplate(WXContact session,string path);
-        bool SetMsg(WXUserReader reader, WXContact session, WorkspaceViewModel viewModel);
+        void SetMsg(WXUserReader reader, WXContact session, WorkspaceViewModel viewModel);
        void SetEnd();
        void Save(string path = "");
    }
--- a/Export/HtmlExport.cs
+++ b/Export/HtmlExport.cs
@@ -12,7 +12,6 @@ using Newtonsoft.Json;
 using WechatBakTool.ViewModel;
 using System.Security.Policy;
 using System.Windows;
-using System.Xml.Linq;

 namespace WechatBakTool.Export
 {
@@ -28,6 +27,7 @@ namespace WechatBakTool.Export

            HtmlBody += string.Format("<div class=\"msg\"><p class=\"nickname\"><b>与 {0}({1}) 的聊天记录</b></p>", Session.NickName, Session.UserName);
            HtmlBody += string.Format("<div class=\"msg\"><p class=\"nickname\"><b>导出时间：{0}</b></p><hr/>", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
+            File.WriteAllText(Path, HtmlBody);
        }

        public void InitTemplate(WXContact contact, string p)
@@ -50,7 +50,7 @@ namespace WechatBakTool.Export
            File.AppendAllText(Path, HtmlBody);
        }

-        public bool SetMsg(WXUserReader reader, WXContact contact,WorkspaceViewModel viewModel)
+        public void SetMsg(WXUserReader reader, WXContact contact,WorkspaceViewModel viewModel)
        {
            if (Session == null)
                throw new Exception("请初始化模版：Not Use InitTemplate");
@@ -59,16 +59,11 @@ namespace WechatBakTool.Export
            if (msgList == null)
                throw new Exception("获取消息失败，请确认数据库读取正常");

-            if(msgList.Count == 0)
-            {
-                viewModel.ExportCount = "没有消息，忽略";
-                return false;
-            }
            msgList.Sort((x, y) => x.CreateTime.CompareTo(y.CreateTime));

            bool err = false;
            int msgCount = 0;
-
+            HtmlBody = "";
            StreamWriter streamWriter = new StreamWriter(Path, true);
            foreach (var msg in msgList)
            {
@@ -162,38 +157,31 @@ namespace WechatBakTool.Export
                                        }

                                        HtmlBody += string.Format("<p class=\"content\">{0}</p>", title);
-                                        try
+                                        findNode = xmlObj.DocumentElement.SelectNodes("/msg/appmsg/recorditem");
+                                        if (findNode != null)
                                        {
-                                            findNode = xmlObj.DocumentElement.SelectNodes("/msg/appmsg/recorditem");
-                                            if (findNode != null)
+                                            if (findNode.Count > 0)
                                            {
-                                                if (findNode.Count > 0)
+                                                XmlDocument itemObj = new XmlDocument();
+                                                itemObj.LoadXml(findNode[0]!.InnerText);
+                                                XmlNodeList? itemNode = itemObj.DocumentElement.SelectNodes("/recordinfo/datalist/dataitem");
+                                                if (itemNode.Count > 0)
                                                {
-                                                    XmlDocument itemObj = new XmlDocument();
-                                                    itemObj.LoadXml(findNode[0]!.InnerText);
-                                                    XmlNodeList? itemNode = itemObj.DocumentElement.SelectNodes("/recordinfo/datalist/dataitem");
-                                                    if (itemNode.Count > 0)
+                                                    foreach (XmlNode node in itemNode)
                                                    {
-                                                        foreach (XmlNode node in itemNode)
-                                                        {
-                                                            string nodeMsg;
-                                                            string name = node["sourcename"].InnerText;
-                                                            if (node.Attributes["datatype"].InnerText == "1")
-                                                                nodeMsg = node["datadesc1"].InnerText;
-                                                            else if (node.Attributes["datatype"].InnerText == "2")
-                                                                nodeMsg = "不支持的消息";
-                                                            else
-                                                                nodeMsg = node["datatitle"].InnerText;
-                                                            HtmlBody += string.Format("<p class=\"content\">{0}：{1}</p>", name, nodeMsg);
-                                                        }
+                                                        string nodeMsg;
+                                                        string name = node["sourcename"].InnerText;
+                                                        if (node.Attributes["datatype"].InnerText == "1")
+                                                            nodeMsg = node["datadesc1"].InnerText;
+                                                        else if (node.Attributes["datatype"].InnerText == "2")
+                                                            nodeMsg = "不支持的消息";
+                                                        else
+                                                            nodeMsg = node["datatitle"].InnerText;
+                                                        HtmlBody += string.Format("<p class=\"content\">{0}：{1}</p>", name, nodeMsg);
                                                    }
                                                }
                                            }
                                        }
-                                        catch
-                                        {
-                                            HtmlBody += string.Format("<p class=\"content\">{0}</p>", "解析异常");
-                                        }
                                    }
                                }
                            }
@@ -246,6 +234,8 @@ namespace WechatBakTool.Export
                                                HtmlBody += string.Format("<p class=\"content\">未知的引用消息</p>");
                                            }
                                        }
+                                            
+                                        
                                    }
                                }
                            }
@@ -344,7 +334,7 @@ namespace WechatBakTool.Export
            }
            streamWriter.Close();
            streamWriter.Dispose();
-            return true;
+                
        }
        private static DateTime TimeStampToDateTime(long timeStamp, bool inMilli = false)
        {
--- a/Export/TXTExport.cs
+++ b/Export/TXTExport.cs
@@ -40,7 +40,7 @@ namespace WechatBakTool.Export
            
        }

-        public bool SetMsg(WXUserReader reader, WXContact session, WorkspaceViewModel viewModel)
+        public void SetMsg(WXUserReader reader, WXContact session, WorkspaceViewModel viewModel)
        {
            if (Contact == null)
                throw new Exception("请初始化模版：Not Use InitTemplate");
@@ -146,7 +146,6 @@ namespace WechatBakTool.Export
                msgCount++;
                viewModel.ExportCount = msgCount.ToString();
            }
-            return true;
        }

        private static DateTime TimeStampToDateTime(long timeStamp, bool inMilli = false)
--- a/Helpers/DecryptionHelper.cs
+++ b/Helpers/DecryptionHelper.cs
@@ -19,12 +19,12 @@ namespace WechatBakTool.Helpers
 {
    public class DecryptionHelper
    {
-        const long IV_SIZE = 16;
+        const int IV_SIZE = 16;
        const int HMAC_SHA1_SIZE = 20;
        const int KEY_SIZE = 32;
        const int AES_BLOCK_SIZE = 16;
        const int DEFAULT_ITER = 64000;
-        const long DEFAULT_PAGESIZE = 4096; //4048数据 + 16IV + 20 HMAC + 12
+        const int DEFAULT_PAGESIZE = 4096; //4048数据 + 16IV + 20 HMAC + 12
        const string SQLITE_HEADER = "SQLite format 3";
        public static byte[]? GetWechatKey(string pid, int find_key_type, string account)
        {
@@ -142,124 +142,35 @@ namespace WechatBakTool.Helpers
            }
            return null;
        }
-        public static string GetMD5(string text)
-        {
-            MD5 md5 = MD5.Create();
-            byte[] bs = Encoding.UTF8.GetBytes(text);
-            byte[] hs = md5.ComputeHash(bs);
-            StringBuilder sb = new StringBuilder();
-            foreach(byte b in hs)
-            {
-                sb.Append(b.ToString("x2"));
-            }
-            return sb.ToString();
-        }
-        public static void DecryptDB(string file, string to_file, byte[] password_bytes)
+
+        public static byte[] DecryptDB(byte[] db_file_bytes, byte[] password_bytes)
        {
            //数据库头16字节是盐值
-            byte[] salt_key = new byte[16];
-
-            FileStream fileStream = new FileStream(file, FileMode.Open, FileAccess.Read);
-            fileStream.Read(salt_key, 0, 16);
-
+            var salt = db_file_bytes.Take(16).ToArray();
            //HMAC验证时用的盐值需要亦或0x3a
            byte[] hmac_salt = new byte[16];
-            for (int i = 0; i < salt_key.Length; i++)
+            for (int i = 0; i < salt.Length; i++)
            {
-                hmac_salt[i] = (byte)(salt_key[i] ^ 0x3a);
+                hmac_salt[i] = (byte)(salt[i] ^ 0x3a);
            }
            //计算保留段长度
-            long reserved = IV_SIZE;
+            int reserved = IV_SIZE;
            reserved += HMAC_SHA1_SIZE;
            reserved = ((reserved % AES_BLOCK_SIZE) == 0) ? reserved : ((reserved / AES_BLOCK_SIZE) + 1) * AES_BLOCK_SIZE;

            //密钥扩展，分别对应AES解密密钥和HMAC验证密钥
            byte[] key = new byte[KEY_SIZE];
            byte[] hmac_key = new byte[KEY_SIZE];
-            OpenSSLInterop.PKCS5_PBKDF2_HMAC_SHA1(password_bytes, password_bytes.Length, salt_key, salt_key.Length, DEFAULT_ITER, key.Length, key);
+            OpenSSLInterop.PKCS5_PBKDF2_HMAC_SHA1(password_bytes, password_bytes.Length, salt, salt.Length, DEFAULT_ITER, key.Length, key);
            OpenSSLInterop.PKCS5_PBKDF2_HMAC_SHA1(key, key.Length, hmac_salt, hmac_salt.Length, 2, hmac_key.Length, hmac_key);

-            long page_no = 0;
-            long offset = 16;
+            int page_no = 0;
+            int offset = 16;
            Console.WriteLine("开始解密...");
            var hmac_sha1 = HMAC.Create("HMACSHA1");
            hmac_sha1!.Key = hmac_key;
-
            List<byte> decrypted_file_bytes = new List<byte>();
-            FileStream tofileStream = new FileStream(to_file, FileMode.OpenOrCreate, FileAccess.Write);
-
-            using (fileStream)
-            {
-                try
-                {
-                    // 当前分页小于计算分页数
-                    while (page_no < fileStream.Length / DEFAULT_PAGESIZE)
-                    {
-                        // 读内容
-                        byte[] decryped_page_bytes = new byte[DEFAULT_PAGESIZE];
-                        byte[] going_to_hashed = new byte[DEFAULT_PAGESIZE - reserved - offset + IV_SIZE + 4];
-                        fileStream.Seek((page_no * DEFAULT_PAGESIZE) + offset, SeekOrigin.Begin);
-                        fileStream.Read(going_to_hashed, 0, Convert.ToInt32(DEFAULT_PAGESIZE - reserved - offset + IV_SIZE));
-
-                        // 分页标志
-                        var page_bytes = BitConverter.GetBytes(page_no + 1);
-                        page_bytes.CopyTo(going_to_hashed, DEFAULT_PAGESIZE - reserved - offset + IV_SIZE);
-                        var hash_mac_compute = hmac_sha1.ComputeHash(going_to_hashed, 0, going_to_hashed.Length);
-
-                        // 取分页hash
-                        byte[] hash_mac_cached = new byte[hash_mac_compute.Length];
-                        fileStream.Seek((page_no * DEFAULT_PAGESIZE) + DEFAULT_PAGESIZE - reserved + IV_SIZE, SeekOrigin.Begin);
-                        fileStream.Read(hash_mac_cached, 0, hash_mac_compute.Length);
-
-                        if (!hash_mac_compute.SequenceEqual(hash_mac_cached) && page_no == 0)
-                        {
-                            Console.WriteLine("Hash错误...");
-                            return;
-                        }
-                        else
-                        {
-                            if (page_no == 0)
-                            {
-                                var header_bytes = Encoding.ASCII.GetBytes(SQLITE_HEADER);
-                                header_bytes.CopyTo(decryped_page_bytes, 0);
-                            }
-
-                            // 加密内容
-                            byte[] page_content = new byte[DEFAULT_PAGESIZE - reserved - offset];
-                            fileStream.Seek((page_no * DEFAULT_PAGESIZE) + offset, SeekOrigin.Begin);
-                            fileStream.Read(page_content, 0, Convert.ToInt32(DEFAULT_PAGESIZE - reserved - offset));
-
-                            // iv
-                            byte[] iv = new byte[16];
-                            fileStream.Seek((page_no * DEFAULT_PAGESIZE) + (DEFAULT_PAGESIZE - reserved), SeekOrigin.Begin);
-                            fileStream.Read(iv, 0, 16);
-
-                            var decrypted_content = AESDecrypt(page_content, key, iv);
-                            decrypted_content.CopyTo(decryped_page_bytes, offset);
-
-                            // 保留
-                            byte[] reserved_byte = new byte[reserved];
-                            fileStream.Seek((page_no * DEFAULT_PAGESIZE) + DEFAULT_PAGESIZE - reserved, SeekOrigin.Begin);
-                            fileStream.Read(reserved_byte, 0, Convert.ToInt32(reserved));
-                            reserved_byte.CopyTo(decryped_page_bytes, DEFAULT_PAGESIZE - reserved);
-
-                            tofileStream.Write(decryped_page_bytes, 0, decryped_page_bytes.Length);
-
-                        }
-                        page_no++;
-                        offset = 0;
-                    }
-                }catch(Exception ex)
-                {
-                    File.AppendAllText("err.log", "page=>" + page_no.ToString() + "\r\n");
-                    File.AppendAllText("err.log", "size=>" + fileStream.Length.ToString() + "\r\n");
-                    File.AppendAllText("err.log", "postion=>" + ((page_no * DEFAULT_PAGESIZE) + offset).ToString() + "\r\n");
-                    File.AppendAllText("err.log", ex.ToString() + "\r\n");
-                }
-            }
-            /*
-             * 旧版解密
-            while (page_no < fileStream.Length / DEFAULT_PAGESIZE)
+            while (page_no < db_file_bytes.Length / DEFAULT_PAGESIZE)
            {
                byte[] decryped_page_bytes = new byte[DEFAULT_PAGESIZE];
                byte[] going_to_hashed = new byte[DEFAULT_PAGESIZE - reserved - offset + IV_SIZE + 4];
@@ -268,6 +179,7 @@ namespace WechatBakTool.Helpers
                page_bytes.CopyTo(going_to_hashed, DEFAULT_PAGESIZE - reserved - offset + IV_SIZE);
                //计算分页的Hash
                var hash_mac_compute = hmac_sha1.ComputeHash(going_to_hashed, 0, going_to_hashed.Length);
+                //取出分页中存储的Hash
                var hash_mac_cached = db_file_bytes.Skip((page_no * DEFAULT_PAGESIZE) + DEFAULT_PAGESIZE - reserved + IV_SIZE).Take(hash_mac_compute.Length).ToArray();
                //对比两个Hash
                if (!hash_mac_compute.SequenceEqual(hash_mac_cached))
@@ -296,9 +208,8 @@ namespace WechatBakTool.Helpers
                {
                    decrypted_file_bytes.Add(item);
                }
-            }*/
-            tofileStream.Close();
-            tofileStream.Dispose();
+            }
+            return decrypted_file_bytes.ToArray();
        }
        public static byte[] AESDecrypt(byte[] content, byte[] key, byte[] iv)
        {
@@ -386,8 +297,16 @@ namespace WechatBakTool.Helpers
            {
                FileInfo info = new FileInfo(file);
                viewModel.LabelStatus = "正在解密" + info.Name;
-                string to_file = Path.Combine(decPath, info.Name);
-                DecryptDB(file,to_file, key);
+                var db_bytes = File.ReadAllBytes(file);
+                var decrypted_file_bytes = DecryptDB(db_bytes, key);
+                if (decrypted_file_bytes == null || decrypted_file_bytes.Length == 0)
+                {
+                    Console.WriteLine("解密后的数组为空");
+                }
+                else
+                {
+                    File.WriteAllBytes(Path.Combine(decPath, info.Name), decrypted_file_bytes);
+                }
            }
        }
    }
--- a/Helpers/DevicePathMapper.cs
+++ b/Helpers/DevicePathMapper.cs
@@ -15,10 +15,7 @@ namespace WechatBakTool.Helpers

        public static string FromDevicePath(string devicePath)
        {
-            var drive = Array.Find(
-                DriveInfo.GetDrives(), d =>
-                devicePath.StartsWith(d.GetDevicePath() + "\\", StringComparison.InvariantCultureIgnoreCase)
-            );
+            var drive = Array.Find(DriveInfo.GetDrives(), d => devicePath.StartsWith(d.GetDevicePath(), StringComparison.InvariantCultureIgnoreCase));
            return drive != null ?
                devicePath.ReplaceFirst(drive.GetDevicePath(), drive.GetDriveLetter()) :
                null;
--- a/Model/WXModel.cs
+++ b/Model/WXModel.cs
@@ -114,8 +114,6 @@ namespace WechatBakTool.Model
    {
        [Column("localId")]
        public int LocalId { get; set; }
-        [Column("MsgSequence")]
-        public int MsgSequence { get; set; }
        [Column("Type")]
        public int Type { get; set; }
        [Column("SubType")]
@@ -160,15 +158,6 @@ namespace WechatBakTool.Model
        public string Reserved0 { get; set; } = "";
    }

-    public class WXContactHT
-    {
-        public string UserName { get; set; } = "";
-        public string NickName { get; set; } = "";
-        public string LastMsg { get; set; } = "";
-        public int FileCount { get; set; } = 1;
-        public string AvatarString { get; set; } = "";
-        public bool Hidden { get; set; } = false;
-    }
    [Table("Contact")]
    public class WXContact
    {
--- a/Pages/CreateWork.xaml
+++ b/Pages/CreateWork.xaml
@@ -39,7 +39,7 @@
        </Button>
        <Label Margin="210,350,0,0" Content="其他选项：" FontWeight="Bold" HorizontalAlignment="Left" VerticalAlignment="Top"/>
        <CheckBox Margin="215,380,0,0" Content="打包资源文件夹（功能规划中）" IsEnabled="False" HorizontalAlignment="Left" VerticalAlignment="Top" />
-        <CheckBox Name="cb_manual" Checked="cb_manual_Checked"  Margin="215,405,0,0" Content="手动模式" Visibility="Visible" HorizontalAlignment="Left" VerticalAlignment="Top" />
+        <CheckBox Margin="215,405,0,0" Content="手动模式（功能规划中）" IsEnabled="False" HorizontalAlignment="Left" VerticalAlignment="Top" />
        <Label Name="lab_status" Content="{Binding LabelStatus}" HorizontalAlignment="Left" Margin="30,450,0,0" VerticalAlignment="Top"/>
    </Grid>
 </Page>
--- a/Pages/CreateWork.xaml.cs
+++ b/Pages/CreateWork.xaml.cs
@@ -97,7 +97,6 @@ namespace WechatBakTool.Pages
        private void btn_create_worksapce_Click(object sender, RoutedEventArgs e)
        {
            ViewModel.IsEnable = false;
-
            Task.Run(() => {
                if (ViewModel.KeyType != -1)
                {
@@ -148,31 +147,5 @@ namespace WechatBakTool.Pages
                ViewModel.IsEnable = true;
            });
        }
-
-        private void cb_manual_Checked(object sender, RoutedEventArgs e)
-        {
-            MessageBox.Show("该功能仅限用于网络安全研究用途使用，红队同学请在合规授权下进行相关操作","重要提醒！！！！！！！！！");
-            if (MessageBox.Show("我确认获取到合规授权，仅用于网络安全用途使用", "信息确认", MessageBoxButton.YesNo) == MessageBoxResult.Yes)
-            {
-                if (File.Exists("auth.txt"))
-                {
-                    string auth = File.ReadAllText("auth.txt");
-                    // 我已知晓手动模式可能潜在的法律及道德风险，我明白非法使用将要承担相关法律责任。
-                    if (DecryptionHelper.GetMD5(auth) == "295f634af60d61dfa52a5f35849ac42b")
-                    {
-                        MessageBox.Show("已经创建空的配置文件，请完善该配置文件后，点击开始解密","提示");
-                        MessageBox.Show("该功能现阶段暂未启用","错误");
-                    }
-                }
-                else
-                {
-                    MessageBox.Show("未完成声明文件，请先确认声明", "错误");
-                }
-            }
-            else
-            {
-                cb_manual.IsChecked = false;
-            }
-        }
    }
 }
--- a/Pages/Manager.xaml.cs
+++ b/Pages/Manager.xaml.cs
@@ -6,7 +6,6 @@ using System.IO;
 using System.Linq;
 using System.Net.Http;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Windows;
@@ -31,8 +30,6 @@ namespace WechatBakTool.Pages
    {
        private WorkspaceViewModel workspaceViewModel = new WorkspaceViewModel();
        public WXUserReader? UserReader;
-        private List<WXContact>? ExpContacts;
-        private bool Suspend = false;
        public Manager()
        {
            DataContext = workspaceViewModel;
@@ -64,25 +61,15 @@ namespace WechatBakTool.Pages
                });
                if (UserReader != null)
                {
-                    if (!Suspend)
-                        ExpContacts = UserReader.GetWXContacts().ToList();
-                    else
-                        Suspend = false;
-
-                    foreach (var contact in ExpContacts!)
+                    List<WXContact>? contacts = UserReader.GetWXContacts().ToList();
+                    foreach (var contact in contacts)
                    {
-                        if (Suspend)
-                        {
-                            workspaceViewModel.ExportCount = "已暂停";
-                            return;
-                        }
-                            
                        if (group && contact.UserName.Contains("@chatroom"))
                        {
                            workspaceViewModel.WXContact = contact;
                            ExportMsg(contact);
                        }
-                        if (user && !contact.UserName.Contains("@chatroom") && !contact.UserName.Contains("gh_"))
+                        if (user)
                        {
                            workspaceViewModel.WXContact = contact;
                            ExportMsg(contact);
@@ -96,27 +83,12 @@ namespace WechatBakTool.Pages
        private void ExportMsg(WXContact contact)
        {
            workspaceViewModel.ExportCount = "";
-            // string path = Path.Combine(Main2.CurrentUserBakConfig!.UserWorkspacePath, contact.UserName + ".html");
-            string name = contact.NickName;
-            name = name.Replace(@"\", "");
-            name = Regex.Replace(name, "[ \\[ \\] \\^ \\-_*×――(^)$%~!/@#$…&%￥—+=<>《》|!！??？:：•`·、。，；,.;\"‘’“”-]", "");
-            string path = Path.Combine(
-                Main2.CurrentUserBakConfig!.UserWorkspacePath,
-                string.Format(
-                    "{0}-{1}.html",
-                    contact.UserName,
-                    contact.Remark == "" ? name : contact.Remark
-                )
-            );
-
+            string path = Path.Combine(Main2.CurrentUserBakConfig!.UserWorkspacePath, contact.UserName + ".html");
            IExport export = new HtmlExport();
            export.InitTemplate(contact, path);
-            if(export.SetMsg(UserReader!, contact, workspaceViewModel))
-            {
-                export.SetEnd();
-                export.Save(path);
-            }
-            
+            export.SetMsg(UserReader!, contact, workspaceViewModel);
+            export.SetEnd();
+            export.Save(path);
        }

        private void btn_emoji_download_Click(object sender, RoutedEventArgs e)
--- a/Pages/MsgTemplateSelector
+++ b/Pages/MsgTemplateSelector
@@ -1,40 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
-using System.Windows.Controls;
-using WechatBakTool.Model;
-
-namespace WechatBakTool.Pages
-{
-    public class MsgTemplateSelector : DataTemplateSelector
-    {
-
-        public override DataTemplate? SelectTemplate(object item, DependencyObject container)
-        {
-            FrameworkElement? element = container as FrameworkElement;
-
-            if (element != null && item != null && item is WXMsg)
-            {
-                WXMsg? wxmsg = item as WXMsg;
-
-                if (wxmsg == null)
-                    return null;
-
-                if (wxmsg.Type == 1)
-                    return
-                        element.FindResource("MsgText") as DataTemplate;
-                else if (wxmsg.Type == 3)
-                    return
-                        element.FindResource("MsgImage") as DataTemplate;
-                else
-                    return
-                        element.FindResource("MsgText") as DataTemplate;
-            }
-            return null;
-        }
-
-    }
-}
--- a/Pages/Workspace.xaml
+++ b/Pages/Workspace.xaml
@@ -3,12 +3,11 @@
      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
      xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-      xmlns:local="clr-namespace:WechatBakTool.Pages" 
+      xmlns:local="clr-namespace:WechatBakTool.Pages"
      mc:Ignorable="d" 
      d:DesignHeight="450" d:DesignWidth="720"
      Title="Workspace" Background="White">
    <Page.Resources>
-        <local:MsgTemplateSelector x:Key="MsgTemplateSelector"/>
        <Style TargetType="ToggleButton" x:Key="ComboxStyleBtn">
            <Setter Property="Template">
                <Setter.Value>
@@ -165,8 +164,9 @@
        </DataTemplate>
        <DataTemplate x:Key="MsgImage">
            <Grid Margin="0">
+                <Image Width="40" Height="40" Margin="10" VerticalAlignment="Top" HorizontalAlignment="Left" Source="{Binding Avatar}"  />
                <Label Margin="60,8,0,0" FontWeight="Bold" VerticalAlignment="Top" HorizontalAlignment="Left" Content="{Binding NickName}" Width="130"/>
-                <Label Margin="60,25,0,0" VerticalAlignment="Top" HorizontalAlignment="Left" Width="140" Content="1111"/>
+                <Label Margin="60,25,0,0" VerticalAlignment="Top" HorizontalAlignment="Left" Width="140" Content="{Binding LastMsg}"/>
            </Grid>
        </DataTemplate>
        <DataTemplate x:Key="MsgAudio">
@@ -214,7 +214,7 @@
            </ListView.Resources>
        </ListView>
        <Label Content="{Binding WXContact.NickName}" HorizontalAlignment="Left" Margin="258,21,0,0" VerticalAlignment="Top"/>
-        <ListView x:Name="list_msg" Margin="230,60,0,60" Background="Transparent" BorderThickness="0,1,0,1" BorderBrush="#BB2775b6" ItemTemplateSelector="{StaticResource MsgTemplateSelector}" ItemsSource="{Binding WXMsgs}" ScrollViewer.ScrollChanged="list_msg_ScrollChanged" >
+        <ListView x:Name="list_msg" Margin="230,60,0,60" Background="Transparent" BorderThickness="0,1,0,1" BorderBrush="#BB2775b6" ItemTemplate="{DynamicResource MsgText}">

        </ListView>
        <ComboBox Name="cb_export" Width="120" Height="30" Style="{StaticResource ComboBoxStyle}" HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="30,15" ItemsSource="{Binding ExportItems}" SelectedItem="{Binding SelectExportItem}" DisplayMemberPath="Name" SelectedValuePath="Value" IsEnabled="{Binding SelectContact}" Background="#2775b6" />
--- a/Pages/Workspace.xaml.cs
+++ b/Pages/Workspace.xaml.cs
@@ -25,10 +25,6 @@ using WordCloudSharp;
 using System.Drawing;
 using System.Windows.Controls;
 using System.Text.RegularExpressions;
-using Newtonsoft.Json;
-using System.Drawing.Imaging;
-using System.Threading;
-using System.Runtime.CompilerServices;

 namespace WechatBakTool.Pages
 {
@@ -39,9 +35,6 @@ namespace WechatBakTool.Pages
    {
        public WXUserReader? UserReader;
        private WorkspaceViewModel ViewModel = new WorkspaceViewModel();
-        private int PageSize = 100;
-        private int Postion = 0;
-        private bool Loading = false;
        public Workspace()
        {
            ViewModel.ExportItems = new System.Collections.ObjectModel.ObservableCollection<ExportItem> {
@@ -61,11 +54,7 @@ namespace WechatBakTool.Pages
                UserReader = new WXUserReader(config);
                if (config.Decrypt)
                {
-                    ViewModel.Contacts = null;
-                    Task.Run(() => {
-                        ViewModel.Contacts = UserReader.GetWXContacts();
-                    });
-                    
+                    ViewModel.Contacts = UserReader.GetWXContacts();
                }
            }
        }
@@ -81,43 +70,14 @@ namespace WechatBakTool.Pages

        private void list_users_SelectionChanged(object sender, SelectionChangedEventArgs e)
        {
-
-            ViewModel.WXMsgs.Clear();
-            Postion = 0;
            ViewModel.ExportCount = "";
-            
-            loadMsg();
-            if (ViewModel.WXMsgs.Count == 0)
-                return;
-            
-        }
-
-        private void loadMsg()
-        {
-            Loading = true;
            ViewModel.WXContact = list_users.SelectedItem as WXContact;
-            if (ViewModel.WXContact == null || UserReader == null)
-                return;
-
-            List<WXMsg>? list = UserReader.GetWXMsgs(ViewModel.WXContact.UserName, Postion, PageSize);
-            // Trace.WriteLine(string.Format("{0}->{1}", PageSize, Postion));
-            if (list == null)
-                return;
-            if (list.Count == 0)
-                return;
-            
-            
-            foreach (WXMsg w in list)
+            if(ViewModel.WXContact == null || UserReader == null)
            {
-                ViewModel.WXMsgs.Add(w);
+                return;
            }
-
-            Postion = int.Parse(list.Max(x => x.CreateTime).ToString());
-            list_msg.ScrollIntoView(list[0]);
-            Task.Run(() => {
-                Thread.Sleep(500);
-                Loading = false;
-            });
+            List<WXMsg>? msgs = UserReader.GetWXMsgs(ViewModel.WXContact.UserName);
+            list_msg.ItemsSource = msgs;
        }

        private void txt_find_user_TextChanged(object sender, TextChangedEventArgs e)
@@ -129,25 +89,7 @@ namespace WechatBakTool.Pages
            if (txt_find_user.Text == "搜索...")
                findName = "";

-            Task.Run(() =>
-            {
-                ViewModel.Contacts = UserReader.GetWXContacts(findName);
-                // 保底回落搜索已删除人员
-                if (ViewModel.Contacts.Count == 0)
-                {
-                    var i = UserReader.GetWXMsgs(txt_find_user.Text);
-                    if (i != null)
-                    {
-                        var g = i.GroupBy(x => x.StrTalker);
-                        ViewModel.Contacts = new System.Collections.ObjectModel.ObservableCollection<WXContact>();
-                        foreach (var x in g)
-                        {
-                            string name = x.Key;
-                            ViewModel.Contacts.Add(new WXContact() { UserName = name, NickName = name });
-                        }
-                    }
-                }
-            });
+            ViewModel.Contacts = UserReader.GetWXContacts(findName);
        }

        private void txt_find_user_GotFocus(object sender, RoutedEventArgs e)
@@ -173,9 +115,9 @@ namespace WechatBakTool.Pages
                export.SetMsg(UserReader, ViewModel.WXContact, ViewModel);
                export.SetEnd();
                export.Save(path);
-            }
-            catch (Exception ex)
+            }catch(Exception ex)
            {
+                File.AppendAllText("1.log", ex.Message);
                MessageBox.Show(ex.Message);
            }
            
@@ -329,17 +271,5 @@ namespace WechatBakTool.Pages
                });
            }
        }
-
-        private void list_msg_ScrollChanged(object sender, ScrollChangedEventArgs e)
-        {
-            if (ViewModel.WXMsgs.Count == 0)
-                return;
-
-            if (e.VerticalOffset + e.ViewportHeight == e.ExtentHeight && !Loading)
-            {
-                // 滚动条到达底部的处理逻辑
-                loadMsg();
-            }
-        }
    }
 }
--- a/README.md
+++ b/README.md
@@ -22,7 +22,6 @@
 > [!NOTE]
 > 反馈群：815054692<br/>
 > 如果觉得不错，欢迎右上角点个star！这是对作者的鼓励，谢谢！<br/>
-> 进群请先Star项目，然后问答消息留id<br/>
 <br/>

 ### 免责声明
@@ -30,7 +29,7 @@
 **用于网络安全用途的，请确保在国家法律法规下使用**<br/>
 **本项目完全免费，问你要钱的都是骗子**<br/>
 **使用本项目初衷是作者研究微信数据库的运行使用，您使用本软件导致的后果，包含但不限于数据损坏，记录丢失等问题，作者不承担相关责任。**<br/>
-**因软件特殊性质，请在使用时获得微信账号所有人授权，你当确保不侵犯他人个人隐私权，后果自行承担**<br/>
+**因软件特殊性质，请在使用时获得微信账号所有人授权，你应当确保不侵犯他人个人隐私权，后果自行承担**<br/>
 <br/>

 ### 隐私声明
@@ -74,7 +73,7 @@ A：基本上都是因为刚迁移完，缓存没写入到数据库导致的，
 ### 参考/引用
 项目在开发过程中参考了以下项目或资料，有引用相关代码，如有需要，推荐您可以去参考下相关资料：

-1. C#使用OpenSSL解密微信数据库，这里注意一下64位适配问题，注意dll引用，另外解密的资源优化不是很好，可以参考一下我改写的，C#还需要注意一下超大文件的问题： [Mr0x01/WXDBDecrypt.NET](https://github.com/Mr0x01/WXDBDecrypt.NET)<br/>
+1. C#使用OpenSSL解密微信数据库，这里注意一下64位适配问题，注意dll引用： [Mr0x01/WXDBDecrypt.NET](https://github.com/Mr0x01/WXDBDecrypt.NET)<br/>
 2. C#使用地址获取微信Key： [AdminTest0/SharpWxDump](https://github.com/AdminTest0/SharpWxDump)
 3. 解密微信语音，我是直接调用解密，反正都要ffmpeg，多一个也是多，多两个也是多，懒得头铁实现： [kn007/silk-v3-decoder](https://github.com/kn007/silk-v3-decoder)
 4. 解密微信图片 [吾爱破解chenhahacjl/微信 DAT 图片解密 （C#）](https://www.52pojie.cn/forum.php?mod=viewthread&tid=1507922)
--- a/ViewModel/WorkspaceViewModel.cs
+++ b/ViewModel/WorkspaceViewModel.cs
@@ -16,9 +16,6 @@ namespace WechatBakTool.ViewModel
        [NotifyPropertyChangedFor(nameof(LabelStatus))]
        private WXContact? wXContact = null;

-        [ObservableProperty]
-        private ObservableCollection<WXMsg> wXMsgs = new ObservableCollection<WXMsg>();
-
        [ObservableProperty]
        [NotifyPropertyChangedFor(nameof(LabelStatus))]
        private string exportCount = "";
--- a/WXUserReader.cs
+++ b/WXUserReader.cs
@@ -330,25 +330,6 @@ namespace WechatBakTool
            }
            return tmp;
        }
-
-        public List<WXMsg>? GetWXMsgs(string uid,int time,int page)
-        {
-            List<WXMsg> tmp = new List<WXMsg>();
-            for (int i = 0; i <= 99; i++)
-            {
-                SQLiteConnection? con = getCon("MSG" + i.ToString());
-                if (con == null)
-                    return tmp;
-
-                List<WXMsg>? wXMsgs = null;
-                string query = "select * from MSG where StrTalker=? and CreateTime>? Limit ?";
-                wXMsgs = con.Query<WXMsg>(query, uid, time, page);
-                if (wXMsgs.Count != 0) {
-                    return ProcessMsg(wXMsgs, uid);
-                }
-            }
-            return tmp;
-        }
        public List<WXMsg>? GetWXMsgs(string uid,string msg = "")
        {
            List<WXMsg> tmp = new List<WXMsg>();
@@ -375,108 +356,99 @@ namespace WechatBakTool
                    wXMsgs = con.Query<WXMsg>(query, uid, string.Format("%{0}%", msg));
                }

-                tmp.AddRange(ProcessMsg(wXMsgs, uid));
+                foreach (WXMsg w in wXMsgs)
+                {
+                    if (UserNameCache.ContainsKey(w.StrTalker))
+                    {
+                        WXContact? contact = UserNameCache[w.StrTalker] as WXContact;
+                        if (contact != null)
+                        {
+                            if (contact.Remark != "")
+                                w.NickName = contact.Remark;
+                            else
+                                w.NickName = contact.NickName;
+                        }
+                    }
+
+                    // 群聊处理
+                    if (uid.Contains("@chatroom"))
+                    {
+                        string userId = "";
+
+                        if (w.BytesExtra == null)
+                            continue;
+
+                        string sl = BitConverter.ToString(w.BytesExtra).Replace("-", "");
+
+                        ProtoMsg protoMsg;
+                        using (MemoryStream stream = new MemoryStream(w.BytesExtra))
+                        {
+                            protoMsg = ProtoBuf.Serializer.Deserialize<ProtoMsg>(stream);
+                        }
+
+                        if (protoMsg.TVMsg != null)
+                        {
+                            foreach (TVType _tmp in protoMsg.TVMsg)
+                            {
+                                if (_tmp.Type == 1)
+                                    userId = _tmp.TypeValue;
+                            }
+                        }
+
+
+                        if (!w.IsSender)
+                        {
+                            if (UserNameCache.ContainsKey(userId))
+                            {
+                                WXContact? contact = UserNameCache[userId] as WXContact;
+                                if (contact != null)
+                                    w.NickName = contact.Remark == "" ? contact.NickName : contact.Remark;
+                            }
+                            else
+                            {
+                                w.NickName = userId;
+                            }
+                        }
+                    }
+                    
+                    
+                    // 发送人名字处理
+                    if (w.IsSender)
+                        w.NickName = "我";
+
+                    w.DisplayContent = w.StrContent;
+                    // 额外格式处理
+                    if (w.Type != 1)
+                    {
+                        if (w.Type == 10000)
+                        {
+                            w.Type = 1;
+                            w.NickName = "系统消息";
+                            w.DisplayContent = w.StrContent.Replace("<revokemsg>", "").Replace("</revokemsg>", "");
+                        }
+                        else if (w.Type == 49 && (w.SubType == 6 || w.SubType == 19 || w.SubType == 40))
+                        {
+                            WXSessionAttachInfo? attachInfos = GetWXMsgAtc(w);
+                            if (attachInfos == null)
+                            {
+                                w.DisplayContent = "附件不存在";
+                            }
+                            else
+                            {
+                                w.DisplayContent = Path.Combine(UserBakConfig!.UserResPath, attachInfos.attachPath);
+                            }
+                        }
+                        else
+                        {
+                            w.DisplayContent = "[界面未支持格式]Type=" + w.Type;
+                        }
+                    }
+                    tmp.Add(w);
+
+                }
            }
            return tmp;
        }
-        private List<WXMsg> ProcessMsg(List<WXMsg> msgs,string uid)
-        {
-            foreach (WXMsg w in msgs)
-            {
-                if (UserNameCache.ContainsKey(w.StrTalker))
-                {
-                    WXContact? contact = UserNameCache[w.StrTalker] as WXContact;
-                    if (contact != null)
-                    {
-                        if (contact.Remark != "")
-                            w.NickName = contact.Remark;
-                        else
-                            w.NickName = contact.NickName;
-
-                        w.StrTalker = contact.UserName;
-                    }
-                }
-                else
-                {
-                    w.NickName = uid;
-                }
-
-                // 群聊处理
-                if (uid.Contains("@chatroom"))
-                {
-                    string userId = "";
-
-                    if (w.BytesExtra == null)
-                        continue;
-
-                    string sl = BitConverter.ToString(w.BytesExtra).Replace("-", "");
-
-                    ProtoMsg protoMsg;
-                    using (MemoryStream stream = new MemoryStream(w.BytesExtra))
-                    {
-                        protoMsg = ProtoBuf.Serializer.Deserialize<ProtoMsg>(stream);
-                    }
-
-                    if (protoMsg.TVMsg != null)
-                    {
-                        foreach (TVType _tmp in protoMsg.TVMsg)
-                        {
-                            if (_tmp.Type == 1)
-                                userId = _tmp.TypeValue;
-                        }
-                    }
-
-
-                    if (!w.IsSender)
-                    {
-                        if (UserNameCache.ContainsKey(userId))
-                        {
-                            WXContact? contact = UserNameCache[userId] as WXContact;
-                            if (contact != null)
-                                w.NickName = contact.Remark == "" ? contact.NickName : contact.Remark;
-                        }
-                        else
-                        {
-                            w.NickName = userId;
-                        }
-                    }
-                }
-
-
-                // 发送人名字处理
-                if (w.IsSender)
-                    w.NickName = "我";
-
-                w.DisplayContent = w.StrContent;
-                // 额外格式处理
-                if (w.Type != 1)
-                {
-                    if (w.Type == 10000)
-                    {
-                        w.Type = 1;
-                        w.NickName = "系统消息";
-                        w.DisplayContent = w.StrContent.Replace("<revokemsg>", "").Replace("</revokemsg>", "");
-                    }
-                    else if (w.Type == 49 && (w.SubType == 6 || w.SubType == 19 || w.SubType == 40))
-                    {
-                        WXSessionAttachInfo? attachInfos = GetWXMsgAtc(w);
-                        if (attachInfos == null)
-                        {
-                            w.DisplayContent = "附件不存在";
-                        }
-                        else
-                        {
-                            w.DisplayContent = Path.Combine(UserBakConfig!.UserResPath, attachInfos.attachPath);
-                        }
-                    }
-                    else
-                    {
-                        w.DisplayContent = "[界面未支持格式]Type=" + w.Type;
-                    }
-                }
-            }
-            return msgs;
-        }
        public List<WXSessionAttachInfo>? GetWXMsgAtc()
        {
            SQLiteConnection? con = getCon("MultiSearchChatMsg");
--- a/WXWorkspace.cs
+++ b/WXWorkspace.cs
@@ -18,7 +18,7 @@ namespace WechatBakTool
    {
        private UserBakConfig UserBakConfig = new UserBakConfig();
        public WXWorkspace(string path,string account = "") {
-            string checkResult = Init(path, false, account);
+            string checkResult = Init(path, account);
            if (checkResult != "")
                new Exception(checkResult);
        }
@@ -28,7 +28,7 @@ namespace WechatBakTool
            UserBakConfig = userBakConfig;
        }

-        public void DecryptDB(string pid,int type,CreateWorkViewModel viewModel,string pwd = "")
+        public void DecryptDB(string pid,int type,CreateWorkViewModel viewModel)
        {
            if (UserBakConfig == null)
            {
@@ -39,20 +39,7 @@ namespace WechatBakTool
            {
                byte[]? key = null;
                viewModel.LabelStatus = "正在获取秘钥，需要1 - 10秒左右";
-                if(pwd == "")
-                    key = DecryptionHelper.GetWechatKey(pid, type, UserBakConfig.Account);
-                else
-                {
-                    key = new byte[pwd.Length / 2];
-                    for(int i = 0;i<pwd.Length / 2; i++)
-                    {
-                        key[i] = Convert.ToByte(pwd.Substring(i * 2, 2), 16);
-                    }
-                    
-                }
-#if DEBUG
-                File.WriteAllText("key.log", BitConverter.ToString(key!));
-#endif
+                key = DecryptionHelper.GetWechatKey(pid, type, UserBakConfig.Account);
                if (key == null)
                {
                    throw new Exception("获取到的密钥为空，获取失败");
@@ -117,7 +104,7 @@ namespace WechatBakTool
                }
            }
        }
-        private string Init(string path,bool manual,string account = "")
+        private string Init(string path,string account = "")
        {
            string curPath = AppDomain.CurrentDomain.BaseDirectory;
            string md5 = GetMd5Hash(path);
--- a/WechatBakTool.csproj
+++ b/WechatBakTool.csproj
@@ -6,9 +6,9 @@
    <Nullable>enable</Nullable>
    <UseWPF>true</UseWPF>
    <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
-    <AssemblyVersion>0.9.6.4</AssemblyVersion>
-    <FileVersion>0.9.6.4</FileVersion>
-    <Version>0.9.6.4</Version>
+    <AssemblyVersion>0.9.6.3</AssemblyVersion>
+    <FileVersion>0.9.6.3</FileVersion>
+    <Version>0.9.6.3</Version>
  </PropertyGroup>

  <ItemGroup>
--- a/version.json
+++ b/version.json
@@ -11,8 +11,5 @@
 	},{
 		"Version":"3.9.8.15",
 		"BaseAddr": 64997904
-	},{
-		"Version":"3.9.8.25",
-		"BaseAddr": 65002192
 	}
 ]