From 63d6769d4716e66a77dfdb1a6f6d1ff3e0a8a139 Mon Sep 17 00:00:00 2001
From: nayaku <zmk.code@qq.com>
Date: Wed, 13 Sep 2023 16:59:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9B=BE=E7=89=87Hash?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E7=9A=84=E5=AD=98=E5=82=A8=E6=96=B9?=
 =?UTF-8?q?=E5=BC=8F=EF=BC=9B=20=E4=BF=AE=E6=94=B9=E6=84=9F=E7=9F=A5Hash?=
 =?UTF-8?q?=E7=9A=84=E8=AE=A1=E7=AE=97=E5=92=8C=E5=88=A4=E6=96=AD=E6=96=B9?=
 =?UTF-8?q?=E5=BC=8F=EF=BC=9B=20=E6=B7=BB=E5=8A=A0=E5=9B=BE=E7=89=87?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E7=9A=84=E5=AF=BC=E5=85=A5=E5=92=8C?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA=20#1=EF=BC=9B=20=E6=B7=BB=E5=8A=A0=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E5=A4=B9=E7=9A=84=E5=AF=BC=E5=85=A5=EF=BC=9B=20?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=A5=E5=BF=97=E8=AE=B0=E5=BD=95=E5=99=A8?=
 =?UTF-8?q?=EF=BC=9B=20=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE=E7=BB=84?=
 =?UTF-8?q?=E7=BB=87=E7=BB=93=E6=9E=84=EF=BC=9B=20=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E6=96=B0=E7=9A=84=E8=BD=AC=E6=8D=A2=E5=99=A8=EF=BC=9B=20?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=8C=85=EF=BC=9B=20=E4=BF=AE=E6=AD=A3?=
 =?UTF-8?q?=E4=BA=86=E6=B7=BB=E5=8A=A0=E5=9B=BE=E7=89=87=E6=97=B6=EF=BC=8C?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=B7=B2=E6=9C=89=E6=A0=87=E7=AD=BE=E5=90=8E?=
 =?UTF-8?q?=E5=87=BA=E9=94=99=E7=9A=84bug=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ImageManager/App.xaml                         |   5 +-
 ImageManager/App.xaml.cs                      |  12 +-
 ImageManager/Bootstrapper.cs                  |  15 +-
 ImageManager/Data/Model/Label.cs              |   5 +
 ImageManager/Data/Model/Picture.cs            |  38 +-
 ImageManager/Data/PictureDataArchive.cs       | 386 ++++++++++++++++++
 ImageManager/Data/PictureFactory.cs           | 188 +++++++++
 ImageManager/Data/UserSettingData.cs          |   4 +
 ImageManager/ImageManager.csproj              |  13 +-
 ImageManager/Logging/Logger.cs                | 115 ++++++
 ImageManager/Logging/LoggerFactory.cs         |   7 +
 ...230911081455_UpdatePictureHash.Designer.cs | 124 ++++++
 .../20230911081455_UpdatePictureHash.cs       |  88 ++++
 .../Migrations/ImageContextModelSnapshot.cs   |  11 +-
 ImageManager/Migrations/MigrationCustom.cs    |  13 +
 ImageManager/Migrations/MigratorEx.cs         |  25 ++
 ImageManager/Tools/BindingProxy.cs            |  26 --
 .../IsNullOrEmptyToVisibilityConverter.cs     |  23 ++
 .../Converter}/StyleConverter.cs              |   2 +-
 ImageManager/Tools/Extension/ContainerEx.cs   |  21 +
 .../Tools/{ => Helper}/ClipboardHelper.cs     |   8 +-
 .../{ => Helper}/ControlsSearchHelper.cs      |   6 +-
 ImageManager/Tools/ImageComparer.cs           |  68 ---
 ImageManager/Tools/Log.cs                     |  86 ----
 .../ViewModels/AddImageProgressViewModel.cs   | 249 -----------
 .../AddImageProgressViewModelWrap.cs          | 160 ++++++++
 ImageManager/ViewModels/AddImageViewModel.cs  |  27 +-
 ImageManager/ViewModels/DialogViewModel.cs    |  28 +-
 .../ExportImageProgressViewModelWrap.cs       |  99 +++++
 ImageManager/ViewModels/MainPageViewModel.cs  |  33 +-
 .../ViewModels/PictureAddLabelViewModel.cs    |  13 +-
 .../PictureSelectableItemWrapper.cs           |   5 +-
 ImageManager/ViewModels/ProgressViewModel.cs  |  71 ++++
 .../ViewModels/ProgressViewModelWrapBase.cs   |  49 +++
 ImageManager/ViewModels/RootViewModel.cs      | 107 ++++-
 ImageManager/Views/DialogView.xaml            |  23 +-
 ImageManager/Views/MainPageView.xaml          |  10 +-
 ImageManager/Views/MainPageView.xaml.cs       |   2 +-
 ...ageProgressView.xaml => ProgressView.xaml} |   8 +-
 ...gressView.xaml.cs => ProgressView.xaml.cs} |   7 +-
 ImageManager/Views/RootView.xaml              |  14 +-
 readme.md                                     |   8 +-
 42 files changed, 1638 insertions(+), 564 deletions(-)
 create mode 100644 ImageManager/Data/PictureDataArchive.cs
 create mode 100644 ImageManager/Data/PictureFactory.cs
 create mode 100644 ImageManager/Logging/Logger.cs
 create mode 100644 ImageManager/Logging/LoggerFactory.cs
 create mode 100644 ImageManager/Migrations/20230911081455_UpdatePictureHash.Designer.cs
 create mode 100644 ImageManager/Migrations/20230911081455_UpdatePictureHash.cs
 create mode 100644 ImageManager/Migrations/MigrationCustom.cs
 create mode 100644 ImageManager/Migrations/MigratorEx.cs
 delete mode 100644 ImageManager/Tools/BindingProxy.cs
 create mode 100644 ImageManager/Tools/Converter/IsNullOrEmptyToVisibilityConverter.cs
 rename ImageManager/{Views => Tools/Converter}/StyleConverter.cs (94%)
 create mode 100644 ImageManager/Tools/Extension/ContainerEx.cs
 rename ImageManager/Tools/{ => Helper}/ClipboardHelper.cs (98%)
 rename ImageManager/Tools/{ => Helper}/ControlsSearchHelper.cs (93%)
 delete mode 100644 ImageManager/Tools/ImageComparer.cs
 delete mode 100644 ImageManager/Tools/Log.cs
 delete mode 100644 ImageManager/ViewModels/AddImageProgressViewModel.cs
 create mode 100644 ImageManager/ViewModels/AddImageProgressViewModelWrap.cs
 create mode 100644 ImageManager/ViewModels/ExportImageProgressViewModelWrap.cs
 create mode 100644 ImageManager/ViewModels/ProgressViewModel.cs
 create mode 100644 ImageManager/ViewModels/ProgressViewModelWrapBase.cs
 rename ImageManager/Views/{AddImageProgressView.xaml => ProgressView.xaml} (86%)
 rename ImageManager/Views/{AddImageProgressView.xaml.cs => ProgressView.xaml.cs} (94%)

diff --git a/ImageManager/App.xaml b/ImageManager/App.xaml
index 50351d4..a93089c 100644
--- a/ImageManager/App.xaml
+++ b/ImageManager/App.xaml
@@ -2,9 +2,9 @@
     x:Class="ImageManager.App"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:conv="clr-namespace:ImageManager.Tools.Converter"
     xmlns:hc="https://handyorg.github.io/handycontrol"
     xmlns:local="clr-namespace:ImageManager"
-    xmlns:local2="clr-namespace:ImageManager.Views"
     xmlns:s="https://github.com/canton7/Stylet">
     <Application.Resources>
         <s:ApplicationLoader>
@@ -23,7 +23,8 @@
                         <Setter Property="OtherButtonBackground" Value="{DynamicResource DangerBrush}" />
                         <Setter Property="MinHeight" Value="100" />
                     </Style>
-                    <local2:StyleConverter x:Key="StyleConverter" />
+                    <conv:StyleConverter x:Key="StyleConverter" />
+                    <conv:IsNullOrEmptyToVisibilityConverter x:Key="IsNullOrEmptyToVisibilityConverter" />
                 </ResourceDictionary>
             </s:ApplicationLoader.MergedDictionaries>
         </s:ApplicationLoader>
diff --git a/ImageManager/App.xaml.cs b/ImageManager/App.xaml.cs
index 8830c84..c86306f 100644
--- a/ImageManager/App.xaml.cs
+++ b/ImageManager/App.xaml.cs
@@ -1,9 +1,10 @@
 using HandyControl.Themes;
-using ImageManager.Tools;
 using System.Diagnostics;
 using System.Reflection;
 using System.Windows;
 using System.Windows.Threading;
+using LoggerFactory = ImageManager.Logging.LoggerFactory;
+using LogLevel = ImageManager.Logging.LogLevel;
 
 namespace ImageManager
 {
@@ -59,15 +60,13 @@ protected override void OnStartup(StartupEventArgs e)
 
         void ThrowException(Exception e)
         {
-            Log.Error(e.ToString());
-            Log.ReportError(e.ToString());
+            LoggerFactory.GetLogger(nameof(App)).Log(LogLevel.Fatal, exception: e);
             MessageBox.Show("我们很抱歉，当前应用程序遇到一些问题，该操作已经终止。我们将会上传错误日志以便开发人员解决问题。\n错误信息：" + e.Message, "意外的操作", MessageBoxButton.OK, MessageBoxImage.Information);
         }
 
         void Current_DispatcherUnhandledException(object sender, DispatcherUnhandledExceptionEventArgs e)
         {
-            Log.Error(e.Exception.ToString());
-            Log.ReportError(e.Exception.ToString());
+            LoggerFactory.GetLogger(nameof(App)).Log(LogLevel.Fatal, exception: e.Exception);
             MessageBox.Show("我们很抱歉，当前应用程序遇到一些问题，该操作已经终止。我们将会上传错误日志以便开发人员解决问题。\n错误信息：" + e.Exception.Message.ToString(), "意外的操作", MessageBoxButton.OK, MessageBoxImage.Information);
             e.Handled = true;
         }
@@ -75,8 +74,7 @@ void Current_DispatcherUnhandledException(object sender, DispatcherUnhandledExce
         void CurrentDomain_UnhandledException(object sender, UnhandledExceptionEventArgs e)
         {
             var ex = (Exception)e.ExceptionObject;
-            Log.Error(ex.ToString());
-            Log.ReportError(ex.ToString());
+            LoggerFactory.GetLogger(nameof(App)).Log(LogLevel.Fatal, exception: ex);
             MessageBox.Show("我们很抱歉，当前应用程序遇到一些问题，该操作已经终止。我们将会上传错误日志以便开发人员解决问题。\n错误信息：" + ex.Message, "意外的操作", MessageBoxButton.OK, MessageBoxImage.Information);
         }
 
diff --git a/ImageManager/Bootstrapper.cs b/ImageManager/Bootstrapper.cs
index 93f2264..c3e6edd 100644
--- a/ImageManager/Bootstrapper.cs
+++ b/ImageManager/Bootstrapper.cs
@@ -1,23 +1,34 @@
 using ImageManager.Data;
+using ImageManager.Logging;
+using ImageManager.Migrations;
 using ImageManager.ViewModels;
 using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
 using StyletIoC;
 
 namespace ImageManager
 {
     public class Bootstrapper : Bootstrapper<RootViewModel>
     {
+        private Logging.Logger _logger = LoggerFactory.GetLogger(nameof(Bootstrapper));
         protected override void ConfigureIoC(IStyletIoCBuilder builder)
         {
             var userSettingData = UserSettingData.Default;
             builder.Bind<UserSettingData>().ToInstance(userSettingData);
-            // create Database context
+
+            // 准备数据库
             var context = new ImageContext();
-            context.Database.Migrate();
+            var migrator = context.GetService<IMigrator>();
+            foreach (var migration in context.Database.GetPendingMigrations())
+            {
+                migrator.MigrateEx(migration, context);
+            }
             // 为每个窗体都配置一个DB上下文
             builder.Bind<ImageContext>()
                 .ToFactory(container => new ImageContext());
 
+
             // 清理
             Task.Run(() =>
             {
diff --git a/ImageManager/Data/Model/Label.cs b/ImageManager/Data/Model/Label.cs
index 3962e35..acb56c2 100644
--- a/ImageManager/Data/Model/Label.cs
+++ b/ImageManager/Data/Model/Label.cs
@@ -24,5 +24,10 @@ public override bool Equals(object? obj)
             }
             return false;
         }
+
+        public override int GetHashCode()
+        {
+            return Name.GetHashCode();
+        }
     }
 }
diff --git a/ImageManager/Data/Model/Picture.cs b/ImageManager/Data/Model/Picture.cs
index 057ca73..5b2e0ee 100644
--- a/ImageManager/Data/Model/Picture.cs
+++ b/ImageManager/Data/Model/Picture.cs
@@ -1,4 +1,5 @@
-using Microsoft.EntityFrameworkCore;
+using ImageManager.Logging;
+using Microsoft.EntityFrameworkCore;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Windows.Media.Imaging;
@@ -36,9 +37,10 @@ public class Picture
         public int Width { get; set; }
         public int Height { get; set; }
         public DateTime AddTime { get; set; }
-        public string Hash { get; set; }
-        public ulong? WeakHash { get; set; }
-        public virtual List<Label> Labels { get; set; }
+        public byte[] Hash { get; set; }
+        [Required]
+        public byte[]? WeakHash { get; set; }
+        public virtual List<Label> Labels { get; set; } = new();
 
         [NotMapped]
         public bool AcceptToAdd { get; set; }
@@ -51,9 +53,9 @@ public PictureAddStateEnum AddState
         {
             get
             {
-                if (SamePicture != null && SamePicture.Count > 0)
+                if (SamePicture?.Any() ?? false)
                     return PictureAddStateEnum.SameConflict;
-                if (SimilarPictures != null && SimilarPictures.Count > 0)
+                if (SimilarPictures?.Any() ?? false)
                     return PictureAddStateEnum.SimilarConflict;
                 return PictureAddStateEnum.WaitToAdd;
             }
@@ -109,5 +111,29 @@ public void CopyTo(string folderPath)
             }
             ImageFolderPath = folderPath;
         }
+
+        public void SafeDeleteFile()
+        {
+            var logger = LoggerFactory.GetLogger(nameof(Picture));
+            try
+            {
+                File.Delete(System.IO.Path.Join(ImageFolderPath, Path));
+            }
+            catch (Exception e)
+            {
+                logger.Error(e);
+            }
+            if (ThumbnailPath != null)
+            {
+                try
+                {
+                    File.Delete(System.IO.Path.Join(ImageFolderPath, ThumbnailPath));
+                }
+                catch (Exception e)
+                {
+                    logger.Error(e);
+                }
+            }
+        }
     }
 }
