Parcourir la source

v0.9.7.6 Release!
1.完善了版本支持。
2.修改了解密界面的推荐,目前仅固定地址查找稳定。
3.修复了部分一些小BUG

suxue il y a 7 mois
Parent
commit
51da1fd0ae
6 fichiers modifiés avec 54 ajouts et 24 suppressions
  1. 3 3
      Helpers/DevicePathMapper.cs
  2. 0 2
      Model/WXModel.cs
  3. 2 2
      Pages/CreateWork.xaml
  4. 1 1
      Pages/CreateWork.xaml.cs
  5. 4 0
      WXUserReader.cs
  6. 44 16
      version.json

+ 3 - 3
Helpers/DevicePathMapper.cs

@@ -13,18 +13,18 @@ namespace WechatBakTool.Helpers
         [DllImport("Kernel32.dll", CharSet = CharSet.Unicode)]
         private static extern uint QueryDosDevice([In] string lpDeviceName, [Out] StringBuilder lpTargetPath, [In] int ucchMax);
 
-        public static string FromDevicePath(string devicePath)
+        public static string? FromDevicePath(string devicePath)
         {
             var drive = Array.Find(
                 DriveInfo.GetDrives(), d =>
                 devicePath.StartsWith(d.GetDevicePath() + "\\", StringComparison.InvariantCultureIgnoreCase)
             );
             return drive != null ?
-                devicePath.ReplaceFirst(drive.GetDevicePath(), drive.GetDriveLetter()) :
+                devicePath.ReplaceFirst(drive.GetDevicePath()!, drive.GetDriveLetter()) :
                 null;
         }
 
-        private static string GetDevicePath(this DriveInfo driveInfo)
+        private static string? GetDevicePath(this DriveInfo driveInfo)
         {
             var devicePathBuilder = new StringBuilder(128);
             return QueryDosDevice(driveInfo.GetDriveLetter(), devicePathBuilder, devicePathBuilder.Capacity + 1) != 0 ?

+ 0 - 2
Model/WXModel.cs

@@ -84,8 +84,6 @@ namespace WechatBakTool.Model
         public string Content { get; set; } = "";
         [Column("nTime")]
         public int LastTime { get; set; }
-        public int ReadCount { get; set; }
-        public int LastMsgId { get; set; }
     }
 
     [Table("SessionAttachInfo")]

+ 2 - 2
Pages/CreateWork.xaml

@@ -26,9 +26,9 @@
         <TextBox IsEnabled="{Binding IsEnable}" x:Name="txt_username" Margin="35,300,0,0" Width="280" HorizontalAlignment="Left" VerticalAlignment="Top" BorderThickness="0,0,0,1" Text="{Binding UserName}" />
 
         <Label Margin="30,350,0,0" Content="请选择解密方式:" FontWeight="Bold" HorizontalAlignment="Left" VerticalAlignment="Top"/>
-        <RadioButton Margin="35,380,0,0" Content="固定地址查找【保底】" HorizontalAlignment="Left" VerticalAlignment="Top" GroupName="rb_find_key" HorizontalContentAlignment="Center" IsEnabled="{Binding IsEnable}" VerticalContentAlignment="Center" IsChecked="{Binding KeyType, Converter={StaticResource ResourceKey=getKeyConverterKey}, ConverterParameter=1}" />
+        <RadioButton Margin="35,380,0,0" Content="固定地址查找【推荐】" HorizontalAlignment="Left" VerticalAlignment="Top" GroupName="rb_find_key" HorizontalContentAlignment="Center" IsEnabled="{Binding IsEnable}" VerticalContentAlignment="Center" IsChecked="{Binding KeyType, Converter={StaticResource ResourceKey=getKeyConverterKey}, ConverterParameter=1}" />
         <RadioButton Margin="35,405,0,0" Content="用户名推断查找【不稳定】" HorizontalAlignment="Left" VerticalAlignment="Top" GroupName="rb_find_key" HorizontalContentAlignment="Center" IsEnabled="{Binding IsEnable}" VerticalContentAlignment="Center" IsChecked="{Binding KeyType, Converter={StaticResource ResourceKey=getKeyConverterKey}, ConverterParameter=2}"/>
