Merge pull request #548 from qinweixian/patch-1

修复后台上传脚本bug
2026-10-16 10:29:42 +08:00 · 2026-09-07 09:29:06 +08:00 · 2026-09-03 10:42:52 +08:00 · 2026-07-05 09:42:32 +08:00 · 2026-06-29 10:42:16 +08:00 · 2026-06-29 10:27:00 +08:00
157 changed files with 13015 additions and 7538 deletions
@@ -0,0 +1,31 @@
+---
+name: 问题反馈
+about: 如果你在使用过程中发现问题，请使用该模板进行反馈。
+labels: Bug
+---
+
+### Ⅰ. 使用环境
+1. 操作系统：(Linux? macOS? Windows?)
+2. aliyunpan版本号：(v0.3.6? v0.3.7?...)
+
+### Ⅱ. 问题描述
+
+
+### Ⅲ. 期望的结果
+
+
+### Ⅳ. 如何复现问题
+<!-- 
+如果该问题是必现的，请帮忙整理复现步骤。   
+如果不是必现的，请尽可能说明问题出现之前你的操作步骤，越详细越好。
+-->
+1. xxx
+2. xxx
+3. xxx
+
+### Ⅴ. 请提供相关的错误日志
+<!-- 最好能提供debug日志。如何开启debug日志请参考README文档。 -->
+```log
+（日志请贴在这里。如果日志很多，可以以附件的形式上传）
+
+```
@@ -0,0 +1,15 @@
+---
+name: 提新需求
+about: 如果你想提出一个新需求，新功能建议，请使用此模板。
+labels: Feature Request
+---
+
+### Ⅰ. 你当前使用环境
+1. 操作系统：(Linux? macOS? Windows?)
+2. aliyunpan版本号：(v0.3.6? v0.3.7?...)
+
+### Ⅱ. 请描述你想要的新功能
+<!-- 请简单描述你希望的新功能，例如："upload上传命令添加一个xxx参数，用于实现xxx功能。" -->
+
+### Ⅲ. 请描述新功能的使用场景
+<!-- 可以讲讲你对新功能的看法，为什么需要增加这个功能，这个新功能在哪些场景下会使用。 -->
@@ -43,4 +43,5 @@ account.txt
 git_push.sh
 git_pull.sh
 docker/sync/data
-clear_docker.sh
+clear_docker.sh
+upload.sh
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
-	<assemblyIdentity version="0.1.7.0" processorArchitecture="*" name="com.tickstep.aliyunpan" type="win32"/>
+	<assemblyIdentity version="0.4.0.0" processorArchitecture="*" name="com.tickstep.aliyunpan" type="win32"/>
 	<dependency>
 		<dependentAssembly>
 			<assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" processorArchitecture="*" publicKeyToken="6595b64144ccf1df" language="*"/>
@@ -12,31 +12,33 @@
 // 参数说明
 // context - 当前调用的上下文信息
 // {
-// 	"appName": "aliyunpan",
-// 	"version": "v0.1.3",
-// 	"userId": "11001d48564f43b3bc5662874f04bb11",
-// 	"nickname": "tickstep",
-// 	"fileDriveId": "19519111",
-// 	"albumDriveId": "29519122"
+//  "appName": "aliyunpan",
+//  "version": "v0.1.3",
+//  "userId": "11001d48564f43b3bc5662874f04bb11",
+//  "nickname": "tickstep",
+//  "fileDriveId": "19519111",
+//  "resourceDriveId": "29519122"
 // }
 // appName - 应用名称，当前固定为aliyunpan
 // version - 版本号
 // userId - 当前登录用户的ID
 // nickname - 用户昵称
-// fileDriveId - 用户文件网盘ID
-// albumDriveId - 用户相册网盘ID
+// fileDriveId - 用户备份网盘ID
+// resourceDriveId - 用户资源网盘ID
 //
 // params - 文件下载前参数
 // {
-// 	"driveId": "19519221",
-// 	"driveFileName": "token.bat",
-// 	"driveFilePath": "/aliyunpan/Downloads/token.bat",
-// 	"driveFileSha1": "08FBE28A5B8791A2F50225E2EC5CEEC3C7955A11",
-// 	"driveFileSize": 125330,
-// 	"driveFileType": "file",
-// 	"driveFileUpdatedAt": "2022-04-14 07:05:12",
-// 	"localFilePath": "aliyunpan\\Downloads\\token.bat"
+//  "downloadActionId": "20976308-a026-450d-92b8-16a969fed0c6",
+//  "driveId": "19519221",
+//  "driveFileName": "token.bat",
+//  "driveFilePath": "/aliyunpan/Downloads/token.bat",
+//  "driveFileSha1": "08FBE28A5B8791A2F50225E2EC5CEEC3C7955A11",
+//  "driveFileSize": 125330,
+//  "driveFileType": "file",
+//  "driveFileUpdatedAt": "2022-04-14 07:05:12",
+//  "localFilePath": "aliyunpan\\Downloads\\token.bat"
 // }
+// downloadActionId - 下载动作ID。同一次下载动作(download命令)下载的文件，这个ID都是同一个值。注意这个ID不是永久的，每执行一次download命令会生成一个对应ID。
 // driveId - 网盘ID
 // driveFileName - 网盘文件名
 // driveFilePath - 网盘文件绝对完整路径
@@ -48,8 +50,8 @@
 // 
 // 返回值说明
 // {
-// 	"downloadApproved": "yes",
-// 	"localFilePath": "newfolder\\token.bat"
+//  "downloadApproved": "yes",
+//  "localFilePath": "newfolder\\token.bat"
 // }
 // downloadApproved - 该文件是否下载，yes-确认下载，no-取消下载
 // localFilePath - 文件保存的本地路径，这个是相对路径，如果为空""代表保持原本的目标路径。
@@ -83,33 +85,37 @@ function downloadFilePrepareCallback(context, params) {
 // 参数说明
 // context - 当前调用的上下文信息
 // {
-// 	"appName": "aliyunpan",
-// 	"version": "v0.1.3",
-// 	"userId": "11001d48564f43b3bc5662874f04bb11",
-// 	"nickname": "tickstep",
-// 	"fileDriveId": "19519111",
-// 	"albumDriveId": "29519122"
+//  "appName": "aliyunpan",
+//  "version": "v0.1.3",
+//  "userId": "11001d48564f43b3bc5662874f04bb11",
+//  "nickname": "tickstep",
+//  "fileDriveId": "19519111",
+//  "resourceDriveId": "29519122"
 // }
 // appName - 应用名称，当前固定为aliyunpan
 // version - 版本号
 // userId - 当前登录用户的ID
 // nickname - 用户昵称
-// fileDriveId - 用户文件网盘ID
-// albumDriveId - 用户相册网盘ID
+// fileDriveId - 用户备份网盘ID
+// resourceDriveId - 用户资源网盘ID
 //
 // params - 文件下载结束参数
 // {
-// 	"driveId": "19519221",
-// 	"driveFileName": "token.bat",
-// 	"driveFilePath": "/aliyunpan/Downloads/token.bat",
-// 	"driveFileSha1": "08FBE28A5B8791A2F50225E2EC5CEEC3C7955A11",
-// 	"driveFileSize": 125330,
-// 	"driveFileType": "file",
-// 	"driveFileUpdatedAt": "2022-04-14 07:05:12",
+//  "downloadActionId": "20976308-a026-450d-92b8-16a969fed0c6",
+//  "driveId": "19519221",
+//  "driveFileId": "65ebb9396d66dfcd9f25414bbdd81594ecb9fcd6",
+//  "driveFileName": "token.bat",
+//  "driveFilePath": "/aliyunpan/Downloads/token.bat",
+//  "driveFileSha1": "08FBE28A5B8791A2F50225E2EC5CEEC3C7955A11",
+//  "driveFileSize": 125330,
+//  "driveFileType": "file",
+//  "driveFileUpdatedAt": "2022-04-14 07:05:12",
 //  "downloadResult": "success",
-// 	"localFilePath": "aliyunpan\\Downloads\\token.bat"
+//  "localFilePath": "aliyunpan\\Downloads\\token.bat"
 // }
+// downloadActionId - 下载动作ID。同一次下载动作(download命令)下载的文件，这个ID都是同一个值。注意这个ID不是永久的，每执行一次download命令会生成一个对应ID。
 // driveId - 网盘ID
+// driveFileId - 网盘文件ID
 // driveFileName - 网盘文件名
 // driveFilePath - 网盘文件绝对完整路径
 // driveFileSize - 网盘文件大小，单位B
@@ -124,4 +130,17 @@ function downloadFilePrepareCallback(context, params) {
 // ------------------------------------------------------------------------------------------
 function downloadFileFinishCallback(context, params) {
    console.log(params)
+
+    // // 云盘文件成功下载到本地后，删除云盘的文件
+    // if (params["downloadResult"] == "success") {
+    //     if (params["driveFileType"] == "file") {
+    //         // 文件下载成功，删除该云盘文件
+    //         var userId = context["userId"]
+    //         var driveId = params["driveId"]
+    //         var driveFileId = params["driveFileId"]
+    //         if (PluginUtil.PanFS.deleteFile(userId, driveId, driveFileId)) {
+    //             console.log("插件删除云盘文件成功：" + params["driveFilePath"])
+    //         }
+    //     }
+    // }
 }
@@ -0,0 +1,105 @@
+// ==========================================================================================
+// aliyunpan JS插件回调处理函数
+// 支持 JavaScript ECMAScript 5.1 语言规范
+//
+// 更多内容请查看官方文档：https://github.com/tickstep/aliyunpan
+// ==========================================================================================
+
+
+// ------------------------------------------------------------------------------------------
+// 函数说明：删除文件前的回调函数
+// 
+// 参数说明
+// context - 当前调用的上下文信息
+// {
+//  "appName": "aliyunpan",
+//  "version": "v0.1.3",
+//  "userId": "11001d48564f43b3bc5662874f04bb11",
+//  "nickname": "tickstep",
+//  "fileDriveId": "19519111",
+//  "resourceDriveId": "29519122"
+// }
+// appName - 应用名称，当前固定为aliyunpan
+// version - 版本号
+// userId - 当前登录用户的ID
+// nickname - 用户昵称
+// fileDriveId - 用户备份网盘ID
+// resourceDriveId - 用户资源网盘ID
+//
+// params - 删除文件前的调用参数
+// {
+//  "count": 10,
+//  "items": [{}, {}, ...],
+// }
+// count - 文件总数
+// items - 文件列表，文件详情请查看下面 RemoveFilePrepareItem 定义
+//
+// RemoveFilePrepareItem - 文件详情参数
+// {
+//  "driveId": "19519221",
+//  "driveFileId": "65f6c5161ee4a1b9a02b41399282f281c6e6df21",
+//  "driveFileName": "token.bat",
+//  "driveFilePath": "/aliyunpan/Downloads/token.bat",
+//  "driveFileSize": 125330,
+//  "driveFileType": "file",
+//  "driveFileUpdatedAt": "2025-03-02 10:39:14",
+//  "driveFileCreatedAt": "2025-03-02 10:39:14"
+// }
+// driveId - 网盘ID
+// driveFileId - 网盘文件的ID
+// driveFileName - 网盘文件名
+// driveFilePath - 网盘文件绝对完整路径
+// driveFileSize - 网盘文件大小，单位B
+// driveFileType - 网盘文件类型，file-文件，folder-文件夹
+// driveFileUpdatedAt - 网盘文件修改时间
+// driveFileCreatedAt - 网盘文件创建时间
+// 
+// 返回值说明
+// {
+//  "result": [{}, {}, ...],
+// }
+// result - 结果列表，每个文件的确认结果，文件详细定义请查看 RemoveFilePrepareResultItem 定义
+//
+// RemoveFilePrepareResultItem - 每项文件确认结果
+// {
+//  "driveId": "19519221",
+//  "driveFileId": "65f6c5161ee4a1b9a02b41399282f281c6e6df21",
+//  "removeApproved": "yes"
+// }
+// driveId - 网盘ID
+// driveFileId - 网盘文件的ID
+// removeApproved - 该文件是否能删除，yes-确认删除，no-不能删除
+// ------------------------------------------------------------------------------------------
+function removeFilePrepareCallback(context, params) {
+    console.log(params)
+    var result = {"result":[]};
+    for(var i = 0; i < params.items.length; i++) {
+        var fileItem = params.items[i]
+        console.log(fileItem);
+        var fileItemApprovedResult = {
+            "driveId": fileItem["driveId"],
+            "driveFileId": fileItem["driveFileId"],
+            "removeApproved": "yes"
+        }
+
+        // 可以通过名称过滤
+        if (fileItem["driveFileType"] == "file") { // 文件        
+            if (fileItem["driveFileName"] == "password.key") {
+                fileItemApprovedResult["removeApproved"] = "no"; // 禁止删除password.key文件
+            }
+        } else if (params["driveFileType"] == "folder") { // 文件夹
+            // 对文件夹进行处理
+        }
+
+        // 可以通过时间过滤，例如：保留最近10天的文件
+        // ...
+
+        // 可以通过数量过滤，例如：保留最新5个文件
+        // ...
+         
+        // 放入结果列表
+        result["result"].push(fileItemApprovedResult)
+    }
+    // 返回
+    return result;
+}
@@ -12,28 +12,28 @@
 // 参数说明
 // context - 当前调用的上下文信息
 // {
-// 	"appName": "aliyunpan",
-// 	"version": "v0.1.3",
-// 	"userId": "11001d48564f43b3bc5662874f04bb11",
-// 	"nickname": "tickstep",
-// 	"fileDriveId": "19519111",
-// 	"albumDriveId": "29519122"
+//  "appName": "aliyunpan",
+//  "version": "v0.1.3",
+//  "userId": "11001d48564f43b3bc5662874f04bb11",
+//  "nickname": "tickstep",
+//  "fileDriveId": "19519111",
+//  "resourceDriveId": "29519122"
 // }
 // appName - 应用名称，当前固定为aliyunpan
 // version - 版本号
 // userId - 当前登录用户的ID
 // nickname - 用户昵称
-// fileDriveId - 用户文件网盘ID
-// albumDriveId - 用户相册网盘ID
+// fileDriveId - 用户备份网盘ID
+// resourceDriveId - 用户资源网盘ID
 //
 // params - 扫描本地文件前参数
 // {
-// 	"localFilePath": "D:\\Program Files\\aliyunpan\\Downloads\\token.bat",
-// 	"localFileName": "token.bat",
-// 	"localFileSize": 125330,
-// 	"localFileType": "file",
-// 	"localFileUpdatedAt": "2022-04-14 07:05:12",
-// 	"driveId": "19519221"
+//  "localFilePath": "D:\\Program Files\\aliyunpan\\Downloads\\token.bat",
+//  "localFileName": "token.bat",
+//  "localFileSize": 125330,
+//  "localFileType": "file",
+//  "localFileUpdatedAt": "2022-04-14 07:05:12",
+//  "driveId": "19519221"
 // }
 // localFilePath - 本地文件绝对完整路径
 // localFileName - 本地文件名
@@ -44,13 +44,13 @@
 //
 // 返回值说明
 // {
-// 	"syncScanLocalApproved": "yes"
+//  "syncScanLocalApproved": "yes"
 // }
 // syncScanLocalApproved - 该文件是否确认扫描，yes-允许扫描，no-禁止扫描。
 //                禁止扫描的文件不会执行后续的动作，例如上传，下载。
 // ------------------------------------------------------------------------------------------
 function syncScanLocalFilePrepareCallback(context, params) {
-	console.log(params);
+ console.log(params);
    var result = {
        "syncScanLocalApproved": "yes"
    };
@@ -60,7 +60,7 @@ function syncScanLocalFilePrepareCallback(context, params) {
        result["syncScanLocalApproved"] = "no";
    }

-	// 禁止~$开头文件上传（office暂存临时文件）
+    // 禁止~$开头文件上传（office暂存临时文件）
    if (params["localFileName"].indexOf("~$") == 0) {
        result["syncScanLocalApproved"] = "no";
    }
@@ -74,9 +74,9 @@ function syncScanLocalFilePrepareCallback(context, params) {
    if (params["localFileName"] == "password.key") {
        result["syncScanLocalApproved"] = "no";
    }
-	
-	// 禁止@eadir文件上传
-	if (params["localFileName"] == "@eadir") {
+ 
+    // 禁止@eadir文件上传
+    if (params["localFileName"] == "@eadir") {
        result["syncScanLocalApproved"] = "no";
    }
    return result;
@@ -89,29 +89,29 @@ function syncScanLocalFilePrepareCallback(context, params) {
 // 参数说明
 // context - 当前调用的上下文信息
 // {
-// 	"appName": "aliyunpan",
-// 	"version": "v0.1.3",
-// 	"userId": "11001d48564f43b3bc5662874f04bb11",
-// 	"nickname": "tickstep",
-// 	"fileDriveId": "19519111",
-// 	"albumDriveId": "29519122"
+//  "appName": "aliyunpan",
+//  "version": "v0.1.3",
+//  "userId": "11001d48564f43b3bc5662874f04bb11",
+//  "nickname": "tickstep",
+//  "fileDriveId": "19519111",
+//  "resourceDriveId": "29519122"
 // }
 // appName - 应用名称，当前固定为aliyunpan
 // version - 版本号
 // userId - 当前登录用户的ID
 // nickname - 用户昵称
-// fileDriveId - 用户文件网盘ID
-// albumDriveId - 用户相册网盘ID
+// fileDriveId - 用户备份网盘ID
+// resourceDriveId - 用户资源网盘ID
 //
 // params - 扫描云盘文件前参数
 // {
-// 	"driveId": "19519221",
-// 	"driveFileName": "token.bat",
-// 	"driveFilePath": "/aliyunpan/Downloads/token.bat",
-// 	"driveFileSha1": "08FBE28A5B8791A2F50225E2EC5CEEC3C7955A11",
-// 	"driveFileSize": 125330,
-// 	"driveFileType": "file",
-// 	"driveFileUpdatedAt": "2022-04-14 07:05:12"
+//  "driveId": "19519221",
+//  "driveFileName": "token.bat",
+//  "driveFilePath": "/aliyunpan/Downloads/token.bat",
+//  "driveFileSha1": "08FBE28A5B8791A2F50225E2EC5CEEC3C7955A11",
+//  "driveFileSize": 125330,
+//  "driveFileType": "file",
+//  "driveFileUpdatedAt": "2022-04-14 07:05:12"
 // }
 // driveId - 网盘ID
 // driveFileName - 网盘文件名
@@ -123,7 +123,7 @@ function syncScanLocalFilePrepareCallback(context, params) {
 // 
 // 返回值说明
 // {
-// 	"syncScanPanApproved": "yes"
+//  "syncScanPanApproved": "yes"
 // }
 // syncScanPanApproved - 该文件是否确认扫描，yes-允许扫描，no-禁止扫描。
 //                       禁止扫描的文件不会执行后续的动作，例如上传，下载。
@@ -151,4 +151,116 @@ function syncScanPanFilePrepareCallback(context, params) {
    // }

    return result;
+}
+
+// ------------------------------------------------------------------------------------------
+// 函数说明：同步备份-同步文件后的回调函数
+//
+// 参数说明
+// context - 当前调用的上下文信息
+// {
+//  "appName": "aliyunpan",
+//  "version": "v0.1.3",
+//  "userId": "11001d48564f43b3bc5662874f04bb11",
+//  "nickname": "tickstep",
+//  "fileDriveId": "19519111",
+//  "resourceDriveId": "29519122"
+// }
+// appName - 应用名称，当前固定为aliyunpan
+// version - 版本号
+// userId - 当前登录用户的ID
+// nickname - 用户昵称
+// fileDriveId - 用户备份网盘ID
+// resourceDriveId - 用户资源网盘ID
+//
+// params - 同步文件后的参数
+// {
+//  "action": "upload",
+//  "actionResult": "success",
+//  "driveId": "19519221",
+//  "driveFileId": "65ebb9396d66dfcd9f25414bbdd81594ecb9fcd6",
+//  "fileName": "1.txt",
+//  "filePath": "D:/goprojects/dev/upload/1.txt",
+//  "fileSha1": "294C8F24C56042710813E95C55A0B018299BA9A7",
+//  "fileSize": "28077",
+//  "fileType": "file",
+//  "fileUpdatedAt": "2022-03-04 15:19:47"
+// }
+// action - 同步动作，download-下载文件，upload-上传文件
+// actionResult - 同步结果，success-成功，fail-失败
+// driveId - 网盘ID
+// driveFileId - 网盘文件ID，只有download模式才会有这个字段
+// fileName - 文件名称
+// filePath - 文件完整路径
+// fileSha1 - 文件SHA1
+// fileSize - 文件大小，单位B
+// fileType - 文件类型，file-文件，folder-文件夹
+// fileUpdatedAt - 文件修改时间
+//
+// 返回值说明
+// （无）
+// ------------------------------------------------------------------------------------------
+function syncFileFinishCallback(context, params) {
+    console.log(params)
+    // 云盘文件成功下载到本地后，删除云盘的文件
+    // if (params["action"] == "download") {
+    //     if (params["actionResult"] == "success" && params["fileType"] == "file") {
+    //         // 文件下载成功，删除该云盘文件
+    //         var userId = context["userId"]
+    //         var driveId = params["driveId"]
+    //         var driveFileId = params["driveFileId"]
+    //         if (PluginUtil.PanFS.deleteFile(userId, driveId, driveFileId)) {
+    //             console.println("插件删除云盘文件成功：" + params["filePath"])
+    //         }
+    //     }
+    // }
+}
+
+// ------------------------------------------------------------------------------------------
+// 函数说明：同步备份-同步任务同步全部文件完成时的回调函数（目前只有"只运行一次备份"的任务模式才有该回调）
+//
+// 参数说明
+// context - 当前调用的上下文信息
+// {
+//  "appName": "aliyunpan",
+//  "version": "v0.1.3",
+//  "userId": "11001d48564f43b3bc5662874f04bb11",
+//  "nickname": "tickstep",
+//  "fileDriveId": "19519111",
+//  "resourceDriveId": "29519122"
+// }
+// appName - 应用名称，当前固定为aliyunpan
+// version - 版本号
+// userId - 当前登录用户的ID
+// nickname - 用户昵称
+// fileDriveId - 用户备份网盘ID
+// resourceDriveId - 用户资源网盘ID
+//
+// params - 任务完成的回调参数
+// {
+//  "name": "备份相册",
+//  "id": "2e959a34-8435-4773-9a3e-687f2692ddc1",
+//  "userId": "4d001d48564f43b3bc5662874114bbe6",
+//  "driveName": "backup",
+//  "driveId": "19519221",
+//  "localFolderPath": "/Volumes/DataDisk3T/Games/Switch/图库备份",
+//  "panFolderPath": "/备份盘/Switch游戏/Album",
+//  "mode": "upload",
+//  "policy": "upload",
+// }
+// name - 任务名称
+// id - 任务ID
+// userId - 登录的用户ID
+// driveName - 网盘名称，backup-备份盘，resource-资源盘
+// driveId - 目标网盘ID
+// localFolderPath - 本地目录
+// panFolderPath - 云盘目录
+// mode - 备份模式，upload-备份本地文件到云盘，download-备份云盘文件到本地
+// policy - 备份策略，increment-增量备份，exclusive-排他备份
+//
+// 返回值说明
+// 无
+// ------------------------------------------------------------------------------------------
+function syncAllFileFinishCallback(context, params) {
+    console.log(params)
 }
@@ -0,0 +1,48 @@
+// ==========================================================================================
+// aliyunpan JS插件回调处理函数
+// 支持 JavaScript ECMAScript 5.1 语言规范
+//
+// 更多内容请查看官方文档：https://github.com/tickstep/aliyunpan
+// ==========================================================================================
+
+
+// ------------------------------------------------------------------------------------------
+// 函数说明：用户Token刷新完成后回调函数
+//
+// 参数说明
+// context - 当前调用的上下文信息
+// {
+//  "appName": "aliyunpan",
+//  "version": "v0.1.3",
+//  "userId": "11001d48564f43b3bc5662874f04bb11",
+//  "nickname": "tickstep",
+//  "fileDriveId": "19519111",
+//  "resourceDriveId": "29519122"
+// }
+// appName - 应用名称，当前固定为aliyunpan
+// version - 版本号
+// userId - 当前登录用户的ID
+// nickname - 用户昵称
+// fileDriveId - 用户备份网盘ID
+// resourceDriveId - 用户资源网盘ID
+//
+// params - Token刷新参数
+// {
+//  "result": "success",
+//  "message": "ok",
+//  "oldToken": "aa31fcc229c54d5ab6d8bfb17aff3711",
+//  "newToken": "bb31fcc229c54d5ab6d8bfb17aff3722",
+//  "updatedAt": "2022-04-14 07:05:12"
+// }
+// result - Token刷新的结果，success-成功，fail-失败
+// message - 消息说明，如果失败这里会有原因说明
+// oldToken - 刷新前的Token
+// newToken - 刷新后的Token，只有result为success的才有该值
+// updatedAt - Token刷新的时间
+//
+// 返回值说明
+// （没有返回值）
+// ------------------------------------------------------------------------------------------
+function userTokenRefreshFinishCallback(context, params) {
+    console.log(params)
+}
@@ -12,29 +12,29 @@
 // 参数说明
 // context - 当前调用的上下文信息
 // {
-// 	"appName": "aliyunpan",
-// 	"version": "v0.1.3",
-// 	"userId": "11001d48564f43b3bc5662874f04bb11",
-// 	"nickname": "tickstep",
-// 	"fileDriveId": "19519111",
-// 	"albumDriveId": "29519122"
+//  "appName": "aliyunpan",
+//  "version": "v0.1.3",
+//  "userId": "11001d48564f43b3bc5662874f04bb11",
+//  "nickname": "tickstep",
+//  "fileDriveId": "19519111",
+//  "resourceDriveId": "29519122"
 // }
 // appName - 应用名称，当前固定为aliyunpan
 // version - 版本号
 // userId - 当前登录用户的ID
 // nickname - 用户昵称
-// fileDriveId - 用户文件网盘ID
-// albumDriveId - 用户相册网盘ID
+// fileDriveId - 用户备份网盘ID
+// resourceDriveId - 用户资源网盘ID
 //
 // params - 文件上传前参数
 // {
-// 	"localFilePath": "D:\\Program Files\\aliyunpan\\Downloads\\token.bat",
-// 	"localFileName": "token.bat",
-// 	"localFileSize": 125330,
-// 	"localFileType": "file",
-// 	"localFileUpdatedAt": "2022-04-14 07:05:12",
-// 	"driveId": "19519221",
-// 	"driveFilePath": "aliyunpan/Downloads/token.bat"
+//  "localFilePath": "D:\\Program Files\\aliyunpan\\Downloads\\token.bat",
+//  "localFileName": "token.bat",
+//  "localFileSize": 125330,
+//  "localFileType": "file",
+//  "localFileUpdatedAt": "2022-04-14 07:05:12",
+//  "driveId": "19519221",
+//  "driveFilePath": "aliyunpan/Downloads/token.bat"
 // }
 // localFilePath - 本地文件绝对完整路径
 // localFileName - 本地文件名
@@ -46,8 +46,8 @@
 //
 // 返回值说明
 // {
-// 	"uploadApproved": "yes",
-// 	"driveFilePath": "newfolder/token.bat"
+//  "uploadApproved": "yes",
+//  "driveFilePath": "newfolder/token.bat"
 // }
 // uploadApproved - 该文件是否确认上传，yes-允许上传，no-禁止上传
 // driveFilePath - 文件保存的网盘路径，这个是相对路径，如果为空""代表保持原本的目标路径。
@@ -84,31 +84,31 @@ function uploadFilePrepareCallback(context, params) {
 // 参数说明
 // context - 当前调用的上下文信息
 // {
-// 	"appName": "aliyunpan",
-// 	"version": "v0.1.3",
-// 	"userId": "11001d48564f43b3bc5662874f04bb11",
-// 	"nickname": "tickstep",
-// 	"fileDriveId": "19519111",
-// 	"albumDriveId": "29519122"
+//  "appName": "aliyunpan",
+//  "version": "v0.1.3",
+//  "userId": "11001d48564f43b3bc5662874f04bb11",
+//  "nickname": "tickstep",
+//  "fileDriveId": "19519111",
+//  "resourceDriveId": "29519122"
 // }
 // appName - 应用名称，当前固定为aliyunpan
 // version - 版本号
 // userId - 当前登录用户的ID
 // nickname - 用户昵称
-// fileDriveId - 用户文件网盘ID
-// albumDriveId - 用户相册网盘ID
+// fileDriveId - 用户备份网盘ID
+// resourceDriveId - 用户资源网盘ID
 //
 // params - 文件上传结束参数
 // {
-// 	"localFilePath": "D:\\Program Files\\aliyunpan\\Downloads\\token.bat",
-// 	"localFileName": "token.bat",
-// 	"localFileSize": 125330,
-// 	"localFileType": "file",
-// 	"localFileUpdatedAt": "2022-04-14 07:05:12",
-// 	"localFileSha1": "08FBE28A5B8791A2F50225E2EC5CEEC3C7955A11",
-// 	"uploadResult": "success",
-// 	"driveId": "19519221",
-// 	"driveFilePath": "/tmp/test/aliyunpan/Downloads/token.bat"
+//  "localFilePath": "D:\\Program Files\\aliyunpan\\Downloads\\token.bat",
+//  "localFileName": "token.bat",
+//  "localFileSize": 125330,
+//  "localFileType": "file",
+//  "localFileUpdatedAt": "2022-04-14 07:05:12",
+//  "localFileSha1": "08FBE28A5B8791A2F50225E2EC5CEEC3C7955A11",
+//  "uploadResult": "success",
+//  "driveId": "19519221",
+//  "driveFilePath": "/tmp/test/aliyunpan/Downloads/token.bat"
 // }
 // localFilePath - 本地文件绝对完整路径
 // localFileName - 本地文件名
@@ -12,6 +12,7 @@ Type=forking
 ExecStart=/path/to/start.sh
 ExecStop=/path/to/stop.sh
 PrivateTmp=true
+Restart=always

 [Install]
 WantedBy=multi-user.target
@@ -5,7 +5,8 @@
   "name": "设计文档备份",
   "localFolderPath": "D:\\tickstep\\Documents\\设计文档",
   "panFolderPath": "/sync_drive/我的文档",
-   "mode": "upload"
+   "mode": "upload",
+   "priority": "local"
  }
 ]
 }
@@ -62,7 +62,7 @@ IOSBuild() {
  cd "$output/$1"
  export CC=/usr/local/go/misc/ios/clangwrap.sh GOOS=ios GOARCH=arm64 GOARM=7 CGO_ENABLED=1
  $go build -ldflags "-X main.Version=$version -s -w" -o $name github.com/tickstep/aliyunpan
-  jtool --sign --inplace --ent ../../entitlements.xml $name
+  jtool2 --sign --inplace --ent ../../entitlements.xml $name
  cd ../..
  RicePack $1 $name
  Pack $1 "ios"
@@ -75,6 +75,8 @@ Pack() {
  fi

  cp README.md "$output/$1"
+  cp docs/manual.md "$output/$1"
+  cp docs/plugin_manual.md "$output/$1"
  cp -rf assets/scripts/* "$output/$1"
  cp -rf assets/plugin "$output/$1"
  cp -rf assets/sync_drive "$output/$1"
@@ -93,45 +95,59 @@ RicePack() {
  return # 已取消web功能
 }

-# Android
+############### Android ###############
 export ANDROID_NDK_ROOT=/Users/tickstep/Applications/android_ndk/android-ndk-r23-darwin
 CC=$ANDROID_NDK_ROOT/bin/arm-linux-androideabi/bin/clang AndroidBuild $name-$version"-android-api16-armv7" android arm 7
 CC=$ANDROID_NDK_ROOT/bin/aarch64-linux-android/bin/clang AndroidBuild $name-$version"-android-api21-arm64" android arm64 7
 CC=$ANDROID_NDK_ROOT/bin/i686-linux-android/bin/clang    AndroidBuild $name-$version"-android-api16-386" android 386 7
 CC=$ANDROID_NDK_ROOT/bin/x86_64-linux-android/bin/clang  AndroidBuild $name-$version"-android-api21-amd64" android amd64 7

-# iOS
+############### iOS ###############
 IOSBuild $name-$version"-ios-arm64"

-# OS X / macOS
+############### macOS ###############
 Build $name-$version"-darwin-macos-amd64" darwin amd64
 # Build $name-$version"-darwin-macos-386" darwin 386
 Build $name-$version"-darwin-macos-arm64" darwin arm64

-# Windows
+############### Windows ###############
 Build $name-$version"-windows-x86" windows 386
 Build $name-$version"-windows-x64" windows amd64
-Build $name-$version"-windows-arm" windows arm
+Build $name-$version"-windows-arm64" windows arm64

-# Linux
+############### Linux ###############
+# x64/x86
 Build $name-$version"-linux-386" linux 386
 Build $name-$version"-linux-amd64" linux amd64
+
+# 龙芯 LoongArch
+Build $name-$version"-linux-loong64" linux loong64
+
+# arm
 Build $name-$version"-linux-armv5" linux arm 5
 Build $name-$version"-linux-armv7" linux arm 7
 Build $name-$version"-linux-arm64" linux arm64
-GOMIPS=softfloat Build $name-$version"-linux-mips" linux mips
-Build $name-$version"-linux-mips64" linux mips64
-GOMIPS=softfloat Build $name-$version"-linux-mipsle" linux mipsle
-Build $name-$version"-linux-mips64le" linux mips64le
-# Build $name-$version"-linux-ppc64" linux ppc64
-# Build $name-$version"-linux-ppc64le" linux ppc64le
-# Build $name-$version"-linux-s390x" linux s390x

-# Others
-# Build $name-$version"-solaris-amd64" solaris amd64
+# mips
+GOMIPS=softfloat Build $name-$version"-linux-mips64" linux mips64
+GOMIPS=softfloat Build $name-$version"-linux-mips64le" linux mips64le
+GOMIPS=hardfloat Build $name-$version"-linux-mips64hf" linux mips64
+GOMIPS=hardfloat Build $name-$version"-linux-mips64lehf" linux mips64le
+GOMIPS=softfloat Build $name-$version"-linux-mips" linux mips
+GOMIPS=softfloat Build $name-$version"-linux-mipsle" linux mipsle
+GOMIPS=hardfloat Build $name-$version"-linux-mipshf" linux mips
+GOMIPS=hardfloat Build $name-$version"-linux-mipslehf" linux mipsle
+
+# freebsd
 Build $name-$version"-freebsd-386" freebsd 386
 Build $name-$version"-freebsd-amd64" freebsd amd64
 # Build $name-$version"-freebsd-arm" freebsd arm
+
+# Others
+# Build $name-$version"-linux-ppc64" linux ppc64
+# Build $name-$version"-linux-ppc64le" linux ppc64le
+# Build $name-$version"-linux-s390x" linux s390x
+# Build $name-$version"-solaris-amd64" solaris amd64
 # Build $name-$version"-netbsd-386" netbsd	386
 # Build $name-$version"-netbsd-amd64" netbsd amd64
 # Build $name-$version"-netbsd-arm" netbsd	arm
@@ -1,39 +1,11 @@
 package cmder

 import (
-	"fmt"
-	"github.com/tickstep/aliyunpan-api/aliyunpan"
-	"github.com/tickstep/aliyunpan-api/aliyunpan/apierror"
-	"github.com/tickstep/aliyunpan/cmder/cmdliner"
-	"github.com/tickstep/aliyunpan/internal/config"
-	"github.com/tickstep/aliyunpan/internal/functions/panlogin"
-	"github.com/tickstep/library-go/logger"
 	"github.com/urfave/cli"
-	"sync"
 )

 var (
 	appInstance *cli.App
-
-	saveConfigMutex *sync.Mutex = new(sync.Mutex)
-
-	ReloadConfigFunc = func(c *cli.Context) error {
-		err := config.Config.Reload()
-		if err != nil {
-			fmt.Printf("重载配置错误: %s\n", err)
-		}
-		return nil
-	}
-
-	SaveConfigFunc = func(c *cli.Context) error {
-		saveConfigMutex.Lock()
-		defer saveConfigMutex.Unlock()
-		err := config.Config.Save()
-		if err != nil {
-			fmt.Printf("保存配置错误: %s\n", err)
-		}
-		return nil
-	}
 )

 func SetApp(app *cli.App) {
@@ -43,73 +15,3 @@ func SetApp(app *cli.App) {
 func App() *cli.App {
 	return appInstance
 }
-
-func DoLoginHelper(refreshToken string) (refreshTokenStr string, webToken aliyunpan.WebLoginToken, error error) {
-	line := cmdliner.NewLiner()
-	defer line.Close()
-
-	if refreshToken == "" {
-		refreshToken, error = line.State.Prompt("请输入RefreshToken, 回车键提交 > ")
-		if error != nil {
-			return
-		}
-	}
-
-	// app login
-	atoken, apperr := aliyunpan.GetAccessTokenFromRefreshToken(refreshToken)
-	if apperr != nil {
-		if apperr.Code == apierror.ApiCodeTokenExpiredCode || apperr.Code == apierror.ApiCodeRefreshTokenExpiredCode {
-			fmt.Println("Token过期，需要重新登录")
-		} else {
-			fmt.Println("Token登录失败：", apperr)
-		}
-		return "", webToken, fmt.Errorf("登录失败")
-	}
-	refreshTokenStr = refreshToken
-	return refreshTokenStr, *atoken, nil
-}
-
-func TryLogin() *config.PanUser {
-	// can do automatically login?
-	for _, u := range config.Config.UserList {
-		if u.UserId == config.Config.ActiveUID {
-			// login
-			_, webToken, err := DoLoginHelper(u.RefreshToken)
-			if err != nil {
-				logger.Verboseln("automatically login use saved refresh token error ", err)
-				if u.TokenId != "" {
-					logger.Verboseln("try to login use tokenId")
-					h := panlogin.NewLoginHelper(config.DefaultTokenServiceWebHost)
-					r, e := h.GetRefreshToken(u.TokenId)
-					if e != nil {
-						logger.Verboseln("try to login use tokenId error", e)
-						break
-					}
-					refreshToken, e := h.ParseSecureRefreshToken("", r.SecureRefreshToken)
-					if e != nil {
-						logger.Verboseln("try to parse refresh token error", e)
-						break
-					}
-					_, webToken, err = DoLoginHelper(refreshToken)
-					if err != nil {
-						logger.Verboseln("try to use refresh token from tokenId error", e)
-						break
-					}
-					fmt.Println("Token重新自动登录成功")
-					// save new refresh token
-					u.RefreshToken = refreshToken
-				}
-				break
-			}
-			// success
-			u.WebToken = webToken
-
-			// save
-			SaveConfigFunc(nil)
-			// reload
-			ReloadConfigFunc(nil)
-			return config.Config.ActiveUser()
-		}
-	}
-	return nil
-}
@@ -1,9 +1,12 @@
-# alpine:3.15.0
+# alpine:3.21

 # 参数
 ARG DOCKER_IMAGE_HASH

-FROM alpine@sha256:$DOCKER_IMAGE_HASH
+#FROM alpine@sha256:$DOCKER_IMAGE_HASH
+#FROM alpine
+FROM alpine:$DOCKER_IMAGE_HASH
+
 LABEL author="tickstep"
 LABEL email="tickstep@outlook.com"
 LABEL version="1.0"
@@ -13,6 +16,9 @@ LABEL description="sync & backup service for aliyun cloud drive"
 ENV TZ=Asia/Shanghai
 # 手动下载tzdata安装包，注意要下载对应架构的： https://dl-cdn.alpinelinux.org/alpine/v3.15/community/
 RUN apk add -U tzdata
+# 更新Alpine的软件源为国内镜像站点，提高下载速度。安装tzdata包
+# RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories
+# RUN apk add --no-cache tzdata
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone

 # 创建运行目录
@@ -48,9 +54,6 @@ HEALTHCHECK --start-period=5s --interval=10s --timeout=5s --retries=3 CMD /bin/s
 ENV ALIYUNPAN_DOCKER=1
 ENV ALIYUNPAN_CONFIG_DIR=/home/app/config

-ENV ALIYUNPAN_REFRESH_TOKEN=""
-ENV ALIYUNPAN_TRANSFER_URL_TYPE=0
-
 ENV ALIYUNPAN_DOWNLOAD_PARALLEL=2
 ENV ALIYUNPAN_UPLOAD_PARALLEL=2
 ENV ALIYUNPAN_DOWNLOAD_BLOCK_SIZE=1024
@@ -58,6 +61,15 @@ ENV ALIYUNPAN_UPLOAD_BLOCK_SIZE=10240
 ENV ALIYUNPAN_LOCAL_DIR=/home/app/data
 ENV ALIYUNPAN_PAN_DIR=/sync_drive
 ENV ALIYUNPAN_SYNC_MODE=upload
+ENV ALIYUNPAN_SYNC_POLICY=increment
+ENV ALIYUNPAN_SYNC_DRIVE=backup
+ENV ALIYUNPAN_SYNC_CYCLE=infinity
+ENV ALIYUNPAN_SYNC_PRIORITY=time
+ENV ALIYUNPAN_SYNC_LOG=false
+ENV ALIYUNPAN_LOCAL_DELAY_TIME=3
+ENV ALIYUNPAN_SCAN_INTERVAL_TIME=1
+ENV ALIYUNPAN_DEVICE_ID=""
+ENV ALIYUNPAN_IP_TYPE="ipv4"

 # 运行
 ENTRYPOINT ./app.sh
@@ -15,10 +15,12 @@ else
    "syncTaskList": [
     {
      "name": "阿里云盘备份",
-      "id": "5b2d7c10-e927-4e72-8f9d-5abb3bb04814",
+      "id": "5b2d7c10-e927-4e72-8f9d-5abb3bb04815",
      "localFolderPath": "$ALIYUNPAN_LOCAL_DIR",
      "panFolderPath": "$ALIYUNPAN_PAN_DIR",
      "mode": "$ALIYUNPAN_SYNC_MODE",
+      "policy": "$ALIYUNPAN_SYNC_POLICY",
+      "driveName": "$ALIYUNPAN_SYNC_DRIVE",
      "lastSyncTime": "2022-06-12 19:28:20"
     }
    ]
@@ -28,15 +30,37 @@ fi

 sleep 2s

+# device-id
+#if [[ -z $ALIYUNPAN_DEVICE_ID ]];
+#then
+#  echo "the program use random device id"
+#else
+#  echo "set device id"
+#  ./aliyunpan config set -device_id ${ALIYUNPAN_DEVICE_ID}
+#fi
+
+# show docker IPs
+./aliyunpan tool getip
+
 # check login already or not
 ./aliyunpan who
 if [ $? -eq 0 ]
 then
  echo "cache token is valid, not need to re-login"
 else
-  echo "login use refresh token: ${ALIYUNPAN_REFRESH_TOKEN}"
-  ./aliyunpan login -RefreshToken=${ALIYUNPAN_REFRESH_TOKEN}
+  echo "token is invalid, please use the valid aliyunpan_config.json file and retry"
+#  ./aliyunpan login -RefreshToken=${ALIYUNPAN_REFRESH_TOKEN}
 fi

-./aliyunpan config set -transfer_url_type ${ALIYUNPAN_TRANSFER_URL_TYPE} 
-./aliyunpan sync start -dp ${ALIYUNPAN_DOWNLOAD_PARALLEL} -up ${ALIYUNPAN_UPLOAD_PARALLEL} -dbs ${ALIYUNPAN_DOWNLOAD_BLOCK_SIZE} -ubs ${ALIYUNPAN_UPLOAD_BLOCK_SIZE}
+if [ "$ALIYUNPAN_SYNC_LOG" = "true" ]
+then
+  ./aliyunpan config set -file_record_config 1
+else
+  ./aliyunpan config set -file_record_config 2
+fi
+
+# IP type
+./aliyunpan config set -ip_type ${ALIYUNPAN_IP_TYPE}
+
+# run
+./aliyunpan sync start -dp ${ALIYUNPAN_DOWNLOAD_PARALLEL} -up ${ALIYUNPAN_UPLOAD_PARALLEL} -dbs ${ALIYUNPAN_DOWNLOAD_BLOCK_SIZE} -ubs ${ALIYUNPAN_UPLOAD_BLOCK_SIZE} -log ${ALIYUNPAN_SYNC_LOG} -ldt ${ALIYUNPAN_LOCAL_DELAY_TIME} -cycle ${ALIYUNPAN_SYNC_CYCLE} -sit ${ALIYUNPAN_SCAN_INTERVAL_TIME}
@@ -6,17 +6,17 @@ services:
    container_name: aliyunpan-sync
    restart: always
    volumes:
+      # （必须）映射的本地目录
      - ./data:/home/app/data:rw
      # （可选）可以指定JS插件sync_handler.js用于过滤文件，详见插件说明
      #- ./plugin/js/sync_handler.js:/home/app/config/plugin/js/sync_handler.js
      # （推荐）挂载sync_drive同步数据库到本地，这样即使容器销毁，同步数据库还可以用于以后使用
      #- ./sync_drive:/home/app/config/sync_drive
+      # （必须）映射token凭据文件
+      - /your/file/path/for/aliyunpan_config.json:/home/app/config/aliyunpan_config.json
    environment:
+      # 时区，东8区
      - TZ=Asia/Shanghai
-      # refresh token
-      - ALIYUNPAN_REFRESH_TOKEN=8bf31a...7628a8ad5a0975bf2d9
-      # 上传下载链接类型：1-默认 2-阿里ECS环境
-      - ALIYUNPAN_TRANSFER_URL_TYPE=1
      # 下载文件并发数
      - ALIYUNPAN_DOWNLOAD_PARALLEL=2
      # 上传文件并发数
@@ -25,10 +25,19 @@ services:
      - ALIYUNPAN_DOWNLOAD_BLOCK_SIZE=1024
      # 上传数据块大小，单位为KB，默认为10240KB，建议范围1024KB~10240KB
      - ALIYUNPAN_UPLOAD_BLOCK_SIZE=10240
-      # 指定网盘文件夹作为备份目录，不要指定根目录
+      # 指定网盘文件夹作为备份目标目录，不要指定根目录
      - ALIYUNPAN_PAN_DIR=/my_sync_dir
-      # 备份模式：upload(备份本地文件到云盘), download(备份云盘文件到本地), sync(双向同步备份，慎用！！！)
+      # 备份模式：upload(备份本地文件到云盘), download(备份云盘文件到本地)
      - ALIYUNPAN_SYNC_MODE=upload
-
-
-
+      # 备份策略: exclusive(排他备份文件，目标目录多余的文件会被删除),increment(增量备份文件，目标目录多余的文件不会被删除)
+      - ALIYUNPAN_SYNC_POLICY=increment
+      # 备份周期, 支持两种: infinity(永久循环备份),onetime(只运行一次备份)
+      - ALIYUNPAN_SYNC_CYCLE=infinity
+      # 网盘：backup(备份盘), resource(资源盘)
+      - ALIYUNPAN_SYNC_DRIVE=backup
+      # 是否显示文件备份过程日志，true-显示，false-不显示
+      - ALIYUNPAN_SYNC_LOG=true
+      # 本地文件修改检测延迟间隔，单位秒。如果本地文件会被频繁修改，例如录制视频文件，配置好该时间可以避免上传未录制好的文件
+      - ALIYUNPAN_LOCAL_DELAY_TIME=3
+      # 扫描文件间隔时间，单位：分钟
+      - ALIYUNPAN_SCAN_INTERVAL_TIME=1
@@ -1,57 +0,0 @@
-# alpine:3.15.0
-
-# 参数
-ARG DOCKER_IMAGE_HASH
-
-FROM alpine@sha256:$DOCKER_IMAGE_HASH
-LABEL author="tickstep"
-LABEL email="tickstep@outlook.com"
-LABEL version="1.0"
-LABEL description="webdav file server for aliyun cloud drive"
-
-# 时区
-ENV TZ=Asia/Shanghai
-# 手动下载tzdata安装包，注意要下载对应架构的： https://dl-cdn.alpinelinux.org/alpine/v3.15/community/
-RUN apk add -U tzdata
-RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
-
-# 创建运行目录
-RUN mkdir -p /home/app
-VOLUME /home/app
-WORKDIR /home/app
-RUN cd /home/app
-
-# 创建配置文件目录
-RUN mkdir -p /home/app/config
-
-# 复制文件
-COPY ./docker/webdav/app.sh /home/app/app.sh
-RUN chmod +x /home/app/app.sh
-COPY ./docker/webdav/health_check.sh /home/app/health_check.sh
-RUN chmod +x /home/app/health_check.sh
-
-COPY ./out/binary_files/aliyunpan /home/app
-RUN mkdir -p /home/app/config/plugin
-COPY ./out/binary_files/plugin /home/app/config/plugin
-RUN mkdir -p /home/app/config/sync_drive
-COPY ./out/binary_files/sync_drive /home/app/config/sync_drive
-#RUN chmod +x /home/app/aliyunpan
-
-# 健康检查
-HEALTHCHECK --start-period=5s --interval=10s --timeout=5s --retries=3 CMD /bin/sh /home/app/health_check.sh
-
-# 端口
-EXPOSE 23077
-
-# 环境变量
-ENV ALIYUNPAN_DOCKER=1
-ENV ALIYUNPAN_CONFIG_DIR=/home/app/config
-ENV ALIYUNPAN_AUTH_USER=admin
-ENV ALIYUNPAN_AUTH_PASSWORD=admin
-ENV ALIYUNPAN_PAN_DRIVE=File
-ENV ALIYUNPAN_PAN_DIR=/
-ENV ALIYUNPAN_REFRESH_TOKEN=""
-ENV ALIYUNPAN_TRANSFER_URL_TYPE=0
-ENV ALIYUNPAN_BLOCK_SIZE=10240
-
-ENTRYPOINT ./app.sh
@@ -1,16 +0,0 @@
-#!/bin/sh
-cd /home/app
-chmod +x ./aliyunpan
-
-# check login already or not
-./aliyunpan who
-if [ $? -eq 0 ]
-then
-  echo "cache token is valid, not need to re-login"
-else
-  echo "login use refresh token: ${ALIYUNPAN_REFRESH_TOKEN}"
-  ./aliyunpan login -RefreshToken=${ALIYUNPAN_REFRESH_TOKEN}
-fi
-
-./aliyunpan config set -transfer_url_type ${ALIYUNPAN_TRANSFER_URL_TYPE} 
-./aliyunpan webdav start -ip "0.0.0.0" -port 23077 -webdav_user "${ALIYUNPAN_AUTH_USER}" -webdav_password "${ALIYUNPAN_AUTH_PASSWORD}" -pan_drive "${ALIYUNPAN_PAN_DRIVE}" -pan_dir_path "${ALIYUNPAN_PAN_DIR}" -bs ${ALIYUNPAN_BLOCK_SIZE}
@@ -1,30 +0,0 @@
-version: '3'
-
-services:
-  webdav:
-    image: tickstep/aliyunpan-webdav:v0.1.6
-    container_name: aliyunpan-webdav
-    restart: always
-    ports:
-      - 23077:23077
-    environment:
-      - TZ=Asia/Shanghai
-      # refresh token
-      - ALIYUNPAN_REFRESH_TOKEN=4dd40e8b165...42b8833e4a507b6
-      # webdav 登录用户名
-      - ALIYUNPAN_AUTH_USER=admin
-      # webdav 登录密码
-      - ALIYUNPAN_AUTH_PASSWORD=admin
-      # 指定网盘类型为文件，可选： File-文件 Album-相册
-      - ALIYUNPAN_PAN_DRIVE=File
-      # 指定网盘文件夹作为webdav服务根目录
-      - ALIYUNPAN_PAN_DIR=/
-      # 上传下载链接类型：1-默认 2-阿里ECS环境
-      - ALIYUNPAN_TRANSFER_URL_TYPE=1
-      # 上传数据块大小，单位为KB，默认为10240KB，建议范围1024KB~10240KB
-      - ALIYUNPAN_BLOCK_SIZE=10240
-
-
-
-
-
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-# 检查webdav的服务端口是否存在
-netstat -luntp | awk '{print $4}' | grep 23077
-if [ $? == 0 ]
-then
-    echo $?
-    exit 0
-else
-    echo $?
-    exit 1
-fi
-
-
@@ -1,161 +0,0 @@
-#!/bin/sh
-
-# how to use
-# for macOS & linux, run this command in shell
-# ./docker_build.sh v0.0.1
-
-name="aliyunpan"
-version=$1
-docker_image_name=tickstep/aliyunpan-sync
-
-if [ "$1" = "" ]; then
-  version=v1.0.0
-fi
-
-# build amd64 docker
-echo "building amd64 docker image"
-ARCH=amd64
-ZIP_FILE_NAME=aliyunpan-$version-linux-$ARCH
-# use alpine:3.15.0 as base image
-# browse the url to view more information: https://hub.docker.com/layers/alpine/library/alpine/3.15.0/images/sha256-c74f1b1166784193ea6c8f9440263b9be6cae07dfe35e32a5df7a31358ac2060?context=explore
-DOCKER_IMAGE_HASH=e7d88de73db3d3fd9b2d63aa7f447a10fd0220b7cbf39803c803f2af9ba256b3
-unzip -d ./out ./out/$ZIP_FILE_NAME.zip
-mv ./out/$ZIP_FILE_NAME ./out/binary_files
-
-docker build \
-f ./docker/sync/Dockerfile \
-t $docker_image_name:$version-$ARCH \
--build-arg DOCKER_IMAGE_HASH=$DOCKER_IMAGE_HASH \
--no-cache .
-
-rm -rf out/binary_files
-
-# build i386 docker
-echo "building i386 docker image"
-ARCH=386
-ZIP_FILE_NAME=aliyunpan-$version-linux-$ARCH
-DOCKER_IMAGE_HASH=2689e157117d2da668ad4699549e55eba1ceb79cb7862368b30919f0488213f4
-unzip -d ./out ./out/$ZIP_FILE_NAME.zip
-mv ./out/$ZIP_FILE_NAME ./out/binary_files
-
-docker build \
-f ./docker/sync/Dockerfile \
-t $docker_image_name:$version-$ARCH \
--build-arg DOCKER_IMAGE_HASH=$DOCKER_IMAGE_HASH \
--no-cache .
-
-rm -rf out/binary_files
-
-# build arm64 docker
-echo "building arm64 docker image"
-ARCH=arm64
-ZIP_FILE_NAME=aliyunpan-$version-linux-$ARCH
-DOCKER_IMAGE_HASH=c74f1b1166784193ea6c8f9440263b9be6cae07dfe35e32a5df7a31358ac2060
-unzip -d ./out ./out/$ZIP_FILE_NAME.zip
-mv ./out/$ZIP_FILE_NAME ./out/binary_files
-
-docker build \
-f ./docker/sync/Dockerfile \
-t $docker_image_name:$version-$ARCH \
--build-arg DOCKER_IMAGE_HASH=$DOCKER_IMAGE_HASH \
--no-cache .
-
-rm -rf out/binary_files
-
-# build armv7 docker
-echo "building armv7 docker image"
-ARCH=armv7
-ZIP_FILE_NAME=aliyunpan-$version-linux-$ARCH
-DOCKER_IMAGE_HASH=8483ecd016885d8dba70426fda133c30466f661bb041490d525658f1aac73822
-unzip -d ./out ./out/$ZIP_FILE_NAME.zip
-mv ./out/$ZIP_FILE_NAME ./out/binary_files
-
-docker build \
-f ./docker/sync/Dockerfile \
-t $docker_image_name:$version-$ARCH \
--build-arg DOCKER_IMAGE_HASH=$DOCKER_IMAGE_HASH \
--no-cache .
-
-rm -rf out/binary_files
-
-# build armv5 docker
-#echo "building armv5 docker image"
-#ARCH=armv5
-#ZIP_FILE_NAME=aliyunpan-$version-linux-$ARCH
-#DOCKER_IMAGE_HASH=e047bc2af17934d38c5a7fa9f46d443f1de3a7675546402592ef805cfa929f9d
-#unzip -d ./out ./out/$ZIP_FILE_NAME.zip
-#mv ./out/$ZIP_FILE_NAME ./out/binary_files
-#
-#docker build \
-#-f ./docker/sync/Dockerfile \
-#-t $docker_image_name:$version-$ARCH \
-#--build-arg DOCKER_IMAGE_HASH=$DOCKER_IMAGE_HASH \
-#--no-cache .
-#
-#rm -rf out/binary_files
-
-echo "push docker images"
-docker push $docker_image_name:$version-amd64
-docker push $docker_image_name:$version-386
-docker push $docker_image_name:$version-arm64
-docker push $docker_image_name:$version-armv7
-#docker push $docker_image_name:$version-armv5
-
-echo "create docker manifest"
-docker manifest create $docker_image_name:$version \
-$docker_image_name:$version-amd64 \
-$docker_image_name:$version-386 \
-$docker_image_name:$version-arm64 \
-$docker_image_name:$version-armv7 \
--amend
-
-
-echo "annotate manifest for amd64 image"
-docker manifest annotate \
--arch=amd64 \
--os=linux \
-$docker_image_name:$version \
-$docker_image_name:$version-amd64
-
-echo "annotate manifest for 386 image"
-docker manifest annotate \
--arch=386 \
--os=linux \
-$docker_image_name:$version \
-$docker_image_name:$version-386
-
-echo "annotate manifest for arm64 image"
-docker manifest annotate \
--arch=arm64 \
--os=linux  \
--variant=v8 \
-$docker_image_name:$version \
-$docker_image_name:$version-arm64
-
-echo "annotate manifest for armv7 image"
-docker manifest annotate \
--arch=arm \
--os=linux \
--variant=v7 \
-$docker_image_name:$version \
-$docker_image_name:$version-armv7
-
-#echo "annotate manifest for armv5 image"
-#docker manifest annotate \
-#--arch=arm \
-#--os=linux \
-#--variant=v6 \
-#$docker_image_name:$version \
-#$docker_image_name:$version-armv5
-
-echo "push manifest to docker hub"
-docker manifest push $docker_image_name:$version
-
-#echo "clear local docker image"
-#docker rmi $docker_image_name:$version-amd64
-#docker rmi $docker_image_name:$version-386
-#docker rmi $docker_image_name:$version-arm64
-#docker rmi $docker_image_name:$version-armv7
-#docker rmi $docker_image_name:$version-armv5
-
-echo "ALL DONE"
@@ -1,161 +0,0 @@
-#!/bin/sh
-
-# how to use
-# for macOS & linux, run this command in shell
-# ./docker_build.sh v0.0.1
-
-name="aliyunpan"
-version=$1
-docker_image_name=tickstep/aliyunpan-webdav
-
-if [ "$1" = "" ]; then
-  version=v1.0.0
-fi
-
-# build amd64 docker
-echo "building amd64 docker image"
-ARCH=amd64
-ZIP_FILE_NAME=aliyunpan-$version-linux-$ARCH
-# use alpine:3.15.0 as base image
-# browse the url to view more information: https://hub.docker.com/layers/alpine/library/alpine/3.15.0/images/sha256-c74f1b1166784193ea6c8f9440263b9be6cae07dfe35e32a5df7a31358ac2060?context=explore
-DOCKER_IMAGE_HASH=e7d88de73db3d3fd9b2d63aa7f447a10fd0220b7cbf39803c803f2af9ba256b3
-unzip -d ./out ./out/$ZIP_FILE_NAME.zip
-mv ./out/$ZIP_FILE_NAME ./out/binary_files
-
-docker build \
-f ./docker/webdav/Dockerfile \
-t $docker_image_name:$version-$ARCH \
--build-arg DOCKER_IMAGE_HASH=$DOCKER_IMAGE_HASH \
--no-cache .
-
-rm -rf out/binary_files
-
-# build i386 docker
-echo "building i386 docker image"
-ARCH=386
-ZIP_FILE_NAME=aliyunpan-$version-linux-$ARCH
-DOCKER_IMAGE_HASH=2689e157117d2da668ad4699549e55eba1ceb79cb7862368b30919f0488213f4
-unzip -d ./out ./out/$ZIP_FILE_NAME.zip
-mv ./out/$ZIP_FILE_NAME ./out/binary_files
-
-docker build \
-f ./docker/webdav/Dockerfile \
-t $docker_image_name:$version-$ARCH \
--build-arg DOCKER_IMAGE_HASH=$DOCKER_IMAGE_HASH \
--no-cache .
-
-rm -rf out/binary_files
-
-# build arm64 docker
-echo "building arm64 docker image"
-ARCH=arm64
-ZIP_FILE_NAME=aliyunpan-$version-linux-$ARCH
-DOCKER_IMAGE_HASH=c74f1b1166784193ea6c8f9440263b9be6cae07dfe35e32a5df7a31358ac2060
-unzip -d ./out ./out/$ZIP_FILE_NAME.zip
-mv ./out/$ZIP_FILE_NAME ./out/binary_files
-
-docker build \
-f ./docker/webdav/Dockerfile \
-t $docker_image_name:$version-$ARCH \
--build-arg DOCKER_IMAGE_HASH=$DOCKER_IMAGE_HASH \
--no-cache .
-
-rm -rf out/binary_files
-
-# build armv7 docker
-echo "building armv7 docker image"
-ARCH=armv7
-ZIP_FILE_NAME=aliyunpan-$version-linux-$ARCH
-DOCKER_IMAGE_HASH=8483ecd016885d8dba70426fda133c30466f661bb041490d525658f1aac73822
-unzip -d ./out ./out/$ZIP_FILE_NAME.zip
-mv ./out/$ZIP_FILE_NAME ./out/binary_files
-
-docker build \
-f ./docker/webdav/Dockerfile \
-t $docker_image_name:$version-$ARCH \
--build-arg DOCKER_IMAGE_HASH=$DOCKER_IMAGE_HASH \
--no-cache .
-
-rm -rf out/binary_files
-
-# build armv5 docker
-#echo "building armv5 docker image"
-#ARCH=armv5
-#ZIP_FILE_NAME=aliyunpan-$version-linux-$ARCH
-#DOCKER_IMAGE_HASH=e047bc2af17934d38c5a7fa9f46d443f1de3a7675546402592ef805cfa929f9d
-#unzip -d ./out ./out/$ZIP_FILE_NAME.zip
-#mv ./out/$ZIP_FILE_NAME ./out/binary_files
-#
-#docker build \
-#-f ./docker/webdav/Dockerfile \
-#-t $docker_image_name:$version-$ARCH \
-#--build-arg DOCKER_IMAGE_HASH=$DOCKER_IMAGE_HASH \
-#--no-cache .
-#
-#rm -rf out/binary_files
-
-echo "push docker images"
-docker push $docker_image_name:$version-amd64
-docker push $docker_image_name:$version-386
-docker push $docker_image_name:$version-arm64
-docker push $docker_image_name:$version-armv7
-#docker push $docker_image_name:$version-armv5
-
-echo "create docker manifest"
-docker manifest create $docker_image_name:$version \
-$docker_image_name:$version-amd64 \
-$docker_image_name:$version-386 \
-$docker_image_name:$version-arm64 \
-$docker_image_name:$version-armv7 \
--amend
-
-
-echo "annotate manifest for amd64 image"
-docker manifest annotate \
--arch=amd64 \
--os=linux \
-$docker_image_name:$version \
-$docker_image_name:$version-amd64
-
-echo "annotate manifest for 386 image"
-docker manifest annotate \
--arch=386 \
--os=linux \
-$docker_image_name:$version \
-$docker_image_name:$version-386
-
-echo "annotate manifest for arm64 image"
-docker manifest annotate \
--arch=arm64 \
--os=linux  \
--variant=v8 \
-$docker_image_name:$version \
-$docker_image_name:$version-arm64
-
-echo "annotate manifest for armv7 image"
-docker manifest annotate \
--arch=arm \
--os=linux \
--variant=v7 \
-$docker_image_name:$version \
-$docker_image_name:$version-armv7
-
-#echo "annotate manifest for armv5 image"
-#docker manifest annotate \
-#--arch=arm \
-#--os=linux \
-#--variant=v6 \
-#$docker_image_name:$version \
-#$docker_image_name:$version-armv5
-
-echo "push manifest to docker hub"
-docker manifest push $docker_image_name:$version
-
-#echo "clear local docker image"
-#docker rmi $docker_image_name:$version-amd64
-#docker rmi $docker_image_name:$version-386
-#docker rmi $docker_image_name:$version-arm64
-#docker rmi $docker_image_name:$version-armv7
-#docker rmi $docker_image_name:$version-armv5
-
-echo "ALL DONE"
@@ -4,6 +4,7 @@
 工具安装，运行下面的命令即可生成工具。也可以直接用 bin/ 文件夹下面的编译好的
 ```
 go get github.com/josephspurrier/goversioninfo/cmd/goversioninfo
+go install github.com/josephspurrier/goversioninfo/cmd/goversioninfo
 ```

 versioninfo.json - 里面有exe程序信息以及ico的配置
@@ -0,0 +1,793 @@
+# 目录
+- [命令列表及说明](#命令列表及说明)
+    * [注意](#注意)
+    * [修改配置文件存储路径](#修改配置文件存储路径)
+    * [检测程序更新](#检测程序更新)
+    * [查看帮助](#查看帮助)
+    * [登录阿里云盘帐号](#登录阿里云盘帐号)
+    * [列出帐号列表](#列出帐号列表)
+    * [获取当前帐号](#获取当前帐号)
+    * [切换阿里云盘帐号](#切换阿里云盘帐号)
+    * [退出阿里云盘帐号](#退出阿里云盘帐号)
+    * [切换网盘(备份盘/资源库)](#切换网盘)
+    * [获取网盘配额](#获取网盘配额)
+    * [切换工作目录](#切换工作目录)
+    * [输出工作目录](#输出工作目录)
+    * [列出目录](#列出目录)
+    * [下载文件/目录](#下载文件目录)
+    * [多用户联合下载](#多用户联合下载)
+    * [上传文件/目录](#上传文件目录)
+    * [创建目录](#创建目录)
+    * [删除文件/目录](#删除文件目录)
+    * [移动文件/目录](#移动文件目录)
+    * [重命名文件/目录](#重命名文件目录)
+    * [分享文件/目录](#分享文件目录)
+        + [设置分享文件/目录](#设置分享文件目录)
+        + [创建快传链接](#创建快传链接)
+        + [列出已分享文件/目录](#列出已分享文件目录)
+        + [取消分享文件/目录](#取消分享文件目录)
+    * [共享相册](#共享相册)
+        + [展示共享相簿列表](#展示共享相簿列表)
+        + [展示指定相簿中的文件](#展示指定相簿中的文件)
+        + [下载相簿中的所有文件](#下载相簿中的所有文件)
+    * [同步备份功能](#同步备份功能)
+        + [常用命令说明](#常用命令说明)
+        + [备份配置文件说明](#备份配置文件说明)
+        + [命令行启动](#命令行启动)
+        + [Linux后台启动](#Linux后台启动)
+        + [Windows后台启动](#Windows后台启动)
+        + [Docker运行](#Docker运行)
+    * [JavaScript插件](#JavaScript插件)
+    * [显示和修改程序配置项](#显示和修改程序配置项)
+- [常见问题Q&A](#常见问题QA)
+    * [1. 如何开启Debug调试日志](#1-如何开启Debug调试日志)
+
+# 命令列表及说明
+## 注意
+
+命令的前缀 `aliyunpan` 为指向程序运行的全路径名 (ARGv 的第一个参数)
+
+直接运行程序时, 未带任何其他参数, 则程序进入cli交互模式, 进入cli模式运行以下命令时要把命令的前缀 `aliyunpan` 去掉! 即不需要输入`aliyunpan`。
+
+cli交互模式支持按tab键自动补全命令.
+
+## 修改配置文件存储路径
+设置环境变量ALIYUNPAN_CONFIG_DIR并指定一个存在目录即可，注意目录需要是绝对路径
+```
+例如linux下面可以这样指定
+
+export ALIYUNPAN_CONFIG_DIR=/home/tickstep/tools/aliyunpan/config
+```
+
+## 检测程序更新
+```
+aliyunpan update
+```
+
+## 查看帮助
+```
+aliyunpan help
+```
+### 例子
+```
+列出程序支持的命令
+aliyunpan help
+
+查看login命令的帮助手册
+aliyunpan help login
+```
+
+## 登录阿里云盘帐号
+
+### 登录
+当前支持在浏览器进行登录，请输入以下命令按照步骤进行即可。
+```
+aliyunpan login
+```
+
+### 例子
+```
+aliyunpan > login
+请在浏览器打开以下链接进行登录，链接有效时间为5分钟。
+https://openapi.alipan.com/oauth/authorize?client_id=cf9f70e8fc61430f8ec5ab5cadf31375&redirect_uri=https%3A%2F%2Fapi.tickstep.com%2Fauth%2Ftickstep%2Faliyunpan%2Ftoken%2Fopenapi%2F8206f0.....fb5db6b40336%2Fauth&scope=user:base,file:all:read,file:all:write
+阿里云盘登录成功:  tickstep
+aliyunpan:/ tickstep$ 
+```
+目前登录全部采用网页登录，由于 aliyunpan 融合了阿里官方Open接口+网页Web端接口，所以你需要进行两次登录。输入 login 命令   
+![](../assets/images/login-screenshot-1.png)
+
+复制该链接到浏览器打开，会自动跳转到阿里官方授权登录页面，点击允许完成第一次登录   
+![](../assets/images/login-screenshot-2.png)
+
+接着页面会自动跳转到网页接口登录页面，使用阿里APP扫码完成第二次登录   
+![](../assets/images/login-screenshot-3.png)
+
+然后切换回 aliyunpan 程序，按下 Enter 按键完成登录即可   
+![](../assets/images/login-screenshot-4.png)
+   
+## 列出帐号列表
+
+```
+aliyunpan loglist
+```
+
+列出所有已登录的帐号
+
+## 获取当前帐号
+
+```
+aliyunpan who
+```
+
+## 切换阿里云盘帐号
+
+切换已登录的帐号
+```
+aliyunpan su <uid>
+```
+```
+aliyunpan su
+
+请输入要切换帐号的 # 值 >
+```
+
+## 退出阿里云盘帐号
+
+退出当前登录的帐号
+```
+aliyunpan logout
+```
+
+程序会进一步确认退出帐号, 防止误操作.
+
+## 切换网盘
+程序默认工作在文件网盘下，如需切换到资源库网盘，可以使用本命令进行切换。
+```
+aliyunpan drive <driveId>
+```
+```
+aliyunpan drive
+
+输入要切换的网盘 # 值 >
+```
+
+## 获取网盘配额
+
+```
+aliyunpan quota
+```
+获取网盘的总储存空间, 和已使用的储存空间
+
+## 切换工作目录
+```
+aliyunpan cd <目录>
+```
+
+### 例子
+```
+# 切换 /我的文档 工作目录
+aliyunpan cd /我的文档
+
+# 切换 上级目录
+aliyunpan cd ..
+
+# 切换 根目录
+aliyunpan cd /
+
+```
+
+## 输出工作目录
+```
+aliyunpan pwd
+```
+
+## 列出目录
+
+列出当前工作目录的文件和目录或指定目录
+```
+aliyunpan ls
+```
+```
+aliyunpan ls <目录>
+```
+
+### 可选参数
+```
+-driveId value  网盘ID
+```
+
+### 例子
+```
+# 列出 我的文档 内的文件和目录
+aliyunpan ls 我的文档
+
+# 绝对路径
+aliyunpan ls /我的文档
+
+# 详细列出 我的文档 内的文件和目录
+aliyunpan ll /我的文档
+```
+
+## 下载文件/目录
+```
+aliyunpan download <网盘文件或目录的路径1> <文件或目录2> <文件或目录3> ...
+aliyunpan d <网盘文件或目录的路径1> <文件或目录2> <文件或目录3> ...
+```
+
+### 可选参数
+```
+   --ow             overwrite, 覆盖已存在的文件
+   --status         输出所有线程的工作状态
+   --save           将下载的文件直接保存到当前工作目录
+   --saveto value   将下载的文件直接保存到指定的目录
+   -x               为文件加上执行权限, (windows系统无效)
+   -p value         parallel,指定同时进行下载文件的数量（取值范围:1 ~ 3） (default: 1)
+   --sp value       slice parallel,指定单个文件下载的最大线程(分片)数（取值范围:1 ~ 3） (default: 0)
+   --retry value    下载失败最大重试次数 (default: 3)
+   --nocheck        下载文件完成后不校验文件
+   --np             no progress 不展示下载进度条
+   --driveId value  网盘ID
+   --exn value      exclude name，指定排除的文件夹或者文件的名称，被排除的文件不会进行下载，只支持正则表达式。支持同时排除多个名称，每一个名称就是一个exn参数
+   --md             (BETA) Multi-User Download，使用多用户联合下载，可以对单一文件叠加所有登录用户的下载速度
+   --ui             (BETA) 使用UI面板显示下载详情和进度，更加直观和友好
+```
+
+
+### 例子
+```
+# 设置保存目录, 保存到 D:\Downloads
+# 注意区别反斜杠 "\" 和 斜杠 "/" !!!
+aliyunpan config set -savedir D:/Downloads
+
+# 下载 /我的文档/1.mp4
+aliyunpan d /我的文档/1.mp4
+
+# 下载 /我的文档 整个目录!!
+aliyunpan d /我的文档
+
+# 下载 /photo 整个目录，并使用UI面板展示下载详情
+aliyunpan d /photo -ui
+```
+
+下载的文件默认保存到 **程序所在目录** 的 download/ 目录, 支持设置指定目录, 重名的文件会自动跳过!
+
+通过 `aliyunpan config set -savedir <savedir>` 可以自定义保存的目录。   
+支持多个文件或目录下载，支持自动跳过下载重名的文件!   
+
+### Linux后台下载
+需要结合nohup进行启动。
+   
+新建 download.sh 脚本，内容如下
+```
+#!/bin/bash
+
+# 是否开启调试日志
+export ALIYUNPAN_VERBOSE=0
+# （可选）配置目录的绝对路径（请更改成你自己的目录）
+export ALIYUNPAN_CONFIG_DIR=/Users/tickstep/Applications/adrive/config
+# aliyunpan程序所在的绝对路径（请更改成你自己的目录）
+export ALIYUNPAN_BIN=/Users/tickstep/Applications/adrive/aliyunpan
+
+# 本地目录（请更改成你自己的目录）
+LOCAL_DIR="/tickstep/Documents/我的文档"
+# 网盘目录（请更改成你自己的目录）
+PAN_DIR="/我的文档"
+
+# 执行下载
+"$ALIYUNPAN_BIN" download --saveto "$LOCAL_DIR" "$PAN_DIR"
+```
+
+增加脚本执行权限
+```
+$ chmod +x download.sh
+```
+
+然后启动该脚本进行后台运行
+```
+$ nohup ./download.sh > aliyunpan.log 2>&1 &
+```
+
+## 多用户联合下载
+前提：程序必须登录多个帐号，并且登录授权都有效。   
+```
+# 使用多用户联合下载 /我的资源/1.mp4 文件。必须保证所有登录的用户在相同的网盘（备份盘/资源盘）下，相同的路径下，有相同的文件
+aliyunpan download /我的资源/1.mp4 -md
+```
+什么是多用户联合下载？   
+由于阿里云盘的限制，一个用户下载的时候只能有3个线程并发数，未开通三方权益包的账号一个下载线程速度大概是500KB/s，3个并发即为1.5MB/s。   
+多用户联合下载，即是多个用户同时下载同一个文件，每个用户并发3个线程，N个用户即能开启 Nx3 个线程，对应的下载速度叠加为 Nx1.5MB/s。   
+对下载速度有极致追求的用户可以尝试使用该选项。   
+如果你的账号都开通了三方权益包，则一个用户下载速度为50MB/s，两个用户联合下载可以轻松突破100MB/s。   
+![](../assets/images/multi_user_download.png)
+
+## 上传文件/目录
+```
+aliyunpan upload <本地文件/目录的路径1> <文件/目录2> <文件/目录3> ... <目标目录>
+aliyunpan u <本地文件/目录的路径1> <文件/目录2> <文件/目录3> ... <目标目录>
+```
+
+### 例子:
+```
+# 将本地的 C:\Users\Administrator\Desktop\1.mp4 上传到网盘 /视频 目录
+# 注意区别反斜杠 "\" 和 斜杠 "/" !!!
+aliyunpan upload C:/Users/Administrator/Desktop/1.mp4 /视频
+
+# 将本地的 C:\Users\Administrator\Desktop\1.mp4 和 C:\Users\Administrator\Desktop\2.mp4 上传到网盘 /视频 目录
+aliyunpan upload C:/Users/Administrator/Desktop/1.mp4 C:/Users/Administrator/Desktop/2.mp4 /视频
+
+# 将本地的 C:\Users\Administrator\Desktop 整个目录上传到网盘 /视频 目录
+aliyunpan upload C:/Users/Administrator/Desktop /视频
+
+# 将本地的 C:\Users\Administrator\Desktop 整个目录上传到网盘 /视频 目录，并使用UI面板展示下载详情
+aliyunpan upload C:/Users/Administrator/Desktop /视频 -ui
+
+## 下面演示文件或者文件夹排除功能
+
+# 将本地的 C:\Users\Administrator\Video 整个目录上传到网盘 /视频 目录，但是排除所有的.jpg文件
+aliyunpan upload -exn "\.jpg$" C:/Users/Administrator/Video /视频
+
+# 将本地的 C:\Users\Administrator\Video 整个目录上传到网盘 /视频 目录，但是排除所有的.jpg文件和.mp3文件，每一个排除项就是一个exn参数
+aliyunpan upload -exn "\.jpg$" -exn "\.mp3$" C:/Users/Administrator/Video /视频
+
+以下是典型的排除特定文件或者文件夹的例子，注意：参数值必须是正则表达式
+1)排除@eadir文件或者文件夹：-exn "^@eadir$"
+2)排除.jpg文件：-exn "\.jpg$"
+3)排除.号开头的文件：-exn "^\."
+4)排除~号开头的文件：-exn "^~"
+5)排除 myfile.txt 文件：-exn "^myfile.txt$"
+```
+### Linux后台上传
+需要结合nohup进行启动。   
+   
+新建 upload.sh 脚本，内容如下
+```
+#!/bin/bash
+
+# 是否开启调试日志 (1=开启, 0=关闭)
+export ALIYUNPAN_VERBOSE=0
+
+# （可选）配置目录的绝对路径
+export ALIYUNPAN_CONFIG_DIR="/Users/tickstep/Applications/adrive/config"
+
+# aliyunpan程序所在的绝对路径
+export ALIYUNPAN_BIN="/Users/tickstep/Applications/adrive/aliyunpan"
+
+# 本地目录
+LOCAL_DIR="/tickstep/Documents/我的文档"
+
+# 网盘目录
+PAN_DIR="/我的文档"
+
+# 检查本地目录是否存在
+if [ ! -d "$LOCAL_DIR" ]; then
+    echo "[ERROR] 本地目录不存在: $LOCAL_DIR"
+    exit 1
+fi
+
+# 执行上传（已修复引号、添加安全引用和覆盖策略）
+"$ALIYUNPAN_BIN" upload \
+    -exn "^\." \
+    -exn "^@eadir$" \
+    -ow \
+    "$LOCAL_DIR" \
+    "$PAN_DIR"
+
+echo "[INFO] 上传任务执行完毕"
+```
+
+增加脚本执行权限
+```
+$ chmod +x upload.sh
+```
+
+然后启动该脚本进行后台运行
+```
+$ nohup ./upload.sh > aliyunpan.log 2>&1 &
+```
+
+## 创建目录
+```
+aliyunpan mkdir <目录>
+```
+
+### 例子
+```
+aliyunpan mkdir test123
+```
+
+## 删除文件/目录
+```
+aliyunpan rm <网盘文件或目录的路径1> <文件或目录2> <文件或目录3> ...
+```
+
+注意: 删除多个文件和目录时, 请确保每一个文件和目录都存在, 否则删除操作会失败.
+
+被删除的文件或目录可在网盘文件回收站找回.
+
+### 例子
+```
+# 删除 /我的文档/1.mp4
+aliyunpan rm /我的文档/1.mp4
+
+# 删除 /我的文档/1.mp4 和 /我的文档/2.mp4
+aliyunpan rm /我的文档/1.mp4 /我的文档/2.mp4
+
+# 删除 /我的文档 整个目录 !!
+aliyunpan rm /我的文档
+```
+
+
+## 移动文件/目录
+```
+aliyunpan mv <文件/目录1> <文件/目录2> <文件/目录3> ... <目标目录>
+```
+
+注意: 移动多个文件和目录时, 请确保每一个文件和目录都存在, 否则移动操作会失败.
+
+### 例子
+```
+# 将 /我的文档/1.mp4 移动到 根目录 /
+aliyunpan mv /我的文档/1.mp4 /
+```
+
+## 重命名文件/目录
+```
+aliyunpan rename <旧文件/目录名> <新文件/目录名>
+```
+
+注意: 重命名的文件/目录，如果指定的是绝对路径，则必须保证新旧的绝对路径在同一个文件夹内，否则重命名失败！
+
+### 例子
+```
+# 将 /我的文档/1.mp4 重命名为 /我的文档/2.mp4
+aliyunpan rename /我的文档/1.mp4 /我的文档/2.mp4
+```
+
+## 分享文件/目录
+```
+aliyunpan share
+```
+
+### 设置分享文件/目录
+阿里目前只支持少数文件类型的分享，不支持的文件分享会提示分享失败
+```
+aliyunpan share set -mode 1 <文件/目录1> <文件/目录2> ...
+```
+
+### 创建快传链接
+阿里的快传支持大部分文件的共享，例如zip压缩包，按照如下方式可以创建快传链接
+```
+aliyunpan share set -mode 3 <文件/目录1> <文件/目录2> ...
+```
+
+### 列出已分享文件/目录
+```
+aliyunpan share list
+```
+
+### 取消分享文件/目录
+```
+aliyunpan share cancel <shareid_1> <shareid_2> ...
+```
+目前只支持通过分享id (shareid) 来取消分享.
+
+## 共享相册
+```
+aliyunpan album
+```
+
+### 展示共享相簿列表
+```
+aliyunpan album list
+```
+
+### 展示指定相簿中的文件
+展示相簿中文件，同名的相簿只会展示第一个符合条件的
+```
+例如：展示相簿中文件"我的相簿2025"
+aliyunpan album list-file "我的相簿2025"
+```
+
+### 下载相簿中的所有文件
+下载相簿中的所有文件到本地，支持普通照片、实况照片。
+```
+下载相簿 "我的相簿2025" 里面的所有文件
+aliyunpan album download-file 我的相簿2025
+```
+
+## 同步备份功能
+同步备份功能，支持备份本地文件到云盘，备份云盘文件到本地两种模式。支持JavaScript插件对备份文件进行过滤。
+指定本地目录和对应的一个网盘目录，以备份文件。网盘目录必须和本地目录独占使用，不要用作其他用途，不然备份可能会有问题。
+   
+备份功能支持以下模式：   
+1. 备份本地文件，即上传本地文件到网盘，始终保持本地文件有一个完整的备份在网盘
+2. 备份云盘文件，即下载网盘文件到本地，始终保持网盘的文件有一个完整的备份在本地
+   
+备份功能支持指定备份策略：
+1. exclusive，排他备份文件，目标目录多余的文件会被删除。保证备份的源目录，和目标目录文件一比一备份。源目录文件如果文件被删除，则对应的目标目录的文件也会被删除。
+2. increment，增量备份文件，目标目录多余的文件不会被删除。只会把源目录修改的文件，新增的文件备份到目标目录。如果源目录有文件删除，或者目标目录有其他文件新增是不会被删除。
+   
+备份功能一般用于NAS等系统，进行文件备份。比如备份照片，就可以使用这个功能定期备份照片到云盘。   
+   
+同步的基本逻辑如下所示，一次循环包括：扫描-对比-执行，一共三个环节。   
+![](../assets/images/sync_command-basic_logic.jpg)
+
+### 常用命令说明
+```
+查看同步备份功能说明
+aliyunpan sync
+
+查看如何配置和启动同步备份功能
+aliyunpan sync start -h
+
+使用命令行配置启动同步备份服务，将本地目录 D:\tickstep\Documents\设计文档 中的文件备份上传到云盘目录 /sync_drive/我的文档
+aliyunpan sync start -ldir "D:\tickstep\Documents\设计文档" -pdir "/sync_drive/我的文档" -mode "upload"
+
+使用命令行配置启动同步备份服务，将云盘目录 /sync_drive/我的文档 中的文件备份下载到本地目录 D:\tickstep\Documents\设计文档
+aliyunpan sync start -ldir "D:\tickstep\Documents\设计文档" -pdir "/sync_drive/我的文档" -mode "download"
+
+使用命令行配置启动同步备份服务，将本地目录 D:\tickstep\Documents\设计文档 中的文件备份到云盘目录 /sync_drive/我的文档
+同时配置下载并发为2，上传并发为1，下载分片大小为256KB，上传分片大小为1MB
+aliyunpan sync start -ldir "D:\tickstep\Documents\设计文档" -pdir "/sync_drive/我的文档" -mode "upload" -dp 2 -up 1 -dbs 256 -ubs 1024
+    
+使用配置文件启动同步备份服务，使用配置文件可以支持同时启动多个备份任务。配置文件必须存在，否则启动失败。
+aliyunpan sync start
+
+使用配置文件启动同步备份服务，并配置下载并发为2，上传并发为1，下载分片大小为256KB，上传分片大小为1MB
+aliyunpan sync start -dp 2 -up 1 -dbs 256 -ubs 1024
+```
+
+### 备份配置文件说明
+如果你只有一个文件夹进行备份建议直接使用命令行配置启动即可。如果需要同时启动多个备份任务，则可以使用备份配置文件启动同步备份任务。   
+配置文件如下所示，如果你有通过环境变量```ALIYUNPAN_CONFIG_DIR```设置配置目录，则需要将```sync_drive```文件夹拷贝到配置的目录中才可以生效。
+```
+配置文件需要保存在：(配置目录)/sync_drive/sync_drive_config.json，样例如下：
+
+{
+ "configVer": "1.0",
+ "syncTaskList": [
+  {
+   "name": "设计文档备份",
+   "localFolderPath": "D:/tickstep/Documents/设计文档",
+   "panFolderPath": "/备份盘/我的文档",
+   "mode": "upload",
+   "driveName": "backup"
+  },
+  {
+   "name": "手机图片备份",
+   "localFolderPath": "D:/tickstep/Photos/手机图片",
+   "panFolderPath": "/备份盘/手机图片",
+   "mode": "upload",
+   "driveName": "resource"
+  }
+ ]
+}
+
+相关字段说明如下：
+name - 任务名称
+localFolderPath - 本地目录
+panFolderPath - 网盘目录
+mode - 模式，支持: upload(备份本地文件到云盘),download(备份云盘文件到本地)
+driveName - 网盘，支持：backup(备份盘), resource(资源盘)
+```
+
+### 命令行启动
+需要先进行登录。然后使用以下命令运行即可，该命令是阻塞的不会退出。
+
+```
+使用命令行配置启动同步备份服务，将本地目录 /tickstep/Documents/设计文档 中的文件备份上传到云盘目录 /备份盘/我的文档
+./aliyunpan sync start -ldir "/tickstep/Documents/设计文档" -pdir "/备份盘/我的文档" -mode "upload" -drive "backup"
+
+参数说明
+ldir：本地目录
+pdir：云盘目录
+mode：备份模式，支持：upload(备份本地文件到云盘),download(备份云盘文件到本地)
+drive - 网盘，支持：backup(备份盘), resource(资源盘)
+
+--------------------------------------------------------------
+正常会有以下的输出：
+
+启动同步备份进程
+备份配置文件：(使用命令行配置)
+链接类型：默认链接
+下载并发：2
+上传并发：2
+下载分片大小：1.00MB
+上传分片大小：10.00MB
+
+启动同步任务
+任务: 设计文档(de3d6b69a607497b73624bcca0845f19)
+同步模式: 备份本地文件（只上传）
+本地目录: /tickstep/Documents/设计文档
+云盘目录: /备份盘/我的文档
+```
+
+### Linux后台启动
+建议结合nohup进行启动。
+
+sync.sh脚本，内容如下
+```
+#!/bin/bash
+
+# 是否开启调试日志
+export ALIYUNPAN_VERBOSE=0
+# （可选）配置目录的绝对路径（请更改成你自己的目录）
+export ALIYUNPAN_CONFIG_DIR=/Users/tickstep/Applications/adrive/config
+# aliyunpan程序所在的绝对路径（请更改成你自己的目录）
+export ALIYUNPAN_BIN=/Users/tickstep/Applications/adrive/aliyunpan
+
+# 本地目录（请更改成你自己的目录）
+LOCAL_DIR="/tickstep/Documents/设计文档"
+# 网盘目录（请更改成你自己的目录）
+PAN_DIR="/备份盘/我的文档"
+
+# 指定配置参数并进行启动
+# 支持的模式：upload(备份本地文件到云盘),download(备份云盘文件到本地)
+"$ALIYUNPAN_BIN" sync start -ldir "$LOCAL_DIR" -pdir "$PAN_DIR" -mode "upload" -drive "backup"
+```
+
+增加脚本执行权限
+```
+$ chmod +x sync.sh
+```
+
+然后启动该脚本进行后台运行
+```
+$ nohup ./sync.sh >/dev/null 2>&1 &
+```
+
+### Windows后台启动
+需要结合 [WinSW](https://github.com/winsw/winsw) 进行后台启动，请前往官网自行下载: https://github.com/winsw/winsw
+
+步骤如下：
+1. 配置好备份任务：(配置目录)\sync_drive\sync_drive_config.json
+2. 下载winsw.exe并更名为alisync.exe
+3. 新增一个alisync.xml文件，内容如下：
+```xml
+<service>
+  <id>alisync</id>
+  <name>alisync</name>
+  <description>aliyunpan-sync 后台备份服务。</description>
+  <env name="ALIYUNPAN_CONFIG_DIR" value="(更改成你PC上aliyunpan.exe工具所在目录)"/>
+  <executable>aliyunpan.exe</executable>
+  <arguments>sync start</arguments>
+  <log mode="roll"></log>
+</service>
+```
+4. 将alisync.exe和alisync.xml存放在你PC上aliyunpan.exe工具所在目录，例如：   
+![](../assets/images/win10-alisync-service.png)
+5. CMD命令行启动程序
+```
+# 安装服务（只需要第一次安装，后面不用再安装）
+D:\Program Files\aliyunpan>alisync install
+
+# 启动服务
+D:\Program Files\aliyunpan>alisync start
+2022-06-21 13:39:05,795 INFO  - Starting service 'alisync (alisync)'...
+2022-06-21 13:39:06,361 INFO  - Service 'alisync (alisync)' started successfully.
+
+# 查看服务状态
+D:\Program Files\aliyunpan>alisync status
+Started
+
+# 停止服务
+D:\Program Files\aliyunpan>alisync stop
+2022-06-21 13:42:32,201 INFO  - Stopping service 'alisync (alisync)'...
+2022-06-21 13:42:32,211 INFO  - Service 'alisync (alisync)' stopped successfully.
+```
+效果截图如下   
+![](../assets/images/win10-alisync-service-bg.png)
+
+### Docker运行
+详情文档请参考dockerhub网址：[tickstep/aliyunpan-sync](https://hub.docker.com/r/tickstep/aliyunpan-sync)
+
+1. 直接运行
+```
+docker run -d --name=aliyunpan-sync --restart=always -v "<your aliyunpan_config.json>:/home/app/config/aliyunpan_config.json" -v "<your local dir>:/home/app/data" -e ALIYUNPAN_PAN_DIR="<your drive pan dir>" -e ALIYUNPAN_SYNC_MODE="upload" -e ALIYUNPAN_SYNC_POLICY="increment" -e ALIYUNPAN_SYNC_DRIVE="backup" -e ALIYUNPAN_SYNC_LOG="true" tickstep/aliyunpan-sync:<tag>
+  
+<your aliyunpan_config.json>: 用户已经登录成功并保存好的aliyunpan_config.json凭据文件
+<your local dir>：本地目标目录，绝对路径，例如：/tickstep/Documents/设计文档
+ALIYUNPAN_PAN_DIR：云盘目标目录，绝对路径
+ALIYUNPAN_SYNC_MODE：备份模式，支持: upload(备份本地文件到云盘),download(备份云盘文件到本地)
+ALIYUNPAN_SYNC_POLICY：备份策略，支持：exclusive(排他备份文件，目标目录多余的文件会被删除),increment(增量备份文件，目标目录多余的文件不会被删除)
+ALIYUNPAN_SYNC_DRIVE: 网盘，支持：backup(备份盘), resource(资源盘)
+ALIYUNPAN_SYNC_LOG: 同步日志，true-开启同步日志显示，false-关闭同步日志
+```
+
+2. docker-compose运行   
+   docker-compose.yml 文件如下所示，为了方便说明增加了相关的注释，部署的时候可以去掉注释。
+
+```
+version: '3'
+services:
+  sync:
+    image: tickstep/aliyunpan-sync:<tag>
+    container_name: aliyunpan-sync
+    restart: always
+    volumes:
+      # （必须）映射的本地目录
+      - ./data:/home/app/data:rw
+      # （可选）可以指定JS插件sync_handler.js用于过滤文件，详见插件说明
+      #- ./plugin/js/sync_handler.js:/home/app/config/plugin/js/sync_handler.js
+      # （推荐）挂载sync_drive同步数据库到本地，这样即使容器销毁，同步数据库还可以用于以后使用
+      #- ./sync_drive:/home/app/config/sync_drive
+      # （必须）映射token凭据文件
+      - /your/file/path/for/aliyunpan_config.json:/home/app/config/aliyunpan_config.json
+    environment:
+      # 时区，东8区
+      - TZ=Asia/Shanghai
+      # 下载文件并发数
+      - ALIYUNPAN_DOWNLOAD_PARALLEL=2
+      # 上传文件并发数
+      - ALIYUNPAN_UPLOAD_PARALLEL=2
+      # 下载数据块大小，单位为KB，默认为10240KB，建议范围1024KB~10240KB
+      - ALIYUNPAN_DOWNLOAD_BLOCK_SIZE=1024
+      # 上传数据块大小，单位为KB，默认为10240KB，建议范围1024KB~10240KB
+      - ALIYUNPAN_UPLOAD_BLOCK_SIZE=10240
+      # 指定网盘文件夹作为备份目标目录，不要指定根目录
+      - ALIYUNPAN_PAN_DIR=/my_sync_dir
+      # 备份模式：upload(备份本地文件到云盘), download(备份云盘文件到本地)
+      - ALIYUNPAN_SYNC_MODE=upload
+      # 备份策略: exclusive(排他备份文件，目标目录多余的文件会被删除),increment(增量备份文件，目标目录多余的文件不会被删除)
+      - ALIYUNPAN_SYNC_POLICY=increment
+      # 备份周期, 支持两种: infinity(永久循环备份),onetime(只运行一次备份)
+      - ALIYUNPAN_SYNC_CYCLE=infinity
+      # 网盘：backup(备份盘), resource(资源盘)
+      - ALIYUNPAN_SYNC_DRIVE=backup
+      # 是否显示文件备份过程日志，true-显示，false-不显示
+      - ALIYUNPAN_SYNC_LOG=true
+      # 本地文件修改检测延迟间隔，单位秒。如果本地文件会被频繁修改，例如录制视频文件，配置好该时间可以避免上传未录制好的文件
+      - ALIYUNPAN_LOCAL_DELAY_TIME=3
+```
+
+3. sync_handler.js插件说明   
+可以使用JS插件过滤备份的文件。更多细节请查看文档：[JavaScript插件手册](https://github.com/tickstep/aliyunpan/blob/main/docs/plugin_manual.md#如何使用)
+
+## JavaScript插件
+本程序支持javascript插件，更多细节请查看文档：[JavaScript插件手册](https://github.com/tickstep/aliyunpan/blob/main/docs/plugin_manual.md)
+
+## 显示和修改程序配置项
+```
+# 显示配置
+aliyunpan config
+
+# 设置配置
+aliyunpan config set
+```
+
+
+### 例子
+```
+# 显示所有可以设置的值
+aliyunpan config -h
+aliyunpan config set -h
+
+# 设置下载文件的储存目录
+aliyunpan config set -savedir D:/Downloads
+
+# 设置下载最大并发量为 15
+aliyunpan config set -max_download_parallel 15
+
+# 组合设置
+aliyunpan config set -max_download_parallel 15 -savedir D:/Downloads
+```
+
+# 常见问题Q&A
+## 1 如何开启Debug调试日志
+当需要定位问题，或者提交issue的时候抓取log，则需要开启debug日志。步骤如下：
+
+### 第一步
+Linux&MacOS   
+命令行运行
+```
+export ALIYUNPAN_VERBOSE=1
+```
+
+Windows   
+不同版本会有些许不一样，请自行查询具体方法   
+设置示意图如下：
+![](../assets/images/win10-env-debug-config.png)
+
+### 第二步
+打开aliyunpan命令行程序，任何云盘命令都有类似如下日志输出
+![](../assets/images/debug-log-screenshot.png)
@@ -0,0 +1,553 @@
+# 目录
+- [简介](#简介)
+- [如何使用](#如何使用)
+- [JS中内置的函数](#JS中内置的函数)
+    + [console.log()](#consolelog)
+    + [console.println()](#consoleprintln)
+    + [PluginUtil.Http.get()](#PluginUtilHttpget)
+    + [PluginUtil.Http.post()](#PluginUtilHttppost)
+    + [PluginUtil.LocalFS.deleteFile()](#PluginUtilLocalFSdeleteFile)
+    + [PluginUtil.PanFS.deleteFile()](#PluginUtilPanFSdeleteFile)
+    + [PluginUtil.Email.sendTextMail()](#PluginUtilEmailsendTextMail)
+    + [PluginUtil.Email.sendHtmlMail()](#PluginUtilEmailsendHtmlMail)
+    + [PluginUtil.KV.putString()](#PluginUtilKVputString)
+    + [PluginUtil.KV.getString()](#PluginUtilKVgetString)
+    + [PluginUtil.HashTool.md5Hex()](#PluginUtilHashToolmd5Hex)
+- [常见场景样例](#常见场景样例)
+    + [1.禁止特定文件上传](#1禁止特定文件上传)
+    + [2.上传文件后删除本地文件](#2上传文件后删除本地文件)
+    + [3.下载文件并截断过长的文件名](#3下载文件并截断过长的文件名)
+    + [4.上传文件去掉文件名包含的部分字符](#4上传文件去掉文件名包含的部分字符)
+    + [5.上传文件时过滤指定目录或者文件路径](#5上传文件时过滤指定目录或者文件路径)
+    + [6.下载云盘文件到本地后删除云盘对应的文件](#6下载云盘文件到本地后删除云盘对应的文件)
+    + [7.Token刷新失败发送外部通知](#7Token刷新失败发送外部通知)
+    + [8.每次只下载指定数量的文件](#8每次只下载指定数量的文件)
+
+# 简介
+本程序支持javascript插件。通过JS插件，你可以按照自己的需要定制上传、下载、同步、删除过程中关键步骤的行为，最大程度满足自己的个性化需求。   
+例如：   
+1. 排除某个特定敏感文件的上传   
+2. 上传文件进行改名，但是本地文件不做更改   
+3. 上传完成文件，删除本地文件   
+4. 上传的文件路径进行更改，但是本地的文件保持不变   
+5. 上传文件成功后，通过HTTP通知其他服务   
+6. 排除某些网盘文件的下载   
+7. 下载的文件进行改名，但是网盘的文件保持不变   
+8. 下载的文件路径进行更改，但是网盘的文件保持不变   
+9. 下载文件完成后，通过HTTP通知其他服务   
+10. 同步备份功能，支持过滤本地文件，或者过滤云盘文件。定制上传或者下载需要同步的文件
+
+# 如何使用
+JS插件的样本文件默认存放在程序所在的```plugin/js```文件夹下，分别为：
+1. 下载插件(download_handler.js.sample)
+2. 上传插件(upload_handler.js.sample)
+3. 删除插件(remove_handler.js.sample)
+4. 同步备份插件(sync_handler.js.sample)
+5. 用户Token插件(token_handler.js.sample)
+
+建议拷贝一份并将后缀名更改为.js，例如：upload_handler.js，不然插件不会生效。   
+你必须具备一定的JS语言基础，然后按照里面的样例根据自己所需进行改动即可。如果你不会JS那也没关系，你可以提issue需求，然后我们开发成员或者网友会给你提供JS脚本代码。   
+注意：如果你有通过环境变量```ALIYUNPAN_CONFIG_DIR```设置配置目录，则需要将plugin文件夹拷贝到配置的目录中才可以生效。
+
+# JS中内置的函数
+目前开放了如下函数，你可以在你的js脚本中直接调用，以用于增强JS脚本的扩展性、可玩性以及可适用性。  
+
+## console.log()
+打印日志，这个日志需要开启debug日志才会在控制台窗口显示
+```js
+console.log("hello world");
+```
+## console.println()
+打印日志，这个日志会直接在控制台窗口显示，无需开启debug日志
+```js
+console.println("hello world");
+```
+
+## PluginUtil.Http.get()
+发起HTTP的get请求
+```js
+    var header = {
+        "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/100.0.4896.88 Safari/537.36",
+        "Content-Type": "application/json",
+        "Accept": "application/json"
+    };
+    try {
+        var r = PluginUtil.Http.get(header, "https://625f528c53a42eaa07f37e13.mockapi.io/files/1");
+        console.log(r);
+    } catch (e) {
+        if (e !== "Error") {
+            throw e;
+        }
+    }
+```
+
+## PluginUtil.Http.post()
+发起HTTP的post请求
+```js
+    var header = {
+        "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/100.0.4896.88 Safari/537.36",
+        "Content-Type": "application/json",
+        "Accept": "application/json"
+    };
+    try {
+        var reqDataStr = JSON.stringify({
+            "id": "1",
+            "localFilePath": "/usr/local/src/borders_burundi_producer.gram.aab",
+            "localFileSize": 1111,
+            "uploadApproved": false
+        });
+        var r = PluginUtil.Http.post(header, "https://625f528c53a42eaa07f37e13.mockapi.io/files", reqDataStr);
+        console.log(r);
+    } catch (e) {
+        if (e !== "Error") {
+            throw e;
+        }
+    }
+```
+
+## PluginUtil.LocalFS.deleteFile()
+删除本地指定文件，不支持文件夹
+```
+PluginUtil.LocalFS.deleteFile(localFilePath);
+其中：
+localFilePath - 本地文件的绝对完整路径
+```
+样例
+```js
+PluginUtil.LocalFS.deleteFile("/Users/tickstep/Downloads/IMG_0884.HEIC");
+```
+
+## PluginUtil.PanFS.deleteFile()
+删除云盘指定文件，支持文件、文件夹
+```
+PluginUtil.PanFS.deleteFile(userId, driveId, panFileId);
+其中：
+userId - 登录的用户ID
+driveId - 网盘ID
+panFileId - 网盘文件ID
+```
+样例
+```js
+var userId = context["userId"]
+var driveId = params["driveId"]
+var driveFileId = params["driveFileId"]
+if (PluginUtil.PanFS.deleteFile(userId, driveId, driveFileId)) {
+    console.println("插件删除云盘文件成功")
+}
+```
+
+## PluginUtil.Email.sendTextMail()
+发送文本邮件，定义如下
+```
+PluginUtil.Email.sendTextMail(mailServer, userName, password, to, subject, body)
+
+其中：
+mailServer - smtp服务器+端口
+userName - 发件人邮箱地址
+password - 发件人邮箱密码
+to - 收件人邮箱地址
+subject - 邮件标题
+body - 邮件内容，纯文本
+```
+样例
+```js
+PluginUtil.Email.sendTextMail("smtp.qq.com:465", "123xxx@qq.com", "pwdxxxxxx", "12545xxx@qq.com", "文件上传通知", "该文件已经上传完毕");
+```
+
+## PluginUtil.Email.sendHtmlMail()
+发送HTML富文本邮件，定义如下
+```
+PluginUtil.Email.sendHtmlMail(mailServer, userName, password, to, subject, body)
+
+其中：
+mailServer - smtp服务器+端口
+userName - 发件人邮箱地址
+password - 发件人邮箱密码
+to - 收件人邮箱地址
+subject - 邮件标题
+body - 邮件内容，HTML富文本
+```
+样例
+```js
+var html = "<html>"
+    +"<body>"
+    +"<h1>文件上传通知</h1>"
+    +"<h2>该文件已经上传完毕</h2>"
+    +"</body>"
+    +"</html>";
+PluginUtil.Email.sendHtmlMail("smtp.qq.com:465", "123xxx@qq.com", "pwdxxxxxx", "12545xxx@qq.com", "文件上传通知", html);
+```
+
+## PluginUtil.KV.putString()
+存储键值对，定义如下
+```
+PluginUtil.KV.putString(key, value)
+
+其中：
+key - 键，字符串
+value - 值，字符串
+```
+样例
+```js
+PluginUtil.KV.putString("mykey", "1670419352");
+```
+
+## PluginUtil.KV.getString()
+获取存储的键值，指定对应的键，返回存储的值，如果没有则返回空字符串，定义如下
+```
+PluginUtil.KV.getString(key)
+
+其中：
+key - 键，字符串
+```
+样例
+```js
+var value = PluginUtil.KV.getString("mykey");
+```
+
+## PluginUtil.HashTool.md5Hex()
+计算指定字符串text的MD5值，返回hex格式的字符串MD5，定义如下
+```
+PluginUtil.HashTool.md5Hex(text)
+
+其中：
+text - 字符串
+```
+样例
+```js
+var md5 = PluginUtil.HashTool.md5Hex("123456");
+```
+
+# 常见场景样例
+这里收集了一些常见的需求样例，可以作为插件定制的样例模板。
+
+## 1.禁止特定文件上传
+使用JavaScript上传插件中的`uploadFilePrepareCallback`函数。如下所示：
+```js
+function uploadFilePrepareCallback(context, params) {
+    console.log(params)
+
+    var result = {
+        "uploadApproved": "yes",
+        "driveFilePath": ""
+    };
+    if (params["localFileType"] != "file") {
+        // do nothing
+        return result;
+    }
+
+    // 禁止点号.开头的文件上传
+    if (params["localFileName"].indexOf(".") == 0) {
+        result["uploadApproved"] = "no";
+    }
+
+    // 禁止.txt文件上传
+    if (params["localFileName"].search(/.txt$/i) >= 0) {
+        result["uploadApproved"] = "no";
+    }
+
+    // 禁止password.key文件上传
+    if (params["localFileName"] == "password.key") {
+        result["uploadApproved"] = "no";
+    }    
+
+    return result;
+}
+```
+
+## 2.上传文件后删除本地文件
+使用JavaScript上传插件中的`uploadFileFinishCallback`函数。如下所示：
+```js
+function uploadFileFinishCallback(context, params) {
+    console.log(params);
+    if (params["localFileType"] != "file") {
+        // do nothing
+        return;
+    }
+    if (params["uploadResult"] == "success") {
+        PluginUtil.LocalFS.deleteFile(params["localFilePath"]);
+    }    
+}
+```
+
+## 3.下载文件并截断过长的文件名
+有些文件的路径或者名称太长，下载的时候可能会由于路径名称过程导致无法下载，这时候可以使用JavaScript下载插件中的`downloadFilePrepareCallback`函数定制下载保存的文件名。   
+如下所示：
+```js
+function downloadFilePrepareCallback(context, params) {
+    console.log(params)
+
+    var result = {
+        "downloadApproved": "yes",
+        "localFilePath": ""
+    };
+    if (params["driveFileType"] != "file") {
+        return result;
+    }
+	
+    // 下面的代码都是分隔路径，方便后面修改路径时使用
+    var filePath =  params["localFilePath"];
+    filePath = filePath.replace(/\\/g, "/");
+    
+    // 目录完整路径
+    var dirPath = "";
+    // 文件名，不包括后缀名
+    var fileName = "";
+    // 文件后缀名
+    var fileExt = "";
+    
+    var idx = filePath.lastIndexOf('/');
+    if (idx > 0) {
+        dirPath = filePath.substring(0,idx);
+        fileName = filePath.substring(idx+1,filePath.length);
+    } else {
+        fileName = filePath;
+    }
+    idx = fileName.lastIndexOf(".")
+    if (idx > 0) {
+        fileExt = fileName.substring(idx,fileName.length);
+        fileName = fileName.substring(0, fileName.length-fileExt.length)
+    }
+
+    // 开始按照需要截断太长的文件路径，例如下面的这个例子:
+    // 
+    // dirPath + "/"          ==> 这个的意思是保留前面的文件夹路径，如果不需要就去掉
+    // fileName.substr(0,10)  ==> 文件名只取前面10个字符，其他的不要了
+    // + fileExt              ==> 把文件的后缀名补上
+    var saveFilePath = dirPath + "/" + fileName.substr(0,10) + fileExt;
+
+    // 返回
+    result["localFilePath"] = saveFilePath;
+    return result;
+}
+```
+效果如下:   
+1）假如网盘源路径是：`/亚马逊书籍合集/亚马逊 kindle ebook 大合集5289册/经济金融 (2)/解密Instagram（ 《金融时报》和麦肯锡2020年度商业书籍！社交应用如何改变世界？解锁打造估值千亿美元爆品的核心方法！ ) by 莎拉·弗莱尔(z-lib.org).mobi`   
+2）下载后保存本地的路径是：`D:\test\亚马逊书籍合集\亚马逊 kindle ebook 大合集5289册\经济金融 (2)\解密Instagra.mobi`   
+```
+[1] ----
+文件ID: 630f0623e67c0a1d2e554b1994a29108d089f0d5
+文件名: 解密Instagram（ 《金融时报》和麦肯锡2020年度商业书籍！社交应用如何改变世界？解锁打造估值千亿美元爆品的核心方法！ ) by 莎拉·弗莱尔(z-lib.org).mobi
+文件类型: 文件
+文件路径: /亚马逊书籍合集/亚马逊 kindle ebook 大合集5289册/经济金融 (2)/解密Instagram（ 《金融时报》和麦肯锡2020年度商业书籍！社交应用如何改变世界？解锁打造估值千亿美元爆品的核心方法！ ) by 莎拉·弗莱尔(z-lib.org).mobi
+
+插件修改文件下载保存路径为: D:\test\亚马逊书籍合集/亚马逊 kindle ebook 大合集5289册/经济金融 (2)/解密Instagra.mobi
+[1] 准备下载: /亚马逊书籍合集/亚马逊 kindle ebook 大合集5289册/经济金融 (2)/解密Instagram（ 《金融时报》和麦肯锡2020年度商业书籍！社交应用如何改变世界？解锁打造估值千亿美元爆品的核心方法！ ) by 莎拉·弗莱尔(z-lib.org).mobi
+[1] 将会下载到路径: D:\test\亚马逊书籍合集/亚马逊 kindle ebook 大合集5289册/经济金融 (2)/解密Instagra.mobi
+[1] 下载开始
+
+[1] 下载完成, 保存位置: D:\test\亚马逊书籍合集/亚马逊 kindle ebook 大合集5289册/经济金融 (2)/解密Instagra.mobi
+[1] 检验文件有效性成功: D:\test\亚马逊书籍合集/亚马逊 kindle ebook 大合集5289册/经济金融 (2)/解密Instagra.mobi
+```
+## 4.上传文件去掉文件名包含的部分字符
+例如本地文件夹名称为```[周杰伦]范特西[mp3]```，上传到网盘希望能更改成名称```[周杰伦]范特西```但保持本地文件夹名称不变，因为文件夹有很多不希望每个手动更改，可以这样实现：
+```js
+function uploadFilePrepareCallback(context, params) {
+    var result = {
+        "uploadApproved": "yes",
+        "driveFilePath": ""
+    };
+
+    // 去掉网盘保存路径中包含的[mp3]字段
+    var filePath =  params["driveFilePath"];
+    filePath = filePath.replace(/\[mp3\]/g, "");
+    result["driveFilePath"] = filePath;
+
+    return result;
+}
+```
+## 5.上传文件时过滤指定目录或者文件路径
+upload命令本身支持exn参数排除上传文件或目录，但是只能指定文件名称，不能指定文件的路径。如果需要排除指定路径则可以通过插件脚本实现，样例如下：
+```js
+function uploadFilePrepareCallback(context, params) {
+    //（自行配置）禁止上传的本地【目录列表】，使用绝对路径，可以配置多个路径用逗号分隔
+    var forbiddenUploadFolders = ["/Users/tickstep/Downloads/up/target","/Users/tickstep/Downloads/up/.idea"]
+    //（自行配置）禁止上传的本地【文件列表】，使用绝对路径，可以配置多个路径用逗号分隔
+    var forbiddenUploadFiles = ["/Users/tickstep/Downloads/up/pom.xml"]
+
+    // -------------------- 以下代码不要修改 --------------------
+    var result = {
+        "uploadApproved": "yes",
+        "driveFilePath": ""
+    };
+
+    // 下面的代码都是分隔路径，方便后面使用
+    var filePath =  params["localFilePath"];
+    filePath = filePath.replace(/\\/g, "/");
+    // 目录完整路径
+    var dirPath = "";
+    // 文件名，不包括后缀名
+    var fileName = "";
+    // 文件后缀名
+    var fileExt = "";
+    var idx = filePath.lastIndexOf('/');
+    if (idx > 0) {
+        dirPath = filePath.substring(0,idx);
+        fileName = filePath.substring(idx+1,filePath.length);
+    } else {
+        fileName = filePath;
+    }
+    idx = fileName.lastIndexOf(".")
+    if (idx > 0) {
+        fileExt = fileName.substring(idx,fileName.length);
+        fileName = fileName.substring(0, fileName.length-fileExt.length)
+    }
+
+    if (params["localFileType"] == "file") {
+        for (var i = 0; i < forbiddenUploadFiles.length; i++) {
+            if (forbiddenUploadFiles[i].replace(/\\/g, "/") == params["localFilePath"]) {
+                result["uploadApproved"] = "no"; // 禁止文件上传
+                break
+            }
+        }
+        for (var i = 0; i < forbiddenUploadFolders.length; i++) {
+            if (forbiddenUploadFolders[i].replace(/\\/g, "/") == dirPath) {
+                result["uploadApproved"] = "no"; // 禁止文件上传
+                break
+            }
+        }
+    } else if (params["localFileType"] == "folder") {
+        for (var i = 0; i < forbiddenUploadFolders.length; i++) {
+            if (forbiddenUploadFolders[i].replace(/\\/g, "/") == params["localFilePath"]) {
+                result["uploadApproved"] = "no"; // 禁止文件上传
+                break
+            }
+        }
+    }
+
+    return result;
+}
+```
+## 6.下载云盘文件到本地后删除云盘对应的文件
+```js
+function downloadFileFinishCallback(context, params) {
+    console.log(params)
+    // 云盘文件成功下载到本地后，删除云盘的文件
+    if (params["downloadResult"] == "success") {
+        if (params["driveFileType"] == "file") {
+            // 文件下载成功，删除该云盘文件
+            var userId = context["userId"]
+            var driveId = params["driveId"]
+            var driveFileId = params["driveFileId"]
+            if (PluginUtil.PanFS.deleteFile(userId, driveId, driveFileId)) {
+                console.println("插件删除云盘文件成功：" + params["driveFilePath"])
+            }
+        }
+    }
+}
+```
+
+## 7.Token刷新失败发送外部通知
+Token刷新失败发送外部通知，例如Server酱
+```js
+function userTokenRefreshFinishCallback(context, params) {
+    var header = {
+        "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/100.0.4896.88 Safari/537.36",
+        "Content-Type": "application/json",
+        "Accept": "application/json"
+    };
+    try {
+        if (params["result"] === "fail") {
+            // 避免频繁发送
+            var ONE_MINUTE = 60 * 1000;
+            var lastSendEmailTime = PluginUtil.KV.getString("email_last_send_time");
+            if (lastSendEmailTime != "") {
+                if ((Date.now() - lastSendEmailTime) < (10 * ONE_MINUTE)) {
+                    console.log("距离上次发送邮件小于10分钟，先不发送了");
+                    return
+                }
+            }
+            PluginUtil.KV.putString("email_last_send_time", Date.now());
+            
+            var reqData = {
+                "text": "Token刷新失败",
+                "desp": params["message"]
+            };
+            var r = PluginUtil.Http.post(header, "https://sctapi.ftqq.com/xxxxxkeyxxxxxx.send", JSON.stringify(reqData));
+        }
+    } catch (e) {
+        if (e !== "Error") {
+            throw e;
+        }
+    }
+}
+```
+或者发送邮件通知
+```js
+function userTokenRefreshFinishCallback(context, params) {
+    try {
+        if (params["result"] === "fail") {
+            // 避免频繁发送
+            var ONE_MINUTE = 60 * 1000;
+            var lastSendEmailTime = PluginUtil.KV.getString("email_last_send_time");
+            if (lastSendEmailTime != "") {
+                if ((Date.now() - lastSendEmailTime) < (10 * ONE_MINUTE)) {
+                    console.log("距离上次发送邮件小于10分钟，先不发送了");
+                    return
+                }
+            }
+            PluginUtil.KV.putString("email_last_send_time", Date.now());
+
+            // 发送通知邮件，请确保你的发送邮箱具备smtp发送权限，没有的需要找邮箱提供商配置开启
+            console.log("发送通知邮件");
+            PluginUtil.Email.sendTextMail("smtp.qq.com:465", "123xxx@qq.com", "pwdxxxxxx", "12545xxx@qq.com", "Token刷新失败了", "Token过期了，骚年快去手动恢复吧");
+        }
+    } catch (e) {
+        if (e !== "Error") {
+            throw e;
+        }
+    }
+}
+```
+## 8.每次只下载指定数量的文件
+每次运行download下载命令，只下载指定数量的文件，只要数量够了其他文件就跳过不再下载，其他文件等下一次运行download命令的时候再下载。
+```js
+function downloadFilePrepareCallback(context, params) {
+    var result = {
+        "downloadApproved": "yes",
+        "localFilePath": ""
+    };
+
+    // 这次下载限制的最大文件总数量
+    const maxCountOfDownloadAction = 3;
+
+    // 只处理文件
+    if (params["driveFileType"] != "file") {
+        return
+    }
+
+    // 获取这次下载动作，已经下载的文件数量
+    var keyOfThisDownloadAction = "download:" + params["downloadActionId"];
+    var valueOfThisDownloadAction = PluginUtil.KV.getString(keyOfThisDownloadAction);
+    if (valueOfThisDownloadAction == "") {
+        valueOfThisDownloadAction = "0";
+    }
+    var countOfThisDownloadAction = parseInt(valueOfThisDownloadAction);
+    if (countOfThisDownloadAction >= maxCountOfDownloadAction) {
+        // 下载数量已达到最大，其他文件不再下载
+        result["downloadApproved"] = "no";
+        return result;
+    }
+
+    // 该文件需要下载，记录相关信息
+    var keyOfThisDownloadFile = "file:" + PluginUtil.HashTool.md5Hex(params["driveFilePath"]);
+    var valueOfThisDownloadFile = PluginUtil.KV.getString(keyOfThisDownloadFile);
+    if (valueOfThisDownloadFile == "finish") {
+        // 已经在下载的文件不做处理
+        return result;
+    }
+    PluginUtil.KV.putString(keyOfThisDownloadFile, "downloading");
+
+    // 更新下载总数量
+    countOfThisDownloadAction += 1;
+    PluginUtil.KV.putString(keyOfThisDownloadAction, String(countOfThisDownloadAction));
+
+    return result;
+}
+
+function downloadFileFinishCallback(context, params) {
+  var keyOfThisDownloadFile = "file:" + PluginUtil.HashTool.md5Hex(params["driveFilePath"]);
+  console.log(keyOfThisDownloadFile)
+  PluginUtil.KV.putString(keyOfThisDownloadFile, "finish");
+}
+```
@@ -1,27 +1,42 @@
 module github.com/tickstep/aliyunpan

-go 1.16
+go 1.22

 require (
 	github.com/GeertJohan/go.incremental v1.0.0
-	github.com/boltdb/bolt v1.3.1 // indirect
+	github.com/adrg/xdg v0.4.0
 	github.com/deckarep/golang-set v1.8.0
 	github.com/dop251/goja v0.0.0-20220408131256-ffe77e20c6f1
+	github.com/jordan-wright/email v0.0.0-20200602115436-fd8a7622303e
 	github.com/json-iterator/go v1.1.12
 	github.com/kardianos/osext v0.0.0-20170510131534-ae77be60afb1
-	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/oleiade/lane v0.0.0-20160817071224-3053869314bb
 	github.com/olekukonko/tablewriter v0.0.2-0.20190618033246-cc27d85e17ce
 	github.com/peterh/liner v1.2.1
 	github.com/satori/go.uuid v1.2.0
-	github.com/tickstep/aliyunpan-api v0.0.7
-	github.com/tickstep/bolt v1.3.3
-	github.com/tickstep/library-go v0.0.5
+	github.com/tickstep/aliyunpan-api v0.2.9
+	github.com/tickstep/bolt v1.3.4
+	github.com/tickstep/library-go v0.1.3
 	github.com/urfave/cli v1.21.1-0.20190817182405-23c83030263f
-	golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a
-	golang.org/x/net v0.0.0-20210614182718-04defd469f4e
+	golang.org/x/sys v0.15.0
 )

+require (
+	github.com/boltdb/bolt v1.3.1 // indirect
+	github.com/btcsuite/btcd v0.22.1 // indirect
+	github.com/cpuguy83/go-md2man v1.0.10 // indirect
+	github.com/denisbrodbeck/machineid v1.0.1 // indirect
+	github.com/dlclark/regexp2 v1.4.1-0.20201116162257-a2a8dda75c91 // indirect
+	github.com/go-sourcemap/sourcemap v2.1.3+incompatible // indirect
+	github.com/mattn/go-runewidth v0.0.9 // indirect
+	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
+	github.com/modern-go/reflect2 v1.0.2 // indirect
+	github.com/russross/blackfriday v1.5.2 // indirect
+	golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a // indirect
+	golang.org/x/text v0.3.7 // indirect
+)
+
+//replace github.com/boltdb/bolt => github.com/tickstep/bolt v1.3.4
 //replace github.com/tickstep/bolt => /Users/tickstep/Documents/Workspace/go/projects/bolt
 //replace github.com/tickstep/library-go => /Users/tickstep/Documents/Workspace/go/projects/library-go
 //replace github.com/tickstep/aliyunpan-api => /Users/tickstep/Documents/Workspace/go/projects/aliyunpan-api
@@ -1,16 +1,36 @@
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/GeertJohan/go.incremental v1.0.0 h1:7AH+pY1XUgQE4Y1HcXYaMqAI0m9yrFqo/jt0CW30vsg=
 github.com/GeertJohan/go.incremental v1.0.0/go.mod h1:6fAjUhbVuX1KcMD3c8TEgVUqmo4seqhv0i0kdATSkM0=
+github.com/adrg/xdg v0.4.0 h1:RzRqFcjH4nE5C6oTAxhBtoE2IRyjBSa62SCbyPidvls=
+github.com/adrg/xdg v0.4.0/go.mod h1:N6ag73EX4wyxeaoeHctc1mas01KZgsj5tYiAIwqJE/E=
+github.com/aead/siphash v1.0.1/go.mod h1:Nywa3cDsYNNK3gaciGTWPwHt0wlpNV15vwmswBAUSII=
 github.com/boltdb/bolt v1.3.1 h1:JQmyP4ZBrce+ZQu0dY660FMfatumYDLun9hBCUVIkF4=
 github.com/boltdb/bolt v1.3.1/go.mod h1:clJnj/oiGkjum5o1McbSZDSLxVThjynRyGBgiAx27Ps=
+github.com/btcsuite/btcd v0.20.1-beta/go.mod h1:wVuoA8VJLEcwgqHBwHmzLRazpKxTv13Px/pDuV7OomQ=
+github.com/btcsuite/btcd v0.22.1 h1:CnwP9LM/M9xuRrGSCGeMVs9iv09uMqwsVX7EeIpgV2c=
+github.com/btcsuite/btcd v0.22.1/go.mod h1:wqgTSL29+50LRkmOVknEdmt8ZojIzhuWvgu/iptuN7Y=
+github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1 h1:q0rUy8C/TYNBQS1+CGKw68tLOFYSNEs0TFnxxnS9+4U=
+github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1/go.mod h1:7SFka0XMvUgj3hfZtydOrQY2mwhPclbT2snogU7SQQc=
+github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f/go.mod h1:TdznJufoqS23FtqVCzL0ZqgP5MqXbb4fg/WgDys70nA=
+github.com/btcsuite/btcutil v0.0.0-20190425235716-9e5f4b9a998d/go.mod h1:+5NJ2+qvTyV9exUAL/rxXi3DcLg2Ts+ymUAY5y4NvMg=
+github.com/btcsuite/btcutil v1.0.3-0.20201208143702-a53e38424cce/go.mod h1:0DVlHczLPewLcPGEIeUEzfOJhqGPQ0mJJRDBtD307+o=
+github.com/btcsuite/go-socks v0.0.0-20170105172521-4720035b7bfd/go.mod h1:HHNXQzUsZCxOoE+CPiyCTO6x34Zs86zZUiwtpXoGdtg=
+github.com/btcsuite/goleveldb v0.0.0-20160330041536-7834afc9e8cd/go.mod h1:F+uVaaLLH7j4eDXPRvw78tMflu7Ie2bzYOH4Y8rRKBY=
+github.com/btcsuite/goleveldb v1.0.0/go.mod h1:QiK9vBlgftBg6rWQIj6wFzbPfRjiykIEhBH4obrXJ/I=
+github.com/btcsuite/snappy-go v0.0.0-20151229074030-0bdef8d06723/go.mod h1:8woku9dyThutzjeg+3xrA5iCpBRH8XEEg3lh6TiUghc=
+github.com/btcsuite/snappy-go v1.0.0/go.mod h1:8woku9dyThutzjeg+3xrA5iCpBRH8XEEg3lh6TiUghc=
+github.com/btcsuite/websocket v0.0.0-20150119174127-31079b680792/go.mod h1:ghJtEyQwv5/p4Mg4C0fgbePVuGr935/5ddU9Z3TmDRY=
+github.com/btcsuite/winsvc v1.0.0/go.mod h1:jsenWakMcC0zFBFurPLEAyrnc/teJEM1O46fmI40EZs=
 github.com/cpuguy83/go-md2man v1.0.10 h1:BSKMNlYxDvnunlTymqtgONjNnaRV1sTpcovwwjF22jk=
 github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
+github.com/davecgh/go-spew v0.0.0-20171005155431-ecdeabc65495/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/deckarep/golang-set v1.8.0 h1:sk9/l/KqpunDwP7pSjUg0keiOOLEnOBHzykLrsPppp4=
 github.com/deckarep/golang-set v1.8.0/go.mod h1:5nI87KwE7wgsBU1F4GKAw2Qod7p5kyS383rP6+o6qqo=
+github.com/decred/dcrd/lru v1.0.0/go.mod h1:mxKOwFd7lFjN2GZYsiz/ecgqR6kkYAl+0pz0tEMk218=
 github.com/denisbrodbeck/machineid v1.0.1 h1:geKr9qtkB876mXguW2X6TU4ZynleN6ezuMSRhl4D7AQ=
 github.com/denisbrodbeck/machineid v1.0.1/go.mod h1:dJUwb7PTidGDeYyUBmXZ2GphQBbjJCrnectwCyxcUSI=
 github.com/dlclark/regexp2 v1.4.1-0.20201116162257-a2a8dda75c91 h1:Izz0+t1Z5nI16/II7vuEo/nHjodOg0p7+OiDpjX5t1E=
@@ -20,14 +40,23 @@ github.com/dop251/goja v0.0.0-20220408131256-ffe77e20c6f1 h1:9/4Hyp+A98nqssD7qce
 github.com/dop251/goja v0.0.0-20220408131256-ffe77e20c6f1/go.mod h1:TQJQ+ZNyFVvUtUEtCZxBhfWiH7RJqR3EivNmvD6Waik=
 github.com/dop251/goja_nodejs v0.0.0-20210225215109-d91c329300e7/go.mod h1:hn7BA7c8pLvoGndExHudxTDKZ84Pyvv+90pbBjbTz0Y=
 github.com/dop251/goja_nodejs v0.0.0-20211022123610-8dd9abb0616d/go.mod h1:DngW8aVqWbuLRMHItjPUyqdj+HWPvnQe8V8y1nDpIbM=
+github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/go-sourcemap/sourcemap v2.1.3+incompatible h1:W1iEw64niKVGogNgBN3ePyLFfuisuzeidWPMPWmECqU=
 github.com/go-sourcemap/sourcemap v2.1.3+incompatible/go.mod h1:F8jJfvm2KbVjc5NqelyYJmf/v5J0dwNLS2mL4sNA1Jg=
+github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
+github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
+github.com/jessevdk/go-flags v0.0.0-20141203071132-1679536dcc89/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
+github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
+github.com/jordan-wright/email v0.0.0-20200602115436-fd8a7622303e h1:OGunVjqY7y4U4laftpEHv+mvZBlr7UGimJXKEGQtg48=
+github.com/jordan-wright/email v0.0.0-20200602115436-fd8a7622303e/go.mod h1:Fy2gCFfZhay8jplf/Csj6cyH/oshQTkLQYZbKkcV+SY=
+github.com/jrick/logrotate v1.0.0/go.mod h1:LNinyqDIJnpAur+b8yyulnQw/wDuN1+BYKlTRt3OuAQ=
 github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
 github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
 github.com/kardianos/osext v0.0.0-20170510131534-ae77be60afb1 h1:PJPDf8OUfOK1bb/NeTKd4f1QXZItOX389VN3B6qC8ro=
 github.com/kardianos/osext v0.0.0-20170510131534-ae77be60afb1/go.mod h1:1NbS8ALrpOvjt0rHPNLyCIeMtbizbir8U//inJ+zuB8=
+github.com/kkdai/bstream v0.0.0-20161212061736-f391b8402d23/go.mod h1:J+Gs4SYgM6CZQHDETBtE9HaSEkGmuNXF86RwHhHUvq4=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
 github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0=
@@ -51,6 +80,10 @@ github.com/oleiade/lane v0.0.0-20160817071224-3053869314bb/go.mod h1:ym0w0flrmBt
 github.com/olekukonko/tablewriter v0.0.1/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo=
 github.com/olekukonko/tablewriter v0.0.2-0.20190618033246-cc27d85e17ce h1:RLmZmfx/K62HKpbwPqtW3tg+V2GgugN/XNNx+uiMH/Y=
 github.com/olekukonko/tablewriter v0.0.2-0.20190618033246-cc27d85e17ce/go.mod h1:rSAaSIOAGT9odnlyGlUfAJaoc5w2fSBUmeGDbRWPxyQ=
+github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
+github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
+github.com/onsi/gomega v1.4.1/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
+github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
 github.com/peterh/liner v1.2.1 h1:O4BlKaq/LWu6VRWmol4ByWfzx6MfXc5Op5HETyIy5yg=
 github.com/peterh/liner v1.2.1/go.mod h1:CRroGNssyjTd/qIG2FyxByd2S8JEAZXBl4qUrZf8GS0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
@@ -65,33 +98,35 @@ github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749/go.mod h1:ZY1cvUeJ
 github.com/shurcooL/vfsgen v0.0.0-20181202132449-6a9ea43bcacd/go.mod h1:TrYk7fJVaAttu97ZZKrO9UbRa8izdowaMIZcxYMbVaw=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
-github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0=
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/tickstep/aliyunpan-api v0.0.6/go.mod h1:ZFtMpbmVPM6+zWRTQ7QHw6xzwN/WTm3zaxQjFZ54UAA=
-github.com/tickstep/aliyunpan-api v0.0.7 h1:71enOt0fx+1F53pSxlY0rasvurcN67PBZkCsZDfmdpU=
-github.com/tickstep/aliyunpan-api v0.0.7/go.mod h1:ZFtMpbmVPM6+zWRTQ7QHw6xzwN/WTm3zaxQjFZ54UAA=
-github.com/tickstep/bolt v1.3.3 h1:3abb88T5JJocnBlYTJE3EqKvwWV6+D/JZD2Fsdt1QHI=
-github.com/tickstep/bolt v1.3.3/go.mod h1:Y24RwCywbOsKAyHiVcJ4K2QQfED+q67x7PEOH9OG7Q4=
-github.com/tickstep/library-go v0.0.5 h1:MBb1tsvs4Wi67zy0E9eobVWLgsfPRLsqKAEdSEi3LBE=
-github.com/tickstep/library-go v0.0.5/go.mod h1:egoK/RvOJ3Qs2tHpkq374CWjhNjI91JSCCG1GrhDYSw=
+github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
+github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/tickstep/aliyunpan-api v0.2.9 h1:0n7BNjmKEi/JYqNLhotBnCQJmJE3OAqiDX28q0Gknxs=
+github.com/tickstep/aliyunpan-api v0.2.9/go.mod h1:UvQgQYMIgA5k1QsfKIVnEJ2h/HqDXIkAb16oookNc8o=
+github.com/tickstep/bolt v1.3.4 h1:UN1txRsauOfR8a5mUWm5So0ng233PsIMVR5/+3WowCE=
+github.com/tickstep/bolt v1.3.4/go.mod h1:Y24RwCywbOsKAyHiVcJ4K2QQfED+q67x7PEOH9OG7Q4=
+github.com/tickstep/library-go v0.1.3 h1:OUj6nkimTsqhHXh5s+PbmHq5hR0m739Y1tu9QpfA2ng=
+github.com/tickstep/library-go v0.1.3/go.mod h1:uAHeNOIpoywCzlaeLrWmmRSupn03m9kJVZKOEmuarmA=
 github.com/urfave/cli v1.21.1-0.20190817182405-23c83030263f h1:xKDKjIsL76VUyHcA0G4Qe1cIAUB/nrq6Pt8D411bd1g=
 github.com/urfave/cli v1.21.1-0.20190817182405-23c83030263f/go.mod h1:qXyCeJubPqsgeiLd3kvHOGHHSrQcNdjZ2ScXIcVZK/I=
+golang.org/x/crypto v0.0.0-20170930174604-9419663f5a44/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20200115085410-6d4e4cb37c7d/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a h1:kr2P4QFmQr29mSLA43kwrOcgcReGTfbE9N577tCTuBc=
 golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a/go.mod h1:P+XmwS30IXTQdn5tA2iutPOUgjI07+tq3H3K9MVA1s8=
+golang.org/x/net v0.0.0-20180719180050-a680a1efc54d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/net v0.0.0-20210614182718-04defd469f4e h1:XpT3nA5TvE525Ne3hInMh6+GETgn27Zfm9dxsThnX2Q=
-golang.org/x/net v0.0.0-20210614182718-04defd469f4e/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210423082822-04245dca01da h1:b3NXsE2LusjYGGjL5bxEVZZORm/YEFFrWFjR8eFrw/c=
-golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc=
+golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
@@ -101,6 +136,9 @@ gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
 gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
+gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
+gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
+gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
 gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
@@ -4,7 +4,7 @@
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
-//     http://www.apache.org/licenses/LICENSE-2.0
+//	http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
@@ -14,39 +14,39 @@
 package command

 import (
+	"encoding/json"
 	"fmt"
 	"github.com/olekukonko/tablewriter"
 	"github.com/tickstep/aliyunpan-api/aliyunpan"
-	"github.com/tickstep/aliyunpan-api/aliyunpan/apierror"
 	"github.com/tickstep/aliyunpan/cmder"
 	"github.com/tickstep/aliyunpan/cmder/cmdtable"
 	"github.com/tickstep/aliyunpan/internal/config"
+	"github.com/tickstep/aliyunpan/internal/file/downloader"
+	"github.com/tickstep/aliyunpan/internal/functions/pandownload"
+	"github.com/tickstep/aliyunpan/internal/global"
+	"github.com/tickstep/aliyunpan/internal/taskframework"
+	"github.com/tickstep/aliyunpan/internal/utils"
+	"github.com/tickstep/aliyunpan/library/requester/transfer"
+	"github.com/tickstep/library-go/converter"
 	"github.com/tickstep/library-go/logger"
+	"github.com/tickstep/library-go/requester"
+	"github.com/tickstep/library-go/requester/rio/speeds"
 	"github.com/urfave/cli"
 	"os"
+	"path/filepath"
 	"strconv"
+	"strings"
 	"time"
 )

-type (
-	AlbumFileCategoryOption string
-)
-
-var (
-	ImageOnlyOption      AlbumFileCategoryOption = "image"
-	VideoOnlyOption      AlbumFileCategoryOption = "video"
-	ImageVideoOnlyOption AlbumFileCategoryOption = "image_video"
-	AllFileOption        AlbumFileCategoryOption = "none"
-)
-
 func CmdAlbum() cli.Command {
 	return cli.Command{
 		Name:      "album",
 		Aliases:   []string{"abm"},
-		Usage:     "相簿(Beta)",
+		Usage:     "共享相册",
 		UsageText: cmder.App().Name + " album",
 		Category:  "阿里云盘",
-		Before:    cmder.ReloadConfigFunc,
+		Before:    ReloadConfigFunc,
 		Action: func(c *cli.Context) error {
 			cli.ShowCommandHelp(c, c.Command.Name)
 			return nil
@@ -56,12 +56,11 @@ func CmdAlbum() cli.Command {
 			{
 				Name:      "list",
 				Aliases:   []string{"ls"},
-				Usage:     "展示相簿列表",
+				Usage:     "展示共享相簿列表",
 				UsageText: cmder.App().Name + " album list",
 				Description: `
 示例:
-
-    展示相簿列表 
+    展示共享相簿列表 
    aliyunpan album ls
 `,
 				Action: func(c *cli.Context) error {
@@ -69,78 +68,7 @@ func CmdAlbum() cli.Command {
 						fmt.Println("未登录账号")
 						return nil
 					}
-					RunAlbumList()
-					return nil
-				},
-				Flags: []cli.Flag{},
-			},
-			{
-				Name:      "new",
-				Aliases:   []string{""},
-				Usage:     "创建相簿",
-				UsageText: cmder.App().Name + " album new",
-				Description: `
-示例:
-
-    新建相簿，名称为：我的相簿2022
-    aliyunpan album new "我的相簿2022"
-
-    新建相簿，名称为：我的相簿2022，描述为：存放2022所有文件
-    aliyunpan album new "我的相簿2022" "存放2022所有文件"
-`,
-				Action: func(c *cli.Context) error {
-					if config.Config.ActiveUser() == nil {
-						fmt.Println("未登录账号")
-						return nil
-					}
-					RunAlbumCreate(c.Args().Get(0), c.Args().Get(1))
-					return nil
-				},
-				Flags: []cli.Flag{},
-			},
-			{
-				Name:      "rm",
-				Aliases:   []string{""},
-				Usage:     "删除相簿",
-				UsageText: cmder.App().Name + " album rm",
-				Description: `
-删除相簿，同名的相簿只会删除第一个符合条件的
-示例:
-
-    删除名称为"我的相簿2022"的相簿
-    aliyunpan album rm "我的相簿2022"
-
-    删除名称为"我的相簿2022-1" 和 "我的相簿2022-2"的相簿
-    aliyunpan album rm "我的相簿2022-1" "我的相簿2022-2"
-`,
-				Action: func(c *cli.Context) error {
-					if config.Config.ActiveUser() == nil {
-						fmt.Println("未登录账号")
-						return nil
-					}
-					RunAlbumDelete(c.Args())
-					return nil
-				},
-				Flags: []cli.Flag{},
-			},
-			{
-				Name:      "rename",
-				Aliases:   []string{""},
-				Usage:     "重命名相簿",
-				UsageText: cmder.App().Name + " album rename",
-				Description: `
-重命名相簿，同名的相簿只会修改第一个符合条件的
-示例:
-
-    重命名相簿"我的相簿2022"为新的名称"我的相簿2022-new"
-    aliyunpan album rename "我的相簿2022" "我的相簿2022-new"
-`,
-				Action: func(c *cli.Context) error {
-					if config.Config.ActiveUser() == nil {
-						fmt.Println("未登录账号")
-						return nil
-					}
-					RunAlbumRename(c.Args().Get(0), c.Args().Get(1))
+					RunShareAlbumList()
 					return nil
 				},
 				Flags: []cli.Flag{},
@@ -162,22 +90,22 @@ func CmdAlbum() cli.Command {
 						fmt.Println("未登录账号")
 						return nil
 					}
-					RunAlbumListFile(c.Args().Get(0))
+					RunShareAlbumListFile(c.Args().Get(0))
 					return nil
 				},
 				Flags: []cli.Flag{},
 			},
 			{
-				Name:      "rm-file",
-				Aliases:   []string{"rf"},
-				Usage:     "移除相簿中的文件",
-				UsageText: cmder.App().Name + " album rm-file",
+				Name:      "download-file",
+				Aliases:   []string{"df"},
+				Usage:     "下载相簿中的所有文件到本地",
+				UsageText: cmder.App().Name + " album download-file",
 				Description: `
-移除相簿中的文件，同名的相簿只会移除第一个符合条件的
+下载相簿中的所有文件
 示例:

-    移除相簿 "我的相簿2022" 中的文件 1.png 2.png
-    aliyunpan album rm-file 我的相簿2022 1.png 2.png
+    下载相簿 "我的相簿2022" 里面的所有文件
+    aliyunpan album download-file 我的相簿2022
 `,
 				Action: func(c *cli.Context) error {
 					if config.Config.ActiveUser() == nil {
@@ -185,119 +113,75 @@ func CmdAlbum() cli.Command {
 						return nil
 					}
 					subArgs := c.Args()
-					if len(subArgs) < 2 {
-						fmt.Println("请指定移除的文件")
+					if len(subArgs) == 0 {
+						fmt.Println("请指定下载的相簿名称")
 						return nil
 					}
-					RunAlbumRmFile(subArgs[0], subArgs[1:])
+
+					// 处理saveTo
+					var (
+						saveTo string
+					)
+					if c.String("saveto") != "" {
+						saveTo = filepath.Clean(c.String("saveto"))
+					}
+
+					do := &DownloadOptions{
+						IsPrintStatus:        false,
+						IsExecutedPermission: false,
+						IsOverwrite:          c.Bool("ow"),
+						SaveTo:               saveTo,
+						Parallel:             0,
+						SliceParallel:        0,
+						Load:                 0,
+						MaxRetry:             pandownload.DefaultDownloadMaxRetry,
+						NoCheck:              false,
+						ShowProgress:         !c.Bool("np"),
+						DriveId:              parseDriveId(c),
+						ExcludeNames:         []string{},
+					}
+
+					RunShareAlbumDownloadFile(c.Args(), do)
 					return nil
 				},
-				Flags: []cli.Flag{},
-			},
-			{
-				Name:      "add-file",
-				Aliases:   []string{"af"},
-				Usage:     "增加（文件/相册）网盘文件到相簿中",
-				UsageText: cmder.App().Name + " album add-file",
-				Description: `
-增加文件到相簿中
-示例:
-
-    增加当前目录下的 1.png 2.png 文件到相簿 "我的相簿2022" 中
-    aliyunpan album add-file 我的相簿2022 1.png 2.png
-
-    增加当前目录下的 myFolder 文件夹下所有文件到相簿 "我的相簿2022" 中
-    aliyunpan album add-file 我的相簿2022 myFolder
-`,
-				Action: func(c *cli.Context) error {
-					if config.Config.ActiveUser() == nil {
-						fmt.Println("未登录账号")
-						return nil
-					}
-					subArgs := c.Args()
-					if len(subArgs) < 2 {
-						fmt.Println("请指定增加的文件")
-						return nil
-					}
-					RunAlbumAddFile(subArgs[0], subArgs[1:], ImageVideoOnlyOption)
-					return nil
+				Flags: []cli.Flag{
+					cli.BoolFlag{
+						Name:  "ow",
+						Usage: "overwrite, 覆盖已存在的文件",
+					},
+					cli.StringFlag{
+						Name:  "saveto",
+						Usage: "将下载的文件直接保存到指定的目录",
+					},
+					cli.BoolFlag{
+						Name:  "np",
+						Usage: "no progress 不展示下载进度条",
+					},
 				},
-				Flags: []cli.Flag{},
 			},
 		},
 	}
 }

-func RunAlbumList() {
+func RunShareAlbumList() {
 	activeUser := GetActiveUser()
-	records, err := activeUser.PanClient().AlbumListGetAll(&aliyunpan.AlbumListParam{})
+	records, err := activeUser.PanClient().OpenapiPanClient().ShareAlbumListGetAll()
 	if err != nil {
 		fmt.Printf("获取相簿列表失败: %s\n", err)
 		return
 	}

 	tb := cmdtable.NewTable(os.Stdout)
-	tb.SetHeader([]string{"#", "ALBUM_ID", "名称", "文件数量", "创建日期", "修改日期"})
-	tb.SetColumnAlignment([]int{tablewriter.ALIGN_DEFAULT, tablewriter.ALIGN_DEFAULT, tablewriter.ALIGN_LEFT, tablewriter.ALIGN_CENTER, tablewriter.ALIGN_DEFAULT, tablewriter.ALIGN_DEFAULT})
+	tb.SetHeader([]string{"#", "ALBUM_ID", "名称", "更新日期", "创建日期"})
+	tb.SetColumnAlignment([]int{tablewriter.ALIGN_DEFAULT, tablewriter.ALIGN_DEFAULT, tablewriter.ALIGN_LEFT, tablewriter.ALIGN_DEFAULT, tablewriter.ALIGN_DEFAULT})
 	for k, record := range records {
-		tb.Append([]string{strconv.Itoa(k), record.AlbumId, record.Name, strconv.Itoa(record.FileCount),
-			record.CreatedAtStr(), record.UpdatedAtStr()})
+		tb.Append([]string{strconv.Itoa(k + 1), record.AlbumId, record.Name, record.UpdatedAtStr(), record.CreatedAtStr()})
 	}
 	tb.Render()
 }

-func RunAlbumCreate(name, description string) {
-	if name == "" {
-		fmt.Printf("相簿名称不能为空\n")
-		return
-	}
-
-	activeUser := GetActiveUser()
-	_, err := activeUser.PanClient().AlbumCreate(&aliyunpan.AlbumCreateParam{
-		Name:        name,
-		Description: description,
-	})
-	if err != nil {
-		fmt.Printf("创建相簿失败: %s\n", err)
-		return
-	}
-	fmt.Printf("创建相簿成功: %s\n", name)
-}
-
-func RunAlbumDelete(nameList []string) {
-	if len(nameList) == 0 {
-		fmt.Printf("相簿名称不能为空\n")
-		return
-	}
-
-	activeUser := GetActiveUser()
-	records, err := activeUser.PanClient().AlbumListGetAll(&aliyunpan.AlbumListParam{})
-	if err != nil {
-		fmt.Printf("获取相簿列表失败: %s\n", err)
-		return
-	}
-
-	for _, record := range records {
-		for i, name := range nameList {
-			if name == record.Name {
-				nameList = append(nameList[:i], nameList[i+1:]...)
-				_, err := activeUser.PanClient().AlbumDelete(&aliyunpan.AlbumDeleteParam{
-					AlbumId: record.AlbumId,
-				})
-				if err != nil {
-					fmt.Printf("删除相簿失败: %s\n", name)
-					return
-				} else {
-					fmt.Printf("删除相簿成功: %s\n", name)
-				}
-				break
-			}
-		}
-	}
-}
-
-func getAlbumFromName(activeUser *config.PanUser, name string) *aliyunpan.AlbumEntity {
-	records, err := activeUser.PanClient().AlbumListGetAll(&aliyunpan.AlbumListParam{})
+func getShareAlbumFromName(activeUser *config.PanUser, name string) *aliyunpan.AlbumEntity {
+	records, err := activeUser.PanClient().OpenapiPanClient().ShareAlbumListGetAll()
 	if err != nil {
 		fmt.Printf("获取相簿列表失败: %s\n", err)
 		return nil
@@ -311,48 +195,21 @@ func getAlbumFromName(activeUser *config.PanUser, name string) *aliyunpan.AlbumE
 	return nil
 }

-func RunAlbumRename(name, newName string) {
-	if len(name) == 0 {
-		fmt.Printf("相簿名称不能为空\n")
-		return
-	}
-	if len(newName) == 0 {
-		fmt.Printf("相簿名称不能为空\n")
-		return
-	}
-
-	activeUser := GetActiveUser()
-	record := getAlbumFromName(activeUser, name)
-	if record == nil {
-		return
-	}
-	_, err := activeUser.PanClient().AlbumEdit(&aliyunpan.AlbumEditParam{
-		AlbumId:     record.AlbumId,
-		Description: record.Description,
-		Name:        newName,
-	})
-	if err != nil {
-		fmt.Printf("重命名相簿失败: %s\n", name)
-		return
-	} else {
-		fmt.Printf("重命名相簿成功: %s -> %s\n", name, newName)
-	}
-}
-
-func RunAlbumListFile(name string) {
+func RunShareAlbumListFile(name string) {
 	if len(name) == 0 {
 		fmt.Printf("相簿名称不能为空\n")
 		return
 	}

 	activeUser := GetActiveUser()
-	record := getAlbumFromName(activeUser, name)
+	record := getShareAlbumFromName(activeUser, name)
 	if record == nil {
 		return
 	}

-	fileList, er := activeUser.PanClient().AlbumListFileGetAll(&aliyunpan.AlbumListFileParam{
+	fileList, er := activeUser.PanClient().OpenapiPanClient().ShareAlbumListFileGetAll(&aliyunpan.ShareAlbumListFileParam{
 		AlbumId: record.AlbumId,
+		Limit:   100,
 	})
 	if er != nil {
 		fmt.Printf("获取相簿文件列表失败：%s\n", er)
@@ -361,145 +218,264 @@ func RunAlbumListFile(name string) {
 	renderTable(opLs, false, "", fileList)
 }

-func RunAlbumRmFile(name string, nameList []string) {
-	if len(name) == 0 {
-		fmt.Printf("相簿名称不能为空\n")
-		return
-	}
-	if len(nameList) == 0 {
-		fmt.Printf("指定文件不能为空\n")
+func RunShareAlbumDownloadFile(albumNames []string, options *DownloadOptions) {
+	if len(albumNames) == 0 {
+		fmt.Printf("请指定相簿名称\n")
 		return
 	}

 	activeUser := GetActiveUser()
-	album := getAlbumFromName(activeUser, name)
-	if album == nil {
-		return
+	if options == nil {
+		options = &DownloadOptions{}
 	}

-	fileList, er := activeUser.PanClient().AlbumListFileGetAll(&aliyunpan.AlbumListFileParam{
-		AlbumId: album.AlbumId,
-	})
-	if er != nil {
-		fmt.Printf("获取相簿文件列表失败：%s\n", er)
+	if options.MaxRetry < 0 {
+		options.MaxRetry = pandownload.DefaultDownloadMaxRetry
+	}
+	options.IsExecutedPermission = false
+
+	// 设置下载配置
+	cfg := &downloader.Config{
+		Mode:                       transfer.RangeGenMode_BlockSize,
+		CacheSize:                  config.Config.CacheSize,
+		BlockSize:                  MaxDownloadRangeSize,
+		MaxRate:                    config.Config.MaxDownloadRate,
+		InstanceStateStorageFormat: downloader.InstanceStateStorageFormatJSON,
+		ShowProgress:               options.ShowProgress,
+		ExcludeNames:               options.ExcludeNames,
+	}
+	if cfg.CacheSize == 0 {
+		cfg.CacheSize = int(DownloadCacheSize)
+	}
+
+	// 设置下载最大并发量
+	if options.Parallel < 1 {
+		options.Parallel = config.Config.MaxDownloadParallel
+		if options.Parallel == 0 {
+			options.Parallel = config.DefaultFileDownloadParallelNum
+		}
+	}
+	if options.Parallel > config.MaxFileDownloadParallelNum {
+		options.Parallel = config.MaxFileDownloadParallelNum
+	}
+	// 设置单个文件下载分片线程数
+	if options.SliceParallel < 1 { // 用户没有主动设置，则使用下面自动配置的策略
+		if options.Parallel > 1 {
+			// 如果是多文件下载，则一个文件只能同时使用1个线程
+			options.SliceParallel = 1
+		} else {
+			// 如果是单文件下载，则可以使用3个最大线程
+			options.SliceParallel = 3
+		}
+	}
+
+	// 保存文件的本地根文件夹
+	originSaveRootPath := ""
+	if options.SaveTo != "" {
+		originSaveRootPath = options.SaveTo
+	} else {
+		// 使用默认的保存路径
+		originSaveRootPath = GetActiveUser().GetSavePath("")
+	}
+	fi, err1 := os.Stat(originSaveRootPath)
+	if err1 != nil && !os.IsExist(err1) {
+		os.MkdirAll(originSaveRootPath, 0777) // 首先在本地创建目录
+	} else {
+		if !fi.IsDir() {
+			fmt.Println("本地保存路径不是文件夹，请删除或者创建对应的文件夹：", originSaveRootPath)
+			return
+		}
+	}
+
+	fmt.Printf("\n[0] 当前文件下载最大并发量为: %d, 下载缓存为: %s\n\n", options.Parallel, converter.ConvertFileSize(int64(cfg.CacheSize), 2))
+
+	var (
+		panClient = activeUser.PanClient()
+	)
+	cfg.MaxParallel = options.Parallel
+	cfg.SliceParallel = options.SliceParallel
+
+	var (
+		executor = taskframework.TaskExecutor{
+			IsFailedDeque: true, // 统计失败的列表
+		}
+		statistic = &pandownload.DownloadStatistic{}
+	)
+	// 配置执行器任务并发数，即同时下载文件并发数
+	executor.SetParallel(cfg.MaxParallel)
+
+	// 全局速度统计
+	globalSpeedsStat := &speeds.Speeds{}
+
+	// 处理队列
+	allShareAlbumList, err := activeUser.PanClient().OpenapiPanClient().ShareAlbumListGetAll()
+	if err != nil {
+		fmt.Printf("获取相簿列表失败: %s\n", err)
 		return
 	}
-	param := &aliyunpan.AlbumDeleteFileParam{
-		AlbumId:       album.AlbumId,
-		DriveFileList: []aliyunpan.FileBatchActionParam{},
-	}
-	for _, file := range fileList {
-		if len(nameList) == 0 {
-			break
-		}
-		for i, name := range nameList {
-			if name == file.FileName {
-				nameList = append(nameList[:i], nameList[i+1:]...)
-				param.AddFileItem(file.DriveId, file.FileId)
+	for k := range albumNames {
+		var record *aliyunpan.AlbumEntity
+		for _, album := range allShareAlbumList {
+			if album.Name == albumNames[k] {
+				record = album
 				break
 			}
 		}
-	}
-
-	// 1-500 范围
-	if len(param.DriveFileList) == 0 {
-		fmt.Printf("没有符合的文件\n")
-		return
-	}
-	// delete file
-	_, e := activeUser.PanClient().AlbumDeleteFile(param)
-	if e != nil {
-		fmt.Printf("删除相簿文件失败：%s\n", e)
-		return
-	}
-	fmt.Printf("删除相簿文件成功：%s\n", name)
-}
-
-// RunAlbumAddFile 增加网盘文件到相簿
-func RunAlbumAddFile(albumName string, filePathList []string, filterOption AlbumFileCategoryOption) {
-	activeUser := GetActiveUser()
-
-	if albumName == "" {
-		fmt.Printf("必须指定相簿名称\n")
-		return
-	}
-	album := getAlbumFromName(activeUser, albumName)
-	if album == nil {
-		fmt.Printf("相簿不存在\n")
-		return
-	}
-
-	paths, err := matchPathByShellPattern(activeUser.ActiveDriveId, filePathList...)
-	if err != nil {
-		fmt.Println(err)
-		return
-	}
-	if len(paths) == 0 {
-		fmt.Printf("没有有效的文件\n")
-		return
-	}
-
-	fmt.Printf("正在获取增加的文件信息，该操作可能会非常耗费时间，请耐心等待...\n")
-	param := &aliyunpan.AlbumAddFileParam{
-		AlbumId:       album.AlbumId,
-		DriveFileList: []aliyunpan.FileBatchActionParam{},
-	}
-	for k := range paths {
-		filePath := paths[k]
-		fileInfo, apierr := activeUser.PanClient().FileInfoByPath(activeUser.ActiveDriveId, filePath)
-		if apierr != nil {
-			fmt.Printf("获取文件信息失败: %s\n", filePath)
+		if record == nil {
 			continue
 		}
-		if fileInfo.IsFile() {
-			// file
-			if isFileMatchCondition(fileInfo, filterOption) {
-				param.AddFileItem(fileInfo.DriveId, fileInfo.FileId)
-			}
-		} else {
-			// folder
-			activeUser.PanClient().FilesDirectoriesRecurseList(activeUser.ActiveDriveId, fileInfo.Path, func(depth int, _ string, fd *aliyunpan.FileEntity, apiError *apierror.ApiError) bool {
-				if apiError != nil {
-					logger.Verbosef("%s\n", apiError)
-					return true
-				}
-				if !fd.IsFolder() {
-					if isFileMatchCondition(fd, filterOption) {
-						param.AddFileItem(fd.DriveId, fd.FileId)
-					}
-				}
-				time.Sleep(2 * time.Second)
-				return true
-			})
+		// 获取相簿下的所有文件
+		fileList, er := activeUser.PanClient().OpenapiPanClient().ShareAlbumListFileGetAll(&aliyunpan.ShareAlbumListFileParam{
+			AlbumId: record.AlbumId,
+			Limit:   100,
+		})
+		if er != nil {
+			fmt.Printf("获取相簿文件出错，请稍后重试: %s\n", albumNames[k])
+			continue
+		}
+		if fileList == nil || len(fileList) == 0 {
+			fmt.Printf("相簿里面没有文件: %s\n", albumNames[k])
+			continue
+		}
+
+		// 相薄文件是没有子文件夹的，这个fileList就是该相册里面的全部文件了，所以不需要再遍历子文件夹了
+		idx := 0
+		for {
+			if idx >= len(fileList) {
+				break
+			}
+			f := fileList.Item(idx)
+			idx += 1
+			// 处理实况照片
+			if f.IsAlbumLivePhotoFile() {
+				// 如果是实况照片，则需要下载图片+视频两个文件
+				// 获取下载链接
+				durl, apierr := activeUser.PanClient().OpenapiPanClient().ShareAlbumGetFileDownloadUrl(&aliyunpan.ShareAlbumGetFileUrlParam{
+					AlbumId: f.AlbumId,
+					DriveId: f.DriveId,
+					FileId:  f.FileId,
+				})
+				if apierr != nil {
+					logger.Verbosef("ERROR: get album file download url error: %s\n", f.FileId)
+					fmt.Printf("\n下载照片失败: %s\n", f.FileName)
+					continue
+				}
+				if durl.StreamsUrl != nil { // 实况图片(照片+视频)下载链接
+					// 照片文件
+					photoFile := cloneFileEntity(f)
+					photoFileSize := int64(0)
+					if durl.StreamsUrl.Heic != "" {
+						beforeStr, _ := strings.CutSuffix(f.FileName, ".livp")
+						photoFile.FileName = beforeStr + ".HEIC"
+						photoFile.FileExtension = "heic"
+						photoFileSize = getHttpDownloadFileSize(durl.StreamsUrl.Heic)
+					} else if durl.StreamsUrl.Jpeg != "" {
+						beforeStr, _ := strings.CutSuffix(f.FileName, ".livp")
+						photoFile.FileName = beforeStr + ".JPG"
+						photoFile.FileExtension = "jpg"
+						photoFileSize = getHttpDownloadFileSize(durl.StreamsUrl.Jpeg)
+					}
+					photoFile.FileSize = photoFileSize
+					fileList = append(fileList, photoFile)
+
+					// 视频文件
+					videoFile := cloneFileEntity(f)
+					videoFile.FileSize = f.FileSize - photoFileSize
+					if durl.StreamsUrl.Mov != "" {
+						beforeStr, _ := strings.CutSuffix(f.FileName, ".livp")
+						videoFile.FileName = beforeStr + ".MOV"
+						videoFile.FileExtension = "mov"
+					}
+					fileList = append(fileList, videoFile)
+				}
+				continue
+			}
+			// 补全虚拟网盘路径，规则：/共享相册/<相簿名称>/文件名称
+			f.Path = "/共享相册/" + albumNames[k] + "/" + f.FileName
+
+			// 生成下载项
+			newCfg := *cfg
+			unit := pandownload.DownloadTaskUnit{
+				Cfg:                  &newCfg, // 复制一份新的cfg
+				PanClient:            panClient,
+				VerbosePrinter:       panCommandVerbose,
+				ParentTaskExecutor:   &executor,
+				DownloadStatistic:    statistic,
+				IsPrintStatus:        options.IsPrintStatus,
+				IsExecutedPermission: options.IsExecutedPermission,
+				IsOverwrite:          options.IsOverwrite,
+				NoCheck:              options.NoCheck,
+				FilePanSource:        global.AlbumSource,
+				FilePanPath:          f.Path,
+				DriveId:              f.DriveId, // 一个相簿的文件会来自多个网盘（资源库/备份盘）
+				GlobalSpeedsStat:     globalSpeedsStat,
+				FileRecorder:         nil,
+			}
+
+			// 设置相簿文件信息
+			unit.SetFileInfo(global.AlbumSource, f)
+
+			// 设置储存的路径
+			if options.SaveTo != "" {
+				unit.OriginSaveRootPath = options.SaveTo
+				unit.SavePath = filepath.Join(options.SaveTo, f.Path)
+			} else {
+				// 使用默认的保存路径
+				unit.OriginSaveRootPath = GetActiveUser().GetSavePath("")
+				unit.SavePath = GetActiveUser().GetSavePath(f.Path)
+			}
+			info := executor.Append(&unit, options.MaxRetry)
+			fmt.Printf("[%s] 加入下载队列: %s\n", info.Id(), f.Path)
 		}
-		time.Sleep(2 * time.Second)
 	}

-	if len(param.DriveFileList) == 0 {
-		fmt.Printf("没有符合的文件\n")
-		return
+	// 开始计时
+	statistic.StartTimer()
+
+	// 开始执行
+	executor.Execute()
+
+	fmt.Printf("\n下载结束, 时间: %s, 数据总量: %s\n", utils.ConvertTime(statistic.Elapsed()), converter.ConvertFileSize(statistic.TotalSize(), 2))
+
+	// 输出失败的文件列表
+	failedList := executor.FailedDeque()
+	if failedList.Size() != 0 {
+		fmt.Printf("以下文件下载失败: \n")
+		tb := cmdtable.NewTable(os.Stdout)
+		for e := failedList.Shift(); e != nil; e = failedList.Shift() {
+			item := e.(*taskframework.TaskInfoItem)
+			tb.Append([]string{item.Info.Id(), item.Unit.(*pandownload.DownloadTaskUnit).FilePanPath})
+		}
+		tb.Render()
 	}
-	// add file
-	_, e := activeUser.PanClient().AlbumAddFile(param)
-	if e != nil {
-		fmt.Printf("增加相簿文件失败：%s\n", e)
-		return
-	}
-	fmt.Printf("增加相簿文件成功：%s\n", albumName)
 }

-func isFileMatchCondition(fileInfo *aliyunpan.FileEntity, filterOption AlbumFileCategoryOption) bool {
-	if fileInfo == nil {
-		return false
+func cloneFileEntity(entity *aliyunpan.FileEntity) *aliyunpan.FileEntity {
+	data, err := json.Marshal(entity) // 序列化原始对象
+	if err != nil {
+		panic(err)
 	}
-	if filterOption == ImageOnlyOption {
-		return fileInfo.Category == "image"
-	} else if filterOption == VideoOnlyOption {
-		return fileInfo.Category == "video"
-	} else if filterOption == ImageVideoOnlyOption {
-		return fileInfo.Category == "image" || fileInfo.Category == "video"
-	} else if filterOption == AllFileOption {
-		return true
+	newEntity := &aliyunpan.FileEntity{}
+	err = json.Unmarshal(data, newEntity) // 反序列化到新的对象中
+	if err != nil {
+		panic(err)
 	}
-	return false
+	return newEntity
+}
+
+func getHttpDownloadFileSize(fileUrl string) int64 {
+	client := requester.NewHTTPClient()
+	client.SetKeepAlive(true)
+	client.SetTimeout(10 * time.Minute)
+	// header
+	headers := map[string]string{
+		"user-agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.124 Safari/537.36",
+		"referer":    "https://www.aliyundrive.com/",
+	}
+	resp, err := client.Req("GET", fileUrl, nil, headers)
+	if err != nil {
+		return -1
+	}
+	fileSize := resp.ContentLength
+	return fileSize
 }
@@ -0,0 +1,787 @@
+// Copyright (c) 2020 tickstep.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+package command
+
+import (
+	"fmt"
+	"github.com/olekukonko/tablewriter"
+	"github.com/tickstep/aliyunpan-api/aliyunpan"
+	"github.com/tickstep/aliyunpan-api/aliyunpan/apierror"
+	"github.com/tickstep/aliyunpan-api/aliyunpan_web"
+	"github.com/tickstep/aliyunpan/cmder"
+	"github.com/tickstep/aliyunpan/cmder/cmdtable"
+	"github.com/tickstep/aliyunpan/internal/config"
+	"github.com/tickstep/aliyunpan/internal/file/downloader"
+	"github.com/tickstep/aliyunpan/internal/functions/pandownload"
+	"github.com/tickstep/aliyunpan/internal/functions/panlogin"
+	"github.com/tickstep/aliyunpan/internal/taskframework"
+	"github.com/tickstep/aliyunpan/internal/utils"
+	"github.com/tickstep/aliyunpan/library/requester/transfer"
+	"github.com/tickstep/library-go/converter"
+	"github.com/tickstep/library-go/logger"
+	"github.com/tickstep/library-go/requester/rio/speeds"
+	"github.com/urfave/cli"
+	"os"
+	"path/filepath"
+	"strconv"
+	"sync/atomic"
+	"time"
+)
+
+type (
+	AlbumFileCategoryOption string
+)
+
+var (
+	ImageOnlyOption      AlbumFileCategoryOption = "image"
+	VideoOnlyOption      AlbumFileCategoryOption = "video"
+	ImageVideoOnlyOption AlbumFileCategoryOption = "image_video"
+	AllFileOption        AlbumFileCategoryOption = "none"
+)
+
+func CmdAlbumWeb() cli.Command {
+	return cli.Command{
+		Name:      "albumw",
+		Usage:     "个人相册",
+		UsageText: cmder.App().Name + " albumw",
+		Category:  "阿里云盘",
+		Before:    ReloadConfigFunc,
+		Action: func(c *cli.Context) error {
+			cli.ShowCommandHelp(c, c.Command.Name)
+			return nil
+		},
+
+		Subcommands: []cli.Command{
+			{
+				Name:      "list",
+				Aliases:   []string{"ls"},
+				Usage:     "展示相簿列表",
+				UsageText: cmder.App().Name + " album list",
+				Description: `
+示例:
+
+    展示相簿列表 
+    aliyunpan albumw ls
+`,
+				Action: func(c *cli.Context) error {
+					if config.Config.ActiveUser() == nil {
+						fmt.Println("未登录账号")
+						return nil
+					}
+					if config.Config.ActiveUser().PanClient().WebapiPanClient() == nil {
+						fmt.Println("WEB客户端未登录，请登录后再使用该命令")
+						return nil
+					}
+					RunAlbumList()
+					return nil
+				},
+				Flags: []cli.Flag{},
+			},
+			{
+				Name:      "new",
+				Aliases:   []string{""},
+				Usage:     "创建相簿",
+				UsageText: cmder.App().Name + " album new",
+				Description: `
+示例:
+
+    新建相簿，名称为：我的相簿2022
+    aliyunpan albumw new "我的相簿2022"
+
+    新建相簿，名称为：我的相簿2022，描述为：存放2022所有文件
+    aliyunpan albumw new "我的相簿2022" "存放2022所有文件"
+`,
+				Action: func(c *cli.Context) error {
+					if config.Config.ActiveUser() == nil {
+						fmt.Println("未登录账号")
+						return nil
+					}
+					if config.Config.ActiveUser().PanClient().WebapiPanClient() == nil {
+						fmt.Println("WEB客户端未登录，请登录后再使用该命令")
+						return nil
+					}
+					RunAlbumCreate(c.Args().Get(0), c.Args().Get(1))
+					return nil
+				},
+				Flags: []cli.Flag{},
+			},
+			{
+				Name:      "rm",
+				Aliases:   []string{""},
+				Usage:     "删除相簿",
+				UsageText: cmder.App().Name + " album rm",
+				Description: `
+删除相簿，同名的相簿只会删除第一个符合条件的
+示例:
+
+    删除名称为"我的相簿2022"的相簿
+    aliyunpan albumw rm "我的相簿2022"
+
+    删除名称为"我的相簿2022-1" 和 "我的相簿2022-2"的相簿
+    aliyunpan albumw rm "我的相簿2022-1" "我的相簿2022-2"
+`,
+				Action: func(c *cli.Context) error {
+					if config.Config.ActiveUser() == nil {
+						fmt.Println("未登录账号")
+						return nil
+					}
+					if config.Config.ActiveUser().PanClient().WebapiPanClient() == nil {
+						fmt.Println("WEB客户端未登录，请登录后再使用该命令")
+						return nil
+					}
+					RunAlbumDelete(c.Args())
+					return nil
+				},
+				Flags: []cli.Flag{},
+			},
+			{
+				Name:      "rename",
+				Aliases:   []string{""},
+				Usage:     "重命名相簿",
+				UsageText: cmder.App().Name + " album rename",
+				Description: `
+重命名相簿，同名的相簿只会修改第一个符合条件的
+示例:
+
+    重命名相簿"我的相簿2022"为新的名称"我的相簿2022-new"
+    aliyunpan albumw rename "我的相簿2022" "我的相簿2022-new"
+`,
+				Action: func(c *cli.Context) error {
+					if config.Config.ActiveUser() == nil {
+						fmt.Println("未登录账号")
+						return nil
+					}
+					if config.Config.ActiveUser().PanClient().WebapiPanClient() == nil {
+						fmt.Println("WEB客户端未登录，请登录后再使用该命令")
+						return nil
+					}
+					RunAlbumRename(c.Args().Get(0), c.Args().Get(1))
+					return nil
+				},
+				Flags: []cli.Flag{},
+			},
+			{
+				Name:      "list-file",
+				Aliases:   []string{"lf"},
+				Usage:     "展示相簿中的文件",
+				UsageText: cmder.App().Name + " album list-file",
+				Description: `
+展示相簿中文件，同名的相簿只会展示第一个符合条件的
+示例:
+
+    展示相簿中文件"我的相簿2022"
+    aliyunpan albumw list-file "我的相簿2022"
+`,
+				Action: func(c *cli.Context) error {
+					if config.Config.ActiveUser() == nil {
+						fmt.Println("未登录账号")
+						return nil
+					}
+					if config.Config.ActiveUser().PanClient().WebapiPanClient() == nil {
+						fmt.Println("WEB客户端未登录，请登录后再使用该命令")
+						return nil
+					}
+					RunAlbumListFile(c.Args().Get(0))
+					return nil
+				},
+				Flags: []cli.Flag{},
+			},
+			{
+				Name:      "rm-file",
+				Aliases:   []string{"rf"},
+				Usage:     "移除相簿中的文件",
+				UsageText: cmder.App().Name + " album rm-file",
+				Description: `
+移除相簿中的文件，同名的相簿只会移除第一个符合条件的
+示例:
+
+    移除相簿 "我的相簿2022" 中的文件 1.png 2.png
+    aliyunpan albumw rm-file 我的相簿2022 1.png 2.png
+`,
+				Action: func(c *cli.Context) error {
+					if config.Config.ActiveUser() == nil {
+						fmt.Println("未登录账号")
+						return nil
+					}
+					if config.Config.ActiveUser().PanClient().WebapiPanClient() == nil {
+						fmt.Println("WEB客户端未登录，请登录后再使用该命令")
+						return nil
+					}
+					subArgs := c.Args()
+					if len(subArgs) < 2 {
+						fmt.Println("请指定移除的文件")
+						return nil
+					}
+					RunAlbumRmFile(subArgs[0], subArgs[1:])
+					return nil
+				},
+				Flags: []cli.Flag{},
+			},
+			{
+				Name:      "add-file",
+				Aliases:   []string{"af"},
+				Usage:     "增加（文件/相册）网盘文件到相簿中",
+				UsageText: cmder.App().Name + " album add-file",
+				Description: `
+增加文件到相簿中
+示例:
+
+    增加当前目录下的 1.png 2.png 文件到相簿 "我的相簿2022" 中
+    aliyunpan albumw add-file 我的相簿2022 1.png 2.png
+
+    增加当前目录下的 myFolder 文件夹下所有文件到相簿 "我的相簿2022" 中
+    aliyunpan albumw add-file 我的相簿2022 myFolder
+`,
+				Action: func(c *cli.Context) error {
+					if config.Config.ActiveUser() == nil {
+						fmt.Println("未登录账号")
+						return nil
+					}
+					if config.Config.ActiveUser().PanClient().WebapiPanClient() == nil {
+						fmt.Println("WEB客户端未登录，请登录后再使用该命令")
+						return nil
+					}
+					subArgs := c.Args()
+					if len(subArgs) < 2 {
+						fmt.Println("请指定增加的文件")
+						return nil
+					}
+					RunAlbumAddFile(subArgs[0], subArgs[1:], ImageVideoOnlyOption)
+					return nil
+				},
+				Flags: []cli.Flag{},
+			},
+			{
+				Name:      "download-file",
+				Aliases:   []string{"df"},
+				Usage:     "下载相簿中的所有文件到本地",
+				UsageText: cmder.App().Name + " album download-file",
+				Description: `
+下载相簿中的所有文件
+示例:
+
+    下载相簿 "我的相簿2022" 里面的所有文件
+    aliyunpan albumw download-file 我的相簿2022
+
+`,
+				Action: func(c *cli.Context) error {
+					if config.Config.ActiveUser() == nil {
+						fmt.Println("未登录账号")
+						return nil
+					}
+					if config.Config.ActiveUser().PanClient().WebapiPanClient() == nil {
+						fmt.Println("WEB客户端未登录，请登录后再使用该命令")
+						return nil
+					}
+					subArgs := c.Args()
+					if len(subArgs) == 0 {
+						fmt.Println("请指定下载的相簿名称")
+						return nil
+					}
+
+					// 处理saveTo
+					var (
+						saveTo string
+					)
+					if c.String("saveto") != "" {
+						saveTo = filepath.Clean(c.String("saveto"))
+					}
+
+					do := &DownloadOptions{
+						IsPrintStatus:        false,
+						IsExecutedPermission: false,
+						IsOverwrite:          c.Bool("ow"),
+						SaveTo:               saveTo,
+						Parallel:             0,
+						Load:                 0,
+						MaxRetry:             pandownload.DefaultDownloadMaxRetry,
+						NoCheck:              false,
+						ShowProgress:         !c.Bool("np"),
+						DriveId:              parseDriveId(c),
+						ExcludeNames:         []string{},
+					}
+
+					RunAlbumDownloadFile(c.Args(), do)
+					return nil
+				},
+				Flags: []cli.Flag{
+					cli.BoolFlag{
+						Name:  "ow",
+						Usage: "overwrite, 覆盖已存在的文件",
+					},
+					cli.StringFlag{
+						Name:  "saveto",
+						Usage: "将下载的文件直接保存到指定的目录",
+					},
+					cli.BoolFlag{
+						Name:  "np",
+						Usage: "no progress 不展示下载进度条",
+					},
+				},
+			},
+		},
+	}
+}
+
+func RunAlbumList() {
+	activeUser := GetActiveUser()
+	records, err := activeUser.PanClient().WebapiPanClient().AlbumListGetAll(&aliyunpan_web.AlbumListParam{})
+	if err != nil {
+		fmt.Printf("获取相簿列表失败: %s\n", err)
+		return
+	}
+
+	tb := cmdtable.NewTable(os.Stdout)
+	tb.SetHeader([]string{"#", "ALBUM_ID", "名称", "文件数量", "创建日期", "修改日期"})
+	tb.SetColumnAlignment([]int{tablewriter.ALIGN_DEFAULT, tablewriter.ALIGN_DEFAULT, tablewriter.ALIGN_LEFT, tablewriter.ALIGN_CENTER, tablewriter.ALIGN_DEFAULT, tablewriter.ALIGN_DEFAULT})
+	for k, record := range records {
+		tb.Append([]string{strconv.Itoa(k + 1), record.AlbumId, record.Name, strconv.Itoa(record.FileCount),
+			record.CreatedAtStr(), record.UpdatedAtStr()})
+	}
+	tb.Render()
+}
+
+func RunAlbumCreate(name, description string) {
+	if name == "" {
+		fmt.Printf("相簿名称不能为空\n")
+		return
+	}
+
+	activeUser := GetActiveUser()
+	_, err := activeUser.PanClient().WebapiPanClient().AlbumCreate(&aliyunpan_web.AlbumCreateParam{
+		Name:        name,
+		Description: description,
+	})
+	if err != nil {
+		fmt.Printf("创建相簿失败: %s\n", err)
+		return
+	}
+	fmt.Printf("创建相簿成功: %s\n", name)
+}
+
+func RunAlbumDelete(nameList []string) {
+	if len(nameList) == 0 {
+		fmt.Printf("相簿名称不能为空\n")
+		return
+	}
+
+	activeUser := GetActiveUser()
+	records, err := activeUser.PanClient().WebapiPanClient().AlbumListGetAll(&aliyunpan_web.AlbumListParam{})
+	if err != nil {
+		fmt.Printf("获取相簿列表失败: %s\n", err)
+		return
+	}
+
+	for _, record := range records {
+		for i, name := range nameList {
+			if name == record.Name {
+				nameList = append(nameList[:i], nameList[i+1:]...)
+				_, err := activeUser.PanClient().WebapiPanClient().AlbumDelete(&aliyunpan_web.AlbumDeleteParam{
+					AlbumId: record.AlbumId,
+				})
+				if err != nil {
+					fmt.Printf("删除相簿失败: %s\n", name)
+					return
+				} else {
+					fmt.Printf("删除相簿成功: %s\n", name)
+				}
+				break
+			}
+		}
+	}
+}
+
+func getAlbumFromName(activeUser *config.PanUser, name string) *aliyunpan.AlbumEntity {
+	records, err := activeUser.PanClient().WebapiPanClient().AlbumListGetAll(&aliyunpan_web.AlbumListParam{})
+	if err != nil {
+		fmt.Printf("获取相簿列表失败: %s\n", err)
+		return nil
+	}
+
+	for _, record := range records {
+		if name == record.Name {
+			return record
+		}
+	}
+	return nil
+}
+
+func RunAlbumRename(name, newName string) {
+	if len(name) == 0 {
+		fmt.Printf("相簿名称不能为空\n")
+		return
+	}
+	if len(newName) == 0 {
+		fmt.Printf("相簿名称不能为空\n")
+		return
+	}
+
+	activeUser := GetActiveUser()
+	record := getAlbumFromName(activeUser, name)
+	if record == nil {
+		return
+	}
+	_, err := activeUser.PanClient().WebapiPanClient().AlbumEdit(&aliyunpan_web.AlbumEditParam{
+		AlbumId:     record.AlbumId,
+		Description: record.Description,
+		Name:        newName,
+	})
+	if err != nil {
+		fmt.Printf("重命名相簿失败: %s\n", name)
+		return
+	} else {
+		fmt.Printf("重命名相簿成功: %s -> %s\n", name, newName)
+	}
+}
+
+func RunAlbumListFile(name string) {
+	if len(name) == 0 {
+		fmt.Printf("相簿名称不能为空\n")
+		return
+	}
+
+	activeUser := GetActiveUser()
+	record := getAlbumFromName(activeUser, name)
+	if record == nil {
+		return
+	}
+
+	fileList, er := activeUser.PanClient().WebapiPanClient().AlbumListFileGetAll(&aliyunpan_web.AlbumListFileParam{
+		AlbumId: record.AlbumId,
+	})
+	if er != nil {
+		fmt.Printf("获取相簿文件列表失败：%s\n", er)
+		return
+	}
+	renderTable(opLs, false, "", fileList)
+}
+
+func RunAlbumRmFile(name string, nameList []string) {
+	if len(name) == 0 {
+		fmt.Printf("相簿名称不能为空\n")
+		return
+	}
+	if len(nameList) == 0 {
+		fmt.Printf("指定文件不能为空\n")
+		return
+	}
+
+	activeUser := GetActiveUser()
+	album := getAlbumFromName(activeUser, name)
+	if album == nil {
+		return
+	}
+
+	fileList, er := activeUser.PanClient().WebapiPanClient().AlbumListFileGetAll(&aliyunpan_web.AlbumListFileParam{
+		AlbumId: album.AlbumId,
+	})
+	if er != nil {
+		fmt.Printf("获取相簿文件列表失败：%s\n", er)
+		return
+	}
+	param := &aliyunpan_web.AlbumDeleteFileParam{
+		AlbumId:       album.AlbumId,
+		DriveFileList: []aliyunpan.FileBatchActionParam{},
+	}
+	for _, file := range fileList {
+		if len(nameList) == 0 {
+			break
+		}
+		for i, name := range nameList {
+			if name == file.FileName {
+				nameList = append(nameList[:i], nameList[i+1:]...)
+				param.AddFileItem(file.DriveId, file.FileId)
+				break
+			}
+		}
+	}
+
+	// 1-500 范围
+	if len(param.DriveFileList) == 0 {
+		fmt.Printf("没有符合的文件\n")
+		return
+	}
+	// delete file
+	_, e := activeUser.PanClient().WebapiPanClient().AlbumDeleteFile(param)
+	if e != nil {
+		fmt.Printf("删除相簿文件失败：%s\n", e)
+		return
+	}
+	fmt.Printf("删除相簿文件成功：%s\n", name)
+}
+
+// RunAlbumAddFile 增加网盘文件到相簿
+func RunAlbumAddFile(albumName string, filePathList []string, filterOption AlbumFileCategoryOption) {
+	activeUser := GetActiveUser()
+
+	if albumName == "" {
+		fmt.Printf("必须指定相簿名称\n")
+		return
+	}
+	album := getAlbumFromName(activeUser, albumName)
+	if album == nil {
+		fmt.Printf("相簿不存在\n")
+		return
+	}
+
+	paths, err := makePathAbsolute(activeUser.ActiveDriveId, filePathList...)
+	if err != nil {
+		fmt.Println(err)
+		return
+	}
+	if len(paths) == 0 {
+		fmt.Printf("没有有效的文件\n")
+		return
+	}
+
+	fmt.Printf("正在获取增加的文件信息，该操作可能会非常耗费时间，请耐心等待...\n")
+	param := &aliyunpan_web.AlbumAddFileParam{
+		AlbumId:       album.AlbumId,
+		DriveFileList: []aliyunpan.FileBatchActionParam{},
+	}
+	for k := range paths {
+		filePath := paths[k]
+		fileInfo, apierr := activeUser.PanClient().WebapiPanClient().FileInfoByPath(activeUser.ActiveDriveId, filePath)
+		if apierr != nil {
+			fmt.Printf("获取文件信息失败: %s\n", filePath)
+			continue
+		}
+		if fileInfo.IsFile() {
+			// file
+			if isFileMatchCondition(fileInfo, filterOption) {
+				param.AddFileItem(fileInfo.DriveId, fileInfo.FileId)
+			}
+		} else {
+			// folder
+			activeUser.PanClient().WebapiPanClient().FilesDirectoriesRecurseList(activeUser.ActiveDriveId, fileInfo.Path, func(depth int, _ string, fd *aliyunpan.FileEntity, apiError *apierror.ApiError) bool {
+				if apiError != nil {
+					logger.Verbosef("%s\n", apiError)
+					return true
+				}
+				if !fd.IsFolder() {
+					if isFileMatchCondition(fd, filterOption) {
+						param.AddFileItem(fd.DriveId, fd.FileId)
+					}
+				}
+				time.Sleep(2 * time.Second)
+				return true
+			})
+		}
+		time.Sleep(2 * time.Second)
+	}
+
+	if len(param.DriveFileList) == 0 {
+		fmt.Printf("没有符合的文件\n")
+		return
+	}
+	// add file
+	_, e := activeUser.PanClient().WebapiPanClient().AlbumAddFile(param)
+	if e != nil {
+		fmt.Printf("增加相簿文件失败：%s\n", e)
+		return
+	}
+	fmt.Printf("增加相簿文件成功：%s\n", albumName)
+}
+
+func isFileMatchCondition(fileInfo *aliyunpan.FileEntity, filterOption AlbumFileCategoryOption) bool {
+	if fileInfo == nil {
+		return false
+	}
+	if filterOption == ImageOnlyOption {
+		return fileInfo.Category == "image"
+	} else if filterOption == VideoOnlyOption {
+		return fileInfo.Category == "video"
+	} else if filterOption == ImageVideoOnlyOption {
+		return fileInfo.Category == "image" || fileInfo.Category == "video"
+	} else if filterOption == AllFileOption {
+		return true
+	}
+	return false
+}
+
+func RunAlbumDownloadFile(albumNames []string, options *DownloadOptions) {
+	if len(albumNames) == 0 {
+		fmt.Printf("相簿名称不能为空\n")
+		return
+	}
+
+	activeUser := GetActiveUser()
+	activeUser.PanClient().WebapiPanClient().EnableCache()
+	activeUser.PanClient().WebapiPanClient().ClearCache()
+	defer activeUser.PanClient().WebapiPanClient().DisableCache()
+	// pan token expired checker
+	continueFlag := int32(0)
+	atomic.StoreInt32(&continueFlag, 0)
+	defer func() {
+		atomic.StoreInt32(&continueFlag, 1)
+	}()
+	go func(flag *int32) {
+		for atomic.LoadInt32(flag) == 0 {
+			time.Sleep(time.Duration(1) * time.Minute)
+			re := RefreshWebTokenInNeed(activeUser)
+			if re.Code == panlogin.SUCCESS {
+				logger.Verboseln("update access token for download task")
+			}
+		}
+	}(&continueFlag)
+
+	if options == nil {
+		options = &DownloadOptions{}
+	}
+
+	if options.MaxRetry < 0 {
+		options.MaxRetry = pandownload.DefaultDownloadMaxRetry
+	}
+	options.IsExecutedPermission = false
+
+	// 设置下载配置
+	cfg := &downloader.Config{
+		Mode:                       transfer.RangeGenMode_BlockSize,
+		CacheSize:                  config.Config.CacheSize,
+		BlockSize:                  MaxDownloadRangeSize,
+		MaxRate:                    config.Config.MaxDownloadRate,
+		InstanceStateStorageFormat: downloader.InstanceStateStorageFormatJSON,
+		ShowProgress:               options.ShowProgress,
+		ExcludeNames:               options.ExcludeNames,
+	}
+	if cfg.CacheSize == 0 {
+		cfg.CacheSize = int(DownloadCacheSize)
+	}
+
+	// 设置下载最大并发量
+	if options.Parallel < 1 {
+		options.Parallel = config.Config.MaxDownloadParallel
+		if options.Parallel == 0 {
+			options.Parallel = config.DefaultFileDownloadParallelNum
+		}
+	}
+	if options.Parallel > config.MaxFileDownloadParallelNum {
+		options.Parallel = config.MaxFileDownloadParallelNum
+	}
+
+	// 保存文件的本地根文件夹
+	originSaveRootPath := ""
+	if options.SaveTo != "" {
+		originSaveRootPath = options.SaveTo
+	} else {
+		// 使用默认的保存路径
+		originSaveRootPath = GetActiveUser().GetSavePath("")
+	}
+	fi, err1 := os.Stat(originSaveRootPath)
+	if err1 != nil && !os.IsExist(err1) {
+		os.MkdirAll(originSaveRootPath, 0777) // 首先在本地创建目录
+	} else {
+		if !fi.IsDir() {
+			fmt.Println("本地保存路径不是文件夹，请删除或者创建对应的文件夹：", originSaveRootPath)
+			return
+		}
+	}
+
+	fmt.Printf("\n[0] 当前文件下载最大并发量为: %d, 下载缓存为: %s\n\n", options.Parallel, converter.ConvertFileSize(int64(cfg.CacheSize), 2))
+
+	var (
+		panClient = activeUser.PanClient()
+	)
+	cfg.MaxParallel = options.Parallel
+
+	var (
+		executor = taskframework.TaskExecutor{
+			IsFailedDeque: true, // 统计失败的列表
+		}
+		statistic = &pandownload.DownloadStatistic{}
+	)
+	// 配置执行器任务并发数，即同时下载文件并发数
+	executor.SetParallel(cfg.MaxParallel)
+
+	// 全局速度统计
+	globalSpeedsStat := &speeds.Speeds{}
+
+	// 处理队列
+	for k := range albumNames {
+		record := getAlbumFromName(activeUser, albumNames[k])
+		if record == nil {
+			continue
+		}
+		// 获取相簿下的所有文件
+		fileList, er := activeUser.PanClient().WebapiPanClient().AlbumListFileGetAll(&aliyunpan_web.AlbumListFileParam{
+			AlbumId: record.AlbumId,
+		})
+		if er != nil {
+			fmt.Printf("获取相簿文件出错，请稍后重试: %s\n", albumNames[k])
+			continue
+		}
+		if fileList == nil || len(fileList) == 0 {
+			fmt.Printf("相簿里面没有文件: %s\n", albumNames[k])
+			continue
+		}
+		for _, f := range fileList {
+			// 补全虚拟网盘路径，规则：/<相簿名称>/文件名称
+			f.Path = "/" + albumNames[k] + "/" + f.FileName
+
+			// 生成下载项
+			newCfg := *cfg
+			unit := pandownload.DownloadTaskUnit{
+				Cfg:                  &newCfg, // 复制一份新的cfg
+				PanClient:            panClient,
+				VerbosePrinter:       panCommandVerbose,
+				ParentTaskExecutor:   &executor,
+				DownloadStatistic:    statistic,
+				IsPrintStatus:        options.IsPrintStatus,
+				IsExecutedPermission: options.IsExecutedPermission,
+				IsOverwrite:          options.IsOverwrite,
+				NoCheck:              options.NoCheck,
+				FilePanPath:          f.Path,
+				DriveId:              f.DriveId, // 必须使用文件的DriveId,因为一个相簿的文件会来自多个网盘（资源库/备份盘）
+				GlobalSpeedsStat:     globalSpeedsStat,
+				FileRecorder:         nil,
+			}
+
+			// TODO: 相册下载需要重构
+			// 设置相簿文件信息
+			//unit.SetFileInfo(pandownload.AlbumFileSource, f)
+
+			// 设置储存的路径
+			if options.SaveTo != "" {
+				unit.OriginSaveRootPath = options.SaveTo
+				unit.SavePath = filepath.Join(options.SaveTo, f.Path)
+			} else {
+				// 使用默认的保存路径
+				unit.OriginSaveRootPath = GetActiveUser().GetSavePath("")
+				unit.SavePath = GetActiveUser().GetSavePath(f.Path)
+			}
+			info := executor.Append(&unit, options.MaxRetry)
+			fmt.Printf("[%s] 加入下载队列: %s\n", info.Id(), f.Path)
+		}
+	}
+
+	// 开始计时
+	statistic.StartTimer()
+
+	// 开始执行
+	executor.Execute()
+
+	fmt.Printf("\n下载结束, 时间: %s, 数据总量: %s\n", utils.ConvertTime(statistic.Elapsed()), converter.ConvertFileSize(statistic.TotalSize(), 2))
+
+	// 输出失败的文件列表
+	failedList := executor.FailedDeque()
+	if failedList.Size() != 0 {
+		fmt.Printf("以下文件下载失败: \n")
+		tb := cmdtable.NewTable(os.Stdout)
+		for e := failedList.Shift(); e != nil; e = failedList.Shift() {
+			item := e.(*taskframework.TaskInfoItem)
+			tb.Append([]string{item.Info.Id(), item.Unit.(*pandownload.DownloadTaskUnit).FilePanPath})
+		}
+		tb.Render()
+	}
+}
@@ -4,7 +4,7 @@
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
-//     http://www.apache.org/licenses/LICENSE-2.0
+//	http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
@@ -33,14 +33,17 @@ func CmdCd() cli.Command {
 	切换 /我的资源 工作目录:
 	aliyunpan cd /我的资源

+	切换 /我的资源 工作目录，使用通配符:
+	aliyunpan cd /我的*
+
 	切换上级目录:
 	aliyunpan cd ..

 	切换根目录:
 	aliyunpan cd /
 `,
-		Before: cmder.ReloadConfigFunc,
-		After:  cmder.SaveConfigFunc,
+		Before: ReloadConfigFunc,
+		After:  SaveConfigFunc,
 		Action: func(c *cli.Context) error {
 			if c.NArg() == 0 {
 				cli.ShowCommandHelp(c, c.Command.Name)
@@ -69,7 +72,7 @@ func CmdPwd() cli.Command {
 		Usage:     "输出工作目录",
 		UsageText: cmder.App().Name + " pwd",
 		Category:  "阿里云盘",
-		Before:    cmder.ReloadConfigFunc,
+		Before:    ReloadConfigFunc,
 		Action: func(c *cli.Context) error {
 			if config.Config.ActiveUser() == nil {
 				fmt.Println("未登录账号")
@@ -78,6 +81,8 @@ func CmdPwd() cli.Command {
 			activeUser := config.Config.ActiveUser()
 			if activeUser.IsFileDriveActive() {
 				fmt.Println(activeUser.Workdir)
+			} else if activeUser.IsResourceDriveActive() {
+				fmt.Println(activeUser.ResourceWorkdir)
 			} else if activeUser.IsAlbumDriveActive() {
 				fmt.Println(activeUser.AlbumWorkdir)
 			}
@@ -90,24 +95,52 @@ func RunChangeDirectory(driveId, targetPath string) {
 	user := config.Config.ActiveUser()
 	targetPath = user.PathJoin(driveId, targetPath)

-	targetPathInfo, err := user.PanClient().FileInfoByPath(driveId, targetPath)
+	// 获取目标路径文件信息
+	targetPathInfo, err := user.PanClient().OpenapiPanClient().FileInfoByPath(driveId, targetPath)
 	if err != nil {
 		fmt.Println(err)
 		return
 	}

+	// 适配通配符路径获取目标文件信息（弃用，容易触发风控）
+	//files, err := matchPathByShellPattern(driveId, targetPath)
+	//if err != nil {
+	//	fmt.Println(err)
+	//	return
+	//}
+	//
+	//var targetPathInfo *aliyunpan.FileEntity
+	//if len(files) == 1 {
+	//	targetPathInfo = files[0]
+	//} else {
+	//	for _, f := range files {
+	//		if f.IsFolder() {
+	//			targetPathInfo = f
+	//			break
+	//		}
+	//	}
+	//}
+
+	if targetPathInfo == nil {
+		fmt.Println("路径不存在")
+		return
+	}
+
 	if !targetPathInfo.IsFolder() {
-		fmt.Printf("错误: %s 不是一个目录 (文件夹)\n", targetPath)
+		fmt.Printf("错误: %s 不是一个目录 (文件夹)\n", targetPathInfo.Path)
 		return
 	}

 	if user.IsFileDriveActive() {
-		user.Workdir = targetPath
+		user.Workdir = targetPathInfo.Path
 		user.WorkdirFileEntity = *targetPathInfo
+	} else if user.IsResourceDriveActive() {
+		user.ResourceWorkdir = targetPathInfo.Path
+		user.ResourceWorkdirFileEntity = *targetPathInfo
 	} else if user.IsAlbumDriveActive() {
-		user.AlbumWorkdir = targetPath
+		user.AlbumWorkdir = targetPathInfo.Path
 		user.AlbumWorkdirFileEntity = *targetPathInfo
 	}

-	fmt.Printf("改变工作目录: %s\n", targetPath)
+	fmt.Printf("改变工作目录: %s\n", targetPathInfo.Path)
 }
@@ -4,7 +4,7 @@
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
-//     http://www.apache.org/licenses/LICENSE-2.0
+//	http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
@@ -18,26 +18,13 @@ import (
 	"fmt"
 	"github.com/tickstep/aliyunpan/cmder"
 	"github.com/tickstep/aliyunpan/cmder/cmdutil"
+	"github.com/tickstep/aliyunpan/internal/config"
 	"github.com/tickstep/aliyunpan/library/crypto"
 	"github.com/tickstep/library-go/getip"
 	"github.com/urfave/cli"
-	"net/url"
-	"path"
-	"strconv"
-	"strings"
-
-	"github.com/tickstep/aliyunpan-api/aliyunpan"
-	"github.com/tickstep/aliyunpan/internal/config"
 )

-type (
-	// 秒传数据项
-	RapidUploadItem struct {
-		FileSha1 string
-		FileSize int64
-		FilePath string // 绝对路径，包含文件名
-	}
-)
+type ()

 const (
 	cryptoDescription = `
@@ -58,7 +45,7 @@ const (
 var ErrBadArgs = errors.New("参数错误")
 var ErrNotLogined = errors.New("未登录账号")

-func GetActivePanClient() *aliyunpan.PanClient {
+func GetActivePanClient() *config.PanClient {
 	return config.Config.ActiveUser().PanClient()
 }

@@ -74,96 +61,16 @@ func parseDriveId(c *cli.Context) string {
 	return driveId
 }

-// newRapidUploadItem 通过解析秒传链接创建秒传实体
-func newRapidUploadItem(rapidUploadShareLink string) (*RapidUploadItem, error) {
-	if strings.IndexAny(rapidUploadShareLink, "aliyunpan://") != 0 {
-		return nil, fmt.Errorf("秒传链接格式错误: %s", rapidUploadShareLink)
-	}
-
-	// 格式：aliyunpan://文件名|sha1|文件大小|<相对路径>
-	rapidUploadShareLinkStr := strings.Replace(rapidUploadShareLink, "aliyunpan://", "", 1)
-
-	item := &RapidUploadItem{}
-	parts := strings.Split(rapidUploadShareLinkStr, "|")
-
-	if len(parts) < 4 {
-		return nil, fmt.Errorf("秒传链接格式错误: %s", rapidUploadShareLink)
-	}
-
-	// hash
-	if len(parts[1]) == 0 {
-		return nil, fmt.Errorf("文件sha1错误: %s", rapidUploadShareLink)
-	}
-	item.FileSha1 = strings.TrimSpace(parts[1])
-
-	// size
-	if size,e := strconv.ParseInt(parts[2], 10, 64); e == nil{
-		item.FileSize = size
-	} else {
-		return nil, fmt.Errorf("文件大小错误: %s", rapidUploadShareLink)
-	}
-
-	// path
-	relativePath, _ := url.QueryUnescape(parts[3])
-	item.FilePath = path.Join(relativePath, parts[0])
-
-	// result
-	return item, nil
-}
-
-func newRapidUploadItemFromFileEntity(fileEntity *aliyunpan.FileEntity) *RapidUploadItem {
-	if fileEntity == nil {
-		return nil
-	}
-	return &RapidUploadItem{
-		FileSha1: fileEntity.ContentHash,
-		FileSize: fileEntity.FileSize,
-		FilePath: fileEntity.Path,
-	}
-}
-
-// 创建秒传链接
-// 链接格式说明：aliyunpan://文件名|sha1|文件大小|<相对路径>
-// "相对路径" 可以为空，为空代表存储到网盘根目录
-func (r *RapidUploadItem) createRapidUploadLink(hideRelativePath bool) string {
-	fullLink := &strings.Builder{}
-
-	p := r.FilePath
-	p = strings.ReplaceAll(p, "\\", "/")
-
-
-	fileName := path.Base(p)
-	dirPath := path.Dir(p)
-
-	// 去掉开头/
-	if strings.Index(dirPath, "/") == 0 {
-		dirPath = dirPath[1:]
-	}
-	// 相对路径编码
-	dirPath = url.QueryEscape(dirPath)
-
-	// 隐藏相对路径
-	if hideRelativePath {
-		dirPath = ""
-	}
-
-	// 拼接
-	fmt.Fprintf(fullLink, "aliyunpan://%s|%s|%d|%s",
-		fileName, strings.ToUpper(r.FileSha1), r.FileSize, dirPath)
-
-	return fullLink.String()
-}
-
 func CmdConfig() cli.Command {
 	return cli.Command{
 		Name:        "config",
 		Usage:       "显示和修改程序配置项",
 		Description: "显示和修改程序配置项",
 		Category:    "配置",
-		Before:      cmder.ReloadConfigFunc,
-		After:       cmder.SaveConfigFunc,
+		Before:      ReloadConfigFunc,
+		After:       SaveConfigFunc,
 		Action: func(c *cli.Context) error {
-			fmt.Printf("----\n运行 %s config set 可进行设置配置\n\n当前配置:\n", cmder.App().Name)
+			fmt.Printf("----\n当前配置目录: %s\n运行 %s config set 可进行设置配置\n\n当前配置:\n", config.GetConfigDir(), cmder.App().Name)
 			config.Config.PrintTable()
 			return nil
 		},
@@ -214,10 +121,6 @@ func CmdConfig() cli.Command {
 							return nil
 						}
 					}
-					if c.IsSet("transfer_url_type") {
-						config.Config.TransferUrlType = c.Int("transfer_url_type")
-					}
-
 					if c.IsSet("savedir") {
 						config.Config.SaveDir = c.String("savedir")
 					}
@@ -227,6 +130,15 @@ func CmdConfig() cli.Command {
 					if c.IsSet("local_addrs") {
 						config.Config.SetLocalAddrs(c.String("local_addrs"))
 					}
+					if c.IsSet("ip_type") {
+						config.Config.SetPreferIPType(c.String("ip_type"))
+					}
+					if c.IsSet("file_record_config") {
+						config.Config.SetFileRecorderConfig(c.String("file_record_config"))
+					}
+					if c.IsSet("device_id") {
+						config.Config.SetDeviceId(c.String("device_id"))
+					}

 					err := config.Config.Save()
 					if err != nil {
@@ -260,11 +172,6 @@ func CmdConfig() cli.Command {
 						Name:  "max_upload_rate",
 						Usage: "限制最大上传速度, 0代表不限制",
 					},
-					cli.IntFlag{
-						Name:  "transfer_url_type",
-						Usage: "上传下载URL类别，1-默认，2-阿里云ECS",
-						Value: 1,
-					},
 					cli.StringFlag{
 						Name:  "savedir",
 						Usage: "下载文件的储存目录",
@@ -277,13 +184,24 @@ func CmdConfig() cli.Command {
 						Name:  "local_addrs",
 						Usage: "设置本地网卡地址, 多个地址用逗号隔开",
 					},
+					cli.StringFlag{
+						Name:  "ip_type",
+						Usage: "设置域名解析IP优先类型",
+					},
+					cli.StringFlag{
+						Name:  "file_record_config",
+						Usage: "设置是否开启上传、下载、同步文件的结果记录功能",
+					},
+					cli.StringFlag{
+						Name:  "device_id",
+						Usage: "设置客户端ID，24位的字符串",
+					},
 				},
 			},
 		},
 	}
 }

-
 func CmdTool() cli.Command {
 	return cli.Command{
 		Name:  "tool",
@@ -1,21 +1,13 @@
 package command

 import (
-	"fmt"
 	"testing"
 )

 func TestRapidUploadItem_createRapidUploadLink(t *testing.T) {
-	item := &RapidUploadItem{
-		FileSha1: "752FCCBFB2436A6FFCA3B287831D4FAA5654B07E",
-		FileSize: 7005440,
-		FilePath: "/dgsdg/rtt5/我的文件夹/file我的文件.dmg",
-	}
-	fmt.Println(item.createRapidUploadLink(false))
+
 }

 func TestRapidUploadItem_newRapidUploadItem(t *testing.T) {
-	link := "aliyunpan://file我的文件.dmg|752FCCBFB2436A6FFCA3B287831D4FAA5654B07E|7005440|dgsdg%2Frtt5%2F%E6%88%91%E7%9A%84%E6%96%87%E4%BB%B6%E5%A4%B9"
-	item,_ := newRapidUploadItem(link)
-	fmt.Println(item)
-}
+
+}
@@ -0,0 +1,123 @@
+// Copyright (c) 2020 tickstep.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+package command
+
+import (
+	"fmt"
+	"github.com/tickstep/aliyunpan-api/aliyunpan"
+	"github.com/tickstep/aliyunpan/cmder/cmdtable"
+	"github.com/tickstep/aliyunpan/internal/config"
+	"github.com/urfave/cli"
+	"os"
+	"strconv"
+)
+
+func CmdCp() cli.Command {
+	return cli.Command{
+		Name:  "cp",
+		Usage: "复制文件/目录",
+		UsageText: `
+	aliyunpan cp <文件/目录1> <文件/目录2> <文件/目录3> ... <目标目录>`,
+		Description: `
+	同网盘内复制文件或者目录。支持通配符匹配复制文件，通配符当前只能匹配文件名，不能匹配文件路径。
+
+	示例:
+
+	将 /我的资源/1.mp4 复制到 根目录 /
+	aliyunpan cp /我的资源/1.mp4 /
+
+	将 /我的资源 目录下所有的.png文件 复制到 /我的图片 目录下面，使用通配符匹配
+	aliyunpan cp /我的资源/*.png /我的图片
+`,
+		Category: "阿里云盘",
+		Before:   ReloadConfigFunc,
+		Action: func(c *cli.Context) error {
+			if c.NArg() <= 1 {
+				cli.ShowCommandHelp(c, c.Command.Name)
+				return nil
+			}
+			if config.Config.ActiveUser() == nil {
+				fmt.Println("未登录账号")
+				return nil
+			}
+			RunCopy(parseDriveId(c), c.Args()...)
+			return nil
+		},
+		Flags: []cli.Flag{
+			cli.StringFlag{
+				Name:  "driveId",
+				Usage: "网盘ID",
+				Value: "",
+			},
+		},
+	}
+}
+
+// RunCopy 执行复制文件/目录
+func RunCopy(driveId string, paths ...string) {
+	activeUser := GetActiveUser()
+	cacheCleanPaths := []string{}
+	opFileList, targetFile, _, err := getFileInfo(driveId, paths...)
+	if err != nil {
+		fmt.Println(err)
+		return
+	}
+	if targetFile == nil {
+		fmt.Println("目标文件不存在")
+		return
+	}
+	if opFileList == nil || len(opFileList) == 0 {
+		fmt.Println("没有有效的文件可复制")
+		return
+	}
+	cacheCleanPaths = append(cacheCleanPaths, targetFile.Path)
+
+	failedCopyFiles := []*aliyunpan.FileEntity{}
+	successCopyFiles := []*aliyunpan.FileEntity{}
+	for _, mfi := range opFileList {
+		_, er := activeUser.PanClient().OpenapiPanClient().FileCopy(&aliyunpan.FileCopyParam{
+			DriveId:        driveId,
+			FileId:         mfi.FileId,
+			ToParentFileId: targetFile.FileId,
+		})
+		if er == nil {
+			successCopyFiles = append(successCopyFiles, mfi)
+		} else {
+			failedCopyFiles = append(failedCopyFiles, mfi)
+		}
+	}
+
+	if len(failedCopyFiles) > 0 {
+		fmt.Println("以下文件复制失败：")
+		for _, f := range failedCopyFiles {
+			fmt.Println(f.Path)
+		}
+		fmt.Println("")
+	}
+	if len(successCopyFiles) > 0 {
+		pnt := func() {
+			tb := cmdtable.NewTable(os.Stdout)
+			tb.SetHeader([]string{"#", "文件/目录"})
+			for k, rs := range successCopyFiles {
+				tb.Append([]string{strconv.Itoa(k + 1), rs.Path})
+			}
+			tb.Render()
+		}
+		fmt.Println("操作成功, 以下文件已复制到目标目录: ", targetFile.Path)
+		pnt()
+		activeUser.DeleteCache(cacheCleanPaths)
+	} else {
+		fmt.Println("无法复制文件，请稍后重试")
+	}
+}
@@ -4,7 +4,7 @@
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
-//     http://www.apache.org/licenses/LICENSE-2.0
+//	http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,38 +15,48 @@ package command

 import (
 	"fmt"
+	"os"
+	"path"
+	"path/filepath"
+	"runtime"
+	"sort"
+
 	"github.com/tickstep/aliyunpan/cmder"
 	"github.com/tickstep/aliyunpan/cmder/cmdtable"
 	"github.com/tickstep/aliyunpan/internal/config"
 	"github.com/tickstep/aliyunpan/internal/file/downloader"
 	"github.com/tickstep/aliyunpan/internal/functions/pandownload"
+	"github.com/tickstep/aliyunpan/internal/global"
+	"github.com/tickstep/aliyunpan/internal/log"
 	"github.com/tickstep/aliyunpan/internal/taskframework"
+	"github.com/tickstep/aliyunpan/internal/ui"
 	"github.com/tickstep/aliyunpan/internal/utils"
 	"github.com/tickstep/aliyunpan/library/requester/transfer"
 	"github.com/tickstep/library-go/converter"
 	"github.com/tickstep/library-go/logger"
 	"github.com/tickstep/library-go/requester/rio/speeds"
 	"github.com/urfave/cli"
-	"os"
-	"path/filepath"
-	"runtime"
-	"time"
 )

 type (
 	//DownloadOptions 下载可选参数
 	DownloadOptions struct {
+		// DownloadActionId 下载动作ID，唯一标识一次下载动作的ID。这个ID每次下载任务启动的时候会自动生成，同一次下载任务下载的文件，这个ID都是同一个值。
+		DownloadActionId     string
 		IsPrintStatus        bool
 		IsExecutedPermission bool
 		IsOverwrite          bool
 		SaveTo               string
-		Parallel             int
+		Parallel             int // 文件下载最大线程数，即同时进行下载文件的数量，阿里云盘限制最大为3
+		SliceParallel        int // 单个文件分片下载最大线程数，阿里云盘限制最大为3
 		Load                 int
 		MaxRetry             int
 		NoCheck              bool
 		ShowProgress         bool
-		DriveId             string
-		UseInternalUrl bool // 是否使用内置链接
+		DriveId              string
+		ExcludeNames         []string // 排除的文件名，包括文件夹和文件。即这些文件/文件夹不进行下载，支持正则表达式
+		IsMultiUserDownload  bool     // 是否启用多用户联合下载
+		IsUseUIDashboard     bool     // 是否使用UI下载面板显示下载进度
 	}

 	// LocateDownloadOption 获取下载链接可选参数
@@ -70,13 +80,10 @@ func CmdDownload() cli.Command {
 		Usage:     "下载文件/目录",
 		UsageText: cmder.App().Name + " download <文件/目录路径1> <文件/目录2> <文件/目录3> ...",
 		Description: `
-	下载的文件默认保存到, 程序所在目录的 download/ 目录.
-	通过 aliyunpan config set -savedir <savedir>, 自定义保存的目录.
-	支持多个文件或目录下载.
-	自动跳过下载重名的文件!
+	下载的文件默认保存到, 程序所在目录的 download/ 目录。支持软链接文件，包括Linux/macOS(ln命令)和Windows(mklink命令)创建的符号链接文件。
+	通过 aliyunpan config set -savedir <savedir>, 自定义保存的目录。支持多个文件或目录下载，支持自动跳过下载重名的文件!

 	示例:
-
 	设置保存目录, 保存到 D:\Downloads
 	注意区别反斜杠 "\" 和 斜杠 "/" !!!
 	aliyunpan config set -savedir D:\\Downloads
@@ -84,16 +91,33 @@ func CmdDownload() cli.Command {
 	aliyunpan config set -savedir D:/Downloads

 	下载 /我的资源/1.mp4
-	aliyunpan d /我的资源/1.mp4
+	aliyunpan download /我的资源/1.mp4
+
+	下载 /我的资源 目录下面所有的mp4文件，使用通配符
+	aliyunpan download /我的资源/*.mp4

 	下载 /我的资源 整个目录!!
-	aliyunpan d /我的资源
+	aliyunpan download /我的资源

-    下载 /我的资源/1.mp4 并保存下载的文件到本地的 d:/panfile
-	aliyunpan d --saveto d:/panfile /我的资源/1.mp4
+	下载 /我的资源 整个目录，但是排除所有的jpg文件
+	aliyunpan download -exn "\.jpg$" /我的资源
+
+	下载 /我的资源/1.mp4 并保存下载的文件到本地的 d:/panfile
+	aliyunpan download --saveto d:/panfile /我的资源/1.mp4
+	
+	使用多用户联合下载 /我的资源/1.mp4 文件。必须保证所有登录的用户在相同的网盘（备份盘/资源盘）下，相同的路径下，有相同的文件
+	aliyunpan download /我的资源/1.mp4 -md
+	
+  参考：
+    以下是典型的排除特定文件或者文件夹的例子，注意：参数值必须是正则表达式。在正则表达式中，^表示匹配开头，$表示匹配结尾。
+    1)排除@eadir文件或者文件夹：-exn "^@eadir$"
+    2)排除.jpg文件：-exn "\.jpg$"
+    3)排除.号开头的文件：-exn "^\."
+    4)排除~号开头的文件：-exn "^~"
+    5)排除 myfile.txt 文件：-exn "^myfile.txt$"
 `,
 		Category: "阿里云盘",
-		Before:   cmder.ReloadConfigFunc,
+		Before:   ReloadConfigFunc,
 		Action: func(c *cli.Context) error {
 			if c.NArg() == 0 {
 				cli.ShowCommandHelp(c, c.Command.Name)
@@ -105,22 +129,29 @@ func CmdDownload() cli.Command {
 				saveTo string
 			)
 			if c.Bool("save") {
-				saveTo = "."
+				// 使用当前工作目录
+				pwd, _ := os.Getwd()
+				saveTo = path.Clean(pwd)
 			} else if c.String("saveto") != "" {
 				saveTo = filepath.Clean(c.String("saveto"))
 			}

 			do := &DownloadOptions{
+				DownloadActionId:     utils.UuidStr(),
 				IsPrintStatus:        c.Bool("status"),
 				IsExecutedPermission: c.Bool("x"),
 				IsOverwrite:          c.Bool("ow"),
 				SaveTo:               saveTo,
 				Parallel:             c.Int("p"),
+				SliceParallel:        c.Int("sp"),
 				Load:                 0,
 				MaxRetry:             c.Int("retry"),
 				NoCheck:              c.Bool("nocheck"),
 				ShowProgress:         !c.Bool("np"),
-				DriveId:             parseDriveId(c),
+				DriveId:              parseDriveId(c),
+				ExcludeNames:         c.StringSlice("exn"),
+				IsMultiUserDownload:  c.Bool("md"),
+				IsUseUIDashboard:     c.Bool("ui"),
 			}

 			RunDownload(c.Args(), do)
@@ -149,7 +180,13 @@ func CmdDownload() cli.Command {
 			},
 			cli.IntFlag{
 				Name:  "p",
-				Usage: "指定同时进行下载文件的数量（取值范围:1 ~ 20）",
+				Usage: "parallel,指定同时进行下载文件的数量（取值范围:1 ~ 3）",
+				Value: 1,
+			},
+			cli.IntFlag{
+				Name:  "sp",
+				Usage: "slice parallel,指定单个文件下载的最大线程(分片)数（取值范围:1 ~ 3）",
+				Value: 0,
 			},
 			cli.IntFlag{
 				Name:  "retry",
@@ -169,29 +206,44 @@ func CmdDownload() cli.Command {
 				Usage: "网盘ID",
 				Value: "",
 			},
+			cli.StringSliceFlag{
+				Name:  "exn",
+				Usage: "exclude name，指定排除的文件夹或者文件的名称，被排除的文件不会进行下载，只支持正则表达式。支持同时排除多个名称，每一个名称就是一个exn参数",
+				Value: nil,
+			},
+			cli.BoolFlag{
+				Name:  "md",
+				Usage: "(BETA) Multi-User Download，使用多用户联合下载，可以对单一文件叠加所有登录用户的下载速度",
+			},
+			cli.BoolFlag{
+				Name:  "ui",
+				Usage: "(BETA) 使用UI面板显示下载详情和进度，更加直观和友好",
+			},
 		},
 	}
 }

-func downloadPrintFormat(load int) string {
-	if load <= 1 {
-		return pandownload.DefaultPrintFormat
-	}
-	return "\r[%s] ↓ %s/%s %s/s in %s, left %s ..."
-}
-
 // RunDownload 执行下载网盘内文件
 func RunDownload(paths []string, options *DownloadOptions) {
 	activeUser := GetActiveUser()
-	// pan token expired checker
-	go func() {
-		for {
-			time.Sleep(time.Duration(1) * time.Minute)
-			if RefreshTokenInNeed(activeUser) {
-				logger.Verboseln("update access token for download task")
-			}
-		}
-	}()
+	activeUser.PanClient().OpenapiPanClient().EnableCache()
+	activeUser.PanClient().OpenapiPanClient().ClearCache()
+	defer activeUser.PanClient().OpenapiPanClient().DisableCache()
+
+	//// pan token expired checker
+	//continueFlag := int32(0)
+	//atomic.StoreInt32(&continueFlag, 0)
+	//defer func() {
+	//	atomic.StoreInt32(&continueFlag, 1)
+	//}()
+	//go func(flag *int32) {
+	//	for atomic.LoadInt32(flag) == 0 {
+	//		time.Sleep(time.Duration(1) * time.Minute)
+	//		if RefreshWebTokenInNeed(activeUser, config.Config.DeviceName) {
+	//			logger.Verboseln("update access token for download task")
+	//		}
+	//	}
+	//}(&continueFlag)

 	if options == nil {
 		options = &DownloadOptions{}
@@ -213,8 +265,8 @@ func RunDownload(paths []string, options *DownloadOptions) {
 		BlockSize:                  MaxDownloadRangeSize,
 		MaxRate:                    config.Config.MaxDownloadRate,
 		InstanceStateStorageFormat: downloader.InstanceStateStorageFormatJSON,
-		ShowProgress: options.ShowProgress,
-		UseInternalUrl: config.Config.TransferUrlType == 2,
+		ShowProgress:               options.ShowProgress,
+		ExcludeNames:               options.ExcludeNames,
 	}
 	if cfg.CacheSize == 0 {
 		cfg.CacheSize = int(DownloadCacheSize)
@@ -231,18 +283,85 @@ func RunDownload(paths []string, options *DownloadOptions) {
 		options.Parallel = config.MaxFileDownloadParallelNum
 	}

-	paths, err := matchPathByShellPattern(options.DriveId, paths...)
+	// 设置单个文件下载分片线程数
+	if options.SliceParallel < 1 { // 用户没有主动设置，则使用下面自动配置的策略
+		if options.Parallel > 1 {
+			// 如果是多文件下载，则一个文件只能同时使用1个线程
+			options.SliceParallel = 1
+		} else {
+			// 如果是单文件下载，则可以使用3个最大线程
+			options.SliceParallel = 3
+		}
+	}
+
+	// 保存文件的本地根文件夹
+	originSaveRootPath := ""
+	if options.SaveTo != "" {
+		originSaveRootPath = options.SaveTo
+	} else {
+		// 使用默认的保存路径
+		originSaveRootPath = GetActiveUser().GetSavePath("")
+	}
+	fi, err1 := os.Stat(originSaveRootPath)
+	if err1 != nil && !os.IsExist(err1) {
+		os.MkdirAll(originSaveRootPath, 0777) // 首先在本地创建目录
+	} else {
+		if !fi.IsDir() {
+			fmt.Println("本地保存路径不是文件夹，请删除或者创建对应的文件夹：", originSaveRootPath)
+			return
+		}
+	}
+
+	paths, err := makePathAbsolute(options.DriveId, paths...)
 	if err != nil {
 		fmt.Println(err)
 		return
 	}

-	fmt.Printf("\n[0] 当前文件下载最大并发量为: %d, 下载缓存为: %s\n\n", options.Parallel, converter.ConvertFileSize(int64(cfg.CacheSize), 2))
+	// 多用户下载的辅助账号列表
+	var subPanClientList []*config.PanClient
+	if options.IsMultiUserDownload { // 多用户下载
+		c := config.Config
+		for _, u := range config.Config.UserList {
+			if u.UserId == activeUser.UserId {
+				// 当前登录用户，作为主用户，跳过
+				continue
+			}
+			// 初始化客户端
+			user, err := config.SetupUserByCookie(u.OpenapiToken, u.WebapiToken,
+				u.TicketId, u.UserId,
+				c.DeviceId, c.DeviceName,
+				c.ClientId, c.ClientSecret)
+			if err != nil {
+				logger.Verboseln("setup user error")
+				continue
+			}
+			if subPanClientList == nil {
+				subPanClientList = []*config.PanClient{}
+			}
+			subPanClientList = append(subPanClientList, user.PanClient())
+		}
+
+		if subPanClientList == nil || len(subPanClientList) == 0 {
+			fmt.Printf("\n当前登录用户只有一个，无法启用多用户联合下载\n")
+			subPanClientList = nil
+		}
+	}
+	if subPanClientList != nil || len(subPanClientList) > 0 {
+		// 已启用多用户下载
+		userCount := len(subPanClientList) + 1
+		fmt.Printf("\n*** 已启用多用户联合下载，用户数: %d ***\n", userCount)
+		// 多用户下载，并发数必须为1，以获得最大下载速度
+		options.Parallel = 1
+		// 阿里OpenAPI规定：文件分片下载的并发数为3，即某用户使用 App 时，可以同时下载 1 个文件的 3 个分片，或者同时下载 3 个文件的各 1 个分片。
+		options.SliceParallel = userCount * 3
+	}

 	var (
 		panClient = activeUser.PanClient()
 	)
 	cfg.MaxParallel = options.Parallel
+	cfg.SliceParallel = options.SliceParallel

 	var (
 		executor = taskframework.TaskExecutor{
@@ -256,44 +375,116 @@ func RunDownload(paths []string, options *DownloadOptions) {
 	// 全局速度统计
 	globalSpeedsStat := &speeds.Speeds{}

+	// 下载统计UI面板
+	var dashboard *ui.DashboardPanel = nil
+	if options.IsUseUIDashboard && options.ShowProgress && !options.IsPrintStatus && ui.IsTerminal(os.Stdout) {
+		dashboard = ui.NewDashboardPanel(ui.DashboardPanelDownload, cfg.MaxParallel, globalSpeedsStat, &ui.DashboardOptions{
+			Title:       "下载统计UI面板",
+			ActiveSlots: 3,  // 下载文件进度展示，最大同时展示3个
+			MaxHistory:  50, // 下载日志显示，最多同时显示50条，这个会按照窗口大小进行自适应显示
+		})
+	}
+	logf := func(format string, a ...interface{}) {
+		if dashboard != nil {
+			dashboard.Logf(format, a...)
+			return
+		}
+		fmt.Printf(format, a...)
+	}
+
+	// 下载记录器
+	fileRecorder := log.NewFileRecorder(config.GetLogDir() + "/download_file_records.csv")
+
+	// 输出当前下载配置信息
+	logf("\n[0] 当前文件下载最大并发量为: %d, 单文件下载分片线程数为: %d, 下载缓存为: %s\n", options.Parallel, options.SliceParallel, converter.ConvertFileSize(int64(cfg.CacheSize), 2))
+
+	// 阿里云盘下载并发超额警告，阿里云盘下载最大并发数为3
+	if options.Parallel*options.SliceParallel > 3 {
+		logf("[0] 警告：当前下载并发配置数已超过阿里云盘限制的最大并发数，下载任务会被风控容易导致下载失败\n")
+	}
+
 	// 处理队列
 	for k := range paths {
-		newCfg := *cfg
-		unit := pandownload.DownloadTaskUnit{
-			Cfg:                  &newCfg, // 复制一份新的cfg
-			PanClient:            panClient,
-			VerbosePrinter:       panCommandVerbose,
-			PrintFormat:          downloadPrintFormat(options.Load),
-			ParentTaskExecutor:   &executor,
-			DownloadStatistic:    statistic,
-			IsPrintStatus:        options.IsPrintStatus,
-			IsExecutedPermission: options.IsExecutedPermission,
-			IsOverwrite:          options.IsOverwrite,
-			NoCheck:              options.NoCheck,
-			FilePanPath:          paths[k],
-			DriveId:              options.DriveId,
-			GlobalSpeedsStat:     globalSpeedsStat,
+		// 使用通配符匹配
+		fileList, err2 := matchPathByShellPattern(options.DriveId, paths[k])
+		if err2 != nil {
+			logf("获取文件出错，请稍后重试: %s\n", paths[k])
+			continue
 		}
+		if fileList == nil || len(fileList) == 0 {
+			// 文件不存在
+			logf("文件不存在: %s\n", paths[k])
+			continue
+		}
+		// 排序，按名称排序，从小到大
+		sort.Slice(fileList, func(i, j int) bool {
+			return fileList[i].FileName < fileList[j].FileName
+		})
+		// 逐一下载
+		for _, f := range fileList {
+			newCfg := *cfg

-		// 设置储存的路径
-		if options.SaveTo != "" {
-			unit.OriginSaveRootPath = options.SaveTo
-			unit.SavePath = filepath.Join(options.SaveTo, filepath.Base(paths[k]))
-		} else {
-			// 使用默认的保存路径
-			unit.OriginSaveRootPath = GetActiveUser().GetSavePath("")
-			unit.SavePath = GetActiveUser().GetSavePath(paths[k])
+			// 是否排除下载
+			if utils.IsExcludeFile(f.Path, &newCfg.ExcludeNames) {
+				logf("排除文件: %s\n", f.Path)
+				continue
+			}
+
+			// 匹配的文件
+			unit := pandownload.DownloadTaskUnit{
+				DownloadActionId:     options.DownloadActionId,
+				Cfg:                  &newCfg, // 复制一份新的cfg
+				PanClient:            panClient,
+				SubPanClientList:     subPanClientList,
+				VerbosePrinter:       panCommandVerbose,
+				ParentTaskExecutor:   &executor,
+				DownloadStatistic:    statistic,
+				IsPrintStatus:        options.IsPrintStatus,
+				IsExecutedPermission: options.IsExecutedPermission,
+				IsOverwrite:          options.IsOverwrite,
+				NoCheck:              options.NoCheck,
+				FilePanSource:        global.FileSource,
+				FilePanPath:          f.Path,
+				DriveId:              options.DriveId,
+				GlobalSpeedsStat:     globalSpeedsStat,
+				FileRecorder:         fileRecorder,
+				UI:                   dashboard,
+			}
+
+			// 设置储存的路径
+			if options.SaveTo != "" {
+				unit.OriginSaveRootPath = options.SaveTo
+				unit.SavePath = filepath.Join(options.SaveTo, f.Path)
+			} else {
+				// 使用默认的保存路径
+				unit.OriginSaveRootPath = GetActiveUser().GetSavePath("")
+				unit.SavePath = GetActiveUser().GetSavePath(f.Path)
+			}
+			info := executor.Append(&unit, options.MaxRetry)
+			if dashboard != nil {
+				dashboard.RegisterTask(info.Id(), f.Path, f.FileSize, f.IsFile())
+			}
+			logf("[%s] 加入下载队列: %s\n", info.Id(), f.Path)
 		}
-		info := executor.Append(&unit, options.MaxRetry)
-		fmt.Printf("[%s] 加入下载队列: %s\n", info.Id(), paths[k])
 	}

 	// 开始计时
 	statistic.StartTimer()

+	// 启动UI面板显示
+	if dashboard != nil {
+		dashboard.Start()
+	}
+
 	// 开始执行
 	executor.Execute()

+	// 关闭UI面板
+	if dashboard != nil {
+		dashboard.Close()
+	}
+
+	// 完成下载，输出统计结果
 	fmt.Printf("\n下载结束, 时间: %s, 数据总量: %s\n", utils.ConvertTime(statistic.Elapsed()), converter.ConvertFileSize(statistic.TotalSize(), 2))

 	// 输出失败的文件列表
@@ -4,7 +4,7 @@
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
-//     http://www.apache.org/licenses/LICENSE-2.0
+//	http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,6 @@ import (
 	"fmt"
 	"github.com/olekukonko/tablewriter"
 	"github.com/tickstep/aliyunpan-api/aliyunpan"
-	"github.com/tickstep/aliyunpan/cmder"
 	"github.com/tickstep/aliyunpan/cmder/cmdtable"
 	"github.com/tickstep/aliyunpan/internal/config"
 	"github.com/urfave/cli"
@@ -28,9 +27,9 @@ import (
 func CmdDrive() cli.Command {
 	return cli.Command{
 		Name:  "drive",
-		Usage: "切换网盘（文件网盘/相册网盘）",
+		Usage: "切换网盘（备份盘/资源库）",
 		Description: `
-	切换已登录的阿里云盘的云工作网盘（文件网盘/相册网盘）
+	切换已登录账号的阿里云盘的工作网盘（备份盘/资源库）
 	如果运行该条命令没有提供参数, 程序将会列出所有的网盘列表, 供选择切换.

 	示例:
@@ -38,8 +37,8 @@ func CmdDrive() cli.Command {
 	aliyunpan drive <driveId>
 `,
 		Category: "阿里云盘账号",
-		Before:   cmder.ReloadConfigFunc,
-		After:    cmder.SaveConfigFunc,
+		Before:   ReloadConfigFunc,
+		After:    SaveConfigFunc,
 		Action: func(c *cli.Context) error {
 			inputData := c.Args().Get(0)
 			targetDriveId := strings.TrimSpace(inputData)
@@ -49,10 +48,10 @@ func CmdDrive() cli.Command {
 	}
 }

-func RunSwitchDriveList(targetDriveId string)  {
+func RunSwitchDriveList(targetDriveId string) {
 	currentDriveId := config.Config.ActiveUser().ActiveDriveId
 	var activeDriveInfo *config.DriveInfo = nil
-	driveList,renderStr := getDriveOptionList()
+	driveList, renderStr := getDriveOptionList()

 	if driveList == nil || len(driveList) == 0 {
 		fmt.Println("切换网盘失败")
@@ -71,15 +70,15 @@ func RunSwitchDriveList(targetDriveId string)  {
 			return
 		}

-		if n, err := strconv.Atoi(index); err == nil && n >= 0 && n < len(driveList) {
-			activeDriveInfo = driveList[n]
+		if n, err1 := strconv.Atoi(index); err1 == nil && (n-1) >= 0 && (n-1) < len(driveList) {
+			activeDriveInfo = driveList[n-1]
 		} else {
 			fmt.Printf("切换网盘失败, 请检查 # 值是否正确\n")
 			return
 		}
 	} else {
 		// 直接切换
-		for _,driveInfo := range driveList {
+		for _, driveInfo := range driveList {
 			if driveInfo.DriveId == targetDriveId {
 				activeDriveInfo = driveInfo
 				break
@@ -101,6 +100,11 @@ func RunSwitchDriveList(targetDriveId string)  {
 				config.Config.ActiveUser().Workdir = "/"
 				config.Config.ActiveUser().WorkdirFileEntity = *aliyunpan.NewFileEntityForRootDir()
 			}
+		} else if activeUser.IsResourceDriveActive() {
+			if activeUser.ResourceWorkdir == "" {
+				config.Config.ActiveUser().ResourceWorkdir = "/"
+				config.Config.ActiveUser().ResourceWorkdirFileEntity = *aliyunpan.NewFileEntityForRootDir()
+			}
 		} else if activeUser.IsAlbumDriveActive() {
 			if activeUser.AlbumWorkdir == "" {
 				config.Config.ActiveUser().AlbumWorkdir = "/"
@@ -121,7 +125,10 @@ func getDriveOptionList() (config.DriveInfoList, string) {
 	tb.SetHeader([]string{"#", "drive_id", "网盘名称"})

 	for k, info := range driveList {
-		tb.Append([]string{strconv.Itoa(k), info.DriveId, info.DriveName})
+		if info.IsAlbumDrive() {
+			continue
+		}
+		tb.Append([]string{strconv.Itoa(k + 1), info.DriveId, info.DriveName})
 	}
 	tb.Render()
 	return driveList, builder.String()
@@ -1,152 +0,0 @@
-// Copyright (c) 2020 tickstep.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-package command
-
-import (
-	"fmt"
-	"github.com/tickstep/aliyunpan-api/aliyunpan"
-	"github.com/tickstep/aliyunpan-api/aliyunpan/apierror"
-	"github.com/tickstep/aliyunpan/cmder"
-	"github.com/tickstep/aliyunpan/internal/config"
-	"github.com/tickstep/library-go/logger"
-	"github.com/urfave/cli"
-	"log"
-	"os"
-	"path"
-	"strconv"
-	"time"
-)
-
-
-func CmdExport() cli.Command {
-	return cli.Command{
-		Name:      "export",
-		Usage:     "导出文件/目录元数据",
-		UsageText: cmder.App().Name + " export <网盘文件/目录的路径1> <文件/目录2> <文件/目录3> ... <本地保存文件路径>",
-		Description: `
-	导出指定文件/目录下面的所有文件的元数据信息，并保存到指定的本地文件里面。导出的文件元信息可以使用 import 命令（秒传文件功能）导入到网盘中。
-	支持多个文件或目录的导出.
-
-	示例:
-
-	导出 /我的资源/1.mp4 元数据到文件 /Users/tickstep/Downloads/export_files.txt
-	aliyunpan export /我的资源/1.mp4 /Users/tickstep/Downloads/export_files.txt
-
-	导出 /我的资源 整个目录 元数据到文件 /Users/tickstep/Downloads/export_files.txt
-	aliyunpan export /我的资源 /Users/tickstep/Downloads/export_files.txt
-
-    导出 网盘 整个目录 元数据到文件 /Users/tickstep/Downloads/export_files.txt
-	aliyunpan export / /Users/tickstep/Downloads/export_files.txt
-`,
-		Category: "阿里云盘",
-		Before:   cmder.ReloadConfigFunc,
-		Action: func(c *cli.Context) error {
-			if c.NArg() < 2 {
-				cli.ShowCommandHelp(c, c.Command.Name)
-				return nil
-			}
-
-			subArgs := c.Args()
-			RunExportFiles(parseDriveId(c), c.Bool("ow"), subArgs[:len(subArgs)-1], subArgs[len(subArgs)-1])
-			return nil
-		},
-		Flags: []cli.Flag{
-			cli.BoolFlag{
-				Name:  "ow",
-				Usage: "overwrite, 覆盖已存在的导出文件",
-			},
-			cli.StringFlag{
-				Name:  "driveId",
-				Usage: "网盘ID",
-				Value: "",
-			},
-		},
-	}
-}
-
-
-func RunExportFiles(driveId string, overwrite bool, panPaths []string, saveLocalFilePath string) {
-	activeUser := config.Config.ActiveUser()
-	panClient := activeUser.PanClient()
-
-	lfi,_ := os.Stat(saveLocalFilePath)
-	realSaveFilePath := saveLocalFilePath
-	if lfi != nil {
-		if lfi.IsDir() {
-			realSaveFilePath = path.Join(saveLocalFilePath, "export_file_") + strconv.FormatInt(time.Now().Unix(), 10) + ".txt"
-		} else {
-			if !overwrite {
-				fmt.Println("导出文件已存在")
-				return
-			}
-		}
-	} else {
-		// create file
-		localDir := path.Dir(saveLocalFilePath)
-		dirFs,_ := os.Stat(localDir)
-		if dirFs != nil {
-			if !dirFs.IsDir() {
-				fmt.Println("指定的保存文件路径不合法")
-				return
-			}
-		} else {
-			er := os.MkdirAll(localDir, 0755)
-			if er != nil {
-				fmt.Println("创建本地文件夹出错")
-				return
-			}
-		}
-		realSaveFilePath = saveLocalFilePath
-	}
-
-	totalCount := 0
-	saveFile, err := os.OpenFile(realSaveFilePath, os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0755)
-	if err != nil {
-		log.Fatal(err)
-		return
-	}
-
-	for _,panPath := range panPaths {
-		panPath = activeUser.PathJoin(driveId, panPath)
-		panClient.FilesDirectoriesRecurseList(driveId, panPath, func(depth int, _ string, fd *aliyunpan.FileEntity, apiError *apierror.ApiError) bool {
-			if apiError != nil {
-				logger.Verbosef("%s\n", apiError)
-				return true
-			}
-
-			// 只需要存储文件即可
-			if !fd.IsFolder() {
-				item := newRapidUploadItemFromFileEntity(fd)
-				jstr := item.createRapidUploadLink(false)
-				if len(jstr) <= 0 {
-					logger.Verboseln("create rapid upload link err")
-					return false
-				}
-				saveFile.WriteString(jstr + "\n")
-				totalCount += 1
-				time.Sleep(time.Duration(100) * time.Millisecond)
-				fmt.Printf("\r导出文件数量: %d", totalCount)
-			}
-			return true
-		})
-	}
-
-	// close and save
-	if err := saveFile.Close(); err != nil {
-		log.Fatal(err)
-	}
-
-	fmt.Printf("\r导出文件总数量: %d\n", totalCount)
-	fmt.Printf("导出文件保存路径: %s\n", realSaveFilePath)
-}
@@ -1,277 +0,0 @@
-// Copyright (c) 2020 tickstep.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-package command
-
-import (
-	"fmt"
-	"github.com/tickstep/aliyunpan-api/aliyunpan"
-	"github.com/tickstep/aliyunpan-api/aliyunpan/apierror"
-	"github.com/tickstep/aliyunpan/cmder"
-	"github.com/tickstep/aliyunpan/internal/config"
-	"github.com/tickstep/library-go/logger"
-	"github.com/urfave/cli"
-	"io/ioutil"
-	"log"
-	"os"
-	"path"
-	"path/filepath"
-	"strings"
-	"time"
-)
-
-type (
-	dirFileListData struct {
-		Dir *aliyunpan.MkdirResult
-		FileList aliyunpan.FileList
-	}
-)
-
-const (
-	DefaultSaveToPanPath = "/aliyunpan"
-)
-
-func CmdImport() cli.Command {
-	return cli.Command{
-		Name:      "import",
-		Usage:     "导入文件",
-		UsageText: cmder.App().Name + " export <本地元数据文件路径>",
-		Description: `
-    导入文件中记录的元数据文件到网盘。保存到网盘的文件会使用文件元数据记录的路径位置，如果没有指定云盘目录(saveto)则默认导入到目录 aliyunpan 中。
-    导入的文件可以使用 export 命令获得。
-    
-    导入文件每一行是一个文件元数据，样例如下：
-    aliyunpan://file.dmg|752FCCBFB2436A6FFCA3B287831D4FAA5654B07E|7005440|pan_folder
-
-	示例:
-    导入文件 /Users/tickstep/Downloads/export_files.txt 存储的所有文件元数据项
-    aliyunpan import /Users/tickstep/Downloads/export_files.txt
-
-    导入文件 /Users/tickstep/Downloads/export_files.txt 存储的所有文件元数据项并保存到目录 /my2021 中
-    aliyunpan import -saveto=/my2021 /Users/tickstep/Downloads/export_files.txt
-
-    导入文件 /Users/tickstep/Downloads/export_files.txt 存储的所有文件元数据项并保存到网盘根目录 / 中
-    aliyunpan import -saveto=/ /Users/tickstep/Downloads/export_files.txt
-`,
-		Category: "阿里云盘",
-		Before:   cmder.ReloadConfigFunc,
-		Action: func(c *cli.Context) error {
-			if c.NArg() < 1 {
-				cli.ShowCommandHelp(c, c.Command.Name)
-				return nil
-			}
-
-			saveTo := ""
-			if c.String("saveto") != "" {
-				saveTo = filepath.Clean(c.String("saveto"))
-			}
-
-			subArgs := c.Args()
-			RunImportFiles(parseDriveId(c), c.Bool("ow"), saveTo, subArgs[0])
-			return nil
-		},
-		Flags: []cli.Flag{
-			cli.BoolFlag{
-				Name:  "ow",
-				Usage: "overwrite, 覆盖已存在的网盘文件",
-			},
-			cli.StringFlag{
-				Name:  "driveId",
-				Usage: "网盘ID",
-				Value: "",
-			},
-			cli.StringFlag{
-				Name:  "saveto",
-				Usage: "将文件保存到指定的目录",
-			},
-		},
-	}
-}
-
-func RunImportFiles(driveId string, overwrite bool, panSavePath, localFilePath string) {
-	lfi,_ := os.Stat(localFilePath)
-	if lfi != nil {
-		if lfi.IsDir() {
-			fmt.Println("请指定导入文件")
-			return
-		}
-	} else {
-		// create file
-		fmt.Println("导入文件不存在")
-		return
-	}
-
-	if panSavePath == "" {
-		// use default
-		panSavePath = DefaultSaveToPanPath
-	}
-
-	fmt.Println("导入的文件会存储到目录：" + panSavePath)
-
-	importFile, err := os.OpenFile(localFilePath, os.O_RDONLY, 0755)
-	if err != nil {
-		log.Fatal(err)
-		return
-	}
-	defer importFile.Close()
-
-	fileData,err := ioutil.ReadAll(importFile)
-	if err != nil {
-		fmt.Println("读取文件出错")
-		return
-	}
-	fileText := string(fileData)
-	if len(fileText) == 0 {
-		fmt.Println("文件为空")
-		return
-	}
-	fileText = strings.TrimSpace(fileText)
-	fileLines := strings.Split(fileText, "\n")
-	importFileItems := []RapidUploadItem{}
-	for _,line := range fileLines {
-		line = strings.TrimSpace(line)
-		if item,e := newRapidUploadItem(line); e != nil {
-			fmt.Println(e)
-			continue
-		} else {
-			item.FilePath = strings.ReplaceAll(path.Join(panSavePath, item.FilePath), "\\", "/")
-			importFileItems = append(importFileItems, *item)
-		}
-	}
-	if len(importFileItems) == 0 {
-		fmt.Println("没有可以导入的文件项目")
-		return
-	}
-
-	fmt.Println("正在准备导入...")
-	dirMap := prepareMkdir(driveId, importFileItems)
-
-	fmt.Println("正在导入...")
-	successImportFiles := []RapidUploadItem{}
-	failedImportFiles := []RapidUploadItem{}
-	for _,item := range importFileItems {
-		fmt.Printf("正在处理导入: %s\n", item.FilePath)
-		result, abort := processOneImport(driveId, overwrite, dirMap, item)
-		if abort {
-			fmt.Println("导入任务终止了")
-			break
-		}
-		if result {
-			successImportFiles = append(successImportFiles, item)
-		} else {
-			failedImportFiles = append(failedImportFiles, item)
-		}
-		time.Sleep(time.Duration(200) * time.Millisecond)
-	}
-	if len(failedImportFiles) > 0 {
-		fmt.Println("\n以下文件导入失败")
-		for _,f := range failedImportFiles {
-			fmt.Printf("%s %s\n", f.FileSha1, f.FilePath)
-		}
-		fmt.Println("")
-	}
-	fmt.Printf("导入结果, 成功 %d, 失败 %d\n", len(successImportFiles), len(failedImportFiles))
-}
-
-func processOneImport(driveId string, isOverwrite bool, dirMap map[string]*dirFileListData, item RapidUploadItem) (result, abort bool) {
-	panClient := config.Config.ActiveUser().PanClient()
-	panDir,fileName := path.Split(item.FilePath)
-	dataItem := dirMap[path.Dir(panDir)]
-	if isOverwrite {
-		// 标记覆盖旧同名文件
-		// 检查同名文件是否存在
-		var efi *aliyunpan.FileEntity = nil
-		for _,fileItem := range dataItem.FileList {
-			if !fileItem.IsFolder() && fileItem.FileName == fileName {
-				efi = fileItem
-				break
-			}
-		}
-		if efi != nil && efi.FileId != "" {
-			// existed, delete it
-			fdr, err := panClient.FileDelete([]*aliyunpan.FileBatchActionParam{
-				{
-					DriveId:driveId,
-					FileId:efi.FileId,
-				},
-			})
-			if err != nil || fdr == nil || !fdr[0].Success {
-				fmt.Println("无法删除文件，请稍后重试")
-				return false, false
-			}
-			time.Sleep(time.Duration(500) * time.Millisecond)
-			fmt.Println("检测到同名文件，已移动到回收站")
-		}
-	}
-
-	appCreateUploadFileParam := &aliyunpan.CreateFileUploadParam{
-		DriveId:      driveId,
-		Name:         fileName,
-		Size:         item.FileSize,
-		ContentHash:  item.FileSha1,
-		ParentFileId: dataItem.Dir.FileId,
-	}
-	uploadOpEntity, apierr := panClient.CreateUploadFile(appCreateUploadFileParam)
-	if apierr != nil {
-		fmt.Println("创建秒传任务失败：" + apierr.Error())
-		return false, true
-	}
-
-	if uploadOpEntity.RapidUpload {
-		logger.Verboseln("秒传成功, 保存到网盘路径: ", path.Join(panDir, uploadOpEntity.FileName))
-	} else {
-		fmt.Println("失败，文件未曾上传，无法秒传")
-		return false, false
-	}
-	return true, false
-}
-
-func prepareMkdir(driveId string, importFileItems []RapidUploadItem) map[string]*dirFileListData {
-	panClient := config.Config.ActiveUser().PanClient()
-	resultMap := map[string]*dirFileListData{}
-	for _,item := range importFileItems {
-		var apierr *apierror.ApiError
-		var rs *aliyunpan.MkdirResult
-		panDir := path.Dir(item.FilePath)
-		if resultMap[panDir] != nil {
-			continue
-		}
-		if panDir != "/" {
-			rs, apierr = panClient.MkdirRecursive(driveId, "", "", 0, strings.Split(path.Clean(panDir), "/"))
-			if apierr != nil || rs.FileId == "" {
-				logger.Verboseln("创建云盘文件夹失败")
-				continue
-			}
-		} else {
-			rs = &aliyunpan.MkdirResult{}
-			rs.FileId = aliyunpan.DefaultRootParentFileId
-		}
-		dataItem := &dirFileListData{}
-		dataItem.Dir = rs
-
-		// files
-		param := &aliyunpan.FileListParam{}
-		param.DriveId = driveId
-		param.ParentFileId = rs.FileId
-		allFileInfo, err1 := panClient.FileListGetAll(param)
-		if err1 != nil {
-			logger.Verboseln("获取文件信息出错")
-			continue
-		}
-		dataItem.FileList = allFileInfo
-
-		resultMap[panDir] = dataItem
-		time.Sleep(time.Duration(500) * time.Millisecond)
-	}
-	return resultMap
-}
@@ -4,7 +4,7 @@
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
-//     http://www.apache.org/licenses/LICENSE-2.0
+//	http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,15 +15,13 @@ package command

 import (
 	"fmt"
-	"github.com/tickstep/aliyunpan-api/aliyunpan"
-	"github.com/tickstep/aliyunpan/cmder"
 	"github.com/tickstep/aliyunpan/cmder/cmdliner"
 	"github.com/tickstep/aliyunpan/internal/config"
 	"github.com/tickstep/aliyunpan/internal/functions/panlogin"
-	"github.com/tickstep/library-go/logger"
+	"github.com/tickstep/aliyunpan/internal/global"
 	_ "github.com/tickstep/library-go/requester"
 	"github.com/urfave/cli"
-	"time"
+	"strings"
 )

 func CmdLogin() cli.Command {
@@ -35,55 +33,36 @@ func CmdLogin() cli.Command {
 		1.常规登录，按提示一步一步来即可
 		aliyunpan login

-		2.直接指定RefreshToken进行登录
-		aliyunpan login -RefreshToken=8B12CBBCE89CA8DFC3445985B63B511B5E7EC7...
-
-		3.使用二维码方式进行登录
-		aliyunpan login -QrCode
 `,
 		Category: "阿里云盘账号",
-		Before:   cmder.ReloadConfigFunc, // 每次进行登录动作的时候需要调用刷新配置
-		After:    cmder.SaveConfigFunc,   // 登录完成需要调用保存配置
+		Before:   ReloadConfigFunc, // 每次进行登录动作的时候需要调用刷新配置
+		After:    SaveConfigFunc,   // 登录完成需要调用保存配置
 		Action: func(c *cli.Context) error {
-			refreshTokenStr := ""
-			if refreshTokenStr == "" {
-				refreshTokenStr = c.String("RefreshToken")
-			}
-			useQrCode := c.Bool("QrCode")
-
-			tokenId := ""
-			webToken := aliyunpan.WebLoginToken{}
-			refreshToken := ""
+			ticketId := ""
+			openToken := &config.PanClientToken{}
+			webToken := &config.PanClientToken{}
 			var err error
-			tokenId, refreshToken, webToken, err = RunLogin(useQrCode, refreshTokenStr)
+			ticketId, openToken, webToken, err = RunLogin()
 			if err != nil {
 				fmt.Println(err)
 				return err
 			}

-			cloudUser, err := config.SetupUserByCookie(&webToken)
+			cloudUser, err := config.SetupUserByCookie(openToken, webToken,
+				ticketId, "",
+				config.Config.DeviceId, config.Config.DeviceName,
+				config.Config.ClientId, config.Config.ClientSecret)
 			if cloudUser == nil {
 				fmt.Println("登录失败: ", err)
 				return nil
 			}
-			cloudUser.RefreshToken = refreshToken
-			cloudUser.TokenId = tokenId
+			cloudUser.TicketId = ticketId
 			config.Config.SetActiveUser(cloudUser)
 			fmt.Println("阿里云盘登录成功: ", cloudUser.Nickname)
 			return nil
 		},
 		// 命令的附加options参数说明，使用 help panlogin 命令即可查看
-		Flags: []cli.Flag{
-			// aliyunpan panlogin -RefreshToken=8B12CBBCE89CA8DFC3445985B63B511B5E7EC7...
-			cli.StringFlag{
-				Name:  "RefreshToken",
-				Usage: "使用RefreshToken Cookie来登录帐号",
-			},
-			cli.BoolFlag{
-				Name:  "QrCode",
-				Usage: "使用二维码登录",
-			},
-		},
+		Flags: []cli.Flag{},
 	}
 }

@@ -93,8 +72,8 @@ func CmdLogout() cli.Command {
 		Usage:       "退出阿里帐号",
 		Description: "退出当前登录的帐号",
 		Category:    "阿里云盘账号",
-		Before:      cmder.ReloadConfigFunc,
-		After:       cmder.SaveConfigFunc,
+		Before:      ReloadConfigFunc,
+		After:       SaveConfigFunc,
 		Action: func(c *cli.Context) error {
 			if config.Config.NumLogins() == 0 {
 				fmt.Println("未设置任何帐号, 不能退出")
@@ -105,6 +84,9 @@ func CmdLogout() cli.Command {
 				confirm    string
 				activeUser = config.Config.ActiveUser()
 			)
+			if activeUser == nil {
+				return nil
+			}

 			if !c.Bool("y") {
 				fmt.Printf("确认退出当前帐号: %s ? (y/n) > ", activeUser.Nickname)
@@ -114,6 +96,12 @@ func CmdLogout() cli.Command {
 				}
 			}

+			// 云端注销登录
+			//if _, e := activeUser.PanClient().WebapiPanClient().DeviceLogout(); e != nil {
+			//	fmt.Printf("登出设备失败，请手动在网页端进行登出: %s\n", e.String())
+			//}
+
+			// 删除用户信息
 			deletedUser, err := config.Config.DeleteUser(activeUser.UserId)
 			if err != nil {
 				fmt.Printf("退出用户 %s, 失败, 错误: %s\n", activeUser.Nickname, err)
@@ -131,53 +119,46 @@ func CmdLogout() cli.Command {
 	}
 }

-func RunLogin(useQrCodeLogin bool, refreshToken string) (tokenId, refreshTokenStr string, webToken aliyunpan.WebLoginToken, error error) {
-	if useQrCodeLogin {
-		h := panlogin.NewLoginHelper(config.DefaultTokenServiceWebHost)
-		qrCodeUrlResult, err := h.GetQRCodeLoginUrl("")
-		if err != nil {
-			fmt.Println("二维码登录错误：", err)
-			return "", "", aliyunpan.WebLoginToken{}, err
-		}
-		fmt.Printf("请在浏览器打开以下链接进行扫码登录，链接有效时间为5分钟\n%s\n\n", qrCodeUrlResult.TokenUrl)
+func RunLogin() (ticketId string, openapiToken, webapiToken *config.PanClientToken, error error) {
+	h := panlogin.NewLoginHelper(config.DefaultTokenServiceWebHost)

-		// handler waiting
-		line := cmdliner.NewLiner()
-		var qrCodeLoginResult *panlogin.QRCodeLoginResult
-		defer line.Close()
+	// web login request
+	qrCodeUrlResult, err := h.GetQRCodeLoginUrl("")
+	if err != nil {
+		fmt.Println("登录出错：", err)
+		return "", nil, nil, err
+	}
+	ticketId = qrCodeUrlResult.TokenId
+	loginUrl := &strings.Builder{}
+	if global.IsSupportNoneOpenApiCommands {
+		// 兼容以前的版本
+		fmt.Fprintf(loginUrl, "https://openapi.alipan.com/oauth/authorize?client_id=%s&redirect_uri=https%%3A%%2F%%2Fapi.tickstep.com%%2Fauth%%2Ftickstep%%2Faliyunpan%%2Ftoken%%2Fopenapi%%2F%s%%2Fauth&scope=user:base,file:all:read,file:all:write,file:share:write,album:shared:read",
+			config.Config.ClientId, ticketId)
+	} else {
+		fmt.Fprintf(loginUrl, "https://openapi.alipan.com/oauth/authorize?client_id=%s&redirect_uri=https%%3A%%2F%%2Fapi.tickstep.com%%2Fauth%%2Ftickstep%%2Faliyunpan%%2Ftoken%%2Fopenapi%%2F%s%%2Fauth2&scope=user:base,file:all:read,file:all:write,file:share:write,album:shared:read",
+			config.Config.ClientId, ticketId)
+	}
+	fmt.Printf("请在浏览器打开以下链接进行登录，链接有效时间为5分钟。\n注意：你需要进行一次授权一次扫码的两次登录。\n%s\n\n", loginUrl)

-		go func() {
-			for {
-				time.Sleep(3 * time.Second)
-				qr, er := h.GetQRCodeLoginResult(qrCodeUrlResult.TokenId)
-				if er != nil {
-					continue
-				}
-				logger.Verboseln(qr)
-				if qr.QrCodeStatus == "CONFIRMED" {
-					// login successfully
-					qrCodeLoginResult = qr
-					break
-				} else if qr.QrCodeStatus == "EXPIRED" {
-					break
-				}
-			}
-		}()
+	// handler waiting
+	line := cmdliner.NewLiner()
+	defer line.Close()
+	line.State.Prompt("请在浏览器里面完成扫码登录，然后再按Enter键继续...")

-		line.State.Prompt("请在浏览器里面完成扫码登录，然后再按Enter键继续...")
-		if qrCodeLoginResult == nil {
-			return "", "", aliyunpan.WebLoginToken{}, fmt.Errorf("二维码登录失败")
-		}
-
-		tokenStr, er := h.ParseSecureRefreshToken("", qrCodeLoginResult.SecureRefreshToken)
-		if er != nil {
-			fmt.Println("解析Token错误：", er)
-			return "", "", aliyunpan.WebLoginToken{}, er
-		}
-		refreshToken = tokenStr
-		tokenId = qrCodeUrlResult.TokenId
+	// get login token
+	comToken, er := h.GetLoginToken(ticketId)
+	if er != nil {
+		return ticketId, nil, nil, fmt.Errorf("登录失败，请稍后尝试重新登录")
 	}

-	refreshTokenStr, webToken, error = cmder.DoLoginHelper(refreshToken)
-	return
+	return ticketId,
+		&config.PanClientToken{
+			AccessToken: comToken.Openapi.AccessToken,
+			Expired:     comToken.Openapi.Expired,
+		},
+		&config.PanClientToken{
+			AccessToken: comToken.Webapi.AccessToken,
+			Expired:     comToken.Webapi.Expired,
+		},
+		nil
 }
@@ -4,7 +4,7 @@
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
-//     http://www.apache.org/licenses/LICENSE-2.0
+//	http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,11 +17,11 @@ import (
 	"fmt"
 	"github.com/olekukonko/tablewriter"
 	"github.com/tickstep/aliyunpan-api/aliyunpan"
+	"github.com/tickstep/aliyunpan-api/aliyunpan/apierror"
 	"github.com/tickstep/aliyunpan/cmder"
 	"github.com/tickstep/aliyunpan/cmder/cmdtable"
 	"github.com/tickstep/aliyunpan/internal/config"
 	"github.com/tickstep/library-go/converter"
-	"github.com/tickstep/library-go/text"
 	"github.com/urfave/cli"
 	"os"
 	"strconv"
@@ -62,11 +62,15 @@ func CmdLs() cli.Command {
 	绝对路径
 	aliyunpan ls /我的资源

+	列出 我的资源 内的文件和目录，使用通配符
+	aliyunpan ls /我的*
+
 	详细列出 我的资源 内的文件和目录
 	aliyunpan ll /我的资源
 `,
 		Category: "阿里云盘",
-		Before:   cmder.ReloadConfigFunc,
+		Before:   ReloadConfigFunc,
+		After:    SaveConfigFunc,
 		Action: func(c *cli.Context) error {
 			if config.Config.ActiveUser() == nil {
 				fmt.Println("未登录账号")
@@ -138,13 +142,38 @@ func RunLs(driveId, targetPath string, lsOptions *LsOptions,
 	orderBy aliyunpan.FileOrderBy, orderDirection aliyunpan.FileOrderDirection) {
 	activeUser := config.Config.ActiveUser()
 	targetPath = activeUser.PathJoin(driveId, targetPath)
-	if targetPath[len(targetPath)-1] == '/' {
-		targetPath = text.Substr(targetPath, 0, len(targetPath)-1)
+
+	// 获取目标路径文件信息
+	targetPathInfo, err := activeUser.PanClient().OpenapiPanClient().FileInfoByPath(driveId, targetPath)
+	if err != nil {
+		if err.Code == apierror.ApiCodeFileNotFoundCode {
+			fmt.Println("指定目录不存在: " + targetPath)
+		} else {
+			fmt.Println(err)
+		}
+		return
 	}

-	targetPathInfo, err := activeUser.PanClient().FileInfoByPath(driveId, targetPath)
-	if err != nil {
-		fmt.Println(err)
+	// 适配通配符路径获取目标文件信息（弃用，容易触发风控）
+	//files, err := matchPathByShellPattern(driveId, targetPath)
+	//if err != nil {
+	//	fmt.Println(err)
+	//	return
+	//}
+	//var targetPathInfo *aliyunpan.FileEntity
+	//if len(files) == 1 {
+	//	targetPathInfo = files[0]
+	//} else {
+	//	for _, f := range files {
+	//		if f.IsFolder() {
+	//			targetPathInfo = f
+	//			break
+	//		}
+	//	}
+	//}
+
+	if targetPathInfo == nil {
+		fmt.Println("目录路径不存在")
 		return
 	}

@@ -155,16 +184,16 @@ func RunLs(driveId, targetPath string, lsOptions *LsOptions,
 	fileListParam.OrderBy = orderBy
 	fileListParam.OrderDirection = orderDirection
 	if targetPathInfo.IsFolder() {
-		fileResult, err := activeUser.PanClient().FileListGetAll(fileListParam)
-		if err != nil {
-			fmt.Println(err)
+		fileResult, err1 := activeUser.PanClient().OpenapiPanClient().FileListGetAll(fileListParam, 200)
+		if err1 != nil {
+			fmt.Println(err1)
 			return
 		}
 		fileList = fileResult
 	} else {
 		fileList = append(fileList, targetPathInfo)
 	}
-	renderTable(opLs, lsOptions.Total, targetPath, fileList)
+	renderTable(opLs, lsOptions.Total, targetPathInfo.Path, fileList)
 }

 func renderTable(op int, isTotal bool, path string, files aliyunpan.FileList) {
@@ -186,15 +215,15 @@ func renderTable(op int, isTotal bool, path string, files aliyunpan.FileList) {
 		tb.SetColumnAlignment([]int{tablewriter.ALIGN_DEFAULT, tablewriter.ALIGN_RIGHT, tablewriter.ALIGN_LEFT, tablewriter.ALIGN_LEFT, tablewriter.ALIGN_LEFT, tablewriter.ALIGN_LEFT, tablewriter.ALIGN_LEFT, tablewriter.ALIGN_LEFT})
 		for k, file := range files {
 			if file.IsFolder() {
-				tb.Append([]string{strconv.Itoa(k), file.FileId, "-", "-", "-", file.CreatedAt, file.UpdatedAt, file.FileName + aliyunpan.PathSeparator})
+				tb.Append([]string{strconv.Itoa(k + 1), file.FileId, "-", "-", "-", file.CreatedAt, file.UpdatedAt, file.FileName + aliyunpan.PathSeparator})
 				continue
 			}

 			switch op {
 			case opLs:
-				tb.Append([]string{strconv.Itoa(k), file.FileId, converter.ConvertFileSize(file.FileSize, 2), file.ContentHash, strconv.FormatInt(file.FileSize, 10), file.CreatedAt, file.UpdatedAt, file.FileName})
+				tb.Append([]string{strconv.Itoa(k + 1), file.FileId, converter.ConvertFileSize(file.FileSize, 2), file.ContentHash, strconv.FormatInt(file.FileSize, 10), file.CreatedAt, file.UpdatedAt, file.FileName})
 			case opSearch:
-				tb.Append([]string{strconv.Itoa(k), file.FileId, converter.ConvertFileSize(file.FileSize, 2), file.ContentHash, strconv.FormatInt(file.FileSize, 10), file.CreatedAt, file.UpdatedAt, file.Path})
+				tb.Append([]string{strconv.Itoa(k + 1), file.FileId, converter.ConvertFileSize(file.FileSize, 2), file.ContentHash, strconv.FormatInt(file.FileSize, 10), file.CreatedAt, file.UpdatedAt, file.Path})
 			}
 		}
 		fN, dN = files.Count()
@@ -204,26 +233,22 @@ func renderTable(op int, isTotal bool, path string, files aliyunpan.FileList) {
 		tb.SetColumnAlignment([]int{tablewriter.ALIGN_DEFAULT, tablewriter.ALIGN_RIGHT, tablewriter.ALIGN_LEFT, tablewriter.ALIGN_LEFT})
 		for k, file := range files {
 			if file.IsFolder() {
-				tb.Append([]string{strconv.Itoa(k), "-", file.UpdatedAt, file.FileName + aliyunpan.PathSeparator})
+				tb.Append([]string{strconv.Itoa(k + 1), "-", file.UpdatedAt, file.FileName + aliyunpan.PathSeparator})
 				continue
 			}

 			switch op {
 			case opLs:
-				tb.Append([]string{strconv.Itoa(k), converter.ConvertFileSize(file.FileSize, 2), file.UpdatedAt, file.FileName})
+				tb.Append([]string{strconv.Itoa(k + 1), converter.ConvertFileSize(file.FileSize, 2), file.UpdatedAt, file.FileName})
 			case opSearch:
-				tb.Append([]string{strconv.Itoa(k), converter.ConvertFileSize(file.FileSize, 2), file.UpdatedAt, file.Path})
+				tb.Append([]string{strconv.Itoa(k + 1), converter.ConvertFileSize(file.FileSize, 2), file.UpdatedAt, file.Path})
 			}
 		}
 		fN, dN = files.Count()
 		tb.Append([]string{"", "总: " + converter.ConvertFileSize(files.TotalSize(), 2), "", fmt.Sprintf("文件总数: %d, 目录总数: %d", fN, dN)})
 	}
-
+	fmt.Printf("\n当前目录: %s\n", path)
+	fmt.Printf("----\n")
 	tb.Render()
-
-	if fN+dN >= 60 {
-		fmt.Printf("\n当前目录: %s\n", path)
-	}
-
 	fmt.Printf("----\n")
 }
@@ -4,7 +4,7 @@
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
-//     http://www.apache.org/licenses/LICENSE-2.0
+//	http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
@@ -20,7 +20,6 @@ import (
 	"github.com/tickstep/aliyunpan/cmder"
 	"github.com/tickstep/aliyunpan/internal/config"
 	"github.com/urfave/cli"
-	"strings"
 )

 func CmdMkdir() cli.Command {
@@ -29,7 +28,7 @@ func CmdMkdir() cli.Command {
 		Usage:     "创建目录",
 		UsageText: cmder.App().Name + " mkdir <目录>",
 		Category:  "阿里云盘",
-		Before:    cmder.ReloadConfigFunc,
+		Before:    ReloadConfigFunc,
 		Action: func(c *cli.Context) error {
 			if c.NArg() == 0 {
 				cli.ShowCommandHelp(c, c.Command.Name)
@@ -44,8 +43,8 @@ func CmdMkdir() cli.Command {
 		},
 		Flags: []cli.Flag{
 			cli.StringFlag{
-				Name:  "familyId",
-				Usage: "家庭云ID",
+				Name:  "driveId",
+				Usage: "网盘ID",
 				Value: "",
 			},
 		},
@@ -55,11 +54,9 @@ func CmdMkdir() cli.Command {
 func RunMkdir(driveId, name string) {
 	activeUser := GetActiveUser()
 	fullpath := activeUser.PathJoin(driveId, name)
-	pathSlice := strings.Split(fullpath, "/")
 	rs := &aliyunpan.MkdirResult{}
 	err := apierror.NewFailedApiError("")
-
-	rs, err = activeUser.PanClient().MkdirRecursive(driveId,"", "", 0, pathSlice)
+	rs, err = activeUser.PanClient().OpenapiPanClient().MkdirByFullPath(driveId, fullpath)

 	if err != nil {
 		fmt.Println("创建文件夹失败：" + err.Error())
@@ -74,4 +71,4 @@ func RunMkdir(driveId, name string) {
 	} else {
 		fmt.Println("创建文件夹失败: ", fullpath)
 	}
-}
+}
@@ -4,7 +4,7 @@
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
-//     http://www.apache.org/licenses/LICENSE-2.0
+//	http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,28 +16,33 @@ package command
 import (
 	"fmt"
 	"github.com/tickstep/aliyunpan-api/aliyunpan"
-	"github.com/tickstep/aliyunpan/cmder"
+	"github.com/tickstep/aliyunpan/cmder/cmdtable"
 	"github.com/tickstep/aliyunpan/internal/config"
 	"github.com/urfave/cli"
+	"os"
 	"path"
+	"strconv"
 )

 func CmdMv() cli.Command {
 	return cli.Command{
 		Name:  "mv",
 		Usage: "移动文件/目录",
-		UsageText: `移动:
+		UsageText: `
 	aliyunpan mv <文件/目录1> <文件/目录2> <文件/目录3> ... <目标目录>`,
 		Description: `
-	注意: 移动多个文件和目录时, 请确保每一个文件和目录都存在, 否则移动操作会失败.
+	注意: 移动多个文件和目录时, 请确保每一个文件和目录都存在, 否则移动操作会失败。支持通配符匹配移动文件，通配符当前只能匹配文件名，不能匹配文件路径。

 	示例:

 	将 /我的资源/1.mp4 移动到 根目录 /
 	aliyunpan mv /我的资源/1.mp4 /
+
+	将 /我的资源 目录下所有的.png文件 移动到 /我的图片 目录下面，使用通配符匹配
+	aliyunpan mv /我的资源/*.png /我的图片
 `,
 		Category: "阿里云盘",
-		Before:   cmder.ReloadConfigFunc,
+		Before:   ReloadConfigFunc,
 		Action: func(c *cli.Context) error {
 			if c.NArg() <= 1 {
 				cli.ShowCommandHelp(c, c.Command.Name)
@@ -47,7 +52,6 @@ func CmdMv() cli.Command {
 				fmt.Println("未登录账号")
 				return nil
 			}
-
 			RunMove(parseDriveId(c), c.Args()...)
 			return nil
 		},
@@ -66,7 +70,7 @@ func RunMove(driveId string, paths ...string) {
 	activeUser := GetActiveUser()
 	cacheCleanPaths := []string{}
 	opFileList, targetFile, _, err := getFileInfo(driveId, paths...)
-	if err !=  nil {
+	if err != nil {
 		fmt.Println(err)
 		return
 	}
@@ -81,40 +85,44 @@ func RunMove(driveId string, paths ...string) {
 	cacheCleanPaths = append(cacheCleanPaths, targetFile.Path)

 	failedMoveFiles := []*aliyunpan.FileEntity{}
-	moveFileParamList := []*aliyunpan.FileMoveParam{}
-	fileId2FileEntity := map[string]*aliyunpan.FileEntity{}
-	for _,mfi := range opFileList {
-		fileId2FileEntity[mfi.FileId] = mfi
-		moveFileParamList = append(moveFileParamList,
-			&aliyunpan.FileMoveParam{
-				DriveId: driveId,
-				FileId: mfi.FileId,
-				ToDriveId: driveId,
-				ToParentFileId: targetFile.FileId,
-			})
-		cacheCleanPaths = append(cacheCleanPaths, path.Dir(mfi.Path))
-	}
-	fmr,er := activeUser.PanClient().FileMove(moveFileParamList)
-
-	for _,rs := range fmr {
-		if !rs.Success {
-			failedMoveFiles = append(failedMoveFiles, fileId2FileEntity[rs.FileId])
+	successMoveFiles := []*aliyunpan.FileEntity{}
+	for _, mfi := range opFileList {
+		fmr, er := activeUser.PanClient().OpenapiPanClient().FileMove(&aliyunpan.FileMoveParam{
+			DriveId:        driveId,
+			FileId:         mfi.FileId,
+			ToDriveId:      driveId,
+			ToParentFileId: targetFile.FileId,
+		})
+		if er != nil || !fmr.Success {
+			failedMoveFiles = append(failedMoveFiles, mfi)
+		} else {
+			successMoveFiles = append(successMoveFiles, mfi)
 		}
+		cacheCleanPaths = append(cacheCleanPaths, path.Dir(mfi.Path))
 	}

 	if len(failedMoveFiles) > 0 {
 		fmt.Println("以下文件移动失败：")
-		for _,f := range failedMoveFiles {
-			fmt.Println(f.FileName)
+		for _, f := range failedMoveFiles {
+			fmt.Println(f.Path)
 		}
 		fmt.Println("")
 	}
-	if er == nil {
-		fmt.Println("操作成功, 已移动文件到目标目录: ", targetFile.Path)
-		activeUser.DeleteCache(cacheCleanPaths)
+	if len(successMoveFiles) > 0 {
+		pnt := func() {
+			tb := cmdtable.NewTable(os.Stdout)
+			tb.SetHeader([]string{"#", "文件/目录"})
+			for k, rs := range successMoveFiles {
+				tb.Append([]string{strconv.Itoa(k + 1), rs.Path})
+			}
+			tb.Render()
+		}
+		fmt.Println("操作成功, 以下文件已移动到目标目录: ", targetFile.Path)
+		pnt()
 	} else {
 		fmt.Println("无法移动文件，请稍后重试")
 	}
+	activeUser.DeleteCache(cacheCleanPaths)
 }

 func getFileInfo(driveId string, paths ...string) (opFileList []*aliyunpan.FileEntity, targetFile *aliyunpan.FileEntity, failedPaths []string, error error) {
@@ -125,11 +133,27 @@ func getFileInfo(driveId string, paths ...string) (opFileList []*aliyunpan.FileE
 	// the last one is the target file path
 	targetFilePath := path.Clean(paths[len(paths)-1])
 	absolutePath := activeUser.PathJoin(driveId, targetFilePath)
-	targetFile, err := activeUser.PanClient().FileInfoByPath(driveId, absolutePath)
+	targetFile, err := activeUser.PanClient().OpenapiPanClient().FileInfoByPath(driveId, absolutePath)
 	if err != nil || !targetFile.IsFolder() {
 		return nil, nil, nil, fmt.Errorf("指定目标文件夹不存在")
 	}

-	opFileList, failedPaths, error = GetAppFileInfoByPaths(driveId, paths[:len(paths)-1]...)
+	for idx := 0; idx < (len(paths) - 1); idx++ {
+		absolutePath = path.Clean(activeUser.PathJoin(driveId, paths[idx]))
+		fileList, err1 := matchPathByShellPattern(driveId, absolutePath)
+		if err1 != nil {
+			failedPaths = append(failedPaths, absolutePath)
+			continue
+		}
+		if fileList == nil || len(fileList) == 0 {
+			// 文件不存在
+			failedPaths = append(failedPaths, absolutePath)
+			continue
+		}
+		for _, f := range fileList {
+			// 移动匹配的文件
+			opFileList = append(opFileList, f)
+		}
+	}
 	return
 }
@@ -4,7 +4,7 @@
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
-//     http://www.apache.org/licenses/LICENSE-2.0
+//	http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,7 +15,6 @@ package command

 import (
 	"fmt"
-	"github.com/tickstep/aliyunpan/cmder"
 	"github.com/tickstep/aliyunpan/internal/config"
 	"github.com/tickstep/library-go/converter"
 	"github.com/urfave/cli"
@@ -34,7 +33,7 @@ func CmdQuota() cli.Command {
 		Usage:       "获取当前帐号空间配额",
 		Description: "获取网盘的总储存空间, 和已使用的储存空间",
 		Category:    "阿里云盘账号",
-		Before:      cmder.ReloadConfigFunc,
+		Before:      ReloadConfigFunc,
 		Action: func(c *cli.Context) error {
 			if config.Config.ActiveUser() == nil {
 				fmt.Println("未登录账号")
@@ -42,7 +41,7 @@ func CmdQuota() cli.Command {
 			}
 			q, err := RunGetQuotaInfo()
 			if err == nil {
-				fmt.Printf("账号: %s, uid: %s, 个人空间总额: %s, 个人空间已使用: %s, 比率: %f%%\n",
+				fmt.Printf("账号: %s, uid: %s, 个人空间总额: %s, 个人空间已使用: %s, 比率: %.2f%%\n",
 					config.Config.ActiveUser().Nickname, config.Config.ActiveUser().UserId,
 					converter.ConvertFileSize(q.Quota, 2), converter.ConvertFileSize(q.UsedSize, 2),
 					100*float64(q.UsedSize)/float64(q.Quota))
@@ -53,12 +52,12 @@ func CmdQuota() cli.Command {
 }

 func RunGetQuotaInfo() (quotaInfo *QuotaInfo, error error) {
-	user, err := GetActivePanClient().GetUserInfo()
+	user, err := GetActivePanClient().OpenapiPanClient().GetUserInfo()
 	if err != nil {
 		return nil, err
 	}
 	return &QuotaInfo{
 		UsedSize: int64(user.UsedSize),
-		Quota: int64(user.TotalSize),
+		Quota:    int64(user.TotalSize),
 	}, nil
 }
@@ -4,7 +4,7 @@
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
-//     http://www.apache.org/licenses/LICENSE-2.0
+//	http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,13 +17,16 @@ import (
 	"fmt"
 	"github.com/olekukonko/tablewriter"
 	"github.com/tickstep/aliyunpan-api/aliyunpan"
+	"github.com/tickstep/aliyunpan-api/aliyunpan_web"
 	"github.com/tickstep/aliyunpan/cmder"
 	"github.com/tickstep/aliyunpan/cmder/cmdtable"
+	"github.com/tickstep/aliyunpan/internal/config"
 	"github.com/tickstep/library-go/converter"
 	"github.com/tickstep/library-go/logger"
 	"github.com/urfave/cli"
 	"os"
 	"strconv"
+	"time"
 )

 func CmdRecycle() cli.Command {
@@ -45,7 +48,7 @@ func CmdRecycle() cli.Command {
 	aliyunpan recycle delete -all
 `,
 		Category: "阿里云盘",
-		Before:   cmder.ReloadConfigFunc,
+		Before:   ReloadConfigFunc,
 		Action: func(c *cli.Context) error {
 			if c.NumFlags() <= 0 || c.NArg() <= 0 {
 				cli.ShowCommandHelp(c, c.Command.Name)
@@ -59,6 +62,14 @@ func CmdRecycle() cli.Command {
 				Usage:     "列出回收站文件列表",
 				UsageText: cmder.App().Name + " recycle list",
 				Action: func(c *cli.Context) error {
+					if config.Config.ActiveUser() == nil {
+						fmt.Println("未登录账号")
+						return nil
+					}
+					if config.Config.ActiveUser().PanClient().WebapiPanClient() == nil {
+						fmt.Println("WEB客户端未登录，请登录后再使用该命令")
+						return nil
+					}
 					RunRecycleList(parseDriveId(c))
 					return nil
 				},
@@ -77,6 +88,14 @@ func CmdRecycle() cli.Command {
 				UsageText:   cmder.App().Name + " recycle restore <file_id 1> <file_id 2> <file_id 3> ...",
 				Description: `根据文件/目录的 fs_id, 还原回收站指定的文件或目录`,
 				Action: func(c *cli.Context) error {
+					if config.Config.ActiveUser() == nil {
+						fmt.Println("未登录账号")
+						return nil
+					}
+					if config.Config.ActiveUser().PanClient().WebapiPanClient() == nil {
+						fmt.Println("WEB客户端未登录，请登录后再使用该命令")
+						return nil
+					}
 					if c.NArg() <= 0 {
 						cli.ShowCommandHelp(c, c.Command.Name)
 						return nil
@@ -99,6 +118,14 @@ func CmdRecycle() cli.Command {
 				UsageText:   cmder.App().Name + " recycle delete [-all] <file_id 1> <file_id 2> <file_id 3> ...",
 				Description: `根据文件/目录的 file_id 或 -all 参数, 删除回收站指定的文件或目录或清空回收站`,
 				Action: func(c *cli.Context) error {
+					if config.Config.ActiveUser() == nil {
+						fmt.Println("未登录账号")
+						return nil
+					}
+					if config.Config.ActiveUser().PanClient().WebapiPanClient() == nil {
+						fmt.Println("WEB客户端未登录，请登录后再使用该命令")
+						return nil
+					}
 					if c.Bool("all") {
 						// 清空回收站
 						RunRecycleClear(parseDriveId(c))
@@ -131,7 +158,7 @@ func CmdRecycle() cli.Command {
 // RunRecycleList 执行列出回收站文件列表
 func RunRecycleList(driveId string) {
 	panClient := GetActivePanClient()
-	fdl, err := panClient.RecycleBinFileListGetAll(&aliyunpan.RecycleBinFileListParam{
+	fdl, err := panClient.WebapiPanClient().RecycleBinFileListGetAll(&aliyunpan_web.RecycleBinFileListParam{
 		DriveId: driveId,
 		Limit:   100,
 	})
@@ -150,7 +177,7 @@ func RunRecycleList(driveId string) {
 			fn = fn + "/"
 			fs = "-"
 		}
-		tb.Append([]string{strconv.Itoa(k), file.FileId, fn, fs, file.CreatedAt, file.UpdatedAt})
+		tb.Append([]string{strconv.Itoa(k + 1), file.FileId, fn, fs, file.CreatedAt, file.UpdatedAt})
 	}

 	tb.Render()
@@ -161,7 +188,7 @@ func RunRecycleRestore(driveId string, fidStrList ...string) {
 	panClient := GetActivePanClient()
 	restoreFileList := []*aliyunpan.FileBatchActionParam{}

-	for _,fid := range fidStrList {
+	for _, fid := range fidStrList {
 		restoreFileList = append(restoreFileList, &aliyunpan.FileBatchActionParam{
 			DriveId: driveId,
 			FileId:  fid,
@@ -173,7 +200,7 @@ func RunRecycleRestore(driveId string, fidStrList ...string) {
 		return
 	}

-	rbfr, err := panClient.RecycleBinFileRestore(restoreFileList)
+	rbfr, err := panClient.WebapiPanClient().RecycleBinFileRestore(restoreFileList)
 	if rbfr != nil && len(rbfr) > 0 {
 		fmt.Printf("还原文件成功\n")
 		return
@@ -190,7 +217,7 @@ func RunRecycleDelete(driveId string, fidStrList ...string) {
 	panClient := GetActivePanClient()
 	deleteFileList := []*aliyunpan.FileBatchActionParam{}

-	for _,fid := range fidStrList {
+	for _, fid := range fidStrList {
 		deleteFileList = append(deleteFileList, &aliyunpan.FileBatchActionParam{
 			DriveId: driveId,
 			FileId:  fid,
@@ -202,7 +229,7 @@ func RunRecycleDelete(driveId string, fidStrList ...string) {
 		return
 	}

-	rbfr, err := panClient.RecycleBinFileDelete(deleteFileList)
+	rbfr, err := panClient.WebapiPanClient().RecycleBinFileDelete(deleteFileList)
 	if rbfr != nil && len(rbfr) > 0 {
 		fmt.Printf("彻底删除文件成功\n")
 		return
@@ -218,39 +245,30 @@ func RunRecycleDelete(driveId string, fidStrList ...string) {
 func RunRecycleClear(driveId string) {
 	panClient := GetActivePanClient()

-	for {
-		// get file list
-		fdl, err := panClient.RecycleBinFileListGetAll(&aliyunpan.RecycleBinFileListParam{
-			DriveId: driveId,
-			Limit:   100,
-		})
-		if err != nil {
-			logger.Verboseln(err)
-			break
-		}
-		if fdl == nil || len(fdl) == 0 {
-			break
-		}
-
-		// delete
-		deleteFileList := []*aliyunpan.FileBatchActionParam{}
-		for _,f := range fdl {
-			deleteFileList = append(deleteFileList, &aliyunpan.FileBatchActionParam{
-				DriveId: driveId,
-				FileId:  f.FileId,
-			})
-		}
-
-		if len(deleteFileList) == 0 {
-			logger.Verboseln("没有需要删除的文件")
-			break
-		}
-
-		rbfr, err := panClient.RecycleBinFileDelete(deleteFileList)
-		if rbfr != nil && len(rbfr) > 0 {
-			logger.Verboseln("彻底删除文件成功")
-		}
+	// 提交清空回收站异步任务
+	r, err := panClient.WebapiPanClient().RecycleBinFileClear(&aliyunpan_web.RecycleBinFileClearParam{
+		DriveId: driveId,
+	})
+	if err != nil {
+		logger.Verboseln(err)
+		fmt.Printf("当前无法清空回收站，请稍后重试\n")
 	}

-	fmt.Printf("清空回收站成功\n")
+	for i := 0; i < 10; i++ {
+		ar, err1 := panClient.WebapiPanClient().AsyncTaskQueryStatus(&aliyunpan_web.AsyncTaskQueryStatusParam{
+			AsyncTaskId: r.AsyncTaskId,
+		})
+		if err1 != nil {
+			logger.Verboseln(err1)
+			time.Sleep(2 * time.Second)
+			continue
+		}
+		if ar.Status == "Succeed" {
+			fmt.Printf("清空回收站成功\n")
+			return
+		} else {
+			time.Sleep(1 * time.Second)
+		}
+	}
+	fmt.Printf("清空回收站失败，请稍后重试\n")
 }
@@ -4,7 +4,7 @@
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
-//     http://www.apache.org/licenses/LICENSE-2.0
+//	http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,14 +15,42 @@ package command

 import (
 	"fmt"
+	"github.com/tickstep/aliyunpan-api/aliyunpan"
 	"github.com/tickstep/aliyunpan-api/aliyunpan/apiutil"
-	"github.com/tickstep/aliyunpan/cmder"
 	"github.com/tickstep/aliyunpan/internal/config"
 	"github.com/urfave/cli"
 	"path"
+	"regexp"
+	"sort"
+	"strconv"
 	"strings"
 )

+type (
+	fileItem struct {
+		file        *aliyunpan.FileEntity
+		newFileName string
+	}
+	fileArray []*fileItem
+)
+
+func newFileItem(file *aliyunpan.FileEntity) *fileItem {
+	return &fileItem{
+		file:        file,
+		newFileName: "",
+	}
+}
+
+func (x fileArray) Len() int {
+	return len(x)
+}
+func (x fileArray) Less(i, j int) bool {
+	return x[i].file.FileName < x[j].file.FileName
+}
+func (x fileArray) Swap(i, j int) {
+	x[i], x[j] = x[j], x[i]
+}
+
 func CmdRename() cli.Command {
 	return cli.Command{
 		Name:  "rename",
@@ -31,18 +59,32 @@ func CmdRename() cli.Command {
 	aliyunpan rename <旧文件/目录名> <新文件/目录名>`,
 		Description: `
 	示例:
+    1. 将文件 1.mp4 重命名为 2.mp4
+    aliyunpan rename 1.mp4 2.mp4

-	将文件 1.mp4 重命名为 2.mp4
-	aliyunpan rename 1.mp4 2.mp4
+    2. 将文件 /test/1.mp4 重命名为 /test/2.mp4
+    要求必须是同一个文件目录内
+    aliyunpan rename /test/1.mp4 /test/2.mp4

-	将文件 /test/1.mp4 重命名为 /test/2.mp4
-	要求必须是同一个文件目录内
-	aliyunpan rename /test/1.mp4 /test/2.mp4
+    批量重命名，规则：rename [expression] [replacement] [file]
+    其中，
+    expression - 表达式，即文件名中需要去掉的部分，如果为*代表旧的文件名全部去掉
+    replacement - 需要替换的新文件名，如果包含 # 号会按顺序替换成数字编号
+    file - 文件匹配模式，指定需要查找的文件匹配字符串，支持通配符，例如：*.mp4 即当前目录下所有的mp4文件
+
+    3. 批量重命名，将当前目录下所有.mp4文件中包含的字符串 "我的视频" 全部改成 "视频"
+    aliyunpan rename 我的视频 视频 *.mp4
+
+    4. 批量重命名，将当前目录下所有.mp4文件全部进行 "视频+编号.mp4" 的重命名操作，旧的名称全部去掉，即：视频001.mp4, 视频002.mp4, 视频003.mp4...
+    aliyunpan rename * 视频###.mp4 *.mp4
+
+    5. 批量重命名，将当前目录下所有.mp4文件全部进行 "视频+编号.mp4" 的重命名操作，旧的名称全部去掉，直接重命名无需人工确认操作
+    aliyunpan rename -y * 视频###.mp4 *.mp4
 `,
 		Category: "阿里云盘",
-		Before:   cmder.ReloadConfigFunc,
+		Before:   ReloadConfigFunc,
 		Action: func(c *cli.Context) error {
-			if c.NArg() != 2 {
+			if c.NArg() != 2 && c.NArg() != 3 {
 				cli.ShowCommandHelp(c, c.Command.Name)
 				return nil
 			}
@@ -50,7 +92,12 @@ func CmdRename() cli.Command {
 				fmt.Println("未登录账号")
 				return nil
 			}
-			RunRename(parseDriveId(c), c.Args().Get(0), c.Args().Get(1))
+			if c.NArg() == 2 {
+				RunRename(parseDriveId(c), c.Args().Get(0), c.Args().Get(1))
+			} else if c.NArg() == 3 {
+				// 批量重命名
+				RunRenameBatch(c.Bool("y"), parseDriveId(c), c.Args().Get(0), c.Args().Get(1), c.Args().Get(2))
+			}
 			return nil
 		},
 		Flags: []cli.Flag{
@@ -59,6 +106,10 @@ func CmdRename() cli.Command {
 				Usage: "网盘ID",
 				Value: "",
 			},
+			cli.BoolFlag{
+				Name:  "y",
+				Usage: "跳过人工确认，对批量操作有效",
+			},
 		},
 	}
 }
@@ -85,14 +136,14 @@ func RunRename(driveId string, oldName string, newName string) {
 	}

 	fileId := ""
-	r, err := GetActivePanClient().FileInfoByPath(driveId, activeUser.PathJoin(driveId, oldName))
+	r, err := GetActivePanClient().OpenapiPanClient().FileInfoByPath(driveId, activeUser.PathJoin(driveId, oldName))
 	if err != nil {
 		fmt.Printf("原文件不存在： %s, %s\n", oldName, err)
 		return
 	}
 	fileId = r.FileId

-	b, e := activeUser.PanClient().FileRename(driveId, fileId, path.Base(newName))
+	b, e := activeUser.PanClient().OpenapiPanClient().FileRename(driveId, fileId, path.Base(newName))
 	if e != nil {
 		fmt.Println(e.Err)
 		return
@@ -104,3 +155,121 @@ func RunRename(driveId string, oldName string, newName string) {
 	fmt.Printf("重命名文件成功：%s -> %s\n", path.Base(oldName), path.Base(newName))
 	activeUser.DeleteOneCache(path.Dir(newName))
 }
+
+// RunRenameBatch 批量重命名文件
+func RunRenameBatch(skipConfirm bool, driveId string, expression, replacement, filePattern string) {
+	if len(expression) == 0 {
+		fmt.Println("旧文件名不能为空")
+		return
+	}
+	if !apiutil.CheckFileNameValid(replacement) {
+		fmt.Println("新文件名不能包含特殊字符：" + apiutil.FileNameSpecialChars)
+		return
+	}
+
+	if len(filePattern) == 0 {
+		fmt.Println("文件匹配模式不能为空")
+		return
+	}
+	if strings.ContainsAny(filePattern, "/") {
+		fmt.Println("文件匹配模式不能包含路径分隔符")
+		return
+	}
+	if strings.ContainsAny(filePattern, "\\") {
+		fmt.Println("文件匹配模式不能包含路径分隔符")
+		return
+	}
+
+	activeUser := GetActiveUser()
+	absolutePath := path.Clean(activeUser.PathJoin(driveId, filePattern))
+	fileList, err1 := matchPathByShellPattern(driveId, absolutePath)
+	if err1 != nil {
+		fmt.Println("查询文件出错：" + err1.Error())
+		return
+	}
+	if fileList == nil || len(fileList) == 0 {
+		fmt.Println("没有找到符合的文件")
+		return
+	}
+
+	// 文件列表按照名字排序
+	files := fileArray{}
+	for _, f := range fileList {
+		files = append(files, newFileItem(f))
+	}
+	if len(files) > 1 {
+		sort.Sort(files)
+	}
+
+	// 依次处理
+	var index = 1
+	for _, file := range files {
+		replacementStr := replaceNumStr(replacement, index)
+		index += 1
+		if expression == "*" {
+			// 旧的名称全部替换
+			file.newFileName = replacementStr
+		} else {
+			// 替换指定的名称片段
+			file.newFileName = strings.ReplaceAll(file.file.FileName, expression, replacementStr)
+		}
+	}
+
+	// 确认
+	if !skipConfirm {
+		fmt.Printf("以下文件将进行对应的重命名\n\n")
+		idx := 1
+		for _, file := range files {
+			fmt.Printf("%d) %s -> %s\n", idx, file.file.FileName, file.newFileName)
+			idx += 1
+		}
+		fmt.Printf("\n是否进行批量重命名，该操作不可逆(y/n): ")
+		confirm := ""
+		_, err := fmt.Scanln(&confirm)
+		if err != nil || (confirm != "y" && confirm != "Y") {
+			fmt.Println("用户取消了操作")
+			return
+		}
+	}
+
+	// 重命名
+	for _, file := range files {
+		b, e := activeUser.PanClient().OpenapiPanClient().FileRename(driveId, file.file.FileId, file.newFileName)
+		if e != nil {
+			fmt.Println(e.Err)
+			return
+		}
+		if !b {
+			fmt.Println("重命名文件失败")
+			return
+		}
+		fmt.Printf("重命名文件成功：%s -> %s\n", file.file.FileName, file.newFileName)
+		activeUser.DeleteOneCache(path.Dir(file.file.Path))
+	}
+}
+
+// replaceNumStr 将#替换成数字编号
+func replaceNumStr(name string, num int) string {
+	pattern, _ := regexp.Compile("[#]+")
+	r := pattern.FindAllStringSubmatchIndex(name, -1)
+	if len(r) == 0 {
+		return name
+	}
+	newName := name
+	c := r[0]
+	return replaceNumStr(newName[:c[0]]+generateNumStr(num, c[1]-c[0])+newName[c[1]:], num)
+}
+func generateNumStr(num, count int) string {
+	s := strconv.Itoa(num)
+	return generateZeroStr(count-len(s)) + s
+}
+func generateZeroStr(count int) string {
+	if count <= 0 {
+		return ""
+	}
+	s := ""
+	for i := 0; i < count; i++ {
+		s += "0"
+	}
+	return s
+}
@@ -0,0 +1,41 @@
+package command
+
+import (
+	"fmt"
+	"github.com/tickstep/aliyunpan-api/aliyunpan"
+	"sort"
+	"testing"
+)
+
+func TestRenameSort(t *testing.T) {
+	files := fileArray{}
+	files = append(files, newFileItem(&aliyunpan.FileEntity{FileName: "0我的文件01.txt"}))
+	files = append(files, newFileItem(&aliyunpan.FileEntity{FileName: "4我的文件03.txt"}))
+	files = append(files, newFileItem(&aliyunpan.FileEntity{FileName: "3我的文件02.txt"}))
+	files = append(files, newFileItem(&aliyunpan.FileEntity{FileName: "1我的文件00.txt"}))
+
+	sort.Sort(files)
+
+	for _, f := range files {
+		fmt.Println(f.file.FileName)
+	}
+}
+func TestRenameNum0(t *testing.T) {
+	fmt.Println(replaceNumStr("我的文件###.txt", 2))
+}
+func TestRenameNum1(t *testing.T) {
+	fmt.Println(replaceNumStr("我的##文件###.txt", 123))
+}
+func TestRenameNum2(t *testing.T) {
+	fmt.Println(replaceNumStr("我的文件###.txt", 1233))
+}
+func TestRenameNum3(t *testing.T) {
+	fmt.Println(replaceNumStr("我的文件[###].txt", 1233))
+}
+func TestRenameNum4(t *testing.T) {
+	fmt.Println(replaceNumStr("我的文件.txt", 1233))
+}
+
+func TestRenameNum5(t *testing.T) {
+	fmt.Println(replaceNumStr("", 1233))
+}
@@ -4,7 +4,7 @@
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
-//     http://www.apache.org/licenses/LICENSE-2.0
+//	http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
@@ -19,10 +19,12 @@ import (
 	"github.com/tickstep/aliyunpan/cmder"
 	"github.com/tickstep/aliyunpan/cmder/cmdtable"
 	"github.com/tickstep/aliyunpan/internal/config"
+	"github.com/tickstep/aliyunpan/internal/plugins"
 	"github.com/urfave/cli"
 	"os"
 	"path"
 	"strconv"
+	"strings"
 )

 func CmdRm() cli.Command {
@@ -32,7 +34,7 @@ func CmdRm() cli.Command {
 		UsageText: cmder.App().Name + " rm <文件/目录的路径1> <文件/目录2> <文件/目录3> ...",
 		Description: `
 	注意: 删除多个文件和目录时, 请确保每一个文件和目录都存在, 否则删除操作会失败.
-	被删除的文件或目录可在网盘文件回收站找回.
+	被删除的文件或目录可在网盘文件回收站找回。支持通配符匹配删除文件，通配符当前只能匹配文件名，不能匹配文件路径。

 	示例:

@@ -44,9 +46,12 @@ func CmdRm() cli.Command {

 	删除 /我的资源 整个目录 !!
 	aliyunpan rm /我的资源
+
+	删除 /我的资源 目录下面的所有.zip文件，使用通配符匹配
+	aliyunpan rm /我的资源/*.zip
 `,
 		Category: "阿里云盘",
-		Before:   cmder.ReloadConfigFunc,
+		Before:   ReloadConfigFunc,
 		Action: func(c *cli.Context) error {
 			if c.NArg() == 0 {
 				cli.ShowCommandHelp(c, c.Command.Name)
@@ -69,49 +74,116 @@ func CmdRm() cli.Command {
 	}
 }

+func queryFileListByPath(activeUser *config.PanUser, driveId, filePathPattern string) (files []*aliyunpan.FileEntity, e error) {
+	if !strings.ContainsAny(filePathPattern, aliyunpan.ShellPatternCharacters) {
+		// 没有通配符，直接查询
+		fi, err := activeUser.PanClient().OpenapiPanClient().FileInfoByPath(driveId, filePathPattern)
+		if err != nil {
+			return nil, err
+		}
+		files = append(files, fi)
+	} else {
+		// 包含通配符，使用通配符查询
+		files, e = matchPathByShellPattern(driveId, filePathPattern)
+	}
+	return files, e
+}
+
 // RunRemove 执行 批量删除文件/目录
 func RunRemove(driveId string, paths ...string) {
 	activeUser := GetActiveUser()
+	pluginManger := plugins.NewPluginManager(config.GetPluginDir())
+	plugin, _ := pluginManger.GetPlugin()

 	cacheCleanDirs := []string{}
 	failedRmPaths := make([]string, 0, len(paths))
-	delFileInfos := []*aliyunpan.FileBatchActionParam{}
-	fileId2FileEntity := map[string]*aliyunpan.FileEntity{}
+	successDelFileEntity := []*aliyunpan.FileEntity{}

 	for _, p := range paths {
 		absolutePath := path.Clean(activeUser.PathJoin(driveId, p))
-		fe, err := activeUser.PanClient().FileInfoByPath(driveId, absolutePath)
-		if err != nil {
+
+		// 查询路径对应的文件信息
+		fileList, err1 := queryFileListByPath(activeUser, driveId, absolutePath)
+		if err1 != nil {
 			failedRmPaths = append(failedRmPaths, absolutePath)
 			continue
 		}
-		fe.Path = absolutePath
-		delFileInfos = append(delFileInfos, &aliyunpan.FileBatchActionParam{
-			DriveId:driveId,
-			FileId:fe.FileId,
-		})
-		fileId2FileEntity[fe.FileId] = fe
-		cacheCleanDirs = append(cacheCleanDirs, path.Dir(fe.Path))
-	}
-
-	// delete
-	successDelFileEntity := []*aliyunpan.FileEntity{}
-	fdr, err := activeUser.PanClient().FileDelete(delFileInfos)
-	if fdr != nil {
-		for _,item := range fdr {
-			if !item.Success {
-				failedRmPaths = append(failedRmPaths, fileId2FileEntity[item.FileId].Path)
-			} else {
-				successDelFileEntity = append(successDelFileEntity, fileId2FileEntity[item.FileId])
+		if fileList == nil || len(fileList) == 0 {
+			// 跳过，没有满足条件的文件
+			failedRmPaths = append(failedRmPaths, absolutePath)
+			continue
+		}
+		// 调用插件
+		approvedToRemoveFiles := []*aliyunpan.FileEntity{}
+		pluginParam := &plugins.RemoveFilePrepareParams{
+			Count: len(fileList),
+			Items: make([]*plugins.RemoveFilePrepareItem, 0),
+		}
+		for _, f := range fileList {
+			pluginParam.Items = append(pluginParam.Items, &plugins.RemoveFilePrepareItem{
+				DriveId:            f.DriveId,
+				DriveFileId:        f.FileId,
+				DriveFileName:      f.FileName,
+				DriveFilePath:      f.Path,
+				DriveFileSize:      f.FileSize,
+				DriveFileType:      f.FileType,
+				DriveFileUpdatedAt: f.UpdatedAt,
+				DriveFileCreatedAt: f.CreatedAt,
+			})
+		}
+		if removeFilePrepareResult, er := plugin.RemoveFilePrepareCallback(plugins.GetContext(config.Config.ActiveUser()), pluginParam); er == nil && removeFilePrepareResult != nil {
+			for _, f := range fileList {
+				matchResult := false
+				for _, r := range removeFilePrepareResult.Result {
+					if strings.Compare(f.FileId, r.DriveFileId) == 0 {
+						matchResult = true
+						if strings.Compare("yes", r.RemoveApproved) != 0 {
+							// skip this file
+							fmt.Printf("插件不允许删除该文件: %s\n", f.Path)
+						} else {
+							approvedToRemoveFiles = append(approvedToRemoveFiles, f)
+						}
+						break
+					}
+				}
+				if !matchResult {
+					// 该文件没有确认结果，则默认删除
+					approvedToRemoveFiles = append(approvedToRemoveFiles, f)
+				}
 			}
+		} else {
+			// 默认删除全部文件
+			approvedToRemoveFiles = fileList
+		}
+
+		for _, f := range approvedToRemoveFiles {
+			// 删除匹配的文件
+			fdr, err := activeUser.PanClient().OpenapiPanClient().FileDelete(&aliyunpan.FileBatchActionParam{
+				DriveId: driveId,
+				FileId:  f.FileId,
+			})
+			if err != nil || !fdr.Success {
+				failedRmPaths = append(failedRmPaths, absolutePath)
+			} else {
+				successDelFileEntity = append(successDelFileEntity, f)
+			}
+			cacheCleanDirs = append(cacheCleanDirs, path.Dir(f.Path))
 		}
 	}

+	// output
+	if len(failedRmPaths) > 0 {
+		fmt.Println("以下文件删除失败：")
+		for _, fp := range failedRmPaths {
+			fmt.Println(fp)
+		}
+		fmt.Println("")
+	}
 	pnt := func() {
 		tb := cmdtable.NewTable(os.Stdout)
 		tb.SetHeader([]string{"#", "文件/目录"})
 		for k := range successDelFileEntity {
-			tb.Append([]string{strconv.Itoa(k), successDelFileEntity[k].Path})
+			tb.Append([]string{strconv.Itoa(k + 1), successDelFileEntity[k].Path})
 		}
 		tb.Render()
 	}
@@ -119,10 +191,7 @@ func RunRemove(driveId string, paths ...string) {
 		fmt.Println("操作成功, 以下文件/目录已删除, 可在云盘文件回收站找回: ")
 		pnt()
 		activeUser.DeleteCache(cacheCleanDirs)
-	}
-
-	if len(successDelFileEntity) == 0 && err != nil {
-		fmt.Println("无法删除文件，请稍后重试")
-		return
+	} else {
+		fmt.Println("本次操作没有删除任何文件")
 	}
 }
@@ -0,0 +1,25 @@
+package command
+
+import (
+	"fmt"
+	"testing"
+)
+
+func TestWildcard(t *testing.T) {
+	fmt.Println(isIncludeFile("ab0.txt", "ab0.txt"))
+	fmt.Println(isIncludeFile("*.zip", "aliyunpan-v0.0.1-darwin-macos-amd64.zip"))
+	fmt.Println(isIncludeFile(".*.swp", ".vd.txt.swp"))
+	fmt.Println(isIncludeFile("*.swp", ".swp"))
+	fmt.Println(isIncludeFile("*.swp", ".1swp"))
+
+	fmt.Println(isIncludeFile("a*b", "ab"))
+	fmt.Println(isIncludeFile("a*b", "aab"))
+	fmt.Println(isIncludeFile("a*b", "accccccccdb"))
+	fmt.Println(isIncludeFile("a?b", "acb"))
+	fmt.Println(isIncludeFile("a?b", "accb"))
+	fmt.Println(isIncludeFile("a[xyz]b", "axb"))
+	fmt.Println(isIncludeFile("ab[0-9].txt", "ab0.txt"))
+
+	fmt.Println(isIncludeFile("a*b/ab[0-9].txt", "acb/ab0.txt"))
+	fmt.Println(isIncludeFile("aliyunpan*", "aliyunpan-v0.0.1-darwin-macos-amd64[TNT].zip"))
+}
@@ -0,0 +1,179 @@
+// Copyright (c) 2020 tickstep.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+package command
+
+import (
+	"fmt"
+	"github.com/tickstep/aliyunpan-api/aliyunpan_web"
+	"path"
+	"strings"
+
+	"github.com/tickstep/aliyunpan/internal/config"
+	"github.com/urfave/cli"
+)
+
+func CmdSave() cli.Command {
+	return cli.Command{
+		Name:  "save",
+		Usage: "保存分享文件/目录",
+		UsageText: `
+	aliyunpan save <分享链接> (<提取码>) <目标目录>`,
+		Description: `
+	注意: 保存大量文件时, 命令完成后可能还需要额外等待一段时间; 分享的根目录下如果包含大量文件或文件夹, 可能存在不稳定的情况
+
+	示例:
+
+	将 公开分享 保存到 根目录 /
+	aliyunpan save ABCD1234wxyz /
+	aliyunpan save https://www.alipan.com/s/ABCD1234wxyz /
+
+	将 私密分享 保存到 指定目录 /资源分享
+	aliyunpan save ABCD1234wxyz akd1 /资源分享
+	aliyunpan save https://www.alipan.com/s/ABCD1234wxyz akd1 /资源分享
+	`,
+		Category: "阿里云盘",
+		Before:   ReloadConfigFunc,
+		Action: func(c *cli.Context) error {
+			if c.NArg() <= 1 || c.NArg() > 3 {
+				cli.ShowCommandHelp(c, c.Command.Name)
+				return nil
+			}
+			if config.Config.ActiveUser() == nil {
+				fmt.Println("未登录账号")
+				return nil
+			}
+			if config.Config.ActiveUser().PanClient().WebapiPanClient() == nil {
+				fmt.Println("WEB客户端未登录，请登录后再使用该命令")
+				return nil
+			}
+			RunSave(parseDriveId(c), c.Args()...)
+			return nil
+		},
+		Flags: []cli.Flag{
+			cli.StringFlag{
+				Name:  "driveId",
+				Usage: "网盘ID",
+				Value: "",
+			},
+		},
+	}
+}
+
+// RunSave 保存分享的文件
+func RunSave(driveId string, args ...string) {
+	activeUser := GetActiveUser()
+
+	targetFilePath := path.Clean(args[len(args)-1])
+	absolutePath := activeUser.PathJoin(driveId, targetFilePath)
+	targetFile, err := activeUser.PanClient().WebapiPanClient().FileInfoByPath(driveId, absolutePath)
+	if err != nil || !targetFile.IsFolder() {
+		fmt.Println("指定目标文件夹不存在")
+		return
+	}
+	fmt.Println("保存文件至：", targetFilePath)
+
+	shareID := args[0]
+	if i := strings.Index(shareID, "alipan.com/s/"); i > 0 {
+		shareID = shareID[i+13:]
+	}
+	sharePwd := ""
+	if len(args) == 3 {
+		sharePwd = args[1]
+	}
+
+	token, err := activeUser.PanClient().WebapiPanClient().GetShareToken(shareID, sharePwd)
+	if err != nil {
+		fmt.Println("读取分享链接失败：", err)
+		return
+	}
+
+	list, err := activeUser.PanClient().WebapiPanClient().GetListByShare(token.ShareToken, shareID, "")
+	if err != nil {
+		fmt.Println("读取分享文件列表失败：", err)
+		return
+	}
+	for list.NextMarker != "" {
+		list2, err := activeUser.PanClient().WebapiPanClient().GetListByShare(token.ShareToken, shareID, "")
+		if err != nil {
+			fmt.Println("读取分享文件列表失败：", err)
+			return
+		}
+		list.Items = append(list.Items, list2.Items...)
+		list.NextMarker = list2.NextMarker
+	}
+
+	var params []*aliyunpan_web.FileSaveParam
+	files := make(map[string]*aliyunpan_web.ListByShareItem)
+	for _, item := range list.Items {
+		if item.FileExtension != "" {
+			fmt.Println(" ", item.Name)
+		} else {
+			fmt.Println(" ", item.Name+"/")
+		}
+		files[item.FileID] = item
+
+		params = append(params, &aliyunpan_web.FileSaveParam{
+			ShareID:        shareID,
+			FileId:         item.FileID,
+			AutoRename:     true,
+			ToDriveId:      driveId,
+			ToParentFileId: targetFile.FileId,
+		})
+	}
+	fmt.Println()
+
+	result, err := activeUser.PanClient().WebapiPanClient().FileCopy(token.ShareToken, params)
+	if err != nil {
+		fmt.Println("保存分享文件失败：", err)
+		return
+	}
+	var ids []string
+	var failedSaveFileIds []string
+	tasks := make(map[string]string)
+	for _, item := range result {
+		if item.AsyncTaskId == "" {
+			if item.Status != 201 {
+				failedSaveFileIds = append(failedSaveFileIds, item.FileId)
+			}
+		} else {
+			tasks[item.AsyncTaskId] = item.FileId
+			ids = append(ids, item.AsyncTaskId)
+		}
+	}
+	if ids != nil {
+		result2, err := activeUser.PanClient().WebapiPanClient().AsyncTaskGet(token.ShareToken, ids)
+		if err != nil {
+			fmt.Println("读取保存结果失败：", err)
+		}
+
+		for _, item := range result2 {
+			if !item.Success {
+				failedSaveFileIds = append(failedSaveFileIds, tasks[item.AsyncTaskId])
+			}
+		}
+	}
+
+	if failedSaveFileIds != nil {
+		fmt.Println("以下文件保存失败：")
+		for _, id := range failedSaveFileIds {
+			if v, ok := files[id]; ok {
+				fmt.Println(v.Name)
+			} else {
+				fmt.Println(id)
+			}
+		}
+		fmt.Println("")
+	}
+	fmt.Println("操作成功, 分享文件已保存到目标目录: ", targetFile.Path)
+}
@@ -4,7 +4,7 @@
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
-//     http://www.apache.org/licenses/LICENSE-2.0
+//	http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
@@ -18,12 +18,10 @@ import (
 	"github.com/tickstep/aliyunpan-api/aliyunpan"
 	"github.com/tickstep/aliyunpan-api/aliyunpan/apierror"
 	"github.com/tickstep/aliyunpan/cmder"
-	"github.com/tickstep/aliyunpan/cmder/cmdtable"
 	"github.com/tickstep/aliyunpan/internal/config"
-	"github.com/tickstep/library-go/logger"
 	"github.com/urfave/cli"
-	"os"
-	"strconv"
+	"path"
+	"strings"
 	"time"
 )

@@ -33,7 +31,7 @@ func CmdShare() cli.Command {
 		Usage:     "分享文件/目录",
 		UsageText: cmder.App().Name + " share",
 		Category:  "阿里云盘",
-		Before:    cmder.ReloadConfigFunc,
+		Before:    ReloadConfigFunc,
 		Action: func(c *cli.Context) error {
 			cli.ShowCommandHelp(c, c.Command.Name)
 			return nil
@@ -48,13 +46,19 @@ func CmdShare() cli.Command {
 示例:

    创建文件 1.mp4 的分享链接 
-	aliyunpan share set 1.mp4
+	aliyunpan share set -mode 1 1.mp4
+
+    创建 /我的视频/ 目录下所有mp4文件的分享链接，支持通配符
+	aliyunpan share set -mode 1 /我的视频/*.mp4

    创建文件 1.mp4 的分享链接，并指定分享密码为2333
-	aliyunpan share set -sharePwd 2333 1.mp4
+	aliyunpan share set -mode 1 -sharePwd 2333 1.mp4

    创建文件 1.mp4 的分享链接，并指定有效期为1天
-	aliyunpan share set -time 1 1.mp4
+	aliyunpan share set -mode 1 -time 1 1.mp4
+
+    创建文件 1.mp4 的快传链接
+	aliyunpan share set 1.mp4
 `,
 				Action: func(c *cli.Context) error {
 					if c.NArg() < 1 {
@@ -65,6 +69,8 @@ func CmdShare() cli.Command {
 						fmt.Println("未登录账号")
 						return nil
 					}
+
+					// 有效期
 					et := ""
 					timeFlag := "0"
 					if c.IsSet("time") {
@@ -79,15 +85,27 @@ func CmdShare() cli.Command {
 						et = ""
 					}

+					// 密码
 					sharePwd := ""
 					if c.IsSet("sharePwd") {
 						sharePwd = c.String("sharePwd")
 					}
+					if sharePwd == "" {
+						sharePwd = RandomStr(4)
+					}

-					modeFlag := "1"
+					// 模式
+					modeFlag := "3"
 					if c.IsSet("mode") {
 						modeFlag = c.String("mode")
 					}
+					if modeFlag == "1" || modeFlag == "2" {
+						if config.Config.ActiveUser().ActiveDriveId != config.Config.ActiveUser().DriveList.GetResourceDriveId() {
+							// 只有资源库才支持私有、公开分享
+							fmt.Println("只有资源库才支持分享链接，其他请使用快传链接")
+							return nil
+						}
+					}
 					if modeFlag == "1" {
 						if sharePwd == "" {
 							sharePwd = RandomStr(4)
@@ -95,7 +113,8 @@ func CmdShare() cli.Command {
 					} else {
 						sharePwd = ""
 					}
-					RunShareSet(parseDriveId(c), c.Args(), et, sharePwd)
+
+					RunOpenShareSet(modeFlag, parseDriveId(c), c.Args(), et, sharePwd)
 					return nil
 				},
 				Flags: []cli.Flag{
@@ -111,8 +130,8 @@ func CmdShare() cli.Command {
 					},
 					cli.StringFlag{
 						Name:  "mode",
-						Usage: "有效期，1-私密分享，2-公开分享",
-						Value: "1",
+						Usage: "模式，1-私密分享，2-公开分享，3-快传",
+						Value: "3",
 					},
 					cli.StringFlag{
 						Name:  "sharePwd",
@@ -121,93 +140,38 @@ func CmdShare() cli.Command {
 					},
 				},
 			},
-			{
-				Name:      "list",
-				Aliases:   []string{"l"},
-				Usage:     "列出已分享文件/目录",
-				UsageText: cmder.App().Name + " share list",
-				Action: func(c *cli.Context) error {
-					RunShareList()
-					return nil
-				},
-				Flags: []cli.Flag{
-				},
-			},
-			{
-				Name:        "cancel",
-				Aliases:     []string{"c"},
-				Usage:       "取消分享文件/目录",
-				UsageText:   cmder.App().Name + " share cancel <shareid_1> <shareid_2> ...",
-				Description: `目前只支持通过分享id (shareid) 来取消分享.`,
-				Action: func(c *cli.Context) error {
-					if c.NArg() < 1 {
-						cli.ShowCommandHelp(c, c.Command.Name)
-						return nil
-					}
-					RunShareCancel(c.Args())
-					return nil
-				},
-			},
-//			{
-//				Name:      "mc",
-//				Aliases:   []string{},
-//				Usage:     "创建秒传链接",
-//				UsageText: cmder.App().Name + " share mc <文件/目录1> <文件/目录2> ...",
-//				Description: `
-//创建文件秒传链接，秒传链接只能是文件，如果是文件夹则会创建文件夹包含的所有文件的秒传链接。秒传链接可以通过RapidUpload命令或者Import命令进行导入到自己的网盘。
-//示例:
-//    创建文件 1.mp4 的秒传链接
-//	aliyunpan share mc 1.mp4
-//
-//    创建文件 1.mp4 的秒传链接，但链接隐藏相对路径
-//	aliyunpan share mc -hp 1.mp4
-//
-//    创建文件夹 share_folder 下面所有文件的秒传链接
-//	aliyunpan share mc share_folder/
-//`,
-//				Action: func(c *cli.Context) error {
-//					if c.NArg() < 1 {
-//						cli.ShowCommandHelp(c, c.Command.Name)
-//						return nil
-//					}
-//					if config.Config.ActiveUser() == nil {
-//						fmt.Println("未登录账号")
-//						return nil
-//					}
-//					hp := false
-//					if c.IsSet("hp") {
-//						hp = c.Bool("hp")
-//					}
-//					RunShareMc(parseDriveId(c), hp, c.Args())
-//					return nil
-//				},
-//				Flags: []cli.Flag{
-//					cli.StringFlag{
-//						Name:  "driveId",
-//						Usage: "网盘ID",
-//						Value: "",
-//					},
-//					cli.BoolFlag{
-//						Name:  "hp",
-//						Usage: "hide path, 隐藏相对目录",
-//					},
-//				},
-//			},
 		},
 	}
 }

-// RunShareSet 执行分享
-func RunShareSet(driveId string, paths []string, expiredTime string, sharePwd string) {
-	panClient := GetActivePanClient()
-	fileList, _, err := GetFileInfoByPaths(paths[:len(paths)]...)
-	if err != nil {
-		fmt.Println(err)
+// RunOpenShareSet 执行分享
+func RunOpenShareSet(modeFlag, driveId string, paths []string, expiredTime string, sharePwd string) {
+	if len(paths) <= 0 {
+		fmt.Println("请指定文件路径")
 		return
 	}
+	activeUser := GetActiveUser()
+	panClient := activeUser.PanClient()
+
+	allFileList := []*aliyunpan.FileEntity{}
+	for idx := 0; idx < len(paths); idx++ {
+		absolutePath := path.Clean(activeUser.PathJoin(driveId, paths[idx]))
+		fileList, err1 := matchPathByShellPattern(driveId, absolutePath)
+		if err1 != nil {
+			fmt.Println("文件不存在: " + absolutePath)
+			continue
+		}
+		if fileList == nil || len(fileList) == 0 {
+			// 文件不存在
+			fmt.Println("文件不存在: " + absolutePath)
+			continue
+		}
+		// 匹配的文件
+		allFileList = append(allFileList, fileList...)
+	}

 	fidList := []string{}
-	for _,f := range fileList {
+	for _, f := range allFileList {
 		fidList = append(fidList, f.FileId)
 	}

@@ -216,119 +180,51 @@ func RunShareSet(driveId string, paths []string, expiredTime string, sharePwd st
 		return
 	}

-	r, err1 := panClient.ShareLinkCreate(aliyunpan.ShareCreateParam{
-		DriveId: driveId,
-		SharePwd: sharePwd,
-		Expiration: expiredTime,
-		FileIdList: fidList,
-	})
-
-	if err1 != nil || r == nil {
-		if err1.Code == apierror.ApiCodeFileShareNotAllowed {
-			fmt.Printf("创建分享链接失败: 该文件类型不允许分享\n")
-		} else {
-			fmt.Printf("创建分享链接失败: %s\n", err)
-		}
-		return
-	}
-
-	fmt.Printf("创建分享链接成功\n")
-	if len(sharePwd) > 0 {
-		fmt.Printf("链接：%s 提取码：%s\n", r.ShareUrl, r.SharePwd)
-	} else {
-		fmt.Printf("链接：%s\n", r.ShareUrl)
-	}
-
-}
-
-// RunShareList 执行列出分享列表
-func RunShareList() {
-	activeUser := GetActiveUser()
-	records, err := activeUser.PanClient().ShareLinkList(activeUser.UserId)
-	if err != nil {
-		fmt.Printf("获取分享列表失败: %s\n", err)
-		return
-	}
-
-	tb := cmdtable.NewTable(os.Stdout)
-	tb.SetHeader([]string{"#", "ShARE_ID", "分享链接", "提取码", "文件名", "FILE_ID", "过期时间", "状态"})
-	now := time.Now()
-	for k, record := range records {
-		et := "永久有效"
-		if len(record.Expiration) > 0 {
-			et = record.Expiration
-		}
-		status := "有效"
-		if record.FirstFile == nil {
-			status = "已删除"
-		} else {
-			cz := time.FixedZone("CST", 8*3600)
-			if len(record.Expiration) > 0 {
-				expiredTime, _ := time.ParseInLocation("2006-01-02 15:04:05", record.Expiration, cz)
-				if expiredTime.Unix() < now.Unix() {
-					status = "已过期"
-				}
-			}
-		}
-		tb.Append([]string{strconv.Itoa(k), record.ShareId, record.ShareUrl, record.SharePwd,
-			record.ShareName,
-			record.FileIdList[0],
-			et,
-			status})
-	}
-	tb.Render()
-}
-
-// RunShareCancel 执行取消分享
-func RunShareCancel(shareIdList []string) {
-	if len(shareIdList) == 0 {
-		fmt.Printf("取消分享操作失败, 没有任何 shareid\n")
-		return
-	}
-
-	activeUser := GetActiveUser()
-	r, err := activeUser.PanClient().ShareLinkCancel(shareIdList)
-	if err != nil {
-		fmt.Printf("取消分享操作失败: %s\n", err)
-		return
-	}
-
-	if r != nil && len(r) > 0 {
-		fmt.Printf("取消分享操作成功\n")
-	} else {
-		fmt.Printf("取消分享操作失败\n")
-	}
-}
-
-// 创建秒传链接
-func RunShareMc(driveId string, hideRelativePath bool, panPaths []string) {
-	activeUser := config.Config.ActiveUser()
-	panClient := activeUser.PanClient()
-
-	totalCount := 0
-	for _,panPath := range panPaths {
-		panPath = activeUser.PathJoin(driveId, panPath)
-		panClient.FilesDirectoriesRecurseList(driveId, panPath, func(depth int, _ string, fd *aliyunpan.FileEntity, apiError *apierror.ApiError) bool {
-			if apiError != nil {
-				logger.Verbosef("%s\n", apiError)
-				return true
-			}
-
-			// 只需要文件即可
-			if !fd.IsFolder() {
-				item := newRapidUploadItemFromFileEntity(fd)
-				jstr := item.createRapidUploadLink(hideRelativePath)
-				if len(jstr) <= 0 {
-					logger.Verboseln("create rapid upload link err")
-					return false
-				}
-				// print
-				fmt.Println(jstr)
-				totalCount += 1
-				time.Sleep(time.Duration(100) * time.Millisecond)
-			}
-			return true
+	// 创建分享类型
+	if modeFlag == "3" {
+		// 快传
+		r, err1 := panClient.OpenapiPanClient().FastShareLinkCreate(aliyunpan.FastShareCreateParam{
+			DriveId:    driveId,
+			FileIdList: fidList,
 		})
+		if err1 != nil || r == nil {
+			if err1.Code == apierror.ApiCodeFileShareNotAllowed {
+				fmt.Printf("创建快传链接失败: 该文件类型不允许分享\n")
+			} else {
+				fmt.Printf("创建快传链接失败: %s\n", err1)
+			}
+			return
+		}
+
+		fmt.Printf("创建快传链接成功\n")
+		fmt.Printf("链接：%s\n", strings.ReplaceAll(r.ShareUrl, "https://www.aliyundrive.com", "https://www.alipan.com"))
+	} else {
+		// 分享
+		r, err1 := panClient.OpenapiPanClient().ShareLinkCreate(aliyunpan.ShareCreateParam{
+			DriveId:    driveId,
+			SharePwd:   sharePwd,
+			Expiration: expiredTime,
+			FileIdList: fidList,
+		})
+		if err1 != nil || r == nil {
+			if err1.Code == apierror.ApiCodeFileShareNotAllowed {
+				fmt.Printf("创建分享链接失败: 该文件类型不允许分享\n")
+			} else {
+				fmt.Printf("创建分享链接失败: %s\n", err1)
+			}
+			return
+		}
+
+		if modeFlag == "1" {
+			fmt.Printf("创建私密分享链接成功\n")
+		} else if modeFlag == "2" {
+			fmt.Printf("创建公开分享链接成功\n")
+		}
+		shareUrl := strings.ReplaceAll(r.ShareUrl, "https://www.aliyundrive.com", "https://www.alipan.com")
+		if len(sharePwd) > 0 {
+			fmt.Printf("链接：%s 提取码：%s\n", shareUrl, r.SharePwd)
+		} else {
+			fmt.Printf("链接：%s\n", shareUrl)
+		}
 	}
-	fmt.Printf("\n秒传链接总数量: %d\n", totalCount)
-}
+}
@@ -0,0 +1,443 @@
+// Copyright (c) 2020 tickstep.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+package command
+
+import (
+	"encoding/csv"
+	"fmt"
+	"github.com/tickstep/aliyunpan-api/aliyunpan"
+	"github.com/tickstep/aliyunpan-api/aliyunpan/apierror"
+	"github.com/tickstep/aliyunpan/cmder"
+	"github.com/tickstep/aliyunpan/cmder/cmdtable"
+	"github.com/tickstep/aliyunpan/internal/config"
+	"github.com/urfave/cli"
+	"os"
+	"path"
+	"path/filepath"
+	"strconv"
+	"time"
+)
+
+// web端分享接口
+func CmdShareWeb() cli.Command {
+	return cli.Command{
+		Name:      "sharew",
+		Usage:     "分享文件/目录",
+		UsageText: cmder.App().Name + " sharew",
+		Category:  "阿里云盘",
+		Before:    ReloadConfigFunc,
+		Action: func(c *cli.Context) error {
+			cli.ShowCommandHelp(c, c.Command.Name)
+			return nil
+		},
+		Subcommands: []cli.Command{
+			{
+				Name:      "set",
+				Aliases:   []string{"s"},
+				Usage:     "设置分享文件/目录",
+				UsageText: cmder.App().Name + " share set <文件/目录1> <文件/目录2> ...",
+				Description: `
+示例:
+
+    创建文件 1.mp4 的分享链接 
+	aliyunpan share set -mode 1 1.mp4
+
+    创建 /我的视频/ 目录下所有mp4文件的分享链接，支持通配符
+	aliyunpan share set -mode 1 /我的视频/*.mp4
+
+    创建文件 1.mp4 的分享链接，并指定分享密码为2333
+	aliyunpan share set -mode 1 -sharePwd 2333 1.mp4
+
+    创建文件 1.mp4 的分享链接，并指定有效期为1天
+	aliyunpan share set -mode 1 -time 1 1.mp4
+
+    创建文件 1.mp4 的快传链接
+	aliyunpan share set 1.mp4
+`,
+				Action: func(c *cli.Context) error {
+					if c.NArg() < 1 {
+						cli.ShowCommandHelp(c, c.Command.Name)
+						return nil
+					}
+					if config.Config.ActiveUser() == nil {
+						fmt.Println("未登录账号")
+						return nil
+					}
+					if config.Config.ActiveUser().PanClient().WebapiPanClient() == nil {
+						fmt.Println("WEB客户端未登录，请登录后再使用该命令")
+						return nil
+					}
+					et := ""
+					timeFlag := "0"
+					if c.IsSet("time") {
+						timeFlag = c.String("time")
+					}
+					now := time.Now()
+					if timeFlag == "1" {
+						et = now.Add(time.Duration(1) * time.Hour * 24).Format("2006-01-02 15:04:05")
+					} else if timeFlag == "2" {
+						et = now.Add(time.Duration(7) * time.Hour * 24).Format("2006-01-02 15:04:05")
+					} else {
+						et = ""
+					}
+
+					sharePwd := ""
+					if c.IsSet("sharePwd") {
+						sharePwd = c.String("sharePwd")
+					}
+
+					modeFlag := "3"
+					if c.IsSet("mode") {
+						modeFlag = c.String("mode")
+					}
+					if modeFlag == "1" || modeFlag == "2" {
+						if config.Config.ActiveUser().ActiveDriveId != config.Config.ActiveUser().DriveList.GetResourceDriveId() {
+							// 只有资源库才支持私有、公开分享
+							fmt.Println("只有资源库才支持分享链接，其他请使用快传链接")
+							return nil
+						}
+					}
+
+					if modeFlag == "1" {
+						if sharePwd == "" {
+							sharePwd = RandomStr(4)
+						}
+					} else {
+						sharePwd = ""
+					}
+					RunShareSet(modeFlag, parseDriveId(c), c.Args(), et, sharePwd)
+					return nil
+				},
+				Flags: []cli.Flag{
+					cli.StringFlag{
+						Name:  "driveId",
+						Usage: "网盘ID",
+						Value: "",
+					},
+					cli.StringFlag{
+						Name:  "time",
+						Usage: "有效期，0-永久，1-1天，2-7天",
+						Value: "0",
+					},
+					cli.StringFlag{
+						Name:  "mode",
+						Usage: "模式，1-私密分享，2-公开分享，3-快传",
+						Value: "3",
+					},
+					cli.StringFlag{
+						Name:  "sharePwd",
+						Usage: "自定义私密分享密码，4个字符，没有指定则随机生成",
+						Value: "",
+					},
+				},
+			},
+			{
+				Name:      "list",
+				Aliases:   []string{"l"},
+				Usage:     "列出已分享文件/目录",
+				UsageText: cmder.App().Name + " share list",
+				Action: func(c *cli.Context) error {
+					if config.Config.ActiveUser() == nil {
+						fmt.Println("未登录账号")
+						return nil
+					}
+					if config.Config.ActiveUser().PanClient().WebapiPanClient() == nil {
+						fmt.Println("WEB客户端未登录，请登录后再使用该命令")
+						return nil
+					}
+					RunShareList()
+					return nil
+				},
+				Flags: []cli.Flag{},
+			},
+			{
+				Name:        "cancel",
+				Aliases:     []string{"c"},
+				Usage:       "取消分享文件/目录",
+				UsageText:   cmder.App().Name + " share cancel <shareid_1> <shareid_2> ...",
+				Description: `目前只支持通过分享id (shareid) 来取消分享.`,
+				Action: func(c *cli.Context) error {
+					if config.Config.ActiveUser() == nil {
+						fmt.Println("未登录账号")
+						return nil
+					}
+					if config.Config.ActiveUser().PanClient().WebapiPanClient() == nil {
+						fmt.Println("WEB客户端未登录，请登录后再使用该命令")
+						return nil
+					}
+					if c.NArg() < 1 {
+						cli.ShowCommandHelp(c, c.Command.Name)
+						return nil
+					}
+					RunShareCancel(c.Args())
+					return nil
+				},
+			},
+			{
+				Name:      "export",
+				Usage:     "导出分享记录保存到文件",
+				UsageText: cmder.App().Name + " share export <csv file path>",
+				Description: `
+导出分享记录，并保存到指定的文件。目前支持csv格式
+  
+示例:
+    导出所有有效的分享并保存成文件
+	aliyunpan share export "d:\myfoler\share_list.csv"
+
+    导出所有的分享并保存成文件
+	aliyunpan share export -option 2 "d:\myfoler\share_list.csv"
+`,
+				Action: func(c *cli.Context) error {
+					if config.Config.ActiveUser() == nil {
+						fmt.Println("未登录账号")
+						return nil
+					}
+					if config.Config.ActiveUser().PanClient().WebapiPanClient() == nil {
+						fmt.Println("WEB客户端未登录，请登录后再使用该命令")
+						return nil
+					}
+					if c.NArg() < 1 {
+						cli.ShowCommandHelp(c, c.Command.Name)
+						return nil
+					}
+					opt := c.String("option")
+					if opt == "" {
+						opt = "1"
+					}
+					filePath := c.Args()[0]
+					RunShareExport(opt, filePath)
+					return nil
+				},
+				Flags: []cli.Flag{
+					cli.StringFlag{
+						Name:  "option",
+						Usage: "导出选项，1-有效分享 2-全部分享",
+						Value: "1",
+					},
+				},
+			},
+		},
+	}
+}
+
+// RunShareSet 执行分享
+func RunShareSet(modeFlag, driveId string, paths []string, expiredTime string, sharePwd string) {
+	if len(paths) <= 0 {
+		fmt.Println("请指定文件路径")
+		return
+	}
+	activeUser := GetActiveUser()
+	panClient := activeUser.PanClient()
+
+	allFileList := []*aliyunpan.FileEntity{}
+	for idx := 0; idx < len(paths); idx++ {
+		absolutePath := path.Clean(activeUser.PathJoin(driveId, paths[idx]))
+		fileList, err1 := matchPathByShellPattern(driveId, absolutePath)
+		if err1 != nil {
+			fmt.Println("文件不存在: " + absolutePath)
+			continue
+		}
+		if fileList == nil || len(fileList) == 0 {
+			// 文件不存在
+			fmt.Println("文件不存在: " + absolutePath)
+			continue
+		}
+		// 匹配的文件
+		allFileList = append(allFileList, fileList...)
+	}
+
+	fidList := []string{}
+	for _, f := range allFileList {
+		fidList = append(fidList, f.FileId)
+	}
+
+	if len(fidList) == 0 {
+		fmt.Printf("没有指定有效的文件\n")
+		return
+	}
+
+	if modeFlag == "3" {
+		// 快传
+		r, err1 := panClient.WebapiPanClient().FastShareLinkCreate(aliyunpan.FastShareCreateParam{
+			DriveId:    driveId,
+			FileIdList: fidList,
+		})
+		if err1 != nil || r == nil {
+			if err1.Code == apierror.ApiCodeFileShareNotAllowed {
+				fmt.Printf("创建快传链接失败: 该文件类型不允许分享\n")
+			} else {
+				fmt.Printf("创建快传链接失败: %s\n", err1)
+			}
+			return
+		}
+
+		fmt.Printf("创建快传链接成功\n")
+		fmt.Printf("链接：%s\n", r.ShareUrl)
+	} else {
+		// 分享
+		r, err1 := panClient.WebapiPanClient().ShareLinkCreate(aliyunpan.ShareCreateParam{
+			DriveId:    driveId,
+			SharePwd:   sharePwd,
+			Expiration: expiredTime,
+			FileIdList: fidList,
+		})
+		if err1 != nil || r == nil {
+			if err1.Code == apierror.ApiCodeFileShareNotAllowed {
+				fmt.Printf("创建分享链接失败: 该文件类型不允许分享\n")
+			} else {
+				fmt.Printf("创建分享链接失败: %s\n", err1)
+			}
+			return
+		}
+
+		fmt.Printf("创建分享链接成功\n")
+		if len(sharePwd) > 0 {
+			fmt.Printf("链接：%s 提取码：%s\n", r.ShareUrl, r.SharePwd)
+		} else {
+			fmt.Printf("链接：%s\n", r.ShareUrl)
+		}
+	}
+}
+
+// RunShareList 执行列出分享列表
+func RunShareList() {
+	activeUser := GetActiveUser()
+	records, err := activeUser.PanClient().WebapiPanClient().ShareLinkList(activeUser.UserId)
+	if err != nil {
+		fmt.Printf("获取分享列表失败: %s\n", err)
+		return
+	}
+
+	tb := cmdtable.NewTable(os.Stdout)
+	tb.SetHeader([]string{"#", "ShARE_ID", "分享链接", "提取码", "文件名", "过期时间", "状态"})
+	now := time.Now()
+	for k, record := range records {
+		et := "永久有效"
+		if len(record.Expiration) > 0 {
+			et = record.Expiration
+		}
+		status := "有效"
+		if record.Status == "enabled" {
+			if record.FirstFile == nil {
+				status = "已删除"
+			} else {
+				cz := time.FixedZone("CST", 8*3600)
+				if len(record.Expiration) > 0 {
+					expiredTime, _ := time.ParseInLocation("2006-01-02 15:04:05", record.Expiration, cz)
+					if expiredTime.Unix() < now.Unix() {
+						status = "已过期"
+					}
+				}
+			}
+		} else if record.Status == "forbidden" {
+			status = "违规"
+		}
+
+		tb.Append([]string{strconv.Itoa(k + 1), record.ShareId, record.ShareUrl, record.SharePwd,
+			record.ShareName,
+			//record.FileIdList[0],
+			et,
+			status})
+	}
+	tb.Render()
+}
+
+// RunShareCancel 执行取消分享
+func RunShareCancel(shareIdList []string) {
+	if len(shareIdList) == 0 {
+		fmt.Printf("取消分享操作失败, 没有任何 shareid\n")
+		return
+	}
+
+	activeUser := GetActiveUser()
+	r, err := activeUser.PanClient().WebapiPanClient().ShareLinkCancel(shareIdList)
+	if err != nil {
+		fmt.Printf("取消分享操作失败: %s\n", err)
+		return
+	}
+
+	if r != nil && len(r) > 0 {
+		fmt.Printf("取消分享操作成功\n")
+	} else {
+		fmt.Printf("取消分享操作失败\n")
+	}
+}
+
+func RunShareExport(option, saveFilePath string) {
+	activeUser := GetActiveUser()
+	records, err := activeUser.PanClient().WebapiPanClient().ShareLinkList(activeUser.UserId)
+	if err != nil {
+		fmt.Printf("获取分享列表失败: %s\n", err)
+		return
+	}
+
+	columns := [][]string{{"序号", "分享ID", "分享链接", "提取码", "文件名", "过期时间", "状态"}}
+	now := time.Now()
+	idx := 1
+	for _, record := range records {
+		et := "永久有效"
+		if len(record.Expiration) > 0 {
+			et = record.Expiration
+		}
+		status := "有效"
+		if record.FirstFile == nil {
+			status = "已删除"
+			if option == "1" {
+				continue
+			}
+		} else {
+			cz := time.FixedZone("CST", 8*3600)
+			if len(record.Expiration) > 0 {
+				expiredTime, _ := time.ParseInLocation("2006-01-02 15:04:05", record.Expiration, cz)
+				if expiredTime.Unix() < now.Unix() {
+					status = "已过期"
+				}
+			}
+		}
+
+		if option == "1" {
+			if status == "已过期" || status == "已删除" {
+				continue
+			}
+		}
+		line := []string{strconv.Itoa(idx), record.ShareId, record.ShareUrl, record.SharePwd, record.ShareName, et, status}
+		idx += 1
+		columns = append(columns, line)
+	}
+
+	// save to file
+	if ExportCsv(saveFilePath, columns) {
+		fmt.Println("分享导出成功：", saveFilePath)
+	}
+}
+
+func ExportCsv(savePath string, data [][]string) bool {
+	folder := filepath.Dir(savePath)
+	if _, err := os.Stat(folder); err != nil {
+		if !os.IsExist(err) {
+			os.MkdirAll(folder, os.ModePerm)
+		}
+	}
+	fp, err := os.Create(savePath) // 创建文件句柄
+	if err != nil {
+		fmt.Println("创建文件["+savePath+"]失败,%v", err)
+		return false
+	}
+	defer fp.Close()
+	fp.WriteString("\xEF\xBB\xBF") // 写入UTF-8 BOM
+	w := csv.NewWriter(fp)         //创建一个新的写入文件流
+	w.WriteAll(data)
+	w.Flush()
+	return true
+}
@@ -4,7 +4,7 @@
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
-//     http://www.apache.org/licenses/LICENSE-2.0
+//	http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
@@ -18,6 +18,8 @@ import (
 	"github.com/tickstep/aliyunpan-api/aliyunpan"
 	"github.com/tickstep/aliyunpan/cmder"
 	"github.com/tickstep/aliyunpan/internal/config"
+	"github.com/tickstep/aliyunpan/internal/global"
+	"github.com/tickstep/aliyunpan/internal/log"
 	"github.com/tickstep/aliyunpan/internal/syncdrive"
 	"github.com/tickstep/aliyunpan/internal/utils"
 	"github.com/tickstep/library-go/converter"
@@ -35,22 +37,20 @@ func CmdSync() cli.Command {
 		Usage:     "同步备份功能(Beta)",
 		UsageText: cmder.App().Name + " sync",
 		Description: `
-    备份功能。支持备份本地文件到云盘，备份云盘文件到本地，双向同步备份三种模式。支持JavaScript插件对备份文件进行过滤。
-    指定本地目录和对应的一个网盘目录，以备份文件。网盘目录必须和本地目录独占使用，不要用作其他他用途，不然备份可能会有问题。
+    备份功能。支持备份本地文件到云盘，备份云盘文件到本地两种模式。支持JavaScript插件对备份文件进行过滤。
+    指定本地目录和对应的一个网盘目录，以备份文件。网盘目录必须和本地目录独占使用，不要用作其他用途，不然备份可能会有问题。

-	备份功能支持以下三种模式：
+	备份功能支持以下模式：
 	1. upload 
       备份本地文件，即上传本地文件到网盘，始终保持本地文件有一个完整的备份在网盘
 	2. download 
       备份云盘文件，即下载网盘文件到本地，始终保持网盘的文件有一个完整的备份在本地
-	3. sync（慎用！！！双向备份过程会删除文件）
-       双向备份，保持网盘文件和本地文件严格一致

 	请输入以下命令查看如何配置和启动：
    aliyunpan sync start -h
 `,
 		Category: "阿里云盘",
-		Before:   cmder.ReloadConfigFunc,
+		Before:   ReloadConfigFunc,
 		Action: func(c *cli.Context) error {
 			cli.ShowCommandHelp(c, c.Command.Name)
 			return nil
@@ -71,7 +71,9 @@ func CmdSync() cli.Command {
   "name": "设计文档备份",
   "localFolderPath": "D:/tickstep/Documents/设计文档",
   "panFolderPath": "/sync_drive/我的文档",
-   "mode": "upload"
+   "mode": "upload",
+   "policy"： "increment"，
+   "driveName": "backup"
  }
 ]
 }
@@ -79,14 +81,16 @@ func CmdSync() cli.Command {
 name - 任务名称
 localFolderPath - 本地目录
 panFolderPath - 网盘目录
-mode - 模式，支持三种: upload(备份本地文件到云盘),download(备份云盘文件到本地),sync(双向同步备份)
+mode - 备份模式，支持两种: upload(备份本地文件到云盘),download(备份云盘文件到本地)
+policy - 备份策略, 支持两种: exclusive(排他备份文件，目标目录多余的文件会被删除),increment(增量备份文件，目标目录多余的文件不会被删除)
+driveName - 网盘名称，backup(备份盘)，resource(资源盘)
    
 	例子:
 	1. 查看帮助
 	aliyunpan sync start -h
    
-	2. 使用命令行配置启动同步备份服务，将本地目录 D:\tickstep\Documents\设计文档 中的文件备份上传到云盘目录 /sync_drive/我的文档
-	aliyunpan sync start -ldir "D:\tickstep\Documents\设计文档" -pdir "/sync_drive/我的文档" -mode "upload"
+	2. 使用命令行配置启动同步备份服务，将本地目录 D:\tickstep\Documents\设计文档 中的文件备份上传到"备份盘"的云盘目录 /sync_drive/我的文档
+	aliyunpan sync start -ldir "D:\tickstep\Documents\设计文档" -pdir "/sync_drive/我的文档" -mode "upload" -drive "backup"

 	3. 使用命令行配置启动同步备份服务，将云盘目录 /sync_drive/我的文档 中的文件备份下载到本地目录 D:\tickstep\Documents\设计文档
 	aliyunpan sync start -ldir "D:\tickstep\Documents\设计文档" -pdir "/sync_drive/我的文档" -mode "download"
@@ -107,6 +111,14 @@ mode - 模式，支持三种: upload(备份本地文件到云盘),download(备
 						fmt.Println("未登录账号")
 						return nil
 					}
+					activeUser := GetActiveUser()
+
+					if c.String("log") == "true" {
+						syncdrive.LogPrompt = true
+					} else {
+						syncdrive.LogPrompt = false
+					}
+
 					dp := c.Int("dp")
 					if dp == 0 {
 						dp = config.Config.MaxDownloadParallel
@@ -136,11 +148,37 @@ mode - 模式，支持三种: upload(备份本地文件到云盘),download(备
 						uploadBlockSize = aliyunpan.DefaultChunkSize
 					}

+					var syncOpt syncdrive.SyncPriorityOption = syncdrive.SyncPriorityTimestampFirst
+					//opt := c.String("pri")
+					//if opt == "local" {
+					//	syncOpt = syncdrive.SyncPriorityLocalFirst
+					//} else if opt == "pan" {
+					//	syncOpt = syncdrive.SyncPriorityPanFirst
+					//} else {
+					//	syncOpt = syncdrive.SyncPriorityTimestampFirst
+					//}
+
 					var task *syncdrive.SyncTask
 					localDir := c.String("ldir")
 					panDir := c.String("pdir")
 					mode := c.String("mode")
+					policy := c.String("policy")
+					driveName := c.String("drive")
 					if localDir != "" && panDir != "" {
+						// make path absolute
+						if !utils.IsLocalAbsPath(localDir) {
+							pwd, _ := os.Getwd()
+							localDir = path.Join(pwd, path.Clean(localDir))
+						}
+						panDir = activeUser.PathJoin(activeUser.ActiveDriveId, panDir)
+						if !utils.IsLocalAbsPath(localDir) {
+							fmt.Println("本地目录请指定绝对路径")
+							return nil
+						}
+						if !utils.IsPanAbsPath(panDir) {
+							fmt.Println("网盘目录请指定绝对路径")
+							return nil
+						}
 						//if b, e := utils.PathExists(localDir); e == nil {
 						//	if !b {
 						//		fmt.Println("本地文件夹不存在：", localDir)
@@ -153,24 +191,59 @@ mode - 模式，支持三种: upload(备份本地文件到云盘),download(备
 						task = &syncdrive.SyncTask{}
 						task.LocalFolderPath = path.Clean(strings.ReplaceAll(localDir, "\\", "/"))
 						task.PanFolderPath = panDir
-						task.Mode = syncdrive.UploadOnly
-						if mode == string(syncdrive.UploadOnly) {
-							task.Mode = syncdrive.UploadOnly
-						} else if mode == string(syncdrive.DownloadOnly) {
-							task.Mode = syncdrive.DownloadOnly
+						task.Mode = syncdrive.Upload
+						if mode == string(syncdrive.Upload) {
+							task.Mode = syncdrive.Upload
+						} else if mode == string(syncdrive.Download) {
+							task.Mode = syncdrive.Download
 						} else if mode == string(syncdrive.SyncTwoWay) {
 							task.Mode = syncdrive.SyncTwoWay
 						} else {
-							task.Mode = syncdrive.UploadOnly
+							task.Mode = syncdrive.Upload
+						}
+						if policy == string(syncdrive.SyncPolicyExclusive) {
+							task.Policy = syncdrive.SyncPolicyExclusive
+						} else {
+							task.Policy = syncdrive.SyncPolicyIncrement
 						}
 						task.Name = path.Base(task.LocalFolderPath)
 						task.Id = utils.Md5Str(task.LocalFolderPath)
+						task.Priority = syncOpt
+						task.UserId = activeUser.UserId
+
+						// drive id
+						task.DriveName = driveName
+						if strings.ToLower(task.DriveName) == "backup" {
+							task.DriveId = activeUser.DriveList.GetFileDriveId()
+						} else if strings.ToLower(task.DriveName) == "resource" {
+							task.DriveId = activeUser.DriveList.GetResourceDriveId()
+						}
+						if len(task.DriveId) == 0 {
+							task.DriveName = "backup"
+							task.DriveId = activeUser.DriveList.GetFileDriveId()
+						}
 					}

-					RunSync(task, dp, up, downloadBlockSize, uploadBlockSize)
+					cycleMode := syncdrive.CycleInfiniteLoop
+					if c.String("cycle") == "onetime" {
+						cycleMode = syncdrive.CycleOneTime
+					} else {
+						cycleMode = syncdrive.CycleInfiniteLoop
+					}
+					scanIntervalTime := int64(c.Int("sit") * 60)
+					if scanIntervalTime == 0 {
+						// 默认1分钟
+						scanIntervalTime = 60
+					}
+					RunSync(task, cycleMode, dp, up, downloadBlockSize, uploadBlockSize, syncOpt, c.Int("ldt"), scanIntervalTime)
 					return nil
 				},
 				Flags: []cli.Flag{
+					cli.StringFlag{
+						Name:  "drive",
+						Usage: "drive name, 网盘名称，backup(备份盘)，resource(资源盘)",
+						Value: "backup",
+					},
 					cli.StringFlag{
 						Name:  "ldir",
 						Usage: "local dir, 本地文件夹完整路径",
@@ -181,9 +254,24 @@ mode - 模式，支持三种: upload(备份本地文件到云盘),download(备
 					},
 					cli.StringFlag{
 						Name:  "mode",
-						Usage: "备份模式, 支持三种: upload(备份本地文件到云盘),download(备份云盘文件到本地),sync(双向同步备份)",
+						Usage: "备份模式, 支持两种: upload(备份本地文件到云盘),download(备份云盘文件到本地)",
 						Value: "upload",
 					},
+					cli.StringFlag{
+						Name:  "policy",
+						Usage: "备份策略, 支持两种: exclusive(排他备份文件，目标目录多余的文件会被删除),increment(增量备份文件，目标目录多余的文件不会被删除)",
+						Value: "increment",
+					},
+					//cli.StringFlag{
+					//	Name:  "pri",
+					//	Usage: "同步优先级，只对sync模式有效。当网盘和本地存在同名文件，优先使用哪个，选项支持三种: time-时间优先，local-本地优先，pan-网盘优先",
+					//	Value: "time",
+					//},
+					cli.StringFlag{
+						Name:  "cycle",
+						Usage: "备份周期, 支持两种: infinity(永久循环备份),onetime(只运行一次备份)",
+						Value: "infinity",
+					},
 					cli.IntFlag{
 						Name:  "dp",
 						Usage: "download parallel, 下载并发数量，即可以同时并发下载多少个文件。0代表跟从配置文件设置（取值范围:1 ~ 10）",
@@ -201,32 +289,55 @@ mode - 模式，支持三种: upload(备份本地文件到云盘),download(备
 					},
 					cli.IntFlag{
 						Name:  "ubs",
-						Usage: "upload block size，上传分片大小，单位KB。推荐值：1024 ~ 10240",
+						Usage: "upload block size，上传分片大小，单位KB。推荐值：1024 ~ 10240。当上传极大单文件时候请适当调高该值",
 						Value: 10240,
 					},
+					cli.StringFlag{
+						Name:  "log",
+						Usage: "是否显示文件备份过程日志，true-显示，false-不显示",
+						Value: "false",
+					},
+					cli.IntFlag{
+						Name:  "ldt",
+						Usage: "local delay time，本地文件修改检测延迟间隔，单位秒。如果本地文件会被频繁修改，例如录制视频文件，配置好该时间可以避免上传未录制好的文件。",
+						Value: 3,
+					},
+					cli.IntFlag{
+						Name:  "sit",
+						Usage: "scan interval time，扫描文件间隔时间，单位：分钟。",
+						Value: 1,
+					},
 				},
 			},
 		},
 	}
 }

-func RunSync(defaultTask *syncdrive.SyncTask, fileDownloadParallel, fileUploadParallel int, downloadBlockSize, uploadBlockSize int64) {
-	useInternalUrl := config.Config.TransferUrlType == 2
+func RunSync(defaultTask *syncdrive.SyncTask, cycleMode syncdrive.CycleMode, fileDownloadParallel, fileUploadParallel int, downloadBlockSize, uploadBlockSize int64,
+	flag syncdrive.SyncPriorityOption, localDelayTime int, scanTimeInterval int64) {
 	maxDownloadRate := config.Config.MaxDownloadRate
 	maxUploadRate := config.Config.MaxUploadRate
 	activeUser := GetActiveUser()
 	panClient := activeUser.PanClient()
+	panClient.OpenapiPanClient().ClearCache()
+	panClient.OpenapiPanClient().DisableCache()

-	// pan token expired checker
-	go func() {
-		for {
-			time.Sleep(time.Duration(1) * time.Minute)
-			if RefreshTokenInNeed(activeUser) {
-				logger.Verboseln("update access token for sync task")
-				panClient.UpdateToken(activeUser.WebToken)
-			}
-		}
-	}()
+	//// pan token expired checker
+	//continueFlag := int32(0)
+	//atomic.StoreInt32(&continueFlag, 0)
+	//defer func() {
+	//	atomic.StoreInt32(&continueFlag, 1)
+	//}()
+	//go func(flag *int32) {
+	//	for atomic.LoadInt32(flag) == 0 {
+	//		time.Sleep(time.Duration(1) * time.Minute)
+	//		if RefreshWebTokenInNeed(activeUser, config.Config.DeviceName) {
+	//			logger.Verboseln("update access token for sync task")
+	//			userWebToken := NewWebLoginToken(activeUser.WebapiToken.AccessToken, activeUser.WebapiToken.Expired)
+	//			panClient.WebapiPanClient().UpdateToken(userWebToken)
+	//		}
+	//	}
+	//}(&continueFlag)

 	syncFolderRootPath := config.GetSyncDriveDir()
 	if b, e := utils.PathExists(syncFolderRootPath); e == nil {
@@ -242,21 +353,30 @@ func RunSync(defaultTask *syncdrive.SyncTask, fileDownloadParallel, fileUploadPa
 	}

 	fmt.Println("启动同步备份进程")
-	typeUrlStr := "默认链接"
-	if useInternalUrl {
-		typeUrlStr = "阿里ECS内部链接"
+
+	// 文件同步记录器
+	fileRecorder := log.NewFileRecorder(config.GetLogDir() + "/sync_file_records.csv")
+
+	option := syncdrive.SyncOption{
+		FileDownloadParallel:              fileDownloadParallel,
+		FileUploadParallel:                fileUploadParallel,
+		FileDownloadBlockSize:             downloadBlockSize,
+		FileUploadBlockSize:               uploadBlockSize,
+		MaxDownloadRate:                   maxDownloadRate,
+		MaxUploadRate:                     maxUploadRate,
+		SyncPriority:                      flag,
+		LocalFileModifiedCheckIntervalSec: localDelayTime,
+		FileRecorder:                      fileRecorder,
 	}
-	syncMgr := syncdrive.NewSyncTaskManager(activeUser, activeUser.DriveList.GetFileDriveId(), panClient, syncFolderRootPath,
-		fileDownloadParallel, fileUploadParallel, downloadBlockSize, uploadBlockSize, useInternalUrl,
-		maxDownloadRate, maxUploadRate)
+	syncMgr := syncdrive.NewSyncTaskManager(activeUser, panClient, syncFolderRootPath, option)
 	syncConfigFile := syncMgr.ConfigFilePath()
 	if tasks != nil {
 		syncConfigFile = "(使用命令行配置)"
 	}
-	fmt.Printf("备份配置文件：%s\n链接类型：%s\n下载并发：%d\n上传并发：%d\n下载分片大小：%s\n上传分片大小：%s\n",
-		syncConfigFile, typeUrlStr, fileDownloadParallel, fileUploadParallel, converter.ConvertFileSize(downloadBlockSize, 2),
+	fmt.Printf("备份配置文件：%s\n下载并发：%d\n上传并发：%d\n下载分片大小：%s\n上传分片大小：%s\n",
+		syncConfigFile, fileDownloadParallel, fileUploadParallel, converter.ConvertFileSize(downloadBlockSize, 2),
 		converter.ConvertFileSize(uploadBlockSize, 2))
-	if _, e := syncMgr.Start(tasks); e != nil {
+	if _, e := syncMgr.Start(tasks, cycleMode, scanTimeInterval); e != nil {
 		fmt.Println("启动任务失败：", e)
 		return
 	}
@@ -264,19 +384,52 @@ func RunSync(defaultTask *syncdrive.SyncTask, fileDownloadParallel, fileUploadPa
 	_, ok := os.LookupEnv("ALIYUNPAN_DOCKER")
 	if ok {
 		// in docker container
-		// 使用休眠以节省CPU资源
-		for {
-			time.Sleep(60 * time.Second)
+		if cycleMode == syncdrive.CycleInfiniteLoop {
+			// 使用休眠以节省CPU资源
+			fmt.Println("本命令不会退出，程序正在以Docker的方式运行。如需退出请借助Docker提供的方式。")
+			for {
+				time.Sleep(60 * time.Second)
+			}
+		} else {
+			for {
+				if syncMgr.IsAllTaskCompletely() {
+					fmt.Println("所有备份任务已完成")
+					break
+				}
+				time.Sleep(5 * time.Second)
+			}
+			syncMgr.DoTaskSyncCompletelyPluginCallback()
 		}
 	} else {
-		// in cmd mode
-		c := ""
-		fmt.Print("本命令不会退出，如需要结束同步备份进程请输入y，然后按Enter键进行停止：")
-		for strings.ToLower(c) != "y" {
-			fmt.Scan(&c)
+		if cycleMode == syncdrive.CycleInfiniteLoop {
+			if global.IsAppInCliMode {
+				// in cmd mode
+				c := ""
+				fmt.Println("本命令不会退出，如需要结束同步备份进程请输入y，然后按Enter键进行停止。")
+				for strings.ToLower(c) != "y" {
+					fmt.Scan(&c)
+				}
+			} else {
+				fmt.Println("本命令不会退出，程序正在以非交互的方式运行。如需退出请借助运行环境提供的方式。")
+				logger.Verboseln("App not in CLI mode, not need to listen to input stream")
+				for {
+					time.Sleep(60 * time.Second)
+				}
+			}
+		} else {
+			for {
+				if syncMgr.IsAllTaskCompletely() {
+					fmt.Println("所有备份任务已完成")
+					break
+				}
+				time.Sleep(5 * time.Second)
+			}
+			syncMgr.DoTaskSyncCompletelyPluginCallback()
 		}
 	}

-	fmt.Println("正在停止同步备份任务，请稍等...")
+	fmt.Println("正在退出同步备份任务，请稍等...")
+
+	// stop task
 	syncMgr.Stop()
 }
@@ -1,99 +0,0 @@
-// Copyright (c) 2020 tickstep.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-package command
-
-import (
-	"fmt"
-	"github.com/tickstep/aliyunpan-api/aliyunpan"
-	"github.com/tickstep/aliyunpan/cmder"
-	"github.com/tickstep/aliyunpan/internal/config"
-	"github.com/urfave/cli"
-)
-
-func CmdToken() cli.Command {
-	return cli.Command{
-		Name:      "token",
-		Usage:     "Token相关操作",
-		UsageText: cmder.App().Name + " token",
-		Category:  "阿里云盘账号",
-		Before:    cmder.ReloadConfigFunc,
-		Action: func(c *cli.Context) error {
-			cli.ShowCommandHelp(c, c.Command.Name)
-			return nil
-		},
-		Subcommands: []cli.Command{
-			{
-				Name:      "update",
-				Usage:     "更新Token",
-				UsageText: cmder.App().Name + " token update",
-				Description: `
-示例:
-
-    更新当前登录用户的Token
-	aliyunpan token update -mode 1
-
-    更新全部登录用户的Token
-	aliyunpan token update -mode 2
-`,
-				Action: func(c *cli.Context) error {
-					if config.Config.ActiveUser() == nil {
-						fmt.Println("未登录账号，无需刷新Token")
-						return nil
-					}
-
-					modeFlag := "1"
-					if c.IsSet("mode") {
-						modeFlag = c.String("mode")
-					}
-					RunTokenUpdate(modeFlag)
-					return nil
-				},
-				Flags: []cli.Flag{
-					cli.StringFlag{
-						Name:  "mode",
-						Usage: "模式，1-登录用户，2-全部用户",
-						Value: "1",
-					},
-				},
-			},
-		},
-	}
-}
-
-// RunTokenUpdate 执行Token更新
-func RunTokenUpdate(modeFlag string) {
-	cmder.ReloadConfigFunc(nil)
-	userList := config.Config.UserList
-	if userList == nil || len(userList) == 0 {
-		fmt.Printf("没有登录用户，无需刷新Token\n")
-		return
-	}
-	for _,user := range userList {
-		if modeFlag == "1" {
-			if user.UserId != config.Config.ActiveUID {
-				continue
-			}
-		}
-		newToken,e := aliyunpan.GetAccessTokenFromRefreshToken(user.RefreshToken)
-		if e != nil {
-			fmt.Printf("无法为%s用户获取新的RefreshToken，可能需要重新登录\n", user.Nickname)
-			continue
-		}
-		if newToken != nil && newToken.RefreshToken != "" {
-			user.RefreshToken = newToken.RefreshToken
-			fmt.Printf("成功刷新%s用户的RefreshToken\n", user.Nickname)
-		}
-	}
-	cmder.SaveConfigFunc(nil)
-}
@@ -0,0 +1,242 @@
+package command
+
+import (
+	"fmt"
+	"github.com/tickstep/aliyunpan-api/aliyunpan"
+	"github.com/tickstep/aliyunpan/cmder"
+	"github.com/tickstep/aliyunpan/internal/config"
+	"github.com/tickstep/library-go/converter"
+	"github.com/urfave/cli"
+	"path"
+	"strings"
+)
+
+func CmdTree() cli.Command {
+	return cli.Command{
+		Name:      "tree",
+		Usage:     "列出目录的树形图",
+		UsageText: cmder.App().Name + " tree <目录>",
+		Description: `
+	列出指定目录内的文件和目录, 并以树形图的方式呈现
+
+	示例:
+
+	列出 当前工作目录 内的文件和目录的树形图
+	aliyunpan tree
+
+	列出 /我的资源 内的文件和目录的树形图
+	aliyunpan tree /我的资源
+
+	列出 /我的资源 内的文件和目录的树形图，使用通配符
+	aliyunpan tree /我的*
+
+	列出 /我的资源 内的文件和目录的树形图，并且显示文件对应的完整绝对路径
+	aliyunpan tree -fp /我的资源
+
+	列出 /我的资源 内的文件和目录的树形图，并且显示文件对应的文件大小
+	aliyunpan tree -fs /我的资源
+
+	列出 /我的资源 内的文件和目录的树形图，过滤大于等于 10kb 并且小于等于 10mb 的文件，同时显示文件对应的文件大小
+	aliyunpan tree -fs -minSize=1kb -maxSize=10mb /我的资源
+`,
+		Category: "阿里云盘",
+		Before:   ReloadConfigFunc,
+		Action: func(c *cli.Context) error {
+			if config.Config.ActiveUser() == nil {
+				fmt.Println("未登录账号")
+				return nil
+			}
+			minSize := int64(0)
+			if c.IsSet("minSize") {
+				if s, e := converter.ParseFileSizeStr(c.String("minSize")); e == nil {
+					minSize = s
+				}
+			}
+			maxSize := int64(0)
+			if c.IsSet("maxSize") {
+				if s, e := converter.ParseFileSizeStr(c.String("maxSize")); e == nil {
+					maxSize = s
+				}
+			}
+			RunTree(parseDriveId(c), c.Args().Get(0), c.Bool("fp"), c.Bool("fs"), minSize, maxSize)
+			return nil
+		},
+		Flags: []cli.Flag{
+			cli.StringFlag{
+				Name:  "driveId",
+				Usage: "网盘ID",
+				Value: "",
+			},
+			cli.BoolFlag{
+				Name:  "fp",
+				Usage: "full path， 树形图显示文件的完整路径",
+			},
+			cli.BoolFlag{
+				Name:  "fs",
+				Usage: "file size， 树形图显示文件的文件大小",
+			},
+			cli.StringFlag{
+				Name:  "minSize",
+				Usage: "min size， 过滤大于等于指定大小的文件，例如：100mb",
+			},
+			cli.StringFlag{
+				Name:  "maxSize",
+				Usage: "max size， 过滤小于等于指定大小的文件，例如：1gb",
+			},
+		},
+	}
+}
+
+const (
+	indentPrefix   = "│   "
+	pathPrefix     = "├──"
+	lastFilePrefix = "└──"
+)
+
+type (
+	treeStatistic struct {
+		CountOfDir  int64
+		CountOfFile int64
+		SizeOfFile  int64
+	}
+
+	treeConfig struct {
+		showFullPath bool
+		showFileSize bool
+		minFileSize  int64
+		maxFileSize  int64
+	}
+)
+
+func getTree(driveId, pathStr string, depth int, statistic *treeStatistic, setting *treeConfig) {
+	activeUser := config.Config.ActiveUser()
+	pathStr = activeUser.PathJoin(driveId, pathStr)
+	pathStr = path.Clean(pathStr)
+
+	// 获取目标路径文件信息
+	targetPathInfo, err := activeUser.PanClient().OpenapiPanClient().FileInfoByPath(driveId, pathStr)
+	if err != nil {
+		fmt.Println(err)
+		return
+	}
+
+	// 适配通配符路径获取目标文件信息（弃用，容易触发风控）
+	//files, err := matchPathByShellPattern(driveId, pathStr)
+	//if err != nil {
+	//	fmt.Println(err)
+	//	return
+	//}
+	//var targetPathInfo *aliyunpan.FileEntity
+	//if len(files) == 1 {
+	//	targetPathInfo = files[0]
+	//} else {
+	//	for _, f := range files {
+	//		if f.IsFolder() {
+	//			targetPathInfo = f
+	//			break
+	//		}
+	//	}
+	//}
+
+	if targetPathInfo == nil {
+		fmt.Println("路径不存在")
+		return
+	}
+
+	if depth == 0 {
+		fmt.Printf("%s\n", targetPathInfo.Path)
+	}
+
+	fileList := aliyunpan.FileList{}
+	fileListParam := &aliyunpan.FileListParam{}
+	fileListParam.ParentFileId = targetPathInfo.FileId
+	fileListParam.DriveId = driveId
+	fileListParam.OrderBy = aliyunpan.FileOrderByName
+	fileListParam.OrderDirection = aliyunpan.FileOrderDirectionAsc
+	if targetPathInfo.IsFolder() {
+		fileResult, err := activeUser.PanClient().OpenapiPanClient().FileListGetAll(fileListParam, 500)
+		if err != nil {
+			fmt.Println(err)
+			return
+		}
+		fileList = append(fileList, fileResult...)
+	} else {
+		fileList = append(fileList, targetPathInfo)
+	}
+
+	var (
+		prefix          = pathPrefix
+		fN              = len(fileList)
+		indentPrefixStr = strings.Repeat(indentPrefix, depth)
+	)
+	for i, file := range fileList {
+		if file.IsFolder() {
+			statistic.CountOfDir += 1
+			if setting.showFullPath {
+				fmt.Printf("%v%v %v/ -> %s\n", indentPrefixStr, pathPrefix, file.FileName, targetPathInfo.Path+"/"+file.FileName)
+			} else {
+				fmt.Printf("%v%v %v/\n", indentPrefixStr, pathPrefix, file.FileName)
+			}
+			getTree(driveId, targetPathInfo.Path+"/"+file.FileName, depth+1, statistic, setting)
+			continue
+		}
+
+		// filter file size
+		if setting.minFileSize > 0 {
+			if file.FileSize < setting.minFileSize {
+				continue
+			}
+		}
+		if setting.maxFileSize > 0 {
+			if file.FileSize > setting.maxFileSize {
+				continue
+			}
+		}
+
+		statistic.CountOfFile += 1
+		statistic.SizeOfFile += file.FileSize
+
+		if i+1 == fN {
+			prefix = lastFilePrefix
+		}
+
+		// 文件大小
+		fileName := &strings.Builder{}
+		if setting.showFileSize {
+			fmt.Fprintf(fileName, "%s (%s)", file.FileName, converter.ConvertFileSize(file.FileSize, 2))
+		} else {
+			fmt.Fprintf(fileName, "%s", file.FileName)
+		}
+
+		// 文件完整路径
+		if setting.showFullPath {
+			fmt.Printf("%v%v %v -> %s\n", indentPrefixStr, prefix, fileName.String(), targetPathInfo.Path+"/"+file.FileName)
+		} else {
+			fmt.Printf("%v%v %v\n", indentPrefixStr, prefix, fileName.String())
+		}
+	}
+
+	return
+}
+
+// RunTree 列出树形图
+func RunTree(driveId, pathStr string, showFullPath, showFileSize bool, minSize, maxSize int64) {
+	activeUser := config.Config.ActiveUser()
+	activeUser.PanClient().OpenapiPanClient().ClearCache()
+	activeUser.PanClient().OpenapiPanClient().EnableCache()
+	defer activeUser.PanClient().OpenapiPanClient().DisableCache()
+	pathStr = activeUser.PathJoin(driveId, pathStr)
+	statistic := &treeStatistic{
+		CountOfDir:  0,
+		CountOfFile: 0,
+		SizeOfFile:  0,
+	}
+	setting := &treeConfig{
+		showFullPath: showFullPath,
+		showFileSize: showFileSize,
+		minFileSize:  minSize,
+		maxFileSize:  maxSize,
+	}
+	getTree(driveId, pathStr, 0, statistic, setting)
+	fmt.Printf("\n%d 个文件夹, %d 个文件, %s 总大小\n", statistic.CountOfDir, statistic.CountOfFile, converter.ConvertFileSize(statistic.SizeOfFile, 2))
+}
@@ -4,7 +4,7 @@
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
-//     http://www.apache.org/licenses/LICENSE-2.0
+//	http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,20 +15,21 @@ package command

 import (
 	"fmt"
-	"github.com/tickstep/aliyunpan-api/aliyunpan/apierror"
-	"github.com/tickstep/aliyunpan/cmder"
-	"github.com/tickstep/aliyunpan/internal/plugins"
-	"github.com/tickstep/aliyunpan/internal/utils"
-	"github.com/tickstep/library-go/requester/rio/speeds"
-	"io/ioutil"
 	"os"
 	"path"
 	"path/filepath"
-	"regexp"
 	"strings"
 	"sync"
 	"time"

+	"github.com/tickstep/aliyunpan-api/aliyunpan/apierror"
+	"github.com/tickstep/aliyunpan/cmder"
+	"github.com/tickstep/aliyunpan/internal/log"
+	"github.com/tickstep/aliyunpan/internal/plugins"
+	"github.com/tickstep/aliyunpan/internal/ui"
+	"github.com/tickstep/aliyunpan/internal/utils"
+	"github.com/tickstep/library-go/requester/rio/speeds"
+
 	"github.com/tickstep/library-go/logger"

 	"github.com/urfave/cli"
@@ -55,16 +56,18 @@ const (
 type (
 	// UploadOptions 上传可选项
 	UploadOptions struct {
-		AllParallel    int // 所有文件并发上传数量，即可以同时并发上传多少个文件
-		Parallel       int // 单个文件并发上传数量
-		MaxRetry       int
-		NoRapidUpload  bool
-		ShowProgress   bool
-		IsOverwrite    bool // 覆盖已存在的文件，如果同名文件已存在则移到回收站里
-		DriveId        string
-		ExcludeNames   []string // 排除的文件名，包括文件夹和文件。即这些文件/文件夹不进行上传，支持正则表达式
-		BlockSize      int64    // 分片大小
-		UseInternalUrl bool     // 是否使用内置链接
+		AllParallel      int // 所有文件并发上传数量，即可以同时并发上传多少个文件
+		Parallel         int // 单个文件并发上传数量
+		MaxRetry         int
+		MaxTimeoutSec    int // http请求超时时间，单位秒
+		NoRapidUpload    bool
+		ShowProgress     bool
+		IsOverwrite      bool // 覆盖已存在的文件，如果同名文件已存在则移到回收站里
+		IsSkipSameName   bool // 跳过已存在的文件，即使文件内容不一致(不检查SHA1)
+		DriveId          string
+		ExcludeNames     []string // 排除的文件名，包括文件夹和文件。即这些文件/文件夹不进行上传，支持正则表达式
+		BlockSize        int64    // 分片大小
+		IsUseUIDashboard bool     // 是否使用UI面板显示上传进度
 	}
 )

@@ -79,6 +82,10 @@ var UploadFlags = []cli.Flag{
 		Usage: "上传失败最大重试次数",
 		Value: DefaultUploadMaxRetry,
 	},
+	cli.IntFlag{
+		Name:  "timeout",
+		Usage: "上传请求超时时间，单位为秒。当遇到网络不好导致上传超时可以尝试调大该值，建议设置30秒以上",
+	},
 	cli.BoolFlag{
 		Name:  "np",
 		Usage: "no progress 不展示上传进度条",
@@ -87,6 +94,10 @@ var UploadFlags = []cli.Flag{
 		Name:  "ow",
 		Usage: "overwrite, 覆盖已存在的同名文件，注意已存在的文件会被移到回收站",
 	},
+	cli.BoolFlag{
+		Name:  "skip",
+		Usage: "skip same name, 跳过已存在的同名文件，即使文件内容不一致(不检查SHA1)",
+	},
 	cli.BoolFlag{
 		Name:  "norapid",
 		Usage: "不检测秒传。跳过费时的SHA1计算直接上传",
@@ -103,9 +114,13 @@ var UploadFlags = []cli.Flag{
 	},
 	cli.IntFlag{
 		Name:  "bs",
-		Usage: "block size，上传分片大小，单位KB。推荐值：1024 ~ 10240",
+		Usage: "block size，上传分片大小，单位KB。推荐值：1024 ~ 10240。当上传极大单文件时候请适当调高该值",
 		Value: 10240,
 	},
+	cli.BoolFlag{
+		Name:  "ui",
+		Usage: "(BETA) 使用UI面板显示上传详情和进度，更加直观和友好",
+	},
 }

 func CmdUpload() cli.Command {
@@ -115,7 +130,7 @@ func CmdUpload() cli.Command {
 		Usage:     "上传文件/目录",
 		UsageText: cmder.App().Name + " upload <本地文件/目录的路径1> <文件/目录2> <文件/目录3> ... <目标目录>",
 		Description: `
-	上传指定的文件夹或者文件，上传的文件将会保存到 <目标目录>.
+	上传指定的文件夹或者文件，上传的文件将会保存到 <目标目录>。支持软链接文件，包括Linux/macOS(ln命令)和Windows(mklink命令)创建的符号链接文件。

  示例:
    1. 将本地的 C:\Users\Administrator\Desktop\1.mp4 上传到网盘 /视频 目录
@@ -128,21 +143,27 @@ func CmdUpload() cli.Command {
    3. 将本地的 C:\Users\Administrator\Desktop 整个目录上传到网盘 /视频 目录
    aliyunpan upload C:/Users/Administrator/Desktop /视频

-    4. 使用相对路径
+    4. 将本地 200GB 极大文件 C:\Users\Administrator\Desktop\1.mp4 上传到网盘 /视频 目录，需要调高上传分片大小
+    aliyunpan upload -bs 30720 C:/Users/Administrator/Desktop/1.mp4 /视频
+
+    5. 使用相对路径
    aliyunpan upload 1.mp4 /视频

-    5. 覆盖上传，已存在的同名文件会被移到回收站
+    6. 覆盖上传，已存在的同名文件会被移到回收站
    aliyunpan upload -ow 1.mp4 /视频

-    6. 将本地的 C:\Users\Administrator\Video 整个目录上传到网盘 /视频 目录，但是排除所有的.jpg文件
+    7. 将本地的 C:\Users\Administrator\Video 整个目录上传到网盘 /视频 目录，但是排除所有的.jpg文件
    aliyunpan upload -exn "\.jpg$" C:/Users/Administrator/Video /视频

-    7. 将本地的 C:\Users\Administrator\Video 整个目录上传到网盘 /视频 目录，但是排除所有的.jpg文件和.mp3文件，每一个排除项就是一个exn参数
+    8. 将本地的 C:\Users\Administrator\Video 整个目录上传到网盘 /视频 目录，但是排除所有的.jpg文件和.mp3文件，每一个排除项就是一个exn参数
    aliyunpan upload -exn "\.jpg$" -exn "\.mp3$" C:/Users/Administrator/Video /视频

-    8. 将本地的 C:\Users\Administrator\Video 整个目录上传到网盘 /视频 目录，但是排除所有的 @eadir 文件夹
+    9. 将本地的 C:\Users\Administrator\Video 整个目录上传到网盘 /视频 目录，但是排除所有的 @eadir 文件夹
    aliyunpan upload -exn "^@eadir$" C:/Users/Administrator/Video /视频

+    10. 跳过已存在的同名文件，即使文件内容不一致(不检查SHA1)
+    aliyunpan upload -skip 1.mp4 /视频
+
  参考：
    以下是典型的排除特定文件或者文件夹的例子，注意：参数值必须是正则表达式。在正则表达式中，^表示匹配开头，$表示匹配结尾。
    1)排除@eadir文件或者文件夹：-exn "^@eadir$"
@@ -152,7 +173,7 @@ func CmdUpload() cli.Command {
    5)排除 myfile.txt 文件：-exn "^myfile.txt$"
 `,
 		Category: "阿里云盘",
-		Before:   cmder.ReloadConfigFunc,
+		Before:   ReloadConfigFunc,
 		Action: func(c *cli.Context) error {
 			if c.NArg() < 2 {
 				cli.ShowCommandHelp(c, c.Command.Name)
@@ -160,88 +181,54 @@ func CmdUpload() cli.Command {
 			}

 			subArgs := c.Args()
+
+			timeout := 0
+			if c.IsSet("timeout") {
+				timeout = c.Int("timeout")
+				if timeout < 0 {
+					timeout = 0
+				}
+			}
+
+			// 获取上传文件锁，保证上传操作单实例
+			//locker := filelocker.NewFileLocker(config.GetLockerDir() + "/aliyunpan-upload")
+			//if e := filelocker.LockFile(locker, 0755, true, 5*time.Second); e != nil {
+			//	logger.Verboseln(e)
+			//	fmt.Println("本应用其他实例正在执行上传，请先停止或者等待其完成")
+			//	return nil
+			//}
+
 			RunUpload(subArgs[:c.NArg()-1], subArgs[c.NArg()-1], &UploadOptions{
-				AllParallel:   c.Int("p"), // 多文件上传的时候，允许同时并行上传的文件数量
-				Parallel:      1,          // 一个文件同时多少个线程并发上传的数量。阿里云盘只支持单线程按顺序进行文件part数据上传，所以只能是1
-				MaxRetry:      c.Int("retry"),
-				NoRapidUpload: c.Bool("norapid"),
-				ShowProgress:  !c.Bool("np"),
-				IsOverwrite:   c.Bool("ow"),
-				DriveId:       parseDriveId(c),
-				ExcludeNames:  c.StringSlice("exn"),
-				BlockSize:     int64(c.Int("bs") * 1024),
+				AllParallel:      c.Int("p"), // 多文件上传的时候，允许同时并行上传的文件数量
+				Parallel:         1,          // 一个文件同时多少个线程并发上传的数量。阿里云盘只支持单线程按顺序进行文件part数据上传，所以只能是1
+				MaxRetry:         c.Int("retry"),
+				MaxTimeoutSec:    timeout,
+				NoRapidUpload:    c.Bool("norapid"),
+				ShowProgress:     !c.Bool("np"),
+				IsOverwrite:      c.Bool("ow"),
+				IsSkipSameName:   c.Bool("skip"),
+				DriveId:          parseDriveId(c),
+				ExcludeNames:     c.StringSlice("exn"),
+				BlockSize:        int64(c.Int("bs") * 1024),
+				IsUseUIDashboard: c.Bool("ui"),
 			})
+
+			// 释放文件锁
+			//if locker != nil {
+			//	filelocker.UnlockFile(locker)
+			//}
 			return nil
 		},
 		Flags: UploadFlags,
 	}
 }

-func CmdRapidUpload() cli.Command {
-	return cli.Command{
-		Name:      "rapidupload",
-		Aliases:   []string{"ru"},
-		Usage:     "手动秒传文件",
-		UsageText: cmder.App().Name + " rapidupload \"aliyunpan://file.dmg|752FCCBFB2436A6FFCA3B287831D4FAA5654B07E|7005440|pan_folder\"",
-		Description: `
-	使用此功能秒传文件, 前提是知道文件的大小, sha1, 且网盘中存在一模一样的文件.
-	上传的文件将会保存到网盘的目标目录。文件的秒传链接可以通过share或者export命令获取。
-
-	链接格式说明：aliyunpan://文件名|sha1|文件大小|<相对路径>
-    "相对路径" 可以为空，为空代表存储到网盘根目录
-
-	示例:
-	1. 如果秒传成功, 则保存到网盘路径 /pan_folder/file.dmg
-	aliyunpan rapidupload "aliyunpan://file.dmg|752FCCBFB2436A6FFCA3B287831D4FAA5654B07E|7005440|pan_folder"
-
-	2. 如果秒传成功, 则保存到网盘路径 /file.dmg
-	aliyunpan rapidupload "aliyunpan://file.dmg|752FCCBFB2436A6FFCA3B287831D4FAA5654B07E|7005440|"
-
-	3. 同时秒传多个文件，如果秒传成功, 则保存到网盘路径 /pan_folder/file.dmg, /pan_folder/file1.dmg
-	aliyunpan rapidupload "aliyunpan://file.dmg|752FCCBFB2436A6FFCA3B287831D4FAA5654B07E|7005440|pan_folder" "aliyunpan://file1.dmg|752FCCBFB2436A6FFCA3B287831D4FAA5654B07E|7005440|pan_folder"
-`,
-		Category: "阿里云盘",
-		Before:   cmder.ReloadConfigFunc,
-		Action: func(c *cli.Context) error {
-			if c.NArg() <= 0 {
-				cli.ShowCommandHelp(c, c.Command.Name)
-				return nil
-			}
-			subArgs := c.Args()
-			RunRapidUpload(parseDriveId(c), c.Bool("ow"), subArgs, c.String("path"))
-			return nil
-		},
-		Flags: []cli.Flag{
-			cli.BoolFlag{
-				Name:  "ow",
-				Usage: "overwrite, 覆盖已存在的文件。已存在的文件会并移到回收站",
-			},
-			cli.StringFlag{
-				Name:  "path",
-				Usage: "存储到网盘目录，绝对路径，例如：/myfolder",
-				Value: "",
-			},
-			cli.StringFlag{
-				Name:  "driveId",
-				Usage: "网盘ID",
-				Value: "",
-			},
-		},
-	}
-}
-
 // RunUpload 执行文件上传
 func RunUpload(localPaths []string, savePath string, opt *UploadOptions) {
 	activeUser := GetActiveUser()
-	// pan token expired checker
-	go func() {
-		for {
-			time.Sleep(time.Duration(1) * time.Minute)
-			if RefreshTokenInNeed(activeUser) {
-				logger.Verboseln("update access token for upload task")
-			}
-		}
-	}()
+	activeUser.PanClient().OpenapiPanClient().EnableCache()
+	activeUser.PanClient().OpenapiPanClient().ClearCache()
+	defer activeUser.PanClient().OpenapiPanClient().DisableCache()

 	if opt == nil {
 		opt = &UploadOptions{}
@@ -255,7 +242,7 @@ func RunUpload(localPaths []string, savePath string, opt *UploadOptions) {
 		}
 	}
 	if opt.AllParallel > config.MaxFileUploadParallelNum {
-		opt.AllParallel = config.MaxFileUploadParallelNum
+		fmt.Printf("警告: 当前上传文件并发数过大，可能会被阿里风控导致上传失败，建议调小。\n")
 	}

 	if opt.Parallel <= 0 {
@@ -264,12 +251,17 @@ func RunUpload(localPaths []string, savePath string, opt *UploadOptions) {
 	if opt.MaxRetry < 0 {
 		opt.MaxRetry = DefaultUploadMaxRetry
 	}
-	opt.UseInternalUrl = config.Config.TransferUrlType == 2

-	fmt.Printf("\n[0] 当前文件上传最大并发量为: %d, 上传分片大小为: %s\n", opt.AllParallel, converter.ConvertFileSize(opt.BlockSize, 2))
+	// 超时时间
+	if opt.MaxTimeoutSec > 0 {
+		activeUser.PanClient().OpenapiPanClient().SetTimeout(time.Duration(opt.MaxTimeoutSec) * time.Second)
+	}
+
+	targetDriveName := config.Config.ActiveUser().DriveList.GetDriveNameById(opt.DriveId)
+	fmt.Printf("\n[0] 当前文件上传最大并发量为: %d, 上传分片大小为: %s, 目标网盘: %s\n", opt.AllParallel, converter.ConvertFileSize(opt.BlockSize, 2), targetDriveName)

 	savePath = activeUser.PathJoin(opt.DriveId, savePath)
-	_, err1 := activeUser.PanClient().FileInfoByPath(opt.DriveId, savePath)
+	_, err1 := activeUser.PanClient().OpenapiPanClient().FileInfoByPath(opt.DriveId, savePath)
 	if err1 != nil {
 		fmt.Printf("警告: 上传文件, 获取云盘路径 %s 错误, %s\n", savePath, err1)
 	}
@@ -280,7 +272,7 @@ func RunUpload(localPaths []string, savePath string, opt *UploadOptions) {
 		return
 	}

-	// 打开上传状态
+	// 打开上传状态数据库
 	uploadDatabase, err := panupload.NewUploadingDatabase()
 	if err != nil {
 		fmt.Printf("打开上传未完成数据库错误: %s\n", err)
@@ -306,18 +298,38 @@ func RunUpload(localPaths []string, savePath string, opt *UploadOptions) {
 	// 全局速度统计
 	globalSpeedsStat := &speeds.Speeds{}

+	// 上传统计UI面板
+	var dashboard *ui.DashboardPanel = nil
+	if opt.IsUseUIDashboard && opt.ShowProgress && ui.IsTerminal(os.Stdout) {
+		dashboard = ui.NewDashboardPanel(ui.DashboardPanelUpload, opt.AllParallel, globalSpeedsStat, &ui.DashboardOptions{
+			Title:       "上传统计UI面板",
+			ActiveSlots: 3,  // 下载文件进度展示，最大同时展示3个
+			MaxHistory:  50, // 下载日志显示，最多同时显示50条，这个会按照窗口大小进行自适应显示
+		})
+	}
+	logf := func(format string, a ...interface{}) {
+		if dashboard != nil {
+			dashboard.Logf(format, a...)
+			return
+		}
+		fmt.Printf(format, a...)
+	}
+
 	// 获取当前插件
 	plugin, _ := pluginManger.GetPlugin()

+	// 上传记录器
+	fileRecorder := log.NewFileRecorder(config.GetLogDir() + "/upload_file_records.csv")
+
 	// 遍历指定的文件并创建上传任务
 	for _, curPath := range localPaths {
-		var walkFunc filepath.WalkFunc
+		var walkFunc localfile.MyWalkFunc
 		curPath = filepath.Clean(curPath)
 		localPathDir := filepath.Dir(curPath)

 		// 是否排除上传
-		if isExcludeFile(curPath, opt) {
-			fmt.Printf("排除文件: %s\n", curPath)
+		if utils.IsExcludeFile(curPath, &opt.ExcludeNames) {
+			logf("排除文件: %s\n", curPath)
 			continue
 		}

@@ -326,60 +338,63 @@ func RunUpload(localPaths []string, savePath string, opt *UploadOptions) {
 			localPathDir = ""
 		}

-		walkFunc = func(file string, fi os.FileInfo, err error) error {
+		walkFunc = func(file localfile.SymlinkFile, fi os.FileInfo, err error) error {
 			if err != nil {
-				return err
+				// skip this error file and continue recurse
+				logger.Verboseln("upload process file: ", file, " error: ", err)
+				return nil
 			}
 			if os.PathSeparator == '\\' {
-				file = cmdutil.ConvertToWindowsPathSeparator(file)
+				file.LogicPath = cmdutil.ConvertToWindowsPathSeparator(file.LogicPath)
+				file.RealPath = cmdutil.ConvertToWindowsPathSeparator(file.RealPath)
 			}

 			// 是否排除上传
-			if isExcludeFile(file, opt) {
-				fmt.Printf("排除文件: %s\n", file)
+			if utils.IsExcludeFile(file.LogicPath, &opt.ExcludeNames) {
+				logf("排除文件: %s\n", file.LogicPath)
 				return filepath.SkipDir
 			}

-			if fi.Mode()&os.ModeSymlink != 0 { // 读取 symbol link
-				err = WalkAllFile(file+string(os.PathSeparator), walkFunc)
-				return err
-			}
-
-			subSavePath := strings.TrimPrefix(file, localPathDir)
+			subSavePath := strings.TrimPrefix(file.LogicPath, localPathDir)

 			// 针对 windows 的目录处理
 			if os.PathSeparator == '\\' {
 				subSavePath = cmdutil.ConvertToUnixPathSeparator(subSavePath)
 			}
-
 			subSavePath = path.Clean(savePath + aliyunpan.PathSeparator + subSavePath)

 			// 插件回调
-			if !fi.IsDir() { // 针对文件上传前进行回调
-				pluginParam := &plugins.UploadFilePrepareParams{
-					LocalFilePath:      file,
-					LocalFileName:      fi.Name(),
-					LocalFileSize:      fi.Size(),
-					LocalFileType:      "file",
-					LocalFileUpdatedAt: fi.ModTime().Format("2006-01-02 15:04:05"),
-					DriveId:            activeUser.ActiveDriveId,
-					DriveFilePath:      strings.TrimPrefix(strings.TrimPrefix(subSavePath, savePath), "/"),
+			ft := "file"
+			if fi.IsDir() {
+				ft = "folder"
+			}
+			pluginParam := &plugins.UploadFilePrepareParams{
+				LocalFilePath:      file.LogicPath,
+				LocalFileName:      fi.Name(),
+				LocalFileSize:      fi.Size(),
+				LocalFileType:      ft,
+				LocalFileUpdatedAt: fi.ModTime().Format("2006-01-02 15:04:05"),
+				DriveId:            activeUser.ActiveDriveId,
+				DriveFilePath:      strings.TrimPrefix(strings.TrimPrefix(subSavePath, savePath), "/"),
+			}
+			if uploadFilePrepareResult, er := plugin.UploadFilePrepareCallback(plugins.GetContext(activeUser), pluginParam); er == nil && uploadFilePrepareResult != nil {
+				if strings.Compare("yes", uploadFilePrepareResult.UploadApproved) != 0 {
+					// skip upload this file
+					logf("插件禁止该文件上传: %s\n", file.LogicPath)
+					return filepath.SkipDir
 				}
-				if uploadFilePrepareResult, er := plugin.UploadFilePrepareCallback(plugins.GetContext(activeUser), pluginParam); er == nil && uploadFilePrepareResult != nil {
-					if strings.Compare("yes", uploadFilePrepareResult.UploadApproved) != 0 {
-						// skip upload this file
-						fmt.Printf("插件禁止该文件上传: %s\n", file)
-						return filepath.SkipDir
-					}
-					if uploadFilePrepareResult.DriveFilePath != "" {
-						targetSavePanRelativePath := strings.TrimPrefix(uploadFilePrepareResult.DriveFilePath, "/")
-						subSavePath = path.Clean(savePath + aliyunpan.PathSeparator + targetSavePanRelativePath)
-						fmt.Printf("插件修改文件网盘保存路径为: %s\n", subSavePath)
-					}
+				if uploadFilePrepareResult.DriveFilePath != "" {
+					targetSavePanRelativePath := strings.TrimPrefix(uploadFilePrepareResult.DriveFilePath, "/")
+					subSavePath = path.Clean(savePath + aliyunpan.PathSeparator + targetSavePanRelativePath)
+					logf("插件修改文件网盘保存路径为: %s\n", subSavePath)
 				}
+			}

+			// 创建对应的文件上传任务
+			// 上传里面的文件会创建对应的缺失文件夹
+			if !fi.IsDir() {
 				taskinfo := executor.Append(&panupload.UploadTaskUnit{
-					LocalFileChecksum: localfile.NewLocalFileEntity(file),
+					LocalFileChecksum: localfile.NewLocalSymlinkFileEntity(file),
 					SavePath:          subSavePath,
 					DriveId:           opt.DriveId,
 					PanClient:         activeUser.PanClient(),
@@ -391,26 +406,64 @@ func RunUpload(localPaths []string, savePath string, opt *UploadOptions) {
 					UploadStatistic:   statistic,
 					ShowProgress:      opt.ShowProgress,
 					IsOverwrite:       opt.IsOverwrite,
-					UseInternalUrl:    opt.UseInternalUrl,
+					IsSkipSameName:    opt.IsSkipSameName,
 					GlobalSpeedsStat:  globalSpeedsStat,
+					FileRecorder:      fileRecorder,
+					UI:                dashboard,
 				}, opt.MaxRetry)
-				fmt.Printf("[%s] 加入上传队列: %s\n", taskinfo.Id(), file)
+				logf("[%s] 加入上传队列: %s\n", taskinfo.Id(), file.LogicPath)
+				if dashboard != nil {
+					dashboard.RegisterTask(taskinfo.Id(), file.LogicPath, fi.Size(), !fi.IsDir())
+				}
+			} else {
+				// 创建文件夹
+				// 这样空文件夹也可以正确上传
+				saveFilePath := subSavePath
+				if saveFilePath != "/" {
+					folderCreateMutex.Lock()
+					logf("正在检测和创建云盘文件夹: %s\n", saveFilePath)
+					_, apierr1 := activeUser.PanClient().OpenapiPanClient().FileInfoByPath(opt.DriveId, saveFilePath)
+					time.Sleep(1 * time.Second)
+					if apierr1 != nil && apierr1.Code == apierror.ApiCodeFileNotFoundCode {
+						logger.Verbosef("%s 创建云盘文件夹: %s\n", utils.NowTimeStr(), saveFilePath)
+						rs, apierr := activeUser.PanClient().OpenapiPanClient().MkdirByFullPath(opt.DriveId, saveFilePath)
+						if apierr != nil || rs.FileId == "" {
+							logf("创建云盘文件夹失败: %s\n", saveFilePath)
+						}
+					}
+					folderCreateMutex.Unlock()
+				}
 			}
 			return nil
 		}
-		if err := WalkAllFile(curPath, walkFunc); err != nil {
-			fmt.Printf("警告: 遍历错误: %s\n", err)
+
+		file := localfile.NewSymlinkFile(curPath)
+		if err = localfile.WalkAllFile(file, walkFunc); err != nil {
+			if err != filepath.SkipDir {
+				logf("警告: 遍历错误: %s\n", err)
+			}
 		}
 	}

 	// 执行上传任务
 	var failedList []*lane.Deque
+
+	// 启动UI面板显示
+	if dashboard != nil {
+		dashboard.Start()
+	}
+
 	executor.Execute()
 	failed := executor.FailedDeque()
 	if failed.Size() > 0 {
 		failedList = append(failedList, failed)
 	}

+	// 关闭UI面板
+	if dashboard != nil {
+		dashboard.Close()
+	}
+
 	fmt.Printf("\n")
 	fmt.Printf("上传结束, 时间: %s, 数据总量: %s\n", utils.ConvertTime(statistic.Elapsed()), converter.ConvertFileSize(statistic.TotalSize(), 2))

@@ -421,169 +474,10 @@ func RunUpload(localPaths []string, savePath string, opt *UploadOptions) {
 			tb := cmdtable.NewTable(os.Stdout)
 			for e := failed.Shift(); e != nil; e = failed.Shift() {
 				item := e.(*taskframework.TaskInfoItem)
-				tb.Append([]string{item.Info.Id(), item.Unit.(*panupload.UploadTaskUnit).LocalFileChecksum.Path})
+				tb.Append([]string{item.Info.Id(), item.Unit.(*panupload.UploadTaskUnit).LocalFileChecksum.Path.LogicPath})
 			}
 			tb.Render()
 		}
 	}
 	activeUser.DeleteCache(GetAllPathFolderByPath(savePath))
 }
-
-// 是否是排除上传的文件
-func isExcludeFile(filePath string, opt *UploadOptions) bool {
-	if opt == nil || len(opt.ExcludeNames) == 0 {
-		return false
-	}
-
-	for _, pattern := range opt.ExcludeNames {
-		fileName := path.Base(strings.ReplaceAll(filePath, "\\", "/"))
-		m, _ := regexp.MatchString(pattern, fileName)
-		if m {
-			return true
-		}
-	}
-	return false
-}
-
-func WalkAllFile(dirPath string, walkFn filepath.WalkFunc) error {
-	info, err := os.Lstat(dirPath)
-	if err != nil {
-		err = walkFn(dirPath, nil, err)
-	} else {
-		err = walkAllFile(dirPath, info, walkFn)
-	}
-	return err
-}
-
-func walkAllFile(dirPath string, info os.FileInfo, walkFn filepath.WalkFunc) error {
-	if !info.IsDir() {
-		return walkFn(dirPath, info, nil)
-	}
-
-	files, err1 := ioutil.ReadDir(dirPath)
-	if err1 != nil {
-		return walkFn(dirPath, nil, err1)
-	}
-	for _, fi := range files {
-		subFilePath := dirPath + "/" + fi.Name()
-		err := walkFn(subFilePath, fi, err1)
-		if err != nil && err != filepath.SkipDir {
-			return err
-		}
-		if fi.IsDir() {
-			if err == filepath.SkipDir {
-				continue
-			}
-			err := walkAllFile(subFilePath, fi, walkFn)
-			if err != nil {
-				return err
-			}
-		}
-	}
-	return nil
-}
-
-// RunRapidUpload 秒传
-func RunRapidUpload(driveId string, isOverwrite bool, fileMetaList []string, savePanPath string) {
-	activeUser := GetActiveUser()
-	savePanPath = activeUser.PathJoin(driveId, savePanPath)
-
-	if len(fileMetaList) == 0 {
-		fmt.Println("秒传链接为空")
-		return
-	}
-
-	items := []*RapidUploadItem{}
-	// parse file meta strings
-	for _, fileMeta := range fileMetaList {
-		item, e := newRapidUploadItem(fileMeta)
-		if e != nil {
-			fmt.Println(e)
-			continue
-		}
-		if item == nil {
-			fmt.Println("秒传链接格式错误: ", fileMeta)
-			continue
-		}
-
-		// pan path
-		item.FilePath = path.Join(savePanPath, item.FilePath)
-
-		// append
-		items = append(items, item)
-	}
-
-	// upload one by one
-	for _, item := range items {
-		fmt.Println("准备秒传:", item.FilePath)
-		if ee := doRapidUpload(driveId, isOverwrite, item); ee != nil {
-			fmt.Println(ee)
-		} else {
-			fmt.Printf("秒传成功, 保存到网盘路径:%s\n", item.FilePath)
-		}
-	}
-}
-
-func doRapidUpload(driveId string, isOverwrite bool, item *RapidUploadItem) error {
-	activeUser := GetActiveUser()
-	panClient := activeUser.PanClient()
-
-	var apierr *apierror.ApiError
-	var rs *aliyunpan.MkdirResult
-	var appCreateUploadFileParam *aliyunpan.CreateFileUploadParam
-	var saveFilePath string
-
-	panDir, panFileName := path.Split(item.FilePath)
-	saveFilePath = item.FilePath
-	if panDir != "/" {
-		rs, apierr = panClient.MkdirRecursive(driveId, "", "", 0, strings.Split(path.Clean(panDir), "/"))
-		if apierr != nil || rs.FileId == "" {
-			return fmt.Errorf("创建云盘文件夹失败")
-		}
-	} else {
-		rs = &aliyunpan.MkdirResult{}
-		rs.FileId = aliyunpan.DefaultRootParentFileId
-	}
-	time.Sleep(time.Duration(2) * time.Second)
-
-	if isOverwrite {
-		// 标记覆盖旧同名文件
-		// 检查同名文件是否存在
-		efi, apierr := panClient.FileInfoByPath(driveId, saveFilePath)
-		if apierr != nil && apierr.Code != apierror.ApiCodeFileNotFoundCode {
-			return fmt.Errorf("检测同名文件失败，请稍后重试")
-		}
-		if efi != nil && efi.FileId != "" {
-			// existed, delete it
-			fileDeleteResult, err1 := panClient.FileDelete([]*aliyunpan.FileBatchActionParam{{DriveId: efi.DriveId, FileId: efi.FileId}})
-			if err1 != nil || len(fileDeleteResult) == 0 {
-				return fmt.Errorf("无法删除文件，请稍后重试")
-			}
-			time.Sleep(time.Duration(500) * time.Millisecond)
-			if fileDeleteResult[0].Success {
-				logger.Verboseln("检测到同名文件，已移动到回收站: ", saveFilePath)
-			} else {
-				return fmt.Errorf("无法删除文件，请稍后重试")
-			}
-		}
-	}
-
-	appCreateUploadFileParam = &aliyunpan.CreateFileUploadParam{
-		DriveId:      driveId,
-		Name:         panFileName,
-		Size:         item.FileSize,
-		ContentHash:  item.FileSha1,
-		ParentFileId: rs.FileId,
-	}
-	uploadOpEntity, apierr := panClient.CreateUploadFile(appCreateUploadFileParam)
-	if apierr != nil {
-		return fmt.Errorf("创建秒传任务失败：" + apierr.Error())
-	}
-
-	if uploadOpEntity.RapidUpload {
-		logger.Verboseln("秒传成功, 保存到网盘路径: ", path.Join(panDir, uploadOpEntity.FileName))
-	} else {
-		return fmt.Errorf("失败，文件未曾上传，无法秒传")
-	}
-	return nil
-}
@@ -4,7 +4,7 @@
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
-//     http://www.apache.org/licenses/LICENSE-2.0
+//	http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,7 +15,6 @@ package command

 import (
 	"fmt"
-	"github.com/tickstep/aliyunpan-api/aliyunpan"
 	"github.com/tickstep/aliyunpan/cmder"
 	"github.com/tickstep/aliyunpan/internal/config"
 	"github.com/urfave/cli"
@@ -29,7 +28,7 @@ func CmdLoglist() cli.Command {
 		Usage:       "列出帐号列表",
 		Description: "列出所有已登录的阿里账号",
 		Category:    "阿里云盘账号",
-		Before:      cmder.ReloadConfigFunc,
+		Before:      ReloadConfigFunc,
 		Action: func(c *cli.Context) error {
 			fmt.Println(config.Config.UserList.String())
 			return nil
@@ -47,11 +46,11 @@ func CmdSu() cli.Command {

 	示例:
 	aliyunpan su
-	aliyunpan su <uid or name>
+	aliyunpan su <uid>
 `,
 		Category: "阿里云盘账号",
-		Before:   cmder.ReloadConfigFunc,
-		After:    cmder.SaveConfigFunc,
+		Before:   ReloadConfigFunc,
+		After:    SaveConfigFunc,
 		Action: func(c *cli.Context) error {
 			if c.NArg() >= 2 {
 				cli.ShowCommandHelp(c, c.Command.Name)
@@ -85,8 +84,8 @@ func CmdSu() cli.Command {
 					return nil
 				}

-				if n, err := strconv.Atoi(index); err == nil && n >= 0 && n < numLogins {
-					uid = config.Config.UserList[n].UserId
+				if n, err1 := strconv.Atoi(index); err1 == nil && (n-1) >= 0 && (n-1) < numLogins {
+					uid = config.Config.UserList[n-1].UserId
 				} else {
 					fmt.Printf("切换用户失败, 请检查 # 值是否正确\n")
 					return nil
@@ -95,14 +94,14 @@ func CmdSu() cli.Command {
 				cli.ShowCommandHelp(c, c.Command.Name)
 			}

-			switchedUser, err := config.Config.SwitchUser(uid, inputData)
+			switchedUser, err := config.Config.SwitchUser(uid)
 			if err != nil {
 				fmt.Printf("切换用户失败, %s\n", err)
 				return nil
 			}

 			if switchedUser == nil {
-				switchedUser = cmder.TryLogin()
+				switchedUser = TryLogin()
 			}

 			if switchedUser != nil {
@@ -122,7 +121,7 @@ func CmdWho() cli.Command {
 		Usage:       "获取当前帐号",
 		Description: "获取当前帐号的信息",
 		Category:    "阿里云盘账号",
-		Before:      cmder.ReloadConfigFunc,
+		Before:      ReloadConfigFunc,
 		Action: func(c *cli.Context) error {
 			if config.Config.ActiveUser() == nil {
 				fmt.Println("未登录账号")
@@ -130,12 +129,13 @@ func CmdWho() cli.Command {
 			}
 			activeUser := config.Config.ActiveUser()
 			cloudName := activeUser.GetDriveById(activeUser.ActiveDriveId).DriveName
-			fmt.Printf("当前帐号UID: %s, 昵称: %s, 用户名: %s, 网盘：%s\n", activeUser.UserId, activeUser.Nickname, activeUser.AccountName, cloudName)
+			user, _ := GetActivePanClient().OpenapiPanClient().GetUserInfo()
+			thirdParty := "未开通"
+			if user.ThirdPartyVip {
+				thirdParty = "已开通(" + user.ThirdPartyVipExpire + ")"
+			}
+			fmt.Printf("当前帐号UID: %s, 昵称: %s, 三方权益包: %s, 当前使用网盘：%s\n", activeUser.UserId, activeUser.Nickname, thirdParty, cloudName)
 			return nil
 		},
 	}
 }
-
-func RunGetUserInfo() (userInfo *aliyunpan.UserInfo, error error) {
-	return GetActivePanClient().GetUserInfo()
-}
@@ -4,7 +4,7 @@
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
-//     http://www.apache.org/licenses/LICENSE-2.0
+//	http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,58 +16,76 @@ package command
 import (
 	"fmt"
 	"github.com/tickstep/aliyunpan-api/aliyunpan"
+	"github.com/tickstep/aliyunpan-api/aliyunpan_web"
 	"github.com/tickstep/aliyunpan/internal/config"
+	"github.com/tickstep/aliyunpan/internal/functions/panlogin"
+	"github.com/tickstep/aliyunpan/internal/plugins"
+	"github.com/tickstep/aliyunpan/internal/utils"
 	"github.com/tickstep/library-go/logger"
+	"github.com/urfave/cli"
+	"math"
 	"math/rand"
 	"net/url"
 	"path"
+	"path/filepath"
 	"strings"
+	"sync"
 	"time"
 )

 var (
 	panCommandVerbose = logger.New("PANCOMMAND", config.EnvVerbose)
+
+	saveConfigMutex *sync.Mutex = new(sync.Mutex)
+
+	ReloadConfigFunc = func(c *cli.Context) error {
+		err := config.Config.Reload()
+		if err != nil {
+			fmt.Printf("重载配置错误: %s\n", err)
+		}
+		return nil
+	}
+
+	SaveConfigFunc = func(c *cli.Context) error {
+		saveConfigMutex.Lock()
+		defer saveConfigMutex.Unlock()
+		err := config.Config.Save()
+		if err != nil {
+			fmt.Printf("保存配置错误: %s\n", err)
+		}
+		return nil
+	}
 )

-// GetFileInfoByPaths 获取指定文件路径的文件详情信息
-func GetAppFileInfoByPaths(driveId string, paths ...string) (fileInfoList []*aliyunpan.FileEntity, failedPaths []string, error error) {
-	if len(paths) <= 0 {
-		return nil, nil, fmt.Errorf("请指定文件路径")
+// RunTestShellPattern 执行测试通配符
+func RunTestShellPattern(driveId string, pattern string) {
+	acUser := GetActiveUser()
+	files, err := acUser.PanClient().OpenapiPanClient().MatchPathByShellPattern(driveId, GetActiveUser().PathJoin(driveId, pattern))
+	if err != nil {
+		fmt.Println(err)
+		return
 	}
-	activeUser := GetActiveUser()
-
-	for idx := 0; idx < len(paths); idx++ {
-		absolutePath := path.Clean(activeUser.PathJoin(driveId, paths[idx]))
-		fe, err := activeUser.PanClient().FileInfoByPath(driveId, absolutePath)
-		if err != nil {
-			failedPaths = append(failedPaths, absolutePath)
-			continue
-		}
-		fileInfoList = append(fileInfoList, fe)
+	for _, f := range *files {
+		fmt.Printf("%s\n", f.Path)
 	}
 	return
 }

-// GetFileInfoByPaths 获取指定文件路径的文件详情信息
-func GetFileInfoByPaths(paths ...string) (fileInfoList []*aliyunpan.FileEntity, failedPaths []string, error error) {
-	if len(paths) <= 0 {
-		return nil, nil, fmt.Errorf("请指定文件路径")
-	}
-	activeUser := GetActiveUser()
-
-	for idx := 0; idx < len(paths); idx++ {
-		absolutePath := path.Clean(activeUser.PathJoin(activeUser.ActiveDriveId, paths[idx]))
-		fe, err := activeUser.PanClient().FileInfoByPath(activeUser.ActiveDriveId, absolutePath)
+// matchPathByShellPattern 通配符匹配路径，允许返回多个匹配结果
+func matchPathByShellPattern(driveId string, patterns ...string) (files []*aliyunpan.FileEntity, e error) {
+	acUser := GetActiveUser()
+	for k := range patterns {
+		ps, err := acUser.PanClient().OpenapiPanClient().MatchPathByShellPattern(driveId, acUser.PathJoin(driveId, patterns[k]))
 		if err != nil {
-			failedPaths = append(failedPaths, absolutePath)
-			continue
+			return nil, err
 		}
-		fileInfoList = append(fileInfoList, fe)
+		files = append(files, *ps...)
 	}
-	return
+	return files, nil
 }

-func matchPathByShellPattern(driveId string, patterns ...string) (panpaths []string, err error) {
+// makePathAbsolute 拼接路径，确定返回路径为绝对路径
+func makePathAbsolute(driveId string, patterns ...string) (panpaths []string, err error) {
 	acUser := GetActiveUser()
 	for k := range patterns {
 		ps := acUser.PathJoin(driveId, patterns[k])
@@ -110,29 +128,300 @@ func UnescapeStr(s string) string {
 	return r
 }

-// RefreshTokenInNeed 刷新refresh token
-func RefreshTokenInNeed(activeUser *config.PanUser) bool {
+func NewWebLoginToken(accessToken string, expired int64) aliyunpan_web.WebLoginToken {
+	webapiToken := &config.PanClientToken{
+		AccessToken: accessToken,
+		Expired:     expired,
+	}
+	return aliyunpan_web.WebLoginToken{
+		AccessTokenType: "Bearer",
+		AccessToken:     webapiToken.AccessToken,
+		RefreshToken:    "",
+		ExpiresIn:       7200,
+		ExpireTime:      webapiToken.GetExpiredTimeCstStr(),
+	}
+}
+
+// RefreshWebTokenInNeed 刷新 webapi access token
+func RefreshWebTokenInNeed(activeUser *config.PanUser) *panlogin.CommonResultError {
 	if activeUser == nil {
-		return false
+		return panlogin.NewCommonResultError("activeUser is nil")
 	}

-	// refresh expired token
-	if activeUser.PanClient() != nil {
-		if len(activeUser.WebToken.RefreshToken) > 0 {
+	// refresh expired web token
+	if activeUser.PanClient().WebapiPanClient() != nil {
+		if activeUser.WebapiToken != nil && len(activeUser.WebapiToken.AccessToken) > 0 {
 			cz := time.FixedZone("CST", 8*3600) // 东8区
-			expiredTime, _ := time.ParseInLocation("2006-01-02 15:04:05", activeUser.WebToken.ExpireTime, cz)
+			expiredTime := time.Unix(activeUser.WebapiToken.Expired, 0).In(cz)
 			now := time.Now()
-			if (expiredTime.Unix() - now.Unix()) <= (10 * 60) { // 10min
+			if (expiredTime.Unix() - now.Unix()) <= (10 * 60) { // 有效期小于10min就刷新
+				pluginManger := plugins.NewPluginManager(config.GetPluginDir())
+				plugin, _ := pluginManger.GetPlugin()
+				params := &plugins.UserTokenRefreshFinishParams{
+					Result:    "success",
+					Message:   "webapi",
+					OldToken:  "",
+					NewToken:  "",
+					UpdatedAt: utils.NowTimeStr(),
+				}
+
 				// need update refresh token
-				logger.Verboseln("access token expired, get new from refresh token")
-				if wt, er := aliyunpan.GetAccessTokenFromRefreshToken(activeUser.RefreshToken); er == nil {
-					activeUser.WebToken = *wt
-					activeUser.PanClient().UpdateToken(*wt)
+				logger.Verboseln("web access token expired, get new from server")
+				loginHelper := panlogin.NewLoginHelper(config.DefaultTokenServiceWebHost)
+				wt, re := loginHelper.GetWebapiNewToken(activeUser.TicketId, activeUser.UserId, activeUser.PanClient().WebapiPanClient().GetAccessToken())
+				if re != nil {
+					logger.Verboseln("get web token from server error: ", re.Msg)
+					if re.Code != panlogin.SUCCESS {
+						return re
+					}
+				}
+				if wt != nil {
+					params.Result = "success"
+					params.OldToken = activeUser.WebapiToken.AccessToken
+					params.NewToken = wt.AccessToken
+
+					// update for user & client
+					userWebToken := NewWebLoginToken(wt.AccessToken, wt.Expired)
+					activeUser.WebapiToken = &config.PanClientToken{
+						AccessToken: wt.AccessToken,
+						Expired:     wt.Expired,
+					}
+					activeUser.PanClient().WebapiPanClient().UpdateToken(userWebToken)
 					logger.Verboseln("get new access token success")
-					return true
+
+					// plugin callback
+					if er1 := plugin.UserTokenRefreshFinishCallback(plugins.GetContext(activeUser), params); er1 != nil {
+						logger.Verbosef("UserTokenRefreshFinishCallback error: " + er1.Error())
+					}
+
+					// create new signature
+					_, e1 := activeUser.PanClient().WebapiPanClient().CreateSession(nil)
+					if e1 != nil {
+						logger.Verboseln("call CreateSession error in RefreshWebTokenInNeed: " + e1.Error())
+					}
+					return &panlogin.CommonResultError{
+						Code: 0,
+						Msg:  "",
+					}
+				} else {
+					// token refresh error
+					// if token has expired, callback plugin api for notify
+					if now.Unix() >= expiredTime.Unix() {
+						params.Result = "fail"
+						params.Message = re.Msg
+						params.OldToken = activeUser.WebapiToken.AccessToken
+						if er1 := plugin.UserTokenRefreshFinishCallback(plugins.GetContext(activeUser), params); er1 != nil {
+							logger.Verbosef("UserTokenRefreshFinishCallback error: " + er1.Error())
+						}
+					}
+				}
+			} else {
+				return &panlogin.CommonResultError{
+					Code: 0,
+					Msg:  "web token is validate, not need to refresh",
 				}
 			}
 		}
 	}
-	return false
+	return panlogin.NewCommonResultError("activeUser is invalidate")
+}
+
+// RefreshOpenTokenInNeed 刷新 openapi access token
+func RefreshOpenTokenInNeed(activeUser *config.PanUser) *panlogin.CommonResultError {
+	if activeUser == nil {
+		return panlogin.NewCommonResultError("activeUser is nil")
+	}
+
+	// OpenAPI的token只有2个小时有效期，需要在token过期之前进行刷新并把获取到的新token存储在本地
+	// refresh expired openapi token
+	if activeUser.PanClient().OpenapiPanClient() != nil {
+		if activeUser.OpenapiToken != nil && len(activeUser.OpenapiToken.AccessToken) > 0 {
+			cz := time.FixedZone("CST", 8*3600) // 东8区
+			expiredTime := time.Unix(activeUser.OpenapiToken.Expired, 0).In(cz)
+			now := time.Now().In(cz)
+			if (expiredTime.Unix() - now.Unix()) <= (10 * 60) { // 有效期小于10min就刷新
+				pluginManger := plugins.NewPluginManager(config.GetPluginDir())
+				plugin, _ := pluginManger.GetPlugin()
+				params := &plugins.UserTokenRefreshFinishParams{
+					Result:    "success",
+					Message:   "openapi",
+					OldToken:  "",
+					NewToken:  "",
+					UpdatedAt: utils.NowTimeStr(),
+				}
+
+				// need update refresh token
+				logger.Verboseln("openapi access token expired, get new from server")
+				loginHelper := panlogin.NewLoginHelper(config.DefaultTokenServiceWebHost)
+				wt, re := loginHelper.GetOpenapiNewToken(activeUser.TicketId, activeUser.UserId, activeUser.PanClient().OpenapiPanClient().GetAccessToken())
+				if re != nil {
+					logger.Verboseln("get openapi token from server error: ", re.Msg)
+					if re.Code != panlogin.SUCCESS {
+						return re
+					}
+				}
+				if wt != nil {
+					// 存储新token到本地
+					params.Result = "success"
+					params.OldToken = activeUser.OpenapiToken.AccessToken
+					params.NewToken = wt.AccessToken
+
+					// update for user
+					activeUser.OpenapiToken = &config.PanClientToken{
+						AccessToken: wt.AccessToken,
+						Expired:     wt.Expired,
+					}
+					logger.Verboseln("get new access token success")
+
+					// plugin callback
+					if er1 := plugin.UserTokenRefreshFinishCallback(plugins.GetContext(activeUser), params); er1 != nil {
+						logger.Verbosef("UserTokenRefreshFinishCallback error: " + er1.Error())
+					}
+
+					return &panlogin.CommonResultError{
+						Code: 0,
+						Msg:  "",
+					}
+				} else {
+					// token refresh error
+					// if token has expired, callback plugin api for notify
+					if now.Unix() >= expiredTime.Unix() {
+						params.Result = "fail"
+						params.Message = re.Msg
+						params.OldToken = activeUser.OpenapiToken.AccessToken
+						if er1 := plugin.UserTokenRefreshFinishCallback(plugins.GetContext(activeUser), params); er1 != nil {
+							logger.Verbosef("UserTokenRefreshFinishCallback error: " + er1.Error())
+						}
+					}
+				}
+			} else {
+				return &panlogin.CommonResultError{
+					Code: 0,
+					Msg:  "openapi token is validate, not need to refresh",
+				}
+			}
+		}
+	}
+	return panlogin.NewCommonResultError("activeUser is invalidate")
+}
+
+// AutomaticallyRefreshTokenTask 自动刷新Token的后台任务
+func AutomaticallyRefreshTokenTask() {
+	go func() {
+		// 延迟启动自动刷新Token任务，因为主程序启动的时候默认会进行Token的初始化和刷新，避免无效的并行初始化Token
+		time.Sleep(time.Duration(15) * time.Minute)
+
+		// 检测延迟时间（分钟）
+		delayMinuteTime := time.Duration(1) * time.Minute
+		//delayMinuteTime := time.Duration(10) * time.Second // for test
+		// 请求重试次数
+		attempt := 1
+		for {
+			// Token刷新进程，不管是CLI命令行模式，还是直接命令模式，本刷新任务都会执行
+			time.Sleep(delayMinuteTime) // 定时器，每1分钟调用一次
+
+			// 重新加载配置文件
+			ReloadConfigFunc(nil)
+			activeUser := config.Config.ActiveUser()
+			if activeUser != nil && activeUser.UserId != "" && activeUser.PanClient() != nil {
+				// 刷新Openapi端Token
+				errResult := RefreshOpenTokenInNeed(activeUser)
+				attempt += 1
+				if errResult != nil && errResult.Code == panlogin.SUCCESS {
+					// 刷新成功，重置定时器
+					attempt = 1
+					delayMinuteTime = time.Duration(1) * time.Minute
+
+					// 刷新Webapi端Token
+					RefreshWebTokenInNeed(activeUser)
+
+					// 保存新token到配置文件
+					SaveConfigFunc(nil)
+				} else {
+					// 刷新Token失败
+					logger.Verboseln("刷新Token失败：", errResult.Msg)
+					if errResult.Code == panlogin.ERROR_NEED_LOGIN_AGAIN {
+						// token已经失效，需要重新登录
+						logger.Verboseln("token已经失效，需要重新登录，退出自动刷新Token任务")
+						return
+					} else if errResult.Code == panlogin.ERROR {
+						// 访问错误
+						delayMinuteTime = ProgressiveBackoffAlg(attempt)
+					} else if errResult.Code == panlogin.ERROR_TOO_MANY_REQUESTS {
+						// 请求过于频繁
+						delayMinuteTime = ProgressiveBackoffAlg(attempt)
+					}
+				}
+			}
+		}
+	}()
+}
+
+// ProgressiveBackoffAlg 指数退降算法
+func ProgressiveBackoffAlg(attempt int) time.Duration {
+	maxRetries := 120
+	baseDelay := float64(1)
+	maxDelay := float64(1440)
+
+	if attempt >= maxRetries {
+		return time.Duration(maxDelay) * time.Minute
+	}
+
+	// 计算当前延迟
+	var delay float64
+	if attempt < 100 {
+		// 前 100 次：线性增长 + 小指数基数（缓慢增加）
+		delay = baseDelay * (1 + float64(attempt)/5) // 调整分母控制增长速度
+	} else {
+		// 100 次后：标准指数退避
+		delay = baseDelay * math.Pow(1.5, float64(attempt-100))
+		if delay > maxDelay {
+			delay = maxDelay
+		}
+	}
+
+	// 添加随机抖动（最多 20% 的扰动）
+	jitterSec := rand.Float64() * delay * 0.2 // ±20% 随机扰动
+	delay += jitterSec
+	return time.Duration(delay * float64(time.Minute))
+}
+
+func isIncludeFile(pattern string, fileName string) bool {
+	b, er := filepath.Match(pattern, fileName)
+	if er != nil {
+		return false
+	}
+	return b
+}
+
+// isMatchWildcardPattern 是否是统配符字符串
+func isMatchWildcardPattern(name string) bool {
+	return strings.ContainsAny(name, "*") || strings.ContainsAny(name, "?") || strings.ContainsAny(name, "[")
+}
+
+// TryLogin 尝试登录，基础应用支持的各类登录方式进行尝试成功登录
+func TryLogin() *config.PanUser {
+	// can do automatically login?
+	for _, u := range config.Config.UserList {
+		if u.UserId == config.Config.ActiveUID {
+			// login
+			cloudUser, err := config.SetupUserByCookie(u.OpenapiToken, u.WebapiToken,
+				u.TicketId, u.UserId,
+				config.Config.DeviceId, config.Config.DeviceName,
+				config.Config.ClientId, config.Config.ClientSecret)
+			if cloudUser == nil {
+				logger.Verboseln("尝试登录失败: ", err)
+				fmt.Println("尝试登录失败，请使用 login 命令进行重新登录")
+				return nil
+			}
+
+			// save
+			SaveConfigFunc(nil)
+			// reload
+			ReloadConfigFunc(nil)
+
+			return config.Config.ActiveUser()
+		}
+	}
+	return nil
 }
@@ -0,0 +1,13 @@
+package command
+
+import (
+	"fmt"
+	"testing"
+)
+
+func TestProgressiveBackoffAlg(t *testing.T) {
+	for attempt := 1; attempt <= 150; attempt++ {
+		delayTime := ProgressiveBackoffAlg(attempt)
+		fmt.Printf("第%d次，延迟分钟: %.2f\n", attempt, delayTime.Minutes())
+	}
+}
@@ -1,191 +0,0 @@
-// Copyright (c) 2020 tickstep.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-package command
-
-import (
-	"fmt"
-	"github.com/tickstep/aliyunpan/cmder"
-	"github.com/tickstep/aliyunpan/internal/config"
-	"github.com/tickstep/aliyunpan/internal/webdav"
-	"github.com/urfave/cli"
-	"strings"
-)
-
-func CmdWebdav() cli.Command {
-	return cli.Command{
-		Name:        "webdav",
-		Usage:       "在线网盘服务",
-		Description: "webdav在线网盘服务",
-		Category:    "阿里云盘",
-		Before:      cmder.ReloadConfigFunc,
-		After:       cmder.SaveConfigFunc,
-		Action: func(c *cli.Context) error {
-			fmt.Print(`
-本文命令可以让阿里云盘变身为webdav协议的文件服务器。这样你可以把阿里云盘挂载为Windows、Linux、Mac系统的磁盘，可以通过NAS系统做文件管理或文件同步等等。
-当把阿里云盘作为webdav文件服务器进行使用的时候，上传文件是不支持秒传的，所以当你挂载为网络磁盘使用的时候，不建议在webdav挂载目录中上传、下载过大的文件，不然体验会非常差。
-建议作为文档，图片等小文件的同步网盘。
-
-请输入以下命令查看如何启动
-aliyunpan webdav start -h
-
-`)
-			cli.ShowCommandHelp(c, c.Command.Name)
-			return nil
-		},
-		Subcommands: []cli.Command{
-			{
-				Name:      "start",
-				Usage:     "启动webdav在线网盘服务",
-				UsageText: cmder.App().Name + " webdav start [arguments...]",
-				Description: `
-启动webdav服务，让阿里云盘变身为webdav协议的文件服务器。这样你可以把阿里云盘挂载为Windows、Linux、Mac系统的磁盘，可以通过NAS系统做文件管理或文件同步等等。
-当把阿里云盘作为webdav文件服务器进行使用的时候，上传文件是不支持秒传的，所以当你挂载为网络磁盘使用的时候，不建议在webdav挂载目录中上传、下载过大的文件，不然体验会非常差。
-建议作为文档，图片等小文件的同步网盘。
-
-	例子:
-	1. 查看帮助
-	aliyunpan webdav start -h
-
-	2. 使用默认配置启动webdav服务
-	aliyunpan webdav start
-
-	3. 启动webdav服务，并配置IP为127.0.0.1，端口为23077，登录用户名为admin，登录密码为admin123，文件网盘目录 /webdav_folder 作为服务的根目录
-	aliyunpan webdav start -ip "127.0.0.1" -port 23077 -webdav_user "admin" -webdav_password "admin123" -pan_drive "File" -pan_dir_path "/webdav_folder"
-
-`,
-				Action: func(c *cli.Context) error {
-					if config.Config.ActiveUser() == nil {
-						fmt.Println("未登录账号，请先登录")
-						return nil
-					}
-					webdavServ := &webdav.WebdavConfig{
-						PanDriveId: "",
-						PanUserId: "",
-						PanUser: nil,
-						UploadChunkSize: c.Int("bs") * 1024,
-						TransferUrlType: config.Config.TransferUrlType,
-						Address:   "0.0.0.0",
-						Port:      23077,
-						Prefix:    "/",
-						Users:     []webdav.WebdavUser{{
-							Username: "admin",
-							Password: "admin",
-							Scope:    "/",
-						}},
-					}
-
-					// pan user
-					panUserId := config.Config.ActiveUID
-					activeUser := GetActiveUser()
-					webdavServ.PanUserId = panUserId
-					webdavServ.PanUser = activeUser
-
-					// address
-					ip := "0.0.0.0"
-					if c.IsSet("ip") {
-						ip = c.String("ip")
-					}
-					webdavServ.Address = ip
-
-					// port
-					port := 23077
-					if c.IsSet("port") {
-						port = c.Int("port")
-					}
-					webdavServ.Port = port
-
-					// binding pan drive
-					panDriveName := "File"
-					panDriveNameStr := "文件"
-					if c.IsSet("pan_drive") {
-						panDriveName = c.String("pan_drive")
-					}
-					if strings.ToLower(panDriveName) == "album" {
-						webdavServ.PanDriveId = activeUser.DriveList.GetAlbumDriveId()
-						panDriveNameStr = "相册"
-					} else {
-						webdavServ.PanDriveId = activeUser.DriveList.GetFileDriveId()
-						panDriveNameStr = "文件"
-					}
-
-					// binding pan dir path
-					panDirPath := "/"
-					if c.IsSet("pan_dir_path") {
-						panDirPath = c.String("pan_dir_path")
-					}
-					webdavServ.Users[0].Scope = panDirPath
-
-					webdavUserName := "admin"
-					if c.IsSet("webdav_user") {
-						webdavUserName = c.String("webdav_user")
-					}
-					webdavServ.Users[0].Username = webdavUserName
-
-					webdavPassword := "admin"
-					if c.IsSet("webdav_password") {
-						webdavPassword = c.String("webdav_password")
-					}
-					webdavServ.Users[0].Password = webdavPassword
-
-					err := config.Config.Save()
-					if err != nil {
-						fmt.Println(err)
-						return err
-					}
-
-					fmt.Println("----------------------------------------")
-					fmt.Printf("webdav网盘信息：\n链接：http://localhost:%d\n用户名：%s\n密码：%s\n网盘服务类型：%s\n网盘服务目录：%s\n",
-						webdavServ.Port, webdavServ.Users[0].Username, webdavServ.Users[0].Password, panDriveNameStr, webdavServ.Users[0].Scope)
-					fmt.Println("----------------------------------------")
-					fmt.Println("webdav在线网盘服务运行中...")
-					webdavServ.StartServer()
-					return nil
-				},
-				Flags: []cli.Flag{
-					cli.StringFlag{
-						Name:  "ip",
-						Usage: "绑定的本地IP，多网卡的环境下建议指定绑定的IP。默认为0.0.0.0代表绑定全部网卡",
-					},
-					cli.IntFlag{
-						Name:  "port",
-						Usage: "绑定的本地端口，默认为：23077",
-						Value: 23077,
-					},
-					cli.StringFlag{
-						Name:  "webdav_user",
-						Usage: "Webdav登录用户名，默认为：admin",
-					},
-					cli.StringFlag{
-						Name:  "webdav_password",
-						Usage: "Webdav登录密码，默认为：admin",
-					},
-					cli.StringFlag{
-						Name:  "pan_drive",
-						Usage: "Webdav绑定的网盘类型。File-文件 Album-相册。默认为文件网盘",
-						Value: "File",
-					},
-					cli.StringFlag{
-						Name:  "pan_dir_path",
-						Usage: "Webdav绑定的网盘文件夹路径，默认为：/",
-					},
-					cli.IntFlag{
-						Name:  "bs",
-						Usage: "block size，上传分片大小，单位KB。推荐值：1024 ~ 10240",
-						Value: 10240,
-					},
-				},
-			},
-		},
-	}
-}
@@ -0,0 +1,183 @@
+// Copyright (c) 2020 tickstep.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+package command
+
+import (
+	"fmt"
+	"github.com/tickstep/aliyunpan-api/aliyunpan"
+	"github.com/tickstep/aliyunpan-api/aliyunpan_web"
+	"github.com/tickstep/aliyunpan/cmder/cmdtable"
+	"github.com/tickstep/aliyunpan/internal/config"
+	"github.com/urfave/cli"
+	"os"
+	"path"
+	"strconv"
+)
+
+func CmdXcp() cli.Command {
+	return cli.Command{
+		Name:  "xcp",
+		Usage: "备份盘和资源库之间转存文件",
+		UsageText: `
+	aliyunpan xcp <文件/目录1> <文件/目录2> <文件/目录3> ... <目标盘目录>`,
+		Description: `
+	注意: 拷贝多个文件和目录时, 请确保每一个文件和目录都存在, 否则拷贝操作会失败。
+
+	示例:
+
+	当前程序工作在备份盘下，将备份盘 /1.mp4 文件转存复制到 资源库下的 /来自备份盘/video 目录下
+	aliyunpan xcp /1.mp4 /来自备份盘/video
+
+	当前程序工作在资源库下，将资源库 /1.mp4 文件转存复制到 备份盘下的 /来自资源库/video 目录下
+	aliyunpan xcp /1.mp4 /来自资源库/video
+
+	当前程序工作在备份盘下，将 /我的资源 目录下所有的.mp4文件 复制到 /来自备份盘/video 目录下面，使用通配符匹配
+	aliyunpan xcp /我的资源/*.mp4 /来自备份盘/video
+`,
+		Category: "阿里云盘",
+		Before:   ReloadConfigFunc,
+		Action: func(c *cli.Context) error {
+			if c.NArg() <= 0 {
+				cli.ShowCommandHelp(c, c.Command.Name)
+				return nil
+			}
+			if config.Config.ActiveUser() == nil {
+				fmt.Println("未登录账号")
+				return nil
+			}
+			if config.Config.ActiveUser().PanClient().WebapiPanClient() == nil {
+				fmt.Println("WEB客户端未登录，请登录后再使用该命令")
+				return nil
+			}
+			srcDriveId := parseDriveId(c)
+			dstDriveId := ""
+			driveList := config.Config.ActiveUser().DriveList
+			if driveList.GetFileDriveId() == srcDriveId {
+				dstDriveId = driveList.GetResourceDriveId()
+			} else if driveList.GetResourceDriveId() == srcDriveId {
+				dstDriveId = driveList.GetFileDriveId()
+			} else {
+				fmt.Println("不支持该操作")
+				return nil
+			}
+			RunXCopy(srcDriveId, dstDriveId, c.Args()...)
+			return nil
+		},
+		Flags: []cli.Flag{
+			cli.StringFlag{
+				Name:  "driveId",
+				Usage: "源网盘ID",
+				Value: "",
+			},
+		},
+	}
+}
+
+// RunXCopy 执行复制文件/目录
+func RunXCopy(srcDriveId, dstDriveId string, paths ...string) {
+	activeUser := GetActiveUser()
+	cacheCleanPaths := []string{}
+	opFileList, targetFile, _, err := getCrossCopyFileInfo(srcDriveId, dstDriveId, paths...)
+	if err != nil {
+		fmt.Println(err)
+		return
+	}
+	if targetFile == nil {
+		fmt.Println("目标目录不存在")
+		return
+	}
+	if opFileList == nil || len(opFileList) == 0 {
+		fmt.Println("没有有效的文件可复制")
+		return
+	}
+	cacheCleanPaths = append(cacheCleanPaths, targetFile.Path)
+
+	failedCopyFiles := []*aliyunpan.FileEntity{}
+	copyFileParamList := []string{}
+	fileId2FileEntity := map[string]*aliyunpan.FileEntity{}
+	for _, mfi := range opFileList {
+		fileId2FileEntity[mfi.FileId] = mfi
+		copyFileParamList = append(copyFileParamList, mfi.FileId)
+		cacheCleanPaths = append(cacheCleanPaths, path.Dir(mfi.Path))
+	}
+	fccr, er := activeUser.PanClient().WebapiPanClient().FileCrossDriveCopy(&aliyunpan_web.FileCrossCopyParam{
+		FromDriveId:    srcDriveId,
+		FromFileIds:    copyFileParamList,
+		ToDriveId:      dstDriveId,
+		ToParentFileId: targetFile.FileId,
+	})
+	for _, rs := range fccr {
+		if rs.Status != 201 {
+			failedCopyFiles = append(failedCopyFiles, fileId2FileEntity[rs.SourceFileId])
+		}
+	}
+
+	if len(failedCopyFiles) > 0 {
+		fmt.Println("以下文件复制失败：")
+		for _, f := range failedCopyFiles {
+			fmt.Println(f.FileName)
+		}
+		fmt.Println("")
+	}
+	if er == nil {
+		pnt := func() {
+			tb := cmdtable.NewTable(os.Stdout)
+			tb.SetHeader([]string{"#", "文件/目录"})
+			for k, rs := range fccr {
+				tb.Append([]string{strconv.Itoa(k + 1), fileId2FileEntity[rs.SourceFileId].Path})
+			}
+			tb.Render()
+		}
+		fmt.Println("操作成功, 以下文件已复制到目标目录: ", targetFile.Path)
+		pnt()
+		activeUser.DeleteCache(cacheCleanPaths)
+	} else {
+		fmt.Println("无法复制文件，请稍后重试")
+	}
+}
+
+func getCrossCopyFileInfo(srcDriveId, dstDriveId string, paths ...string) (opFileList []*aliyunpan.FileEntity, targetFile *aliyunpan.FileEntity, failedPaths []string, error error) {
+	if len(paths) <= 1 {
+		return nil, nil, nil, fmt.Errorf("请指定目标文件夹路径")
+	}
+	activeUser := GetActiveUser()
+
+	// the last one is the target file path
+	targetFilePath := path.Clean(paths[len(paths)-1])
+	absolutePath := activeUser.PathJoin(dstDriveId, targetFilePath)
+	targetFile, err := activeUser.PanClient().WebapiPanClient().FileInfoByPath(dstDriveId, absolutePath)
+	if err != nil || !targetFile.IsFolder() {
+		return nil, nil, nil, fmt.Errorf("指定目标文件夹不存在")
+	}
+
+	// source file list
+	for idx := 0; idx < (len(paths) - 1); idx++ {
+		absolutePath = path.Clean(activeUser.PathJoin(srcDriveId, paths[idx]))
+		fileList, err1 := matchPathByShellPattern(srcDriveId, absolutePath)
+		if err1 != nil {
+			failedPaths = append(failedPaths, absolutePath)
+			continue
+		}
+		if fileList == nil || len(fileList) == 0 {
+			// 文件不存在
+			failedPaths = append(failedPaths, absolutePath)
+			continue
+		}
+		for _, f := range fileList {
+			// 移动匹配的文件
+			opFileList = append(opFileList, f)
+		}
+	}
+	return
+}
@@ -0,0 +1,99 @@
+// Copyright (c) 2020 tickstep.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+package command_local
+
+import (
+	"fmt"
+	"github.com/tickstep/aliyunpan/internal/command"
+	"github.com/tickstep/aliyunpan/internal/config"
+	"github.com/urfave/cli"
+	"os"
+	"runtime"
+	"strings"
+)
+
+// CmdLocalCd 切换本地工作目录
+func CmdLocalCd() cli.Command {
+	return cli.Command{
+		Name:     "lcd",
+		Category: "本地命令",
+		Usage:    "切换本地工作目录",
+		Description: `
+	aliyunpan lcd <本地目录, 绝对路径或相对路径>
+
+	示例:
+
+	切换 /我的资源 工作目录:
+	aliyunpan lcd /我的资源
+
+	切换上级目录:
+	aliyunpan lcd ..
+
+	切换根目录:
+	aliyunpan lcd /
+`,
+		Action: func(c *cli.Context) error {
+			if c.NArg() == 0 {
+				cli.ShowCommandHelp(c, c.Command.Name)
+				return nil
+			}
+			RunChangeLocalDirectory(c.Args().Get(0))
+			return nil
+		},
+		Flags: []cli.Flag{},
+	}
+}
+
+// CmdLocalPwd 当前本地工作目录
+func CmdLocalPwd() cli.Command {
+	return cli.Command{
+		Name:     "lpwd",
+		Usage:    "输出本地工作目录",
+		Category: "本地命令",
+		Before:   command.ReloadConfigFunc,
+		Action: func(c *cli.Context) error {
+			lwd := config.Config.LocalWorkdir
+			if lwd == "" {
+				// 默认为用户主页目录
+				lwd = GetLocalHomeDir()
+				config.Config.LocalWorkdir = lwd
+			}
+			if runtime.GOOS == "windows" {
+				lwd = strings.ReplaceAll(lwd, "/", "\\")
+			} else {
+				// Unix-like system, so just assume Unix
+				lwd = strings.ReplaceAll(lwd, "\\", "/")
+			}
+			fmt.Println("本地工作目录: " + lwd)
+			return nil
+		},
+	}
+}
+
+func RunChangeLocalDirectory(targetPath string) {
+	targetPath = LocalPathJoin(targetPath)
+
+	// 获取目标路径文件信息
+	localFileInfo, er := os.Stat(targetPath)
+	if er != nil {
+		fmt.Println("目录路径不存在")
+		return
+	}
+	if !localFileInfo.IsDir() {
+		fmt.Printf("错误: %s 不是一个目录 (文件夹)\n", targetPath)
+		return
+	}
+	config.Config.LocalWorkdir = strings.ReplaceAll(targetPath, "\\", "/")
+	fmt.Printf("改变本地工作目录: %s\n", config.Config.LocalWorkdir)
+}
@@ -0,0 +1,216 @@
+// Copyright (c) 2020 tickstep.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+package command_local
+
+import (
+	"fmt"
+	"github.com/olekukonko/tablewriter"
+	"github.com/tickstep/aliyunpan-api/aliyunpan"
+	"github.com/tickstep/aliyunpan/cmder/cmdtable"
+	"github.com/tickstep/library-go/converter"
+	"github.com/urfave/cli"
+	"log"
+	"os"
+	"sort"
+	"strconv"
+	"strings"
+)
+
+func CmdLocalLs() cli.Command {
+	return cli.Command{
+		Name:     "lls",
+		Category: "本地命令",
+		Usage:    "列出本地目录",
+		Description: `
+	列出当前本地工作目录内的文件和目录, 或指定目录内的文件和目录
+
+	示例:
+
+	列出 我的资源 内的文件和目录
+	aliyunpan lls 我的资源
+
+	绝对路径
+	aliyunpan lls /我的资源
+
+	详细列出 我的资源 内的文件和目录
+	aliyunpan lls /我的资源
+`,
+		Action: func(c *cli.Context) error {
+			var (
+				orderBy     aliyunpan.FileOrderBy        = aliyunpan.FileOrderByUpdatedAt
+				orderSort   aliyunpan.FileOrderDirection = aliyunpan.FileOrderDirectionDesc
+				showAllFile bool                         = false
+			)
+			if c.IsSet("a") {
+				showAllFile = true
+			}
+
+			switch {
+			case c.IsSet("asc"):
+				orderSort = aliyunpan.FileOrderDirectionAsc
+			case c.IsSet("desc"):
+				orderSort = aliyunpan.FileOrderDirectionDesc
+			default:
+				orderSort = aliyunpan.FileOrderDirectionDesc
+			}
+
+			switch {
+			case c.IsSet("time"):
+				orderBy = aliyunpan.FileOrderByUpdatedAt
+			case c.IsSet("name"):
+				orderBy = aliyunpan.FileOrderByName
+			case c.IsSet("size"):
+				orderBy = aliyunpan.FileOrderBySize
+			default:
+				orderBy = aliyunpan.FileOrderByUpdatedAt
+			}
+
+			RunLocalLs(c.Args().Get(0), showAllFile, orderBy, orderSort)
+			return nil
+		},
+		Flags: []cli.Flag{
+			cli.BoolFlag{
+				Name:  "a",
+				Usage: "显示所有文件",
+			},
+			cli.BoolFlag{
+				Name:  "asc",
+				Usage: "升序排序",
+			},
+			cli.BoolFlag{
+				Name:  "desc",
+				Usage: "降序排序",
+			},
+			cli.BoolFlag{
+				Name:  "time",
+				Usage: "根据修改时间排序",
+			},
+			cli.BoolFlag{
+				Name:  "name",
+				Usage: "根据文件名排序",
+			},
+			cli.BoolFlag{
+				Name:  "size",
+				Usage: "根据大小排序",
+			},
+		},
+	}
+}
+
+func RunLocalLs(targetPath string,
+	showAllFile bool,
+	orderBy aliyunpan.FileOrderBy, orderDirection aliyunpan.FileOrderDirection) {
+	targetPath = LocalPathJoin(targetPath)
+
+	// 获取目标路径文件信息
+	localFileInfo, er := os.Stat(targetPath)
+	if er != nil {
+		fmt.Println("目录路径不存在")
+		return
+	}
+	if !localFileInfo.IsDir() {
+		fmt.Println("指定的路径不是目录")
+		return
+	}
+
+	fileEntryList, err := os.ReadDir(targetPath)
+	if err != nil {
+		log.Fatal(err)
+	}
+	fileInfoList := []os.FileInfo{}
+	folderInfoList := []os.FileInfo{}
+	for _, entry := range fileEntryList {
+		if fi, e := entry.Info(); e == nil {
+			if strings.HasPrefix(fi.Name(), ".") {
+				if !showAllFile {
+					continue
+				}
+			}
+			if fi.IsDir() {
+				folderInfoList = append(folderInfoList, fi)
+			} else {
+				fileInfoList = append(fileInfoList, fi)
+			}
+		}
+	}
+	// 过滤
+
+	// 排序
+	sortFileInfoList(folderInfoList, orderBy, orderDirection)
+	sortFileInfoList(fileInfoList, orderBy, orderDirection)
+
+	// 合并并渲染列表
+	renderFileList := append(folderInfoList, fileInfoList...)
+	renderTable(targetPath, renderFileList)
+}
+
+func sortFileInfoList(fileInfoList []os.FileInfo,
+	orderBy aliyunpan.FileOrderBy, orderDirection aliyunpan.FileOrderDirection) []os.FileInfo {
+	switch orderBy {
+	case aliyunpan.FileOrderByUpdatedAt: // 基于修改时间排序
+		sort.Slice(fileInfoList, func(i, j int) bool {
+			if orderDirection == aliyunpan.FileOrderDirectionAsc {
+				return fileInfoList[i].ModTime().UnixMilli() < fileInfoList[j].ModTime().UnixMilli()
+			} else {
+				return fileInfoList[i].ModTime().UnixMilli() > fileInfoList[j].ModTime().UnixMilli()
+			}
+		})
+		break
+	case aliyunpan.FileOrderByName: // 基于文件名排序
+		sort.Slice(fileInfoList, func(i, j int) bool {
+			if orderDirection == aliyunpan.FileOrderDirectionAsc {
+				return fileInfoList[i].Name() < fileInfoList[j].Name()
+			} else {
+				return fileInfoList[i].Name() > fileInfoList[j].Name()
+			}
+		})
+		break
+	case aliyunpan.FileOrderBySize: // 基于文件大小排序
+		sort.Slice(fileInfoList, func(i, j int) bool {
+			if orderDirection == aliyunpan.FileOrderDirectionAsc {
+				return fileInfoList[i].Size() < fileInfoList[j].Size()
+			} else {
+				return fileInfoList[i].Size() > fileInfoList[j].Size()
+			}
+		})
+		break
+	}
+	return fileInfoList
+}
+
+func renderTable(path string, files []os.FileInfo) {
+	tb := cmdtable.NewTable(os.Stdout)
+	var (
+		fileCount, dirCount, totalSize int64
+	)
+
+	tb.SetHeader([]string{"#", "文件大小", "修改日期", "文件(目录)"})
+	tb.SetColumnAlignment([]int{tablewriter.ALIGN_DEFAULT, tablewriter.ALIGN_RIGHT, tablewriter.ALIGN_LEFT, tablewriter.ALIGN_LEFT})
+	for k, file := range files {
+		if file.IsDir() {
+			dirCount += 1
+			tb.Append([]string{strconv.Itoa(k + 1), "-", file.ModTime().Format("2006-01-02 15:04:05"), file.Name() + aliyunpan.PathSeparator})
+			continue
+		}
+		fileCount += 1
+		totalSize += file.Size()
+		tb.Append([]string{strconv.Itoa(k + 1), converter.ConvertFileSize(file.Size(), 2), file.ModTime().Format("2006-01-02 15:04:05"), file.Name()})
+	}
+	tb.Append([]string{"", "总: " + converter.ConvertFileSize(totalSize, 2), "", fmt.Sprintf("文件总数: %d, 目录总数: %d", fileCount, dirCount)})
+
+	fmt.Printf("\n本地当前目录: %s\n", path)
+	fmt.Printf("----\n")
+	tb.Render()
+	fmt.Printf("----\n")
+}
@@ -0,0 +1,62 @@
+package command_local
+
+import (
+	"github.com/tickstep/aliyunpan/internal/config"
+	"github.com/tickstep/aliyunpan/library/homedir"
+	"os"
+	"path"
+	"path/filepath"
+	"strings"
+)
+
+// GetLocalHomeDir 获取本地用户主目录
+func GetLocalHomeDir() string {
+	// 默认为用户主页目录
+	if hd, e := os.UserHomeDir(); e == nil {
+		return hd
+	}
+	return ""
+}
+
+// LocalPathJoin 拼接本地路径
+func LocalPathJoin(p string) string {
+	p = path.Clean(strings.ReplaceAll(p, "\\", "/"))
+	if filepath.IsAbs(p) {
+		return p
+	} else if strings.HasPrefix(p, "~") {
+		if d, e := homedir.Expand(p); e == nil {
+			return d
+		}
+	}
+	wd := config.Config.LocalWorkdir
+	if wd == "" {
+		wd = GetLocalHomeDir()
+	}
+	return path.Join(wd, p)
+}
+
+// LocalPathDir 获取当前文件夹的父文件夹路径
+func LocalPathDir(p string) string {
+	p = strings.ReplaceAll(p, "\\", "/")
+	if strings.HasSuffix(p, ":/") { // windows卷标路径，例如：C:\ 、D:\、E:\
+		return p
+	}
+	parentDirPath := path.Dir(LocalPathClean(p))
+	return parentDirPath
+}
+
+// LocalPathBase 获取当前路径的文件（文件夹）名
+func LocalPathBase(p string) string {
+	p = strings.ReplaceAll(p, "\\", "/")
+	if strings.HasSuffix(p, ":/") { // windows卷标路径，例如：C:\ 、D:\、E:\
+		return ""
+	}
+	baseName := path.Base(LocalPathClean(p))
+	return baseName
+}
+
+// LocalPathClean 规范化本地文件夹路径
+func LocalPathClean(p string) string {
+	cleanPath := path.Clean(strings.ReplaceAll(p, "\\", "/"))
+	return cleanPath
+}
@@ -30,15 +30,15 @@ func (pu *PanUser) DeleteOneCache(dirPath string) {
 func (pu *PanUser) CacheFilesDirectoriesList(pathStr string) (fdl aliyunpan.FileList, apiError *apierror.ApiError) {
 	data := pu.cacheOpMap.CacheOperation(pu.ActiveDriveId, pathStr+"_OrderByName", func() expires.DataExpires {
 		var fi *aliyunpan.FileEntity
-		fi, apiError = pu.panClient.FileInfoByPath(pu.ActiveDriveId, pathStr)
+		fi, apiError = pu.panClient.OpenapiPanClient().FileInfoByPath(pu.ActiveDriveId, pathStr)
 		if apiError != nil {
 			return nil
 		}
 		fileListParam := &aliyunpan.FileListParam{
-			DriveId: pu.ActiveDriveId,
+			DriveId:      pu.ActiveDriveId,
 			ParentFileId: fi.FileId,
 		}
-		fdl, apiError = pu.panClient.FileListGetAll(fileListParam)
+		fdl, apiError = pu.panClient.OpenapiPanClient().FileListGetAll(fileListParam, 200)
 		if apiError != nil {
 			return nil
 		}
@@ -0,0 +1,31 @@
+package config
+
+import (
+	"github.com/tickstep/aliyunpan-api/aliyunpan_open"
+	"github.com/tickstep/aliyunpan-api/aliyunpan_web"
+)
+
+type (
+	// PanClient 云盘客户端
+	PanClient struct {
+		// 网页WEB接口客户端
+		webapiPanClient *aliyunpan_web.WebPanClient
+		// 阿里openapi接口客户端
+		openapiPanClient *aliyunpan_open.OpenPanClient
+	}
+)
+
+func NewPanClient(webClient *aliyunpan_web.WebPanClient, openClient *aliyunpan_open.OpenPanClient) *PanClient {
+	return &PanClient{
+		webapiPanClient:  webClient,
+		openapiPanClient: openClient,
+	}
+}
+
+func (p *PanClient) WebapiPanClient() *aliyunpan_web.WebPanClient {
+	return p.webapiPanClient
+}
+
+func (p *PanClient) OpenapiPanClient() *aliyunpan_open.OpenPanClient {
+	return p.openapiPanClient
+}
@@ -4,7 +4,7 @@
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
-//     http://www.apache.org/licenses/LICENSE-2.0
+//	http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,6 +15,7 @@ package config

 import (
 	"fmt"
+	"github.com/adrg/xdg"
 	jsoniter "github.com/json-iterator/go"
 	"github.com/tickstep/aliyunpan-api/aliyunpan"
 	"github.com/tickstep/aliyunpan/cmder/cmdutil"
@@ -24,6 +25,7 @@ import (
 	"github.com/tickstep/library-go/logger"
 	"github.com/tickstep/library-go/requester"
 	"os"
+	"path"
 	"path/filepath"
 	"runtime"
 	"strings"
@@ -31,6 +33,8 @@ import (
 )

 const (
+	// EnvDownloadDir 配置下载环境变量
+	EnvDownloadDir = "ALIYUNPAN_DOWNLOAD_DIR"
 	// EnvVerbose 启用调试环境变量
 	EnvVerbose = "ALIYUNPAN_VERBOSE"
 	// EnvConfigDir 配置路径环境变量
@@ -50,11 +54,20 @@ const (
 	DefaultFileDownloadParallelNum = 5

 	// MaxFileDownloadParallelNum 最大文件下载并发数量。过大会被阿里云盘风控，导致无法下载
-	MaxFileDownloadParallelNum = 20
+	MaxFileDownloadParallelNum = 3

 	// DefaultTokenServiceWebHost 默认的token服务
 	DefaultTokenServiceWebHost = "https://api.tickstep.com"
 	//DefaultTokenServiceWebHost = "http://localhost:8977"
+
+	// DefaultVideoFileExtensions 默认的视频文件后缀
+	DefaultVideoFileExtensions = "mp4,flv,mkv,mov,rm,rmvb,wmv,wma,mv,asf,asx,mpg,mpeg,mpe,3gp,m4v,avi,vob"
+
+	// DefaultDeviceName 默认客户端名称
+	DefaultDeviceName = "Chrome浏览器"
+
+	// DefaultClientId 默认的clientId
+	DefaultClientId = "cf9f70e8fc61430f8ec5ab5cadf31375"
 )

 var (
@@ -63,8 +76,6 @@ var (

 	// Config 配置信息, 由外部调用
 	Config = NewConfig(configFilePath)
-
-	AppVersion string
 )

 type UpdateCheckInfo struct {
@@ -86,14 +97,27 @@ type PanConfig struct {

 	MaxDownloadRate int64 `json:"maxDownloadRate"` // 限制最大下载速度，单位 B/s, 即字节/每秒
 	MaxUploadRate   int64 `json:"maxUploadRate"`   // 限制最大上传速度，单位 B/s, 即字节/每秒
-	TransferUrlType int   `json:"transferUrlType"` // 上传/下载URL类别，1-默认，2-阿里云ECS

 	SaveDir string `json:"saveDir"` // 下载储存路径

-	Proxy           string          `json:"proxy"`      // 代理
-	LocalAddrs      string          `json:"localAddrs"` // 本地网卡地址
+	Proxy           string          `json:"proxy"`        // 代理
+	LocalAddrs      string          `json:"localAddrs"`   // 本地网卡地址
+	PreferIPType    string          `json:"preferIPType"` // 优先IP类型，IPv4或者IPv6
 	UpdateCheckInfo UpdateCheckInfo `json:"updateCheckInfo"`

+	VideoFileExtensions string `json:"videoFileExtensions"`
+	FileRecordConfig    string `json:"fileRecordConfig"` // 上传、下载、同步文件的记录，包括失败和成功的
+
+	DeviceId   string `json:"deviceId"`   // 客户端ID，用于标识登录客户端，阿里单个账号最多允许10个客户端同时登录
+	DeviceName string `json:"deviceName"` // 客户端名称，默认为：Chrome浏览器
+
+	// Openapi客户端信息
+	ClientId     string `json:"clientId"`
+	ClientSecret string `json:"clientSecret"`
+
+	// 本地工作目录（lcd/lpwd/lls命令使用）
+	LocalWorkdir string `json:"localWorkdir"`
+
 	configFilePath string
 	configFile     *os.File
 	fileMu         sync.Mutex
@@ -181,9 +205,23 @@ func (c *PanConfig) init() error {
 	if c.Proxy != "" {
 		requester.SetGlobalProxy(c.Proxy)
 	}
+
+	// 设置域名解析策略 IPv4 or IPv6
+	t := requester.IPAny
+	if strings.ToLower(c.PreferIPType) == "ipv4" {
+		t = requester.IPv4
+	} else if strings.ToLower(c.PreferIPType) == "ipv6" {
+		t = requester.IPv6
+	}
+	requester.SetPreferIPType(t)
+
 	// 设置本地网卡地址
 	if c.LocalAddrs != "" {
-		requester.SetLocalTCPAddrList(strings.Split(c.LocalAddrs, ",")...)
+		ips := ParseLocalAddress(c.LocalAddrs, strings.ToLower(c.PreferIPType))
+		if len(ips) > 0 {
+			logger.Verboseln("bind local address list: ", ips)
+			requester.SetLocalTCPAddrList(ips...)
+		}
 	}

 	return nil
@@ -242,33 +280,30 @@ func (c *PanConfig) loadConfigFromFile() (err error) {
 	if err != nil {
 		return ErrConfigContentsParseError
 	}
+	if c.DeviceName == "" {
+		c.DeviceName = DefaultDeviceName
+	}
+	if c.ClientId == "" {
+		c.ClientId = DefaultClientId
+	}
 	return nil
 }

 func (c *PanConfig) initDefaultConfig() {
-	// 设置默认的下载路径
-	switch runtime.GOOS {
-	case "windows":
-		c.SaveDir = cmdutil.ExecutablePathJoin("Downloads")
-	case "android":
-		// TODO: 获取完整的的下载路径
-		c.SaveDir = "/sdcard/Download"
-	default:
-		dataPath, ok := os.LookupEnv("HOME")
-		if !ok {
-			CmdConfigVerbose.Warn("Environment HOME not set")
-			c.SaveDir = cmdutil.ExecutablePathJoin("Downloads")
-		} else {
-			c.SaveDir = filepath.Join(dataPath, "Downloads")
-		}
-	}
+	//c.SaveDir = GetDefaultDownloadDir()
 	c.ConfigVer = ConfigVersion
+	c.VideoFileExtensions = DefaultVideoFileExtensions
+	c.DeviceId = RandomDeviceId() // 生成默认客户端ID
+	c.DeviceName = DefaultDeviceName
+	c.ClientId = DefaultClientId
+	c.FileRecordConfig = "2" // 默认关闭
+	c.PreferIPType = "ipv4"  // 默认优先IPv4
 }

 // GetConfigDir 获取配置路径
 func GetConfigDir() string {
 	// 按照以下顺序依次获取配置目录
-	// 1.环境变量ALIYUNPAN_CONFIG_DIR => 2. /etc/aliyunpan/ => 3. ~/.aliyunpan/ => 4.当前程序目录
+	// 1.环境变量ALIYUNPAN_CONFIG_DIR => 2. XDG_CONFIG_HOME/aliyunpan => 3. /etc/aliyunpan/ => 4. ~/.aliyunpan/ => 5.当前程序目录

 	// 1. 从环境变量读取
 	configDir, ok := os.LookupEnv(EnvConfigDir)
@@ -282,7 +317,14 @@ func GetConfigDir() string {
 		logger.Verboseln("use config dir from ALIYUNPAN_CONFIG_DIR env: ", configDir)
 		return configDir
 	} else {
-		// 2. /etc/aliyunpan/
+		// 2. $XDG_CONFIG_HOME/aliyunpan
+		xdgConfigHome := path.Join(xdg.ConfigHome, "aliyunpan")
+		if IsFolderExist(xdgConfigHome) {
+			logger.Verboseln("use XDG home config dir: ", xdgConfigHome)
+			return xdgConfigHome
+		}
+
+		// 3. /etc/aliyunpan/
 		if runtime.GOOS == "linux" {
 			cd := "/etc/aliyunpan"
 			if IsFolderExist(cd) {
@@ -291,7 +333,7 @@ func GetConfigDir() string {
 			}
 		}

-		// 3. ~/.aliyunpan/
+		// 4. ~/.aliyunpan/
 		if runtime.GOOS == "linux" || runtime.GOOS == "windows" {
 			cd, er := homedir.Expand("~/.aliyunpan")
 			if er == nil {
@@ -303,17 +345,65 @@ func GetConfigDir() string {
 		}
 	}

-	// 4.当前程序所在目录
+	// 5.当前程序所在目录
 	configDir = cmdutil.ExecutablePathJoin("")
 	logger.Verboseln("use config dir: ", configDir)
 	return configDir
 }

+// GetDefaultDownloadDir 获取默认的下载目录
+func GetDefaultDownloadDir() string {
+	// 按照以下顺序依次获取下载目录
+	// 1.环境变量ALIYUNPAN_DOWNLOAD_DIR => 2. XDG_DOWNLOAD_DIR目录 => 3. (当前程序目录)/Downloads
+
+	downloadDir := ""
+	// 设置默认的下载路径
+	switch runtime.GOOS {
+	case "android":
+		// TODO: 获取完整的的下载路径
+		downloadDir = "/sdcard/Download"
+		return downloadDir
+	default:
+		// 1. 环境变量ALIYUNPAN_DOWNLOAD_DIR
+		d, ok := os.LookupEnv(EnvDownloadDir)
+		if ok {
+			logger.Verboseln("use download dir from ALIYUNPAN_DOWNLOAD_DIR env: ", d)
+			downloadDir = d
+			return downloadDir
+		} else {
+			// 2. $XDG_DOWNLOAD_DIR
+			xdgDownloadDir := path.Join(xdg.UserDirs.Download)
+			if IsFolderExist(xdgDownloadDir) {
+				logger.Verboseln("use XDG download dir: ", xdgDownloadDir)
+				return xdgDownloadDir
+			}
+		}
+	}
+
+	// 3. (当前程序目录)/Downloads
+	downloadDir = cmdutil.ExecutablePathJoin("Downloads")
+	logger.Verboseln("use default download dir: ", downloadDir)
+	return downloadDir
+}
+
+// GetDownloadDir 获取当前下载目录
+func GetDownloadDir() string {
+	if Config.SaveDir == "" {
+		return GetDefaultDownloadDir()
+	}
+	return Config.SaveDir
+}
+
 // GetPluginDir 获取插件文件夹路径
 func GetPluginDir() string {
 	return strings.TrimSuffix(GetConfigDir(), "/") + "/plugin"
 }

+// GetPluginKvFile 获取插件KV键值对存储文件
+func GetPluginKvFile() string {
+	return GetPluginDir() + "/kv.bolt"
+}
+
 // GetSyncDriveDir 获取同步备份的文件夹路径
 func GetSyncDriveDir() string {
 	return strings.TrimSuffix(GetConfigDir(), "/") + "/sync_drive"
@@ -335,6 +425,11 @@ func GetLogFilePath() string {
 	return dirPath + "/" + "aliyunpan_verbose.log"
 }

+// GetLockerDir 获取文件锁路径
+func GetLockerDir() string {
+	return strings.TrimSuffix(GetConfigDir(), "/")
+}
+
 func (c *PanConfig) ActiveUser() *PanUser {
 	if c.activeUser == nil {
 		if c.UserList == nil {
@@ -347,7 +442,10 @@ func (c *PanConfig) ActiveUser() *PanUser {
 			if u.UserId == c.ActiveUID {
 				if u.PanClient() == nil {
 					// restore client
-					user, err := SetupUserByCookie(&u.WebToken)
+					user, err := SetupUserByCookie(u.OpenapiToken, u.WebapiToken,
+						u.TicketId, u.UserId,
+						c.DeviceId, c.DeviceName,
+						c.ClientId, c.ClientSecret)
 					if err != nil {
 						logger.Verboseln("setup user error")
 						return nil
@@ -355,25 +453,46 @@ func (c *PanConfig) ActiveUser() *PanUser {
 					u.panClient = user.panClient
 					u.Nickname = user.Nickname

+					if u.ActiveDriveId == "" {
+						u.ActiveDriveId = user.DriveList.GetFileDriveId()
+					}
 					u.DriveList = user.DriveList
 					// check workdir valid or not
 					if user.IsFileDriveActive() {
-						fe, err1 := u.PanClient().FileInfoByPath(u.ActiveDriveId, u.Workdir)
+						fe, err1 := u.PanClient().OpenapiPanClient().FileInfoByPath(u.ActiveDriveId, u.Workdir)
 						if err1 != nil {
 							// default to root
 							u.Workdir = "/"
 							u.WorkdirFileEntity = *aliyunpan.NewFileEntityForRootDir()
 						} else {
 							u.WorkdirFileEntity = *fe
+							if u.Workdir == "" {
+								u.Workdir = "/"
+							}
+						}
+					} else if user.IsResourceDriveActive() {
+						fe, err1 := u.PanClient().OpenapiPanClient().FileInfoByPath(u.ActiveDriveId, u.ResourceWorkdir)
+						if err1 != nil {
+							// default to root
+							u.ResourceWorkdir = "/"
+							u.ResourceWorkdirFileEntity = *aliyunpan.NewFileEntityForRootDir()
+						} else {
+							u.ResourceWorkdirFileEntity = *fe
+							if u.ResourceWorkdir == "" {
+								u.ResourceWorkdir = "/"
+							}
 						}
 					} else if user.IsAlbumDriveActive() {
-						fe, err1 := u.PanClient().FileInfoByPath(u.ActiveDriveId, u.AlbumWorkdir)
+						fe, err1 := u.PanClient().WebapiPanClient().FileInfoByPath(u.ActiveDriveId, u.AlbumWorkdir)
 						if err1 != nil {
 							// default to root
 							u.AlbumWorkdir = "/"
 							u.AlbumWorkdirFileEntity = *aliyunpan.NewFileEntityForRootDir()
 						} else {
 							u.AlbumWorkdirFileEntity = *fe
+							if u.AlbumWorkdir == "" {
+								u.AlbumWorkdir = "/"
+							}
 						}
 					}
 				}
@@ -381,7 +500,7 @@ func (c *PanConfig) ActiveUser() *PanUser {
 				return u
 			}
 		}
-		return &PanUser{}
+		return nil
 	}
 	return c.activeUser
 }
@@ -392,9 +511,12 @@ func (c *PanConfig) SetActiveUser(user *PanUser) *PanUser {
 		if u.UserId == user.UserId {
 			// update user info
 			u.Nickname = user.Nickname
-			u.WebToken = user.WebToken
-			u.RefreshToken = user.RefreshToken
-			u.TokenId = user.TokenId
+			u.WebapiToken = user.WebapiToken
+			u.OpenapiToken = user.OpenapiToken
+			u.TicketId = user.TicketId
+			if u.PanClient() != nil && user.PanClient() != nil {
+				u.UpdateClient(user.PanClient().OpenapiPanClient(), user.PanClient().WebapiPanClient())
+			}
 			needToInsert = false
 			break
 		}
@@ -422,9 +544,9 @@ func (c *PanConfig) NumLogins() int {
 }

 // SwitchUser 切换登录用户
-func (c *PanConfig) SwitchUser(uid, username string) (*PanUser, error) {
+func (c *PanConfig) SwitchUser(uid string) (*PanUser, error) {
 	for _, u := range c.UserList {
-		if u.UserId == uid || u.AccountName == username {
+		if u.UserId == uid {
 			return c.SetActiveUser(u), nil
 		}
 	}
@@ -440,7 +562,7 @@ func (c *PanConfig) DeleteUser(uid string) (*PanUser, error) {
 			c.ActiveUID = ""
 			c.activeUser = nil
 			if len(c.UserList) > 0 {
-				c.SwitchUser(c.UserList[0].UserId, "")
+				c.SwitchUser(c.UserList[0].UserId)
 			}
 			return u, nil
 		}
@@ -456,3 +578,18 @@ func (c *PanConfig) HTTPClient(ua string) *requester.HTTPClient {
 	}
 	return client
 }
+
+func (c *PanConfig) GetVideoExtensionList() []string {
+	if c.VideoFileExtensions == "" {
+		return []string{}
+	}
+	exts := strings.Split(c.VideoFileExtensions, ",")
+	r := []string{}
+	for _, ex := range exts {
+		ex = strings.TrimSpace(ex)
+		if ex != "" {
+			r = append(r, strings.ToLower(ex))
+		}
+	}
+	return r
+}
@@ -4,7 +4,7 @@
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
-//     http://www.apache.org/licenses/LICENSE-2.0
+//	http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
@@ -33,7 +33,21 @@ func (c *PanConfig) SetProxy(proxy string) {
 // SetLocalAddrs 设置localAddrs
 func (c *PanConfig) SetLocalAddrs(localAddrs string) {
 	c.LocalAddrs = localAddrs
-	requester.SetLocalTCPAddrList(strings.Split(localAddrs, ",")...)
+	ips := ParseLocalAddress(localAddrs, strings.ToLower(c.PreferIPType))
+	if len(ips) > 0 {
+		requester.SetLocalTCPAddrList(ips...)
+	}
+}
+
+func (c *PanConfig) SetPreferIPType(ipType string) {
+	c.PreferIPType = ipType
+	t := requester.IPAny
+	if strings.ToLower(ipType) == "ipv4" {
+		t = requester.IPv4
+	} else if strings.ToLower(ipType) == "ipv6" {
+		t = requester.IPv6
+	}
+	requester.SetPreferIPType(t)
 }

 // SetCacheSizeByStr 设置cache_size
@@ -66,22 +80,45 @@ func (c *PanConfig) SetMaxUploadRateByStr(sizeStr string) error {
 	return nil
 }

+// SetFileRecorderConfig 设置文件记录器
+func (c *PanConfig) SetFileRecorderConfig(config string) error {
+	if config == "1" || config == "2" {
+		c.FileRecordConfig = config
+	}
+	return nil
+}
+
+// SetDeviceId 设置客户端ID
+func (c *PanConfig) SetDeviceId(deviceId string) error {
+	if deviceId == "" {
+		return nil
+	}
+	c.DeviceId = deviceId
+	return nil
+}
+
 // PrintTable 输出表格
 func (c *PanConfig) PrintTable() {
+	fileRecorderLabel := "禁用"
+	if c.FileRecordConfig == "1" {
+		fileRecorderLabel = "开启"
+	}
 	tb := cmdtable.NewTable(os.Stdout)
 	tb.SetHeader([]string{"名称", "值", "建议值", "描述"})
 	tb.SetHeaderAlignment(tablewriter.ALIGN_LEFT)
 	tb.SetColumnAlignment([]int{tablewriter.ALIGN_DEFAULT, tablewriter.ALIGN_LEFT, tablewriter.ALIGN_LEFT, tablewriter.ALIGN_LEFT})
 	tb.AppendBulk([][]string{
 		[]string{"cache_size", converter.ConvertFileSize(int64(c.CacheSize), 2), "1KB ~ 256KB", "下载缓存, 如果硬盘占用高或下载速度慢, 请尝试调大此值"},
-		[]string{"max_download_parallel", strconv.Itoa(c.MaxDownloadParallel), "1 ~ 20", "最大下载并发量，即同时下载文件最大数量"},
+		[]string{"max_download_parallel", strconv.Itoa(c.MaxDownloadParallel), "1 ~ 3", "最大下载并发量，即同时下载文件最大数量"},
 		[]string{"max_upload_parallel", strconv.Itoa(c.MaxUploadParallel), "1 ~ 20", "最大上传并发量，即同时上传文件最大数量"},
 		[]string{"max_download_rate", showMaxRate(c.MaxDownloadRate), "", "限制单个文件最大下载速度, 0代表不限制"},
 		[]string{"max_upload_rate", showMaxRate(c.MaxUploadRate), "", "限制单个文件最大上传速度, 0代表不限制"},
-		[]string{"transfer_url_type", strconv.Itoa(c.TransferUrlType), "1-默认，2-阿里云ECS", "上传下载URL类别。除非在阿里云ECS（暂只支持经典网络）服务器中使用，不然请设置1"},
-		[]string{"savedir", c.SaveDir, "", "下载文件的储存目录"},
-		[]string{"proxy", c.Proxy, "", "设置代理, 支持 http/socks5 代理，例如：http://127.0.0.1:8888"},
-		[]string{"local_addrs", c.LocalAddrs, "", "设置本地网卡地址, 多个地址用逗号隔开，例如：127.0.0.1,192.168.100.126"},
+		[]string{"savedir", GetDownloadDir(), "", "下载文件的储存目录"},
+		[]string{"proxy", c.Proxy, "", "设置代理, 支持 http/socks5 代理，例如: http://127.0.0.1:8888 或者 socks5://127.0.0.1:8889"},
+		[]string{"local_addrs", c.LocalAddrs, "", "绑定本地网卡地址, 多个地址用逗号隔开，支持网口名称，例如: 127.0.0.1,192.168.100.126,en0,eth0"},
+		[]string{"ip_type", c.PreferIPType, "ipv4-优先IPv4，ipv6-优先IPv6", "设置域名解析IP优先类型。修改后需要重启应用生效"},
+		[]string{"file_record_config", fileRecorderLabel, "1-开启，2-禁用", "设置是否开启上传、下载、同步文件的结果记录，开启后会把结果记录到CSV文件方便后期查看"},
+		[]string{"device_id", c.DeviceId, "", "客户端ID，用于标识登录客户端，阿里单个账号最多允许10个客户端同时在线。修改后需要重启应用生效"},
 	})
 	tb.Render()
 }
@@ -4,7 +4,7 @@
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
-//     http://www.apache.org/licenses/LICENSE-2.0
+//	http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,10 +17,15 @@ import (
 	"fmt"
 	"github.com/tickstep/aliyunpan-api/aliyunpan"
 	"github.com/tickstep/aliyunpan-api/aliyunpan/apierror"
+	"github.com/tickstep/aliyunpan-api/aliyunpan_open"
+	"github.com/tickstep/aliyunpan-api/aliyunpan_open/openapi"
+	"github.com/tickstep/aliyunpan-api/aliyunpan_web"
+	"github.com/tickstep/aliyunpan/internal/functions/panlogin"
 	"github.com/tickstep/library-go/expires/cachemap"
 	"github.com/tickstep/library-go/logger"
 	"path"
 	"path/filepath"
+	"time"
 )

 type DriveInfo struct {
@@ -48,91 +53,275 @@ func (d DriveInfoList) GetAlbumDriveId() string {
 	return ""
 }

+func (d DriveInfoList) GetResourceDriveId() string {
+	for _, drive := range d {
+		if drive.DriveTag == "Resource" {
+			return drive.DriveId
+		}
+	}
+	return ""
+}
+
+func (d DriveInfoList) GetDriveIdByName(name string) string {
+	for _, drive := range d {
+		if drive.DriveTag == name {
+			return drive.DriveId
+		}
+	}
+	return ""
+}
+
+func (d DriveInfoList) GetDriveNameById(driveId string) string {
+	for _, drive := range d {
+		if drive.DriveId == driveId {
+			return drive.DriveName
+		}
+	}
+	return ""
+}
+
+// PanClientToken 授权Token
+type PanClientToken struct {
+	// AccessToken AccessToken
+	AccessToken string `json:"accessToken"`
+	// Expired 过期时间戳，单位秒
+	Expired int64 `json:"expired"`
+}
+
+// GetExpiredTimeCstStr 获取东八区时间字符串
+func (t *PanClientToken) GetExpiredTimeCstStr() string {
+	cz := time.FixedZone("CST", 8*3600) // 东8区
+	tm := time.Unix(t.Expired, 0).In(cz)
+	return tm.Format("2006-01-02 15:04:05")
+}
+
 type PanUser struct {
+	// 用户信息
 	UserId      string `json:"userId"`
 	Nickname    string `json:"nickname"`
 	AccountName string `json:"accountName"`

+	// 文件（备份盘）
 	Workdir           string               `json:"workdir"`
 	WorkdirFileEntity aliyunpan.FileEntity `json:"workdirFileEntity"`

+	// 资源库
+	ResourceWorkdir           string               `json:"resourceWorkdir"`
+	ResourceWorkdirFileEntity aliyunpan.FileEntity `json:"resourceWorkdirFileEntity"`
+
+	// 相册
 	AlbumWorkdir           string               `json:"albumWorkdir"`
 	AlbumWorkdirFileEntity aliyunpan.FileEntity `json:"albumWorkdirFileEntity"`

+	// 用户网盘信息
 	ActiveDriveId string        `json:"activeDriveId"`
 	DriveList     DriveInfoList `json:"driveList"`

-	RefreshToken string                  `json:"refreshToken"`
-	WebToken     aliyunpan.WebLoginToken `json:"webToken"`
-	TokenId      string                  `json:"tokenId"`
+	// 授权Token信息
+	TicketId     string          `json:"ticketId"`
+	WebapiToken  *PanClientToken `json:"webapiToken"`
+	OpenapiToken *PanClientToken `json:"openapiToken"`

-	panClient  *aliyunpan.PanClient
-	cacheOpMap cachemap.CacheOpMap
+	// API客户端
+	panClient  *PanClient          `json:"-"`
+	cacheOpMap cachemap.CacheOpMap `json:"-"`
 }

 type PanUserList []*PanUser

-func SetupUserByCookie(webToken *aliyunpan.WebLoginToken) (user *PanUser, err *apierror.ApiError) {
+func SetupUserByCookie(openapiToken, webapiToken *PanClientToken, ticketId, userId, deviceId, deviceName, clientId, clientSecret string) (user *PanUser, err *apierror.ApiError) {
 	tryRefreshWebToken := true
+	tryRefreshOpenToken := true
+	loginHelper := panlogin.NewLoginHelper(DefaultTokenServiceWebHost)

-	if webToken == nil {
-		return nil, apierror.NewFailedApiError("web token is empty")
+	if openapiToken == nil {
+		return nil, apierror.NewFailedApiError("openapi token is empty")
 	}
+	//if webapiToken == nil {
+	//	return nil, apierror.NewFailedApiError("webapi token is empty")
+	//}

-doLoginAct:
-	panClient := aliyunpan.NewPanClient(*webToken, aliyunpan.AppLoginToken{})
-	u := &PanUser{
-		WebToken:          *webToken,
-		panClient:         panClient,
-		Workdir:           "/",
-		WorkdirFileEntity: *aliyunpan.NewFileEntityForRootDir(),
-	}
+doOpenLoginAct:
+	// setup openapi client
+	openPanClient := aliyunpan_open.NewOpenPanClient(openapi.ApiConfig{
+		TicketId:     ticketId,
+		UserId:       userId,
+		ClientId:     clientId,
+		ClientSecret: clientSecret,
+	}, openapi.ApiToken{
+		AccessToken: openapiToken.AccessToken,
+		ExpiredAt:   openapiToken.Expired,
+	}, nil)
+	openPanClient.SetAccessTokenRefreshCallback(func(userId string, newToken openapi.ApiToken) error {
+		// api层自动刷新Token，回调通知程序
+		logger.Verboseln("openapi token refresh, use new token")
+		openapiToken.AccessToken = newToken.AccessToken
+		openapiToken.Expired = newToken.ExpiredAt
+		return nil
+	})

-	// web api token maybe expired
-	userInfo, err := panClient.GetUserInfo()
+	// open api token maybe expired
+	// check & refresh new one
+	openUserInfo, err := openPanClient.GetUserInfo()
 	if err != nil {
-		if err.Code == apierror.ApiCodeTokenExpiredCode && tryRefreshWebToken {
-			tryRefreshWebToken = false
-			webCookie, _ := aliyunpan.GetAccessTokenFromRefreshToken(webToken.RefreshToken)
-			if webCookie != nil {
-				webToken = webCookie
-				goto doLoginAct
+		if err.Code == apierror.ApiCodeTokenExpiredCode && tryRefreshOpenToken { // 如果是token过期，则尝试刷新
+			tryRefreshOpenToken = false
+			wt, re := loginHelper.GetOpenapiNewToken(ticketId, userId, openapiToken.AccessToken)
+			if re != nil {
+				logger.Verboseln("get openapi token from server error: ", re.Msg)
+				return nil, apierror.NewFailedApiError("get new openapi token error, try login again")
 			}
+			if wt != nil {
+				openapiToken = &PanClientToken{
+					AccessToken: wt.AccessToken,
+					Expired:     wt.Expired,
+				}
+
+				// TODO: 检查token有效期
+			}
+
+			// 回到token检测流程，必须确保token是有效
+			time.Sleep(time.Duration(1) * time.Second)
+			goto doOpenLoginAct
 		}
 		return nil, err
 	}
+
+doWebLoginAct:
+	// setup webapi client
+	var webUserInfo *aliyunpan.UserInfo
+	var err2 *apierror.ApiError
+	var webPanClient *aliyunpan_web.WebPanClient
+	if webapiToken != nil && webapiToken.AccessToken != "" {
+		appConfig := aliyunpan_web.AppConfig{
+			AppId:     "25dzX3vbYqktVxyX",
+			DeviceId:  deviceId,
+			UserId:    userId,
+			Nonce:     0,
+			PublicKey: "",
+		}
+		webPanClient = aliyunpan_web.NewWebPanClient(aliyunpan_web.WebLoginToken{
+			AccessTokenType: "Bearer",
+			AccessToken:     webapiToken.AccessToken,
+			RefreshToken:    "",
+			ExpiresIn:       7200,
+			ExpireTime:      webapiToken.GetExpiredTimeCstStr(),
+		}, aliyunpan_web.AppLoginToken{}, appConfig, aliyunpan_web.SessionConfig{
+			DeviceName: deviceName,
+			ModelName:  "Windows网页版",
+		})
+		// web api token maybe expired
+		// check & refresh new one
+		webUserInfo, err2 = webPanClient.GetUserInfo()
+		if err2 != nil {
+			if err2.Code == apierror.ApiCodeTokenExpiredCode && tryRefreshWebToken {
+				tryRefreshWebToken = false
+				wt, e := loginHelper.GetWebapiNewToken(ticketId, userId, webapiToken.AccessToken)
+				if e != nil {
+					logger.Verboseln("get web token from server error: ", e.Msg)
+				}
+				if wt != nil {
+					webapiToken = &PanClientToken{
+						AccessToken: wt.AccessToken,
+						Expired:     wt.Expired,
+					}
+				}
+				time.Sleep(time.Duration(1) * time.Second)
+				goto doWebLoginAct
+			}
+			webPanClient = nil
+			//return nil, err2
+		}
+		// web create session
+		if webUserInfo != nil {
+			appConfig.UserId = webUserInfo.UserId
+			webPanClient.UpdateAppConfig(appConfig)
+			r, e := webPanClient.CreateSession(nil)
+			if e != nil {
+				logger.Verboseln("call CreateSession error in SetupUserByCookie: " + e.Error())
+			}
+			if r != nil && !r.Result {
+				logger.Verboseln("上传签名秘钥失败，可能是你账号登录的设备已超最大数量")
+			}
+		}
+	}
+
+	//
+	// setup PanUser
+	//
+	u := &PanUser{
+		WebapiToken:       webapiToken,
+		OpenapiToken:      openapiToken,
+		panClient:         NewPanClient(webPanClient, openPanClient),
+		Workdir:           "/",
+		WorkdirFileEntity: *aliyunpan.NewFileEntityForRootDir(),
+	}
+	u.PanClient().OpenapiPanClient().SetAccessTokenRefreshCallback(func(userId string, newToken openapi.ApiToken) error {
+		// api层自动刷新Token，回调通知程序
+		logger.Verboseln("openapi token refresh, update for user")
+		u.OpenapiToken = &PanClientToken{
+			AccessToken: newToken.AccessToken,
+			Expired:     newToken.ExpiredAt,
+		}
+		return nil
+	})
+
+	// setup user info
 	name := "Unknown"
-	if userInfo != nil {
-		if userInfo.Nickname != "" {
-			name = userInfo.Nickname
+	if openUserInfo != nil {
+		// fill userId for client
+		u.PanClient().OpenapiPanClient().UpdateUserId(openUserInfo.UserId)
+		if u.PanClient().WebapiPanClient() != nil {
+			u.PanClient().WebapiPanClient().UpdateUserId(openUserInfo.UserId)
 		}

 		// update user
-		u.UserId = userInfo.UserId
+		if openUserInfo.Nickname != "" {
+			name = openUserInfo.Nickname
+		}
+		u.UserId = openUserInfo.UserId
 		u.Nickname = name
-		u.AccountName = userInfo.UserName
+		u.AccountName = openUserInfo.UserName

 		// default file drive
 		if u.ActiveDriveId == "" {
-			u.ActiveDriveId = userInfo.FileDriveId
+			u.ActiveDriveId = openUserInfo.FileDriveId
 		}

 		// drive list
 		u.DriveList = DriveInfoList{
-			{DriveId: userInfo.FileDriveId, DriveTag: "File", DriveName: "文件"},
-			{DriveId: userInfo.AlbumDriveId, DriveTag: "Album", DriveName: "相册"},
+			{DriveId: openUserInfo.FileDriveId, DriveTag: "File", DriveName: "备份盘"},
+			{DriveId: openUserInfo.ResourceDriveId, DriveTag: "Resource", DriveName: "资源库"},
+		}
+		if webUserInfo != nil {
+			u.AccountName = webUserInfo.UserName
+			u.DriveList = append(u.DriveList, &DriveInfo{DriveId: webUserInfo.AlbumDriveId, DriveTag: "Album", DriveName: "相册"})
 		}
 	} else {
 		// error, maybe the token has expired
-		return nil, apierror.NewFailedApiError("cannot get user info, the token has expired")
+		return nil, apierror.NewFailedApiError("cannot get user info, the token has expired. please login again")
 	}
+
+	// return user
 	return u, nil
 }

-func (pu *PanUser) PanClient() *aliyunpan.PanClient {
+func (pu *PanUser) PanClient() *PanClient {
 	return pu.panClient
 }

+func (pu *PanUser) UpdateClient(openClient *aliyunpan_open.OpenPanClient, webClient *aliyunpan_web.WebPanClient) {
+	if pu.panClient == nil {
+		pu.panClient = &PanClient{
+			webapiPanClient:  webClient,
+			openapiPanClient: openClient,
+		}
+	} else {
+		pu.panClient.webapiPanClient = webClient
+		pu.panClient.openapiPanClient = openClient
+	}
+}
+
 // PathJoin 合并工作目录和相对路径p, 若p为绝对路径则忽略
 func (pu *PanUser) PathJoin(driveId, p string) string {
 	if path.IsAbs(p) {
@@ -143,6 +332,8 @@ func (pu *PanUser) PathJoin(driveId, p string) string {
 	if di != nil {
 		if di.IsFileDrive() {
 			wd = pu.Workdir
+		} else if di.IsResourceDrive() {
+			wd = pu.ResourceWorkdir
 		} else if di.IsAlbumDrive() {
 			wd = pu.AlbumWorkdir
 		}
@@ -152,27 +343,26 @@ func (pu *PanUser) PathJoin(driveId, p string) string {

 func (pu *PanUser) FreshWorkdirInfo() {
 	if pu.IsFileDriveActive() {
-		fe, err := pu.PanClient().FileInfoById(pu.ActiveDriveId, pu.WorkdirFileEntity.FileId)
+		fe, err := pu.PanClient().OpenapiPanClient().FileInfoById(pu.ActiveDriveId, pu.WorkdirFileEntity.FileId)
 		if err != nil {
 			logger.Verboseln("刷新工作目录信息失败")
 			return
 		}
 		pu.WorkdirFileEntity = *fe
 	} else if pu.IsAlbumDriveActive() {
-		fe, err := pu.PanClient().FileInfoById(pu.ActiveDriveId, pu.AlbumWorkdirFileEntity.FileId)
+		fe, err := pu.PanClient().OpenapiPanClient().FileInfoById(pu.ActiveDriveId, pu.AlbumWorkdirFileEntity.FileId)
 		if err != nil {
 			logger.Verboseln("刷新工作目录信息失败")
 			return
 		}
 		pu.AlbumWorkdirFileEntity = *fe
 	}
-
 }

 // GetSavePath 根据提供的网盘文件路径 panpath, 返回本地储存路径,
 // 返回绝对路径, 获取绝对路径出错时才返回相对路径...
 func (pu *PanUser) GetSavePath(filePanPath string) string {
-	dirStr := filepath.Join(Config.SaveDir, fmt.Sprintf("%s", pu.UserId), filePanPath)
+	dirStr := filepath.Join(GetDownloadDir(), fmt.Sprintf("%s", pu.UserId), filePanPath)
 	dir, err := filepath.Abs(dirStr)
 	if err != nil {
 		dir = filepath.Clean(dirStr)
@@ -217,6 +407,11 @@ func (pu *PanUser) IsAlbumDriveActive() bool {
 	return d != nil && d.IsAlbumDrive()
 }

+func (pu *PanUser) IsResourceDriveActive() bool {
+	d := pu.GetActiveDriveInfo()
+	return d != nil && d.IsResourceDrive()
+}
+
 func (di *DriveInfo) IsFileDrive() bool {
 	return di.DriveTag == "File"
 }
@@ -224,3 +419,7 @@ func (di *DriveInfo) IsFileDrive() bool {
 func (di *DriveInfo) IsAlbumDrive() bool {
 	return di.DriveTag == "Album"
 }
+
+func (di *DriveInfo) IsResourceDrive() bool {
+	return di.DriveTag == "Resource"
+}
@@ -4,7 +4,7 @@
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
-//     http://www.apache.org/licenses/LICENSE-2.0
+//	http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,13 +17,17 @@ import (
 	"encoding/hex"
 	"github.com/olekukonko/tablewriter"
 	"github.com/tickstep/aliyunpan/cmder/cmdtable"
+	"github.com/tickstep/aliyunpan/library/nets"
 	"github.com/tickstep/library-go/converter"
 	"github.com/tickstep/library-go/crypto"
 	"github.com/tickstep/library-go/ids"
 	"github.com/tickstep/library-go/logger"
+	"math/rand"
+	"net"
 	"os"
 	"strconv"
 	"strings"
+	"time"
 )

 func (pl *PanUserList) String() string {
@@ -34,7 +38,7 @@ func (pl *PanUserList) String() string {
 	tb.SetHeader([]string{"#", "uid", "用户名", "昵称"})

 	for k, userInfo := range *pl {
-		tb.Append([]string{strconv.Itoa(k), userInfo.UserId, userInfo.AccountName, userInfo.Nickname})
+		tb.Append([]string{strconv.Itoa(k + 1), userInfo.UserId, userInfo.AccountName, userInfo.Nickname})
 	}

 	tb.Render()
@@ -42,6 +46,16 @@ func (pl *PanUserList) String() string {
 	return builder.String()
 }

+// GetUserByUserId 根据用户ID获取用户信息
+func (pl *PanUserList) GetUserByUserId(userId string) *PanUser {
+	for _, u := range *pl {
+		if u.UserId == userId {
+			return u
+		}
+	}
+	return nil
+}
+
 // AverageParallel 返回平均的下载最大并发量
 func AverageParallel(parallel, downloadLoad int) int {
 	if downloadLoad < 1 {
@@ -95,7 +109,7 @@ func DecryptString(text string) string {
 	if text == "" {
 		return ""
 	}
-	d, _  := hex.DecodeString(text)
+	d, _ := hex.DecodeString(text)

 	// use the machine unique id as the key
 	// but in some OS, this key will be changed if you reinstall the OS
@@ -107,7 +121,7 @@ func DecryptString(text string) string {
 	return string(r)
 }

-// isFolderExist 判断文件夹是否存在
+// IsFolderExist 判断文件夹是否存在
 func IsFolderExist(pathStr string) bool {
 	fi, err := os.Stat(pathStr)
 	if err != nil {
@@ -120,4 +134,55 @@ func IsFolderExist(pathStr string) bool {
 		return false
 	}
 	return fi.IsDir()
-}
+}
+
+// RandomDeviceId 随机生成device-id
+func RandomDeviceId() string {
+	count := 24
+	STR_SET := "abcdefjhijklmnopqrstuvwxyzABCDEFJHIJKLMNOPQRSTUVWXYZ1234567890"
+	rand.Seed(time.Now().UnixNano())
+	str := strings.Builder{}
+	for i := 0; i < count; i++ {
+		str.WriteByte(byte(STR_SET[rand.Intn(len(STR_SET))]))
+	}
+	return str.String()
+}
+
+// ParseLocalAddress 解析网络接口配置为对应的本地IP地址
+func ParseLocalAddress(localAddrs string, filterIpType string) []string {
+	allLocalAddress, _ := nets.GetLocalNetInterfaceAddress()
+	localAddrNames := strings.Split(localAddrs, ",")
+	ips := []string{}
+	for _, addr := range localAddrNames {
+		if addr == "" {
+			continue
+		}
+		if net.ParseIP(addr) == nil {
+			// maybe local interface name
+			if localAddr := allLocalAddress.GetByName(addr); localAddr != nil {
+				if localAddr.IPv4 != "" {
+					if filterIpType == "any" || filterIpType == "" { // 不限制
+						ips = append(ips, localAddr.IPv4)
+					} else {
+						if filterIpType == "ipv4" {
+							ips = append(ips, localAddr.IPv4)
+						}
+					}
+				}
+				if localAddr.IPv6 != "" {
+					if filterIpType == "any" || filterIpType == "" { // 不限制
+						ips = append(ips, localAddr.IPv6)
+					} else {
+						if filterIpType == "ipv6" {
+							ips = append(ips, localAddr.IPv6)
+						}
+					}
+				}
+			}
+		} else {
+			// ip
+			ips = append(ips, addr)
+		}
+	}
+	return ips
+}
@@ -25,3 +25,7 @@ func TestEncryptString(t *testing.T) {
 func TestDecryptString(t *testing.T) {
 	fmt.Println(DecryptString("75b3c8d21607440c0e8a70f4a4861c8669774cc69c70ce2a2c8acb815b6d5d3b"))
 }
+
+func TestRandomDeviceId(t *testing.T) {
+	fmt.Println(RandomDeviceId())
+}
@@ -4,7 +4,7 @@
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
-//     http://www.apache.org/licenses/LICENSE-2.0
+//	http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
@@ -27,13 +27,15 @@ var (
 	MinParallelSize int64 = 10 * 1024 * 1024 // 10MB

 	// MaxParallelWorkerCount 单个文件下载最大并发线程数量
+	// 阿里云盘规定：并发下载线程数不要超过3，否则会有风控检测处罚的风险
 	MaxParallelWorkerCount int = 3
 )

-//Config 下载配置
+// Config 下载配置
 type Config struct {
 	Mode                       transfer.RangeGenMode      // 下载Range分配模式
 	MaxParallel                int                        // 最大下载并发量
+	SliceParallel              int                        // 单文件下载线程数，为0代表程序自动调度
 	CacheSize                  int                        // 下载缓冲
 	BlockSize                  int64                      // 每个Range区块的大小, RangeGenMode 为 RangeGenMode2 时才有效
 	MaxRate                    int64                      // 限制最大下载速度
@@ -41,18 +43,18 @@ type Config struct {
 	InstanceStatePath          string                     // 断点续传信息路径
 	TryHTTP                    bool                       // 是否尝试使用 http 连接
 	ShowProgress               bool                       // 是否展示下载进度条
-	UseInternalUrl             bool // 是否使用内置链接
+	ExcludeNames               []string                   // 排除的文件名，包括文件夹和文件。即这些文件/文件夹不进行下载，支持正则表达式
 }

-//NewConfig 返回默认配置
+// NewConfig 返回默认配置
 func NewConfig() *Config {
 	return &Config{
-		MaxParallel: 5,
+		MaxParallel: 3,
 		CacheSize:   CacheSize,
 	}
 }

-//Fix 修复配置信息, 使其合法
+// Fix 修复配置信息, 使其合法
 func (cfg *Config) Fix() {
 	fixCacheSize(&cfg.CacheSize)
 	if cfg.MaxParallel < 1 {
@@ -60,7 +62,7 @@ func (cfg *Config) Fix() {
 	}
 }

-//Copy 拷贝新的配置
+// Copy 拷贝新的配置
 func (cfg *Config) Copy() *Config {
 	newCfg := *cfg
 	return &newCfg
@@ -4,7 +4,7 @@
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
-//     http://www.apache.org/licenses/LICENSE-2.0
+//	http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
@@ -19,6 +19,8 @@ import (
 	"github.com/tickstep/aliyunpan-api/aliyunpan"
 	"github.com/tickstep/aliyunpan-api/aliyunpan/apierror"
 	"github.com/tickstep/aliyunpan/cmder/cmdutil"
+	"github.com/tickstep/aliyunpan/internal/config"
+	"github.com/tickstep/aliyunpan/internal/global"
 	"github.com/tickstep/aliyunpan/internal/waitgroup"
 	"github.com/tickstep/aliyunpan/library/requester/transfer"
 	"github.com/tickstep/library-go/cachepool"
@@ -28,6 +30,7 @@ import (
 	"github.com/tickstep/library-go/requester/rio/speeds"
 	"io"
 	"net/http"
+	"strings"
 	"sync"
 	"time"
 )
@@ -52,6 +55,7 @@ type (
 		monitorCancelFunc context.CancelFunc
 		globalSpeedsStat  *speeds.Speeds // 全局速度统计

+		filePanSource           global.FileSourceType // 要下载的网盘文件来源
 		fileInfo                *aliyunpan.FileEntity // 下载的文件信息
 		driveId                 string
 		loadBalancerCompareFunc LoadBalancerCompareFunc // 负载均衡检测函数
@@ -61,7 +65,8 @@ type (
 		loadBalansers           []string
 		writer                  io.WriterAt
 		client                  *requester.HTTPClient
-		panClient               *aliyunpan.PanClient
+		panClient               *config.PanClient
+		subPanClientList        []*config.PanClient // 辅助下载子账号列表
 		config                  *Config
 		monitor                 *Monitor
 		instanceState           *InstanceState
@@ -71,29 +76,39 @@ type (
 	DURLCheckFunc func(client *requester.HTTPClient, durl string) (contentLength int64, resp *http.Response, err error)
 	// StatusCodeBodyCheckFunc 响应状态码出错的检查函数
 	StatusCodeBodyCheckFunc func(respBody io.Reader) error
+
+	// panClientDownloadUrlEntity 下载url实体，和网盘(用户)客户端绑定
+	panClientDownloadUrlEntity struct {
+		PanClient *config.PanClient
+		FileInfo  *aliyunpan.FileEntity
+		DriveId   string
+		FileId    string
+		FileUrl   string
+	}
 )

-//NewDownloader 初始化Downloader
-func NewDownloader(writer io.WriterAt, config *Config, p *aliyunpan.PanClient, globalSpeedsStat *speeds.Speeds) (der *Downloader) {
+// NewDownloader 初始化Downloader
+func NewDownloader(writer io.WriterAt, config *Config, p *config.PanClient, sp []*config.PanClient, globalSpeedsStat *speeds.Speeds) (der *Downloader) {
 	der = &Downloader{
 		config:           config,
 		writer:           writer,
 		panClient:        p,
+		subPanClientList: sp,
 		globalSpeedsStat: globalSpeedsStat,
 	}
 	return
 }

-//SetClient 设置http客户端
-func (der *Downloader) SetFileInfo(f *aliyunpan.FileEntity) {
+// SetFileInfo 设置文件信息
+func (der *Downloader) SetFileInfo(source global.FileSourceType, f *aliyunpan.FileEntity) {
+	der.filePanSource = source
 	der.fileInfo = f
 }
-
 func (der *Downloader) SetDriveId(driveId string) {
 	der.driveId = driveId
 }

-//SetClient 设置http客户端
+// SetClient 设置http客户端
 func (der *Downloader) SetClient(client *requester.HTTPClient) {
 	der.client = client
 }
@@ -103,7 +118,7 @@ func (der *Downloader) SetLoadBalancerCompareFunc(f LoadBalancerCompareFunc) {
 	der.loadBalancerCompareFunc = f
 }

-//SetStatusCodeBodyCheckFunc 设置响应状态码出错的检查函数, 当FirstCheckMethod不为HEAD时才有效
+// SetStatusCodeBodyCheckFunc 设置响应状态码出错的检查函数, 当FirstCheckMethod不为HEAD时才有效
 func (der *Downloader) SetStatusCodeBodyCheckFunc(f StatusCodeBodyCheckFunc) {
 	der.statusCodeBodyCheckFunc = f
 }
@@ -128,19 +143,20 @@ func (der *Downloader) lazyInit() {
 }

 // SelectParallel 获取合适的 parallel
-func (der *Downloader) SelectParallel(single bool, maxParallel int, totalSize int64, instanceRangeList transfer.RangeList) (parallel int) {
-	isRange := instanceRangeList != nil && len(instanceRangeList) > 0
-	if single { // 单线程下载
-		parallel = 1
+func (der *Downloader) SelectParallel(prefParallel int, maxParallel int, totalSize int64, instanceRangeList transfer.RangeList) (parallel int) {
+	isRange := instanceRangeList != nil && len(instanceRangeList) > 0 // 历史下载分片记录存在
+	if prefParallel > 0 {                                             // 单线程下载
+		parallel = prefParallel
 	} else if isRange {
 		parallel = len(instanceRangeList)
 	} else {
-		parallel = maxParallel
-		if int64(parallel) > totalSize/int64(MinParallelSize) {
+		parallel = maxParallel                                  // 默认为设置为maxParallel个并发线程数
+		if int64(parallel) > totalSize/int64(MinParallelSize) { // 如果文件太小不足切片成maxParallel数量的分片，则计算最接近的分片数量
 			parallel = int(totalSize/int64(MinParallelSize)) + 1
 		}
 	}

+	// 其他情况默认使用单线程下载
 	if parallel < 1 {
 		parallel = 1
 	}
@@ -148,9 +164,9 @@ func (der *Downloader) SelectParallel(single bool, maxParallel int, totalSize in
 }

 // SelectBlockSizeAndInitRangeGen 获取合适的 BlockSize, 和初始化 RangeGen
-func (der *Downloader) SelectBlockSizeAndInitRangeGen(single bool, status *transfer.DownloadStatus, parallel int) (blockSize int64, initErr error) {
+func (der *Downloader) SelectBlockSizeAndInitRangeGen(status *transfer.DownloadStatus, parallel int) (blockSize int64, initErr error) {
 	// Range 生成器
-	if single { // 单线程
+	if parallel == 1 { // 单线程
 		blockSize = -1
 		return
 	}
@@ -282,7 +298,7 @@ func (der *Downloader) checkLoadBalancers() *LoadBalancerResponseList {
 	return loadBalancerResponseList
 }

-//Execute 开始任务
+// Execute 开始任务
 func (der *Downloader) Execute() error {
 	der.lazyInit()

@@ -306,7 +322,6 @@ func (der *Downloader) Execute() error {
 	var (
 		isInstance = bii != nil // 是否存在断点信息
 		status     *transfer.DownloadStatus
-		single     = false // 默认开启多线程下载
 	)
 	if !isInstance {
 		bii = &transfer.DownloadInstanceInfo{}
@@ -328,9 +343,9 @@ func (der *Downloader) Execute() error {
 		defer rl.Stop()
 	}

-	// 计算文件下载的线程数
-	parallel := der.SelectParallel(single, MaxParallelWorkerCount, status.TotalSize(), bii.Ranges) // 实际的下载并行量
-	blockSize, err := der.SelectBlockSizeAndInitRangeGen(single, status, parallel)                 // 实际的BlockSize
+	// 计算本文件下载的并发线程数（分片数）
+	parallel := der.SelectParallel(der.config.SliceParallel, MaxParallelWorkerCount, status.TotalSize(), bii.Ranges) // 实际的下载并行量
+	blockSize, err := der.SelectBlockSizeAndInitRangeGen(status, parallel)                                           // 实际的BlockSize
 	if err != nil {
 		return err
 	}
@@ -358,7 +373,7 @@ func (der *Downloader) Execute() error {
 		// 没有使用断点续传
 		// 分配线程
 		bii.Ranges = make(transfer.RangeList, 0, parallel)
-		if single { // 单线程
+		if parallel == 1 { // 单线程
 			bii.Ranges = append(bii.Ranges, &transfer.Range{Begin: 0, End: der.fileInfo.FileSize})
 		} else {
 			gen := status.RangeListGen()
@@ -376,45 +391,32 @@ func (der *Downloader) Execute() error {
 		writeMu = &sync.Mutex{}
 	)

-	// 获取下载链接
-	var apierr *apierror.ApiError
-	durl, apierr := der.panClient.GetFileDownloadUrl(&aliyunpan.GetFileDownloadUrlParam{
-		DriveId: der.driveId,
-		FileId:  der.fileInfo.FileId,
-	})
-	time.Sleep(time.Duration(200) * time.Millisecond)
-	if apierr != nil {
+	// 获取各个账号网盘客户端的下载链接
+	panClientFileUrl, err := der.getFileAllClientDownloadUrl()
+	if err != nil || panClientFileUrl == nil {
 		logger.Verbosef("ERROR: get download url error: %s\n", der.fileInfo.FileId)
 		cmdutil.Trigger(der.onCancelEvent)
-		return apierr
-	}
-	if durl == nil || durl.Url == "" || durl.Url == aliyunpan.IllegalDownloadUrl {
-		logger.Verbosef("无法获取有效的下载链接: %+v\n", durl)
-		cmdutil.Trigger(der.onCancelEvent)
-		der.removeInstanceState() // 移除断点续传文件
-		cmdutil.Trigger(der.onFailedEvent)
-		return ErrFileDownloadForbidden
+		return err
 	}

 	// 初始化下载worker
+	factorNum := len(bii.Ranges) / len(panClientFileUrl)
 	for k, r := range bii.Ranges {
+		panClientUrl := panClientFileUrl[int(k/factorNum)]
 		loadBalancer := loadBalancerResponseList.SequentialGet()
 		if loadBalancer == nil {
 			continue
 		}

-		logger.Verbosef("work id: %d, download url: %s\n", k, durl)
+		logger.Verbosef("work id: %d, download url: %v\n", k, panClientUrl.FileUrl)
 		client := requester.NewHTTPClient()
 		client.SetKeepAlive(true)
 		client.SetTimeout(10 * time.Minute)

-		realUrl := durl.Url
-		if der.config.UseInternalUrl {
-			realUrl = durl.InternalUrl
-		}
-		worker := NewWorker(k, der.driveId, der.fileInfo.FileId, realUrl, writer, der.globalSpeedsStat)
+		realUrl := panClientUrl.FileUrl
+		worker := NewWorker(k, panClientUrl.DriveId, panClientUrl.FileInfo.FileId, realUrl, writer, der.globalSpeedsStat)
 		worker.SetClient(client)
-		worker.SetPanClient(der.panClient)
+		worker.SetPanClient(panClientUrl.PanClient)
 		worker.SetWriteMutex(writeMu)
 		worker.SetTotalSize(der.fileInfo.FileSize)

@@ -425,8 +427,8 @@ func (der *Downloader) Execute() error {

 	der.monitor.SetStatus(status)

-	// 服务器不支持断点续传, 或者单线程下载, 都不重载worker
-	der.monitor.SetReloadWorker(parallel > 1)
+	// 阿里云盘支持断点续传，开启重载worker
+	der.monitor.SetReloadWorker(true)

 	moniterCtx, moniterCancelFunc := context.WithCancel(context.Background())
 	der.monitorCancelFunc = moniterCancelFunc
@@ -456,7 +458,166 @@ func (der *Downloader) Execute() error {
 	return err
 }

-//downloadStatusEvent 执行状态处理事件
+// 获取对应网盘文件的下载链接
+func (der *Downloader) getFileAllClientDownloadUrl() ([]*panClientDownloadUrlEntity, error) {
+	if der.filePanSource == global.AlbumSource {
+		// 相册源只支持主账号下载
+		return der.getAlbumSourceDownloadUrl()
+	} else {
+		// 文件源支持多账号分流下载
+		return der.getFileSourceDownloadUrl()
+	}
+}
+
+// getFileSourceDownloadUrl 获取文件源的文件下载链接
+func (der *Downloader) getFileSourceDownloadUrl() ([]*panClientDownloadUrlEntity, error) {
+	result := []*panClientDownloadUrlEntity{}
+
+	// 主账号（必须存在）
+	// 获取下载链接
+	var apierr *apierror.ApiError
+	durl, apierr := der.panClient.OpenapiPanClient().GetFileDownloadUrl(&aliyunpan.GetFileDownloadUrlParam{
+		DriveId: der.driveId,
+		FileId:  der.fileInfo.FileId,
+	})
+	time.Sleep(time.Duration(200) * time.Millisecond)
+	if apierr != nil {
+		logger.Verbosef("ERROR: get download url error: %s\n", der.fileInfo.FileId)
+		cmdutil.Trigger(der.onCancelEvent)
+		return nil, apierr
+	}
+	if durl == nil || durl.Url == "" || strings.HasPrefix(durl.Url, aliyunpan.IllegalDownloadUrlPrefix) {
+		logger.Verbosef("无法获取有效的下载链接: %+v\n", durl)
+		cmdutil.Trigger(der.onCancelEvent)
+		der.removeInstanceState() // 移除断点续传文件
+		cmdutil.Trigger(der.onFailedEvent)
+		return nil, ErrFileDownloadForbidden
+	}
+	result = append(result, &panClientDownloadUrlEntity{
+		PanClient: der.panClient,
+		FileInfo:  der.fileInfo,
+		DriveId:   der.driveId,
+		FileId:    der.fileInfo.FileId,
+		FileUrl:   durl.Url,
+	})
+
+	// 网盘名称
+	mainDriveName := ""
+	openUserInfo, err := der.panClient.OpenapiPanClient().GetUserInfo()
+	if err != nil || openUserInfo == nil {
+		return nil, err
+	}
+	if openUserInfo.FileDriveId == der.driveId {
+		mainDriveName = "File"
+	} else if openUserInfo.ResourceDriveId == der.driveId {
+		mainDriveName = "Resource"
+	}
+
+	// 网盘文件路径
+	mainFileFullPath := der.fileInfo.Path
+
+	// 铺助账号的下载链接，只支持文件源
+	if der.subPanClientList != nil {
+		for _, spc := range der.subPanClientList {
+			driveId := ""
+			userInfo, err1 := spc.OpenapiPanClient().GetUserInfo()
+			if err1 != nil {
+				continue
+			}
+			if mainDriveName == "File" {
+				driveId = userInfo.FileDriveId
+			} else if mainDriveName == "Resource" {
+				driveId = userInfo.ResourceDriveId
+			}
+
+			// 文件信息
+			panfileInfo, err2 := spc.OpenapiPanClient().FileInfoByPath(driveId, mainFileFullPath)
+			if err2 != nil || panfileInfo == nil {
+				continue
+			}
+
+			// 下载链接
+			durl2, apierr := spc.OpenapiPanClient().GetFileDownloadUrl(&aliyunpan.GetFileDownloadUrlParam{
+				DriveId: driveId,
+				FileId:  panfileInfo.FileId,
+			})
+			time.Sleep(time.Duration(200) * time.Millisecond)
+			if apierr != nil {
+				logger.Verbosef("ERROR: get download url error: %s\n", der.fileInfo.FileId)
+				continue
+			}
+			if durl2 == nil || durl2.Url == "" || strings.HasPrefix(durl2.Url, aliyunpan.IllegalDownloadUrlPrefix) {
+				logger.Verbosef("无法获取有效的下载链接: %+v\n", durl2)
+				continue
+			}
+			result = append(result, &panClientDownloadUrlEntity{
+				PanClient: spc,
+				FileInfo:  panfileInfo,
+				DriveId:   driveId,
+				FileId:    panfileInfo.FileId,
+				FileUrl:   durl2.Url,
+			})
+		}
+	}
+
+	return result, nil
+}
+
+// getAlbumSourceDownloadUrl 获取相册源的文件下载链接
+func (der *Downloader) getAlbumSourceDownloadUrl() ([]*panClientDownloadUrlEntity, error) {
+	result := []*panClientDownloadUrlEntity{}
+
+	// 相册源只能使用主账号
+	// 获取下载链接
+	var apierr *apierror.ApiError
+	durl, apierr := der.panClient.OpenapiPanClient().ShareAlbumGetFileDownloadUrl(&aliyunpan.ShareAlbumGetFileUrlParam{
+		AlbumId: der.fileInfo.AlbumId,
+		DriveId: der.fileInfo.DriveId,
+		FileId:  der.fileInfo.FileId,
+	})
+	time.Sleep(time.Duration(200) * time.Millisecond)
+	if apierr != nil {
+		logger.Verbosef("ERROR: get album file download url error: %s\n", der.fileInfo.FileId)
+		cmdutil.Trigger(der.onCancelEvent)
+		return nil, apierr
+	}
+	realUrl := ""
+	if durl.StreamsUrl != nil { // 实况图片
+		if strings.ToLower(der.fileInfo.FileExtension) == "mov" {
+			// 视频文件
+			if durl.StreamsUrl.Mov != "" {
+				realUrl = durl.StreamsUrl.Mov
+			}
+		} else {
+			// 照片文件
+			if durl.StreamsUrl.Heic != "" {
+				realUrl = durl.StreamsUrl.Heic
+			} else if durl.StreamsUrl.Jpeg != "" {
+				realUrl = durl.StreamsUrl.Jpeg
+			}
+		}
+	} else if durl.Url != "" { // 普通图片
+		realUrl = durl.Url
+	}
+	if realUrl == "" {
+		logger.Verbosef("无法获取有效的相册文件下载链接: %+v\n", durl)
+		cmdutil.Trigger(der.onCancelEvent)
+		der.removeInstanceState() // 移除断点续传文件
+		cmdutil.Trigger(der.onFailedEvent)
+		return nil, ErrFileDownloadForbidden
+	}
+	// 返回下载链接
+	result = append(result, &panClientDownloadUrlEntity{
+		PanClient: der.panClient,
+		FileInfo:  der.fileInfo,
+		DriveId:   der.driveId,
+		FileId:    der.fileInfo.FileId,
+		FileUrl:   realUrl,
+	})
+	return result, nil
+}
+
+// downloadStatusEvent 执行状态处理事件
 func (der *Downloader) downloadStatusEvent() {
 	if der.onDownloadStatusEvent == nil {
 		return
@@ -478,7 +639,7 @@ func (der *Downloader) downloadStatusEvent() {
 	}()
 }

-//Pause 暂停
+// Pause 暂停
 func (der *Downloader) Pause() {
 	if der.monitor == nil {
 		return
@@ -487,7 +648,7 @@ func (der *Downloader) Pause() {
 	der.monitor.Pause()
 }

-//Resume 恢复
+// Resume 恢复
 func (der *Downloader) Resume() {
 	if der.monitor == nil {
 		return
@@ -496,7 +657,7 @@ func (der *Downloader) Resume() {
 	der.monitor.Resume()
 }

-//Cancel 取消
+// Cancel 取消
 func (der *Downloader) Cancel() {
 	if der.monitor == nil {
 		return
@@ -505,7 +666,7 @@ func (der *Downloader) Cancel() {
 	cmdutil.Trigger(der.monitorCancelFunc)
 }

-//Failed 失败
+// Failed 失败
 func (der *Downloader) Failed() {
 	if der.monitor == nil {
 		return
@@ -514,42 +675,42 @@ func (der *Downloader) Failed() {
 	cmdutil.Trigger(der.monitorCancelFunc)
 }

-//OnExecute 设置开始下载事件
+// OnExecute 设置开始下载事件
 func (der *Downloader) OnExecute(onExecuteEvent requester.Event) {
 	der.onExecuteEvent = onExecuteEvent
 }

-//OnSuccess 设置成功下载事件
+// OnSuccess 设置成功下载事件
 func (der *Downloader) OnSuccess(onSuccessEvent requester.Event) {
 	der.onSuccessEvent = onSuccessEvent
 }

-//OnFailed 设置失败事件
+// OnFailed 设置失败事件
 func (der *Downloader) OnFailed(onFailedEvent requester.Event) {
 	der.onFailedEvent = onFailedEvent
 }

-//OnFinish 设置结束下载事件
+// OnFinish 设置结束下载事件
 func (der *Downloader) OnFinish(onFinishEvent requester.Event) {
 	der.onFinishEvent = onFinishEvent
 }

-//OnPause 设置暂停下载事件
+// OnPause 设置暂停下载事件
 func (der *Downloader) OnPause(onPauseEvent requester.Event) {
 	der.onPauseEvent = onPauseEvent
 }

-//OnResume 设置恢复下载事件
+// OnResume 设置恢复下载事件
 func (der *Downloader) OnResume(onResumeEvent requester.Event) {
 	der.onResumeEvent = onResumeEvent
 }

-//OnCancel 设置取消下载事件
+// OnCancel 设置取消下载事件
 func (der *Downloader) OnCancel(onCancelEvent requester.Event) {
 	der.onCancelEvent = onCancelEvent
 }

-//OnDownloadStatusEvent 设置状态处理函数
+// OnDownloadStatusEvent 设置状态处理函数
 func (der *Downloader) OnDownloadStatusEvent(f DownloadStatusFunc) {
 	der.onDownloadStatusEvent = f
 }
@@ -4,7 +4,7 @@
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
-//     http://www.apache.org/licenses/LICENSE-2.0
+//	http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,8 +16,8 @@ package downloader
 import (
 	"context"
 	"errors"
-	"github.com/tickstep/library-go/logger"
 	"github.com/tickstep/aliyunpan/library/requester/transfer"
+	"github.com/tickstep/library-go/logger"
 	"sort"
 	"time"
 )
@@ -36,7 +36,7 @@ type (
 		completed       chan struct{}
 		err             error
 		resetController *ResetController
-		isReloadWorker  bool //是否重载worker, 单线程模式不重载
+		isReloadWorker  bool //是否重载worker

 		// 临时变量
 		lastAvaliableIndex int
@@ -46,7 +46,7 @@ type (
 	RangeWorkerFunc func(key int, worker *Worker) bool
 )

-//NewMonitor 初始化Monitor
+// NewMonitor 初始化Monitor
 func NewMonitor() *Monitor {
 	monitor := &Monitor{}
 	return monitor
@@ -60,16 +60,16 @@ func (mt *Monitor) lazyInit() {
 		mt.status = transfer.NewDownloadStatus()
 	}
 	if mt.resetController == nil {
-		mt.resetController = NewResetController(80)
+		mt.resetController = NewResetController(1000)
 	}
 }

-//InitMonitorCapacity 初始化workers, 用于Append
+// InitMonitorCapacity 初始化workers, 用于Append
 func (mt *Monitor) InitMonitorCapacity(capacity int) {
 	mt.workers = make(WorkerList, 0, capacity)
 }

-//Append 增加Worker
+// Append 增加Worker
 func (mt *Monitor) Append(worker *Worker) {
 	if worker == nil {
 		return
@@ -77,37 +77,37 @@ func (mt *Monitor) Append(worker *Worker) {
 	mt.workers = append(mt.workers, worker)
 }

-//SetWorkers 设置workers, 此操作会覆盖原有的workers
+// SetWorkers 设置workers, 此操作会覆盖原有的workers
 func (mt *Monitor) SetWorkers(workers WorkerList) {
 	mt.workers = workers
 }

-//SetStatus 设置DownloadStatus
+// SetStatus 设置DownloadStatus
 func (mt *Monitor) SetStatus(status *transfer.DownloadStatus) {
 	mt.status = status
 }

-//SetInstanceState 设置状态
+// SetInstanceState 设置状态
 func (mt *Monitor) SetInstanceState(instanceState *InstanceState) {
 	mt.instanceState = instanceState
 }

-//Status 返回DownloadStatus
+// Status 返回DownloadStatus
 func (mt *Monitor) Status() *transfer.DownloadStatus {
 	return mt.status
 }

-//Err 返回遇到的错误
+// Err 返回遇到的错误
 func (mt *Monitor) Err() error {
 	return mt.err
 }

-//CompletedChan 获取completed chan
+// CompletedChan 获取completed chan
 func (mt *Monitor) CompletedChan() <-chan struct{} {
 	return mt.completed
 }

-//GetAvailableWorker 获取空闲的worker
+// GetAvailableWorker 获取空闲的worker
 func (mt *Monitor) GetAvailableWorker() *Worker {
 	workerCount := len(mt.workers)
 	for i := mt.lastAvaliableIndex; i < mt.lastAvaliableIndex+workerCount; i++ {
@@ -121,7 +121,7 @@ func (mt *Monitor) GetAvailableWorker() *Worker {
 	return nil
 }

-//GetAllWorkersRange 获取所有worker的范围
+// GetAllWorkersRange 获取所有worker的范围
 func (mt *Monitor) GetAllWorkersRange() transfer.RangeList {
 	allWorkerRanges := make(transfer.RangeList, 0, len(mt.workers))
 	for _, worker := range mt.workers {
@@ -130,7 +130,7 @@ func (mt *Monitor) GetAllWorkersRange() transfer.RangeList {
 	return allWorkerRanges
 }

-//NumLeftWorkers 剩余的worker数量
+// NumLeftWorkers 剩余的worker数量
 func (mt *Monitor) NumLeftWorkers() (num int) {
 	for _, worker := range mt.workers {
 		if !worker.Completed() {
@@ -140,12 +140,12 @@ func (mt *Monitor) NumLeftWorkers() (num int) {
 	return
 }

-//SetReloadWorker 是否重载worker
+// SetReloadWorker 是否重载worker
 func (mt *Monitor) SetReloadWorker(b bool) {
 	mt.isReloadWorker = b
 }

-//IsLeftWorkersAllFailed 剩下的线程是否全部失败
+// IsLeftWorkersAllFailed 剩下的线程是否全部失败
 func (mt *Monitor) IsLeftWorkersAllFailed() bool {
 	failedNum := 0
 	for _, worker := range mt.workers {
@@ -161,7 +161,7 @@ func (mt *Monitor) IsLeftWorkersAllFailed() bool {
 	return failedNum != 0
 }

-//registerAllCompleted 全部完成则发送消息
+// registerAllCompleted 全部完成则发送消息
 func (mt *Monitor) registerAllCompleted() {
 	mt.completed = make(chan struct{}, 0)
 	var (
@@ -197,7 +197,7 @@ func (mt *Monitor) registerAllCompleted() {
 	}()
 }

-//ResetFailedAndNetErrorWorkers 重设部分网络错误的worker
+// ResetFailedAndNetErrorWorkers 重设部分网络错误的worker
 func (mt *Monitor) ResetFailedAndNetErrorWorkers() {
 	for k := range mt.workers {
 		if !mt.resetController.CanReset() {
@@ -221,7 +221,7 @@ func (mt *Monitor) ResetFailedAndNetErrorWorkers() {
 	}
 }

-//RangeWorker 遍历worker
+// RangeWorker 遍历worker
 func (mt *Monitor) RangeWorker(f RangeWorkerFunc) {
 	for k := range mt.workers {
 		if !f(k, mt.workers[k]) {
@@ -230,14 +230,14 @@ func (mt *Monitor) RangeWorker(f RangeWorkerFunc) {
 	}
 }

-//Pause 暂停所有的下载
+// Pause 暂停所有的下载
 func (mt *Monitor) Pause() {
 	for k := range mt.workers {
 		mt.workers[k].Pause()
 	}
 }

-//Resume 恢复所有的下载
+// Resume 恢复所有的下载
 func (mt *Monitor) Resume() {
 	for k := range mt.workers {
 		mt.workers[k].Resume()
@@ -346,7 +346,10 @@ func (mt *Monitor) ResetWorker(worker *Worker) {
 		// 忽略, 返回
 		return
 	case StatusCodeDownloadUrlExpired: // 下载链接已经过期
-	    worker.RefreshDownloadUrl()
+		logger.Verbosef("download url expired, reset worker: %d\n", worker.ID())
+		worker.RefreshDownloadUrl()
+		break
+	case StatusCodeDownloadUrlExceedMaxConcurrency: // 下载遇到限流报错
 		break
 	}

@@ -357,7 +360,7 @@ func (mt *Monitor) ResetWorker(worker *Worker) {
 	worker.Reset()
 }

-//Execute 执行任务
+// Execute 执行任务
 func (mt *Monitor) Execute(cancelCtx context.Context) {
 	if len(mt.workers) == 0 {
 		mt.err = ErrNoWokers
@@ -406,7 +409,7 @@ func (mt *Monitor) Execute(cancelCtx context.Context) {

 			// 是否有失败的worker
 			for _, w := range mt.workers {
-				if w.status.statusCode == StatusCodeDownloadUrlExpired {
+				if w.status.statusCode == StatusCodeDownloadUrlExpired || w.status.statusCode == StatusCodeDownloadUrlExceedMaxConcurrency {
 					mt.ResetWorker(w)
 				}
 			}
@@ -4,7 +4,7 @@
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
-//     http://www.apache.org/licenses/LICENSE-2.0
+//	http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
@@ -63,11 +63,13 @@ const (
 	StatusCodeCanceled
 	//StatusCodeDownloadUrlExpired 下载链接已过期
 	StatusCodeDownloadUrlExpired
+	// StatusCodeDownloadUrlExceedMaxConcurrency 限流报错，下载链接超过最大并发数
+	StatusCodeDownloadUrlExceedMaxConcurrency
 	//StatusCodeIllegalDownloadFile 文件非法，不允许下载
 	StatusCodeIllegalDownloadFile
 )

-//GetStatusText 根据状态码获取状态信息
+// GetStatusText 根据状态码获取状态信息
 func GetStatusText(sc StatusCode) string {
 	switch sc {
 	case StatusCodeInit:
@@ -94,29 +96,33 @@ func GetStatusText(sc StatusCode) string {
 		return "已重设连接"
 	case StatusCodeCanceled:
 		return "已取消"
+	case StatusCodeDownloadUrlExpired:
+		return "链接已过期"
+	case StatusCodeDownloadUrlExceedMaxConcurrency:
+		return "遇到限流报错"
 	default:
 		return "未知状态码"
 	}
 }

-//NewWorkerStatus 初始化WorkerStatus
+// NewWorkerStatus 初始化WorkerStatus
 func NewWorkerStatus() *WorkerStatus {
 	return &WorkerStatus{
 		statusCode: StatusCodeInit,
 	}
 }

-//SetStatusCode 设置worker状态码
+// SetStatusCode 设置worker状态码
 func (ws *WorkerStatus) SetStatusCode(sc StatusCode) {
 	ws.statusCode = sc
 }

-//StatusCode 返回状态码
+// StatusCode 返回状态码
 func (ws *WorkerStatus) StatusCode() StatusCode {
 	return ws.statusCode
 }

-//StatusText 返回状态信息
+// StatusText 返回状态信息
 func (ws *WorkerStatus) StatusText() string {
 	return GetStatusText(ws.statusCode)
 }
@@ -4,7 +4,7 @@
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
-//     http://www.apache.org/licenses/LICENSE-2.0
+//	http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,8 +15,6 @@ package downloader

 import (
 	"errors"
-	"github.com/tickstep/library-go/logger"
-	"github.com/tickstep/library-go/requester"
 	mathrand "math/rand"
 	"mime"
 	"net/url"
@@ -24,6 +22,10 @@ import (
 	"regexp"
 	"strconv"
 	"time"
+
+	"github.com/tickstep/aliyunpan/internal/utils"
+	"github.com/tickstep/library-go/logger"
+	"github.com/tickstep/library-go/requester"
 )

 var (
@@ -99,3 +101,18 @@ func fixCacheSize(size *int) {
 		*size = 1024
 	}
 }
+
+// IsUrlExpired 下载链接是否已过期。过期返回True
+func IsUrlExpired(urlStr string) bool {
+	expiredTimeSec, err := utils.GetExpiredTimeSecFromOSSUrl(urlStr)
+	if err != nil {
+		// 解析错误，默认过期
+		return true
+	}
+	if (expiredTimeSec - time.Now().Unix()) <= 5 { // 小于5秒钟
+		// expired
+		return true
+	}
+	// 返回未过期
+	return false
+}
@@ -4,7 +4,7 @@
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
-//     http://www.apache.org/licenses/LICENSE-2.0
+//	http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
@@ -19,33 +19,37 @@ import (
 	"fmt"
 	"github.com/tickstep/aliyunpan-api/aliyunpan"
 	"github.com/tickstep/aliyunpan-api/aliyunpan/apierror"
+	"github.com/tickstep/aliyunpan/internal/config"
+	"github.com/tickstep/aliyunpan/library/requester/transfer"
 	"github.com/tickstep/library-go/cachepool"
 	"github.com/tickstep/library-go/logger"
 	"github.com/tickstep/library-go/requester"
 	"github.com/tickstep/library-go/requester/rio/speeds"
-	"github.com/tickstep/aliyunpan/library/requester/transfer"
 	"io"
+	"io/ioutil"
 	"net/http"
+	"strings"
 	"sync"
+	"time"
 )

 type (
 	//Worker 工作单元
 	Worker struct {
-		totalSize    int64 // 整个文件的大小, worker请求range时会获取尝试获取该值, 如果不匹配, 则返回错误
-		wrange       *transfer.Range
-		speedsStat   *speeds.Speeds
-		globalSpeedsStat   *speeds.Speeds // 全局速度统计
-		id           int    // work id
-		fileId       string // 文件ID
-		driveId     string
-		url          string // 下载地址
-		acceptRanges string
-		panClient    *aliyunpan.PanClient
-		client       *requester.HTTPClient
-		writerAt     io.WriterAt
-		writeMu      *sync.Mutex
-		execMu       sync.Mutex
+		totalSize        int64 // 整个文件的大小, worker请求range时会获取尝试获取该值, 如果不匹配, 则返回错误
+		wrange           *transfer.Range
+		speedsStat       *speeds.Speeds
+		globalSpeedsStat *speeds.Speeds // 全局速度统计
+		id               int            // work id
+		fileId           string         // 文件ID
+		driveId          string
+		url              string // 下载地址
+		acceptRanges     string
+		panClient        *config.PanClient
+		client           *requester.HTTPClient
+		writerAt         io.WriterAt
+		writeMu          *sync.Mutex
+		execMu           sync.Mutex

 		pauseChan              chan struct{}
 		workerCancelFunc       context.CancelFunc
@@ -67,19 +71,19 @@ func (wl WorkerList) Duplicate() WorkerList {
 	return n
 }

-//NewWorker 初始化Worker
+// NewWorker 初始化Worker
 func NewWorker(id int, driveId string, fileId, durl string, writerAt io.WriterAt, globalSpeedsStat *speeds.Speeds) *Worker {
 	return &Worker{
-		id:       id,
-		url:      durl,
-		writerAt: writerAt,
-		fileId: fileId,
-		driveId: driveId,
+		id:               id,
+		url:              durl,
+		writerAt:         writerAt,
+		fileId:           fileId,
+		driveId:          driveId,
 		globalSpeedsStat: globalSpeedsStat,
 	}
 }

-//ID 返回worker ID
+// ID 返回worker ID
 func (wer *Worker) ID() int {
 	return wer.id
 }
@@ -109,21 +113,21 @@ func (wer *Worker) SetTotalSize(size int64) {
 	wer.totalSize = size
 }

-//SetClient 设置http客户端
+// SetClient 设置http客户端
 func (wer *Worker) SetClient(c *requester.HTTPClient) {
 	wer.client = c
 }

-func (wer *Worker) SetPanClient(p *aliyunpan.PanClient) {
+func (wer *Worker) SetPanClient(p *config.PanClient) {
 	wer.panClient = p
 }

-//SetAcceptRange 设置AcceptRange
+// SetAcceptRange 设置AcceptRange
 func (wer *Worker) SetAcceptRange(acceptRanges string) {
 	wer.acceptRanges = acceptRanges
 }

-//SetRange 设置请求范围
+// SetRange 设置请求范围
 func (wer *Worker) SetRange(r *transfer.Range) {
 	if wer.wrange == nil {
 		wer.wrange = r
@@ -133,33 +137,38 @@ func (wer *Worker) SetRange(r *transfer.Range) {
 	wer.wrange.StoreEnd(r.LoadEnd())
 }

-//SetWriteMutex 设置数据写锁
+// SetWriteMutex 设置数据写锁
 func (wer *Worker) SetWriteMutex(mu *sync.Mutex) {
 	wer.writeMu = mu
 }

-//SetDownloadStatus 增加其他需要统计的数据
+// SetDownloadStatus 增加其他需要统计的数据
 func (wer *Worker) SetDownloadStatus(downloadStatus *transfer.DownloadStatus) {
 	wer.downloadStatus = downloadStatus
 }

-//GetStatus 返回下载状态
+// SetUrl 更新新的下载路径
+func (wer *Worker) SetUrl(newUrl string) {
+	wer.url = newUrl
+}
+
+// GetStatus 返回下载状态
 func (wer *Worker) GetStatus() WorkerStatuser {
 	// 空接口与空指针不等价
 	return &wer.status
 }

-//GetRange 返回worker范围
+// GetRange 返回worker范围
 func (wer *Worker) GetRange() *transfer.Range {
 	return wer.wrange
 }

-//GetSpeedsPerSecond 获取每秒的速度
+// GetSpeedsPerSecond 获取每秒的速度
 func (wer *Worker) GetSpeedsPerSecond() int64 {
 	return wer.speedsStat.GetSpeeds()
 }

-//Pause 暂停下载
+// Pause 暂停下载
 func (wer *Worker) Pause() {
 	wer.lazyInit()
 	if wer.acceptRanges == "" {
@@ -174,7 +183,7 @@ func (wer *Worker) Pause() {
 	wer.status.statusCode = StatusCodePaused
 }

-//Resume 恢复下载
+// Resume 恢复下载
 func (wer *Worker) Resume() {
 	if wer.status.statusCode != StatusCodePaused {
 		return
@@ -182,7 +191,7 @@ func (wer *Worker) Resume() {
 	go wer.Execute()
 }

-//Cancel 取消下载
+// Cancel 取消下载
 func (wer *Worker) Cancel() error {
 	if wer.workerCancelFunc == nil {
 		return errors.New("cancelFunc not set")
@@ -194,8 +203,9 @@ func (wer *Worker) Cancel() error {
 	return nil
 }

-//Reset 重设连接
+// Reset 重设连接
 func (wer *Worker) Reset() {
+	logger.Verbosef("Reset worker: %d\n", wer.ID())
 	if wer.resetFunc == nil {
 		logger.Verbosef("DEBUG: worker: resetFunc not set")
 		return
@@ -211,13 +221,15 @@ func (wer *Worker) Reset() {
 // RefreshDownloadUrl 重新刷新下载链接
 func (wer *Worker) RefreshDownloadUrl() {
 	var apierr *apierror.ApiError
-
-	durl, apierr := wer.panClient.GetFileDownloadUrl(&aliyunpan.GetFileDownloadUrlParam{DriveId: wer.driveId, FileId: wer.fileId})
+	logger.Verbosef("get new download url for worker: %d\n", wer.ID())
+	durl, apierr := wer.panClient.OpenapiPanClient().GetFileDownloadUrl(&aliyunpan.GetFileDownloadUrlParam{DriveId: wer.driveId, FileId: wer.fileId})
 	if apierr != nil {
+		logger.Verbosef("get new download url for worker: %d, error: %+v\n", wer.ID(), apierr)
 		wer.status.statusCode = StatusCodeTooManyConnections
 		return
 	}
 	wer.url = durl.Url
+	logger.Verbosef("get new download url for worker: %d, new url: %s\n", wer.ID(), wer.url)
 }

 // Canceled 是否已经取消
@@ -225,7 +237,7 @@ func (wer *Worker) Canceled() bool {
 	return wer.status.statusCode == StatusCodeCanceled
 }

-//Completed 是否已经完成
+// Completed 是否已经完成
 func (wer *Worker) Completed() bool {
 	switch wer.status.statusCode {
 	case StatusCodeSuccessed, StatusCodeCanceled:
@@ -235,7 +247,7 @@ func (wer *Worker) Completed() bool {
 	}
 }

-//Failed 是否失败
+// Failed 是否失败
 func (wer *Worker) Failed() bool {
 	switch wer.status.statusCode {
 	case StatusCodeFailed, StatusCodeInternalError, StatusCodeTooManyConnections, StatusCodeNetError:
@@ -245,18 +257,19 @@ func (wer *Worker) Failed() bool {
 	}
 }

-//ClearStatus 清空状态
+// ClearStatus 清空状态
 func (wer *Worker) ClearStatus() {
 	wer.status.statusCode = StatusCodeInit
 }

-//Err 返回worker错误
+// Err 返回worker错误
 func (wer *Worker) Err() error {
 	return wer.err
 }

-//Execute 执行任务
+// Execute 执行任务
 func (wer *Worker) Execute() {
+	logger.Verbosef("Execute worker: %d\n", wer.ID())
 	wer.lazyInit()

 	wer.execMu.Lock()
@@ -294,11 +307,19 @@ func (wer *Worker) Execute() {

 	wer.status.statusCode = StatusCodePending

-	var resp *http.Response
+	// check url expired or not
+	if IsUrlExpired(wer.url) {
+		logger.Verbosef("download url expired, renew url and reset worker: %d\n", wer.ID())
+		wer.status.statusCode = StatusCodeDownloadUrlExpired
+		wer.err = errors.New("403")
+		return
+	}

-	apierr := wer.panClient.DownloadFileData(wer.url, aliyunpan.FileDownloadRange{
+	// do download data
+	var resp *http.Response
+	apierr := wer.panClient.OpenapiPanClient().DownloadFileData(wer.url, aliyunpan.FileDownloadRange{
 		Offset: wer.wrange.Begin,
-		End: wer.wrange.End - 1,
+		End:    wer.wrange.End - 1,
 	}, func(httpMethod, fullUrl string, headers map[string]string) (*http.Response, error) {
 		resp, wer.err = wer.client.Req(httpMethod, fullUrl, nil, headers)
 		if wer.err != nil {
@@ -328,16 +349,41 @@ func (wer *Worker) Execute() {
 		break
 	case 416: //Requested Range Not Satisfiable
 		fallthrough
-	case 403: // Forbidden
-		fallthrough
+	case 403: // 链接过期也会返回403
+		if respBody, e := ioutil.ReadAll(resp.Body); e == nil {
+			respBodyStr := string(respBody)
+			if strings.Contains(respBodyStr, "Request has expired") { // 链接已过期
+				logger.Verboseln("download url return 403 error and expired url response")
+				wer.status.statusCode = StatusCodeDownloadUrlExpired
+				wer.err = errors.New(resp.Status)
+			} else if strings.Contains(respBodyStr, "ExceedMaxConcurrency") { // 遇到限流报错
+				// 普通应用：文件分片下载的并发数为 3，即某用户使用 App 时，可以同时下载 1 个文件的 3 个分片，或者同时下载 3 个文件的各 1 个分片。
+				// 超过并发，再次调用接口，报错 http status：403。示例报错信息如下：
+				// <?xml version="1.0" encoding="UTF-8"?>
+				//<Error>
+				//  <Code>RequestDeniedByCallback</Code>
+				//  <Message>Callback deny this request reason: ExceedMaxConcurrency</Message>
+				//  <RequestId>66B5720887CECD32333EB8C1</RequestId>
+				//  <HostId>cn-beijing-data.aliyundrive.net</HostId>
+				//  <EC>0007-00000209</EC>
+				//  <RecommendDoc>https://api.aliyun.com/troubleshoot?q=0007-00000209</RecommendDoc>
+				//</Error>
+				logger.Verboseln("download url return 403 error and exceed max concurrency response")
+				wer.status.statusCode = StatusCodeDownloadUrlExceedMaxConcurrency
+				wer.err = errors.New(resp.Status)
+
+				// 遇到限流，本线程延迟后，再重试
+				time.Sleep(10 * time.Second)
+			}
+		}
+		return
 	case 406: // Not Acceptable
 		wer.status.statusCode = StatusCodeNetError
 		wer.err = errors.New(resp.Status)
 		return
 	case 404:
-		wer.status.statusCode = StatusCodeDownloadUrlExpired
-		wer.err = errors.New(resp.Status)
-		return
+		logger.Verboseln("request download url 404 error")
+		fallthrough
 	case 429, 509: // Too Many Requests
 		wer.status.SetStatusCode(StatusCodeTooManyConnections)
 		wer.err = errors.New(resp.Status)
@@ -16,6 +16,7 @@ package downloader
 import (
 	"io"
 	"os"
+	"runtime"
 )

 type (
@@ -32,6 +33,9 @@ type (

 // NewDownloaderWriterByFilename 创建下载器数据输出接口, 类似于os.OpenFile
 func NewDownloaderWriterByFilename(name string, flag int, perm os.FileMode) (writer Writer, file *os.File, err error) {
+	if runtime.GOOS == "windows" {
+		// TODO: name进行特殊字符转换
+	}
 	file, err = os.OpenFile(name, flag, perm)
 	if err != nil {
 		return
@@ -4,7 +4,7 @@
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
-//     http://www.apache.org/licenses/LICENSE-2.0
+//	http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
@@ -30,6 +30,7 @@ type (
 		io.Seeker
 		Range() transfer.Range
 		Left() int64
+		ResetReader(readerAt io.ReaderAt)
 	}

 	fileBlock struct {
@@ -147,3 +148,8 @@ func (fb *fileBlock) Range() transfer.Range {
 func (fb *fileBlock) Readed() int64 {
 	return fb.readed
 }
+
+func (fb *fileBlock) ResetReader(readerAt io.ReaderAt) {
+	fb.readerAt = readerAt
+	fb.readed = 0
+}
@@ -4,7 +4,7 @@
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
-//     http://www.apache.org/licenses/LICENSE-2.0
+//	http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
@@ -13,16 +13,31 @@
 // limitations under the License.
 package uploader

+import "fmt"
+
+var (
+	UploadUrlExpired                  = fmt.Errorf("UrlExpired")
+	UploadPartNotSeq                  = fmt.Errorf("PartNotSequential")
+	UploadNoSuchUpload                = fmt.Errorf("NoSuchUpload")
+	UploadTerminate                   = fmt.Errorf("UploadErrorTerminate")
+	UploadPartAlreadyExist            = fmt.Errorf("PartAlreadyExist")
+	UploadHttpError                   = fmt.Errorf("HttpError")
+	UploadLocalFileAlreadyClosedError = fmt.Errorf("LocalFileAlreadyClosedError")
+)
+
 type (
 	// MultiError 多线程上传的错误
 	MultiError struct {
 		Err error
 		// IsRetry 是否重试,
-		Terminated bool
+		Terminated    bool
 		NeedStartOver bool // 是否从头开始上传
 	}
 )

 func (me *MultiError) Error() string {
-	return me.Err.Error()
+	if me.Err != nil {
+		return me.Err.Error()
+	}
+	return ""
 }
@@ -4,7 +4,7 @@
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
-//     http://www.apache.org/licenses/LICENSE-2.0
+//	http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
@@ -20,9 +20,9 @@ import (
 type (
 	// BlockState 文件区块信息
 	BlockState struct {
-		ID       int            `json:"id"`
-		Range    transfer.Range `json:"range"`
-		UploadDone bool `json:"upload_done"`
+		ID         int            `json:"id"`
+		Range      transfer.Range `json:"range"`
+		UploadDone bool           `json:"upload_done"`
 	}

 	// InstanceState 上传断点续传信息
@@ -39,18 +39,14 @@ func (muer *MultiUploader) getWorkerListByInstanceState(is *InstanceState) worke
 				id:         blockState.ID,
 				partOffset: blockState.Range.Begin,
 				splitUnit:  NewBufioSplitUnit(muer.file, blockState.Range, muer.speedsStat, muer.rateLimit, muer.globalSpeedsStat),
-				uploadDone:   false,
+				uploadDone: false,
 			})
 		} else {
-			// 已经完成的, 也要加入 (可继续优化)
+			// 已经完成的, 也要加入
 			workers = append(workers, &worker{
 				id:         blockState.ID,
 				partOffset: blockState.Range.Begin,
-				splitUnit: &fileBlock{
-					readRange: blockState.Range,
-					readed:    blockState.Range.End - blockState.Range.Begin,
-					readerAt:  muer.file,
-				},
+				splitUnit:  NewBufioSplitUnit(muer.file, blockState.Range, muer.speedsStat, muer.rateLimit, muer.globalSpeedsStat),
 				uploadDone: true,
 			})
 		}
@@ -4,7 +4,7 @@
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
-//     http://www.apache.org/licenses/LICENSE-2.0
+//	http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,8 +16,10 @@ package uploader
 import (
 	"context"
 	"github.com/tickstep/aliyunpan-api/aliyunpan"
+	"github.com/tickstep/aliyunpan/internal/config"
 	"github.com/tickstep/aliyunpan/internal/utils"
 	"github.com/tickstep/library-go/converter"
+	"github.com/tickstep/library-go/logger"
 	"github.com/tickstep/library-go/requester"
 	"github.com/tickstep/library-go/requester/rio"
 	"github.com/tickstep/library-go/requester/rio/speeds"
@@ -60,6 +62,7 @@ type (

 		// 网盘上传参数
 		UploadOpEntity *aliyunpan.CreateFileUploadResult `json:"uploadOpEntity"`
+		panClient      *config.PanClient
 	}

 	// MultiUploaderConfig 多线程上传配置
@@ -71,12 +74,13 @@ type (
 )

 // NewMultiUploader 初始化上传
-func NewMultiUploader(multiUpload MultiUpload, file rio.ReaderAtLen64, config *MultiUploaderConfig, uploadOpEntity *aliyunpan.CreateFileUploadResult, globalSpeedsStat *speeds.Speeds) *MultiUploader {
+func NewMultiUploader(multiUpload MultiUpload, file rio.ReaderAtLen64, config *MultiUploaderConfig, uploadOpEntity *aliyunpan.CreateFileUploadResult, panClient *config.PanClient, globalSpeedsStat *speeds.Speeds) *MultiUploader {
 	return &MultiUploader{
 		multiUpload:      multiUpload,
 		file:             file,
 		config:           config,
 		UploadOpEntity:   uploadOpEntity,
+		panClient:        panClient,
 		globalSpeedsStat: globalSpeedsStat,
 	}
 }
@@ -136,13 +140,13 @@ func (muer *MultiUploader) Execute() error {
 	// 分配任务
 	if muer.instanceState != nil {
 		muer.workers = muer.getWorkerListByInstanceState(muer.instanceState)
-		uploaderVerbose.Infof("upload task CREATED from instance state\n")
+		logger.Verbosef("upload task CREATED from instance state\n")
 	} else {
 		muer.workers = muer.getWorkerListByInstanceState(&InstanceState{
 			BlockList: SplitBlock(muer.file.Len(), muer.config.BlockSize),
 		})

-		uploaderVerbose.Infof("upload task CREATED: block size: %d, num: %d\n", muer.config.BlockSize, len(muer.workers))
+		logger.Verbosef("upload task CREATED: block size: %d, worker num: %d\n", muer.config.BlockSize, len(muer.workers))
 	}

 	// 开始上传
@@ -194,32 +198,32 @@ func (muer *MultiUploader) Cancel() {
 	close(muer.canceled)
 }

-//OnExecute 设置开始上传事件
+// OnExecute 设置开始上传事件
 func (muer *MultiUploader) OnExecute(onExecuteEvent requester.Event) {
 	muer.onExecuteEvent = onExecuteEvent
 }

-//OnSuccess 设置成功上传事件
+// OnSuccess 设置成功上传事件
 func (muer *MultiUploader) OnSuccess(onSuccessEvent requester.Event) {
 	muer.onSuccessEvent = onSuccessEvent
 }

-//OnFinish 设置结束上传事件
+// OnFinish 设置结束上传事件
 func (muer *MultiUploader) OnFinish(onFinishEvent requester.Event) {
 	muer.onFinishEvent = onFinishEvent
 }

-//OnCancel 设置取消上传事件
+// OnCancel 设置取消上传事件
 func (muer *MultiUploader) OnCancel(onCancelEvent requester.Event) {
 	muer.onCancelEvent = onCancelEvent
 }

-//OnError 设置上传发生错误事件
+// OnError 设置上传发生错误事件
 func (muer *MultiUploader) OnError(onErrorEvent requester.EventOnError) {
 	muer.onErrorEvent = onErrorEvent
 }

-//OnUploadStatusEvent 设置上传状态事件
+// OnUploadStatusEvent 设置上传状态事件
 func (muer *MultiUploader) OnUploadStatusEvent(f UploadStatusFunc) {
 	muer.onUploadStatusEvent = f
 }
@@ -4,7 +4,7 @@
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
-//     http://www.apache.org/licenses/LICENSE-2.0
+//	http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,16 +15,18 @@ package uploader

 import (
 	"context"
+	"errors"
 	"github.com/oleiade/lane"
 	"github.com/tickstep/aliyunpan/internal/waitgroup"
+	"github.com/tickstep/library-go/logger"
 	"github.com/tickstep/library-go/requester"
-	"os"
+	"io"
 	"strconv"
 )

 type (
 	worker struct {
-		id         int
+		id         int // ID从0开始计数
 		partOffset int64
 		splitUnit  SplitUnit
 		uploadDone bool
@@ -33,10 +35,17 @@ type (
 	workerList []*worker
 )

+// Readed 获取已上传大小
 func (werl *workerList) Readed() int64 {
 	var readed int64
 	for _, wer := range *werl {
-		readed += wer.splitUnit.Readed()
+		if wer.uploadDone {
+			// 已经上传完成的分片
+			readed += wer.splitUnit.Range().End - wer.splitUnit.Range().Begin
+		} else {
+			// 正在上传中的分片
+			readed += wer.splitUnit.Readed()
+		}
 	}
 	return readed
 }
@@ -66,77 +75,88 @@ func (muer *MultiUploader) upload() (uperr error) {
 	uploadClient.SetKeepAlive(true)

 	for {
-		// 阿里云盘只支持分片按顺序上传，这里正常应该是parallel = 1
+		// 阿里云盘只支持分片按顺序上传，这里必须是parallel = 1
 		wg := waitgroup.NewWaitGroup(muer.config.Parallel)
-		for {
-			e := uploadDeque.Shift()
-			if e == nil { // 任务为空
-				break
-			}
+		wg.AddDelta()

-			wer := e.(*worker)
-			wg.AddDelta()
-			go func() {
-				defer wg.Done()
-
-				var (
-					ctx, cancel = context.WithCancel(context.Background())
-					doneChan    = make(chan struct{})
-					uploadDone  bool
-					terr        error
-				)
-				go func() {
-					if !wer.uploadDone {
-						uploaderVerbose.Info("begin to upload part: " + strconv.Itoa(wer.id))
-						uploadDone, terr = muer.multiUpload.UploadFile(ctx, int(wer.id), wer.partOffset, wer.splitUnit.Range().End, wer.splitUnit, uploadClient)
-					} else {
-						uploadDone = true
-					}
-					close(doneChan)
-				}()
-				select {
-				case <-muer.canceled:
-					cancel()
-					return
-				case <-doneChan:
-					// continue
-					uploaderVerbose.Info("multiUpload worker upload file done")
-				}
-				cancel()
-				if terr != nil {
-					if me, ok := terr.(*MultiError); ok {
-						if me.Terminated { // 终止
-							muer.closeCanceledOnce.Do(func() { // 只关闭一次
-								close(muer.canceled)
-							})
-							uperr = me.Err
-							return
-						} else if me.NeedStartOver {
-							uploaderVerbose.Warnf("upload start over: %d\n", wer.id)
-							// 从头开始上传
-							muer.closeCanceledOnce.Do(func() { // 只关闭一次
-								close(muer.canceled)
-							})
-							uperr = me.Err
-							return
-						}
-					}
-
-					uploaderVerbose.Warnf("upload err: %s, id: %d\n", terr, wer.id)
-					wer.splitUnit.Seek(0, os.SEEK_SET)
-					uploadDeque.Append(wer)
-					return
-				}
-				wer.uploadDone = uploadDone
-
-				// 通知更新
-				if muer.updateInstanceStateChan != nil && len(muer.updateInstanceStateChan) < cap(muer.updateInstanceStateChan) {
-					muer.updateInstanceStateChan <- struct{}{}
-				}
-			}()
+		uperr = nil
+		e := uploadDeque.Shift()
+		if e == nil { // 任务为空
+			break
 		}
-		wg.Wait()

+		wer := e.(*worker)
+		go func() { // 异步上传
+			defer wg.Done()
+
+			var (
+				ctx, cancel = context.WithCancel(context.Background())
+				doneChan    = make(chan struct{})
+				uploadDone  bool
+				terr        error
+			)
+			go func() {
+				if !wer.uploadDone {
+					logger.Verboseln("begin to upload part num: " + strconv.Itoa(wer.id+1))
+					uploadDone, terr = muer.multiUpload.UploadFile(ctx, int(wer.id), wer.partOffset, wer.splitUnit.Range().End, wer.splitUnit, uploadClient)
+				} else {
+					uploadDone = true
+				}
+				close(doneChan)
+			}()
+			select { // 监听上传进程，循环阻塞
+			case <-muer.canceled:
+				cancel()
+				return
+			case <-doneChan:
+				// continue
+				logger.Verboseln("multiUpload worker upload file http action done")
+			}
+			cancel()
+			if terr != nil {
+				logger.Verbosef("upload file part err: %+v\n", terr)
+				if me, ok := terr.(*MultiError); ok {
+					if me.Terminated { // 终止
+						muer.closeCanceledOnce.Do(func() { // 只关闭一次
+							close(muer.canceled)
+						})
+						uperr = me.Err
+						return
+					} else if me.NeedStartOver {
+						logger.Verbosef("upload start over: %d\n", wer.id)
+						// 从头开始上传
+						muer.closeCanceledOnce.Do(func() { // 只关闭一次
+							close(muer.canceled)
+						})
+						uperr = me.Err
+						return
+					} else {
+						uperr = me.Err
+						return
+					}
+				}
+
+				logger.Verbosef("upload worker err: %s, id: %d\n", terr, wer.id)
+				wer.splitUnit.Seek(0, io.SeekStart)
+				uploadDeque.Prepend(wer) // 放回上传队列首位
+				return
+			}
+			wer.uploadDone = uploadDone
+
+			// 通知更新
+			if muer.updateInstanceStateChan != nil && len(muer.updateInstanceStateChan) < cap(muer.updateInstanceStateChan) {
+				muer.updateInstanceStateChan <- struct{}{}
+			}
+		}()
+		wg.Wait()
+		if uperr != nil {
+			if errors.Is(uperr, UploadPartNotSeq) ||
+				errors.Is(uperr, UploadNoSuchUpload) ||
+				errors.Is(uperr, UploadLocalFileAlreadyClosedError) {
+				// 清空数据，停止上传
+				uploadDeque = lane.NewDeque() // 清空待上传列表
+			}
+		}
 		// 没有任务了
 		if uploadDeque.Size() == 0 {
 			break
@@ -146,6 +166,13 @@ func (muer *MultiUploader) upload() (uperr error) {
 	// 释放链路
 	uploadClient.CloseIdleConnections()

+	// 返回错误，通知上层客户端进行处理
+	if errors.Is(uperr, UploadPartNotSeq) ||
+		errors.Is(uperr, UploadNoSuchUpload) ||
+		errors.Is(uperr, UploadLocalFileAlreadyClosedError) {
+		return uperr
+	}
+
 	select {
 	case <-muer.canceled:
 		if uperr != nil {
@@ -164,11 +191,11 @@ func (muer *MultiUploader) upload() (uperr error) {
 	if allSuccess {
 		e := muer.multiUpload.CommitFile()
 		if e != nil {
-			uploaderVerbose.Warn("upload file commit failed: " + e.Error())
+			logger.Verboseln("upload file commit failed: " + e.Error())
 			return e
 		}
 	} else {
-		uploaderVerbose.Warn("upload file not all success: " + muer.UploadOpEntity.FileId)
+		logger.Verboseln("upload file not all success: " + muer.UploadOpEntity.FileId)
 	}

 	return
@@ -4,7 +4,7 @@
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
-//     http://www.apache.org/licenses/LICENSE-2.0
+//	http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
@@ -14,6 +14,7 @@
 package uploader

 import (
+	"sync/atomic"
 	"time"
 )

@@ -24,6 +25,7 @@ type (
 		Uploaded() int64            // 已上传数据
 		SpeedsPerSecond() int64     // 每秒的上传速度
 		TimeElapsed() time.Duration // 上传时间
+		TimeLeft() time.Duration    // 预计剩余时间, 负数代表未知
 	}

 	// UploadStatus 上传状态
@@ -42,11 +44,21 @@ func (us *UploadStatus) TotalSize() int64 {
 	return us.totalSize
 }

+// SetTotalSize 设置总大小
+func (us *UploadStatus) SetTotalSize(size int64) {
+	us.totalSize = size
+}
+
 // Uploaded 返回已上传数据
 func (us *UploadStatus) Uploaded() int64 {
 	return us.uploaded
 }

+// SetUploaded 设置已上传数据
+func (us *UploadStatus) SetUploaded(size int64) {
+	us.uploaded = size
+}
+
 // SpeedsPerSecond 返回每秒的上传速度
 func (us *UploadStatus) SpeedsPerSecond() int64 {
 	return us.speedsPerSecond
@@ -57,6 +69,18 @@ func (us *UploadStatus) TimeElapsed() time.Duration {
 	return us.timeElapsed
 }

+// TimeLeft 返回预计剩余时间, 负数代表未知
+func (us *UploadStatus) TimeLeft() time.Duration {
+	var left time.Duration
+	speeds := atomic.LoadInt64(&us.speedsPerSecond)
+	if speeds <= 0 {
+		left = -1
+	} else {
+		left = time.Duration((us.totalSize-us.uploaded)/(speeds)) * time.Second
+	}
+	return left
+}
+
 // GetStatusChan 获取上传状态
 func (u *Uploader) GetStatusChan() <-chan Status {
 	c := make(chan Status)
@@ -14,10 +14,8 @@
 package uploader

 import (
-	"github.com/tickstep/aliyunpan/internal/config"
 	"github.com/tickstep/aliyunpan/internal/utils"
 	"github.com/tickstep/library-go/converter"
-	"github.com/tickstep/library-go/logger"
 	"github.com/tickstep/library-go/requester"
 	"github.com/tickstep/library-go/requester/rio"
 	"net/http"
@@ -51,10 +49,6 @@ type (
 	}
 )

-var (
-	uploaderVerbose = logger.New("UPLOADER", config.EnvVerbose)
-)
-
 // NewUploader 返回 uploader 对象, url: 上传地址, readerlen64: 实现 rio.ReaderLen64 接口的对象, 例如文件
 func NewUploader(url string, readerlen64 rio.ReaderLen64) (uploader *Uploader) {
 	uploader = &Uploader{
@@ -4,7 +4,7 @@
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
-//     http://www.apache.org/licenses/LICENSE-2.0
+//	http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
@@ -14,38 +14,45 @@
 package pandownload

 import (
-	"errors"
 	"fmt"
+	"io"
+	"os"
+	"path"
+	"path/filepath"
+	"sort"
+	"strconv"
+	"strings"
+	"time"
+
 	"github.com/tickstep/aliyunpan-api/aliyunpan"
 	"github.com/tickstep/aliyunpan-api/aliyunpan/apierror"
 	"github.com/tickstep/aliyunpan/cmder/cmdtable"
 	"github.com/tickstep/aliyunpan/internal/config"
 	"github.com/tickstep/aliyunpan/internal/file/downloader"
 	"github.com/tickstep/aliyunpan/internal/functions"
+	"github.com/tickstep/aliyunpan/internal/global"
+	"github.com/tickstep/aliyunpan/internal/localfile"
+	"github.com/tickstep/aliyunpan/internal/log"
 	"github.com/tickstep/aliyunpan/internal/plugins"
 	"github.com/tickstep/aliyunpan/internal/taskframework"
+	"github.com/tickstep/aliyunpan/internal/ui"
+	"github.com/tickstep/aliyunpan/internal/utils"
 	"github.com/tickstep/aliyunpan/library/requester/transfer"
 	"github.com/tickstep/library-go/converter"
 	"github.com/tickstep/library-go/logger"
-	"github.com/tickstep/library-go/requester"
 	"github.com/tickstep/library-go/requester/rio/speeds"
-	"io"
-	"net/http"
-	"os"
-	"path"
-	"path/filepath"
-	"strconv"
-	"strings"
-	"time"
 )

 type (
 	// DownloadTaskUnit 下载的任务单元
 	DownloadTaskUnit struct {
-		taskInfo *taskframework.TaskInfo // 任务信息
+		// DownloadActionId 下载动作ID，唯一标识一次下载动作的ID。这个ID每次下载任务启动的时候会自动生成，同一次下载任务下载的文件，这个ID都是同一个值。
+		DownloadActionId string
+		taskInfo         *taskframework.TaskInfo // 任务信息

 		Cfg                *downloader.Config
-		PanClient          *aliyunpan.PanClient
+		PanClient          *config.PanClient
+		SubPanClientList   []*config.PanClient // 辅助下载子账号列表
 		ParentTaskExecutor *taskframework.TaskExecutor

 		DownloadStatistic *DownloadStatistic // 下载统计
@@ -53,18 +60,23 @@ type (

 		// 可选项
 		VerbosePrinter       *logger.CmdVerbose
-		PrintFormat          string
 		IsPrintStatus        bool // 是否输出各个下载线程的详细信息
 		IsExecutedPermission bool // 下载成功后是否加上执行权限
 		IsOverwrite          bool // 是否覆盖已存在的文件
 		NoCheck              bool // 不校验文件

-		FilePanPath        string // 要下载的网盘文件路径
-		SavePath           string // 文件保存在本地的路径
-		OriginSaveRootPath string // 文件保存在本地的根目录路径
-		DriveId            string
+		FilePanSource      global.FileSourceType // 要下载的网盘文件来源
+		FilePanPath        string                // 要下载的网盘文件路径
+		SavePath           string                // 文件保存在本地的路径
+		OriginSaveRootPath string                // 文件保存在本地的根目录路径
+		DriveId            string                // 网盘ID

 		fileInfo *aliyunpan.FileEntity // 文件或目录详情
+
+		// 下载文件记录器
+		FileRecorder *log.FileRecorder
+
+		UI *ui.DashboardPanel // 下载统计面板UI
 	}
 )

@@ -85,6 +97,12 @@ const (
 	DefaultDownloadMaxRetry = 3
 )

+// SetFileInfo 设置文件信息
+func (dtu *DownloadTaskUnit) SetFileInfo(source global.FileSourceType, f *aliyunpan.FileEntity) {
+	dtu.FilePanSource = source
+	dtu.fileInfo = f
+}
+
 func (dtu *DownloadTaskUnit) SetTaskInfo(info *taskframework.TaskInfo) {
 	dtu.taskInfo = info
 }
@@ -95,53 +113,108 @@ func (dtu *DownloadTaskUnit) verboseInfof(format string, a ...interface{}) {
 	}
 }

-// download 执行下载
+// logf 打印文本日志
+func (dtu *DownloadTaskUnit) logf(format string, a ...interface{}) {
+	if dtu.UI != nil {
+		// 使用UI面板显示下载日志
+		dtu.UI.Logf(format, a...)
+		return
+	}
+
+	// 使用传统单行文本显示下载日志，直接输出到控制台
+	fmt.Printf(format, a...)
+}
+
+// updateUITaskState 更新UI下载面板的任务状态
+func (dtu *DownloadTaskUnit) updateUITaskState(state ui.TaskState, message string) {
+	if dtu.UI == nil {
+		return
+	}
+	dtu.UI.MarkTaskState(dtu.taskInfo.Id(), state, message)
+}
+
+// download 执行下载文件（非目录）
 func (dtu *DownloadTaskUnit) download() (err error) {
 	var (
 		writer downloader.Writer
 		file   *os.File
 	)

-	dtu.Cfg.InstanceStatePath = dtu.SavePath + DownloadSuffix
-
 	// 创建下载的目录
 	// 获取SavePath所在的目录
 	dir := filepath.Dir(dtu.SavePath)
-	fileInfo, err := os.Stat(dir)
-	if err != nil {
-		// 目录不存在, 创建
-		err = os.MkdirAll(dir, 0777)
+	//fileInfo, err := os.Stat(dir)
+	//if err != nil {
+	//	// 目录不存在, 创建
+	//	err = os.MkdirAll(dir, 0777)
+	//	if err != nil {
+	//		return err
+	//	}
+	//} else if !fileInfo.IsDir() {
+	//	// SavePath所在的目录不是目录
+	//	return fmt.Errorf("%s, path %s: not a directory", StrDownloadInitError, dir)
+	//}
+	// 支持本地符号链接文件，整体逻辑和上面注释代码一致
+	savePathSymlinkFile := localfile.SymlinkFile{
+		LogicPath: dtu.SavePath,
+		RealPath:  "",
+	}
+	originSaveRootSymlinkFile := localfile.NewSymlinkFile(dtu.OriginSaveRootPath)
+	suffixPath := localfile.GetSuffixPath(dir, dtu.OriginSaveRootPath)
+	saveDirPathSymlinkFile, saveDirPathFileInfo, err := localfile.RetrieveRealPathFromLogicSuffixPath(originSaveRootSymlinkFile, suffixPath)
+	if err != nil && !os.IsExist(err) {
+		// 本地保存目录不存在，需要创建对应的保存目录
+		realSaveDirPath := saveDirPathSymlinkFile.RealPath
+		suffixPath = localfile.GetSuffixPath(filepath.Dir(dtu.SavePath), saveDirPathSymlinkFile.LogicPath) // 获取后缀不存在的路径
+		if suffixPath != "" {
+			realSaveDirPath = filepath.Join(realSaveDirPath, suffixPath) // 拼接
+		}
+		// 创建保存目录
+		err = os.MkdirAll(realSaveDirPath, 0777)
 		if err != nil {
 			return err
 		}
-	} else if !fileInfo.IsDir() {
+
+		// 拼接完整的保存文件路径
+		savePathSymlinkFile.RealPath = filepath.Join(realSaveDirPath, filepath.Base(localfile.CleanPath(dtu.SavePath)))
+	} else if !saveDirPathFileInfo.IsDir() {
 		// SavePath所在的目录不是目录
-		return fmt.Errorf("%s, path %s: not a directory", StrDownloadInitError, dir)
+		return fmt.Errorf("%s, path %s: not a directory", StrDownloadInitError, saveDirPathSymlinkFile.RealPath)
+	} else {
+		// 保存目录已存在，直接拼接成文件完整保存路径
+		savePathSymlinkFile.RealPath = filepath.Join(saveDirPathSymlinkFile.RealPath, filepath.Base(localfile.CleanPath(dtu.SavePath)))
 	}
+	savePathSymlinkFile, _, _ = localfile.RetrieveRealPath(savePathSymlinkFile)
+
+	// 下载配置文件存储路径
+	dtu.Cfg.InstanceStatePath = savePathSymlinkFile.RealPath + DownloadSuffix

 	// 打开文件
-	writer, file, err = downloader.NewDownloaderWriterByFilename(dtu.SavePath, os.O_CREATE|os.O_WRONLY, 0666)
+	writer, file, err = downloader.NewDownloaderWriterByFilename(savePathSymlinkFile.RealPath, os.O_CREATE|os.O_WRONLY, 0666)
 	if err != nil {
 		return fmt.Errorf("%s, %s", StrDownloadInitError, err)
 	}
 	defer file.Close()

-	der := downloader.NewDownloader(writer, dtu.Cfg, dtu.PanClient, dtu.GlobalSpeedsStat)
-	der.SetFileInfo(dtu.fileInfo)
+	der := downloader.NewDownloader(writer, dtu.Cfg, dtu.PanClient, dtu.SubPanClientList, dtu.GlobalSpeedsStat)
+	der.SetFileInfo(dtu.FilePanSource, dtu.fileInfo)
 	der.SetDriveId(dtu.DriveId)
 	der.SetStatusCodeBodyCheckFunc(func(respBody io.Reader) error {
 		// 解析错误
 		return apierror.NewFailedApiError("")
 	})

-	// 检查输出格式
-	if dtu.PrintFormat == "" {
-		dtu.PrintFormat = DefaultPrintFormat
-	}
-
 	// 这里用共享变量的方式
 	isComplete := false
 	der.OnDownloadStatusEvent(func(status transfer.DownloadStatuser, workersCallback func(downloader.RangeWorkerFunc)) {
+		// 方式1：使用UI统计面板显示下载进度
+		if dtu.UI != nil {
+			// 更新UI面板任务状态
+			dtu.UI.UpdateTaskProgress(dtu.taskInfo.Id(), status.Downloaded(), status.TotalSize(), status.SpeedsPerSecond(), status.TimeLeft())
+			return
+		}
+
+		// 方式2：使用传统单行显示下载进度
 		// 这里可能会下载结束了, 还会输出内容
 		builder := &strings.Builder{}
 		if dtu.IsPrintStatus {
@@ -171,9 +244,11 @@ func (dtu *DownloadTaskUnit) download() (err error) {
 		}

 		if dtu.Cfg.ShowProgress {
-			fmt.Fprintf(builder, "\r[%s] ↓ %s/%s %s/s(%s/s) in %s, left %s ............", dtu.taskInfo.Id(),
+			downloadedPercentage := fmt.Sprintf("%.2f%%", float64(status.Downloaded())/float64(status.TotalSize())*100)
+			fmt.Fprintf(builder, "\r[%s] ↓ %s/%s(%s) %s/s(%s/s) in %s, left %s ............", dtu.taskInfo.Id(),
 				converter.ConvertFileSize(status.Downloaded(), 2),
 				converter.ConvertFileSize(status.TotalSize(), 2),
+				downloadedPercentage,
 				converter.ConvertFileSize(status.SpeedsPerSecond(), 2),
 				converter.ConvertFileSize(dtu.GlobalSpeedsStat.GetSpeeds(), 2),
 				status.TimeElapsed()/1e7*1e7, leftStr,
@@ -187,7 +262,7 @@ func (dtu *DownloadTaskUnit) download() (err error) {
 	})

 	der.OnExecute(func() {
-		fmt.Printf("[%s] 下载开始\n", dtu.taskInfo.Id())
+		dtu.logf("[%s] 下载开始\n", dtu.taskInfo.Id())
 	})

 	err = der.Execute()
@@ -204,7 +279,7 @@ func (dtu *DownloadTaskUnit) download() (err error) {
 			if removeErr != nil {
 				dtu.verboseInfof("[%s] remove file error: %s\n", dtu.taskInfo.Id(), removeErr)
 			}
-			fmt.Printf("[%s] 下载失败，文件不合法或者被禁止下载: %s\n", dtu.taskInfo.Id(), dtu.SavePath)
+			dtu.logf("[%s] 下载失败，文件不合法或者被禁止下载: %s\n", dtu.taskInfo.Id(), dtu.SavePath)
 			return err
 		} else {
 			// 下载发生错误
@@ -229,33 +304,21 @@ func (dtu *DownloadTaskUnit) download() (err error) {
 	if dtu.IsExecutedPermission {
 		err = file.Chmod(0766)
 		if err != nil {
-			fmt.Printf("[%s] 警告, 加执行权限错误: %s\n", dtu.taskInfo.Id(), err)
+			dtu.logf("[%s] 警告, 加执行权限错误: %s\n", dtu.taskInfo.Id(), err)
 		}
 	}
-	fmt.Printf("\n[%s] 下载完成, 保存位置: %s\n", dtu.taskInfo.Id(), dtu.SavePath)
+	dtu.logf("\n[%s] 下载完成, 保存位置: %s\n", dtu.taskInfo.Id(), dtu.SavePath)

 	return nil
 }

-//panHTTPClient 获取包含特定User-Agent的HTTPClient
-func (dtu *DownloadTaskUnit) panHTTPClient() (client *requester.HTTPClient) {
-	client = requester.NewHTTPClient()
-	client.CheckRedirect = func(req *http.Request, via []*http.Request) error {
-		if len(via) >= 10 {
-			return errors.New("stopped after 10 redirects")
-		}
-		return nil
-	}
-	client.SetTimeout(20 * time.Minute)
-	client.SetKeepAlive(true)
-	return client
-}
-
+// handleError 下载错误处理器
 func (dtu *DownloadTaskUnit) handleError(result *taskframework.TaskUnitRunResult) {
 	switch value := result.Err.(type) {
 	case *apierror.ApiError:
 		switch value.ErrCode() {
 		case apierror.ApiCodeFileNotFoundCode:
+		case apierror.ApiCodeForbiddenFileInTheRecycleBin:
 			result.NeedRetry = false
 			break
 		default:
@@ -275,7 +338,7 @@ func (dtu *DownloadTaskUnit) handleError(result *taskframework.TaskUnitRunResult
 	time.Sleep(1 * time.Second)
 }

-//checkFileValid 检测文件有效性
+// checkFileValid 检测文件有效性
 func (dtu *DownloadTaskUnit) checkFileValid(result *taskframework.TaskUnitRunResult) (ok bool) {
 	if dtu.NoCheck {
 		// 不检测文件有效性
@@ -284,7 +347,7 @@ func (dtu *DownloadTaskUnit) checkFileValid(result *taskframework.TaskUnitRunRes

 	if dtu.fileInfo.FileSize >= 128*converter.MB {
 		// 大文件, 输出一句提示消息
-		fmt.Printf("[%s] 开始检验文件有效性, 请稍候...\n", dtu.taskInfo.Id())
+		dtu.logf("[%s] 开始检验文件有效性, 请稍候...\n", dtu.taskInfo.Id())
 	}

 	// 就在这里处理校验出错
@@ -297,7 +360,7 @@ func (dtu *DownloadTaskUnit) checkFileValid(result *taskframework.TaskUnitRunRes
 			// 文件不支持校验
 			result.ResultMessage = "检验文件有效性"
 			result.Err = err
-			fmt.Printf("[%s] 检验文件有效性: %s\n", dtu.taskInfo.Id(), err)
+			dtu.logf("[%s] 检验文件有效性: %s\n", dtu.taskInfo.Id(), err)
 			return true
 		case ErrDownloadFileBanned:
 			// 违规文件
@@ -315,7 +378,7 @@ func (dtu *DownloadTaskUnit) checkFileValid(result *taskframework.TaskUnitRunRes
 		}
 	}

-	fmt.Printf("[%s] 检验文件有效性成功: %s\n", dtu.taskInfo.Id(), dtu.SavePath)
+	dtu.logf("[%s] 检验文件有效性成功: %s\n", dtu.taskInfo.Id(), dtu.SavePath)
 	return true
 }

@@ -323,28 +386,52 @@ func (dtu *DownloadTaskUnit) OnRetry(lastRunResult *taskframework.TaskUnitRunRes
 	// 输出错误信息
 	if lastRunResult.Err == nil {
 		// result中不包含Err, 忽略输出
-		fmt.Printf("[%s] %s, 重试 %d/%d\n", dtu.taskInfo.Id(), lastRunResult.ResultMessage, dtu.taskInfo.Retry(), dtu.taskInfo.MaxRetry())
+		dtu.logf("[%s] %s, 重试 %d/%d\n", dtu.taskInfo.Id(), lastRunResult.ResultMessage, dtu.taskInfo.Retry(), dtu.taskInfo.MaxRetry())
 		return
 	}
-	fmt.Printf("[%s] %s, %s, 重试 %d/%d\n", dtu.taskInfo.Id(), lastRunResult.ResultMessage, lastRunResult.Err, dtu.taskInfo.Retry(), dtu.taskInfo.MaxRetry())
+	dtu.logf("[%s] %s, %s, 重试 %d/%d\n", dtu.taskInfo.Id(), lastRunResult.ResultMessage, lastRunResult.Err, dtu.taskInfo.Retry(), dtu.taskInfo.MaxRetry())
 }

 func (dtu *DownloadTaskUnit) OnSuccess(lastRunResult *taskframework.TaskUnitRunResult) {
 	// 执行插件
 	dtu.pluginCallback("success")
+
+	// 更新UI面板任务状态
+	dtu.updateUITaskState(ui.TaskSuccess, "")
+
+	// 下载文件数据记录
+	if config.Config.FileRecordConfig == "1" {
+		if dtu.fileInfo.IsFile() {
+			if dtu.FileRecorder != nil {
+				dtu.FileRecorder.Append(&log.FileRecordItem{
+					Status:   "成功",
+					TimeStr:  utils.NowTimeStr(),
+					FileSize: dtu.fileInfo.FileSize,
+					FilePath: dtu.fileInfo.Path,
+				})
+			}
+		}
+	}
 }

 func (dtu *DownloadTaskUnit) OnFailed(lastRunResult *taskframework.TaskUnitRunResult) {
 	// 失败
 	dtu.pluginCallback("fail")

+	// 更新UI面板
+	failedMessage := lastRunResult.ResultMessage
+	if lastRunResult.Err != nil {
+		failedMessage = fmt.Sprintf("%s, %s", lastRunResult.ResultMessage, lastRunResult.Err)
+	}
+	dtu.updateUITaskState(ui.TaskFailed, failedMessage)
+
 	// 失败
 	if lastRunResult.Err == nil {
 		// result中不包含Err, 忽略输出
-		fmt.Printf("[%s] %s\n", dtu.taskInfo.Id(), lastRunResult.ResultMessage)
+		dtu.logf("[%s] %s\n", dtu.taskInfo.Id(), lastRunResult.ResultMessage)
 		return
 	}
-	fmt.Printf("[%s] %s, %s\n", dtu.taskInfo.Id(), lastRunResult.ResultMessage, lastRunResult.Err)
+	dtu.logf("[%s] %s, %s\n", dtu.taskInfo.Id(), lastRunResult.ResultMessage, lastRunResult.Err)
 }

 func (dtu *DownloadTaskUnit) pluginCallback(result string) {
@@ -354,7 +441,9 @@ func (dtu *DownloadTaskUnit) pluginCallback(result string) {
 	pluginManger := plugins.NewPluginManager(config.GetPluginDir())
 	plugin, _ := pluginManger.GetPlugin()
 	pluginParam := &plugins.DownloadFileFinishParams{
+		DownloadActionId:   dtu.DownloadActionId,
 		DriveId:            dtu.fileInfo.DriveId,
+		DriveFileId:        dtu.fileInfo.FileId,
 		DriveFilePath:      dtu.fileInfo.Path,
 		DriveFileName:      dtu.fileInfo.FileName,
 		DriveFileSize:      dtu.fileInfo.FileSize,
@@ -375,7 +464,7 @@ func (dtu *DownloadTaskUnit) OnComplete(lastRunResult *taskframework.TaskUnitRun
 }

 func (dtu *DownloadTaskUnit) OnCancel(lastRunResult *taskframework.TaskUnitRunResult) {
-
+	dtu.updateUITaskState(ui.TaskCanceled, "取消: "+dtu.FilePanPath)
 }

 func (dtu *DownloadTaskUnit) RetryWait() time.Duration {
@@ -390,7 +479,7 @@ func (dtu *DownloadTaskUnit) Run() (result *taskframework.TaskUnitRunResult) {
 		// 没有获取文件信息
 		// 如果是动态添加的下载任务, 是会写入文件信息的
 		// 如果该任务重试过, 则应该再获取一次文件信息
-		dtu.fileInfo, apierr = dtu.PanClient.FileInfoByPath(dtu.DriveId, dtu.FilePanPath)
+		dtu.fileInfo, apierr = dtu.PanClient.OpenapiPanClient().FileInfoByPath(dtu.DriveId, dtu.FilePanPath)
 		if apierr != nil {
 			// 如果不是未登录或文件不存在, 则不重试
 			result.ResultMessage = "获取下载路径信息错误"
@@ -402,29 +491,85 @@ func (dtu *DownloadTaskUnit) Run() (result *taskframework.TaskUnitRunResult) {
 	}

 	// 输出文件信息
-	fmt.Print("\n")
-	fmt.Printf("[%s] ----\n%s\n", dtu.taskInfo.Id(), dtu.fileInfo.String())
+	dtu.logf("\n")
+	dtu.logf("[%s] ----\n%s\n", dtu.taskInfo.Id(), dtu.fileInfo.String())
+
+	// 调用插件
+	ft := "file"
+	if dtu.fileInfo.IsFolder() {
+		ft = "folder"
+	}
+	pluginManger := plugins.NewPluginManager(config.GetPluginDir())
+	plugin, _ := pluginManger.GetPlugin()
+	localFilePath := strings.TrimPrefix(dtu.SavePath, dtu.OriginSaveRootPath)
+	localFilePath = strings.TrimPrefix(strings.TrimPrefix(localFilePath, "\\"), "/")
+	pluginParam := &plugins.DownloadFilePrepareParams{
+		DownloadActionId:   dtu.DownloadActionId,
+		DriveId:            dtu.fileInfo.DriveId,
+		DriveFilePath:      dtu.fileInfo.Path,
+		DriveFileName:      dtu.fileInfo.FileName,
+		DriveFileSize:      dtu.fileInfo.FileSize,
+		DriveFileType:      ft,
+		DriveFileSha1:      dtu.fileInfo.ContentHash,
+		DriveFileUpdatedAt: dtu.fileInfo.UpdatedAt,
+		LocalFilePath:      localFilePath,
+	}
+	if downloadFilePrepareResult, er := plugin.DownloadFilePrepareCallback(plugins.GetContext(config.Config.ActiveUser()), pluginParam); er == nil && downloadFilePrepareResult != nil {
+		if strings.Compare("yes", downloadFilePrepareResult.DownloadApproved) != 0 {
+			// skip download this file
+			dtu.logf("插件取消了该文件下载: %s\n", dtu.fileInfo.Path)
+			dtu.updateUITaskState(ui.TaskCanceled, "插件取消了该文件下载: "+dtu.fileInfo.Path)
+			result.Succeed = false
+			result.Cancel = true
+			return
+		}
+		if downloadFilePrepareResult.LocalFilePath != "" {
+			targetSaveRelativePath := strings.TrimPrefix(downloadFilePrepareResult.LocalFilePath, "/")
+			targetSaveRelativePath = strings.TrimPrefix(targetSaveRelativePath, "\\")
+			dtu.SavePath = path.Clean(dtu.OriginSaveRootPath + string(os.PathSeparator) + targetSaveRelativePath)
+			dtu.logf("插件修改文件下载保存路径为: %s\n", dtu.SavePath)
+		}
+	}

 	// 如果是一个目录, 将子文件和子目录加入队列
 	if dtu.fileInfo.IsFolder() {
-		_, err := os.Stat(dtu.SavePath)
+		//_, err := os.Stat(dtu.SavePath)
+		//if err != nil && !os.IsExist(err) {
+		//	os.MkdirAll(dtu.SavePath, 0777) // 首先在本地创建目录, 保证空目录也能被保存
+		//}
+		// 支持本地符号逻辑文件，整体逻辑等效上面的注释代码
+		originSaveRootSymlinkFile := localfile.NewSymlinkFile(dtu.OriginSaveRootPath)
+		suffixPath := localfile.GetSuffixPath(dtu.SavePath, dtu.OriginSaveRootPath)
+		savePathSymlinkFile, _, err := localfile.RetrieveRealPathFromLogicSuffixPath(originSaveRootSymlinkFile, suffixPath)
 		if err != nil && !os.IsExist(err) {
-			os.MkdirAll(dtu.SavePath, 0777) // 首先在本地创建目录, 保证空目录也能被保存
+			realSavePath := savePathSymlinkFile.RealPath
+			suffixPath = localfile.GetSuffixPath(dtu.SavePath, savePathSymlinkFile.LogicPath) // 获取后缀不存在的路径
+			if suffixPath != "" {
+				realSavePath = filepath.Join(realSavePath, suffixPath)
+			}
+			err1 := os.MkdirAll(realSavePath, 0777) // 首先在本地创建目录, 保证空目录也能被保存
+			if err1 != nil {
+				result.ResultMessage = "创建目录错误"
+				result.Succeed = false
+				result.Err = err1
+				result.NeedRetry = false
+				return
+			}
 		}

 		// 获取该目录下的文件列表
-		fileList, apierr := dtu.PanClient.FileListGetAll(&aliyunpan.FileListParam{
+		fileList, apierr := dtu.PanClient.OpenapiPanClient().FileListGetAll(&aliyunpan.FileListParam{
 			DriveId:      dtu.DriveId,
 			ParentFileId: dtu.fileInfo.FileId,
-		})
+		}, 1000)
 		if apierr != nil {
 			// retry one more time
 			time.Sleep(3 * time.Second)

-			fileList, apierr = dtu.PanClient.FileListGetAll(&aliyunpan.FileListParam{
+			fileList, apierr = dtu.PanClient.OpenapiPanClient().FileListGetAll(&aliyunpan.FileListParam{
 				DriveId:      dtu.DriveId,
 				ParentFileId: dtu.fileInfo.FileId,
-			})
+			}, 1000)
 			if apierr != nil {
 				logger.Verbosef("[%s] get download file list for %s error: %s\n",
 					dtu.taskInfo.Id(), dtu.FilePanPath, apierr)
@@ -445,9 +590,20 @@ func (dtu *DownloadTaskUnit) Run() (result *taskframework.TaskUnitRunResult) {
 		}
 		time.Sleep(1 * time.Second)

+		// 排序，按名称排序，从小到大
+		sort.Slice(fileList, func(i, j int) bool {
+			return fileList[i].FileName < fileList[j].FileName
+		})
 		// 创建对应的任务进行下载
 		for k := range fileList {
 			fileList[k].Path = path.Join(dtu.FilePanPath, fileList[k].FileName)
+
+			// 是否排除下载
+			if utils.IsExcludeFile(fileList[k].Path, &dtu.Cfg.ExcludeNames) {
+				dtu.logf("排除文件: %s\n", fileList[k].Path)
+				continue
+			}
+
 			if fileList[k].IsFolder() {
 				logger.Verbosef("[%s] create sub folder download task: %s\n",
 					dtu.taskInfo.Id(), fileList[k].Path)
@@ -458,12 +614,17 @@ func (dtu *DownloadTaskUnit) Run() (result *taskframework.TaskUnitRunResult) {
 			newCfg := *dtu.Cfg
 			subUnit.Cfg = &newCfg
 			subUnit.fileInfo = fileList[k] // 保存文件信息
+			subUnit.FilePanSource = dtu.FilePanSource
 			subUnit.FilePanPath = fileList[k].Path
 			subUnit.SavePath = filepath.Join(dtu.OriginSaveRootPath, fileList[k].Path) // 保存位置

 			// 加入父队列，按照队列调度进行下载
 			info := dtu.ParentTaskExecutor.Append(&subUnit, dtu.taskInfo.MaxRetry())
-			fmt.Printf("[%s] 加入下载队列: %s\n", info.Id(), fileList[k].Path)
+			dtu.logf("[%s] 加入下载队列: %s\n", info.Id(), fileList[k].Path)
+			// UI面板注册任务
+			if dtu.UI != nil {
+				dtu.UI.RegisterTask(info.Id(), fileList[k].Path, fileList[k].FileSize, fileList[k].IsFile())
+			}
 		}

 		// 本下载任务执行成功
@@ -471,46 +632,24 @@ func (dtu *DownloadTaskUnit) Run() (result *taskframework.TaskUnitRunResult) {
 		return
 	}

-	// 调用插件
-	pluginManger := plugins.NewPluginManager(config.GetPluginDir())
-	plugin, _ := pluginManger.GetPlugin()
-	localFilePath := strings.TrimPrefix(dtu.SavePath, dtu.OriginSaveRootPath)
-	localFilePath = strings.TrimPrefix(strings.TrimPrefix(localFilePath, "\\"), "/")
-	pluginParam := &plugins.DownloadFilePrepareParams{
-		DriveId:            dtu.fileInfo.DriveId,
-		DriveFilePath:      dtu.fileInfo.Path,
-		DriveFileName:      dtu.fileInfo.FileName,
-		DriveFileSize:      dtu.fileInfo.FileSize,
-		DriveFileType:      "file",
-		DriveFileSha1:      dtu.fileInfo.ContentHash,
-		DriveFileUpdatedAt: dtu.fileInfo.UpdatedAt,
-		LocalFilePath:      localFilePath,
-	}
-	if downloadFilePrepareResult, er := plugin.DownloadFilePrepareCallback(plugins.GetContext(config.Config.ActiveUser()), pluginParam); er == nil && downloadFilePrepareResult != nil {
-		if strings.Compare("yes", downloadFilePrepareResult.DownloadApproved) != 0 {
-			// skip download this file
-			fmt.Printf("插件取消了该文件下载: %s\n", dtu.fileInfo.Path)
-			result.Succeed = false
-			result.Cancel = true
-			return
-		}
-		if downloadFilePrepareResult.LocalFilePath != "" {
-			targetSaveRelativePath := strings.TrimPrefix(downloadFilePrepareResult.LocalFilePath, "/")
-			targetSaveRelativePath = strings.TrimPrefix(targetSaveRelativePath, "\\")
-			dtu.SavePath = path.Clean(dtu.OriginSaveRootPath + string(os.PathSeparator) + targetSaveRelativePath)
-			fmt.Printf("插件修改文件下载保存路径为: %s\n", dtu.SavePath)
-		}
-	}
+	dtu.logf("[%s] 准备下载: %s\n", dtu.taskInfo.Id(), dtu.FilePanPath)

-	fmt.Printf("[%s] 准备下载: %s\n", dtu.taskInfo.Id(), dtu.FilePanPath)
-
-	if !dtu.IsOverwrite && FileExist(dtu.SavePath) {
-		fmt.Printf("[%s] 文件已经存在: %s, 跳过...\n", dtu.taskInfo.Id(), dtu.SavePath)
+	//if !dtu.IsOverwrite && FileExist(dtu.SavePath) {
+	//	fmt.Printf("[%s] 文件已经存在: %s, 跳过...\n", dtu.taskInfo.Id(), dtu.SavePath)
+	//	result.Succeed = true // 执行成功
+	//	return
+	//}
+	// 支持符号文件，逻辑和注释代码一致
+	if !dtu.IsOverwrite && SymlinkFileExist(dtu.SavePath, dtu.OriginSaveRootPath) {
+		dtu.updateUITaskState(ui.TaskSkipped, "文件已存在，跳过: "+dtu.SavePath)
+		dtu.logf("[%s] 文件已经存在: %s, 跳过...\n", dtu.taskInfo.Id(), dtu.SavePath)
 		result.Succeed = true // 执行成功
 		return
 	}

-	fmt.Printf("[%s] 将会下载到路径: %s\n", dtu.taskInfo.Id(), dtu.SavePath)
+	dtu.logf("[%s] 将会下载到路径: %s\n", dtu.taskInfo.Id(), dtu.SavePath)
+	// 更新UI面板任务状态
+	dtu.updateUITaskState(ui.TaskRunning, "")

 	var ok bool
 	er := dtu.download()
@@ -530,6 +669,11 @@ func (dtu *DownloadTaskUnit) Run() (result *taskframework.TaskUnitRunResult) {
 		return result
 	}

+	//// 文件下载成功，更改文件修改时间和云盘的同步
+	//if err := os.Chtimes(dtu.SavePath, utils.ParseTimeStr(dtu.fileInfo.CreatedAt), utils.ParseTimeStr(dtu.fileInfo.CreatedAt)); err != nil {
+	//	logger.Verbosef(err.Error())
+	//}
+
 	// 统计下载
 	dtu.DownloadStatistic.AddTotalSize(dtu.fileInfo.FileSize)
 	// 下载成功
@@ -4,7 +4,7 @@
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
-//     http://www.apache.org/licenses/LICENSE-2.0
+//	http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,6 +15,7 @@ package pandownload

 import (
 	"github.com/tickstep/aliyunpan-api/aliyunpan"
+	"github.com/tickstep/aliyunpan/internal/localfile"
 	"os"
 )

@@ -26,7 +27,8 @@ func CheckFileValid(filePath string, fileInfo *aliyunpan.FileEntity) error {
 	return nil
 }

-// FileExist 检查文件是否存在,
+// FileExist 检查文件是否存在
+//
 // 只有当文件存在, 文件大小不为0或断点续传文件不存在时, 才判断为存在
 func FileExist(path string) bool {
 	if info, err := os.Stat(path); err == nil {
@@ -40,3 +42,27 @@ func FileExist(path string) bool {

 	return false
 }
+
+// SymlinkFileExist 检查文件是否存在
+//
+// 逻辑和 FileExist 一致，增加符号链接文件的支持
+func SymlinkFileExist(fullPath, rootPath string) bool {
+	originSaveRootSymlinkFile := localfile.NewSymlinkFile(rootPath)
+	suffixPath := localfile.GetSuffixPath(fullPath, rootPath)
+	savePathSymlinkFile, savePathFileInfo, err := localfile.RetrieveRealPathFromLogicSuffixPath(originSaveRootSymlinkFile, suffixPath)
+	if err != nil || savePathFileInfo == nil {
+		return false
+	} else {
+		if savePathFileInfo.IsDir() {
+			return true
+		} else {
+			if savePathFileInfo.Size() == 0 {
+				return false
+			}
+			if _, err = os.Stat(savePathSymlinkFile.RealPath + DownloadSuffix); err != nil {
+				return true
+			}
+		}
+	}
+	return false
+}
@@ -4,23 +4,40 @@ import (
 	"encoding/hex"
 	"encoding/json"
 	"fmt"
-	"github.com/tickstep/aliyunpan/internal/config"
-	"github.com/tickstep/aliyunpan/internal/utils"
-	"github.com/tickstep/library-go/crypto"
-	"github.com/tickstep/library-go/getip"
-	"github.com/tickstep/library-go/logger"
-	"github.com/tickstep/library-go/requester"
 	"net/url"
 	"regexp"
 	"runtime"
 	"strings"
 	"time"
+
+	"github.com/tickstep/aliyunpan/internal/global"
+	"github.com/tickstep/aliyunpan/internal/utils"
+	"github.com/tickstep/library-go/crypto"
+	"github.com/tickstep/library-go/logger"
+	"github.com/tickstep/library-go/requester"
 )

 type LoginHelper struct {
 	webHost string
 }

+const (
+	// SUCCESS 成功
+	SUCCESS = 0
+	// ERROR 失败
+	ERROR = 500
+	// ERROR_TOO_MANY_REQUESTS 请求太频繁，已被限流
+	ERROR_TOO_MANY_REQUESTS = 429
+	// ERROR_NEED_LOGIN_AGAIN Token已经过期，需要重新登录
+	ERROR_NEED_LOGIN_AGAIN = 100004
+)
+
+// CommonResultError 通用接口错误
+type CommonResultError struct {
+	Code int    `json:"code"`
+	Msg  string `json:"msg"`
+}
+
 type LoginHttpResult struct {
 	Code int         `json:"code"`
 	Msg  string      `json:"msg"`
@@ -40,6 +57,24 @@ type QRCodeLoginResult struct {
 	SecureRefreshToken string `json:"secureRefreshToken"`
 }

+// LoginTokenResult Token结果
+type LoginTokenResult struct {
+	AccessToken string `json:"accessToken"`
+	Expired     int64  `json:"expired"`
+}
+
+type CommonTokenEntity struct {
+	Openapi *LoginTokenResult `json:"openapi"`
+	Webapi  *LoginTokenResult `json:"webapi"`
+}
+
+func NewCommonResultError(msg string) *CommonResultError {
+	return &CommonResultError{
+		Code: 500,
+		Msg:  msg,
+	}
+}
+
 func NewLoginHelper(webHost string) *LoginHelper {
 	return &LoginHelper{
 		webHost: webHost,
@@ -52,18 +87,18 @@ func (h *LoginHelper) GetQRCodeLoginUrl(keyStr string) (*QRCodeUrlResult, error)
 		keyStr = utils.GetUniqueKeyStr()
 	}
 	fullUrl := strings.Builder{}
-	ipAddr, err := getip.IPInfoFromTechainBaidu()
+	ipAddr, err := utils.GetPublicIP()
 	if err != nil {
 		ipAddr = "127.0.0.1"
 	}
 	fmt.Fprintf(&fullUrl, "%s/auth/tickstep/aliyunpan/token/qrcode/create?ip=%s&os=%s&arch=%s&version=%s&key=%s",
-		h.webHost, ipAddr, runtime.GOOS, runtime.GOARCH, config.AppVersion, keyStr)
+		h.webHost, ipAddr, runtime.GOOS, runtime.GOARCH, global.AppVersion, keyStr)

 	logger.Verboseln("do request url: " + fullUrl.String())
 	header := map[string]string{
 		"accept":       "application/json, text/plain, */*",
 		"content-type": "application/json;charset=UTF-8",
-		"user-agent":   "aliyunpan/" + config.AppVersion,
+		"user-agent":   "aliyunpan/" + global.AppVersion,
 	}
 	// request
 	client := requester.NewHTTPClient()
@@ -75,6 +110,16 @@ func (h *LoginHelper) GetQRCodeLoginUrl(keyStr string) (*QRCodeUrlResult, error)
 		return nil, err
 	}

+	// 通用接口错误
+	commonResult := &CommonResultError{}
+	if err1 := json.Unmarshal(body, commonResult); err1 != nil {
+		logger.Verboseln("parse openapi result json error ", err1)
+		return nil, err1
+	}
+	if commonResult.Code != 0 {
+		return nil, fmt.Errorf(commonResult.Msg)
+	}
+
 	errResp := &LoginHttpResult{}
 	if err1 := json.Unmarshal(body, errResp); err1 != nil {
 		logger.Verboseln("parse qrcode result json error ", err1)
@@ -114,7 +159,7 @@ func (h *LoginHelper) GetQRCodeLoginResult(tokenId string) (*QRCodeLoginResult,
 	header := map[string]string{
 		"accept":       "application/json, text/plain, */*",
 		"content-type": "application/json;charset=UTF-8",
-		"user-agent":   "aliyunpan/" + config.AppVersion,
+		"user-agent":   "aliyunpan/" + global.AppVersion,
 	}
 	// request
 	client := requester.NewHTTPClient()
@@ -126,6 +171,16 @@ func (h *LoginHelper) GetQRCodeLoginResult(tokenId string) (*QRCodeLoginResult,
 		return nil, err
 	}

+	// 通用接口错误
+	commonResult := &CommonResultError{}
+	if err1 := json.Unmarshal(body, commonResult); err1 != nil {
+		logger.Verboseln("parse openapi result json error ", err1)
+		return nil, err1
+	}
+	if commonResult.Code != 0 {
+		return nil, fmt.Errorf(commonResult.Msg)
+	}
+
 	errResp := &LoginHttpResult{}
 	if err1 := json.Unmarshal(body, errResp); err1 != nil {
 		logger.Verboseln("parse qrcode result json error ", err1)
@@ -154,7 +209,7 @@ func (h *LoginHelper) GetRefreshToken(tokenId string) (*QRCodeLoginResult, error
 	header := map[string]string{
 		"accept":       "application/json, text/plain, */*",
 		"content-type": "application/json;charset=UTF-8",
-		"user-agent":   "aliyunpan/" + config.AppVersion,
+		"user-agent":   "aliyunpan/" + global.AppVersion,
 	}
 	// request
 	client := requester.NewHTTPClient()
@@ -166,6 +221,16 @@ func (h *LoginHelper) GetRefreshToken(tokenId string) (*QRCodeLoginResult, error
 		return nil, err
 	}

+	// 通用接口错误
+	commonResult := &CommonResultError{}
+	if err1 := json.Unmarshal(body, commonResult); err1 != nil {
+		logger.Verboseln("parse openapi result json error ", err1)
+		return nil, err1
+	}
+	if commonResult.Code != 0 {
+		return nil, fmt.Errorf(commonResult.Msg)
+	}
+
 	errResp := &LoginHttpResult{}
 	if err1 := json.Unmarshal(body, errResp); err1 != nil {
 		logger.Verboseln("parse qrcode result json error ", err1)
@@ -220,3 +285,162 @@ func (h *LoginHelper) ParseSecureRefreshToken(keyStr, secureRefreshToken string)
 	}
 	return refreshToken, nil
 }
+
+// GetWebapiNewToken 获取Webapi Token
+func (h *LoginHelper) GetWebapiNewToken(ticketId, userId, oldAccessToken string) (*LoginTokenResult, *CommonResultError) {
+	fullUrl := strings.Builder{}
+	fmt.Fprintf(&fullUrl, "%s/auth/tickstep/aliyunpan/token/webapi/%s/refresh?userId=%s",
+		h.webHost, ticketId, userId)
+	logger.Verboseln("do request url: " + fullUrl.String())
+	header := map[string]string{
+		"accept":       "application/json, text/plain, */*",
+		"content-type": "application/json;charset=UTF-8",
+		"user-agent":   "aliyunpan/" + global.AppVersion,
+		"old-token":    oldAccessToken,
+	}
+	// request
+	client := requester.NewHTTPClient()
+	client.SetTimeout(20 * time.Second)
+	client.SetKeepAlive(false)
+	body, err := client.Fetch("GET", fullUrl.String(), nil, header)
+	if err != nil {
+		logger.Verboseln("get web token result error ", err)
+		return nil, NewCommonResultError(err.Error())
+	}
+
+	// 通用接口错误
+	commonResult := &CommonResultError{}
+	if err1 := json.Unmarshal(body, commonResult); err1 != nil {
+		logger.Verboseln("parse openapi result json error ", err1)
+		return nil, NewCommonResultError(err1.Error())
+	}
+	if commonResult.Code != 0 {
+		return nil, commonResult
+	}
+
+	errResp := &LoginHttpResult{}
+	if err1 := json.Unmarshal(body, errResp); err1 != nil {
+		logger.Verboseln("parse result json error ", err1)
+		return nil, NewCommonResultError(err1.Error())
+	}
+	if errResp.Code != 0 {
+		return nil, &CommonResultError{
+			Code: errResp.Code,
+			Msg:  errResp.Msg,
+		}
+	}
+
+	// parse result
+	r := &LoginHttpResult{}
+	r.Data = &LoginTokenResult{}
+	if err2 := json.Unmarshal(body, r); err2 != nil {
+		logger.Verboseln("parse web token result json error ", err2)
+		return nil, NewCommonResultError(err2.Error())
+	}
+	return r.Data.(*LoginTokenResult), nil
+}
+
+// GetOpenapiNewToken 获取Openapi Token
+func (h *LoginHelper) GetOpenapiNewToken(ticketId, userId, oldAccessToken string) (*LoginTokenResult, *CommonResultError) {
+	fullUrl := strings.Builder{}
+	fmt.Fprintf(&fullUrl, "%s/auth/tickstep/aliyunpan/token/openapi/%s/refresh?userId=%s",
+		h.webHost, ticketId, userId)
+	logger.Verboseln("do request url: " + fullUrl.String())
+	header := map[string]string{
+		"accept":       "application/json, text/plain, */*",
+		"content-type": "application/json;charset=UTF-8",
+		"user-agent":   "aliyunpan/" + global.AppVersion,
+		"old-token":    oldAccessToken,
+	}
+	// request
+	client := requester.NewHTTPClient()
+	client.SetTimeout(20 * time.Second)
+	client.SetKeepAlive(false)
+	body, err := client.Fetch("GET", fullUrl.String(), nil, header)
+	if err != nil {
+		logger.Verboseln("get openapi token result error ", err)
+		return nil, NewCommonResultError(err.Error())
+	}
+
+	// 通用接口错误
+	commonResult := &CommonResultError{}
+	if err1 := json.Unmarshal(body, commonResult); err1 != nil {
+		logger.Verboseln("parse openapi result json error ", err1)
+		return nil, NewCommonResultError(err1.Error())
+	}
+	if commonResult.Code != 0 {
+		return nil, commonResult
+	}
+
+	// 解析结果
+	errResp := &LoginHttpResult{}
+	if err1 := json.Unmarshal(body, errResp); err1 != nil {
+		logger.Verboseln("parse result json error ", err1)
+		return nil, NewCommonResultError(err1.Error())
+	}
+	if errResp.Code != 0 {
+		return nil, &CommonResultError{
+			Code: errResp.Code,
+			Msg:  errResp.Msg,
+		}
+	}
+
+	// parse result
+	r := &LoginHttpResult{}
+	r.Data = &LoginTokenResult{}
+	if err2 := json.Unmarshal(body, r); err2 != nil {
+		logger.Verboseln("parse openapi token result json error ", err2)
+		return nil, NewCommonResultError(err2.Error())
+	}
+	return r.Data.(*LoginTokenResult), nil
+}
+
+// GetLoginToken 获取登录后的Token
+func (h *LoginHelper) GetLoginToken(ticketId string) (*CommonTokenEntity, error) {
+	fullUrl := strings.Builder{}
+	fmt.Fprintf(&fullUrl, "%s/auth/tickstep/aliyunpan/token/common/%s/login",
+		h.webHost, ticketId)
+	logger.Verboseln("do request url: " + fullUrl.String())
+	header := map[string]string{
+		"accept":       "application/json, text/plain, */*",
+		"content-type": "application/json;charset=UTF-8",
+		"user-agent":   "aliyunpan/" + global.AppVersion,
+	}
+	// request
+	client := requester.NewHTTPClient()
+	client.SetTimeout(20 * time.Second)
+	client.SetKeepAlive(false)
+	body, err := client.Fetch("GET", fullUrl.String(), nil, header)
+	if err != nil {
+		logger.Verboseln("get login token result error ", err)
+		return nil, err
+	}
+
+	// 通用接口错误
+	commonResult := &CommonResultError{}
+	if err1 := json.Unmarshal(body, commonResult); err1 != nil {
+		logger.Verboseln("parse openapi result json error ", err1)
+		return nil, err1
+	}
+	if commonResult.Code != 0 {
+		return nil, fmt.Errorf(commonResult.Msg)
+	}
+
+	errResp := &LoginHttpResult{}
+	if err1 := json.Unmarshal(body, errResp); err1 != nil {
+		logger.Verboseln("parse result json error ", err1)
+		return nil, err1
+	}
+	if errResp.Code != 0 {
+		return nil, fmt.Errorf(errResp.Msg)
+	}
+
+	// parse result
+	r := &LoginHttpResult{}
+	r.Data = &CommonTokenEntity{}
+	if err2 := json.Unmarshal(body, r); err2 != nil {
+		logger.Verboseln("parse login token result json error ", err2)
+		return nil, err2
+	}
+	return r.Data.(*CommonTokenEntity), nil
+}
@@ -4,7 +4,7 @@
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
-//     http://www.apache.org/licenses/LICENSE-2.0
+//	http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,12 +16,18 @@ package panupload
 import (
 	"context"
 	"encoding/xml"
-	"fmt"
-	"github.com/tickstep/library-go/logger"
-	"github.com/tickstep/library-go/requester"
+	"errors"
 	"io"
 	"net/http"
+	"net/url"
+	"os"
 	"strconv"
+	"strings"
+	"time"
+
+	"github.com/tickstep/aliyunpan/internal/config"
+	"github.com/tickstep/library-go/logger"
+	"github.com/tickstep/library-go/requester"

 	"github.com/tickstep/aliyunpan-api/aliyunpan"
 	"github.com/tickstep/aliyunpan-api/aliyunpan/apierror"
@@ -31,26 +37,18 @@ import (

 type (
 	PanUpload struct {
-		panClient  *aliyunpan.PanClient
+		panClient  *config.PanClient
 		targetPath string
 		driveId    string

 		// 网盘上传参数
 		uploadOpEntity *aliyunpan.CreateFileUploadResult
-		useInternalUrl bool
 	}

 	EmptyReaderLen64 struct {
 	}
 )

-var (
-	uploadUrlExpired       = fmt.Errorf("UrlExpired")
-	uploadPartNotSeq       = fmt.Errorf("PartNotSequential")
-	uploadTerminate        = fmt.Errorf("UploadErrorTerminate")
-	uploadPartAlreadyExist = fmt.Errorf("PartAlreadyExist")
-)
-
 func (e EmptyReaderLen64) Read(p []byte) (n int, err error) {
 	return 0, io.EOF
 }
@@ -59,19 +57,18 @@ func (e EmptyReaderLen64) Len() int64 {
 	return 0
 }

-func NewPanUpload(panClient *aliyunpan.PanClient, targetPath, driveId string, uploadOpEntity *aliyunpan.CreateFileUploadResult, useInternalUrl bool) uploader.MultiUpload {
+func NewPanUpload(panClient *config.PanClient, targetPath, driveId string, uploadOpEntity *aliyunpan.CreateFileUploadResult) uploader.MultiUpload {
 	return &PanUpload{
 		panClient:      panClient,
 		targetPath:     targetPath,
 		driveId:        driveId,
 		uploadOpEntity: uploadOpEntity,
-		useInternalUrl: useInternalUrl,
 	}
 }

 func (pu *PanUpload) lazyInit() {
 	if pu.panClient == nil {
-		pu.panClient = &aliyunpan.PanClient{}
+		pu.panClient = &config.PanClient{}
 	}
 }

@@ -80,13 +77,15 @@ func (pu *PanUpload) Precreate() (err error) {
 }

 func (pu *PanUpload) UploadFile(ctx context.Context, partseq int, partOffset int64, partEnd int64, r rio.ReaderLen64, uploadClient *requester.HTTPClient) (uploadDone bool, uperr error) {
+	if len(pu.uploadOpEntity.PartInfoList) == 0 {
+		logger.Verbosef("网盘上传参数错误，分片%d => uploadOpEntity.PartInfoList为空\n", partseq+1)
+		return true, nil
+	}
+
 	pu.lazyInit()

 	// check url expired or not
 	uploadUrl := pu.uploadOpEntity.PartInfoList[partseq].UploadURL
-	if pu.useInternalUrl {
-		uploadUrl = pu.uploadOpEntity.PartInfoList[partseq].InternalUploadURL
-	}
 	if IsUrlExpired(uploadUrl) {
 		// get renew upload url
 		infoList := make([]aliyunpan.FileUploadPartInfoParam, 0)
@@ -101,10 +100,11 @@ func (pu *PanUpload) UploadFile(ctx context.Context, partseq int, partOffset int
 			PartInfoList: infoList,
 			UploadId:     pu.uploadOpEntity.UploadId,
 		}
-		newUploadInfo, err := pu.panClient.GetUploadUrl(refreshUploadParam)
+		newUploadInfo, err := pu.panClient.OpenapiPanClient().GetUploadUrl(refreshUploadParam)
 		if err != nil {
+			logger.Verboseln(err)
 			return false, &uploader.MultiError{
-				Err:        uploadUrlExpired,
+				Err:        uploader.UploadUrlExpired,
 				Terminated: false,
 			}
 		}
@@ -112,6 +112,7 @@ func (pu *PanUpload) UploadFile(ctx context.Context, partseq int, partOffset int
 	}

 	var respErr *uploader.MultiError
+	// 分片上传回调函数，供阿里云盘API接口使用
 	uploadFunc := func(httpMethod, fullUrl string, headers map[string]string) (*http.Response, error) {
 		var resp *http.Response
 		var respError error = nil
@@ -126,7 +127,7 @@ func (pu *PanUpload) UploadFile(ctx context.Context, partseq int, partOffset int
 		}
 		resp, err = uploadClient.Req(httpMethod, fullUrl, r, headers)
 		if err != nil {
-			logger.Verbosef("分片上传出错: 分片%d => %s\n", partseq, err)
+			logger.Verbosef("分片上传出错: 分片%d => %s\n", partseq+1, err)
 		}

 		if resp != nil {
@@ -134,73 +135,107 @@ func (pu *PanUpload) UploadFile(ctx context.Context, partseq int, partOffset int
 				if blen > 0 {
 					buf := make([]byte, blen)
 					resp.Body.Read(buf)
-					logger.Verbosef("分片上传出错: 分片%d => %s\n", partseq, string(buf))
+					logger.Verbosef("分片上传出错: 分片%d, 错误信息: %s\n", partseq+1, string(buf))

 					errResp := &apierror.ErrorXmlResp{}
-					if err := xml.Unmarshal(buf, errResp); err == nil {
+					if errXml := xml.Unmarshal(buf, errResp); errXml == nil {
 						if errResp.Code != "" {
-							if "PartNotSequential" == errResp.Code || "NoSuchUpload" == errResp.Code {
-								respError = uploadPartNotSeq
+							if "PartNotSequential" == errResp.Code {
+								respError = uploader.UploadPartNotSeq
 								respErr = &uploader.MultiError{
-									Err:           uploadPartNotSeq,
+									Err:           uploader.UploadPartNotSeq,
 									Terminated:    false,
-									NeedStartOver: true,
+									NeedStartOver: false,
+								}
+								return resp, respError
+							} else if "NoSuchUpload" == errResp.Code {
+								respError = uploader.UploadNoSuchUpload
+								respErr = &uploader.MultiError{
+									Err:           uploader.UploadNoSuchUpload,
+									Terminated:    true,
+									NeedStartOver: false,
 								}
 								return resp, respError
 							} else if "AccessDenied" == errResp.Code && "Request has expired." == errResp.Message {
-								respError = uploadUrlExpired
+								respError = uploader.UploadUrlExpired
 								respErr = &uploader.MultiError{
-									Err:        uploadUrlExpired,
+									Err:        uploader.UploadUrlExpired,
 									Terminated: false,
 								}
 								return resp, respError
 							} else if "PartAlreadyExist" == errResp.Code {
-								respError = uploadPartAlreadyExist
+								respError = uploader.UploadPartAlreadyExist
 								respErr = &uploader.MultiError{
-									Err:        uploadPartAlreadyExist,
+									Err:        uploader.UploadPartAlreadyExist,
 									Terminated: false,
 								}
 								return resp, respError
 							}
 						}
+					} else {
+						respError = uploader.UploadHttpError
+						respErr = &uploader.MultiError{
+							Err:           uploader.UploadHttpError,
+							Terminated:    false,
+							NeedStartOver: false,
+						}
+						return resp, respError
 					}
 				}
 			} else {
-				logger.Verbosef("分片上传出错: %d分片 => 原因未知\n", partseq)
+				logger.Verbosef("分片上传出错: %d分片 => 原因未知\n", partseq+1)
 			}

 			// 不可恢复的错误
 			switch resp.StatusCode {
 			case 400, 401, 403, 413, 600:
-				respError = uploadTerminate
+				respError = uploader.UploadTerminate
 				respErr = &uploader.MultiError{
 					Terminated: true,
 				}
 			}
 		} else {
-			respError = uploadTerminate
+			// 默认错误
+			respError = uploader.UploadTerminate
 			respErr = &uploader.MultiError{
 				Terminated: true,
 			}
+
+			// 解析HTTP请求出现的错误信息
+			if err != nil {
+				var netErr *url.Error
+				if errors.As(err, &netErr) {
+					var pathErr *os.PathError
+					if errors.As(netErr.Err, &pathErr) { // 本地文件读取异常
+						if strings.Contains(pathErr.Err.Error(), "file already closed") {
+							// 本地文件流触发"file already closed"错误
+							// 一般是文件上传过程中，文件被删除了，或者文件所在的硬盘异常导致文件流被系统关闭
+							respError = uploader.UploadLocalFileAlreadyClosedError
+							respErr = &uploader.MultiError{
+								Terminated:    true,
+								NeedStartOver: false,
+								Err:           uploader.UploadLocalFileAlreadyClosedError,
+							}
+						}
+					}
+				}
+			}
 		}
 		return resp, respError
 	}

 	// 上传一个分片数据
 	uploadUrl = pu.uploadOpEntity.PartInfoList[partseq].UploadURL
-	if pu.useInternalUrl {
-		uploadUrl = pu.uploadOpEntity.PartInfoList[partseq].InternalUploadURL
-	}
-	apiError := pu.panClient.UploadFileData(uploadUrl, uploadFunc)
+	apiError := pu.panClient.OpenapiPanClient().UploadFileData(uploadUrl, uploadFunc)

 	if respErr != nil {
-		if respErr.Err == uploadUrlExpired {
+		if errors.Is(respErr.Err, uploader.UploadUrlExpired) {
 			// URL过期，获取新的URL
-			guur, er := pu.panClient.GetUploadUrl(&aliyunpan.GetUploadUrlParam{
+			guur, er := pu.panClient.OpenapiPanClient().GetUploadUrl(&aliyunpan.GetUploadUrlParam{
 				DriveId:      pu.driveId,
 				FileId:       pu.uploadOpEntity.FileId,
 				UploadId:     pu.uploadOpEntity.UploadId,
-				PartInfoList: []aliyunpan.FileUploadPartInfoParam{{PartNumber: (partseq + 1)}}, // 阿里云盘partNum从1开始计数，partSeq从0开始
+				PartInfoList: []aliyunpan.FileUploadPartInfoParam{{PartNumber: partseq + 1}}, // 阿里云盘partNum从1开始计数，partSeq从0开始
 			})
 			if er != nil {
 				return false, &uploader.MultiError{
@@ -210,18 +245,18 @@ func (pu *PanUpload) UploadFile(ctx context.Context, partseq int, partOffset int

 			// 获取新的上传URL重试一次
 			pu.uploadOpEntity.PartInfoList[partseq] = guur.PartInfoList[0]
-			uploadUrl := pu.uploadOpEntity.PartInfoList[partseq].UploadURL
-			if pu.useInternalUrl {
-				uploadUrl = pu.uploadOpEntity.PartInfoList[partseq].InternalUploadURL
-			}
-			apiError = pu.panClient.UploadFileData(uploadUrl, uploadFunc)
-		} else if respErr.Err == uploadPartAlreadyExist {
+			uploadUrl = pu.uploadOpEntity.PartInfoList[partseq].UploadURL
+			apiError = pu.panClient.OpenapiPanClient().UploadFileData(uploadUrl, uploadFunc)
+		} else if errors.Is(respErr.Err, uploader.UploadPartAlreadyExist) {
 			// already upload
 			// success
 			return true, nil
-		} else if respErr.Err == uploadPartNotSeq {
-			// 上传分片乱序了，需要重新从0分片开始上传
-			// 先直接返回，后续再优化
+		} else if errors.Is(respErr.Err, uploader.UploadPartNotSeq) {
+			// 上传分片乱序了
+			// 返回错误，然后重传
+			return false, respErr
+		} else if errors.Is(respErr.Err, uploader.UploadLocalFileAlreadyClosedError) {
+			// 本地文件读取错误
 			return false, respErr
 		} else {
 			return false, respErr
@@ -239,7 +274,7 @@ func (pu *PanUpload) CommitFile() (cerr error) {
 	pu.lazyInit()
 	var er *apierror.ApiError

-	_, er = pu.panClient.CompleteUploadFile(&aliyunpan.CompleteUploadFileParam{
+	_, er = pu.panClient.OpenapiPanClient().CompleteUploadFile(&aliyunpan.CompleteUploadFileParam{
 		DriveId:  pu.driveId,
 		FileId:   pu.uploadOpEntity.FileId,
 		UploadId: pu.uploadOpEntity.UploadId,
@@ -247,5 +282,24 @@ func (pu *PanUpload) CommitFile() (cerr error) {
 	if er != nil {
 		return er
 	}
+
+	// 视频文件触发云端转码请求
+	pu.triggerVideoTranscodeAction()
+
 	return nil
 }
+
+// TriggerVideoTranscodeAction 触发视频文件转码成功
+func (pu *PanUpload) triggerVideoTranscodeAction() {
+	// 视频文件触发云端转码请求
+	if pu.uploadOpEntity != nil && IsVideoFile(pu.uploadOpEntity.FileName) {
+		time.Sleep(3 * time.Second)
+		_, er1 := pu.panClient.OpenapiPanClient().VideoGetPreviewPlayInfo(&aliyunpan.VideoGetPreviewPlayInfoParam{
+			DriveId: pu.driveId,
+			FileId:  pu.uploadOpEntity.FileId,
+		})
+		if er1 == nil {
+			logger.Verboseln("触发视频文件转码成功：" + pu.uploadOpEntity.FileName)
+		}
+	}
+}
@@ -4,7 +4,7 @@
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
-//     http://www.apache.org/licenses/LICENSE-2.0
+//	http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,6 +15,8 @@ package panupload

 import (
 	"errors"
+	"github.com/tickstep/library-go/logger"
+	"io"
 	"os"
 	"path/filepath"
 	"strings"
@@ -47,6 +49,7 @@ type (
 func NewUploadingDatabase() (ud *UploadingDatabase, err error) {
 	file, err := os.OpenFile(filepath.Join(config.GetConfigDir(), UploadingFileName), os.O_CREATE|os.O_RDWR, 0777)
 	if err != nil {
+		// 打开文件错误，一般是文件权限问题
 		return nil, err
 	}

@@ -64,7 +67,20 @@ func NewUploadingDatabase() (ud *UploadingDatabase, err error) {

 	err = jsonhelper.UnmarshalData(file, ud)
 	if err != nil {
-		return nil, err
+		// 上传数据库文件内容解析错误
+		// 尝试从备份的文件读取数据
+		bakFile, err1 := os.OpenFile(filepath.Join(config.GetConfigDir(), UploadingBackupFileName), os.O_CREATE|os.O_RDONLY, 0777)
+		if err1 != nil {
+			return nil, err
+		}
+		err2 := jsonhelper.UnmarshalData(bakFile, ud)
+		if err2 != nil {
+			return nil, err
+		}
+		bakFile.Close()
+		// 旧的备份文件可以正常使用，复制备份的数据文件到当前数据文件中
+		ud.copyFile(filepath.Join(config.GetConfigDir(), UploadingFileName), filepath.Join(config.GetConfigDir(), UploadingBackupFileName))
+		return ud, nil
 	}

 	return ud, nil
@@ -86,11 +102,23 @@ func (ud *UploadingDatabase) Save() error {
 		panic(err)
 	}

+	// 备份旧的数据库文件
+	// 因为下面有文件内容清空、写入新内容的操作。有小概率出现文件保存没有完成程序就退出的问题，这会导致数据库内容丢失。所以这里必须备份一下旧文件
+	err1 := ud.copyFile(filepath.Join(config.GetConfigDir(), UploadingBackupFileName), filepath.Join(config.GetConfigDir(), UploadingFileName))
+	if err1 != nil {
+		logger.Verboseln("备份上传数据库文件出错： {}", err1)
+	} else {
+		logger.Verboseln("成功备份旧的上传数据库文件")
+	}
+
+	logger.Verboseln("保存最新上传数据库内容")
+	// 清空文件旧内容
 	err = ud.dataFile.Truncate(int64(builder.Len()))
 	if err != nil {
 		return err
 	}

+	// 写入新内容
 	str := builder.String()
 	_, err = ud.dataFile.WriteAt(converter.ToBytes(str), 0)
 	if err != nil {
@@ -100,6 +128,26 @@ func (ud *UploadingDatabase) Save() error {
 	return nil
 }

+// copyFile 复制文件
+func (ud *UploadingDatabase) copyFile(dstFilePath string, srcFilePath string) error {
+	os.Remove(dstFilePath)
+	dstFile, err1 := os.OpenFile(dstFilePath, os.O_CREATE|os.O_WRONLY, 0777)
+	if err1 != nil {
+		return err1
+	}
+	srcFile, err2 := os.OpenFile(srcFilePath, os.O_CREATE|os.O_RDONLY, 0777)
+	if err2 != nil {
+		return err2
+	}
+	_, err3 := io.Copy(dstFile, srcFile)
+	if err3 != nil {
+		return err3
+	}
+	dstFile.Close()
+	srcFile.Close()
+	return nil
+}
+
 // UpdateUploading 更新正在上传
 func (ud *UploadingDatabase) UpdateUploading(meta *localfile.LocalFileMeta, state *uploader.InstanceState) {
 	if meta == nil {
@@ -111,7 +159,7 @@ func (ud *UploadingDatabase) UpdateUploading(meta *localfile.LocalFileMeta, stat
 		if uploading.LocalFileMeta == nil {
 			continue
 		}
-		if uploading.LocalFileMeta.EqualLengthMD5(meta) || uploading.LocalFileMeta.Path == meta.Path {
+		if uploading.LocalFileMeta.EqualLengthMD5(meta) || uploading.LocalFileMeta.Path.LogicPath == meta.Path.LogicPath {
 			ud.UploadingList[k].State = state
 			return
 		}
@@ -158,18 +206,20 @@ func (ud *UploadingDatabase) Search(meta *localfile.LocalFileMeta) *uploader.Ins
 		if uploading.LocalFileMeta == nil {
 			continue
 		}
-		if uploading.LocalFileMeta.EqualLengthSHA1(meta) {
-			return uploading.State
-		}
-		if uploading.LocalFileMeta.Path == meta.Path {
-			// 移除旧的信息
-			// 目前只是比较了文件大小
-			if meta.Length != uploading.LocalFileMeta.Length {
+		// 优选通过SHA1进行匹配，如果匹配失败则通过文件路径进行匹配
+		// 因为部分上传文件是直接上传的，没有计算SHA1
+		if uploading.LocalFileMeta.EqualLengthSHA1(meta) ||
+			uploading.LocalFileMeta.Path.LogicPath == meta.Path.LogicPath {
+			// 文件大小或者修改日期不一致，代表本地文件已经更改了，保存的旧的上传文件信息已经无用
+			// 移除旧的信息，客户端需要重新上传该文件
+			if meta.Length != uploading.LocalFileMeta.Length ||
+				meta.ModTime != uploading.LocalFileMeta.ModTime {
+				logger.Verboseln("本地文件已经被修改，上传数据记录需要移除，文件需要重新从0开始上传： {}", meta.Path.LogicPath)
 				ud.Delete(meta)
 				return nil
 			}

-			// 覆盖数据
+			// 从上传数据库补全信息并返回
 			meta.SHA1 = uploading.LocalFileMeta.SHA1
 			meta.ParentFolderId = uploading.LocalFileMeta.ParentFolderId
 			meta.UploadOpEntity = uploading.LocalFileMeta.UploadOpEntity
@@ -190,7 +240,7 @@ func (ud *UploadingDatabase) clearModTimeChange() {
 			continue
 		}

-		info, err := os.Stat(uploading.LocalFileMeta.Path)
+		info, err := os.Stat(uploading.LocalFileMeta.Path.RealPath)
 		if err != nil {
 			ud.deleteIndex(i)
 			i--
@@ -4,7 +4,7 @@
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
-//     http://www.apache.org/licenses/LICENSE-2.0
+//	http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
@@ -14,9 +14,8 @@
 package panupload

 import (
+	"errors"
 	"fmt"
-	"github.com/tickstep/aliyunpan/internal/plugins"
-	"github.com/tickstep/library-go/logger"
 	"os"
 	"path"
 	"path/filepath"
@@ -24,6 +23,11 @@ import (
 	"sync"
 	"time"

+	"github.com/tickstep/aliyunpan/internal/log"
+	"github.com/tickstep/aliyunpan/internal/plugins"
+	"github.com/tickstep/aliyunpan/internal/ui"
+	"github.com/tickstep/library-go/logger"
+
 	"github.com/tickstep/aliyunpan/internal/utils"
 	"github.com/tickstep/library-go/requester/rio/speeds"

@@ -38,6 +42,11 @@ import (
 	"github.com/tickstep/library-go/requester/rio"
 )

+const (
+	// DefaultCheckPreHashFileSize PreHash计算文件大小门限，默认100MB以上文件才计算
+	DefaultCheckPreHashFileSize = 100 * 1024 * 1024
+)
+
 type (
 	// StepUpload 上传步骤
 	StepUpload int
@@ -50,7 +59,7 @@ type (
 		DriveId           string // 网盘ID，例如：文件网盘，相册网盘
 		FolderCreateMutex *sync.Mutex

-		PanClient         *aliyunpan.PanClient
+		PanClient         *config.PanClient
 		UploadingDatabase *UploadingDatabase // 数据库
 		Parallel          int
 		NoRapidUpload     bool  // 禁用秒传，无需计算SHA1，直接上传
@@ -63,21 +72,24 @@ type (
 		panFile  string
 		state    *uploader.InstanceState

-		ShowProgress bool
-		IsOverwrite  bool // 覆盖已存在的文件，如果同名文件已存在则移到回收站里
-
-		// 是否使用内置链接
-		UseInternalUrl bool
+		ShowProgress   bool
+		IsOverwrite    bool // 覆盖已存在的文件，如果同名文件已存在则移到回收站里
+		IsSkipSameName bool // 跳过已存在的文件，即使文件内容不一致(不检查SHA1)

 		// 全局速度统计
 		GlobalSpeedsStat *speeds.Speeds
+
+		// 上传文件记录器
+		FileRecorder *log.FileRecorder
+
+		UI *ui.DashboardPanel // 上传统计面板UI
 	}
 )

 const (
 	// StepUploadInit 初始化步骤
 	StepUploadInit StepUpload = iota
-	// 上传前准备，创建上传任务
+	// StepUploadPrepareUpload 上传前准备，创建上传任务
 	StepUploadPrepareUpload
 	// StepUploadRapidUpload 秒传步骤
 	StepUploadRapidUpload
@@ -89,11 +101,31 @@ const (
 	StrUploadFailed = "上传文件失败"
 )

+// logf 打印文本日志
+func (utu *UploadTaskUnit) logf(format string, a ...interface{}) {
+	if utu.UI != nil {
+		// 使用UI面板显示日志
+		utu.UI.Logf(format, a...)
+		return
+	}
+
+	// 使用传统单行文本显示下载日志，直接输出到控制台
+	fmt.Printf(format, a...)
+}
+
+// updateUITaskState 更新UI面板的任务状态
+func (utu *UploadTaskUnit) updateUITaskState(state ui.TaskState, message string) {
+	if utu.UI == nil {
+		return
+	}
+	utu.UI.MarkTaskState(utu.taskInfo.Id(), state, message)
+}
+
 func (utu *UploadTaskUnit) SetTaskInfo(taskInfo *taskframework.TaskInfo) {
 	utu.taskInfo = taskInfo
 }

-// prepareFile 解析文件阶段
+// prepareFile 解析文件准备阶段
 func (utu *UploadTaskUnit) prepareFile() {
 	// 解析文件保存路径
 	var (
@@ -118,11 +150,12 @@ func (utu *UploadTaskUnit) prepareFile() {
 		return
 	}

-	if utu.LocalFileChecksum.Length > MaxRapidUploadSize {
-		fmt.Printf("[%s] 文件超过20GB, 无法使用秒传功能, 跳过秒传...\n", utu.taskInfo.Id())
-		utu.Step = StepUploadUpload
-		return
-	}
+	//if utu.LocalFileChecksum.Length > MaxRapidUploadSize {
+	//	utu.logf("[%s] 文件超过20GB, 无法使用秒传功能, 跳过秒传...\n", utu.taskInfo.Id())
+	//	utu.Step = StepUploadUpload
+	//	return
+	//}
+
 	// 下一步: 秒传
 	utu.Step = StepUploadRapidUpload
 }
@@ -133,13 +166,13 @@ func (utu *UploadTaskUnit) rapidUpload() (isContinue bool, result *taskframework

 	// 是否可以秒传
 	result = &taskframework.TaskUnitRunResult{}
-	fmt.Printf("[%s] %s 检测秒传中, 请稍候...\n", utu.taskInfo.Id(), time.Now().Format("2006-01-02 15:04:06"))
+	utu.logf("[%s] %s 检测秒传中, 请稍候...\n", utu.taskInfo.Id(), time.Now().Format("2006-01-02 15:04:06"))
 	if utu.LocalFileChecksum.UploadOpEntity.RapidUpload {
-		fmt.Printf("[%s] %s 秒传成功, 保存到网盘路径: %s\n", utu.taskInfo.Id(), time.Now().Format("2006-01-02 15:04:06"), utu.SavePath)
+		utu.logf("[%s] %s 秒传成功, 保存到网盘路径: %s\n", utu.taskInfo.Id(), time.Now().Format("2006-01-02 15:04:06"), utu.SavePath)
 		result.Succeed = true
 		return false, result
 	} else {
-		fmt.Printf("[%s] %s 秒传失败，开始正常上传文件\n", utu.taskInfo.Id(), time.Now().Format("2006-01-02 15:04:06"))
+		utu.logf("[%s] %s 秒传失败，开始正常上传文件\n", utu.taskInfo.Id(), time.Now().Format("2006-01-02 15:04:06"))
 		result.Succeed = false
 		result.ResultMessage = "文件未曾上传，无法秒传"
 		return true, result
@@ -154,12 +187,19 @@ func (utu *UploadTaskUnit) upload() (result *taskframework.TaskUnitRunResult) {
 	// 阿里云盘默认就是分片上传，每一个分片对应一个part_info
 	// 但是不支持分片同时上传，必须单线程，并且按照顺序从1开始一个一个上传
 	muer := uploader.NewMultiUploader(
-		NewPanUpload(utu.PanClient, utu.SavePath, utu.DriveId, utu.LocalFileChecksum.UploadOpEntity, utu.UseInternalUrl),
+		NewPanUpload(utu.PanClient, utu.SavePath, utu.DriveId, utu.LocalFileChecksum.UploadOpEntity),
 		rio.NewFileReaderAtLen64(utu.LocalFileChecksum.GetFile()), &uploader.MultiUploaderConfig{
 			Parallel:  utu.Parallel,
 			BlockSize: utu.BlockSize,
 			MaxRate:   config.Config.MaxUploadRate,
-		}, utu.LocalFileChecksum.UploadOpEntity, utu.GlobalSpeedsStat)
+		}, utu.LocalFileChecksum.UploadOpEntity, utu.PanClient, utu.GlobalSpeedsStat)
+
+	// 模拟 file already closed 错误
+	//go func(f *os.File) {
+	//	time.Sleep(10 * time.Second)
+	//	f.Close()
+	//	utu.logf("关闭文件流: %s\n", f.Name())
+	//}(utu.LocalFileChecksum.GetFile())

 	// 设置断点续传
 	if utu.state != nil {
@@ -174,13 +214,35 @@ func (utu *UploadTaskUnit) upload() (result *taskframework.TaskUnitRunResult) {
 		default:
 		}

+		// 方式1：使用UI统计面板显示进度
+		if utu.UI != nil {
+			// 更新UI面板任务状态
+			utu.UI.UpdateTaskProgress(utu.taskInfo.Id(), status.Uploaded(), status.TotalSize(), status.SpeedsPerSecond(), status.TimeLeft())
+			return
+		}
+
+		// 方式2：使用传统单行显示下载进度
 		if utu.ShowProgress {
-			fmt.Printf("\r[%s] ↑ %s/%s %s/s(%s/s) in %s ............", utu.taskInfo.Id(),
+			// 如果上传速度为0, 剩余时间未知, 则用 - 代替
+			var leftStr string
+			left := status.TimeLeft()
+			if left < 0 {
+				leftStr = "-"
+			} else {
+				leftStr = left.String()
+			}
+			uploadedPercentage := "0.00%"
+			if status.TotalSize() > 0 {
+				uploadedPercentage = fmt.Sprintf("%.2f%%", float64(status.Uploaded())/float64(status.TotalSize())*100)
+			}
+			utu.logf("\r[%s] ↑ %s/%s(%s) %s/s(%s/s) in %s, left %s ............", utu.taskInfo.Id(),
 				converter.ConvertFileSize(status.Uploaded(), 2),
 				converter.ConvertFileSize(status.TotalSize(), 2),
+				uploadedPercentage,
 				converter.ConvertFileSize(status.SpeedsPerSecond(), 2),
 				converter.ConvertFileSize(utu.GlobalSpeedsStat.GetSpeeds(), 2),
 				status.TimeElapsed(),
+				leftStr,
 			)
 		}
 	})
@@ -188,8 +250,8 @@ func (utu *UploadTaskUnit) upload() (result *taskframework.TaskUnitRunResult) {
 	// result
 	result = &taskframework.TaskUnitRunResult{}
 	muer.OnSuccess(func() {
-		fmt.Printf("\n")
-		fmt.Printf("[%s] %s 上传文件成功, 保存到网盘路径: %s\n", utu.taskInfo.Id(), time.Now().Format("2006-01-02 15:04:06"), utu.SavePath)
+		utu.logf("\n")
+		utu.logf("[%s] %s 上传文件成功, 保存到网盘路径: %s\n", utu.taskInfo.Id(), time.Now().Format("2006-01-02 15:04:06"), utu.SavePath)
 		// 统计
 		utu.UploadStatistic.AddTotalSize(utu.LocalFileChecksum.Length)
 		utu.UploadingDatabase.Delete(&utu.LocalFileChecksum.LocalFileMeta) // 删除
@@ -221,6 +283,10 @@ func (utu *UploadTaskUnit) upload() (result *taskframework.TaskUnitRunResult) {
 	if er != nil {
 		result.ResultMessage = StrUploadFailed
 		result.NeedRetry = true
+		if errors.Is(er, uploader.UploadNoSuchUpload) {
+			// do not need retry
+			result.NeedRetry = false
+		}
 		result.Err = er
 	}
 	return
@@ -230,20 +296,34 @@ func (utu *UploadTaskUnit) OnRetry(lastRunResult *taskframework.TaskUnitRunResul
 	// 输出错误信息
 	if lastRunResult.Err == nil {
 		// result中不包含Err, 忽略输出
-		fmt.Printf("[%s] %s, 重试 %d/%d\n", utu.taskInfo.Id(), lastRunResult.ResultMessage, utu.taskInfo.Retry(), utu.taskInfo.MaxRetry())
+		utu.logf("[%s] %s, 重试 %d/%d\n", utu.taskInfo.Id(), lastRunResult.ResultMessage, utu.taskInfo.Retry(), utu.taskInfo.MaxRetry())
 		return
 	}
-	fmt.Printf("[%s] %s, %s, 重试 %d/%d\n", utu.taskInfo.Id(), lastRunResult.ResultMessage, lastRunResult.Err, utu.taskInfo.Retry(), utu.taskInfo.MaxRetry())
+	utu.logf("[%s] %s, %s, 重试 %d/%d\n", utu.taskInfo.Id(), lastRunResult.ResultMessage, lastRunResult.Err, utu.taskInfo.Retry(), utu.taskInfo.MaxRetry())
 }

 func (utu *UploadTaskUnit) OnSuccess(lastRunResult *taskframework.TaskUnitRunResult) {
 	// 执行插件
 	utu.pluginCallback("success")
+
+	// 更新UI面板状态
+	utu.updateUITaskState(ui.TaskSuccess, "")
+
+	// 上传文件数据记录
+	if config.Config.FileRecordConfig == "1" {
+		utu.FileRecorder.Append(&log.FileRecordItem{
+			Status:   "成功",
+			TimeStr:  utils.NowTimeStr(),
+			FileSize: utu.LocalFileChecksum.LocalFileMeta.Length,
+			FilePath: utu.LocalFileChecksum.Path.LogicPath,
+		})
+	}
 }

 func (utu *UploadTaskUnit) OnFailed(lastRunResult *taskframework.TaskUnitRunResult) {
 	// 失败
 	utu.pluginCallback("fail")
+	utu.updateUITaskState(ui.TaskCanceled, "取消: "+utu.LocalFileChecksum.Path.LogicPath)
 }

 func (utu *UploadTaskUnit) pluginCallback(result string) {
@@ -252,9 +332,9 @@ func (utu *UploadTaskUnit) pluginCallback(result string) {
 	}
 	pluginManger := plugins.NewPluginManager(config.GetPluginDir())
 	plugin, _ := pluginManger.GetPlugin()
-	_, fileName := filepath.Split(utu.LocalFileChecksum.Path)
+	_, fileName := filepath.Split(utu.LocalFileChecksum.Path.LogicPath)
 	pluginParam := &plugins.UploadFileFinishParams{
-		LocalFilePath:      utu.LocalFileChecksum.Path,
+		LocalFilePath:      utu.LocalFileChecksum.Path.LogicPath,
 		LocalFileName:      fileName,
 		LocalFileSize:      utu.LocalFileChecksum.LocalFileMeta.Length,
 		LocalFileType:      "file",
@@ -275,7 +355,12 @@ func (utu *UploadTaskUnit) OnComplete(lastRunResult *taskframework.TaskUnitRunRe
 	// 任务结束，可能成功也可能失败
 }
 func (utu *UploadTaskUnit) OnCancel(lastRunResult *taskframework.TaskUnitRunResult) {
-
+	// 更新UI面板
+	failedMessage := lastRunResult.ResultMessage
+	if lastRunResult.Err != nil {
+		failedMessage = fmt.Sprintf("%s, %s", lastRunResult.ResultMessage, lastRunResult.Err)
+	}
+	utu.updateUITaskState(ui.TaskCanceled, failedMessage)
 }
 func (utu *UploadTaskUnit) RetryWait() time.Duration {
 	return functions.RetryWait(utu.taskInfo.Retry())
@@ -284,7 +369,7 @@ func (utu *UploadTaskUnit) RetryWait() time.Duration {
 func (utu *UploadTaskUnit) Run() (result *taskframework.TaskUnitRunResult) {
 	err := utu.LocalFileChecksum.OpenPath()
 	if err != nil {
-		fmt.Printf("[%s] 文件不可读, 错误信息: %s, 跳过...\n", utu.taskInfo.Id(), err)
+		utu.logf("[%s] 文件不可读, 错误信息: %s, 跳过...\n", utu.taskInfo.Id(), err)
 		return
 	}
 	defer utu.LocalFileChecksum.Close() // 关闭文件
@@ -292,7 +377,8 @@ func (utu *UploadTaskUnit) Run() (result *taskframework.TaskUnitRunResult) {
 	timeStart := time.Now()
 	result = &taskframework.TaskUnitRunResult{}

-	fmt.Printf("[%s] %s 准备上传: %s => %s\n", utu.taskInfo.Id(), time.Now().Format("2006-01-02 15:04:06"), utu.LocalFileChecksum.Path, utu.SavePath)
+	utu.logf("[%s] %s 准备上传: %s => %s\n", utu.taskInfo.Id(), time.Now().Format("2006-01-02 15:04:06"), utu.LocalFileChecksum.Path.LogicPath, utu.SavePath)
+	utu.updateUITaskState(ui.TaskRunning, "")

 	defer func() {
 		var msg string
@@ -303,14 +389,16 @@ func (utu *UploadTaskUnit) Run() (result *taskframework.TaskUnitRunResult) {
 		} else {
 			msg = result.ResultMessage
 		}
-		fmt.Printf("[%s] %s 文件上传结果： %s 耗时 %s\n", utu.taskInfo.Id(), time.Now().Format("2006-01-02 15:04:06"), msg, utils.ConvertTime(time.Now().Sub(timeStart)))
+		utu.logf("[%s] %s 文件上传结果： %s 耗时 %s\n", utu.taskInfo.Id(), time.Now().Format("2006-01-02 15:04:06"), msg, utils.ConvertTime(time.Now().Sub(timeStart)))
 	}()
+
 	// 准备文件
 	utu.prepareFile()
 	logger.Verbosef("[%s] %s 准备结束, 准备耗时 %s\n", utu.taskInfo.Id(), time.Now().Format("2006-01-02 15:04:06"), utils.ConvertTime(time.Now().Sub(timeStart)))

 	var apierr *apierror.ApiError
 	var rs *aliyunpan.MkdirResult
+	var efi *aliyunpan.FileEntity
 	var appCreateUploadFileParam *aliyunpan.CreateFileUploadParam
 	var sha1Str string
 	var contentHashName string
@@ -320,6 +408,7 @@ func (utu *UploadTaskUnit) Run() (result *taskframework.TaskUnitRunResult) {
 	var proofCode = ""
 	var localFileInfo os.FileInfo
 	var localFile *os.File
+	var newBlockSize int64

 	switch utu.Step {
 	case StepUploadPrepareUpload:
@@ -335,24 +424,33 @@ StepUploadPrepareUpload:
 	// 创建云盘文件夹
 	saveFilePath = path.Dir(utu.SavePath)
 	if saveFilePath != "/" {
-		fmt.Printf("[%s] %s 正在检测和创建云盘文件夹: %s\n", utu.taskInfo.Id(), time.Now().Format("2006-01-02 15:04:06"), saveFilePath)
-		fe, apierr1 := utu.PanClient.FileInfoByPath(utu.DriveId, saveFilePath)
+		utu.FolderCreateMutex.Lock()
+		utu.logf("[%s] %s 正在检测和创建云盘文件夹: %s\n", utu.taskInfo.Id(), time.Now().Format("2006-01-02 15:04:06"), saveFilePath)
+		fe, apierr1 := utu.PanClient.OpenapiPanClient().FileInfoByPath(utu.DriveId, saveFilePath)
 		time.Sleep(1 * time.Second)
+		needToCreateFolder := false
 		if apierr1 != nil && apierr1.Code == apierror.ApiCodeFileNotFoundCode {
+			needToCreateFolder = true
+		} else {
+			if fe == nil {
+				needToCreateFolder = true
+			} else {
+				rs = &aliyunpan.MkdirResult{}
+				rs.FileId = fe.FileId
+			}
+		}
+		if needToCreateFolder {
 			logger.Verbosef("[%s] %s 创建云盘文件夹: %s\n", utu.taskInfo.Id(), time.Now().Format("2006-01-02 15:04:06"), saveFilePath)
-			// rs, apierr = utu.PanClient.MkdirRecursive(utu.DriveId, "", "", 0, strings.Split(path.Clean(saveFilePath), "/"))
-			// 可以直接创建的，不用循环创建
-			rs, apierr = utu.PanClient.Mkdir(utu.DriveId, "root", saveFilePath)
+			rs, apierr = utu.PanClient.OpenapiPanClient().MkdirByFullPath(utu.DriveId, saveFilePath)
 			if apierr != nil || rs.FileId == "" {
 				result.Err = apierr
 				result.ResultMessage = "创建云盘文件夹失败"
+				utu.FolderCreateMutex.Unlock()
 				return
 			}
 			logger.Verbosef("[%s] %s 创建云盘文件夹成功\n", utu.taskInfo.Id(), time.Now().Format("2006-01-02 15:04:06"))
-		} else {
-			rs = &aliyunpan.MkdirResult{}
-			rs.FileId = fe.FileId
 		}
+		utu.FolderCreateMutex.Unlock()
 	} else {
 		rs = &aliyunpan.MkdirResult{}
 		rs.FileId = ""
@@ -363,74 +461,144 @@ StepUploadPrepareUpload:
 	proofCode = ""
 	contentHashName = "sha1"
 	checkNameMode = "auto_rename"
+	// 如果启用了 覆盖/跳过 已存在的文件,则需要提前检查文件是否存在
+	if utu.IsOverwrite || utu.IsSkipSameName {
+		efi, apierr = utu.PanClient.OpenapiPanClient().FileInfoByPath(utu.DriveId, utu.SavePath)
+		if apierr != nil && apierr.Code != apierror.ApiCodeFileNotFoundCode {
+			result.Err = apierr
+			result.ResultMessage = "检测同名文件失败"
+			return
+		}
+	}
+	if utu.IsSkipSameName {
+		if efi != nil && efi.FileId != "" {
+			result.Succeed = true
+			result.Extra = efi
+			utu.logf("[%s] %s 检测到同名文件，跳过上传: %s\n", utu.taskInfo.Id(), time.Now().Format("2006-01-02 15:04:06"), utu.SavePath)
+			utu.updateUITaskState(ui.TaskSkipped, "")
+			return
+		}
+	}
 	if !utu.NoRapidUpload {
-		// 计算文件SHA1
-		fmt.Printf("[%s] %s 正在计算文件SHA1: %s\n", utu.taskInfo.Id(), time.Now().Format("2006-01-02 15:04:06"), utu.LocalFileChecksum.Path)
-		utu.LocalFileChecksum.Sum(localfile.CHECKSUM_SHA1)
-		sha1Str = utu.LocalFileChecksum.SHA1
-		if utu.LocalFileChecksum.Length == 0 {
-			sha1Str = aliyunpan.DefaultZeroSizeFileContentHash
+		// 正常上传流程，检测是否能秒传
+		preHashMatch := true
+		if utu.LocalFileChecksum.Length >= DefaultCheckPreHashFileSize {
+			// 大文件，先计算 PreHash，用于检测是否可能支持秒传
+			preHash := CalcFilePreHash(utu.LocalFileChecksum.Path.RealPath)
+			if len(preHash) > 0 {
+				if b, er := utu.PanClient.OpenapiPanClient().CheckUploadFilePreHash(&aliyunpan.FileUploadCheckPreHashParam{
+					DriveId:      utu.DriveId,
+					Name:         filepath.Base(utu.SavePath),
+					Size:         utu.LocalFileChecksum.Length,
+					ParentFileId: rs.FileId,
+					PreHash:      preHash,
+				}); er == nil {
+					preHashMatch = b
+				}
+			}
 		}

-		// proof code
-		localFile, _ = os.Open(utu.LocalFileChecksum.Path)
-		localFileInfo, _ = localFile.Stat()
-		proofCode = aliyunpan.CalcProofCode(utu.PanClient.GetAccessToken(), rio.NewFileReaderAtLen64(localFile), localFileInfo.Size())
-		localFile.Close()
+		if preHashMatch { // preHashMatch为true，代表该文件可能已经被上传过，能够支持秒传，所以需要进一步计算完整SHA1进行检测是否能秒传
+			// 计算完整文件SHA1
+			utu.logf("[%s] %s 正在计算文件SHA1: %s\n", utu.taskInfo.Id(), time.Now().Format("2006-01-02 15:04:06"), utu.LocalFileChecksum.Path.LogicPath)
+			utu.LocalFileChecksum.Sum(localfile.CHECKSUM_SHA1)
+			sha1Str = utu.LocalFileChecksum.SHA1
+			if utu.LocalFileChecksum.Length == 0 {
+				sha1Str = aliyunpan.DefaultZeroSizeFileContentHash
+			}
+
+			// proof code
+			localFile, _ = os.Open(utu.LocalFileChecksum.Path.RealPath)
+			localFileInfo, _ = localFile.Stat()
+			proofCode = aliyunpan.CalcProofCode(utu.PanClient.OpenapiPanClient().GetAccessToken(), rio.NewFileReaderAtLen64(localFile), localFileInfo.Size())
+			localFile.Close()
+		} else {
+			// 无需计算 sha1，直接上传
+			logger.Verboseln("PreHash not match, upload file directly")
+			sha1Str = ""
+			contentHashName = ""
+			checkNameMode = "auto_rename"
+		}
 	} else {
-		fmt.Printf("[%s] %s 已经禁用秒传检测，直接上传\n", utu.taskInfo.Id(), time.Now().Format("2006-01-02 15:04:06"))
-		contentHashName = "none"
+		utu.logf("[%s] %s 已经禁用秒传检测，直接上传\n", utu.taskInfo.Id(), time.Now().Format("2006-01-02 15:04:06"))
+		sha1Str = ""
+		contentHashName = ""
 		checkNameMode = "auto_rename"
 	}

 	if utu.IsOverwrite {
 		// 标记覆盖旧同名文件
 		// 检查同名文件是否存在
-		efi, apierr := utu.PanClient.FileInfoByPath(utu.DriveId, utu.SavePath)
-		if apierr != nil && apierr.Code != apierror.ApiCodeFileNotFoundCode {
-			result.Err = apierr
-			result.ResultMessage = "检测同名文件失败"
-			return
-		}
 		if efi != nil && efi.FileId != "" {
 			if strings.ToUpper(efi.ContentHash) == strings.ToUpper(sha1Str) {
 				result.Succeed = true
 				result.Extra = efi
-				fmt.Printf("[%s] %s 检测到同名文件，文件内容完全一致，无需重复上传: %s\n", utu.taskInfo.Id(), time.Now().Format("2006-01-02 15:04:06"), utu.SavePath)
+				utu.logf("[%s] %s 检测到同名文件，文件内容完全一致，无需重复上传: %s\n", utu.taskInfo.Id(), time.Now().Format("2006-01-02 15:04:06"), utu.SavePath)
 				return
 			}
 			// existed, delete it
-			var fileDeleteResult []*aliyunpan.FileBatchActionResult
+			var fileDeleteResult *aliyunpan.FileBatchActionResult
 			var err *apierror.ApiError
-			fileDeleteResult, err = utu.PanClient.FileDelete([]*aliyunpan.FileBatchActionParam{{DriveId: efi.DriveId, FileId: efi.FileId}})
-			if err != nil || len(fileDeleteResult) == 0 {
+			fileDeleteResult, err = utu.PanClient.OpenapiPanClient().FileDelete(&aliyunpan.FileBatchActionParam{DriveId: efi.DriveId, FileId: efi.FileId})
+			if err != nil || !fileDeleteResult.Success {
 				result.Err = err
 				result.ResultMessage = "无法删除文件，请稍后重试"
 				return
 			}
 			time.Sleep(time.Duration(500) * time.Millisecond)
-			fmt.Printf("[%s] %s 检测到同名文件，已移动到回收站: %s\n", utu.taskInfo.Id(), time.Now().Format("2006-01-02 15:04:06"), utu.SavePath)
+			utu.logf("[%s] %s 检测到同名文件，文件内容不一致，已将旧文件移动到回收站: %s\n", utu.taskInfo.Id(), time.Now().Format("2006-01-02 15:04:06"), utu.SavePath)
 		}
 	}

-	// 创建上传任务
-	appCreateUploadFileParam = &aliyunpan.CreateFileUploadParam{
-		DriveId:         utu.DriveId,
-		Name:            filepath.Base(utu.SavePath),
-		Size:            utu.LocalFileChecksum.Length,
-		ContentHash:     sha1Str,
-		ContentHashName: contentHashName,
-		CheckNameMode:   checkNameMode,
-		ParentFileId:    rs.FileId,
-		BlockSize:       utu.BlockSize,
-		ProofCode:       proofCode,
-		ProofVersion:    "v1",
+	// 自动调整BlockSize大小
+	newBlockSize = utils.ResizeUploadBlockSize(utu.LocalFileChecksum.Length, utu.BlockSize)
+	if newBlockSize != utu.BlockSize {
+		logger.Verboseln("resize upload block size to: " + converter.ConvertFileSize(newBlockSize, 2))
+		utu.BlockSize = newBlockSize
 	}

-	uploadOpEntity, apierr = utu.PanClient.CreateUploadFile(appCreateUploadFileParam)
+	// 创建上传任务
+	if sha1Str != "" {
+		// 计算SHA1和ProofCode，该方式支持秒传文件
+		appCreateUploadFileParam = &aliyunpan.CreateFileUploadParam{
+			DriveId:         utu.DriveId,
+			Name:            filepath.Base(utu.SavePath),
+			Size:            utu.LocalFileChecksum.Length,
+			CheckNameMode:   checkNameMode,
+			ParentFileId:    rs.FileId,
+			BlockSize:       utu.BlockSize,
+			ContentHash:     sha1Str,
+			ContentHashName: contentHashName,
+			ProofCode:       proofCode,
+			ProofVersion:    "v1",
+			LocalCreatedAt:  utils.UnixTime2LocalFormatStr(utu.LocalFileChecksum.ModTime),
+			LocalModifiedAt: utils.UnixTime2LocalFormatStr(utu.LocalFileChecksum.ModTime),
+		}
+	} else {
+		// 不支持秒传，不计算SHA1，直接上传文件
+		appCreateUploadFileParam = &aliyunpan.CreateFileUploadParam{
+			DriveId:         utu.DriveId,
+			Name:            filepath.Base(utu.SavePath),
+			Size:            utu.LocalFileChecksum.Length,
+			CheckNameMode:   checkNameMode,
+			ParentFileId:    rs.FileId,
+			BlockSize:       utu.BlockSize,
+			LocalCreatedAt:  utils.UnixTime2LocalFormatStr(utu.LocalFileChecksum.ModTime),
+			LocalModifiedAt: utils.UnixTime2LocalFormatStr(utu.LocalFileChecksum.ModTime),
+		}
+	}
+
+	uploadOpEntity, apierr = utu.PanClient.OpenapiPanClient().CreateUploadFile(appCreateUploadFileParam)
 	if apierr != nil {
 		result.Err = apierr
 		result.ResultMessage = "创建上传任务失败：" + apierr.Error()
+		if apierr.Code == apierror.ApiCodeTooManyRequests || apierr.Code == apierror.ApiCodeBadGateway {
+			logger.Verboseln("create upload file error: " + result.ResultMessage)
+			// 重试
+			result.NeedRetry = true
+		} else if apierr.Code == apierror.ApiCodeUploadPayloadTooLarge {
+			utu.logf("[%s] %s 上传文件的大小超出限制，你可能需要开通阿里云盘三方权益包以便上传大文件\n", utu.taskInfo.Id(), time.Now().Format("2006-01-02 15:04:06"))
+		}
 		return
 	}

@@ -451,14 +619,101 @@ stepUploadUpload:
 	// 正常上传流程
 	uploadResult := utu.upload()
 	if uploadResult != nil && uploadResult.Err != nil {
-		if uploadResult.Err == uploadPartNotSeq {
-			fmt.Printf("[%s] %s 文件分片上传顺序错误，开始重新上传文件\n", utu.taskInfo.Id(), time.Now().Format("2006-01-02 15:04:06"))
+		// 处理上传错误
+		if errors.Is(uploadResult.Err, uploader.UploadPartNotSeq) {
+			// 分片乱序错误
+			if ee := utu.amendFileUploadPartNum(); ee != nil {
+				// 修正分片乱序失败，先令上传任务直接失败
+				logger.Verboseln("WARNING! amend uploaded parts num failed")
+				utu.logf("[%s] %s 无法修正上传分片乱序的错误，建议重新上传\n", utu.taskInfo.Id(), time.Now().Format("2006-01-02 15:04:06"))
+				uploadResult = &taskframework.TaskUnitRunResult{
+					Succeed:       false,
+					NeedRetry:     false,
+					Cancel:        false,
+					Err:           ee,
+					ResultCode:    0,
+					ResultMessage: "",
+					Extra:         nil,
+				}
+				return uploadResult
+			}
+			goto stepUploadUpload
+		}
+		if errors.Is(uploadResult.Err, uploader.UploadNoSuchUpload) {
+			// 上传任务过期
+			utu.logf("[%s] %s 网盘上传任务不存在，创建新任务重新上传文件\n", utu.taskInfo.Id(), time.Now().Format("2006-01-02 15:04:06"))
 			// 需要重新从0开始上传
 			uploadResult = nil
 			utu.LocalFileChecksum.UploadOpEntity = nil
 			utu.state = nil
 			goto StepUploadPrepareUpload
 		}
+		if errors.Is(uploadResult.Err, uploader.UploadLocalFileAlreadyClosedError) {
+			// 本地文件读取错误
+			utu.logf("[%s] %s 本地文件读取错误，建议检查文件是否存在，是否有文件读取权限，或者硬盘是否有异常\n", utu.taskInfo.Id(), time.Now().Format("2006-01-02 15:04:06"))
+			uploadResult = &taskframework.TaskUnitRunResult{
+				Succeed:       false,
+				NeedRetry:     false,
+				Cancel:        false,
+				Err:           uploadResult.Err,
+				ResultCode:    0,
+				ResultMessage: "",
+				Extra:         nil,
+			}
+			return uploadResult
+		}
+
+		// 处理阿里云盘API接口错误
+		var apier *apierror.ApiError
+		if errors.As(uploadResult.Err, &apier) {
+			// 上传任务过期
+			if apier.Code == apierror.ApiCodeUploadIdNotFound {
+				utu.logf("[%s] %s 网盘上传任务已失效，创建新任务重新上传文件\n", utu.taskInfo.Id(), time.Now().Format("2006-01-02 15:04:06"))
+				uploadResult = nil
+				utu.LocalFileChecksum.UploadOpEntity = nil
+				utu.state = nil
+				goto StepUploadPrepareUpload
+			}
+		}
 	}
 	return uploadResult
 }
+
+// amendFileUploadPartNum 修正文件分片上传顺序错误
+func (utu *UploadTaskUnit) amendFileUploadPartNum() error {
+	if utu.LocalFileChecksum.LocalFileMeta.UploadOpEntity == nil || utu.state == nil {
+		return nil
+	}
+	logger.Verbosef("adjust the uploaded parts num error\n")
+	// 分片出现乱序
+	// 获取的已上传分片信息，修正正确的分片顺序
+	uploadedParts, uper := utu.PanClient.OpenapiPanClient().GetUploadedPartInfoAllItem(&aliyunpan.GetUploadedPartsParam{
+		DriveId:  utu.LocalFileChecksum.LocalFileMeta.UploadOpEntity.DriveId,
+		FileId:   utu.LocalFileChecksum.LocalFileMeta.UploadOpEntity.FileId,
+		UploadId: utu.LocalFileChecksum.LocalFileMeta.UploadOpEntity.UploadId,
+	})
+	if uper != nil {
+		logger.Verbosef("get uploaded parts info error: %+v\n", uper)
+		return uper
+	}
+	// 获取最后上传的分片编号
+	lastUploadedPartNum := -1
+	if len(uploadedParts.UploadedParts) > 0 {
+		lastUploadedPartNum = uploadedParts.UploadedParts[len(uploadedParts.UploadedParts)-1].PartNumber
+	} else {
+		logger.Verbosef("get uploaded parts list is empty\n")
+		return errors.New("uploaded parts list is empty")
+	}
+	// 修正分片上传的标识
+	if lastUploadedPartNum > 0 {
+		logger.Verbosef("get the right uploaded parts num: %d\n", lastUploadedPartNum)
+		for _, w := range utu.state.BlockList {
+			if (w.ID + 1) <= lastUploadedPartNum { // 分片的编号从1开始，BlockList的id是从0开始
+				w.UploadDone = true
+			} else {
+				w.UploadDone = false
+			}
+		}
+	}
+	return nil
+}
--- a/Show More
+++ b/Show More