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
127 changed files with 9332 additions and 7474 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功能。" -->
+
+### Ⅲ. 请描述新功能的使用场景
+<!-- 可以讲讲你对新功能的看法，为什么需要增加这个功能，这个新功能在哪些场景下会使用。 -->
@@ -1,17 +1,22 @@
 # 关于
-阿里云盘CLI。仿 Linux shell 文件处理命令的阿里云盘命令行客户端，支持JavaScript插件，支持webdav文件协议，支持同步备份功能。
+阿里云盘CLI。仿 Linux shell 文件处理命令的阿里云盘命令行客户端，支持JavaScript插件，支持同步备份功能，支持相册批量下载。

 # 特色
 1. 多平台支持, 支持 Windows, macOS, linux(x86/x64/arm), android, iOS 等
 2. 阿里云盘多用户支持
-3. 支持文件网盘，相册网盘无缝切换
+3. 支持备份盘，资源库无缝切换
 4. [下载](docs/manual.md#下载文件目录)网盘内文件, 支持多个文件或目录下载, 支持断点续传和单文件并行下载。支持软链接(符号链接)文件。
 5. [上传](docs/manual.md#上传文件目录)本地文件, 支持多个文件或目录上传，支持排除指定文件夹/文件（正则表达式）功能。支持软链接(符号链接)文件。
 6. [同步备份功能](docs/manual.md#同步备份功能)支持备份本地文件到云盘，备份云盘文件到本地，双向同步备份保持本地文件和网盘文件同步。常用于嵌入式或者NAS等设备，支持docker镜像部署。
 7. 命令和文件路径输入支持Tab键自动补全，路径支持通配符匹配模式
-8. 支持阿里云ECS环境下使用内网链接上传/下载，速度更快(只支持阿里经典网络，最高可达100MB/s)，还可以节省公网带宽流量(配置transfer_url_type=2即可)
-9. 支持[webdav文件服务](docs/manual.md#webdav文件服务)，可以将阿里云盘当做webdav文件网盘挂载到Windows, macOS, linux的磁盘中进行使用。webdav部署支持docker镜像，镜像只有不到10MB非常小巧。
-10. 支持[JavaScript插件](docs/manual.md#JavaScript插件)，你可以按照自己的需要定制上传/下载中关键步骤的行为，最大程度满足自己的个性化需求
+8. 支持[JavaScript插件](docs/plugin_manual.md#简介)，你可以按照自己的需要定制上传/下载中关键步骤的行为，最大程度满足自己的个性化需求
+9. 支持共享相册的相关操作，支持批量下载相册所有普通照片、实况照片文件到本地
+10. 支持多用户联合下载功能，对下载速度有极致追求的用户可以尝试使用该选项。详情请查看文档[多用户联合下载](docs/manual.md#多用户联合下载)
+
+# 阿里云盘VIP会员推荐码
+如果大家有打算开通阿里云盘VIP会员，可以使用阿里云盘APP扫描下面的优惠推荐码进行开通。    
+注意：您需要开通【三方应用权益包】，这样使用本程序下载才能加速，否则下载无法提速。   
+![](./assets/images/aliyunpan_cps_qrcode.png)

 # 目录
 - [关于](#关于)
@@ -21,23 +26,23 @@
  - [直接下载安装](#直接下载安装)
  - [apt安装](#apt安装)
  - [yum安装](#yum安装)
+  - [brew安装](#brew安装)
  - [winget安装](#winget安装)
  - [docker安装](#docker安装)
    - [sync同步盘](#sync同步盘)
-    - [webdav共享盘](#webdav共享盘)
 - [如何使用](#如何使用)
  - [基本使用](#基本使用)
    - [修改配置目录](#修改配置目录)
    - [启动程序](#启动程序)
    - [查看帮助](#查看帮助)
    - [登录](#登录)
+    - [切换网盘](#切换网盘)
    - [查看文件列表](#查看文件列表)
    - [下载文件](#下载文件)
    - [上传文件](#上传文件)
    - [同步备份文件](#同步备份文件)
  - [更多命令](#更多命令)
 - [常见问题](#常见问题)
-  - [如何获取RefreshToken](#如何获取refreshtoken)
  - [如何开启Debug调试日志](#如何开启debug调试日志)
    - [第一步](#第一步)
    - [第二步](#第二步)
@@ -54,15 +59,16 @@
 2. arm64 : 适用64位ARM系统
 3. 386 / x86 : 适用32系统，包括Intel和AMD的CPU系统
 4. amd64 / x64 : 适用64位系统，包括Intel和AMD的CPU系统
-5. mips : 适用MIPS指令集的CPU，例如国产龙芯CPU
-6. macOS amd64适用Intel CPU的机器，macOS arm64目前主要是适用苹果M1芯片的机器
+5. mips : 适用MIPS指令集的CPU，例如中标麒麟的系统。MIPS要注意大小端字序的不同对应的版本也不同。
+6. macOS amd64适用Intel CPU的机器，macOS arm64目前主要是适用苹果M系列芯片的机器
 7. iOS arm64适用iPhone手机，并且必须是越狱的手机才能正常运行
+8. loong64 : 适用于LoongArch64架构的机器，例如国产龙芯CPU

 参考例子：
 ```shell
-wget https://github.com/tickstep/aliyunpan/releases/download/v0.2.7/aliyunpan-v0.2.7-linux-amd64.zip
-unzip aliyunpan-v0.2.7-linux-amd64.zip
-cd aliyunpan-v0.2.7-linux-amd64
+wget https://github.com/tickstep/aliyunpan/releases/download/v0.4.0/aliyunpan-v0.4.0-linux-amd64.zip
+unzip aliyunpan-v0.4.0-linux-amd64.zip
+cd aliyunpan-v0.4.0-linux-amd64
 ./aliyunpan
 ```

@@ -80,53 +86,58 @@ sudo curl -fsSL http://file.tickstep.com/rpm/aliyunpan/aliyunpan.repo | sudo tee
 
 ```

+## brew安装
+适用于brew包管理器的系统，主要是苹果macOS系统。目前只支持amd64和arm64架构(Apple Silicon)的机器。
+```shell
+brew install aliyunpan
+    
+```
+由于brew默认安装在系统目录下面，这样配置文件也默认存放在系统目录里了，建议设置系统变量进行配置文件的单独存储，例如
+```shell
+export ALIYUNPAN_CONFIG_DIR=/Users/tickstep/Applications/adrive/config
+```
+
 ## winget安装
 适用于Windows系统的winget包管理器。目前只支持x86和x64架构的机器。  
    
-更新源
+更新源（可选）
 ```powershell
 winget source update
 
 ```
 安装
 ```powershell
-winget install tickstep.aliyunpan --silent
+winget install tickstep.aliyunpan --source winget --silent
 
 ```

 ## docker安装
 ### sync同步盘
-同步备份功能，支持备份本地文件到云盘，备份云盘文件到本地，双向同步备份三种模式。支持JavaScript插件对备份文件进行过滤。
-备份功能支持以下三种模式：
+同步备份功能，支持备份本地文件到云盘，备份云盘文件到本地两种模式。支持JavaScript插件对备份文件进行过滤。
+备份功能支持以下模式：
 1. 备份本地文件，即上传本地文件到网盘，始终保持本地文件有一个完整的备份在网盘
 2. 备份云盘文件，即下载网盘文件到本地，始终保持网盘的文件有一个完整的备份在本地
-3. 双向备份，保持网盘文件和本地文件严格一致
-```
-docker run -d --name=aliyunpan-sync --restart=always -v "<your local dir>:/home/app/data" -e TZ="Asia/Shanghai" -e ALIYUNPAN_REFRESH_TOKEN="<your refreshToken>" -e ALIYUNPAN_PAN_DIR="<your drive pan dir>" -e ALIYUNPAN_SYNC_MODE="upload" -e ALIYUNPAN_TASK_STEP="sync" tickstep/aliyunpan-sync:v0.2.7
- 
-  
-<your local dir>：本地目录绝对路径，例如：/tickstep/Documents/设计文档
-ALIYUNPAN_PAN_DIR：云盘目录
-ALIYUNPAN_REFRESH_TOKEN：RefreshToken
-ALIYUNPAN_SYNC_MODE：备份模式，支持三种: upload(备份本地文件到云盘),download(备份云盘文件到本地),sync(双向同步备份)
-ALIYUNPAN_TASK_STEP：任务步骤, 支持两种: scan(只扫描并建立同步数据库),sync(正常启动同步任务)。如果你同步目录文件非常多，首次运行最好先跑一次scan步骤，然后再正常启动文件同步任务
-```
-更详情文档请参考dockerhub网址：[tickstep/aliyunpan-sync](https://hub.docker.com/r/tickstep/aliyunpan-sync)
+   
+备份功能支持指定备份策略：
+1. exclusive，排他备份文件（一比一镜像备份），目标目录多余的文件会被删除。保证备份的源目录，和目标目录文件一比一备份。源目录文件如果文件被删除，则对应的目标目录的文件也会被删除。
+2. increment，增量备份文件，目标目录多余的文件不会被删除。只会把源目录修改的文件，新增的文件备份到目标目录。如果源目录有文件删除，或者目标目录有其他文件新增是不会被删除。
+   
+同步的基本逻辑如下所示，一次循环包括：扫描-对比-执行，一共三个环节。   
+![](./assets/images/sync_command-basic_logic.jpg)

-### webdav共享盘
-让阿里云盘变身为webdav协议的文件服务器。这样使用webdav客户端软件，你可以把阿里云盘挂载为Windows、Linux、Mac系统的磁盘，可以通过NAS系统做文件管理或文件同步等等。
 ```
-docker run -d --name=aliyunpan-webdav --restart=always -p 23077:23077 -e TZ="Asia/Shanghai" -e ALIYUNPAN_REFRESH_TOKEN="<your refreshToken>" -e ALIYUNPAN_AUTH_USER="admin" -e ALIYUNPAN_AUTH_PASSWORD="admin" -e ALIYUNPAN_WEBDAV_MODE="rw" -e ALIYUNPAN_PAN_DRIVE="File" -e ALIYUNPAN_PAN_DIR="/" tickstep/aliyunpan-webdav:v0.2.7
- 
- 
-ALIYUNPAN_REFRESH_TOKEN RefreshToken
-ALIYUNPAN_AUTH_USER webdav登录用户名
-ALIYUNPAN_AUTH_PASSWORD webdav登录密码
-ALIYUNPAN_WEBDAV_MODE webdav模式，支持：rw-读写，ro-只读
-ALIYUNPAN_PAN_DRIVE 网盘类型，可选： File-文件 Album-相册
-ALIYUNPAN_PAN_DIR 网盘文件夹的webdav服务根目录
+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:v0.4.0 
+  
+<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-关闭同步日志
 ```
-更详情文档请参考dockerhub网址：[tickstep/aliyunpan-webdav](https://hub.docker.com/r/tickstep/aliyunpan-webdav)
+docker-compose启动方式请查看：[docker-compose.yml](https://github.com/tickstep/aliyunpan/blob/main/docs/manual.md#Docker%E8%BF%90%E8%A1%8C)   
+更详情文档请参考dockerhub网址：[tickstep/aliyunpan-sync](https://hub.docker.com/r/tickstep/aliyunpan-sync)

 # 如何使用
 完整和详细的命令说明请查看手册：[命令手册](docs/manual.md)   
@@ -185,20 +196,33 @@ aliyunpan > help
     share        分享文件/目录
     sync         同步备份功能
     upload, u    上传文件/目录
-     webdav       在线网盘服务
 ...
 ```

 ### 登录
-需要先登录，已经登录过的可以跳过此步。   
-RefreshToken获取教程请查看：[如何获取RefreshToken](#如何获取RefreshToken)
+需要先登录，已经登录过的可以跳过此步。登录是在浏览器上进行，你需要进行两次登录。
 ```shell
-aliyunpan > login -RefreshToken=32994cd2c43...4d505fa79
-
+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$ 
 ```

+### 切换网盘
+支持切换备份盘、资源库，默认工作在备份盘下。
+```shell
+aliyunpan:/ tickstep(备份盘)$ drive
+  #   DRIVE ID   网盘名称  
+  1    11519221   备份盘   
+  2  1311893110   资源库   
+  
+输入要切换的网盘 # 值 > 2
+切换到网盘：资源库                     
+aliyunpan:/ tickstep(资源库)$ 
+```
+
 ### 查看文件列表
 ```shell
 aliyunpan:/ tickstep$ ls
@@ -217,6 +241,7 @@ aliyunpan:/ tickstep$ ls
 ```

 ### 下载文件
+如果需要更改默认下载目录路径，可以通过 `aliyunpan config set -savedir <savedir>` 自定义下载文件保存的目录。
 ```shell
 aliyunpan:/ tickstep$ download IMG_0106.JPG

@@ -236,12 +261,26 @@ aliyunpan:/ tickstep$ download IMG_0106.JPG
 [1] 检验文件有效性成功: /root/Downloads/4d001d48564f43b..62874f04bbe6/IMG_0106.JPG

 下载结束, 时间: 4秒, 数据总量: 1.48MB
-aliyunpan:/ tickstep$ 
 ```
-下载支持两种链接类型：1-默认类型 2-阿里ECS环境类型   
-在普通网络下，下载速度可以达到10MB/s，在阿里ECS（必须是"经典网络"类型的机器）环境下，下载速度单文件可以轻松达到20MB/s，多文件可以达到100MB/s   
-![](./assets/images/download_file_ecs_speed_screenshot.gif)
-![](./assets/images/download_file_speed_screenshot.gif)
+或者使用UI面板展示下载进度(使用-ui选项)，更加直观和友好。
+```shell
+aliyunpan:/ tickstep$ download /photo -ui
+┌──────────────────────────────────────────────────────────────────────────────────────────┐
+│总速度: 341.59 KB/s | 文件: 0/7 | 失败: 0 | 状态: 下载中 | 已用时间: 9s | 剩余时间: 51s         │
+│总进度: [===>                                                  ]   7.4% (896.00KB/11.83MB) │
+│──────────────────────────────────────────────────────────────────────────────────────────│
+│ 1. IMG_0005.JPG                       [============>       ]  66.9% 258.42KB/s   3s      │
+│ 2. IMG_0007.JPG                       [============>       ]  67.3% 258.54KB/s   3s      │
+│ 3. IMG_0009.JPG                       [                    ]   0.0% 等待中        -       │
+│──────────────────────────────────────────────────────────────────────────────────────────│
+│[10:39:24] [0] 当前文件下载最大并发量为: 2, 单文件下载分片线程数为: 1, 下载缓存为: 64.00KB         │
+│[10:39:27] [2] 加入下载队列: /photo/p/IMG_0007.JPG                                          │
+│[10:39:27] [2] ---- 文件ID: 67dfe476a7573e76a2034626bd013f36581296ed 文件名: IMG_0007....  │
+│[10:39:27] [3] 准备下载: /photo/p/IMG_0007.JPG                                             │
+│[10:39:27] [2] 将会下载到路径: /Users/tickstep/Downloads/4d001d48564f43b3bc5662874f04bb...  │
+│[10:39:28] [2] 下载开始                                                                    │
+└──────────────────────────────────────────────────────────────────────────────────────────┘
+```

 ### 上传文件
 ```shell
@@ -260,23 +299,32 @@ aliyunpan:/ tickstep$ upload /Users/tickstep/Downloads/apt.zip /tmp

 上传结束, 时间: 18秒, 数据总量: 21.00MB
 ```
-上传支持两种链接类型：1-默认类型 2-阿里ECS环境类型   
-在阿里ECS（必须是"经典网络"类型的机器）环境下，上传速度单文件可以轻松达到30MB/s，多文件可以达到100MB/s   
-![](./assets/images/upload_file_speed_screenshot.gif)
+或者使用UI面板展示上传进度(使用-ui选项)，更加直观和友好。
+```shell
+aliyunpan:/ tickstep$ upload /Users/tickstep/Downloads /photo -ui
+┌─────────────────────────────────────────────────────────────────────────────────────────┐
+│总速度:   3.62 MB/s | 文件: 9/14 | 失败: 0 | 状态: 上传中 | 已用时间: 12s | 剩余时间: 17s      │
+│总进度: [==========================>                          ]  51.7% (68.56MB/132.73MB) │
+│─────────────────────────────────────────────────────────────────────────────────────────│
+│ 1. System Design Interview 2.zip     [====>               ]  26.2% 3.25MB/s     18s     │
+│ 2. ips_20260228.txt                  [                    ]   0.0% 0 B/s        -       │
+│ 3. neko-agent                        [                    ]   0.0% 0 B/s        -       │
+│─────────────────────────────────────────────────────────────────────────────────────────│
+│[11:14:49] [9] 2026-03-02 11:14:26 正在计算文件SHA1: /Users/tickstep/Downloads/test/da...  │
+│[11:14:49] [13] 2026-03-02 11:14:26 正在检测和创建云盘文件夹: /photo/p2/test/output          │
+│[11:14:49] [9] 2026-03-02 11:14:26 检测秒传中, 请稍候...                                    │
+│[11:14:49] [9] 2026-03-02 11:14:26 秒传成功, 保存到网盘路径: /photo/p2/test/data/ips_2...    │
+│[11:14:49] [9] 2026-03-02 11:14:26 文件上传结果： 成功！ 耗时 12秒                           │
+│[11:14:49] 完成: /Users/tickstep/Downloads/test/data/ips_20260226.txt                    │
+└─────────────────────────────────────────────────────────────────────────────────────────┘
+```

 ### 同步备份文件
-同步备份功能，支持备份本地文件到云盘，备份云盘文件到本地，双向同步备份三种模式。支持JavaScript插件对备份文件进行过滤。
-
-***注意：如果同步目录下有非常多的文件，最好在首次备份前先运行一次scan任务，等scan任务完成并建立起同步数据库后，再正常启动同步任务。这样同步任务可以更加快速同步并且能有效避免同步重复文件。***
-
-
+同步备份功能，支持备份本地文件到云盘，备份云盘文件到本地两种模式。支持JavaScript插件对备份文件进行过滤。   
+   
 例如：将本地目录 `/tickstep/Documents/设计文档` 中的文件备份上传到云盘目录 `/备份盘/我的文档`
 ```shell
-首次运行建议先扫描并构建同步数据库，如下：
-aliyunpan:/ tickstep$ sync start -ldir "/tickstep/Documents/设计文档" -pdir "/备份盘/我的文档" -mode "upload" -step scan
-
-然后再正常启动同步任务，如下：
-aliyunpan:/ tickstep$ sync start -ldir "/tickstep/Documents/设计文档" -pdir "/备份盘/我的文档" -mode "upload"
+aliyunpan:/ tickstep$ sync start -ldir "/tickstep/Documents/设计文档" -pdir "/备份盘/我的文档" -mode "upload" -drive "backup"

 启动同步备份进程
 备份配置文件：(使用命令行配置)
@@ -297,18 +345,6 @@ aliyunpan:/ tickstep$ sync start -ldir "/tickstep/Documents/设计文档" -pdir
 更多更详细的命令请查看手册：[命令手册](docs/manual.md)。

 # 常见问题
-## 如何获取RefreshToken
-需要通过浏览器获取refresh_token。这里以Chrome浏览器为例，其他浏览器类似。   
-打开 [阿里云盘网页](https://www.aliyundrive.com/drive) 并进行登录，然后F12按键打开浏览器调试菜单，按照下面步骤进行
-![](./assets/images/how-to-get-refresh-token.png)
-
-或者直接在控制台输入以下命令获取
-```
-JSON.parse(localStorage.getItem("token")).refresh_token
-```
-![](./assets/images/how-to-get-refresh-token-cmd.png)
-
-
 ## 如何开启Debug调试日志
 当需要定位问题，或者提交issue的时候抓取log，则需要开启debug日志。步骤如下：

@@ -321,17 +357,18 @@ export ALIYUNPAN_VERBOSE=1

 Windows   
 不同版本会有些许不一样，请自行查询具体方法   
-设置示意图如下：
+设置示意图如下：   
 ![](./assets/images/win10-env-debug-config.png)

 ### 第二步
-打开aliyunpan命令行程序，任何云盘命令都有类似如下日志输出
+打开aliyunpan命令行程序，任何云盘命令都有类似如下日志输出   
 ![](./assets/images/debug-log-screenshot.png)

 ## 如何登出和下线客户端
 阿里云盘单账户最多只允许同时登录 10 台设备   
 当出现这个提示：你账号已超出最大登录设备数量，请先下线一台设备，然后重启本应用，才可以继续使用   
 说明你的账号登录客户端已经超过数量，你需要先登出其他客户端才能继续使用，如下所示   
+   
 APP手机端   
 ![](./assets/images/app-deregister-device.png)
 Web网页端   
@@ -343,6 +380,6 @@ Web网页端

 # 鸣谢
 本项目大量借鉴了以下相关项目的功能&成果   
-> [tickstep/cloudpan189-go](https://github.com/tickstep/cloudpan189-go)    
-> [hacdias/webdav](https://github.com/hacdias/webdav)   
+> [tickstep/aliyunpan-api](https://github.com/tickstep/aliyunpan-api)   
+> [tickstep/cloudpan189-go](https://github.com/tickstep/cloudpan189-go)   
 > [kazutoiris/ali_ecc](https://github.com/kazutoiris/ali_ecc)   
@@ -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.2.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-禁止扫描。
 //                       禁止扫描的文件不会执行后续的动作，例如上传，下载。
@@ -159,41 +159,37 @@ function syncScanPanFilePrepareCallback(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 - 同步文件后的参数
 // {
-// 	"action": "upload",
-// 	"actionResult": "success",
-// 	"driveId": "19519221",
-// 	"fileName": "1.txt",
-// 	"filePath": "D:/goprojects/dev/upload/1.txt",
-// 	"fileSha1": "294C8F24C56042710813E95C55A0B018299BA9A7",
-// 	"fileSize": "28077",
-// 	"fileType": "file",
-// 	"fileUpdatedAt": "2022-03-04 15:19:47"
+//  "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-上传文件，
-//          delete_local-删除本地文件，
-//          delete_pan-删除云盘文件，
-//          create_local_folder-创建本地文件夹，
-//          create_pan_folder-创建云盘文件夹
+// action - 同步动作，download-下载文件，upload-上传文件
 // actionResult - 同步结果，success-成功，fail-失败
 // driveId - 网盘ID
+// driveFileId - 网盘文件ID，只有download模式才会有这个字段
 // fileName - 文件名称
 // filePath - 文件完整路径
 // fileSha1 - 文件SHA1
@@ -205,5 +201,66 @@ function syncScanPanFilePrepareCallback(context, params) {
 // （无）
 // ------------------------------------------------------------------------------------------
 function syncFileFinishCallback(context, params) {
-	console.log(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)
 }
@@ -12,27 +12,27 @@
 // 参数说明
 // 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 - Token刷新参数
 // {
-// 	"result": "success",
-// 	"message": "ok",
-// 	"oldToken": "aa31fcc229c54d5ab6d8bfb17aff3711",
-// 	"newToken": "bb31fcc229c54d5ab6d8bfb17aff3722",
-// 	"updatedAt": "2022-04-14 07:05:12"
+//  "result": "success",
+//  "message": "ok",
+//  "oldToken": "aa31fcc229c54d5ab6d8bfb17aff3711",
+//  "newToken": "bb31fcc229c54d5ab6d8bfb17aff3722",
+//  "updatedAt": "2022-04-14 07:05:12"
 // }
 // result - Token刷新的结果，success-成功，fail-失败
 // message - 消息说明，如果失败这里会有原因说明
@@ -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 - 本地文件名
@@ -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"
@@ -76,6 +76,7 @@ Pack() {

  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"
@@ -112,13 +113,16 @@ Build $name-$version"-darwin-macos-arm64" darwin arm64
 ############### 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 ###############
 # 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
@@ -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,11 +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_TASK_STEP=sync
+ENV ALIYUNPAN_SCAN_INTERVAL_TIME=1
 ENV ALIYUNPAN_DEVICE_ID=""
+ENV ALIYUNPAN_IP_TYPE="ipv4"

 # 运行
 ENTRYPOINT ./app.sh
@@ -15,11 +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",
-      "priority": "$ALIYUNPAN_SYNC_PRIORITY",
+      "policy": "$ALIYUNPAN_SYNC_POLICY",
+      "driveName": "$ALIYUNPAN_SYNC_DRIVE",
      "lastSyncTime": "2022-06-12 19:28:20"
     }
    ]
@@ -30,13 +31,16 @@ 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
+#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
@@ -44,12 +48,10 @@ 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}
-
 if [ "$ALIYUNPAN_SYNC_LOG" = "true" ]
 then
  ./aliyunpan config set -file_record_config 1
@@ -57,4 +59,8 @@ else
  ./aliyunpan config set -file_record_config 2
 fi

-./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} -step ${ALIYUNPAN_TASK_STEP}
+# 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,17 +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
-      # 优先级，只对双向同步备份模式有效。选项支持三种: time-时间优先，local-本地优先，pan-网盘优先
-      - ALIYUNPAN_SYNC_PRIORITY=time
+      # 备份策略: 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
-      # 任务步骤, 支持两种: scan(只扫描并建立同步数据库),sync(正常启动同步任务)
-      - ALIYUNPAN_TASK_STEP=sync
-      # 登录设备的ID，默认为空，程序会自动生成一个ID
-      - ALIYUNPAN_DEVICE_ID=
+      # 扫描文件间隔时间，单位：分钟
+      - ALIYUNPAN_SCAN_INTERVAL_TIME=1
@@ -1,59 +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_WEBDAV_MODE=rw
-ENV ALIYUNPAN_PAN_DRIVE=File
-ENV ALIYUNPAN_PAN_DIR=/
-ENV ALIYUNPAN_REFRESH_TOKEN=""
-ENV ALIYUNPAN_TRANSFER_URL_TYPE=0
-ENV ALIYUNPAN_BLOCK_SIZE=10240
-ENV ALIYUNPAN_DEVICE_ID=""
-
-ENTRYPOINT ./app.sh
@@ -1,25 +0,0 @@
-#!/bin/sh
-cd /home/app
-chmod +x ./aliyunpan
-
-# 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
-
-# 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}" -webdav_mode "${ALIYUNPAN_WEBDAV_MODE}" -pan_drive "${ALIYUNPAN_PAN_DRIVE}" -pan_dir_path "${ALIYUNPAN_PAN_DIR}" -bs ${ALIYUNPAN_BLOCK_SIZE}
@@ -1,33 +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
-      # webdav 网盘模式，支持：rw-读写，ro-只读
-      - ALIYUNPAN_WEBDAV_MODE=rw
-      # 指定网盘类型为文件，可选： 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
-      # 登录设备的ID，默认为空，程序会自动生成一个ID
-      - ALIYUNPAN_DEVICE_ID=
-
-
-
-
@@ -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
-
-
@@ -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,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,28 +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.1.6
-	github.com/tickstep/bolt v1.3.3
-	github.com/tickstep/library-go v0.1.0
+	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,6 +1,8 @@
 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=
@@ -96,14 +98,15 @@ 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.1.6 h1:wF35KWo1RpYNBWfdLLciuT6nlKvJiX4lhxAiGFUivRk=
-github.com/tickstep/aliyunpan-api v0.1.6/go.mod h1:SN+N5Vh3lLq3dVimlxKxviCl50gLGXZO96nHHc3qd2o=
-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.1.0 h1:lzz6wpYCeliSzmVISa7rp9bGB4r+uIa9/VUTtk87DFU=
-github.com/tickstep/library-go v0.1.0/go.mod h1:uAHeNOIpoywCzlaeLrWmmRSupn03m9kJVZKOEmuarmA=
+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=
@@ -116,19 +119,14 @@ golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a/go.mod h1:P+XmwS30IXTQdn5
 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=
@@ -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,36 +14,36 @@
 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:    ReloadConfigFunc,
@@ -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 + 1), 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 := makePathAbsolute(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,
@@ -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"
@@ -82,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)
 			}
@@ -94,24 +95,32 @@ func RunChangeDirectory(driveId, targetPath string) {
 	user := config.Config.ActiveUser()
 	targetPath = user.PathJoin(driveId, targetPath)

-	//targetPathInfo, err := user.PanClient().FileInfoByPath(driveId, targetPath)
-	files, err := matchPathByShellPattern(driveId, targetPath)
+	// 获取目标路径文件信息
+	targetPathInfo, err := user.PanClient().OpenapiPanClient().FileInfoByPath(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
-			}
-		}
-	}
+	// 适配通配符路径获取目标文件信息（弃用，容易触发风控）
+	//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
@@ -125,6 +134,9 @@ func RunChangeDirectory(driveId, targetPath string) {
 	if user.IsFileDriveActive() {
 		user.Workdir = targetPathInfo.Path
 		user.WorkdirFileEntity = *targetPathInfo
+	} else if user.IsResourceDriveActive() {
+		user.ResourceWorkdir = targetPathInfo.Path
+		user.ResourceWorkdirFileEntity = *targetPathInfo
 	} else if user.IsAlbumDriveActive() {
 		user.AlbumWorkdir = targetPathInfo.Path
 		user.AlbumWorkdirFileEntity = *targetPathInfo
@@ -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,85 +61,6 @@ 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",
@@ -213,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")
 					}
@@ -226,6 +130,9 @@ 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"))
 					}
@@ -265,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: "下载文件的储存目录",
@@ -282,6 +184,10 @@ func CmdConfig() cli.Command {
 						Name:  "local_addrs",
 						Usage: "设置本地网卡地址, 多个地址用逗号隔开",
 					},
+					cli.StringFlag{
+						Name:  "ip_type",
+						Usage: "设置域名解析IP优先类型",
+					},
 					cli.StringFlag{
 						Name:  "file_record_config",
 						Usage: "设置是否开启上传、下载、同步文件的结果记录功能",
@@ -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,42 +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"
-	"path/filepath"
-	"runtime"
-	"sync/atomic"
-	"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     // 是否使用内置链接
 		ExcludeNames         []string // 排除的文件名，包括文件夹和文件。即这些文件/文件夹不进行下载，支持正则表达式
+		IsMultiUserDownload  bool     // 是否启用多用户联合下载
+		IsUseUIDashboard     bool     // 是否使用UI下载面板显示下载进度
 	}

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

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

 	下载 /我的资源/1.mp4 并保存下载的文件到本地的 d:/panfile
 	aliyunpan download --saveto d:/panfile /我的资源/1.mp4
-
+	
+	使用多用户联合下载 /我的资源/1.mp4 文件。必须保证所有登录的用户在相同的网盘（备份盘/资源盘）下，相同的路径下，有相同的文件
+	aliyunpan download /我的资源/1.mp4 -md
+	
  参考：
    以下是典型的排除特定文件或者文件夹的例子，注意：参数值必须是正则表达式。在正则表达式中，^表示匹配开头，$表示匹配结尾。
    1)排除@eadir文件或者文件夹：-exn "^@eadir$"
@@ -131,33 +137,24 @@ func CmdDownload() cli.Command {
 			}

 			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),
 				ExcludeNames:         c.StringSlice("exn"),
+				IsMultiUserDownload:  c.Bool("md"),
+				IsUseUIDashboard:     c.Bool("ui"),
 			}

-			// 获取下载文件锁，保证下载操作单实例
-			//locker := filelocker.NewFileLocker(config.GetLockerDir() + "/aliyunpan-download")
-			//if e := filelocker.LockFile(locker, 0755, true, 5*time.Second); e != nil {
-			//	logger.Verboseln(e)
-			//	fmt.Println("本应用其他实例正在执行下载，请先停止或者等待其完成")
-			//	return nil
-			//}
-
 			RunDownload(c.Args(), do)
-
-			// 释放文件锁
-			//if locker != nil {
-			//	filelocker.UnlockFile(locker)
-			//}
 			return nil
 		},
 		Flags: []cli.Flag{
@@ -183,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",
@@ -208,37 +211,39 @@ func CmdDownload() cli.Command {
 				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()
-	activeUser.PanClient().EnableCache()
-	activeUser.PanClient().ClearCache()
-	defer activeUser.PanClient().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 RefreshTokenInNeed(activeUser, config.Config.DeviceName) {
-				logger.Verboseln("update access token for download task")
-			}
-		}
-	}(&continueFlag)
+	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{}
@@ -261,7 +266,6 @@ func RunDownload(paths []string, options *DownloadOptions) {
 		MaxRate:                    config.Config.MaxDownloadRate,
 		InstanceStateStorageFormat: downloader.InstanceStateStorageFormatJSON,
 		ShowProgress:               options.ShowProgress,
-		UseInternalUrl:             config.Config.TransferUrlType == 2,
 		ExcludeNames:               options.ExcludeNames,
 	}
 	if cfg.CacheSize == 0 {
@@ -279,6 +283,17 @@ func RunDownload(paths []string, options *DownloadOptions) {
 		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 != "" {
@@ -303,12 +318,50 @@ func RunDownload(paths []string, options *DownloadOptions) {
 		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{
@@ -322,47 +375,80 @@ 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 {
 		// 使用通配符匹配
 		fileList, err2 := matchPathByShellPattern(options.DriveId, paths[k])
 		if err2 != nil {
-			fmt.Printf("获取文件出错，请稍后重试: %s\n", paths[k])
+			logf("获取文件出错，请稍后重试: %s\n", paths[k])
 			continue
 		}
 		if fileList == nil || len(fileList) == 0 {
 			// 文件不存在
-			fmt.Printf("文件不存在: %s\n", paths[k])
+			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 utils.IsExcludeFile(f.Path, &newCfg.ExcludeNames) {
-				fmt.Printf("排除文件: %s\n", f.Path)
+				logf("排除文件: %s\n", f.Path)
 				continue
 			}

 			// 匹配的文件
 			unit := pandownload.DownloadTaskUnit{
+				DownloadActionId:     options.DownloadActionId,
 				Cfg:                  &newCfg, // 复制一份新的cfg
 				PanClient:            panClient,
+				SubPanClientList:     subPanClientList,
 				VerbosePrinter:       panCommandVerbose,
-				PrintFormat:          downloadPrintFormat(options.Load),
 				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,
 			}

 			// 设置储存的路径
@@ -375,16 +461,30 @@ func RunDownload(paths []string, options *DownloadOptions) {
 				unit.SavePath = GetActiveUser().GetSavePath(f.Path)
 			}
 			info := executor.Append(&unit, options.MaxRetry)
-			fmt.Printf("[%s] 加入下载队列: %s\n", info.Id(), f.Path)
+			if dashboard != nil {
+				dashboard.RegisterTask(info.Id(), f.Path, f.FileSize, f.IsFile())
+			}
+			logf("[%s] 加入下载队列: %s\n", info.Id(), f.Path)
 		}
 	}

 	// 开始计时
 	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,
@@ -27,9 +27,9 @@ import (
 func CmdDrive() cli.Command {
 	return cli.Command{
 		Name:  "drive",
-		Usage: "切换网盘（文件网盘/相册网盘）",
+		Usage: "切换网盘（备份盘/资源库）",
 		Description: `
-	切换已登录的阿里云盘的云工作网盘（文件网盘/相册网盘）
+	切换已登录账号的阿里云盘的工作网盘（备份盘/资源库）
 	如果运行该条命令没有提供参数, 程序将会列出所有的网盘列表, 供选择切换.

 	示例:
@@ -100,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 = "/"
@@ -120,6 +125,9 @@ func getDriveOptionList() (config.DriveInfoList, string) {
 	tb.SetHeader([]string{"#", "drive_id", "网盘名称"})

 	for k, info := range driveList {
+		if info.IsAlbumDrive() {
+			continue
+		}
 		tb.Append([]string{strconv.Itoa(k + 1), info.DriveId, info.DriveName})
 	}
 	tb.Render()
@@ -1,150 +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:   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:   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, 0)
-		if err1 != nil {
-			logger.Verboseln("获取文件信息出错")
-			continue
-		}
-		dataItem.FileList = allFileInfo
-
-		resultMap[panDir] = dataItem
-		time.Sleep(time.Duration(500) * time.Millisecond)
-	}
-	return resultMap
-}
@@ -1,197 +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/cmder/cmdtable"
-	"github.com/tickstep/aliyunpan/internal/config"
-	"github.com/tickstep/aliyunpan/library/collection"
-	"github.com/urfave/cli"
-	"io/ioutil"
-	"os"
-	"strconv"
-	"strings"
-)
-
-func CmdLocateUrl() cli.Command {
-	return cli.Command{
-		Name:      "locate",
-		Usage:     "获取文件下载链接",
-		UsageText: cmder.App().Name + " locate <文件/目录1> <文件/目录2> <文件/目录3> ...",
-		Description: `
-	获取文件下载直链，支持文件和文件夹。下载链接有效时间为4个小时。
-	导出的下载链接可以使用任何支持http下载的工具进行下载，如果是视频文件还可以使用支持在线流播放的视频软件进行在线播放。
-	
-	注意：由于阿里云盘网页端有防盗链设置所以不能直接使用网页Token登录，你必须使用手机扫码二维码登录(命令：login -QrCode)，否则获取的直链无法正常下载，会提示 403 Forbidden 下载被禁止。
-
-	示例:
-	获取 /我的资源/1.mp4 下载直链
-	aliyunpan locate /我的资源/1.mp4
-
-	获取 /我的资源 目录下面所有mp4文件的下载直链，使用通配符
-	aliyunpan locate /我的资源/*.mp4
-
-	获取 /我的资源 目录下面所有文件的下载直链并保存到本地文件 /Volumes/Downloads/file_url.txt 中
-	aliyunpan locate -saveto "/Volumes/Downloads/file_url.txt" /我的资源
-`,
-		Category: "阿里云盘",
-		Before:   ReloadConfigFunc,
-		Action: func(c *cli.Context) error {
-			if c.NArg() == 0 {
-				cli.ShowCommandHelp(c, c.Command.Name)
-				return nil
-			}
-			saveFilePath := ""
-			if c.IsSet("saveto") {
-				saveFilePath = c.String("saveto")
-			}
-			RunLocateUrl(parseDriveId(c), c.Args(), saveFilePath)
-			return nil
-		},
-		Flags: []cli.Flag{
-			cli.StringFlag{
-				Name:  "driveId",
-				Usage: "网盘ID",
-				Value: "",
-			},
-			cli.StringFlag{
-				Name:  "saveto",
-				Usage: "导出链接成文件并保存到指定的位置",
-			},
-		},
-	}
-}
-
-// RunLocateUrl 执行下载网盘内文件
-func RunLocateUrl(driveId string, paths []string, saveFilePath string) {
-	useInternalUrl := config.Config.TransferUrlType == 2
-	activeUser := GetActiveUser()
-	activeUser.PanClient().EnableCache()
-	activeUser.PanClient().ClearCache()
-	defer activeUser.PanClient().DisableCache()
-
-	paths, err := makePathAbsolute(driveId, paths...)
-	if err != nil {
-		fmt.Println(err)
-		return
-	}
-	fileEntityQueue := collection.NewFifoQueue()
-	sb := &strings.Builder{}
-	failedList := []string{}
-	for _, p := range paths {
-		fileList, err1 := matchPathByShellPattern(driveId, p)
-		if err1 != nil {
-			failedList = append(failedList, p)
-			continue
-		}
-		if fileList == nil || len(fileList) == 0 {
-			// 文件不存在
-			failedList = append(failedList, p)
-			continue
-		}
-		for _, f := range fileList {
-			// 匹配的文件
-			fileEntityQueue.Push(f)
-		}
-	}
-
-	for {
-		item := fileEntityQueue.Pop()
-		if item == nil {
-			break
-		}
-		fileInfo := item.(*aliyunpan.FileEntity)
-		if fileInfo.IsFolder() { // 文件夹，获取下面所有文件
-			allFilesInFolder, er := activeUser.PanClient().FileListGetAll(&aliyunpan.FileListParam{
-				DriveId:      driveId,
-				ParentFileId: fileInfo.FileId,
-			}, 300)
-			if er != nil {
-				failedList = append(failedList, fileInfo.Path)
-				continue
-			}
-			for _, f := range allFilesInFolder {
-				f.Path = fileInfo.Path + "/" + f.FileName
-				if f.IsFolder() {
-					// for next term
-					fileEntityQueue.Push(f)
-					continue
-				}
-				durl, apierr := activeUser.PanClient().GetFileDownloadUrl(&aliyunpan.GetFileDownloadUrlParam{
-					DriveId: driveId,
-					FileId:  f.FileId,
-				})
-				if apierr != nil {
-					failedList = append(failedList, f.Path)
-					continue
-				}
-				url := durl.Url
-				if useInternalUrl {
-					url = durl.InternalUrl
-				}
-				if saveFilePath != "" {
-					fmt.Printf("获取文件下载链接：%s\n", f.Path)
-					fmt.Fprintf(sb, "\n文件：%s\n%s\n", f.Path, url)
-				} else {
-					fmt.Printf("\n文件：%s\n%s\n", f.Path, url)
-				}
-			}
-		} else { // 文件
-			durl, apierr := activeUser.PanClient().GetFileDownloadUrl(&aliyunpan.GetFileDownloadUrlParam{
-				DriveId: driveId,
-				FileId:  fileInfo.FileId,
-			})
-			if apierr != nil {
-				failedList = append(failedList, fileInfo.Path)
-				continue
-			}
-			url := durl.Url
-			if useInternalUrl {
-				url = durl.InternalUrl
-			}
-			if saveFilePath != "" {
-				fmt.Printf("获取文件下载链接：%s\n", fileInfo.Path)
-				fmt.Fprintf(sb, "\n文件：%s\n%s\n", fileInfo.Path, url)
-			} else {
-				fmt.Printf("\n文件：%s\n%s\n", fileInfo.Path, url)
-			}
-		}
-	}
-
-	if saveFilePath != "" {
-		// save file
-		if e := ioutil.WriteFile(saveFilePath, []byte(sb.String()), 0777); e == nil {
-			fmt.Printf("保存文件成功：%s\n", saveFilePath)
-		} else {
-			fmt.Printf("保存文件失败：%s\n", saveFilePath)
-		}
-	}
-
-	// 输出失败的文件列表
-	if len(failedList) > 0 {
-		pnt := func() {
-			tb := cmdtable.NewTable(os.Stdout)
-			tb.SetHeader([]string{"#", "文件/目录"})
-			for k, f := range failedList {
-				tb.Append([]string{strconv.Itoa(k + 1), f})
-			}
-			tb.Render()
-		}
-		fmt.Printf("\n\n以下文件获取直链失败: \n")
-		pnt()
-	}
-}
@@ -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,13 @@ package command

 import (
 	"fmt"
-	"github.com/tickstep/aliyunpan-api/aliyunpan"
 	"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 {
@@ -34,55 +33,36 @@ func CmdLogin() cli.Command {
 		1.常规登录，按提示一步一步来即可
 		aliyunpan login

-		2.直接指定RefreshToken进行登录
-		aliyunpan login -RefreshToken=8B12CBBCE89CA8DFC3445985B63B511B5E7EC7...
-
-		3.使用二维码方式进行登录
-		aliyunpan login -QrCode
 `,
 		Category: "阿里云盘账号",
 		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, config.Config.DeviceId, config.Config.DeviceName)
+			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{},
 	}
 }

@@ -117,10 +97,9 @@ func CmdLogout() cli.Command {
 			}

 			// 云端注销登录
-			if _, e := activeUser.PanClient().DeviceLogout(); e != nil {
-				fmt.Printf("登出设备失败，请稍后重试: %s\n", e.String())
-				return nil
-			}
+			//if _, e := activeUser.PanClient().WebapiPanClient().DeviceLogout(); e != nil {
+			//	fmt.Printf("登出设备失败，请手动在网页端进行登出: %s\n", e.String())
+			//}

 			// 删除用户信息
 			deletedUser, err := config.Config.DeleteUser(activeUser.UserId)
@@ -140,55 +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+"&deviceId="+config.Config.DeviceId)
+func RunLogin() (ticketId string, openapiToken, webapiToken *config.PanClientToken, error error) {
+	h := panlogin.NewLoginHelper(config.DefaultTokenServiceWebHost)

-		// handler waiting
-		line := cmdliner.NewLiner()
-		var qrCodeLoginResult *panlogin.QRCodeLoginResult
-		queryResult := true
-		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 queryResult {
-				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 {
-			queryResult = false
-			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 = 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,6 +17,7 @@ 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"
@@ -69,6 +70,7 @@ func CmdLs() cli.Command {
 `,
 		Category: "阿里云盘",
 		Before:   ReloadConfigFunc,
+		After:    SaveConfigFunc,
 		Action: func(c *cli.Context) error {
 			if config.Config.ActiveUser() == nil {
 				fmt.Println("未登录账号")
@@ -141,22 +143,35 @@ func RunLs(driveId, targetPath string, lsOptions *LsOptions,
 	activeUser := config.Config.ActiveUser()
 	targetPath = activeUser.PathJoin(driveId, targetPath)

-	files, err := matchPathByShellPattern(driveId, targetPath)
+	// 获取目标路径文件信息
+	targetPathInfo, err := activeUser.PanClient().OpenapiPanClient().FileInfoByPath(driveId, targetPath)
 	if err != nil {
-		fmt.Println(err)
+		if err.Code == apierror.ApiCodeFileNotFoundCode {
+			fmt.Println("指定目录不存在: " + targetPath)
+		} else {
+			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
-			}
-		}
-	}
+
+	// 适配通配符路径获取目标文件信息（弃用，容易触发风控）
+	//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
@@ -169,7 +184,7 @@ func RunLs(driveId, targetPath string, lsOptions *LsOptions,
 	fileListParam.OrderBy = orderBy
 	fileListParam.OrderDirection = orderDirection
 	if targetPathInfo.IsFolder() {
-		fileResult, err1 := activeUser.PanClient().FileListGetAll(fileListParam, 200)
+		fileResult, err1 := activeUser.PanClient().OpenapiPanClient().FileListGetAll(fileListParam, 200)
 		if err1 != nil {
 			fmt.Println(err1)
 			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,
@@ -56,7 +56,7 @@ func RunMkdir(driveId, name string) {
 	fullpath := activeUser.PathJoin(driveId, name)
 	rs := &aliyunpan.MkdirResult{}
 	err := apierror.NewFailedApiError("")
-	rs, err = activeUser.PanClient().Mkdir(driveId, "", fullpath)
+	rs, err = activeUser.PanClient().OpenapiPanClient().MkdirByFullPath(driveId, fullpath)

 	if err != nil {
 		fmt.Println("创建文件夹失败：" + err.Error())
@@ -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,
@@ -28,7 +28,7 @@ func CmdMv() cli.Command {
 	return cli.Command{
 		Name:  "mv",
 		Usage: "移动文件/目录",
-		UsageText: `移动:
+		UsageText: `
 	aliyunpan mv <文件/目录1> <文件/目录2> <文件/目录3> ... <目标目录>`,
 		Description: `
 	注意: 移动多个文件和目录时, 请确保每一个文件和目录都存在, 否则移动操作会失败。支持通配符匹配移动文件，通配符当前只能匹配文件名，不能匹配文件路径。
@@ -85,49 +85,44 @@ func RunMove(driveId string, paths ...string) {
 	cacheCleanPaths = append(cacheCleanPaths, targetFile.Path)

 	failedMoveFiles := []*aliyunpan.FileEntity{}
-	moveFileParamList := []*aliyunpan.FileMoveParam{}
-	fileId2FileEntity := map[string]*aliyunpan.FileEntity{}
+	successMoveFiles := []*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])
+		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)
+			fmt.Println(f.Path)
 		}
 		fmt.Println("")
 	}
-	if er == nil {
+	if len(successMoveFiles) > 0 {
 		pnt := func() {
 			tb := cmdtable.NewTable(os.Stdout)
 			tb.SetHeader([]string{"#", "文件/目录"})
-			for k, rs := range fmr {
-				tb.Append([]string{strconv.Itoa(k + 1), fileId2FileEntity[rs.FileId].Path})
+			for k, rs := range successMoveFiles {
+				tb.Append([]string{strconv.Itoa(k + 1), rs.Path})
 			}
 			tb.Render()
 		}
 		fmt.Println("操作成功, 以下文件已移动到目标目录: ", targetFile.Path)
 		pnt()
-		activeUser.DeleteCache(cacheCleanPaths)
 	} else {
 		fmt.Println("无法移动文件，请稍后重试")
 	}
+	activeUser.DeleteCache(cacheCleanPaths)
 }

 func getFileInfo(driveId string, paths ...string) (opFileList []*aliyunpan.FileEntity, targetFile *aliyunpan.FileEntity, failedPaths []string, error error) {
@@ -138,7 +133,7 @@ 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("指定目标文件夹不存在")
 	}
@@ -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,
@@ -41,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))
@@ -52,7 +52,7 @@ 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
 	}
@@ -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 {
@@ -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,
 	})
@@ -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
@@ -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,
@@ -136,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
@@ -234,7 +234,7 @@ func RunRenameBatch(skipConfirm bool, driveId string, expression, replacement, f

 	// 重命名
 	for _, file := range files {
-		b, e := activeUser.PanClient().FileRename(driveId, file.file.FileId, file.newFileName)
+		b, e := activeUser.PanClient().OpenapiPanClient().FileRename(driveId, file.file.FileId, file.newFileName)
 		if e != nil {
 			fmt.Println(e.Err)
 			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,
@@ -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 {
@@ -72,51 +74,111 @@ 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))
-		fileList, err1 := matchPathByShellPattern(driveId, absolutePath)
+
+		// 查询路径对应的文件信息
+		fileList, err1 := queryFileListByPath(activeUser, driveId, absolutePath)
 		if err1 != nil {
 			failedRmPaths = append(failedRmPaths, absolutePath)
 			continue
 		}
 		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 {
 			// 删除匹配的文件
-			delFileInfos = append(delFileInfos, &aliyunpan.FileBatchActionParam{
+			fdr, err := activeUser.PanClient().OpenapiPanClient().FileDelete(&aliyunpan.FileBatchActionParam{
 				DriveId: driveId,
 				FileId:  f.FileId,
 			})
-			fileId2FileEntity[f.FileId] = f
+			if err != nil || !fdr.Success {
+				failedRmPaths = append(failedRmPaths, absolutePath)
+			} else {
+				successDelFileEntity = append(successDelFileEntity, f)
+			}
 			cacheCleanDirs = append(cacheCleanDirs, path.Dir(f.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])
-			}
+	// 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{"#", "文件/目录"})
@@ -129,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,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,
@@ -14,19 +14,14 @@
 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/tickstep/library-go/logger"
 	"github.com/urfave/cli"
-	"os"
 	"path"
-	"path/filepath"
-	"strconv"
+	"strings"
 	"time"
 )

@@ -51,16 +46,19 @@ func CmdShare() cli.Command {
 示例:

    创建文件 1.mp4 的分享链接 
-	aliyunpan share set 1.mp4
+	aliyunpan share set -mode 1 1.mp4

    创建 /我的视频/ 目录下所有mp4文件的分享链接，支持通配符
-	aliyunpan share set /我的视频/*.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 {
@@ -71,6 +69,8 @@ func CmdShare() cli.Command {
 						fmt.Println("未登录账号")
 						return nil
 					}
+
+					// 有效期
 					et := ""
 					timeFlag := "0"
 					if c.IsSet("time") {
@@ -85,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)
@@ -101,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{
@@ -117,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",
@@ -127,118 +140,12 @@ 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:      "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 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",
-					},
-				},
-			},
-			//			{
-			//				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) {
+// RunOpenShareSet 执行分享
+func RunOpenShareSet(modeFlag, driveId string, paths []string, expiredTime string, sharePwd string) {
 	if len(paths) <= 0 {
 		fmt.Println("请指定文件路径")
 		return
@@ -273,187 +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", 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().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.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 + 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().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().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
-}
-
-// 创建秒传链接
-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,7 @@ 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"
@@ -27,7 +28,6 @@ import (
 	"os"
 	"path"
 	"strings"
-	"sync/atomic"
 	"time"
 )

@@ -37,16 +37,14 @@ func CmdSync() cli.Command {
 		Usage:     "同步备份功能(Beta)",
 		UsageText: cmder.App().Name + " sync",
 		Description: `
-    备份功能。支持备份本地文件到云盘，备份云盘文件到本地，双向同步备份三种模式。支持JavaScript插件对备份文件进行过滤。
+    备份功能。支持备份本地文件到云盘，备份云盘文件到本地两种模式。支持JavaScript插件对备份文件进行过滤。
    指定本地目录和对应的一个网盘目录，以备份文件。网盘目录必须和本地目录独占使用，不要用作其他用途，不然备份可能会有问题。

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

 	请输入以下命令查看如何配置和启动：
    aliyunpan sync start -h
@@ -74,7 +72,8 @@ func CmdSync() cli.Command {
   "localFolderPath": "D:/tickstep/Documents/设计文档",
   "panFolderPath": "/sync_drive/我的文档",
   "mode": "upload",
-   "priority": "time"
+   "policy"： "increment"，
+   "driveName": "backup"
  }
 ]
 }
@@ -82,36 +81,30 @@ func CmdSync() cli.Command {
 name - 任务名称
 localFolderPath - 本地目录
 panFolderPath - 网盘目录
-mode - 模式，支持三种: upload(备份本地文件到云盘),download(备份云盘文件到本地),sync(双向同步备份)
-priority - 优先级，只对双向同步备份模式有效。选项支持三种: time-时间优先，local-本地优先，pan-网盘优先
+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"

-	4. 使用命令行配置启动同步备份服务，将云盘目录 /sync_drive/我的文档 和本地目录 D:\tickstep\Documents\设计文档 的文件进行双向同步
-       同时配置同步优先选项为本地文件优先，并显示同步过程的日志
-	aliyunpan sync start -ldir "D:\tickstep\Documents\设计文档" -pdir "/sync_drive/我的文档" -mode "sync" -pri "local" -log true
-
-	5. 使用命令行配置启动同步备份服务，将本地目录 D:\tickstep\Documents\设计文档 中的文件备份到云盘目录 /sync_drive/我的文档
+	4. 使用命令行配置启动同步备份服务，将本地目录 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
    
-	6. 使用配置文件启动同步备份服务，使用配置文件可以支持同时启动多个备份任务。配置文件必须存在，否则启动失败。
+	5. 使用配置文件启动同步备份服务，使用配置文件可以支持同时启动多个备份任务。配置文件必须存在，否则启动失败。
 	aliyunpan sync start

-	7. 使用配置文件启动同步备份服务，并配置下载并发为2，上传并发为1，下载分片大小为256KB，上传分片大小为1MB
+	6. 使用配置文件启动同步备份服务，并配置下载并发为2，上传并发为1，下载分片大小为256KB，上传分片大小为1MB
 	aliyunpan sync start -dp 2 -up 1 -dbs 256 -ubs 1024

-	8. 当你本地同步目录文件非常多，或者云盘同步目录文件非常多，为了后期更快更精准同步文件，可以先进行文件扫描并构建同步数据库，然后再正常启动同步任务。如下所示：
-	aliyunpan sync start -step scan
-	aliyunpan sync start
 `,
 				Action: func(c *cli.Context) error {
 					if config.Config.ActiveUser() == nil {
@@ -155,27 +148,22 @@ priority - 优先级，只对双向同步备份模式有效。选项支持三种
 						uploadBlockSize = aliyunpan.DefaultChunkSize
 					}

-					opt := c.String("pri")
 					var syncOpt syncdrive.SyncPriorityOption = syncdrive.SyncPriorityTimestampFirst
-					if opt == "local" {
-						syncOpt = syncdrive.SyncPriorityLocalFirst
-					} else if opt == "pan" {
-						syncOpt = syncdrive.SyncPriorityPanFirst
-					} else {
-						syncOpt = syncdrive.SyncPriorityTimestampFirst
-					}
-
-					// 任务类型
-					step := syncdrive.StepSyncFile
-					stepVar := c.String("step")
-					if stepVar == "scan" {
-						step = syncdrive.StepScanFile
-					}
+					//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) {
@@ -203,39 +191,59 @@ priority - 优先级，只对双向同步备份模式有效。选项支持三种
 						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()
+						}
 					}

-					// 获取同步文件锁，保证同步操作单实例
-					//locker := filelocker.NewFileLocker(config.GetLockerDir() + "/aliyunpan-sync")
-					//if e := filelocker.LockFile(locker, 0755, true, 5*time.Second); e != nil {
-					//	logger.Verboseln(e)
-					//	fmt.Println("本应用其他实例正在执行同步，请先停止或者等待其完成")
-					//	return nil
-					//}
-
-					RunSync(task, dp, up, downloadBlockSize, uploadBlockSize, syncOpt, c.Int("ldt"), step)
-
-					// 释放文件锁
-					//if locker != nil {
-					//	filelocker.UnlockFile(locker)
-					//}
+					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, 本地文件夹完整路径",
@@ -246,13 +254,23 @@ priority - 优先级，只对双向同步备份模式有效。选项支持三种
 					},
 					cli.StringFlag{
 						Name:  "mode",
-						Usage: "备份模式, 支持三种: upload(备份本地文件到云盘),download(备份云盘文件到本地),sync(双向同步备份)",
+						Usage: "备份模式, 支持两种: upload(备份本地文件到云盘),download(备份云盘文件到本地)",
 						Value: "upload",
 					},
 					cli.StringFlag{
-						Name:  "pri",
-						Usage: "优先级priority，只对双向同步备份模式有效。当网盘和本地存在同名文件，优先使用哪个，选项支持三种: time-时间优先，local-本地优先，pan-网盘优先",
-						Value: "time",
+						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",
@@ -281,13 +299,13 @@ priority - 优先级，只对双向同步备份模式有效。选项支持三种
 					},
 					cli.IntFlag{
 						Name:  "ldt",
-						Usage: "local delay time，本地文件修改检测延迟间隔，单位秒。如果本地文件会被频繁修改，例如录制视频文件，配置好该时间可以避免上传未录制好的文件",
+						Usage: "local delay time，本地文件修改检测延迟间隔，单位秒。如果本地文件会被频繁修改，例如录制视频文件，配置好该时间可以避免上传未录制好的文件。",
 						Value: 3,
 					},
-					cli.StringFlag{
-						Name:  "step",
-						Usage: "task step 任务步骤, 支持两种: scan(只扫描并建立同步数据库),sync(正常启动同步任务)",
-						Value: "sync",
+					cli.IntFlag{
+						Name:  "sit",
+						Usage: "scan interval time，扫描文件间隔时间，单位：分钟。",
+						Value: 1,
 					},
 				},
 			},
@@ -295,30 +313,31 @@ priority - 优先级，只对双向同步备份模式有效。选项支持三种
 	}
 }

-func RunSync(defaultTask *syncdrive.SyncTask, fileDownloadParallel, fileUploadParallel int, downloadBlockSize, uploadBlockSize int64,
-	flag syncdrive.SyncPriorityOption, localDelayTime int, taskStep syncdrive.TaskStep) {
-	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.DisableCache()
+	panClient.OpenapiPanClient().ClearCache()
+	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 RefreshTokenInNeed(activeUser, config.Config.DeviceName) {
-				logger.Verboseln("update access token for sync task")
-				panClient.UpdateToken(activeUser.WebToken)
-			}
-		}
-	}(&continueFlag)
+	//// 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 {
@@ -334,10 +353,6 @@ func RunSync(defaultTask *syncdrive.SyncTask, fileDownloadParallel, fileUploadPa
 	}

 	fmt.Println("启动同步备份进程")
-	typeUrlStr := "默认链接"
-	if useInternalUrl {
-		typeUrlStr = "阿里ECS内部链接"
-	}

 	// 文件同步记录器
 	fileRecorder := log.NewFileRecorder(config.GetLogDir() + "/sync_file_records.csv")
@@ -347,37 +362,47 @@ func RunSync(defaultTask *syncdrive.SyncTask, fileDownloadParallel, fileUploadPa
 		FileUploadParallel:                fileUploadParallel,
 		FileDownloadBlockSize:             downloadBlockSize,
 		FileUploadBlockSize:               uploadBlockSize,
-		UseInternalUrl:                    useInternalUrl,
 		MaxDownloadRate:                   maxDownloadRate,
 		MaxUploadRate:                     maxUploadRate,
 		SyncPriority:                      flag,
 		LocalFileModifiedCheckIntervalSec: localDelayTime,
 		FileRecorder:                      fileRecorder,
 	}
-	syncMgr := syncdrive.NewSyncTaskManager(activeUser, activeUser.DriveList.GetFileDriveId(), panClient, syncFolderRootPath, option)
+	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, taskStep); e != nil {
+	if _, e := syncMgr.Start(tasks, cycleMode, scanTimeInterval); e != nil {
 		fmt.Println("启动任务失败：", e)
 		return
 	}

-	if taskStep != syncdrive.StepScanFile {
-		_, ok := os.LookupEnv("ALIYUNPAN_DOCKER")
-		if ok {
-			// in docker container
+	_, ok := os.LookupEnv("ALIYUNPAN_DOCKER")
+	if ok {
+		// in docker container
+		if cycleMode == syncdrive.CycleInfiniteLoop {
 			// 使用休眠以节省CPU资源
 			fmt.Println("本命令不会退出，程序正在以Docker的方式运行。如需退出请借助Docker提供的方式。")
 			for {
 				time.Sleep(60 * time.Second)
 			}
 		} else {
-			if config.IsAppInCliMode {
+			for {
+				if syncMgr.IsAllTaskCompletely() {
+					fmt.Println("所有备份任务已完成")
+					break
+				}
+				time.Sleep(5 * time.Second)
+			}
+			syncMgr.DoTaskSyncCompletelyPluginCallback()
+		}
+	} else {
+		if cycleMode == syncdrive.CycleInfiniteLoop {
+			if global.IsAppInCliMode {
 				// in cmd mode
 				c := ""
 				fmt.Println("本命令不会退出，如需要结束同步备份进程请输入y，然后按Enter键进行停止。")
@@ -391,15 +416,20 @@ func RunSync(defaultTask *syncdrive.SyncTask, fileDownloadParallel, fileUploadPa
 					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(taskStep)
-
-	if taskStep == syncdrive.StepScanFile {
-		fmt.Println("\n已完成文件扫描和同步数据库的构建，可以启动任务同步了")
-	}
+	syncMgr.Stop()
 }
@@ -1,129 +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/tickstep/aliyunpan/internal/plugins"
-	"github.com/tickstep/aliyunpan/internal/utils"
-	"github.com/tickstep/library-go/logger"
-	"github.com/urfave/cli"
-)
-
-func CmdToken() cli.Command {
-	return cli.Command{
-		Name:      "token",
-		Usage:     "Token相关操作",
-		UsageText: cmder.App().Name + " token",
-		Category:  "阿里云盘账号",
-		Before:    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) {
-	ReloadConfigFunc(nil)
-
-	// 获取当前插件
-	pluginManger := plugins.NewPluginManager(config.GetPluginDir())
-	plugin, _ := pluginManger.GetPlugin()
-	params := &plugins.UserTokenRefreshFinishParams{
-		Result:    "success",
-		Message:   "",
-		OldToken:  "",
-		NewToken:  "",
-		UpdatedAt: utils.NowTimeStr(),
-	}
-
-	userList := config.Config.UserList
-	if userList == nil || len(userList) == 0 {
-		fmt.Printf("没有登录用户，无需刷新Token\n")
-		return
-	}
-	for _, user := range userList {
-		params.Result = "success"
-
-		if modeFlag == "1" {
-			if user.UserId != config.Config.ActiveUID {
-				continue
-			}
-		}
-		newToken, e := aliyunpan.GetAccessTokenFromRefreshToken(user.RefreshToken)
-		if e != nil {
-			params.Result = "fail"
-			params.Message = e.Error()
-			fmt.Printf("无法为%s用户获取新的RefreshToken，可能需要重新登录\n", user.Nickname)
-			continue
-		}
-		if newToken != nil && newToken.RefreshToken != "" {
-			params.OldToken = user.RefreshToken
-			params.NewToken = newToken.RefreshToken
-
-			user.RefreshToken = newToken.RefreshToken
-			user.WebToken = *newToken
-			fmt.Printf("成功刷新%s用户的RefreshToken\n", user.Nickname)
-		} else {
-			params.Result = "fail"
-		}
-
-		// plugin callback
-		if er := plugin.UserTokenRefreshFinishCallback(plugins.GetContext(user), params); er != nil {
-			logger.Verbosef("UserTokenRefreshFinishCallback error: " + er.Error())
-		}
-	}
-	SaveConfigFunc(nil)
-}
@@ -113,23 +113,31 @@ func getTree(driveId, pathStr string, depth int, statistic *treeStatistic, setti
 	pathStr = activeUser.PathJoin(driveId, pathStr)
 	pathStr = path.Clean(pathStr)

-	files, err := matchPathByShellPattern(driveId, pathStr)
+	// 获取目标路径文件信息
+	targetPathInfo, err := activeUser.PanClient().OpenapiPanClient().FileInfoByPath(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
-			}
-		}
-	}
+	// 适配通配符路径获取目标文件信息（弃用，容易触发风控）
+	//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
@@ -146,7 +154,7 @@ func getTree(driveId, pathStr string, depth int, statistic *treeStatistic, setti
 	fileListParam.OrderBy = aliyunpan.FileOrderByName
 	fileListParam.OrderDirection = aliyunpan.FileOrderDirectionAsc
 	if targetPathInfo.IsFolder() {
-		fileResult, err := activeUser.PanClient().FileListGetAll(fileListParam, 500)
+		fileResult, err := activeUser.PanClient().OpenapiPanClient().FileListGetAll(fileListParam, 500)
 		if err != nil {
 			fmt.Println(err)
 			return
@@ -169,7 +177,7 @@ func getTree(driveId, pathStr string, depth int, statistic *treeStatistic, setti
 			} else {
 				fmt.Printf("%v%v %v/\n", indentPrefixStr, pathPrefix, file.FileName)
 			}
-			getTree(driveId, targetPathInfo.Path+"/"+file.Path, depth+1, statistic, setting)
+			getTree(driveId, targetPathInfo.Path+"/"+file.FileName, depth+1, statistic, setting)
 			continue
 		}

@@ -214,9 +222,9 @@ func getTree(driveId, pathStr string, depth int, statistic *treeStatistic, setti
 // RunTree 列出树形图
 func RunTree(driveId, pathStr string, showFullPath, showFileSize bool, minSize, maxSize int64) {
 	activeUser := config.Config.ActiveUser()
-	activeUser.PanClient().ClearCache()
-	activeUser.PanClient().EnableCache()
-	defer activeUser.PanClient().DisableCache()
+	activeUser.PanClient().OpenapiPanClient().ClearCache()
+	activeUser.PanClient().OpenapiPanClient().EnableCache()
+	defer activeUser.PanClient().OpenapiPanClient().DisableCache()
 	pathStr = activeUser.PathJoin(driveId, pathStr)
 	statistic := &treeStatistic{
 		CountOfDir:  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,
@@ -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/log"
-	"github.com/tickstep/aliyunpan/internal/plugins"
-	"github.com/tickstep/aliyunpan/internal/utils"
-	"github.com/tickstep/library-go/requester/rio/speeds"
 	"os"
 	"path"
 	"path/filepath"
 	"strings"
 	"sync"
-	"sync/atomic"
 	"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,17 +56,18 @@ const (
 type (
 	// UploadOptions 上传可选项
 	UploadOptions struct {
-		AllParallel    int // 所有文件并发上传数量，即可以同时并发上传多少个文件
-		Parallel       int // 单个文件并发上传数量
-		MaxRetry       int
-		MaxTimeoutSec  int // http请求超时时间，单位秒
-		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面板显示上传进度
 	}
 )

@@ -92,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计算直接上传",
@@ -111,6 +117,10 @@ var UploadFlags = []cli.Flag{
 		Usage: "block size，上传分片大小，单位KB。推荐值：1024 ~ 10240。当上传极大单文件时候请适当调高该值",
 		Value: 10240,
 	},
+	cli.BoolFlag{
+		Name:  "ui",
+		Usage: "(BETA) 使用UI面板显示上传详情和进度，更加直观和友好",
+	},
 }

 func CmdUpload() cli.Command {
@@ -151,6 +161,9 @@ func CmdUpload() cli.Command {
    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$"
@@ -186,16 +199,18 @@ func CmdUpload() cli.Command {
 			//}

 			RunUpload(subArgs[:c.NArg()-1], subArgs[c.NArg()-1], &UploadOptions{
-				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"),
-				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"),
 			})

 			// 释放文件锁
@@ -208,79 +223,12 @@ func CmdUpload() cli.Command {
 	}
 }

-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:   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()
-	activeUser.PanClient().EnableCache()
-	activeUser.PanClient().ClearCache()
-	defer activeUser.PanClient().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 RefreshTokenInNeed(activeUser, config.Config.DeviceName) {
-				logger.Verboseln("update access token for upload task")
-			}
-		}
-	}(&continueFlag)
+	activeUser.PanClient().OpenapiPanClient().EnableCache()
+	activeUser.PanClient().OpenapiPanClient().ClearCache()
+	defer activeUser.PanClient().OpenapiPanClient().DisableCache()

 	if opt == nil {
 		opt = &UploadOptions{}
@@ -294,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 {
@@ -303,17 +251,17 @@ func RunUpload(localPaths []string, savePath string, opt *UploadOptions) {
 	if opt.MaxRetry < 0 {
 		opt.MaxRetry = DefaultUploadMaxRetry
 	}
-	opt.UseInternalUrl = config.Config.TransferUrlType == 2

 	// 超时时间
 	if opt.MaxTimeoutSec > 0 {
-		activeUser.PanClient().SetTimeout(time.Duration(opt.MaxTimeoutSec) * time.Second)
+		activeUser.PanClient().OpenapiPanClient().SetTimeout(time.Duration(opt.MaxTimeoutSec) * time.Second)
 	}

-	fmt.Printf("\n[0] 当前文件上传最大并发量为: %d, 上传分片大小为: %s\n", opt.AllParallel, converter.ConvertFileSize(opt.BlockSize, 2))
+	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)
 	}
@@ -324,7 +272,7 @@ func RunUpload(localPaths []string, savePath string, opt *UploadOptions) {
 		return
 	}

-	// 打开上传状态
+	// 打开上传状态数据库
 	uploadDatabase, err := panupload.NewUploadingDatabase()
 	if err != nil {
 		fmt.Printf("打开上传未完成数据库错误: %s\n", err)
@@ -350,6 +298,23 @@ 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()

@@ -364,7 +329,7 @@ func RunUpload(localPaths []string, savePath string, opt *UploadOptions) {

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

@@ -386,7 +351,7 @@ func RunUpload(localPaths []string, savePath string, opt *UploadOptions) {

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

@@ -415,13 +380,13 @@ func RunUpload(localPaths []string, savePath string, opt *UploadOptions) {
 			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.LogicPath)
+					logf("插件禁止该文件上传: %s\n", file.LogicPath)
 					return filepath.SkipDir
 				}
 				if uploadFilePrepareResult.DriveFilePath != "" {
 					targetSavePanRelativePath := strings.TrimPrefix(uploadFilePrepareResult.DriveFilePath, "/")
 					subSavePath = path.Clean(savePath + aliyunpan.PathSeparator + targetSavePanRelativePath)
-					fmt.Printf("插件修改文件网盘保存路径为: %s\n", subSavePath)
+					logf("插件修改文件网盘保存路径为: %s\n", subSavePath)
 				}
 			}

@@ -441,25 +406,29 @@ 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.LogicPath)
+				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()
-					fmt.Printf("正在检测和创建云盘文件夹: %s\n", saveFilePath)
-					_, apierr1 := activeUser.PanClient().FileInfoByPath(opt.DriveId, saveFilePath)
+					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().Mkdir(opt.DriveId, "root", saveFilePath)
+						rs, apierr := activeUser.PanClient().OpenapiPanClient().MkdirByFullPath(opt.DriveId, saveFilePath)
 						if apierr != nil || rs.FileId == "" {
-							fmt.Printf("创建云盘文件夹失败: %s\n", saveFilePath)
+							logf("创建云盘文件夹失败: %s\n", saveFilePath)
 						}
 					}
 					folderCreateMutex.Unlock()
@@ -471,19 +440,30 @@ func RunUpload(localPaths []string, savePath string, opt *UploadOptions) {
 		file := localfile.NewSymlinkFile(curPath)
 		if err = localfile.WalkAllFile(file, walkFunc); err != nil {
 			if err != filepath.SkipDir {
-				fmt.Printf("警告: 遍历错误: %s\n", err)
+				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))

@@ -501,108 +481,3 @@ func RunUpload(localPaths []string, savePath string, opt *UploadOptions) {
 	}
 	activeUser.DeleteCache(GetAllPathFolderByPath(savePath))
 }
-
-// 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"
@@ -47,7 +46,7 @@ func CmdSu() cli.Command {

 	示例:
 	aliyunpan su
-	aliyunpan su <uid or name>
+	aliyunpan su <uid>
 `,
 		Category: "阿里云盘账号",
 		Before:   ReloadConfigFunc,
@@ -95,7 +94,7 @@ 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
@@ -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,14 +16,14 @@ package command
 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-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"
@@ -60,7 +60,7 @@ var (
 // RunTestShellPattern 执行测试通配符
 func RunTestShellPattern(driveId string, pattern string) {
 	acUser := GetActiveUser()
-	files, err := acUser.PanClient().MatchPathByShellPattern(driveId, GetActiveUser().PathJoin(driveId, pattern))
+	files, err := acUser.PanClient().OpenapiPanClient().MatchPathByShellPattern(driveId, GetActiveUser().PathJoin(driveId, pattern))
 	if err != nil {
 		fmt.Println(err)
 		return
@@ -75,7 +75,7 @@ func RunTestShellPattern(driveId string, pattern string) {
 func matchPathByShellPattern(driveId string, patterns ...string) (files []*aliyunpan.FileEntity, e error) {
 	acUser := GetActiveUser()
 	for k := range patterns {
-		ps, err := acUser.PanClient().MatchPathByShellPattern(driveId, acUser.PathJoin(driveId, patterns[k]))
+		ps, err := acUser.PanClient().OpenapiPanClient().MatchPathByShellPattern(driveId, acUser.PathJoin(driveId, patterns[k]))
 		if err != nil {
 			return nil, err
 		}
@@ -128,39 +128,65 @@ func UnescapeStr(s string) string {
 	return r
 }

-// RefreshTokenInNeed 刷新refresh token
-func RefreshTokenInNeed(activeUser *config.PanUser, deviceName string) 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()) <= (20 * 60) { // 20min
+			if (expiredTime.Unix() - now.Unix()) <= (10 * 60) { // 有效期小于10min就刷新
 				pluginManger := plugins.NewPluginManager(config.GetPluginDir())
 				plugin, _ := pluginManger.GetPlugin()
 				params := &plugins.UserTokenRefreshFinishParams{
 					Result:    "success",
-					Message:   "",
+					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 {
+				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.RefreshToken
-					params.NewToken = wt.RefreshToken
+					params.OldToken = activeUser.WebapiToken.AccessToken
+					params.NewToken = wt.AccessToken

-					activeUser.RefreshToken = wt.RefreshToken
-					activeUser.WebToken = *wt
-					activeUser.PanClient().UpdateToken(*wt)
+					// 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")

 					// plugin callback
@@ -169,27 +195,195 @@ func RefreshTokenInNeed(activeUser *config.PanUser, deviceName string) bool {
 					}

 					// create new signature
-					_, e := activeUser.PanClient().CreateSession(nil)
-					if e != nil {
-						logger.Verboseln("call CreateSession error in RefreshTokenInNeed: " + e.Error())
+					_, e1 := activeUser.PanClient().WebapiPanClient().CreateSession(nil)
+					if e1 != nil {
+						logger.Verboseln("call CreateSession error in RefreshWebTokenInNeed: " + e1.Error())
+					}
+					return &panlogin.CommonResultError{
+						Code: 0,
+						Msg:  "",
 					}
-					return true
 				} else {
 					// token refresh error
 					// if token has expired, callback plugin api for notify
 					if now.Unix() >= expiredTime.Unix() {
 						params.Result = "fail"
-						params.Message = er.Error()
-						params.OldToken = activeUser.RefreshToken
+						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 {
@@ -205,110 +399,27 @@ func isMatchWildcardPattern(name string) bool {
 	return strings.ContainsAny(name, "*") || strings.ContainsAny(name, "?") || strings.ContainsAny(name, "[")
 }

-// DoLoginHelper 登录助手，使用token进行登录
-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
-}
-
 // TryLogin 尝试登录，基础应用支持的各类登录方式进行尝试成功登录
 func TryLogin() *config.PanUser {
-	// 获取当前插件
-	pluginManger := plugins.NewPluginManager(config.GetPluginDir())
-	plugin, _ := pluginManger.GetPlugin()
-	params := &plugins.UserTokenRefreshFinishParams{
-		Result:    "success",
-		Message:   "",
-		OldToken:  "",
-		NewToken:  "",
-		UpdatedAt: utils.NowTimeStr(),
-	}
-
 	// 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)
-						// login fail plugin callback
-						params.Result = "fail"
-						params.OldToken = u.RefreshToken
-						params.NewToken = ""
-						if er := plugin.UserTokenRefreshFinishCallback(plugins.GetContext(u), params); er != nil {
-							logger.Verbosef("UserTokenRefreshFinishCallback error: " + er.Error())
-						}
-						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
-				} else {
-					// login fail plugin callback
-					params.Result = "fail"
-					params.OldToken = u.RefreshToken
-					params.NewToken = ""
-					if er := plugin.UserTokenRefreshFinishCallback(plugins.GetContext(u), params); er != nil {
-						logger.Verbosef("UserTokenRefreshFinishCallback error: " + er.Error())
-					}
-				}
-				break
+			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
 			}
-			// plugin param
-			params.Result = "success"
-			params.OldToken = u.RefreshToken
-			params.NewToken = webToken.RefreshToken
-
-			// success login, save new token and access token
-			u.RefreshToken = webToken.RefreshToken
-			u.WebToken = webToken

 			// save
 			SaveConfigFunc(nil)
 			// reload
 			ReloadConfigFunc(nil)

-			// do plugin callback
-			if er := plugin.UserTokenRefreshFinishCallback(plugins.GetContext(u), params); er != nil {
-				logger.Verbosef("UserTokenRefreshFinishCallback error: " + er.Error())
-			}
-
 			return config.Config.ActiveUser()
 		}
 	}
@@ -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,234 +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/tickstep/library-go/logger"
-	"github.com/urfave/cli"
-	"strings"
-	"sync/atomic"
-	"time"
-)
-
-func CmdWebdav() cli.Command {
-	return cli.Command{
-		Name:        "webdav",
-		Usage:       "在线网盘服务",
-		Description: "webdav在线网盘服务",
-		Category:    "阿里云盘",
-		Before:      ReloadConfigFunc,
-		After:       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" -webdav_mode "rw" -pan_drive "File" -pan_dir_path "/webdav_folder"
-
-`,
-				Action: func(c *cli.Context) error {
-					if config.Config.ActiveUser() == nil {
-						fmt.Println("未登录账号，请先登录")
-						return nil
-					}
-					activeUser := GetActiveUser()
-
-					// 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 {
-							// token刷新
-							time.Sleep(time.Duration(1) * time.Minute)
-							//time.Sleep(time.Duration(5) * time.Second)
-							if RefreshTokenInNeed(activeUser, config.Config.DeviceName) {
-								logger.Verboseln("reload new access token for webdav")
-							}
-						}
-					}(&continueFlag)
-
-					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:    "/",
-							Mode:     "rw",
-						}},
-					}
-
-					// pan user
-					panUserId := activeUser.UserId
-					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
-
-					webdavMode := "rw"
-					if c.IsSet("webdav_mode") {
-						webdavMode = c.String("webdav_mode")
-					}
-					webdavServ.Users[0].Mode = webdavMode
-					if webdavServ.Users[0].Mode != "rw" && webdavServ.Users[0].Mode != "ro" {
-						webdavServ.Users[0].Mode = "rw"
-					}
-
-					err := config.Config.Save()
-					if err != nil {
-						fmt.Println(err)
-						return err
-					}
-
-					modeStr := "读写"
-					if webdavServ.Users[0].Mode == "rw" {
-						modeStr = "读写"
-					} else if webdavServ.Users[0].Mode == "ro" {
-						modeStr = "只读"
-					}
-
-					fmt.Println("----------------------------------------")
-					fmt.Printf("webdav网盘信息：\n链接：http://localhost:%d\n用户名：%s\n密码：%s\n网盘模式：%s\n网盘服务类型：%s\n网盘服务目录：%s\n",
-						webdavServ.Port, webdavServ.Users[0].Username, webdavServ.Users[0].Password, modeStr, 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:  "webdav_mode",
-						Usage: "Webdav模式，包括：rw-读写，ro-只读，默认为：rw",
-						Value: "rw",
-					},
-					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,7 +30,7 @@ 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
 		}
@@ -38,7 +38,7 @@ func (pu *PanUser) CacheFilesDirectoriesList(pathStr string) (fdl aliyunpan.File
 			DriveId:      pu.ActiveDriveId,
 			ParentFileId: fi.FileId,
 		}
-		fdl, apiError = pu.panClient.FileListGetAll(fileListParam, 100)
+		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,7 +54,7 @@ const (
 	DefaultFileDownloadParallelNum = 5

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

 	// DefaultTokenServiceWebHost 默认的token服务
 	DefaultTokenServiceWebHost = "https://api.tickstep.com"
@@ -61,6 +65,9 @@ const (

 	// DefaultDeviceName 默认客户端名称
 	DefaultDeviceName = "Chrome浏览器"
+
+	// DefaultClientId 默认的clientId
+	DefaultClientId = "cf9f70e8fc61430f8ec5ab5cadf31375"
 )

 var (
@@ -69,11 +76,6 @@ var (

 	// Config 配置信息, 由外部调用
 	Config = NewConfig(configFilePath)
-
-	AppVersion string
-
-	// IsAppInCliMode 是否在交互模式
-	IsAppInCliMode = false
 )

 type UpdateCheckInfo struct {
@@ -95,12 +97,12 @@ 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"`
@@ -109,6 +111,13 @@ type PanConfig struct {
 	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
@@ -196,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
@@ -260,37 +283,27 @@ func (c *PanConfig) loadConfigFromFile() (err error) {
 	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.FileRecordConfig = "1" // 默认开启
+	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)
@@ -304,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) {
@@ -313,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 {
@@ -325,12 +345,55 @@ 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"
@@ -379,7 +442,10 @@ func (c *PanConfig) ActiveUser() *PanUser {
 			if u.UserId == c.ActiveUID {
 				if u.PanClient() == nil {
 					// restore client
-					user, err := SetupUserByCookie(&u.WebToken, c.DeviceId, c.DeviceName)
+					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
@@ -387,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 = "/"
+							}
 						}
 					}
 				}
@@ -413,7 +500,7 @@ func (c *PanConfig) ActiveUser() *PanUser {
 				return u
 			}
 		}
-		return &PanUser{}
+		return nil
 	}
 	return c.activeUser
 }
@@ -424,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
 		}
@@ -454,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
 		}
 	}
@@ -472,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
 		}
@@ -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
@@ -95,14 +109,14 @@ func (c *PanConfig) PrintTable() {
 	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{"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"},
+		[]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个客户端同时在线。修改后需要重启应用生效"},
 	})
@@ -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,113 +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, deviceId, deviceName string) (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:
-	appConfig := aliyunpan.AppConfig{
-		AppId:     "25dzX3vbYqktVxyX",
-		DeviceId:  deviceId,
-		UserId:    "",
-		Nonce:     0,
-		PublicKey: "",
-	}
-	panClient := aliyunpan.NewPanClient(*webToken, aliyunpan.AppLoginToken{}, appConfig, aliyunpan.SessionConfig{
-		DeviceName: deviceName,
-		ModelName:  "Windows网页版",
+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
 	})
-	u := &PanUser{
-		WebToken:          *webToken,
-		panClient:         panClient,
-		Workdir:           "/",
-		WorkdirFileEntity: *aliyunpan.NewFileEntityForRootDir(),
-	}

-	// 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")
-	}
-
-	// create session
-	appConfig.UserId = u.UserId
-	panClient.UpdateAppConfig(appConfig)
-	r, e := panClient.CreateSession(nil)
-	if e != nil {
-		logger.Verboseln("call CreateSession error in SetupUserByCookie: " + e.Error())
-	}
-	if r != nil && !r.Result {
-		logger.Verboseln("上传签名秘钥失败，可能是你账号登录的设备已超最大数量")
+		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) {
@@ -165,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
 		}
@@ -174,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)
@@ -239,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"
 }
@@ -246,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,11 +17,13 @@ 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"
@@ -44,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 {
@@ -109,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 {
@@ -135,3 +147,42 @@ func RandomDeviceId() string {
 	}
 	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
+}
@@ -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,19 +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 {
@@ -61,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"
@@ -53,6 +55,7 @@ type (
 		monitorCancelFunc context.CancelFunc
 		globalSpeedsStat  *speeds.Speeds // 全局速度统计

+		filePanSource           global.FileSourceType // 要下载的网盘文件来源
 		fileInfo                *aliyunpan.FileEntity // 下载的文件信息
 		driveId                 string
 		loadBalancerCompareFunc LoadBalancerCompareFunc // 负载均衡检测函数
@@ -62,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
@@ -72,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
 }
@@ -104,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
 }
@@ -129,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
 	}
@@ -149,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
 	}
@@ -283,7 +298,7 @@ func (der *Downloader) checkLoadBalancers() *LoadBalancerResponseList {
 	return loadBalancerResponseList
 }

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

@@ -307,7 +322,6 @@ func (der *Downloader) Execute() error {
 	var (
 		isInstance = bii != nil // 是否存在断点信息
 		status     *transfer.DownloadStatus
-		single     = false // 默认开启多线程下载
 	)
 	if !isInstance {
 		bii = &transfer.DownloadInstanceInfo{}
@@ -329,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
 	}
@@ -359,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()
@@ -377,57 +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,
-	})
-	if apierr != nil && apierr.Code == apierror.ApiCodeDeviceSessionSignatureInvalid {
-		_, e := der.panClient.CreateSession(nil)
-		if e == nil {
-			// retry
-			durl, apierr = der.panClient.GetFileDownloadUrl(&aliyunpan.GetFileDownloadUrlParam{
-				DriveId: der.driveId,
-				FileId:  der.fileInfo.FileId,
-			})
-		} else {
-			logger.Verboseln("CreateSession failed")
-		}
-	}
-	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 == "" || strings.HasPrefix(durl.Url, aliyunpan.IllegalDownloadUrlPrefix) {
-		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: %v\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)

@@ -438,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
@@ -469,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
@@ -491,7 +639,7 @@ func (der *Downloader) downloadStatusEvent() {
 	}()
 }

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

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

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

-//Failed 失败
+// Failed 失败
 func (der *Downloader) Failed() {
 	if der.monitor == nil {
 		return
@@ -527,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)
@@ -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,
@@ -16,10 +16,13 @@ package uploader
 import "fmt"

 var (
-	UploadUrlExpired       = fmt.Errorf("UrlExpired")
-	UploadPartNotSeq       = fmt.Errorf("PartNotSequential")
-	UploadTerminate        = fmt.Errorf("UploadErrorTerminate")
-	UploadPartAlreadyExist = fmt.Errorf("PartAlreadyExist")
+	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 (
@@ -33,5 +36,8 @@ type (
 )

 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,6 +16,7 @@ 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"
@@ -61,6 +62,7 @@ type (

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

 	// MultiUploaderConfig 多线程上传配置
@@ -72,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,
 	}
 }
@@ -137,13 +140,13 @@ func (muer *MultiUploader) Execute() error {
 	// 分配任务
 	if muer.instanceState != nil {
 		muer.workers = muer.getWorkerListByInstanceState(muer.instanceState)
-		logger.Verboseln("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),
 		})

-		logger.Verboseln("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))
 	}

 	// 开始上传
@@ -195,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,17 +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
@@ -34,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
 }
@@ -89,7 +97,7 @@ func (muer *MultiUploader) upload() (uperr error) {
 			)
 			go func() {
 				if !wer.uploadDone {
-					logger.Verboseln("begin to upload part: " + strconv.Itoa(wer.id))
+					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
@@ -102,11 +110,11 @@ func (muer *MultiUploader) upload() (uperr error) {
 				return
 			case <-doneChan:
 				// continue
-				logger.Verboseln("multiUpload worker upload file done")
+				logger.Verboseln("multiUpload worker upload file http action done")
 			}
 			cancel()
 			if terr != nil {
-				logger.Verboseln("upload file part err: %+v", terr)
+				logger.Verbosef("upload file part err: %+v\n", terr)
 				if me, ok := terr.(*MultiError); ok {
 					if me.Terminated { // 终止
 						muer.closeCanceledOnce.Do(func() { // 只关闭一次
@@ -115,18 +123,21 @@ func (muer *MultiUploader) upload() (uperr error) {
 						uperr = me.Err
 						return
 					} else if me.NeedStartOver {
-						logger.Verboseln("upload start over: %d\n", wer.id)
+						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.Verboseln("upload err: %s, id: %d\n", terr, wer.id)
-				wer.splitUnit.Seek(0, os.SEEK_SET)
+				logger.Verbosef("upload worker err: %s, id: %d\n", terr, wer.id)
+				wer.splitUnit.Seek(0, io.SeekStart)
 				uploadDeque.Prepend(wer) // 放回上传队列首位
 				return
 			}
@@ -139,9 +150,11 @@ func (muer *MultiUploader) upload() (uperr error) {
 		}()
 		wg.Wait()
 		if uperr != nil {
-			if uperr == UploadPartNotSeq {
-				// 分片出现乱序，需要重新上传，取消本次所有剩余的分片的上传
-				break
+			if errors.Is(uperr, UploadPartNotSeq) ||
+				errors.Is(uperr, UploadNoSuchUpload) ||
+				errors.Is(uperr, UploadLocalFileAlreadyClosedError) {
+				// 清空数据，停止上传
+				uploadDeque = lane.NewDeque() // 清空待上传列表
 			}
 		}
 		// 没有任务了
@@ -153,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 {
@@ -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)
@@ -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,41 +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 // 下载统计
@@ -56,21 +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
 	}
 )

@@ -91,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
 }
@@ -101,6 +113,26 @@ func (dtu *DownloadTaskUnit) verboseInfof(format string, a ...interface{}) {
 	}
 }

+// 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 (
@@ -164,22 +196,25 @@ func (dtu *DownloadTaskUnit) download() (err error) {
 	}
 	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 {
@@ -227,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()
@@ -244,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 {
 			// 下载发生错误
@@ -269,28 +304,14 @@ 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) {
@@ -317,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 {
 		// 不检测文件有效性
@@ -326,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())
 	}

 	// 就在这里处理校验出错
@@ -339,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:
 			// 违规文件
@@ -357,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
 }

@@ -365,25 +386,30 @@ 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() {
-			dtu.FileRecorder.Append(&log.FileRecordItem{
-				Status:   "成功",
-				TimeStr:  utils.NowTimeStr(),
-				FileSize: dtu.fileInfo.FileSize,
-				FilePath: dtu.fileInfo.Path,
-			})
+			if dtu.FileRecorder != nil {
+				dtu.FileRecorder.Append(&log.FileRecordItem{
+					Status:   "成功",
+					TimeStr:  utils.NowTimeStr(),
+					FileSize: dtu.fileInfo.FileSize,
+					FilePath: dtu.fileInfo.Path,
+				})
+			}
 		}
 	}
 }
@@ -392,13 +418,20 @@ func (dtu *DownloadTaskUnit) OnFailed(lastRunResult *taskframework.TaskUnitRunRe
 	// 失败
 	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) {
@@ -408,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,
@@ -429,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 {
@@ -444,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 = "获取下载路径信息错误"
@@ -456,8 +491,8 @@ 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"
@@ -469,6 +504,7 @@ func (dtu *DownloadTaskUnit) Run() (result *taskframework.TaskUnitRunResult) {
 	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,
@@ -481,7 +517,8 @@ func (dtu *DownloadTaskUnit) Run() (result *taskframework.TaskUnitRunResult) {
 	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)
+			dtu.logf("插件取消了该文件下载: %s\n", dtu.fileInfo.Path)
+			dtu.updateUITaskState(ui.TaskCanceled, "插件取消了该文件下载: "+dtu.fileInfo.Path)
 			result.Succeed = false
 			result.Cancel = true
 			return
@@ -490,7 +527,7 @@ func (dtu *DownloadTaskUnit) Run() (result *taskframework.TaskUnitRunResult) {
 			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\n", dtu.SavePath)
 		}
 	}

@@ -521,7 +558,7 @@ func (dtu *DownloadTaskUnit) Run() (result *taskframework.TaskUnitRunResult) {
 		}

 		// 获取该目录下的文件列表
-		fileList, apierr := dtu.PanClient.FileListGetAll(&aliyunpan.FileListParam{
+		fileList, apierr := dtu.PanClient.OpenapiPanClient().FileListGetAll(&aliyunpan.FileListParam{
 			DriveId:      dtu.DriveId,
 			ParentFileId: dtu.fileInfo.FileId,
 		}, 1000)
@@ -529,7 +566,7 @@ func (dtu *DownloadTaskUnit) Run() (result *taskframework.TaskUnitRunResult) {
 			// 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)
@@ -553,13 +590,17 @@ 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) {
-				fmt.Printf("排除文件: %s\n", fileList[k].Path)
+				dtu.logf("排除文件: %s\n", fileList[k].Path)
 				continue
 			}

@@ -573,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())
+			}
 		}

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

-	fmt.Printf("[%s] 准备下载: %s\n", dtu.taskInfo.Id(), dtu.FilePanPath)
+	dtu.logf("[%s] 准备下载: %s\n", dtu.taskInfo.Id(), dtu.FilePanPath)

 	//if !dtu.IsOverwrite && FileExist(dtu.SavePath) {
 	//	fmt.Printf("[%s] 文件已经存在: %s, 跳过...\n", dtu.taskInfo.Id(), dtu.SavePath)
@@ -595,12 +641,15 @@ func (dtu *DownloadTaskUnit) Run() (result *taskframework.TaskUnitRunResult) {
 	//}
 	// 支持符号文件，逻辑和注释代码一致
 	if !dtu.IsOverwrite && SymlinkFileExist(dtu.SavePath, dtu.OriginSaveRootPath) {
-		fmt.Printf("[%s] 文件已经存在: %s, 跳过...\n", dtu.taskInfo.Id(), dtu.SavePath)
+		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()
@@ -620,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,
@@ -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,13 +16,19 @@ package panupload
 import (
 	"context"
 	"encoding/xml"
-	"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"
 	"github.com/tickstep/aliyunpan/internal/file/uploader"
@@ -31,13 +37,12 @@ import (

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

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

 	EmptyReaderLen64 struct {
@@ -52,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{}
 	}
 }

@@ -73,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)
@@ -94,7 +100,7 @@ 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{
@@ -106,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
@@ -120,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 {
@@ -128,17 +135,25 @@ 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 {
+							if "PartNotSequential" == errResp.Code {
 								respError = uploader.UploadPartNotSeq
 								respErr = &uploader.MultiError{
 									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 {
@@ -157,10 +172,18 @@ func (pu *PanUpload) UploadFile(ctx context.Context, partseq int, partOffset int
 								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)
 			}

 			// 不可恢复的错误
@@ -172,29 +195,47 @@ func (pu *PanUpload) UploadFile(ctx context.Context, partseq int, partOffset int
 				}
 			}
 		} else {
+			// 默认错误
 			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 == uploader.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{
@@ -204,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 == uploader.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 == uploader.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
@@ -233,24 +274,11 @@ 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,
 	})
-	if er != nil && er.Code == apierror.ApiCodeDeviceSessionSignatureInvalid {
-		_, e := pu.panClient.CreateSession(nil)
-		if e == nil {
-			// retry
-			_, er = pu.panClient.CompleteUploadFile(&aliyunpan.CompleteUploadFileParam{
-				DriveId:  pu.driveId,
-				FileId:   pu.uploadOpEntity.FileId,
-				UploadId: pu.uploadOpEntity.UploadId,
-			})
-		} else {
-			logger.Verboseln("CreateSession failed")
-		}
-	}
 	if er != nil {
 		return er
 	}
@@ -266,7 +294,7 @@ func (pu *PanUpload) triggerVideoTranscodeAction() {
 	// 视频文件触发云端转码请求
 	if pu.uploadOpEntity != nil && IsVideoFile(pu.uploadOpEntity.FileName) {
 		time.Sleep(3 * time.Second)
-		_, er1 := pu.panClient.VideoGetPreviewPlayInfo(&aliyunpan.VideoGetPreviewPlayInfoParam{
+		_, er1 := pu.panClient.OpenapiPanClient().VideoGetPreviewPlayInfo(&aliyunpan.VideoGetPreviewPlayInfoParam{
 			DriveId: pu.driveId,
 			FileId:  pu.uploadOpEntity.FileId,
 		})
@@ -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 {
@@ -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.LogicPath == meta.Path.LogicPath {
-			// 移除旧的信息
-			// 目前只是比较了文件大小
-			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
@@ -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,10 +14,8 @@
 package panupload

 import (
+	"errors"
 	"fmt"
-	"github.com/tickstep/aliyunpan/internal/log"
-	"github.com/tickstep/aliyunpan/internal/plugins"
-	"github.com/tickstep/library-go/logger"
 	"os"
 	"path"
 	"path/filepath"
@@ -25,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"

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

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

-		PanClient         *aliyunpan.PanClient
+		PanClient         *config.PanClient
 		UploadingDatabase *UploadingDatabase // 数据库
 		Parallel          int
 		NoRapidUpload     bool  // 禁用秒传，无需计算SHA1，直接上传
@@ -64,24 +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
@@ -93,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 (
@@ -123,10 +151,11 @@ func (utu *UploadTaskUnit) prepareFile() {
 	}

 	//if utu.LocalFileChecksum.Length > MaxRapidUploadSize {
-	//	fmt.Printf("[%s] 文件超过20GB, 无法使用秒传功能, 跳过秒传...\n", utu.taskInfo.Id())
+	//	utu.logf("[%s] 文件超过20GB, 无法使用秒传功能, 跳过秒传...\n", utu.taskInfo.Id())
 	//	utu.Step = StepUploadUpload
 	//	return
 	//}
+
 	// 下一步: 秒传
 	utu.Step = StepUploadRapidUpload
 }
@@ -137,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
@@ -158,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 {
@@ -178,15 +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 {
-			uploadedPercentage := fmt.Sprintf("%.2f%%", float64(status.Uploaded())/float64(status.TotalSize())*100)
-			fmt.Printf("\r[%s] ↑ %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,
 			)
 		}
 	})
@@ -194,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) // 删除
@@ -227,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
@@ -236,16 +296,19 @@ 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{
@@ -260,6 +323,7 @@ func (utu *UploadTaskUnit) OnSuccess(lastRunResult *taskframework.TaskUnitRunRes
 func (utu *UploadTaskUnit) OnFailed(lastRunResult *taskframework.TaskUnitRunResult) {
 	// 失败
 	utu.pluginCallback("fail")
+	utu.updateUITaskState(ui.TaskCanceled, "取消: "+utu.LocalFileChecksum.Path.LogicPath)
 }

 func (utu *UploadTaskUnit) pluginCallback(result string) {
@@ -291,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())
@@ -300,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() // 关闭文件
@@ -308,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.LogicPath, 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
@@ -319,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
@@ -353,8 +425,8 @@ StepUploadPrepareUpload:
 	saveFilePath = path.Dir(utu.SavePath)
 	if saveFilePath != "/" {
 		utu.FolderCreateMutex.Lock()
-		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.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 {
@@ -369,16 +441,7 @@ StepUploadPrepareUpload:
 		}
 		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.Mkdir(utu.DriveId, "root", saveFilePath)
-			if apierr != nil && apierr.Code == apierror.ApiCodeDeviceSessionSignatureInvalid {
-				_, e := utu.PanClient.CreateSession(nil)
-				if e == nil {
-					// retry
-					rs, apierr = utu.PanClient.Mkdir(utu.DriveId, "root", saveFilePath)
-				} else {
-					logger.Verboseln("CreateSession failed")
-				}
-			}
+			rs, apierr = utu.PanClient.OpenapiPanClient().MkdirByFullPath(utu.DriveId, saveFilePath)
 			if apierr != nil || rs.FileId == "" {
 				result.Err = apierr
 				result.ResultMessage = "创建云盘文件夹失败"
@@ -398,53 +461,92 @@ 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.LogicPath)
-		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.RealPath)
-		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)
 		}
 	}

@@ -456,29 +558,37 @@ StepUploadPrepareUpload:
 	}

 	// 创建上传任务
-	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",
-	}
-
-	uploadOpEntity, apierr = utu.PanClient.CreateUploadFile(appCreateUploadFileParam)
-	if apierr != nil && apierr.Code == apierror.ApiCodeDeviceSessionSignatureInvalid {
-		_, e := utu.PanClient.CreateSession(nil)
-		if e == nil {
-			// retry
-			uploadOpEntity, apierr = utu.PanClient.CreateUploadFile(appCreateUploadFileParam)
-		} else {
-			logger.Verboseln("CreateSession failed")
+	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()
@@ -486,6 +596,8 @@ StepUploadPrepareUpload:
 			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
 	}
@@ -507,14 +619,101 @@ stepUploadUpload:
 	// 正常上传流程
 	uploadResult := utu.upload()
 	if uploadResult != nil && uploadResult.Err != nil {
-		if uploadResult.Err == uploader.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
+}
@@ -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,14 +14,17 @@
 package panupload

 import (
-	"github.com/tickstep/aliyunpan/internal/config"
-	"github.com/tickstep/library-go/converter"
-	"github.com/tickstep/library-go/logger"
-	"net/url"
+	"crypto/sha1"
+	"encoding/hex"
+	"os"
 	"path"
-	"strconv"
 	"strings"
 	"time"
+
+	"github.com/tickstep/aliyunpan/internal/config"
+	"github.com/tickstep/aliyunpan/internal/utils"
+	"github.com/tickstep/library-go/converter"
+	"github.com/tickstep/library-go/logger"
 )

 const (
@@ -32,7 +35,10 @@ const (
 	// MaxRapidUploadSize 秒传文件支持的最大文件大小
 	MaxRapidUploadSize = 20 * converter.GB

+	// UploadingFileName 上传文件上传状态的文件名
 	UploadingFileName = "aliyunpan_uploading.json"
+	// UploadingBackupFileName 上传文件上传状态的副本
+	UploadingBackupFileName = "aliyunpan_uploading.json.bak"
 )

 var (
@@ -49,16 +55,16 @@ func getBlockSize(fileSize int64) int64 {

 // IsUrlExpired 上传链接是否已过期。过期返回True
 func IsUrlExpired(urlStr string) bool {
-	u, err := url.Parse(urlStr)
+	expiredTimeSec, err := utils.GetExpiredTimeSecFromOSSUrl(urlStr)
 	if err != nil {
+		// 解析错误，默认过期
 		return true
 	}
-	expiredTimeSecStr := u.Query().Get("x-oss-expires")
-	expiredTimeSec, _ := strconv.ParseInt(expiredTimeSecStr, 10, 64)
 	if (expiredTimeSec - time.Now().Unix()) <= 300 { // 小于5分钟
 		// expired
 		return true
 	}
+	// 返回未过期
 	return false
 }

@@ -78,3 +84,16 @@ func IsVideoFile(fileName string) bool {
 	}
 	return false
 }
+
+// CalcFilePreHash 计算文件 PreHash
+func CalcFilePreHash(filePath string) string {
+	localFile, _ := os.OpenFile(filePath, os.O_RDONLY, 0)
+	defer localFile.Close()
+	bytes := make([]byte, 1024)
+	localFile.ReadAt(bytes, 0)
+	sha1w := sha1.New()
+	sha1w.Write(bytes)
+	shaBytes := sha1w.Sum(nil)
+	hashCode := hex.EncodeToString(shaBytes)
+	return strings.ToUpper(hashCode)
+}
@@ -0,0 +1,12 @@
+package global
+
+type (
+	FileSourceType string
+)
+
+const (
+	// FileSource 文件，包括：资源盘文件、备份盘文件
+	FileSource FileSourceType = "file"
+	// AlbumSource 相册
+	AlbumSource FileSourceType = "album"
+)
@@ -0,0 +1,12 @@
+package global
+
+var (
+	// AppVersion 应用版本
+	AppVersion string
+
+	// IsAppInCliMode 是否在交互模式
+	IsAppInCliMode = false
+
+	// IsSupportNoneOpenApiCommands 是否开启非OpenAPI的命令
+	IsSupportNoneOpenApiCommands = 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,
@@ -17,19 +17,6 @@ import (
 	"archive/zip"
 	"bytes"
 	"fmt"
-	jsoniter "github.com/json-iterator/go"
-	"github.com/tickstep/aliyunpan/cmder/cmdliner"
-	"github.com/tickstep/aliyunpan/cmder/cmdutil"
-	"github.com/tickstep/aliyunpan/internal/config"
-	"github.com/tickstep/aliyunpan/internal/utils"
-	"github.com/tickstep/aliyunpan/library/requester/transfer"
-	"github.com/tickstep/library-go/cachepool"
-	"github.com/tickstep/library-go/checkaccess"
-	"github.com/tickstep/library-go/converter"
-	"github.com/tickstep/library-go/getip"
-	"github.com/tickstep/library-go/jsonhelper"
-	"github.com/tickstep/library-go/logger"
-	"github.com/tickstep/library-go/requester"
 	"io/ioutil"
 	"net/http"
 	"path/filepath"
@@ -39,6 +26,20 @@ import (
 	"strings"
 	"sync"
 	"time"
+
+	jsoniter "github.com/json-iterator/go"
+	"github.com/tickstep/aliyunpan/cmder/cmdliner"
+	"github.com/tickstep/aliyunpan/cmder/cmdutil"
+	"github.com/tickstep/aliyunpan/internal/config"
+	"github.com/tickstep/aliyunpan/internal/global"
+	"github.com/tickstep/aliyunpan/internal/utils"
+	"github.com/tickstep/aliyunpan/library/requester/transfer"
+	"github.com/tickstep/library-go/cachepool"
+	"github.com/tickstep/library-go/checkaccess"
+	"github.com/tickstep/library-go/converter"
+	"github.com/tickstep/library-go/jsonhelper"
+	"github.com/tickstep/library-go/logger"
+	"github.com/tickstep/library-go/requester"
 )

 const (
@@ -57,16 +58,16 @@ type tsResp struct {
 	Msg  string      `json:"msg"`
 }

-func getReleaseFromTicstep(client *requester.HTTPClient, showPrompt bool) *ReleaseInfo {
+func getReleaseFromTickstep(client *requester.HTTPClient, showPrompt bool) *ReleaseInfo {
 	tsReleaseInfo := &ReleaseInfo{}
 	tsRespObj := &tsResp{Data: tsReleaseInfo}
 	fullUrl := strings.Builder{}
-	ipAddr, err := getip.IPInfoFromTechainBaidu()
+	ipAddr, err := utils.GetPublicIP()
 	if err != nil {
 		ipAddr = "127.0.0.1"
 	}
-	fmt.Fprintf(&fullUrl, "http://api.tickstep.com/update/tickstep/aliyunpan/releases/latest?ip=%s&os=%s&arch=%s&version=%s",
-		ipAddr, runtime.GOOS, runtime.GOARCH, config.AppVersion)
+	fmt.Fprintf(&fullUrl, "http://api.tickstep.com/update/tickstep/aliyunpan/releases/latest?ip=%s&os=%s&arch=%s&version=%s", ipAddr, runtime.GOOS, runtime.GOARCH, global.AppVersion)
+	//fmt.Fprintf(&fullUrl, "http://localhost:8997/update/tickstep/aliyunpan/releases/latest?ip=%s&os=%s&arch=%s&version=%s", ipAddr, runtime.GOOS, runtime.GOARCH, global.AppVersion)
 	resp, err := client.Req(http.MethodGet, fullUrl.String(), nil, nil)
 	if resp != nil {
 		defer resp.Body.Close()
@@ -135,19 +136,12 @@ func GetLatestReleaseInfo(showPrompt bool) *ReleaseInfo {
 	client.SetTimeout(time.Duration(0) * time.Second)
 	client.SetKeepAlive(true)

-	// check tickstep srv
-	var tsReleaseInfo *ReleaseInfo = nil
-	for idx := 0; idx < 3; idx++ {
-		tsReleaseInfo = getReleaseFromTicstep(client, showPrompt)
-		if tsReleaseInfo != nil {
-			break
-		}
-		time.Sleep(time.Duration(5) * time.Second)
-	}
+	// tickstep server
+	var tsReleaseInfo = getReleaseFromTickstep(client, showPrompt)

-	// github
+	// github server
 	var ghReleaseInfo *ReleaseInfo = nil
-	for idx := 0; idx < 3; idx++ {
+	for idx := 0; idx < 2; idx++ {
 		ghReleaseInfo = getReleaseFromGithub(client, showPrompt)
 		if ghReleaseInfo != nil {
 			break
@@ -157,10 +151,11 @@ func GetLatestReleaseInfo(showPrompt bool) *ReleaseInfo {

 	var releaseInfo *ReleaseInfo = nil
 	if config.Config.UpdateCheckInfo.PreferUpdateSrv == "tickstep" {
-		// theoretically, tickstep server will be more faster at mainland
+		// theoretically, tickstep server will be faster in China mainland
 		releaseInfo = tsReleaseInfo
 	} else {
 		releaseInfo = ghReleaseInfo
+		// 如果github的版本信息获取不到（例如网络不稳定），可以尝试使用tickstep服务进行升级
 		if ghReleaseInfo == nil || ghReleaseInfo.TagName == "" {
 			releaseInfo = tsReleaseInfo
 		}
@@ -211,29 +206,25 @@ func CheckUpdate(version string, yes bool) {

 	builder := &strings.Builder{}
 	builder.WriteString(ReleaseName + "-" + releaseInfo.TagName + "-" + runtime.GOOS + "-.*?")
-	if runtime.GOOS == "darwin" && (runtime.GOARCH == "arm" || runtime.GOARCH == "arm64") {
-		builder.WriteString("arm")
-	} else {
-		switch runtime.GOARCH {
-		case "amd64":
-			builder.WriteString("(amd64|x86_64|x64)")
-		case "386":
-			builder.WriteString("(386|x86)")
-		case "arm":
-			builder.WriteString("(armv5|armv7|arm)")
-		case "arm64":
-			builder.WriteString("arm64")
-		case "mips":
-			builder.WriteString("mips")
-		case "mips64":
-			builder.WriteString("mips64")
-		case "mipsle":
-			builder.WriteString("(mipsle|mipsel)")
-		case "mips64le":
-			builder.WriteString("(mips64le|mips64el)")
-		default:
-			builder.WriteString(runtime.GOARCH)
-		}
+	switch runtime.GOARCH {
+	case "amd64":
+		builder.WriteString("(amd64|x86_64|x64)")
+	case "386":
+		builder.WriteString("(386|x86)")
+	case "arm":
+		builder.WriteString("(armv5|armv7|arm)")
+	case "arm64":
+		builder.WriteString("arm64")
+	case "mips":
+		builder.WriteString("mips")
+	case "mips64":
+		builder.WriteString("mips64")
+	case "mipsle":
+		builder.WriteString("(mipsle|mipsel)")
+	case "mips64le":
+		builder.WriteString("(mips64le|mips64el)")
+	default:
+		builder.WriteString(runtime.GOARCH)
 	}
 	builder.WriteString("\\.zip")

@@ -384,7 +375,8 @@ func CheckUpdate(version string, yes bool) {
 		return
 	}

-	execPath := cmdutil.ExecutablePath()
+	//execPath := cmdutil.ExecutablePath()
+	configPath := configurationPath()

 	var fileNum, errTimes int
 	for _, zipFile := range reader.File {
@@ -408,9 +400,11 @@ func CheckUpdate(version string, yes bool) {

 		name := zipFile.Name[strings.Index(zipFile.Name, "/")+1:]
 		if name == ReleaseName {
+			// 执行文件
 			err = update(cmdutil.Executable(), rc)
 		} else {
-			err = update(filepath.Join(execPath, name), rc)
+			// 配置文件
+			err = update(filepath.Join(configPath, name), rc)
 		}

 		if err != nil {
@@ -427,3 +421,8 @@ func CheckUpdate(version string, yes bool) {

 	fmt.Printf("更新完毕, 请重启程序\n")
 }
+
+// ConfigurationPath 获取程序配置所在目录
+func configurationPath() string {
+	return config.GetConfigDir()
+}
@@ -44,10 +44,17 @@ func (p *IdlePlugin) SyncFileFinishCallback(context *Context, params *SyncFileFi
 	return nil
 }

+func (p *IdlePlugin) SyncAllFileFinishCallback(context *Context, params *SyncAllFileFinishParams) error {
+	return nil
+}
 func (p *IdlePlugin) UserTokenRefreshFinishCallback(context *Context, params *UserTokenRefreshFinishParams) error {
 	return nil
 }

+func (p *IdlePlugin) RemoveFilePrepareCallback(context *Context, params *RemoveFilePrepareParams) (*RemoveFilePrepareResult, error) {
+	return nil, nil
+}
+
 func (p *IdlePlugin) Stop() error {
 	return nil
 }
@@ -31,6 +31,15 @@ func jsLog(call goja.FunctionCall) goja.Value {
 	return str
 }

+// jsLog 支持js中的console.log方法
+func jsPrintln(call goja.FunctionCall) goja.Value {
+	str := call.Argument(0)
+	buf := &strings.Builder{}
+	fmt.Fprintf(buf, "[PLUGIN] %+v\n", str.Export())
+	fmt.Println(buf.String())
+	return str
+}
+
 func (js *JsPlugin) Start() error {
 	js.Name = "JsPlugin"
 	js.vm = goja.New()
@@ -38,8 +47,9 @@ func (js *JsPlugin) Start() error {

 	// 内置log
 	console := js.vm.NewObject()
-	console.Set("log", jsLog)
-	js.vm.Set("console", console) // console.log()
+	js.vm.Set("console", console)
+	console.Set("log", jsLog)         // console.log()
+	console.Set("println", jsPrintln) // console.println()

 	// 内置系统函数PluginUtil
 	pluginObj := js.vm.NewObject()
@@ -56,6 +66,11 @@ func (js *JsPlugin) Start() error {
 	pluginObj.Set("LocalFS", localFS)
 	localFS.Set("deleteFile", DeleteLocalFile) // PluginUtil.LocalFS.deleteFile()

+	// PluginUtil.PanFS
+	panFS := js.vm.NewObject()
+	pluginObj.Set("PanFS", panFS)
+	panFS.Set("deleteFile", DeletePanFile) // PluginUtil.PanFS.deleteFile()
+
 	// PluginUtil.Email
 	emailObj := js.vm.NewObject()
 	pluginObj.Set("Email", emailObj)
@@ -69,6 +84,11 @@ func (js *JsPlugin) Start() error {
 	kvObj.Set("getString", GetString) // PluginUtil.KV.getString()
 	kvObj.Set("putString", PutString) // PluginUtil.KV.putString()

+	// PluginUtil.HashTool
+	hashTool := js.vm.NewObject()
+	pluginObj.Set("HashTool", hashTool)
+	hashTool.Set("md5Hex", Md5Hex) // PluginUtil.HashTool.md5Hex()
+
 	return nil
 }

@@ -223,6 +243,26 @@ func (js *JsPlugin) SyncFileFinishCallback(context *Context, params *SyncFileFin
 	return nil
 }

+// SyncAllFileFinishCallback 同步备份-同步全部文件完成时的回调函数
+func (js *JsPlugin) SyncAllFileFinishCallback(context *Context, params *SyncAllFileFinishParams) error {
+	var fn func(*Context, *SyncAllFileFinishParams) error
+	if !js.isHandlerFuncExisted("syncAllFileFinishCallback") {
+		return nil
+	}
+	err := js.vm.ExportTo(js.vm.Get("syncAllFileFinishCallback"), &fn)
+	if err != nil {
+		logger.Verboseln("Js函数映射到 Go 函数失败！")
+		return nil
+	}
+	er := fn(context, params)
+	if er != nil {
+		logger.Verboseln(er)
+		return nil
+	}
+	return nil
+}
+
+// UserTokenRefreshFinishCallback 用户Token刷新完成后回调函数
 func (js *JsPlugin) UserTokenRefreshFinishCallback(context *Context, params *UserTokenRefreshFinishParams) error {
 	var fn func(*Context, *UserTokenRefreshFinishParams) error
 	if !js.isHandlerFuncExisted("userTokenRefreshFinishCallback") {
@@ -241,6 +281,25 @@ func (js *JsPlugin) UserTokenRefreshFinishCallback(context *Context, params *Use
 	return nil
 }

+// RemoveFilePrepareCallback 删除文件前的回调函数
+func (js *JsPlugin) RemoveFilePrepareCallback(context *Context, params *RemoveFilePrepareParams) (*RemoveFilePrepareResult, error) {
+	var fn func(*Context, *RemoveFilePrepareParams) (*RemoveFilePrepareResult, error)
+	if !js.isHandlerFuncExisted("removeFilePrepareCallback") {
+		return nil, nil
+	}
+	err := js.vm.ExportTo(js.vm.Get("removeFilePrepareCallback"), &fn)
+	if err != nil {
+		logger.Verboseln("Js函数映射到 Go 函数失败！")
+		return nil, nil
+	}
+	r, er := fn(context, params)
+	if er != nil {
+		logger.Verboseln(er)
+		return nil, er
+	}
+	return r, nil
+}
+
 func (js *JsPlugin) Stop() error {
 	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,
@@ -16,12 +16,16 @@ package plugins
 type (
 	// Context 插件回调函数上下文信息
 	Context struct {
-		AppName      string `json:"appName"`
-		Version      string `json:"version"`
-		UserId       string `json:"userId"`
-		Nickname     string `json:"nickname"`
-		FileDriveId  string `json:"fileDriveId"`
+		AppName  string `json:"appName"`
+		Version  string `json:"version"`
+		UserId   string `json:"userId"`
+		Nickname string `json:"nickname"`
+		// FileDriveId 备份盘
+		FileDriveId string `json:"fileDriveId"`
+		// AlbumDriveId 相册盘
 		AlbumDriveId string `json:"albumDriveId"`
+		// ResourceDriveId 资源盘
+		ResourceDriveId string `json:"resourceDriveId"`
 	}

 	// UploadFilePrepareParams 上传文件前的回调函数-参数
@@ -66,6 +70,7 @@ type (
 		DriveFileType      string `json:"driveFileType"`
 		DriveFileUpdatedAt string `json:"driveFileUpdatedAt"`
 		LocalFilePath      string `json:"localFilePath"`
+		DownloadActionId   string `json:"downloadActionId"`
 	}

 	// DownloadFilePrepareResult 上传文件前的回调函数-返回结果
@@ -79,6 +84,7 @@ type (
 	// DownloadFileFinishParams 下载文件结束的回调函数-参数
 	DownloadFileFinishParams struct {
 		DriveId            string `json:"driveId"`
+		DriveFileId        string `json:"driveFileId"`
 		DriveFileName      string `json:"driveFileName"`
 		DriveFilePath      string `json:"driveFilePath"`
 		DriveFileSha1      string `json:"driveFileSha1"`
@@ -87,6 +93,7 @@ type (
 		DriveFileUpdatedAt string `json:"driveFileUpdatedAt"`
 		DownloadResult     string `json:"downloadResult"`
 		LocalFilePath      string `json:"localFilePath"`
+		DownloadActionId   string `json:"downloadActionId"`
 	}

 	// SyncScanLocalFilePrepareParams 同步备份-扫描本地文件前参数
@@ -122,11 +129,12 @@ type (
 		SyncScanPanApproved string `json:"syncScanPanApproved"`
 	}

-	// SyncFileFinishParams 同步备份-文件同步结束-回调参数
+	// SyncFileFinishParams 同步备份-一个文件同步结束-回调参数
 	SyncFileFinishParams struct {
 		Action        string `json:"action"`
 		ActionResult  string `json:"actionResult"`
 		DriveId       string `json:"driveId"`
+		DriveFileId   string `json:"driveFileId"`
 		FileName      string `json:"fileName"`
 		FilePath      string `json:"filePath"`
 		FileSha1      string `json:"fileSha1"`
@@ -135,6 +143,28 @@ type (
 		FileUpdatedAt string `json:"fileUpdatedAt"`
 	}

+	// SyncAllFileFinishParams 同步备份-全部文件同步结束-回调参数
+	SyncAllFileFinishParams struct {
+		// Name 任务名称
+		Name string `json:"name"`
+		// Id 任务ID
+		Id string `json:"id"`
+		// UserId 账号ID
+		UserId string `json:"userId"`
+		// DriveName 网盘名称，backup-备份盘，resource-资源盘
+		DriveName string `json:"driveName"`
+		// DriveId 网盘ID，目前支持文件网盘
+		DriveId string `json:"driveId"`
+		// LocalFolderPath 本地目录
+		LocalFolderPath string `json:"localFolderPath"`
+		// PanFolderPath 云盘目录
+		PanFolderPath string `json:"panFolderPath"`
+		// Mode 备份模式
+		Mode string `json:"mode"`
+		// Policy 备份策略
+		Policy string `json:"policy"`
+	}
+
 	// UserTokenRefreshFinishParams 用户Token刷新完成后回调函数
 	UserTokenRefreshFinishParams struct {
 		Result    string `json:"result"`
@@ -144,6 +174,42 @@ type (
 		UpdatedAt string `json:"updatedAt"`
 	}

+	// RemoveFilePrepareParams 删除文件前的回调函数-参数
+	RemoveFilePrepareParams struct {
+		Count int                      `json:"count"`
+		Items []*RemoveFilePrepareItem `json:"items"`
+	}
+	RemoveFilePrepareItem struct {
+		// DriveId 网盘ID
+		DriveId string `json:"driveId"`
+		// DriveFileId 网盘文件的ID
+		DriveFileId string `json:"driveFileId"`
+		// DriveFileName 网盘文件名
+		DriveFileName string `json:"driveFileName"`
+		// DriveFilePath 网盘文件路径
+		DriveFilePath string `json:"driveFilePath"`
+		// DriveFileSize 网盘文件大小
+		DriveFileSize int64 `json:"driveFileSize"`
+		// DriveFileType 网盘文件类型，file-文件，folder-文件夹
+		DriveFileType string `json:"driveFileType"`
+		// DriveFileUpdatedAt 网盘文件修改时间，格式：2025-03-03 10:39:14
+		DriveFileUpdatedAt string `json:"driveFileUpdatedAt"`
+		// DriveFileCreatedAt 网盘文件创建时间，格式：2025-03-03 10:39:14
+		DriveFileCreatedAt string `json:"driveFileCreatedAt"`
+	}
+	// RemoveFilePrepareResult 删除文件前的回调函数-返回结果
+	RemoveFilePrepareResult struct {
+		Result []*RemoveFilePrepareResultItem `json:"result"`
+	}
+	RemoveFilePrepareResultItem struct {
+		// DriveId 网盘ID
+		DriveId string `json:"driveId"`
+		// DriveFileId 网盘文件的ID
+		DriveFileId string `json:"driveFileId"`
+		// RemoveApproved 确认该文件是否删除。yes-删除 no-不删除
+		RemoveApproved string `json:"removeApproved"`
+	}
+
 	// Plugin 插件接口
 	Plugin interface {
 		// Start 启动
@@ -164,18 +230,22 @@ type (
 		// SyncScanLocalFilePrepareCallback 同步备份-扫描本地文件的回调函数
 		SyncScanLocalFilePrepareCallback(context *Context, params *SyncScanLocalFilePrepareParams) (*SyncScanLocalFilePrepareResult, error)

-		// SyncScanPanFilePrepareCallback 同步备份-扫描本地文件的回调函数
+		// SyncScanPanFilePrepareCallback 同步备份-扫描云盘文件的回调函数
 		SyncScanPanFilePrepareCallback(context *Context, params *SyncScanPanFilePrepareParams) (*SyncScanPanFilePrepareResult, error)

-		// SyncFileFinishCallback 同步备份-同步文件完成的回调函数
+		// SyncFileFinishCallback 同步备份-同步一个文件完成时的回调函数
 		SyncFileFinishCallback(context *Context, params *SyncFileFinishParams) error

+		// SyncAllFileFinishCallback 同步备份-同步全部文件完成时的回调函数
+		SyncAllFileFinishCallback(context *Context, params *SyncAllFileFinishParams) error
+
 		// UserTokenRefreshFinishCallback 用户Token刷新完成后回调函数
 		UserTokenRefreshFinishCallback(context *Context, params *UserTokenRefreshFinishParams) error

+		// RemoveFilePrepareCallback 删除文件前的回调函数
+		RemoveFilePrepareCallback(context *Context, params *RemoveFilePrepareParams) (*RemoveFilePrepareResult, error)
+
 		// Stop 停止
 		Stop() error
 	}
 )
-
-var ()
@@ -3,6 +3,7 @@ package plugins
 import (
 	"fmt"
 	"github.com/tickstep/aliyunpan/internal/config"
+	"github.com/tickstep/aliyunpan/internal/global"
 	"github.com/tickstep/library-go/logger"
 	"io/ioutil"
 	"os"
@@ -21,7 +22,7 @@ func GetContext(user *config.PanUser) *Context {
 	if user == nil {
 		return &Context{
 			AppName:      "aliyunpan",
-			Version:      config.AppVersion,
+			Version:      global.AppVersion,
 			UserId:       "",
 			Nickname:     "",
 			FileDriveId:  "",
@@ -29,12 +30,13 @@ func GetContext(user *config.PanUser) *Context {
 		}
 	}
 	return &Context{
-		AppName:      "aliyunpan",
-		Version:      config.AppVersion,
-		UserId:       user.UserId,
-		Nickname:     user.Nickname,
-		FileDriveId:  user.DriveList.GetFileDriveId(),
-		AlbumDriveId: user.DriveList.GetFileDriveId(),
+		AppName:         "aliyunpan",
+		Version:         global.AppVersion,
+		UserId:          user.UserId,
+		Nickname:        user.Nickname,
+		FileDriveId:     user.DriveList.GetFileDriveId(),     // 备份盘
+		AlbumDriveId:    user.DriveList.GetAlbumDriveId(),    // 相册盘，在OpenAPI接口中，这个相册盘ID是获取不到的
+		ResourceDriveId: user.DriveList.GetResourceDriveId(), // 资源盘
 	}
 }

@@ -1,9 +1,13 @@
 package plugins

 import (
+	"crypto/md5"
 	"crypto/tls"
+	"fmt"
 	"github.com/jordan-wright/email"
 	jsoniter "github.com/json-iterator/go"
+	"github.com/tickstep/aliyunpan-api/aliyunpan"
+	"github.com/tickstep/aliyunpan/internal/config"
 	"github.com/tickstep/bolt"
 	"github.com/tickstep/library-go/logger"
 	"github.com/tickstep/library-go/requester"
@@ -62,6 +66,30 @@ func DeleteLocalFile(localFilePath string) bool {
 	return false
 }

+// DeletePanFile 删除云盘文件，支持文件和文件夹
+func DeletePanFile(userId, driveId, panFileId string) bool {
+	logger.Verboseln("[Plugin] try to delete pan file: userId=" + userId + ", driveId=" + driveId + ", panFileId=" + panFileId)
+	if userId == "" || driveId == "" || panFileId == "" {
+		return false
+	}
+	user := config.Config.UserList.GetUserByUserId(userId)
+	if user == nil {
+		logger.Verboseln("[Plugin] user not existed: ", userId)
+		return false
+	}
+	fdr, err := user.PanClient().OpenapiPanClient().FileDelete(&aliyunpan.FileBatchActionParam{
+		DriveId: driveId,
+		FileId:  panFileId,
+	})
+	if err != nil || !fdr.Success {
+		logger.Verboseln("[Plugin] delete pan file error: ", err)
+		return false
+	} else {
+		logger.Verboseln("[Plugin] delete pan file success: ", panFileId)
+		return true
+	}
+}
+
 // SendTextMail 发送文本邮件
 func SendTextMail(mailServer, userName, password, to, subject, body string) bool {
 	if e := sendEmail(mailServer, userName, password, to, subject, body, "text", true); e != nil {
@@ -166,3 +194,9 @@ func PutString(key, value string) bool {
 	}
 	return true
 }
+
+// Md5Hex md5加密
+func Md5Hex(text string) string {
+	hash := md5.Sum([]byte(text))
+	return fmt.Sprintf("%x", hash[:])
+}
@@ -2,6 +2,7 @@ package syncdrive

 import (
 	"context"
+	"errors"
 	"fmt"
 	"github.com/tickstep/aliyunpan-api/aliyunpan"
 	"github.com/tickstep/aliyunpan-api/aliyunpan/apierror"
@@ -18,6 +19,7 @@ import (
 	"github.com/tickstep/library-go/requester"
 	"github.com/tickstep/library-go/requester/rio"
 	"github.com/tickstep/library-go/requester/rio/speeds"
+	"math/rand"
 	"os"
 	"path"
 	"path/filepath"
@@ -33,7 +35,7 @@ type (
 		panFileDb   PanSyncDb
 		syncFileDb  SyncFileDb

-		panClient *aliyunpan.PanClient
+		panClient *config.PanClient

 		syncItem        *SyncFileItem
 		maxDownloadRate int64 // 限制最大下载速度
@@ -47,12 +49,6 @@ type (
 	}
 )

-func (f *FileActionTask) prompt(msg string) {
-	if LogPrompt {
-		fmt.Println("[" + utils.NowTimeStr() + "] " + msg)
-	}
-}
-
 func (f *FileActionTask) HashCode() string {
 	postfix := ""
 	if f.syncItem.Action == SyncFileActionDownload {
@@ -66,7 +62,7 @@ func (f *FileActionTask) HashCode() string {
 func (f *FileActionTask) DoAction(ctx context.Context) error {
 	logger.Verboseln("file action task：", utils.ObjectToJsonStr(f.syncItem, false))
 	if f.syncItem.Action == SyncFileActionUpload {
-		f.prompt("上传文件：" + f.syncItem.getLocalFileFullPath())
+		PromptPrintln("上传文件：" + f.syncItem.getLocalFileFullPath())
 		if e := f.uploadFile(ctx); e != nil {
 			// TODO: retry / cleanup downloading file
 			return e
@@ -75,27 +71,25 @@ func (f *FileActionTask) DoAction(ctx context.Context) error {
 			// save local file info into db
 			var actFile *aliyunpan.FileEntity
 			if f.syncItem.UploadEntity != nil && f.syncItem.UploadEntity.FileId != "" {
-				if file, er := f.panClient.FileInfoById(f.syncItem.DriveId, f.syncItem.UploadEntity.FileId); er == nil {
+				if file, er := f.panClient.OpenapiPanClient().FileInfoById(f.syncItem.DriveId, f.syncItem.UploadEntity.FileId); er == nil {
 					file.Path = f.syncItem.getPanFileFullPath()
-					fItem := NewPanFileItem(file)
-					fItem.ScanTimeAt = utils.NowTimeStr()
-					f.panFileDb.Add(fItem)
-
 					actFile = file
 				}
 			} else {
-				if file, er := f.panClient.FileInfoByPath(f.syncItem.DriveId, f.syncItem.getPanFileFullPath()); er == nil {
+				if file, er := f.panClient.OpenapiPanClient().FileInfoByPath(f.syncItem.DriveId, f.syncItem.getPanFileFullPath()); er == nil {
 					file.Path = f.syncItem.getPanFileFullPath()
-					fItem := NewPanFileItem(file)
-					fItem.ScanTimeAt = utils.NowTimeStr()
-					f.panFileDb.Add(fItem)
-
 					actFile = file
 				}
 			}

-			// recorder
 			if actFile != nil {
+				// save file sha1 to local DB
+				if file, e := f.localFileDb.Get(f.syncItem.getLocalFileFullPath()); e == nil {
+					file.Sha1Hash = actFile.ContentHash
+					f.localFileDb.Update(file)
+				}
+
+				// recorder file
 				f.appendRecord(&log.FileRecordItem{
 					Status:   "成功-上传",
 					TimeStr:  utils.NowTimeStr(),
@@ -107,7 +101,7 @@ func (f *FileActionTask) DoAction(ctx context.Context) error {
 	}

 	if f.syncItem.Action == SyncFileActionDownload {
-		f.prompt("下载文件：" + f.syncItem.getPanFileFullPath())
+		PromptPrintln("下载文件：" + f.syncItem.getPanFileFullPath())
 		if e := f.downloadFile(ctx); e != nil {
 			// TODO: retry / cleanup downloading file
 			return e
@@ -167,90 +161,11 @@ func (f *FileActionTask) DoAction(ctx context.Context) error {
 			})
 		}
 	}
-
-	if f.syncItem.Action == SyncFileActionDeleteLocal {
-		f.prompt("删除本地文件：" + f.syncItem.getLocalFileFullPath())
-		if e := f.deleteLocalFile(ctx); e != nil {
-			// TODO: retry
-			return e
-		} else {
-			// clear DB
-			f.localFileDb.Delete(f.syncItem.getLocalFileFullPath())
-			f.panFileDb.Delete(f.syncItem.getPanFileFullPath())
-
-			// recorder
-			f.appendRecord(&log.FileRecordItem{
-				Status:   "成功-删除本地文件",
-				TimeStr:  utils.NowTimeStr(),
-				FileSize: 0,
-				FilePath: f.syncItem.getLocalFileFullPath(),
-			})
-		}
-	}
-
-	if f.syncItem.Action == SyncFileActionDeletePan {
-		f.prompt("删除云盘文件：" + f.syncItem.getPanFileFullPath())
-		if e := f.deletePanFile(ctx); e != nil {
-			// TODO: retry
-			return e
-		} else {
-			// clear DB
-			f.localFileDb.Delete(f.syncItem.getLocalFileFullPath())
-			f.panFileDb.Delete(f.syncItem.getPanFileFullPath())
-
-			// recorder
-			f.appendRecord(&log.FileRecordItem{
-				Status:   "成功-删除云盘文件",
-				TimeStr:  utils.NowTimeStr(),
-				FileSize: 0,
-				FilePath: f.syncItem.getPanFileFullPath(),
-			})
-		}
-	}
-
-	if f.syncItem.Action == SyncFileActionCreateLocalFolder {
-		f.prompt("创建本地文件夹：" + f.syncItem.getLocalFileFullPath())
-		if e := f.createLocalFolder(ctx); e != nil {
-			// TODO: retry
-			return e
-		} else {
-			if file, er := os.Stat(f.syncItem.getLocalFileFullPath()); er == nil {
-				f.localFileDb.Add(&LocalFileItem{
-					FileName:      file.Name(),
-					FileSize:      file.Size(),
-					FileType:      "folder",
-					CreatedAt:     file.ModTime().Format("2006-01-02 15:04:05"),
-					UpdatedAt:     file.ModTime().Format("2006-01-02 15:04:05"),
-					FileExtension: "",
-					Sha1Hash:      f.syncItem.PanFile.Sha1Hash,
-					Path:          f.syncItem.getLocalFileFullPath(),
-					ScanTimeAt:    utils.NowTimeStr(),
-					ScanStatus:    ScanStatusNormal,
-				})
-			}
-		}
-	}
-
-	if f.syncItem.Action == SyncFileActionCreatePanFolder {
-		f.prompt("创建云盘文件夹：" + f.syncItem.getPanFileFullPath())
-		if e := f.createPanFolder(ctx); e != nil {
-			// TODO: retry
-			return e
-		} else {
-			if file, er := f.panClient.FileInfoByPath(f.syncItem.DriveId, f.syncItem.getPanFileFullPath()); er == nil {
-				file.Path = f.syncItem.getPanFileFullPath()
-				fItem := NewPanFileItem(file)
-				fItem.ScanTimeAt = utils.NowTimeStr()
-				f.panFileDb.Add(fItem)
-			}
-		}
-	}
-
 	return nil
 }

 func (f *FileActionTask) downloadFile(ctx context.Context) error {
-	durl, apierr := f.panClient.GetFileDownloadUrl(&aliyunpan.GetFileDownloadUrlParam{
+	durl, apierr := f.panClient.OpenapiPanClient().GetFileDownloadUrl(&aliyunpan.GetFileDownloadUrlParam{
 		DriveId: f.syncItem.PanFile.DriveId,
 		FileId:  f.syncItem.PanFile.FileId,
 	})
@@ -293,40 +208,56 @@ func (f *FileActionTask) downloadFile(ctx context.Context) error {
 	defer file.Close()
 	if f.syncItem.PanFile.FileSize == 0 {
 		// zero file
-		f.syncItem.Status = SyncFileStatusDownloading
+		f.syncItem.Status = SyncFileStatusSuccess
 		f.syncItem.StatusUpdateTime = utils.NowTimeStr()
 		f.syncFileDb.Update(f.syncItem)
 		return nil
 	}
+	if f.syncItem.DownloadRange == nil {
+		f.syncItem.DownloadRange = &transfer.Range{
+			Begin: 0,
+			End:   f.syncItem.DownloadBlockSize,
+		}
+	}

 	downloadUrl := durl.Url
-	if f.syncItem.UseInternalUrl {
-		downloadUrl = durl.InternalUrl
-	}
 	worker := downloader.NewWorker(0, f.syncItem.PanFile.DriveId, f.syncItem.PanFile.FileId, downloadUrl, writer, nil)

+	status := &transfer.DownloadStatus{}
+	status.AddDownloaded(f.syncItem.DownloadRange.Begin)
+	status.SetTotalSize(f.syncItem.PanFile.FileSize)
 	// 限速
 	if f.maxDownloadRate > 0 {
 		rl := speeds.NewRateLimit(f.maxDownloadRate)
 		defer rl.Stop()
-		status := &transfer.DownloadStatus{}
 		status.SetRateLimit(rl)
-		worker.SetDownloadStatus(status)
-
-		//go func() {
-		//	for {
-		//		time.Sleep(1000 * time.Millisecond)
-		//		builder := &strings.Builder{}
-		//		status.UpdateSpeeds()
-		//		fmt.Fprintf(builder, "\r↓ %s/%s %s/s ............",
-		//			converter.ConvertFileSize(status.Downloaded(), 2),
-		//			converter.ConvertFileSize(status.TotalSize(), 2),
-		//			converter.ConvertFileSize(status.SpeedsPerSecond(), 2),
-		//		)
-		//		fmt.Print(builder.String())
-		//	}
-		//}()
 	}
+	worker.SetDownloadStatus(status)
+	completed := make(chan struct{}, 0)
+	rand.Seed(time.Now().UnixNano())
+	go func() {
+		ticker := time.NewTicker(1 * time.Second)
+		defer ticker.Stop()
+		for {
+			select {
+			case <-completed:
+				return
+			case <-ticker.C:
+				time.Sleep(time.Duration(rand.Intn(10)*33) * time.Millisecond) // 延迟随机时间
+				builder := &strings.Builder{}
+				status.UpdateSpeeds()
+				downloadedPercentage := fmt.Sprintf("%.2f%%", float64(status.Downloaded())/float64(status.TotalSize())*100)
+				fmt.Fprintf(builder, "\r下载到本地:%s ↓ %s/%s(%s) %s/s............",
+					f.syncItem.getLocalFileFullPath(),
+					converter.ConvertFileSize(status.Downloaded(), 2),
+					converter.ConvertFileSize(status.TotalSize(), 2),
+					downloadedPercentage,
+					converter.ConvertFileSize(status.SpeedsPerSecond(), 2),
+				)
+				PromptPrint(builder.String())
+			}
+		}
+	}()

 	client := requester.NewHTTPClient()
 	client.SetKeepAlive(true)
@@ -338,12 +269,6 @@ func (f *FileActionTask) downloadFile(ctx context.Context) error {
 	worker.SetWriteMutex(writeMu)
 	worker.SetTotalSize(f.syncItem.PanFile.FileSize)
 	worker.SetAcceptRange("bytes")
-	if f.syncItem.DownloadRange == nil {
-		f.syncItem.DownloadRange = &transfer.Range{
-			Begin: 0,
-			End:   f.syncItem.DownloadBlockSize,
-		}
-	}
 	worker.SetRange(f.syncItem.DownloadRange) // 分片

 	// update status
@@ -355,8 +280,9 @@ func (f *FileActionTask) downloadFile(ctx context.Context) error {
 		select {
 		case <-ctx.Done():
 			// cancel routine & done
-			logger.Verboseln("file download routine done")
-			return nil
+			logger.Verboseln("file download routine cancel")
+			close(completed)
+			return errors.New("file download routine cancel")
 		default:
 			logger.Verboseln("do file download process")
 			if f.syncItem.DownloadRange.End > f.syncItem.PanFile.FileSize {
@@ -366,6 +292,10 @@ func (f *FileActionTask) downloadFile(ctx context.Context) error {

 			// 检查上次执行是否有下载已完成
 			if f.syncItem.DownloadRange.Begin == f.syncItem.PanFile.FileSize {
+				f.syncItem.Status = SyncFileStatusSuccess
+				f.syncItem.StatusUpdateTime = utils.NowTimeStr()
+				f.syncFileDb.Update(f.syncItem)
+				close(completed)
 				return nil
 			}

@@ -376,9 +306,11 @@ func (f *FileActionTask) downloadFile(ctx context.Context) error {
 			if worker.GetStatus().StatusCode() == downloader.StatusCodeSuccessed {
 				if f.syncItem.DownloadRange.End == f.syncItem.PanFile.FileSize {
 					// finished
-					f.syncItem.Status = SyncFileStatusDownloading
+					f.syncItem.Status = SyncFileStatusSuccess
 					f.syncItem.StatusUpdateTime = utils.NowTimeStr()
 					f.syncFileDb.Update(f.syncItem)
+					close(completed)
+					PromptPrintln("下载完毕：" + f.syncItem.getLocalFileFullPath())
 					return nil
 				}

@@ -388,8 +320,37 @@ func (f *FileActionTask) downloadFile(ctx context.Context) error {

 				// 存储状态
 				f.syncFileDb.Update(f.syncItem)
+			} else if worker.GetStatus().StatusCode() == downloader.StatusCodeDownloadUrlExpired {
+				logger.Verboseln("download url expired: ", f.syncItem.PanFile.Path)
+				// 下载链接过期，获取新的链接
+				newUrl, apierr1 := f.panClient.OpenapiPanClient().GetFileDownloadUrl(&aliyunpan.GetFileDownloadUrlParam{
+					DriveId: f.syncItem.PanFile.DriveId,
+					FileId:  f.syncItem.PanFile.FileId,
+				})
+				time.Sleep(time.Duration(3) * time.Second)
+				if apierr1 != nil {
+					if apierr1.Code == apierror.ApiCodeFileNotFoundCode || apierr1.Code == apierror.ApiCodeForbiddenFileInTheRecycleBin {
+						f.syncItem.Status = SyncFileStatusNotExisted
+						f.syncItem.StatusUpdateTime = utils.NowTimeStr()
+						f.syncFileDb.Update(f.syncItem)
+						return fmt.Errorf("文件不存在")
+					}
+					logger.Verbosef("ERROR: get download url error: %s, %s\n", f.syncItem.PanFile.Path, apierr.Error())
+					return apierr
+				}
+				if newUrl == nil || newUrl.Url == "" {
+					logger.Verbosef("无法获取有效的下载链接: %+v\n", durl)
+					f.syncItem.Status = SyncFileStatusFailed
+					f.syncItem.StatusUpdateTime = utils.NowTimeStr()
+					f.syncFileDb.Update(f.syncItem)
+					return fmt.Errorf("无法获取有效的下载链接")
+				}
+				logger.Verboseln("query new download url: ", newUrl.Url)
+				worker.SetUrl(newUrl.Url)
+			} else if worker.GetStatus().StatusCode() == downloader.StatusCodeDownloadUrlExceedMaxConcurrency {
+				logger.Verboseln("download url exceed max concurrency: ", f.syncItem.PanFile.Path)
+				// 下载遇到限流了，下一次重试
 			}
-			// TODO: 下载链接过期处理
 		}
 	}
 }
@@ -420,81 +381,110 @@ func (f *FileActionTask) uploadFile(ctx context.Context) error {
 	targetPanFilePath := f.syncItem.getPanFileFullPath()

 	if f.syncItem.UploadEntity == nil {
+		// 尝试创建文件夹
+		panDirPath := filepath.Dir(targetPanFilePath)
+		panDirFileId := ""
+		logger.Verbosef("检测云盘文件夹: %s\n", panDirPath)
+		if dirFile, er2 := f.panClient.OpenapiPanClient().FileInfoByPath(f.syncItem.DriveId, panDirPath); er2 != nil {
+			if er2.Code == apierror.ApiCodeFileNotFoundCode {
+				logger.Verbosef("创建云盘文件夹: %s\n", panDirPath)
+				f.panFolderCreateMutex.Lock()
+				rs, apierr1 := f.panClient.OpenapiPanClient().MkdirByFullPath(f.syncItem.DriveId, panDirPath)
+				f.panFolderCreateMutex.Unlock()
+				if apierr1 != nil || rs.FileId == "" {
+					return apierr1
+				}
+				panDirFileId = rs.FileId
+				logger.Verbosef("创建云盘文件夹成功: %s\n", panDirPath)
+			} else {
+				logger.Verbosef("查询云盘文件夹错误: %s\n", er2.String())
+				return er2
+			}
+		} else {
+			if dirFile != nil && dirFile.FileId != "" {
+				panDirFileId = dirFile.FileId
+			}
+		}
+
 		// 计算文件SHA1
 		sha1Str := ""
-
+		proofCode := ""
+		contentHashName := "sha1"
 		if f.syncItem.LocalFile.Sha1Hash != "" {
 			sha1Str = f.syncItem.LocalFile.Sha1Hash
 		} else {
-			logger.Verbosef("正在计算文件SHA1: %s\n", localFile.Path)
-			if localFile.Length == 0 {
-				sha1Str = aliyunpan.DefaultZeroSizeFileContentHash
-			} else {
-				localFile.Sum(localfile.CHECKSUM_SHA1)
-				sha1Str = localFile.SHA1
+			// 正常上传流程，检测是否能秒传
+			preHashMatch := true
+			if f.syncItem.LocalFile.FileSize >= panupload.DefaultCheckPreHashFileSize {
+				// 大文件，先计算 PreHash，用于检测是否可能支持秒传
+				preHash := panupload.CalcFilePreHash(f.syncItem.LocalFile.Path)
+				if len(preHash) > 0 {
+					if b, er := f.panClient.OpenapiPanClient().CheckUploadFilePreHash(&aliyunpan.FileUploadCheckPreHashParam{
+						DriveId:      f.syncItem.DriveId,
+						Name:         f.syncItem.LocalFile.FileName,
+						Size:         f.syncItem.LocalFile.FileSize,
+						ParentFileId: panDirFileId,
+						PreHash:      preHash,
+					}); er == nil {
+						preHashMatch = b
+					}
+				}
+			}
+			if preHashMatch {
+				// 再计算完整文件SHA1
+				logger.Verbosef("正在计算文件SHA1: %s\n", localFile.Path)
+				if localFile.Length == 0 {
+					sha1Str = aliyunpan.DefaultZeroSizeFileContentHash
+				} else {
+					localFile.Sum(localfile.CHECKSUM_SHA1)
+					sha1Str = localFile.SHA1
+				}
+				f.syncItem.LocalFile.Sha1Hash = sha1Str
+				f.syncFileDb.Update(f.syncItem)
+
+				// 计算proof code
+				localFileEntity, _ := os.Open(localFile.Path.RealPath)
+				localFileInfo, _ := localFileEntity.Stat()
+				proofCode = aliyunpan.CalcProofCode(f.panClient.OpenapiPanClient().GetAccessToken(), rio.NewFileReaderAtLen64(localFileEntity), localFileInfo.Size())
+			} else {
+				// 无需计算 sha1，直接上传
+				logger.Verboseln("PreHash not match, upload file directly")
+				sha1Str = ""
+				contentHashName = ""
 			}
-			f.syncItem.LocalFile.Sha1Hash = sha1Str
-			f.syncFileDb.Update(f.syncItem)
 		}

 		// 检查同名文件是否存在
 		panFileId := ""
-		if panFileInDb, e := f.panFileDb.Get(targetPanFilePath); e == nil {
-			if panFileInDb != nil {
-				panFileId = panFileInDb.FileId
-			}
-		} else {
-			efi, apierr := f.panClient.FileInfoByPath(f.syncItem.DriveId, targetPanFilePath)
-			if apierr != nil && apierr.Code != apierror.ApiCodeFileNotFoundCode {
-				logger.Verbosef("上传文件错误: %s\n", apierr.String())
-				return apierr
-			}
-			if efi != nil && efi.FileId != "" {
-				panFileId = efi.FileId
-			}
-			time.Sleep(5 * time.Second)
+		panFileSha1Str := ""
+		efi, apierr := f.panClient.OpenapiPanClient().FileInfoByPath(f.syncItem.DriveId, targetPanFilePath)
+		if apierr != nil && apierr.Code != apierror.ApiCodeFileNotFoundCode {
+			logger.Verbosef("上传文件错误: %s\n", apierr.String())
+			return apierr
 		}
-		if strings.ToUpper(panFileId) == strings.ToUpper(sha1Str) {
-			logger.Verbosef("检测到同名文件，文件内容完全一致，无需重复上传: %s\n", targetPanFilePath)
-			f.syncItem.Status = SyncFileStatusSuccess
-			f.syncItem.StatusUpdateTime = utils.NowTimeStr()
-			f.syncFileDb.Update(f.syncItem)
-			return nil
+		if efi != nil && efi.FileId != "" {
+			panFileId = efi.FileId
 		}
-
-		// 创建文件夹
-		panDirPath := filepath.Dir(targetPanFilePath)
-		panDirFileId := ""
-		if panDirItem, er := f.panFileDb.Get(panDirPath); er == nil {
-			if panDirItem != nil && panDirItem.IsFolder() {
-				panDirFileId = panDirItem.FileId
-			}
-		} else {
-			logger.Verbosef("创建云盘文件夹: %s\n", panDirPath)
-			f.panFolderCreateMutex.Lock()
-			rs, apierr1 := f.panClient.Mkdir(f.syncItem.DriveId, "root", panDirPath)
-			f.panFolderCreateMutex.Unlock()
-			if apierr1 != nil || rs.FileId == "" {
-				return apierr1
-			}
-			panDirFileId = rs.FileId
-			logger.Verbosef("创建云盘文件夹成功: %s\n", panDirPath)
-
-			// save into DB
-			if panDirFile, e := f.panClient.FileInfoById(f.syncItem.DriveId, panDirFileId); e == nil {
-				panDirFile.Path = panDirPath
-				fItem := NewPanFileItem(panDirFile)
-				fItem.ScanTimeAt = utils.NowTimeStr()
-				f.panFileDb.Add(fItem)
+		if panFileId != "" {
+			if strings.ToUpper(panFileSha1Str) == strings.ToUpper(sha1Str) {
+				logger.Verbosef("检测到同名文件，文件内容完全一致，无需重复上传: %s\n", targetPanFilePath)
+				f.syncItem.Status = SyncFileStatusSuccess
+				f.syncItem.StatusUpdateTime = utils.NowTimeStr()
+				f.syncFileDb.Update(f.syncItem)
+				return nil
+			} else {
+				// 删除云盘文件
+				dp := &aliyunpan.FileBatchActionParam{
+					DriveId: f.syncItem.DriveId,
+					FileId:  panFileId,
+				}
+				if _, e := f.panClient.OpenapiPanClient().FileDeleteCompletely(dp); e != nil {
+					logger.Verbosef(" 删除云盘旧文件失败: %s\n", targetPanFilePath)
+					return e
+				}
 			}
 		}

-		// 计算proof code
-		proofCode := ""
-		localFileEntity, _ := os.Open(localFile.Path.RealPath)
-		localFileInfo, _ := localFileEntity.Stat()
-		proofCode = aliyunpan.CalcProofCode(f.panClient.GetAccessToken(), rio.NewFileReaderAtLen64(localFileEntity), localFileInfo.Size())
-
 		// 自动调整BlockSize大小
 		newBlockSize := utils.ResizeUploadBlockSize(localFile.Length, f.syncItem.UploadBlockSize)
 		if newBlockSize != f.syncItem.UploadBlockSize {
@@ -510,15 +500,17 @@ func (f *FileActionTask) uploadFile(ctx context.Context) error {
 			Name:            filepath.Base(targetPanFilePath),
 			Size:            localFile.Length,
 			ContentHash:     sha1Str,
-			ContentHashName: "sha1",
-			CheckNameMode:   "overwrite", // 覆盖云盘文件
+			ContentHashName: contentHashName,
+			CheckNameMode:   "refuse",
 			ParentFileId:    panDirFileId,
 			BlockSize:       f.syncItem.UploadBlockSize,
 			ProofCode:       proofCode,
 			ProofVersion:    "v1",
+			LocalCreatedAt:  utils.UnixTime2LocalFormatStr(localFile.ModTime),
+			LocalModifiedAt: utils.UnixTime2LocalFormatStr(localFile.ModTime),
 		}
-		if uploadOpEntity, err := f.panClient.CreateUploadFile(appCreateUploadFileParam); err != nil {
-			logger.Verbosef("创建云盘上传任务失败: %s\n", panDirPath)
+		if uploadOpEntity, err := f.panClient.OpenapiPanClient().CreateUploadFile(appCreateUploadFileParam); err != nil {
+			logger.Verbosef("创建云盘上传任务失败: %s\n", targetPanFilePath)
 			return err
 		} else {
 			f.syncItem.UploadEntity = uploadOpEntity
@@ -532,15 +524,22 @@ func (f *FileActionTask) uploadFile(ctx context.Context) error {
 			f.syncItem.Status = SyncFileStatusSuccess
 			f.syncItem.StatusUpdateTime = utils.NowTimeStr()
 			f.syncFileDb.Update(f.syncItem)
+			PromptPrintln("上传完毕：" + f.syncItem.getPanFileFullPath())
 			return nil
 		}
 	} else {
+		if len(f.syncItem.UploadEntity.PartInfoList) == 0 {
+			// finished
+			f.syncItem.Status = SyncFileStatusSuccess
+			f.syncItem.StatusUpdateTime = utils.NowTimeStr()
+			f.syncFileDb.Update(f.syncItem)
+
+			PromptPrintln("上传完毕：" + f.syncItem.getPanFileFullPath())
+			return nil
+		}
 		// 检测链接是否过期
 		// check url expired or not
 		uploadUrl := f.syncItem.UploadEntity.PartInfoList[f.syncItem.UploadPartSeq].UploadURL
-		if f.syncItem.UseInternalUrl {
-			uploadUrl = f.syncItem.UploadEntity.PartInfoList[f.syncItem.UploadPartSeq].InternalUploadURL
-		}
 		if panupload.IsUrlExpired(uploadUrl) {
 			// get renew upload url
 			logger.Verbosef("链接过期，获取新的上传链接: %s\n", targetPanFilePath)
@@ -556,7 +555,7 @@ func (f *FileActionTask) uploadFile(ctx context.Context) error {
 				PartInfoList: infoList,
 				UploadId:     f.syncItem.UploadEntity.UploadId,
 			}
-			newUploadInfo, err1 := f.panClient.GetUploadUrl(refreshUploadParam)
+			newUploadInfo, err1 := f.panClient.OpenapiPanClient().GetUploadUrl(refreshUploadParam)
 			if err1 != nil {
 				return err1
 			}
@@ -568,19 +567,9 @@ func (f *FileActionTask) uploadFile(ctx context.Context) error {
 	// 创建分片上传器
 	// 阿里云盘默认就是分片上传，每一个分片对应一个part_info
 	// 但是不支持分片同时上传，必须单线程，并且按照顺序从1开始一个一个上传
-	worker := panupload.NewPanUpload(f.panClient, f.syncItem.getPanFileFullPath(), f.syncItem.DriveId, f.syncItem.UploadEntity, f.syncItem.UseInternalUrl)
-
-	// 限速配置
-	var rateLimit *speeds.RateLimit
-	if f.maxUploadRate > 0 {
-		rateLimit = speeds.NewRateLimit(f.maxUploadRate)
-	}
-
-	// 上传客户端
-	uploadClient := requester.NewHTTPClient()
-	uploadClient.SetTimeout(0)
-	uploadClient.SetKeepAlive(true)
+	worker := panupload.NewPanUpload(f.panClient, f.syncItem.getPanFileFullPath(), f.syncItem.DriveId, f.syncItem.UploadEntity)

+	// 初始化上传Range
 	if f.syncItem.UploadRange == nil {
 		f.syncItem.UploadRange = &transfer.Range{
 			Begin: 0,
@@ -588,19 +577,66 @@ func (f *FileActionTask) uploadFile(ctx context.Context) error {
 		}
 	}

+	// 限速配置
+	var rateLimit *speeds.RateLimit
+	if f.maxUploadRate > 0 {
+		rateLimit = speeds.NewRateLimit(f.maxUploadRate)
+	}
+	// 速度指示器
+	speedsStat := &speeds.Speeds{}
+	// 进度指示器
+	status := &uploader.UploadStatus{}
+	status.SetTotalSize(f.syncItem.LocalFile.FileSize)
+	completed := make(chan struct{}, 0)
+	rand.Seed(time.Now().UnixNano())
+	go func() {
+		ticker := time.NewTicker(1 * time.Second)
+		defer ticker.Stop()
+		for {
+			select {
+			case <-completed:
+				return
+			case <-ticker.C:
+				status.SetUploaded(f.syncItem.UploadRange.Begin)
+				time.Sleep(time.Duration(rand.Intn(10)*33) * time.Millisecond) // 延迟随机时间
+				builder := &strings.Builder{}
+				uploadedPercentage := fmt.Sprintf("%.2f%%", float64(status.Uploaded())/float64(status.TotalSize())*100)
+				fmt.Fprintf(builder, "\r上传到网盘:%s ↑ %s/%s(%s) %s/s............",
+					f.syncItem.getPanFileFullPath(),
+					converter.ConvertFileSize(status.Uploaded(), 2),
+					converter.ConvertFileSize(status.TotalSize(), 2),
+					uploadedPercentage,
+					converter.ConvertFileSize(speedsStat.GetSpeeds(), 2),
+				)
+				PromptPrint(builder.String())
+			}
+		}
+	}()
+
+	// 上传客户端
+	uploadClient := requester.NewHTTPClient()
+	uploadClient.SetTimeout(0)
+	uploadClient.SetKeepAlive(true)
+
+	// 标记上传状态
+	f.syncItem.Status = SyncFileStatusUploading
+	f.syncItem.StatusUpdateTime = utils.NowTimeStr()
+	f.syncFileDb.Update(f.syncItem)
+
 	worker.Precreate()
 	for {
 		select {
 		case <-ctx.Done():
 			// cancel routine & done
-			logger.Verboseln("file upload routine done")
-			return nil
+			logger.Verboseln("file upload routine cancel")
+			close(completed)
+			return errors.New("file upload routine cancel")
 		default:
 			logger.Verboseln("do file upload process")
 			if f.syncItem.UploadRange.End > f.syncItem.LocalFile.FileSize {
 				f.syncItem.UploadRange.End = f.syncItem.LocalFile.FileSize
 			}
-			fileReader := uploader.NewBufioSplitUnit(rio.NewFileReaderAtLen64(localFile.GetFile()), *f.syncItem.UploadRange, nil, rateLimit, nil)
+			fileReader := uploader.NewBufioSplitUnit(rio.NewFileReaderAtLen64(localFile.GetFile()), *f.syncItem.UploadRange, speedsStat, rateLimit, nil)

 			if uploadDone, terr := worker.UploadFile(ctx, f.syncItem.UploadPartSeq, f.syncItem.UploadRange.Begin, f.syncItem.UploadRange.End, fileReader, uploadClient); terr == nil {
 				if uploadDone {
@@ -613,6 +649,8 @@ func (f *FileActionTask) uploadFile(ctx context.Context) error {
 						f.syncItem.Status = SyncFileStatusSuccess
 						f.syncItem.StatusUpdateTime = utils.NowTimeStr()
 						f.syncFileDb.Update(f.syncItem)
+						close(completed)
+						PromptPrintln("上传完毕：" + f.syncItem.getPanFileFullPath())
 						return nil
 					}

@@ -635,132 +673,6 @@ func (f *FileActionTask) uploadFile(ctx context.Context) error {
 	}
 }

-// deleteLocalFile 删除本地文件
-func (f *FileActionTask) deleteLocalFile(ctx context.Context) error {
-	isFolder := f.syncItem.PanFile.IsFolder()
-	localFilePath := f.syncItem.getLocalFileFullPath()
-	if b, e := utils.PathExists(localFilePath); e == nil {
-		if !b {
-			// 本地文件已经不存在
-			f.syncItem.Status = SyncFileStatusSuccess
-			f.syncItem.StatusUpdateTime = utils.NowTimeStr()
-			f.syncFileDb.Update(f.syncItem)
-			return nil
-		}
-	}
-
-	// 删除
-	var e error
-	if isFolder {
-		e = os.RemoveAll(localFilePath)
-	} else {
-		e = os.Remove(localFilePath)
-	}
-	if e == nil {
-		f.syncItem.Status = SyncFileStatusSuccess
-	} else {
-		f.syncItem.Status = SyncFileStatusFailed
-	}
-	f.syncItem.StatusUpdateTime = utils.NowTimeStr()
-	f.syncFileDb.Update(f.syncItem)
-	return e
-}
-
-// deletePanFile 删除云盘文件
-func (f *FileActionTask) deletePanFile(ctx context.Context) error {
-	panFilePath := f.syncItem.getPanFileFullPath()
-
-	driveId := f.syncItem.DriveId
-	panFileId := ""
-	if f.syncItem.PanFile != nil {
-		panFileId = f.syncItem.PanFile.FileId
-	} else {
-		fi, er := f.panClient.FileInfoByPath(f.syncItem.DriveId, panFilePath)
-		time.Sleep(1 * time.Second)
-		if er != nil {
-			if er.Code == apierror.ApiCodeFileNotFoundCode {
-				// 云盘文件已经不存在
-				f.syncItem.Status = SyncFileStatusSuccess
-				f.syncItem.StatusUpdateTime = utils.NowTimeStr()
-				f.syncFileDb.Update(f.syncItem)
-				return nil
-			} else {
-				// error
-				return er
-			}
-		}
-		panFileId = fi.FileId
-	}
-
-	// 删除
-	var fileDeleteResult []*aliyunpan.FileBatchActionResult
-	var err *apierror.ApiError = nil
-	fileDeleteResult, err = f.panClient.FileDelete([]*aliyunpan.FileBatchActionParam{{DriveId: driveId, FileId: panFileId}})
-	time.Sleep(1 * time.Second)
-	if err != nil || len(fileDeleteResult) == 0 {
-		f.syncItem.Status = SyncFileStatusFailed
-	} else {
-		f.syncItem.Status = SyncFileStatusSuccess
-	}
-	f.syncItem.StatusUpdateTime = utils.NowTimeStr()
-	f.syncFileDb.Update(f.syncItem)
-	if err == nil {
-		return nil
-	}
-	return err
-}
-
-func (f *FileActionTask) createLocalFolder(ctx context.Context) error {
-	localFilePath := f.syncItem.getLocalFileFullPath()
-	if b, e := utils.PathExists(localFilePath); e == nil && b {
-		// 本地文件夹已经存在
-		f.syncItem.Status = SyncFileStatusSuccess
-		f.syncItem.StatusUpdateTime = utils.NowTimeStr()
-		f.syncFileDb.Update(f.syncItem)
-		return nil
-	}
-
-	// 创建
-	var er error
-	if b, e := utils.PathExists(localFilePath); e == nil && !b {
-		f.localFolderCreateMutex.Lock()
-		er = os.MkdirAll(localFilePath, 0755)
-		f.localFolderCreateMutex.Unlock()
-		time.Sleep(200 * time.Millisecond)
-	}
-
-	if er == nil {
-		f.syncItem.Status = SyncFileStatusSuccess
-	} else {
-		f.syncItem.Status = SyncFileStatusFailed
-	}
-
-	f.syncItem.StatusUpdateTime = utils.NowTimeStr()
-	f.syncFileDb.Update(f.syncItem)
-	return er
-}
-
-func (f *FileActionTask) createPanFolder(ctx context.Context) error {
-	panDirPath := f.syncItem.getPanFileFullPath()
-	// 创建文件夹
-	logger.Verbosef("创建云盘文件夹: %s\n", panDirPath)
-	f.panFolderCreateMutex.Lock()
-	_, apierr1 := f.panClient.Mkdir(f.syncItem.DriveId, "root", panDirPath)
-	f.panFolderCreateMutex.Unlock()
-	if apierr1 == nil {
-		logger.Verbosef("创建云盘文件夹成功: %s\n", panDirPath)
-		f.syncItem.Status = SyncFileStatusSuccess
-		f.syncItem.StatusUpdateTime = utils.NowTimeStr()
-		f.syncFileDb.Update(f.syncItem)
-		return nil
-	} else {
-		f.syncItem.Status = SyncFileStatusFailed
-		f.syncItem.StatusUpdateTime = utils.NowTimeStr()
-		f.syncFileDb.Update(f.syncItem)
-		return apierr1
-	}
-}
-
 func (f *FileActionTask) appendRecord(item *log.FileRecordItem) error {
 	if item == nil {
 		return nil
@@ -1,78 +0,0 @@
-package syncdrive
-
-import (
-	"fmt"
-	"github.com/tickstep/aliyunpan-api/aliyunpan"
-	"github.com/tickstep/aliyunpan/internal/utils"
-	"github.com/tickstep/library-go/logger"
-	"os"
-	"testing"
-	"time"
-)
-
-func TestFileActionMgrStart(t *testing.T) {
-	refreshToken := "1640cc2d4ea...cb4d6242161a7"
-	webToken, err := aliyunpan.GetAccessTokenFromRefreshToken(refreshToken)
-	if err != nil {
-		fmt.Println("get acccess token error")
-		return
-	}
-
-	// pan client
-	panClient := aliyunpan.NewPanClient(*webToken, aliyunpan.AppLoginToken{}, aliyunpan.AppConfig{
-		AppId:     "25dzX3vbYqktVxyX",
-		DeviceId:  "E75459EXhOTkI5ZI6S3qDHA3",
-		UserId:    "",
-		Nonce:     0,
-		PublicKey: "",
-	}, aliyunpan.SessionConfig{
-		DeviceName: "Chrome浏览器",
-		ModelName:  "Windows网页版",
-	})
-	user, _ := panClient.GetUserInfo()
-	task := &SyncTask{
-		Id:              "5b2d7c10-e927-4e72-8f9d-5abb3bb04814",
-		DriveId:         user.FileDriveId,
-		LocalFolderPath: "D:\\smb\\feny\\goprojects\\dev\\NS游戏备份",
-		PanFolderPath:   "/sync_drive",
-		Mode:            "sync",
-		LastSyncTime:    "2022-05-26 19:29:19",
-
-		syncDbFolderPath: "D:\\smb\\feny\\goprojects\\dev\\sync_drive",
-		panClient:        panClient,
-		syncOption: SyncOption{
-			FileDownloadParallel:  2,
-			FileUploadParallel:    2,
-			FileDownloadBlockSize: int64(256 * 1024),
-			FileUploadBlockSize:   aliyunpan.DefaultChunkSize,
-			UseInternalUrl:        false,
-			MaxDownloadRate:       0,
-			MaxUploadRate:         0,
-		},
-	}
-	task.setupDb()
-
-	ft := NewFileActionTaskManager(task)
-	ft.Start()
-
-	//go func() {
-	//	time.Sleep(10 * time.Second)
-	//	task.Stop()
-	//}()
-	time.Sleep(50 * time.Minute)
-	ft.Stop()
-}
-
-func TestFileTime(t *testing.T) {
-	ts := utils.ParseTimeStr("2013-01-11 12:15:07")
-	//ts = time.Now()
-	if err := os.Chtimes("/Volumes/Downloads/dev/upload/password.key", ts, ts); err != nil {
-		logger.Verbosef(err.Error())
-	}
-}
-
-func TestLocalFileTime(t *testing.T) {
-	if file, er := os.Stat("/Volumes/Downloads/dev/upload/password.key"); er == nil {
-		fmt.Println(file.ModTime().Format("2006-01-02 15:04:05"))
-	}
-}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
xiaoyaofenfen	d05d19acd8	Merge pull request #548 from qinweixian/patch-1 修复后台上传脚本bug	2026-09-07 09:29:06 +08:00
秦伟先	5179f914ed	修复后台上传脚本bug	2026-09-03 10:42:52 +08:00
tickstep	2feaa3cf82	update readme file	2026-07-05 09:42:32 +08:00
tickstep studio team	cedd43d402	update version to v0.4.0	2026-06-29 10:42:16 +08:00
tickstep studio team	e62bdbb9f1	refractor OSS url parser	2026-06-29 10:27:00 +08:00
tickstep studio team	acc408f0a0	fix download url expired calc error issue #544 #543 #542	2026-06-29 09:29:05 +08:00
tickstep studio team	db28ea6732	update version to v0.3.9	2026-04-20 19:41:14 +08:00
tickstep studio team	a9bc1076a5	update aliyunpan-api to v0.2.9	2026-04-20 19:12:16 +08:00
tickstep	e20ea479c4	fix update config file error	2026-04-12 08:32:26 +08:00
tickstep studio team	42f044ba38	update readme file	2026-03-02 11:17:31 +08:00
tickstep studio team	88f1ff2688	update manual file	2026-03-02 11:05:41 +08:00
feny	ca09039e48	fix the issue that -ui print output flickering	2026-02-18 08:24:10 +08:00
tickstep studio team	cf38ad51fd	add -ui option for upload	2026-02-13 17:27:50 +08:00
tickstep studio team	30cbced50c	rename download_dashboard to dashboard_panel	2026-02-13 17:23:09 +08:00
tickstep studio team	0946939325	update manual file	2026-02-12 11:03:58 +08:00
tickstep studio team	da13b046b8	update readme file	2026-02-12 10:56:37 +08:00
tickstep studio team	268e4a30d1	update readme file	2026-02-12 10:51:48 +08:00
tickstep studio team	a0ca0f8089	update readme file	2026-02-12 10:44:34 +08:00
tickstep studio team	2d99a39606	Merge branch 'main' of github.com:tickstep/aliyunpan	2026-02-12 10:35:25 +08:00
tickstep	2965179ae8	update version to v0.3.8	2026-02-11 20:23:40 +08:00
tickstep	0565482121	update golang.org/x/sys to v0.15.0	2026-02-11 20:21:14 +08:00
tickstep	1822d3c2b2	Merge branch 'main' of github.com:tickstep/aliyunpan	2026-02-11 19:33:53 +08:00
tickstep	6672aa4cd4	update aliyunpan-api to v0.2.8	2026-02-11 19:33:37 +08:00
tickstep studio team	c69a27c9b1	add verbose log for upload	2026-02-10 15:34:07 +08:00
tickstep studio team	4feacbcdbf	fix login get ip error issue	2026-02-10 15:33:49 +08:00
tickstep studio team	1916dda8f8	fix update issue	2026-02-10 14:52:34 +08:00
tickstep studio team	8b5eb14eb6	add more log to track download url expired issue #501	2026-02-05 20:47:19 +08:00
tickstep studio team	d3d9690d55	beautify download ui dashboard	2026-02-05 20:14:56 +08:00
tickstep studio team	89a6ef326c	beautify download ui dashboard	2026-02-05 17:31:21 +08:00
tickstep studio team	35dfb35429	handle file already closed error for upload #509 #512	2026-02-04 17:46:11 +08:00
tickstep studio team	3c7ebb5f62	optimize rm command, faster remove file without wildcard #530	2026-02-04 11:00:38 +08:00
tickstep	f796f40664	optimize update logic	2026-02-03 21:25:21 +08:00
tickstep studio team	0d9700c84c	fix the error in the total download size statistics	2026-02-03 16:41:40 +08:00
tickstep studio team	09ee162ba4	add slice parallel option for downoad #529	2026-02-03 16:30:36 +08:00
tickstep studio team	ff0e3dbfa9	optimize downoad ui dashboard	2026-02-03 15:52:06 +08:00
tickstep studio team	4c5f45e5ab	delete useless code	2026-02-03 15:02:20 +08:00
tickstep studio team	02326b0bd7	fix terminal abnormalities	2026-02-03 14:40:04 +08:00
tickstep	350fec4275	add -ui option for download	2026-02-03 11:23:57 +08:00
xiaoyaofenfen	70a14dd1a6	Merge pull request #525 from SpookySandwich/main 【功能建议】改善下载界面	2026-02-02 18:30:37 +08:00
CharliePu	23dad72914	improve download tui	2026-01-06 17:50:41 +08:00
xiaoyaofenfen	9fa547ddc8	Merge pull request #520 from sikaisky/main fix uploadEntity.PartInfoList len 0 error	2025-11-25 14:54:25 +08:00
sikai	2898037ec5	fix uploadEntity.PartInfoList len 0 error	2025-11-09 10:26:19 +08:00
tickstep	70c14fd66f	open file with readonly mode	2025-08-11 11:17:20 +08:00
tickstep	8913597716	optimize login routine logic	2025-08-07 17:43:14 +08:00
tickstep	9b276f2caf	optimize token refresh task	2025-08-06 15:34:36 +08:00
tickstep	e8bda159fa	handle api common error	2025-08-05 23:08:24 +08:00
tickstep	e1ac6a95b9	fix share url error	2025-04-15 21:47:00 +08:00
tickstep	cef9c6c7c2	update version to v0.3.7	2025-03-23 20:51:06 +08:00
tickstep	17e8e182ee	fix word spell error	2025-03-23 20:33:03 +08:00
tickstep	4b9ded5b9e	add resource dirive id for JS plugin context	2025-03-23 20:22:37 +08:00
tickstep	f939f515f4	add download JS plugin sample #40	2025-03-23 20:03:57 +08:00
tickstep	0e0486914c	sort by file name for download file list	2025-03-23 14:18:04 +08:00
tickstep	a86a464e67	add downloadActionId for download JS plugin	2025-03-22 15:59:47 +08:00
tickstep	c932e3a231	add md5 hash function for JS plugin	2025-03-22 15:32:10 +08:00
tickstep	f79645bfa7	add friendly prompt for not found file path	2025-03-22 15:17:47 +08:00
tickstep	7786dc6c40	add file path auto complete for local command	2025-03-21 21:33:10 +08:00
tickstep	d7b4d0c846	support local file path auto completer for lls / lcd command	2025-03-19 21:31:00 +08:00
tickstep	e669063be9	fix path completer empty match issue	2025-03-19 17:33:55 +08:00
tickstep	e63ba4478c	refactor pan file path auto completer function	2025-03-19 17:22:04 +08:00
tickstep	23617d810b	add prompt for adrive third vip #493	2025-03-19 15:31:39 +08:00
tickstep	3d87c6244f	fix local windows path recognize error	2025-03-08 10:14:12 +08:00
tickstep	4f7941caf5	adapt local file path for windows	2025-03-07 23:22:17 +08:00
tickstep	095d06d99c	add sort option for lls command	2025-03-07 22:49:54 +08:00
tickstep	7fbe082e58	add lcd lpwd lls command #98	2025-03-07 16:19:54 +08:00
tickstep	34a6242bde	update manual	2025-03-07 10:50:01 +08:00
tickstep	71df114d8a	tidy the accept complete file name list config	2025-03-07 10:03:52 +08:00
tickstep	622984ee26	update manual	2025-03-06 11:20:02 +08:00
tickstep	04ec8658e4	update plugin manual	2025-03-06 11:15:16 +08:00
tickstep	6f0d03bd58	add javascript plugin manual	2025-03-06 11:06:50 +08:00
tickstep	94c24ebf16	add sample code for js plugin	2025-03-05 20:47:56 +08:00
tickstep	fb07969bb1	append PanFS.deleteFile() usage to manual	2025-03-05 20:14:20 +08:00
tickstep	9f83bad7d6	add a println function for plugin to print log text in console windows	2025-03-05 19:56:02 +08:00
tickstep	91b1e724fa	add DeletePanFile plugin function #489	2025-03-05 17:33:57 +08:00
tickstep	787d3e1099	add issue template	2025-03-03 15:15:23 +08:00
tickstep	87f951b5f5	add remove file plugin callback #70	2025-03-03 11:46:08 +08:00
tickstep	fdafcaed42	add sync task done plugin callback #304	2025-03-01 08:31:15 +08:00
tickstep	9bef162dad	revision comments	2025-02-28 14:53:46 +08:00
tickstep	6b638d7817	fix NoSuchUpload error	2025-02-27 16:21:20 +08:00
tickstep	ce6d0266bf	fix upload database read error #263	2025-02-27 15:45:55 +08:00
tickstep	acdc2c93ee	fix uploaded file size statistics error	2025-02-27 15:17:08 +08:00
tickstep	e9702ea449	update docker file	2025-02-26 11:16:41 +08:00
tickstep	212a8ef764	update dockerfile	2025-02-26 10:39:32 +08:00
tickstep	057362d5a9	update version to v0.3.6	2025-02-25 21:51:40 +08:00
tickstep	ae3590f84a	add javascript plugin sample to manual file	2025-02-25 10:01:59 +08:00
tickstep	770cd0356f	update aliyunpan-api to v0.2.6	2025-02-24 22:05:24 +08:00
tickstep	12bca5683c	fix upload file occurs PartNotSequential error #487 #486 #466	2025-02-24 15:54:03 +08:00
tickstep	68f4c44a55	add more logs for upload	2025-02-23 09:06:18 +08:00
tickstep	3aae75a46e	fix upload part num issue	2025-02-22 23:08:21 +08:00
tickstep	44e7402b27	fix part num error	2025-02-22 17:44:34 +08:00
tickstep	499b08dd72	append album document	2025-02-18 14:59:18 +08:00
tickstep	29ba6903e6	show target drive name for upload file	2025-02-18 14:44:34 +08:00
tickstep	6d1687e519	add album command	2025-02-18 14:10:13 +08:00
tickstep	d8d00600d8	add album permission for login	2025-02-18 14:08:27 +08:00
tickstep	304c4d4f93	adapt album new api	2025-02-14 16:03:35 +08:00
tickstep	4c75a3d6ee	fix version string parse error #484	2025-02-05 09:45:56 +08:00
tickstep	34d58d3ebc	update version to v0.3.5	2025-01-05 23:06:35 +08:00
tickstep	8410f5977c	update copyright tag	2025-01-05 22:26:20 +08:00
tickstep	9730bb8a23	upgrade aliyunpan-api	2025-01-05 22:25:01 +08:00
tickstep	6ed0e6bae0	refactor upload command	2025-01-04 10:57:21 +08:00
tickstep	2b283b727e	update copyright tag	2025-01-01 09:27:50 +08:00
tickstep	f3d352800b	adapt fast share api	2024-12-03 14:04:00 +08:00
tickstep	2eaba0c3c8	add fast share create command	2024-12-03 11:15:38 +08:00
tickstep	4a59f246f2	show error for user that file is too big to upload #469 #460	2024-11-10 13:31:35 +08:00
xiaoyaofenfen	d45ef8c1b9	Merge pull request #455 from cuishuang/main Remove duplicate and redundant code	2024-10-29 13:49:09 +08:00
tickstep	ed26496bb7	add share command using openapi	2024-10-29 11:34:58 +08:00
tickstep	1e2bcee3e7	refactor share to share_web	2024-10-26 14:53:13 +08:00
cuishuang	1415e81eec	Remove duplicate and redundant code Signed-off-by: cuishuang <imcusg@gmail.com>	2024-09-27 10:47:22 +08:00
tickstep	7ebaf6ec17	update Dockerfile	2024-09-21 18:50:59 +08:00
tickstep	1e205b52a3	update version v0.3.4	2024-09-21 15:50:41 +08:00
tickstep	790056a488	add comments for upload	2024-09-21 15:49:22 +08:00
tickstep	68c89ec317	using aliyunpan api v0.2.4 & upgrade go to 1.22	2024-09-21 15:21:40 +08:00
tickstep	2849dbb472	add default ip type as ipv4 for docker	2024-09-21 14:13:56 +08:00
tickstep	68437a7a4c	update docker file	2024-09-20 11:04:21 +08:00
tickstep	05f695a882	add scan interval time for sync command	2024-09-20 10:53:35 +08:00
tickstep	fbfa313c1e	add backgroup usage for donwload & upload command	2024-09-09 16:52:03 +08:00
tickstep	ff97c172b6	show ips for sync docker	2024-09-04 15:40:31 +08:00
tickstep	47baab44a7	fix file upload PartNotSequential error #445	2024-08-30 11:49:43 +08:00
tickstep	0b5bd60702	add env command	2024-08-18 17:03:10 +08:00
tickstep	6f45a8048d	add left time for upload	2024-08-16 22:57:15 +08:00
tickstep	7132342ed3	fix build error with go1.22	2024-08-12 20:51:44 +08:00
tickstep	d85758b8b0	update version v0.3.3	2024-08-11 16:57:13 +08:00
tickstep	76e657db74	fix login error	2024-08-11 16:26:20 +08:00
tickstep	7870077565	add multi user download feature usage	2024-08-11 16:20:56 +08:00
tickstep	0a52136c2c	update aliyunpan-api to v0.2.2	2024-08-11 14:51:50 +08:00
tickstep	210747fe14	add XDG prompt	2024-08-11 14:21:51 +08:00
tickstep	1f3131f718	remove useless prompt	2024-08-11 14:09:22 +08:00
tickstep	630866798b	add multi user download option for download command	2024-08-10 08:16:02 +08:00
tickstep	f56d103849	add multi user download option for download command	2024-08-09 21:26:50 +08:00
tickstep	97ee446b32	add multi user download option for download command	2024-08-09 21:20:40 +08:00
tickstep	c05148df16	fix download exceed max concurrency limit	2024-08-09 12:57:46 +08:00
tickstep	7dfd89c29d	fix download occurs zero speed issue #444	2024-08-09 10:17:02 +08:00
tickstep	0d823de18f	make download parallel rule meets openapi limits	2024-08-09 09:43:49 +08:00
feny	605380ce70	show third party vip info for who command	2024-08-07 09:09:43 +08:00
tickstep	e1428f2097	adapt XDG folder #433	2024-07-03 21:42:48 +08:00
tickstep	b368060ffb	update version v0.3.2	2024-05-01 07:39:06 +08:00
tickstep	504d38db90	remove none support commands	2024-04-27 22:18:38 +08:00
tickstep	4a0ad141dc	remove none OpenAPI commands	2024-04-27 19:13:59 +08:00
tickstep	a7a386e9a6	update readme file	2024-04-26 10:54:03 +08:00
tickstep	6506acba9a	update readme	2024-04-23 10:12:52 +08:00
tickstep	1e6004d367	update document	2024-04-22 16:38:24 +08:00
tickstep	9796673138	update version to v0.3.1	2024-04-21 19:22:51 +08:00
tickstep	b506bcc84d	fix x-retry-after issue #408	2024-04-21 18:46:34 +08:00
tickstep	989abc71ee	add run cycle mode config for docker	2024-04-21 18:43:01 +08:00
tickstep	ebed4ff62f	complete one time cycle mode	2024-04-21 18:37:46 +08:00
tickstep	465d8fa4e9	add one time backup for sync #414	2024-04-21 11:32:49 +08:00
tickstep	e9ae974017	set local address binding match prefer ip type	2024-04-08 19:36:32 +08:00
tickstep	54dd4e766b	fix switch user error	2024-04-02 09:42:08 +08:00
tickstep	4727b9696d	fix token plugin param error	2024-04-01 23:25:34 +08:00
tickstep	4769d17281	set webapi optional	2024-04-01 22:46:24 +08:00
tickstep	03f3d37fb8	update readme file	2024-03-26 19:23:47 +08:00
tickstep	d1a577810c	support address name for local address binding #402	2024-03-26 19:09:58 +08:00
tickstep	670b5c5dad	update readme file	2024-03-25 14:48:03 +08:00
tickstep	9d084610e5	complete backup policy for sync commnad	2024-03-20 21:29:59 +08:00
tickstep	9962e63c81	add sync policy for download&upload mode	2024-03-20 18:04:30 +08:00
tickstep	f7b8d26964	add time format method	2024-03-20 10:03:01 +08:00
tickstep	280421fd88	fix macOS arm64 version update check error	2024-03-17 19:48:09 +08:00
tickstep	02b6d529d0	update readme file	2024-03-17 19:32:48 +08:00
tickstep	561c50956f	update version to v0.3.0	2024-03-17 16:58:47 +08:00
tickstep	6a39dd78f6	change share usage	2024-03-17 16:53:00 +08:00
tickstep	a5ff0780b7	update aliyunapn-api version to v0.2.0	2024-03-17 16:28:53 +08:00
tickstep	1d2342efb5	change sync manual	2024-03-17 16:21:12 +08:00
tickstep	2e3916be7e	modify sync document	2024-03-17 16:17:13 +08:00
tickstep	68b3a4aba6	update sync docker file	2024-03-17 15:53:28 +08:00
tickstep	82c62a2d51	disable file record as default	2024-03-17 14:30:06 +08:00
tickstep	a02638272f	add upload indicator for sync command	2024-03-17 14:26:53 +08:00
tickstep	87d3770e5b	add download indicator for sync command	2024-03-17 11:34:40 +08:00
tickstep	8ae323eaa6	add prompt for sync command	2024-03-17 09:33:53 +08:00
tickstep	21770fec89	fix path sperator error in windows OS	2024-03-16 23:13:53 +08:00
tickstep	291fbd54c8	fix build script error	2024-03-16 22:37:32 +08:00
tickstep	281ba818cd	support resource drive for sync command	2024-03-16 22:06:20 +08:00
tickstep	df53c7f44b	optimize upload code	2024-03-16 21:28:21 +08:00
tickstep	5cab8cc6a5	remove test code	2024-03-16 20:54:03 +08:00
tickstep	25202861c5	skip symlink file for upload mode	2024-03-16 20:44:19 +08:00
tickstep	3fcbbe9b40	remove no use flag for sync command	2024-03-16 17:13:10 +08:00
tickstep	ae3be4ce6f	remove sync mode usage	2024-03-16 17:06:55 +08:00
tickstep	ae81b59926	fix download url expired issue for sync	2024-03-16 17:02:33 +08:00
tickstep	c0da3de6c6	refactor download mode for sync	2024-03-16 15:58:54 +08:00
tickstep	134531d64a	refactor sync upload mode	2024-03-13 15:31:28 +08:00
tickstep	0064a23f64	fix refresh open token may occurs nil pointer exception	2024-03-11 15:21:40 +08:00
tickstep	425dddf92b	fix refresh web token occurs nil pointer exception	2024-03-11 15:19:56 +08:00
tickstep	31aaadfcc1	refactor mv command	2024-03-07 14:22:56 +08:00
tickstep	1f10f1e982	remove useless code	2024-03-07 14:22:40 +08:00
tickstep	a9f9f18f09	refactor file rm command	2024-03-07 09:27:29 +08:00
tickstep	5e90f96577	add cp command	2024-03-06 22:53:30 +08:00
tickstep	5b008b935d	not support album download in download task	2024-03-06 21:35:56 +08:00
tickstep	bdc0a15bdc	fix download url expired issue	2024-03-05 18:19:41 +08:00
tickstep	26c7201f4e	add fast share document	2024-03-04 15:17:31 +08:00
tickstep	7da4fedc54	remove album command temporary	2024-03-04 14:35:48 +08:00
tickstep	957a1a1bd1	make download file parallel number match adrive rule	2024-03-04 14:25:20 +08:00
tickstep	92133d185e	remove download limit prompt	2024-03-04 14:00:32 +08:00
tickstep	239b794f8b	update readme file	2024-03-04 11:36:24 +08:00
tickstep	b8f35e8647	update README file	2024-03-04 10:43:06 +08:00
tickstep	c465277a8d	update README file	2024-03-04 10:42:18 +08:00
tickstep	281552eefa	make image smaller	2024-03-04 10:27:53 +08:00
tickstep	d26d4d273e	fix spell error	2024-03-04 09:05:33 +08:00
tickstep	f531c7bc70	fix login refresh token issue	2024-03-03 23:20:27 +08:00
tickstep	443eac7589	not support upload & download using InternalUrl	2024-03-03 22:22:50 +08:00
tickstep	6aecb98595	update README file	2024-03-03 22:00:24 +08:00
tickstep	62c50726a5	update document	2024-03-03 21:56:48 +08:00
tickstep	a7034e300f	set PreHash threshold as 100MB	2024-03-03 16:23:03 +08:00
tickstep	c86afbd764	add PreHash check for file upload	2024-03-03 16:20:50 +08:00
tickstep	d83f87942c	adapt WebPanClient naming	2024-03-03 14:07:35 +08:00
tickstep	b79cd7bafb	adapt webapi new struct	2024-03-03 14:02:05 +08:00
tickstep	4c0c8a4ff9	fix upload file error	2024-03-03 10:50:23 +08:00
tickstep	bb231dd45e	using openapi for sync command	2024-03-03 10:12:44 +08:00
tickstep	bec492fe65	fix refresh & save new token error	2024-03-03 09:11:58 +08:00
tickstep	69b76a15ca	use openapi for upload commnad	2024-03-02 22:58:41 +08:00
tickstep	3bdc27ce66	fix download file error when file size big than 100MB	2024-03-02 22:38:36 +08:00
tickstep	9dd2482b58	add openapi token refresh hook	2024-03-02 22:10:54 +08:00
tickstep	e8b87a02dc	rename refresh token method	2024-03-02 21:26:37 +08:00
tickstep	787aa53ce7	fix web api client issue	2024-03-02 21:22:02 +08:00
tickstep	4a623b443c	not support album drive	2024-03-02 19:29:12 +08:00
tickstep	136dfb082f	add webapi check	2024-03-02 19:25:55 +08:00
tickstep	e4d73d8b42	add check for webapi using	2024-03-02 19:23:54 +08:00
tickstep	47123f2b86	not support album drive	2024-03-02 19:14:43 +08:00
tickstep	9d6dfd0d0a	short web token refresh time interval	2024-03-02 19:11:58 +08:00
tickstep	3c0da7fc1d	use openapi as default api for commands	2024-03-02 17:38:21 +08:00
tickstep	2fe5cc5414	remove no support command	2024-03-02 10:25:35 +08:00
tickstep	e261e04978	add login prompt	2024-03-02 10:01:22 +08:00
tickstep	e5f63c60e9	change login routine	2024-03-02 00:55:46 +08:00
tickstep	c350cadba4	remove webdav code	2024-03-01 11:35:18 +08:00
tickstep	4e8c4d6e9c	fix share file save issue	2024-03-01 11:32:10 +08:00
xiaoyaofenfen	a282aabbe7	Merge pull request #367 from reveever/main 新增命令支持保存分享文件	2024-03-01 11:27:32 +08:00
tickstep	c81855f9c2	update to version v0.2.9	2024-01-30 16:31:50 +08:00
tickstep	65b7f28aa6	update api version to v0.1.8	2024-01-30 15:08:26 +08:00
xiaoyaofenfen	8afdb8f701	Merge pull request #381 from Sowevo/main 增加忽略SHA1跳过同名文件的功能	2024-01-30 14:51:36 +08:00
tickstep	ead6ecc218	remove device offline action	2024-01-30 14:32:43 +08:00
tickstep	a42f14f013	update copyright info	2024-01-30 14:13:23 +08:00
tickstep	54fff27fbe	add download 100MB limit prompt for user	2024-01-30 14:10:43 +08:00
tickstep	b0a1ea8591	use new api for recycle bin clear action	2024-01-30 12:01:41 +08:00
sowevo	1b78dff61e	add skip args	2024-01-26 15:10:27 +08:00
sowevo	f838ebfe24	add skip args	2024-01-26 15:01:27 +08:00
sowevo	7f5e19812e	add skip args	2024-01-26 11:40:04 +08:00
ReveEver	bbff32c8c6	add save cmd for saving shared files	2023-12-10 21:44:48 +08:00
xiaoyaofenfen	6a7da9f180	update readme file	2023-10-11 11:05:51 +08:00
xiaoyaofenfen	06184249d0	add prefer ip type config	2023-10-09 16:09:34 +08:00
xiaoyaofenfen	b983d4c335	add usage demo for drive select	2023-10-09 09:33:18 +08:00
tickstep	d061a28559	update version to v0.2.8	2023-10-09 01:17:32 +08:00
tickstep	e91e66aadf	add loong64 build script	2023-10-08 23:09:36 +08:00
tickstep	71f55424d0	update bolt version to v1.3.4	2023-10-08 23:08:49 +08:00
tickstep	c6c4d871ef	update aliyunpan-api to v0.1.7	2023-10-08 20:01:05 +08:00
tickstep	50e6200607	update document & readme file	2023-10-08 19:41:27 +08:00
xiaoyaofenfen	c363d90e72	rename album usage	2023-10-08 17:22:36 +08:00
xiaoyaofenfen	048a6a5438	no limit the upload parallels threads #343	2023-10-08 16:55:20 +08:00
xiaoyaofenfen	19afa16bfe	add album download command	2023-10-08 16:41:55 +08:00
xiaoyaofenfen	b559f41e47	remove locate command	2023-10-08 14:56:47 +08:00
xiaoyaofenfen	33a5484e4a	modify drive list usage	2023-10-08 14:54:59 +08:00
xiaoyaofenfen	34254bf822	format used disk quota	2023-10-08 14:23:58 +08:00
xiaoyaofenfen	66540c9457	add xcp command manual	2023-10-08 14:19:32 +08:00
xiaoyaofenfen	c522b530d7	add xcp command	2023-10-08 14:12:18 +08:00
xiaoyaofenfen	3d130949c0	add share link create check	2023-10-08 09:43:27 +08:00
tickstep	1365471639	remove webdav command	2023-10-07 19:26:27 +08:00
xiaoyaofenfen	151574e154	support fast share link create	2023-10-07 17:20:16 +08:00
xiaoyaofenfen	55e989d821	adapt resource drive	2023-10-07 16:42:43 +08:00
tickstep	0edf7d0af2	label forbidden status for share list	2023-04-30 10:01:32 +08:00
tickstep	ccc285ce5e	add brew usage in readme file	2023-04-06 21:46:48 +08:00