update version v0.3.3

新增命令支持保存分享文件

README.md

@@ -1,40 +1,51 @@
 # 关于
-阿里云盘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插件)，你可以按照自己的需要定制上传/下载中关键步骤的行为，最大程度满足自己的个性化需求
+7. 命令和文件路径输入支持Tab键自动补全，路径支持通配符匹配模式
+8. 支持[JavaScript插件](docs/manual.md#JavaScript插件)，你可以按照自己的需要定制上传/下载中关键步骤的行为，最大程度满足自己的个性化需求
+9. 支持个人相册的相关操作，支持批量下载相册所有照片、视频文件到本地
+10. 支持多用户联合下载功能，对下载速度有极致追求的用户可以尝试使用该选项。详情请查看文档[多用户联合下载](docs/manual.md#多用户联合下载)
+
+# 阿里云盘VIP会员推荐码
+如果大家有打算开通阿里云盘VIP会员，可以使用阿里云盘APP扫描我们的推荐码进行开通。   
+![](./assets/images/aliyunpan_cps_qrcode.png)
 
 # 目录
+- [关于](#关于)
+- [特色](#特色)
+- [目录](#目录)
 - [如何安装](#如何安装)
-    * [直接下载安装](#直接下载安装)
-    * [apt安装](#apt安装)
-    * [yum安装](#yum安装)
-    * [docker安装](#docker安装)
-        + [sync同步盘](#sync同步盘)
-        + [webdav共享盘](#webdav共享盘)
+  - [直接下载安装](#直接下载安装)
+  - [apt安装](#apt安装)
+  - [yum安装](#yum安装)
+  - [brew安装](#brew安装)
+  - [winget安装](#winget安装)
+  - [docker安装](#docker安装)
+    - [sync同步盘](#sync同步盘)
 - [如何使用](#如何使用)
-    * [基本使用](#基本使用)
-        + [修改配置目录](#修改配置目录)
-        + [启动程序](#启动程序)
-        + [查看帮助](#查看帮助)
-        + [登录](#登录)
-        + [查看文件列表](#查看文件列表)
-        + [下载文件](#下载文件)
-        + [上传文件](#上传文件)
-        + [同步备份文件](#同步备份文件)
-    * [更多命令](#更多命令)
+  - [基本使用](#基本使用)
+    - [修改配置目录](#修改配置目录)
+    - [启动程序](#启动程序)
+    - [查看帮助](#查看帮助)
+    - [登录](#登录)
+    - [切换网盘](#切换网盘)
+    - [查看文件列表](#查看文件列表)
+    - [下载文件](#下载文件)
+    - [上传文件](#上传文件)
+    - [同步备份文件](#同步备份文件)
+  - [更多命令](#更多命令)
 - [常见问题](#常见问题)
-    * [如何获取RefreshToken](#如何获取RefreshToken)
-    * [如何开启Debug调试日志](#如何开启Debug调试日志)
+  - [如何开启Debug调试日志](#如何开启debug调试日志)
+    - [第一步](#第一步)
+    - [第二步](#第二步)
+  - [如何登出和下线客户端](#如何登出和下线客户端)
 - [交流反馈](#交流反馈)
 - [鸣谢](#鸣谢)
 
@@ -47,22 +58,23 @@
 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.3/aliyunpan-v0.2.3-linux-amd64.zip
-unzip aliyunpan-v0.2.3-linux-amd64.zip
-cd aliyunpan-v0.2.3-linux-amd64
+wget https://github.com/tickstep/aliyunpan/releases/download/v0.3.3/aliyunpan-v0.3.3-linux-amd64.zip
+unzip aliyunpan-v0.3.3-linux-amd64.zip
+cd aliyunpan-v0.3.3-linux-amd64
 ./aliyunpan
 ```
 
 ## apt安装
 适用于apt包管理器的系统，例如Ubuntu，国产deepin深度操作系统等。目前只支持amd64和arm64架构的机器。
 ```shell
-sudo curl -fsSL http://file.tickstep.com/apt/pgp | gpg --dearmor | sudo tee /etc/apt/trusted.gpg.d/tickstep-packages-archive-keyring.gpg > /dev/null && echo "deb [signed-by=/etc/apt/trusted.gpg.d/tickstep-packages-archive-keyring.gpg] http://file.tickstep.com/apt aliyunpan main" | sudo tee /etc/apt/sources.list.d/tickstep-aliyunpan.list > /dev/null && sudo apt-get update && sudo apt-get install -y aliyunpan
+sudo curl -fsSL http://file.tickstep.com/apt/pgp | gpg --dearmor | sudo tee /etc/apt/trusted.gpg.d/tickstep-packages-archive-keyring.gpg > /dev/null && echo "deb [signed-by=/etc/apt/trusted.gpg.d/tickstep-packages-archive-keyring.gpg arch=amd64,arm64] http://file.tickstep.com/apt aliyunpan main" | sudo tee /etc/apt/sources.list.d/tickstep-aliyunpan.list > /dev/null && sudo apt-get update && sudo apt-get install -y aliyunpan
  
 ```
 
@@ -73,39 +85,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
+ 
+```
+
 ## 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.3
- 
-  
-<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.3
- 
- 
-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.3.3 
+  
+<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)   
@@ -164,20 +195,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
@@ -196,6 +240,7 @@ aliyunpan:/ tickstep$ ls
 ```
 
 ### 下载文件
+通过 `aliyunpan config set -savedir <savedir>` 可以自定义下载文件保存的目录。
 ```shell
 aliyunpan:/ tickstep$ download IMG_0106.JPG
 
@@ -217,10 +262,6 @@ aliyunpan:/ tickstep$ download 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)
 
 ### 上传文件
 ```shell
@@ -239,23 +280,13 @@ 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)
 
 ### 同步备份文件
-同步备份功能，支持备份本地文件到云盘，备份云盘文件到本地，双向同步备份三种模式。支持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"
 
 启动同步备份进程
 备份配置文件：(使用命令行配置)
@@ -276,18 +307,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日志。步骤如下：
 
@@ -300,18 +319,29 @@ 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网页端   
+![](./assets/images/web-deregister-device.png)
+
 # 交流反馈
 提交issue: [issues页面](https://github.com/tickstep/aliyunpan/issues)   
 联系邮箱: tickstep@outlook.com
 
 # 鸣谢
 本项目大量借鉴了以下相关项目的功能&成果   
-> [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)   

aliyunpan.exe.manifest

@@ -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.3.0" processorArchitecture="*" name="com.tickstep.aliyunpan" type="win32"/>
+	<assemblyIdentity version="0.3.3.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="*"/>

assets/plugin/js/token_handler.js.sample

@@ -0,0 +1,48 @@
+// ==========================================================================================
+// aliyunpan JS插件回调处理函数
+// 支持 JavaScript ECMAScript 5.1 语言规范
+//
+// 更多内容请查看官方文档：https://github.com/tickstep/aliyunpan
+// ==========================================================================================
+
+
+// ------------------------------------------------------------------------------------------
+// 函数说明：用户Token刷新完成后回调函数
+//
+// 参数说明
+// context - 当前调用的上下文信息
+// {
+// 	"appName": "aliyunpan",
+// 	"version": "v0.1.3",
+// 	"userId": "11001d48564f43b3bc5662874f04bb11",
+// 	"nickname": "tickstep",
+// 	"fileDriveId": "19519111",
+// 	"albumDriveId": "29519122"
+// }
+// appName - 应用名称，当前固定为aliyunpan
+// version - 版本号
+// userId - 当前登录用户的ID
+// nickname - 用户昵称
+// fileDriveId - 用户文件网盘ID
+// albumDriveId - 用户相册网盘ID
+//
+// params - Token刷新参数
+// {
+// 	"result": "success",
+// 	"message": "ok",
+// 	"oldToken": "aa31fcc229c54d5ab6d8bfb17aff3711",
+// 	"newToken": "bb31fcc229c54d5ab6d8bfb17aff3722",
+// 	"updatedAt": "2022-04-14 07:05:12"
+// }
+// result - Token刷新的结果，success-成功，fail-失败
+// message - 消息说明，如果失败这里会有原因说明
+// oldToken - 刷新前的Token
+// newToken - 刷新后的Token，只有result为success的才有该值
+// updatedAt - Token刷新的时间
+//
+// 返回值说明
+// （没有返回值）
+// ------------------------------------------------------------------------------------------
+function userTokenRefreshFinishCallback(context, params) {
+    console.log(params)
+}

build.sh

@@ -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"
@@ -94,45 +94,59 @@ RicePack() {
   return # 已取消web功能
 }
 
-# Android
+############### Android ###############
 export ANDROID_NDK_ROOT=/Users/tickstep/Applications/android_ndk/android-ndk-r23-darwin
 CC=$ANDROID_NDK_ROOT/bin/arm-linux-androideabi/bin/clang AndroidBuild $name-$version"-android-api16-armv7" android arm 7
 CC=$ANDROID_NDK_ROOT/bin/aarch64-linux-android/bin/clang AndroidBuild $name-$version"-android-api21-arm64" android arm64 7
 CC=$ANDROID_NDK_ROOT/bin/i686-linux-android/bin/clang    AndroidBuild $name-$version"-android-api16-386" android 386 7
 CC=$ANDROID_NDK_ROOT/bin/x86_64-linux-android/bin/clang  AndroidBuild $name-$version"-android-api21-amd64" android amd64 7
 
-# iOS
+############### iOS ###############
 IOSBuild $name-$version"-ios-arm64"
 
-# OS X / macOS
+############### macOS ###############
 Build $name-$version"-darwin-macos-amd64" darwin amd64
 # Build $name-$version"-darwin-macos-386" darwin 386
 Build $name-$version"-darwin-macos-arm64" darwin arm64
 
-# Windows
+############### Windows ###############
 Build $name-$version"-windows-x86" windows 386
 Build $name-$version"-windows-x64" windows amd64
-Build $name-$version"-windows-arm" windows arm
+Build $name-$version"-windows-arm64" windows arm64
 
-# Linux
+############### Linux ###############
+# x64/x86
 Build $name-$version"-linux-386" linux 386
 Build $name-$version"-linux-amd64" linux amd64
+
+# 龙芯 LoongArch
+Build $name-$version"-linux-loong64" linux loong64
+
+# arm
 Build $name-$version"-linux-armv5" linux arm 5
 Build $name-$version"-linux-armv7" linux arm 7
 Build $name-$version"-linux-arm64" linux arm64
-GOMIPS=softfloat Build $name-$version"-linux-mips" linux mips
-Build $name-$version"-linux-mips64" linux mips64
-GOMIPS=softfloat Build $name-$version"-linux-mipsle" linux mipsle
-Build $name-$version"-linux-mips64le" linux mips64le
-# Build $name-$version"-linux-ppc64" linux ppc64
-# Build $name-$version"-linux-ppc64le" linux ppc64le
-# Build $name-$version"-linux-s390x" linux s390x
 
-# Others
-# Build $name-$version"-solaris-amd64" solaris amd64
+# mips
+GOMIPS=softfloat Build $name-$version"-linux-mips64" linux mips64
+GOMIPS=softfloat Build $name-$version"-linux-mips64le" linux mips64le
+GOMIPS=hardfloat Build $name-$version"-linux-mips64hf" linux mips64
+GOMIPS=hardfloat Build $name-$version"-linux-mips64lehf" linux mips64le
+GOMIPS=softfloat Build $name-$version"-linux-mips" linux mips
+GOMIPS=softfloat Build $name-$version"-linux-mipsle" linux mipsle
+GOMIPS=hardfloat Build $name-$version"-linux-mipshf" linux mips
+GOMIPS=hardfloat Build $name-$version"-linux-mipslehf" linux mipsle
+
+# freebsd
 Build $name-$version"-freebsd-386" freebsd 386
 Build $name-$version"-freebsd-amd64" freebsd amd64
 # Build $name-$version"-freebsd-arm" freebsd arm
+
+# Others
+# Build $name-$version"-linux-ppc64" linux ppc64
+# Build $name-$version"-linux-ppc64le" linux ppc64le
+# Build $name-$version"-linux-s390x" linux s390x
+# Build $name-$version"-solaris-amd64" solaris amd64
 # Build $name-$version"-netbsd-386" netbsd	386
 # Build $name-$version"-netbsd-amd64" netbsd amd64
 # Build $name-$version"-netbsd-arm" netbsd	arm

cmder/cmder_helper.go

@@ -1,39 +1,11 @@
 package cmder
 
 import (
-	"fmt"
-	"github.com/tickstep/aliyunpan-api/aliyunpan"
-	"github.com/tickstep/aliyunpan-api/aliyunpan/apierror"
-	"github.com/tickstep/aliyunpan/cmder/cmdliner"
-	"github.com/tickstep/aliyunpan/internal/config"
-	"github.com/tickstep/aliyunpan/internal/functions/panlogin"
-	"github.com/tickstep/library-go/logger"
 	"github.com/urfave/cli"
-	"sync"
 )
 
 var (
 	appInstance *cli.App
-
-	saveConfigMutex *sync.Mutex = new(sync.Mutex)
-
-	ReloadConfigFunc = func(c *cli.Context) error {
-		err := config.Config.Reload()
-		if err != nil {
-			fmt.Printf("重载配置错误: %s\n", err)
-		}
-		return nil
-	}
-
-	SaveConfigFunc = func(c *cli.Context) error {
-		saveConfigMutex.Lock()
-		defer saveConfigMutex.Unlock()
-		err := config.Config.Save()
-		if err != nil {
-			fmt.Printf("保存配置错误: %s\n", err)
-		}
-		return nil
-	}
 )
 
 func SetApp(app *cli.App) {
@@ -43,73 +15,3 @@ func SetApp(app *cli.App) {
 func App() *cli.App {
 	return appInstance
 }
-
-func DoLoginHelper(refreshToken string) (refreshTokenStr string, webToken aliyunpan.WebLoginToken, error error) {
-	line := cmdliner.NewLiner()
-	defer line.Close()
-
-	if refreshToken == "" {
-		refreshToken, error = line.State.Prompt("请输入RefreshToken, 回车键提交 > ")
-		if error != nil {
-			return
-		}
-	}
-
-	// app login
-	atoken, apperr := aliyunpan.GetAccessTokenFromRefreshToken(refreshToken)
-	if apperr != nil {
-		if apperr.Code == apierror.ApiCodeTokenExpiredCode || apperr.Code == apierror.ApiCodeRefreshTokenExpiredCode {
-			fmt.Println("Token过期，需要重新登录")
-		} else {
-			fmt.Println("Token登录失败：", apperr)
-		}
-		return "", webToken, fmt.Errorf("登录失败")
-	}
-	refreshTokenStr = refreshToken
-	return refreshTokenStr, *atoken, nil
-}
-
-func TryLogin() *config.PanUser {
-	// can do automatically login?
-	for _, u := range config.Config.UserList {
-		if u.UserId == config.Config.ActiveUID {
-			// login
-			_, webToken, err := DoLoginHelper(u.RefreshToken)
-			if err != nil {
-				logger.Verboseln("automatically login use saved refresh token error ", err)
-				if u.TokenId != "" {
-					logger.Verboseln("try to login use tokenId")
-					h := panlogin.NewLoginHelper(config.DefaultTokenServiceWebHost)
-					r, e := h.GetRefreshToken(u.TokenId)
-					if e != nil {
-						logger.Verboseln("try to login use tokenId error", e)
-						break
-					}
-					refreshToken, e := h.ParseSecureRefreshToken("", r.SecureRefreshToken)
-					if e != nil {
-						logger.Verboseln("try to parse refresh token error", e)
-						break
-					}
-					_, webToken, err = DoLoginHelper(refreshToken)
-					if err != nil {
-						logger.Verboseln("try to use refresh token from tokenId error", e)
-						break
-					}
-					fmt.Println("Token重新自动登录成功")
-					// save new refresh token
-					u.RefreshToken = refreshToken
-				}
-				break
-			}
-			// success
-			u.WebToken = webToken
-
-			// save
-			SaveConfigFunc(nil)
-			// reload
-			ReloadConfigFunc(nil)
-			return config.Config.ActiveUser()
-		}
-	}
-	return nil
-}

docker/sync/Dockerfile

@@ -48,9 +48,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,10 +55,13 @@ 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_DEVICE_ID=""
 
 # 运行
 ENTRYPOINT ./app.sh

docker/sync/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"
      }
     ]
@@ -29,15 +30,30 @@ 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
+
 # check login already or not
 ./aliyunpan who
 if [ $? -eq 0 ]
 then
   echo "cache token is valid, not need to re-login"
 else
-  echo "login use refresh token: ${ALIYUNPAN_REFRESH_TOKEN}"
-  ./aliyunpan login -RefreshToken=${ALIYUNPAN_REFRESH_TOKEN}
+  echo "token is invalid, please use the valid aliyunpan_config.json file and retry"
+#  ./aliyunpan login -RefreshToken=${ALIYUNPAN_REFRESH_TOKEN}
 fi
 
-./aliyunpan config set -transfer_url_type ${ALIYUNPAN_TRANSFER_URL_TYPE} 
-./aliyunpan sync start -dp ${ALIYUNPAN_DOWNLOAD_PARALLEL} -up ${ALIYUNPAN_UPLOAD_PARALLEL} -dbs ${ALIYUNPAN_DOWNLOAD_BLOCK_SIZE} -ubs ${ALIYUNPAN_UPLOAD_BLOCK_SIZE} -log ${ALIYUNPAN_SYNC_LOG} -ldt ${ALIYUNPAN_LOCAL_DELAY_TIME} -step ${ALIYUNPAN_TASK_STEP}
+if [ "$ALIYUNPAN_SYNC_LOG" = "true" ]
+then
+  ./aliyunpan config set -file_record_config 1
+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} -cycle ${ALIYUNPAN_SYNC_CYCLE}

docker/sync/docker-compose.yml

@@ -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,15 +25,17 @@ 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
+      - ALIYUNPAN_LOCAL_DELAY_TIME=3

docker/webdav/Dockerfile

@@ -1,58 +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
-
-ENTRYPOINT ./app.sh

docker/webdav/app.sh

@@ -1,16 +0,0 @@
-#!/bin/sh
-cd /home/app
-chmod +x ./aliyunpan
-
-# check login already or not
-./aliyunpan who
-if [ $? -eq 0 ]
-then
-  echo "cache token is valid, not need to re-login"
-else
-  echo "login use refresh token: ${ALIYUNPAN_REFRESH_TOKEN}"
-  ./aliyunpan login -RefreshToken=${ALIYUNPAN_REFRESH_TOKEN}
-fi
-
-./aliyunpan config set -transfer_url_type ${ALIYUNPAN_TRANSFER_URL_TYPE} 
-./aliyunpan webdav start -ip "0.0.0.0" -port 23077 -webdav_user "${ALIYUNPAN_AUTH_USER}" -webdav_password "${ALIYUNPAN_AUTH_PASSWORD}" -webdav_mode "${ALIYUNPAN_WEBDAV_MODE}" -pan_drive "${ALIYUNPAN_PAN_DRIVE}" -pan_dir_path "${ALIYUNPAN_PAN_DIR}" -bs ${ALIYUNPAN_BLOCK_SIZE}

docker/webdav/docker-compose.yml

@@ -1,32 +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
-
-
-
-
-

docker/webdav/health_check.sh

@@ -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
-
-

docs/complie_project.md

@@ -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的配置

docs/manual.md

@@ -9,27 +9,24 @@
     * [获取当前帐号](#获取当前帐号)
     * [切换阿里云盘帐号](#切换阿里云盘帐号)
     * [退出阿里云盘帐号](#退出阿里云盘帐号)
-    * [刷新Token](#刷新Token)
-    * [切换网盘(文件/相册)](#切换网盘)
+    * [切换网盘(备份盘/资源库)](#切换网盘)
     * [获取网盘配额](#获取网盘配额)
     * [切换工作目录](#切换工作目录)
     * [输出工作目录](#输出工作目录)
     * [列出目录](#列出目录)
     * [下载文件/目录](#下载文件目录)
-    * [获取文件下载直链](#获取文件下载直链)
+    * [多用户联合下载](#多用户联合下载)
     * [上传文件/目录](#上传文件目录)
-    * [手动秒传文件](#手动秒传文件)
     * [创建目录](#创建目录)
     * [删除文件/目录](#删除文件目录)
     * [移动文件/目录](#移动文件目录)
+    * [备份盘和资源库之间转存文件](#备份盘和资源库之间转存文件)
     * [重命名文件/目录](#重命名文件目录)
-    * [导出文件](#导出文件)
-    * [导入文件](#导入文件)
     * [分享文件/目录](#分享文件目录)
         + [设置分享文件/目录](#设置分享文件目录)
+        + [创建快传链接](#创建快传链接)
         + [列出已分享文件/目录](#列出已分享文件目录)
         + [取消分享文件/目录](#取消分享文件目录)
-        + [分享秒传链接](#分享秒传链接)
     * [同步备份功能](#同步备份功能)
         + [常用命令说明](#常用命令说明)
         + [备份配置文件说明](#备份配置文件说明)
@@ -37,12 +34,6 @@
         + [Linux后台启动](#Linux后台启动)
         + [Windows后台启动](#Windows后台启动)
         + [Docker运行](#Docker运行)
-    * [webdav文件服务](#webdav文件服务)
-        + [常用命令说明](#常用命令说明)
-        + [命令行启动](#命令行启动)
-        + [Linux后台启动](#Linux后台启动)
-        + [Docker运行](#Docker运行)
-        + [HTTPS配置](#HTTPS配置)
     * [JavaScript插件](#JavaScript插件)
         + [如何使用](#如何使用)
         + [JS中内置的函数](#JS中内置的函数)
@@ -50,12 +41,12 @@
             + [1.禁止特定文件上传](#1.禁止特定文件上传)
             + [2.上传文件后删除本地文件](#2.上传文件后删除本地文件)
             + [3.下载文件并截断过长的文件名](#3.下载文件并截断过长的文件名)
+            + [4.上传文件去掉文件名包含的部分字符](#4.上传文件去掉文件名包含的部分字符)
+            + [5.Token刷新失败发送外部通知](#5.Token刷新失败发送外部通知)
     * [显示和修改程序配置项](#显示和修改程序配置项)
 - [常见问题Q&A](#常见问题Q&A)
-    * [1. 如何获取RefreshToken](#1-如何获取RefreshToken)
-    * [2. 如何开启Debug调试日志](#2-如何开启Debug调试日志)
-    * [3. 解决 time: missing Location in call to Date 问题](#3-解决-missing-Location-in-call-to-Date-问题)
-    
+    * [1. 如何开启Debug调试日志](#1-如何开启Debug调试日志)
+
 # 命令列表及说明
 ## 注意
 
@@ -94,25 +85,31 @@ aliyunpan help login
 ## 登录阿里云盘帐号
 
 ### 登录
-当前支持使用RefreshToken进行登录。RefreshToken请参考 [1. 如何获取RefreshToken](#1-如何获取RefreshToken) 获取
+当前支持在浏览器进行登录，请输入以下命令按照步骤进行即可。
 ```
 aliyunpan login
 ```
 
 ### 例子
 ```
-按照引导步骤登录
-aliyunpan login
-请输入RefreshToken, 回车键提交 > 626a27b6193f4c5ca6ef0.......
-
-命令行指定RefreshToken登录
-aliyunpan login -RefreshToken=626a27b6193f4c5ca6ef0.......
-
-使用二维码方式进行登录，按照引导步骤进行
-aliyunpan login -QrCode
+aliyunpan > login
+请在浏览器打开以下链接进行登录，链接有效时间为5分钟。
+https://openapi.alipan.com/oauth/authorize?client_id=cf9f70e8fc61430f8ec5ab5cadf31375&redirect_uri=https%3A%2F%2Fapi.tickstep.com%2Fauth%2Ftickstep%2Faliyunpan%2Ftoken%2Fopenapi%2F8206f0.....fb5db6b40336%2Fauth&scope=user:base,file:all:read,file:all:write
+阿里云盘登录成功:  tickstep
+aliyunpan:/ tickstep$ 
 ```
+目前登录全部采用网页登录，由于 aliyunpan 融合了阿里官方Open接口+网页Web端接口，所以你需要进行两次登录。输入 login 命令   
+![](../assets/images/login-screenshot-1.png)
 
+复制该链接到浏览器打开，会自动跳转到阿里官方授权登录页面，点击允许完成第一次登录   
+![](../assets/images/login-screenshot-2.png)
 
+接着页面会自动跳转到网页接口登录页面，使用阿里APP扫码完成第二次登录   
+![](../assets/images/login-screenshot-3.png)
+
+然后切换回 aliyunpan 程序，按下 Enter 按键完成登录即可   
+![](../assets/images/login-screenshot-4.png)
+   
 ## 列出帐号列表
 
 ```
@@ -148,25 +145,8 @@ aliyunpan logout
 
 程序会进一步确认退出帐号, 防止误操作.
 
-## 刷新Token
-由于阿里云盘的RefreshToken是会过期的，为了延长最大过期时间，需要定期刷新Token，建议每小时刷新一次。
-调用该命令可以自动刷新RefreshToken并保存到配置文件中，但是有一个前提，即Token必须还没有过期，如果Token已经过期是无法刷新的则只能重新登录。
-```
-刷新当前登录用户
-aliyunpan token update
-
-刷新所有登录的用户
-aliyunpan token update -mode 2
-```
-
-如果你的aliyunpan工具是在Linux中运行，则建议你使用crontab定时任务进行Token自动刷新，例如
-```
-每小时执行一次Token刷新任务
-*/60  * * * * /<your path>/aliyunpan token update -mode 2
-```
-
 ## 切换网盘
-程序默认工作在文件网盘下，如需切换到相册网盘，可以使用本命令进行切换。
+程序默认工作在文件网盘下，如需切换到资源库网盘，可以使用本命令进行切换。
 ```
 aliyunpan drive <driveId>
 ```
@@ -234,11 +214,6 @@ aliyunpan ll /我的文档
 ```
 
 ## 下载文件/目录
-下载支持两种链接类型：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)
-
 ```
 aliyunpan download <网盘文件或目录的路径1> <文件或目录2> <文件或目录3> ...
 aliyunpan d <网盘文件或目录的路径1> <文件或目录2> <文件或目录3> ...
@@ -247,6 +222,7 @@ aliyunpan d <网盘文件或目录的路径1> <文件或目录2> <文件或目
 ### 可选参数
 ```
   --ow            overwrite, 覆盖已存在的文件
+  --skip          skip same name, 跳过已存在的同名文件，即使文件内容不一致(不检查SHA1)
   --status        输出所有线程的工作状态
   --save          将下载的文件直接保存到当前工作目录
   --saveto value  将下载的文件直接保存到指定的目录
@@ -256,6 +232,7 @@ aliyunpan d <网盘文件或目录的路径1> <文件或目录2> <文件或目
   --retry value   下载失败最大重试次数 (default: 3)
   --nocheck       下载文件完成后不校验文件
   --exn value     指定排除的文件夹或者文件的名称，只支持正则表达式。支持排除多个名称，每一个名称就是一个exn参数
+  --md             (BETA) Multi-User Download，使用多用户联合下载，可以对单一文件叠加所有登录用户的下载速度
 ```
 
 
@@ -274,36 +251,23 @@ aliyunpan d /我的文档
 
 下载的文件默认保存到 **程序所在目录** 的 download/ 目录, 支持设置指定目录, 重名的文件会自动跳过!
 
-通过 `aliyunpan config set -savedir <savedir>` 可以自定义保存的目录.
-
-支持多个文件或目录下载.
-
-自动跳过下载重名的文件!
-
-## 获取文件下载直链
-你可以通过本命令获取文件下载直链，这样你就可以使用其他支持的工具进行下载了。
-   
-***注意***
-1. 必须二维码登录！必须二维码登录！必须二维码登录！你必须使用手机扫码二维码方式登录(命令：login -QrCode)，否则获取的直链无法正常下载，会提示 403 Forbidden 下载被禁止
-2. 下载链接有效时间为4个小时，当然过期后你可以重新运行命令生成一个新的下载链接
-3. 暂只支持文件，不支持文件夹
+通过 `aliyunpan config set -savedir <savedir>` 可以自定义保存的目录。   
+支持多个文件或目录下载，支持自动跳过下载重名的文件!   
 
+## 多用户联合下载
+前提：程序必须登录多个帐号，并且登录授权都有效。   
 ```
-aliyunpan locate <文件1> <文件2> <文件3> ...
+# 使用多用户联合下载 /我的资源/1.mp4 文件。必须保证所有登录的用户在相同的网盘（备份盘/资源盘）下，相同的路径下，有相同的文件
+aliyunpan download /我的资源/1.mp4 -md
 ```
-
-### 例子
-```
-获取 /我的资源/1.mp4 下载直链
-aliyunpan locate /我的资源/1.mp4
-```
-
+什么是多用户联合下载？   
+由于阿里云盘的限制，一个用户下载的时候只能有3个线程并发数，未开通三方权益包的账号一个下载线程速度大概是500KB/s，3个并发即为1.5MB/s。   
+多用户联合下载，即是多个用户同时下载同一个文件，每个用户并发3个线程，N个用户即能开启 Nx3 个线程，对应的下载速度叠加为 Nx1.5MB/s。   
+对下载速度有极致追求的用户可以尝试使用该选项。   
+如果你的账号都开通了三方权益包，则一个用户下载速度为50MB/s，两个用户联合下载可以轻松突破100MB/s。   
+![](../assets/images/multi_user_download.png)
 
 ## 上传文件/目录
-上传支持两种链接类型：1-默认类型 2-阿里ECS环境类型   
-在阿里ECS（必须是"经典网络"类型的机器）环境下，上传速度单文件可以轻松达到30MB/s，多文件可以达到100MB/s   
-![](../assets/images/upload_file_speed_screenshot.gif)
-
 ```
 aliyunpan upload <本地文件/目录的路径1> <文件/目录2> <文件/目录3> ... <目标目录>
 aliyunpan u <本地文件/目录的路径1> <文件/目录2> <文件/目录3> ... <目标目录>
@@ -337,22 +301,6 @@ aliyunpan upload -exn "\.jpg$" -exn "\.mp3$" C:/Users/Administrator/Video /视
 5)排除 myfile.txt 文件：-exn "^myfile.txt$"
 ```
 
-## 手动秒传上传文件
-通过秒传链接上传文件到网盘，秒传链接可以通过share命令获取
-```
-aliyunpan rapidupload <秒传链接1> <秒传链接2> <秒传链接3> ...
-```
-
-### 例子:
-```
-# 如果秒传成功, 则保存到网盘路径 /file.dmg
-aliyunpan rapidupload "aliyunpan://file.dmg|752FCCBFB2436A6FFCA3B287831D4FAA5654B07E|7005440|"
-
-# 如果秒传成功, 则保存到网盘路径 /pan_folder/file.dmg
-aliyunpan rapidupload "aliyunpan://file.dmg|752FCCBFB2436A6FFCA3B287831D4FAA5654B07E|7005440|pan_folder"
-
-```
-
 ## 创建目录
 ```
 aliyunpan mkdir <目录>
@@ -398,6 +346,25 @@ aliyunpan mv <文件/目录1> <文件/目录2> <文件/目录3> ... <目标目
 aliyunpan mv /我的文档/1.mp4 /
 ```
 
+## 备份盘和资源库之间转存文件
+```
+aliyunpan xcp <文件/目录1> <文件/目录2> <文件/目录3> ... <目标盘目录>
+```
+
+注意: 拷贝多个文件和目录时, 请确保每一个文件和目录都存在, 否则拷贝操作会失败
+
+### 例子
+```
+当前程序工作在备份盘下，将备份盘 /1.mp4 文件转存复制到 资源库下的 /来自备份盘/video 目录下
+aliyunpan xcp /1.mp4 /来自备份盘/video
+
+当前程序工作在资源库下，将资源库 /1.mp4 文件转存复制到 备份盘下的 /来自资源库/video 目录下
+aliyunpan xcp /1.mp4 /来自资源库/video
+
+当前程序工作在备份盘下，将 /我的资源 目录下所有的.mp4文件 复制到 /来自备份盘/video 目录下面，使用通配符匹配
+aliyunpan xcp /我的资源/*.mp4 /来自备份盘/video
+```
+
 ## 重命名文件/目录
 ```
 aliyunpan rename <旧文件/目录名> <新文件/目录名>
@@ -411,101 +378,50 @@ aliyunpan rename <旧文件/目录名> <新文件/目录名>
 aliyunpan rename /我的文档/1.mp4 /我的文档/2.mp4
 ```
 
-## 导出文件
-导出文件主要是用于备份网盘的文件。通过该命令将网盘的文件元数据信息导出并保存到本地文件中，等到以后需要的时候再通过import命令导入到网盘中。
-```
-aliyunpan export <网盘文件/目录的路径1> <文件/目录2> <文件/目录3> ... <本地保存文件路径>
-```
-导出指定文件/目录下面的所有文件的元数据信息，并保存到指定的本地文件里面。导出的文件元信息可以使用 import 命令（秒传文件功能）导入到网盘中。
-
-### 例子
-```
-导出 /我的资源 整个目录 元数据到文件 /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
-```
-
-## 导入文件
-```
-aliyunpan export <本地元数据文件路径>
-```
-导入文件中记录的元数据文件到网盘。保存到网盘的文件会使用文件元数据记录的路径位置，如果没有指定云盘目录(saveto)则默认导入到目录 aliyunpan 中。
-导入的文件可以使用 export 命令获得。
-
-导入文件每一行是一个文件元数据，样例如下：
-```
-aliyunpan://file.dmg|752FCCBFB2436A6FFCA3B287831D4FAA5654B07E|7005440|
-```
-
-### 例子
-```
-导入文件 /Users/tickstep/Downloads/export_files.txt 存储的所有文件元数据项
-aliyunpan import /Users/tickstep/Downloads/export_files.txt
-
-导入文件 /Users/tickstep/Downloads/export_files.txt 存储的所有文件元数据项并保存到目录 /my2020 中
-aliyunpan import -saveto=/my2020 /Users/tickstep/Downloads/export_files.txt
-
-导入文件 /Users/tickstep/Downloads/export_files.txt 存储的所有文件元数据项并保存到网盘根目录 / 中
-aliyunpan import -saveto=/ /Users/tickstep/Downloads/export_files.txt
-```
-
 ## 分享文件/目录
 ```
 aliyunpan share
 ```
 
 ### 设置分享文件/目录
-阿里目前之支持少数文件类型的分享，不支持的文件分享会提示分享失败
+阿里目前只支持少数文件类型的分享，不支持的文件分享会提示分享失败
 ```
-aliyunpan share set <文件/目录1> <文件/目录2> ...
-aliyunpan share s <文件/目录1> <文件/目录2> ...
+aliyunpan share set -mode 1 <文件/目录1> <文件/目录2> ...
+```
+
+### 创建快传链接
+阿里的快传支持大部分文件的共享，例如zip压缩包，按照如下方式可以创建快传链接
+```
+aliyunpan share set -mode 3 <文件/目录1> <文件/目录2> ...
 ```
 
 ### 列出已分享文件/目录
 ```
 aliyunpan share list
-aliyunpan share l
 ```
 
 ### 取消分享文件/目录
 ```
 aliyunpan share cancel <shareid_1> <shareid_2> ...
-aliyunpan share c <shareid_1> <shareid_2> ...
 ```
 目前只支持通过分享id (shareid) 来取消分享.
 
-
-### 分享秒传链接
-秒传链接支持所有类型的文件分享，可以突破阿里的分享限制。得到的链接可以使用import或者rapidupload命令保存到自己网盘中。
-秒传链接只支持文件分享，不支持文件夹。如果指定文件夹会创建文件夹下所有文件的秒传链接。
-```
-aliyunpan share mc <文件/目录1> <文件/目录2> ...
-
-例子
-# 创建文件 1.mp4 的秒传链接 
-aliyunpan share mc 1.mp4
-
-# 创建文件 1.mp4 的秒传链接，但链接隐藏相对路径
-aliyunpan share mc -hp 1.mp4
-
-# 创建文件夹 share_folder 下面所有文件的秒传链接
-aliyunpan share mc share_folder/
-```
-
 ## 同步备份功能
-同步备份功能，支持备份本地文件到云盘，备份云盘文件到本地，双向同步备份三种模式。支持JavaScript插件对备份文件进行过滤。
+同步备份功能，支持备份本地文件到云盘，备份云盘文件到本地两种模式。支持JavaScript插件对备份文件进行过滤。
 指定本地目录和对应的一个网盘目录，以备份文件。网盘目录必须和本地目录独占使用，不要用作其他用途，不然备份可能会有问题。
-
-备份功能支持以下三种模式：
+   
+备份功能支持以下模式：   
 1. 备份本地文件，即上传本地文件到网盘，始终保持本地文件有一个完整的备份在网盘
 2. 备份云盘文件，即下载网盘文件到本地，始终保持网盘的文件有一个完整的备份在本地
-3. 双向备份，保持网盘文件和本地文件严格一致
-
-备份功能一般用于NAS等系统，进行文件备份。比如备份照片，就可以使用这个功能定期备份照片到云盘，十分好用。
-
-***如果你同步目录下有非常多的文件，最好在首次备份前先运行一次scan任务，等scan任务完成并建立起同步数据库后，再正常启动同步任务。这样同步任务可以更加快速并且能有效避免同步重复文件。***
+   
+备份功能支持指定备份策略：
+1. exclusive，排他备份文件，目标目录多余的文件会被删除。保证备份的源目录，和目标目录文件一比一备份。源目录文件如果文件被删除，则对应的目标目录的文件也会被删除。
+2. increment，增量备份文件，目标目录多余的文件不会被删除。只会把源目录修改的文件，新增的文件备份到目标目录。如果源目录有文件删除，或者目标目录有其他文件新增是不会被删除。
+   
+备份功能一般用于NAS等系统，进行文件备份。比如备份照片，就可以使用这个功能定期备份照片到云盘。   
+   
+同步的基本逻辑如下所示，一次循环包括：扫描-对比-执行，一共三个环节。   
+![](../assets/images/sync_command-basic_logic.jpg)
 
 ### 常用命令说明
 ```
@@ -530,10 +446,6 @@ aliyunpan sync start
 
 使用配置文件启动同步备份服务，并配置下载并发为2，上传并发为1，下载分片大小为256KB，上传分片大小为1MB
 aliyunpan sync start -dp 2 -up 1 -dbs 256 -ubs 1024
-
-当你本地同步目录文件非常多，或者云盘同步目录文件非常多，为了后期更快更精准同步文件，可以先进行文件扫描并构建同步数据库，然后再正常启动同步任务。如下所示：
-aliyunpan sync start -step scan
-aliyunpan sync start
 ```
 
 ### 备份配置文件说明
@@ -549,13 +461,15 @@ aliyunpan sync start
    "name": "设计文档备份",
    "localFolderPath": "D:/tickstep/Documents/设计文档",
    "panFolderPath": "/备份盘/我的文档",
-   "mode": "upload"
+   "mode": "upload",
+   "driveName": "backup"
   },
   {
    "name": "手机图片备份",
    "localFolderPath": "D:/tickstep/Photos/手机图片",
    "panFolderPath": "/备份盘/手机图片",
-   "mode": "upload"
+   "mode": "upload",
+   "driveName": "resource"
   }
  ]
 }
@@ -564,7 +478,8 @@ aliyunpan sync start
 name - 任务名称
 localFolderPath - 本地目录
 panFolderPath - 网盘目录
-mode - 模式，支持三种: upload(备份本地文件到云盘),download(备份云盘文件到本地),sync(双向同步备份)
+mode - 模式，支持: upload(备份本地文件到云盘),download(备份云盘文件到本地)
+driveName - 网盘，支持：backup(备份盘), resource(资源盘)
 ```
 
 ### 命令行启动
@@ -572,12 +487,13 @@ mode - 模式，支持三种: upload(备份本地文件到云盘),download(备
 
 ```
 使用命令行配置启动同步备份服务，将本地目录 /tickstep/Documents/设计文档 中的文件备份上传到云盘目录 /备份盘/我的文档
-./aliyunpan sync start -ldir "/tickstep/Documents/设计文档" -pdir "/备份盘/我的文档" -mode "upload"
+./aliyunpan sync start -ldir "/tickstep/Documents/设计文档" -pdir "/备份盘/我的文档" -mode "upload" -drive "backup"
 
 参数说明
 ldir：本地目录
 pdir：云盘目录
-mode：备份模式，支持：upload(备份本地文件到云盘),download(备份云盘文件到本地),sync(双向同步备份)
+mode：备份模式，支持：upload(备份本地文件到云盘),download(备份云盘文件到本地)
+drive - 网盘，支持：backup(备份盘), resource(资源盘)
 
 --------------------------------------------------------------
 正常会有以下的输出：
@@ -607,15 +523,9 @@ cd /path/to/aliyunpan/folder
 
 chmod +x ./aliyunpan
 
-# 指定refresh token用于登录
-./aliyunpan login -RefreshToken=9078907....adg9087
-
-# 上传下载链接类型：1-默认 2-阿里ECS环境
-./aliyunpan config set -transfer_url_type 1
-
 # 指定配置参数并进行启动
-# 支持的模式：upload(备份本地文件到云盘),download(备份云盘文件到本地),sync(双向同步备份)
-./aliyunpan sync start -ldir "/tickstep/Documents/设计文档" -pdir "/备份盘/我的文档" -mode "upload"
+# 支持的模式：upload(备份本地文件到云盘),download(备份云盘文件到本地)
+./aliyunpan sync start -ldir "/tickstep/Documents/设计文档" -pdir "/备份盘/我的文档" -mode "upload" -drive "backup"
 ```
 
 增加脚本执行权限
@@ -646,8 +556,8 @@ $ nohup ./sync.sh >/dev/null 2>&1 &
   <log mode="roll"></log>
 </service>
 ```
-4. 将alisync.exe和alisync.xml存放在你PC上aliyunpan.exe工具所在目录，例如：
-   ![](../assets/images/win10-alisync-service.png)
+4. 将alisync.exe和alisync.xml存放在你PC上aliyunpan.exe工具所在目录，例如：   
+![](../assets/images/win10-alisync-service.png)
 5. CMD命令行启动程序
 ```
 # 安装服务（只需要第一次安装，后面不用再安装）
@@ -675,14 +585,15 @@ D:\Program Files\aliyunpan>alisync stop
 
 1. 直接运行
 ```
-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:<tag>
- 
+docker run -d --name=aliyunpan-sync --restart=always -v "<your aliyunpan_config.json>:/home/app/config/aliyunpan_config.json" -v "<your local dir>:/home/app/data" -e ALIYUNPAN_PAN_DIR="<your drive pan dir>" -e ALIYUNPAN_SYNC_MODE="upload" -e ALIYUNPAN_SYNC_POLICY="increment" -e ALIYUNPAN_SYNC_DRIVE="backup" -e ALIYUNPAN_SYNC_LOG="true" tickstep/aliyunpan-sync:<tag>
   
-<your local dir>：本地目录绝对路径，例如：/tickstep/Documents/设计文档
-ALIYUNPAN_PAN_DIR：云盘目录
-ALIYUNPAN_REFRESH_TOKEN：RefreshToken
-ALIYUNPAN_SYNC_MODE：备份模式，支持三种: upload(备份本地文件到云盘),download(备份云盘文件到本地),sync(双向同步备份)
-ALIYUNPAN_TASK_STEP：任务步骤, 支持两种: scan(只扫描并建立同步数据库),sync(正常启动同步任务)。如果你同步目录文件非常多，首次运行最好先跑一次scan步骤，然后再正常启动文件同步任务
+<your aliyunpan_config.json>: 用户已经登录成功并保存好的aliyunpan_config.json凭据文件
+<your local dir>：本地目标目录，绝对路径，例如：/tickstep/Documents/设计文档
+ALIYUNPAN_PAN_DIR：云盘目标目录，绝对路径
+ALIYUNPAN_SYNC_MODE：备份模式，支持: upload(备份本地文件到云盘),download(备份云盘文件到本地)
+ALIYUNPAN_SYNC_POLICY：备份策略，支持：exclusive(排他备份文件，目标目录多余的文件会被删除),increment(增量备份文件，目标目录多余的文件不会被删除)
+ALIYUNPAN_SYNC_DRIVE: 网盘，支持：backup(备份盘), resource(资源盘)
+ALIYUNPAN_SYNC_LOG: 同步日志，true-开启同步日志显示，false-关闭同步日志
 ```
 
 2. docker-compose运行   
@@ -696,18 +607,17 @@ services:
     container_name: aliyunpan-sync
     restart: always
     volumes:
-      # 指定本地备份目录绝对路径：/tickstep/Documents/设计文档
-      - /tickstep/Documents/设计文档:/home/app/data:rw
-      # （可选）可以指定JS插件sync_handler.js用于过滤文件，详见下面的插件说明
+      # （必须）映射的本地目录
+      - ./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同步数据库到本地，这样即使容器销毁，同步数据库还可以用于以后使用
       #- ./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=41804446a...bf7f069cab2
-      # 上传下载链接类型：1-默认 2-阿里ECS环境
-      - ALIYUNPAN_TRANSFER_URL_TYPE=1
       # 下载文件并发数
       - ALIYUNPAN_DOWNLOAD_PARALLEL=2
       # 上传文件并发数
@@ -716,18 +626,20 @@ services:
       - ALIYUNPAN_DOWNLOAD_BLOCK_SIZE=1024
       # 上传数据块大小，单位为KB，默认为10240KB，建议范围1024KB~10240KB
       - ALIYUNPAN_UPLOAD_BLOCK_SIZE=10240
-      # 指定网盘文件夹作为备份目录，不要指定根目录
-      - ALIYUNPAN_PAN_DIR=/备份盘/我的文档
-      # 备份模式：upload(备份本地文件到云盘), download(备份云盘文件到本地), sync(双向同步备份)
+      # 指定网盘文件夹作为备份目标目录，不要指定根目录
+      - ALIYUNPAN_PAN_DIR=/my_sync_dir
+      # 备份模式：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      
 ```
 
 3. sync_handler.js插件说明   
@@ -888,154 +800,6 @@ function syncScanPanFilePrepareCallback(context, params) {
 }
 ```
 
-## webdav文件服务
-本文命令可以让阿里云盘变身为webdav协议的文件服务器。这样你可以把阿里云盘挂载为Windows、Linux、Mac系统的磁盘，可以通过NAS系统做文件管理或文件同步等等。
-当把阿里云盘作为webdav文件服务器进行使用的时候，上传文件是不支持秒传的，所以当你挂载为网络磁盘使用的时候，不建议在webdav挂载目录中上传、下载过大的文件，不然体验会非常差。
-建议作为文档，图片等小文件的同步网盘。   
-效果图如下所示：   
-![](../assets/images/webdav-screenshot.png)
-
-### 常用命令说明
-```
-查看webdav说明
-aliyunpan webdav
-
-查看webdav如何启动说明
-aliyunpan webdav start -h
-
-使用默认配置启动webdav服务。
-aliyunpan webdav start
-
-启动webdav服务，并配置IP为127.0.0.1，端口为23077，登录用户名为admin，登录密码为admin123，文件网盘目录 /webdav_folder 作为服务的根目录
-aliyunpan webdav start -ip "127.0.0.1" -port 23077 -webdav_user "admin" -webdav_password "admin123" -pan_drive "File" -pan_dir_path "/webdav_folder"
-
-正常启动后会打印出webdav链接参数，然后使用支持webdav的客户端填入下面对应的参数进行链接即可
-----------------------------------------
-webdav网盘信息：
-链接：http://localhost:23077
-用户名：admin
-密码：admin123
-网盘服务类型：文件
-网盘服务目录：/webdav_folder
-----------------------------------------
-```
-
-### 命令行启动
-需要先进行登录。然后使用以下命令运行即可，该命令是阻塞的不会退出，除非停止webdav服务。
-
-```
-./aliyunpan webdav start -port 23077 -webdav_user "admin" -webdav_password "admin123" -pan_dir_path "/webdav_folder"
-
-参数说明
-port：绑定端口
-webdav_user： webdav客户端登录用户名
-webdav_password： webdav客户端登录密码
-pan_dir_path：指定webdav使用那个阿里云盘目录作为服务根目录
-```
-
-### Linux后台启动
-建议结合nohup进行启动。
-
-先创建webdav.sh脚本，内容如下
-```
-# 请更改成你自己的目录
-cd /path/to/aliyunpan/folder
-
-chmod +x ./aliyunpan
-
-# 指定refresh token用于登录
-./aliyunpan login -RefreshToken=9078907....adg9087
-
-# 上传下载链接类型：1-默认 2-阿里ECS环境
-./aliyunpan config set -transfer_url_type 1
-
-# 指定webdav启动参数并进行启动
-./aliyunpan webdav start -ip "0.0.0.0" -port 23077 -webdav_user "admin" -webdav_password "admin" -pan_dir_path "/" -bs 1024
-```
-
-增加脚本执行权限
-```
-$ chmod +x webdav.sh
-```
-
-然后启动该脚本进行后台运行
-```
-$ nohup ./webdav.sh >/dev/null 2>&1 &
-```
-
-### Docker运行
-详情文档请参考dockerhub网址：[tickstep/aliyunpan-webdav](https://hub.docker.com/r/tickstep/aliyunpan-webdav)
-
-1. 直接运行
-```
-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_PAN_DRIVE="File" -e ALIYUNPAN_PAN_DIR="/" tickstep/aliyunpan-webdav
-
-# ALIYUNPAN_REFRESH_TOKEN RefreshToken
-# ALIYUNPAN_AUTH_USER webdav登录用户名
-# ALIYUNPAN_AUTH_PASSWORD webdav登录密码
-# ALIYUNPAN_PAN_DRIVE 网盘类型，可选： File-文件 Album-相册
-# ALIYUNPAN_PAN_DIR 网盘文件夹的webdav服务根目录
-```
-
-2. docker-compose运行   
-   docker-compose.yml 文件如下所示，为了方便说明增加了相关的注释，部署的时候可以去掉注释。
-```
-version: '3'
-services:
-  webdav:
-    image: tickstep/aliyunpan-webdav
-    container_name: aliyunpan-webdav
-    restart: always
-    ports:
-      - 23077:23077
-    environment:
-      - TZ=Asia/Shanghai
-      # refresh token用于登录
-      - ALIYUNPAN_REFRESH_TOKEN=b9123...13e66a1
-      # webdav 登录用户名
-      - ALIYUNPAN_AUTH_USER=admin
-      # webdav 登录密码
-      - ALIYUNPAN_AUTH_PASSWORD=admin
-      # 指定网盘类型为文件，可选： File-文件 Album-相册
-      - ALIYUNPAN_PAN_DRIVE=File
-      # 指定网盘文件夹作为webdav服务根目录
-      - ALIYUNPAN_PAN_DIR=/
-      # 上传下载链接类型：1-默认 2-阿里ECS环境
-      - ALIYUNPAN_TRANSFER_URL_TYPE=1
-      # 上传数据块大小，单位为KB，默认为10240KB，建议范围1024KB~10240KB
-      - ALIYUNPAN_BLOCK_SIZE=10240
-```
-
-### HTTPS配置
-建议使用nginx进行https的配置。样例如下：
-```
-server {
-       listen 443;
-       server_name your.host.com;
-       ssl on;
-       root html;
-       index index.html index.htm;
-       ssl_certificate /path/to/your/file.pem;
-       ssl_certificate_key /path/to/your/file.key;
-
-       ssl_session_timeout 5m;
-       ssl_ciphers ECDHE-RSA-AES128-GCM-SHA256:ECDHE:ECDH:AES:HIGH:!NULL:!aNULL:!MD5:!ADH:!RC4;
-       ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
-       ssl_prefer_server_ciphers on;
-
-       # webdav server
-       location /{
-          root html;
-          proxy_pass http://127.0.0.1:23077;
-          proxy_set_header X-Real-IP $remote_addr;
-          proxy_set_header REMOTE-HOST $remote_addr;
-          proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-          proxy_set_header Host $http_host;
-          proxy_redirect off;
-        }
-   }
-```
-
 ## JavaScript插件
 支持javascript插件，你可以按照自己的需要定制上传/下载中关键步骤的行为，最大程度满足自己的个性化需求。   
 例如：   
@@ -1048,10 +812,11 @@ server {
 7.下载的文件进行改名，但是网盘的文件保持不变   
 8.下载的文件路径进行更改，但是网盘的文件保持不变   
 9.下载文件完成后，通过HTTP通知其他服务   
-10.同步备份功能，支持过滤本地文件，或者过滤云盘文件。定制上传或者下载需要同步的文件
+10.同步备份功能，支持过滤本地文件，或者过滤云盘文件。定制上传或者下载需要同步的文件   
+11.Token刷新失败或者过期，发送外部通知（HTTP&邮件）   
 
 ### 如何使用
-JS插件的样本文件默认存放在程序所在的plugin/js文件夹下，分为下载(download_handler.js.sample)、上传(upload_handler.js.sample)、同步备份(sync_handler.js.sample)插件。
+JS插件的样本文件默认存放在程序所在的plugin/js文件夹下，分为下载(download_handler.js.sample)、上传(upload_handler.js.sample)、同步备份(sync_handler.js.sample)、用户Token(token_handler.js.sample)插件。
 
 建议拷贝一份并将后缀名更改为.js，例如：upload_handler.js，不然插件不会生效。   
 你必须具备一定的JS语言基础，然后按照里面的样例根据自己所需进行改动即可。   
@@ -1061,13 +826,13 @@ JS插件的样本文件默认存放在程序所在的plugin/js文件夹下，分
 目前只开放了如下函数，你可以在你的js脚本中直接调用   
 1.console.log()   
 打印日志
-```
+```js
 console.log("hello world");
 ```
 
 2.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",
@@ -1085,7 +850,7 @@ console.log("hello world");
 
 3.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",
@@ -1109,17 +874,85 @@ console.log("hello world");
 
 4.PluginUtil.LocalFS.deleteFile()   
 删除本地指定文件，不支持文件夹
-```
+```js
 PluginUtil.LocalFS.deleteFile(params["localFilePath"]);
 ```
 
+5.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", "文件上传通知", "该文件已经上传完毕");
+```
+
+6.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);
+```
+
+7.PluginUtil.KV.putString()
+存储键值对，定义如下
+```
+PluginUtil.KV.putString(key, value)
+
+其中：
+key - 键，字符串
+value - 值，字符串
+```
+样例
+```js
+PluginUtil.KV.putString("mykey", "1670419352");
+```
+
+8.PluginUtil.KV.getString()
+获取存储的键值，指定对应的键，返回存储的值，如果没有则返回空字符串，定义如下
+```
+PluginUtil.KV.getString(key)
+
+其中：
+key - 键，字符串
+```
+样例
+```js
+var value = PluginUtil.KV.getString("mykey");
+```
 
 ### 常见场景样例
 这里收集了一些常见的需求样例，可以作为插件定制的样例模板。
 
 #### 1.禁止特定文件上传
 使用JavaScript上传插件中的`uploadFilePrepareCallback`函数。如下所示：
-```
+```js
 function uploadFilePrepareCallback(context, params) {
     console.log(params)
 
@@ -1153,7 +986,7 @@ function uploadFilePrepareCallback(context, params) {
 
 #### 2.上传文件后删除本地文件
 使用JavaScript上传插件中的`uploadFileFinishCallback`函数。如下所示：
-```
+```js
 function uploadFileFinishCallback(context, params) {
     console.log(params);
     if (params["localFileType"] != "file") {
@@ -1169,7 +1002,7 @@ function uploadFileFinishCallback(context, params) {
 #### 3.下载文件并截断过长的文件名
 有些文件的路径或者名称太长，下载的时候可能会由于路径名称过程导致无法下载，这时候可以使用JavaScript下载插件中的`downloadFilePrepareCallback`函数定制下载保存的文件名。   
 如下所示：
-```
+```js
 function downloadFilePrepareCallback(context, params) {
     console.log(params)
 
@@ -1235,7 +1068,87 @@ function downloadFilePrepareCallback(context, params) {
 [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.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;
+        }
+    }
+}
+```
 
 ## 显示和修改程序配置项
 ```
@@ -1261,25 +1174,10 @@ aliyunpan config set -max_download_parallel 15
 
 # 组合设置
 aliyunpan config set -max_download_parallel 15 -savedir D:/Downloads
-
-# 设置使用阿里云内部URL链接，专供阿里云ECS环境使用
-# 开启内部URL链接可以使用阿里云ECS私网带宽流量，而不用使用宝贵的公网带宽流量，如果你在阿里ECS环境中使用本工具，建议开启
-aliyunpan config set -transfer_url_type 2
 ```
 
 # 常见问题Q&A
-## 1 如何获取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)
-
-## 2 如何开启Debug调试日志
+## 1 如何开启Debug调试日志
 当需要定位问题，或者提交issue的时候抓取log，则需要开启debug日志。步骤如下：
 
 ### 第一步
@@ -1296,15 +1194,4 @@ Windows
 
 ### 第二步
 打开aliyunpan命令行程序，任何云盘命令都有类似如下日志输出
-![](../assets/images/debug-log-screenshot.png)
-
-## 3 解决 missing Location in call to Date 问题
-在使用webdav文件服务的过程中可能会出现该问题。   
-原因是golang中的time.LoadLocation()依赖于 IANA Time Zone Database，一般linux系统都带了，但是有部分系统没有带有这个数据文件则出现该问题。   
-解决方法：
-1. 下载文件 ./assets/binary/tzdata.zip 文件并保存到系统中，记下保存的文件路径
-2. 设置环境变量 ZONEINFO
-```
-export ZONEINFO=/path/to/tzdata.zip
-```
-然后启动aliyunpan服务即可。
+![](../assets/images/debug-log-screenshot.png)

go.mod

@@ -1,27 +1,42 @@
 module github.com/tickstep/aliyunpan
 
-go 1.16
+go 1.20
 
 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.1
-	github.com/tickstep/bolt v1.3.3
-	github.com/tickstep/library-go v0.0.5
+	github.com/tickstep/aliyunpan-api v0.2.2
+	github.com/tickstep/bolt v1.3.4
+	github.com/tickstep/library-go v0.1.2
 	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
 )
 
+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/sys v0.0.0-20211025201205-69cdffdb9359 // 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

go.sum

@@ -1,16 +1,36 @@
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/GeertJohan/go.incremental v1.0.0 h1:7AH+pY1XUgQE4Y1HcXYaMqAI0m9yrFqo/jt0CW30vsg=
 github.com/GeertJohan/go.incremental v1.0.0/go.mod h1:6fAjUhbVuX1KcMD3c8TEgVUqmo4seqhv0i0kdATSkM0=
+github.com/adrg/xdg v0.4.0 h1:RzRqFcjH4nE5C6oTAxhBtoE2IRyjBSa62SCbyPidvls=
+github.com/adrg/xdg v0.4.0/go.mod h1:N6ag73EX4wyxeaoeHctc1mas01KZgsj5tYiAIwqJE/E=
+github.com/aead/siphash v1.0.1/go.mod h1:Nywa3cDsYNNK3gaciGTWPwHt0wlpNV15vwmswBAUSII=
 github.com/boltdb/bolt v1.3.1 h1:JQmyP4ZBrce+ZQu0dY660FMfatumYDLun9hBCUVIkF4=
 github.com/boltdb/bolt v1.3.1/go.mod h1:clJnj/oiGkjum5o1McbSZDSLxVThjynRyGBgiAx27Ps=
+github.com/btcsuite/btcd v0.20.1-beta/go.mod h1:wVuoA8VJLEcwgqHBwHmzLRazpKxTv13Px/pDuV7OomQ=
+github.com/btcsuite/btcd v0.22.1 h1:CnwP9LM/M9xuRrGSCGeMVs9iv09uMqwsVX7EeIpgV2c=
+github.com/btcsuite/btcd v0.22.1/go.mod h1:wqgTSL29+50LRkmOVknEdmt8ZojIzhuWvgu/iptuN7Y=
+github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1 h1:q0rUy8C/TYNBQS1+CGKw68tLOFYSNEs0TFnxxnS9+4U=
+github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1/go.mod h1:7SFka0XMvUgj3hfZtydOrQY2mwhPclbT2snogU7SQQc=
+github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f/go.mod h1:TdznJufoqS23FtqVCzL0ZqgP5MqXbb4fg/WgDys70nA=
+github.com/btcsuite/btcutil v0.0.0-20190425235716-9e5f4b9a998d/go.mod h1:+5NJ2+qvTyV9exUAL/rxXi3DcLg2Ts+ymUAY5y4NvMg=
+github.com/btcsuite/btcutil v1.0.3-0.20201208143702-a53e38424cce/go.mod h1:0DVlHczLPewLcPGEIeUEzfOJhqGPQ0mJJRDBtD307+o=
+github.com/btcsuite/go-socks v0.0.0-20170105172521-4720035b7bfd/go.mod h1:HHNXQzUsZCxOoE+CPiyCTO6x34Zs86zZUiwtpXoGdtg=
+github.com/btcsuite/goleveldb v0.0.0-20160330041536-7834afc9e8cd/go.mod h1:F+uVaaLLH7j4eDXPRvw78tMflu7Ie2bzYOH4Y8rRKBY=
+github.com/btcsuite/goleveldb v1.0.0/go.mod h1:QiK9vBlgftBg6rWQIj6wFzbPfRjiykIEhBH4obrXJ/I=
+github.com/btcsuite/snappy-go v0.0.0-20151229074030-0bdef8d06723/go.mod h1:8woku9dyThutzjeg+3xrA5iCpBRH8XEEg3lh6TiUghc=
+github.com/btcsuite/snappy-go v1.0.0/go.mod h1:8woku9dyThutzjeg+3xrA5iCpBRH8XEEg3lh6TiUghc=
+github.com/btcsuite/websocket v0.0.0-20150119174127-31079b680792/go.mod h1:ghJtEyQwv5/p4Mg4C0fgbePVuGr935/5ddU9Z3TmDRY=
+github.com/btcsuite/winsvc v1.0.0/go.mod h1:jsenWakMcC0zFBFurPLEAyrnc/teJEM1O46fmI40EZs=
 github.com/cpuguy83/go-md2man v1.0.10 h1:BSKMNlYxDvnunlTymqtgONjNnaRV1sTpcovwwjF22jk=
 github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
+github.com/davecgh/go-spew v0.0.0-20171005155431-ecdeabc65495/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/deckarep/golang-set v1.8.0 h1:sk9/l/KqpunDwP7pSjUg0keiOOLEnOBHzykLrsPppp4=
 github.com/deckarep/golang-set v1.8.0/go.mod h1:5nI87KwE7wgsBU1F4GKAw2Qod7p5kyS383rP6+o6qqo=
+github.com/decred/dcrd/lru v1.0.0/go.mod h1:mxKOwFd7lFjN2GZYsiz/ecgqR6kkYAl+0pz0tEMk218=
 github.com/denisbrodbeck/machineid v1.0.1 h1:geKr9qtkB876mXguW2X6TU4ZynleN6ezuMSRhl4D7AQ=
 github.com/denisbrodbeck/machineid v1.0.1/go.mod h1:dJUwb7PTidGDeYyUBmXZ2GphQBbjJCrnectwCyxcUSI=
 github.com/dlclark/regexp2 v1.4.1-0.20201116162257-a2a8dda75c91 h1:Izz0+t1Z5nI16/II7vuEo/nHjodOg0p7+OiDpjX5t1E=
@@ -20,14 +40,23 @@ github.com/dop251/goja v0.0.0-20220408131256-ffe77e20c6f1 h1:9/4Hyp+A98nqssD7qce
 github.com/dop251/goja v0.0.0-20220408131256-ffe77e20c6f1/go.mod h1:TQJQ+ZNyFVvUtUEtCZxBhfWiH7RJqR3EivNmvD6Waik=
 github.com/dop251/goja_nodejs v0.0.0-20210225215109-d91c329300e7/go.mod h1:hn7BA7c8pLvoGndExHudxTDKZ84Pyvv+90pbBjbTz0Y=
 github.com/dop251/goja_nodejs v0.0.0-20211022123610-8dd9abb0616d/go.mod h1:DngW8aVqWbuLRMHItjPUyqdj+HWPvnQe8V8y1nDpIbM=
+github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/go-sourcemap/sourcemap v2.1.3+incompatible h1:W1iEw64niKVGogNgBN3ePyLFfuisuzeidWPMPWmECqU=
 github.com/go-sourcemap/sourcemap v2.1.3+incompatible/go.mod h1:F8jJfvm2KbVjc5NqelyYJmf/v5J0dwNLS2mL4sNA1Jg=
+github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
+github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
+github.com/jessevdk/go-flags v0.0.0-20141203071132-1679536dcc89/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
+github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
+github.com/jordan-wright/email v0.0.0-20200602115436-fd8a7622303e h1:OGunVjqY7y4U4laftpEHv+mvZBlr7UGimJXKEGQtg48=
+github.com/jordan-wright/email v0.0.0-20200602115436-fd8a7622303e/go.mod h1:Fy2gCFfZhay8jplf/Csj6cyH/oshQTkLQYZbKkcV+SY=
+github.com/jrick/logrotate v1.0.0/go.mod h1:LNinyqDIJnpAur+b8yyulnQw/wDuN1+BYKlTRt3OuAQ=
 github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
 github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
 github.com/kardianos/osext v0.0.0-20170510131534-ae77be60afb1 h1:PJPDf8OUfOK1bb/NeTKd4f1QXZItOX389VN3B6qC8ro=
 github.com/kardianos/osext v0.0.0-20170510131534-ae77be60afb1/go.mod h1:1NbS8ALrpOvjt0rHPNLyCIeMtbizbir8U//inJ+zuB8=
+github.com/kkdai/bstream v0.0.0-20161212061736-f391b8402d23/go.mod h1:J+Gs4SYgM6CZQHDETBtE9HaSEkGmuNXF86RwHhHUvq4=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
 github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0=
@@ -51,6 +80,10 @@ github.com/oleiade/lane v0.0.0-20160817071224-3053869314bb/go.mod h1:ym0w0flrmBt
 github.com/olekukonko/tablewriter v0.0.1/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo=
 github.com/olekukonko/tablewriter v0.0.2-0.20190618033246-cc27d85e17ce h1:RLmZmfx/K62HKpbwPqtW3tg+V2GgugN/XNNx+uiMH/Y=
 github.com/olekukonko/tablewriter v0.0.2-0.20190618033246-cc27d85e17ce/go.mod h1:rSAaSIOAGT9odnlyGlUfAJaoc5w2fSBUmeGDbRWPxyQ=
+github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
+github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
+github.com/onsi/gomega v1.4.1/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
+github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
 github.com/peterh/liner v1.2.1 h1:O4BlKaq/LWu6VRWmol4ByWfzx6MfXc5Op5HETyIy5yg=
 github.com/peterh/liner v1.2.1/go.mod h1:CRroGNssyjTd/qIG2FyxByd2S8JEAZXBl4qUrZf8GS0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
@@ -65,32 +98,34 @@ 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.1 h1:MRxKpCDhLigoHJANAVXq1K7QphwRGWz+GycDNgOWE1k=
-github.com/tickstep/aliyunpan-api v0.1.1/go.mod h1:ZFtMpbmVPM6+zWRTQ7QHw6xzwN/WTm3zaxQjFZ54UAA=
-github.com/tickstep/bolt v1.3.3 h1:3abb88T5JJocnBlYTJE3EqKvwWV6+D/JZD2Fsdt1QHI=
-github.com/tickstep/bolt v1.3.3/go.mod h1:Y24RwCywbOsKAyHiVcJ4K2QQfED+q67x7PEOH9OG7Q4=
-github.com/tickstep/library-go v0.0.5 h1:MBb1tsvs4Wi67zy0E9eobVWLgsfPRLsqKAEdSEi3LBE=
-github.com/tickstep/library-go v0.0.5/go.mod h1:egoK/RvOJ3Qs2tHpkq374CWjhNjI91JSCCG1GrhDYSw=
+github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
+github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/tickstep/aliyunpan-api v0.2.2 h1:u1DS6wAg5dZ1595Q55iNZ87/M5cQ21b9/9B5twl9GJo=
+github.com/tickstep/aliyunpan-api v0.2.2/go.mod h1:uMYRMWJO8mEAW6nRkw/QnathYFzQ8AL8kKO/cdMt058=
+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.2 h1:iewbEZBl5+aWeL9zcjVHVC4BXET4+9gwc52fuDC8MXQ=
+github.com/tickstep/library-go v0.1.2/go.mod h1:uAHeNOIpoywCzlaeLrWmmRSupn03m9kJVZKOEmuarmA=
 github.com/urfave/cli v1.21.1-0.20190817182405-23c83030263f h1:xKDKjIsL76VUyHcA0G4Qe1cIAUB/nrq6Pt8D411bd1g=
 github.com/urfave/cli v1.21.1-0.20190817182405-23c83030263f/go.mod h1:qXyCeJubPqsgeiLd3kvHOGHHSrQcNdjZ2ScXIcVZK/I=
+golang.org/x/crypto v0.0.0-20170930174604-9419663f5a44/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20200115085410-6d4e4cb37c7d/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a h1:kr2P4QFmQr29mSLA43kwrOcgcReGTfbE9N577tCTuBc=
 golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a/go.mod h1:P+XmwS30IXTQdn5tA2iutPOUgjI07+tq3H3K9MVA1s8=
+golang.org/x/net v0.0.0-20180719180050-a680a1efc54d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/net v0.0.0-20210614182718-04defd469f4e h1:XpT3nA5TvE525Ne3hInMh6+GETgn27Zfm9dxsThnX2Q=
-golang.org/x/net v0.0.0-20210614182718-04defd469f4e/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210423082822-04245dca01da h1:b3NXsE2LusjYGGjL5bxEVZZORm/YEFFrWFjR8eFrw/c=
-golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359 h1:2B5p2L5IfGiD7+b9BOoRMC6DgObAVZV+Fsp050NqXik=
+golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 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=
@@ -100,6 +135,9 @@ gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
 gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
+gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
+gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
+gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
 gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=

internal/command/album.go

@@ -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,13 +18,23 @@ import (
 	"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/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"
 )
 
@@ -43,10 +53,10 @@ func CmdAlbum() cli.Command {
 	return cli.Command{
 		Name:      "album",
 		Aliases:   []string{"abm"},
-		Usage:     "相簿(Beta)",
+		Usage:     "个人相册(Beta)",
 		UsageText: cmder.App().Name + " album",
 		Category:  "阿里云盘",
-		Before:    cmder.ReloadConfigFunc,
+		Before:    ReloadConfigFunc,
 		Action: func(c *cli.Context) error {
 			cli.ShowCommandHelp(c, c.Command.Name)
 			return nil
@@ -69,6 +79,10 @@ func CmdAlbum() cli.Command {
 						fmt.Println("未登录账号")
 						return nil
 					}
+					if config.Config.ActiveUser().PanClient().WebapiPanClient() == nil {
+						fmt.Println("WEB客户端未登录，请登录后再使用该命令")
+						return nil
+					}
 					RunAlbumList()
 					return nil
 				},
@@ -93,6 +107,10 @@ func CmdAlbum() cli.Command {
 						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
 				},
@@ -118,6 +136,10 @@ func CmdAlbum() cli.Command {
 						fmt.Println("未登录账号")
 						return nil
 					}
+					if config.Config.ActiveUser().PanClient().WebapiPanClient() == nil {
+						fmt.Println("WEB客户端未登录，请登录后再使用该命令")
+						return nil
+					}
 					RunAlbumDelete(c.Args())
 					return nil
 				},
@@ -140,6 +162,10 @@ func CmdAlbum() cli.Command {
 						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
 				},
@@ -162,6 +188,10 @@ func CmdAlbum() cli.Command {
 						fmt.Println("未登录账号")
 						return nil
 					}
+					if config.Config.ActiveUser().PanClient().WebapiPanClient() == nil {
+						fmt.Println("WEB客户端未登录，请登录后再使用该命令")
+						return nil
+					}
 					RunAlbumListFile(c.Args().Get(0))
 					return nil
 				},
@@ -184,6 +214,10 @@ func CmdAlbum() cli.Command {
 						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("请指定移除的文件")
@@ -214,6 +248,10 @@ func CmdAlbum() cli.Command {
 						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("请指定增加的文件")
@@ -224,13 +262,81 @@ func CmdAlbum() cli.Command {
 				},
 				Flags: []cli.Flag{},
 			},
+			{
+				Name:      "download-file",
+				Aliases:   []string{"df"},
+				Usage:     "下载相簿中的所有文件到本地",
+				UsageText: cmder.App().Name + " album download-file",
+				Description: `
+下载相簿中的所有文件
+示例:
+
+    下载相簿 "我的相簿2022" 里面的所有文件
+    aliyunpan album 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().AlbumListGetAll(&aliyunpan.AlbumListParam{})
+	records, err := activeUser.PanClient().WebapiPanClient().AlbumListGetAll(&aliyunpan_web.AlbumListParam{})
 	if err != nil {
 		fmt.Printf("获取相簿列表失败: %s\n", err)
 		return
@@ -253,7 +359,7 @@ func RunAlbumCreate(name, description string) {
 	}
 
 	activeUser := GetActiveUser()
-	_, err := activeUser.PanClient().AlbumCreate(&aliyunpan.AlbumCreateParam{
+	_, err := activeUser.PanClient().WebapiPanClient().AlbumCreate(&aliyunpan_web.AlbumCreateParam{
 		Name:        name,
 		Description: description,
 	})
@@ -271,7 +377,7 @@ func RunAlbumDelete(nameList []string) {
 	}
 
 	activeUser := GetActiveUser()
-	records, err := activeUser.PanClient().AlbumListGetAll(&aliyunpan.AlbumListParam{})
+	records, err := activeUser.PanClient().WebapiPanClient().AlbumListGetAll(&aliyunpan_web.AlbumListParam{})
 	if err != nil {
 		fmt.Printf("获取相簿列表失败: %s\n", err)
 		return
@@ -281,7 +387,7 @@ func RunAlbumDelete(nameList []string) {
 		for i, name := range nameList {
 			if name == record.Name {
 				nameList = append(nameList[:i], nameList[i+1:]...)
-				_, err := activeUser.PanClient().AlbumDelete(&aliyunpan.AlbumDeleteParam{
+				_, err := activeUser.PanClient().WebapiPanClient().AlbumDelete(&aliyunpan_web.AlbumDeleteParam{
 					AlbumId: record.AlbumId,
 				})
 				if err != nil {
@@ -296,8 +402,8 @@ func RunAlbumDelete(nameList []string) {
 	}
 }
 
-func getAlbumFromName(activeUser *config.PanUser, name string) *aliyunpan.AlbumEntity {
-	records, err := activeUser.PanClient().AlbumListGetAll(&aliyunpan.AlbumListParam{})
+func getAlbumFromName(activeUser *config.PanUser, name string) *aliyunpan_web.AlbumEntity {
+	records, err := activeUser.PanClient().WebapiPanClient().AlbumListGetAll(&aliyunpan_web.AlbumListParam{})
 	if err != nil {
 		fmt.Printf("获取相簿列表失败: %s\n", err)
 		return nil
@@ -326,7 +432,7 @@ func RunAlbumRename(name, newName string) {
 	if record == nil {
 		return
 	}
-	_, err := activeUser.PanClient().AlbumEdit(&aliyunpan.AlbumEditParam{
+	_, err := activeUser.PanClient().WebapiPanClient().AlbumEdit(&aliyunpan_web.AlbumEditParam{
 		AlbumId:     record.AlbumId,
 		Description: record.Description,
 		Name:        newName,
@@ -351,7 +457,7 @@ func RunAlbumListFile(name string) {
 		return
 	}
 
-	fileList, er := activeUser.PanClient().AlbumListFileGetAll(&aliyunpan.AlbumListFileParam{
+	fileList, er := activeUser.PanClient().WebapiPanClient().AlbumListFileGetAll(&aliyunpan_web.AlbumListFileParam{
 		AlbumId: record.AlbumId,
 	})
 	if er != nil {
@@ -377,14 +483,14 @@ func RunAlbumRmFile(name string, nameList []string) {
 		return
 	}
 
-	fileList, er := activeUser.PanClient().AlbumListFileGetAll(&aliyunpan.AlbumListFileParam{
+	fileList, er := activeUser.PanClient().WebapiPanClient().AlbumListFileGetAll(&aliyunpan_web.AlbumListFileParam{
 		AlbumId: album.AlbumId,
 	})
 	if er != nil {
 		fmt.Printf("获取相簿文件列表失败：%s\n", er)
 		return
 	}
-	param := &aliyunpan.AlbumDeleteFileParam{
+	param := &aliyunpan_web.AlbumDeleteFileParam{
 		AlbumId:       album.AlbumId,
 		DriveFileList: []aliyunpan.FileBatchActionParam{},
 	}
@@ -407,7 +513,7 @@ func RunAlbumRmFile(name string, nameList []string) {
 		return
 	}
 	// delete file
-	_, e := activeUser.PanClient().AlbumDeleteFile(param)
+	_, e := activeUser.PanClient().WebapiPanClient().AlbumDeleteFile(param)
 	if e != nil {
 		fmt.Printf("删除相簿文件失败：%s\n", e)
 		return
@@ -429,7 +535,7 @@ func RunAlbumAddFile(albumName string, filePathList []string, filterOption Album
 		return
 	}
 
-	paths, err := matchPathByShellPattern(activeUser.ActiveDriveId, filePathList...)
+	paths, err := makePathAbsolute(activeUser.ActiveDriveId, filePathList...)
 	if err != nil {
 		fmt.Println(err)
 		return
@@ -440,13 +546,13 @@ func RunAlbumAddFile(albumName string, filePathList []string, filterOption Album
 	}
 
 	fmt.Printf("正在获取增加的文件信息，该操作可能会非常耗费时间，请耐心等待...\n")
-	param := &aliyunpan.AlbumAddFileParam{
+	param := &aliyunpan_web.AlbumAddFileParam{
 		AlbumId:       album.AlbumId,
 		DriveFileList: []aliyunpan.FileBatchActionParam{},
 	}
 	for k := range paths {
 		filePath := paths[k]
-		fileInfo, apierr := activeUser.PanClient().FileInfoByPath(activeUser.ActiveDriveId, filePath)
+		fileInfo, apierr := activeUser.PanClient().WebapiPanClient().FileInfoByPath(activeUser.ActiveDriveId, filePath)
 		if apierr != nil {
 			fmt.Printf("获取文件信息失败: %s\n", filePath)
 			continue
@@ -458,7 +564,7 @@ func RunAlbumAddFile(albumName string, filePathList []string, filterOption Album
 			}
 		} else {
 			// folder
-			activeUser.PanClient().FilesDirectoriesRecurseList(activeUser.ActiveDriveId, fileInfo.Path, func(depth int, _ string, fd *aliyunpan.FileEntity, apiError *apierror.ApiError) bool {
+			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
@@ -480,7 +586,7 @@ func RunAlbumAddFile(albumName string, filePathList []string, filterOption Album
 		return
 	}
 	// add file
-	_, e := activeUser.PanClient().AlbumAddFile(param)
+	_, e := activeUser.PanClient().WebapiPanClient().AlbumAddFile(param)
 	if e != nil {
 		fmt.Printf("增加相簿文件失败：%s\n", e)
 		return
@@ -503,3 +609,179 @@ func isFileMatchCondition(fileInfo *aliyunpan.FileEntity, filterOption AlbumFile
 	}
 	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)
+			if RefreshWebTokenInNeed(activeUser, config.Config.DeviceName) {
+				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,
+				PrintFormat:          downloadPrintFormat(options.Load),
+				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()
+	}
+}

internal/command/cd.go

@@ -4,7 +4,7 @@
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
-//     http://www.apache.org/licenses/LICENSE-2.0
+//	http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
@@ -33,14 +33,17 @@ func CmdCd() cli.Command {
 	切换 /我的资源 工作目录:
 	aliyunpan cd /我的资源
 
+	切换 /我的资源 工作目录，使用通配符:
+	aliyunpan cd /我的*
+
 	切换上级目录:
 	aliyunpan cd ..
 
 	切换根目录:
 	aliyunpan cd /
 `,
-		Before: cmder.ReloadConfigFunc,
-		After:  cmder.SaveConfigFunc,
+		Before: ReloadConfigFunc,
+		After:  SaveConfigFunc,
 		Action: func(c *cli.Context) error {
 			if c.NArg() == 0 {
 				cli.ShowCommandHelp(c, c.Command.Name)
@@ -69,7 +72,7 @@ func CmdPwd() cli.Command {
 		Usage:     "输出工作目录",
 		UsageText: cmder.App().Name + " pwd",
 		Category:  "阿里云盘",
-		Before:    cmder.ReloadConfigFunc,
+		Before:    ReloadConfigFunc,
 		Action: func(c *cli.Context) error {
 			if config.Config.ActiveUser() == nil {
 				fmt.Println("未登录账号")
@@ -78,6 +81,8 @@ func CmdPwd() cli.Command {
 			activeUser := config.Config.ActiveUser()
 			if activeUser.IsFileDriveActive() {
 				fmt.Println(activeUser.Workdir)
+			} else if activeUser.IsResourceDriveActive() {
+				fmt.Println(activeUser.ResourceWorkdir)
 			} else if activeUser.IsAlbumDriveActive() {
 				fmt.Println(activeUser.AlbumWorkdir)
 			}
@@ -90,24 +95,52 @@ func RunChangeDirectory(driveId, targetPath string) {
 	user := config.Config.ActiveUser()
 	targetPath = user.PathJoin(driveId, targetPath)
 
-	targetPathInfo, err := user.PanClient().FileInfoByPath(driveId, targetPath)
+	// 获取目标路径文件信息
+	targetPathInfo, err := user.PanClient().OpenapiPanClient().FileInfoByPath(driveId, targetPath)
 	if err != nil {
 		fmt.Println(err)
 		return
 	}
 
+	// 适配通配符路径获取目标文件信息（弃用，容易触发风控）
+	//files, err := matchPathByShellPattern(driveId, targetPath)
+	//if err != nil {
+	//	fmt.Println(err)
+	//	return
+	//}
+	//
+	//var targetPathInfo *aliyunpan.FileEntity
+	//if len(files) == 1 {
+	//	targetPathInfo = files[0]
+	//} else {
+	//	for _, f := range files {
+	//		if f.IsFolder() {
+	//			targetPathInfo = f
+	//			break
+	//		}
+	//	}
+	//}
+
+	if targetPathInfo == nil {
+		fmt.Println("路径不存在")
+		return
+	}
+
 	if !targetPathInfo.IsFolder() {
-		fmt.Printf("错误: %s 不是一个目录 (文件夹)\n", targetPath)
+		fmt.Printf("错误: %s 不是一个目录 (文件夹)\n", targetPathInfo.Path)
 		return
 	}
 
 	if user.IsFileDriveActive() {
-		user.Workdir = targetPath
+		user.Workdir = targetPathInfo.Path
 		user.WorkdirFileEntity = *targetPathInfo
+	} else if user.IsResourceDriveActive() {
+		user.ResourceWorkdir = targetPathInfo.Path
+		user.ResourceWorkdirFileEntity = *targetPathInfo
 	} else if user.IsAlbumDriveActive() {
-		user.AlbumWorkdir = targetPath
+		user.AlbumWorkdir = targetPathInfo.Path
 		user.AlbumWorkdirFileEntity = *targetPathInfo
 	}
 
-	fmt.Printf("改变工作目录: %s\n", targetPath)
+	fmt.Printf("改变工作目录: %s\n", targetPathInfo.Path)
 }

internal/command/command.go

@@ -4,7 +4,7 @@
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
-//     http://www.apache.org/licenses/LICENSE-2.0
+//	http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
@@ -18,26 +18,13 @@ import (
 	"fmt"
 	"github.com/tickstep/aliyunpan/cmder"
 	"github.com/tickstep/aliyunpan/cmder/cmdutil"
+	"github.com/tickstep/aliyunpan/internal/config"
 	"github.com/tickstep/aliyunpan/library/crypto"
 	"github.com/tickstep/library-go/getip"
 	"github.com/urfave/cli"
-	"net/url"
-	"path"
-	"strconv"
-	"strings"
-
-	"github.com/tickstep/aliyunpan-api/aliyunpan"
-	"github.com/tickstep/aliyunpan/internal/config"
 )
 
-type (
-	// 秒传数据项
-	RapidUploadItem struct {
-		FileSha1 string
-		FileSize int64
-		FilePath string // 绝对路径，包含文件名
-	}
-)
+type ()
 
 const (
 	cryptoDescription = `
@@ -58,7 +45,7 @@ const (
 var ErrBadArgs = errors.New("参数错误")
 var ErrNotLogined = errors.New("未登录账号")
 
-func GetActivePanClient() *aliyunpan.PanClient {
+func GetActivePanClient() *config.PanClient {
 	return config.Config.ActiveUser().PanClient()
 }
 
@@ -74,96 +61,16 @@ func parseDriveId(c *cli.Context) string {
 	return driveId
 }
 
-// newRapidUploadItem 通过解析秒传链接创建秒传实体
-func newRapidUploadItem(rapidUploadShareLink string) (*RapidUploadItem, error) {
-	if strings.IndexAny(rapidUploadShareLink, "aliyunpan://") != 0 {
-		return nil, fmt.Errorf("秒传链接格式错误: %s", rapidUploadShareLink)
-	}
-
-	// 格式：aliyunpan://文件名|sha1|文件大小|<相对路径>
-	rapidUploadShareLinkStr := strings.Replace(rapidUploadShareLink, "aliyunpan://", "", 1)
-
-	item := &RapidUploadItem{}
-	parts := strings.Split(rapidUploadShareLinkStr, "|")
-
-	if len(parts) < 4 {
-		return nil, fmt.Errorf("秒传链接格式错误: %s", rapidUploadShareLink)
-	}
-
-	// hash
-	if len(parts[1]) == 0 {
-		return nil, fmt.Errorf("文件sha1错误: %s", rapidUploadShareLink)
-	}
-	item.FileSha1 = strings.TrimSpace(parts[1])
-
-	// size
-	if size,e := strconv.ParseInt(parts[2], 10, 64); e == nil{
-		item.FileSize = size
-	} else {
-		return nil, fmt.Errorf("文件大小错误: %s", rapidUploadShareLink)
-	}
-
-	// path
-	relativePath, _ := url.QueryUnescape(parts[3])
-	item.FilePath = path.Join(relativePath, parts[0])
-
-	// result
-	return item, nil
-}
-
-func newRapidUploadItemFromFileEntity(fileEntity *aliyunpan.FileEntity) *RapidUploadItem {
-	if fileEntity == nil {
-		return nil
-	}
-	return &RapidUploadItem{
-		FileSha1: fileEntity.ContentHash,
-		FileSize: fileEntity.FileSize,
-		FilePath: fileEntity.Path,
-	}
-}
-
-// 创建秒传链接
-// 链接格式说明：aliyunpan://文件名|sha1|文件大小|<相对路径>
-// "相对路径" 可以为空，为空代表存储到网盘根目录
-func (r *RapidUploadItem) createRapidUploadLink(hideRelativePath bool) string {
-	fullLink := &strings.Builder{}
-
-	p := r.FilePath
-	p = strings.ReplaceAll(p, "\\", "/")
-
-
-	fileName := path.Base(p)
-	dirPath := path.Dir(p)
-
-	// 去掉开头/
-	if strings.Index(dirPath, "/") == 0 {
-		dirPath = dirPath[1:]
-	}
-	// 相对路径编码
-	dirPath = url.QueryEscape(dirPath)
-
-	// 隐藏相对路径
-	if hideRelativePath {
-		dirPath = ""
-	}
-
-	// 拼接
-	fmt.Fprintf(fullLink, "aliyunpan://%s|%s|%d|%s",
-		fileName, strings.ToUpper(r.FileSha1), r.FileSize, dirPath)
-
-	return fullLink.String()
-}
-
 func CmdConfig() cli.Command {
 	return cli.Command{
 		Name:        "config",
 		Usage:       "显示和修改程序配置项",
 		Description: "显示和修改程序配置项",
 		Category:    "配置",
-		Before:      cmder.ReloadConfigFunc,
-		After:       cmder.SaveConfigFunc,
+		Before:      ReloadConfigFunc,
+		After:       SaveConfigFunc,
 		Action: func(c *cli.Context) error {
-			fmt.Printf("----\n运行 %s config set 可进行设置配置\n\n当前配置:\n", cmder.App().Name)
+			fmt.Printf("----\n当前配置目录: %s\n运行 %s config set 可进行设置配置\n\n当前配置:\n", config.GetConfigDir(), cmder.App().Name)
 			config.Config.PrintTable()
 			return nil
 		},
@@ -214,10 +121,6 @@ func CmdConfig() cli.Command {
 							return nil
 						}
 					}
-					if c.IsSet("transfer_url_type") {
-						config.Config.TransferUrlType = c.Int("transfer_url_type")
-					}
-
 					if c.IsSet("savedir") {
 						config.Config.SaveDir = c.String("savedir")
 					}
@@ -227,6 +130,15 @@ func CmdConfig() cli.Command {
 					if c.IsSet("local_addrs") {
 						config.Config.SetLocalAddrs(c.String("local_addrs"))
 					}
+					if c.IsSet("ip_type") {
+						config.Config.SetPreferIPType(c.String("ip_type"))
+					}
+					if c.IsSet("file_record_config") {
+						config.Config.SetFileRecorderConfig(c.String("file_record_config"))
+					}
+					if c.IsSet("device_id") {
+						config.Config.SetDeviceId(c.String("device_id"))
+					}
 
 					err := config.Config.Save()
 					if err != nil {
@@ -260,11 +172,6 @@ func CmdConfig() cli.Command {
 						Name:  "max_upload_rate",
 						Usage: "限制最大上传速度, 0代表不限制",
 					},
-					cli.IntFlag{
-						Name:  "transfer_url_type",
-						Usage: "上传下载URL类别，1-默认，2-阿里云ECS",
-						Value: 1,
-					},
 					cli.StringFlag{
 						Name:  "savedir",
 						Usage: "下载文件的储存目录",
@@ -277,13 +184,24 @@ func CmdConfig() cli.Command {
 						Name:  "local_addrs",
 						Usage: "设置本地网卡地址, 多个地址用逗号隔开",
 					},
+					cli.StringFlag{
+						Name:  "ip_type",
+						Usage: "设置域名解析IP优先类型",
+					},
+					cli.StringFlag{
+						Name:  "file_record_config",
+						Usage: "设置是否开启上传、下载、同步文件的结果记录功能",
+					},
+					cli.StringFlag{
+						Name:  "device_id",
+						Usage: "设置客户端ID，24位的字符串",
+					},
 				},
 			},
 		},
 	}
 }
 
-
 func CmdTool() cli.Command {
 	return cli.Command{
 		Name:  "tool",

internal/command/command_test.go

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

internal/command/cp.go

@@ -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("无法复制文件，请稍后重试")
+	}
+}

internal/command/download.go

@@ -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,6 +20,7 @@ import (
 	"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/log"
 	"github.com/tickstep/aliyunpan/internal/taskframework"
 	"github.com/tickstep/aliyunpan/internal/utils"
 	"github.com/tickstep/aliyunpan/library/requester/transfer"
@@ -31,7 +32,6 @@ import (
 	"path"
 	"path/filepath"
 	"runtime"
-	"time"
 )
 
 type (
@@ -41,13 +41,15 @@ type (
 		IsExecutedPermission bool
 		IsOverwrite          bool
 		SaveTo               string
-		Parallel             int
+		Parallel             int // 文件下载最大线程数
+		SliceParallel        int // 单个文件分片下载最大线程数
 		Load                 int
 		MaxRetry             int
 		NoCheck              bool
 		ShowProgress         bool
 		DriveId              string
-		UseInternalUrl       bool // 是否使用内置链接
+		ExcludeNames         []string // 排除的文件名，包括文件夹和文件。即这些文件/文件夹不进行下载，支持正则表达式
+		IsMultiUserDownload  bool     // 是否启用多用户联合下载
 	}
 
 	// LocateDownloadOption 获取下载链接可选参数
@@ -72,12 +74,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
@@ -85,16 +84,33 @@ func CmdDownload() cli.Command {
 	aliyunpan config set -savedir D:/Downloads
 
 	下载 /我的资源/1.mp4
-	aliyunpan d /我的资源/1.mp4
+	aliyunpan download /我的资源/1.mp4
+
+	下载 /我的资源 目录下面所有的mp4文件，使用通配符
+	aliyunpan download /我的资源/*.mp4
 
 	下载 /我的资源 整个目录!!
-	aliyunpan d /我的资源
+	aliyunpan download /我的资源
 
-    下载 /我的资源/1.mp4 并保存下载的文件到本地的 d:/panfile
-	aliyunpan d --saveto d:/panfile /我的资源/1.mp4
+	下载 /我的资源 整个目录，但是排除所有的jpg文件
+	aliyunpan download -exn "\.jpg$" /我的资源
+
+	下载 /我的资源/1.mp4 并保存下载的文件到本地的 d:/panfile
+	aliyunpan download --saveto d:/panfile /我的资源/1.mp4
+	
+	使用多用户联合下载 /我的资源/1.mp4 文件。必须保证所有登录的用户在相同的网盘（备份盘/资源盘）下，相同的路径下，有相同的文件
+	aliyunpan download /我的资源/1.mp4 -md
+	
+  参考：
+    以下是典型的排除特定文件或者文件夹的例子，注意：参数值必须是正则表达式。在正则表达式中，^表示匹配开头，$表示匹配结尾。
+    1)排除@eadir文件或者文件夹：-exn "^@eadir$"
+    2)排除.jpg文件：-exn "\.jpg$"
+    3)排除.号开头的文件：-exn "^\."
+    4)排除~号开头的文件：-exn "^~"
+    5)排除 myfile.txt 文件：-exn "^myfile.txt$"
 `,
 		Category: "阿里云盘",
-		Before:   cmder.ReloadConfigFunc,
+		Before:   ReloadConfigFunc,
 		Action: func(c *cli.Context) error {
 			if c.NArg() == 0 {
 				cli.ShowCommandHelp(c, c.Command.Name)
@@ -119,14 +135,30 @@ func CmdDownload() cli.Command {
 				IsOverwrite:          c.Bool("ow"),
 				SaveTo:               saveTo,
 				Parallel:             c.Int("p"),
+				SliceParallel:        3,
 				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"),
 			}
 
+			// 获取下载文件锁，保证下载操作单实例
+			//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{
@@ -152,8 +184,14 @@ 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: 1,
+			//},
 			cli.IntFlag{
 				Name:  "retry",
 				Usage: "下载失败最大重试次数",
@@ -172,6 +210,15 @@ func CmdDownload() cli.Command {
 				Usage: "网盘ID",
 				Value: "",
 			},
+			cli.StringSliceFlag{
+				Name:  "exn",
+				Usage: "exclude name，指定排除的文件夹或者文件的名称，被排除的文件不会进行下载，只支持正则表达式。支持同时排除多个名称，每一个名称就是一个exn参数",
+				Value: nil,
+			},
+			cli.BoolFlag{
+				Name:  "md",
+				Usage: "(BETA) Multi-User Download，使用多用户联合下载，可以对单一文件叠加所有登录用户的下载速度",
+			},
 		},
 	}
 }
@@ -186,18 +233,24 @@ func downloadPrintFormat(load int) string {
 // RunDownload 执行下载网盘内文件
 func RunDownload(paths []string, options *DownloadOptions) {
 	activeUser := GetActiveUser()
-	activeUser.PanClient().EnableCache()
-	activeUser.PanClient().ClearCache()
-	defer activeUser.PanClient().DisableCache()
-	// pan token expired checker
-	go func() {
-		for {
-			time.Sleep(time.Duration(1) * time.Minute)
-			if RefreshTokenInNeed(activeUser) {
-				logger.Verboseln("update access token for download task")
-			}
-		}
-	}()
+	activeUser.PanClient().OpenapiPanClient().EnableCache()
+	activeUser.PanClient().OpenapiPanClient().ClearCache()
+	defer activeUser.PanClient().OpenapiPanClient().DisableCache()
+
+	//// pan token expired checker
+	//continueFlag := int32(0)
+	//atomic.StoreInt32(&continueFlag, 0)
+	//defer func() {
+	//	atomic.StoreInt32(&continueFlag, 1)
+	//}()
+	//go func(flag *int32) {
+	//	for atomic.LoadInt32(flag) == 0 {
+	//		time.Sleep(time.Duration(1) * time.Minute)
+	//		if RefreshWebTokenInNeed(activeUser, config.Config.DeviceName) {
+	//			logger.Verboseln("update access token for download task")
+	//		}
+	//	}
+	//}(&continueFlag)
 
 	if options == nil {
 		options = &DownloadOptions{}
@@ -220,7 +273,7 @@ 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 {
 		cfg.CacheSize = int(DownloadCacheSize)
@@ -237,6 +290,11 @@ func RunDownload(paths []string, options *DownloadOptions) {
 		options.Parallel = config.MaxFileDownloadParallelNum
 	}
 
+	// 设置单个文件下载分片线程数
+	if options.SliceParallel < 1 {
+		options.SliceParallel = 1
+	}
+
 	// 保存文件的本地根文件夹
 	originSaveRootPath := ""
 	if options.SaveTo != "" {
@@ -255,18 +313,57 @@ func RunDownload(paths []string, options *DownloadOptions) {
 		}
 	}
 
-	paths, err := matchPathByShellPattern(options.DriveId, paths...)
+	paths, err := makePathAbsolute(options.DriveId, paths...)
 	if err != nil {
 		fmt.Println(err)
 		return
 	}
 
-	fmt.Printf("\n[0] 当前文件下载最大并发量为: %d, 下载缓存为: %s\n\n", options.Parallel, converter.ConvertFileSize(int64(cfg.CacheSize), 2))
+	// 多用户下载的辅助账号列表
+	var subPanClientList []*config.PanClient
+	if options.IsMultiUserDownload { // 多用户下载
+		c := config.Config
+		for _, u := range config.Config.UserList {
+			if u.UserId == activeUser.UserId {
+				// 当前登录用户，作为主用户，跳过
+				continue
+			}
+			// 初始化客户端
+			user, err := config.SetupUserByCookie(u.OpenapiToken, u.WebapiToken,
+				u.TicketId, u.UserId,
+				c.DeviceId, c.DeviceName,
+				c.ClientId, c.ClientSecret)
+			if err != nil {
+				logger.Verboseln("setup user error")
+				continue
+			}
+			if subPanClientList == nil {
+				subPanClientList = []*config.PanClient{}
+			}
+			subPanClientList = append(subPanClientList, user.PanClient())
+		}
+
+		if subPanClientList == nil || len(subPanClientList) == 0 {
+			fmt.Printf("\n当前登录用户只有一个，无法启用多用户联合下载\n")
+			subPanClientList = nil
+		}
+	}
+	if subPanClientList != nil || len(subPanClientList) > 0 {
+		// 已启用多用户下载
+		userCount := len(subPanClientList) + 1
+		fmt.Printf("\n*** 已启用多用户联合下载，用户数: %d ***\n", userCount)
+		// 多用户下载，并发数必须为1，以获得最大下载速度
+		options.Parallel = 1
+		// 阿里OpenAPI规定：文件分片下载的并发数为3，即某用户使用 App 时，可以同时下载 1 个文件的 3 个分片，或者同时下载 3 个文件的各 1 个分片。
+		options.SliceParallel = userCount * 3
+	}
+	fmt.Printf("\n[0] 当前文件下载最大并发量为: %d, 单文件下载分片线程数为: %d, 下载缓存为: %s\n", options.Parallel, options.SliceParallel, converter.ConvertFileSize(int64(cfg.CacheSize), 2))
 
 	var (
 		panClient = activeUser.PanClient()
 	)
 	cfg.MaxParallel = options.Parallel
+	cfg.SliceParallel = options.SliceParallel
 
 	var (
 		executor = taskframework.TaskExecutor{
@@ -280,36 +377,62 @@ func RunDownload(paths []string, options *DownloadOptions) {
 	// 全局速度统计
 	globalSpeedsStat := &speeds.Speeds{}
 
+	// 下载记录器
+	fileRecorder := log.NewFileRecorder(config.GetLogDir() + "/download_file_records.csv")
+
 	// 处理队列
 	for k := range paths {
-		newCfg := *cfg
-		unit := pandownload.DownloadTaskUnit{
-			Cfg:                  &newCfg, // 复制一份新的cfg
-			PanClient:            panClient,
-			VerbosePrinter:       panCommandVerbose,
-			PrintFormat:          downloadPrintFormat(options.Load),
-			ParentTaskExecutor:   &executor,
-			DownloadStatistic:    statistic,
-			IsPrintStatus:        options.IsPrintStatus,
-			IsExecutedPermission: options.IsExecutedPermission,
-			IsOverwrite:          options.IsOverwrite,
-			NoCheck:              options.NoCheck,
-			FilePanPath:          paths[k],
-			DriveId:              options.DriveId,
-			GlobalSpeedsStat:     globalSpeedsStat,
+		// 使用通配符匹配
+		fileList, err2 := matchPathByShellPattern(options.DriveId, paths[k])
+		if err2 != nil {
+			fmt.Printf("获取文件出错，请稍后重试: %s\n", paths[k])
+			continue
 		}
+		if fileList == nil || len(fileList) == 0 {
+			// 文件不存在
+			fmt.Printf("文件不存在: %s\n", paths[k])
+			continue
+		}
+		for _, f := range fileList {
+			newCfg := *cfg
 
-		// 设置储存的路径
-		if options.SaveTo != "" {
-			unit.OriginSaveRootPath = options.SaveTo
-			unit.SavePath = filepath.Join(options.SaveTo, paths[k])
-		} else {
-			// 使用默认的保存路径
-			unit.OriginSaveRootPath = GetActiveUser().GetSavePath("")
-			unit.SavePath = GetActiveUser().GetSavePath(paths[k])
+			// 是否排除下载
+			if utils.IsExcludeFile(f.Path, &newCfg.ExcludeNames) {
+				fmt.Printf("排除文件: %s\n", f.Path)
+				continue
+			}
+
+			// 匹配的文件
+			unit := pandownload.DownloadTaskUnit{
+				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,
+				FilePanPath:          f.Path,
+				DriveId:              options.DriveId,
+				GlobalSpeedsStat:     globalSpeedsStat,
+				FileRecorder:         fileRecorder,
+			}
+
+			// 设置储存的路径
+			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)
 		}
-		info := executor.Append(&unit, options.MaxRetry)
-		fmt.Printf("[%s] 加入下载队列: %s\n", info.Id(), paths[k])
 	}
 
 	// 开始计时

internal/command/drive_list.go

@@ -4,7 +4,7 @@
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
-//     http://www.apache.org/licenses/LICENSE-2.0
+//	http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,6 @@ import (
 	"fmt"
 	"github.com/olekukonko/tablewriter"
 	"github.com/tickstep/aliyunpan-api/aliyunpan"
-	"github.com/tickstep/aliyunpan/cmder"
 	"github.com/tickstep/aliyunpan/cmder/cmdtable"
 	"github.com/tickstep/aliyunpan/internal/config"
 	"github.com/urfave/cli"
@@ -28,9 +27,9 @@ import (
 func CmdDrive() cli.Command {
 	return cli.Command{
 		Name:  "drive",
-		Usage: "切换网盘（文件网盘/相册网盘）",
+		Usage: "切换网盘（备份盘/资源库）",
 		Description: `
-	切换已登录的阿里云盘的云工作网盘（文件网盘/相册网盘）
+	切换已登录账号的阿里云盘的工作网盘（备份盘/资源库）
 	如果运行该条命令没有提供参数, 程序将会列出所有的网盘列表, 供选择切换.
 
 	示例:
@@ -38,8 +37,8 @@ func CmdDrive() cli.Command {
 	aliyunpan drive <driveId>
 `,
 		Category: "阿里云盘账号",
-		Before:   cmder.ReloadConfigFunc,
-		After:    cmder.SaveConfigFunc,
+		Before:   ReloadConfigFunc,
+		After:    SaveConfigFunc,
 		Action: func(c *cli.Context) error {
 			inputData := c.Args().Get(0)
 			targetDriveId := strings.TrimSpace(inputData)
@@ -101,6 +100,11 @@ func RunSwitchDriveList(targetDriveId string) {
 				config.Config.ActiveUser().Workdir = "/"
 				config.Config.ActiveUser().WorkdirFileEntity = *aliyunpan.NewFileEntityForRootDir()
 			}
+		} else if activeUser.IsResourceDriveActive() {
+			if activeUser.ResourceWorkdir == "" {
+				config.Config.ActiveUser().ResourceWorkdir = "/"
+				config.Config.ActiveUser().ResourceWorkdirFileEntity = *aliyunpan.NewFileEntityForRootDir()
+			}
 		} else if activeUser.IsAlbumDriveActive() {
 			if activeUser.AlbumWorkdir == "" {
 				config.Config.ActiveUser().AlbumWorkdir = "/"
@@ -121,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()

internal/command/export_file.go

@@ -1,152 +0,0 @@
-// Copyright (c) 2020 tickstep.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-package command
-
-import (
-	"fmt"
-	"github.com/tickstep/aliyunpan-api/aliyunpan"
-	"github.com/tickstep/aliyunpan-api/aliyunpan/apierror"
-	"github.com/tickstep/aliyunpan/cmder"
-	"github.com/tickstep/aliyunpan/internal/config"
-	"github.com/tickstep/library-go/logger"
-	"github.com/urfave/cli"
-	"log"
-	"os"
-	"path"
-	"strconv"
-	"time"
-)
-
-
-func CmdExport() cli.Command {
-	return cli.Command{
-		Name:      "export",
-		Usage:     "导出文件/目录元数据",
-		UsageText: cmder.App().Name + " export <网盘文件/目录的路径1> <文件/目录2> <文件/目录3> ... <本地保存文件路径>",
-		Description: `
-	导出指定文件/目录下面的所有文件的元数据信息，并保存到指定的本地文件里面。导出的文件元信息可以使用 import 命令（秒传文件功能）导入到网盘中。
-	支持多个文件或目录的导出.
-
-	示例:
-
-	导出 /我的资源/1.mp4 元数据到文件 /Users/tickstep/Downloads/export_files.txt
-	aliyunpan export /我的资源/1.mp4 /Users/tickstep/Downloads/export_files.txt
-
-	导出 /我的资源 整个目录 元数据到文件 /Users/tickstep/Downloads/export_files.txt
-	aliyunpan export /我的资源 /Users/tickstep/Downloads/export_files.txt
-
-    导出 网盘 整个目录 元数据到文件 /Users/tickstep/Downloads/export_files.txt
-	aliyunpan export / /Users/tickstep/Downloads/export_files.txt
-`,
-		Category: "阿里云盘",
-		Before:   cmder.ReloadConfigFunc,
-		Action: func(c *cli.Context) error {
-			if c.NArg() < 2 {
-				cli.ShowCommandHelp(c, c.Command.Name)
-				return nil
-			}
-
-			subArgs := c.Args()
-			RunExportFiles(parseDriveId(c), c.Bool("ow"), subArgs[:len(subArgs)-1], subArgs[len(subArgs)-1])
-			return nil
-		},
-		Flags: []cli.Flag{
-			cli.BoolFlag{
-				Name:  "ow",
-				Usage: "overwrite, 覆盖已存在的导出文件",
-			},
-			cli.StringFlag{
-				Name:  "driveId",
-				Usage: "网盘ID",
-				Value: "",
-			},
-		},
-	}
-}
-
-
-func RunExportFiles(driveId string, overwrite bool, panPaths []string, saveLocalFilePath string) {
-	activeUser := config.Config.ActiveUser()
-	panClient := activeUser.PanClient()
-
-	lfi,_ := os.Stat(saveLocalFilePath)
-	realSaveFilePath := saveLocalFilePath
-	if lfi != nil {
-		if lfi.IsDir() {
-			realSaveFilePath = path.Join(saveLocalFilePath, "export_file_") + strconv.FormatInt(time.Now().Unix(), 10) + ".txt"
-		} else {
-			if !overwrite {
-				fmt.Println("导出文件已存在")
-				return
-			}
-		}
-	} else {
-		// create file
-		localDir := path.Dir(saveLocalFilePath)
-		dirFs,_ := os.Stat(localDir)
-		if dirFs != nil {
-			if !dirFs.IsDir() {
-				fmt.Println("指定的保存文件路径不合法")
-				return
-			}
-		} else {
-			er := os.MkdirAll(localDir, 0755)
-			if er != nil {
-				fmt.Println("创建本地文件夹出错")
-				return
-			}
-		}
-		realSaveFilePath = saveLocalFilePath
-	}
-
-	totalCount := 0
-	saveFile, err := os.OpenFile(realSaveFilePath, os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0755)
-	if err != nil {
-		log.Fatal(err)
-		return
-	}
-
-	for _,panPath := range panPaths {
-		panPath = activeUser.PathJoin(driveId, panPath)
-		panClient.FilesDirectoriesRecurseList(driveId, panPath, func(depth int, _ string, fd *aliyunpan.FileEntity, apiError *apierror.ApiError) bool {
-			if apiError != nil {
-				logger.Verbosef("%s\n", apiError)
-				return true
-			}
-
-			// 只需要存储文件即可
-			if !fd.IsFolder() {
-				item := newRapidUploadItemFromFileEntity(fd)
-				jstr := item.createRapidUploadLink(false)
-				if len(jstr) <= 0 {
-					logger.Verboseln("create rapid upload link err")
-					return false
-				}
-				saveFile.WriteString(jstr + "\n")
-				totalCount += 1
-				time.Sleep(time.Duration(100) * time.Millisecond)
-				fmt.Printf("\r导出文件数量: %d", totalCount)
-			}
-			return true
-		})
-	}
-
-	// close and save
-	if err := saveFile.Close(); err != nil {
-		log.Fatal(err)
-	}
-
-	fmt.Printf("\r导出文件总数量: %d\n", totalCount)
-	fmt.Printf("导出文件保存路径: %s\n", realSaveFilePath)
-}

internal/command/import_file.go

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

internal/command/locate.go

@@ -1,186 +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
-
-	获取 /我的资源 目录下面所有文件的下载直链并保存到本地文件 /Volumes/Downloads/file_url.txt 中
-	aliyunpan locate -saveto "/Volumes/Downloads/file_url.txt" /我的资源
-`,
-		Category: "阿里云盘",
-		Before:   cmder.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 := matchPathByShellPattern(driveId, paths...)
-	if err != nil {
-		fmt.Println(err)
-		return
-	}
-	fileEntityQueue := collection.NewFifoQueue()
-	sb := &strings.Builder{}
-	failedList := []string{}
-	for _, p := range paths {
-		if fileInfo, e := activeUser.PanClient().FileInfoByPath(driveId, p); e == nil {
-			fileInfo.Path = p
-			fileEntityQueue.Push(fileInfo)
-		} else {
-			failedList = append(failedList, p)
-		}
-	}
-
-	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()
-	}
-}

internal/command/login.go

@@ -4,7 +4,7 @@
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
-//     http://www.apache.org/licenses/LICENSE-2.0
+//	http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,15 +15,13 @@ package command
 
 import (
 	"fmt"
-	"github.com/tickstep/aliyunpan-api/aliyunpan"
-	"github.com/tickstep/aliyunpan/cmder"
 	"github.com/tickstep/aliyunpan/cmder/cmdliner"
 	"github.com/tickstep/aliyunpan/internal/config"
 	"github.com/tickstep/aliyunpan/internal/functions/panlogin"
-	"github.com/tickstep/library-go/logger"
+	"github.com/tickstep/aliyunpan/internal/global"
 	_ "github.com/tickstep/library-go/requester"
 	"github.com/urfave/cli"
-	"time"
+	"strings"
 )
 
 func CmdLogin() cli.Command {
@@ -35,55 +33,36 @@ func CmdLogin() cli.Command {
 		1.常规登录，按提示一步一步来即可
 		aliyunpan login
 
-		2.直接指定RefreshToken进行登录
-		aliyunpan login -RefreshToken=8B12CBBCE89CA8DFC3445985B63B511B5E7EC7...
-
-		3.使用二维码方式进行登录
-		aliyunpan login -QrCode
 `,
 		Category: "阿里云盘账号",
-		Before:   cmder.ReloadConfigFunc, // 每次进行登录动作的时候需要调用刷新配置
-		After:    cmder.SaveConfigFunc,   // 登录完成需要调用保存配置
+		Before:   ReloadConfigFunc, // 每次进行登录动作的时候需要调用刷新配置
+		After:    SaveConfigFunc,   // 登录完成需要调用保存配置
 		Action: func(c *cli.Context) error {
-			refreshTokenStr := ""
-			if refreshTokenStr == "" {
-				refreshTokenStr = c.String("RefreshToken")
-			}
-			useQrCode := c.Bool("QrCode")
-
-			tokenId := ""
-			webToken := aliyunpan.WebLoginToken{}
-			refreshToken := ""
+			ticketId := ""
+			openToken := &config.PanClientToken{}
+			webToken := &config.PanClientToken{}
 			var err error
-			tokenId, refreshToken, webToken, err = RunLogin(useQrCode, refreshTokenStr)
+			ticketId, openToken, webToken, err = RunLogin()
 			if err != nil {
 				fmt.Println(err)
 				return err
 			}
 
-			cloudUser, err := config.SetupUserByCookie(&webToken)
+			cloudUser, err := config.SetupUserByCookie(openToken, webToken,
+				ticketId, "",
+				config.Config.DeviceId, config.Config.DeviceName,
+				config.Config.ClientId, config.Config.ClientSecret)
 			if cloudUser == nil {
 				fmt.Println("登录失败: ", err)
 				return nil
 			}
-			cloudUser.RefreshToken = refreshToken
-			cloudUser.TokenId = tokenId
+			cloudUser.TicketId = ticketId
 			config.Config.SetActiveUser(cloudUser)
 			fmt.Println("阿里云盘登录成功: ", cloudUser.Nickname)
 			return nil
 		},
 		// 命令的附加options参数说明，使用 help panlogin 命令即可查看
-		Flags: []cli.Flag{
-			// aliyunpan panlogin -RefreshToken=8B12CBBCE89CA8DFC3445985B63B511B5E7EC7...
-			cli.StringFlag{
-				Name:  "RefreshToken",
-				Usage: "使用RefreshToken Cookie来登录帐号",
-			},
-			cli.BoolFlag{
-				Name:  "QrCode",
-				Usage: "使用二维码登录",
-			},
-		},
+		Flags: []cli.Flag{},
 	}
 }
 
@@ -93,8 +72,8 @@ func CmdLogout() cli.Command {
 		Usage:       "退出阿里帐号",
 		Description: "退出当前登录的帐号",
 		Category:    "阿里云盘账号",
-		Before:      cmder.ReloadConfigFunc,
-		After:       cmder.SaveConfigFunc,
+		Before:      ReloadConfigFunc,
+		After:       SaveConfigFunc,
 		Action: func(c *cli.Context) error {
 			if config.Config.NumLogins() == 0 {
 				fmt.Println("未设置任何帐号, 不能退出")
@@ -117,6 +96,12 @@ func CmdLogout() cli.Command {
 				}
 			}
 
+			// 云端注销登录
+			//if _, e := activeUser.PanClient().WebapiPanClient().DeviceLogout(); e != nil {
+			//	fmt.Printf("登出设备失败，请手动在网页端进行登出: %s\n", e.String())
+			//}
+
+			// 删除用户信息
 			deletedUser, err := config.Config.DeleteUser(activeUser.UserId)
 			if err != nil {
 				fmt.Printf("退出用户 %s, 失败, 错误: %s\n", activeUser.Nickname, err)
@@ -134,53 +119,46 @@ func CmdLogout() cli.Command {
 	}
 }
 
-func RunLogin(useQrCodeLogin bool, refreshToken string) (tokenId, refreshTokenStr string, webToken aliyunpan.WebLoginToken, error error) {
-	if useQrCodeLogin {
-		h := panlogin.NewLoginHelper(config.DefaultTokenServiceWebHost)
-		qrCodeUrlResult, err := h.GetQRCodeLoginUrl("")
-		if err != nil {
-			fmt.Println("二维码登录错误：", err)
-			return "", "", aliyunpan.WebLoginToken{}, err
-		}
-		fmt.Printf("请在浏览器打开以下链接进行扫码登录，链接有效时间为5分钟\n%s\n\n", qrCodeUrlResult.TokenUrl)
+func RunLogin() (ticketId string, openapiToken, webapiToken *config.PanClientToken, error error) {
+	h := panlogin.NewLoginHelper(config.DefaultTokenServiceWebHost)
 
-		// handler waiting
-		line := cmdliner.NewLiner()
-		var qrCodeLoginResult *panlogin.QRCodeLoginResult
-		defer line.Close()
+	// web login request
+	qrCodeUrlResult, err := h.GetQRCodeLoginUrl("")
+	if err != nil {
+		fmt.Println("登录出错：", err)
+		return "", nil, nil, err
+	}
+	ticketId = qrCodeUrlResult.TokenId
+	loginUrl := &strings.Builder{}
+	if global.IsSupportNoneOpenApiCommands {
+		// 兼容以前的版本
+		fmt.Fprintf(loginUrl, "https://openapi.alipan.com/oauth/authorize?client_id=%s&redirect_uri=https%%3A%%2F%%2Fapi.tickstep.com%%2Fauth%%2Ftickstep%%2Faliyunpan%%2Ftoken%%2Fopenapi%%2F%s%%2Fauth&scope=user:base,file:all:read,file:all:write",
+			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",
+			config.Config.ClientId, ticketId)
+	}
+	fmt.Printf("请在浏览器打开以下链接进行登录，链接有效时间为5分钟。\n注意：你需要进行一次授权一次扫码的两次登录。\n%s\n\n", loginUrl)
 
-		go func() {
-			for {
-				time.Sleep(3 * time.Second)
-				qr, er := h.GetQRCodeLoginResult(qrCodeUrlResult.TokenId)
-				if er != nil {
-					continue
-				}
-				logger.Verboseln(qr)
-				if qr.QrCodeStatus == "CONFIRMED" {
-					// login successfully
-					qrCodeLoginResult = qr
-					break
-				} else if qr.QrCodeStatus == "EXPIRED" {
-					break
-				}
-			}
-		}()
+	// handler waiting
+	line := cmdliner.NewLiner()
+	defer line.Close()
+	line.State.Prompt("请在浏览器里面完成扫码登录，然后再按Enter键继续...")
 
-		line.State.Prompt("请在浏览器里面完成扫码登录，然后再按Enter键继续...")
-		if qrCodeLoginResult == nil {
-			return "", "", aliyunpan.WebLoginToken{}, fmt.Errorf("二维码登录失败")
-		}
-
-		tokenStr, er := h.ParseSecureRefreshToken("", qrCodeLoginResult.SecureRefreshToken)
-		if er != nil {
-			fmt.Println("解析Token错误：", er)
-			return "", "", aliyunpan.WebLoginToken{}, er
-		}
-		refreshToken = tokenStr
-		tokenId = qrCodeUrlResult.TokenId
+	// get login token
+	comToken, er := h.GetLoginToken(ticketId)
+	if er != nil {
+		return ticketId, nil, nil, fmt.Errorf("登录失败，请稍后尝试重新登录")
 	}
 
-	refreshTokenStr, webToken, error = cmder.DoLoginHelper(refreshToken)
-	return
+	return ticketId,
+		&config.PanClientToken{
+			AccessToken: comToken.Openapi.AccessToken,
+			Expired:     comToken.Openapi.Expired,
+		},
+		&config.PanClientToken{
+			AccessToken: comToken.Webapi.AccessToken,
+			Expired:     comToken.Webapi.Expired,
+		},
+		nil
 }

internal/command/ls_search.go

@@ -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,
@@ -21,7 +21,6 @@ import (
 	"github.com/tickstep/aliyunpan/cmder/cmdtable"
 	"github.com/tickstep/aliyunpan/internal/config"
 	"github.com/tickstep/library-go/converter"
-	"github.com/tickstep/library-go/text"
 	"github.com/urfave/cli"
 	"os"
 	"strconv"
@@ -62,11 +61,14 @@ func CmdLs() cli.Command {
 	绝对路径
 	aliyunpan ls /我的资源
 
+	列出 我的资源 内的文件和目录，使用通配符
+	aliyunpan ls /我的*
+
 	详细列出 我的资源 内的文件和目录
 	aliyunpan ll /我的资源
 `,
 		Category: "阿里云盘",
-		Before:   cmder.ReloadConfigFunc,
+		Before:   ReloadConfigFunc,
 		Action: func(c *cli.Context) error {
 			if config.Config.ActiveUser() == nil {
 				fmt.Println("未登录账号")
@@ -138,16 +140,37 @@ func RunLs(driveId, targetPath string, lsOptions *LsOptions,
 	orderBy aliyunpan.FileOrderBy, orderDirection aliyunpan.FileOrderDirection) {
 	activeUser := config.Config.ActiveUser()
 	targetPath = activeUser.PathJoin(driveId, targetPath)
-	if targetPath[len(targetPath)-1] == '/' {
-		targetPath = text.Substr(targetPath, 0, len(targetPath)-1)
-	}
 
-	targetPathInfo, err := activeUser.PanClient().FileInfoByPath(driveId, targetPath)
+	// 获取目标路径文件信息
+	targetPathInfo, err := activeUser.PanClient().OpenapiPanClient().FileInfoByPath(driveId, targetPath)
 	if err != nil {
 		fmt.Println(err)
 		return
 	}
 
+	// 适配通配符路径获取目标文件信息（弃用，容易触发风控）
+	//files, err := matchPathByShellPattern(driveId, targetPath)
+	//if err != nil {
+	//	fmt.Println(err)
+	//	return
+	//}
+	//var targetPathInfo *aliyunpan.FileEntity
+	//if len(files) == 1 {
+	//	targetPathInfo = files[0]
+	//} else {
+	//	for _, f := range files {
+	//		if f.IsFolder() {
+	//			targetPathInfo = f
+	//			break
+	//		}
+	//	}
+	//}
+
+	if targetPathInfo == nil {
+		fmt.Println("目录路径不存在")
+		return
+	}
+
 	fileList := aliyunpan.FileList{}
 	fileListParam := &aliyunpan.FileListParam{}
 	fileListParam.ParentFileId = targetPathInfo.FileId
@@ -155,16 +178,16 @@ func RunLs(driveId, targetPath string, lsOptions *LsOptions,
 	fileListParam.OrderBy = orderBy
 	fileListParam.OrderDirection = orderDirection
 	if targetPathInfo.IsFolder() {
-		fileResult, err := activeUser.PanClient().FileListGetAll(fileListParam, 0)
-		if err != nil {
-			fmt.Println(err)
+		fileResult, err1 := activeUser.PanClient().OpenapiPanClient().FileListGetAll(fileListParam, 200)
+		if err1 != nil {
+			fmt.Println(err1)
 			return
 		}
 		fileList = fileResult
 	} else {
 		fileList = append(fileList, targetPathInfo)
 	}
-	renderTable(opLs, lsOptions.Total, targetPath, fileList)
+	renderTable(opLs, lsOptions.Total, targetPathInfo.Path, fileList)
 }
 
 func renderTable(op int, isTotal bool, path string, files aliyunpan.FileList) {
@@ -218,12 +241,8 @@ func renderTable(op int, isTotal bool, path string, files aliyunpan.FileList) {
 		fN, dN = files.Count()
 		tb.Append([]string{"", "总: " + converter.ConvertFileSize(files.TotalSize(), 2), "", fmt.Sprintf("文件总数: %d, 目录总数: %d", fN, dN)})
 	}
-
+	fmt.Printf("\n当前目录: %s\n", path)
+	fmt.Printf("----\n")
 	tb.Render()
-
-	if fN+dN >= 60 {
-		fmt.Printf("\n当前目录: %s\n", path)
-	}
-
 	fmt.Printf("----\n")
 }

internal/command/mkdir.go

@@ -4,7 +4,7 @@
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
-//     http://www.apache.org/licenses/LICENSE-2.0
+//	http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
@@ -20,7 +20,6 @@ import (
 	"github.com/tickstep/aliyunpan/cmder"
 	"github.com/tickstep/aliyunpan/internal/config"
 	"github.com/urfave/cli"
-	"strings"
 )
 
 func CmdMkdir() cli.Command {
@@ -29,7 +28,7 @@ func CmdMkdir() cli.Command {
 		Usage:     "创建目录",
 		UsageText: cmder.App().Name + " mkdir <目录>",
 		Category:  "阿里云盘",
-		Before:    cmder.ReloadConfigFunc,
+		Before:    ReloadConfigFunc,
 		Action: func(c *cli.Context) error {
 			if c.NArg() == 0 {
 				cli.ShowCommandHelp(c, c.Command.Name)
@@ -44,8 +43,8 @@ func CmdMkdir() cli.Command {
 		},
 		Flags: []cli.Flag{
 			cli.StringFlag{
-				Name:  "familyId",
-				Usage: "家庭云ID",
+				Name:  "driveId",
+				Usage: "网盘ID",
 				Value: "",
 			},
 		},
@@ -55,11 +54,9 @@ func CmdMkdir() cli.Command {
 func RunMkdir(driveId, name string) {
 	activeUser := GetActiveUser()
 	fullpath := activeUser.PathJoin(driveId, name)
-	pathSlice := strings.Split(fullpath, "/")
 	rs := &aliyunpan.MkdirResult{}
 	err := apierror.NewFailedApiError("")
-
-	rs, err = activeUser.PanClient().MkdirRecursive(driveId,"", "", 0, pathSlice)
+	rs, err = activeUser.PanClient().OpenapiPanClient().MkdirByFullPath(driveId, fullpath)
 
 	if err != nil {
 		fmt.Println("创建文件夹失败：" + err.Error())
@@ -74,4 +71,4 @@ func RunMkdir(driveId, name string) {
 	} else {
 		fmt.Println("创建文件夹失败: ", fullpath)
 	}
-}
+}

internal/command/mv.go

@@ -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,8 @@ 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/library-go/logger"
 	"github.com/urfave/cli"
 	"os"
 	"path"
@@ -30,7 +28,7 @@ func CmdMv() cli.Command {
 	return cli.Command{
 		Name:  "mv",
 		Usage: "移动文件/目录",
-		UsageText: `移动:
+		UsageText: `
 	aliyunpan mv <文件/目录1> <文件/目录2> <文件/目录3> ... <目标目录>`,
 		Description: `
 	注意: 移动多个文件和目录时, 请确保每一个文件和目录都存在, 否则移动操作会失败。支持通配符匹配移动文件，通配符当前只能匹配文件名，不能匹配文件路径。
@@ -44,7 +42,7 @@ func CmdMv() cli.Command {
 	aliyunpan mv /我的资源/*.png /我的图片
 `,
 		Category: "阿里云盘",
-		Before:   cmder.ReloadConfigFunc,
+		Before:   ReloadConfigFunc,
 		Action: func(c *cli.Context) error {
 			if c.NArg() <= 1 {
 				cli.ShowCommandHelp(c, c.Command.Name)
@@ -87,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) {
@@ -140,49 +133,26 @@ 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("指定目标文件夹不存在")
 	}
 
 	for idx := 0; idx < (len(paths) - 1); idx++ {
 		absolutePath = path.Clean(activeUser.PathJoin(driveId, paths[idx]))
-		name := path.Base(absolutePath)
-		fe, err1 := activeUser.PanClient().FileInfoByPath(driveId, absolutePath)
+		fileList, err1 := matchPathByShellPattern(driveId, absolutePath)
 		if err1 != nil {
-			// 匹配的文件不存在，检查是否是通配符匹配
-			if isMatchWildcardPattern(name) {
-				// 通配符
-				parentDir := path.Dir(absolutePath)
-				wildcardName := path.Base(absolutePath)
-				pf, err2 := activeUser.PanClient().FileInfoByPath(driveId, parentDir)
-				if err2 != nil {
-					failedPaths = append(failedPaths, absolutePath)
-					continue
-				}
-				fileList, er := activeUser.PanClient().FileListGetAll(&aliyunpan.FileListParam{
-					DriveId:      driveId,
-					ParentFileId: pf.FileId,
-				}, 500)
-				if er != nil {
-					failedPaths = append(failedPaths, absolutePath)
-					continue
-				}
-				for _, f := range fileList {
-					if isIncludeFile(wildcardName, f.FileName) {
-						f.Path = parentDir + "/" + f.FileName
-						logger.Verboseln("wildcard match move: " + f.Path)
-						opFileList = append(opFileList, f)
-					}
-				}
-			} else {
-				// 文件不存在
-				failedPaths = append(failedPaths, absolutePath)
-				continue
-			}
-		} else {
-			// 直接删除匹配的文件
-			opFileList = append(opFileList, fe)
+			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

internal/command/quota.go

@@ -4,7 +4,7 @@
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
-//     http://www.apache.org/licenses/LICENSE-2.0
+//	http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,7 +15,6 @@ package command
 
 import (
 	"fmt"
-	"github.com/tickstep/aliyunpan/cmder"
 	"github.com/tickstep/aliyunpan/internal/config"
 	"github.com/tickstep/library-go/converter"
 	"github.com/urfave/cli"
@@ -34,7 +33,7 @@ func CmdQuota() cli.Command {
 		Usage:       "获取当前帐号空间配额",
 		Description: "获取网盘的总储存空间, 和已使用的储存空间",
 		Category:    "阿里云盘账号",
-		Before:      cmder.ReloadConfigFunc,
+		Before:      ReloadConfigFunc,
 		Action: func(c *cli.Context) error {
 			if config.Config.ActiveUser() == nil {
 				fmt.Println("未登录账号")
@@ -42,7 +41,7 @@ func CmdQuota() cli.Command {
 			}
 			q, err := RunGetQuotaInfo()
 			if err == nil {
-				fmt.Printf("账号: %s, uid: %s, 个人空间总额: %s, 个人空间已使用: %s, 比率: %f%%\n",
+				fmt.Printf("账号: %s, uid: %s, 个人空间总额: %s, 个人空间已使用: %s, 比率: %.2f%%\n",
 					config.Config.ActiveUser().Nickname, config.Config.ActiveUser().UserId,
 					converter.ConvertFileSize(q.Quota, 2), converter.ConvertFileSize(q.UsedSize, 2),
 					100*float64(q.UsedSize)/float64(q.Quota))
@@ -53,12 +52,12 @@ func CmdQuota() cli.Command {
 }
 
 func RunGetQuotaInfo() (quotaInfo *QuotaInfo, error error) {
-	user, err := GetActivePanClient().GetUserInfo()
+	user, err := GetActivePanClient().OpenapiPanClient().GetUserInfo()
 	if err != nil {
 		return nil, err
 	}
 	return &QuotaInfo{
 		UsedSize: int64(user.UsedSize),
-		Quota: int64(user.TotalSize),
+		Quota:    int64(user.TotalSize),
 	}, nil
 }

internal/command/recycle.go

@@ -4,7 +4,7 @@
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
-//     http://www.apache.org/licenses/LICENSE-2.0
+//	http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,13 +17,16 @@ import (
 	"fmt"
 	"github.com/olekukonko/tablewriter"
 	"github.com/tickstep/aliyunpan-api/aliyunpan"
+	"github.com/tickstep/aliyunpan-api/aliyunpan_web"
 	"github.com/tickstep/aliyunpan/cmder"
 	"github.com/tickstep/aliyunpan/cmder/cmdtable"
+	"github.com/tickstep/aliyunpan/internal/config"
 	"github.com/tickstep/library-go/converter"
 	"github.com/tickstep/library-go/logger"
 	"github.com/urfave/cli"
 	"os"
 	"strconv"
+	"time"
 )
 
 func CmdRecycle() cli.Command {
@@ -45,7 +48,7 @@ func CmdRecycle() cli.Command {
 	aliyunpan recycle delete -all
 `,
 		Category: "阿里云盘",
-		Before:   cmder.ReloadConfigFunc,
+		Before:   ReloadConfigFunc,
 		Action: func(c *cli.Context) error {
 			if c.NumFlags() <= 0 || c.NArg() <= 0 {
 				cli.ShowCommandHelp(c, c.Command.Name)
@@ -59,6 +62,14 @@ func CmdRecycle() cli.Command {
 				Usage:     "列出回收站文件列表",
 				UsageText: cmder.App().Name + " recycle list",
 				Action: func(c *cli.Context) error {
+					if config.Config.ActiveUser() == nil {
+						fmt.Println("未登录账号")
+						return nil
+					}
+					if config.Config.ActiveUser().PanClient().WebapiPanClient() == nil {
+						fmt.Println("WEB客户端未登录，请登录后再使用该命令")
+						return nil
+					}
 					RunRecycleList(parseDriveId(c))
 					return nil
 				},
@@ -77,6 +88,14 @@ func CmdRecycle() cli.Command {
 				UsageText:   cmder.App().Name + " recycle restore <file_id 1> <file_id 2> <file_id 3> ...",
 				Description: `根据文件/目录的 fs_id, 还原回收站指定的文件或目录`,
 				Action: func(c *cli.Context) error {
+					if config.Config.ActiveUser() == nil {
+						fmt.Println("未登录账号")
+						return nil
+					}
+					if config.Config.ActiveUser().PanClient().WebapiPanClient() == nil {
+						fmt.Println("WEB客户端未登录，请登录后再使用该命令")
+						return nil
+					}
 					if c.NArg() <= 0 {
 						cli.ShowCommandHelp(c, c.Command.Name)
 						return nil
@@ -99,6 +118,14 @@ func CmdRecycle() cli.Command {
 				UsageText:   cmder.App().Name + " recycle delete [-all] <file_id 1> <file_id 2> <file_id 3> ...",
 				Description: `根据文件/目录的 file_id 或 -all 参数, 删除回收站指定的文件或目录或清空回收站`,
 				Action: func(c *cli.Context) error {
+					if config.Config.ActiveUser() == nil {
+						fmt.Println("未登录账号")
+						return nil
+					}
+					if config.Config.ActiveUser().PanClient().WebapiPanClient() == nil {
+						fmt.Println("WEB客户端未登录，请登录后再使用该命令")
+						return nil
+					}
 					if c.Bool("all") {
 						// 清空回收站
 						RunRecycleClear(parseDriveId(c))
@@ -131,7 +158,7 @@ func CmdRecycle() cli.Command {
 // RunRecycleList 执行列出回收站文件列表
 func RunRecycleList(driveId string) {
 	panClient := GetActivePanClient()
-	fdl, err := panClient.RecycleBinFileListGetAll(&aliyunpan.RecycleBinFileListParam{
+	fdl, err := panClient.WebapiPanClient().RecycleBinFileListGetAll(&aliyunpan_web.RecycleBinFileListParam{
 		DriveId: driveId,
 		Limit:   100,
 	})
@@ -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")
 }

internal/command/rename.go

@@ -4,7 +4,7 @@
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
-//     http://www.apache.org/licenses/LICENSE-2.0
+//	http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,14 +15,42 @@ package command
 
 import (
 	"fmt"
+	"github.com/tickstep/aliyunpan-api/aliyunpan"
 	"github.com/tickstep/aliyunpan-api/aliyunpan/apiutil"
-	"github.com/tickstep/aliyunpan/cmder"
 	"github.com/tickstep/aliyunpan/internal/config"
 	"github.com/urfave/cli"
 	"path"
+	"regexp"
+	"sort"
+	"strconv"
 	"strings"
 )
 
+type (
+	fileItem struct {
+		file        *aliyunpan.FileEntity
+		newFileName string
+	}
+	fileArray []*fileItem
+)
+
+func newFileItem(file *aliyunpan.FileEntity) *fileItem {
+	return &fileItem{
+		file:        file,
+		newFileName: "",
+	}
+}
+
+func (x fileArray) Len() int {
+	return len(x)
+}
+func (x fileArray) Less(i, j int) bool {
+	return x[i].file.FileName < x[j].file.FileName
+}
+func (x fileArray) Swap(i, j int) {
+	x[i], x[j] = x[j], x[i]
+}
+
 func CmdRename() cli.Command {
 	return cli.Command{
 		Name:  "rename",
@@ -31,18 +59,32 @@ func CmdRename() cli.Command {
 	aliyunpan rename <旧文件/目录名> <新文件/目录名>`,
 		Description: `
 	示例:
+    1. 将文件 1.mp4 重命名为 2.mp4
+    aliyunpan rename 1.mp4 2.mp4
 
-	将文件 1.mp4 重命名为 2.mp4
-	aliyunpan rename 1.mp4 2.mp4
+    2. 将文件 /test/1.mp4 重命名为 /test/2.mp4
+    要求必须是同一个文件目录内
+    aliyunpan rename /test/1.mp4 /test/2.mp4
 
-	将文件 /test/1.mp4 重命名为 /test/2.mp4
-	要求必须是同一个文件目录内
-	aliyunpan rename /test/1.mp4 /test/2.mp4
+    批量重命名，规则：rename [expression] [replacement] [file]
+    其中，
+    expression - 表达式，即文件名中需要去掉的部分，如果为*代表旧的文件名全部去掉
+    replacement - 需要替换的新文件名，如果包含 # 号会按顺序替换成数字编号
+    file - 文件匹配模式，指定需要查找的文件匹配字符串，支持通配符，例如：*.mp4 即当前目录下所有的mp4文件
+
+    3. 批量重命名，将当前目录下所有.mp4文件中包含的字符串 "我的视频" 全部改成 "视频"
+    aliyunpan rename 我的视频 视频 *.mp4
+
+    4. 批量重命名，将当前目录下所有.mp4文件全部进行 "视频+编号.mp4" 的重命名操作，旧的名称全部去掉，即：视频001.mp4, 视频002.mp4, 视频003.mp4...
+    aliyunpan rename * 视频###.mp4 *.mp4
+
+    5. 批量重命名，将当前目录下所有.mp4文件全部进行 "视频+编号.mp4" 的重命名操作，旧的名称全部去掉，直接重命名无需人工确认操作
+    aliyunpan rename -y * 视频###.mp4 *.mp4
 `,
 		Category: "阿里云盘",
-		Before:   cmder.ReloadConfigFunc,
+		Before:   ReloadConfigFunc,
 		Action: func(c *cli.Context) error {
-			if c.NArg() != 2 {
+			if c.NArg() != 2 && c.NArg() != 3 {
 				cli.ShowCommandHelp(c, c.Command.Name)
 				return nil
 			}
@@ -50,7 +92,12 @@ func CmdRename() cli.Command {
 				fmt.Println("未登录账号")
 				return nil
 			}
-			RunRename(parseDriveId(c), c.Args().Get(0), c.Args().Get(1))
+			if c.NArg() == 2 {
+				RunRename(parseDriveId(c), c.Args().Get(0), c.Args().Get(1))
+			} else if c.NArg() == 3 {
+				// 批量重命名
+				RunRenameBatch(c.Bool("y"), parseDriveId(c), c.Args().Get(0), c.Args().Get(1), c.Args().Get(2))
+			}
 			return nil
 		},
 		Flags: []cli.Flag{
@@ -59,6 +106,10 @@ func CmdRename() cli.Command {
 				Usage: "网盘ID",
 				Value: "",
 			},
+			cli.BoolFlag{
+				Name:  "y",
+				Usage: "跳过人工确认，对批量操作有效",
+			},
 		},
 	}
 }
@@ -85,14 +136,14 @@ func RunRename(driveId string, oldName string, newName string) {
 	}
 
 	fileId := ""
-	r, err := GetActivePanClient().FileInfoByPath(driveId, activeUser.PathJoin(driveId, oldName))
+	r, err := GetActivePanClient().OpenapiPanClient().FileInfoByPath(driveId, activeUser.PathJoin(driveId, oldName))
 	if err != nil {
 		fmt.Printf("原文件不存在： %s, %s\n", oldName, err)
 		return
 	}
 	fileId = r.FileId
 
-	b, e := activeUser.PanClient().FileRename(driveId, fileId, path.Base(newName))
+	b, e := activeUser.PanClient().OpenapiPanClient().FileRename(driveId, fileId, path.Base(newName))
 	if e != nil {
 		fmt.Println(e.Err)
 		return
@@ -104,3 +155,121 @@ func RunRename(driveId string, oldName string, newName string) {
 	fmt.Printf("重命名文件成功：%s -> %s\n", path.Base(oldName), path.Base(newName))
 	activeUser.DeleteOneCache(path.Dir(newName))
 }
+
+// RunRenameBatch 批量重命名文件
+func RunRenameBatch(skipConfirm bool, driveId string, expression, replacement, filePattern string) {
+	if len(expression) == 0 {
+		fmt.Println("旧文件名不能为空")
+		return
+	}
+	if !apiutil.CheckFileNameValid(replacement) {
+		fmt.Println("新文件名不能包含特殊字符：" + apiutil.FileNameSpecialChars)
+		return
+	}
+
+	if len(filePattern) == 0 {
+		fmt.Println("文件匹配模式不能为空")
+		return
+	}
+	if strings.ContainsAny(filePattern, "/") {
+		fmt.Println("文件匹配模式不能包含路径分隔符")
+		return
+	}
+	if strings.ContainsAny(filePattern, "\\") {
+		fmt.Println("文件匹配模式不能包含路径分隔符")
+		return
+	}
+
+	activeUser := GetActiveUser()
+	absolutePath := path.Clean(activeUser.PathJoin(driveId, filePattern))
+	fileList, err1 := matchPathByShellPattern(driveId, absolutePath)
+	if err1 != nil {
+		fmt.Println("查询文件出错：" + err1.Error())
+		return
+	}
+	if fileList == nil || len(fileList) == 0 {
+		fmt.Println("没有找到符合的文件")
+		return
+	}
+
+	// 文件列表按照名字排序
+	files := fileArray{}
+	for _, f := range fileList {
+		files = append(files, newFileItem(f))
+	}
+	if len(files) > 1 {
+		sort.Sort(files)
+	}
+
+	// 依次处理
+	var index = 1
+	for _, file := range files {
+		replacementStr := replaceNumStr(replacement, index)
+		index += 1
+		if expression == "*" {
+			// 旧的名称全部替换
+			file.newFileName = replacementStr
+		} else {
+			// 替换指定的名称片段
+			file.newFileName = strings.ReplaceAll(file.file.FileName, expression, replacementStr)
+		}
+	}
+
+	// 确认
+	if !skipConfirm {
+		fmt.Printf("以下文件将进行对应的重命名\n\n")
+		idx := 1
+		for _, file := range files {
+			fmt.Printf("%d) %s -> %s\n", idx, file.file.FileName, file.newFileName)
+			idx += 1
+		}
+		fmt.Printf("\n是否进行批量重命名，该操作不可逆(y/n): ")
+		confirm := ""
+		_, err := fmt.Scanln(&confirm)
+		if err != nil || (confirm != "y" && confirm != "Y") {
+			fmt.Println("用户取消了操作")
+			return
+		}
+	}
+
+	// 重命名
+	for _, file := range files {
+		b, e := activeUser.PanClient().OpenapiPanClient().FileRename(driveId, file.file.FileId, file.newFileName)
+		if e != nil {
+			fmt.Println(e.Err)
+			return
+		}
+		if !b {
+			fmt.Println("重命名文件失败")
+			return
+		}
+		fmt.Printf("重命名文件成功：%s -> %s\n", file.file.FileName, file.newFileName)
+		activeUser.DeleteOneCache(path.Dir(file.file.Path))
+	}
+}
+
+// replaceNumStr 将#替换成数字编号
+func replaceNumStr(name string, num int) string {
+	pattern, _ := regexp.Compile("[#]+")
+	r := pattern.FindAllStringSubmatchIndex(name, -1)
+	if len(r) == 0 {
+		return name
+	}
+	newName := name
+	c := r[0]
+	return replaceNumStr(newName[:c[0]]+generateNumStr(num, c[1]-c[0])+newName[c[1]:], num)
+}
+func generateNumStr(num, count int) string {
+	s := strconv.Itoa(num)
+	return generateZeroStr(count-len(s)) + s
+}
+func generateZeroStr(count int) string {
+	if count <= 0 {
+		return ""
+	}
+	s := ""
+	for i := 0; i < count; i++ {
+		s += "0"
+	}
+	return s
+}

internal/command/rename_test.go

@@ -0,0 +1,41 @@
+package command
+
+import (
+	"fmt"
+	"github.com/tickstep/aliyunpan-api/aliyunpan"
+	"sort"
+	"testing"
+)
+
+func TestRenameSort(t *testing.T) {
+	files := fileArray{}
+	files = append(files, newFileItem(&aliyunpan.FileEntity{FileName: "0我的文件01.txt"}))
+	files = append(files, newFileItem(&aliyunpan.FileEntity{FileName: "4我的文件03.txt"}))
+	files = append(files, newFileItem(&aliyunpan.FileEntity{FileName: "3我的文件02.txt"}))
+	files = append(files, newFileItem(&aliyunpan.FileEntity{FileName: "1我的文件00.txt"}))
+
+	sort.Sort(files)
+
+	for _, f := range files {
+		fmt.Println(f.file.FileName)
+	}
+}
+func TestRenameNum0(t *testing.T) {
+	fmt.Println(replaceNumStr("我的文件###.txt", 2))
+}
+func TestRenameNum1(t *testing.T) {
+	fmt.Println(replaceNumStr("我的##文件###.txt", 123))
+}
+func TestRenameNum2(t *testing.T) {
+	fmt.Println(replaceNumStr("我的文件###.txt", 1233))
+}
+func TestRenameNum3(t *testing.T) {
+	fmt.Println(replaceNumStr("我的文件[###].txt", 1233))
+}
+func TestRenameNum4(t *testing.T) {
+	fmt.Println(replaceNumStr("我的文件.txt", 1233))
+}
+
+func TestRenameNum5(t *testing.T) {
+	fmt.Println(replaceNumStr("", 1233))
+}

internal/command/rm.go

@@ -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,7 +19,6 @@ import (
 	"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"
@@ -50,7 +49,7 @@ func CmdRm() cli.Command {
 	aliyunpan rm /我的资源/*.zip
 `,
 		Category: "阿里云盘",
-		Before:   cmder.ReloadConfigFunc,
+		Before:   ReloadConfigFunc,
 		Action: func(c *cli.Context) error {
 			if c.NArg() == 0 {
 				cli.ShowCommandHelp(c, c.Command.Name)
@@ -79,75 +78,43 @@ func RunRemove(driveId string, paths ...string) {
 
 	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))
-		name := path.Base(absolutePath)
-
-		fe, err := activeUser.PanClient().FileInfoByPath(driveId, absolutePath)
-		if err != nil {
-			// 匹配的文件不存在，是否是通配符匹配的文件
-			if isMatchWildcardPattern(name) {
-				// 通配符
-				parentDir := path.Dir(absolutePath)
-				wildcardName := path.Base(absolutePath)
-				pf, err1 := activeUser.PanClient().FileInfoByPath(driveId, parentDir)
-				if err1 != nil {
-					failedRmPaths = append(failedRmPaths, absolutePath)
-					continue
-				}
-				fileList, er := activeUser.PanClient().FileListGetAll(&aliyunpan.FileListParam{
-					DriveId:      driveId,
-					ParentFileId: pf.FileId,
-				}, 500)
-				if er != nil {
-					failedRmPaths = append(failedRmPaths, absolutePath)
-					continue
-				}
-				for _, f := range fileList {
-					if isIncludeFile(wildcardName, f.FileName) {
-						f.Path = parentDir + "/" + f.FileName
-						logger.Verboseln("wildcard match delete: " + f.Path)
-						delFileInfos = append(delFileInfos, &aliyunpan.FileBatchActionParam{
-							DriveId: driveId,
-							FileId:  f.FileId,
-						})
-						fileId2FileEntity[f.FileId] = f
-						cacheCleanDirs = append(cacheCleanDirs, path.Dir(f.Path))
-					}
-				}
-			} else {
-				// 失败，文件不存在
-				failedRmPaths = append(failedRmPaths, absolutePath)
-				continue
-			}
-		} else {
-			// 直接删除匹配的文件
-			fe.Path = absolutePath
-			delFileInfos = append(delFileInfos, &aliyunpan.FileBatchActionParam{
+		fileList, err1 := matchPathByShellPattern(driveId, absolutePath)
+		if err1 != nil {
+			failedRmPaths = append(failedRmPaths, absolutePath)
+			continue
+		}
+		if fileList == nil || len(fileList) == 0 {
+			// 失败，文件不存在
+			failedRmPaths = append(failedRmPaths, absolutePath)
+			continue
+		}
+		for _, f := range fileList {
+			// 删除匹配的文件
+			fdr, err := activeUser.PanClient().OpenapiPanClient().FileDelete(&aliyunpan.FileBatchActionParam{
 				DriveId: driveId,
-				FileId:  fe.FileId,
+				FileId:  f.FileId,
 			})
-			fileId2FileEntity[fe.FileId] = fe
-			cacheCleanDirs = append(cacheCleanDirs, path.Dir(fe.Path))
-		}
-	}
-
-	// delete
-	successDelFileEntity := []*aliyunpan.FileEntity{}
-	fdr, err := activeUser.PanClient().FileDelete(delFileInfos)
-	if fdr != nil {
-		for _, item := range fdr {
-			if !item.Success {
-				failedRmPaths = append(failedRmPaths, fileId2FileEntity[item.FileId].Path)
+			if err != nil || !fdr.Success {
+				failedRmPaths = append(failedRmPaths, absolutePath)
 			} else {
-				successDelFileEntity = append(successDelFileEntity, fileId2FileEntity[item.FileId])
+				successDelFileEntity = append(successDelFileEntity, f)
 			}
+			cacheCleanDirs = append(cacheCleanDirs, path.Dir(f.Path))
 		}
 	}
 
+	// output
+	if len(failedRmPaths) > 0 {
+		fmt.Println("以下文件删除失败：")
+		for _, fp := range failedRmPaths {
+			fmt.Println(fp)
+		}
+		fmt.Println("")
+	}
 	pnt := func() {
 		tb := cmdtable.NewTable(os.Stdout)
 		tb.SetHeader([]string{"#", "文件/目录"})
@@ -161,9 +128,4 @@ func RunRemove(driveId string, paths ...string) {
 		pnt()
 		activeUser.DeleteCache(cacheCleanDirs)
 	}
-
-	if len(successDelFileEntity) == 0 && err != nil {
-		fmt.Println("无法删除文件，请稍后重试")
-		return
-	}
 }

internal/command/save.go

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

internal/command/share.go

@@ -4,7 +4,7 @@
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
-//     http://www.apache.org/licenses/LICENSE-2.0
+//	http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
@@ -18,12 +18,13 @@ import (
 	"fmt"
 	"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/library-go/logger"
 	"github.com/urfave/cli"
 	"os"
+	"path"
 	"path/filepath"
 	"strconv"
 	"time"
@@ -35,7 +36,7 @@ func CmdShare() cli.Command {
 		Usage:     "分享文件/目录",
 		UsageText: cmder.App().Name + " share",
 		Category:  "阿里云盘",
-		Before:    cmder.ReloadConfigFunc,
+		Before:    ReloadConfigFunc,
 		Action: func(c *cli.Context) error {
 			cli.ShowCommandHelp(c, c.Command.Name)
 			return nil
@@ -50,13 +51,19 @@ func CmdShare() cli.Command {
 示例:
 
     创建文件 1.mp4 的分享链接 
-	aliyunpan share set 1.mp4
+	aliyunpan share set -mode 1 1.mp4
+
+    创建 /我的视频/ 目录下所有mp4文件的分享链接，支持通配符
+	aliyunpan share set -mode 1 /我的视频/*.mp4
 
     创建文件 1.mp4 的分享链接，并指定分享密码为2333
-	aliyunpan share set -sharePwd 2333 1.mp4
+	aliyunpan share set -mode 1 -sharePwd 2333 1.mp4
 
     创建文件 1.mp4 的分享链接，并指定有效期为1天
-	aliyunpan share set -time 1 1.mp4
+	aliyunpan share set -mode 1 -time 1 1.mp4
+
+    创建文件 1.mp4 的快传链接
+	aliyunpan share set 1.mp4
 `,
 				Action: func(c *cli.Context) error {
 					if c.NArg() < 1 {
@@ -67,6 +74,10 @@ func CmdShare() cli.Command {
 						fmt.Println("未登录账号")
 						return nil
 					}
+					if config.Config.ActiveUser().PanClient().WebapiPanClient() == nil {
+						fmt.Println("WEB客户端未登录，请登录后再使用该命令")
+						return nil
+					}
 					et := ""
 					timeFlag := "0"
 					if c.IsSet("time") {
@@ -86,10 +97,18 @@ func CmdShare() cli.Command {
 						sharePwd = c.String("sharePwd")
 					}
 
-					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)
@@ -97,7 +116,7 @@ func CmdShare() cli.Command {
 					} else {
 						sharePwd = ""
 					}
-					RunShareSet(parseDriveId(c), c.Args(), et, sharePwd)
+					RunShareSet(modeFlag, parseDriveId(c), c.Args(), et, sharePwd)
 					return nil
 				},
 				Flags: []cli.Flag{
@@ -113,8 +132,8 @@ func CmdShare() cli.Command {
 					},
 					cli.StringFlag{
 						Name:  "mode",
-						Usage: "有效期，1-私密分享，2-公开分享",
-						Value: "1",
+						Usage: "模式，1-私密分享，2-公开分享，3-快传",
+						Value: "3",
 					},
 					cli.StringFlag{
 						Name:  "sharePwd",
@@ -129,6 +148,14 @@ func CmdShare() cli.Command {
 				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
 				},
@@ -141,6 +168,14 @@ func CmdShare() cli.Command {
 				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
@@ -164,6 +199,14 @@ func CmdShare() cli.Command {
 	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
@@ -184,66 +227,38 @@ func CmdShare() cli.Command {
 					},
 				},
 			},
-			//			{
-			//				Name:      "mc",
-			//				Aliases:   []string{},
-			//				Usage:     "创建秒传链接",
-			//				UsageText: cmder.App().Name + " share mc <文件/目录1> <文件/目录2> ...",
-			//				Description: `
-			//创建文件秒传链接，秒传链接只能是文件，如果是文件夹则会创建文件夹包含的所有文件的秒传链接。秒传链接可以通过RapidUpload命令或者Import命令进行导入到自己的网盘。
-			//示例:
-			//    创建文件 1.mp4 的秒传链接
-			//	aliyunpan share mc 1.mp4
-			//
-			//    创建文件 1.mp4 的秒传链接，但链接隐藏相对路径
-			//	aliyunpan share mc -hp 1.mp4
-			//
-			//    创建文件夹 share_folder 下面所有文件的秒传链接
-			//	aliyunpan share mc share_folder/
-			//`,
-			//				Action: func(c *cli.Context) error {
-			//					if c.NArg() < 1 {
-			//						cli.ShowCommandHelp(c, c.Command.Name)
-			//						return nil
-			//					}
-			//					if config.Config.ActiveUser() == nil {
-			//						fmt.Println("未登录账号")
-			//						return nil
-			//					}
-			//					hp := false
-			//					if c.IsSet("hp") {
-			//						hp = c.Bool("hp")
-			//					}
-			//					RunShareMc(parseDriveId(c), hp, c.Args())
-			//					return nil
-			//				},
-			//				Flags: []cli.Flag{
-			//					cli.StringFlag{
-			//						Name:  "driveId",
-			//						Usage: "网盘ID",
-			//						Value: "",
-			//					},
-			//					cli.BoolFlag{
-			//						Name:  "hp",
-			//						Usage: "hide path, 隐藏相对目录",
-			//					},
-			//				},
-			//			},
 		},
 	}
 }
 
 // RunShareSet 执行分享
-func RunShareSet(driveId string, paths []string, expiredTime string, sharePwd string) {
-	panClient := GetActivePanClient()
-	fileList, _, err := GetFileInfoByPaths(paths[:len(paths)]...)
-	if err != nil {
-		fmt.Println(err)
+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 fileList {
+	for _, f := range allFileList {
 		fidList = append(fidList, f.FileId)
 	}
 
@@ -252,35 +267,53 @@ func RunShareSet(driveId string, paths []string, expiredTime string, sharePwd st
 		return
 	}
 
-	r, err1 := panClient.ShareLinkCreate(aliyunpan.ShareCreateParam{
-		DriveId:    driveId,
-		SharePwd:   sharePwd,
-		Expiration: expiredTime,
-		FileIdList: fidList,
-	})
-
-	if err1 != nil || r == nil {
-		if err1.Code == apierror.ApiCodeFileShareNotAllowed {
-			fmt.Printf("创建分享链接失败: 该文件类型不允许分享\n")
-		} else {
-			fmt.Printf("创建分享链接失败: %s\n", err)
+	if modeFlag == "3" {
+		// 快传
+		r, err1 := panClient.WebapiPanClient().FastShareLinkCreate(aliyunpan_web.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
 		}
-		return
-	}
 
-	fmt.Printf("创建分享链接成功\n")
-	if len(sharePwd) > 0 {
-		fmt.Printf("链接：%s 提取码：%s\n", r.ShareUrl, r.SharePwd)
-	} else {
+		fmt.Printf("创建快传链接成功\n")
 		fmt.Printf("链接：%s\n", r.ShareUrl)
-	}
+	} else {
+		// 分享
+		r, err1 := panClient.WebapiPanClient().ShareLinkCreate(aliyunpan_web.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)
+	records, err := activeUser.PanClient().WebapiPanClient().ShareLinkList(activeUser.UserId)
 	if err != nil {
 		fmt.Printf("获取分享列表失败: %s\n", err)
 		return
@@ -295,17 +328,22 @@ func RunShareList() {
 			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 = "已过期"
+		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],
@@ -323,7 +361,7 @@ func RunShareCancel(shareIdList []string) {
 	}
 
 	activeUser := GetActiveUser()
-	r, err := activeUser.PanClient().ShareLinkCancel(shareIdList)
+	r, err := activeUser.PanClient().WebapiPanClient().ShareLinkCancel(shareIdList)
 	if err != nil {
 		fmt.Printf("取消分享操作失败: %s\n", err)
 		return
@@ -338,7 +376,7 @@ func RunShareCancel(shareIdList []string) {
 
 func RunShareExport(option, saveFilePath string) {
 	activeUser := GetActiveUser()
-	records, err := activeUser.PanClient().ShareLinkList(activeUser.UserId)
+	records, err := activeUser.PanClient().WebapiPanClient().ShareLinkList(activeUser.UserId)
 	if err != nil {
 		fmt.Printf("获取分享列表失败: %s\n", err)
 		return
@@ -403,36 +441,3 @@ func ExportCsv(savePath string, data [][]string) bool {
 	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
-		})
-	}
-	fmt.Printf("\n秒传链接总数量: %d\n", totalCount)
-}

internal/command/sync.go

@@ -4,7 +4,7 @@
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
-//     http://www.apache.org/licenses/LICENSE-2.0
+//	http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
@@ -18,6 +18,8 @@ import (
 	"github.com/tickstep/aliyunpan-api/aliyunpan"
 	"github.com/tickstep/aliyunpan/cmder"
 	"github.com/tickstep/aliyunpan/internal/config"
+	"github.com/tickstep/aliyunpan/internal/global"
+	"github.com/tickstep/aliyunpan/internal/log"
 	"github.com/tickstep/aliyunpan/internal/syncdrive"
 	"github.com/tickstep/aliyunpan/internal/utils"
 	"github.com/tickstep/library-go/converter"
@@ -35,22 +37,20 @@ func CmdSync() cli.Command {
 		Usage:     "同步备份功能(Beta)",
 		UsageText: cmder.App().Name + " sync",
 		Description: `
-    备份功能。支持备份本地文件到云盘，备份云盘文件到本地，双向同步备份三种模式。支持JavaScript插件对备份文件进行过滤。
+    备份功能。支持备份本地文件到云盘，备份云盘文件到本地两种模式。支持JavaScript插件对备份文件进行过滤。
     指定本地目录和对应的一个网盘目录，以备份文件。网盘目录必须和本地目录独占使用，不要用作其他用途，不然备份可能会有问题。
 
-	备份功能支持以下三种模式：
+	备份功能支持以下模式：
 	1. upload 
        备份本地文件，即上传本地文件到网盘，始终保持本地文件有一个完整的备份在网盘
 	2. download 
        备份云盘文件，即下载网盘文件到本地，始终保持网盘的文件有一个完整的备份在本地
-	3. sync（慎用！！！双向备份过程会删除文件）
-       双向备份，保持网盘文件和本地文件严格一致
 
 	请输入以下命令查看如何配置和启动：
     aliyunpan sync start -h
 `,
 		Category: "阿里云盘",
-		Before:   cmder.ReloadConfigFunc,
+		Before:   ReloadConfigFunc,
 		Action: func(c *cli.Context) error {
 			cli.ShowCommandHelp(c, c.Command.Name)
 			return nil
@@ -72,7 +72,8 @@ func CmdSync() cli.Command {
    "localFolderPath": "D:/tickstep/Documents/设计文档",
    "panFolderPath": "/sync_drive/我的文档",
    "mode": "upload",
-   "priority": "time"
+   "policy"： "increment"，
+   "driveName": "backup"
   }
  ]
 }
@@ -80,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 {
@@ -153,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) {
@@ -201,25 +191,57 @@ 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 if policy == string(syncdrive.SyncPolicyIncrement) {
+							task.Policy = syncdrive.SyncPolicyIncrement
+						} else {
+							task.Policy = syncdrive.SyncPolicyIncrement
 						}
 						task.Name = path.Base(task.LocalFolderPath)
 						task.Id = utils.Md5Str(task.LocalFolderPath)
 						task.Priority = syncOpt
+						task.UserId = activeUser.UserId
+
+						// drive id
+						task.DriveName = driveName
+						if strings.ToLower(task.DriveName) == "backup" {
+							task.DriveId = activeUser.DriveList.GetFileDriveId()
+						} else if strings.ToLower(task.DriveName) == "resource" {
+							task.DriveId = activeUser.DriveList.GetResourceDriveId()
+						}
+						if len(task.DriveId) == 0 {
+							task.DriveName = "backup"
+							task.DriveId = activeUser.DriveList.GetFileDriveId()
+						}
 					}
 
-					RunSync(task, dp, up, downloadBlockSize, uploadBlockSize, syncOpt, c.Int("ldt"), step)
+					cycleMode := syncdrive.CycleInfiniteLoop
+					if c.String("cycle") == "onetime" {
+						cycleMode = syncdrive.CycleOneTime
+					} else {
+						cycleMode = syncdrive.CycleInfiniteLoop
+					}
+					RunSync(task, cycleMode, dp, up, downloadBlockSize, uploadBlockSize, syncOpt, c.Int("ldt"))
+
 					return nil
 				},
 				Flags: []cli.Flag{
+					cli.StringFlag{
+						Name:  "drive",
+						Usage: "drive name, 网盘名称，backup(备份盘)，resource(资源盘)",
+						Value: "backup",
+					},
 					cli.StringFlag{
 						Name:  "ldir",
 						Usage: "local dir, 本地文件夹完整路径",
@@ -230,13 +252,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",
@@ -255,7 +287,7 @@ priority - 优先级，只对双向同步备份模式有效。选项支持三种
 					},
 					cli.IntFlag{
 						Name:  "ubs",
-						Usage: "upload block size，上传分片大小，单位KB。推荐值：1024 ~ 10240",
+						Usage: "upload block size，上传分片大小，单位KB。推荐值：1024 ~ 10240。当上传极大单文件时候请适当调高该值",
 						Value: 10240,
 					},
 					cli.StringFlag{
@@ -268,36 +300,37 @@ priority - 优先级，只对双向同步备份模式有效。选项支持三种
 						Usage: "local delay time，本地文件修改检测延迟间隔，单位秒。如果本地文件会被频繁修改，例如录制视频文件，配置好该时间可以避免上传未录制好的文件",
 						Value: 3,
 					},
-					cli.StringFlag{
-						Name:  "step",
-						Usage: "task step 任务步骤, 支持两种: scan(只扫描并建立同步数据库),sync(正常启动同步任务)",
-						Value: "sync",
-					},
 				},
 			},
 		},
 	}
 }
 
-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) {
 	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
-	go func() {
-		for {
-			time.Sleep(time.Duration(1) * time.Minute)
-			if RefreshTokenInNeed(activeUser) {
-				logger.Verboseln("update access token for sync task")
-				panClient.UpdateToken(activeUser.WebToken)
-			}
-		}
-	}()
+	//// pan token expired checker
+	//continueFlag := int32(0)
+	//atomic.StoreInt32(&continueFlag, 0)
+	//defer func() {
+	//	atomic.StoreInt32(&continueFlag, 1)
+	//}()
+	//go func(flag *int32) {
+	//	for atomic.LoadInt32(flag) == 0 {
+	//		time.Sleep(time.Duration(1) * time.Minute)
+	//		if RefreshWebTokenInNeed(activeUser, config.Config.DeviceName) {
+	//			logger.Verboseln("update access token for sync task")
+	//			userWebToken := NewWebLoginToken(activeUser.WebapiToken.AccessToken, activeUser.WebapiToken.Expired)
+	//			panClient.WebapiPanClient().UpdateToken(userWebToken)
+	//		}
+	//	}
+	//}(&continueFlag)
 
 	syncFolderRootPath := config.GetSyncDriveDir()
 	if b, e := utils.PathExists(syncFolderRootPath); e == nil {
@@ -313,45 +346,55 @@ func RunSync(defaultTask *syncdrive.SyncTask, fileDownloadParallel, fileUploadPa
 	}
 
 	fmt.Println("启动同步备份进程")
-	typeUrlStr := "默认链接"
-	if useInternalUrl {
-		typeUrlStr = "阿里ECS内部链接"
-	}
+
+	// 文件同步记录器
+	fileRecorder := log.NewFileRecorder(config.GetLogDir() + "/sync_file_records.csv")
+
 	option := syncdrive.SyncOption{
 		FileDownloadParallel:              fileDownloadParallel,
 		FileUploadParallel:                fileUploadParallel,
 		FileDownloadBlockSize:             downloadBlockSize,
 		FileUploadBlockSize:               uploadBlockSize,
-		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); 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)
+			}
+		}
+	} else {
+		if cycleMode == syncdrive.CycleInfiniteLoop {
+			if global.IsAppInCliMode {
 				// in cmd mode
 				c := ""
 				fmt.Println("本命令不会退出，如需要结束同步备份进程请输入y，然后按Enter键进行停止。")
@@ -365,15 +408,19 @@ 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)
+			}
 		}
-
-		fmt.Println("正在停止同步备份任务，请稍等...")
 	}
 
+	fmt.Println("正在退出同步备份任务，请稍等...")
+
 	// stop task
-	syncMgr.Stop(taskStep)
-
-	if taskStep == syncdrive.StepScanFile {
-		fmt.Println("\n已完成文件扫描和同步数据库的构建，可以启动任务同步了")
-	}
+	syncMgr.Stop()
 }

internal/command/token.go

@@ -1,99 +0,0 @@
-// Copyright (c) 2020 tickstep.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-package command
-
-import (
-	"fmt"
-	"github.com/tickstep/aliyunpan-api/aliyunpan"
-	"github.com/tickstep/aliyunpan/cmder"
-	"github.com/tickstep/aliyunpan/internal/config"
-	"github.com/urfave/cli"
-)
-
-func CmdToken() cli.Command {
-	return cli.Command{
-		Name:      "token",
-		Usage:     "Token相关操作",
-		UsageText: cmder.App().Name + " token",
-		Category:  "阿里云盘账号",
-		Before:    cmder.ReloadConfigFunc,
-		Action: func(c *cli.Context) error {
-			cli.ShowCommandHelp(c, c.Command.Name)
-			return nil
-		},
-		Subcommands: []cli.Command{
-			{
-				Name:      "update",
-				Usage:     "更新Token",
-				UsageText: cmder.App().Name + " token update",
-				Description: `
-示例:
-
-    更新当前登录用户的Token
-	aliyunpan token update -mode 1
-
-    更新全部登录用户的Token
-	aliyunpan token update -mode 2
-`,
-				Action: func(c *cli.Context) error {
-					if config.Config.ActiveUser() == nil {
-						fmt.Println("未登录账号，无需刷新Token")
-						return nil
-					}
-
-					modeFlag := "1"
-					if c.IsSet("mode") {
-						modeFlag = c.String("mode")
-					}
-					RunTokenUpdate(modeFlag)
-					return nil
-				},
-				Flags: []cli.Flag{
-					cli.StringFlag{
-						Name:  "mode",
-						Usage: "模式，1-登录用户，2-全部用户",
-						Value: "1",
-					},
-				},
-			},
-		},
-	}
-}
-
-// RunTokenUpdate 执行Token更新
-func RunTokenUpdate(modeFlag string) {
-	cmder.ReloadConfigFunc(nil)
-	userList := config.Config.UserList
-	if userList == nil || len(userList) == 0 {
-		fmt.Printf("没有登录用户，无需刷新Token\n")
-		return
-	}
-	for _,user := range userList {
-		if modeFlag == "1" {
-			if user.UserId != config.Config.ActiveUID {
-				continue
-			}
-		}
-		newToken,e := aliyunpan.GetAccessTokenFromRefreshToken(user.RefreshToken)
-		if e != nil {
-			fmt.Printf("无法为%s用户获取新的RefreshToken，可能需要重新登录\n", user.Nickname)
-			continue
-		}
-		if newToken != nil && newToken.RefreshToken != "" {
-			user.RefreshToken = newToken.RefreshToken
-			fmt.Printf("成功刷新%s用户的RefreshToken\n", user.Nickname)
-		}
-	}
-	cmder.SaveConfigFunc(nil)
-}

internal/command/tree.go

@@ -27,17 +27,38 @@ func CmdTree() cli.Command {
 	列出 /我的资源 内的文件和目录的树形图
 	aliyunpan tree /我的资源
 
+	列出 /我的资源 内的文件和目录的树形图，使用通配符
+	aliyunpan tree /我的*
+
 	列出 /我的资源 内的文件和目录的树形图，并且显示文件对应的完整绝对路径
 	aliyunpan tree -fp /我的资源
+
+	列出 /我的资源 内的文件和目录的树形图，并且显示文件对应的文件大小
+	aliyunpan tree -fs /我的资源
+
+	列出 /我的资源 内的文件和目录的树形图，过滤大于等于 10kb 并且小于等于 10mb 的文件，同时显示文件对应的文件大小
+	aliyunpan tree -fs -minSize=1kb -maxSize=10mb /我的资源
 `,
 		Category: "阿里云盘",
-		Before:   cmder.ReloadConfigFunc,
+		Before:   ReloadConfigFunc,
 		Action: func(c *cli.Context) error {
 			if config.Config.ActiveUser() == nil {
 				fmt.Println("未登录账号")
 				return nil
 			}
-			RunTree(parseDriveId(c), c.Args().Get(0), c.Bool("fp"))
+			minSize := int64(0)
+			if c.IsSet("minSize") {
+				if s, e := converter.ParseFileSizeStr(c.String("minSize")); e == nil {
+					minSize = s
+				}
+			}
+			maxSize := int64(0)
+			if c.IsSet("maxSize") {
+				if s, e := converter.ParseFileSizeStr(c.String("maxSize")); e == nil {
+					maxSize = s
+				}
+			}
+			RunTree(parseDriveId(c), c.Args().Get(0), c.Bool("fp"), c.Bool("fs"), minSize, maxSize)
 			return nil
 		},
 		Flags: []cli.Flag{
@@ -48,7 +69,19 @@ func CmdTree() cli.Command {
 			},
 			cli.BoolFlag{
 				Name:  "fp",
-				Usage: "full path， 树形图是否显示文件完整路径",
+				Usage: "full path， 树形图显示文件的完整路径",
+			},
+			cli.BoolFlag{
+				Name:  "fs",
+				Usage: "file size， 树形图显示文件的文件大小",
+			},
+			cli.StringFlag{
+				Name:  "minSize",
+				Usage: "min size， 过滤大于等于指定大小的文件，例如：100mb",
+			},
+			cli.StringFlag{
+				Name:  "maxSize",
+				Usage: "max size， 过滤小于等于指定大小的文件，例如：1gb",
 			},
 		},
 	}
@@ -66,18 +99,54 @@ type (
 		CountOfFile int64
 		SizeOfFile  int64
 	}
+
+	treeConfig struct {
+		showFullPath bool
+		showFileSize bool
+		minFileSize  int64
+		maxFileSize  int64
+	}
 )
 
-func getTree(driveId, pathStr string, depth int, statistic *treeStatistic, showFullPath bool) {
+func getTree(driveId, pathStr string, depth int, statistic *treeStatistic, setting *treeConfig) {
 	activeUser := config.Config.ActiveUser()
 	pathStr = activeUser.PathJoin(driveId, pathStr)
 	pathStr = path.Clean(pathStr)
 
-	targetPathInfo, err1 := activeUser.PanClient().FileInfoByPath(driveId, pathStr)
-	if err1 != nil {
-		fmt.Println(err1)
+	// 获取目标路径文件信息
+	targetPathInfo, err := activeUser.PanClient().OpenapiPanClient().FileInfoByPath(driveId, pathStr)
+	if err != nil {
+		fmt.Println(err)
 		return
 	}
+
+	// 适配通配符路径获取目标文件信息（弃用，容易触发风控）
+	//files, err := matchPathByShellPattern(driveId, pathStr)
+	//if err != nil {
+	//	fmt.Println(err)
+	//	return
+	//}
+	//var targetPathInfo *aliyunpan.FileEntity
+	//if len(files) == 1 {
+	//	targetPathInfo = files[0]
+	//} else {
+	//	for _, f := range files {
+	//		if f.IsFolder() {
+	//			targetPathInfo = f
+	//			break
+	//		}
+	//	}
+	//}
+
+	if targetPathInfo == nil {
+		fmt.Println("路径不存在")
+		return
+	}
+
+	if depth == 0 {
+		fmt.Printf("%s\n", targetPathInfo.Path)
+	}
+
 	fileList := aliyunpan.FileList{}
 	fileListParam := &aliyunpan.FileListParam{}
 	fileListParam.ParentFileId = targetPathInfo.FileId
@@ -85,7 +154,7 @@ func getTree(driveId, pathStr string, depth int, statistic *treeStatistic, showF
 	fileListParam.OrderBy = aliyunpan.FileOrderByName
 	fileListParam.OrderDirection = aliyunpan.FileOrderDirectionAsc
 	if targetPathInfo.IsFolder() {
-		fileResult, err := activeUser.PanClient().FileListGetAll(fileListParam, 0)
+		fileResult, err := activeUser.PanClient().OpenapiPanClient().FileListGetAll(fileListParam, 500)
 		if err != nil {
 			fmt.Println(err)
 			return
@@ -103,14 +172,27 @@ func getTree(driveId, pathStr string, depth int, statistic *treeStatistic, showF
 	for i, file := range fileList {
 		if file.IsFolder() {
 			statistic.CountOfDir += 1
-			if showFullPath {
-				fmt.Printf("%v%v %v/ -> %s\n", indentPrefixStr, pathPrefix, file.FileName, pathStr+"/"+file.FileName)
+			if setting.showFullPath {
+				fmt.Printf("%v%v %v/ -> %s\n", indentPrefixStr, pathPrefix, file.FileName, targetPathInfo.Path+"/"+file.FileName)
 			} else {
 				fmt.Printf("%v%v %v/\n", indentPrefixStr, pathPrefix, file.FileName)
 			}
-			getTree(driveId, pathStr+"/"+file.Path, depth+1, statistic, showFullPath)
+			getTree(driveId, targetPathInfo.Path+"/"+file.FileName, depth+1, statistic, setting)
 			continue
 		}
+
+		// filter file size
+		if setting.minFileSize > 0 {
+			if file.FileSize < setting.minFileSize {
+				continue
+			}
+		}
+		if setting.maxFileSize > 0 {
+			if file.FileSize > setting.maxFileSize {
+				continue
+			}
+		}
+
 		statistic.CountOfFile += 1
 		statistic.SizeOfFile += file.FileSize
 
@@ -118,10 +200,19 @@ func getTree(driveId, pathStr string, depth int, statistic *treeStatistic, showF
 			prefix = lastFilePrefix
 		}
 
-		if showFullPath {
-			fmt.Printf("%v%v %v -> %s\n", indentPrefixStr, prefix, file.FileName, pathStr+"/"+file.FileName)
+		// 文件大小
+		fileName := &strings.Builder{}
+		if setting.showFileSize {
+			fmt.Fprintf(fileName, "%s (%s)", file.FileName, converter.ConvertFileSize(file.FileSize, 2))
 		} else {
-			fmt.Printf("%v%v %v\n", indentPrefixStr, prefix, file.FileName)
+			fmt.Fprintf(fileName, "%s", file.FileName)
+		}
+
+		// 文件完整路径
+		if setting.showFullPath {
+			fmt.Printf("%v%v %v -> %s\n", indentPrefixStr, prefix, fileName.String(), targetPathInfo.Path+"/"+file.FileName)
+		} else {
+			fmt.Printf("%v%v %v\n", indentPrefixStr, prefix, fileName.String())
 		}
 	}
 
@@ -129,18 +220,23 @@ func getTree(driveId, pathStr string, depth int, statistic *treeStatistic, showF
 }
 
 // RunTree 列出树形图
-func RunTree(driveId, pathStr string, showFullPath bool) {
+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,
 		CountOfFile: 0,
 		SizeOfFile:  0,
 	}
-	fmt.Printf("%s\n", pathStr)
-	getTree(driveId, pathStr, 0, statistic, showFullPath)
+	setting := &treeConfig{
+		showFullPath: showFullPath,
+		showFileSize: showFileSize,
+		minFileSize:  minSize,
+		maxFileSize:  maxSize,
+	}
+	getTree(driveId, pathStr, 0, statistic, setting)
 	fmt.Printf("\n%d 个文件夹, %d 个文件, %s 总大小\n", statistic.CountOfDir, statistic.CountOfFile, converter.ConvertFileSize(statistic.SizeOfFile, 2))
 }

internal/command/upload.go

@@ -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,13 @@ 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"
-	"regexp"
 	"strings"
 	"sync"
 	"time"
@@ -61,10 +61,10 @@ type (
 		NoRapidUpload  bool
 		ShowProgress   bool
 		IsOverwrite    bool // 覆盖已存在的文件，如果同名文件已存在则移到回收站里
+		IsSkipSameName bool // 跳过已存在的文件，即使文件内容不一致(不检查SHA1)
 		DriveId        string
 		ExcludeNames   []string // 排除的文件名，包括文件夹和文件。即这些文件/文件夹不进行上传，支持正则表达式
 		BlockSize      int64    // 分片大小
-		UseInternalUrl bool     // 是否使用内置链接
 	}
 )
 
@@ -91,6 +91,10 @@ var UploadFlags = []cli.Flag{
 		Name:  "ow",
 		Usage: "overwrite, 覆盖已存在的同名文件，注意已存在的文件会被移到回收站",
 	},
+	cli.BoolFlag{
+		Name:  "skip",
+		Usage: "skip same name, 跳过已存在的同名文件，即使文件内容不一致(不检查SHA1)",
+	},
 	cli.BoolFlag{
 		Name:  "norapid",
 		Usage: "不检测秒传。跳过费时的SHA1计算直接上传",
@@ -107,7 +111,7 @@ var UploadFlags = []cli.Flag{
 	},
 	cli.IntFlag{
 		Name:  "bs",
-		Usage: "block size，上传分片大小，单位KB。推荐值：1024 ~ 10240",
+		Usage: "block size，上传分片大小，单位KB。推荐值：1024 ~ 10240。当上传极大单文件时候请适当调高该值",
 		Value: 10240,
 	},
 }
@@ -132,21 +136,27 @@ func CmdUpload() cli.Command {
     3. 将本地的 C:\Users\Administrator\Desktop 整个目录上传到网盘 /视频 目录
     aliyunpan upload C:/Users/Administrator/Desktop /视频
 
-    4. 使用相对路径
+    4. 将本地 200GB 极大文件 C:\Users\Administrator\Desktop\1.mp4 上传到网盘 /视频 目录，需要调高上传分片大小
+    aliyunpan upload -bs 30720 C:/Users/Administrator/Desktop/1.mp4 /视频
+
+    5. 使用相对路径
     aliyunpan upload 1.mp4 /视频
 
-    5. 覆盖上传，已存在的同名文件会被移到回收站
+    6. 覆盖上传，已存在的同名文件会被移到回收站
     aliyunpan upload -ow 1.mp4 /视频
 
-    6. 将本地的 C:\Users\Administrator\Video 整个目录上传到网盘 /视频 目录，但是排除所有的.jpg文件
+    7. 将本地的 C:\Users\Administrator\Video 整个目录上传到网盘 /视频 目录，但是排除所有的.jpg文件
     aliyunpan upload -exn "\.jpg$" C:/Users/Administrator/Video /视频
 
-    7. 将本地的 C:\Users\Administrator\Video 整个目录上传到网盘 /视频 目录，但是排除所有的.jpg文件和.mp3文件，每一个排除项就是一个exn参数
+    8. 将本地的 C:\Users\Administrator\Video 整个目录上传到网盘 /视频 目录，但是排除所有的.jpg文件和.mp3文件，每一个排除项就是一个exn参数
     aliyunpan upload -exn "\.jpg$" -exn "\.mp3$" C:/Users/Administrator/Video /视频
 
-    8. 将本地的 C:\Users\Administrator\Video 整个目录上传到网盘 /视频 目录，但是排除所有的 @eadir 文件夹
+    9. 将本地的 C:\Users\Administrator\Video 整个目录上传到网盘 /视频 目录，但是排除所有的 @eadir 文件夹
     aliyunpan upload -exn "^@eadir$" C:/Users/Administrator/Video /视频
 
+    10. 跳过已存在的同名文件，即使文件内容不一致(不检查SHA1)
+    aliyunpan upload -skip 1.mp4 /视频
+
   参考：
     以下是典型的排除特定文件或者文件夹的例子，注意：参数值必须是正则表达式。在正则表达式中，^表示匹配开头，$表示匹配结尾。
     1)排除@eadir文件或者文件夹：-exn "^@eadir$"
@@ -156,7 +166,7 @@ func CmdUpload() cli.Command {
     5)排除 myfile.txt 文件：-exn "^myfile.txt$"
 `,
 		Category: "阿里云盘",
-		Before:   cmder.ReloadConfigFunc,
+		Before:   ReloadConfigFunc,
 		Action: func(c *cli.Context) error {
 			if c.NArg() < 2 {
 				cli.ShowCommandHelp(c, c.Command.Name)
@@ -173,92 +183,59 @@ func CmdUpload() cli.Command {
 				}
 			}
 
+			// 获取上传文件锁，保证上传操作单实例
+			//locker := filelocker.NewFileLocker(config.GetLockerDir() + "/aliyunpan-upload")
+			//if e := filelocker.LockFile(locker, 0755, true, 5*time.Second); e != nil {
+			//	logger.Verboseln(e)
+			//	fmt.Println("本应用其他实例正在执行上传，请先停止或者等待其完成")
+			//	return nil
+			//}
+
 			RunUpload(subArgs[:c.NArg()-1], subArgs[c.NArg()-1], &UploadOptions{
-				AllParallel:   c.Int("p"), // 多文件上传的时候，允许同时并行上传的文件数量
-				Parallel:      1,          // 一个文件同时多少个线程并发上传的数量。阿里云盘只支持单线程按顺序进行文件part数据上传，所以只能是1
-				MaxRetry:      c.Int("retry"),
-				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),
 			})
+
+			// 释放文件锁
+			//if locker != nil {
+			//	filelocker.UnlockFile(locker)
+			//}
 			return nil
 		},
 		Flags: UploadFlags,
 	}
 }
 
-func CmdRapidUpload() cli.Command {
-	return cli.Command{
-		Name:      "rapidupload",
-		Aliases:   []string{"ru"},
-		Usage:     "手动秒传文件",
-		UsageText: cmder.App().Name + " rapidupload \"aliyunpan://file.dmg|752FCCBFB2436A6FFCA3B287831D4FAA5654B07E|7005440|pan_folder\"",
-		Description: `
-	使用此功能秒传文件, 前提是知道文件的大小, sha1, 且网盘中存在一模一样的文件.
-	上传的文件将会保存到网盘的目标目录。文件的秒传链接可以通过share或者export命令获取。
-
-	链接格式说明：aliyunpan://文件名|sha1|文件大小|<相对路径>
-    "相对路径" 可以为空，为空代表存储到网盘根目录
-
-	示例:
-	1. 如果秒传成功, 则保存到网盘路径 /pan_folder/file.dmg
-	aliyunpan rapidupload "aliyunpan://file.dmg|752FCCBFB2436A6FFCA3B287831D4FAA5654B07E|7005440|pan_folder"
-
-	2. 如果秒传成功, 则保存到网盘路径 /file.dmg
-	aliyunpan rapidupload "aliyunpan://file.dmg|752FCCBFB2436A6FFCA3B287831D4FAA5654B07E|7005440|"
-
-	3. 同时秒传多个文件，如果秒传成功, 则保存到网盘路径 /pan_folder/file.dmg, /pan_folder/file1.dmg
-	aliyunpan rapidupload "aliyunpan://file.dmg|752FCCBFB2436A6FFCA3B287831D4FAA5654B07E|7005440|pan_folder" "aliyunpan://file1.dmg|752FCCBFB2436A6FFCA3B287831D4FAA5654B07E|7005440|pan_folder"
-`,
-		Category: "阿里云盘",
-		Before:   cmder.ReloadConfigFunc,
-		Action: func(c *cli.Context) error {
-			if c.NArg() <= 0 {
-				cli.ShowCommandHelp(c, c.Command.Name)
-				return nil
-			}
-			subArgs := c.Args()
-			RunRapidUpload(parseDriveId(c), c.Bool("ow"), subArgs, c.String("path"))
-			return nil
-		},
-		Flags: []cli.Flag{
-			cli.BoolFlag{
-				Name:  "ow",
-				Usage: "overwrite, 覆盖已存在的文件。已存在的文件会并移到回收站",
-			},
-			cli.StringFlag{
-				Name:  "path",
-				Usage: "存储到网盘目录，绝对路径，例如：/myfolder",
-				Value: "",
-			},
-			cli.StringFlag{
-				Name:  "driveId",
-				Usage: "网盘ID",
-				Value: "",
-			},
-		},
-	}
-}
-
 // RunUpload 执行文件上传
 func RunUpload(localPaths []string, savePath string, opt *UploadOptions) {
 	activeUser := GetActiveUser()
-	activeUser.PanClient().EnableCache()
-	activeUser.PanClient().ClearCache()
-	defer activeUser.PanClient().DisableCache()
-	// pan token expired checker
-	go func() {
-		for {
-			time.Sleep(time.Duration(1) * time.Minute)
-			if RefreshTokenInNeed(activeUser) {
-				logger.Verboseln("update access token for upload task")
-			}
-		}
-	}()
+	activeUser.PanClient().OpenapiPanClient().EnableCache()
+	activeUser.PanClient().OpenapiPanClient().ClearCache()
+	defer activeUser.PanClient().OpenapiPanClient().DisableCache()
+
+	//// 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 upload task")
+	//		}
+	//	}
+	//}(&continueFlag)
 
 	if opt == nil {
 		opt = &UploadOptions{}
@@ -272,7 +249,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 {
@@ -281,17 +258,16 @@ 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))
 
 	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)
 	}
@@ -302,7 +278,7 @@ func RunUpload(localPaths []string, savePath string, opt *UploadOptions) {
 		return
 	}
 
-	// 打开上传状态
+	// 打开上传状态数据库
 	uploadDatabase, err := panupload.NewUploadingDatabase()
 	if err != nil {
 		fmt.Printf("打开上传未完成数据库错误: %s\n", err)
@@ -331,6 +307,9 @@ func RunUpload(localPaths []string, savePath string, opt *UploadOptions) {
 	// 获取当前插件
 	plugin, _ := pluginManger.GetPlugin()
 
+	// 上传记录器
+	fileRecorder := log.NewFileRecorder(config.GetLogDir() + "/upload_file_records.csv")
+
 	// 遍历指定的文件并创建上传任务
 	for _, curPath := range localPaths {
 		var walkFunc localfile.MyWalkFunc
@@ -338,7 +317,7 @@ func RunUpload(localPaths []string, savePath string, opt *UploadOptions) {
 		localPathDir := filepath.Dir(curPath)
 
 		// 是否排除上传
-		if isExcludeFile(curPath, opt) {
+		if utils.IsExcludeFile(curPath, &opt.ExcludeNames) {
 			fmt.Printf("排除文件: %s\n", curPath)
 			continue
 		}
@@ -360,7 +339,7 @@ func RunUpload(localPaths []string, savePath string, opt *UploadOptions) {
 			}
 
 			// 是否排除上传
-			if isExcludeFile(file.LogicPath, opt) {
+			if utils.IsExcludeFile(file.LogicPath, &opt.ExcludeNames) {
 				fmt.Printf("排除文件: %s\n", file.LogicPath)
 				return filepath.SkipDir
 			}
@@ -416,8 +395,9 @@ 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,
 				}, opt.MaxRetry)
 				fmt.Printf("[%s] 加入上传队列: %s\n", taskinfo.Id(), file.LogicPath)
 			} else {
@@ -425,16 +405,18 @@ func RunUpload(localPaths []string, savePath string, opt *UploadOptions) {
 				// 这样空文件夹也可以正确上传
 				saveFilePath := subSavePath
 				if saveFilePath != "/" {
+					folderCreateMutex.Lock()
 					fmt.Printf("正在检测和创建云盘文件夹: %s\n", saveFilePath)
-					_, apierr1 := activeUser.PanClient().FileInfoByPath(opt.DriveId, 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)
 						}
 					}
+					folderCreateMutex.Unlock()
 				}
 			}
 			return nil
@@ -473,124 +455,3 @@ func RunUpload(localPaths []string, savePath string, opt *UploadOptions) {
 	}
 	activeUser.DeleteCache(GetAllPathFolderByPath(savePath))
 }
-
-// 是否是排除上传的文件
-func isExcludeFile(filePath string, opt *UploadOptions) bool {
-	if opt == nil || len(opt.ExcludeNames) == 0 {
-		return false
-	}
-
-	for _, pattern := range opt.ExcludeNames {
-		fileName := path.Base(strings.ReplaceAll(filePath, "\\", "/"))
-		m, _ := regexp.MatchString(pattern, fileName)
-		if m {
-			return true
-		}
-	}
-	return false
-}
-
-// 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
-}

internal/command/user_info.go

@@ -4,7 +4,7 @@
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
-//     http://www.apache.org/licenses/LICENSE-2.0
+//	http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,7 +15,6 @@ package command
 
 import (
 	"fmt"
-	"github.com/tickstep/aliyunpan-api/aliyunpan"
 	"github.com/tickstep/aliyunpan/cmder"
 	"github.com/tickstep/aliyunpan/internal/config"
 	"github.com/urfave/cli"
@@ -29,7 +28,7 @@ func CmdLoglist() cli.Command {
 		Usage:       "列出帐号列表",
 		Description: "列出所有已登录的阿里账号",
 		Category:    "阿里云盘账号",
-		Before:      cmder.ReloadConfigFunc,
+		Before:      ReloadConfigFunc,
 		Action: func(c *cli.Context) error {
 			fmt.Println(config.Config.UserList.String())
 			return nil
@@ -47,11 +46,11 @@ func CmdSu() cli.Command {
 
 	示例:
 	aliyunpan su
-	aliyunpan su <uid or name>
+	aliyunpan su <uid>
 `,
 		Category: "阿里云盘账号",
-		Before:   cmder.ReloadConfigFunc,
-		After:    cmder.SaveConfigFunc,
+		Before:   ReloadConfigFunc,
+		After:    SaveConfigFunc,
 		Action: func(c *cli.Context) error {
 			if c.NArg() >= 2 {
 				cli.ShowCommandHelp(c, c.Command.Name)
@@ -95,14 +94,14 @@ func CmdSu() cli.Command {
 				cli.ShowCommandHelp(c, c.Command.Name)
 			}
 
-			switchedUser, err := config.Config.SwitchUser(uid, inputData)
+			switchedUser, err := config.Config.SwitchUser(uid)
 			if err != nil {
 				fmt.Printf("切换用户失败, %s\n", err)
 				return nil
 			}
 
 			if switchedUser == nil {
-				switchedUser = cmder.TryLogin()
+				switchedUser = TryLogin()
 			}
 
 			if switchedUser != nil {
@@ -122,7 +121,7 @@ func CmdWho() cli.Command {
 		Usage:       "获取当前帐号",
 		Description: "获取当前帐号的信息",
 		Category:    "阿里云盘账号",
-		Before:      cmder.ReloadConfigFunc,
+		Before:      ReloadConfigFunc,
 		Action: func(c *cli.Context) error {
 			if config.Config.ActiveUser() == nil {
 				fmt.Println("未登录账号")
@@ -130,12 +129,13 @@ func CmdWho() cli.Command {
 			}
 			activeUser := config.Config.ActiveUser()
 			cloudName := activeUser.GetDriveById(activeUser.ActiveDriveId).DriveName
-			fmt.Printf("当前帐号UID: %s, 昵称: %s, 用户名: %s, 网盘：%s\n", activeUser.UserId, activeUser.Nickname, activeUser.AccountName, cloudName)
+			user, _ := GetActivePanClient().OpenapiPanClient().GetUserInfo()
+			thirdParty := "未开通"
+			if user.ThirdPartyVip {
+				thirdParty = "已开通(" + user.ThirdPartyVipExpire + ")"
+			}
+			fmt.Printf("当前帐号UID: %s, 昵称: %s, 三方权益包: %s, 当前使用网盘：%s\n", activeUser.UserId, activeUser.Nickname, thirdParty, cloudName)
 			return nil
 		},
 	}
 }
-
-func RunGetUserInfo() (userInfo *aliyunpan.UserInfo, error error) {
-	return GetActivePanClient().GetUserInfo()
-}

internal/command/utils.go

@@ -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,40 +16,75 @@ package command
 import (
 	"fmt"
 	"github.com/tickstep/aliyunpan-api/aliyunpan"
+	"github.com/tickstep/aliyunpan-api/aliyunpan_web"
 	"github.com/tickstep/aliyunpan/internal/config"
+	"github.com/tickstep/aliyunpan/internal/functions/panlogin"
+	"github.com/tickstep/aliyunpan/internal/plugins"
+	"github.com/tickstep/aliyunpan/internal/utils"
 	"github.com/tickstep/library-go/logger"
+	"github.com/urfave/cli"
 	"math/rand"
 	"net/url"
 	"path"
 	"path/filepath"
 	"strings"
+	"sync"
 	"time"
 )
 
 var (
 	panCommandVerbose = logger.New("PANCOMMAND", config.EnvVerbose)
+
+	saveConfigMutex *sync.Mutex = new(sync.Mutex)
+
+	ReloadConfigFunc = func(c *cli.Context) error {
+		err := config.Config.Reload()
+		if err != nil {
+			fmt.Printf("重载配置错误: %s\n", err)
+		}
+		return nil
+	}
+
+	SaveConfigFunc = func(c *cli.Context) error {
+		saveConfigMutex.Lock()
+		defer saveConfigMutex.Unlock()
+		err := config.Config.Save()
+		if err != nil {
+			fmt.Printf("保存配置错误: %s\n", err)
+		}
+		return nil
+	}
 )
 
-// GetFileInfoByPaths 获取指定文件路径的文件详情信息
-func GetFileInfoByPaths(paths ...string) (fileInfoList []*aliyunpan.FileEntity, failedPaths []string, error error) {
-	if len(paths) <= 0 {
-		return nil, nil, fmt.Errorf("请指定文件路径")
+// RunTestShellPattern 执行测试通配符
+func RunTestShellPattern(driveId string, pattern string) {
+	acUser := GetActiveUser()
+	files, err := acUser.PanClient().OpenapiPanClient().MatchPathByShellPattern(driveId, GetActiveUser().PathJoin(driveId, pattern))
+	if err != nil {
+		fmt.Println(err)
+		return
 	}
-	activeUser := GetActiveUser()
-
-	for idx := 0; idx < len(paths); idx++ {
-		absolutePath := path.Clean(activeUser.PathJoin(activeUser.ActiveDriveId, paths[idx]))
-		fe, err := activeUser.PanClient().FileInfoByPath(activeUser.ActiveDriveId, absolutePath)
-		if err != nil {
-			failedPaths = append(failedPaths, absolutePath)
-			continue
-		}
-		fileInfoList = append(fileInfoList, fe)
+	for _, f := range *files {
+		fmt.Printf("%s\n", f.Path)
 	}
 	return
 }
 
-func matchPathByShellPattern(driveId string, patterns ...string) (panpaths []string, err error) {
+// matchPathByShellPattern 通配符匹配路径，允许返回多个匹配结果
+func matchPathByShellPattern(driveId string, patterns ...string) (files []*aliyunpan.FileEntity, e error) {
+	acUser := GetActiveUser()
+	for k := range patterns {
+		ps, err := acUser.PanClient().OpenapiPanClient().MatchPathByShellPattern(driveId, acUser.PathJoin(driveId, patterns[k]))
+		if err != nil {
+			return nil, err
+		}
+		files = append(files, *ps...)
+	}
+	return files, nil
+}
+
+// makePathAbsolute 拼接路径，确定返回路径为绝对路径
+func makePathAbsolute(driveId string, patterns ...string) (panpaths []string, err error) {
 	acUser := GetActiveUser()
 	for k := range patterns {
 		ps := acUser.PathJoin(driveId, patterns[k])
@@ -92,26 +127,86 @@ func UnescapeStr(s string) string {
 	return r
 }
 
-// RefreshTokenInNeed 刷新refresh token
-func RefreshTokenInNeed(activeUser *config.PanUser) bool {
+func NewWebLoginToken(accessToken string, expired int64) aliyunpan_web.WebLoginToken {
+	webapiToken := &config.PanClientToken{
+		AccessToken: accessToken,
+		Expired:     expired,
+	}
+	return aliyunpan_web.WebLoginToken{
+		AccessTokenType: "Bearer",
+		AccessToken:     webapiToken.AccessToken,
+		RefreshToken:    "",
+		ExpiresIn:       7200,
+		ExpireTime:      webapiToken.GetExpiredTimeCstStr(),
+	}
+}
+
+// RefreshWebTokenInNeed 刷新 webapi access token
+func RefreshWebTokenInNeed(activeUser *config.PanUser, deviceName string) bool {
 	if activeUser == nil {
 		return false
 	}
 
-	// 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()) <= (2 * 60) { // 有效期小于2min就刷新
+				pluginManger := plugins.NewPluginManager(config.GetPluginDir())
+				plugin, _ := pluginManger.GetPlugin()
+				params := &plugins.UserTokenRefreshFinishParams{
+					Result:    "success",
+					Message:   "webapi",
+					OldToken:  "",
+					NewToken:  "",
+					UpdatedAt: utils.NowTimeStr(),
+				}
+
 				// need update refresh token
-				logger.Verboseln("access token expired, get new from refresh token")
-				if wt, er := aliyunpan.GetAccessTokenFromRefreshToken(activeUser.RefreshToken); er == nil {
-					activeUser.WebToken = *wt
-					activeUser.PanClient().UpdateToken(*wt)
+				logger.Verboseln("web access token expired, get new from server")
+				loginHelper := panlogin.NewLoginHelper(config.DefaultTokenServiceWebHost)
+				wt, e := loginHelper.GetWebapiNewToken(activeUser.TicketId, activeUser.UserId, activeUser.PanClient().WebapiPanClient().GetAccessToken())
+				if e != nil {
+					logger.Verboseln("get web token from server error: ", e)
+				}
+				if wt != nil {
+					params.Result = "success"
+					params.OldToken = activeUser.WebapiToken.AccessToken
+					params.NewToken = wt.AccessToken
+
+					// update for user & client
+					userWebToken := NewWebLoginToken(wt.AccessToken, wt.Expired)
+					activeUser.WebapiToken = &config.PanClientToken{
+						AccessToken: wt.AccessToken,
+						Expired:     wt.Expired,
+					}
+					activeUser.PanClient().WebapiPanClient().UpdateToken(userWebToken)
 					logger.Verboseln("get new access token success")
+
+					// plugin callback
+					if er1 := plugin.UserTokenRefreshFinishCallback(plugins.GetContext(activeUser), params); er1 != nil {
+						logger.Verbosef("UserTokenRefreshFinishCallback error: " + er1.Error())
+					}
+
+					// create new signature
+					_, e := activeUser.PanClient().WebapiPanClient().CreateSession(nil)
+					if e != nil {
+						logger.Verboseln("call CreateSession error in RefreshWebTokenInNeed: " + e.Error())
+					}
 					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 = e.Error()
+						params.OldToken = activeUser.WebapiToken.AccessToken
+						if er1 := plugin.UserTokenRefreshFinishCallback(plugins.GetContext(activeUser), params); er1 != nil {
+							logger.Verbosef("UserTokenRefreshFinishCallback error: " + er1.Error())
+						}
+					}
 				}
 			}
 		}
@@ -119,25 +214,66 @@ func RefreshTokenInNeed(activeUser *config.PanUser) bool {
 	return false
 }
 
-// ReloadRefreshTokenInNeed 从配置文件加载最新token
-func ReloadRefreshTokenInNeed(activeUser *config.PanUser) bool {
+// RefreshOpenTokenInNeed 刷新 openapi access token
+func RefreshOpenTokenInNeed(activeUser *config.PanUser) bool {
 	if activeUser == nil {
 		return false
 	}
 
-	// refresh expired token
-	if activeUser.PanClient() != nil {
-		if len(activeUser.WebToken.RefreshToken) > 0 {
+	// 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.ParseInLocation("2006-01-02 15:04:05", activeUser.WebToken.ExpireTime, cz)
-			now := time.Now()
-			if (expiredTime.Unix() - now.Unix()) <= (10 * 60) { // 10min
-				// reload refresh token from config file
-				u := config.Config.ActiveUser()
-				activeUser.WebToken = u.WebToken
-				activeUser.PanClient().UpdateToken(u.WebToken)
-				logger.Verboseln("reload access token from config file")
-				return true
+			expiredTime := time.Unix(activeUser.OpenapiToken.Expired, 0).In(cz)
+			now := time.Now().In(cz)
+			if (expiredTime.Unix() - now.Unix()) <= (2 * 60) { // 有效期小于2min就刷新
+				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, e := loginHelper.GetOpenapiNewToken(activeUser.TicketId, activeUser.UserId, activeUser.PanClient().OpenapiPanClient().GetAccessToken())
+				if e != nil {
+					logger.Verboseln("get openapi token from server error: ", e)
+				}
+				if wt != nil {
+					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 true
+				} else {
+					// token refresh error
+					// if token has expired, callback plugin api for notify
+					if now.Unix() >= expiredTime.Unix() {
+						params.Result = "fail"
+						params.Message = e.Error()
+						params.OldToken = activeUser.WebapiToken.AccessToken
+						if er1 := plugin.UserTokenRefreshFinishCallback(plugins.GetContext(activeUser), params); er1 != nil {
+							logger.Verbosef("UserTokenRefreshFinishCallback error: " + er1.Error())
+						}
+					}
+				}
 			}
 		}
 	}
@@ -156,3 +292,30 @@ func isIncludeFile(pattern string, fileName string) bool {
 func isMatchWildcardPattern(name string) bool {
 	return strings.ContainsAny(name, "*") || strings.ContainsAny(name, "?") || strings.ContainsAny(name, "[")
 }
+
+// TryLogin 尝试登录，基础应用支持的各类登录方式进行尝试成功登录
+func TryLogin() *config.PanUser {
+	// can do automatically login?
+	for _, u := range config.Config.UserList {
+		if u.UserId == config.Config.ActiveUID {
+			// login
+			cloudUser, err := config.SetupUserByCookie(u.OpenapiToken, u.WebapiToken,
+				u.TicketId, u.UserId,
+				config.Config.DeviceId, config.Config.DeviceName,
+				config.Config.ClientId, config.Config.ClientSecret)
+			if cloudUser == nil {
+				logger.Verboseln("尝试登录失败: ", err)
+				fmt.Println("尝试登录失败，请使用 login 命令进行重新登录")
+				return nil
+			}
+
+			// save
+			SaveConfigFunc(nil)
+			// reload
+			ReloadConfigFunc(nil)
+
+			return config.Config.ActiveUser()
+		}
+	}
+	return nil
+}

internal/command/webdav.go

@@ -1,226 +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"
-	"time"
-)
-
-func CmdWebdav() cli.Command {
-	return cli.Command{
-		Name:        "webdav",
-		Usage:       "在线网盘服务",
-		Description: "webdav在线网盘服务",
-		Category:    "阿里云盘",
-		Before:      cmder.ReloadConfigFunc,
-		After:       cmder.SaveConfigFunc,
-		Action: func(c *cli.Context) error {
-			fmt.Print(`
-本文命令可以让阿里云盘变身为webdav协议的文件服务器。这样你可以把阿里云盘挂载为Windows、Linux、Mac系统的磁盘，可以通过NAS系统做文件管理或文件同步等等。
-当把阿里云盘作为webdav文件服务器进行使用的时候，上传文件是不支持秒传的，所以当你挂载为网络磁盘使用的时候，不建议在webdav挂载目录中上传、下载过大的文件，不然体验会非常差。
-建议作为文档，图片等小文件的同步网盘。
-
-请输入以下命令查看如何启动
-aliyunpan webdav start -h
-
-`)
-			cli.ShowCommandHelp(c, c.Command.Name)
-			return nil
-		},
-		Subcommands: []cli.Command{
-			{
-				Name:      "start",
-				Usage:     "启动webdav在线网盘服务",
-				UsageText: cmder.App().Name + " webdav start [arguments...]",
-				Description: `
-启动webdav服务，让阿里云盘变身为webdav协议的文件服务器。这样你可以把阿里云盘挂载为Windows、Linux、Mac系统的磁盘，可以通过NAS系统做文件管理或文件同步等等。
-当把阿里云盘作为webdav文件服务器进行使用的时候，上传文件是不支持秒传的，所以当你挂载为网络磁盘使用的时候，不建议在webdav挂载目录中上传、下载过大的文件，不然体验会非常差。
-建议作为文档，图片等小文件的同步网盘。
-
-	例子:
-	1. 查看帮助
-	aliyunpan webdav start -h
-
-	2. 使用默认配置启动webdav服务
-	aliyunpan webdav start
-
-	3. 启动webdav服务，并配置IP为127.0.0.1，端口为23077，登录用户名为admin，登录密码为admin123，模式为读写，文件网盘目录 /webdav_folder 作为服务的根目录
-	aliyunpan webdav start -ip "127.0.0.1" -port 23077 -webdav_user "admin" -webdav_password "admin123" -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()
-					go func() {
-						for {
-							// token刷新
-							time.Sleep(time.Duration(1) * time.Minute)
-							//time.Sleep(time.Duration(5) * time.Second)
-							if ReloadRefreshTokenInNeed(activeUser) {
-								logger.Verboseln("reload new access token for webdav")
-							}
-						}
-					}()
-
-					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,
-					},
-				},
-			},
-		},
-	}
-}

internal/command/xcp.go

@@ -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
+}

internal/config/cache.go

@@ -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
 		}

internal/config/pan_client.go

@@ -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
+}

internal/config/pan_config.go

@@ -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 配置路径环境变量
@@ -58,6 +62,12 @@ const (
 
 	// DefaultVideoFileExtensions 默认的视频文件后缀
 	DefaultVideoFileExtensions = "mp4,flv,mkv,mov,rm,rmvb,wmv,wma,mv,asf,asx,mpg,mpeg,mpe,3gp,m4v,avi,vob"
+
+	// DefaultDeviceName 默认客户端名称
+	DefaultDeviceName = "Chrome浏览器"
+
+	// DefaultClientId 默认的clientId
+	DefaultClientId = "cf9f70e8fc61430f8ec5ab5cadf31375"
 )
 
 var (
@@ -66,11 +76,6 @@ var (
 
 	// Config 配置信息, 由外部调用
 	Config = NewConfig(configFilePath)
-
-	AppVersion string
-
-	// IsAppInCliMode 是否在交互模式
-	IsAppInCliMode = false
 )
 
 type UpdateCheckInfo struct {
@@ -92,15 +97,23 @@ type PanConfig struct {
 
 	MaxDownloadRate int64 `json:"maxDownloadRate"` // 限制最大下载速度，单位 B/s, 即字节/每秒
 	MaxUploadRate   int64 `json:"maxUploadRate"`   // 限制最大上传速度，单位 B/s, 即字节/每秒
-	TransferUrlType int   `json:"transferUrlType"` // 上传/下载URL类别，1-默认，2-阿里云ECS
 
 	SaveDir string `json:"saveDir"` // 下载储存路径
 
-	Proxy           string          `json:"proxy"`      // 代理
-	LocalAddrs      string          `json:"localAddrs"` // 本地网卡地址
+	Proxy           string          `json:"proxy"`        // 代理
+	LocalAddrs      string          `json:"localAddrs"`   // 本地网卡地址
+	PreferIPType    string          `json:"preferIPType"` // 优先IP类型，IPv4或者IPv6
 	UpdateCheckInfo UpdateCheckInfo `json:"updateCheckInfo"`
 
 	VideoFileExtensions string `json:"videoFileExtensions"`
+	FileRecordConfig    string `json:"fileRecordConfig"` // 上传、下载、同步文件的记录，包括失败和成功的
+
+	DeviceId   string `json:"deviceId"`   // 客户端ID，用于标识登录客户端，阿里单个账号最多允许10个客户端同时登录
+	DeviceName string `json:"deviceName"` // 客户端名称，默认为：Chrome浏览器
+
+	// Openapi客户端信息
+	ClientId     string `json:"clientId"`
+	ClientSecret string `json:"clientSecret"`
 
 	configFilePath string
 	configFile     *os.File
@@ -189,9 +202,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
@@ -250,34 +277,30 @@ func (c *PanConfig) loadConfigFromFile() (err error) {
 	if err != nil {
 		return ErrConfigContentsParseError
 	}
+	if c.DeviceName == "" {
+		c.DeviceName = DefaultDeviceName
+	}
+	if c.ClientId == "" {
+		c.ClientId = DefaultClientId
+	}
 	return nil
 }
 
 func (c *PanConfig) initDefaultConfig() {
-	// 设置默认的下载路径
-	switch runtime.GOOS {
-	case "windows":
-		c.SaveDir = cmdutil.ExecutablePathJoin("Downloads")
-	case "android":
-		// TODO: 获取完整的的下载路径
-		c.SaveDir = "/sdcard/Download"
-	default:
-		dataPath, ok := os.LookupEnv("HOME")
-		if !ok {
-			CmdConfigVerbose.Warn("Environment HOME not set")
-			c.SaveDir = cmdutil.ExecutablePathJoin("Downloads")
-		} else {
-			c.SaveDir = filepath.Join(dataPath, "Downloads")
-		}
-	}
+	//c.SaveDir = GetDefaultDownloadDir()
 	c.ConfigVer = ConfigVersion
 	c.VideoFileExtensions = DefaultVideoFileExtensions
+	c.DeviceId = RandomDeviceId() // 生成默认客户端ID
+	c.DeviceName = DefaultDeviceName
+	c.ClientId = DefaultClientId
+	c.FileRecordConfig = "2" // 默认关闭
+	c.PreferIPType = "ipv4"  // 默认优先IPv4
 }
 
 // GetConfigDir 获取配置路径
 func GetConfigDir() string {
 	// 按照以下顺序依次获取配置目录
-	// 1.环境变量ALIYUNPAN_CONFIG_DIR => 2. /etc/aliyunpan/ => 3. ~/.aliyunpan/ => 4.当前程序目录
+	// 1.环境变量ALIYUNPAN_CONFIG_DIR => 2. XDG_CONFIG_HOME/aliyunpan => 3. /etc/aliyunpan/ => 4. ~/.aliyunpan/ => 5.当前程序目录
 
 	// 1. 从环境变量读取
 	configDir, ok := os.LookupEnv(EnvConfigDir)
@@ -291,7 +314,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) {
@@ -300,7 +330,7 @@ func GetConfigDir() string {
 			}
 		}
 
-		// 3. ~/.aliyunpan/
+		// 4. ~/.aliyunpan/
 		if runtime.GOOS == "linux" || runtime.GOOS == "windows" {
 			cd, er := homedir.Expand("~/.aliyunpan")
 			if er == nil {
@@ -312,17 +342,65 @@ func GetConfigDir() string {
 		}
 	}
 
-	// 4.当前程序所在目录
+	// 5.当前程序所在目录
 	configDir = cmdutil.ExecutablePathJoin("")
 	logger.Verboseln("use config dir: ", configDir)
 	return configDir
 }
 
+// GetDefaultDownloadDir 获取默认的下载目录
+func GetDefaultDownloadDir() string {
+	// 按照以下顺序依次获取下载目录
+	// 1.环境变量ALIYUNPAN_DOWNLOAD_DIR => 2. XDG_DOWNLOAD_DIR目录 => 3. (当前程序目录)/Downloads
+
+	downloadDir := ""
+	// 设置默认的下载路径
+	switch runtime.GOOS {
+	case "android":
+		// TODO: 获取完整的的下载路径
+		downloadDir = "/sdcard/Download"
+		return downloadDir
+	default:
+		// 1. 环境变量ALIYUNPAN_DOWNLOAD_DIR
+		d, ok := os.LookupEnv(EnvDownloadDir)
+		if ok {
+			logger.Verboseln("use download dir from ALIYUNPAN_DOWNLOAD_DIR env: ", d)
+			downloadDir = d
+			return downloadDir
+		} else {
+			// 2. $XDG_DOWNLOAD_DIR
+			xdgDownloadDir := path.Join(xdg.UserDirs.Download)
+			if IsFolderExist(xdgDownloadDir) {
+				logger.Verboseln("use XDG download dir: ", xdgDownloadDir)
+				return xdgDownloadDir
+			}
+		}
+	}
+
+	// 3. (当前程序目录)/Downloads
+	downloadDir = cmdutil.ExecutablePathJoin("Downloads")
+	logger.Verboseln("use default download dir: ", downloadDir)
+	return downloadDir
+}
+
+// GetDownloadDir 获取当前下载目录
+func GetDownloadDir() string {
+	if Config.SaveDir == "" {
+		return GetDefaultDownloadDir()
+	}
+	return Config.SaveDir
+}
+
 // GetPluginDir 获取插件文件夹路径
 func GetPluginDir() string {
 	return strings.TrimSuffix(GetConfigDir(), "/") + "/plugin"
 }
 
+// GetPluginKvFile 获取插件KV键值对存储文件
+func GetPluginKvFile() string {
+	return GetPluginDir() + "/kv.bolt"
+}
+
 // GetSyncDriveDir 获取同步备份的文件夹路径
 func GetSyncDriveDir() string {
 	return strings.TrimSuffix(GetConfigDir(), "/") + "/sync_drive"
@@ -344,6 +422,11 @@ func GetLogFilePath() string {
 	return dirPath + "/" + "aliyunpan_verbose.log"
 }
 
+// GetLockerDir 获取文件锁路径
+func GetLockerDir() string {
+	return strings.TrimSuffix(GetConfigDir(), "/")
+}
+
 func (c *PanConfig) ActiveUser() *PanUser {
 	if c.activeUser == nil {
 		if c.UserList == nil {
@@ -356,7 +439,10 @@ func (c *PanConfig) ActiveUser() *PanUser {
 			if u.UserId == c.ActiveUID {
 				if u.PanClient() == nil {
 					// restore client
-					user, err := SetupUserByCookie(&u.WebToken)
+					user, err := SetupUserByCookie(u.OpenapiToken, u.WebapiToken,
+						u.TicketId, u.UserId,
+						c.DeviceId, c.DeviceName,
+						c.ClientId, c.ClientSecret)
 					if err != nil {
 						logger.Verboseln("setup user error")
 						return nil
@@ -364,25 +450,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 = "/"
+							}
 						}
 					}
 				}
@@ -390,7 +497,7 @@ func (c *PanConfig) ActiveUser() *PanUser {
 				return u
 			}
 		}
-		return &PanUser{}
+		return nil
 	}
 	return c.activeUser
 }
@@ -401,9 +508,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
 		}
@@ -431,9 +541,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
 		}
 	}
@@ -449,7 +559,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
 		}

internal/config/pan_config_export.go

@@ -4,7 +4,7 @@
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
-//     http://www.apache.org/licenses/LICENSE-2.0
+//	http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
@@ -33,7 +33,21 @@ func (c *PanConfig) SetProxy(proxy string) {
 // SetLocalAddrs 设置localAddrs
 func (c *PanConfig) SetLocalAddrs(localAddrs string) {
 	c.LocalAddrs = localAddrs
-	requester.SetLocalTCPAddrList(strings.Split(localAddrs, ",")...)
+	ips := ParseLocalAddress(localAddrs, strings.ToLower(c.PreferIPType))
+	if len(ips) > 0 {
+		requester.SetLocalTCPAddrList(ips...)
+	}
+}
+
+func (c *PanConfig) SetPreferIPType(ipType string) {
+	c.PreferIPType = ipType
+	t := requester.IPAny
+	if strings.ToLower(ipType) == "ipv4" {
+		t = requester.IPv4
+	} else if strings.ToLower(ipType) == "ipv6" {
+		t = requester.IPv6
+	}
+	requester.SetPreferIPType(t)
 }
 
 // SetCacheSizeByStr 设置cache_size
@@ -66,8 +80,29 @@ func (c *PanConfig) SetMaxUploadRateByStr(sizeStr string) error {
 	return nil
 }
 
+// SetFileRecorderConfig 设置文件记录器
+func (c *PanConfig) SetFileRecorderConfig(config string) error {
+	if config == "1" || config == "2" {
+		c.FileRecordConfig = config
+	}
+	return nil
+}
+
+// SetDeviceId 设置客户端ID
+func (c *PanConfig) SetDeviceId(deviceId string) error {
+	if deviceId == "" {
+		return nil
+	}
+	c.DeviceId = deviceId
+	return nil
+}
+
 // PrintTable 输出表格
 func (c *PanConfig) PrintTable() {
+	fileRecorderLabel := "禁用"
+	if c.FileRecordConfig == "1" {
+		fileRecorderLabel = "开启"
+	}
 	tb := cmdtable.NewTable(os.Stdout)
 	tb.SetHeader([]string{"名称", "值", "建议值", "描述"})
 	tb.SetHeaderAlignment(tablewriter.ALIGN_LEFT)
@@ -78,10 +113,12 @@ func (c *PanConfig) PrintTable() {
 		[]string{"max_upload_parallel", strconv.Itoa(c.MaxUploadParallel), "1 ~ 20", "最大上传并发量，即同时上传文件最大数量"},
 		[]string{"max_download_rate", showMaxRate(c.MaxDownloadRate), "", "限制单个文件最大下载速度, 0代表不限制"},
 		[]string{"max_upload_rate", showMaxRate(c.MaxUploadRate), "", "限制单个文件最大上传速度, 0代表不限制"},
-		[]string{"transfer_url_type", strconv.Itoa(c.TransferUrlType), "1-默认，2-阿里云ECS", "上传下载URL类别。除非在阿里云ECS（暂只支持经典网络）服务器中使用，不然请设置1"},
-		[]string{"savedir", c.SaveDir, "", "下载文件的储存目录"},
-		[]string{"proxy", c.Proxy, "", "设置代理, 支持 http/socks5 代理，例如：http://127.0.0.1:8888"},
-		[]string{"local_addrs", c.LocalAddrs, "", "设置本地网卡地址, 多个地址用逗号隔开，例如：127.0.0.1,192.168.100.126"},
+		[]string{"savedir", GetDownloadDir(), "", "下载文件的储存目录"},
+		[]string{"proxy", c.Proxy, "", "设置代理, 支持 http/socks5 代理，例如: http://127.0.0.1:8888 或者 socks5://127.0.0.1:8889"},
+		[]string{"local_addrs", c.LocalAddrs, "", "绑定本地网卡地址, 多个地址用逗号隔开，支持网口名称，例如: 127.0.0.1,192.168.100.126,en0,eth0"},
+		[]string{"ip_type", c.PreferIPType, "ipv4-优先IPv4，ipv6-优先IPv6", "设置域名解析IP优先类型。修改后需要重启应用生效"},
+		[]string{"file_record_config", fileRecorderLabel, "1-开启，2-禁用", "设置是否开启上传、下载、同步文件的结果记录，开启后会把结果记录到CSV文件方便后期查看"},
+		[]string{"device_id", c.DeviceId, "", "客户端ID，用于标识登录客户端，阿里单个账号最多允许10个客户端同时在线。修改后需要重启应用生效"},
 	})
 	tb.Render()
 }

internal/config/pan_user.go

@@ -4,7 +4,7 @@
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
-//     http://www.apache.org/licenses/LICENSE-2.0
+//	http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,10 +17,15 @@ import (
 	"fmt"
 	"github.com/tickstep/aliyunpan-api/aliyunpan"
 	"github.com/tickstep/aliyunpan-api/aliyunpan/apierror"
+	"github.com/tickstep/aliyunpan-api/aliyunpan_open"
+	"github.com/tickstep/aliyunpan-api/aliyunpan_open/openapi"
+	"github.com/tickstep/aliyunpan-api/aliyunpan_web"
+	"github.com/tickstep/aliyunpan/internal/functions/panlogin"
 	"github.com/tickstep/library-go/expires/cachemap"
 	"github.com/tickstep/library-go/logger"
 	"path"
 	"path/filepath"
+	"time"
 )
 
 type DriveInfo struct {
@@ -48,91 +53,254 @@ 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 ""
+}
+
+// PanClientToken 授权Token
+type PanClientToken struct {
+	// AccessToken AccessToken
+	AccessToken string `json:"accessToken"`
+	// Expired 过期时间戳，单位秒
+	Expired int64 `json:"expired"`
+}
+
+// GetExpiredTimeCstStr 获取东八区时间字符串
+func (t *PanClientToken) GetExpiredTimeCstStr() string {
+	cz := time.FixedZone("CST", 8*3600) // 东8区
+	tm := time.Unix(t.Expired, 0).In(cz)
+	return tm.Format("2006-01-02 15:04:05")
+}
+
 type PanUser struct {
+	// 用户信息
 	UserId      string `json:"userId"`
 	Nickname    string `json:"nickname"`
 	AccountName string `json:"accountName"`
 
+	// 文件（备份盘）
 	Workdir           string               `json:"workdir"`
 	WorkdirFileEntity aliyunpan.FileEntity `json:"workdirFileEntity"`
 
+	// 资源库
+	ResourceWorkdir           string               `json:"resourceWorkdir"`
+	ResourceWorkdirFileEntity aliyunpan.FileEntity `json:"resourceWorkdirFileEntity"`
+
+	// 相册
 	AlbumWorkdir           string               `json:"albumWorkdir"`
 	AlbumWorkdirFileEntity aliyunpan.FileEntity `json:"albumWorkdirFileEntity"`
 
+	// 用户网盘信息
 	ActiveDriveId string        `json:"activeDriveId"`
 	DriveList     DriveInfoList `json:"driveList"`
 
-	RefreshToken string                  `json:"refreshToken"`
-	WebToken     aliyunpan.WebLoginToken `json:"webToken"`
-	TokenId      string                  `json:"tokenId"`
+	// 授权Token信息
+	TicketId     string          `json:"ticketId"`
+	WebapiToken  *PanClientToken `json:"webapiToken"`
+	OpenapiToken *PanClientToken `json:"openapiToken"`
 
-	panClient  *aliyunpan.PanClient
-	cacheOpMap cachemap.CacheOpMap
+	// API客户端
+	panClient  *PanClient          `json:"-"`
+	cacheOpMap cachemap.CacheOpMap `json:"-"`
 }
 
 type PanUserList []*PanUser
 
-func SetupUserByCookie(webToken *aliyunpan.WebLoginToken) (user *PanUser, err *apierror.ApiError) {
+func SetupUserByCookie(openapiToken, webapiToken *PanClientToken, ticketId, userId, deviceId, deviceName, clientId, clientSecret string) (user *PanUser, err *apierror.ApiError) {
 	tryRefreshWebToken := true
+	tryRefreshOpenToken := true
+	loginHelper := panlogin.NewLoginHelper(DefaultTokenServiceWebHost)
 
-	if webToken == nil {
-		return nil, apierror.NewFailedApiError("web token is empty")
+	if openapiToken == nil {
+		return nil, apierror.NewFailedApiError("openapi token is empty")
 	}
+	//if webapiToken == nil {
+	//	return nil, apierror.NewFailedApiError("webapi token is empty")
+	//}
 
-doLoginAct:
-	panClient := aliyunpan.NewPanClient(*webToken, aliyunpan.AppLoginToken{})
-	u := &PanUser{
-		WebToken:          *webToken,
-		panClient:         panClient,
-		Workdir:           "/",
-		WorkdirFileEntity: *aliyunpan.NewFileEntityForRootDir(),
-	}
+doOpenLoginAct:
+	// setup openapi client
+	openPanClient := aliyunpan_open.NewOpenPanClient(openapi.ApiConfig{
+		TicketId:     ticketId,
+		UserId:       userId,
+		ClientId:     clientId,
+		ClientSecret: clientSecret,
+	}, openapi.ApiToken{
+		AccessToken: openapiToken.AccessToken,
+		ExpiredAt:   openapiToken.Expired,
+	}, nil)
 
-	// 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 {
+			tryRefreshOpenToken = false
+			wt, e := loginHelper.GetOpenapiNewToken(ticketId, userId, openapiToken.AccessToken)
+			if e != nil {
+				logger.Verboseln("get openapi token from server error: ", e)
+				return nil, apierror.NewFailedApiError("get new openapi token error, try login again")
 			}
+			if wt != nil {
+				openapiToken = &PanClientToken{
+					AccessToken: wt.AccessToken,
+					Expired:     wt.Expired,
+				}
+			}
+			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)
+				}
+				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 {
+		logger.Verboseln("openapi token refresh, update for user")
+		u.OpenapiToken = &PanClientToken{
+			AccessToken: newToken.AccessToken,
+			Expired:     newToken.ExpiredAt,
+		}
+		return nil
+	})
+
+	// setup user info
 	name := "Unknown"
-	if userInfo != nil {
-		if userInfo.Nickname != "" {
-			name = userInfo.Nickname
+	if openUserInfo != nil {
+		// fill userId for client
+		u.PanClient().OpenapiPanClient().UpdateUserId(openUserInfo.UserId)
+		if u.PanClient().WebapiPanClient() != nil {
+			u.PanClient().WebapiPanClient().UpdateUserId(openUserInfo.UserId)
 		}
 
 		// update user
-		u.UserId = userInfo.UserId
+		if openUserInfo.Nickname != "" {
+			name = openUserInfo.Nickname
+		}
+		u.UserId = openUserInfo.UserId
 		u.Nickname = name
-		u.AccountName = userInfo.UserName
+		u.AccountName = openUserInfo.UserName
 
 		// default file drive
 		if u.ActiveDriveId == "" {
-			u.ActiveDriveId = userInfo.FileDriveId
+			u.ActiveDriveId = openUserInfo.FileDriveId
 		}
 
 		// drive list
 		u.DriveList = DriveInfoList{
-			{DriveId: userInfo.FileDriveId, DriveTag: "File", DriveName: "文件"},
-			{DriveId: userInfo.AlbumDriveId, DriveTag: "Album", DriveName: "相册"},
+			{DriveId: openUserInfo.FileDriveId, DriveTag: "File", DriveName: "备份盘"},
+			{DriveId: openUserInfo.ResourceDriveId, DriveTag: "Resource", DriveName: "资源库"},
+		}
+		if webUserInfo != nil {
+			u.AccountName = webUserInfo.UserName
+			u.DriveList = append(u.DriveList, &DriveInfo{DriveId: webUserInfo.AlbumDriveId, DriveTag: "Album", DriveName: "相册"})
 		}
 	} else {
 		// error, maybe the token has expired
-		return nil, apierror.NewFailedApiError("cannot get user info, the token has expired")
+		return nil, apierror.NewFailedApiError("cannot get user info, the token has expired. please login again")
 	}
+
+	// return user
 	return u, nil
 }
 
-func (pu *PanUser) PanClient() *aliyunpan.PanClient {
+func (pu *PanUser) PanClient() *PanClient {
 	return pu.panClient
 }
 
+func (pu *PanUser) UpdateClient(openClient *aliyunpan_open.OpenPanClient, webClient *aliyunpan_web.WebPanClient) {
+	if pu.panClient == nil {
+		pu.panClient = &PanClient{
+			webapiPanClient:  webClient,
+			openapiPanClient: openClient,
+		}
+	} else {
+		pu.panClient.webapiPanClient = webClient
+		pu.panClient.openapiPanClient = openClient
+	}
+}
+
 // PathJoin 合并工作目录和相对路径p, 若p为绝对路径则忽略
 func (pu *PanUser) PathJoin(driveId, p string) string {
 	if path.IsAbs(p) {
@@ -143,6 +311,8 @@ func (pu *PanUser) PathJoin(driveId, p string) string {
 	if di != nil {
 		if di.IsFileDrive() {
 			wd = pu.Workdir
+		} else if di.IsResourceDrive() {
+			wd = pu.ResourceWorkdir
 		} else if di.IsAlbumDrive() {
 			wd = pu.AlbumWorkdir
 		}
@@ -152,27 +322,26 @@ func (pu *PanUser) PathJoin(driveId, p string) string {
 
 func (pu *PanUser) FreshWorkdirInfo() {
 	if pu.IsFileDriveActive() {
-		fe, err := pu.PanClient().FileInfoById(pu.ActiveDriveId, pu.WorkdirFileEntity.FileId)
+		fe, err := pu.PanClient().OpenapiPanClient().FileInfoById(pu.ActiveDriveId, pu.WorkdirFileEntity.FileId)
 		if err != nil {
 			logger.Verboseln("刷新工作目录信息失败")
 			return
 		}
 		pu.WorkdirFileEntity = *fe
 	} else if pu.IsAlbumDriveActive() {
-		fe, err := pu.PanClient().FileInfoById(pu.ActiveDriveId, pu.AlbumWorkdirFileEntity.FileId)
+		fe, err := pu.PanClient().OpenapiPanClient().FileInfoById(pu.ActiveDriveId, pu.AlbumWorkdirFileEntity.FileId)
 		if err != nil {
 			logger.Verboseln("刷新工作目录信息失败")
 			return
 		}
 		pu.AlbumWorkdirFileEntity = *fe
 	}
-
 }
 
 // GetSavePath 根据提供的网盘文件路径 panpath, 返回本地储存路径,
 // 返回绝对路径, 获取绝对路径出错时才返回相对路径...
 func (pu *PanUser) GetSavePath(filePanPath string) string {
-	dirStr := filepath.Join(Config.SaveDir, fmt.Sprintf("%s", pu.UserId), filePanPath)
+	dirStr := filepath.Join(GetDownloadDir(), fmt.Sprintf("%s", pu.UserId), filePanPath)
 	dir, err := filepath.Abs(dirStr)
 	if err != nil {
 		dir = filepath.Clean(dirStr)
@@ -217,6 +386,11 @@ func (pu *PanUser) IsAlbumDriveActive() bool {
 	return d != nil && d.IsAlbumDrive()
 }
 
+func (pu *PanUser) IsResourceDriveActive() bool {
+	d := pu.GetActiveDriveInfo()
+	return d != nil && d.IsResourceDrive()
+}
+
 func (di *DriveInfo) IsFileDrive() bool {
 	return di.DriveTag == "File"
 }
@@ -224,3 +398,7 @@ func (di *DriveInfo) IsFileDrive() bool {
 func (di *DriveInfo) IsAlbumDrive() bool {
 	return di.DriveTag == "Album"
 }
+
+func (di *DriveInfo) IsResourceDrive() bool {
+	return di.DriveTag == "Resource"
+}

internal/config/utils.go

@@ -4,7 +4,7 @@
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
-//     http://www.apache.org/licenses/LICENSE-2.0
+//	http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,13 +17,17 @@ import (
 	"encoding/hex"
 	"github.com/olekukonko/tablewriter"
 	"github.com/tickstep/aliyunpan/cmder/cmdtable"
+	"github.com/tickstep/aliyunpan/library/nets"
 	"github.com/tickstep/library-go/converter"
 	"github.com/tickstep/library-go/crypto"
 	"github.com/tickstep/library-go/ids"
 	"github.com/tickstep/library-go/logger"
+	"math/rand"
+	"net"
 	"os"
 	"strconv"
 	"strings"
+	"time"
 )
 
 func (pl *PanUserList) String() string {
@@ -107,7 +111,7 @@ func DecryptString(text string) string {
 	return string(r)
 }
 
-// isFolderExist 判断文件夹是否存在
+// IsFolderExist 判断文件夹是否存在
 func IsFolderExist(pathStr string) bool {
 	fi, err := os.Stat(pathStr)
 	if err != nil {
@@ -121,3 +125,54 @@ func IsFolderExist(pathStr string) bool {
 	}
 	return fi.IsDir()
 }
+
+// RandomDeviceId 随机生成device-id
+func RandomDeviceId() string {
+	count := 24
+	STR_SET := "abcdefjhijklmnopqrstuvwxyzABCDEFJHIJKLMNOPQRSTUVWXYZ1234567890"
+	rand.Seed(time.Now().UnixNano())
+	str := strings.Builder{}
+	for i := 0; i < count; i++ {
+		str.WriteByte(byte(STR_SET[rand.Intn(len(STR_SET))]))
+	}
+	return str.String()
+}
+
+// ParseLocalAddress 解析网络接口配置为对应的本地IP地址
+func ParseLocalAddress(localAddrs string, filterIpType string) []string {
+	allLocalAddress, _ := nets.GetLocalNetInterfaceAddress()
+	localAddrNames := strings.Split(localAddrs, ",")
+	ips := []string{}
+	for _, addr := range localAddrNames {
+		if addr == "" {
+			continue
+		}
+		if net.ParseIP(addr) == nil {
+			// maybe local interface name
+			if localAddr := allLocalAddress.GetByName(addr); localAddr != nil {
+				if localAddr.IPv4 != "" {
+					if filterIpType == "any" || filterIpType == "" { // 不限制
+						ips = append(ips, localAddr.IPv4)
+					} else {
+						if filterIpType == "ipv4" {
+							ips = append(ips, localAddr.IPv4)
+						}
+					}
+				}
+				if localAddr.IPv6 != "" {
+					if filterIpType == "any" || filterIpType == "" { // 不限制
+						ips = append(ips, localAddr.IPv6)
+					} else {
+						if filterIpType == "ipv6" {
+							ips = append(ips, localAddr.IPv6)
+						}
+					}
+				}
+			}
+		} else {
+			// ip
+			ips = append(ips, addr)
+		}
+	}
+	return ips
+}

internal/config/utils_test.go

@@ -25,3 +25,7 @@ func TestEncryptString(t *testing.T) {
 func TestDecryptString(t *testing.T) {
 	fmt.Println(DecryptString("75b3c8d21607440c0e8a70f4a4861c8669774cc69c70ce2a2c8acb815b6d5d3b"))
 }
+
+func TestRandomDeviceId(t *testing.T) {
+	fmt.Println(RandomDeviceId())
+}

internal/file/downloader/config.go

@@ -4,7 +4,7 @@
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
-//     http://www.apache.org/licenses/LICENSE-2.0
+//	http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
@@ -27,13 +27,15 @@ var (
 	MinParallelSize int64 = 10 * 1024 * 1024 // 10MB
 
 	// MaxParallelWorkerCount 单个文件下载最大并发线程数量
+	// 阿里云盘规定：并发下载线程数不要超过3，否则会有风控检测处罚的风险
 	MaxParallelWorkerCount int = 3
 )
 
-//Config 下载配置
+// Config 下载配置
 type Config struct {
 	Mode                       transfer.RangeGenMode      // 下载Range分配模式
 	MaxParallel                int                        // 最大下载并发量
+	SliceParallel              int                        // 单文件下载线程数，为0代表程序自动调度
 	CacheSize                  int                        // 下载缓冲
 	BlockSize                  int64                      // 每个Range区块的大小, RangeGenMode 为 RangeGenMode2 时才有效
 	MaxRate                    int64                      // 限制最大下载速度
@@ -41,18 +43,18 @@ type Config struct {
 	InstanceStatePath          string                     // 断点续传信息路径
 	TryHTTP                    bool                       // 是否尝试使用 http 连接
 	ShowProgress               bool                       // 是否展示下载进度条
-	UseInternalUrl             bool // 是否使用内置链接
+	ExcludeNames               []string                   // 排除的文件名，包括文件夹和文件。即这些文件/文件夹不进行下载，支持正则表达式
 }
 
-//NewConfig 返回默认配置
+// NewConfig 返回默认配置
 func NewConfig() *Config {
 	return &Config{
-		MaxParallel: 5,
+		MaxParallel: 3,
 		CacheSize:   CacheSize,
 	}
 }
 
-//Fix 修复配置信息, 使其合法
+// Fix 修复配置信息, 使其合法
 func (cfg *Config) Fix() {
 	fixCacheSize(&cfg.CacheSize)
 	if cfg.MaxParallel < 1 {
@@ -60,7 +62,7 @@ func (cfg *Config) Fix() {
 	}
 }
 
-//Copy 拷贝新的配置
+// Copy 拷贝新的配置
 func (cfg *Config) Copy() *Config {
 	newCfg := *cfg
 	return &newCfg

internal/file/downloader/downloader.go

@@ -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,7 @@ 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/waitgroup"
 	"github.com/tickstep/aliyunpan/library/requester/transfer"
 	"github.com/tickstep/library-go/cachepool"
@@ -28,6 +29,7 @@ import (
 	"github.com/tickstep/library-go/requester/rio/speeds"
 	"io"
 	"net/http"
+	"strings"
 	"sync"
 	"time"
 )
@@ -61,7 +63,8 @@ type (
 		loadBalansers           []string
 		writer                  io.WriterAt
 		client                  *requester.HTTPClient
-		panClient               *aliyunpan.PanClient
+		panClient               *config.PanClient
+		subPanClientList        []*config.PanClient // 辅助下载子账号列表
 		config                  *Config
 		monitor                 *Monitor
 		instanceState           *InstanceState
@@ -71,20 +74,30 @@ 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客户端
+// SetClient 设置http客户端
 func (der *Downloader) SetFileInfo(f *aliyunpan.FileEntity) {
 	der.fileInfo = f
 }
@@ -93,7 +106,7 @@ func (der *Downloader) SetDriveId(driveId string) {
 	der.driveId = driveId
 }
 
-//SetClient 设置http客户端
+// SetClient 设置http客户端
 func (der *Downloader) SetClient(client *requester.HTTPClient) {
 	der.client = client
 }
@@ -103,7 +116,7 @@ func (der *Downloader) SetLoadBalancerCompareFunc(f LoadBalancerCompareFunc) {
 	der.loadBalancerCompareFunc = f
 }
 
-//SetStatusCodeBodyCheckFunc 设置响应状态码出错的检查函数, 当FirstCheckMethod不为HEAD时才有效
+// SetStatusCodeBodyCheckFunc 设置响应状态码出错的检查函数, 当FirstCheckMethod不为HEAD时才有效
 func (der *Downloader) SetStatusCodeBodyCheckFunc(f StatusCodeBodyCheckFunc) {
 	der.statusCodeBodyCheckFunc = f
 }
@@ -128,19 +141,20 @@ func (der *Downloader) lazyInit() {
 }
 
 // SelectParallel 获取合适的 parallel
-func (der *Downloader) SelectParallel(single bool, maxParallel int, totalSize int64, instanceRangeList transfer.RangeList) (parallel int) {
-	isRange := instanceRangeList != nil && len(instanceRangeList) > 0
-	if single { // 单线程下载
-		parallel = 1
+func (der *Downloader) SelectParallel(prefParallel int, maxParallel int, totalSize int64, instanceRangeList transfer.RangeList) (parallel int) {
+	isRange := instanceRangeList != nil && len(instanceRangeList) > 0 // 历史下载分片记录存在
+	if prefParallel > 0 {                                             // 单线程下载
+		parallel = prefParallel
 	} else if isRange {
 		parallel = len(instanceRangeList)
 	} else {
-		parallel = maxParallel
-		if int64(parallel) > totalSize/int64(MinParallelSize) {
+		parallel = maxParallel                                  // 默认为设置为maxParallel个并发线程数
+		if int64(parallel) > totalSize/int64(MinParallelSize) { // 如果文件太小不足切片成maxParallel数量的分片，则计算最接近的分片数量
 			parallel = int(totalSize/int64(MinParallelSize)) + 1
 		}
 	}
 
+	// 其他情况默认使用单线程下载
 	if parallel < 1 {
 		parallel = 1
 	}
@@ -148,9 +162,9 @@ func (der *Downloader) SelectParallel(single bool, maxParallel int, totalSize in
 }
 
 // SelectBlockSizeAndInitRangeGen 获取合适的 BlockSize, 和初始化 RangeGen
-func (der *Downloader) SelectBlockSizeAndInitRangeGen(single bool, status *transfer.DownloadStatus, parallel int) (blockSize int64, initErr error) {
+func (der *Downloader) SelectBlockSizeAndInitRangeGen(status *transfer.DownloadStatus, parallel int) (blockSize int64, initErr error) {
 	// Range 生成器
-	if single { // 单线程
+	if parallel == 1 { // 单线程
 		blockSize = -1
 		return
 	}
@@ -282,7 +296,7 @@ func (der *Downloader) checkLoadBalancers() *LoadBalancerResponseList {
 	return loadBalancerResponseList
 }
 
-//Execute 开始任务
+// Execute 开始任务
 func (der *Downloader) Execute() error {
 	der.lazyInit()
 
@@ -306,7 +320,6 @@ func (der *Downloader) Execute() error {
 	var (
 		isInstance = bii != nil // 是否存在断点信息
 		status     *transfer.DownloadStatus
-		single     = false // 默认开启多线程下载
 	)
 	if !isInstance {
 		bii = &transfer.DownloadInstanceInfo{}
@@ -328,9 +341,9 @@ func (der *Downloader) Execute() error {
 		defer rl.Stop()
 	}
 
-	// 计算文件下载的线程数
-	parallel := der.SelectParallel(single, MaxParallelWorkerCount, status.TotalSize(), bii.Ranges) // 实际的下载并行量
-	blockSize, err := der.SelectBlockSizeAndInitRangeGen(single, status, parallel)                 // 实际的BlockSize
+	// 计算本文件下载的并发线程数（分片数）
+	parallel := der.SelectParallel(der.config.SliceParallel, MaxParallelWorkerCount, status.TotalSize(), bii.Ranges) // 实际的下载并行量
+	blockSize, err := der.SelectBlockSizeAndInitRangeGen(status, parallel)                                           // 实际的BlockSize
 	if err != nil {
 		return err
 	}
@@ -358,7 +371,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,44 +390,51 @@ func (der *Downloader) Execute() error {
 	)
 
 	// 获取下载链接
-	var apierr *apierror.ApiError
-	durl, apierr := der.panClient.GetFileDownloadUrl(&aliyunpan.GetFileDownloadUrlParam{
-		DriveId: der.driveId,
-		FileId:  der.fileInfo.FileId,
-	})
-	time.Sleep(time.Duration(200) * time.Millisecond)
-	if apierr != nil {
+	//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 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
+	//}
+
+	// 获取各个网盘客户端的下载链接
+	panClientFileUrl, err := der.getFileAllClientDownloadUrl()
+	if err != nil || panClientFileUrl == nil {
 		logger.Verbosef("ERROR: get download url error: %s\n", der.fileInfo.FileId)
 		cmdutil.Trigger(der.onCancelEvent)
-		return apierr
-	}
-	if durl == nil || durl.Url == "" || durl.Url == aliyunpan.IllegalDownloadUrl {
-		logger.Verbosef("无法获取有效的下载链接: %+v\n", durl)
-		cmdutil.Trigger(der.onCancelEvent)
-		der.removeInstanceState() // 移除断点续传文件
-		cmdutil.Trigger(der.onFailedEvent)
-		return ErrFileDownloadForbidden
+		return err
 	}
 
 	// 初始化下载worker
+	factorNum := len(bii.Ranges) / len(panClientFileUrl)
 	for k, r := range bii.Ranges {
+		panClientUrl := panClientFileUrl[int(k/factorNum)]
 		loadBalancer := loadBalancerResponseList.SequentialGet()
 		if loadBalancer == nil {
 			continue
 		}
 
-		logger.Verbosef("work id: %d, download url: %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)
 
@@ -425,8 +445,8 @@ func (der *Downloader) Execute() error {
 
 	der.monitor.SetStatus(status)
 
-	// 服务器不支持断点续传, 或者单线程下载, 都不重载worker
-	der.monitor.SetReloadWorker(parallel > 1)
+	// 阿里云盘支持断点续传，开启重载worker
+	der.monitor.SetReloadWorker(true)
 
 	moniterCtx, moniterCancelFunc := context.WithCancel(context.Background())
 	der.monitorCancelFunc = moniterCancelFunc
@@ -456,7 +476,101 @@ func (der *Downloader) Execute() error {
 	return err
 }
 
-//downloadStatusEvent 执行状态处理事件
+// 获取对应网盘的下载链接
+func (der *Downloader) getFileAllClientDownloadUrl() ([]*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
+}
+
+// downloadStatusEvent 执行状态处理事件
 func (der *Downloader) downloadStatusEvent() {
 	if der.onDownloadStatusEvent == nil {
 		return
@@ -478,7 +592,7 @@ func (der *Downloader) downloadStatusEvent() {
 	}()
 }
 
-//Pause 暂停
+// Pause 暂停
 func (der *Downloader) Pause() {
 	if der.monitor == nil {
 		return
@@ -487,7 +601,7 @@ func (der *Downloader) Pause() {
 	der.monitor.Pause()
 }
 
-//Resume 恢复
+// Resume 恢复
 func (der *Downloader) Resume() {
 	if der.monitor == nil {
 		return
@@ -496,7 +610,7 @@ func (der *Downloader) Resume() {
 	der.monitor.Resume()
 }
 
-//Cancel 取消
+// Cancel 取消
 func (der *Downloader) Cancel() {
 	if der.monitor == nil {
 		return
@@ -505,7 +619,7 @@ func (der *Downloader) Cancel() {
 	cmdutil.Trigger(der.monitorCancelFunc)
 }
 
-//Failed 失败
+// Failed 失败
 func (der *Downloader) Failed() {
 	if der.monitor == nil {
 		return
@@ -514,42 +628,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
 }

internal/file/downloader/monitor.go

@@ -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,9 @@ func (mt *Monitor) ResetWorker(worker *Worker) {
 		// 忽略, 返回
 		return
 	case StatusCodeDownloadUrlExpired: // 下载链接已经过期
-	    worker.RefreshDownloadUrl()
+		worker.RefreshDownloadUrl()
+		break
+	case StatusCodeDownloadUrlExceedMaxConcurrency: // 下载遇到限流报错
 		break
 	}
 
@@ -357,7 +359,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 +408,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)
 				}
 			}

internal/file/downloader/status.go

@@ -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)
 }

internal/file/downloader/utils.go

@@ -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,
@@ -99,3 +99,18 @@ func fixCacheSize(size *int) {
 		*size = 1024
 	}
 }
+
+// IsUrlExpired 下载链接是否已过期。过期返回True
+func IsUrlExpired(urlStr string) bool {
+	u, err := url.Parse(urlStr)
+	if err != nil {
+		return true
+	}
+	expiredTimeSecStr := u.Query().Get("x-oss-expires")
+	expiredTimeSec, _ := strconv.ParseInt(expiredTimeSecStr, 10, 64)
+	if (expiredTimeSec - time.Now().Unix()) <= 5 { // 小于5秒钟
+		// expired
+		return true
+	}
+	return false
+}

internal/file/downloader/worker.go

@@ -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,7 +203,7 @@ func (wer *Worker) Cancel() error {
 	return nil
 }
 
-//Reset 重设连接
+// Reset 重设连接
 func (wer *Worker) Reset() {
 	if wer.resetFunc == nil {
 		logger.Verbosef("DEBUG: worker: resetFunc not set")
@@ -212,7 +221,7 @@ func (wer *Worker) Reset() {
 func (wer *Worker) RefreshDownloadUrl() {
 	var apierr *apierror.ApiError
 
-	durl, apierr := wer.panClient.GetFileDownloadUrl(&aliyunpan.GetFileDownloadUrlParam{DriveId: wer.driveId, FileId: wer.fileId})
+	durl, apierr := wer.panClient.OpenapiPanClient().GetFileDownloadUrl(&aliyunpan.GetFileDownloadUrlParam{DriveId: wer.driveId, FileId: wer.fileId})
 	if apierr != nil {
 		wer.status.statusCode = StatusCodeTooManyConnections
 		return
@@ -225,7 +234,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 +244,7 @@ func (wer *Worker) Completed() bool {
 	}
 }
 
-//Failed 是否失败
+// Failed 是否失败
 func (wer *Worker) Failed() bool {
 	switch wer.status.statusCode {
 	case StatusCodeFailed, StatusCodeInternalError, StatusCodeTooManyConnections, StatusCodeNetError:
@@ -245,17 +254,17 @@ 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() {
 	wer.lazyInit()
 
@@ -294,11 +303,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 +345,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)

internal/file/uploader/error.go

@@ -13,12 +13,21 @@
 // limitations under the License.
 package uploader
 
+import "fmt"
+
+var (
+	UploadUrlExpired       = fmt.Errorf("UrlExpired")
+	UploadPartNotSeq       = fmt.Errorf("PartNotSequential")
+	UploadTerminate        = fmt.Errorf("UploadErrorTerminate")
+	UploadPartAlreadyExist = fmt.Errorf("PartAlreadyExist")
+)
+
 type (
 	// MultiError 多线程上传的错误
 	MultiError struct {
 		Err error
 		// IsRetry 是否重试,
-		Terminated bool
+		Terminated    bool
 		NeedStartOver bool // 是否从头开始上传
 	}
 )

internal/file/uploader/multiuploader.go

@@ -18,6 +18,7 @@ import (
 	"github.com/tickstep/aliyunpan-api/aliyunpan"
 	"github.com/tickstep/aliyunpan/internal/utils"
 	"github.com/tickstep/library-go/converter"
+	"github.com/tickstep/library-go/logger"
 	"github.com/tickstep/library-go/requester"
 	"github.com/tickstep/library-go/requester/rio"
 	"github.com/tickstep/library-go/requester/rio/speeds"
@@ -136,13 +137,13 @@ func (muer *MultiUploader) Execute() error {
 	// 分配任务
 	if muer.instanceState != nil {
 		muer.workers = muer.getWorkerListByInstanceState(muer.instanceState)
-		uploaderVerbose.Infof("upload task CREATED from instance state\n")
+		logger.Verboseln("upload task CREATED from instance state\n")
 	} else {
 		muer.workers = muer.getWorkerListByInstanceState(&InstanceState{
 			BlockList: SplitBlock(muer.file.Len(), muer.config.BlockSize),
 		})
 
-		uploaderVerbose.Infof("upload task CREATED: block size: %d, num: %d\n", muer.config.BlockSize, len(muer.workers))
+		logger.Verboseln("upload task CREATED: block size: %d, num: %d\n", muer.config.BlockSize, len(muer.workers))
 	}
 
 	// 开始上传

internal/file/uploader/multiworker.go

@@ -17,6 +17,7 @@ import (
 	"context"
 	"github.com/oleiade/lane"
 	"github.com/tickstep/aliyunpan/internal/waitgroup"
+	"github.com/tickstep/library-go/logger"
 	"github.com/tickstep/library-go/requester"
 	"os"
 	"strconv"
@@ -66,77 +67,83 @@ func (muer *MultiUploader) upload() (uperr error) {
 	uploadClient.SetKeepAlive(true)
 
 	for {
-		// 阿里云盘只支持分片按顺序上传，这里正常应该是parallel = 1
+		// 阿里云盘只支持分片按顺序上传，这里必须是parallel = 1
 		wg := waitgroup.NewWaitGroup(muer.config.Parallel)
-		for {
-			e := uploadDeque.Shift()
-			if e == nil { // 任务为空
+		wg.AddDelta()
+
+		uperr = nil
+		e := uploadDeque.Shift()
+		if e == nil { // 任务为空
+			break
+		}
+
+		wer := e.(*worker)
+		go func() { // 异步上传
+			defer wg.Done()
+
+			var (
+				ctx, cancel = context.WithCancel(context.Background())
+				doneChan    = make(chan struct{})
+				uploadDone  bool
+				terr        error
+			)
+			go func() {
+				if !wer.uploadDone {
+					logger.Verboseln("begin to upload part: " + strconv.Itoa(wer.id))
+					uploadDone, terr = muer.multiUpload.UploadFile(ctx, int(wer.id), wer.partOffset, wer.splitUnit.Range().End, wer.splitUnit, uploadClient)
+				} else {
+					uploadDone = true
+				}
+				close(doneChan)
+			}()
+			select { // 监听上传进程，循环阻塞
+			case <-muer.canceled:
+				cancel()
+				return
+			case <-doneChan:
+				// continue
+				logger.Verboseln("multiUpload worker upload file done")
+			}
+			cancel()
+			if terr != nil {
+				logger.Verboseln("upload file part err: %+v", terr)
+				if me, ok := terr.(*MultiError); ok {
+					if me.Terminated { // 终止
+						muer.closeCanceledOnce.Do(func() { // 只关闭一次
+							close(muer.canceled)
+						})
+						uperr = me.Err
+						return
+					} else if me.NeedStartOver {
+						logger.Verboseln("upload start over: %d\n", wer.id)
+						// 从头开始上传
+						muer.closeCanceledOnce.Do(func() { // 只关闭一次
+							close(muer.canceled)
+						})
+						uperr = me.Err
+						return
+					}
+				}
+
+				logger.Verboseln("upload err: %s, id: %d\n", terr, wer.id)
+				wer.splitUnit.Seek(0, os.SEEK_SET)
+				uploadDeque.Prepend(wer) // 放回上传队列首位
+				return
+			}
+			wer.uploadDone = uploadDone
+
+			// 通知更新
+			if muer.updateInstanceStateChan != nil && len(muer.updateInstanceStateChan) < cap(muer.updateInstanceStateChan) {
+				muer.updateInstanceStateChan <- struct{}{}
+			}
+		}()
+		wg.Wait()
+		if uperr != nil {
+			if uperr == UploadPartNotSeq {
+				// 分片出现乱序，需要重新上传，取消本次所有剩余的分片的上传
 				break
 			}
-
-			wer := e.(*worker)
-			wg.AddDelta()
-			go func() {
-				defer wg.Done()
-
-				var (
-					ctx, cancel = context.WithCancel(context.Background())
-					doneChan    = make(chan struct{})
-					uploadDone  bool
-					terr        error
-				)
-				go func() {
-					if !wer.uploadDone {
-						uploaderVerbose.Info("begin to upload part: " + strconv.Itoa(wer.id))
-						uploadDone, terr = muer.multiUpload.UploadFile(ctx, int(wer.id), wer.partOffset, wer.splitUnit.Range().End, wer.splitUnit, uploadClient)
-					} else {
-						uploadDone = true
-					}
-					close(doneChan)
-				}()
-				select {
-				case <-muer.canceled:
-					cancel()
-					return
-				case <-doneChan:
-					// continue
-					uploaderVerbose.Info("multiUpload worker upload file done")
-				}
-				cancel()
-				if terr != nil {
-					if me, ok := terr.(*MultiError); ok {
-						if me.Terminated { // 终止
-							muer.closeCanceledOnce.Do(func() { // 只关闭一次
-								close(muer.canceled)
-							})
-							uperr = me.Err
-							return
-						} else if me.NeedStartOver {
-							uploaderVerbose.Warnf("upload start over: %d\n", wer.id)
-							// 从头开始上传
-							muer.closeCanceledOnce.Do(func() { // 只关闭一次
-								close(muer.canceled)
-							})
-							uperr = me.Err
-							return
-						}
-					}
-
-					uploaderVerbose.Warnf("upload err: %s, id: %d\n", terr, wer.id)
-					wer.splitUnit.Seek(0, os.SEEK_SET)
-					uploadDeque.Append(wer)
-					return
-				}
-				wer.uploadDone = uploadDone
-
-				// 通知更新
-				if muer.updateInstanceStateChan != nil && len(muer.updateInstanceStateChan) < cap(muer.updateInstanceStateChan) {
-					muer.updateInstanceStateChan <- struct{}{}
-				}
-			}()
 		}
-		wg.Wait()
-
 		// 没有任务了
 		if uploadDeque.Size() == 0 {
 			break
@@ -164,11 +171,11 @@ func (muer *MultiUploader) upload() (uperr error) {
 	if allSuccess {
 		e := muer.multiUpload.CommitFile()
 		if e != nil {
-			uploaderVerbose.Warn("upload file commit failed: " + e.Error())
+			logger.Verboseln("upload file commit failed: " + e.Error())
 			return e
 		}
 	} else {
-		uploaderVerbose.Warn("upload file not all success: " + muer.UploadOpEntity.FileId)
+		logger.Verboseln("upload file not all success: " + muer.UploadOpEntity.FileId)
 	}
 
 	return

internal/file/uploader/status.go

@@ -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,
@@ -42,11 +42,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

internal/file/uploader/uploader.go

@@ -14,10 +14,8 @@
 package uploader
 
 import (
-	"github.com/tickstep/aliyunpan/internal/config"
 	"github.com/tickstep/aliyunpan/internal/utils"
 	"github.com/tickstep/library-go/converter"
-	"github.com/tickstep/library-go/logger"
 	"github.com/tickstep/library-go/requester"
 	"github.com/tickstep/library-go/requester/rio"
 	"net/http"
@@ -51,10 +49,6 @@ type (
 	}
 )
 
-var (
-	uploaderVerbose = logger.New("UPLOADER", config.EnvVerbose)
-)
-
 // NewUploader 返回 uploader 对象, url: 上传地址, readerlen64: 实现 rio.ReaderLen64 接口的对象, 例如文件
 func NewUploader(url string, readerlen64 rio.ReaderLen64) (uploader *Uploader) {
 	uploader = &Uploader{

internal/functions/pandownload/download_task_unit.go

@@ -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,7 +14,6 @@
 package pandownload
 
 import (
-	"errors"
 	"fmt"
 	"github.com/tickstep/aliyunpan-api/aliyunpan"
 	"github.com/tickstep/aliyunpan-api/aliyunpan/apierror"
@@ -23,15 +22,15 @@ import (
 	"github.com/tickstep/aliyunpan/internal/file/downloader"
 	"github.com/tickstep/aliyunpan/internal/functions"
 	"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/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"
@@ -41,12 +40,15 @@ import (
 )
 
 type (
+	FileSourceType string
+
 	// DownloadTaskUnit 下载的任务单元
 	DownloadTaskUnit struct {
 		taskInfo *taskframework.TaskInfo // 任务信息
 
 		Cfg                *downloader.Config
-		PanClient          *aliyunpan.PanClient
+		PanClient          *config.PanClient
+		SubPanClientList   []*config.PanClient // 辅助下载子账号列表
 		ParentTaskExecutor *taskframework.TaskExecutor
 
 		DownloadStatistic *DownloadStatistic // 下载统计
@@ -66,6 +68,9 @@ type (
 		DriveId            string
 
 		fileInfo *aliyunpan.FileEntity // 文件或目录详情
+
+		// 下载文件记录器
+		FileRecorder *log.FileRecorder
 	}
 )
 
@@ -84,6 +89,13 @@ const (
 	StrDownloadChecksumFailed = "检测文件有效性失败"
 	// DefaultDownloadMaxRetry 默认下载失败最大重试次数
 	DefaultDownloadMaxRetry = 3
+
+	// BackupFileSource 备份盘文件
+	BackupFileSource FileSourceType = "backup"
+	// ResourceFileSource 资源库文件
+	ResourceFileSource FileSourceType = "resource"
+	// AlbumFileSource 相册文件
+	AlbumFileSource FileSourceType = "album"
 )
 
 func (dtu *DownloadTaskUnit) SetTaskInfo(info *taskframework.TaskInfo) {
@@ -159,7 +171,7 @@ func (dtu *DownloadTaskUnit) download() (err error) {
 	}
 	defer file.Close()
 
-	der := downloader.NewDownloader(writer, dtu.Cfg, dtu.PanClient, dtu.GlobalSpeedsStat)
+	der := downloader.NewDownloader(writer, dtu.Cfg, dtu.PanClient, dtu.SubPanClientList, dtu.GlobalSpeedsStat)
 	der.SetFileInfo(dtu.fileInfo)
 	der.SetDriveId(dtu.DriveId)
 	der.SetStatusCodeBodyCheckFunc(func(respBody io.Reader) error {
@@ -204,9 +216,11 @@ func (dtu *DownloadTaskUnit) download() (err error) {
 		}
 
 		if dtu.Cfg.ShowProgress {
-			fmt.Fprintf(builder, "\r[%s] ↓ %s/%s %s/s(%s/s) in %s, left %s ............", dtu.taskInfo.Id(),
+			downloadedPercentage := fmt.Sprintf("%.2f%%", float64(status.Downloaded())/float64(status.TotalSize())*100)
+			fmt.Fprintf(builder, "\r[%s] ↓ %s/%s(%s) %s/s(%s/s) in %s, left %s ............", dtu.taskInfo.Id(),
 				converter.ConvertFileSize(status.Downloaded(), 2),
 				converter.ConvertFileSize(status.TotalSize(), 2),
+				downloadedPercentage,
 				converter.ConvertFileSize(status.SpeedsPerSecond(), 2),
 				converter.ConvertFileSize(dtu.GlobalSpeedsStat.GetSpeeds(), 2),
 				status.TimeElapsed()/1e7*1e7, leftStr,
@@ -270,25 +284,13 @@ func (dtu *DownloadTaskUnit) download() (err error) {
 	return nil
 }
 
-//panHTTPClient 获取包含特定User-Agent的HTTPClient
-func (dtu *DownloadTaskUnit) panHTTPClient() (client *requester.HTTPClient) {
-	client = requester.NewHTTPClient()
-	client.CheckRedirect = func(req *http.Request, via []*http.Request) error {
-		if len(via) >= 10 {
-			return errors.New("stopped after 10 redirects")
-		}
-		return nil
-	}
-	client.SetTimeout(20 * time.Minute)
-	client.SetKeepAlive(true)
-	return client
-}
-
+// handleError 下载错误处理器
 func (dtu *DownloadTaskUnit) handleError(result *taskframework.TaskUnitRunResult) {
 	switch value := result.Err.(type) {
 	case *apierror.ApiError:
 		switch value.ErrCode() {
 		case apierror.ApiCodeFileNotFoundCode:
+		case apierror.ApiCodeForbiddenFileInTheRecycleBin:
 			result.NeedRetry = false
 			break
 		default:
@@ -308,7 +310,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 {
 		// 不检测文件有效性
@@ -365,6 +367,20 @@ func (dtu *DownloadTaskUnit) OnRetry(lastRunResult *taskframework.TaskUnitRunRes
 func (dtu *DownloadTaskUnit) OnSuccess(lastRunResult *taskframework.TaskUnitRunResult) {
 	// 执行插件
 	dtu.pluginCallback("success")
+
+	// 下载文件数据记录
+	if config.Config.FileRecordConfig == "1" {
+		if dtu.fileInfo.IsFile() {
+			if dtu.FileRecorder != nil {
+				dtu.FileRecorder.Append(&log.FileRecordItem{
+					Status:   "成功",
+					TimeStr:  utils.NowTimeStr(),
+					FileSize: dtu.fileInfo.FileSize,
+					FilePath: dtu.fileInfo.Path,
+				})
+			}
+		}
+	}
 }
 
 func (dtu *DownloadTaskUnit) OnFailed(lastRunResult *taskframework.TaskUnitRunResult) {
@@ -423,7 +439,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 = "获取下载路径信息错误"
@@ -500,7 +516,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)
@@ -508,7 +524,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)
@@ -535,6 +551,13 @@ func (dtu *DownloadTaskUnit) Run() (result *taskframework.TaskUnitRunResult) {
 		// 创建对应的任务进行下载
 		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)
+				continue
+			}
+
 			if fileList[k].IsFolder() {
 				logger.Verbosef("[%s] create sub folder download task: %s\n",
 					dtu.taskInfo.Id(), fileList[k].Path)
@@ -592,6 +615,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)
 	// 下载成功

internal/functions/pandownload/utils.go

@@ -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,

internal/functions/panlogin/login_helper.go

@@ -4,7 +4,7 @@ import (
 	"encoding/hex"
 	"encoding/json"
 	"fmt"
-	"github.com/tickstep/aliyunpan/internal/config"
+	"github.com/tickstep/aliyunpan/internal/global"
 	"github.com/tickstep/aliyunpan/internal/utils"
 	"github.com/tickstep/library-go/crypto"
 	"github.com/tickstep/library-go/getip"
@@ -40,6 +40,17 @@ 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 NewLoginHelper(webHost string) *LoginHelper {
 	return &LoginHelper{
 		webHost: webHost,
@@ -57,13 +68,13 @@ func (h *LoginHelper) GetQRCodeLoginUrl(keyStr string) (*QRCodeUrlResult, error)
 		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()
@@ -114,7 +125,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()
@@ -154,7 +165,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()
@@ -220,3 +231,125 @@ func (h *LoginHelper) ParseSecureRefreshToken(keyStr, secureRefreshToken string)
 	}
 	return refreshToken, nil
 }
+
+// GetWebapiNewToken 获取Webapi Token
+func (h *LoginHelper) GetWebapiNewToken(ticketId, userId, oldAccessToken string) (*LoginTokenResult, error) {
+	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, err
+	}
+
+	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 = &LoginTokenResult{}
+	if err2 := json.Unmarshal(body, r); err2 != nil {
+		logger.Verboseln("parse web token result json error ", err2)
+		return nil, err2
+	}
+	return r.Data.(*LoginTokenResult), nil
+}
+
+// GetOpenapiNewToken 获取Openapi Token
+func (h *LoginHelper) GetOpenapiNewToken(ticketId, userId, oldAccessToken string) (*LoginTokenResult, error) {
+	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, err
+	}
+
+	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 = &LoginTokenResult{}
+	if err2 := json.Unmarshal(body, r); err2 != nil {
+		logger.Verboseln("parse openapi token result json error ", err2)
+		return nil, err2
+	}
+	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
+	}
+
+	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
+}

internal/functions/panupload/upload.go

@@ -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,7 +16,7 @@ package panupload
 import (
 	"context"
 	"encoding/xml"
-	"fmt"
+	"github.com/tickstep/aliyunpan/internal/config"
 	"github.com/tickstep/library-go/logger"
 	"github.com/tickstep/library-go/requester"
 	"io"
@@ -32,26 +32,18 @@ import (
 
 type (
 	PanUpload struct {
-		panClient  *aliyunpan.PanClient
+		panClient  *config.PanClient
 		targetPath string
 		driveId    string
 
 		// 网盘上传参数
 		uploadOpEntity *aliyunpan.CreateFileUploadResult
-		useInternalUrl bool
 	}
 
 	EmptyReaderLen64 struct {
 	}
 )
 
-var (
-	uploadUrlExpired       = fmt.Errorf("UrlExpired")
-	uploadPartNotSeq       = fmt.Errorf("PartNotSequential")
-	uploadTerminate        = fmt.Errorf("UploadErrorTerminate")
-	uploadPartAlreadyExist = fmt.Errorf("PartAlreadyExist")
-)
-
 func (e EmptyReaderLen64) Read(p []byte) (n int, err error) {
 	return 0, io.EOF
 }
@@ -60,19 +52,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{}
 	}
 }
 
@@ -85,9 +76,6 @@ func (pu *PanUpload) UploadFile(ctx context.Context, partseq int, partOffset int
 
 	// 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)
@@ -102,10 +90,11 @@ func (pu *PanUpload) UploadFile(ctx context.Context, partseq int, partOffset int
 			PartInfoList: infoList,
 			UploadId:     pu.uploadOpEntity.UploadId,
 		}
-		newUploadInfo, err := pu.panClient.GetUploadUrl(refreshUploadParam)
+		newUploadInfo, err := pu.panClient.OpenapiPanClient().GetUploadUrl(refreshUploadParam)
 		if err != nil {
+			logger.Verboseln(err)
 			return false, &uploader.MultiError{
-				Err:        uploadUrlExpired,
+				Err:        uploader.UploadUrlExpired,
 				Terminated: false,
 			}
 		}
@@ -141,24 +130,24 @@ func (pu *PanUpload) UploadFile(ctx context.Context, partseq int, partOffset int
 					if err := xml.Unmarshal(buf, errResp); err == nil {
 						if errResp.Code != "" {
 							if "PartNotSequential" == errResp.Code || "NoSuchUpload" == errResp.Code {
-								respError = uploadPartNotSeq
+								respError = uploader.UploadPartNotSeq
 								respErr = &uploader.MultiError{
-									Err:           uploadPartNotSeq,
+									Err:           uploader.UploadPartNotSeq,
 									Terminated:    false,
 									NeedStartOver: true,
 								}
 								return resp, respError
 							} else if "AccessDenied" == errResp.Code && "Request has expired." == errResp.Message {
-								respError = uploadUrlExpired
+								respError = uploader.UploadUrlExpired
 								respErr = &uploader.MultiError{
-									Err:        uploadUrlExpired,
+									Err:        uploader.UploadUrlExpired,
 									Terminated: false,
 								}
 								return resp, respError
 							} else if "PartAlreadyExist" == errResp.Code {
-								respError = uploadPartAlreadyExist
+								respError = uploader.UploadPartAlreadyExist
 								respErr = &uploader.MultiError{
-									Err:        uploadPartAlreadyExist,
+									Err:        uploader.UploadPartAlreadyExist,
 									Terminated: false,
 								}
 								return resp, respError
@@ -173,13 +162,13 @@ func (pu *PanUpload) UploadFile(ctx context.Context, partseq int, partOffset int
 			// 不可恢复的错误
 			switch resp.StatusCode {
 			case 400, 401, 403, 413, 600:
-				respError = uploadTerminate
+				respError = uploader.UploadTerminate
 				respErr = &uploader.MultiError{
 					Terminated: true,
 				}
 			}
 		} else {
-			respError = uploadTerminate
+			respError = uploader.UploadTerminate
 			respErr = &uploader.MultiError{
 				Terminated: true,
 			}
@@ -189,15 +178,12 @@ func (pu *PanUpload) UploadFile(ctx context.Context, partseq int, partOffset int
 
 	// 上传一个分片数据
 	uploadUrl = pu.uploadOpEntity.PartInfoList[partseq].UploadURL
-	if pu.useInternalUrl {
-		uploadUrl = pu.uploadOpEntity.PartInfoList[partseq].InternalUploadURL
-	}
-	apiError := pu.panClient.UploadFileData(uploadUrl, uploadFunc)
+	apiError := pu.panClient.OpenapiPanClient().UploadFileData(uploadUrl, uploadFunc)
 
 	if respErr != nil {
-		if respErr.Err == uploadUrlExpired {
+		if 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,
@@ -212,15 +198,12 @@ func (pu *PanUpload) UploadFile(ctx context.Context, partseq int, partOffset int
 			// 获取新的上传URL重试一次
 			pu.uploadOpEntity.PartInfoList[partseq] = guur.PartInfoList[0]
 			uploadUrl := pu.uploadOpEntity.PartInfoList[partseq].UploadURL
-			if pu.useInternalUrl {
-				uploadUrl = pu.uploadOpEntity.PartInfoList[partseq].InternalUploadURL
-			}
-			apiError = pu.panClient.UploadFileData(uploadUrl, uploadFunc)
-		} else if respErr.Err == uploadPartAlreadyExist {
+			apiError = pu.panClient.OpenapiPanClient().UploadFileData(uploadUrl, uploadFunc)
+		} else if respErr.Err == uploader.UploadPartAlreadyExist {
 			// already upload
 			// success
 			return true, nil
-		} else if respErr.Err == uploadPartNotSeq {
+		} else if respErr.Err == uploader.UploadPartNotSeq {
 			// 上传分片乱序了，需要重新从0分片开始上传
 			// 先直接返回，后续再优化
 			return false, respErr
@@ -240,7 +223,7 @@ func (pu *PanUpload) CommitFile() (cerr error) {
 	pu.lazyInit()
 	var er *apierror.ApiError
 
-	_, er = pu.panClient.CompleteUploadFile(&aliyunpan.CompleteUploadFileParam{
+	_, er = pu.panClient.OpenapiPanClient().CompleteUploadFile(&aliyunpan.CompleteUploadFileParam{
 		DriveId:  pu.driveId,
 		FileId:   pu.uploadOpEntity.FileId,
 		UploadId: pu.uploadOpEntity.UploadId,
@@ -260,7 +243,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,
 		})

internal/functions/panupload/upload_task_unit.go

@@ -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 panupload
 
 import (
 	"fmt"
+	"github.com/tickstep/aliyunpan/internal/log"
 	"github.com/tickstep/aliyunpan/internal/plugins"
 	"github.com/tickstep/library-go/logger"
 	"os"
@@ -38,6 +39,11 @@ import (
 	"github.com/tickstep/library-go/requester/rio"
 )
 
+const (
+	// DefaultCheckPreHashFileSize PreHash计算文件大小门限，默认100MB以上文件才计算
+	DefaultCheckPreHashFileSize = 100 * 1024 * 1024
+)
+
 type (
 	// StepUpload 上传步骤
 	StepUpload int
@@ -50,7 +56,7 @@ type (
 		DriveId           string // 网盘ID，例如：文件网盘，相册网盘
 		FolderCreateMutex *sync.Mutex
 
-		PanClient         *aliyunpan.PanClient
+		PanClient         *config.PanClient
 		UploadingDatabase *UploadingDatabase // 数据库
 		Parallel          int
 		NoRapidUpload     bool  // 禁用秒传，无需计算SHA1，直接上传
@@ -63,21 +69,22 @@ 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
 	}
 )
 
 const (
 	// StepUploadInit 初始化步骤
 	StepUploadInit StepUpload = iota
-	// 上传前准备，创建上传任务
+	// StepUploadPrepareUpload 上传前准备，创建上传任务
 	StepUploadPrepareUpload
 	// StepUploadRapidUpload 秒传步骤
 	StepUploadRapidUpload
@@ -93,7 +100,7 @@ func (utu *UploadTaskUnit) SetTaskInfo(taskInfo *taskframework.TaskInfo) {
 	utu.taskInfo = taskInfo
 }
 
-// prepareFile 解析文件阶段
+// prepareFile 解析文件准备阶段
 func (utu *UploadTaskUnit) prepareFile() {
 	// 解析文件保存路径
 	var (
@@ -118,11 +125,12 @@ func (utu *UploadTaskUnit) prepareFile() {
 		return
 	}
 
-	if utu.LocalFileChecksum.Length > MaxRapidUploadSize {
-		fmt.Printf("[%s] 文件超过20GB, 无法使用秒传功能, 跳过秒传...\n", utu.taskInfo.Id())
-		utu.Step = StepUploadUpload
-		return
-	}
+	//if utu.LocalFileChecksum.Length > MaxRapidUploadSize {
+	//	fmt.Printf("[%s] 文件超过20GB, 无法使用秒传功能, 跳过秒传...\n", utu.taskInfo.Id())
+	//	utu.Step = StepUploadUpload
+	//	return
+	//}
+
 	// 下一步: 秒传
 	utu.Step = StepUploadRapidUpload
 }
@@ -154,7 +162,7 @@ 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,
@@ -175,9 +183,11 @@ func (utu *UploadTaskUnit) upload() (result *taskframework.TaskUnitRunResult) {
 		}
 
 		if utu.ShowProgress {
-			fmt.Printf("\r[%s] ↑ %s/%s %s/s(%s/s) in %s ............", utu.taskInfo.Id(),
+			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(),
 				converter.ConvertFileSize(status.Uploaded(), 2),
 				converter.ConvertFileSize(status.TotalSize(), 2),
+				uploadedPercentage,
 				converter.ConvertFileSize(status.SpeedsPerSecond(), 2),
 				converter.ConvertFileSize(utu.GlobalSpeedsStat.GetSpeeds(), 2),
 				status.TimeElapsed(),
@@ -239,6 +249,16 @@ func (utu *UploadTaskUnit) OnRetry(lastRunResult *taskframework.TaskUnitRunResul
 func (utu *UploadTaskUnit) OnSuccess(lastRunResult *taskframework.TaskUnitRunResult) {
 	// 执行插件
 	utu.pluginCallback("success")
+
+	// 上传文件数据记录
+	if config.Config.FileRecordConfig == "1" {
+		utu.FileRecorder.Append(&log.FileRecordItem{
+			Status:   "成功",
+			TimeStr:  utils.NowTimeStr(),
+			FileSize: utu.LocalFileChecksum.LocalFileMeta.Length,
+			FilePath: utu.LocalFileChecksum.Path.LogicPath,
+		})
+	}
 }
 
 func (utu *UploadTaskUnit) OnFailed(lastRunResult *taskframework.TaskUnitRunResult) {
@@ -305,12 +325,14 @@ func (utu *UploadTaskUnit) Run() (result *taskframework.TaskUnitRunResult) {
 		}
 		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.prepareFile()
 	logger.Verbosef("[%s] %s 准备结束, 准备耗时 %s\n", utu.taskInfo.Id(), time.Now().Format("2006-01-02 15:04:06"), utils.ConvertTime(time.Now().Sub(timeStart)))
 
 	var apierr *apierror.ApiError
 	var rs *aliyunpan.MkdirResult
+	var efi *aliyunpan.FileEntity
 	var appCreateUploadFileParam *aliyunpan.CreateFileUploadParam
 	var sha1Str string
 	var contentHashName string
@@ -320,6 +342,7 @@ func (utu *UploadTaskUnit) Run() (result *taskframework.TaskUnitRunResult) {
 	var proofCode = ""
 	var localFileInfo os.FileInfo
 	var localFile *os.File
+	var newBlockSize int64
 
 	switch utu.Step {
 	case StepUploadPrepareUpload:
@@ -335,24 +358,33 @@ 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)
+		fe, apierr1 := utu.PanClient.OpenapiPanClient().FileInfoByPath(utu.DriveId, saveFilePath)
 		time.Sleep(1 * time.Second)
+		needToCreateFolder := false
 		if apierr1 != nil && apierr1.Code == apierror.ApiCodeFileNotFoundCode {
+			needToCreateFolder = true
+		} else {
+			if fe == nil {
+				needToCreateFolder = true
+			} else {
+				rs = &aliyunpan.MkdirResult{}
+				rs.FileId = fe.FileId
+			}
+		}
+		if needToCreateFolder {
 			logger.Verbosef("[%s] %s 创建云盘文件夹: %s\n", utu.taskInfo.Id(), time.Now().Format("2006-01-02 15:04:06"), saveFilePath)
-			// rs, apierr = utu.PanClient.MkdirRecursive(utu.DriveId, "", "", 0, strings.Split(path.Clean(saveFilePath), "/"))
-			// 可以直接创建的，不用循环创建
-			rs, apierr = utu.PanClient.Mkdir(utu.DriveId, "root", saveFilePath)
+			rs, apierr = utu.PanClient.OpenapiPanClient().MkdirByFullPath(utu.DriveId, saveFilePath)
 			if apierr != nil || rs.FileId == "" {
 				result.Err = apierr
 				result.ResultMessage = "创建云盘文件夹失败"
+				utu.FolderCreateMutex.Unlock()
 				return
 			}
 			logger.Verbosef("[%s] %s 创建云盘文件夹成功\n", utu.taskInfo.Id(), time.Now().Format("2006-01-02 15:04:06"))
-		} else {
-			rs = &aliyunpan.MkdirResult{}
-			rs.FileId = fe.FileId
 		}
+		utu.FolderCreateMutex.Unlock()
 	} else {
 		rs = &aliyunpan.MkdirResult{}
 		rs.FileId = ""
@@ -363,35 +395,73 @@ 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
+			fmt.Printf("[%s] %s 检测到同名文件，跳过上传: %s\n", utu.taskInfo.Id(), time.Now().Format("2006-01-02 15:04:06"), utu.SavePath)
+			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 {
+			// 计算完整文件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
+			}
+
+			// 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"
+		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
@@ -400,37 +470,62 @@ StepUploadPrepareUpload:
 				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)
+			fmt.Printf("[%s] %s 检测到同名文件，文件内容不一致，已将旧文件移动到回收站: %s\n", utu.taskInfo.Id(), time.Now().Format("2006-01-02 15:04:06"), utu.SavePath)
 		}
 	}
 
-	// 创建上传任务
-	appCreateUploadFileParam = &aliyunpan.CreateFileUploadParam{
-		DriveId:         utu.DriveId,
-		Name:            filepath.Base(utu.SavePath),
-		Size:            utu.LocalFileChecksum.Length,
-		ContentHash:     sha1Str,
-		ContentHashName: contentHashName,
-		CheckNameMode:   checkNameMode,
-		ParentFileId:    rs.FileId,
-		BlockSize:       utu.BlockSize,
-		ProofCode:       proofCode,
-		ProofVersion:    "v1",
+	// 自动调整BlockSize大小
+	newBlockSize = utils.ResizeUploadBlockSize(utu.LocalFileChecksum.Length, utu.BlockSize)
+	if newBlockSize != utu.BlockSize {
+		logger.Verboseln("resize upload block size to: " + converter.ConvertFileSize(newBlockSize, 2))
+		utu.BlockSize = newBlockSize
 	}
 
-	uploadOpEntity, apierr = utu.PanClient.CreateUploadFile(appCreateUploadFileParam)
+	// 创建上传任务
+	if sha1Str != "" {
+		// 计算SHA1和ProofCode，该方式支持秒传文件
+		appCreateUploadFileParam = &aliyunpan.CreateFileUploadParam{
+			DriveId:         utu.DriveId,
+			Name:            filepath.Base(utu.SavePath),
+			Size:            utu.LocalFileChecksum.Length,
+			CheckNameMode:   checkNameMode,
+			ParentFileId:    rs.FileId,
+			BlockSize:       utu.BlockSize,
+			ContentHash:     sha1Str,
+			ContentHashName: contentHashName,
+			ProofCode:       proofCode,
+			ProofVersion:    "v1",
+		}
+	} 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,
+		}
+	}
+
+	uploadOpEntity, apierr = utu.PanClient.OpenapiPanClient().CreateUploadFile(appCreateUploadFileParam)
 	if apierr != nil {
 		result.Err = apierr
 		result.ResultMessage = "创建上传任务失败：" + apierr.Error()
+		if apierr.Code == apierror.ApiCodeTooManyRequests || apierr.Code == apierror.ApiCodeBadGateway {
+			logger.Verboseln("create upload file error: " + result.ResultMessage)
+			// 重试
+			result.NeedRetry = true
+		}
 		return
 	}
 
@@ -451,7 +546,7 @@ stepUploadUpload:
 	// 正常上传流程
 	uploadResult := utu.upload()
 	if uploadResult != nil && uploadResult.Err != nil {
-		if uploadResult.Err == uploadPartNotSeq {
+		if uploadResult.Err == uploader.UploadPartNotSeq {
 			fmt.Printf("[%s] %s 文件分片上传顺序错误，开始重新上传文件\n", utu.taskInfo.Id(), time.Now().Format("2006-01-02 15:04:06"))
 			// 需要重新从0开始上传
 			uploadResult = nil

internal/functions/panupload/utils.go

@@ -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,13 @@
 package panupload
 
 import (
+	"crypto/sha1"
+	"encoding/hex"
 	"github.com/tickstep/aliyunpan/internal/config"
 	"github.com/tickstep/library-go/converter"
 	"github.com/tickstep/library-go/logger"
 	"net/url"
+	"os"
 	"path"
 	"strconv"
 	"strings"
@@ -55,7 +58,7 @@ func IsUrlExpired(urlStr string) bool {
 	}
 	expiredTimeSecStr := u.Query().Get("x-oss-expires")
 	expiredTimeSec, _ := strconv.ParseInt(expiredTimeSecStr, 10, 64)
-	if (time.Now().Unix() - 10) >= expiredTimeSec {
+	if (expiredTimeSec - time.Now().Unix()) <= 300 { // 小于5分钟
 		// expired
 		return true
 	}
@@ -78,3 +81,23 @@ func IsVideoFile(fileName string) bool {
 	}
 	return false
 }
+
+// CalcFilePreHash 计算文件 PreHash
+func CalcFilePreHash(filePath string) string {
+	localFile, _ := os.Open(filePath)
+	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)
+}
+
+// UnixTime2LocalFormatStr 时间戳转换为东8区时间字符串
+func UnixTime2LocalFormatStr(unixTime int64) string {
+	t := time.Unix(unixTime, 0)
+	cz := time.FixedZone("CST", 8*3600) // 东8区
+	return t.In(cz).Format("2006-01-02T15:04:05.000Z")
+}

internal/functions/statistic.go

@@ -14,7 +14,6 @@
 package functions
 
 import (
-	"github.com/tickstep/library-go/expires"
 	"sync/atomic"
 	"time"
 )
@@ -36,9 +35,8 @@ func (s *Statistic) TotalSize() int64 {
 
 func (s *Statistic) StartTimer() {
 	s.startTime = time.Now()
-	expires.StripMono(&s.startTime)
 }
 
 func (s *Statistic) Elapsed() time.Duration {
 	return time.Now().Sub(s.startTime)
-}
+}

internal/global/vars.go

@@ -0,0 +1,12 @@
+package global
+
+var (
+	// AppVersion 应用版本
+	AppVersion string
+
+	// IsAppInCliMode 是否在交互模式
+	IsAppInCliMode = false
+
+	// IsSupportNoneOpenApiCommands 是否开启非OpenAPI的命令
+	IsSupportNoneOpenApiCommands = false
+)

internal/log/file_record.go

@@ -0,0 +1,76 @@
+package log
+
+import (
+	"encoding/csv"
+	"fmt"
+	"github.com/tickstep/aliyunpan/internal/utils"
+	"github.com/tickstep/library-go/converter"
+	"github.com/tickstep/library-go/logger"
+	"os"
+	"path/filepath"
+	"sync"
+)
+
+type (
+	FileRecordItem struct {
+		Status   string `json:"status"`
+		TimeStr  string `json:"timeStr"`
+		FileSize int64  `json:"fileSize"`
+		FilePath string `json:"filePath"`
+	}
+
+	FileRecorder struct {
+		Path   string `json:"path"`
+		locker *sync.Mutex
+	}
+)
+
+// NewFileRecorder 创建文件记录器
+func NewFileRecorder(filePath string) *FileRecorder {
+	return &FileRecorder{
+		Path:   filePath,
+		locker: &sync.Mutex{},
+	}
+}
+
+// Append 增加数据记录
+func (f *FileRecorder) Append(item *FileRecordItem) error {
+	f.locker.Lock()
+	defer f.locker.Unlock()
+	savePath := f.Path
+	folder := filepath.Dir(savePath)
+	if b, err := utils.PathExists(folder); err == nil && !b {
+		os.MkdirAll(folder, 0755)
+	}
+
+	var fp *os.File
+	var write *csv.Writer
+	if b, err := utils.PathExists(savePath); err == nil && b {
+		file, err1 := os.OpenFile(savePath, os.O_APPEND, 0755)
+		if err1 != nil {
+			logger.Verbosef("打开文件["+savePath+"]失败,%v", err1)
+			return err1
+		}
+		fp = file
+		write = csv.NewWriter(fp) //创建一个新的写入文件流
+	} else {
+		file, err1 := os.OpenFile(savePath, os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0755) // 创建文件句柄
+		if err1 != nil {
+			logger.Verbosef("创建文件["+savePath+"]失败,%v", err1)
+			return err1
+		}
+		fp = file
+		fp.WriteString("\xEF\xBB\xBF") // 写入UTF-8 BOM
+		write = csv.NewWriter(fp)      //创建一个新的写入文件流
+		write.Write([]string{"状态", "时间", "文件大小", "文件路径"})
+	}
+	if fp == nil || write == nil {
+		return fmt.Errorf("open recorder file error")
+	}
+	defer fp.Close()
+
+	data := []string{item.Status, item.TimeStr, converter.ConvertFileSize(item.FileSize, 2), item.FilePath}
+	write.Write(data)
+	write.Flush()
+	return nil
+}

internal/log/file_record_test.go

@@ -0,0 +1,16 @@
+package log
+
+import (
+	"testing"
+)
+
+func TestCsvFile(t *testing.T) {
+	savePath := "D:\\smb\\feny\\goprojects\\dev\\logs\\file_upload_records.csv"
+	recorder := NewFileRecorder(savePath)
+	recorder.Append(&FileRecordItem{
+		Status:   "成功",
+		TimeStr:  "2022-12-19 16:46:36",
+		FileSize: 453450,
+		FilePath: "D:\\smb\\feny\\goprojects\\dev\\myfile.mp4",
+	})
+}

internal/panupdate/panupdate.go

@@ -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,
@@ -21,6 +21,7 @@ import (
 	"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"
@@ -66,7 +67,7 @@ func getReleaseFromTicstep(client *requester.HTTPClient, showPrompt bool) *Relea
 		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)
+		ipAddr, runtime.GOOS, runtime.GOARCH, global.AppVersion)
 	resp, err := client.Req(http.MethodGet, fullUrl.String(), nil, nil)
 	if resp != nil {
 		defer resp.Body.Close()
@@ -211,29 +212,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")
 
@@ -297,7 +294,15 @@ func CheckUpdate(version string, yes bool) {
 
 	// 开始下载
 	buf := cachepool.RawMallocByteSlice(int(target.size))
-	resp, err := client.Req("GET", target.downloadURL, nil, nil)
+	client.CheckRedirect = func(req *http.Request, via []*http.Request) error {
+		logger.Verboseln("下载文件：" + req.URL.String())
+		req.Header.Del("Referer") // aliyundrive会检测盗链行为，所以删除Referer
+		return nil
+	}
+	header := map[string]string{}
+	header["Referer"] = ""
+	header["User-Agent"] = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/106.0.0.0 Safari/537.36 Edg/106.0.1370.42"
+	resp, err := client.Req("GET", target.downloadURL, nil, header)
 	if err != nil {
 		fmt.Printf("下载更新文件发生错误: %s\n", err)
 		return
@@ -305,6 +310,10 @@ func CheckUpdate(version string, yes bool) {
 	total, _ := strconv.Atoi(resp.Header.Get("Content-Length"))
 	if total > 0 {
 		if int64(total) != target.size {
+			if es, e := ioutil.ReadAll(resp.Body); e == nil {
+				// 发生错误
+				logger.Verboseln(string(es))
+			}
 			fmt.Printf("下载更新文件发生错误: %s\n", err)
 			return
 		}

internal/plugins/idle_plugin.go

@@ -44,6 +44,10 @@ func (p *IdlePlugin) SyncFileFinishCallback(context *Context, params *SyncFileFi
 	return nil
 }
 
+func (p *IdlePlugin) UserTokenRefreshFinishCallback(context *Context, params *UserTokenRefreshFinishParams) error {
+	return nil
+}
+
 func (p *IdlePlugin) Stop() error {
 	return nil
 }

internal/plugins/js_plugin.go

@@ -3,6 +3,7 @@ package plugins
 import (
 	"fmt"
 	"github.com/dop251/goja"
+	"github.com/tickstep/aliyunpan/internal/config"
 	"github.com/tickstep/library-go/logger"
 	"strings"
 )
@@ -55,6 +56,19 @@ func (js *JsPlugin) Start() error {
 	pluginObj.Set("LocalFS", localFS)
 	localFS.Set("deleteFile", DeleteLocalFile) // PluginUtil.LocalFS.deleteFile()
 
+	// PluginUtil.Email
+	emailObj := js.vm.NewObject()
+	pluginObj.Set("Email", emailObj)
+	emailObj.Set("sendTextMail", SendTextMail) // PluginUtil.Email.sendTextMail()
+	emailObj.Set("sendHtmlMail", SendHtmlMail) // PluginUtil.Email.sendHtmlMail()
+
+	// PluginUtil.KV
+	PersistenceFilePath = config.GetPluginKvFile()
+	kvObj := js.vm.NewObject()
+	pluginObj.Set("KV", kvObj)
+	kvObj.Set("getString", GetString) // PluginUtil.KV.getString()
+	kvObj.Set("putString", PutString) // PluginUtil.KV.putString()
+
 	return nil
 }
 
@@ -209,6 +223,24 @@ func (js *JsPlugin) SyncFileFinishCallback(context *Context, params *SyncFileFin
 	return nil
 }
 
+func (js *JsPlugin) UserTokenRefreshFinishCallback(context *Context, params *UserTokenRefreshFinishParams) error {
+	var fn func(*Context, *UserTokenRefreshFinishParams) error
+	if !js.isHandlerFuncExisted("userTokenRefreshFinishCallback") {
+		return nil
+	}
+	err := js.vm.ExportTo(js.vm.Get("userTokenRefreshFinishCallback"), &fn)
+	if err != nil {
+		logger.Verboseln("Js函数映射到 Go 函数失败！")
+		return nil
+	}
+	er := fn(context, params)
+	if er != nil {
+		logger.Verboseln(er)
+		return nil
+	}
+	return nil
+}
+
 func (js *JsPlugin) Stop() error {
 	return nil
 }

internal/plugins/plugin.go

@@ -135,6 +135,15 @@ type (
 		FileUpdatedAt string `json:"fileUpdatedAt"`
 	}
 
+	// UserTokenRefreshFinishParams 用户Token刷新完成后回调函数
+	UserTokenRefreshFinishParams struct {
+		Result    string `json:"result"`
+		Message   string `json:"message"`
+		OldToken  string `json:"oldToken"`
+		NewToken  string `json:"newToken"`
+		UpdatedAt string `json:"updatedAt"`
+	}
+
 	// Plugin 插件接口
 	Plugin interface {
 		// Start 启动
@@ -161,6 +170,9 @@ type (
 		// SyncFileFinishCallback 同步备份-同步文件完成的回调函数
 		SyncFileFinishCallback(context *Context, params *SyncFileFinishParams) error
 
+		// UserTokenRefreshFinishCallback 用户Token刷新完成后回调函数
+		UserTokenRefreshFinishCallback(context *Context, params *UserTokenRefreshFinishParams) error
+
 		// Stop 停止
 		Stop() error
 	}

internal/plugins/plugin_manager.go

@@ -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:  "",
@@ -30,7 +31,7 @@ func GetContext(user *config.PanUser) *Context {
 	}
 	return &Context{
 		AppName:      "aliyunpan",
-		Version:      config.AppVersion,
+		Version:      global.AppVersion,
 		UserId:       user.UserId,
 		Nickname:     user.Nickname,
 		FileDriveId:  user.DriveList.GetFileDriveId(),

internal/plugins/plugin_util.go

@@ -1,9 +1,30 @@
 package plugins
 
 import (
+	"crypto/tls"
+	"github.com/jordan-wright/email"
+	jsoniter "github.com/json-iterator/go"
+	"github.com/tickstep/bolt"
 	"github.com/tickstep/library-go/logger"
 	"github.com/tickstep/library-go/requester"
+	"net/smtp"
 	"os"
+	"strings"
+	"sync"
+	"time"
+)
+
+type (
+	PersistenceItem struct {
+		Key   string `json:"key"`
+		Value string `json:"value"`
+		Type  string `json:"type"`
+	}
+)
+
+var (
+	locker              = &sync.Mutex{}
+	PersistenceFilePath = ""
 )
 
 // HttpGet Http的get请求
@@ -40,3 +61,108 @@ func DeleteLocalFile(localFilePath string) bool {
 	}
 	return false
 }
+
+// SendTextMail 发送文本邮件
+func SendTextMail(mailServer, userName, password, to, subject, body string) bool {
+	if e := sendEmail(mailServer, userName, password, to, subject, body, "text", true); e != nil {
+		logger.Verboseln("js SendTextMail error ", e)
+		return false
+	}
+	return true
+}
+
+// SendHtmlMail 发送HTML富文本邮件
+func SendHtmlMail(mailServer, userName, password, to, subject, body string) bool {
+	if e := sendEmail(mailServer, userName, password, to, subject, body, "html", true); e != nil {
+		logger.Verboseln("js SendHtmlMail error ", e)
+		return false
+	}
+	return true
+}
+
+func sendEmail(mailServer, userName, password, to, subject, body, mailType string, useSsl bool) error {
+	mailServerHost := strings.Split(mailServer, ":")[0]
+	auth := smtp.PlainAuth("", userName, password, mailServerHost)
+
+	e := email.NewEmail()
+	e.From = userName
+	e.To = []string{to}
+	e.Subject = subject
+	if mailType == "html" {
+		e.HTML = []byte(body)
+	} else {
+		e.Text = []byte(body)
+	}
+
+	if useSsl {
+		return e.SendWithStartTLS(mailServer, auth, &tls.Config{ServerName: mailServerHost, InsecureSkipVerify: true})
+	} else {
+		return e.Send(mailServer, auth)
+	}
+}
+
+// GetString 获取值
+func GetString(key string) string {
+	locker.Lock()
+	defer locker.Unlock()
+	db, err := bolt.Open(PersistenceFilePath, 0755, &bolt.Options{Timeout: 5 * time.Second})
+	if err != nil {
+		return ""
+	}
+	defer db.Close()
+
+	tx, err := db.Begin(false)
+	if err != nil {
+		return ""
+	}
+	bkt := tx.Bucket([]byte("/"))
+	if bkt == nil {
+		return ""
+	}
+	data := bkt.Get([]byte(key))
+	item := PersistenceItem{}
+	if e := jsoniter.Unmarshal(data, &item); e == nil {
+		return item.Value
+	}
+	return ""
+}
+
+// PutString 存储KV键值对
+func PutString(key, value string) bool {
+	locker.Lock()
+	defer locker.Unlock()
+	db, err := bolt.Open(PersistenceFilePath, 0755, &bolt.Options{Timeout: 5 * time.Second})
+	if err != nil {
+		return false
+	}
+	defer db.Close()
+
+	// Start a writable transaction.
+	tx, err := db.Begin(true)
+	if err != nil {
+		return false
+	}
+	defer tx.Rollback()
+
+	rootBucket, er := tx.CreateBucketIfNotExists([]byte("/"))
+	if er != nil {
+		return false
+	}
+	data, ee := jsoniter.Marshal(&PersistenceItem{
+		Key:   key,
+		Value: value,
+		Type:  "string",
+	})
+	if ee != nil {
+		return false
+	}
+	if e := rootBucket.Put([]byte(key), data); e != nil {
+		return false
+	}
+
+	// Commit the transaction and check for error.
+	if err := tx.Commit(); err != nil {
+		return false
+	}
+	return true
+}

internal/plugins/plugin_util_test.go

@@ -8,3 +8,18 @@ import (
 func TestDeleteLocalFile(t *testing.T) {
 	fmt.Println(DeleteLocalFile("/Volumes/Downloads/dev/upload/2"))
 }
+
+func TestSendEmail(t *testing.T) {
+	fmt.Println(sendEmail("smtp.qq.com:465", "111xxx@qq.com", "xxxxxx", "12545xxx@qq.com", "title", "hello", "text", true))
+}
+
+func TestPutString(t *testing.T) {
+	PersistenceFilePath = "/Volumes/Downloads/kv.bolt"
+	PutString("test1", "ok1234-new")
+}
+
+func TestGetString(t *testing.T) {
+	PersistenceFilePath = "/Volumes/Downloads/kv.bolt"
+	v := GetString("test1")
+	fmt.Println(v)
+}

internal/syncdrive/file_action_task.go

@@ -2,19 +2,24 @@ package syncdrive
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"github.com/tickstep/aliyunpan-api/aliyunpan"
 	"github.com/tickstep/aliyunpan-api/aliyunpan/apierror"
+	"github.com/tickstep/aliyunpan/internal/config"
 	"github.com/tickstep/aliyunpan/internal/file/downloader"
 	"github.com/tickstep/aliyunpan/internal/file/uploader"
 	"github.com/tickstep/aliyunpan/internal/functions/panupload"
 	"github.com/tickstep/aliyunpan/internal/localfile"
+	"github.com/tickstep/aliyunpan/internal/log"
 	"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"
 	"github.com/tickstep/library-go/requester/rio/speeds"
+	"math/rand"
 	"os"
 	"path"
 	"path/filepath"
@@ -30,7 +35,7 @@ type (
 		panFileDb   PanSyncDb
 		syncFileDb  SyncFileDb
 
-		panClient *aliyunpan.PanClient
+		panClient *config.PanClient
 
 		syncItem        *SyncFileItem
 		maxDownloadRate int64 // 限制最大下载速度
@@ -38,15 +43,12 @@ type (
 
 		localFolderCreateMutex *sync.Mutex
 		panFolderCreateMutex   *sync.Mutex
+
+		// 文件记录器，存储同步文件记录
+		fileRecorder *log.FileRecorder
 	}
 )
 
-func (f *FileActionTask) prompt(msg string) {
-	if LogPrompt {
-		fmt.Println("[" + utils.NowTimeStr() + "] " + msg)
-	}
-}
-
 func (f *FileActionTask) HashCode() string {
 	postfix := ""
 	if f.syncItem.Action == SyncFileActionDownload {
@@ -60,33 +62,46 @@ 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
 		} else {
 			// upload success, post operation
 			// 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
 				}
 			}
+
+			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(),
+					FileSize: actFile.FileSize,
+					FilePath: actFile.Path,
+				})
+			}
 		}
 	}
 
 	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
@@ -136,82 +151,27 @@ func (f *FileActionTask) DoAction(ctx context.Context) error {
 					ScanStatus:    ScanStatusNormal,
 				})
 			}
+
+			// recorder
+			f.appendRecord(&log.FileRecordItem{
+				Status:   "成功-下载",
+				TimeStr:  utils.NowTimeStr(),
+				FileSize: f.syncItem.PanFile.FileSize,
+				FilePath: f.syncItem.PanFile.Path,
+			})
 		}
 	}
-
-	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())
-		}
-	}
-
-	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())
-		}
-	}
-
-	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,
 	})
 	time.Sleep(time.Duration(200) * time.Millisecond)
 	if apierr != nil {
-		if apierr.Code == apierror.ApiCodeFileNotFoundCode {
+		if apierr.Code == apierror.ApiCodeFileNotFoundCode || apierr.Code == apierror.ApiCodeForbiddenFileInTheRecycleBin {
 			f.syncItem.Status = SyncFileStatusNotExisted
 			f.syncItem.StatusUpdateTime = utils.NowTimeStr()
 			f.syncFileDb.Update(f.syncItem)
@@ -227,7 +187,7 @@ func (f *FileActionTask) downloadFile(ctx context.Context) error {
 		f.syncFileDb.Update(f.syncItem)
 		return fmt.Errorf("无法获取有效的下载链接")
 	}
-	if durl.Url == aliyunpan.IllegalDownloadUrl {
+	if strings.HasPrefix(durl.Url, aliyunpan.IllegalDownloadUrlPrefix) {
 		logger.Verbosef("无法获取有效的下载链接: %+v\n", durl)
 		f.syncItem.Status = SyncFileStatusIllegal
 		f.syncItem.StatusUpdateTime = utils.NowTimeStr()
@@ -248,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)
@@ -293,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
@@ -310,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 {
@@ -321,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
 			}
 
@@ -331,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
 				}
 
@@ -343,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: 下载链接过期处理
 		}
 	}
 }
@@ -364,6 +370,9 @@ func (f *FileActionTask) uploadFile(ctx context.Context) error {
 	err := localFile.OpenPath()
 	if err != nil {
 		logger.Verbosef("文件不可读 %s, 错误信息: %s\n", localFile.Path, err)
+		f.syncItem.Status = SyncFileStatusFailed
+		f.syncItem.StatusUpdateTime = utils.NowTimeStr()
+		f.syncFileDb.Update(f.syncItem)
 		return err
 	}
 	defer localFile.Close() // 关闭文件
@@ -372,96 +381,134 @@ 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()
+		if efi != nil && efi.FileId != "" {
+			panFileId = efi.FileId
+		}
+		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
+				}
+			}
+		}
+
+		// 自动调整BlockSize大小
+		newBlockSize := utils.ResizeUploadBlockSize(localFile.Length, f.syncItem.UploadBlockSize)
+		if newBlockSize != f.syncItem.UploadBlockSize {
+			logger.Verboseln("resize upload block size to: " + converter.ConvertFileSize(newBlockSize, 2))
+			f.syncItem.UploadBlockSize = newBlockSize
+			// 存储状态
 			f.syncFileDb.Update(f.syncItem)
-			return nil
 		}
 
-		// 创建文件夹
-		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)
-			}
-		}
-
-		// 计算proof code
-		proofCode := ""
-		localFileEntity, _ := os.Open(localFile.Path.RealPath)
-		localFileInfo, _ := localFileEntity.Stat()
-		proofCode = aliyunpan.CalcProofCode(f.panClient.GetAccessToken(), rio.NewFileReaderAtLen64(localFileEntity), localFileInfo.Size())
-
 		// 创建上传任务
 		appCreateUploadFileParam := &aliyunpan.CreateFileUploadParam{
 			DriveId:         f.syncItem.DriveId,
 			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",
 		}
-		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
@@ -475,15 +522,13 @@ 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 {
 		// 检测链接是否过期
 		// 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)
@@ -499,7 +544,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
 			}
@@ -511,19 +556,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,
@@ -531,19 +566,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 {
@@ -556,6 +638,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
 					}
 
@@ -578,128 +662,12 @@ 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 {
+func (f *FileActionTask) appendRecord(item *log.FileRecordItem) error {
+	if item == 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
-	}
+	if config.Config.FileRecordConfig == "1" {
+		return f.fileRecorder.Append(item)
+	}
+	return nil
 }

internal/syncdrive/file_action_task_mgr_test.go

@@ -1,69 +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{})
-	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"))
-	}
-}

internal/syncdrive/sync_db.go

@@ -133,7 +133,6 @@ type (
 		StatusUpdateTime string `json:"statusUpdateTime"`
 
 		DriveId           string                            `json:"driveId"`
-		UseInternalUrl    bool                              `json:"useInternalUrl"`
 		DownloadRange     *transfer.Range                   `json:"downloadRange"`
 		DownloadBlockSize int64                             `json:"downloadBlockSize"`
 		UploadRange       *transfer.Range                   `json:"uploadRange"`
@@ -349,7 +348,8 @@ func (item *SyncFileItem) getPanFileFullPath() string {
 	localRootPath := strings.ReplaceAll(item.LocalFolderPath, "\\", "/")
 
 	relativePath := strings.TrimPrefix(localPath, localRootPath)
-	return path.Join(path.Clean(item.PanFolderPath), relativePath)
+	panPath := path.Join(path.Clean(item.PanFolderPath), relativePath)
+	return strings.ReplaceAll(panPath, "\\", "/")
 }
 
 // getLocalFullPath 获取本地文件的路径

internal/syncdrive/sync_db_test.go

@@ -2,55 +2,15 @@ package syncdrive
 
 import (
 	"fmt"
-	"github.com/tickstep/aliyunpan-api/aliyunpan"
-	"github.com/tickstep/aliyunpan-api/aliyunpan/apierror"
 	"github.com/tickstep/aliyunpan/internal/utils"
-	"github.com/tickstep/library-go/logger"
 	"io/ioutil"
 	"os"
 	"path"
 	"path/filepath"
 	"strings"
 	"testing"
-	"time"
 )
 
-func TestPanSyncDb(t *testing.T) {
-	// get access token
-	refreshToken := "d77420e4daa...9d384d7c44508"
-	webToken, err := aliyunpan.GetAccessTokenFromRefreshToken(refreshToken)
-	if err != nil {
-		fmt.Println("get acccess token error")
-		return
-	}
-
-	// pan client
-	panClient := aliyunpan.NewPanClient(*webToken, aliyunpan.AppLoginToken{})
-
-	// get user info
-	ui, err := panClient.GetUserInfo()
-	if err != nil {
-		fmt.Println("get user info error")
-		return
-	}
-	fmt.Println("当前登录用户：" + ui.Nickname)
-
-	b := NewPanSyncDb("D:\\smb\\feny\\goprojects\\dev\\pan.db")
-	b.Open()
-	defer b.Close()
-	// do some file operation
-	panClient.FilesDirectoriesRecurseList(ui.FileDriveId, "/Parallels Desktop", func(depth int, _ string, fd *aliyunpan.FileEntity, apiError *apierror.ApiError) bool {
-		if apiError != nil {
-			logger.Verbosef("%s\n", apiError)
-			return true
-		}
-		fmt.Println("add file：" + fd.String())
-		b.Add(NewPanFileItem(fd))
-		time.Sleep(2 * time.Second)
-		return true
-	})
-}
-
 func TestGet(t *testing.T) {
 	b := NewPanSyncDb("D:\\smb\\feny\\goprojects\\dev\\pan.db")
 	b.Open()

internal/syncdrive/sync_task.go

@@ -20,8 +20,9 @@ import (
 )
 
 type (
-	TaskStep string
-	SyncMode string
+	SyncMode   string
+	SyncPolicy string
+	CycleMode  string
 
 	// SyncTask 同步任务
 	SyncTask struct {
@@ -29,16 +30,24 @@ type (
 		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:"-"`
 		// LocalFolderPath 本地目录
 		LocalFolderPath string `json:"localFolderPath"`
 		// PanFolderPath 云盘目录
 		PanFolderPath string `json:"panFolderPath"`
-		// Mode 同步模式
+		// Mode 备份模式
 		Mode SyncMode `json:"mode"`
+		// Policy 备份策略
+		Policy SyncPolicy `json:"policy"`
+		// CycleMode 循环模式，OneTime-运行一次，InfiniteLoop-无限循环模式
+		CycleModeType CycleMode `json:"-"`
 		// Priority 优先级选项
-		Priority SyncPriorityOption `json:"priority"`
+		Priority SyncPriorityOption `json:"-"`
 		// LastSyncTime 上一次同步时间
 		LastSyncTime string `json:"lastSyncTime"`
 
@@ -52,11 +61,13 @@ type (
 		cancelFunc context.CancelFunc
 
 		panUser   *config.PanUser
-		panClient *aliyunpan.PanClient
+		panClient *config.PanClient
 
 		syncOption SyncOption
 
 		fileActionTaskManager *FileActionTaskManager
+		resourceMutex         *sync.Mutex
+		scanLoopIsDone        bool // 本次扫描对比文件进程是否已经完成
 
 		plugin      plugins.Plugin
 		pluginMutex *sync.Mutex
@@ -64,19 +75,22 @@ type (
 )
 
 const (
-	// UploadOnly 单向上传，即备份本地文件到云盘
-	UploadOnly SyncMode = "upload"
-	// DownloadOnly 只下载，即备份云盘文件到本地
-	DownloadOnly SyncMode = "download"
+	// Upload 上传，即备份本地文件到云盘
+	Upload SyncMode = "upload"
+	// Download 下载，即备份云盘文件到本地
+	Download SyncMode = "download"
 	// SyncTwoWay 双向同步，本地和云盘文件完全保持一致
 	SyncTwoWay SyncMode = "sync"
 
-	// StepScanFile 任务步骤，扫描文件建立同步数据库
-	StepScanFile TaskStep = "scan"
-	// StepDiffFile 任务步骤，对比文件
-	StepDiffFile TaskStep = "diff"
-	// StepSyncFile 任务步骤，同步文件
-	StepSyncFile TaskStep = "sync"
+	// SyncPolicyExclusive 备份策略，排他备份，保证本地和云盘一比一备份，目标目录多余的文件会被删除
+	SyncPolicyExclusive SyncPolicy = "exclusive"
+	// SyncPolicyIncrement 备份策略，增量备份，只会增量备份文件，目标目录多余的（旧的）文件不会被删除
+	SyncPolicyIncrement SyncPolicy = "increment"
+
+	// CycleOneTime 只运行一次
+	CycleOneTime CycleMode = "OneTime"
+	// CycleInfiniteLoop 无限循环模式
+	CycleInfiniteLoop CycleMode = "InfiniteLoop"
 )
 
 func (t *SyncTask) NameLabel() string {
@@ -87,13 +101,30 @@ func (t *SyncTask) String() string {
 	builder := &strings.Builder{}
 	builder.WriteString("任务: " + t.NameLabel() + "\n")
 	mode := "双向备份"
-	if t.Mode == UploadOnly {
-		mode = "备份本地文件（只上传）"
+	if t.Mode == Upload {
+		mode = "备份本地文件（上传）"
 	}
-	if t.Mode == DownloadOnly {
-		mode = "备份云盘文件（只下载）"
+	if t.Mode == Download {
+		mode = "备份云盘文件（下载）"
 	}
 	builder.WriteString("同步模式: " + mode + "\n")
+
+	policy := ""
+	if t.Policy == SyncPolicyExclusive {
+		if t.Mode == Upload {
+			policy = "排他备份（上传&删除）"
+		} else if t.Mode == Download {
+			policy = "排他备份（下载&删除）"
+		}
+	}
+	if t.Policy == SyncPolicyIncrement {
+		if t.Mode == Upload {
+			policy = "增量备份（只上传）"
+		} else if t.Mode == Download {
+			policy = "增量备份（只下载）"
+		}
+	}
+
 	if t.Mode == SyncTwoWay {
 		priority := "时间优先"
 		if t.syncOption.SyncPriority == SyncPriorityLocalFirst {
@@ -103,10 +134,22 @@ func (t *SyncTask) String() string {
 		} else {
 			priority = "时间优先"
 		}
-		builder.WriteString("优先选项: " + priority + "\n")
+		builder.WriteString("同步策略: " + priority + "\n")
+	} else {
+		builder.WriteString("同步策略: " + policy + "\n")
 	}
+	cycleModeStr := "永久循环"
+	if t.CycleModeType == CycleOneTime {
+		cycleModeStr = "运行一次"
+	}
+	builder.WriteString("运行周期: " + cycleModeStr + "\n")
 	builder.WriteString("本地目录: " + t.LocalFolderPath + "\n")
 	builder.WriteString("云盘目录: " + t.PanFolderPath + "\n")
+	driveName := "备份盘"
+	if strings.ToLower(t.DriveName) == "resource" {
+		driveName = "资源盘"
+	}
+	builder.WriteString("目标网盘: " + driveName + "\n")
 	return builder.String()
 }
 
@@ -128,7 +171,7 @@ func (t *SyncTask) setupDb() error {
 
 // Start 启动同步任务
 // 扫描本地和云盘文件信息并存储到本地数据库
-func (t *SyncTask) Start(step TaskStep) error {
+func (t *SyncTask) Start() error {
 	if t.ctx != nil {
 		return fmt.Errorf("task have starting")
 	}
@@ -155,18 +198,20 @@ func (t *SyncTask) Start(step TaskStep) error {
 			os.MkdirAll(t.LocalFolderPath, 0755)
 		}
 	}
-	if _, er := t.panClient.FileInfoByPath(t.DriveId, t.PanFolderPath); er != nil {
+	if _, er := t.panClient.OpenapiPanClient().FileInfoByPath(t.DriveId, t.PanFolderPath); er != nil {
 		if er.Code == apierror.ApiCodeFileNotFoundCode {
-			t.panClient.MkdirByFullPath(t.DriveId, t.PanFolderPath)
+			t.panClient.OpenapiPanClient().MkdirByFullPath(t.DriveId, t.PanFolderPath)
 		}
 	}
 
 	// setup sync db file
 	t.setupDb()
-
 	if t.fileActionTaskManager == nil {
 		t.fileActionTaskManager = NewFileActionTaskManager(t)
 	}
+	if t.resourceMutex == nil {
+		t.resourceMutex = &sync.Mutex{}
+	}
 
 	if t.plugin == nil {
 		pluginManger := plugins.NewPluginManager(config.GetPluginDir())
@@ -182,19 +227,28 @@ func (t *SyncTask) Start(step TaskStep) error {
 	t.ctx, cancel = context.WithCancel(context.Background())
 	t.cancelFunc = cancel
 
-	go t.scanLocalFile(t.ctx, step == StepScanFile)
-	go t.scanPanFile(t.ctx, step == StepScanFile)
-
-	// 如果只扫描文件建立同步数据库，则无需进行文件对比这一步
-	if step != StepScanFile {
-		// start file sync manager
-		if e := t.fileActionTaskManager.Start(); e != nil {
-			return e
-		}
-	} else {
-		// delay
-		time.Sleep(1 * time.Second)
+	// 初始化文件执行进程
+	if e := t.fileActionTaskManager.InitMgr(); e != nil {
+		return e
 	}
+
+	// 策略
+	if t.Policy == "" {
+		t.Policy = SyncPolicyIncrement
+	}
+
+	// 启动文件扫描进程
+	t.SetScanLoopFlag(false)
+	if t.Mode == Upload {
+		go t.scanLocalFile(t.ctx)
+	} else if t.Mode == Download {
+		go t.scanPanFile(t.ctx)
+	} else if t.Mode == SyncTwoWay {
+		return fmt.Errorf("异常：暂不支持该模式。")
+	} else {
+		return fmt.Errorf("异常：暂不支持该模式。")
+	}
+
 	return nil
 }
 
@@ -240,6 +294,26 @@ func (t *SyncTask) Stop() error {
 	return nil
 }
 
+// IsScanLoopDone 获取文件扫描进程状态
+func (t *SyncTask) IsScanLoopDone() bool {
+	t.resourceMutex.Lock()
+	defer t.resourceMutex.Unlock()
+	return t.scanLoopIsDone
+}
+
+// SetScanLoopFlag 设置文件扫描进程状态标记
+func (t *SyncTask) SetScanLoopFlag(done bool) {
+	t.resourceMutex.Lock()
+	defer t.resourceMutex.Unlock()
+	t.scanLoopIsDone = done
+}
+
+// IsTaskCompletely 任务是否已经完成
+func (t *SyncTask) IsTaskCompletely() bool {
+	// 扫描完成+执行完成+一次运行模式
+	return t.IsScanLoopDone() && t.fileActionTaskManager.IsExecuteLoopIsDone() && t.CycleModeType == CycleOneTime
+}
+
 // panSyncDbFullPath 云盘文件数据库
 func (t *SyncTask) panSyncDbFullPath() string {
 	dir := path.Join(t.syncDbFolderPath, t.Id)
@@ -295,7 +369,7 @@ func (t *SyncTask) discardLocalFileDb(filePath string, startTimeUnix int64) bool
 	}
 	for _, file := range files {
 		if file.ScanTimeAt == "" || file.ScanTimeUnix() < startTimeUnix {
-			if t.Mode == DownloadOnly {
+			if t.Mode == Download {
 				// delete discard local file info directly
 				t.localFileDb.Delete(file.Path)
 				logger.Verboseln("label discard local file from DB: ", utils.ObjectToJsonStr(file, false))
@@ -339,8 +413,8 @@ func (t *SyncTask) skipLocalFile(file *LocalFileItem) bool {
 	return false
 }
 
-// scanLocalFile 本地文件循环扫描进程
-func (t *SyncTask) scanLocalFile(ctx context.Context, scanFileOnly bool) {
+// scanLocalFile 本地文件扫描进程。上传备份模式是以本地文件为扫描对象，并对比云盘端对应目录文件，以决定是否需要上传新文件到云盘
+func (t *SyncTask) scanLocalFile(ctx context.Context) {
 	t.wg.AddDelta()
 	defer t.wg.Done()
 
@@ -370,6 +444,7 @@ func (t *SyncTask) scanLocalFile(ctx context.Context, scanFileOnly bool) {
 		t.localFileDb.Add(newLocalFileItem(fi, fullPath))
 	}
 
+	// 文件夹队列
 	folderQueue := collection.NewFifoQueue()
 	rootFolder, err := os.Stat(t.LocalFolderPath)
 	if err != nil {
@@ -379,18 +454,13 @@ func (t *SyncTask) scanLocalFile(ctx context.Context, scanFileOnly bool) {
 		fileInfo: rootFolder,
 		path:     t.LocalFolderPath,
 	})
-	startTimeOfThisLoop := time.Now().Unix()
 	delayTimeCount := int64(0)
-	isLocalFolderModify := false
-
-	// 触发一次文件对比任务
-	t.fileActionTaskManager.AddLocalFolderModifyCount()
 
 	for {
 		select {
 		case <-ctx.Done():
 			// cancel routine & done
-			logger.Verboseln("local file routine done")
+			logger.Verboseln("local file routine done, exit loop")
 			return
 		default:
 			// 采用广度优先遍历(BFS)进行文件遍历
@@ -399,49 +469,35 @@ func (t *SyncTask) scanLocalFile(ctx context.Context, scanFileOnly bool) {
 				delayTimeCount -= 1
 				continue
 			} else if delayTimeCount == 0 {
-				delayTimeCount -= 1
-				startTimeOfThisLoop = time.Now().Unix()
-				logger.Verboseln("do scan local file process at ", utils.NowTimeStr())
-			}
-
-			// check local sync dir
-			if t.Mode == SyncTwoWay {
-				// check local disk unplug issue
-				if b, e := utils.PathExists(t.LocalFolderPath); e == nil {
-					if !b {
-						// maybe the local disk unplug, check
-						fmt.Println("异常：本地同步目录不存在，本任务已经停止。如需继续同步请手动删除同步数据库再重试。")
-						return
-					}
+				// 确认文件执行进程是否已完成
+				if !t.fileActionTaskManager.IsExecuteLoopIsDone() {
+					time.Sleep(1 * time.Second)
+					continue // 需要等待文件上传进程完成才能开启新一轮扫描
 				}
+				delayTimeCount -= 1
+				logger.Verboseln("start scan local file process at ", utils.NowTimeStr())
+				t.SetScanLoopFlag(false)
+				t.fileActionTaskManager.StartFileActionTaskExecutor()
+				PromptPrintln("开始进行文件扫描...")
 			}
 
 			obj := folderQueue.Pop()
 			if obj == nil {
-				// label discard file from DB
-				if t.discardLocalFileDb(t.LocalFolderPath, startTimeOfThisLoop) {
-					logger.Verboseln("notify local folder modify, need to do file action task")
-					t.fileActionTaskManager.AddLocalFolderModifyCount()
-					t.fileActionTaskManager.AddPanFolderModifyCount()
-					isLocalFolderModify = false // 重置标记
-				}
+				// 没有其他文件夹需要扫描了，已完成了一次全量文件夹的扫描了
+				t.SetScanLoopFlag(true)
 
-				if scanFileOnly {
-					// 全盘扫描文件一次，建立好文件同步数据库，然后退出
+				if t.CycleModeType == CycleOneTime {
+					// 只运行一次，全盘扫描一次后退出任务循环
+					logger.Verboseln("file scan task is finish, exit normally")
 					return
 				}
 
-				// restart scan loop over again
+				// 无限循环模式，继续下一次扫描
 				folderQueue.Push(&folderItem{
 					fileInfo: rootFolder,
 					path:     t.LocalFolderPath,
 				})
-				delayTimeCount = TimeSecondsOf30Seconds
-				if isLocalFolderModify {
-					logger.Verboseln("notify local folder modify, need to do file action task")
-					t.fileActionTaskManager.AddLocalFolderModifyCount()
-					isLocalFolderModify = false // 重置标记
-				}
+				delayTimeCount = TimeSecondsOfOneMinute
 				continue
 			}
 			item := obj.(*folderItem)
@@ -452,65 +508,93 @@ func (t *SyncTask) scanLocalFile(ctx context.Context, scanFileOnly bool) {
 			if len(files) == 0 {
 				continue
 			}
+			localFileScanList := LocalFileList{}
 			localFileAppendList := LocalFileList{}
-			for _, file := range files {
+			for _, file := range files { // 逐个确认目录下面的每个文件的情况
 				if strings.HasSuffix(file.Name(), DownloadingFileSuffix) {
-					// 下载中文件，跳过
+					// 下载中的文件，跳过
 					continue
 				}
 
+				// 检查JS插件
 				localFile := newLocalFileItem(file, item.path+"/"+file.Name())
 				if t.skipLocalFile(localFile) {
-					fmt.Println("插件禁止扫描本地文件: ", localFile.Path)
+					PromptPrintln("插件禁止扫描本地文件: " + localFile.Path)
 					continue
 				}
 
-				if scanFileOnly {
-					fmt.Println("扫描本地文件：" + item.path + "/" + file.Name())
+				// 跳过软链接文件
+				if IsSymlinkFile(file) {
+					logger.Verboseln("软链接文件，跳过：" + item.path + "/" + file.Name())
+					continue
 				}
 
-				localFileInDb, _ := t.localFileDb.Get(localFile.Path)
-				if localFileInDb == nil {
-					// append
-					localFile.ScanTimeAt = utils.NowTimeStr()
-					localFileAppendList = append(localFileAppendList, localFile)
-					logger.Verboseln("add local file to db: ", utils.ObjectToJsonStr(localFile, false))
-					isLocalFolderModify = true
-				} else {
-					// update newest info into DB
-					if localFile.UpdateTimeUnix() > localFileInDb.UpdateTimeUnix() || localFile.FileSize != localFileInDb.FileSize {
-						localFileInDb.Sha1Hash = ""
-						isLocalFolderModify = true
-					}
-
-					localFileInDb.UpdatedAt = localFile.UpdatedAt
-					localFileInDb.CreatedAt = localFile.CreatedAt
-					localFileInDb.FileSize = localFile.FileSize
-					localFileInDb.FileType = localFile.FileType
-					localFileInDb.ScanTimeAt = utils.NowTimeStr()
-					localFileInDb.ScanStatus = ScanStatusNormal
-					logger.Verboseln("update local file to db: ", utils.ObjectToJsonStr(localFileInDb, false))
-					if _, er := t.localFileDb.Update(localFileInDb); er != nil {
-						logger.Verboseln("local db update error ", er)
-					}
-				}
-
-				// for next term scan
+				PromptPrintln("扫描到本地文件：" + item.path + "/" + file.Name())
+				// 文件夹需要增加到扫描队列
 				if file.IsDir() {
 					folderQueue.Push(&folderItem{
 						fileInfo: file,
 						path:     item.path + "/" + file.Name(),
 					})
 				}
-			}
 
+				// 查询本地扫描数据库
+				localFileInDb, _ := t.localFileDb.Get(localFile.Path)
+				if localFileInDb == nil {
+					// 记录不存在，直接增加到本地数据库队列
+					localFileAppendList = append(localFileAppendList, localFile)
+				} else {
+					// 记录存在，查看文件SHA1是否更改
+					if localFile.UpdateTimeUnix() == localFileInDb.UpdateTimeUnix() && localFile.FileSize == localFileInDb.FileSize {
+						// 文件大小没变，文件修改时间没变，假定文件内容也没变
+						localFile.Sha1Hash = localFileInDb.Sha1Hash
+					} else {
+						// 文件已修改，更新文件信息到扫描数据库
+						localFileInDb.Sha1Hash = localFile.Sha1Hash
+						localFileInDb.UpdatedAt = localFile.UpdatedAt
+						localFileInDb.CreatedAt = localFile.CreatedAt
+						localFileInDb.FileSize = localFile.FileSize
+						localFileInDb.FileType = localFile.FileType
+						localFileInDb.ScanTimeAt = utils.NowTimeStr()
+						localFileInDb.ScanStatus = ScanStatusNormal
+						logger.Verboseln("update local file to db: ", utils.ObjectToJsonStr(localFileInDb, false))
+						if _, er := t.localFileDb.Update(localFileInDb); er != nil {
+							logger.Verboseln("local db update error ", er)
+						}
+					}
+				}
+				localFileScanList = append(localFileScanList, localFile)
+			}
 			if len(localFileAppendList) > 0 {
 				//fmt.Println(utils.ObjectToJsonStr(localFileAppendList))
 				if _, er := t.localFileDb.AddFileList(localFileAppendList); er != nil {
-					logger.Verboseln("add files to local file db error {}", er)
+					logger.Verboseln("add new files to local file db error {}", er)
 				}
 			}
-			time.Sleep(500 * time.Millisecond)
+
+			// 获取云盘对应目录下的文件清单
+			panFileInfo, er := t.panClient.OpenapiPanClient().FileInfoByPath(t.DriveId, GetPanFileFullPathFromLocalPath(item.path, t.LocalFolderPath, t.PanFolderPath))
+			if er != nil {
+				logger.Verboseln("query pan file info error: ", er)
+				// do nothing
+				continue
+			}
+			panFileList, er2 := t.panClient.OpenapiPanClient().FileListGetAll(&aliyunpan.FileListParam{
+				DriveId:      t.DriveId,
+				ParentFileId: panFileInfo.FileId,
+			}, 1500) // 延迟时间避免触发风控
+			if er2 != nil {
+				logger.Verboseln("query pan file list error: ", er)
+				continue
+			}
+			panFileScanList := PanFileList{}
+			for _, pf := range panFileList {
+				pf.Path = path.Join(GetPanFileFullPathFromLocalPath(item.path, t.LocalFolderPath, t.PanFolderPath), pf.FileName)
+				panFileScanList = append(panFileScanList, NewPanFileItem(pf))
+			}
+
+			// 对比文件
+			t.fileActionTaskManager.doFileDiffRoutine(localFileScanList, panFileScanList)
 		}
 	}
 }
@@ -524,7 +608,7 @@ func (t *SyncTask) discardPanFileDb(filePath string, startTimeUnix int64) bool {
 	}
 	for _, file := range files {
 		if file.ScanTimeUnix() < startTimeUnix {
-			if t.Mode == UploadOnly {
+			if t.Mode == Upload {
 				// delete discard pan file info directly
 				t.panFileDb.Delete(file.Path)
 				logger.Verboseln("delete discard pan file from DB: ", utils.ObjectToJsonStr(file, false))
@@ -569,8 +653,8 @@ func (t *SyncTask) skipPanFile(file *PanFileItem) bool {
 	return false
 }
 
-// scanPanFile 云盘文件循环扫描进程
-func (t *SyncTask) scanPanFile(ctx context.Context, scanFileOnly bool) {
+// scanPanFile 云盘文件循环扫描进程。下载备份模式是以云盘文件为扫描对象，并对比本地对应目录文件，以决定是否需要下载新文件到本地
+func (t *SyncTask) scanPanFile(ctx context.Context) {
 	t.wg.AddDelta()
 	defer t.wg.Done()
 
@@ -583,7 +667,7 @@ func (t *SyncTask) scanPanFile(ctx context.Context, scanFileOnly bool) {
 		}
 		fullPath += "/" + p
 	}
-	fi, err := t.panClient.FileInfoByPath(t.DriveId, fullPath)
+	fi, err := t.panClient.OpenapiPanClient().FileInfoByPath(t.DriveId, fullPath)
 	if err != nil {
 		return
 	}
@@ -595,12 +679,7 @@ func (t *SyncTask) scanPanFile(ctx context.Context, scanFileOnly bool) {
 	folderQueue := collection.NewFifoQueue()
 	rootPanFile := fi
 	folderQueue.Push(rootPanFile)
-	startTimeOfThisLoop := time.Now().Unix()
 	delayTimeCount := int64(0)
-	isPanFolderModify := false
-
-	// 触发一次文件对比任务
-	t.fileActionTaskManager.AddPanFolderModifyCount()
 
 	for {
 		select {
@@ -615,97 +694,112 @@ func (t *SyncTask) scanPanFile(ctx context.Context, scanFileOnly bool) {
 				delayTimeCount -= 1
 				continue
 			} else if delayTimeCount == 0 {
+				// 确认文件执行进程是否已完成
+				if !t.fileActionTaskManager.IsExecuteLoopIsDone() {
+					time.Sleep(1 * time.Second)
+					continue // 需要等待文件上传进程完成才能开启新一轮扫描
+				}
 				delayTimeCount -= 1
-				startTimeOfThisLoop = time.Now().Unix()
-				logger.Verboseln("do scan pan file process at ", utils.NowTimeStr())
+				logger.Verboseln("start scan pan file process at ", utils.NowTimeStr())
+				t.SetScanLoopFlag(false)
+				t.fileActionTaskManager.StartFileActionTaskExecutor()
+				PromptPrintln("开始进行文件扫描...")
 			}
 			obj := folderQueue.Pop()
 			if obj == nil {
-				// label discard file from DB
-				if t.discardPanFileDb(t.PanFolderPath, startTimeOfThisLoop) {
-					logger.Verboseln("notify pan folder modify, need to do file action task")
-					t.fileActionTaskManager.AddPanFolderModifyCount()
-					t.fileActionTaskManager.AddLocalFolderModifyCount()
-					isPanFolderModify = false
-				}
+				// 没有其他文件夹需要扫描了，已完成了一次全量文件夹的扫描了
+				t.SetScanLoopFlag(true)
 
-				if scanFileOnly {
-					// 全盘扫描文件一次，建立好文件同步数据库，然后退出
+				if t.CycleModeType == CycleOneTime {
+					// 只运行一次，全盘扫描一次后退出任务循环
+					logger.Verboseln("pan file scan task is finish, exit normally")
 					return
 				}
 
-				// restart scan loop over again
+				// 无限循环模式，继续下一次扫描
 				folderQueue.Push(rootPanFile)
-				delayTimeCount = TimeSecondsOf2Minute
-				if isPanFolderModify {
-					logger.Verboseln("notify pan folder modify, need to do file action task")
-					t.fileActionTaskManager.AddPanFolderModifyCount()
-					isPanFolderModify = false
-				}
+				delayTimeCount = TimeSecondsOfOneMinute
 				continue
 			}
 			item := obj.(*aliyunpan.FileEntity)
-			files, err1 := t.panClient.FileListGetAll(&aliyunpan.FileListParam{
+			files, err1 := t.panClient.OpenapiPanClient().FileListGetAll(&aliyunpan.FileListParam{
 				DriveId:      t.DriveId,
 				ParentFileId: item.FileId,
 			}, 1500) // 延迟时间避免触发风控
 			if err1 != nil {
-				// retry next term
+				// 下一轮重试
 				folderQueue.Push(item)
 				time.Sleep(10 * time.Second)
 				continue
 			}
-			panFileList := PanFileList{}
+			panFileScanList := PanFileList{}
 			for _, file := range files {
 				file.Path = path.Join(item.Path, file.FileName)
 				panFile := NewPanFileItem(file)
+
+				// 检查JS插件
 				if t.skipPanFile(panFile) {
-					logger.Verboseln("插件禁止扫描云盘文件: ", panFile.Path)
+					PromptPrintln("插件禁止扫描云盘文件: " + panFile.Path)
 					continue
 				}
-				if scanFileOnly {
-					fmt.Println("扫描云盘文件：" + file.Path)
-				}
 
-				panFileInDb, _ := t.panFileDb.Get(file.Path)
-				if panFileInDb == nil {
-					// append
-					panFile.ScanTimeAt = utils.NowTimeStr()
-					panFileList = append(panFileList, panFile)
-					logger.Verboseln("add pan file to db: ", utils.ObjectToJsonStr(panFile, false))
-					isPanFolderModify = true
-				} else {
-					// update newest info into DB
-					if strings.ToLower(file.ContentHash) != strings.ToLower(panFileInDb.Sha1Hash) {
-						isPanFolderModify = true
-
-						panFileInDb.DomainId = file.DomainId
-						panFileInDb.FileId = file.FileId
-						panFileInDb.FileType = file.FileType
-						panFileInDb.Category = file.Category
-						panFileInDb.Crc64Hash = file.Crc64Hash
-						panFileInDb.Sha1Hash = file.ContentHash
-						panFileInDb.FileSize = file.FileSize
-						panFileInDb.UpdatedAt = file.UpdatedAt
-						panFileInDb.CreatedAt = file.CreatedAt
-					}
-					// update scan time
-					panFileInDb.ScanTimeAt = utils.NowTimeStr()
-					panFileInDb.ScanStatus = ScanStatusNormal
-					logger.Verboseln("update pan file to db: ", utils.ObjectToJsonStr(panFileInDb, false))
-					t.panFileDb.Update(panFileInDb)
-				}
+				PromptPrintln("扫描到云盘文件：" + file.Path)
+				panFile.ScanTimeAt = utils.NowTimeStr()
+				panFileScanList = append(panFileScanList, panFile)
+				logger.Verboseln("scan pan file: ", utils.ObjectToJsonStr(panFile, false))
 
 				if file.IsFolder() {
 					folderQueue.Push(file)
 				}
 			}
-			if len(panFileList) > 0 {
-				if _, er := t.panFileDb.AddFileList(panFileList); er != nil {
-					logger.Verboseln("add files to pan file db error {}", er)
-				}
+			if len(panFileScanList) == 0 {
+				// empty dir
+				continue
 			}
-			time.Sleep(5 * time.Second) // 延迟避免触发风控
+
+			// 获取本地对应目录下的文件清单
+			localFolderPath := GetLocalFileFullPathFromPanPath(item.Path, t.LocalFolderPath, t.PanFolderPath)
+			localFiles, err2 := ioutil.ReadDir(localFolderPath)
+			if err2 != nil {
+				logger.Verboseln("query local file list error: ", err2)
+				continue
+			}
+			localFileScanList := LocalFileList{}
+			for _, file := range localFiles { // 逐个确认目录下面的每个文件的情况
+				if strings.HasSuffix(file.Name(), DownloadingFileSuffix) {
+					// 下载中的文件，跳过
+					continue
+				}
+				localFile := newLocalFileItem(file, localFolderPath+"/"+file.Name())
+				logger.Verboseln("扫描到本地文件：" + localFile.Path)
+
+				// 查询本地扫描数据库
+				localFileInDb, _ := t.localFileDb.Get(localFile.Path)
+				if localFileInDb != nil {
+					// 记录存在，查看文件SHA1是否更改
+					if localFile.UpdateTimeUnix() == localFileInDb.UpdateTimeUnix() && localFile.FileSize == localFileInDb.FileSize {
+						// 文件大小没变，文件修改时间没变，假定文件内容也没变
+						localFile.Sha1Hash = localFileInDb.Sha1Hash
+					} else {
+						// 文件已修改，更新文件信息到扫描数据库
+						localFileInDb.Sha1Hash = localFile.Sha1Hash
+						localFileInDb.UpdatedAt = localFile.UpdatedAt
+						localFileInDb.CreatedAt = localFile.CreatedAt
+						localFileInDb.FileSize = localFile.FileSize
+						localFileInDb.FileType = localFile.FileType
+						localFileInDb.ScanTimeAt = utils.NowTimeStr()
+						localFileInDb.ScanStatus = ScanStatusNormal
+						logger.Verboseln("update local file to db: ", utils.ObjectToJsonStr(localFileInDb, false))
+						if _, er := t.localFileDb.Update(localFileInDb); er != nil {
+							logger.Verboseln("local db update error ", er)
+						}
+					}
+				}
+				localFileScanList = append(localFileScanList, localFile)
+			}
+
+			// 对比文件
+			t.fileActionTaskManager.doFileDiffRoutine(localFileScanList, panFileScanList)
 		}
 	}
 }

internal/syncdrive/sync_task_mgr.go

@@ -3,12 +3,13 @@ package syncdrive
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/tickstep/aliyunpan-api/aliyunpan"
 	"github.com/tickstep/aliyunpan/internal/config"
+	"github.com/tickstep/aliyunpan/internal/log"
 	"github.com/tickstep/aliyunpan/internal/utils"
 	"github.com/tickstep/library-go/logger"
 	"io/ioutil"
 	"path"
+	"strings"
 	"time"
 )
 
@@ -19,7 +20,6 @@ type (
 		FileUploadParallel    int   // 文件上传并发数
 		FileDownloadBlockSize int64 // 文件下载分片大小
 		FileUploadBlockSize   int64 // 文件上传分片大小
-		UseInternalUrl        bool  // 是否使用阿里ECS内部链接
 
 		MaxDownloadRate int64 // 限制最大下载速度
 		MaxUploadRate   int64 // 限制最大上传速度
@@ -29,6 +29,9 @@ type (
 
 		// 本地文件修改检测间隔
 		LocalFileModifiedCheckIntervalSec int
+
+		// 文件记录器
+		FileRecorder *log.FileRecorder
 	}
 
 	// SyncTaskManager 同步任务管理器
@@ -36,8 +39,7 @@ type (
 		syncDriveConfig      *SyncDriveConfig
 		syncOption           SyncOption
 		PanUser              *config.PanUser
-		DriveId              string
-		PanClient            *aliyunpan.PanClient
+		PanClient            *config.PanClient
 		SyncConfigFolderPath string
 
 		// useConfigFile 是否使用配置文件启动
@@ -55,11 +57,10 @@ var (
 	ErrSyncTaskListEmpty error = fmt.Errorf("no sync task")
 )
 
-func NewSyncTaskManager(user *config.PanUser, driveId string, panClient *aliyunpan.PanClient, syncConfigFolderPath string,
+func NewSyncTaskManager(user *config.PanUser, panClient *config.PanClient, syncConfigFolderPath string,
 	option SyncOption) *SyncTaskManager {
 	return &SyncTaskManager{
 		PanUser:              user,
-		DriveId:              driveId,
 		PanClient:            panClient,
 		SyncConfigFolderPath: syncConfigFolderPath,
 		syncOption:           option,
@@ -78,6 +79,7 @@ func (m *SyncTaskManager) parseConfigFile() error {
 	   "localFolderPath": "D:\\smb\\datadisk\\game",
 	   "panFolderPath": "/sync_drive/game",
 	   "mode": "sync",
+	   "driveName": "backup",
 	   "lastSyncTime": ""
 	  }
 	 ]
@@ -114,7 +116,7 @@ func (m *SyncTaskManager) ConfigFilePath() string {
 }
 
 // Start 启动同步进程
-func (m *SyncTaskManager) Start(tasks []*SyncTask, step TaskStep) (bool, error) {
+func (m *SyncTaskManager) Start(tasks []*SyncTask, cycleMode CycleMode) (bool, error) {
 	if tasks != nil && len(tasks) > 0 {
 		m.syncDriveConfig = &SyncDriveConfig{
 			ConfigVer:    "1.0",
@@ -137,6 +139,30 @@ func (m *SyncTaskManager) Start(tasks []*SyncTask, step TaskStep) (bool, error)
 		if len(task.Id) == 0 {
 			task.Id = utils.UuidStr()
 		}
+		// cycle mode
+		task.CycleModeType = cycleMode
+
+		// check driveId
+		if strings.ToLower(task.DriveName) == "backup" {
+			task.DriveId = m.PanUser.DriveList.GetFileDriveId()
+		} else if strings.ToLower(task.DriveName) == "resource" {
+			task.DriveId = m.PanUser.DriveList.GetResourceDriveId()
+		}
+		if len(task.DriveId) == 0 {
+			task.DriveId = m.PanUser.DriveList.GetFileDriveId()
+		}
+
+		// check userId
+		if len(task.UserId) > 0 {
+			if task.UserId != m.PanUser.UserId {
+				// not this user task, skip
+				logger.Verboseln("skip sync task: " + task.NameLabel())
+				continue
+			}
+		} else {
+			task.UserId = m.PanUser.UserId
+		}
+
 		// check pan path
 		if !utils.IsPanAbsPath(task.PanFolderPath) {
 			task.PanFolderPath = "/" + task.PanFolderPath
@@ -148,7 +174,6 @@ func (m *SyncTaskManager) Start(tasks []*SyncTask, step TaskStep) (bool, error)
 			continue
 		}
 		task.panUser = m.PanUser
-		task.DriveId = m.DriveId
 		task.syncDbFolderPath = m.SyncConfigFolderPath
 		task.panClient = m.PanClient
 		task.syncOption = m.syncOption
@@ -158,9 +183,12 @@ func (m *SyncTaskManager) Start(tasks []*SyncTask, step TaskStep) (bool, error)
 			task.Priority = SyncPriorityTimestampFirst
 			task.syncOption.SyncPriority = SyncPriorityTimestampFirst
 		}
+		if task.Policy == "" {
+			task.Policy = SyncPolicyIncrement
+		}
 		task.LocalFolderPath = path.Clean(task.LocalFolderPath)
 		task.PanFolderPath = path.Clean(task.PanFolderPath)
-		if e := task.Start(step); e != nil {
+		if e := task.Start(); e != nil {
 			logger.Verboseln(e)
 			fmt.Printf("启动同步任务[%s]出错: %s\n", task.Id, e.Error())
 			continue
@@ -177,16 +205,11 @@ func (m *SyncTaskManager) Start(tasks []*SyncTask, step TaskStep) (bool, error)
 }
 
 // Stop 停止同步进程
-func (m *SyncTaskManager) Stop(step TaskStep) (bool, error) {
+func (m *SyncTaskManager) Stop() (bool, error) {
 	// stop task one by one
 	for _, task := range m.syncDriveConfig.SyncTaskList {
 		var e error
-		if step == StepScanFile {
-			e = task.WaitToStop() // 阻塞直到停止
-		} else {
-			e = task.Stop()
-		}
-
+		e = task.Stop()
 		if e != nil {
 			logger.Verboseln(e)
 			fmt.Println("stop sync task error: ", task.NameLabel())
@@ -201,3 +224,12 @@ func (m *SyncTaskManager) Stop(step TaskStep) (bool, error) {
 	}
 	return true, nil
 }
+
+func (m *SyncTaskManager) IsAllTaskCompletely() bool {
+	for _, task := range m.syncDriveConfig.SyncTaskList {
+		if !task.IsTaskCompletely() {
+			return false
+		}
+	}
+	return true
+}

internal/syncdrive/sync_task_mgr_test.go

@@ -1,33 +0,0 @@
-package syncdrive
-
-import (
-	"fmt"
-	"github.com/tickstep/aliyunpan-api/aliyunpan"
-	"testing"
-	"time"
-)
-
-func TestStart(t *testing.T) {
-	refreshToken := "1640cc2d4ea...6b8ccb4d6242161a7"
-	webToken, err := aliyunpan.GetAccessTokenFromRefreshToken(refreshToken)
-	if err != nil {
-		fmt.Println("get acccess token error")
-		return
-	}
-
-	// pan client
-	panClient := aliyunpan.NewPanClient(*webToken, aliyunpan.AppLoginToken{})
-	user, _ := panClient.GetUserInfo()
-
-	manager := NewSyncTaskManager(
-		nil,
-		user.FileDriveId,
-		panClient,
-		"D:\\smb\\feny\\goprojects\\dev\\sync_drive",
-		SyncOption{},
-	)
-
-	manager.Start(nil)
-	time.Sleep(30 * time.Minute)
-	manager.Stop()
-}

internal/syncdrive/sync_task_test.go

@@ -1,48 +0,0 @@
-package syncdrive
-
-import (
-	"fmt"
-	"github.com/tickstep/aliyunpan-api/aliyunpan"
-	"sync"
-	"testing"
-	"time"
-)
-
-func TestSyncTask(t *testing.T) {
-	refreshToken := "84c6499b7...9a2fe4f6733c3afd"
-	webToken, err := aliyunpan.GetAccessTokenFromRefreshToken(refreshToken)
-	if err != nil {
-		fmt.Println("get acccess token error")
-		return
-	}
-
-	// pan client
-	panClient := aliyunpan.NewPanClient(*webToken, aliyunpan.AppLoginToken{})
-	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:    "",
-
-		syncDbFolderPath: "D:\\smb\\feny\\goprojects\\dev\\sync_drive",
-		panClient:        panClient,
-	}
-	task.Start(StepSyncFile)
-	//go func() {
-	//	time.Sleep(10 * time.Second)
-	//	task.Stop()
-	//}()
-	time.Sleep(60 * time.Second)
-	task.Stop()
-}
-
-func TestSyncLocker(t *testing.T) {
-	locker := &sync.Mutex{}
-	locker.Lock()
-	fmt.Println("lock")
-	//locker.Unlock()
-	defer locker.Unlock()
-}

internal/syncdrive/utils.go

@@ -0,0 +1,50 @@
+package syncdrive
+
+import (
+	"fmt"
+	"io/fs"
+	"os"
+	"path"
+	"strings"
+)
+
+// GetPanFileFullPathFromLocalPath 获取网盘文件的路径
+func GetPanFileFullPathFromLocalPath(localFilePath, localRootPath, panRootPath string) string {
+	localFilePath = strings.ReplaceAll(localFilePath, "\\", "/")
+	localRootPath = strings.ReplaceAll(localRootPath, "\\", "/")
+
+	relativePath := strings.TrimPrefix(localFilePath, localRootPath)
+	panPath := path.Join(path.Clean(panRootPath), relativePath)
+	return strings.ReplaceAll(panPath, "\\", "/")
+}
+
+// GetLocalFileFullPathFromPanPath 获取本地文件的路径
+func GetLocalFileFullPathFromPanPath(panFilePath, localRootPath, panRootPath string) string {
+	panFilePath = strings.ReplaceAll(panFilePath, "\\", "/")
+	panRootPath = strings.ReplaceAll(panRootPath, "\\", "/")
+
+	relativePath := strings.TrimPrefix(panFilePath, panRootPath)
+	return path.Join(path.Clean(localRootPath), relativePath)
+}
+
+// IsSymlinkFile 是否是软链接文件
+func IsSymlinkFile(file fs.FileInfo) bool {
+	if file.Mode()&os.ModeSymlink != 0 {
+		return true
+	}
+	return false
+}
+
+// PromptPrintln 输出提示消息到控制台
+func PromptPrintln(msg string) {
+	if LogPrompt {
+		//fmt.Println("[" + utils.NowTimeStr() + "] " + msg)
+		fmt.Println(msg)
+	}
+}
+
+func PromptPrint(msg string) {
+	if LogPrompt {
+		fmt.Print(msg)
+	}
+}