From 2eaa9b8dd56d88fc4cdd192655e6a58d24c1b9d8 Mon Sep 17 00:00:00 2001
From: xaoyaoo <xaoyaoo@qq.com>
Date: Sat, 9 Dec 2023 22:41:53 +0800
Subject: [PATCH] =?UTF-8?q?merge=E5=91=BD=E4=BB=A4=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 doc/CHANGELOG.md | 7 +++++++
 pywxdump/cli.py  | 2 +-
 setup.py         | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/doc/CHANGELOG.md b/doc/CHANGELOG.md
index 372a8e26..082793c3 100644
--- a/doc/CHANGELOG.md
+++ b/doc/CHANGELOG.md
@@ -1,5 +1,12 @@
 # 更新日志
 
+## v2.3.4 (2023-12-09)
+
+### 优化
+
+- 修复部分bug
+- merge命令错误修复
+
 ## v2.3.3 (2023-12-08)
 
 ### 新功能
diff --git a/pywxdump/cli.py b/pywxdump/cli.py
index 182bfb98..ef645973 100644
--- a/pywxdump/cli.py
+++ b/pywxdump/cli.py
@@ -134,7 +134,7 @@ def init_parses(self, parser):
         sb_merge.add_argument("-t", "--dbtype", type=str, help="数据库类型(可选值)：[msg,media]", required=True, metavar="")
         sb_merge.add_argument("-i", "--db_path", type=str, help="数据库路径(文件路径，使用英文[,]分割)", required=True, metavar="")
         sb_merge.add_argument("-o", "--out_path", type=str, default=os.path.join(os.getcwd(), "decrypted"),
-                              help="输出路径(必须是目录)[默认为当前路径下decrypted文件夹]", required=False,
+                              help="输出路径(目录或文件名)[默认为当前路径下decrypted文件夹下merge_***.db]", required=False,
                               metavar="")
         return sb_merge
 
diff --git a/setup.py b/setup.py
index f765c6b9..10160ea8 100644
--- a/setup.py
+++ b/setup.py
@@ -3,7 +3,7 @@
 with open("README.md", "r", encoding="utf-8") as fh:
     long_description = fh.read()
 
-version = "2.3.3"
+version = "2.3.4"
 
 install_requires = [
     "psutil",