diff --git a/ImageManager/Data/PictureDataArchive.cs b/ImageManager/Data/PictureDataArchive.cs
new file mode 100644
index 0000000..3e8232a
--- /dev/null
+++ b/ImageManager/Data/PictureDataArchive.cs
@@ -0,0 +1,386 @@
+using ImageManager.Data.Model;
+using Joveler.Compression.XZ;
+using System.Collections.ObjectModel;
+using System.Diagnostics;
+using System.Runtime.InteropServices;
+using System.Text;
+using System.Xml.Serialization;
+using Label = ImageManager.Data.Model.Label;
+
+namespace ImageManager.Data
+{
+    /// <summary>
+    /// Picture数据的外部存档
+    /// </summary>
+    /// <remarks>
+    /// 文件结构分为头部和压缩数据两部分
+    /// Head结构如下
+    /// Magic: 4 bytes "PDAF"
+    /// Version: 1 byte, UInt8, 版本号
+    /// Length: 8 bytes, UInt64, 压缩数据的长度
+    /// </remarks>
+    public class PictureDataArchive
+    {
+        public static readonly string Magic = "PDAF";
+        public static readonly string Extension = ".pdaf";
+
+        private UserSettingData _userSettingData;
+        private ImageContext _context;
+        private string _filePath;
+        private static bool _isInitialized = false;
+
+        public List<Picture> Pictures { get; set; }
+        public EventHandler<ProgressEventArgs> ProgressChanged { get; set; }
+
+        public PictureDataArchive(UserSettingData userSettingData, ImageContext context, string filePath)
+        {
+            _userSettingData = userSettingData;
+            _context = context;
+            _filePath = filePath;
+        }
+
+        /// <summary>
+        /// 保存
+        /// </summary>
+        /// <param name="cancellationToken"></param>
+        public void Save(CancellationToken cancellationToken)
+        {
+            ProgressChanged?.Invoke(this, new ProgressEventArgs { Progress = 0, Message = "正在初始化……" });
+            InitNativeLibrary();
+
+            // 计算大小
+            ProgressChanged?.Invoke(this, new ProgressEventArgs { Progress = 0, Message = "正在计算总大小……" });
+            var pictureStoreInfos = new List<PictureStoreInfo>();
+            var totalByte = 0uL;
+            var fileInfos = new List<FileInfo>();
+            foreach (var picture in Pictures)
+            {
+                if (cancellationToken.IsCancellationRequested)
+                    return;
+
+                var fileInfo = new FileInfo(Path.Join(picture.ImageFolderPath, picture.Path));
+                totalByte += (ulong)fileInfo.Length;
+                fileInfos.Add(fileInfo);
+                var pictureStoreInfo = new PictureStoreInfo()
+                {
+                    Title = picture.Title,
+                    Labels = picture.Labels.Select(l => l.Name).ToList(),
+                    Extension = fileInfo.Extension,
+                    Length = (uint)fileInfo.Length,
+                };
+                pictureStoreInfos.Add(pictureStoreInfo);
+            }
+
+            // 转存数据库
+            if (cancellationToken.IsCancellationRequested)
+                return;
+            using var pictureStoreInfosStream = new MemoryStream();
+            var xml = new XmlSerializer(typeof(List<PictureStoreInfo>));
+            xml.Serialize(pictureStoreInfosStream, pictureStoreInfos);
+            pictureStoreInfosStream.Seek(0, SeekOrigin.Begin);
+            Debug.WriteLine(new StreamReader(pictureStoreInfosStream).ReadToEnd());
+            totalByte += (ulong)pictureStoreInfosStream.Length;
+
+            // 准备压缩
+            ProgressChanged?.Invoke(this, new ProgressEventArgs { Progress = 0, Message = "正在创建压缩包……" });
+            using var fs = new FileStream(_filePath, FileMode.Create);
+            // 写入头部
+            fs.Write(Encoding.UTF8.GetBytes(Magic));
+            fs.WriteByte(1);
+            fs.Write(BitConverter.GetBytes((ulong)0)); // 预留 文件长度
+            // 头部
+            var headLength = fs.Position;
+
+            fs.Flush();
+
+            // 写入压缩数据
+            var compressOptions = new XZCompressOptions()
+            {
+                Level = LzmaCompLevel.Level9,
+                ExtremeFlag = true,
+                LeaveOpen = true,
+            };
+            var threadCompressOptions = new XZThreadedCompressOptions
+            {
+                // Thread equal as CPU core count
+                Threads = Environment.ProcessorCount,
+            };
+            using var xzStream = new XZStream(fs, compressOptions, threadCompressOptions);
+            var fin = false;
+            Task.Run(() =>
+            {
+                ProgressChanged?.Invoke(this, new ProgressEventArgs { Progress = 0, Message = "正在压缩……" });
+                while (!fin)
+                {
+                    if (cancellationToken.IsCancellationRequested)
+                        return;
+                    ulong progressIn;
+                    lock (xzStream)
+                        xzStream.GetProgress(out progressIn, out ulong progressOut);
+                    ProgressChanged?.Invoke(this, new ProgressEventArgs
+                    {
+                        Progress = 100.0 * progressIn / totalByte,
+                        Message = "正在压缩……"
+                    });
+                    Task.Delay(200).Wait();
+                }
+                ProgressChanged?.Invoke(this, new ProgressEventArgs { Progress = 100, Message = "压缩完成！" });
+            }, cancellationToken);
+
+            // 写入数据库
+            // Length: 4 bytes, uint32, 数据库的长度
+            if (cancellationToken.IsCancellationRequested)
+            {
+                fin = true;
+                lock (xzStream)
+                    xzStream.Abort();
+                return;
+            }
+            xzStream.Write(BitConverter.GetBytes((uint)pictureStoreInfosStream.Length));
+            pictureStoreInfosStream.Seek(0, SeekOrigin.Begin);
+            pictureStoreInfosStream.CopyTo(xzStream);
+            xzStream.Flush();
+
+            // 写入图片
+            foreach (var fileinfo in fileInfos)
+            {
+                if (cancellationToken.IsCancellationRequested)
+                {
+                    fin = true;
+                    lock (xzStream)
+                        xzStream.Abort();
+                    return;
+                }
+                using var fileStream = fileinfo.OpenRead();
+                fileStream.CopyTo(xzStream);
+                fileStream.Close();
+                xzStream.Flush();
+            }
+
+            xzStream.Flush();
+            fin = true;
+
+            // 写入文件长度
+            lock (xzStream)
+                xzStream.Close();
+            var blockLength = (ulong)(fs.Length - headLength);
+            fs.Seek(headLength - 8, SeekOrigin.Begin);
+            fs.Write(BitConverter.GetBytes(blockLength));
+            return;
+        }
+
+        /// <summary>
+        /// 加载
+        /// </summary>
+        /// <param name="cancellationToken"></param>
+        /// <exception cref="PictureDataArchiveFileFormatNotSupportException"></exception>
+        /// <exception cref="PictureDataArchiveVersionNotSupportException"></exception>
+        /// <exception cref="PictureDataArchiveFileDamagedException"></exception>
+        public void Load(CancellationToken cancellationToken, ReadOnlyCollection<Picture> tempPictures)
+        {
+            ProgressChanged?.Invoke(this, new ProgressEventArgs { Progress = 0, Message = "正在初始化……" });
+            InitNativeLibrary();
+
+            // 打开文件
+            using var fs = new FileStream(_filePath, FileMode.Open);
+            // 读取头部
+            var magic = new byte[4];
+            fs.Read(magic);
+            if (Encoding.UTF8.GetString(magic) != Magic)
+                throw new PictureDataArchiveFileFormatNotSupportException("文件格式不支持！");
+            var version = fs.ReadByte();
+            if (version != 1)
+                throw new PictureDataArchiveVersionNotSupportException("不支持该文件版本！");
+            byte[] buf;
+            // 验证文件长度
+            buf = new byte[8];
+            fs.Read(buf);
+            var length = BitConverter.ToUInt64(buf);
+            if ((ulong)fs.Length != length + (ulong)fs.Position)
+                throw new PictureDataArchiveFileDamagedException("文件损坏！");
+            // 解压缩
+            var decompressOptions = new XZDecompressOptions();
+            using var xzStream = new XZStream(fs, decompressOptions);
+            // 读取数据库
+            buf = new byte[4];
+            xzStream.Read(buf);
+            var infoLength = BitConverter.ToUInt32(buf);
+            buf = new byte[infoLength];
+            xzStream.Read(buf);
+
+            using var storeInfosStream = new MemoryStream(buf);
+            Debug.WriteLine(new StreamReader(storeInfosStream).ReadToEnd());
+            storeInfosStream.Seek(0, SeekOrigin.Begin);
+            var xmlSerializer = new XmlSerializer(typeof(List<PictureStoreInfo>));
+            var pictureStoreInfos = (List<PictureStoreInfo>)xmlSerializer.Deserialize(storeInfosStream);
+            // 读取图片
+            Pictures = new();
+            for (var pictureStoreInfoIndex = 0; pictureStoreInfoIndex < pictureStoreInfos.Count; pictureStoreInfoIndex++)
+            {
+                if (cancellationToken.IsCancellationRequested)
+                    return;
+                var pictureStoreInfo = pictureStoreInfos[pictureStoreInfoIndex];
+                ProgressChanged?.Invoke(this, new ProgressEventArgs
+                {
+                    Progress = 100.0 * pictureStoreInfoIndex / pictureStoreInfos.Count,
+                    Message = "正在解压缩……"
+                });
+
+                var fileInfo = new FileInfo(Path.Join(_userSettingData.TempFolderPath,
+                    "Decompress" + pictureStoreInfo.Extension));
+                using (var fileStream = fileInfo.OpenWrite())
+                {
+                    buf = new byte[1024 * 1024];// 1MB
+                    var fileByte = pictureStoreInfo.Length;
+                    while (fileByte > 0)
+                    {
+                        var readByte = xzStream.Read(buf, 0, (int)Math.Min(fileByte, (ulong)buf.Length));
+                        fileStream.Write(buf, 0, readByte);
+                        fileByte -= (uint)readByte;
+                    }
+                }
+                var pictureFactory = new PictureFactory(_userSettingData, _context);
+                var picture = pictureFactory.CreateTempPicture(fileInfo.FullName, tempPictures, true);
+                picture.Title = pictureStoreInfo.Title;
+                foreach (var labelName in pictureStoreInfo.Labels)
+                {
+                    var label = _context.Labels.FirstOrDefault(l => l.Name == labelName);
+                    label ??= _context.Labels.Local.FirstOrDefault(l => l.Name == labelName);
+                    if (label == null)
+                    {
+                        label = new Label
+                        {
+                            Name = labelName,
+                        };
+                        _context.Labels.Add(label);
+                    }
+                    picture.Labels.Add(label);
+                }
+                Pictures.Add(picture);
+            }
+            if (cancellationToken.IsCancellationRequested)
+                return;
+            ProgressChanged?.Invoke(this, new ProgressEventArgs { Progress = 100, Message = "解压缩完成！" });
+            _context.SaveChanges();
+        }
+
+        public static bool IsPictureDataArchiveFile(string filePath)
+        {
+            if (!File.Exists(filePath))
+                return false;
+            if (Path.GetExtension(filePath) != Extension)
+                return false;
+            using var fs = new FileStream(filePath, FileMode.Open);
+            var magic = new byte[4];
+            fs.Read(magic);
+            return Encoding.UTF8.GetString(magic) == Magic;
+        }
+
+        private static void InitNativeLibrary()
+        {
+            if (_isInitialized)
+                return;
+            string libDir = "runtimes";
+            if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+                libDir = Path.Combine(libDir, "win-");
+            else if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
+                libDir = Path.Combine(libDir, "linux-");
+            else if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
+                libDir = Path.Combine(libDir, "osx-");
+
+            switch (RuntimeInformation.ProcessArchitecture)
+            {
+                case Architecture.X86:
+                    libDir += "x86";
+                    break;
+                case Architecture.X64:
+                    libDir += "x64";
+                    break;
+                case Architecture.Arm:
+                    libDir += "arm";
+                    break;
+                case Architecture.Arm64:
+                    libDir += "arm64";
+                    break;
+            }
+            libDir = Path.Combine(libDir, "native");
+
+            string libPath = null;
+            if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+                libPath = Path.Combine(libDir, "liblzma.dll");
+            else if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
+                libPath = Path.Combine(libDir, "liblzma.so");
+            else if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
+                libPath = Path.Combine(libDir, "liblzma.dylib");
+
+            if (libPath == null)
+                throw new PlatformNotSupportedException($"Unable to find native library.");
+            if (!File.Exists(libPath))
+                throw new PlatformNotSupportedException($"Unable to find native library [{libPath}].");
+
+            XZInit.GlobalInit(libPath);
+            _isInitialized = true;
+        }
+
+        public class PictureStoreInfo
+        {
+            public string Title { get; set; }
+            public List<string> Labels { get; set; }
+            /// <summary>
+            /// 图片后缀
+            /// </summary>
+            public string Extension { get; set; }
+            public uint Length { get; set; }
+        }
+
+    }
+
+    public class ProgressEventArgs : EventArgs
+    {
+        /// <summary>
+        /// 进度，0-100
+        /// </summary>
+        public double Progress { get; set; }
+        /// <summary>
+        /// 消息
+        /// </summary>
+        public string Message { get; set; }
+    }
+    /// <summary>
+    /// 文件格式错误
+    /// </summary>
+    public class PictureDataArchiveFileFormatNotSupportException : Exception
+    {
+        public PictureDataArchiveFileFormatNotSupportException() { }
+        public PictureDataArchiveFileFormatNotSupportException(string message) : base(message) { }
+        public PictureDataArchiveFileFormatNotSupportException(string message, Exception innerException) :
+            base(message, innerException)
+        { }
+
+    }
+
+    /// <summary>
+    /// 不支持的文件版本
+    /// </summary>
+    public class PictureDataArchiveVersionNotSupportException : PictureDataArchiveFileFormatNotSupportException
+    {
+        public PictureDataArchiveVersionNotSupportException() { }
+        public PictureDataArchiveVersionNotSupportException(string message) : base(message) { }
+        public PictureDataArchiveVersionNotSupportException(string message, Exception innerException) :
+            base(message, innerException)
+        { }
+    }
+
+    /// <summary>
+    /// 文件损坏
+    /// </summary>
+    public class PictureDataArchiveFileDamagedException : PictureDataArchiveFileFormatNotSupportException
+    {
+        public PictureDataArchiveFileDamagedException() { }
+        public PictureDataArchiveFileDamagedException(string message) : base(message) { }
+        public PictureDataArchiveFileDamagedException(string message, Exception innerException) :
+            base(message, innerException)
+        { }
+    }
+
+}
diff --git a/ImageManager/Data/PictureFactory.cs b/ImageManager/Data/PictureFactory.cs
new file mode 100644
index 0000000..aa1216c
--- /dev/null
+++ b/ImageManager/Data/PictureFactory.cs
@@ -0,0 +1,188 @@
+using ImageManager.Data.Model;
+using Shipwreck.Phash;
+using Shipwreck.Phash.Bitmaps;
+using System.Collections.ObjectModel;
+using System.Security.Cryptography;
+
+namespace ImageManager.Data
+{
+    public class PictureFactory
+    {
+        private UserSettingData UserSettingData;
+        private ImageContext _context;
+
+        public PictureFactory(UserSettingData userSettingData, ImageContext context)
+        {
+            UserSettingData = userSettingData;
+            _context = context;
+        }
+
+        /// <summary>
+        /// 添加临时图片
+        /// </summary>
+        /// <param name="context"></param>
+        /// <param name="filePath"></param>
+        /// <param name="tempPictures"></param>
+        /// <param name="deleteSourceFile">删除源文件</param>
+        /// <returns></returns>
+        /// <exception cref="ImageFormatException">文件格式不支持</exception>
+        public Picture CreateTempPicture(string filePath, ReadOnlyCollection<Picture>? tempPictures = null,
+            bool deleteSourceFile = false)
+        {
+            using var fs = File.OpenRead(filePath);
+            using var reader = new BufferedStream(fs, 16 * 1024 * 1024); //16MB
+
+            // 判断是否为可读格式
+            var fif = FreeImageAPI.FreeImage.GetFileTypeFromStream(reader);
+            if (fif == FreeImageAPI.FREE_IMAGE_FORMAT.FIF_UNKNOWN)
+            {
+                fif = FreeImageAPI.FreeImage.GetFIFFromFilename(filePath);
+                if (fif == FreeImageAPI.FREE_IMAGE_FORMAT.FIF_UNKNOWN)
+                {
+                    throw new ImageFormatNotSupportException("图片格式不支持！");
+                }
+            }
+            if (!FreeImageAPI.FreeImage.FIFSupportsReading(fif))
+            {
+                throw new ImageFormatNotSupportException("图片格式不支持！");
+            }
+
+            // 读取图片
+            reader.Seek(0, SeekOrigin.Begin);
+            var fibitmap = FreeImageAPI.FreeImage.LoadFromStream(reader, FreeImageAPI.FREE_IMAGE_LOAD_FLAGS.DEFAULT, ref fif);
+            var width = (int)FreeImageAPI.FreeImage.GetWidth(fibitmap);
+            var height = (int)FreeImageAPI.FreeImage.GetHeight(fibitmap);
+            // 判断是否为位图
+            if (FreeImageAPI.FreeImage.GetImageType(fibitmap) != FreeImageAPI.FREE_IMAGE_TYPE.FIT_BITMAP)
+            {
+                var newBitmap = FreeImageAPI.FreeImage.ConvertToType(fibitmap, FreeImageAPI.FREE_IMAGE_TYPE.FIT_BITMAP, true);
+                FreeImageAPI.FreeImage.Unload(fibitmap);
+                fibitmap = newBitmap;
+            }
+            // 转换为GDI+图片
+            using var bitmap = FreeImageAPI.FreeImage.GetBitmap(fibitmap);
+            FreeImageAPI.FreeImage.Unload(fibitmap);
+
+            // 相同图片判断
+            reader.Seek(0, SeekOrigin.Begin);
+            var md5 = MD5.HashData(reader);
+            var samePictures = new List<Picture>();
+            var samePicture = _context.Pictures.Where(p => p.Hash.SequenceEqual(md5)).SingleOrDefault();
+            if (samePicture != null)
+                samePictures.Add(samePicture);
+            if (tempPictures != null)
+                samePictures.AddRange(tempPictures.Where(p => p.Hash == md5).ToList());
+
+            // 相似判断
+            var phash = ImagePhash.ComputeDigest(bitmap.ToLuminanceImage()).Coefficients;
+            var similarPictures = _context.Pictures.AsEnumerable().Where(
+                p => ImagePhash.GetCrossCorrelation(p.WeakHash, phash) > UserSettingData.SimilarityThreshold
+                ).ToList();
+            if (tempPictures != null)
+                similarPictures.AddRange(tempPictures.Where(
+                    p => ImagePhash.GetCrossCorrelation(p.WeakHash, phash) > UserSettingData.SimilarityThreshold
+                    ).ToList());
+
+            // 关闭文件，防止文件被占用
+            reader.Close();
+            fs.Close();
+            // 保存到临时文件夹
+            string saveFileName;
+            do
+            {
+                saveFileName = $"{md5}{Random.Shared.Next()}";
+            } while (File.Exists(Path.Join(UserSettingData.TempFolderPath, saveFileName + Path.GetExtension(filePath))));
+            if (deleteSourceFile)
+                File.Move(filePath, Path.Join(UserSettingData.TempFolderPath, saveFileName + Path.GetExtension(filePath)));
+            else
+                File.Copy(filePath, Path.Join(UserSettingData.TempFolderPath, saveFileName + Path.GetExtension(filePath)));
+
+            string? thumbFileName = null;
+            // 生成缩略图
+            // 如果过宽或者格式不支持，生成缩略图
+            if (width > UserSettingData.ThumbnailWidth || !(
+                fif == FreeImageAPI.FREE_IMAGE_FORMAT.FIF_BMP
+                || fif == FreeImageAPI.FREE_IMAGE_FORMAT.FIF_JPEG
+                || fif == FreeImageAPI.FREE_IMAGE_FORMAT.FIF_PNG
+                || fif == FreeImageAPI.FREE_IMAGE_FORMAT.FIF_TIFF
+                || fif == FreeImageAPI.FREE_IMAGE_FORMAT.FIF_GIF
+                || fif == FreeImageAPI.FREE_IMAGE_FORMAT.FIF_ICO
+                || fif == FreeImageAPI.FREE_IMAGE_FORMAT.FIF_TIFF))
+            {
+                thumbFileName = saveFileName + "_s.png";
+                if (width > UserSettingData.ThumbnailWidth)
+                {
+                    int targetWidth = UserSettingData.ThumbnailWidth;
+                    int targetHeight = bitmap.Height * targetWidth / bitmap.Width;
+                    using var thumb = bitmap.GetThumbnailImage(targetWidth, targetHeight, () => false, IntPtr.Zero); //ImageUtility.Resize(bitmap, targetWidth);
+                    thumb.Save(Path.Join(UserSettingData.TempFolderPath, thumbFileName));
+                }
+                else
+                {
+                    bitmap.Save(Path.Join(UserSettingData.TempFolderPath, thumbFileName));
+                }
+            }
+
+            // 判断是否接受
+            var accept = false;
+            if (samePictures.Count != 0)
+                accept = false;
+            else if (similarPictures.Count != 0)
+                accept = false;// TODO 如果存在更加清晰的图片应该为更新替换，目前还没有更新替换功能
+            else
+                accept = true;
+
+            // 生成Picture数据
+            var dirPath = UserSettingData.Default.TempFolderPath;
+            if (!Path.IsPathRooted(dirPath))
+                dirPath = Path.Join(AppDomain.CurrentDomain.BaseDirectory, dirPath);
+            var picture = new Picture(false)
+            {
+                Title = Path.GetFileNameWithoutExtension(filePath),
+                Path = saveFileName + Path.GetExtension(filePath),
+                ThumbnailPath = thumbFileName,
+                Width = width,
+                Height = height,
+                Hash = md5,
+                WeakHash = phash,
+                SamePicture = samePictures,
+                SimilarPictures = similarPictures,
+                ImageFolderPath = dirPath,
+                AcceptToAdd = accept,
+            };
+            return picture;
+        }
+
+        public static bool IsPictureFile(string filePath)
+        {
+            var fif = FreeImageAPI.FreeImage.GetFileType(filePath, 0);
+            if (fif == FreeImageAPI.FREE_IMAGE_FORMAT.FIF_UNKNOWN)
+            {
+                fif = FreeImageAPI.FreeImage.GetFIFFromFilename(filePath);
+                if (fif == FreeImageAPI.FREE_IMAGE_FORMAT.FIF_UNKNOWN)
+                {
+                    return false;
+                }
+            }
+            if (!FreeImageAPI.FreeImage.FIFSupportsReading(fif))
+            {
+                return false;
+            }
+            return true;
+        }
+    }
+
+    ///<summary>
+    ///图片格式不支持
+    ///</summary>
+    [Serializable]
+    public class ImageFormatNotSupportException : Exception
+    {
+        public ImageFormatNotSupportException() { }
+        public ImageFormatNotSupportException(string message) : base(message) { }
+        public ImageFormatNotSupportException(string message, Exception inner) : base(message, inner) { }
+        protected ImageFormatNotSupportException(
+          System.Runtime.Serialization.SerializationInfo info,
+          System.Runtime.Serialization.StreamingContext context) : base(info, context) { }
+    }
+}
diff --git a/ImageManager/Data/UserSettingData.cs b/ImageManager/Data/UserSettingData.cs
index a95e8ef..cb93d35 100644
--- a/ImageManager/Data/UserSettingData.cs
+++ b/ImageManager/Data/UserSettingData.cs
@@ -31,6 +31,10 @@ public enum OrderByEnum { AddTime, Title, AddState }
         public OrderByEnum OrderBy { get; set; } = OrderByEnum.AddTime;
         public bool IsDesc { get; set; } = false;
         public bool IsGroup { get; set; } = false;
