git-jiadong
diff --git a/‎app.go‎
Lines changed: 16 additions & 9 deletions b/‎app.go‎
Lines changed: 16 additions & 9 deletions
diff --git a/‎changelog.md‎
Lines changed: 5 additions & 0 deletions b/‎changelog.md‎
Lines changed: 5 additions & 0 deletions
diff --git a/‎frontend/dist/assets/index.0393a903.css‎
Lines changed: 0 additions & 1 deletion b/‎frontend/dist/assets/index.0393a903.css‎
Lines changed: 0 additions & 1 deletion
diff --git a/‎frontend/dist/assets/index.5131ab95.css‎
Lines changed: 1 addition & 0 deletions b/‎frontend/dist/assets/index.5131ab95.css‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎frontend/dist/assets/nunito-v16-latin-regular.06f3af3f.woff2‎
-18.5 KB b/‎frontend/dist/assets/nunito-v16-latin-regular.06f3af3f.woff2‎
-18.5 KB
diff --git a/‎frontend/dist/assets/思源黑体-Normal.df5ff3ec.otf‎
7.96 MB b/‎frontend/dist/assets/思源黑体-Normal.df5ff3ec.otf‎
7.96 MB
diff --git a/‎frontend/dist/index.html‎
Lines changed: 1 addition & 1 deletion b/‎frontend/dist/index.html‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎pkg/wechat/wechat.go‎
Lines changed: 1 addition & 1 deletion b/‎pkg/wechat/wechat.go‎
Lines changed: 1 addition & 1 deletion
@@ -23,7 +23,7 @@ const (
 	configDefaultUserKey = "userConfig.defaultUser"
 	configUsersKey       = "userConfig.users"
 	configExportPathKey  = "exportPath"
-	appVersion           = "v1.2.1"
+	appVersion           = "v1.2.2"
 )
 
 type FileLoader struct {
@@ -832,14 +832,6 @@ func (a *App) ExportWeChatDataByUserName(userName, path string) string {
 		return "WeChatExportDataByUserName failed:" + err.Error()
 	}
 
-	exeSrcPath := a.FLoader.FilePrefix + "\\" + "wechatDataBackup.exe"
-	exeDstPath := exPath + "\\" + "wechatDataBackup.exe"
-	_, err = utils.CopyFile(exeSrcPath, exeDstPath)
-	if err != nil {
-		log.Println("CopyFile:", err)
-		return "CopyFile:" + err.Error()
-	}
-
 	config := map[string]interface{}{
 		"exportpath": ".\\",
 		"userconfig": map[string]interface{}{
@@ -861,6 +853,21 @@ func (a *App) ExportWeChatDataByUserName(userName, path string) string {
 		return "WriteFile:" + err.Error()
 	}
 
+	exeSrcPath, err := os.Executable()
+	if err != nil {
+		log.Println("Executable:", exeSrcPath)
+		return "Executable:" + err.Error()
+	}
+
+	exeDstPath := exPath + "\\" + "wechatDataBackup.exe"
+	log.Printf("Copy [%s] -> [%s]\n", exeSrcPath, exeDstPath)
+	_, err = utils.CopyFile(exeSrcPath, exeDstPath)
+	if err != nil {
+		log.Println("CopyFile:", err)
+		return "CopyFile:" + err.Error()
+	}
+	return ""
+
 	return ""
 }
 
 
@@ -1,3 +1,8 @@
+## v1.2.2
+1. UI统一使用“思源黑体”字体
+2. 修复导出分享会话时可执行文件可能拷贝错误的情况
+3. 修复微信存储路径为网盘时，解密会失败的情况
+
 ## v1.2.0
 1. 实现最后浏览位置记录和书签功能
 2. 实现会话导出分享功能
 
@@ -5,7 +5,7 @@
     <meta content="width=device-width, initial-scale=1.0" name="viewport"/>
     <title>wechatDataBackup</title>
   <script type="module" crossorigin src="/assets/index.e4a8c0f4.js"></script>
-  <link rel="stylesheet" href="/assets/index.0393a903.css">
+  <link rel="stylesheet" href="/assets/index.5131ab95.css">
 </head>
 <body >
 <div id="root"></div>
 
@@ -598,7 +598,7 @@ func GetWeChatInfo() (list *WeChatInfoList) {
 			for _, f := range files {
 				if strings.HasSuffix(f.Path, "\\Media.db") {
 					// fmt.Printf("opened %s\n", f.Path[4:])
-					filePath := f.Path[4:]
+					filePath := f.Path
 					parts := strings.Split(filePath, string(filepath.Separator))
 					if len(parts) < 4 {
 						log.Println("Error filePath " + filePath)