-        <RadioButton Margin="35,430,0,0" Content="公钥头推断查找【推荐】" HorizontalAlignment="Left" VerticalAlignment="Top" GroupName="rb_find_key" HorizontalContentAlignment="Center" IsEnabled="{Binding IsEnable}" VerticalContentAlignment="Center" IsChecked="{Binding KeyType, Converter={StaticResource ResourceKey=getKeyConverterKey}, ConverterParameter=3}"/>
+        <RadioButton Margin="35,430,0,0" Content="公钥头推断查找【不稳定】" HorizontalAlignment="Left" VerticalAlignment="Top" GroupName="rb_find_key" HorizontalContentAlignment="Center" IsEnabled="{Binding IsEnable}" VerticalContentAlignment="Center" IsChecked="{Binding KeyType, Converter={StaticResource ResourceKey=getKeyConverterKey}, ConverterParameter=3}"/>
 
         <Button Name="btn_create_worksapce" Margin="0,0,35,50" Height="60" Width="100" HorizontalAlignment="Right" VerticalAlignment="Bottom" Content="创建工作区" BorderThickness="0" IsEnabled="{Binding IsEnable}" Background="#2775b6" Foreground="White" Click="btn_create_worksapce_Click">
             <Button.Resources>

+ 1 - 1
Pages/CreateWork.xaml.cs

@@ -66,7 +66,7 @@ namespace WechatBakTool.Pages
                             ProcessInfo info = new ProcessInfo();
                             info.ProcessId = p.Id.ToString();
                             info.ProcessName = p.ProcessName;
-                            info.DBPath = DevicePathMapper.FromDevicePath(name);
+                            info.DBPath = DevicePathMapper.FromDevicePath(name)!;
                             ViewModel.ProcessInfos.Add(info);
                         }
                     }

+ 4 - 0
WXUserReader.cs

@@ -52,6 +52,10 @@ namespace WechatBakTool
                     continue;
                 SQLiteConnection con = new SQLiteConnection(item);
                 string dbName = fileInfo.Name.Split('.')[0];
+                if (DBInfo.ContainsKey(dbName))
+                {
+                    continue;
+                } 
                 DBInfo.Add(dbName, con);
             }
         }

+ 44 - 16
version.json

@@ -2,29 +2,57 @@
 	{
 		"Version": "3.9.6.33",
 		"BaseAddr": 62031872
-	},{
-		"Version":"3.9.7.25",
+	},
+	{
+		"Version": "3.9.7.25",
 		"BaseAddr": 63484032
-	},{
-		"Version":"3.9.7.29",
+	},
+	{
+		"Version": "3.9.7.29",
 		"BaseAddr": 63488256
-	},{
-		"Version":"3.9.8.15",
+	},
+	{
+		"Version": "3.9.8.15",
 		"BaseAddr": 64997904
-	},{
-		"Version":"3.9.8.25",
+	},
+	{
+		"Version": "3.9.8.25",
 		"BaseAddr": 65002192
-	},{
-		"Version":"3.9.9.27",
+	},
+	{
+		"Version": "3.9.9.27",
 		"BaseAddr": 68066576
-	},{
-		"Version":"3.9.9.35",
+	},
+	{
+		"Version": "3.9.9.35",
 		"BaseAddr": 68066576
-	},{
-		"Version":"3.9.9.43",
+	},
+	{
+		"Version": "3.9.9.43",
 		"BaseAddr": 68067216
-	},{
-		"Version":"3.9.10.19",
+	},
+	{
+		"Version": "3.9.10.19",
 		"BaseAddr": 95131040
+	},
+	{
+		"Version": "3.9.10.27",
+		"BaseAddr": 95126928
+	},
+	{
+		"Version": "3.9.11.19",
+		"BaseAddr": 93551568
+	},
+	{
+		"Version": "3.9.11.23",
+		"BaseAddr": 93700920
+	},
+	{
+		"Version": "3.9.11.25",
+		"BaseAddr": 93702352
+	},
+	{
+		"Version": "3.9.12.15",
+		"BaseAddr": 93814816
 	}
 ]