+        /// <summary>
+        /// 图片相似度阈值
+        /// </summary>
+        public double SimilarityThreshold { get; set; } = 0.9;
 
         /// <summary>
         /// 截图时关闭主窗口
diff --git a/ImageManager/ImageManager.csproj b/ImageManager/ImageManager.csproj
index b598722..34c796c 100644
--- a/ImageManager/ImageManager.csproj
+++ b/ImageManager/ImageManager.csproj
@@ -37,18 +37,21 @@
 	<ItemGroup>
 		<PackageReference Include="FreeImage.Standard" Version="4.3.9-beta4" />
 		<PackageReference Include="HandyControls" Version="3.4.5" />
-		<PackageReference Include="MdXaml" Version="1.17.0" />
-		<PackageReference Include="Microsoft.EntityFrameworkCore.DynamicLinq" Version="7.3.2" />
-		<PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="7.0.4" />
-		<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.4" />
-		<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.4">
+		<PackageReference Include="Joveler.Compression.XZ" Version="4.3.0" />
+		<PackageReference Include="MdXaml" Version="1.21.0" />
+		<PackageReference Include="Microsoft.EntityFrameworkCore.DynamicLinq" Version="7.3.4" />
+		<PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="7.0.10" />
+		<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.10" />
+		<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.10">
 		  <PrivateAssets>all</PrivateAssets>
 		  <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
 		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
 		<PackageReference Include="PropertyChanged.Fody" Version="4.1.0" />
+		<PackageReference Include="Shipwreck.Phash.Bitmaps" Version="0.5.0" />
 		<PackageReference Include="Stylet" Version="1.3.6" />
 		<PackageReference Include="System.Drawing.Common" Version="7.0.0" />
+		<PackageReference Include="WpfExtensions.Xaml" Version="1.2.0" />
 	</ItemGroup>
 	<ItemGroup>
 	  <Using Include="Stylet" />
diff --git a/ImageManager/Logging/Logger.cs b/ImageManager/Logging/Logger.cs
new file mode 100644
index 0000000..5fafbd1
--- /dev/null
+++ b/ImageManager/Logging/Logger.cs
@@ -0,0 +1,115 @@
+using System.Net.Http;
+using System.Reflection;
+
+namespace ImageManager.Logging
+{
+    public class Logger
+    {
+        private readonly string _name;
+        public Logger(string name)
+        {
+            _name = name;
+        }
+        /// <summary>
+        /// 错误记录路径
+        /// </summary>
+        private readonly string LogPath = Path.Combine(AppDomain.CurrentDomain.SetupInformation.ApplicationBase, "Logger.txt");
+
+        public void Debug(string message) => Log(LogLevel.Debug, message);
+
+        public void Info(string message) => Log(LogLevel.Info, message);
+        public void Warn(string message) => Log(LogLevel.Warn, message);
+        public void Error(Exception exception) => Log(LogLevel.Error, exception: exception);
+        public void Fatal(Exception exception) => Log(LogLevel.Fatal, exception: exception, report: true);
+
+        /// <summary>
+        /// 写入错误
+        /// <paramref name="level"/>错误等级
+        /// <paramref name="message"/>错误信息
+        /// <paramref name="exception"/>错误，如果有覆盖<paramref name="message"/>
+        /// </summary>
+        public void Log(LogLevel level, string message = "", Exception? exception = null, bool report = false)
+        {
+            if (exception != null)
+                message = exception.Message;
+            var datetime = DateTime.Now.ToString("yyyy-MM-ddTHH:mm:sszzz",
+                System.Globalization.CultureInfo.InvariantCulture);
+
+            // 控制台输出
+            var logMessage = string.Format("{0}\t[{1}]:\t{2}({3})", level.ToString(),
+                _name, message, datetime);
+            System.Diagnostics.Debug.WriteLine(logMessage);
+
+            // 写入日志
+            if (level >= LogLevel.Info)
+            {
+                try
+                {
+                    File.AppendAllText(LogPath, logMessage);
+                }
+                catch (Exception e)
+                {
+                    System.Diagnostics.Debug.WriteLine(e.ToString());
+                }
+            }
+#if !DEBUG
+            // 上传错误
+            if (report)
+                ReportError(level, exception != null ? exception.ToString() : message);
+#endif
+        }
+
+
+        /// <summary>
+        /// 上传错误
+        /// </summary>
+        public void ReportError(LogLevel level, string error)
+        {
+            var machineName = Environment.MachineName;
+            var userName = Environment.UserName;
+            var version = Assembly.GetEntryAssembly()!.GetName().Version!.ToString();
+            var osVersion = Environment.OSVersion.VersionString;
+            var currentDirectory = Environment.CurrentDirectory;
+
+            var formData = new MultipartFormDataContent
+            {
+                { new StringContent(machineName),"MachineName" },
+                { new StringContent(userName),"UserName"},
+                { new StringContent(version),"Version" },
+                { new StringContent(osVersion),"OSVersion" },
+                { new StringContent(currentDirectory),"CurrentDirectory" },
+                { new StringContent(error),"Error" },
+            };
+            try
+            {
+                using var client = new HttpClient();
+                var severAddr = "https://im.ngmks.com";
+                //#if DEBUG
+                //                var severAddr = "http://127.0.0.1:5000";
+                //#else
+                //                var severAddr = "https://im.ngmks.com";
+                //#endif
+                var url = severAddr + "/api/report";
+                var result = client.PostAsync(url, formData).Result;
+                var respon = result.Content.ReadAsStringAsync().Result;
+                System.Diagnostics.Debug.WriteLine(respon);
+            }
+            catch (Exception)
+            {
+                System.Diagnostics.Debug.WriteLine($"无法连接错误上报服务器。Error: {error}");
+            }
+
+        }
+    }
+    /// <summary>
+    /// 错误级别
+    /// </summary>
+    public enum LogLevel
+    {
+        Debug,
+        Info,
+        Warn,
+        Error,
+        Fatal
+    }
+}
diff --git a/ImageManager/Logging/LoggerFactory.cs b/ImageManager/Logging/LoggerFactory.cs
new file mode 100644
index 0000000..1b81377
--- /dev/null
+++ b/ImageManager/Logging/LoggerFactory.cs
@@ -0,0 +1,7 @@
+namespace ImageManager.Logging
+{
+    public static class LoggerFactory
+    {
+        public static Logger GetLogger(string name) => new Logger(name);
+    }
+}
diff --git a/ImageManager/Migrations/20230911081455_UpdatePictureHash.Designer.cs b/ImageManager/Migrations/20230911081455_UpdatePictureHash.Designer.cs
new file mode 100644
index 0000000..93d7086
--- /dev/null
+++ b/ImageManager/Migrations/20230911081455_UpdatePictureHash.Designer.cs
@@ -0,0 +1,124 @@
+// <auto-generated />
+using System;
+using ImageManager.Data;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+
+#nullable disable
+
+namespace ImageManager.Migrations
+{
+    [DbContext(typeof(ImageContext))]
+    [Migration("20230911081455_UpdatePictureHash")]
+    partial class UpdatePictureHash
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "7.0.10")
+                .HasAnnotation("Proxies:ChangeTracking", false)
+                .HasAnnotation("Proxies:CheckEquality", false)
+                .HasAnnotation("Proxies:LazyLoading", true);
+
+            modelBuilder.Entity("ImageManager.Data.Model.Label", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("Num")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Name")
+                        .IsUnique();
+
+                    b.ToTable("Labels");
+                });
+
+            modelBuilder.Entity("ImageManager.Data.Model.Picture", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime>("AddTime")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT")
+                        .HasDefaultValueSql("datetime('now','localtime')");
+
+                    b.Property<byte[]>("Hash")
+                        .IsRequired()
+                        .HasColumnType("BLOB");
+
+                    b.Property<int>("Height")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Path")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ThumbnailPath")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Title")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<byte[]>("WeakHash")
+                        .IsRequired()
+                        .HasColumnType("BLOB");
+
+                    b.Property<int>("Width")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Hash")
+                        .IsUnique();
+
+                    b.ToTable("Pictures");
+                });
+
+            modelBuilder.Entity("LabelPicture", b =>
+                {
+                    b.Property<int>("LabelsId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("PictureId")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("LabelsId", "PictureId");
+
+                    b.HasIndex("PictureId");
+
+                    b.ToTable("LabelPicture");
+                });
+
+            modelBuilder.Entity("LabelPicture", b =>
+                {
+                    b.HasOne("ImageManager.Data.Model.Label", null)
+                        .WithMany()
+                        .HasForeignKey("LabelsId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("ImageManager.Data.Model.Picture", null)
+                        .WithMany()
+                        .HasForeignKey("PictureId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/ImageManager/Migrations/20230911081455_UpdatePictureHash.cs b/ImageManager/Migrations/20230911081455_UpdatePictureHash.cs
new file mode 100644
index 0000000..1b4e7e3
--- /dev/null
+++ b/ImageManager/Migrations/20230911081455_UpdatePictureHash.cs
@@ -0,0 +1,88 @@
+using ImageManager.Data;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Shipwreck.Phash;
+using Shipwreck.Phash.Bitmaps;
+using System.Security.Cryptography;
+
+#nullable disable
+
+namespace ImageManager.Migrations
+{
+    /// <inheritdoc />
+    public partial class UpdatePictureHash : MigrationCustom<ImageContext>
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AlterColumn<byte[]>(
+                name: "WeakHash",
+                table: "Pictures",
+                type: "BLOB",
+                nullable: false,
+                defaultValue: new byte[0],
+                oldClrType: typeof(ulong),
+                oldType: "INTEGER",
+                oldNullable: true);
+
+            migrationBuilder.AlterColumn<byte[]>(
+                name: "Hash",
+                table: "Pictures",
+                type: "BLOB",
+                nullable: false,
+                oldClrType: typeof(string),
+                oldType: "TEXT");
+        }
+        public override void PostUp(ImageContext context)
+        {
+            base.PostUp(context);
+            // 更新图片的Hash
+            foreach (var picture in context.Pictures)
+            {
+                var filePath = Path.Join(picture.ImageFolderPath, picture.Path);
+                using var fs = File.OpenRead(filePath);
+                using var reader = new BufferedStream(fs, 16 * 1024 * 1024); //16MB
+                var md5 = MD5.HashData(reader);
+                picture.Hash = md5;
+                // 读取图片
+                reader.Seek(0, SeekOrigin.Begin);
+                var fif = FreeImageAPI.FreeImage.GetFileTypeFromStream(reader);
+                var fibitmap = FreeImageAPI.FreeImage.LoadFromStream(reader, FreeImageAPI.FREE_IMAGE_LOAD_FLAGS.DEFAULT, ref fif);
+                // 判断是否为位图
+                if (FreeImageAPI.FreeImage.GetImageType(fibitmap) != FreeImageAPI.FREE_IMAGE_TYPE.FIT_BITMAP)
+                {
+                    var newBitmap = FreeImageAPI.FreeImage.ConvertToType(fibitmap, FreeImageAPI.FREE_IMAGE_TYPE.FIT_BITMAP, true);
+                    FreeImageAPI.FreeImage.Unload(fibitmap);
+                    fibitmap = newBitmap;
+                }
+                // 转换为GDI+图片
+                using var bitmap = FreeImageAPI.FreeImage.GetBitmap(fibitmap);
+                FreeImageAPI.FreeImage.Unload(fibitmap);
+                // 相似判断
+                var phash = ImagePhash.ComputeDigest(bitmap.ToLuminanceImage()).Coefficients;
+                picture.WeakHash = phash;
+            }
+            context.SaveChanges();
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            throw new System.NotImplementedException();
+            //migrationBuilder.AlterColumn<ulong>(
+            //    name: "WeakHash",
+            //    table: "Pictures",
+            //    type: "INTEGER",
+            //    nullable: true,
+            //    oldClrType: typeof(byte[]),
+            //    oldType: "BLOB");
+
+            //migrationBuilder.AlterColumn<string>(
+            //    name: "Hash",
+            //    table: "Pictures",
+            //    type: "TEXT",
+            //    nullable: false,
+            //    oldClrType: typeof(byte[]),
+            //    oldType: "BLOB");
+        }
+    }
+}
diff --git a/ImageManager/Migrations/ImageContextModelSnapshot.cs b/ImageManager/Migrations/ImageContextModelSnapshot.cs
index e38a73d..b7645d0 100644
--- a/ImageManager/Migrations/ImageContextModelSnapshot.cs
+++ b/ImageManager/Migrations/ImageContextModelSnapshot.cs
@@ -16,7 +16,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
         {
 #pragma warning disable 612, 618
             modelBuilder
-                .HasAnnotation("ProductVersion", "7.0.1")
+                .HasAnnotation("ProductVersion", "7.0.10")
                 .HasAnnotation("Proxies:ChangeTracking", false)
                 .HasAnnotation("Proxies:CheckEquality", false)
                 .HasAnnotation("Proxies:LazyLoading", true);
@@ -53,9 +53,9 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnType("TEXT")
                         .HasDefaultValueSql("datetime('now','localtime')");
 
-                    b.Property<string>("Hash")
+                    b.Property<byte[]>("Hash")
                         .IsRequired()
-                        .HasColumnType("TEXT");
+                        .HasColumnType("BLOB");
 
                     b.Property<int>("Height")
                         .HasColumnType("INTEGER");
@@ -71,8 +71,9 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .IsRequired()
                         .HasColumnType("TEXT");
 
-                    b.Property<ulong?>("WeakHash")
-                        .HasColumnType("INTEGER");
+                    b.Property<byte[]>("WeakHash")
+                        .IsRequired()
+                        .HasColumnType("BLOB");
 
                     b.Property<int>("Width")
                         .HasColumnType("INTEGER");
diff --git a/ImageManager/Migrations/MigrationCustom.cs b/ImageManager/Migrations/MigrationCustom.cs
new file mode 100644
index 0000000..effc04b
--- /dev/null
+++ b/ImageManager/Migrations/MigrationCustom.cs
@@ -0,0 +1,13 @@
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace ImageManager.Migrations
+{
+    public abstract class MigrationCustom<T> : Migration where T : DbContext
+    {
+        public virtual void PreUp(T context) { }
+        public virtual void PostUp(T context) { }
+        public virtual void PreDown(T context) { }
+        public virtual void PostDown(T context) { }
+    }
+}
diff --git a/ImageManager/Migrations/MigratorEx.cs b/ImageManager/Migrations/MigratorEx.cs
new file mode 100644
index 0000000..53d5edf
--- /dev/null
+++ b/ImageManager/Migrations/MigratorEx.cs
@@ -0,0 +1,25 @@
+using ImageManager.Data;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage;
+
+namespace ImageManager.Migrations
+{
+    public static class MigratorEx
+    {
+        public static void MigrateEx(this IMigrator migrator, string targetMigration, ImageContext context)
+        {
+            var migrationsAssembly = context.GetService<IMigrationsAssembly>();
+            var activeProvider = context.GetService<IDatabaseProvider>().Name;
+            var migrationType = migrationsAssembly.Migrations
+                .Where(m => string.Compare(m.Key, targetMigration, StringComparison.OrdinalIgnoreCase) == 0)
+                .SingleOrDefault().Value ?? throw new Exception($"Migration {targetMigration} not found.");
+            var migration = migrationsAssembly.CreateMigration(migrationType, activeProvider);
+            if (migration is MigrationCustom<ImageContext> migrationCustom)
+                migrationCustom.PreUp(context);
+            migrator.Migrate(targetMigration);
+            if (migration is MigrationCustom<ImageContext> migrationCustom2)
+                migrationCustom2.PostUp(context);
+        }
+    }
+}
diff --git a/ImageManager/Tools/BindingProxy.cs b/ImageManager/Tools/BindingProxy.cs
deleted file mode 100644
index 520ea1b..0000000
--- a/ImageManager/Tools/BindingProxy.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using System.Windows;
-
-namespace ImageManager.Tools
-{
-    public class BindingProxy : Freezable
-    {
-        #region Overrides of Freezable
-
-        protected override Freezable CreateInstanceCore()
-        {
-            return new BindingProxy();
-        }
-
-        #endregion
-
-        public object Data
-        {
-            get { return (object)GetValue(DataProperty); }
-            set { SetValue(DataProperty, value); }
-        }
-
-        // Using a DependencyProperty as the backing store for Data.  This enables animation, styling, binding, etc...
-        public static readonly DependencyProperty DataProperty =
-            DependencyProperty.Register("Data", typeof(object), typeof(BindingProxy), new UIPropertyMetadata(null));
-    }
-}
diff --git a/ImageManager/Tools/Converter/IsNullOrEmptyToVisibilityConverter.cs b/ImageManager/Tools/Converter/IsNullOrEmptyToVisibilityConverter.cs
new file mode 100644
index 0000000..ccd7599
--- /dev/null
+++ b/ImageManager/Tools/Converter/IsNullOrEmptyToVisibilityConverter.cs
@@ -0,0 +1,23 @@
+using System.Globalization;
+using System.Windows.Data;
+
+namespace ImageManager.Tools.Converter
+{
+    public class IsNullOrEmptyToVisibilityConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            if (value == null || value.GetType() != typeof(string))
+            {
+                return System.Windows.Visibility.Collapsed;
+            }
+            return string.IsNullOrEmpty((string)value) ?
+                System.Windows.Visibility.Collapsed : System.Windows.Visibility.Visible;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
diff --git a/ImageManager/Views/StyleConverter.cs b/ImageManager/Tools/Converter/StyleConverter.cs
similarity index 94%
rename from ImageManager/Views/StyleConverter.cs
rename to ImageManager/Tools/Converter/StyleConverter.cs
index b9e3704..a155e0b 100644
--- a/ImageManager/Views/StyleConverter.cs
+++ b/ImageManager/Tools/Converter/StyleConverter.cs
@@ -1,7 +1,7 @@
 using System.Windows;
 using System.Windows.Data;
 
-namespace ImageManager.Views
+namespace ImageManager.Tools.Converter
 {
     public class StyleConverter : IValueConverter
     {
diff --git a/ImageManager/Tools/Extension/ContainerEx.cs b/ImageManager/Tools/Extension/ContainerEx.cs
new file mode 100644
index 0000000..c21c0b3
--- /dev/null
+++ b/ImageManager/Tools/Extension/ContainerEx.cs
@@ -0,0 +1,21 @@
+using StyletIoC;
+
+namespace ImageManager.Tools.Extension
+{
+    public static class ContainerEx
+    {
+        /// <summary>
+        /// BuildUp扩展,在BuildUp后调用IInjectionAware的ParametersInjected方法。
+        /// </summary>
+        /// <param name="container"></param>
+        /// <param name="obj"></param>
+        public static void BuildUpEx(this IContainer container, object obj)
+        {
+            container.BuildUp(obj);
+            if (obj is IInjectionAware injectionAware)
+            {
+                injectionAware.ParametersInjected();
+            }
+        }
+    }
+}
diff --git a/ImageManager/Tools/ClipboardHelper.cs b/ImageManager/Tools/Helper/ClipboardHelper.cs
similarity index 98%
rename from ImageManager/Tools/ClipboardHelper.cs
rename to ImageManager/Tools/Helper/ClipboardHelper.cs
index 563a047..399d64a 100644
--- a/ImageManager/Tools/ClipboardHelper.cs
+++ b/ImageManager/Tools/Helper/ClipboardHelper.cs
@@ -1,7 +1,7 @@
 using System.Text;
 using System.Windows;
 
-namespace ImageManager.Tools
+namespace ImageManager.Tools.Helper
 {
     /// <summary>
     /// Helper to encode and set HTML fragment to clipboard.<br/>
@@ -105,7 +105,7 @@ public static string GetHtml(string html)
         /// <param name="plainText">the plain text</param>
         public static DataObject CreateDataObject(string html, string plainText)
         {
-            html = html ?? String.Empty;
+            html = html ?? string.Empty;
             var htmlFragment = GetHtmlDataString(html);
 
             // re-encode the string so it will work correctly (fixed in CLR 4.0)
@@ -187,8 +187,8 @@ public static string GetHtmlDataString(string html)
                     sb.Append(StartFragment);
                     fragmentStart = GetByteCount(sb);
 
-                    var innerHtmlStart = bodyOpenEndIdx > -1 ? bodyOpenEndIdx : (htmlOpenEndIdx > -1 ? htmlOpenEndIdx : 0);
-                    var innerHtmlEnd = bodyCloseIdx > -1 ? bodyCloseIdx : (htmlCloseIdx > -1 ? htmlCloseIdx : html.Length);
+                    var innerHtmlStart = bodyOpenEndIdx > -1 ? bodyOpenEndIdx : htmlOpenEndIdx > -1 ? htmlOpenEndIdx : 0;
+                    var innerHtmlEnd = bodyCloseIdx > -1 ? bodyCloseIdx : htmlCloseIdx > -1 ? htmlCloseIdx : html.Length;
                     sb.Append(html, innerHtmlStart, innerHtmlEnd - innerHtmlStart);
 
                     fragmentEnd = GetByteCount(sb);
diff --git a/ImageManager/Tools/ControlsSearchHelper.cs b/ImageManager/Tools/Helper/ControlsSearchHelper.cs
similarity index 93%
rename from ImageManager/Tools/ControlsSearchHelper.cs
rename to ImageManager/Tools/Helper/ControlsSearchHelper.cs
index 3c09006..ebbdb45 100644
--- a/ImageManager/Tools/ControlsSearchHelper.cs
+++ b/ImageManager/Tools/Helper/ControlsSearchHelper.cs
@@ -1,7 +1,7 @@
 using System.Windows;
 using System.Windows.Media;
 
-namespace ImageManager.Tools
+namespace ImageManager.Tools.Helper
 {
     public class ControlsSearchHelper
     {
@@ -18,7 +18,7 @@ public class ControlsSearchHelper
 
             while (parent != null)
             {
-                if (parent is T t && (t.Name == name | string.IsNullOrEmpty(name)))
+                if (parent is T t && t.Name == name | string.IsNullOrEmpty(name))
                 {
                     return t;
                 }
@@ -43,7 +43,7 @@ public class ControlsSearchHelper
             for (int i = 0; i <= VisualTreeHelper.GetChildrenCount(obj) - 1; i++)
             {
                 DependencyObject child = VisualTreeHelper.GetChild(obj, i);
-                if (child is T t && (t.Name == name | string.IsNullOrEmpty(name)))
+                if (child is T t && t.Name == name | string.IsNullOrEmpty(name))
                 {
                     return t;
                 }
diff --git a/ImageManager/Tools/ImageComparer.cs b/ImageManager/Tools/ImageComparer.cs
deleted file mode 100644
index 8f3c62a..0000000
--- a/ImageManager/Tools/ImageComparer.cs
+++ /dev/null
@@ -1,68 +0,0 @@
-using System.Drawing;
-using System.Security.Cryptography;
-
-namespace ImageManager.Tools
-{
-    class ImageComparer
-    {
-        /// <summary>
-        /// 返回图片感知hash值
-        /// </summary>
-        /// <param name="bitmap"></param>
-        /// <returns></returns>
-        public static ulong GetImagePHash(Bitmap bitmap)
-        {
-            // 缩放为8*8
-            using var thumb = (Bitmap)bitmap.GetThumbnailImage(8, 8, () => { return false; }, IntPtr.Zero);
-            // 转为灰度图
-            int[,] pixels = new int[8, 8];
-            for (int i = 0; i < 8; i++)
-            {
-                for (int j = 0; j < 8; j++)
-                {
-                    var pixel = thumb.GetPixel(i, j);
-                    pixels[i, j] = (pixel.R * 19595 + pixel.G * 38469 + pixel.B * 7472) >> 16;
-                }
-            }
-            // 计算平均值
-            int avg = 0;
-            for (int i = 0; i < 8; i++)
-            {
-                for (int j = 0; j < 8; j++)
-                {
-                    avg += pixels[i, j];
-                }
-            }
-            avg /= 64;
-            // 计算hash值
-            ulong hash = 0;
-            for (int i = 0; i < 8; i++)
-            {
-                for (int j = 0; j < 8; j++)
-                {
-                    if (pixels[i, j] >= avg)
-                    {
-                        hash |= (ulong)1 << (i * 8 + j);
-                    }
-                }
-            }
-            return hash;
-        }
-        public static int GetHammingDistance(ulong hash1, ulong hash2)
-        {
-            ulong xor = hash1 ^ hash2;
-            int distance = 0;
-            while (xor != 0)
-            {
-                distance++;
-                xor &= xor - 1;
-            }
-            return distance;
-        }
-        public static string GetMD5Hash(Stream stream)
-        {
-            var hash = MD5.HashData(stream);
-            return Convert.ToHexString(hash);
-        }
-    }
-}
diff --git a/ImageManager/Tools/Log.cs b/ImageManager/Tools/Log.cs
deleted file mode 100644
index 807a299..0000000
--- a/ImageManager/Tools/Log.cs
+++ /dev/null
@@ -1,86 +0,0 @@
-using System.Net.Http;
-using System.Reflection;
-using System.Text;
-
-namespace ImageManager.Tools
-{
-    static class Log
-    {
-        /// <summary>
-        /// 错误记录路径
-        /// </summary>
-        private static string LogPath = Path.Combine(AppDomain.CurrentDomain.SetupInformation.ApplicationBase, "Log.txt");
-
-        public static void Debug(string message) => Write("Debug", message);
-
-        public static void Info(string message) => Write("Info", message);
-        public static void Warn(string message) => Write("Warn", message);
-        public static void Error(string message) => Write("Error", message);
-
-        /// <summary>
-        /// 写入错误
-        /// </summary>
-        private static void Write(string type, string message)
-        {
-            try
-            {
-                // 写入日志
-                var sb = new StringBuilder();
-                sb.AppendLine("*****************************************");
-                sb.AppendLine(string.Format("{0}  {1} : {2}", DateTime.Now.ToLongDateString(), DateTime.Now.ToLongTimeString(), type));
-                sb.AppendLine("");
-                sb.AppendLine(message);
-                sb.AppendLine("*****************************************");
-                sb.AppendLine("");
-                sb.AppendLine("");
-                File.AppendAllText(LogPath, sb.ToString());
-            }
-            catch (Exception e)
-            {
-                System.Diagnostics.Debug.WriteLine(e.ToString());
-            }
-        }
-
-
-        /// <summary>
-        /// 上传错误
-        /// </summary>
-        public static void ReportError(string error)
-        {
-            var machineName = Environment.MachineName;
-            var userName = Environment.UserName;
-            var version = Assembly.GetEntryAssembly().GetName().Version.ToString();
-            var OSVersion = Environment.OSVersion.VersionString;
-            var currentDirectory = Environment.CurrentDirectory;
-
-            var formData = new MultipartFormDataContent
-            {
-                { new StringContent(machineName),"MachineName" },
-                { new StringContent(userName),"UserName"},
-                { new StringContent(version),"Version" },
-                { new StringContent(OSVersion),"OSVersion" },
-                { new StringContent(currentDirectory),"CurrentDirectory" },
-                { new StringContent(error),"Error" },
-            };
-            try
-            {
-                using var client = new HttpClient();
-                var severAddr = "https://im.ngmks.com";
-                //#if DEBUG
-                //                var severAddr = "http://127.0.0.1:5000";
-                //#else
-                //                var severAddr = "https://im.ngmks.com";
-                //#endif
-                var url = severAddr + "/api/report";
-                var result = client.PostAsync(url, formData).Result;
-                var respon = result.Content.ReadAsStringAsync().Result;
-                System.Diagnostics.Debug.WriteLine(respon);
-            }
-            catch (Exception)
-            {
-                System.Diagnostics.Debug.WriteLine($"无法连接错误上报服务器。Error: {error}");
-            }
-
-        }
-    }
-}
diff --git a/ImageManager/ViewModels/AddImageProgressViewModel.cs b/ImageManager/ViewModels/AddImageProgressViewModel.cs
deleted file mode 100644
index 6366357..0000000
--- a/ImageManager/ViewModels/AddImageProgressViewModel.cs
+++ /dev/null
@@ -1,249 +0,0 @@
-using ImageManager.Data;
-using ImageManager.Data.Model;
-using ImageManager.Tools;
-using StyletIoC;
-
-namespace ImageManager.ViewModels
-{
-    public class AddImageProgressViewModel : Screen, IInjectionAware
-    {
-        [Inject]
-        public UserSettingData UserSettingData { get; set; }
-        [Inject]
-        public IWindowManager WindowManager { get; set; }
-        [Inject]
-        public IContainer Container { get; set; }
-        [Inject]
-        public ImageContext Context { get; set; }
-
-        public double Progress { get; set; }
-        public string Message { get; set; }
-        public string Title => string.Format("{0}中...({1:F2}%)", _isDoingCleanUp ? "回退" : "处理", Progress);
-        public List<string> Files { get; private set; } = new();
-        public List<Picture> Pictures { get; private set; } = new();
-
-        private bool _isDoingCleanUp;
-        private CancellationTokenSource _cancellationTokenSource = new();
-        private List<string> _dirFiles;
-        private bool _canClose = true;
-        private EventHandler<int> _successEvent;
-
-        public AddImageProgressViewModel(List<string> dirFiles, EventHandler<int> successEvent)
-        {
-            _dirFiles = dirFiles;
-            _successEvent = successEvent;
-        }
-
-        public override Task<bool> CanCloseAsync()
-        {
-            return Task.Run(() =>
-            {
-                if (_canClose == false && _cancellationTokenSource.Token.IsCancellationRequested == false)
-                    CancelTask();
-                return _canClose;
-            });
-        }
-
-        public void CancelTask()
-        {
-            _cancellationTokenSource.Cancel();
-        }
-
-        /// <summary>
-        /// 做取消清理工作
-        /// </summary>
-        private void CleanTemp()
-        {
-            _isDoingCleanUp = true;
-            var preProgress = Progress;
-            foreach (var picture in Pictures)
-            {
-                Message = $"删除文件{picture.Path}";
-                File.Delete(Path.Join(picture.ImageFolderPath, picture.Path));
-                if (picture.ThumbnailPath != null)
-                    File.Delete(Path.Join(picture.ImageFolderPath, picture.ThumbnailPath));
-                Progress -= 1.0 / Pictures.Count * preProgress * 100;
-            }
-        }
-        public async void DoTask()
-        {
-            // 先遍历一遍，把文件都找出来
-            // 然后遍历文件，找出受支持格式的图片
-            _canClose = false;
-            var result = await Task.Run(() =>
-            {
-                Message = "正在准备处理...";
-                // 找出文件
-                foreach (var dirFile in _dirFiles)
-                {
-                    if (_cancellationTokenSource.Token.IsCancellationRequested)
-                        return false;
-                    Walk(dirFile);
-                }
-                Progress = 20;
-
-                // 遍历文件
-                foreach (var file in Files)
-                {
-                    if (_cancellationTokenSource.Token.IsCancellationRequested)
-                        return false;
-                    Message = $"正在处理{file}...";
-                    ProcessFile(file);
-                    Progress += 1.0 / Files.Count * 80;
-                }
-                if (_cancellationTokenSource.Token.IsCancellationRequested)
-                    return false;
-                return true;
-            }, _cancellationTokenSource.Token);
-            // 被取消
-            if (!result)
-            {
-                CleanTemp();
-            }
-            // 准备返回
-            _canClose = true;
-            RequestClose();
-            if (result)
-            {
-                // 准备完成，等待用户选择需要添加的图片
-                var addImageViewModel = new AddImageViewModel(Files, Pictures, _successEvent);
-                Container.BuildUp(addImageViewModel);
-                addImageViewModel.ParametersInjected();
-                WindowManager.ShowWindow(addImageViewModel);
-            }
-        }
-
-        private void Walk(string path)
-        {
-            if (_cancellationTokenSource.Token.IsCancellationRequested)
-                return;
-            // 文件
-            if (File.Exists(path))
-                Files.Add(path);
-            else
-            {
-                Progress = Math.Min(Progress + 0.5, 20);
-                Message = $"正在遍历文件夹{path}...";
-                var directories = Directory.GetDirectories(path);
-                foreach (var directory in directories)
-                {
-                    Walk(directory);
-                }
-                var files = Directory.GetFiles(path);
-                Files.AddRange(files);
-            }
-        }
-
-        private void ProcessFile(string file)
-        {
-            var FileStream = File.OpenRead(file);
-            var reader = new BufferedStream(FileStream, 16 * 1024 * 1024); //16MB
-
-            // 判断是否为可读格式
-            var fif = FreeImageAPI.FreeImage.GetFileTypeFromStream(reader);
-            if (fif == FreeImageAPI.FREE_IMAGE_FORMAT.FIF_UNKNOWN)
-            {
-                fif = FreeImageAPI.FreeImage.GetFIFFromFilename(file);
-                if (fif == FreeImageAPI.FREE_IMAGE_FORMAT.FIF_UNKNOWN)
-                {
-                    return;
-                }
-            }
-            if (!FreeImageAPI.FreeImage.FIFSupportsReading(fif))
-            {
-                return;
-            }
-
-            // 读取图片
-            reader.Seek(0, SeekOrigin.Begin);
-            var fibitmap = FreeImageAPI.FreeImage.LoadFromStream(reader, FreeImageAPI.FREE_IMAGE_LOAD_FLAGS.DEFAULT, ref fif);
-            var width = (int)FreeImageAPI.FreeImage.GetWidth(fibitmap);
-            var height = (int)FreeImageAPI.FreeImage.GetHeight(fibitmap);
-            using var bitmap = FreeImageAPI.FreeImage.GetBitmap(fibitmap);
-            FreeImageAPI.FreeImage.Unload(fibitmap);
-
-            // 相同图片判断
-            reader.Seek(0, SeekOrigin.Begin);
-            var md5 = ImageComparer.GetMD5Hash(reader);
-            var samePictures = new List<Picture>();
-            var samePicture = Context.Pictures.Where(p => p.Hash == md5).SingleOrDefault();
-            if (samePicture != null)
-                samePictures.Add(samePicture);
-            samePictures.AddRange(Pictures.Where(p => p.Hash == md5).ToList());
-
-            // 相似判断
-            var phash = ImageComparer.GetImagePHash(bitmap);
-            var similarPictures = Context.Pictures.Where(p => p.WeakHash == phash).ToList();
-            similarPictures.AddRange(Pictures.Where(p => p.WeakHash == phash).ToList());
-
-            // 保存到临时文件夹
-            string saveFileName;
-            do
-            {
-                saveFileName = $"{md5}{Random.Shared.Next()}";
-            } while (File.Exists(Path.Join(UserSettingData.TempFolderPath, saveFileName + Path.GetExtension(file))));
-            File.Copy(file, Path.Join(UserSettingData.TempFolderPath, saveFileName + Path.GetExtension(file)));
-
-            string? thumbFileName = null;
-            // 生成缩略图
-            // 如果过宽或者格式不支持，生成缩略图
-            if (width > UserSettingData.ThumbnailWidth || !(
-                fif == FreeImageAPI.FREE_IMAGE_FORMAT.FIF_BMP
-                || fif == FreeImageAPI.FREE_IMAGE_FORMAT.FIF_JPEG
-                || fif == FreeImageAPI.FREE_IMAGE_FORMAT.FIF_PNG
-                || fif == FreeImageAPI.FREE_IMAGE_FORMAT.FIF_TIFF
-                || fif == FreeImageAPI.FREE_IMAGE_FORMAT.FIF_GIF
-                || fif == FreeImageAPI.FREE_IMAGE_FORMAT.FIF_ICO
-                || fif == FreeImageAPI.FREE_IMAGE_FORMAT.FIF_TIFF))
-            {
-                thumbFileName = saveFileName + "_s.png";
-                if (width > UserSettingData.ThumbnailWidth)
-                {
-                    int targetWidth = UserSettingData.ThumbnailWidth;
-                    int targetHeight = bitmap.Height * targetWidth / bitmap.Width;
-                    using var thumb = bitmap.GetThumbnailImage(targetWidth, targetHeight, () => false, IntPtr.Zero); //ImageUtility.Resize(bitmap, targetWidth);
-                    thumb.Save(Path.Join(UserSettingData.TempFolderPath, thumbFileName));
-                }
-                else
-                {
-                    bitmap.Save(Path.Join(UserSettingData.TempFolderPath, thumbFileName));
-                }
-            }
-
-            // 判断是否接受
-            var accept = false;
-            if (samePictures.Count != 0)
-                accept = false;
-            else if (similarPictures.Count != 0)
-                accept = similarPictures.All(p => width * height > p.Width * p.Height);
-            else
-                accept = true;
-
-
-            // 生成Picture数据
-            var dirPath = UserSettingData.Default.TempFolderPath;
-            if (!Path.IsPathRooted(dirPath))
-                dirPath = Path.Join(AppDomain.CurrentDomain.BaseDirectory, dirPath);
-            var picture = new Picture(false)
-            {
-                Title = Path.GetFileNameWithoutExtension(file),
-                Path = saveFileName + Path.GetExtension(file),
-                ThumbnailPath = thumbFileName,
-                Width = width,
-                Height = height,
-                Hash = md5,
-                WeakHash = phash,
-                SamePicture = samePictures,
-                SimilarPictures = similarPictures,
-                ImageFolderPath = dirPath,
-                AcceptToAdd = accept,
-            };
-            Pictures.Add(picture);
-        }
-
-        public void ParametersInjected()
-        {
-
-        }
-    }
-}
diff --git a/ImageManager/ViewModels/AddImageProgressViewModelWrap.cs b/ImageManager/ViewModels/AddImageProgressViewModelWrap.cs
new file mode 100644
index 0000000..8dc58e2
--- /dev/null
+++ b/ImageManager/ViewModels/AddImageProgressViewModelWrap.cs
@@ -0,0 +1,160 @@
+using ImageManager.Data;
+using ImageManager.Data.Model;
+using ImageManager.Logging;
+using ImageManager.Tools.Extension;
+using StyletIoC;
+using Logger = ImageManager.Logging.Logger;
+
+namespace ImageManager.ViewModels
+{
+    public class AddImageProgressViewModelWrap : ProgressViewModelWrapBase, IInjectionAware
+    {
+        [Inject]
+        public UserSettingData UserSettingData { get; set; }
+        [Inject]
+        public ImageContext Context { get; set; }
+        [Inject]
+        public IWindowManager WindowManager { get; set; }
+        [Inject]
+        public IContainer Container { get; set; }
+
+        private List<string> _pictureFiles = new();
+        private int _notPictureNum = 0;
+        private int _archiveNum = 0;
+        private List<Picture> _pictures = new();
+        private List<string> _dirFiles;
+        private Logger _logger = LoggerFactory.GetLogger(nameof(AddImageProgressViewModelWrap));
+        private EventHandler<int> _successEvent;
+
+        /// <summary>
+        /// 数据库在第二部分进度条中的权重
+        /// </summary>
+        private readonly double _archiveProgressWeight = 20;
+        /// <summary>
+        /// 用于进度条第二部分计算的总和
+        /// </summary>
+        private double _progressSum => (_pictureFiles.Count - _archiveNum) + _archiveNum * _archiveProgressWeight;
+
+
+        public AddImageProgressViewModelWrap(List<string> dirFiles, EventHandler<int> successEvent)
+        {
+            _dirFiles = dirFiles;
+            _successEvent = successEvent;
+        }
+
+        /// <summary>
+        /// 处理
+        /// </summary>
+        /// <returns>处理成功</returns>
+        protected override bool Process()
+        {
+            // 先遍历一遍，把文件都找出来
+            // 然后遍历文件，找出受支持格式的图片
+
+            Message = "正在准备处理...";
+            // 找出文件
+            foreach (var dirFile in _dirFiles)
+            {
+                if (_cancellationToken.IsCancellationRequested)
+                    return false;
+
+                if (Directory.Exists(dirFile))
+                {
+                    // 如果为文件夹，遍历文件夹
+                    Message = $"正在查找{dirFile}下的文件...";
+                    _pictureFiles.AddRange(Directory.GetFiles(dirFile, "*.*", SearchOption.AllDirectories));
+                }
+                else
+                {
+                    // 如果为文件，直接添加
+                    _pictureFiles.Add(dirFile);
+                    if (dirFile.EndsWith(PictureDataArchive.Extension))
+                        _archiveNum++;
+                }
+                Progress += 1.0 / _dirFiles.Count * 10;
+            }
+            Progress = 10;
+
+            var progressCount = 0.0;
+            var pictureFactory = new PictureFactory(UserSettingData, Context);
+            // 遍历文件
+            foreach (var file in _pictureFiles)
+            {
+                if (_cancellationToken.IsCancellationRequested)
+                    return false;
+                Message = $"正在处理{file}...";
+
+                try
+                {
+                    if (PictureDataArchive.IsPictureDataArchiveFile(file))
+                    {
+                        var pictureDataArchive = new PictureDataArchive(UserSettingData, Context, file)
+                        {
+                            ProgressChanged = (sender, e) =>
+                            {
+                                Message = $"正在导入图片数据库{Path.GetFileName(file)}:" +
+                                $"{e.Message}({e.Progress}%)";
+                                Progress = (e.Progress * (_archiveProgressWeight / _progressSum)
+                                + 100.0 * progressCount / _progressSum) * 0.9 + 0.1;
+                            }
+                        };
+                        pictureDataArchive.Load(_cancellationToken, _pictures.AsReadOnly());
+                        _pictures.AddRange(pictureDataArchive.Pictures);
+                        progressCount += _archiveProgressWeight;
+                    }
+                    else if (PictureFactory.IsPictureFile(file))
+                    {
+                        var picture = pictureFactory.CreateTempPicture(file, _pictures.AsReadOnly(), false);
+                        _pictures.Add(picture);
+                        progressCount += 1;
+                    }
+                    else
+                    {
+                        _notPictureNum++;
+                    }
+                }
+                catch (Exception e)
+                {
+                    DialogViewModel.Show(Container, "导入错误", file + ":" + e.Message, "确定");
+                    _logger.Error(e);
+                }
+                Progress = progressCount / _progressSum * 90 + 10;
+
+            }
+            if (_cancellationToken.IsCancellationRequested)
+                return false;
+            return true;
+        }
+
+        /// <summary>
+        /// 做取消清理工作
+        /// </summary>
+        protected override void Cancel()
+        {
+            var preProgress = Progress;
+            foreach (var picture in _pictures)
+            {
+                Message = $"删除文件{picture.Path}";
+                picture.SafeDeleteFile();
+                Progress -= 1.0 / _pictures.Count * preProgress * 90;
+            }
+        }
+
+        protected override void Done()
+        {
+            // 准备完成，等待用户选择需要添加的图片
+            var samePictureNum = _pictures.Count(p => p.SamePicture?.Any() ?? false);
+            var similarPictureNum = _pictures.Count(p => p.SimilarPictures?.Any() ?? false);
+            var message = $"一共扫描到{_pictures.Count}张图片，其中有{_archiveNum}个图片数据库，" +
+                $"有{samePictureNum}张重复图片，有{similarPictureNum}张相似图片，此外还有{_notPictureNum}个文件不支持。";
+
+            var addImageViewModel = new AddImageViewModel(_pictures, message, _successEvent, Context);
+            Container.BuildUpEx(addImageViewModel);
+
+            Execute.OnUIThread(() =>
+            {
+                WindowManager.ShowWindow(addImageViewModel);
+            });
+        }
+    }
+}
diff --git a/ImageManager/ViewModels/AddImageViewModel.cs b/ImageManager/ViewModels/AddImageViewModel.cs
index 4050f52..5b2dee3 100644
--- a/ImageManager/ViewModels/AddImageViewModel.cs
+++ b/ImageManager/ViewModels/AddImageViewModel.cs
@@ -2,7 +2,6 @@
 using ImageManager.Data;
 using ImageManager.Data.Model;
 using ImageManager.Views;
-using Microsoft.EntityFrameworkCore;
 using StyletIoC;
 
 namespace ImageManager.ViewModels
@@ -11,8 +10,7 @@ public class AddImageViewModel : Screen, IInjectionAware
     {
         [Inject]
         public IContainer Container { get; set; }
-        [Inject]
-        public ImageContext Context { get; set; }
+
         public MainPageViewModel MainPageViewModel { get; set; }
         public List<Picture> Pictures { get; set; }
         public bool WaitingAdding { get; set; }
@@ -20,31 +18,30 @@ public class AddImageViewModel : Screen, IInjectionAware
 
         private bool _canClose = false;
         private bool _isWorking = false;
-        private List<string> _files;
+        private string _message;
         private EventHandler<int> _successEvent;
+        private ImageContext _context;
+
 
-        public AddImageViewModel(List<string> files, List<Picture> pictures, EventHandler<int> successEvent)
+        public AddImageViewModel(List<Picture> pictures, string message, EventHandler<int> successEvent, ImageContext context)
         {
-            _files = files;
             Pictures = pictures;
+            _message = message;
             _successEvent = successEvent;
 
-            MainPageViewModel = new(this)
+            MainPageViewModel = new(this, context)
             {
                 UserSetting = new() { AutoSave = false },
                 OrderBy = UserSettingData.OrderByEnum.AddState,
                 IsGroup = true,
             };
+            _context = context;
         }
 
         public async void ShowMessageSync()
         {
             await Task.Delay(500);
-            var samePictureNum = Pictures.Count(p => p.SamePicture != null);
-            var similarPictureNum = Pictures.Count(p => p.SimilarPictures != null);
-            var message = $"一共扫描到{Pictures.Count}张图片，其中有{samePictureNum}张重复图片，" +
-                $"有{similarPictureNum}张相似图片，此外还有{_files.Count - Pictures.Count}个文件不是图片。";
-            Growl.Success(message, "AddImageViewMessage");
+            Growl.Success(_message, "AddImageViewMessage");
         }
 
         #region 快捷键
@@ -89,11 +86,11 @@ public async Task AcceptAsync()
                             var newThumbnailFile = Path.Combine(p.ImageFolderPath, p.ThumbnailPath);
                             File.Copy(thumbnailFile, newThumbnailFile);
                         }
-                        Context.Add(p);
+                        _context.Add(p);
                         count++;
                     }
                 });
-                Context.SaveChanges();
+                _context.SaveChanges();
                 return count;
             });
             dialog.Close();
@@ -124,9 +121,7 @@ public override Task<bool> CanCloseAsync()
 
         public void ParametersInjected()
         {
-            Context.Database.Migrate();
             Container.BuildUp(MainPageViewModel);
-            // 得手动调用
             MainPageViewModel.ParametersInjected();
         }
     }
diff --git a/ImageManager/ViewModels/DialogViewModel.cs b/ImageManager/ViewModels/DialogViewModel.cs
index 013b31a..01502f3 100644
--- a/ImageManager/ViewModels/DialogViewModel.cs
+++ b/ImageManager/ViewModels/DialogViewModel.cs
@@ -1,4 +1,6 @@
-using System.Windows.Input;
+using ImageManager.Tools.Extension;
+using StyletIoC;
+using System.Windows.Input;
 
 namespace ImageManager.ViewModels
 {
@@ -6,9 +8,8 @@ public class DialogViewModel : Screen
     {
         public string Title { get; set; } = "Title";
         public string Message { get; set; } = "Message";
-        public string ConfirmText { get; set; } = "确  定";
-        public string CancelText { get; set; } = "取  消";
-        public bool ShowCancel { get; set; }
+        public string ConfirmText { get; set; } = "Confirm";
+        public string CancelText { get; set; } = string.Empty;
         public string ConfirmButtonStyle { get; set; } = "ButtonPrimary";
         public string CancelButtonStyle { get; set; } = "ButtonDefault";
         public void WindowKeyDown(object sender, KeyEventArgs e)
@@ -23,5 +24,24 @@ public void OK(string okString)
             var ok = bool.Parse(okString);
             RequestClose(ok);
         }
+        public static bool? Show(IContainer container, string title, string message, string confirmText,
+            string cancelText = "", string confirmButtonStyle = "ButtonPrimary",
+            string cancelButtonStyle = "ButtonDefault")
+        {
+            var vm = new DialogViewModel
+            {
+                Title = title,
+                Message = message,
+                ConfirmText = confirmText,
+                CancelText = cancelText,
+                ConfirmButtonStyle = confirmButtonStyle,
+                CancelButtonStyle = cancelButtonStyle
+            };
+            container.BuildUpEx(vm);
+            var windowManager = container.Get<IWindowManager>();
+            bool? res = null;
+            Execute.OnUIThreadSync(() => res = windowManager.ShowDialog(vm));
+            return res;
+        }
     }
 }
\ No newline at end of file
diff --git a/ImageManager/ViewModels/ExportImageProgressViewModelWrap.cs b/ImageManager/ViewModels/ExportImageProgressViewModelWrap.cs
new file mode 100644
index 0000000..094b0cc
--- /dev/null
+++ b/ImageManager/ViewModels/ExportImageProgressViewModelWrap.cs
@@ -0,0 +1,99 @@
+using HandyControl.Controls;
+using HandyControl.Data;
+using ImageManager.Data;
+using ImageManager.Data.Model;
+using ImageManager.Logging;
+using StyletIoC;
+
+namespace ImageManager.ViewModels
+{
+    public class ExportImageProgressViewModelWrap : ProgressViewModelWrapBase
+    {
+        [Inject]
+        public ImageContext Context { get; set; }
+        [Inject]
+        public IContainer Container { get; set; }
+        [Inject]
+        public UserSettingData UserSettingData { get; set; }
+
+        public List<Picture> Pictures { get; private set; }
+        private string _dataFilePath;
+        private Logger _logger = LoggerFactory.GetLogger(nameof(ExportImageProgressViewModelWrap));
+
+
+        public ExportImageProgressViewModelWrap(List<Picture> pictures, string exportFilePath)
+        {
+            Pictures = pictures;
+            _dataFilePath = exportFilePath;
+        }
+
+        protected override bool Process()
+        {
+            try
+            {
+                var pictureDataArchive = new PictureDataArchive(UserSettingData, Context, _dataFilePath)
+                {
+                    Pictures = Pictures,
+                    ProgressChanged = (sender, e) =>
+                    {
+                        Progress = e.Progress;
+                        Message = e.Message;
+                    }
+                };
+                pictureDataArchive.Save(_cancellationToken);
+                return true;
+            }
+            catch (Exception e)
+            {
+                DialogViewModel.Show(Container, "导出错误", e.Message, "确定");
+                _logger.Error(e);
+            }
+            return false;
+        }
+
+        protected override void Cancel()
+        {
+            try
+            {
+                if (File.Exists(_dataFilePath))
+                {
+                    File.Delete(_dataFilePath);
+                }
+            }
+            catch (Exception e)
+            {
+                _logger.Error(e);
+            }
+
+        }
+
+        protected override void Done()
+        {
+            var growlInfo = new GrowlInfo()
+            {
+                ConfirmStr = "打开输出目录",
+                CancelStr = "取消",
+                Message = $"导出成功，是否立刻打开输出目录？",
+                ActionBeforeClose = isConfirmed =>
+                {
+                    if (isConfirmed)
+                    {
+                        // 打开输出目录
+                        System.Diagnostics.Process.Start("explorer.exe", "/select," + _dataFilePath);
+                    }
+                    return true;
+
+                },
+                Token = "RootViewMessage"
+            };
+            Growl.Ask(growlInfo);
+
+        }
+
+        public enum ModeEnum
+        {
+            Export,
+            Import
+        }
+    }
+}
diff --git a/ImageManager/ViewModels/MainPageViewModel.cs b/ImageManager/ViewModels/MainPageViewModel.cs
index a40b0af..6414bc0 100644
--- a/ImageManager/ViewModels/MainPageViewModel.cs
+++ b/ImageManager/ViewModels/MainPageViewModel.cs
@@ -2,7 +2,7 @@
 using HandyControl.Tools.Extension;
 using ImageManager.Data;
 using ImageManager.Data.Model;
-using ImageManager.Tools;
+using ImageManager.Tools.Helper;
 using ImageManager.Windows;
 using Microsoft.EntityFrameworkCore;
 using StyletIoC;
@@ -22,6 +22,7 @@ namespace ImageManager.ViewModels
     public class MainPageViewModel : PropertyChangedBase, IInjectionAware
     {
         private readonly object _fatherViewModel;
+        private ImageContext _context;
 
         [Inject]
         public IWindowManager WindowManager;
@@ -29,8 +30,6 @@ public class MainPageViewModel : PropertyChangedBase, IInjectionAware
         public IContainer Container;
         [Inject]
         public UserSettingData UserSetting { get; set; }
-        [Inject]
-        public ImageContext Context { get; set; }
 
 
         public bool IsAddPictureMode => _fatherViewModel is AddImageViewModel;
@@ -84,7 +83,7 @@ public double CardWidth
         // 右键菜单栏
         public List<MenuItemViewModel> ContextMenuItems { get; set; }
 
-        public MainPageViewModel(object fatherViewModel)
+        public MainPageViewModel(object fatherViewModel, ImageContext context)
         {
             _fatherViewModel = fatherViewModel;
 
@@ -189,6 +188,7 @@ public MainPageViewModel(object fatherViewModel)
                     },
                 };
             }
+            _context = context;
         }
 
         public void UpdatePicture()
@@ -197,7 +197,7 @@ public void UpdatePicture()
             if (_fatherViewModel is AddImageViewModel addImageViewModel)
                 query = addImageViewModel.Pictures.AsQueryable();
             else
-                query = Context.Pictures.AsQueryable();
+                query = _context.Pictures.AsQueryable();
 
             if (_fatherViewModel is RootViewModel rootViewModel && rootViewModel.SearchText != null)
                 query = query.Where(p => EF.Functions.Like(p.Title, "%" + rootViewModel.SearchText + "%"));
@@ -225,7 +225,7 @@ public void DeletePictureLabel(object sender, RoutedEventArgs e)
 
             picture.Item.Labels.Remove(label);
             if (!IsAddPictureMode)
-                Context.SaveChanges();
+                _context.SaveChanges();
         }
 
         public void PictureSelectionChange()
@@ -309,38 +309,29 @@ public void AddPictureLabel()
             bool? res = WindowManager.ShowDialog(pictureAddLabelViewModel);
             if (res ?? false)
             {
-                var label = Context.Labels.SingleOrDefault(l => l.Name == pictureAddLabelViewModel.SearchText)
+                var label = _context.Labels.SingleOrDefault(l => l.Name == pictureAddLabelViewModel.SearchText)
                     ?? new Label { Name = pictureAddLabelViewModel.SearchText };
 
                 SelectedPictures.ForEach(p =>
                 {
-                    p.Labels ??= new List<Label>();
                     if (!p.Labels.Contains(label))
                         p.Labels.Add(label);
                 });
                 Pictures.Refresh();
                 NotifyOfPropertyChange(nameof(PictureGroups));
                 if (!IsAddPictureMode)
-                    Context.SaveChanges();
+                    _context.SaveChanges();
             }
         }
         public void DeletePicture()
         {
-            var dialogViewModel = new DialogViewModel
-            {
-                Title = "删除图片",
-                Message = "确定删除选中的图片吗？",
-                ConfirmText = "删  除",
-                CancelText = "取  消",
-                ShowCancel = true,
-                ConfirmButtonStyle = "ButtonDanger"
-            };
-            var res = WindowManager.ShowDialog(dialogViewModel);
+            var res = DialogViewModel.Show(Container, "删除图片",
+                "确定删除选中的图片吗？", "删  除", "取  消", confirmButtonStyle: "ButtonDanger");
             if (res ?? false)
             {
                 var deletePictures = Pictures.Where(p => p.IsSelected).ToList();
-                Context.Pictures.RemoveRange(deletePictures.Select(p => p.Item));
-                Context.SaveChanges();
+                _context.Pictures.RemoveRange(deletePictures.Select(p => p.Item));
+                _context.SaveChanges();
                 Pictures.RemoveRange(deletePictures);
                 var deleteFiles = new List<string>();
                 deletePictures.ForEach(p =>
diff --git a/ImageManager/ViewModels/PictureAddLabelViewModel.cs b/ImageManager/ViewModels/PictureAddLabelViewModel.cs
index c92c2c9..e3ad2fc 100644
--- a/ImageManager/ViewModels/PictureAddLabelViewModel.cs
+++ b/ImageManager/ViewModels/PictureAddLabelViewModel.cs
@@ -10,7 +10,7 @@ public class PictureAddLabelViewModel : Screen
     {
         [Inject]
         public ImageContext Context { get; set; }
-        public string SearchText { get; set; }
+        public string SearchText { get; set; } = string.Empty;
         public bool ShowLabelPopup { get; set; }
         public List<Label> SearchedLabels { get; set; }
         public PictureAddLabelViewModel()
@@ -18,8 +18,8 @@ public PictureAddLabelViewModel()
         }
         public void UpdateSearchedLabels()
         {
-            SearchText = SearchText?.Trim();
-            if (SearchText == null || SearchText == "")
+            SearchText = SearchText.Trim();
+            if (SearchText == string.Empty)
                 SearchedLabels = Context.Labels.OrderByDescending(l => l.Num).ToList();
             else
                 SearchedLabels = Context.Labels.Where(l => l.Name.Contains(SearchText)).OrderByDescending(l => l.Num).ToList();
@@ -67,8 +67,11 @@ public void WindowKeyDown(object sender, System.Windows.Input.KeyEventArgs e)
         public void OK(string okString)
         {
             var ok = bool.Parse(okString);
-
-            RequestClose(ok);
+            SearchText = SearchText.Trim();
+            if (ok && SearchText != string.Empty)
+                RequestClose(ok);
+            else
+                RequestClose(false);
         }
     }
 }
\ No newline at end of file
diff --git a/ImageManager/ViewModels/PictureSelectableItemWrapper.cs b/ImageManager/ViewModels/PictureSelectableItemWrapper.cs
index 5025d3f..9ef7d7b 100644
--- a/ImageManager/ViewModels/PictureSelectableItemWrapper.cs
+++ b/ImageManager/ViewModels/PictureSelectableItemWrapper.cs
@@ -9,9 +9,8 @@ public class PictureSelectableItemWrapper : PropertyChangedBase
         public Picture Item { get; set; }
         public bool IsSelected { get; set; }
         public bool AcceptToAdd { get => Item.AcceptToAdd; set => Item.AcceptToAdd = value; }
-        public bool IsEnabled => !(Item.SamePicture != null && Item.SamePicture.Count > 0);
-        public bool IsConflict => (Item.SamePicture != null && Item.SamePicture.Count > 0)
-            || (Item.SimilarPictures != null && Item.SimilarPictures.Count > 0);
+        public bool IsEnabled => Item.AddState != PictureAddStateEnum.SameConflict;
+        public bool IsConflict => Item.AddState != PictureAddStateEnum.WaitToAdd;
         public PictureSelectableItemWrapper(Picture item)
         {
             Item = item;
diff --git a/ImageManager/ViewModels/ProgressViewModel.cs b/ImageManager/ViewModels/ProgressViewModel.cs
new file mode 100644
index 0000000..4568fd6
--- /dev/null
+++ b/ImageManager/ViewModels/ProgressViewModel.cs
@@ -0,0 +1,71 @@
+namespace ImageManager.ViewModels
+{
+    public class ProgressViewModel : Screen
+    {
+        private bool _isDoingCleanUp;
+        private CancellationTokenSource _cancellationTokenSource = new();
+        private bool _canClose = true;
+        private Func<bool> _processFunc;
+        private Action _donection;
+        private Action? _cancelAction;
+
+        /// <summary>
+        /// 进度条，0-100
+        /// </summary>
+        public double Progress { get; set; }
+
+        /// <summary>
+        /// 消息
+        /// </summary>
+        public string Message { get; set; }
+
+        public string Title =>
+            string.Format("{0}中...({1:F2}%)", _isDoingCleanUp ? "取消" : "处理", Progress);
+
+        public CancellationToken CancellationToken => _cancellationTokenSource.Token;
+
+        /// <summary>
+        /// 进度条组件
+        /// </summary>
+        /// <remarks>如果处理失败或者用户取消，则运行取消函数，否则运行成功处理函数。</remarks>
+        /// <param name="processFunc">处理</param>
+        /// <param name="doneAction">成功处理</param>
+        /// <param name="cancelFunc">取消</param>
+        public ProgressViewModel(Func<bool> processFunc,
+            Action doneAction, Action? cancelFunc)
+        {
+            _processFunc = processFunc;
+            _donection = doneAction;
+            _cancelAction = cancelFunc;
+        }
+
+        public async void Process()
+        {
+            _canClose = false;
+            var result = await Task.Run(() => _processFunc());
+            if (!result || _cancellationTokenSource.Token.IsCancellationRequested)
+                await Task.Run(() => _cancelAction?.Invoke());
+            else
+                await Task.Run(() => _donection());
+            _canClose = true;
+            RequestClose();
+        }
+
+        public void CancelTask()
+        {
+            _cancellationTokenSource.Cancel();
+        }
+
+        public Task<bool> CanCloseAsync()
+        {
+            return Task.Run(() =>
+            {
+                if (_canClose == false && _cancellationTokenSource.Token.IsCancellationRequested == false)
+                    CancelTask();
+                return _canClose;
+            });
+        }
+
+
+    }
+}
\ No newline at end of file
diff --git a/ImageManager/ViewModels/ProgressViewModelWrapBase.cs b/ImageManager/ViewModels/ProgressViewModelWrapBase.cs
new file mode 100644
index 0000000..acff243
--- /dev/null
+++ b/ImageManager/ViewModels/ProgressViewModelWrapBase.cs
@@ -0,0 +1,49 @@
+using StyletIoC;
+
+namespace ImageManager.ViewModels
+{
+    public abstract class ProgressViewModelWrapBase : Screen, IInjectionAware
+    {
+        public ProgressViewModel ProgressViewModel { get; set; }
+
+        protected CancellationToken _cancellationToken;
+
+        public ProgressViewModelWrapBase()
+        {
+            ProgressViewModel = new(Process, Done, Cancel);
+            _cancellationToken = ProgressViewModel.CancellationToken;
+        }
+        /// <summary>
+        /// 设置消息
+        /// </summary>
+        public string Message
+        {
+            get => ProgressViewModel.Message;
+            set => ProgressViewModel.Message = value;
+        }
+
+        /// <summary>
+        /// 进度条，0-100
+        /// </summary>
+        public double Progress
+        {
+            get => ProgressViewModel.Progress;
+            set => ProgressViewModel.Progress = value;
+        }
+        /// <summary>
+        /// 处理
+        /// </summary>
+        /// <returns>true为成功，false为失败</returns>
+        protected abstract bool Process();
+        /// <summary>
+        /// 处理结束后操作
+        /// </summary>
+        protected abstract void Done();
+        /// <summary>
+        /// 取消操作
+        /// </summary>
+        protected abstract void Cancel();
+
+        public void ParametersInjected() { }
+    }
+}
diff --git a/ImageManager/ViewModels/RootViewModel.cs b/ImageManager/ViewModels/RootViewModel.cs
index 8cf4814..7f546b8 100644
--- a/ImageManager/ViewModels/RootViewModel.cs
+++ b/ImageManager/ViewModels/RootViewModel.cs
@@ -3,21 +3,22 @@
 using HandyControl.Themes;
 using ImageManager.Data;
 using ImageManager.Tools;
+using ImageManager.Tools.Extension;
 using ImageManager.Windows;
 using StyletIoC;
 using System.Windows;
 using System.Windows.Input;
-using System.Windows.Threading;
+using IContainer = StyletIoC.IContainer;
 using Label = ImageManager.Data.Model.Label;
 
 namespace ImageManager.ViewModels
 {
     public class RootViewModel : Screen, IInjectionAware
     {
+        private ImageContext _context;
+
         [Inject]
         public UserSettingData UserSettingData { get; set; }
-        [Inject]
-        public ImageContext Context { get; set; }
         public bool ThemeConfigShow { get; set; } = false;
         public string SearchText { get; set; }
         public List<Label> SearchedLabels { get; set; }
@@ -32,12 +33,12 @@ public bool IsHideWhenScreenShoot
 
         private IWindowManager _windowManager;
         private IContainer _container;
-        public RootViewModel(IWindowManager windowManager, IContainer container)
+        public RootViewModel(IWindowManager windowManager, IContainer container, ImageContext context)
         {
             _windowManager = windowManager;
             _container = container;
-            MainPageViewModel = new(this);
-            container.BuildUp(MainPageViewModel);
+            MainPageViewModel = new(this, context);
+            _context = context;
         }
 
         public void Loaded()
@@ -59,9 +60,9 @@ public void Loaded()
         public void UpdateSearchedLabels()
         {
             if (SearchText == null || SearchText == "")
-                SearchedLabels = Context.Labels.OrderByDescending(l => l.Num).ToList();
+                SearchedLabels = _context.Labels.OrderByDescending(l => l.Num).ToList();
             else
-                SearchedLabels = Context.Labels.Where(l => l.Name.Contains(SearchText)).OrderByDescending(l => l.Num).ToList();
+                SearchedLabels = _context.Labels.Where(l => l.Name.Contains(SearchText)).OrderByDescending(l => l.Num).ToList();
         }
         public void LabelClick(Label label)
         {
@@ -113,26 +114,65 @@ public void WindowMouseDown(object sender, System.Windows.Input.MouseButtonEvent
         }
 
         #region 菜单栏
-        private Dispatcher _dispatcher;
+        /// <summary>
+        /// 添加图片
+        /// </summary>
         public void AddPictures()
         {
-            _dispatcher = Application.Current.Dispatcher;
-            var dialog = new Microsoft.Win32.OpenFileDialog
+            var dialog = new System.Windows.Forms.OpenFileDialog
             {
-                //dialog.Filter = "图片文件|*.BMP;*ICO;*.JPG;*.JIF;*.JPEG;*.JPE;*.JNG;*.KOA;*.IFF;*.LBM;*.IFF;*.LBM;*.MNG;*.PBM;*.PCD;*PCX;*.PGM;*.PNG;*.PPM;*.PPM;*.RAS;*.TGA;*.TARGA;*.TIF;*.TIFF;*.WBMP;*.PSD;*.CUT;*.XBM;*.XPM;*.DDS;*.GIF;*.HDR;*.G3;*.SGI;*.EXR;*.J2K;*.J2C;*.JP2;*.PFM;*.PICT;*.RAW;*.webp;*.jxr";
                 Multiselect = true
             };
-            bool? fileDialogResult = dialog.ShowDialog();
-            if (fileDialogResult ?? false)
+            var res = dialog.ShowDialog();
+            if (res == System.Windows.Forms.DialogResult.OK)
             {
                 // 扫描和准备文件
-                var progressViewModel = new AddImageProgressViewModel(new List<string>(dialog.FileNames), AddPictureSuccessEvent);
-                _container.BuildUp(progressViewModel);
-                progressViewModel.ParametersInjected();
-                _windowManager.ShowWindow(progressViewModel);
+                var addImageProgressViewModelWrap = new AddImageProgressViewModelWrap(
+                    new List<string>(dialog.FileNames), AddPictureSuccess);
+                _container.BuildUpEx(addImageProgressViewModelWrap);
+                _windowManager.ShowWindow(addImageProgressViewModelWrap.ProgressViewModel);
             }
         }
-        public void AddPictureSuccessEvent(object? sender, int pictureNum)
+
+        /// <summary>
+        /// 添加文件夹
+        /// </summary>
+        public void AddFolders()
+        {
+            var dialog = new System.Windows.Forms.FolderBrowserDialog();
+            var result = dialog.ShowDialog();
+            if (result == System.Windows.Forms.DialogResult.OK)
+            {
+                // 扫描和准备文件
+                var addImageProgressViewModelWrap = new AddImageProgressViewModelWrap(
+                                       new List<string>() { dialog.SelectedPath }, AddPictureSuccess);
+                _container.BuildUpEx(addImageProgressViewModelWrap);
+                _windowManager.ShowWindow(addImageProgressViewModelWrap.ProgressViewModel);
+            }
+        }
+
+        /// <summary>
+        /// 导入数据库
+        /// </summary>
+        public void ImportData()
+        {
+            // 选择要导入的文件
+            var dialog = new System.Windows.Forms.OpenFileDialog
+            {
+                Filter = "数据库文件|*" + PictureDataArchive.Extension,
+                Multiselect = true,
+            };
+            var result = dialog.ShowDialog();
+            if (result == System.Windows.Forms.DialogResult.OK)
+            {
+                var addImageProgressViewModel = new AddImageProgressViewModelWrap(
+                                       new List<string>(dialog.FileNames), AddPictureSuccess);
+                _container.BuildUpEx(addImageProgressViewModel);
+                _windowManager.ShowWindow(addImageProgressViewModel.ProgressViewModel);
+            }
+        }
+
+        private void AddPictureSuccess(object? sender, int pictureNum)
         {
             var growlInfo = new GrowlInfo()
             {
@@ -153,6 +193,30 @@ public void AddPictureSuccessEvent(object? sender, int pictureNum)
             };
             Growl.Ask(growlInfo);
         }
+
+        /// <summary>
+        /// 导出数据库
+        /// </summary>
+        public void ExportData()
+        {
+            // 选择要导出到的文件夹和文件名
+            var dialog = new System.Windows.Forms.SaveFileDialog
+            {
+                Filter = "数据库文件|*" + PictureDataArchive.Extension,
+            };
+            var result = dialog.ShowDialog();
+            if (result == System.Windows.Forms.DialogResult.OK)
+            {
+                var exportImageProgressViewModelWrap = new ExportImageProgressViewModelWrap(
+                    _context.Pictures.ToList(), dialog.FileName);
+                _container.BuildUpEx(exportImageProgressViewModelWrap);
+                _windowManager.ShowWindow(exportImageProgressViewModelWrap.ProgressViewModel);
+            }
+        }
+
+        /// <summary>
+        /// 截图
+        /// </summary>
         public void ScreenShot()
         {
             if (IsHideWhenScreenShoot)
@@ -189,7 +253,6 @@ public void About()
 
         private async void CheckUpdateAsync()
         {
-            //await Task.Delay(1000);
             var updateViewModel = new UpdateViewModel();
             if (await updateViewModel.NeedUpdateAsync())
             {
@@ -214,12 +277,14 @@ private async void CheckUpdateAsync()
         public void ParametersInjected()
         {
             // 得手动调用
+            _container.BuildUp(MainPageViewModel);
             MainPageViewModel.ParametersInjected();
             ThemeManager.Current.ApplicationTheme = UserSettingData.Theme;
         }
+
         public void Closed()
         {
-            App.Current.Shutdown();
+            Application.Current.Shutdown();
         }
     }
 }
diff --git a/ImageManager/Views/DialogView.xaml b/ImageManager/Views/DialogView.xaml
index b56e135..02d6167 100644
--- a/ImageManager/Views/DialogView.xaml
+++ b/ImageManager/Views/DialogView.xaml
@@ -4,13 +4,12 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:hc="https://handyorg.github.io/handycontrol"
-    xmlns:local="clr-namespace:ImageManager.Views"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:s="https://github.com/canton7/Stylet"
     xmlns:viewmodels="clr-namespace:ImageManager.ViewModels"
     Title="{Binding Title}"
-    Width="200"
-    Height="90"
+    Width="320"
+    Height="150"
     d:DataContext="{d:DesignInstance Type=viewmodels:DialogViewModel}"
     KeyDown="{s:Action WindowKeyDown}"
     ResizeMode="NoResize"
@@ -28,33 +27,33 @@
             HorizontalAlignment="Stretch"
             Background="{StaticResource DefaultBrush}">
             <TextBlock
-                Margin="0,14"
+                Margin="8,25"
                 HorizontalAlignment="Center"
-                Text="{Binding Message}" />
+                Text="{Binding Message}"
+                TextWrapping="WrapWithOverflow" />
         </Border>
 
         <StackPanel
             Grid.Row="1"
-            Margin="0,6"
+            Margin="0,8"
             HorizontalAlignment="Center"
             VerticalAlignment="Bottom"
             Orientation="Horizontal">
             <Button
-                Width="60"
-                Margin="0"
+                Width="80"
+                Margin="20,0"
                 Command="{s:Action OK}"
                 CommandParameter="True"
                 Content="{Binding ConfirmText}"
                 Style="{Binding ConfirmButtonStyle, Converter={StaticResource StyleConverter}}" />
-            <Border Width="30" Visibility="{Binding ShowCancel, Converter={x:Static s:BoolToVisibilityConverter.Instance}}" />
             <Button
-                Width="60"
-                Margin="0"
+                Width="80"
+                Margin="20,0"
                 Command="{s:Action OK}"
                 CommandParameter="False"
                 Content="{Binding CancelText}"
                 Style="{Binding CancelButtonStyle, Converter={StaticResource StyleConverter}}"
-                Visibility="{Binding ShowCancel, Converter={x:Static s:BoolToVisibilityConverter.Instance}}" />
+                Visibility="{Binding CancelText, Converter={StaticResource IsNullOrEmptyToVisibilityConverter}}" />
         </StackPanel>
 
     </Grid>
diff --git a/ImageManager/Views/MainPageView.xaml b/ImageManager/Views/MainPageView.xaml
index 4e2a537..ab3df4e 100644
--- a/ImageManager/Views/MainPageView.xaml
+++ b/ImageManager/Views/MainPageView.xaml
@@ -2,7 +2,6 @@
     x:Class="ImageManager.Views.MainPageView"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:Tools="clr-namespace:ImageManager.Tools"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:dataModels="clr-namespace:ImageManager.Data.Model"
     xmlns:hc="https://handyorg.github.io/handycontrol"
@@ -19,7 +18,7 @@
                 <hc:ThemeResources />
                 <hc:Theme />
                 <ResourceDictionary>
-                    <Tools:BindingProxy x:Key="Proxy" Data="{Binding}" />
+                    <hc:BindingProxy x:Key="Proxy" Value="{Binding}" />
                     <Style
                         x:Key="PictureCard"
                         BasedOn="{StaticResource CardBaseStyle}"
@@ -41,7 +40,7 @@
                                             <Border CornerRadius="4,4,0,0">
                                                 <Image MouseLeftButtonDown="{s:Action OpenPicture}" Stretch="UniformToFill">
                                                     <Image.Source>
-                                                        <BitmapImage DecodePixelWidth="{Binding Data.CardWidth, Source={StaticResource Proxy}}" UriSource="{Binding Item.ImageUri}" />
+                                                        <BitmapImage DecodePixelWidth="{Binding Value.CardWidth, Source={StaticResource Proxy}}" UriSource="{Binding Item.ImageUri}" />
                                                     </Image.Source>
                                                 </Image>
                                             </Border>
@@ -65,7 +64,8 @@
                                             HorizontalAlignment="Center"
                                             Style="{StaticResource TextBlockTitleBold}"
                                             Text="{Binding Item.Title}"
-                                            TextTrimming="CharacterEllipsis" />
+                                            TextAlignment="Center"
+                                            TextWrapping="Wrap" />
                                         <hc:TagContainer
                                             Margin="5,5,5,0"
                                             BorderThickness="0"
@@ -131,7 +131,7 @@
                                         Footer="{Binding}"
                                         Style="{StaticResource PictureCard}">
                                         <hc:Card.ContextMenu>
-                                            <ContextMenu ItemsSource="{Binding Source={StaticResource Proxy}, Path=Data.ContextMenuItems, Mode=OneTime}">
+                                            <ContextMenu ItemsSource="{Binding Source={StaticResource Proxy}, Path=Value.ContextMenuItems, Mode=OneTime}">
                                                 <ContextMenu.ItemContainerStyle>
                                                     <Style TargetType="MenuItem">
                                                         <Setter Property="Template">
diff --git a/ImageManager/Views/MainPageView.xaml.cs b/ImageManager/Views/MainPageView.xaml.cs
index 86a28a7..570ae94 100644
--- a/ImageManager/Views/MainPageView.xaml.cs
+++ b/ImageManager/Views/MainPageView.xaml.cs
@@ -1,6 +1,6 @@
 using HandyControl.Controls;
 using HandyControl.Tools;
-using ImageManager.Tools;
+using ImageManager.Tools.Helper;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
diff --git a/ImageManager/Views/AddImageProgressView.xaml b/ImageManager/Views/ProgressView.xaml
similarity index 86%
rename from ImageManager/Views/AddImageProgressView.xaml
rename to ImageManager/Views/ProgressView.xaml
index 637890e..2dcf09e 100644
--- a/ImageManager/Views/AddImageProgressView.xaml
+++ b/ImageManager/Views/ProgressView.xaml
@@ -1,5 +1,5 @@
 <hc:Window
-    x:Class="ImageManager.Views.AddImageProgressView"
+    x:Class="ImageManager.Views.ProgressView"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
@@ -11,8 +11,8 @@
     Title="{Binding Title}"
     Width="600"
     Height="90"
-    d:DataContext="{d:DesignInstance Type=viewModels:AddImageProgressViewModel}"
-    Loaded="{s:Action DoTask}"
+    d:DataContext="{d:DesignInstance Type=viewModels:ProgressViewModel}"
+    Loaded="{s:Action Process}"
     ResizeMode="NoResize"
     ShowNonClientArea="False"
     WindowStyle="None"
@@ -22,7 +22,7 @@
             Height="30"
             Margin="1"
             HorizontalAlignment="Stretch"
-            Value="{Binding Progress}" />
+            Value="{Binding Progress, Mode=OneWay}" />
         <TextBlock
             Margin="4,8,4,2"
             HorizontalAlignment="Left"
diff --git a/ImageManager/Views/AddImageProgressView.xaml.cs b/ImageManager/Views/ProgressView.xaml.cs
similarity index 94%
rename from ImageManager/Views/AddImageProgressView.xaml.cs
rename to ImageManager/Views/ProgressView.xaml.cs
index 67c3b3f..9897fac 100644
--- a/ImageManager/Views/AddImageProgressView.xaml.cs
+++ b/ImageManager/Views/ProgressView.xaml.cs
@@ -6,14 +6,15 @@
 namespace ImageManager.Views
 {
     /// <summary>
-    /// AddImageProgressView.xaml 的交互逻辑
+    /// ProgressView.xaml 的交互逻辑
     /// </summary>
-    public partial class AddImageProgressView : HandyControl.Controls.Window
+    public partial class ProgressView
     {
-        public AddImageProgressView()
+        public ProgressView()
         {
             InitializeComponent();
         }
+
         private void TextBlock_SizeChanged(object sender, SizeChangedEventArgs e)
         {
             TextBlock textBlock = sender as TextBlock;
diff --git a/ImageManager/Views/RootView.xaml b/ImageManager/Views/RootView.xaml
index f34fe26..0f35869 100644
--- a/ImageManager/Views/RootView.xaml
+++ b/ImageManager/Views/RootView.xaml
@@ -25,6 +25,10 @@
             Key="O"
             Command="{s:Action AddPictures}"
             Modifiers="Ctrl" />
+        <KeyBinding
+            Key="O"
+            Command="{s:Action AddFolders}"
+            Modifiers="Ctrl+Shift" />
         <KeyBinding
             Key="A"
             s:View.ActionTarget="{Binding MainPageViewModel}"
@@ -63,11 +67,19 @@
                         Command="{s:Action AddPictures}"
                         Header="添加图片"
                         InputGestureText="Ctrl+O" />
+                    <MenuItem
+                        Command="{s:Action AddFolders}"
+                        Header="添加文件夹"
+                        InputGestureText="Ctrl+Shift+O" />
+                    <Separator />
+                    <MenuItem Command="{s:Action ImportData}" Header="导入数据库" />
+                    <MenuItem Command="{s:Action ExportData}" Header="导出数据库" />
+                    <Separator />
                     <MenuItem
                         Command="{s:Action ScreenShot}"
                         Header="截图"
                         InputGestureText="Ctrl+Alt+Shift+X" />
-                    <CheckBox IsChecked="{Binding IsHideWhenScreenShoot}" Content="截图时隐藏" />
+                    <CheckBox Content="截图时隐藏" IsChecked="{Binding IsHideWhenScreenShoot}" />
                 </MenuItem>
                 <MenuItem Header="选择">
                     <MenuItem
diff --git a/readme.md b/readme.md
index 5ee5623..41227a2 100644
--- a/readme.md
+++ b/readme.md
@@ -27,8 +27,6 @@
 
 ![添加图片](添加图片.jpg)
 
-
-
 ##  更新日志
 
 ### 3.1.5 
@@ -37,8 +35,10 @@
 
 - [ ] 优化性能和减少内存占用（完成50%）
 - [x] 修正添加图片取消后出现崩溃的错误。
-- [ ] 图片数据库导出和导入（完成50%）[#1](/../../issues/1)
-- [ ] 文件夹导入
+- [x] 图片数据库导出和导入（完成50%）[#1](/../../issues/1)
+- [x] 文件夹导入
+- [x] 修正了添加图片时，添加已有标签后出错的bug
+- [ ] 更新以后首次启动显示更新日志
 - [ ] 支持拖拽导入
 - [ ] 快速输入多个标签 [#1](/../../issues/1)
 - [ ] 标签折叠 [#1](/../../issues/1)