chore: Merge pull request #1052 from Xhofe/dev

docs: add baidu.photo

.all-contributorsrc

@@ -0,0 +1,89 @@
+{
+  "files": [
+    "CONTRIBUTORS.md"
+  ],
+  "imageSize": 100,
+  "commit": false,
+  "contributors": [
+    {
+      "login": "Xhofe",
+      "name": "Xhofe",
+      "avatar_url": "https://avatars.githubusercontent.com/u/36558727?v=4",
+      "profile": "http://nn.ci",
+      "contributions": [
+        "code",
+        "ideas",
+        "doc"
+      ]
+    },
+    {
+      "login": "foxxorcat",
+      "name": "foxxorcat",
+      "avatar_url": "https://avatars.githubusercontent.com/u/95907542?v=4",
+      "profile": "https://github.com/foxxorcat",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "DaoChen6",
+      "name": "道辰",
+      "avatar_url": "https://avatars.githubusercontent.com/u/63903027?v=4",
+      "profile": "https://www.iflu.cf/",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "vg-land",
+      "name": "vg-land",
+      "avatar_url": "https://avatars.githubusercontent.com/u/16739728?v=4",
+      "profile": "https://vg-land.github.io/",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "Clansty",
+      "name": "凌莞~(=^▽^=)",
+      "avatar_url": "https://avatars.githubusercontent.com/u/18461360?v=4",
+      "profile": "https://c5y.moe",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "Windman1320",
+      "name": "Windman",
+      "avatar_url": "https://avatars.githubusercontent.com/u/9999486?v=4",
+      "profile": "https://github.com/Windman1320",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "ericarena",
+      "name": "ericarena",
+      "avatar_url": "https://avatars.githubusercontent.com/u/4518927?v=4",
+      "profile": "https://github.com/ericarena",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "WntFlm",
+      "name": "WntFlm",
+      "avatar_url": "https://avatars.githubusercontent.com/u/34620278?v=4",
+      "profile": "https://github.com/WntFlm",
+      "contributions": [
+        "code"
+      ]
+    }
+  ],
+  "contributorsPerLine": 7,
+  "projectName": "alist",
+  "projectOwner": "Xhofe",
+  "repoType": "github",
+  "repoHost": "https://github.com",
+  "skipCi": true
+}

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -5,7 +5,16 @@ body:
   - type: markdown
     attributes:
       value: |
-        Thanks for taking the time to fill out this bug report!
+        Thanks for taking the time to fill out this bug report, please **confirm that your issue is not a duplicate issue and not because of your operation or version issues**
+        感谢您花时间填写此错误报告，请**务必确认您的issue不是重复的且不是因为您的操作或版本问题**
+  - type: checkboxes
+    attributes:
+      label: Please make sure of the following things
+      description: You may select more than one, even select all.
+      options:
+        - label: I have read the [documentation](https://alist-doc.nn.ci).
+        - label: I'm sure there are no duplicate issues or discussions.
+        - label: I'm sure it's due to `alist` and not something else(such as `Dependencies` or `Operational`).
   - type: input
     id: version
     attributes:
@@ -28,11 +37,11 @@ body:
         Please provide a link to a repo that can reproduce the problem you ran into.
         请提供能复现此问题的链接
     validations:
-      required: false
+      required: true
   - type: textarea
     id: logs
     attributes:
-      label: 日志 / Logs
+      label: Logs / 日志
       description: |
         Please copy and paste any relevant log output.
         请复制粘贴错误日志，或者截图

.github/ISSUE_TEMPLATE/config.yml

@@ -1,5 +1,5 @@
 blank_issues_enabled: false
 contact_links:
-  - name: Questions & Discussions & Feature request
+  - name: Questions & Discussions
     url: https://github.com/Xhofe/alist/discussions
-    about: Use GitHub discussions for message-board style questions and discussions or feature request.
+    about: Use GitHub discussions for message-board style questions and discussions.

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -0,0 +1,33 @@
+name: "Feature request"
+description: Feature request
+labels: ["enhancement: pending triage"]
+body:
+  - type: checkboxes
+    attributes:
+      label: Please make sure of the following things
+      description: You may select more than one, even select all.
+      options:
+        - label: I have read the [documentation](https://alist-doc.nn.ci).
+        - label: I'm sure there are no duplicate issues or discussions.
+        - label: I'm sure this feature is not implemented.
+        - label: I'm sure it's a reasonable and popular requirement.
+  - type: textarea
+    id: feature-description
+    attributes:
+      label: Description of the feature / 需求描述
+    validations:
+      required: true
+  - type: textarea
+    id: suggested-solution
+    attributes:
+      label: Suggested solution / 实现思路
+      description: |
+        Solutions to achieve this requirement.
+        实现此需求的解决思路。
+  - type: textarea
+    id: additional-context
+    attributes:
+      label: Additional context / 附件
+      description: |
+        Any other context or screenshots about the feature request here, or information you find helpful.
+        相关的任何其他上下文或截图，或者你觉得有帮助的信息

.github/config.yml

@@ -0,0 +1,21 @@
+# Configuration for welcome - https://github.com/behaviorbot/welcome
+
+# Configuration for new-issue-welcome - https://github.com/behaviorbot/new-issue-welcome
+
+# Comment to be posted to on first time issues
+newIssueWelcomeComment: >
+  Thanks for opening your first issue here! Be sure to follow the issue template!
+
+# Configuration for new-pr-welcome - https://github.com/behaviorbot/new-pr-welcome
+
+# Comment to be posted to on PRs from first time contributors in your repository
+newPRWelcomeComment: >
+  Thanks for opening this pull request! Please check out our contributing guidelines.
+
+# Configuration for first-pr-merge - https://github.com/behaviorbot/first-pr-merge
+
+# Comment to be posted to on pull requests merged by a first time user
+firstPRMergeComment: >
+  Congrats on merging your first pull request! We here at behavior bot are proud of you! 
+
+# It is recommend to include as many gifs and emojis as possible

.github/workflows/build.yml

@@ -2,16 +2,16 @@ name: build
 
 on:
   push:
-    branches: [ v2 ]
+    branches: [ '**' ]
   pull_request:
-    branches: [ v2 ]
+    branches: [ '**' ]
 
 jobs:
   build:
     strategy:
       matrix:
         platform: [ubuntu-latest]
-        go-version: [1.17]
+        go-version: [1.18]
     name: Build
     runs-on: ${{ matrix.platform }}
     steps:
@@ -25,23 +25,12 @@ jobs:
         with:
           node-version: '16'
 
-#      - name: Setup docker
-#        uses: docker-practice/actions-setup-docker@master
-
       - name: Checkout
         uses: actions/checkout@v2
         with:
-          ref: v2
           path: alist
 
-      - name: Checkout web repo
-        uses: actions/checkout@v2
-        with:
-          repository: Xhofe/alist-web
-          ref: v2
-          path: alist-web
-
-      - name: Set up xgo
+      - name: Install dependencies
         run: |
           docker pull techknowlogick/xgo:latest
           go install src.techknowlogick.com/xgo@latest
@@ -50,10 +39,12 @@ jobs:
       - name: Build
         run: |
           mv alist/build.sh .
-          bash build.sh
+          bash build.sh web
+          mv dist/* alist/public
+          bash build.sh build
 
       - name: Upload artifact
         uses: actions/upload-artifact@v2
         with:
           name: artifact
-          path: alist/build
+          path: alist/build

.github/workflows/build_docker.yml

@@ -0,0 +1,44 @@
+name: build_docker
+
+on:
+  push:
+    branches: [ v2 ]
+
+jobs:
+  build_docker:
+    name: Docker
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v3
+        with:
+          images: xhofe/alist
+      - name: Set up Node
+        uses: actions/setup-node@v2
+        with:
+          node-version: '16'
+      - name: Build web
+        run: |
+          bash build.sh web
+          mv dist/* public
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+      - name: Login to DockerHub
+        uses: docker/login-action@v1
+        with:
+          username: xhofe
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: Build and push
+        id: docker_build
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/386,linux/arm/v6,linux/s390x

.github/workflows/issue_check_question.yml

@@ -0,0 +1,20 @@
+name: Check need info
+
+on:
+  schedule:
+    - cron: "0 0 */7 * *"
+
+jobs:
+  check-need-info:
+    runs-on: ubuntu-latest
+    steps:
+      - name: close-issues
+        uses: actions-cool/issues-helper@v2
+        with:
+          actions: 'close-issues'
+          token: ${{ secrets.GITHUB_TOKEN }}
+          labels: 'question'
+          inactive-day: 7
+          body: |
+            Hello @${{ github.event.issue.user.login }}, this issue was closed due to no activities in 7 days.
+            你好 @${{ github.event.issue.user.login }}，此issue因超过7天未回复被关闭。

.github/workflows/issue_duplicate.yml

@@ -0,0 +1,25 @@
+name: Issue Duplicate
+
+on:
+  issues:
+    types: [labeled]
+
+jobs:
+  create-comment:
+    runs-on: ubuntu-latest
+    if: github.event.label.name == 'duplicate'
+    steps:
+      - name: Create comment
+        uses: actions-cool/issues-helper@v2
+        with:
+          actions: 'create-comment'
+          token: ${{ secrets.GITHUB_TOKEN }}
+          issue-number: ${{ github.event.issue.number }}
+          body: |
+            Hello @${{ github.event.issue.user.login }}, your issue is a duplicate and will be closed.
+            你好 @${{ github.event.issue.user.login }}，你的issue是重复的，将被关闭。
+      - name: Close issue
+        uses: actions-cool/issues-helper@v2
+        with:
+          actions: 'close-issue'
+          token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/issue_invalid.yml

@@ -0,0 +1,25 @@
+name: Issue Invalid
+
+on:
+  issues:
+    types: [labeled]
+
+jobs:
+  create-comment:
+    runs-on: ubuntu-latest
+    if: github.event.label.name == 'invalid'
+    steps:
+      - name: Create comment
+        uses: actions-cool/issues-helper@v2
+        with:
+          actions: 'create-comment'
+          token: ${{ secrets.GITHUB_TOKEN }}
+          issue-number: ${{ github.event.issue.number }}
+          body: |
+            Hello @${{ github.event.issue.user.login }}, your issue is invalid and will be closed.
+            你好 @${{ github.event.issue.user.login }}，你的issue无效，将被关闭。
+      - name: Close issue
+        uses: actions-cool/issues-helper@v2
+        with:
+          actions: 'close-issue'
+          token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/issue_month_statistics.yml

@@ -0,0 +1,16 @@
+name: Issue Month Statistics
+
+on:
+  schedule:
+    - cron: "0 1 1 * *"
+
+jobs:
+  month-statistics:
+    runs-on: ubuntu-latest
+    steps:
+      - name: month-statistics
+        uses: actions-cool/issues-month-statistics@v1
+        with:
+          count-lables: true
+          count-comments: true
+          emoji: 'eyes'

.github/workflows/issue_question.yml

@@ -0,0 +1,20 @@
+name: Issue Question
+
+on:
+  issues:
+    types: [labeled]
+
+jobs:
+  create-comment:
+    runs-on: ubuntu-latest
+    if: github.event.label.name == 'question'
+    steps:
+      - name: Create comment
+        uses: actions-cool/issues-helper@v2.0.0
+        with:
+          actions: 'create-comment'
+          token: ${{ secrets.GITHUB_TOKEN }}
+          issue-number: ${{ github.event.issue.number }}
+          body: |
+            Hello @${{ github.event.issue.user.login }}, please input issue by template and add detail. Issues labeled by `question` will be closed if no activities in 7 days.
+            你好 @${{ github.event.issue.user.login }}，请按照issue模板填写, 并详细说明问题/复现步骤/复现链接/实现思路或提供更多信息等, 7天内未回复issue自动关闭。

.github/workflows/issue_wontfix.yml

@@ -0,0 +1,25 @@
+name: Issue Wontfix
+
+on:
+  issues:
+    types: [labeled]
+
+jobs:
+  lock-issue:
+    runs-on: ubuntu-latest
+    if: github.event.label.name == 'wontfix'
+    steps:
+      - name: Create comment
+        uses: actions-cool/issues-helper@v2
+        with:
+          actions: 'create-comment'
+          token: ${{ secrets.GITHUB_TOKEN }}
+          issue-number: ${{ github.event.issue.number }}
+          body: |
+            Hello @${{ github.event.issue.user.login }}, this issue will not be worked on and will be closed.
+            你好 @${{ github.event.issue.user.login }}，这不会被处理，将被关闭。
+      - name: Close issue
+        uses: actions-cool/issues-helper@v2
+        with:
+          actions: 'close-issue'
+          token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/release.yml

@@ -10,7 +10,7 @@ jobs:
     strategy:
       matrix:
         platform: [ubuntu-latest]
-        go-version: [1.17]
+        go-version: [1.18]
     name: Release
     runs-on: ${{ matrix.platform }}
     steps:
@@ -19,14 +19,6 @@ jobs:
         with:
           go-version: ${{ matrix.go-version }}
 
-#      - name: Setup docker
-#        uses: docker-practice/actions-setup-docker@master
-
-      - name: Setup Node
-        uses: actions/setup-node@v2
-        with:
-          node-version: '16'
-
       - name: Checkout
         uses: actions/checkout@v2
         with:
@@ -35,16 +27,7 @@ jobs:
           persist-credentials: false
           fetch-depth: 0
 
-      - name: Checkout web repo
-        uses: actions/checkout@v2
-        with:
-          repository: Xhofe/alist-web
-          ref: v2
-          path: alist-web
-          persist-credentials: false
-          fetch-depth: 0
-
-      - name: Set up xgo
+      - name: Install upx
         run: |
           docker pull techknowlogick/xgo:latest
           go install src.techknowlogick.com/xgo@latest
@@ -53,16 +36,10 @@ jobs:
       - name: Build
         run: |
           mv alist/build.sh .
+          bash build.sh cdn
+          mv dist/* alist/public
           bash build.sh release
 
-      - name: Upload asserts files
-        uses: ad-m/github-push-action@master
-        with:
-          github_token: ${{ secrets.MY_TOKEN }}
-          branch: cdn
-          directory: alist-web
-          repository: Xhofe/alist-web
-
       - name: Release
         uses: softprops/action-gh-release@v1
         with:

.github/workflows/release_docker.yml

@@ -1,17 +1,12 @@
-name: docker
+name: release_docker
 
 on:
   push:
-    branches:
-      - 'v2'
     tags:
-      - 'v*'
-  pull_request:
-    branches:
-      - 'v2'
+      - '*'
 
 jobs:
-  docker:
+  docker_release:
     name: Docker
     runs-on: ubuntu-latest
     steps:
@@ -27,7 +22,9 @@ jobs:
         with:
           node-version: '16'
       - name: Build web
-        run: bash build.sh web
+        run: |
+          bash build.sh cdn
+          mv dist/* public
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v1
       - name: Set up Docker Buildx

.gitignore

@@ -22,8 +22,9 @@ dist/
 # vendor/
 bin/*
 /alist
+/alist.exe
 *.json
-public/index.html
+public/*.html
 public/assets/
 public/public/
 data/

CONTRIBUTING.md

@@ -0,0 +1,105 @@
+# Contributing
+
+## Setup your machine
+
+`alist` is written in [Go](https://golang.org/) and [React](https://reactjs.org/).
+
+Prerequisites:
+
+- [git](https://nodejs.org/zh-cn/)
+- [Go 1.18+](https://golang.org/doc/install)
+- [gcc](https://gcc.gnu.org/)
+- [nodejs](https://nodejs.org/)
+
+Clone `alist` and `alist-web` anywhere:
+
+```shell
+$ git clone https://github.com/Xhofe/alist.git
+$ git clone https://github.com/Xhofe/alist-web.git
+```
+You should switch to the dev branch for development.
+
+## Preview your change
+### backend
+```shell
+$ go run alist.go
+```
+### frontend
+```shell
+$ yarn dev
+```
+
+## Create a commit
+
+Commit messages should be well formatted, and to make that "standardized".
+
+### Commit Message Format
+Each commit message consists of a **header**, a **body** and a **footer**.  The header has a special
+format that includes a **type**, a **scope** and a **subject**:
+
+```
+<type>(<scope>): <subject>
+<BLANK LINE>
+<body>
+<BLANK LINE>
+<footer>
+```
+
+The **header** is mandatory and the **scope** of the header is optional.
+
+Any line of the commit message cannot be longer than 100 characters! This allows the message to be easier
+to read on GitHub as well as in various git tools.
+
+### Revert
+If the commit reverts a previous commit, it should begin with `revert: `, followed by the header
+of the reverted commit.
+In the body it should say: `This reverts commit <hash>.`, where the hash is the SHA of the commit
+being reverted.
+
+### Type
+Must be one of the following:
+
+* **feat**: A new feature
+* **fix**: A bug fix
+* **docs**: Documentation only changes
+* **style**: Changes that do not affect the meaning of the code (white-space, formatting, missing
+  semi-colons, etc)
+* **refactor**: A code change that neither fixes a bug nor adds a feature
+* **perf**: A code change that improves performance
+* **test**: Adding missing or correcting existing tests
+* **build**: Affects project builds or dependency modifications
+* **revert**: Restore the previous commit
+* **ci**: Continuous integration of related file modifications
+* **chore**: Changes to the build process or auxiliary tools and libraries such as documentation
+  generation
+* **release**: Release a new version
+* **workflow**: Workflow related file modification
+
+### Scope
+The scope could be anything specifying place of the commit change. For example `$location`,
+`$browser`, `$compile`, `$rootScope`, `ngHref`, `ngClick`, `ngView`, etc...
+
+You can use `*` when the change affects more than a single scope.
+
+### Subject
+The subject contains succinct description of the change:
+
+* use the imperative, present tense: "change" not "changed" nor "changes"
+* don't capitalize first letter
+* no dot (.) at the end
+
+### Body
+Just as in the **subject**, use the imperative, present tense: "change" not "changed" nor "changes".
+The body should include the motivation for the change and contrast this with previous behavior.
+
+### Footer
+The footer should contain any information about **Breaking Changes** and is also the place to
+[reference GitHub issues that this commit closes](https://help.github.com/articles/closing-issues-via-commit-messages/).
+
+**Breaking Changes** should start with the word `BREAKING CHANGE:` with a space or two newlines.
+The rest of the commit message is then used for this.
+
+## Submit a pull request
+
+Push your branch to your `alist` fork and open a pull request against the
+`dev` branch.

CONTRIBUTORS.md

@@ -0,0 +1,32 @@
+<!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
+[![All Contributors](https://img.shields.io/badge/all_contributors-8-orange.svg?style=flat-square)](#contributors-)
+<!-- ALL-CONTRIBUTORS-BADGE:END -->
+
+## Contributors ✨
+
+Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/docs/en/emoji-key)):
+
+<!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->
+<!-- prettier-ignore-start -->
+<!-- markdownlint-disable -->
+<table>
+  <tr>
+    <td align="center"><a href="http://nn.ci"><img src="https://avatars.githubusercontent.com/u/36558727?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Xhofe</b></sub></a><br /><a href="https://github.com/Xhofe/alist/commits?author=Xhofe" title="Code">💻</a> <a href="#ideas-Xhofe" title="Ideas, Planning, & Feedback">🤔</a> <a href="https://github.com/Xhofe/alist/commits?author=Xhofe" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://github.com/foxxorcat"><img src="https://avatars.githubusercontent.com/u/95907542?v=4?s=100" width="100px;" alt=""/><br /><sub><b>foxxorcat</b></sub></a><br /><a href="https://github.com/Xhofe/alist/commits?author=foxxorcat" title="Code">💻</a></td>
+    <td align="center"><a href="https://www.iflu.cf/"><img src="https://avatars.githubusercontent.com/u/63903027?v=4?s=100" width="100px;" alt=""/><br /><sub><b>道辰</b></sub></a><br /><a href="https://github.com/Xhofe/alist/commits?author=DaoChen6" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://vg-land.github.io/"><img src="https://avatars.githubusercontent.com/u/16739728?v=4?s=100" width="100px;" alt=""/><br /><sub><b>vg-land</b></sub></a><br /><a href="https://github.com/Xhofe/alist/commits?author=vg-land" title="Code">💻</a></td>
+    <td align="center"><a href="https://c5y.moe"><img src="https://avatars.githubusercontent.com/u/18461360?v=4?s=100" width="100px;" alt=""/><br /><sub><b>凌莞~(=^▽^=)</b></sub></a><br /><a href="https://github.com/Xhofe/alist/commits?author=Clansty" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://github.com/Windman1320"><img src="https://avatars.githubusercontent.com/u/9999486?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Windman</b></sub></a><br /><a href="https://github.com/Xhofe/alist/commits?author=Windman1320" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/ericarena"><img src="https://avatars.githubusercontent.com/u/4518927?v=4?s=100" width="100px;" alt=""/><br /><sub><b>ericarena</b></sub></a><br /><a href="https://github.com/Xhofe/alist/commits?author=ericarena" title="Code">💻</a></td>
+  </tr>
+  <tr>
+    <td align="center"><a href="https://github.com/WntFlm"><img src="https://avatars.githubusercontent.com/u/34620278?v=4?s=100" width="100px;" alt=""/><br /><sub><b>WntFlm</b></sub></a><br /><a href="https://github.com/Xhofe/alist/commits?author=WntFlm" title="Code">💻</a></td>
+  </tr>
+</table>
+
+<!-- markdownlint-restore -->
+<!-- prettier-ignore-end -->
+
+<!-- ALL-CONTRIBUTORS-LIST:END -->
+
+This project follows the [all-contributors](https://github.com/all-contributors/all-contributors) specification. Contributions of any kind welcome!

Dockerfile

@@ -3,7 +3,7 @@ LABEL stage=go-builder
 WORKDIR /app/
 COPY ./ ./
 RUN apk add --no-cache bash git go gcc musl-dev; \
-    sh build.sh docker
+    bash build.sh docker
 
 FROM alpine:edge
 LABEL MAINTAINER="i@nn.ci"
@@ -11,4 +11,4 @@ VOLUME /opt/alist/data/
 WORKDIR /opt/alist/
 COPY --from=builder /app/bin/alist ./
 EXPOSE 5244
-CMD [ "./alist" ]
+CMD [ "./alist", "-docker" ]

LICENSE

@@ -1,21 +1,661 @@
-MIT License
+                    GNU AFFERO GENERAL PUBLIC LICENSE
+                       Version 3, 19 November 2007
 
-Copyright (c) 2020 Xhofe
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
 
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
+                            Preamble
 
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
+  The GNU Affero General Public License is a free, copyleft license for
+software and other kinds of works, specifically designed to ensure
+cooperation with the community in the case of network server software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+our General Public Licenses are intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  Developers that use our General Public Licenses protect your rights
+with two steps: (1) assert copyright on the software, and (2) offer
+you this License which gives you legal permission to copy, distribute
+and/or modify the software.
+
+  A secondary benefit of defending all users' freedom is that
+improvements made in alternate versions of the program, if they
+receive widespread use, become available for other developers to
+incorporate.  Many developers of free software are heartened and
+encouraged by the resulting cooperation.  However, in the case of
+software used on network servers, this result may fail to come about.
+The GNU General Public License permits making a modified version and
+letting the public access it on a server without ever releasing its
+source code to the public.
+
+  The GNU Affero General Public License is designed specifically to
+ensure that, in such cases, the modified source code becomes available
+to the community.  It requires the operator of a network server to
+provide the source code of the modified version running there to the
+users of that server.  Therefore, public use of a modified version, on
+a publicly accessible server, gives the public access to the source
+code of the modified version.
+
+  An older license, called the Affero General Public License and
+published by Affero, was designed to accomplish similar goals.  This is
+a different license, not a version of the Affero GPL, but Affero has
+released a new version of the Affero GPL which permits relicensing under
+this license.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU Affero General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Remote Network Interaction; Use with the GNU General Public License.
+
+  Notwithstanding any other provision of this License, if you modify the
+Program, your modified version must prominently offer all users
+interacting with it remotely through a computer network (if your version
+supports such interaction) an opportunity to receive the Corresponding
+Source of your version by providing access to the Corresponding Source
+from a network server at no charge, through some standard or customary
+means of facilitating copying of software.  This Corresponding Source
+shall include the Corresponding Source for any work covered by version 3
+of the GNU General Public License that is incorporated pursuant to the
+following paragraph.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the work with which it is combined will remain governed by version
+3 of the GNU General Public License.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU Affero General Public License from time to time.  Such new versions
+will be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU Affero General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU Affero General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU Affero General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If your software can interact with users remotely through a computer
+network, you should also make sure that it provides a way for users to
+get its source.  For example, if your program is a web application, its
+interface could display a "Source" link that leads users to an archive
+of the code.  There are many ways you could offer source, and different
+solutions will be better for different programs; see section 13 for the
+specific requirements.
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU AGPL, see
+<https://www.gnu.org/licenses/>.

README.md

@@ -1,5 +1,5 @@
 <div align="center">
-  <h3><a href="https://alist.nn.ci">Alist</a></h3>
+  <a href="https://alist.nn.ci"><img height="100px" alt="logo" src="https://cdn.jsdelivr.net/gh/alist-org/logo@main/logo.svg"/></a>
   <p><em>🗂️Another file list program that supports multiple storage, powered by Gin and React.</em></p>
   <a href="https://github.com/Xhofe/alist/releases"><img src="https://img.shields.io/github/release/Xhofe/alist?style=flat-square" alt="latest version"></a>
   <a href="https://github.com/Xhofe/alist/discussions"><img src="https://img.shields.io/github/discussions/Xhofe/alist?color=%23ED8936&style=flat-square" alt="discussions"></a>
@@ -11,27 +11,35 @@
   </a>
 </div>
 
-
 ---
 
-English | [中文](./README_cn.md)
+English | [中文](./README_cn.md) | [Contributors](./CONTRIBUTORS.md) | [Contributing](./CONTRIBUTING.md)
 
 ## Features
 
-- [x] multiple storage
+- [x] Multiple storage
   - [x] Local storage
-  - [x] [aliyundrive](https://www.aliyundrive.com/)
-  - [x] OneDrive / Sharepoint ([global](https://www.office.com/), [cn](https://portal.partner.microsoftonline.cn),de,us）
-  - [x] [189cloud](https://cloud.189.cn)
+  - [x] [Aliyundrive](https://www.aliyundrive.com/)
+  - [x] OneDrive / Sharepoint ([global](https://www.office.com/), [cn](https://portal.partner.microsoftonline.cn),de,us)
+  - [x] [189cloud](https://cloud.189.cn) (Personal, Family)
   - [x] [GoogleDrive](https://drive.google.com/)
   - [x] [123pan](https://www.123pan.com/)
-  - [x] [lanzou](https://pc.woozooo.com/)
+  - [x] [Lanzou](https://pc.woozooo.com/)
   - [x] [Alist](https://github.com/Xhofe/alist)
   - [x] FTP
   - [x] [PikPak](https://www.mypikpak.com/)
   - [x] [ShandianPan](https://shandianpan.com/)
   - [x] [S3](https://aws.amazon.com/s3/)
-  - [x] WebDav
+  - [x] WebDav(Support OneDrive/SharePoint without API)
+  - [x] Teambition([China](https://www.teambition.com/ ),[International](https://us.teambition.com/ ))
+  - [x] [Mediatrack](https://www.mediatrack.cn/)
+  - [x] [139yun](https://yun.139.com/) (Personal, Family)
+  - [x] [Yandex.Disk](https://disk.yandex.com/)
+  - [x] [Baidu Disk](http://pan.baidu.com/)
+  - [x] [Quark](https://pan.quark.cn)
+  - [x] [XunleiCloud](https://pan.xunlei.com/)
+  - [x] SFTP
+  - [x] [Baidu.Photo](https://photo.baidu.com/)
 - [x] Easy to deploy and out-of-the-box
 - [x] File preview (PDF, markdown, code, plain text, ...)
 - [x] Image preview in gallery mode
@@ -42,31 +50,42 @@ English | [中文](./README_cn.md)
 - [x] Dark mode
 - [x] I18n
 - [x] Protected routes (password protection and authentication) 
-- [x] WebDav (A small part readonly, see https://alist-doc.nn.ci/en/docs/intro for details)
+- [x] WebDav (see https://alist-doc.nn.ci/en/docs/webdav for details)
 - [x] [Docker Deploy](https://hub.docker.com/r/xhofe/alist)
 - [x] Cloudflare workers proxy
 - [x] File/Folder package download
 - [x] Support video list playback and subtitles(ass,srt,vtt)
-- [x] Web upload(Can allow visitors to upload)
+- [x] Web upload(Can allow visitors to upload), delete, mkdir, rename, move and copy
 
 ## Discussion
 
-Please go to our [discussion forum](https://github.com/Xhofe/alist/discussions) for general questions, **issues are for bug reports  only.**
+Please go to our [discussion forum](https://github.com/Xhofe/alist/discussions) for general questions, **issues are for bug reports and feature request only.**
 
 ## Demo
 
 Available at: <https://alist.nn.ci>.
 
-![demo](https://inews.gtimg.com/newsapp_ls/0/14256614096/0)
+![demo](https://store.heytapimage.com/cdo-portal/feedback/202202/20/b271627971e29f0c7c9d59935b6ef381.png)
 
 ## Document
 
 <https://alist-doc.nn.ci/en/>
 
+## Special sponsors
+- [Find Resources - Aliyundrive Resource Search Engine](https://zhaoziyuan.la/)
+- [JetBrains: Essential tools for software developers and teams](https://www.jetbrains.com/)
+
 ## License
 
-The `AList` is open-source software licensed under the MIT license.
+The `AList` is open-source software licensed under the AGPL-3.0 license.
+
+## Disclaimer
+- This program is a free and open source project. It is designed to share files on the network disk, which is convenient for downloading and learning golang. Please abide by relevant laws and regulations when using it, and do not abuse it;
+- This program is implemented by calling the official sdk/interface, without destroying the official interface behavior;
+- This program only does 302 redirect/traffic forwarding, and does not intercept, store, or tamper with any user data;
+- Before using this program, you should understand and bear the corresponding risks, including but not limited to account ban, download speed limit, etc., which is none of this program's business;
+- If there is any infringement, please contact me by [email](mailto:i@nn.ci), and it will be dealt with in time.
 
 ---
 
-> [@Blog](https://www.nn.ci/) · [@GitHub](https://github.com/Xhofe)
+> [@Blog](https://nn.ci/) · [@GitHub](https://github.com/Xhofe) · [@TelegramGroup](https://t.me/alist_chat) · [@QQGroup](https://jq.qq.com/?_wv=1027&k=YJJj2Gwb)

README_cn.md

@@ -1,5 +1,5 @@
 <div align="center">
-  <h3><a href="https://alist.nn.ci">Alist</a></h3>
+  <a href="https://alist.nn.ci"><img height="100px" alt="logo" src="https://cdn.jsdelivr.net/gh/alist-org/logo@main/logo.svg"/></a>
   <p><em>🗂️一个支持多存储的文件列表程序，使用 Gin 和 React 。</em></p>
   <a href="https://github.com/Xhofe/alist/releases"><img src="https://img.shields.io/github/release/Xhofe/alist?style=flat-square" alt="latest version"></a>
   <a href="https://github.com/Xhofe/alist/discussions"><img src="https://img.shields.io/github/discussions/Xhofe/alist?color=%23ED8936&style=flat-square" alt="discussions"></a>
@@ -13,7 +13,7 @@
 
 ---
 
-[English](./README.md) | 中文
+[English](./README.md) | 中文 | [Contributors](./CONTRIBUTORS.md) | [Contributing](./CONTRIBUTING.md)
 
 ## 支持
 
@@ -21,7 +21,7 @@
   - [x] 本地存储
   - [x] [阿里云盘](https://www.aliyundrive.com/)
   - [x] OneDrive / Sharepoint（[国际版](https://www.office.com/), [世纪互联](https://portal.partner.microsoftonline.cn),de,us）
-  - [x] [天翼云盘](https://cloud.189.cn)
+  - [x] [天翼云盘](https://cloud.189.cn) (个人云, 家庭云)
   - [x] [GoogleDrive](https://drive.google.com/)
   - [x] [123云盘](https://www.123pan.com/)
   - [x] [蓝奏云](https://pc.woozooo.com/)
@@ -30,7 +30,16 @@
   - [x] [PikPak](https://www.mypikpak.com/)
   - [x] [闪电盘](https://shandianpan.com/)
   - [x] [S3](https://aws.amazon.com/cn/s3/)
-  - [x] WebDav
+  - [x] WebDav(支持无API的OneDrive/SharePoint)
+  - [x] Teambition（[中国](https://www.teambition.com/ )，[国际](https://us.teambition.com/ )）
+  - [x] [分秒帧](https://www.mediatrack.cn/)
+  - [x] [和彩云](https://yun.139.com/) (个人云, 家庭云)
+  - [x] [Yandex.Disk](https://disk.yandex.com/)
+  - [x] [百度网盘](http://pan.baidu.com/)
+  - [x] [夸克网盘](https://pan.quark.cn)
+  - [x] [迅雷云盘](https://pan.xunlei.com/)
+  - [x] SFTP
+  - [x] [一刻相册](https://photo.baidu.com/)
 - [x] 部署方便，开箱即用
 - [x] 文件预览（PDF、markdown、代码、纯文本……）
 - [x] 画廊模式下的图像预览
@@ -41,31 +50,42 @@
 - [x] 黑暗模式
 - [x] 国际化
 - [x] 受保护的路由（密码保护和身份验证）
-- [x] WebDav（少部分只读，具体见https://alist-doc.nn.ci/docs/intro ）
+- [x] WebDav（具体见https://alist-doc.nn.ci/docs/webdav ）
 - [x] [Docker 部署](https://hub.docker.com/r/xhofe/alist)
 - [x] Cloudflare workers 中转
 - [x] 文件/文件夹打包下载
 - [x] 支持视频列表播放和字幕(ass,srt,vtt)
-- [x] 网页上传(可以允许访客上传)
+- [x] 网页上传(可以允许访客上传)，删除，新建文件夹，重命名，移动，复制
 
 ## 讨论
 
-一般问题请到[讨论论坛](https://github.com/Xhofe/alist/discussions) ，**issue仅针对错误报告。**
+一般问题请到[讨论论坛](https://github.com/Xhofe/alist/discussions) ，**issue仅针对错误报告和功能请求。**
 
 ## 演示
 
 <https://alist.nn.ci>。
 
-![演示](https://inews.gtimg.com/newsapp_ls/0/14256614096/0)
+![演示](https://store.heytapimage.com/cdo-portal/feedback/202202/20/b271627971e29f0c7c9d59935b6ef381.png)
 
 ## 文档
 
 <https://alist-doc.nn.ci/>
 
+## 特别赞助
+- [找资源 - 阿里云盘资源搜索引擎](https://zhaoziyuan.la/)
+- [JetBrains: Essential tools for software developers and teams](https://www.jetbrains.com/)
+
 ##  许可
 
-`AList` 是在 MIT 许可下许可的开源软件。
+`AList` 是在 AGPL-3.0 许可下许可的开源软件。
+
+## 免责声明
+- 本程序为免费开源项目，旨在分享网盘文件，方便下载以及学习golang，使用时请遵守相关法律法规，请勿滥用；
+- 本程序通过调用官方sdk/接口实现，无破坏官方接口行为；
+- 本程序仅做302重定向/流量转发，不拦截、存储、篡改任何用户数据；
+- 在使用本程序之前，你应了解并承担相应的风险，包括但不限于账号被ban，下载限速等，与本程序无关；
+- 如有侵权，请通过[邮件](mailto:i@nn.ci)与我联系，会及时处理。
 
 ---
 
-> [@Blog](https://www.nn.ci/) · [@GitHub](https://github.com/Xhofe)
+> [@博客](https://nn.ci/) · [@GitHub](https://github.com/Xhofe) · [@Telegram群](https://t.me/alist_chat) · [@QQ群](https://jq.qq.com/?_wv=1027&k=YJJj2Gwb)

alist-proxy.js

@@ -1,430 +0,0 @@
-const HOST = "YOUR_HOST";
-const TOKEN = "YOUR_TOKEN";
-
-addEventListener("fetch", (event) => {
-    const request = event.request;
-    const url = new URL(request.url);
-    const sign = url.searchParams.get("sign");
-    if (request.method === "OPTIONS") {
-        // Handle CORS preflight requests
-        event.respondWith(handleOptions(request));
-    } else if (sign && sign.length === 16) {
-        // Handle requests to the Down server
-        event.respondWith(handleDownload(request));
-    } else {
-        // Handle requests to the API server
-        event.respondWith(handleRequest(event));
-    }
-});
-
-const corsHeaders = {
-    "Access-Control-Allow-Origin": "*",
-    "Access-Control-Allow-Methods": "GET,HEAD,POST,OPTIONS",
-    "Access-Control-Max-Age": "86400",
-};
-
-async function handleDownload(request) {
-    const origin = request.headers.get("origin");
-    const url = new URL(request.url);
-    const path = decodeURI(url.pathname);
-    const sign = url.searchParams.get("sign");
-    const name = path.split("/").pop();
-    const right = md5(`alist-${TOKEN}-${name}`).slice(8, 24);
-    if (sign !== right) {
-        const resp = new Response(
-            JSON.stringify({
-                code: 401,
-                message: `sign mismatch`,
-            }),
-            {
-                headers: {
-                    "content-type": "application/json;charset=UTF-8",
-                },
-            }
-        );
-        resp.headers.set("Access-Control-Allow-Origin", origin);
-        return resp;
-    }
-
-    let resp = await fetch(`${HOST}/api/admin/link`, {
-        method: "POST",
-        headers: {
-            "content-type": "application/json;charset=UTF-8",
-            Authorization: TOKEN,
-        },
-        body: JSON.stringify({
-            path: path,
-        }),
-    });
-    let res = await resp.json();
-    if (res.code !== 200) {
-        return new Response(JSON.stringify(res));
-    }
-    request = new Request(res.data.url, request);
-    if (res.data.headers) {
-        for (const header of res.data.headers) {
-            request.headers.set(header.name, header.value);
-        }
-    }
-    let response = await fetch(request);
-
-    // Recreate the response so we can modify the headers
-    response = new Response(response.body, response);
-
-    // Set CORS headers
-    response.headers.set("Access-Control-Allow-Origin", origin);
-
-    // Append to/Add Vary header so browser will cache response correctly
-    response.headers.append("Vary", "Origin");
-
-    return response;
-}
-
-/**
- * Respond to the request
- * @param {Request} request
- */
-async function handleRequest(event) {
-    const { request } = event;
-
-    //请求头部、返回对象
-    let reqHeaders = new Headers(request.headers),
-        outBody,
-        outStatus = 200,
-        outStatusText = "OK",
-        outCt = null,
-        outHeaders = new Headers({
-            "Access-Control-Allow-Origin": reqHeaders.get("Origin"),
-            "Access-Control-Allow-Methods": "GET, POST, PUT, PATCH, DELETE, OPTIONS",
-            "Access-Control-Allow-Headers":
-                reqHeaders.get("Access-Control-Allow-Headers") ||
-                "Accept, Authorization, Cache-Control, Content-Type, DNT, If-Modified-Since, Keep-Alive, Origin, User-Agent, X-Requested-With, Token, x-access-token, Notion-Version",
-        });
-
-    try {
-        //取域名第一个斜杠后的所有信息为代理链接
-        let url = request.url.substr(8);
-        url = decodeURIComponent(url.substr(url.indexOf("/") + 1));
-
-        //需要忽略的代理
-        if (
-            request.method == "OPTIONS" &&
-            reqHeaders.has("access-control-request-headers")
-        ) {
-            //输出提示
-            return new Response(null, PREFLIGHT_INIT);
-        } else if (
-            url.length < 3 ||
-            url.indexOf(".") == -1 ||
-            url == "favicon.ico" ||
-            url == "robots.txt"
-        ) {
-            return Response.redirect("https://baidu.com", 301);
-        }
-        //阻断
-        else if (blocker.check(url)) {
-            return Response.redirect("https://baidu.com", 301);
-        } else {
-            //补上前缀 http://
-            url = url
-                .replace(/https:(\/)*/, "https://")
-                .replace(/http:(\/)*/, "http://");
-            if (url.indexOf("://") == -1) {
-                url = "http://" + url;
-            }
-            //构建 fetch 参数
-            let fp = {
-                method: request.method,
-                headers: {},
-            };
-
-            //保留头部其它信息
-            let he = reqHeaders.entries();
-            for (let h of he) {
-                if (!["content-length"].includes(h[0])) {
-                    fp.headers[h[0]] = h[1];
-                }
-            }
-            // 是否带 body
-            if (["POST", "PUT", "PATCH", "DELETE"].indexOf(request.method) >= 0) {
-                const ct = (reqHeaders.get("content-type") || "").toLowerCase();
-                if (ct.includes("application/json")) {
-                    let requestJSON = await request.json();
-                    console.log(typeof requestJSON);
-                    fp.body = JSON.stringify(requestJSON);
-                } else if (
-                    ct.includes("application/text") ||
-                    ct.includes("text/html")
-                ) {
-                    fp.body = await request.text();
-                } else if (ct.includes("form")) {
-                    // fp.body = await request.formData();
-                    fp.body = await request.text();
-                } else {
-                    fp.body = await request.blob();
-                }
-            }
-            // 发起 fetch
-            let fr = await fetch(url, fp);
-            outCt = fr.headers.get("content-type");
-            if (outCt.includes("application/text") || outCt.includes("text/html")) {
-                try {
-                    // 添加base
-                    let newFr = new HTMLRewriter()
-                        .on("head", {
-                            element(element) {
-                                element.prepend(`<base href="${url}" />`, {
-                                    html: true,
-                                });
-                            },
-                        })
-                        .transform(fr);
-                    fr = newFr;
-                } catch (e) {}
-            }
-            outStatus = fr.status;
-            outStatusText = fr.statusText;
-            outBody = fr.body;
-        }
-    } catch (err) {
-        outCt = "application/json";
-        outBody = JSON.stringify({
-            code: -1,
-            msg: JSON.stringify(err.stack) || err,
-        });
-    }
-
-    //设置类型
-    if (outCt && outCt != "") {
-        outHeaders.set("content-type", outCt);
-    }
-
-    let response = new Response(outBody, {
-        status: outStatus,
-        statusText: outStatusText,
-        headers: outHeaders,
-    });
-
-    return response;
-}
-
-const blocker = {
-    keys: [],
-    check: function (url) {
-        url = url.toLowerCase();
-        let len = blocker.keys.filter((x) => url.includes(x)).length;
-        return len != 0;
-    },
-};
-
-function handleOptions(request) {
-    // Make sure the necessary headers are present
-    // for this to be a valid pre-flight request
-    let headers = request.headers;
-    if (
-        headers.get("Origin") !== null &&
-        headers.get("Access-Control-Request-Method") !== null
-        // && headers.get("Access-Control-Request-Headers") !== null
-    ) {
-        // Handle CORS pre-flight request.
-        // If you want to check or reject the requested method + headers
-        // you can do that here.
-        let respHeaders = {
-            ...corsHeaders,
-            // Allow all future content Request headers to go back to browser
-            // such as Authorization (Bearer) or X-Client-Name-Version
-            "Access-Control-Allow-Headers": request.headers.get(
-                "Access-Control-Request-Headers"
-            ),
-        };
-
-        return new Response(null, {
-            headers: respHeaders,
-        });
-    } else {
-        // Handle standard OPTIONS request.
-        // If you want to allow other HTTP Methods, you can do that here.
-        return new Response(null, {
-            headers: {
-                Allow: "GET, HEAD, POST, OPTIONS",
-            },
-        });
-    }
-}
-
-!(function (a) {
-    "use strict";
-    function b(a, b) {
-        var c = (65535 & a) + (65535 & b),
-            d = (a >> 16) + (b >> 16) + (c >> 16);
-        return (d << 16) | (65535 & c);
-    }
-    function c(a, b) {
-        return (a << b) | (a >>> (32 - b));
-    }
-    function d(a, d, e, f, g, h) {
-        return b(c(b(b(d, a), b(f, h)), g), e);
-    }
-    function e(a, b, c, e, f, g, h) {
-        return d((b & c) | (~b & e), a, b, f, g, h);
-    }
-    function f(a, b, c, e, f, g, h) {
-        return d((b & e) | (c & ~e), a, b, f, g, h);
-    }
-    function g(a, b, c, e, f, g, h) {
-        return d(b ^ c ^ e, a, b, f, g, h);
-    }
-    function h(a, b, c, e, f, g, h) {
-        return d(c ^ (b | ~e), a, b, f, g, h);
-    }
-    function i(a, c) {
-        (a[c >> 5] |= 128 << c % 32), (a[(((c + 64) >>> 9) << 4) + 14] = c);
-        var d,
-            i,
-            j,
-            k,
-            l,
-            m = 1732584193,
-            n = -271733879,
-            o = -1732584194,
-            p = 271733878;
-        for (d = 0; d < a.length; d += 16)
-            (i = m),
-                (j = n),
-                (k = o),
-                (l = p),
-                (m = e(m, n, o, p, a[d], 7, -680876936)),
-                (p = e(p, m, n, o, a[d + 1], 12, -389564586)),
-                (o = e(o, p, m, n, a[d + 2], 17, 606105819)),
-                (n = e(n, o, p, m, a[d + 3], 22, -1044525330)),
-                (m = e(m, n, o, p, a[d + 4], 7, -176418897)),
-                (p = e(p, m, n, o, a[d + 5], 12, 1200080426)),
-                (o = e(o, p, m, n, a[d + 6], 17, -1473231341)),
-                (n = e(n, o, p, m, a[d + 7], 22, -45705983)),
-                (m = e(m, n, o, p, a[d + 8], 7, 1770035416)),
-                (p = e(p, m, n, o, a[d + 9], 12, -1958414417)),
-                (o = e(o, p, m, n, a[d + 10], 17, -42063)),
-                (n = e(n, o, p, m, a[d + 11], 22, -1990404162)),
-                (m = e(m, n, o, p, a[d + 12], 7, 1804603682)),
-                (p = e(p, m, n, o, a[d + 13], 12, -40341101)),
-                (o = e(o, p, m, n, a[d + 14], 17, -1502002290)),
-                (n = e(n, o, p, m, a[d + 15], 22, 1236535329)),
-                (m = f(m, n, o, p, a[d + 1], 5, -165796510)),
-                (p = f(p, m, n, o, a[d + 6], 9, -1069501632)),
-                (o = f(o, p, m, n, a[d + 11], 14, 643717713)),
-                (n = f(n, o, p, m, a[d], 20, -373897302)),
-                (m = f(m, n, o, p, a[d + 5], 5, -701558691)),
-                (p = f(p, m, n, o, a[d + 10], 9, 38016083)),
-                (o = f(o, p, m, n, a[d + 15], 14, -660478335)),
-                (n = f(n, o, p, m, a[d + 4], 20, -405537848)),
-                (m = f(m, n, o, p, a[d + 9], 5, 568446438)),
-                (p = f(p, m, n, o, a[d + 14], 9, -1019803690)),
-                (o = f(o, p, m, n, a[d + 3], 14, -187363961)),
-                (n = f(n, o, p, m, a[d + 8], 20, 1163531501)),
-                (m = f(m, n, o, p, a[d + 13], 5, -1444681467)),
-                (p = f(p, m, n, o, a[d + 2], 9, -51403784)),
-                (o = f(o, p, m, n, a[d + 7], 14, 1735328473)),
-                (n = f(n, o, p, m, a[d + 12], 20, -1926607734)),
-                (m = g(m, n, o, p, a[d + 5], 4, -378558)),
-                (p = g(p, m, n, o, a[d + 8], 11, -2022574463)),
-                (o = g(o, p, m, n, a[d + 11], 16, 1839030562)),
-                (n = g(n, o, p, m, a[d + 14], 23, -35309556)),
-                (m = g(m, n, o, p, a[d + 1], 4, -1530992060)),
-                (p = g(p, m, n, o, a[d + 4], 11, 1272893353)),
-                (o = g(o, p, m, n, a[d + 7], 16, -155497632)),
-                (n = g(n, o, p, m, a[d + 10], 23, -1094730640)),
-                (m = g(m, n, o, p, a[d + 13], 4, 681279174)),
-                (p = g(p, m, n, o, a[d], 11, -358537222)),
-                (o = g(o, p, m, n, a[d + 3], 16, -722521979)),
-                (n = g(n, o, p, m, a[d + 6], 23, 76029189)),
-                (m = g(m, n, o, p, a[d + 9], 4, -640364487)),
-                (p = g(p, m, n, o, a[d + 12], 11, -421815835)),
-                (o = g(o, p, m, n, a[d + 15], 16, 530742520)),
-                (n = g(n, o, p, m, a[d + 2], 23, -995338651)),
-                (m = h(m, n, o, p, a[d], 6, -198630844)),
-                (p = h(p, m, n, o, a[d + 7], 10, 1126891415)),
-                (o = h(o, p, m, n, a[d + 14], 15, -1416354905)),
-                (n = h(n, o, p, m, a[d + 5], 21, -57434055)),
-                (m = h(m, n, o, p, a[d + 12], 6, 1700485571)),
-                (p = h(p, m, n, o, a[d + 3], 10, -1894986606)),
-                (o = h(o, p, m, n, a[d + 10], 15, -1051523)),
-                (n = h(n, o, p, m, a[d + 1], 21, -2054922799)),
-                (m = h(m, n, o, p, a[d + 8], 6, 1873313359)),
-                (p = h(p, m, n, o, a[d + 15], 10, -30611744)),
-                (o = h(o, p, m, n, a[d + 6], 15, -1560198380)),
-                (n = h(n, o, p, m, a[d + 13], 21, 1309151649)),
-                (m = h(m, n, o, p, a[d + 4], 6, -145523070)),
-                (p = h(p, m, n, o, a[d + 11], 10, -1120210379)),
-                (o = h(o, p, m, n, a[d + 2], 15, 718787259)),
-                (n = h(n, o, p, m, a[d + 9], 21, -343485551)),
-                (m = b(m, i)),
-                (n = b(n, j)),
-                (o = b(o, k)),
-                (p = b(p, l));
-        return [m, n, o, p];
-    }
-    function j(a) {
-        var b,
-            c = "";
-        for (b = 0; b < 32 * a.length; b += 8)
-            c += String.fromCharCode((a[b >> 5] >>> b % 32) & 255);
-        return c;
-    }
-    function k(a) {
-        var b,
-            c = [];
-        for (c[(a.length >> 2) - 1] = void 0, b = 0; b < c.length; b += 1) c[b] = 0;
-        for (b = 0; b < 8 * a.length; b += 8)
-            c[b >> 5] |= (255 & a.charCodeAt(b / 8)) << b % 32;
-        return c;
-    }
-    function l(a) {
-        return j(i(k(a), 8 * a.length));
-    }
-    function m(a, b) {
-        var c,
-            d,
-            e = k(a),
-            f = [],
-            g = [];
-        for (
-            f[15] = g[15] = void 0, e.length > 16 && (e = i(e, 8 * a.length)), c = 0;
-            16 > c;
-            c += 1
-        )
-            (f[c] = 909522486 ^ e[c]), (g[c] = 1549556828 ^ e[c]);
-        return (d = i(f.concat(k(b)), 512 + 8 * b.length)), j(i(g.concat(d), 640));
-    }
-    function n(a) {
-        var b,
-            c,
-            d = "0123456789abcdef",
-            e = "";
-        for (c = 0; c < a.length; c += 1)
-            (b = a.charCodeAt(c)), (e += d.charAt((b >>> 4) & 15) + d.charAt(15 & b));
-        return e;
-    }
-    function o(a) {
-        return unescape(encodeURIComponent(a));
-    }
-    function p(a) {
-        return l(o(a));
-    }
-    function q(a) {
-        return n(p(a));
-    }
-    function r(a, b) {
-        return m(o(a), o(b));
-    }
-    function s(a, b) {
-        return n(r(a, b));
-    }
-    function t(a, b, c) {
-        return b ? (c ? r(b, a) : s(b, a)) : c ? p(a) : q(a);
-    }
-    "function" == typeof define && define.amd
-        ? define(function () {
-            return t;
-        })
-        : (a.md5 = t);
-})(this);

alist.go

@@ -12,7 +12,6 @@ import (
 )
 
 func Init() bool {
-	//bootstrap.InitLog()
 	bootstrap.InitConf()
 	bootstrap.InitCron()
 	bootstrap.InitModel()
@@ -22,7 +21,7 @@ func Init() bool {
 			log.Errorf(err.Error())
 			return false
 		}
-		log.Infof("current password: %s", pass.Value)
+		fmt.Printf("your password: %s\n", pass.Value)
 		return false
 	}
 	server.InitIndex()
@@ -34,7 +33,8 @@ func Init() bool {
 
 func main() {
 	if conf.Version {
-		fmt.Printf("Built At: %s\nGo Version: %s\nAuthor: %s\nCommit ID: %s\nVersion: %s\n", conf.BuiltAt, conf.GoVersion, conf.GitAuthor, conf.GitCommit, conf.GitTag)
+		fmt.Printf("Built At: %s\nGo Version: %s\nAuthor: %s\nCommit ID: %s\nVersion: %s\nWebVersion: %s\n",
+			conf.BuiltAt, conf.GoVersion, conf.GitAuthor, conf.GitCommit, conf.GitTag, conf.WebTag)
 		return
 	}
 	if !Init() {

alist_test.go

@@ -1,12 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"net/url"
-	"testing"
-)
-
-func TestUrl(t *testing.T) {
-	s,_ := url.QueryUnescape("/ali/%E7%8C%AA%E5%A4%B4%E7%9A%84%E6%96%87%E4%BB%B6%5B%E5%98%BF%E5%98%BF%5D/%E9%82%B9%E9%82%B9%E7%9A%84%E6%96%87%E4%BB%B6/%E6%A1%8C%E9%9D%A2%E5%A3%81%E7%BA%B8/v2-e8f266ba17ae387eefed1cb22b2b5e4e_r.jpg")
-	fmt.Print(s)
-}

bootstrap/account.go

@@ -3,6 +3,7 @@ package bootstrap
 import (
 	"github.com/Xhofe/alist/conf"
 	"github.com/Xhofe/alist/drivers/base"
+	"github.com/Xhofe/alist/drivers/operate"
 	"github.com/Xhofe/alist/model"
 	log "github.com/sirupsen/logrus"
 )
@@ -19,7 +20,9 @@ func InitAccounts() {
 		if !ok {
 			log.Errorf("no [%s] driver", account.Type)
 		} else {
-			err := driver.Save(&accounts[i], nil)
+			log.Infof("start init account: [%s], type: [%s]", account.Name, account.Type)
+			//err := driver.Save(&accounts[i], nil)
+			err := operate.Save(driver, &accounts[i], nil)
 			if err != nil {
 				log.Errorf("init account [%s] error:[%s]", account.Name, err.Error())
 			} else {
@@ -27,4 +30,4 @@ func InitAccounts() {
 			}
 		}
 	}
-}
+}

bootstrap/conf.go

@@ -1,11 +1,13 @@
 package bootstrap
 
 import (
-	"encoding/json"
 	"github.com/Xhofe/alist/conf"
 	"github.com/Xhofe/alist/utils"
+	"github.com/caarlos0/env/v6"
 	log "github.com/sirupsen/logrus"
 	"io/ioutil"
+	"os"
+	"path/filepath"
 )
 
 // InitConf init config
@@ -21,16 +23,49 @@ func InitConf() {
 		if !utils.WriteToJson(conf.ConfigFile, conf.Conf) {
 			log.Fatalf("failed to create default config file")
 		}
-		return
+	} else {
+		config, err := ioutil.ReadFile(conf.ConfigFile)
+		if err != nil {
+			log.Fatalf("reading config file error:%s", err.Error())
+		}
+		conf.Conf = conf.DefaultConfig()
+		err = utils.Json.Unmarshal(config, conf.Conf)
+		if err != nil {
+			log.Fatalf("load config error: %s", err.Error())
+		}
+		log.Debugf("config:%+v", conf.Conf)
+		// update config.json struct
+		confBody, err := utils.Json.MarshalIndent(conf.Conf, "", "  ")
+		if err != nil {
+			log.Fatalf("marshal config error:%s", err.Error())
+		}
+		err = ioutil.WriteFile(conf.ConfigFile, confBody, 0777)
+		if err != nil {
+			log.Fatalf("update config struct error: %s", err.Error())
+		}
 	}
-	config, err := ioutil.ReadFile(conf.ConfigFile)
+	if !conf.Conf.Force {
+		confFromEnv()
+	}
+	err := os.RemoveAll(filepath.Join(conf.Conf.TempDir))
 	if err != nil {
-		log.Fatalf("reading config file error:%s", err.Error())
+		log.Errorln("failed delete temp file:", err)
 	}
-	conf.Conf = new(conf.Config)
-	err = json.Unmarshal(config, conf.Conf)
+	err = os.MkdirAll(conf.Conf.TempDir, 0700)
 	if err != nil {
-		log.Fatalf("load config error: %s", err.Error())
+		log.Fatalf("create temp dir error: %s", err.Error())
+	}
+	log.Debugf("config: %+v", conf.Conf)
+}
+
+func confFromEnv() {
+	prefix := "ALIST_"
+	if conf.Docker {
+		prefix = ""
+	}
+	if err := env.Parse(conf.Conf, env.Options{
+		Prefix: prefix,
+	}); err != nil {
+		log.Fatalf("load config from env error: %s", err.Error())
 	}
-	log.Debugf("config:%+v", conf.Conf)
 }

bootstrap/log.go

@@ -12,6 +12,9 @@ func InitLog() {
 		log.SetLevel(log.DebugLevel)
 		log.SetReportCaller(true)
 	}
+	if conf.Password || conf.Version {
+		log.SetLevel(log.WarnLevel)
+	}
 	log.SetFormatter(&log.TextFormatter{
 		//DisableColors: true,
 		ForceColors:               true,
@@ -27,6 +30,7 @@ func init() {
 	flag.BoolVar(&conf.Debug, "debug", false, "start with debug mode")
 	flag.BoolVar(&conf.Version, "version", false, "print version info")
 	flag.BoolVar(&conf.Password, "password", false, "print current password")
+	flag.BoolVar(&conf.Docker, "docker", false, "is using docker")
 	flag.Parse()
 	InitLog()
-}
+}

bootstrap/model.go

@@ -19,6 +19,7 @@ import (
 
 func InitModel() {
 	log.Infof("init model...")
+	var err error
 	databaseConfig := conf.Conf.Database
 	newLogger := logger.New(
 		log2.New(os.Stdout, "\r\n", log2.LstdFlags),
@@ -49,8 +50,8 @@ func InitModel() {
 		}
 	case "mysql":
 		{
-			dsn := fmt.Sprintf("%s:%s@tcp(%s:%d)/%s?charset=utf8mb4&parseTime=True&loc=Local",
-				databaseConfig.User, databaseConfig.Password, databaseConfig.Host, databaseConfig.Port, databaseConfig.Name)
+			dsn := fmt.Sprintf("%s:%s@tcp(%s:%d)/%s?charset=utf8mb4&parseTime=True&loc=Local&tls=%s",
+				databaseConfig.User, databaseConfig.Password, databaseConfig.Host, databaseConfig.Port, databaseConfig.Name, databaseConfig.SslMode)
 			db, err := gorm.Open(mysql.Open(dsn), gormConfig)
 			if err != nil {
 				log.Fatalf("failed to connect database:%s", err.Error())
@@ -59,22 +60,25 @@ func InitModel() {
 		}
 	case "postgres":
 		{
-			dsn := fmt.Sprintf("host=%s user=%s password=%s dbname=%s port=%d sslmode=disable TimeZone=Asia/Shanghai",
-				databaseConfig.Host, databaseConfig.User, databaseConfig.Password, databaseConfig.Name, databaseConfig.Port)
+			dsn := fmt.Sprintf("host=%s user=%s password=%s dbname=%s port=%d sslmode=%s TimeZone=Asia/Shanghai",
+				databaseConfig.Host, databaseConfig.User, databaseConfig.Password, databaseConfig.Name, databaseConfig.Port, databaseConfig.SslMode)
 			db, err := gorm.Open(postgres.Open(dsn), gormConfig)
 			if err != nil {
 				log.Errorf("failed to connect database:%s", err.Error())
 			}
 			conf.DB = db
-
 		}
 	default:
 		log.Fatalf("not supported database type: %s", databaseConfig.Type)
 	}
 	log.Infof("auto migrate model...")
-	err := conf.DB.AutoMigrate(&model.SettingItem{}, &model.Account{}, &model.Meta{})
+	if databaseConfig.Type == "mysql" {
+		err = conf.DB.Set("gorm:table_options", "ENGINE=InnoDB CHARSET=utf8mb4").
+			AutoMigrate(&model.SettingItem{}, &model.Account{}, &model.Meta{}, &model.SearchFile{})
+	} else {
+		err = conf.DB.AutoMigrate(&model.SettingItem{}, &model.Account{}, &model.Meta{}, &model.SearchFile{})
+	}
 	if err != nil {
-		log.Fatalf("failed to auto migrate")
+		log.Fatalf("failed to auto migrate: %s", err.Error())
 	}
 }
-

bootstrap/setting.go

@@ -3,6 +3,7 @@ package bootstrap
 import (
 	"github.com/Xhofe/alist/conf"
 	"github.com/Xhofe/alist/model"
+	"github.com/Xhofe/alist/utils"
 	log "github.com/sirupsen/logrus"
 	"gorm.io/gorm"
 	"strings"
@@ -27,7 +28,7 @@ func InitSettings() {
 		},
 		{
 			Key:         "password",
-			Value:       "alist",
+			Value:       utils.RandomStr(8),
 			Description: "password",
 			Type:        "string",
 			Access:      model.PRIVATE,
@@ -35,7 +36,7 @@ func InitSettings() {
 		},
 		{
 			Key:         "logo",
-			Value:       "https://store.heytapimage.com/cdo-portal/feedback/202112/05/1542f45f86b8609495b69c5380753135.png",
+			Value:       "https://cdn.jsdelivr.net/gh/alist-org/logo@main/can_circle.svg",
 			Description: "logo",
 			Type:        "string",
 			Access:      model.PUBLIC,
@@ -43,7 +44,7 @@ func InitSettings() {
 		},
 		{
 			Key:         "favicon",
-			Value:       "https://store.heytapimage.com/cdo-portal/feedback/202112/05/1542f45f86b8609495b69c5380753135.png",
+			Value:       "https://cdn.jsdelivr.net/gh/alist-org/logo@main/logo.svg",
 			Description: "favicon",
 			Type:        "string",
 			Access:      model.PUBLIC,
@@ -57,6 +58,14 @@ func InitSettings() {
 			Access:      model.PUBLIC,
 			Group:       model.FRONT,
 		},
+		{
+			Key:         "announcement",
+			Value:       "This is a test announcement.",
+			Description: "announcement message (support markdown)",
+			Type:        "text",
+			Access:      model.PUBLIC,
+			Group:       model.FRONT,
+		},
 		{
 			Key:         "text types",
 			Value:       strings.Join(conf.TextTypes, ","),
@@ -65,15 +74,37 @@ func InitSettings() {
 			Group:       model.FRONT,
 		},
 		{
-			Key:         "hide readme file",
-			Value:       "true",
-			Type:        "bool",
-			Description: "hide readme file? ",
+			Key:         "audio types",
+			Value:       strings.Join(conf.AudioTypes, ","),
+			Type:        "string",
+			Description: "audio type extensions",
+			Group:       model.FRONT,
+		},
+		{
+			Key:         "video types",
+			Value:       strings.Join(conf.VideoTypes, ","),
+			Type:        "string",
+			Description: "video type extensions",
+			Group:       model.FRONT,
+		},
+		{
+			Key:         "d_proxy types",
+			Value:       strings.Join(conf.DProxyTypes, ","),
+			Type:        "string",
+			Description: "/d but proxy",
+			Access:      model.PRIVATE,
+			Group:       model.BACK,
+		},
+		{
+			Key:         "hide files",
+			Value:       "/\\/README.md/i",
+			Type:        "text",
+			Description: "hide files, support RegExp, one per line",
 			Group:       model.FRONT,
 		},
 		{
 			Key:         "music cover",
-			Value:       "https://store.heytapimage.com/cdo-portal/feedback/202110/30/d43c41c5d257c9bc36366e310374fb19.png",
+			Value:       "https://cdn.jsdelivr.net/gh/alist-org/logo@main/circle_center.svg",
 			Description: "music cover image",
 			Type:        "string",
 			Access:      model.PUBLIC,
@@ -87,8 +118,8 @@ func InitSettings() {
 			Group:       model.FRONT,
 		},
 		{
-			Key:         "home readme url",
-			Description: "when have multiple, the readme file to show",
+			Key:         "global readme url",
+			Description: "Default display when directory has no readme",
 			Type:        "string",
 			Access:      model.PUBLIC,
 			Group:       model.FRONT,
@@ -131,6 +162,14 @@ func InitSettings() {
 			Access:      model.PRIVATE,
 			Group:       model.FRONT,
 		},
+		{
+			Key:         "home emoji",
+			Value:       "🏠",
+			Type:        "string",
+			Description: "emoji in front of home in nav",
+			Access:      model.PUBLIC,
+			Group:       model.FRONT,
+		},
 		{
 			Key:         "animation",
 			Value:       "true",
@@ -149,7 +188,7 @@ func InitSettings() {
 		},
 		{
 			Key:         "WebDAV username",
-			Value:       "alist_admin",
+			Value:       "admin",
 			Description: "WebDAV username",
 			Type:        "string",
 			Access:      model.PRIVATE,
@@ -157,7 +196,7 @@ func InitSettings() {
 		},
 		{
 			Key:         "WebDAV password",
-			Value:       "alist_admin",
+			Value:       utils.RandomStr(8),
 			Description: "WebDAV password",
 			Type:        "string",
 			Access:      model.PRIVATE,
@@ -181,7 +220,7 @@ func InitSettings() {
 		},
 		{
 			Key:         "Visitor WebDAV username",
-			Value:       "alist_visitor",
+			Value:       "guest",
 			Description: "Visitor WebDAV username",
 			Type:        "string",
 			Access:      model.PRIVATE,
@@ -189,12 +228,60 @@ func InitSettings() {
 		},
 		{
 			Key:         "Visitor WebDAV password",
-			Value:       "alist_visitor",
+			Value:       "guest",
 			Description: "Visitor WebDAV password",
 			Type:        "string",
 			Access:      model.PRIVATE,
 			Group:       model.BACK,
 		},
+		{
+			Key:         "load type",
+			Value:       "all",
+			Type:        "select",
+			Values:      "all,load more,auto load more,pagination",
+			Description: "Not recommended to choose to auto load more, it has bugs now",
+			Access:      model.PUBLIC,
+			Group:       model.FRONT,
+		},
+		{
+			Key:    "default page size",
+			Value:  "30",
+			Type:   "number",
+			Access: model.PUBLIC,
+			Group:  model.FRONT,
+		},
+		{
+			Key:         "ocr api",
+			Value:       "https://api.xhofe.top/ocr/file/json",
+			Description: "Used to identify verification codes",
+			Type:        "string",
+			Access:      model.PRIVATE,
+			Group:       model.BACK,
+		},
+		{
+			Key:         "enable search",
+			Value:       "false",
+			Type:        "bool",
+			Access:      model.PUBLIC,
+			Group:       model.BACK,
+			Description: "Experimental function, not recommended as it's still under development",
+		},
+		{
+			Key:         "Aria2 RPC url",
+			Value:       "http://localhost:6800/jsonrpc",
+			Description: "Aria2 RPC url, e.g. 'http://aria2.example.com:6800/jsonrpc'",
+			Type:        "string",
+			Access:      model.PRIVATE,
+			Group:       model.BACK,
+		},
+		{
+			Key:         "Aria2 RPC secret",
+			Value:       "",
+			Description: "Aria2 RPC secret, e.g. '123456'",
+			Type:        "string",
+			Access:      model.PRIVATE,
+			Group:       model.BACK,
+		},
 	}
 	for i, _ := range settings {
 		v := settings[i]
@@ -203,11 +290,14 @@ func InitSettings() {
 		if err != nil {
 			if err == gorm.ErrRecordNotFound {
 				err = model.SaveSetting(v)
+				if v.Key == "password" {
+					log.Infof("Initial password: %s", conf.C.Sprintf(v.Value))
+				}
 				if err != nil {
 					log.Fatalf("failed write setting: %s", err.Error())
 				}
 			} else {
-				log.Fatal("can't get setting: %s", err.Error())
+				log.Fatalf("can't get setting: %s", err.Error())
 			}
 		} else {
 			//o.Version = conf.GitTag
@@ -217,6 +307,9 @@ func InitSettings() {
 			if err != nil {
 				log.Fatalf("failed write setting: %s", err.Error())
 			}
+			if v.Key == "password" {
+				log.Infof("Your password: %s", conf.C.Sprintf(v.Value))
+			}
 		}
 	}
 	model.LoadSettings()

build.sh

@@ -1,23 +1,34 @@
 #!/bin/bash
-if [ "$1" == "web" ]; then
-  git clone https://github.com/Xhofe/alist-web.git
-  cd alist-web || exit
+
+# 构建前端,在当前目录产生一个dist文件夹
+BUILD_WEB() {
+  git clone https://github.com/alist-org/alist-web.git
+  cd alist-web
   yarn
   yarn build
-  mv dist/* ../public
-  cd ..
-  exit 0
-fi
+  sed -i -e "s/\/CDN_URL\//\//g" dist/index.html
+  sed -i -e "s/assets/\/assets/g" dist/index.html
+  rm -f dist/index.html-e
+  mv dist ..
+  cd .. || exit
+  rm -rf alist-web
+}
 
-go env -w GOPROXY=https://goproxy.cn,https://mirrors.aliyun.com/goproxy/,https://goproxy.io,direct
+CDN_WEB() {
+  curl -L https://github.com/alist-org/alist-web/releases/latest/download/dist.tar.gz -o dist.tar.gz
+  tar -zxvf dist.tar.gz
+  rm -f dist.tar.gz
+}
 
-if [ "$1" == "docker" ]; then
+# 在DOCKER中构建
+BUILD_DOCKER() {
   appName="alist"
   builtAt="$(date +'%F %T %z')"
   goVersion=$(go version | sed 's/go version //')
   gitAuthor=$(git show -s --format='format:%aN <%ae>' HEAD)
   gitCommit=$(git log --pretty=format:"%h" -1)
   gitTag=$(git describe --long --tags --dirty --always)
+  webTag=$(wget -qO- -t1 -T2 "https://api.github.com/repos/alist-org/alist-web/releases/latest" | grep "tag_name" | head -n 1 | awk -F ":" '{print $2}' | sed 's/\"//g;s/,//g;s/ //g')
   ldflags="\
 -w -s \
 -X 'github.com/Xhofe/alist/conf.BuiltAt=$builtAt' \
@@ -25,86 +36,122 @@ if [ "$1" == "docker" ]; then
 -X 'github.com/Xhofe/alist/conf.GitAuthor=$gitAuthor' \
 -X 'github.com/Xhofe/alist/conf.GitCommit=$gitCommit' \
 -X 'github.com/Xhofe/alist/conf.GitTag=$gitTag' \
-"
-  go build -o ./bin/alist -ldflags="$ldflags" alist.go
-  exit 0
-fi
+-X 'github.com/Xhofe/alist/conf.WebTag=$webTag' \
+  "
+  go build -o ./bin/alist -ldflags="$ldflags" -tags=jsoniter alist.go
+}
 
-cd alist-web || exit
-webCommit=$(git log --pretty=format:"%h" -1)
-echo "web commit id: $webCommit"
-yarn
-if [ "$1" == "release" ]; then
-  yarn build --base="https://cdn.jsdelivr.net/gh/Xhofe/alist-web@cdn/v2/$webCommit"
-  mv dist/assets ..
-  mv dist/index.html ../alist/public
-  #  构建local
-  yarn build
-  mv dist/index.html dist/local.html
-  mv dist/* ../alist/public
-else
-  yarn build
-  mv dist/* ../alist/public
-fi
-cd ..
+BUILD() {
+  cd alist
+  appName="alist"
+  builtAt="$(date +'%F %T %z')"
+  goVersion=$(go version | sed 's/go version //')
+  gitAuthor=$(git show -s --format='format:%aN <%ae>' HEAD)
+  gitCommit=$(git log --pretty=format:"%h" -1)
+  gitTag=$(git describe --long --tags --dirty --always)
+  webTag=$(wget -qO- -t1 -T2 "https://api.github.com/repos/alist-org/alist-web/releases/latest" | grep "tag_name" | head -n 1 | awk -F ":" '{print $2}' | sed 's/\"//g;s/,//g;s/ //g')
+  echo "build version: $gitTag"
 
-cd alist
-appName="alist"
-builtAt="$(date +'%F %T %z')"
-goVersion=$(go version | sed 's/go version //')
-gitAuthor=$(git show -s --format='format:%aN <%ae>' HEAD)
-gitCommit=$(git log --pretty=format:"%h" -1)
-gitTag=$(git describe --long --tags --dirty --always)
-
-echo "build version: $gitTag"
-
-ldflags="\
+  ldflags="\
 -w -s \
 -X 'github.com/Xhofe/alist/conf.BuiltAt=$builtAt' \
 -X 'github.com/Xhofe/alist/conf.GoVersion=$goVersion' \
 -X 'github.com/Xhofe/alist/conf.GitAuthor=$gitAuthor' \
 -X 'github.com/Xhofe/alist/conf.GitCommit=$gitCommit' \
 -X 'github.com/Xhofe/alist/conf.GitTag=$gitTag' \
+-X 'github.com/Xhofe/alist/conf.WebTag=$webTag' \
 "
+  rm -rf .git/
+  if [ "$1" == "release" ]; then
+    xgo -out "$appName" -ldflags="$ldflags" -tags=jsoniter .
+  else
+    xgo -targets=linux/amd64,windows/amd64,darwin/amd64 -out "$appName" -ldflags="$ldflags" -tags=jsoniter .
+  fi
+  mkdir -p "build"
+  mv alist-* build
+  if [ "$1" != "release" ]; then
+      cd build
+      upx -9 ./alist-linux*
+      upx -9 ./alist-windows*
+      find . -type f -print0 | xargs -0 md5sum >md5.txt
+      cat md5.txt
+      cd .. || exit
+  fi
+  cd .. || exit
+}
 
-if [ "$1" == "release" ]; then
-  xgo -out alist -ldflags="$ldflags" .
+BUILD_MUSL() {
+  BASE="https://musl.cc/"
+  FILES=(x86_64-linux-musl-cross aarch64-linux-musl-cross arm-linux-musleabihf-cross mips-linux-musl-cross mips64-linux-musl-cross mips64el-linux-musl-cross mipsel-linux-musl-cross powerpc64le-linux-musl-cross s390x-linux-musl-cross)
+  for i in "${FILES[@]}"; do
+    url="${BASE}${i}.tgz"
+    curl -L -o "${i}.tgz" "${url}"
+    sudo tar xf "${i}.tgz" --strip-components 1 -C /usr/local
+  done
+  cd alist
+  appName="alist"
+  builtAt="$(date +'%F %T %z')"
+  goVersion=$(go version | sed 's/go version //')
+  gitAuthor=$(git show -s --format='format:%aN <%ae>' HEAD)
+  gitCommit=$(git log --pretty=format:"%h" -1)
+  gitTag=$(git describe --long --tags --dirty --always)
+  webTag=$(wget -qO- -t1 -T2 "https://api.github.com/repos/alist-org/alist-web/releases/latest" | grep "tag_name" | head -n 1 | awk -F ":" '{print $2}' | sed 's/\"//g;s/,//g;s/ //g')
+  ldflags="\
+-w -s --extldflags '-static -fpic' \
+-X 'github.com/Xhofe/alist/conf.BuiltAt=$builtAt' \
+-X 'github.com/Xhofe/alist/conf.GoVersion=$goVersion' \
+-X 'github.com/Xhofe/alist/conf.GitAuthor=$gitAuthor' \
+-X 'github.com/Xhofe/alist/conf.GitCommit=$gitCommit' \
+-X 'github.com/Xhofe/alist/conf.GitTag=$gitTag' \
+-X 'github.com/Xhofe/alist/conf.WebTag=$webTag' \
+  "
+  OS_ARCHES=(linux-musl-amd64 linux-musl-arm64 linux-musl-arm linux-musl-mips linux-musl-mips64 linux-musl-mips64le linux-musl-mipsle linux-musl-ppc64le linux-musl-s390x)
+  CGO_ARGS=(x86_64-linux-musl-gcc aarch64-linux-musl-gcc arm-linux-musleabihf-gcc mips-linux-musl-gcc mips64-linux-musl-gcc mips64el-linux-musl-gcc mipsel-linux-musl-gcc powerpc64le-linux-musl-gcc s390x-linux-musl-gcc)
+  for i in "${!OS_ARCHES[@]}"; do
+      os_arch=${OS_ARCHES[$i]}
+      cgo_cc=${CGO_ARGS[$i]}
+      echo building for ${os_arch}
+      export GOOS=${os_arch%%-*}
+      export GOARCH=${os_arch##*-}
+      export CC=${cgo_cc}
+      export CGO_ENABLED=1
+      go build -o ./build/$appName-$os_arch -ldflags="$ldflags" -tags=jsoniter alist.go
+  done
+  cd .. || exit
+}
+
+RELEASE() {
+  cd alist/build
+  upx -9 ./alist-linux-amd64
+  upx -9 ./alist-windows*
+  find . -type f -print0 | xargs -0 md5sum >md5.txt
+  cat md5.txt
+  mkdir compress
+  mv md5.txt compress
+  for i in $(find . -type f -name "$appName-linux-*"); do
+    tar -czvf compress/"$i".tar.gz "$i"
+  done
+  for i in $(find . -type f -name "$appName-darwin-*"); do
+    tar -czvf compress/"$i".tar.gz "$i"
+  done
+  for i in $(find . -type f -name "$appName-windows-*"); do
+    zip compress/$(echo $i | sed 's/\.[^.]*$//').zip "$i"
+  done
+  cd ../.. || exit 
+}
+
+if [ "$1" = "web" ]; then
+  BUILD_WEB
+elif [ "$1" = "cdn" ]; then
+  CDN_WEB
+elif [ "$1" = "docker" ]; then
+  BUILD_DOCKER
+elif [ "$1" = "build" ]; then
+  BUILD build
+elif [ "$1" = "release" ]; then
+  BUILD_MUSL
+  BUILD release
+  RELEASE
 else
-  xgo -targets=linux/amd64,windows/amd64 -out alist -ldflags="$ldflags" .
-fi
-mkdir "build"
-mv alist-* build
-cd build || exit
-upx -9 ./*
-find . -type f -print0 | xargs -0 md5sum > md5.txt
-cat md5.txt
-# compress file (release)
-if [ "$1" == "release" ]; then
-    mkdir compress
-    mv md5.txt compress
-    for i in `find . -type f -name "$appName-linux-*"`
-    do
-      tar -czvf compress/"$i".tar.gz "$i"
-    done
-    for i in `find . -type f -name "$appName-darwin-*"`
-    do
-      tar -czvf compress/"$i".tar.gz "$i"
-    done
-    for i in `find . -type f -name "$appName-windows-*"`
-    do
-      zip compress/$(echo $i | sed 's/\.[^.]*$//').zip "$i"
-    done
-fi
-cd ../..
-
-if [ "$1" == "release" ]; then
-  cd alist-web
-  git checkout cdn
-  mkdir "v2/$webCommit"
-  mv ../assets/ v2/$webCommit
-  git add .
-  git config --local user.email "i@nn.ci"
-  git config --local user.name "Xhofe"
-  git commit --allow-empty -m "upload $webCommit assets files" -a
-  cd ..
+  echo -e "${RED_COLOR} Parameter error ${RES}"
 fi

conf/config.go

@@ -1,40 +1,45 @@
 package conf
 
 type Database struct {
-	Type        string `json:"type"`
-	User        string `json:"user"`
-	Password    string `json:"password"`
-	Host        string `json:"host"`
-	Port        int    `json:"port"`
-	Name        string `json:"name"`
-	TablePrefix string `json:"table_prefix"`
-	DBFile      string `json:"db_file"`
+	Type        string `json:"type" env:"DB_TYPE"`
+	Host        string `json:"host" env:"DB_HOST"`
+	Port        int    `json:"port" env:"DB_PORT"`
+	User        string `json:"user" env:"DB_USER"`
+	Password    string `json:"password" env:"DB_PASS"`
+	Name        string `json:"name" env:"DB_NAME"`
+	DBFile      string `json:"db_file" env:"DB_FILE"`
+	TablePrefix string `json:"table_prefix" env:"DB_TABLE_PREFIX"`
+	SslMode     string `json:"ssl_mode" env:"DB_SLL_MODE"`
 }
 
 type Scheme struct {
-	Https    bool   `json:"https"`
-	CertFile string `json:"cert_file"`
-	KeyFile  string `json:"key_file"`
+	Https    bool   `json:"https" env:"HTTPS"`
+	CertFile string `json:"cert_file" env:"CERT_FILE"`
+	KeyFile  string `json:"key_file" env:"KEY_FILE"`
 }
 
 type CacheConfig struct {
-	Expiration      int64 `json:"expiration"`
-	CleanupInterval int64 `json:"cleanup_interval"`
+	Expiration      int64 `json:"expiration" env:"CACHE_EXPIRATION"`
+	CleanupInterval int64 `json:"cleanup_interval" env:"CLEANUP_INTERVAL"`
 }
 
 type Config struct {
-	Address  string      `json:"address"`
-	Port     int         `json:"port"`
-	Local    bool        `json:"local"`
+	Force    bool        `json:"force"`
+	Address  string      `json:"address" env:"ADDR"`
+	Port     int         `json:"port" env:"PORT"`
+	Assets   string      `json:"assets" env:"ASSETS"`
 	Database Database    `json:"database"`
 	Scheme   Scheme      `json:"scheme"`
 	Cache    CacheConfig `json:"cache"`
+	TempDir  string      `json:"temp_dir" env:"TEMP_DIR"`
 }
 
 func DefaultConfig() *Config {
 	return &Config{
 		Address: "0.0.0.0",
 		Port:    5244,
+		Assets:  "https://npm.elemecdn.com/alist-web@$version/dist",
+		TempDir: "data/temp",
 		Database: Database{
 			Type:        "sqlite3",
 			Port:        0,

conf/var.go

@@ -3,8 +3,10 @@ package conf
 import (
 	"context"
 	"github.com/eko/gocache/v2/cache"
+	"github.com/fatih/color"
 	"github.com/robfig/cron/v3"
 	"gorm.io/gorm"
+	"strconv"
 )
 
 var (
@@ -13,6 +15,7 @@ var (
 	GitAuthor string
 	GitCommit string
 	GitTag    string = "dev"
+	WebTag    string
 )
 
 var (
@@ -21,33 +24,81 @@ var (
 	Debug      bool
 	Version    bool
 	Password   bool
+	Docker     bool
 
 	DB    *gorm.DB
 	Cache *cache.Cache
 	Ctx   = context.TODO()
 	Cron  *cron.Cron
+
+	C = color.New(color.FgHiBlue, color.Bold, color.BgHiWhite, color.Underline)
 )
 
 var (
 	TextTypes = []string{"txt", "htm", "html", "xml", "java", "properties", "sql",
 		"js", "md", "json", "conf", "ini", "vue", "php", "py", "bat", "gitignore", "yml",
 		"go", "sh", "c", "cpp", "h", "hpp", "tsx", "vtt", "srt", "ass"}
+	DProxyTypes = []string{"m3u8"}
 	OfficeTypes = []string{"doc", "docx", "xls", "xlsx", "ppt", "pptx", "pdf"}
-	VideoTypes  = []string{"mp4", "mkv", "avi", "mov", "rmvb", "webm"}
-	AudioTypes  = []string{"mp3", "flac", "ogg", "m4a", "wav"}
-	ImageTypes  = []string{"jpg", "tiff", "jpeg", "png", "gif", "bmp", "svg", "ico"}
+	VideoTypes  = []string{"mp4", "mkv", "avi", "mov", "rmvb", "webm", "flv"}
+	AudioTypes  = []string{"mp3", "flac", "ogg", "m4a", "wav", "opus"}
+	ImageTypes  = []string{"jpg", "tiff", "jpeg", "png", "gif", "bmp", "svg", "ico", "swf", "webp"}
+)
+
+var settingsMap = make(map[string]string)
+
+func Set(key string, value string) {
+	settingsMap[key] = value
+}
+
+func GetStr(key string) string {
+	value, ok := settingsMap[key]
+	if !ok {
+		return ""
+	}
+	return value
+}
+
+func GetBool(key string) bool {
+	value, ok := settingsMap[key]
+	if !ok {
+		return false
+	}
+	return value == "true"
+}
+
+func GetInt(key string, defaultV int) int {
+	value, ok := settingsMap[key]
+	if !ok {
+		return defaultV
+	}
+	v, err := strconv.Atoi(value)
+	if err != nil {
+		return defaultV
+	}
+	return v
+}
+
+var (
+	LoadSettings = []string{
+		"check parent folder", "check down link", "WebDAV username", "WebDAV password",
+		"Visitor WebDAV username", "Visitor WebDAV password",
+		"default page size", "load type",
+		"ocr api", "favicon",
+		"enable search",
+	}
 )
 
-// settings
 var (
 	RawIndexHtml string
+	ManageHtml   string
 	IndexHtml    string
-	CheckParent  bool
-	CheckDown    bool
+	Token        string
 
-	Token              string
-	DavUsername        string
-	DavPassword        string
-	VisitorDavUsername string
-	VisitorDavPassword string
+	//CheckParent        bool
+	//CheckDown          bool
+	//DavUsername        string
+	//DavPassword        string
+	//VisitorDavUsername string
+	//VisitorDavPassword string
 )

drivers/123/123.go

@@ -1,60 +1,18 @@
 package _23
 
 import (
-	"crypto/hmac"
-	"crypto/sha256"
 	"errors"
 	"fmt"
-	"github.com/Xhofe/alist/conf"
 	"github.com/Xhofe/alist/drivers/base"
 	"github.com/Xhofe/alist/model"
 	"github.com/Xhofe/alist/utils"
 	"github.com/go-resty/resty/v2"
 	jsoniter "github.com/json-iterator/go"
 	log "github.com/sirupsen/logrus"
-	"math/rand"
 	"path/filepath"
 	"strconv"
-	"time"
 )
 
-type BaseResp struct {
-	Code    int    `json:"code"`
-	Message string `json:"message"`
-}
-
-type Pan123TokenResp struct {
-	BaseResp
-	Data struct {
-		Token string `json:"token"`
-	} `json:"data"`
-}
-
-type Pan123File struct {
-	FileName  string     `json:"FileName"`
-	Size      int64      `json:"Size"`
-	UpdateAt  *time.Time `json:"UpdateAt"`
-	FileId    int64      `json:"FileId"`
-	Type      int        `json:"Type"`
-	Etag      string     `json:"Etag"`
-	S3KeyFlag string     `json:"S3KeyFlag"`
-}
-
-type Pan123Files struct {
-	BaseResp
-	Data struct {
-		InfoList []Pan123File `json:"InfoList"`
-		Next     string       `json:"Next"`
-	} `json:"data"`
-}
-
-type Pan123DownResp struct {
-	BaseResp
-	Data struct {
-		DownloadUrl string `json:"DownloadUrl"`
-	} `json:"data"`
-}
-
 func (driver Pan123) Login(account *model.Account) error {
 	url := "https://www.123pan.com/api/user/sign_in"
 	if account.APIProxyUrl != "" {
@@ -81,7 +39,7 @@ func (driver Pan123) Login(account *model.Account) error {
 	return err
 }
 
-func (driver Pan123) FormatFile(file *Pan123File) *model.File {
+func (driver Pan123) FormatFile(file *File) *model.File {
 	f := &model.File{
 		Id:        strconv.FormatInt(file.FileId, 10),
 		Name:      file.FileName,
@@ -89,17 +47,13 @@ func (driver Pan123) FormatFile(file *Pan123File) *model.File {
 		Driver:    driver.Config().Name,
 		UpdatedAt: file.UpdateAt,
 	}
-	if file.Type == 1 {
-		f.Type = conf.FOLDER
-	} else {
-		f.Type = utils.GetFileType(filepath.Ext(file.FileName))
-	}
+	f.Type = file.GetType()
 	return f
 }
 
-func (driver Pan123) GetFiles(parentId string, account *model.Account) ([]Pan123File, error) {
+func (driver Pan123) GetFiles(parentId string, account *model.Account) ([]File, error) {
 	next := "0"
-	res := make([]Pan123File, 0)
+	res := make([]File, 0)
 	for next != "-1" {
 		var resp Pan123Files
 		query := map[string]string{
@@ -184,7 +138,7 @@ func (driver Pan123) Request(url string, method int, headers, query map[string]s
 //	return body, nil
 //}
 
-func (driver Pan123) GetFile(path string, account *model.Account) (*Pan123File, error) {
+func (driver Pan123) GetFile(path string, account *model.Account) (*File, error) {
 	dir, name := filepath.Split(path)
 	dir = utils.ParsePath(dir)
 	_, err := driver.Files(dir, account)
@@ -192,40 +146,30 @@ func (driver Pan123) GetFile(path string, account *model.Account) (*Pan123File,
 		return nil, err
 	}
 	parentFiles_, _ := base.GetCache(dir, account)
-	parentFiles, _ := parentFiles_.([]Pan123File)
+	parentFiles, _ := parentFiles_.([]File)
 	for _, file := range parentFiles {
 		if file.FileName == name {
-			if file.Type != conf.FOLDER {
-				return &file, err
-			} else {
-				return nil, base.ErrNotFile
-			}
+			//if file.Type != conf.FOLDER {
+			//	return &file, err
+			//} else {
+			//	return nil, base.ErrNotFile
+			//}
+			return &file, nil
 		}
 	}
 	return nil, base.ErrPathNotFound
 }
 
-func RandStr(length int) string {
-	str := "123456789abcdefghijklmnopqrstuvwxyz"
-	bytes := []byte(str)
-	var result []byte
-	rand.Seed(time.Now().UnixNano() + int64(rand.Intn(100)))
-	for i := 0; i < length; i++ {
-		result = append(result, bytes[rand.Intn(len(bytes))])
-	}
-	return string(result)
-}
-
-func HMAC(message string, secret string) string {
-	key := []byte(secret)
-	h := hmac.New(sha256.New, key)
-	h.Write([]byte(message))
-	//	fmt.Println(h.Sum(nil))
-	//sha := hex.EncodeToString(h.Sum(nil))
-	//	fmt.Println(sha)
-	//return sha
-	return string(h.Sum(nil))
-}
+//func HMAC(message string, secret string) string {
+//	key := []byte(secret)
+//	h := hmac.New(sha256.New, key)
+//	h.Write([]byte(message))
+//	//	fmt.Println(h.Sum(nil))
+//	//sha := hex.EncodeToString(h.Sum(nil))
+//	//	fmt.Println(sha)
+//	//return sha
+//	return string(h.Sum(nil))
+//}
 
 func init() {
 	base.RegisterDriver(&Pan123{})

drivers/123/driver.go

@@ -1,21 +1,24 @@
 package _23
 
 import (
+	"crypto/md5"
 	"encoding/hex"
-	"encoding/xml"
 	"fmt"
 	"github.com/Xhofe/alist/conf"
 	"github.com/Xhofe/alist/drivers/base"
 	"github.com/Xhofe/alist/model"
 	"github.com/Xhofe/alist/utils"
-	"github.com/gin-gonic/gin"
-	jsoniter "github.com/json-iterator/go"
+	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/aws/credentials"
+	"github.com/aws/aws-sdk-go/aws/session"
+	"github.com/aws/aws-sdk-go/service/s3/s3manager"
 	log "github.com/sirupsen/logrus"
+	"io"
+	"io/ioutil"
 	"net/url"
+	"os"
 	"path/filepath"
 	"strconv"
-	"strings"
-	"time"
 )
 
 type Pan123 struct{}
@@ -54,6 +57,7 @@ func (driver Pan123) Items() []base.Item {
 			Type:     base.TypeSelect,
 			Values:   "name,fileId,updateAt,createAt",
 			Required: true,
+			Default:  "name",
 		},
 		{
 			Name:     "order_direction",
@@ -61,11 +65,15 @@ func (driver Pan123) Items() []base.Item {
 			Type:     base.TypeSelect,
 			Values:   "asc,desc",
 			Required: true,
+			Default:  "asc",
 		},
 	}
 }
 
 func (driver Pan123) Save(account *model.Account, old *model.Account) error {
+	if account == nil {
+		return nil
+	}
 	if account.RootFolder == "" {
 		account.RootFolder = "0"
 	}
@@ -100,10 +108,10 @@ func (driver Pan123) File(path string, account *model.Account) (*model.File, err
 
 func (driver Pan123) Files(path string, account *model.Account) ([]model.File, error) {
 	path = utils.ParsePath(path)
-	var rawFiles []Pan123File
+	var rawFiles []File
 	cache, err := base.GetCache(path, account)
 	if err == nil {
-		rawFiles, _ = cache.([]Pan123File)
+		rawFiles, _ = cache.([]File)
 	} else {
 		file, err := driver.File(path, account)
 		if err != nil {
@@ -132,7 +140,7 @@ func (driver Pan123) Link(args base.Args, account *model.Account) (*base.Link, e
 	}
 	var resp Pan123DownResp
 	var headers map[string]string
-	if args.IP != "" && args.IP != "::1" {
+	if !utils.IsLocalIPAddr(args.IP) {
 		headers = map[string]string{
 			//"X-Real-IP":       "1.1.1.1",
 			"X-Forwarded-For": args.IP,
@@ -190,9 +198,9 @@ func (driver Pan123) Path(path string, account *model.Account) (*model.File, []m
 	return nil, files, nil
 }
 
-func (driver Pan123) Proxy(c *gin.Context, account *model.Account) {
-	c.Request.Header.Del("origin")
-}
+//func (driver Pan123) Proxy(r *http.Request, account *model.Account) {
+//	r.Header.Del("origin")
+//}
 
 func (driver Pan123) Preview(path string, account *model.Account) (interface{}, error) {
 	return nil, base.ErrNotSupport
@@ -218,50 +226,46 @@ func (driver Pan123) MakeDir(path string, account *model.Account) error {
 	}
 	_, err = driver.Request("https://www.123pan.com/api/file/upload_request",
 		base.Post, nil, nil, &data, nil, false, account)
-	//_, err = driver.Post("https://www.123pan.com/api/file/upload_request", data, account)
-	if err == nil {
-		_ = base.DeleteCache(dir, account)
-	}
 	return err
 }
 
 func (driver Pan123) Move(src string, dst string, account *model.Account) error {
-	srcDir, _ := filepath.Split(src)
-	dstDir, dstName := filepath.Split(dst)
+	dstDir, _ := filepath.Split(dst)
 	srcFile, err := driver.File(src, account)
 	if err != nil {
 		return err
 	}
 	fileId, _ := strconv.Atoi(srcFile.Id)
-	// rename
-	if srcDir == dstDir {
-		data := base.Json{
-			"driveId":  0,
-			"fileId":   fileId,
-			"fileName": dstName,
-		}
-		_, err = driver.Request("https://www.123pan.com/api/file/rename",
-			base.Post, nil, nil, &data, nil, false, account)
-		//_, err = driver.Post("https://www.123pan.com/api/file/rename", data, account)
-	} else {
-		// move
-		dstDirFile, err := driver.File(dstDir, account)
-		if err != nil {
-			return err
-		}
-		parentFileId, _ := strconv.Atoi(dstDirFile.Id)
-		data := base.Json{
-			"fileId":       fileId,
-			"parentFileId": parentFileId,
-		}
-		_, err = driver.Request("https://www.123pan.com/api/file/mod_pid",
-			base.Post, nil, nil, &data, nil, false, account)
-		//_, err = driver.Post("https://www.123pan.com/api/file/mod_pid", data, account)
-	}
+
+	dstDirFile, err := driver.File(dstDir, account)
 	if err != nil {
-		_ = base.DeleteCache(srcDir, account)
-		_ = base.DeleteCache(dstDir, account)
+		return err
 	}
+	parentFileId, _ := strconv.Atoi(dstDirFile.Id)
+	data := base.Json{
+		"fileIdList":   []base.Json{{"FileId": fileId}},
+		"parentFileId": parentFileId,
+	}
+	_, err = driver.Request("https://www.123pan.com/api/file/mod_pid",
+		base.Post, nil, nil, &data, nil, false, account)
+	return err
+}
+
+func (driver Pan123) Rename(src string, dst string, account *model.Account) error {
+	_, dstName := filepath.Split(dst)
+	srcFile, err := driver.File(src, account)
+	if err != nil {
+		return err
+	}
+	fileId, _ := strconv.Atoi(srcFile.Id)
+
+	data := base.Json{
+		"driveId":  0,
+		"fileId":   fileId,
+		"fileName": dstName,
+	}
+	_, err = driver.Request("https://www.123pan.com/api/file/rename",
+		base.Post, nil, nil, &data, nil, false, account)
 	return err
 }
 
@@ -274,30 +278,21 @@ func (driver Pan123) Delete(path string, account *model.Account) error {
 	if err != nil {
 		return err
 	}
+	log.Debugln("delete 123 file: ", file)
 	data := base.Json{
 		"driveId":           0,
 		"operation":         true,
-		"fileTrashInfoList": file,
+		"fileTrashInfoList": []File{*file},
 	}
-	_, err = driver.Request("https://www.123pan.com/api/file/trash",
+	_, err = driver.Request("https://www.123pan.com/b/api/file/trash",
 		base.Post, nil, nil, &data, nil, false, account)
-	//_, err = driver.Post("https://www.123pan.com/api/file/trash", data, account)
-	if err == nil {
-		_ = base.DeleteCache(utils.Dir(path), account)
-	}
 	return err
 }
 
-type UploadResp struct {
-	XMLName  xml.Name `xml:"InitiateMultipartUploadResult"`
-	Bucket   string   `xml:"Bucket"`
-	Key      string   `xml:"Key"`
-	UploadId string   `xml:"UploadId"`
-}
-
-// TODO unfinished
 func (driver Pan123) Upload(file *model.FileStream, account *model.Account) error {
-	return base.ErrNotImplement
+	if file == nil {
+		return base.ErrEmptyFile
+	}
 	parentFile, err := driver.File(file.ParentPath, account)
 	if err != nil {
 		return err
@@ -306,50 +301,140 @@ func (driver Pan123) Upload(file *model.FileStream, account *model.Account) erro
 		return base.ErrNotFolder
 	}
 	parentFileId, _ := strconv.Atoi(parentFile.Id)
+	tempFile, err := ioutil.TempFile(conf.Conf.TempDir, "file-*")
+	if err != nil {
+		return err
+	}
+	defer func() {
+		_ = tempFile.Close()
+		_ = os.Remove(tempFile.Name())
+	}()
+	_, err = io.Copy(tempFile, file)
+	if err != nil {
+		return err
+	}
+	_, err = tempFile.Seek(0, io.SeekStart)
+	if err != nil {
+		return err
+	}
+	h := md5.New()
+	_, err = io.Copy(h, tempFile)
+	if err != nil {
+		return err
+	}
+	etag := hex.EncodeToString(h.Sum(nil))
+	log.Debugln("md5:", etag)
+	_, err = tempFile.Seek(0, io.SeekStart)
+	if err != nil {
+		return err
+	}
 	data := base.Json{
 		"driveId":      0,
 		"duplicate":    true,
-		"etag":         RandStr(32), //maybe file's md5
+		"etag":         etag,
 		"fileName":     file.GetFileName(),
 		"parentFileId": parentFileId,
 		"size":         file.GetSize(),
 		"type":         0,
 	}
-	res, err := driver.Request("https://www.123pan.com/api/file/upload_request",
-		base.Post, nil, nil, &data, nil, false, account)
+	var resp UploadResp
+	_, err = driver.Request("https://www.123pan.com/api/file/upload_request",
+		base.Post, nil, nil, &data, &resp, false, account)
 	//res, err := driver.Post("https://www.123pan.com/api/file/upload_request", data, account)
 	if err != nil {
 		return err
 	}
-	baseUrl := fmt.Sprintf("https://file.123pan.com/%s/%s", jsoniter.Get(res, "data.Bucket").ToString(), jsoniter.Get(res, "data.Key").ToString())
-	var resp UploadResp
-	kSecret := jsoniter.Get(res, "data.SecretAccessKey").ToString()
-	nowTimeStr := time.Now().String()
-	Date := strings.ReplaceAll(strings.Split(nowTimeStr, "T")[0], "-", "")
-
-	StringToSign := fmt.Sprintf("%s\n%s\n%s\n%s",
-		"AWS4-HMAC-SHA256",
-		nowTimeStr,
-		fmt.Sprintf("%s/us-east-1/s3/aws4_request", Date),
-	)
-
-	kDate := HMAC("AWS4"+kSecret, Date)
-	kRegion := HMAC(kDate, "us-east-1")
-	kService := HMAC(kRegion, "s3")
-	kSigning := HMAC(kService, "aws4_request")
-	_, err = base.RestyClient.R().SetResult(&resp).SetHeaders(map[string]string{
-		"Authorization": fmt.Sprintf("AWS4-HMAC-SHA256 Credential=%s/%s/us-east-1/s3/aws4_request, SignedHeaders=host;x-amz-content-sha256;x-amz-date;x-amz-security-token;x-amz-user-agent, Signature=%s",
-			jsoniter.Get(res, "data.AccessKeyId"),
-			Date,
-			hex.EncodeToString([]byte(HMAC(StringToSign, kSigning)))),
-		"X-Amz-Content-Sha256": "UNSIGNED-PAYLOAD",
-		"X-Amz-Date":           nowTimeStr,
-		"x-amz-security-token": jsoniter.Get(res, "data.SessionToken").ToString(),
-	}).Post(fmt.Sprintf("%s?uploads", baseUrl))
+	if resp.Data.Key == "" {
+		return nil
+	}
+	cfg := &aws.Config{
+		Credentials:      credentials.NewStaticCredentials(resp.Data.AccessKeyId, resp.Data.SecretAccessKey, resp.Data.SessionToken),
+		Region:           aws.String("123pan"),
+		Endpoint:         aws.String("file.123pan.com"),
+		S3ForcePathStyle: aws.Bool(true),
+	}
+	s, err := session.NewSession(cfg)
 	if err != nil {
 		return err
 	}
-	return base.ErrNotImplement
+	uploader := s3manager.NewUploader(s)
+	input := &s3manager.UploadInput{
+		Bucket: &resp.Data.Bucket,
+		Key:    &resp.Data.Key,
+		Body:   tempFile,
+	}
+	_, err = uploader.Upload(input)
+	if err != nil {
+		return err
+	}
+	_, err = driver.Request("https://www.123pan.com/api/file/upload_complete", base.Post, nil, nil, &base.Json{
+		"fileId": resp.Data.FileId,
+	}, nil, false, account)
+	return err
 }
 
+//type UploadResp struct {
+//	XMLName  xml.Name `xml:"InitiateMultipartUploadResult"`
+//	Bucket   string   `xml:"Bucket"`
+//	Key      string   `xml:"Key"`
+//	UploadId string   `xml:"UploadId"`
+//}
+
+// TODO unfinished
+//func (driver Pan123) Upload(file *model.FileStream, account *model.Account) error {
+//	return base.ErrNotImplement
+//	parentFile, err := driver.File(file.ParentPath, account)
+//	if err != nil {
+//		return err
+//	}
+//	if !parentFile.IsDir() {
+//		return base.ErrNotFolder
+//	}
+//	parentFileId, _ := strconv.Atoi(parentFile.Id)
+//	data := base.Json{
+//		"driveId":      0,
+//		"duplicate":    true,
+//		"etag":         RandStr(32), //maybe file's md5
+//		"fileName":     file.GetFileName(),
+//		"parentFileId": parentFileId,
+//		"size":         file.GetSize(),
+//		"type":         0,
+//	}
+//	res, err := driver.Request("https://www.123pan.com/api/file/upload_request",
+//		base.Post, nil, nil, &data, nil, false, account)
+//	//res, err := driver.Post("https://www.123pan.com/api/file/upload_request", data, account)
+//	if err != nil {
+//		return err
+//	}
+//	baseUrl := fmt.Sprintf("https://file.123pan.com/%s/%s", jsoniter.Get(res, "data.Bucket").ToString(), jsoniter.Get(res, "data.Key").ToString())
+//	var resp UploadResp
+//	kSecret := jsoniter.Get(res, "data.SecretAccessKey").ToString()
+//	nowTimeStr := time.Now().String()
+//	Date := strings.ReplaceAll(strings.Split(nowTimeStr, "T")[0], "-", "")
+//
+//	StringToSign := fmt.Sprintf("%s\n%s\n%s\n%s",
+//		"AWS4-HMAC-SHA256",
+//		nowTimeStr,
+//		fmt.Sprintf("%s/us-east-1/s3/aws4_request", Date),
+//	)
+//
+//	kDate := HMAC("AWS4"+kSecret, Date)
+//	kRegion := HMAC(kDate, "us-east-1")
+//	kService := HMAC(kRegion, "s3")
+//	kSigning := HMAC(kService, "aws4_request")
+//	_, err = base.RestyClient.R().SetResult(&resp).SetHeaders(map[string]string{
+//		"Authorization": fmt.Sprintf("AWS4-HMAC-SHA256 Credential=%s/%s/us-east-1/s3/aws4_request, SignedHeaders=host;x-amz-content-sha256;x-amz-date;x-amz-security-token;x-amz-user-agent, Signature=%s",
+//			jsoniter.Get(res, "data.AccessKeyId"),
+//			Date,
+//			hex.EncodeToString([]byte(HMAC(StringToSign, kSigning)))),
+//		"X-Amz-Content-Sha256": "UNSIGNED-PAYLOAD",
+//		"X-Amz-Date":           nowTimeStr,
+//		"x-amz-security-token": jsoniter.Get(res, "data.SessionToken").ToString(),
+//	}).Post(fmt.Sprintf("%s?uploads", baseUrl))
+//	if err != nil {
+//		return err
+//	}
+//	return base.ErrNotImplement
+//}
+
 var _ base.Driver = (*Pan123)(nil)

drivers/123/types.go

@@ -0,0 +1,72 @@
+package _23
+
+import (
+	"github.com/Xhofe/alist/conf"
+	"github.com/Xhofe/alist/utils"
+	"path"
+	"time"
+)
+
+type File struct {
+	FileName  string     `json:"FileName"`
+	Size      int64      `json:"Size"`
+	UpdateAt  *time.Time `json:"UpdateAt"`
+	FileId    int64      `json:"FileId"`
+	Type      int        `json:"Type"`
+	Etag      string     `json:"Etag"`
+	S3KeyFlag string     `json:"S3KeyFlag"`
+}
+
+func (f File) GetSize() uint64 {
+	return uint64(f.Size)
+}
+
+func (f File) GetName() string {
+	return f.FileName
+}
+
+func (f File) GetType() int {
+	if f.Type == 1 {
+		return conf.FOLDER
+	}
+	return utils.GetFileType(path.Ext(f.FileName))
+}
+
+type BaseResp struct {
+	Code    int    `json:"code"`
+	Message string `json:"message"`
+}
+
+type Pan123TokenResp struct {
+	BaseResp
+	Data struct {
+		Token string `json:"token"`
+	} `json:"data"`
+}
+
+type Pan123Files struct {
+	BaseResp
+	Data struct {
+		InfoList []File `json:"InfoList"`
+		Next     string `json:"Next"`
+	} `json:"data"`
+}
+
+type Pan123DownResp struct {
+	BaseResp
+	Data struct {
+		DownloadUrl string `json:"DownloadUrl"`
+	} `json:"data"`
+}
+
+type UploadResp struct {
+	BaseResp
+	Data struct {
+		AccessKeyId     string `json:"AccessKeyId"`
+		Bucket          string `json:"Bucket"`
+		Key             string `json:"Key"`
+		SecretAccessKey string `json:"SecretAccessKey"`
+		SessionToken    string `json:"SessionToken"`
+		FileId          int64  `json:"FileId"`
+	} `json:"data"`
+}

drivers/139/139.go

@@ -0,0 +1,175 @@
+package _39
+
+import (
+	"errors"
+	"fmt"
+	"github.com/Xhofe/alist/conf"
+	"github.com/Xhofe/alist/drivers/base"
+	"github.com/Xhofe/alist/model"
+	"github.com/Xhofe/alist/utils"
+	"github.com/go-resty/resty/v2"
+	jsoniter "github.com/json-iterator/go"
+	log "github.com/sirupsen/logrus"
+	"path"
+	"time"
+)
+
+func (driver Cloud139) Request(pathname string, method int, headers, query, form map[string]string, data interface{}, resp interface{}, account *model.Account) ([]byte, error) {
+	url := "https://yun.139.com" + pathname
+	req := base.RestyClient.R()
+	randStr := utils.RandomStr(16)
+	ts := time.Now().Format("2006-01-02 15:04:05")
+	log.Debugf("%+v", data)
+	body, err := utils.Json.Marshal(data)
+	if err != nil {
+		return nil, err
+	}
+	sign := calSign(string(body), ts, randStr)
+	svcType := "1"
+	if isFamily(account) {
+		svcType = "2"
+	}
+	req.SetHeaders(map[string]string{
+		"Accept":         "application/json, text/plain, */*",
+		"CMS-DEVICE":     "default",
+		"Cookie":         account.AccessToken,
+		"mcloud-channel": "1000101",
+		"mcloud-client":  "10701",
+		//"mcloud-route": "001",
+		"mcloud-sign": fmt.Sprintf("%s,%s,%s", ts, randStr, sign),
+		//"mcloud-skey":"",
+		"mcloud-version":      "6.6.0",
+		"Origin":              "https://yun.139.com",
+		"Referer":             "https://yun.139.com/w/",
+		"x-DeviceInfo":        "||9|6.6.0|chrome|95.0.4638.69|uwIy75obnsRPIwlJSd7D9GhUvFwG96ce||macos 10.15.2||zh-CN|||",
+		"x-huawei-channelSrc": "10000034",
+		"x-inner-ntwk":        "2",
+		"x-m4c-caller":        "PC",
+		"x-m4c-src":           "10002",
+		"x-SvcType":           svcType,
+	})
+	if headers != nil {
+		req.SetHeaders(headers)
+	}
+	if query != nil {
+		req.SetQueryParams(query)
+	}
+	if form != nil {
+		req.SetFormData(form)
+	}
+	if data != nil {
+		req.SetBody(data)
+	}
+	var e BaseResp
+	//var err error
+	var res *resty.Response
+	req.SetResult(&e)
+	switch method {
+	case base.Get:
+		res, err = req.Get(url)
+	case base.Post:
+		res, err = req.Post(url)
+	case base.Delete:
+		res, err = req.Delete(url)
+	case base.Patch:
+		res, err = req.Patch(url)
+	case base.Put:
+		res, err = req.Put(url)
+	default:
+		return nil, base.ErrNotSupport
+	}
+	if err != nil {
+		return nil, err
+	}
+	log.Debugln(res.String())
+	if !e.Success {
+		return nil, errors.New(e.Message)
+	}
+	if resp != nil {
+		err = utils.Json.Unmarshal(res.Body(), resp)
+		if err != nil {
+			return nil, err
+		}
+	}
+	return res.Body(), nil
+}
+
+func (driver Cloud139) Post(pathname string, data interface{}, resp interface{}, account *model.Account) ([]byte, error) {
+	return driver.Request(pathname, base.Post, nil, nil, nil, data, resp, account)
+}
+
+func (driver Cloud139) GetFiles(catalogID string, account *model.Account) ([]model.File, error) {
+	start := 0
+	limit := 100
+	files := make([]model.File, 0)
+	for {
+		data := base.Json{
+			"catalogID":       catalogID,
+			"sortDirection":   1,
+			"startNumber":     start + 1,
+			"endNumber":       start + limit,
+			"filterType":      0,
+			"catalogSortType": 0,
+			"contentSortType": 0,
+			"commonAccountInfo": base.Json{
+				"account":     account.Username,
+				"accountType": 1,
+			},
+		}
+		var resp GetDiskResp
+		_, err := driver.Post("/orchestration/personalCloud/catalog/v1.0/getDisk", data, &resp, account)
+		if err != nil {
+			return nil, err
+		}
+		for _, catalog := range resp.Data.GetDiskResult.CatalogList {
+			f := model.File{
+				Id:        catalog.CatalogID,
+				Name:      catalog.CatalogName,
+				Size:      0,
+				Type:      conf.FOLDER,
+				Driver:    driver.Config().Name,
+				UpdatedAt: getTime(catalog.UpdateTime),
+			}
+			files = append(files, f)
+		}
+		for _, content := range resp.Data.GetDiskResult.ContentList {
+			f := model.File{
+				Id:        content.ContentID,
+				Name:      content.ContentName,
+				Size:      content.ContentSize,
+				Type:      utils.GetFileType(path.Ext(content.ContentName)),
+				Driver:    driver.Config().Name,
+				UpdatedAt: getTime(content.UpdateTime),
+				Thumbnail: content.ThumbnailURL,
+				//Thumbnail: content.BigthumbnailURL,
+			}
+			files = append(files, f)
+		}
+		if start+limit >= resp.Data.GetDiskResult.NodeCount {
+			break
+		}
+		start += limit
+	}
+	return files, nil
+}
+
+func (driver Cloud139) GetLink(contentId string, account *model.Account) (string, error) {
+	data := base.Json{
+		"appName":   "",
+		"contentID": contentId,
+		"commonAccountInfo": base.Json{
+			"account":     account.Username,
+			"accountType": 1,
+		},
+	}
+	res, err := driver.Post("/orchestration/personalCloud/uploadAndDownload/v1.0/downloadRequest",
+		data, nil, account)
+	if err != nil {
+		return "", err
+	}
+	return jsoniter.Get(res, "data", "downloadURL").ToString(), nil
+}
+
+func init() {
+	base.RegisterDriver(&Cloud139{})
+}

drivers/139/driver.go

@@ -0,0 +1,456 @@
+package _39
+
+import (
+	"bytes"
+	"fmt"
+	"github.com/Xhofe/alist/conf"
+	"github.com/Xhofe/alist/drivers/base"
+	"github.com/Xhofe/alist/model"
+	"github.com/Xhofe/alist/utils"
+	log "github.com/sirupsen/logrus"
+	"io"
+	"math"
+	"net/http"
+	"path/filepath"
+	"strconv"
+)
+
+type Cloud139 struct{}
+
+func (driver Cloud139) Config() base.DriverConfig {
+	return base.DriverConfig{
+		Name:      "139Yun",
+		LocalSort: true,
+	}
+}
+
+func (driver Cloud139) Items() []base.Item {
+	return []base.Item{
+		{
+			Name:        "username",
+			Label:       "phone",
+			Type:        base.TypeString,
+			Required:    true,
+			Description: "phone number",
+		},
+		{
+			Name:        "access_token",
+			Label:       "Cookie",
+			Type:        base.TypeString,
+			Required:    true,
+			Description: "Unknown expiration time",
+		},
+		{
+			Name:     "internal_type",
+			Label:    "139yun type",
+			Type:     base.TypeSelect,
+			Required: true,
+			Values:   "Personal,Family",
+		},
+		{
+			Name:     "root_folder",
+			Label:    "root folder file_id",
+			Type:     base.TypeString,
+			Required: true,
+		},
+		{
+			Name:     "site_id",
+			Label:    "cloud_id",
+			Type:     base.TypeString,
+			Required: false,
+		},
+	}
+}
+
+func (driver Cloud139) Save(account *model.Account, old *model.Account) error {
+	if account == nil {
+		return nil
+	}
+	_, err := driver.Request("/orchestration/personalCloud/user/v1.0/qryUserExternInfo", base.Post, nil, nil, nil, base.Json{
+		"qryUserExternInfoReq": base.Json{
+			"commonAccountInfo": base.Json{
+				"account":     account.Username,
+				"accountType": 1,
+			},
+		},
+	}, nil, account)
+	return err
+}
+
+func (driver Cloud139) File(path string, account *model.Account) (*model.File, error) {
+	path = utils.ParsePath(path)
+	if path == "/" {
+		return &model.File{
+			Id:        account.RootFolder,
+			Name:      account.Name,
+			Size:      0,
+			Type:      conf.FOLDER,
+			Driver:    driver.Config().Name,
+			UpdatedAt: account.UpdatedAt,
+		}, nil
+	}
+	dir, name := filepath.Split(path)
+	files, err := driver.Files(dir, account)
+	if err != nil {
+		return nil, err
+	}
+	for _, file := range files {
+		if file.Name == name {
+			return &file, nil
+		}
+	}
+	return nil, base.ErrPathNotFound
+}
+
+func (driver Cloud139) Files(path string, account *model.Account) ([]model.File, error) {
+	path = utils.ParsePath(path)
+	var files []model.File
+	cache, err := base.GetCache(path, account)
+	if err == nil {
+		files, _ = cache.([]model.File)
+	} else {
+		file, err := driver.File(path, account)
+		if err != nil {
+			return nil, err
+		}
+		if isFamily(account) {
+			files, err = driver.familyGetFiles(file.Id, account)
+		} else {
+			files, err = driver.GetFiles(file.Id, account)
+		}
+		if err != nil {
+			return nil, err
+		}
+		if len(files) > 0 {
+			_ = base.SetCache(path, files, account)
+		}
+	}
+	return files, nil
+}
+
+func (driver Cloud139) Link(args base.Args, account *model.Account) (*base.Link, error) {
+	file, err := driver.File(args.Path, account)
+	if err != nil {
+		return nil, err
+	}
+	var u string
+	//if isFamily(account) {
+	//	u, err = driver.familyLink(file.Id, account)
+	//} else {
+	u, err = driver.GetLink(file.Id, account)
+	//}
+	if err != nil {
+		return nil, err
+	}
+	return &base.Link{Url: u}, nil
+}
+
+func (driver Cloud139) Path(path string, account *model.Account) (*model.File, []model.File, error) {
+	path = utils.ParsePath(path)
+	log.Debugf("139 path: %s", path)
+	file, err := driver.File(path, account)
+	if err != nil {
+		return nil, nil, err
+	}
+	if !file.IsDir() {
+		return file, nil, nil
+	}
+	files, err := driver.Files(path, account)
+	if err != nil {
+		return nil, nil, err
+	}
+	return nil, files, nil
+}
+
+//func (driver Cloud139) Proxy(r *http.Request, account *model.Account) {
+//
+//}
+
+func (driver Cloud139) Preview(path string, account *model.Account) (interface{}, error) {
+	return nil, base.ErrNotSupport
+}
+
+func (driver Cloud139) MakeDir(path string, account *model.Account) error {
+	parentFile, err := driver.File(utils.Dir(path), account)
+	if err != nil {
+		return err
+	}
+	data := base.Json{
+		"createCatalogExtReq": base.Json{
+			"parentCatalogID": parentFile.Id,
+			"newCatalogName":  utils.Base(path),
+			"commonAccountInfo": base.Json{
+				"account":     account.Username,
+				"accountType": 1,
+			},
+		},
+	}
+	pathname := "/orchestration/personalCloud/catalog/v1.0/createCatalogExt"
+	if isFamily(account) {
+		data = base.Json{
+			"cloudID": account.SiteId,
+			"commonAccountInfo": base.Json{
+				"account":     account.Username,
+				"accountType": 1,
+			},
+			"docLibName": utils.Base(path),
+		}
+		pathname = "/orchestration/familyCloud/cloudCatalog/v1.0/createCloudDoc"
+	}
+	_, err = driver.Post(pathname,
+		data, nil, account)
+	return err
+}
+
+func (driver Cloud139) Move(src string, dst string, account *model.Account) error {
+	if isFamily(account) {
+		return base.ErrNotSupport
+	}
+	srcFile, err := driver.File(src, account)
+	if err != nil {
+		return err
+	}
+	dstParentFile, err := driver.File(utils.Dir(dst), account)
+	if err != nil {
+		return err
+	}
+	var contentInfoList []string
+	var catalogInfoList []string
+	if srcFile.IsDir() {
+		catalogInfoList = append(catalogInfoList, srcFile.Id)
+	} else {
+		contentInfoList = append(contentInfoList, srcFile.Id)
+	}
+	data := base.Json{
+		"createBatchOprTaskReq": base.Json{
+			"taskType":   3,
+			"actionType": "304",
+			"taskInfo": base.Json{
+				"contentInfoList": contentInfoList,
+				"catalogInfoList": catalogInfoList,
+				"newCatalogID":    dstParentFile.Id,
+			},
+			"commonAccountInfo": base.Json{
+				"account":     account.Username,
+				"accountType": 1,
+			},
+		},
+	}
+	pathname := "/orchestration/personalCloud/batchOprTask/v1.0/createBatchOprTask"
+	_, err = driver.Post(pathname, data, nil, account)
+	return err
+}
+
+func (driver Cloud139) Rename(src string, dst string, account *model.Account) error {
+	if isFamily(account) {
+		return base.ErrNotSupport
+	}
+	srcFile, err := driver.File(src, account)
+	if err != nil {
+		return err
+	}
+	var data base.Json
+	var pathname string
+	if srcFile.IsDir() {
+		data = base.Json{
+			"catalogID":   srcFile.Id,
+			"catalogName": utils.Base(dst),
+			"commonAccountInfo": base.Json{
+				"account":     account.Username,
+				"accountType": 1,
+			},
+		}
+		pathname = "/orchestration/personalCloud/catalog/v1.0/updateCatalogInfo"
+	} else {
+		data = base.Json{
+			"contentID":   srcFile.Id,
+			"contentName": utils.Base(dst),
+			"commonAccountInfo": base.Json{
+				"account":     account.Username,
+				"accountType": 1,
+			},
+		}
+		pathname = "/orchestration/personalCloud/catalog/v1.0/updateContentInfo"
+	}
+	_, err = driver.Post(pathname, data, nil, account)
+	return err
+}
+
+func (driver Cloud139) Copy(src string, dst string, account *model.Account) error {
+	if isFamily(account) {
+		return base.ErrNotSupport
+	}
+	srcFile, err := driver.File(src, account)
+	if err != nil {
+		return err
+	}
+	dstParentFile, err := driver.File(utils.Dir(dst), account)
+	if err != nil {
+		return err
+	}
+	var contentInfoList []string
+	var catalogInfoList []string
+	if srcFile.IsDir() {
+		catalogInfoList = append(catalogInfoList, srcFile.Id)
+	} else {
+		contentInfoList = append(contentInfoList, srcFile.Id)
+	}
+	data := base.Json{
+		"createBatchOprTaskReq": base.Json{
+			"taskType":   3,
+			"actionType": 309,
+			"taskInfo": base.Json{
+				"contentInfoList": contentInfoList,
+				"catalogInfoList": catalogInfoList,
+				"newCatalogID":    dstParentFile.Id,
+			},
+			"commonAccountInfo": base.Json{
+				"account":     account.Username,
+				"accountType": 1,
+			},
+		},
+	}
+	pathname := "/orchestration/personalCloud/batchOprTask/v1.0/createBatchOprTask"
+	_, err = driver.Post(pathname, data, nil, account)
+	return err
+}
+
+func (driver Cloud139) Delete(path string, account *model.Account) error {
+	file, err := driver.File(path, account)
+	if err != nil {
+		return err
+	}
+	var contentInfoList []string
+	var catalogInfoList []string
+	if file.IsDir() {
+		catalogInfoList = append(catalogInfoList, file.Id)
+	} else {
+		contentInfoList = append(contentInfoList, file.Id)
+	}
+	data := base.Json{
+		"createBatchOprTaskReq": base.Json{
+			"taskType":   2,
+			"actionType": 201,
+			"taskInfo": base.Json{
+				"newCatalogID":    "",
+				"contentInfoList": contentInfoList,
+				"catalogInfoList": catalogInfoList,
+			},
+			"commonAccountInfo": base.Json{
+				"account":     account.Username,
+				"accountType": 1,
+			},
+		},
+	}
+	pathname := "/orchestration/personalCloud/batchOprTask/v1.0/createBatchOprTask"
+	if isFamily(account) {
+		data = base.Json{
+			"catalogList": catalogInfoList,
+			"contentList": contentInfoList,
+			"commonAccountInfo": base.Json{
+				"account":     account.Username,
+				"accountType": 1,
+			},
+			"sourceCatalogType": 1002,
+			"taskType":          2,
+		}
+		pathname = "/orchestration/familyCloud/batchOprTask/v1.0/createBatchOprTask"
+	}
+	_, err = driver.Post(pathname, data, nil, account)
+	return err
+}
+
+func (driver Cloud139) Upload(file *model.FileStream, account *model.Account) error {
+	if file == nil {
+		return base.ErrEmptyFile
+	}
+	parentFile, err := driver.File(file.ParentPath, account)
+	if err != nil {
+		return err
+	}
+	if !parentFile.IsDir() {
+		return base.ErrNotFolder
+	}
+	data := base.Json{
+		"manualRename": 2,
+		"operation":    0,
+		"fileCount":    1,
+		"totalSize":    file.Size,
+		"uploadContentList": []base.Json{{
+			"contentName": file.Name,
+			"contentSize": file.Size,
+			// "digest": "5a3231986ce7a6b46e408612d385bafa"
+		}},
+		"parentCatalogID": parentFile.Id,
+		"newCatalogName":  "",
+		"commonAccountInfo": base.Json{
+			"account":     account.Username,
+			"accountType": 1,
+		},
+	}
+	pathname := "/orchestration/personalCloud/uploadAndDownload/v1.0/pcUploadFileRequest"
+	if isFamily(account) {
+		data = newJson(base.Json{
+			"fileCount":    1,
+			"manualRename": 2,
+			"operation":    0,
+			"path":         "",
+			"seqNo":        "",
+			"totalSize":    file.Size,
+			"uploadContentList": []base.Json{{
+				"contentName": file.Name,
+				"contentSize": file.Size,
+				// "digest": "5a3231986ce7a6b46e408612d385bafa"
+			}},
+		}, account)
+		pathname = "/orchestration/familyCloud/content/v1.0/getFileUploadURL"
+		return base.ErrNotSupport
+	}
+	var resp UploadResp
+	_, err = driver.Post(pathname, data, &resp, account)
+	if err != nil {
+		return err
+	}
+	var Default uint64 = 10485760
+	part := int(math.Ceil(float64(file.Size) / float64(Default)))
+	var start uint64 = 0
+	for i := 0; i < part; i++ {
+		byteSize := file.Size - start
+		if byteSize > Default {
+			byteSize = Default
+		}
+		byteData := make([]byte, byteSize)
+		_, err = io.ReadFull(file, byteData)
+		if err != nil {
+			return err
+		}
+		req, err := http.NewRequest("POST", resp.Data.UploadResult.RedirectionURL, bytes.NewBuffer(byteData))
+		if err != nil {
+			return err
+		}
+		headers := map[string]string{
+			"Accept":         "*/*",
+			"Content-Type":   "text/plain;name=" + unicode(file.Name),
+			"contentSize":    strconv.FormatUint(file.Size, 10),
+			"range":          fmt.Sprintf("bytes=%d-%d", start, start+byteSize-1),
+			"content-length": strconv.FormatUint(byteSize, 10),
+			"uploadtaskID":   resp.Data.UploadResult.UploadTaskID,
+			"rangeType":      "0",
+			"Referer":        "https://yun.139.com/",
+			"User-Agent":     "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/95.0.4638.69 Safari/537.36 Edg/95.0.1020.44",
+			"x-SvcType":      "1",
+		}
+		for k, v := range headers {
+			req.Header.Set(k, v)
+		}
+		res, err := base.HttpClient.Do(req)
+		if err != nil {
+			return err
+		}
+		log.Debugf("%+v", res)
+		start += byteSize
+	}
+	return nil
+}
+
+var _ base.Driver = (*Cloud139)(nil)

drivers/139/family.go

@@ -0,0 +1,74 @@
+package _39
+
+import (
+	"github.com/Xhofe/alist/conf"
+	"github.com/Xhofe/alist/drivers/base"
+	"github.com/Xhofe/alist/model"
+	"github.com/Xhofe/alist/utils"
+	jsoniter "github.com/json-iterator/go"
+	"path"
+)
+
+func (driver Cloud139) familyGetFiles(catalogID string, account *model.Account) ([]model.File, error) {
+	pageNum := 1
+	files := make([]model.File, 0)
+	for {
+		data := newJson(base.Json{
+			"catalogID":       catalogID,
+			"contentSortType": 0,
+			"pageInfo": base.Json{
+				"pageNum":  pageNum,
+				"pageSize": 100,
+			},
+			"sortDirection": 1,
+		}, account)
+
+		var resp QueryContentListResp
+		_, err := driver.Post("/orchestration/familyCloud/content/v1.0/queryContentList", data, &resp, account)
+		if err != nil {
+			return nil, err
+		}
+		for _, catalog := range resp.Data.CloudCatalogList {
+			f := model.File{
+				Id:        catalog.CatalogID,
+				Name:      catalog.CatalogName,
+				Size:      0,
+				Type:      conf.FOLDER,
+				Driver:    driver.Config().Name,
+				UpdatedAt: getTime(catalog.LastUpdateTime),
+			}
+			files = append(files, f)
+		}
+		for _, content := range resp.Data.CloudContentList {
+			f := model.File{
+				Id:        content.ContentID,
+				Name:      content.ContentName,
+				Size:      content.ContentSize,
+				Type:      utils.GetFileType(path.Ext(content.ContentName)),
+				Driver:    driver.Config().Name,
+				UpdatedAt: getTime(content.LastUpdateTime),
+				Thumbnail: content.ThumbnailURL,
+				//Thumbnail: content.BigthumbnailURL,
+			}
+			files = append(files, f)
+		}
+		if 100*pageNum > resp.Data.TotalCount {
+			break
+		}
+		pageNum++
+	}
+	return files, nil
+}
+
+func (driver Cloud139) familyLink(contentId string, account *model.Account) (string, error) {
+	data := newJson(base.Json{
+		"contentID": contentId,
+		//"path":"",
+	}, account)
+	res, err := driver.Post("/orchestration/familyCloud/content/v1.0/getFileDownLoadURL",
+		data, nil, account)
+	if err != nil {
+		return "", err
+	}
+	return jsoniter.Get(res, "data", "downloadURL").ToString(), nil
+}

drivers/139/types.go

@@ -0,0 +1,187 @@
+package _39
+
+type BaseResp struct {
+	Success bool   `json:"success"`
+	Code    string `json:"code"`
+	Message string `json:"message"`
+}
+
+type Catalog struct {
+	CatalogID   string `json:"catalogID"`
+	CatalogName string `json:"catalogName"`
+	//CatalogType     int         `json:"catalogType"`
+	//CreateTime      string      `json:"createTime"`
+	UpdateTime string `json:"updateTime"`
+	//IsShared        bool        `json:"isShared"`
+	//CatalogLevel    int         `json:"catalogLevel"`
+	//ShareDoneeCount int         `json:"shareDoneeCount"`
+	//OpenType        int         `json:"openType"`
+	//ParentCatalogID string      `json:"parentCatalogId"`
+	//DirEtag         int         `json:"dirEtag"`
+	//Tombstoned      int         `json:"tombstoned"`
+	//ProxyID         interface{} `json:"proxyID"`
+	//Moved           int         `json:"moved"`
+	//IsFixedDir      int         `json:"isFixedDir"`
+	//IsSynced        interface{} `json:"isSynced"`
+	//Owner           string      `json:"owner"`
+	//Modifier        interface{} `json:"modifier"`
+	//Path            string      `json:"path"`
+	//ShareType       int         `json:"shareType"`
+	//SoftLink        interface{} `json:"softLink"`
+	//ExtProp1        interface{} `json:"extProp1"`
+	//ExtProp2        interface{} `json:"extProp2"`
+	//ExtProp3        interface{} `json:"extProp3"`
+	//ExtProp4        interface{} `json:"extProp4"`
+	//ExtProp5        interface{} `json:"extProp5"`
+	//ETagOprType     int         `json:"ETagOprType"`
+}
+
+type Content struct {
+	ContentID   string `json:"contentID"`
+	ContentName string `json:"contentName"`
+	//ContentSuffix   string      `json:"contentSuffix"`
+	ContentSize int64 `json:"contentSize"`
+	//ContentDesc     string      `json:"contentDesc"`
+	//ContentType     int         `json:"contentType"`
+	//ContentOrigin   int         `json:"contentOrigin"`
+	UpdateTime string `json:"updateTime"`
+	//CommentCount    int         `json:"commentCount"`
+	ThumbnailURL string `json:"thumbnailURL"`
+	//BigthumbnailURL string      `json:"bigthumbnailURL"`
+	//PresentURL      string      `json:"presentURL"`
+	//PresentLURL     string      `json:"presentLURL"`
+	//PresentHURL     string      `json:"presentHURL"`
+	//ContentTAGList  interface{} `json:"contentTAGList"`
+	//ShareDoneeCount int         `json:"shareDoneeCount"`
+	//Safestate       int         `json:"safestate"`
+	//Transferstate   int         `json:"transferstate"`
+	//IsFocusContent  int         `json:"isFocusContent"`
+	//UpdateShareTime interface{} `json:"updateShareTime"`
+	//UploadTime      string      `json:"uploadTime"`
+	//OpenType        int         `json:"openType"`
+	//AuditResult     int         `json:"auditResult"`
+	//ParentCatalogID string      `json:"parentCatalogId"`
+	//Channel         string      `json:"channel"`
+	//GeoLocFlag      string      `json:"geoLocFlag"`
+	//Digest          string      `json:"digest"`
+	//Version         string      `json:"version"`
+	//FileEtag        string      `json:"fileEtag"`
+	//FileVersion     string      `json:"fileVersion"`
+	//Tombstoned      int         `json:"tombstoned"`
+	//ProxyID         string      `json:"proxyID"`
+	//Moved           int         `json:"moved"`
+	//MidthumbnailURL string      `json:"midthumbnailURL"`
+	//Owner           string      `json:"owner"`
+	//Modifier        string      `json:"modifier"`
+	//ShareType       int         `json:"shareType"`
+	//ExtInfo         struct {
+	//	Uploader string `json:"uploader"`
+	//	Address  string `json:"address"`
+	//} `json:"extInfo"`
+	//Exif struct {
+	//	CreateTime    string      `json:"createTime"`
+	//	Longitude     interface{} `json:"longitude"`
+	//	Latitude      interface{} `json:"latitude"`
+	//	LocalSaveTime interface{} `json:"localSaveTime"`
+	//} `json:"exif"`
+	//CollectionFlag interface{} `json:"collectionFlag"`
+	//TreeInfo       interface{} `json:"treeInfo"`
+	//IsShared       bool        `json:"isShared"`
+	//ETagOprType    int         `json:"ETagOprType"`
+}
+
+type GetDiskResp struct {
+	BaseResp
+	Data struct {
+		Result struct {
+			ResultCode string      `json:"resultCode"`
+			ResultDesc interface{} `json:"resultDesc"`
+		} `json:"result"`
+		GetDiskResult struct {
+			ParentCatalogID string    `json:"parentCatalogID"`
+			NodeCount       int       `json:"nodeCount"`
+			CatalogList     []Catalog `json:"catalogList"`
+			ContentList     []Content `json:"contentList"`
+			IsCompleted     int       `json:"isCompleted"`
+		} `json:"getDiskResult"`
+	} `json:"data"`
+}
+
+type UploadResp struct {
+	BaseResp
+	Data struct {
+		Result struct {
+			ResultCode string      `json:"resultCode"`
+			ResultDesc interface{} `json:"resultDesc"`
+		} `json:"result"`
+		UploadResult struct {
+			UploadTaskID     string `json:"uploadTaskID"`
+			RedirectionURL   string `json:"redirectionUrl"`
+			NewContentIDList []struct {
+				ContentID     string `json:"contentID"`
+				ContentName   string `json:"contentName"`
+				IsNeedUpload  string `json:"isNeedUpload"`
+				FileEtag      int64  `json:"fileEtag"`
+				FileVersion   int64  `json:"fileVersion"`
+				OverridenFlag int    `json:"overridenFlag"`
+			} `json:"newContentIDList"`
+			CatalogIDList interface{} `json:"catalogIDList"`
+			IsSlice       interface{} `json:"isSlice"`
+		} `json:"uploadResult"`
+	} `json:"data"`
+}
+
+type CloudContent struct {
+	ContentID string `json:"contentID"`
+	//Modifier         string      `json:"modifier"`
+	//Nickname         string      `json:"nickname"`
+	//CloudNickName    string      `json:"cloudNickName"`
+	ContentName string `json:"contentName"`
+	//ContentType      int         `json:"contentType"`
+	//ContentSuffix    string      `json:"contentSuffix"`
+	ContentSize int64 `json:"contentSize"`
+	//ContentDesc      string      `json:"contentDesc"`
+	//CreateTime       string      `json:"createTime"`
+	//Shottime         interface{} `json:"shottime"`
+	LastUpdateTime string `json:"lastUpdateTime"`
+	ThumbnailURL   string `json:"thumbnailURL"`
+	//MidthumbnailURL  string      `json:"midthumbnailURL"`
+	//BigthumbnailURL  string      `json:"bigthumbnailURL"`
+	//PresentURL       string      `json:"presentURL"`
+	//PresentLURL      string      `json:"presentLURL"`
+	//PresentHURL      string      `json:"presentHURL"`
+	//ParentCatalogID  string      `json:"parentCatalogID"`
+	//Uploader         string      `json:"uploader"`
+	//UploaderNickName string      `json:"uploaderNickName"`
+	//TreeInfo         interface{} `json:"treeInfo"`
+	//UpdateTime       interface{} `json:"updateTime"`
+	//ExtInfo          struct {
+	//	Uploader string `json:"uploader"`
+	//} `json:"extInfo"`
+	//EtagOprType interface{} `json:"etagOprType"`
+}
+
+type CloudCatalog struct {
+	CatalogID   string `json:"catalogID"`
+	CatalogName string `json:"catalogName"`
+	//CloudID         string `json:"cloudID"`
+	//CreateTime      string `json:"createTime"`
+	LastUpdateTime string `json:"lastUpdateTime"`
+	//Creator         string `json:"creator"`
+	//CreatorNickname string `json:"creatorNickname"`
+}
+
+type QueryContentListResp struct {
+	BaseResp
+	Data struct {
+		Result struct {
+			ResultCode string `json:"resultCode"`
+			ResultDesc string `json:"resultDesc"`
+		} `json:"result"`
+		Path             string         `json:"path"`
+		CloudContentList []CloudContent `json:"cloudContentList"`
+		CloudCatalogList []CloudCatalog `json:"cloudCatalogList"`
+		TotalCount       int            `json:"totalCount"`
+		RecallContent    interface{}    `json:"recallContent"`
+	} `json:"data"`
+}

drivers/139/util.go

@@ -0,0 +1,70 @@
+package _39
+
+import (
+	"encoding/base64"
+	"github.com/Xhofe/alist/drivers/base"
+	"github.com/Xhofe/alist/model"
+	"github.com/Xhofe/alist/utils"
+	"net/url"
+	"sort"
+	"strconv"
+	"strings"
+	"time"
+)
+
+func encodeURIComponent(str string) string {
+	r := url.QueryEscape(str)
+	r = strings.Replace(r, "+", "%20", -1)
+	return r
+}
+
+func calSign(body, ts, randStr string) string {
+	body = strings.ReplaceAll(body, "\n", "")
+	body = strings.ReplaceAll(body, " ", "")
+	body = encodeURIComponent(body)
+	strs := strings.Split(body, "")
+	sort.Strings(strs)
+	body = strings.Join(strs, "")
+	body = base64.StdEncoding.EncodeToString([]byte(body))
+	res := utils.GetMD5Encode(body) + utils.GetMD5Encode(ts+":"+randStr)
+	res = strings.ToUpper(utils.GetMD5Encode(res))
+	return res
+}
+
+func getTime(t string) *time.Time {
+	stamp, _ := time.ParseInLocation("20060102150405", t, time.Local)
+	return &stamp
+}
+
+func isFamily(account *model.Account) bool {
+	return account.InternalType == "Family"
+}
+
+func unicode(str string) string {
+	textQuoted := strconv.QuoteToASCII(str)
+	textUnquoted := textQuoted[1 : len(textQuoted)-1]
+	return textUnquoted
+}
+
+func MergeMap(mObj ...map[string]interface{}) map[string]interface{} {
+	newObj := map[string]interface{}{}
+	for _, m := range mObj {
+		for k, v := range m {
+			newObj[k] = v
+		}
+	}
+	return newObj
+}
+
+func newJson(data map[string]interface{}, account *model.Account) map[string]interface{} {
+	common := map[string]interface{}{
+		"catalogType": 3,
+		"cloudID":     account.SiteId,
+		"cloudType":   1,
+		"commonAccountInfo": base.Json{
+			"account":     account.Username,
+			"accountType": 1,
+		},
+	}
+	return MergeMap(data, common)
+}

drivers/189/189.go

@@ -1,17 +1,10 @@
 package _89
 
 import (
-	"crypto/aes"
-	"crypto/hmac"
+	"bytes"
 	"crypto/md5"
-	"crypto/rand"
-	"crypto/rsa"
-	"crypto/sha1"
-	"crypto/x509"
 	"encoding/base64"
 	"encoding/hex"
-	"encoding/json"
-	"encoding/pem"
 	"errors"
 	"fmt"
 	"github.com/Xhofe/alist/conf"
@@ -21,9 +14,10 @@ import (
 	"github.com/go-resty/resty/v2"
 	jsoniter "github.com/json-iterator/go"
 	log "github.com/sirupsen/logrus"
-	mathRand "math/rand"
-	"net/url"
-	"path/filepath"
+	"io"
+	"math"
+	"net/http"
+	"net/http/cookiejar"
 	"regexp"
 	"strconv"
 	"strings"
@@ -31,6 +25,23 @@ import (
 )
 
 var client189Map map[string]*resty.Client
+var infoMap = make(map[string]Rsa)
+
+func (driver Cloud189) getClient(account *model.Account) (*resty.Client, error) {
+	client, ok := client189Map[account.Name]
+	if ok {
+		return client, nil
+	}
+	err := driver.Login(account)
+	if err != nil {
+		return nil, err
+	}
+	client, ok = client189Map[account.Name]
+	if !ok {
+		return nil, fmt.Errorf("can't find [%s] client", account.Name)
+	}
+	return client, nil
+}
 
 func (driver Cloud189) FormatFile(file *Cloud189File) *model.File {
 	f := &model.File{
@@ -48,11 +59,9 @@ func (driver Cloud189) FormatFile(file *Cloud189File) *model.File {
 		f.UpdatedAt = &lastOpTime
 	}
 	if file.Size == -1 {
-		f.Type = conf.FOLDER
 		f.Size = 0
-	} else {
-		f.Type = utils.GetFileType(filepath.Ext(file.Name))
 	}
+	f.Type = file.GetType()
 	return f
 }
 
@@ -77,12 +86,6 @@ func (driver Cloud189) FormatFile(file *Cloud189File) *model.File {
 //	return nil, ErrPathNotFound
 //}
 
-type Cloud189Down struct {
-	ResCode         int    `json:"res_code"`
-	ResMessage      string `json:"res_message"`
-	FileDownloadUrl string `json:"fileDownloadUrl"`
-}
-
 type LoginResp struct {
 	Msg    string `json:"msg"`
 	Result int    `json:"result"`
@@ -96,9 +99,13 @@ func (driver Cloud189) Login(account *model.Account) error {
 		//cookieJar, _ := cookiejar.New(&cookiejar.Options{PublicSuffixList: publicsuffix.List})
 		client = resty.New()
 		//client.SetCookieJar(cookieJar)
+		client.SetTimeout(base.DefaultTimeout)
 		client.SetRetryCount(3)
 		client.SetHeader("Referer", "https://cloud.189.cn/")
 	}
+	// clear cookie
+	jar, _ := cookiejar.New(nil)
+	client.SetCookieJar(jar)
 	url := "https://cloud.189.cn/api/portal/loginUrl.action?redirectURL=https%3A%2F%2Fcloud.189.cn%2Fmain.action"
 	b := ""
 	lt := ""
@@ -108,6 +115,10 @@ func (driver Cloud189) Login(account *model.Account) error {
 		if err != nil {
 			return err
 		}
+		// 已经登陆
+		if res.RawResponse.Request.URL.String() == "https://cloud.189.cn/web/main" {
+			return nil
+		}
 		b = res.String()
 		ltTextArr := ltText.FindStringSubmatch(b)
 		if len(ltTextArr) > 0 {
@@ -118,7 +129,7 @@ func (driver Cloud189) Login(account *model.Account) error {
 		}
 	}
 	if lt == "" {
-		return fmt.Errorf("get empty login page")
+		return errors.New("get page: " + b)
 	}
 	captchaToken := regexp.MustCompile(`captchaToken' value='(.+?)'`).FindStringSubmatch(b)[1]
 	returnUrl := regexp.MustCompile(`returnUrl = '(.+?)'`).FindStringSubmatch(b)[1]
@@ -129,9 +140,33 @@ func (driver Cloud189) Login(account *model.Account) error {
 	vCodeRS := ""
 	if vCodeID != "" {
 		// need ValidateCode
+		log.Debugf("try to identify verification codes")
+		timeStamp := strconv.FormatInt(time.Now().UnixNano()/1e6, 10)
+		u := "https://open.e.189.cn/api/logbox/oauth2/picCaptcha.do?token=" + vCodeID + timeStamp
+		imgRes, err := client.R().SetHeaders(map[string]string{
+			"User-Agent":     "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:74.0) Gecko/20100101 Firefox/76.0",
+			"Referer":        "https://open.e.189.cn/api/logbox/oauth2/unifyAccountLogin.do",
+			"Sec-Fetch-Dest": "image",
+			"Sec-Fetch-Mode": "no-cors",
+			"Sec-Fetch-Site": "same-origin",
+		}).Get(u)
+		if err != nil {
+			return err
+		}
+		vRes, err := client.R().SetMultipartField(
+			"image", "validateCode.png", "image/png", bytes.NewReader(imgRes.Body())).
+			Post(conf.GetStr("ocr api"))
+		if err != nil {
+			return err
+		}
+		if jsoniter.Get(vRes.Body(), "status").ToInt() != 200 {
+			return errors.New("ocr error:" + jsoniter.Get(vRes.Body(), "msg").ToString())
+		}
+		vCodeRS = jsoniter.Get(vRes.Body(), "result").ToString()
+		log.Debugln("code: ", vCodeRS)
 	}
-	userRsa := RsaEncode([]byte(account.Username), jRsakey)
-	passwordRsa := RsaEncode([]byte(account.Password), jRsakey)
+	userRsa := RsaEncode([]byte(account.Username), jRsakey, true)
+	passwordRsa := RsaEncode([]byte(account.Password), jRsakey, true)
 	url = "https://open.e.189.cn/api/logbox/oauth2/loginSubmit.do"
 	var loginResp LoginResp
 	res, err := client.R().
@@ -158,7 +193,7 @@ func (driver Cloud189) Login(account *model.Account) error {
 	if err != nil {
 		return err
 	}
-	err = json.Unmarshal(res.Body(), &loginResp)
+	err = utils.Json.Unmarshal(res.Body(), &loginResp)
 	if err != nil {
 		log.Error(err.Error())
 		return err
@@ -175,72 +210,32 @@ func (driver Cloud189) Login(account *model.Account) error {
 	return nil
 }
 
-type Cloud189Error struct {
-	ErrorCode string `json:"errorCode"`
-	ErrorMsg  string `json:"errorMsg"`
-}
-
-type Cloud189File struct {
-	Id         int64  `json:"id"`
-	LastOpTime string `json:"lastOpTime"`
-	Name       string `json:"name"`
-	Size       int64  `json:"size"`
-	Icon       struct {
-		SmallUrl string `json:"smallUrl"`
-		//LargeUrl string `json:"largeUrl"`
-	} `json:"icon"`
-	Url string `json:"url"`
-}
-
-type Cloud189Folder struct {
-	Id         int64  `json:"id"`
-	LastOpTime string `json:"lastOpTime"`
-	Name       string `json:"name"`
-}
-
-type Cloud189Files struct {
-	ResCode    int    `json:"res_code"`
-	ResMessage string `json:"res_message"`
-	FileListAO struct {
-		Count      int              `json:"count"`
-		FileList   []Cloud189File   `json:"fileList"`
-		FolderList []Cloud189Folder `json:"folderList"`
-	} `json:"fileListAO"`
+func (driver Cloud189) isFamily(account *model.Account) bool {
+	return account.InternalType == "Family"
 }
 
 func (driver Cloud189) GetFiles(fileId string, account *model.Account) ([]Cloud189File, error) {
-	client, ok := client189Map[account.Name]
-	if !ok {
-		return nil, fmt.Errorf("can't find [%s] client", account.Name)
-	}
 	res := make([]Cloud189File, 0)
 	pageNum := 1
+
 	for {
-		var e Cloud189Error
 		var resp Cloud189Files
-		_, err := client.R().SetResult(&resp).SetError(&e).
-			SetHeader("Accept", "application/json;charset=UTF-8").
-			SetQueryParams(map[string]string{
-				"noCache":    random(),
-				"pageSize":   "60",
-				"pageNum":    strconv.Itoa(pageNum),
-				"mediaType":  "0",
-				"folderId":   fileId,
-				"iconOption": "5",
-				"orderBy":    account.OrderBy,
-				"descending": account.OrderDirection,
-			}).Get("https://cloud.189.cn/api/open/file/listFiles.action")
+		body, err := driver.Request("https://cloud.189.cn/api/open/file/listFiles.action", base.Get, map[string]string{
+			//"noCache":    random(),
+			"pageSize":   "60",
+			"pageNum":    strconv.Itoa(pageNum),
+			"mediaType":  "0",
+			"folderId":   fileId,
+			"iconOption": "5",
+			"orderBy":    "lastOpTime", //account.OrderBy
+			"descending": "true",       //account.OrderDirection
+		}, nil, nil, account)
 		if err != nil {
 			return nil, err
 		}
-		if e.ErrorCode != "" {
-			if e.ErrorCode == "InvalidSessionKey" {
-				err = driver.Login(account)
-				if err != nil {
-					return nil, err
-				}
-				return driver.GetFiles(fileId, account)
-			}
+		err = utils.Json.Unmarshal(body, &resp)
+		if err != nil {
+			return nil, err
 		}
 		if resp.ResCode != 0 {
 			return nil, fmt.Errorf(resp.ResMessage)
@@ -262,44 +257,58 @@ func (driver Cloud189) GetFiles(fileId string, account *model.Account) ([]Cloud1
 	return res, nil
 }
 
-func (driver Cloud189) Request(url string, method string, form map[string]string, headers map[string]string, account *model.Account) ([]byte, error) {
-	client, ok := client189Map[account.Name]
-	if !ok {
-		return nil, fmt.Errorf("can't find [%s] client", account.Name)
+func (driver Cloud189) Request(url string, method int, query, form map[string]string, headers map[string]string, account *model.Account) ([]byte, error) {
+	client, err := driver.getClient(account)
+	if err != nil {
+		return nil, err
 	}
 	//var resp base.Json
+	if driver.isFamily(account) {
+		url = strings.Replace(url, "/api/open", "/api/open/family", 1)
+		if query != nil {
+			query["familyId"] = account.SiteId
+		}
+		if form != nil {
+			form["familyId"] = account.SiteId
+		}
+	}
 	var e Cloud189Error
 	req := client.R().SetError(&e).
 		SetHeader("Accept", "application/json;charset=UTF-8").
 		SetQueryParams(map[string]string{
 			"noCache": random(),
 		})
+	if query != nil {
+		req = req.SetQueryParams(query)
+	}
 	if form != nil {
 		req = req.SetFormData(form)
 	}
 	if headers != nil {
 		req = req.SetHeaders(headers)
 	}
-	var err error
 	var res *resty.Response
-	if strings.ToUpper(method) == "GET" {
+	switch method {
+	case base.Get:
 		res, err = req.Get(url)
-	} else {
+	case base.Post:
 		res, err = req.Post(url)
+	default:
+		return nil, base.ErrNotSupport
 	}
 	if err != nil {
 		return nil, err
 	}
+	//log.Debug(res.String())
 	if e.ErrorCode != "" {
 		if e.ErrorCode == "InvalidSessionKey" {
 			err = driver.Login(account)
 			if err != nil {
 				return nil, err
 			}
-			return driver.Request(url, method, form, nil, account)
+			return driver.Request(url, method, query, form, nil, account)
 		}
 	}
-	//log.Debug(res, jsoniter.Get(res.Body(),"res_code").ToInt())
 	if jsoniter.Get(res.Body(), "res_code").ToInt() != 0 {
 		err = errors.New(jsoniter.Get(res.Body(), "res_message").ToString())
 	}
@@ -307,185 +316,307 @@ func (driver Cloud189) Request(url string, method string, form map[string]string
 }
 
 func (driver Cloud189) GetSessionKey(account *model.Account) (string, error) {
-	resp, err := driver.Request("https://cloud.189.cn/v2/getUserBriefInfo.action", "GET", nil, nil, account)
+	//info, ok := infoMap[account.Name]
+	//if !ok {
+	//	info = Info{}
+	//	infoMap[account.Name] = info
+	//} else {
+	//	log.Debugf("hit")
+	//}
+	//if info.SessionKey != "" {
+	//	return info.SessionKey, nil
+	//}
+	resp, err := driver.Request("https://cloud.189.cn/v2/getUserBriefInfo.action", base.Get, nil, nil, nil, account)
 	if err != nil {
 		return "", err
 	}
-	return jsoniter.Get(resp, "sessionKey").ToString(), nil
+	sessionKey := jsoniter.Get(resp, "sessionKey").ToString()
+	//info.SessionKey = sessionKey
+	return sessionKey, nil
 }
 
 func (driver Cloud189) GetResKey(account *model.Account) (string, string, error) {
-	resp, err := driver.Request("https://cloud.189.cn/api/security/generateRsaKey.action", "GET", nil, nil, account)
+	rsa, ok := infoMap[account.Name]
+	if !ok {
+		rsa = Rsa{}
+		infoMap[account.Name] = rsa
+	}
+	now := time.Now().UnixMilli()
+	if rsa.Expire > now {
+		return rsa.PubKey, rsa.PkId, nil
+	}
+	resp, err := driver.Request("https://cloud.189.cn/api/security/generateRsaKey.action", base.Get, nil, nil, nil, account)
 	if err != nil {
 		return "", "", err
 	}
-	return jsoniter.Get(resp, "pubKey").ToString(), jsoniter.Get(resp, "pkId").ToString(), nil
+	pubKey, pkId := jsoniter.Get(resp, "pubKey").ToString(), jsoniter.Get(resp, "pkId").ToString()
+	rsa.PubKey, rsa.PkId = pubKey, pkId
+	rsa.Expire = jsoniter.Get(resp, "expire").ToInt64()
+	return pubKey, pkId, nil
 }
 
-func (driver Cloud189) UploadRequest(url string, form map[string]string, account *model.Account) ([]byte, error) {
-	sessionKey, err := driver.GetSessionKey(account)
-	if err != nil {
-		return nil, err
-	}
+//func (driver Cloud189) UploadRequest1(uri string, form map[string]string, account *model.Account, resp interface{}) ([]byte, error) {
+//	//sessionKey, err := driver.GetSessionKey(account)
+//	//if err != nil {
+//	//	return nil, err
+//	//}
+//	sessionKey := account.DriveId
+//	pubKey, pkId, err := driver.GetResKey(account)
+//	log.Debugln(sessionKey, pubKey, pkId)
+//	if err != nil {
+//		return nil, err
+//	}
+//	xRId := Random("xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx")
+//	pkey := Random("xxxxxxxxxxxx4xxxyxxxxxxxxxxxxxxx")[0 : 16+int(16*mathRand.Float32())]
+//	params := hex.EncodeToString(AesEncrypt([]byte(qs(form)), []byte(pkey[0:16])))
+//	date := strconv.FormatInt(time.Now().Unix(), 10)
+//	a := make(url.Values)
+//	a.Set("SessionKey", sessionKey)
+//	a.Set("Operate", http.MethodGet)
+//	a.Set("RequestURI", uri)
+//	a.Set("Date", date)
+//	a.Set("params", params)
+//	signature := hex.EncodeToString(SHA1(EncodeParam(a), pkey))
+//	encryptionText := RsaEncode([]byte(pkey), pubKey, false)
+//	headers := map[string]string{
+//		"signature":      signature,
+//		"sessionKey":     sessionKey,
+//		"encryptionText": encryptionText,
+//		"pkId":           pkId,
+//		"x-request-id":   xRId,
+//		"x-request-date": date,
+//	}
+//	req := base.RestyClient.R().SetHeaders(headers).SetQueryParam("params", params)
+//	if resp != nil {
+//		req.SetResult(resp)
+//	}
+//	res, err := req.Get("https://upload.cloud.189.cn" + uri)
+//	if err != nil {
+//		return nil, err
+//	}
+//	//log.Debug(res.String())
+//	data := res.Body()
+//	if jsoniter.Get(data, "code").ToString() != "SUCCESS" {
+//		return nil, errors.New(uri + "---" + jsoniter.Get(data, "msg").ToString())
+//	}
+//	return data, nil
+//}
+//
+//func (driver Cloud189) UploadRequest2(uri string, form map[string]string, account *model.Account, resp interface{}) ([]byte, error) {
+//	c := strconv.FormatInt(time.Now().UnixMilli(), 10)
+//	r := Random("xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx")
+//	l := Random("xxxxxxxxxxxx4xxxyxxxxxxxxxxxxxxx")
+//	l = l[0 : 16+int(16*mathRand.Float32())]
+//
+//	e := qs(form)
+//	data := AesEncrypt([]byte(e), []byte(l[0:16]))
+//	h := hex.EncodeToString(data)
+//
+//	sessionKey := account.DriveId
+//	a := make(url.Values)
+//	a.Set("SessionKey", sessionKey)
+//	a.Set("Operate", http.MethodGet)
+//	a.Set("RequestURI", uri)
+//	a.Set("Date", c)
+//	a.Set("params", h)
+//	g := SHA1(EncodeParam(a), l)
+//
+//	pubKey, pkId, err := driver.GetResKey(account)
+//	if err != nil {
+//		return nil, err
+//	}
+//	b := RsaEncode([]byte(l), pubKey, false)
+//	client, err := driver.getClient(account)
+//	if err != nil {
+//		return nil, err
+//	}
+//	req := client.R()
+//	req.Header.Set("accept", "application/json;charset=UTF-8")
+//	req.Header.Set("SessionKey", sessionKey)
+//	req.Header.Set("Signature", hex.EncodeToString(g))
+//	req.Header.Set("X-Request-Date", c)
+//	req.Header.Set("X-Request-ID", r)
+//	req.Header.Set("EncryptionText", b)
+//	req.Header.Set("PkId", pkId)
+//	if resp != nil {
+//		req.SetResult(resp)
+//	}
+//	res, err := req.Get("https://upload.cloud.189.cn" + uri + "?params=" + h)
+//	if err != nil {
+//		return nil, err
+//	}
+//	//log.Debug(res.String())
+//	data = res.Body()
+//	if jsoniter.Get(data, "code").ToString() != "SUCCESS" {
+//		return nil, errors.New(uri + "---" + jsoniter.Get(data, "msg").ToString())
+//	}
+//	return data, nil
+//}
+
+func (driver Cloud189) UploadRequest(uri string, form map[string]string, account *model.Account, resp interface{}) ([]byte, error) {
+	c := strconv.FormatInt(time.Now().UnixMilli(), 10)
+	r := Random("xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx")
+	l := Random("xxxxxxxxxxxx4xxxyxxxxxxxxxxxxxxx")
+	l = l[0 : 16+int(16*utils.Rand.Float32())]
+
+	e := qs(form)
+	data := AesEncrypt([]byte(e), []byte(l[0:16]))
+	h := hex.EncodeToString(data)
+
+	sessionKey := account.DriveId
+	signature := hmacSha1(fmt.Sprintf("SessionKey=%s&Operate=GET&RequestURI=%s&Date=%s&params=%s", sessionKey, uri, c, h), l)
+
 	pubKey, pkId, err := driver.GetResKey(account)
 	if err != nil {
 		return nil, err
 	}
-	xRId := "e007e99a-370c-4a14-a143-1b1541972fcf"
-	pkey := strings.ReplaceAll(xRId, "-", "")
-	params := aesEncrypt(qs(form), pkey[:16])
-	date := strconv.FormatInt(time.Now().Unix(), 10)
-	signature := hmacSha1(fmt.Sprintf("SessionKey=%s&Operate=GET&RequestURI=%s&Date=%s&params=%s", sessionKey, url, date, params), pkey)
-	encryptionText := RsaEncode([]byte(pkey), pubKey)
-	res, err := base.RestyClient.R().SetHeaders(map[string]string{
-		"signature":      signature,
-		"sessionKey":     sessionKey,
-		"encryptionText": encryptionText,
-		"pkId":           pkId,
-		"x-request-id":   xRId,
-		"x-request-date": date,
-		"origin":         "https://cloud.189.cn",
-		"referer":        "https://cloud.189.cn/",
-	}).SetQueryParam("params", params).Get("https://upload.cloud.189.cn" + url)
+	b := RsaEncode([]byte(l), pubKey, false)
+	client, err := driver.getClient(account)
 	if err != nil {
 		return nil, err
 	}
-	log.Debug(res.String())
-	data := res.Body()
+	req := client.R()
+	req.Header.Set("accept", "application/json;charset=UTF-8")
+	req.Header.Set("SessionKey", sessionKey)
+	req.Header.Set("Signature", signature)
+	req.Header.Set("X-Request-Date", c)
+	req.Header.Set("X-Request-ID", r)
+	req.Header.Set("EncryptionText", b)
+	req.Header.Set("PkId", pkId)
+	if resp != nil {
+		req.SetResult(resp)
+	}
+	res, err := req.Get("https://upload.cloud.189.cn" + uri + "?params=" + h)
+	if err != nil {
+		return nil, err
+	}
+	//log.Debug(res.String())
+	data = res.Body()
 	if jsoniter.Get(data, "code").ToString() != "SUCCESS" {
-		return nil, errors.New(jsoniter.Get(data, "msg").ToString())
+		return nil, errors.New(uri + "---" + jsoniter.Get(data, "msg").ToString())
 	}
 	return data, nil
 }
 
-func random() string {
-	return fmt.Sprintf("0.%17v", mathRand.New(mathRand.NewSource(time.Now().UnixNano())).Int63n(100000000000000000))
-}
-
-func RsaEncode(origData []byte, j_rsakey string) string {
-	publicKey := []byte("-----BEGIN PUBLIC KEY-----\n" + j_rsakey + "\n-----END PUBLIC KEY-----")
-	block, _ := pem.Decode(publicKey)
-	pubInterface, _ := x509.ParsePKIXPublicKey(block.Bytes)
-	pub := pubInterface.(*rsa.PublicKey)
-	b, err := rsa.EncryptPKCS1v15(rand.Reader, pub, origData)
+// NewUpload Error: signature check false
+func (driver Cloud189) NewUpload(file *model.FileStream, account *model.Account) error {
+	sessionKey, err := driver.GetSessionKey(account)
 	if err != nil {
-		log.Errorf("err: %s", err.Error())
+		account.Status = err.Error()
+	} else {
+		account.Status = "work"
+		account.DriveId = sessionKey
 	}
-	return b64tohex(base64.StdEncoding.EncodeToString(b))
-}
+	_ = model.SaveAccount(account)
+	const DEFAULT uint64 = 10485760
+	var count = int64(math.Ceil(float64(file.GetSize()) / float64(DEFAULT)))
+	var finish uint64 = 0
+	parentFile, err := driver.File(file.ParentPath, account)
+	if err != nil {
+		return err
+	}
+	if !parentFile.IsDir() {
+		return base.ErrNotFolder
+	}
+	res, err := driver.UploadRequest("/person/initMultiUpload", map[string]string{
+		"parentFolderId": parentFile.Id,
+		"fileName":       encode(file.Name),
+		"fileSize":       strconv.FormatInt(int64(file.Size), 10),
+		"sliceSize":      strconv.FormatInt(int64(DEFAULT), 10),
+		"lazyCheck":      "1",
+	}, account, nil)
+	if err != nil {
+		return err
+	}
+	uploadFileId := jsoniter.Get(res, "data", "uploadFileId").ToString()
+	//_, err = driver.UploadRequest("/person/getUploadedPartsInfo", map[string]string{
+	//	"uploadFileId": uploadFileId,
+	//}, account, nil)
+	var i int64
+	var byteSize uint64
+	md5s := make([]string, 0)
+	md5Sum := md5.New()
+	for i = 1; i <= count; i++ {
+		byteSize = file.GetSize() - finish
+		if DEFAULT < byteSize {
+			byteSize = DEFAULT
+		}
+		//log.Debugf("%d,%d", byteSize, finish)
+		byteData := make([]byte, byteSize)
+		n, err := io.ReadFull(file, byteData)
+		//log.Debug(err, n)
+		if err != nil {
+			return err
+		}
+		finish += uint64(n)
+		md5Bytes := getMd5(byteData)
+		md5Hex := hex.EncodeToString(md5Bytes)
+		md5Base64 := base64.StdEncoding.EncodeToString(md5Bytes)
+		md5s = append(md5s, strings.ToUpper(md5Hex))
+		md5Sum.Write(byteData)
+		//log.Debugf("md5Bytes: %+v,md5Str:%s,md5Base64:%s", md5Bytes, md5Hex, md5Base64)
+		var resp UploadUrlsResp
+		res, err = driver.UploadRequest("/person/getMultiUploadUrls", map[string]string{
+			"partInfo":     fmt.Sprintf("%s-%s", strconv.FormatInt(i, 10), md5Base64),
+			"uploadFileId": uploadFileId,
+		}, account, &resp)
+		if err != nil {
+			return err
+		}
+		uploadData := resp.UploadUrls["partNumber_"+strconv.FormatInt(i, 10)]
+		log.Debugf("uploadData: %+v", uploadData)
+		requestURL := uploadData.RequestURL
+		uploadHeaders := strings.Split(decodeURIComponent(uploadData.RequestHeader), "&")
+		req, _ := http.NewRequest(http.MethodPut, requestURL, bytes.NewReader(byteData))
+		for _, v := range uploadHeaders {
+			i := strings.Index(v, "=")
+			req.Header.Set(v[0:i], v[i+1:])
+		}
 
-var b64map = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"
-
-var BI_RM = "0123456789abcdefghijklmnopqrstuvwxyz"
-
-func int2char(a int) string {
-	return strings.Split(BI_RM, "")[a]
-}
-
-func b64tohex(a string) string {
-	d := ""
-	e := 0
-	c := 0
-	for i := 0; i < len(a); i++ {
-		m := strings.Split(a, "")[i]
-		if m != "=" {
-			v := strings.Index(b64map, m)
-			if 0 == e {
-				e = 1
-				d += int2char(v >> 2)
-				c = 3 & v
-			} else if 1 == e {
-				e = 2
-				d += int2char(c<<2 | v>>4)
-				c = 15 & v
-			} else if 2 == e {
-				e = 3
-				d += int2char(c)
-				d += int2char(v >> 2)
-				c = 3 & v
-			} else {
-				e = 0
-				d += int2char(c<<2 | v>>4)
-				d += int2char(15 & v)
-			}
+		r, err := base.HttpClient.Do(req)
+		log.Debugf("%+v %+v", r, r.Request.Header)
+		if err != nil {
+			return err
 		}
 	}
-	if e == 1 {
-		d += int2char(c << 2)
+	fileMd5 := hex.EncodeToString(md5Sum.Sum(nil))
+	sliceMd5 := fileMd5
+	if file.GetSize() > DEFAULT {
+		sliceMd5 = utils.GetMD5Encode(strings.Join(md5s, "\n"))
 	}
-	return d
+	res, err = driver.UploadRequest("/person/commitMultiUploadFile", map[string]string{
+		"uploadFileId": uploadFileId,
+		"fileMd5":      fileMd5,
+		"sliceMd5":     sliceMd5,
+		"lazyCheck":    "1",
+	}, account, nil)
+	account.DriveId, _ = driver.GetSessionKey(account)
+	return err
 }
 
-func qs(form map[string]string) string {
-	strList := make([]string, 0)
-	for k, v := range form {
-		strList = append(strList, fmt.Sprintf("%s=%s", k, url.QueryEscape(v)))
+func (driver Cloud189) OldUpload(file *model.FileStream, account *model.Account) error {
+	//return base.ErrNotImplement
+	client, err := driver.getClient(account)
+	if err != nil {
+		return err
 	}
-	return strings.Join(strList, "&")
-}
-
-func aesEncrypt(data, key string) string {
-	encrypted := AesEncryptECB([]byte(data), []byte(key))
-	//return string(encrypted)
-	return hex.EncodeToString(encrypted)
-}
-
-func hmacSha1(data string, secret string) string {
-	h := hmac.New(sha1.New, []byte(secret))
-	h.Write([]byte(data))
-	return hex.EncodeToString(h.Sum(nil))
-}
-
-func AesEncryptECB(origData []byte, key []byte) (encrypted []byte) {
-	cipher, _ := aes.NewCipher(generateKey(key))
-	length := (len(origData) + aes.BlockSize) / aes.BlockSize
-	plain := make([]byte, length*aes.BlockSize)
-	copy(plain, origData)
-	pad := byte(len(plain) - len(origData))
-	for i := len(origData); i < len(plain); i++ {
-		plain[i] = pad
+	parentFile, err := driver.File(file.ParentPath, account)
+	if err != nil {
+		return err
 	}
-	encrypted = make([]byte, len(plain))
-	// 分组分块加密
-	for bs, be := 0, cipher.BlockSize(); bs <= len(origData); bs, be = bs+cipher.BlockSize(), be+cipher.BlockSize() {
-		cipher.Encrypt(encrypted[bs:be], plain[bs:be])
+	// api refer to PanIndex
+	res, err := client.R().SetMultipartFormData(map[string]string{
+		"parentId":   parentFile.Id,
+		"sessionKey": account.DriveId,
+		"opertype":   "1",
+		"fname":      file.GetFileName(),
+	}).SetMultipartField("Filedata", file.GetFileName(), file.GetMIMEType(), file).Post("https://hb02.upload.cloud.189.cn/v1/DCIWebUploadAction")
+	if err != nil {
+		return err
 	}
-
-	return encrypted
-}
-func AesDecryptECB(encrypted []byte, key []byte) (decrypted []byte) {
-	cipher, _ := aes.NewCipher(generateKey(key))
-	decrypted = make([]byte, len(encrypted))
-	//
-	for bs, be := 0, cipher.BlockSize(); bs < len(encrypted); bs, be = bs+cipher.BlockSize(), be+cipher.BlockSize() {
-		cipher.Decrypt(decrypted[bs:be], encrypted[bs:be])
+	if jsoniter.Get(res.Body(), "MD5").ToString() != "" {
+		return nil
 	}
-
-	trim := 0
-	if len(decrypted) > 0 {
-		trim = len(decrypted) - int(decrypted[len(decrypted)-1])
-	}
-
-	return decrypted[:trim]
-}
-func generateKey(key []byte) (genKey []byte) {
-	genKey = make([]byte, 16)
-	copy(genKey, key)
-	for i := 16; i < len(key); {
-		for j := 0; j < 16 && i < len(key); j, i = j+1, i+1 {
-			genKey[j] ^= key[i]
-		}
-	}
-	return genKey
-}
-
-func getMd5(data []byte) []byte {
-	h := md5.New()
-	h.Write(data)
-	return h.Sum(nil)
-}
-
-func init() {
-	base.RegisterDriver(&Cloud189{})
-	client189Map = make(map[string]*resty.Client, 0)
+	log.Debugf(res.String())
+	return errors.New(res.String())
 }

drivers/189/driver.go

@@ -1,24 +1,15 @@
 package _89
 
 import (
-	"bytes"
-	"crypto/md5"
-	"encoding/base64"
-	"encoding/hex"
-	"encoding/json"
 	"fmt"
 	"github.com/Xhofe/alist/conf"
 	"github.com/Xhofe/alist/drivers/base"
 	"github.com/Xhofe/alist/model"
 	"github.com/Xhofe/alist/utils"
-	"github.com/gin-gonic/gin"
-	jsoniter "github.com/json-iterator/go"
+	"github.com/go-resty/resty/v2"
 	log "github.com/sirupsen/logrus"
-	"io"
-	"math"
 	"net/http"
 	"path/filepath"
-	"strconv"
 	"strings"
 )
 
@@ -26,7 +17,8 @@ type Cloud189 struct{}
 
 func (driver Cloud189) Config() base.DriverConfig {
 	return base.DriverConfig{
-		Name: "189Cloud",
+		Name:      "189Cloud",
+		LocalSort: true,
 	}
 }
 
@@ -52,38 +44,56 @@ func (driver Cloud189) Items() []base.Item {
 			Type:     base.TypeString,
 			Required: true,
 		},
-		{
-			Name:     "order_by",
-			Label:    "order_by",
-			Type:     base.TypeSelect,
-			Values:   "name,size,lastOpTime,createdDate",
-			Required: true,
-		},
-		{
-			Name:     "order_direction",
-			Label:    "desc",
-			Type:     base.TypeSelect,
-			Values:   "true,false",
-			Required: true,
-		},
+		//{
+		//	Name:     "internal_type",
+		//	Label:    "189cloud type",
+		//	Type:     base.TypeSelect,
+		//	Required: true,
+		//	Values:   "Personal,Family",
+		//},
+		//{
+		//	Name:  "site_id",
+		//	Label: "family id",
+		//	Type:  base.TypeString,
+		//},
+		//{
+		//	Name:     "order_by",
+		//	Label:    "order_by",
+		//	Type:     base.TypeSelect,
+		//	Values:   "name,size,lastOpTime,createdDate",
+		//	Required: true,
+		//},
+		//{
+		//	Name:     "order_direction",
+		//	Label:    "desc",
+		//	Type:     base.TypeSelect,
+		//	Values:   "true,false",
+		//	Required: true,
+		//},
 	}
 }
 
 func (driver Cloud189) Save(account *model.Account, old *model.Account) error {
-	if old != nil && old.Name != account.Name {
+	if old != nil {
 		delete(client189Map, old.Name)
 	}
+	if account == nil {
+		return nil
+	}
 	if err := driver.Login(account); err != nil {
 		account.Status = err.Error()
 		_ = model.SaveAccount(account)
 		return err
 	}
-	account.Status = "work"
-	err := model.SaveAccount(account)
+	sessionKey, err := driver.GetSessionKey(account)
 	if err != nil {
-		return err
+		account.Status = err.Error()
+	} else {
+		account.Status = "work"
+		account.DriveId = sessionKey
 	}
-	return nil
+	_ = model.SaveAccount(account)
+	return err
 }
 
 func (driver Cloud189) File(path string, account *model.Account) (*model.File, error) {
@@ -145,43 +155,51 @@ func (driver Cloud189) Link(args base.Args, account *model.Account) (*base.Link,
 	if file.Type == conf.FOLDER {
 		return nil, base.ErrNotFile
 	}
-	client, ok := client189Map[account.Name]
-	if !ok {
-		return nil, fmt.Errorf("can't find [%s] client", account.Name)
-	}
-	var e Cloud189Error
-	var resp Cloud189Down
-	_, err = client.R().SetResult(&resp).SetError(&e).
-		SetHeader("Accept", "application/json;charset=UTF-8").
-		SetQueryParams(map[string]string{
-			"noCache": random(),
-			"fileId":  file.Id,
-		}).Get("https://cloud.189.cn/api/open/file/getFileDownloadUrl.action")
+	var resp DownResp
+	u := "https://cloud.189.cn/api/portal/getFileInfo.action"
+	body, err := driver.Request(u, base.Get, map[string]string{
+		"fileId": file.Id,
+	}, nil, nil, account)
 	if err != nil {
 		return nil, err
 	}
-	if e.ErrorCode != "" {
-		if e.ErrorCode == "InvalidSessionKey" {
-			err = driver.Login(account)
-			if err != nil {
-				return nil, err
-			}
-			return driver.Link(args, account)
-		}
+	log.Debugln(string(body))
+	err = utils.Json.Unmarshal(body, &resp)
+	if err != nil {
+		return nil, err
 	}
 	if resp.ResCode != 0 {
 		return nil, fmt.Errorf(resp.ResMessage)
 	}
-	res, err := base.NoRedirectClient.R().Get(resp.FileDownloadUrl)
+	client, err := driver.getClient(account)
 	if err != nil {
 		return nil, err
 	}
-	link := base.Link{}
+	client = resty.NewWithClient(client.GetClient()).SetRedirectPolicy(
+		resty.RedirectPolicyFunc(func(req *http.Request, via []*http.Request) error {
+			return http.ErrUseLastResponse
+		}))
+	res, err := client.R().Get("https:" + resp.FileDownloadUrl)
+	if err != nil {
+		return nil, err
+	}
+	log.Debugln(res.Status())
+	link := base.Link{
+		Headers: []base.Header{
+			{Name: "User-Agent", Value: base.UserAgent},
+			//{Name: "Authorization", Value: ""},
+		},
+	}
 	if res.StatusCode() == 302 {
 		link.Url = res.Header().Get("location")
+		res, err = client.R().Get(link.Url)
+		if res.StatusCode() == 302 {
+			link.Url = res.Header().Get("location")
+		}
 	} else {
 		link.Url = resp.FileDownloadUrl
 	}
+	link.Url = strings.Replace(link.Url, "http://", "https://", 1)
 	return &link, nil
 }
 
@@ -202,9 +220,9 @@ func (driver Cloud189) Path(path string, account *model.Account) (*model.File, [
 	return nil, files, nil
 }
 
-func (driver Cloud189) Proxy(ctx *gin.Context, account *model.Account) {
-	ctx.Request.Header.Del("Origin")
-}
+//func (driver Cloud189) Proxy(r *http.Request, account *model.Account) {
+//	r.Header.Del("Origin")
+//}
 
 func (driver Cloud189) Preview(path string, account *model.Account) (interface{}, error) {
 	return nil, base.ErrNotSupport
@@ -223,67 +241,63 @@ func (driver Cloud189) MakeDir(path string, account *model.Account) error {
 		"parentFolderId": parent.Id,
 		"folderName":     name,
 	}
-	_, err = driver.Request("https://cloud.189.cn/api/open/file/createFolder.action", "POST", form, nil, account)
-	if err == nil {
-		_ = base.DeleteCache(dir, account)
-	}
+	_, err = driver.Request("https://cloud.189.cn/api/open/file/createFolder.action", base.Post, nil, form, nil, account)
 	return err
 }
 
 func (driver Cloud189) Move(src string, dst string, account *model.Account) error {
-	srcDir, _ := filepath.Split(src)
 	dstDir, dstName := filepath.Split(dst)
 	srcFile, err := driver.File(src, account)
 	if err != nil {
 		return err
 	}
-	// rename
-	if srcDir == dstDir {
-		url := "https://cloud.189.cn/api/open/file/renameFile.action"
-		idKey := "fileId"
-		nameKey := "destFileName"
-		if srcFile.IsDir() {
-			url = "https://cloud.189.cn/api/open/file/renameFolder.action"
-			idKey = "folderId"
-			nameKey = "destFolderName"
-		}
-		form := map[string]string{
-			idKey:   srcFile.Id,
-			nameKey: dstName,
-		}
-		_, err = driver.Request(url, "POST", form, nil, account)
-	} else {
-		// move
-		dstDirFile, err := driver.File(dstDir, account)
-		if err != nil {
-			return err
-		}
-		isFolder := 0
-		if srcFile.IsDir() {
-			isFolder = 1
-		}
-		taskInfos := []base.Json{
-			{
-				"fileId":   srcFile.Id,
-				"fileName": dstName,
-				"isFolder": isFolder,
-			},
-		}
-		taskInfosBytes, err := json.Marshal(taskInfos)
-		if err != nil {
-			return err
-		}
-		form := map[string]string{
-			"type":           "MOVE",
-			"targetFolderId": dstDirFile.Id,
-			"taskInfos":      string(taskInfosBytes),
-		}
-		_, err = driver.Request("https://cloud.189.cn/api/open/batch/createBatchTask.action", "POST", form, nil, account)
+	dstDirFile, err := driver.File(dstDir, account)
+	if err != nil {
+		return err
 	}
-	if err == nil {
-		_ = base.DeleteCache(srcDir, account)
-		_ = base.DeleteCache(dstDir, account)
+	isFolder := 0
+	if srcFile.IsDir() {
+		isFolder = 1
 	}
+	taskInfos := []base.Json{
+		{
+			"fileId":   srcFile.Id,
+			"fileName": dstName,
+			"isFolder": isFolder,
+		},
+	}
+	taskInfosBytes, err := utils.Json.Marshal(taskInfos)
+	if err != nil {
+		return err
+	}
+	form := map[string]string{
+		"type":           "MOVE",
+		"targetFolderId": dstDirFile.Id,
+		"taskInfos":      string(taskInfosBytes),
+	}
+	_, err = driver.Request("https://cloud.189.cn/api/open/batch/createBatchTask.action", base.Post, nil, form, nil, account)
+	return err
+}
+
+func (driver Cloud189) Rename(src string, dst string, account *model.Account) error {
+	_, dstName := filepath.Split(dst)
+	srcFile, err := driver.File(src, account)
+	if err != nil {
+		return err
+	}
+	url := "https://cloud.189.cn/api/open/file/renameFile.action"
+	idKey := "fileId"
+	nameKey := "destFileName"
+	if srcFile.IsDir() {
+		url = "https://cloud.189.cn/api/open/file/renameFolder.action"
+		idKey = "folderId"
+		nameKey = "destFolderName"
+	}
+	form := map[string]string{
+		idKey:   srcFile.Id,
+		nameKey: dstName,
+	}
+	_, err = driver.Request(url, base.Post, nil, form, nil, account)
 	return err
 }
 
@@ -308,7 +322,7 @@ func (driver Cloud189) Copy(src string, dst string, account *model.Account) erro
 			"isFolder": isFolder,
 		},
 	}
-	taskInfosBytes, err := json.Marshal(taskInfos)
+	taskInfosBytes, err := utils.Json.Marshal(taskInfos)
 	if err != nil {
 		return err
 	}
@@ -317,10 +331,7 @@ func (driver Cloud189) Copy(src string, dst string, account *model.Account) erro
 		"targetFolderId": dstDirFile.Id,
 		"taskInfos":      string(taskInfosBytes),
 	}
-	_, err = driver.Request("https://cloud.189.cn/api/open/batch/createBatchTask.action", "POST", form, nil, account)
-	if err == nil {
-		_ = base.DeleteCache(dstDir, account)
-	}
+	_, err = driver.Request("https://cloud.189.cn/api/open/batch/createBatchTask.action", base.Post, nil, form, nil, account)
 	return err
 }
 
@@ -341,7 +352,7 @@ func (driver Cloud189) Delete(path string, account *model.Account) error {
 			"isFolder": isFolder,
 		},
 	}
-	taskInfosBytes, err := json.Marshal(taskInfos)
+	taskInfosBytes, err := utils.Json.Marshal(taskInfos)
 	if err != nil {
 		return err
 	}
@@ -350,93 +361,17 @@ func (driver Cloud189) Delete(path string, account *model.Account) error {
 		"targetFolderId": "",
 		"taskInfos":      string(taskInfosBytes),
 	}
-	_, err = driver.Request("https://cloud.189.cn/api/open/batch/createBatchTask.action", "POST", form, nil, account)
-	if err == nil {
-		_ = base.DeleteCache(utils.Dir(path), account)
-	}
+	_, err = driver.Request("https://cloud.189.cn/api/open/batch/createBatchTask.action", base.Post, nil, form, nil, account)
 	return err
 }
 
-// Upload Error: decrypt encryptionText failed
 func (driver Cloud189) Upload(file *model.FileStream, account *model.Account) error {
-	return base.ErrNotImplement
-	const DEFAULT uint64 = 10485760
-	var count = int64(math.Ceil(float64(file.GetSize()) / float64(DEFAULT)))
-	var finish uint64 = 0
-	parentFile, err := driver.File(file.ParentPath, account)
-	if err != nil {
-		return err
+	//return base.ErrNotImplement
+	if file == nil {
+		return base.ErrEmptyFile
 	}
-	if !parentFile.IsDir() {
-		return base.ErrNotFolder
-	}
-	res, err := driver.UploadRequest("/person/initMultiUpload", map[string]string{
-		"parentFolderId": parentFile.Id,
-		"fileName":       file.Name,
-		"fileSize":       strconv.FormatInt(int64(file.Size), 10),
-		"sliceSize":      strconv.FormatInt(int64(DEFAULT), 10),
-		"lazyCheck":      "1",
-	}, account)
-	if err != nil {
-		return err
-	}
-	uploadFileId := jsoniter.Get(res, "data.uploadFileId").ToString()
-	var i int64
-	var byteSize uint64
-	md5s := make([]string, 0)
-	md5Sum := md5.New()
-	for i = 1; i <= count; i++ {
-		byteSize = file.GetSize() - finish
-		if DEFAULT < byteSize {
-			byteSize = DEFAULT
-		}
-		log.Debugf("%d,%d", byteSize, finish)
-		byteData := make([]byte, byteSize)
-		n, err := io.ReadFull(file, byteData)
-		log.Debug(err, n)
-		if err != nil {
-			return err
-		}
-		finish += uint64(n)
-		md5Bytes := getMd5(byteData)
-		md5Str := hex.EncodeToString(md5Bytes)
-		md5Base64 := base64.StdEncoding.EncodeToString(md5Bytes)
-		md5s = append(md5s, md5Str)
-		md5Sum.Write(byteData)
-		res, err = driver.UploadRequest("/person/getMultiUploadUrls", map[string]string{
-			"partInfo":     fmt.Sprintf("%s-%s", strconv.FormatInt(i, 10), md5Base64),
-			"uploadFileId": uploadFileId,
-		}, account)
-		if err != nil {
-			return err
-		}
-		uploadData := jsoniter.Get(res, "uploadUrls.partNumber_"+strconv.FormatInt(i, 10))
-		headers := strings.Split(uploadData.Get("requestHeader").ToString(), "&")
-		req, err := http.NewRequest("PUT", uploadData.Get("requestURL").ToString(), bytes.NewBuffer(byteData))
-		if err != nil {
-			return err
-		}
-		for _, header := range headers {
-			kv := strings.Split(header, "=")
-			req.Header.Set(kv[0], strings.Join(kv[1:], "="))
-		}
-		res, err := base.HttpClient.Do(req)
-		if err != nil {
-			return err
-		}
-		log.Debugf("%+v", res)
-	}
-	id := md5Sum.Sum(nil)
-	res, err = driver.UploadRequest("/person/commitMultiUploadFile", map[string]string{
-		"uploadFileId": uploadFileId,
-		"fileMd5":      hex.EncodeToString(id),
-		"sliceMd5":     utils.GetMD5Encode(strings.Join(md5s, "\n")),
-		"lazyCheck":    "1",
-	}, account)
-	if err == nil {
-		_ = base.DeleteCache(file.ParentPath, account)
-	}
-	return err
+	return driver.NewUpload(file, account)
+	//return driver.OldUpload(file, account)
 }
 
 var _ base.Driver = (*Cloud189)(nil)

drivers/189/types.go

@@ -0,0 +1,91 @@
+package _89
+
+import (
+	"github.com/Xhofe/alist/conf"
+	"github.com/Xhofe/alist/utils"
+	"path"
+)
+
+type Cloud189Error struct {
+	ErrorCode string `json:"errorCode"`
+	ErrorMsg  string `json:"errorMsg"`
+}
+
+type Cloud189File struct {
+	Id         int64  `json:"id"`
+	LastOpTime string `json:"lastOpTime"`
+	Name       string `json:"name"`
+	Size       int64  `json:"size"`
+	Icon       struct {
+		SmallUrl string `json:"smallUrl"`
+		//LargeUrl string `json:"largeUrl"`
+	} `json:"icon"`
+	Url string `json:"url"`
+}
+
+func (f Cloud189File) GetSize() uint64 {
+	if f.Size == -1 {
+		return 0
+	}
+	return uint64(f.Size)
+}
+
+func (f Cloud189File) GetName() string {
+	return f.Name
+}
+
+func (f Cloud189File) GetType() int {
+	if f.Size == -1 {
+		return conf.FOLDER
+	}
+	return utils.GetFileType(path.Ext(f.Name))
+}
+
+type Cloud189Folder struct {
+	Id         int64  `json:"id"`
+	LastOpTime string `json:"lastOpTime"`
+	Name       string `json:"name"`
+}
+
+type Cloud189Files struct {
+	ResCode    int    `json:"res_code"`
+	ResMessage string `json:"res_message"`
+	FileListAO struct {
+		Count      int              `json:"count"`
+		FileList   []Cloud189File   `json:"fileList"`
+		FolderList []Cloud189Folder `json:"folderList"`
+	} `json:"fileListAO"`
+}
+
+type UploadUrlsResp struct {
+	Code       string          `json:"code"`
+	UploadUrls map[string]Part `json:"uploadUrls"`
+}
+
+type Part struct {
+	RequestURL    string `json:"requestURL"`
+	RequestHeader string `json:"requestHeader"`
+}
+
+//type Info struct {
+//	SessionKey string
+//	Rsa        Rsa
+//}
+
+type Rsa struct {
+	Expire int64  `json:"expire"`
+	PkId   string `json:"pkId"`
+	PubKey string `json:"pubKey"`
+}
+
+type Cloud189Down struct {
+	ResCode         int    `json:"res_code"`
+	ResMessage      string `json:"res_message"`
+	FileDownloadUrl string `json:"fileDownloadUrl"`
+}
+
+type DownResp struct {
+	ResCode         int    `json:"res_code"`
+	ResMessage      string `json:"res_message"`
+	FileDownloadUrl string `json:"downloadUrl"`
+}

drivers/189/util.go

@@ -0,0 +1,199 @@
+package _89
+
+import (
+	"bytes"
+	"crypto/aes"
+	"crypto/hmac"
+	"crypto/md5"
+	"crypto/rand"
+	"crypto/rsa"
+	"crypto/sha1"
+	"crypto/x509"
+	"encoding/base64"
+	"encoding/hex"
+	"encoding/pem"
+	"fmt"
+	"github.com/Xhofe/alist/drivers/base"
+	"github.com/Xhofe/alist/utils"
+	"github.com/go-resty/resty/v2"
+	log "github.com/sirupsen/logrus"
+	"net/url"
+	"regexp"
+	"strconv"
+	"strings"
+)
+
+func random() string {
+	return fmt.Sprintf("0.%17v", utils.Rand.Int63n(100000000000000000))
+}
+
+func RsaEncode(origData []byte, j_rsakey string, hex bool) string {
+	publicKey := []byte("-----BEGIN PUBLIC KEY-----\n" + j_rsakey + "\n-----END PUBLIC KEY-----")
+	block, _ := pem.Decode(publicKey)
+	pubInterface, _ := x509.ParsePKIXPublicKey(block.Bytes)
+	pub := pubInterface.(*rsa.PublicKey)
+	b, err := rsa.EncryptPKCS1v15(rand.Reader, pub, origData)
+	if err != nil {
+		log.Errorf("err: %s", err.Error())
+	}
+	res := base64.StdEncoding.EncodeToString(b)
+	if hex {
+		return b64tohex(res)
+	}
+	return res
+}
+
+var b64map = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"
+
+var BI_RM = "0123456789abcdefghijklmnopqrstuvwxyz"
+
+func int2char(a int) string {
+	return strings.Split(BI_RM, "")[a]
+}
+
+func b64tohex(a string) string {
+	d := ""
+	e := 0
+	c := 0
+	for i := 0; i < len(a); i++ {
+		m := strings.Split(a, "")[i]
+		if m != "=" {
+			v := strings.Index(b64map, m)
+			if 0 == e {
+				e = 1
+				d += int2char(v >> 2)
+				c = 3 & v
+			} else if 1 == e {
+				e = 2
+				d += int2char(c<<2 | v>>4)
+				c = 15 & v
+			} else if 2 == e {
+				e = 3
+				d += int2char(c)
+				d += int2char(v >> 2)
+				c = 3 & v
+			} else {
+				e = 0
+				d += int2char(c<<2 | v>>4)
+				d += int2char(15 & v)
+			}
+		}
+	}
+	if e == 1 {
+		d += int2char(c << 2)
+	}
+	return d
+}
+
+func qs(form map[string]string) string {
+	f := make(url.Values)
+	for k, v := range form {
+		f.Set(k, v)
+	}
+	return EncodeParam(f)
+	//strList := make([]string, 0)
+	//for k, v := range form {
+	//	strList = append(strList, fmt.Sprintf("%s=%s", k, url.QueryEscape(v)))
+	//}
+	//return strings.Join(strList, "&")
+}
+
+func EncodeParam(v url.Values) string {
+	if v == nil {
+		return ""
+	}
+	var buf strings.Builder
+	keys := make([]string, 0, len(v))
+	for k := range v {
+		keys = append(keys, k)
+	}
+	for _, k := range keys {
+		vs := v[k]
+		for _, v := range vs {
+			if buf.Len() > 0 {
+				buf.WriteByte('&')
+			}
+			buf.WriteString(k)
+			buf.WriteByte('=')
+			//if k == "fileName" {
+			//	buf.WriteString(encode(v))
+			//} else {
+			buf.WriteString(v)
+			//}
+		}
+	}
+	return buf.String()
+}
+
+func encode(str string) string {
+	//str = strings.ReplaceAll(str, "%", "%25")
+	//str = strings.ReplaceAll(str, "&", "%26")
+	//str = strings.ReplaceAll(str, "+", "%2B")
+	//return str
+	return url.QueryEscape(str)
+}
+
+func AesEncrypt(data, key []byte) []byte {
+	block, _ := aes.NewCipher(key)
+	if block == nil {
+		return []byte{}
+	}
+	data = PKCS7Padding(data, block.BlockSize())
+	decrypted := make([]byte, len(data))
+	size := block.BlockSize()
+	for bs, be := 0, size; bs < len(data); bs, be = bs+size, be+size {
+		block.Encrypt(decrypted[bs:be], data[bs:be])
+	}
+	return decrypted
+}
+
+func PKCS7Padding(ciphertext []byte, blockSize int) []byte {
+	padding := blockSize - len(ciphertext)%blockSize
+	padtext := bytes.Repeat([]byte{byte(padding)}, padding)
+	return append(ciphertext, padtext...)
+}
+
+func hmacSha1(data string, secret string) string {
+	h := hmac.New(sha1.New, []byte(secret))
+	h.Write([]byte(data))
+	return hex.EncodeToString(h.Sum(nil))
+}
+
+func getMd5(data []byte) []byte {
+	h := md5.New()
+	h.Write(data)
+	return h.Sum(nil)
+}
+
+func init() {
+	base.RegisterDriver(&Cloud189{})
+	client189Map = make(map[string]*resty.Client)
+}
+
+func decodeURIComponent(str string) string {
+	r, _ := url.PathUnescape(str)
+	//r = strings.ReplaceAll(r, " ", "+")
+	return r
+}
+
+func Random(v string) string {
+	reg := regexp.MustCompilePOSIX("[xy]")
+	data := reg.ReplaceAllFunc([]byte(v), func(msg []byte) []byte {
+		var i int64
+		t := int64(16 * utils.Rand.Float32())
+		if msg[0] == 120 {
+			i = t
+		} else {
+			i = 3&t | 8
+		}
+		return []byte(strconv.FormatInt(i, 16))
+	})
+	return string(data)
+}
+
+//func SHA1(v, l string) []byte {
+//	key := []byte(l)
+//	mac := hmac.New(sha1.New, key)
+//	mac.Write([]byte(v))
+//	return mac.Sum(nil)
+//}

drivers/189pc/189.go

@@ -0,0 +1,318 @@
+package _189
+
+import (
+	"bytes"
+	"errors"
+	"fmt"
+	"net/http"
+	"net/http/cookiejar"
+	"net/url"
+	"regexp"
+	"sync"
+
+	"github.com/Xhofe/alist/conf"
+	"github.com/Xhofe/alist/drivers/base"
+	"github.com/Xhofe/alist/model"
+	"github.com/Xhofe/alist/utils"
+	"github.com/go-resty/resty/v2"
+	"github.com/google/uuid"
+	log "github.com/sirupsen/logrus"
+)
+
+var userStateCache = struct {
+	sync.Mutex
+	States map[string]*State
+}{States: make(map[string]*State)}
+
+func GetState(account *model.Account) *State {
+	userStateCache.Lock()
+	defer userStateCache.Unlock()
+	if v, ok := userStateCache.States[account.Username]; ok && v != nil {
+		return v
+	}
+	state := &State{client: resty.New().
+		SetHeaders(map[string]string{
+			"Accept":     "application/json;charset=UTF-8",
+			"User-Agent": base.UserAgent,
+		}).SetTimeout(base.DefaultTimeout),
+	}
+	userStateCache.States[account.Username] = state
+	return state
+}
+
+type State struct {
+	sync.Mutex
+	client *resty.Client
+
+	RsaPublicKey string
+
+	SessionKey          string
+	SessionSecret       string
+	FamilySessionKey    string
+	FamilySessionSecret string
+
+	AccessToken string
+
+	//怎么刷新的???
+	RefreshToken string
+}
+
+func (s *State) login(account *model.Account) error {
+	// 清除cookie
+	jar, _ := cookiejar.New(nil)
+	s.client.SetCookieJar(jar)
+
+	var err error
+	var res *resty.Response
+	defer func() {
+		account.Status = "work"
+		if err != nil {
+			account.Status = err.Error()
+		}
+		model.SaveAccount(account)
+		if res != nil {
+			log.Debug(res.String())
+		}
+	}()
+
+	var param *LoginParam
+	param, err = s.getLoginParam()
+	if err != nil {
+		return err
+	}
+
+	// 提交登录
+	s.RsaPublicKey = fmt.Sprintf("-----BEGIN PUBLIC KEY-----\n%s\n-----END PUBLIC KEY-----", param.jRsaKey)
+	res, err = s.client.R().
+		SetHeaders(map[string]string{
+			"Referer": AUTH_URL,
+			"REQID":   param.ReqId,
+			"lt":      param.Lt,
+		}).
+		SetFormData(map[string]string{
+			"appKey":       APP_ID,
+			"accountType":  "02",
+			"userName":     "{RSA}" + rsaEncrypt(s.RsaPublicKey, account.Username),
+			"password":     "{RSA}" + rsaEncrypt(s.RsaPublicKey, account.Password),
+			"validateCode": param.vCodeRS,
+			"captchaToken": param.CaptchaToken,
+			"returnUrl":    RETURN_URL,
+			"mailSuffix":   "@189.cn",
+			"dynamicCheck": "FALSE",
+			"clientType":   CLIENT_TYPE,
+			"cb_SaveName":  "1",
+			"isOauth2":     "false",
+			"state":        "",
+			"paramId":      param.ParamId,
+		}).
+		Post(AUTH_URL + "/api/logbox/oauth2/loginSubmit.do")
+	if err != nil {
+		return err
+	}
+	toUrl := utils.Json.Get(res.Body(), "toUrl").ToString()
+	if toUrl == "" {
+		log.Error(res.String())
+		return fmt.Errorf(res.String())
+	}
+
+	// 获取Session
+	var erron Erron
+	var sessionResp appSessionResp
+	res, err = s.client.R().
+		SetResult(&sessionResp).SetError(&erron).
+		SetQueryParams(clientSuffix()).
+		SetQueryParam("redirectURL", url.QueryEscape(toUrl)).
+		Post(API_URL + "/getSessionForPC.action")
+	if err != nil {
+		return err
+	}
+
+	if erron.ResCode != "" {
+		err = fmt.Errorf(erron.ResMessage)
+		return err
+	}
+	if sessionResp.ResCode != 0 {
+		err = fmt.Errorf(sessionResp.ResMessage)
+		return err
+	}
+	s.SessionKey = sessionResp.SessionKey
+	s.SessionSecret = sessionResp.SessionSecret
+	s.FamilySessionKey = sessionResp.FamilySessionKey
+	s.FamilySessionSecret = sessionResp.FamilySessionSecret
+	s.AccessToken = sessionResp.AccessToken
+	s.RefreshToken = sessionResp.RefreshToken
+	return err
+}
+
+func (s *State) getLoginParam() (*LoginParam, error) {
+	res, err := s.client.R().
+		SetQueryParams(map[string]string{
+			"appId":      APP_ID,
+			"clientType": CLIENT_TYPE,
+			"returnURL":  RETURN_URL,
+			"timeStamp":  fmt.Sprint(timestamp()),
+		}).
+		Get(WEB_URL + "/api/portal/unifyLoginForPC.action")
+	if err != nil {
+		return nil, err
+	}
+	log.Debug(res.String())
+	param := &LoginParam{
+		CaptchaToken: regexp.MustCompile(`'captchaToken' value='(.+?)'`).FindStringSubmatch(res.String())[1],
+		Lt:           regexp.MustCompile(`lt = "(.+?)"`).FindStringSubmatch(res.String())[1],
+		ParamId:      regexp.MustCompile(`paramId = "(.+?)"`).FindStringSubmatch(res.String())[1],
+		ReqId:        regexp.MustCompile(`reqId = "(.+?)"`).FindStringSubmatch(res.String())[1],
+		jRsaKey:      regexp.MustCompile(`"j_rsaKey" value="(.+?)"`).FindStringSubmatch(res.String())[1],
+
+		vCodeID: regexp.MustCompile(`token=([A-Za-z0-9&=]+)`).FindStringSubmatch(res.String())[1],
+	}
+
+	imgRes, err := s.client.R().Get(fmt.Sprint(AUTH_URL, "/api/logbox/oauth2/picCaptcha.do?token=", param.vCodeID, timestamp()))
+	if err != nil {
+		return nil, err
+	}
+	if len(imgRes.Body()) > 0 {
+		vRes, err := resty.New().R().
+			SetMultipartField("image", "validateCode.png", "image/png", bytes.NewReader(imgRes.Body())).
+			Post(conf.GetStr("ocr api"))
+		if err != nil {
+			return nil, err
+		}
+		if utils.Json.Get(vRes.Body(), "status").ToInt() != 200 {
+			return nil, errors.New("ocr error:" + utils.Json.Get(vRes.Body(), "msg").ToString())
+		}
+		param.vCodeRS = utils.Json.Get(vRes.Body(), "result").ToString()
+		log.Debugln("code: ", param.vCodeRS)
+	}
+	return param, nil
+}
+
+func (s *State) refreshSession(account *model.Account) error {
+	var erron Erron
+	var userSessionResp UserSessionResp
+	res, err := s.client.R().
+		SetResult(&userSessionResp).SetError(&erron).
+		SetQueryParams(clientSuffix()).
+		SetQueryParams(map[string]string{
+			"appId":       APP_ID,
+			"accessToken": s.AccessToken,
+		}).
+		SetHeader("X-Request-ID", uuid.NewString()).
+		Get(API_URL + "/getSessionForPC.action")
+	if err != nil {
+		return err
+	}
+	log.Debug(res.String())
+	if erron.ResCode != "" {
+		return fmt.Errorf(erron.ResMessage)
+	}
+
+	switch userSessionResp.ResCode {
+	case 0:
+		s.SessionKey = userSessionResp.SessionKey
+		s.SessionSecret = userSessionResp.SessionSecret
+		s.FamilySessionKey = userSessionResp.FamilySessionKey
+		s.FamilySessionSecret = userSessionResp.FamilySessionSecret
+	case 11, 18:
+		return s.login(account)
+	default:
+		account.Status = userSessionResp.ResMessage
+		_ = model.SaveAccount(account)
+		return fmt.Errorf(userSessionResp.ResMessage)
+	}
+	return nil
+}
+
+func (s *State) IsLogin(account *model.Account) bool {
+	_, err := s.Request(http.MethodGet, API_URL+"/getUserInfo.action", nil, func(r *resty.Request) { r.SetQueryParams(clientSuffix()) }, account)
+	return err == nil
+}
+
+func (s *State) Login(account *model.Account) error {
+	s.Lock()
+	defer s.Unlock()
+	return s.login(account)
+}
+
+func (s *State) RefreshSession(account *model.Account) error {
+	s.Lock()
+	defer s.Unlock()
+	return s.refreshSession(account)
+}
+
+func (s *State) Request(method string, fullUrl string, params Params, callback func(*resty.Request), account *model.Account) (*resty.Response, error) {
+	s.Lock()
+	dateOfGmt := getHttpDateStr()
+	sessionKey := s.SessionKey
+	sessionSecret := s.SessionSecret
+	if isFamily(account) {
+		sessionKey = s.FamilySessionKey
+		sessionSecret = s.FamilySessionSecret
+	}
+
+	req := s.client.R()
+	req.SetHeaders(map[string]string{
+		"Date":         dateOfGmt,
+		"SessionKey":   sessionKey,
+		"X-Request-ID": uuid.NewString(),
+	})
+
+	// 设置params
+	var paramsData string
+	if params != nil {
+		paramsData = AesECBEncrypt(params.Encode(), s.SessionSecret[:16])
+		req.SetQueryParam("params", paramsData)
+	}
+	req.SetHeader("Signature", signatureOfHmac(sessionSecret, sessionKey, method, fullUrl, dateOfGmt, paramsData))
+
+	if callback != nil {
+		callback(req)
+	}
+	s.Unlock()
+
+	res, err := req.Execute(method, fullUrl)
+	if err != nil {
+		return nil, err
+	}
+	log.Debug(res.String())
+
+	var erron Erron
+	utils.Json.Unmarshal(res.Body(), &erron)
+	if erron.ResCode != "" {
+		return nil, fmt.Errorf(erron.ResMessage)
+	}
+	if erron.Code != "" && erron.Code != "SUCCESS" {
+		if erron.Msg == "" {
+			if erron.Message == "" {
+				return nil, fmt.Errorf(res.String())
+			}
+			return nil, fmt.Errorf(erron.Message)
+		}
+		return nil, fmt.Errorf(erron.Msg)
+	}
+	if erron.ErrorCode != "" {
+		switch erron.ErrorCode {
+		case "InvalidSessionKey":
+			if err := s.RefreshSession(account); err != nil {
+				return nil, err
+			}
+			return s.Request(method, fullUrl, params, callback, account)
+		}
+		return nil, fmt.Errorf(erron.ErrorMsg)
+	}
+
+	switch utils.Json.Get(res.Body(), "res_code").ToInt64() {
+	case 11, 18:
+		if err := s.RefreshSession(account); err != nil {
+			return nil, err
+		}
+		return s.Request(method, fullUrl, params, callback, account)
+	case 0:
+		if res.StatusCode() == http.StatusOK {
+			return res, nil
+		}
+		return nil, fmt.Errorf(res.String())
+	default:
+		return nil, fmt.Errorf(utils.Json.Get(res.Body(), "res_message").ToString())
+	}
+}

drivers/189pc/driver.go

@@ -0,0 +1,912 @@
+package _189
+
+import (
+	"bytes"
+	"crypto/md5"
+	"encoding/base64"
+	"encoding/hex"
+	"fmt"
+	"io"
+	"io/ioutil"
+	"math"
+	"net/http"
+	"net/url"
+	"os"
+	"path/filepath"
+	"strings"
+
+	"github.com/Xhofe/alist/conf"
+	"github.com/Xhofe/alist/drivers/base"
+	"github.com/Xhofe/alist/model"
+	"github.com/Xhofe/alist/utils"
+	"github.com/go-resty/resty/v2"
+	log "github.com/sirupsen/logrus"
+)
+
+func init() {
+	base.RegisterDriver(new(Cloud189))
+}
+
+type Cloud189 struct {
+}
+
+func (driver Cloud189) Config() base.DriverConfig {
+	return base.DriverConfig{
+		Name: "189CloudPC",
+	}
+}
+
+func (driver Cloud189) Items() []base.Item {
+	return []base.Item{
+		{
+			Name:        "username",
+			Label:       "username",
+			Type:        base.TypeString,
+			Required:    true,
+			Description: "account username/phone number",
+		},
+		{
+			Name:        "password",
+			Label:       "password",
+			Type:        base.TypeString,
+			Required:    true,
+			Description: "account password",
+		},
+		{
+			Name:  "root_folder",
+			Label: "root folder file_id",
+			Type:  base.TypeString,
+		},
+		{
+			Name:     "internal_type",
+			Label:    "189cloud type",
+			Type:     base.TypeSelect,
+			Required: true,
+			Values:   "Personal,Family",
+		},
+		{
+			Name:  "site_id",
+			Label: "family id",
+			Type:  base.TypeString,
+		},
+		{
+			Name:     "order_by",
+			Label:    "order_by",
+			Type:     base.TypeSelect,
+			Values:   "filename,filesize,lastOpTime",
+			Required: true,
+		},
+		{
+			Name:     "order_direction",
+			Label:    "desc",
+			Type:     base.TypeSelect,
+			Values:   "true,false",
+			Required: true,
+		},
+		{
+			Name:  "bool_1",
+			Label: "fast upload",
+			Type:  base.TypeBool,
+		},
+	}
+}
+
+func (driver Cloud189) Save(account *model.Account, old *model.Account) error {
+	if account == nil {
+		return nil
+	}
+
+	if !isFamily(account) && account.RootFolder == "" {
+		account.RootFolder = "-11"
+		account.SiteId = ""
+	}
+	if isFamily(account) && account.RootFolder == "-11" {
+		account.RootFolder = ""
+	}
+
+	state := GetState(account)
+	if !state.IsLogin(account) {
+		if err := state.Login(account); err != nil {
+			return err
+		}
+	}
+
+	if isFamily(account) {
+		list, err := driver.getFamilyInfoList(account)
+		if err != nil {
+			return err
+		}
+		for _, l := range list {
+			if account.SiteId == "" {
+				account.SiteId = fmt.Sprint(l.FamilyID)
+			}
+			log.Infof("天翼家庭云 用户名：%s FamilyID %d\n", l.RemarkName, l.FamilyID)
+		}
+	}
+
+	account.Status = "work"
+	model.SaveAccount(account)
+	return nil
+}
+
+func (driver Cloud189) getFamilyInfoList(account *model.Account) ([]FamilyInfoResp, error) {
+	var resp FamilyInfoListResp
+	_, err := GetState(account).Request(http.MethodGet, API_URL+"/family/manage/getFamilyList.action", nil, func(r *resty.Request) {
+		r.SetQueryParams(clientSuffix())
+		r.SetResult(&resp)
+	}, account)
+	if err != nil {
+		return nil, err
+	}
+	return resp.FamilyInfoResp, nil
+}
+
+func (driver Cloud189) File(path string, account *model.Account) (*model.File, error) {
+	path = utils.ParsePath(path)
+	if path == "/" {
+		return &model.File{
+			Id:        account.RootFolder,
+			Name:      account.Name,
+			Size:      0,
+			Type:      conf.FOLDER,
+			Driver:    driver.Config().Name,
+			UpdatedAt: account.UpdatedAt,
+		}, nil
+	}
+	dir, name := filepath.Split(path)
+	files, err := driver.Files(dir, account)
+	if err != nil {
+		return nil, err
+	}
+	for _, file := range files {
+		if file.Name == name {
+			return &file, nil
+		}
+	}
+	return nil, base.ErrPathNotFound
+}
+
+func (driver Cloud189) Files(path string, account *model.Account) ([]model.File, error) {
+	path = utils.ParsePath(path)
+	cache, err := base.GetCache(path, account)
+	if err == nil {
+		files, _ := cache.([]model.File)
+		return files, nil
+	}
+
+	file, err := driver.File(path, account)
+	if err != nil {
+		return nil, err
+	}
+
+	fullUrl := API_URL
+	if isFamily(account) {
+		fullUrl += "/family/file"
+	}
+	fullUrl += "/listFiles.action"
+
+	files := make([]model.File, 0)
+	client := GetState(account)
+	for pageNum := 1; ; pageNum++ {
+		var resp Cloud189FilesResp
+		_, err = client.Request(http.MethodGet, fullUrl, nil, func(r *resty.Request) {
+			r.SetQueryParams(clientSuffix()).
+				SetQueryParams(map[string]string{
+					"folderId":   file.Id,
+					"fileType":   "0",
+					"mediaAttr":  "0",
+					"iconOption": "5",
+					"pageNum":    fmt.Sprint(pageNum),
+					"pageSize":   "130",
+				})
+			if isFamily(account) {
+				r.SetQueryParams(map[string]string{
+					"familyId":   account.SiteId,
+					"orderBy":    toFamilyOrderBy(account.OrderBy),
+					"descending": account.OrderDirection,
+				})
+			} else {
+				r.SetQueryParams(map[string]string{
+					"recursive":  "0",
+					"orderBy":    account.OrderBy,
+					"descending": account.OrderDirection,
+				})
+			}
+			r.SetResult(&resp)
+		}, account)
+		if err != nil {
+			return nil, err
+		}
+		// 获取完毕跳出
+		if resp.FileListAO.Count == 0 {
+			break
+		}
+
+		for _, folder := range resp.FileListAO.FolderList {
+			files = append(files, model.File{
+				Id:        fmt.Sprint(folder.ID),
+				Name:      folder.Name,
+				Size:      0,
+				Type:      conf.FOLDER,
+				Driver:    driver.Config().Name,
+				UpdatedAt: MustParseTime(folder.LastOpTime),
+			})
+		}
+		for _, file := range resp.FileListAO.FileList {
+			files = append(files, model.File{
+				Id:        fmt.Sprint(file.ID),
+				Name:      file.Name,
+				Size:      file.Size,
+				Type:      utils.GetFileType(filepath.Ext(file.Name)),
+				Driver:    driver.Config().Name,
+				UpdatedAt: MustParseTime(file.LastOpTime),
+				Thumbnail: file.Icon.SmallUrl,
+			})
+		}
+	}
+	if len(files) > 0 {
+		_ = base.SetCache(path, files, account)
+	}
+	return files, nil
+}
+
+func (driver Cloud189) Path(path string, account *model.Account) (*model.File, []model.File, error) {
+	path = utils.ParsePath(path)
+	log.Debugf("189PC path: %s", path)
+	file, err := driver.File(path, account)
+	if err != nil {
+		return nil, nil, err
+	}
+	if !file.IsDir() {
+		return file, nil, nil
+	}
+	files, err := driver.Files(path, account)
+	if err != nil {
+		return nil, nil, err
+	}
+	return nil, files, nil
+}
+
+func (driver Cloud189) Link(args base.Args, account *model.Account) (*base.Link, error) {
+	file, err := driver.File(utils.ParsePath(args.Path), account)
+	if err != nil {
+		return nil, err
+	}
+	if file.Type == conf.FOLDER {
+		return nil, base.ErrNotFile
+	}
+
+	fullUrl := API_URL
+	if isFamily(account) {
+		fullUrl += "/family/file"
+	}
+	fullUrl += "/getFileDownloadUrl.action"
+
+	var downloadUrl struct {
+		URL string `json:"fileDownloadUrl"`
+	}
+	_, err = GetState(account).Request(http.MethodGet, fullUrl, nil, func(r *resty.Request) {
+		r.SetQueryParams(clientSuffix()).SetQueryParam("fileId", file.Id)
+		if isFamily(account) {
+			r.SetQueryParams(map[string]string{
+				"familyId": account.SiteId,
+			})
+		} else {
+			r.SetQueryParams(map[string]string{
+				"dt":   "3",
+				"flag": "1",
+			})
+		}
+		r.SetResult(&downloadUrl)
+	}, account)
+	if err != nil {
+		return nil, err
+	}
+	return &base.Link{
+		Headers: []base.Header{
+			{Name: "User-Agent", Value: base.UserAgent},
+		},
+		Url: strings.ReplaceAll(downloadUrl.URL, "&", "&"),
+	}, nil
+}
+
+func (driver Cloud189) Preview(path string, account *model.Account) (interface{}, error) {
+	return nil, base.ErrNotSupport
+}
+
+func (driver Cloud189) MakeDir(path string, account *model.Account) error {
+	dir, name := filepath.Split(path)
+	parentFile, err := driver.File(dir, account)
+	if err != nil {
+		return err
+	}
+	if !parentFile.IsDir() {
+		return base.ErrNotFolder
+	}
+
+	fullUrl := API_URL
+	if isFamily(account) {
+		fullUrl += "/family/file"
+	}
+	fullUrl += "/createFolder.action"
+
+	_, err = GetState(account).Request(http.MethodPost, fullUrl, nil, func(r *resty.Request) {
+		r.SetQueryParams(clientSuffix()).SetQueryParams(map[string]string{
+			"folderName":   name,
+			"relativePath": "",
+		})
+		if isFamily(account) {
+			r.SetQueryParams(map[string]string{
+				"familyId": account.SiteId,
+				"parentId": parentFile.Id,
+			})
+		} else {
+			r.SetQueryParams(map[string]string{
+				"parentFolderId": parentFile.Id,
+			})
+		}
+	}, account)
+	return err
+}
+
+func (driver Cloud189) Move(src string, dst string, account *model.Account) error {
+	srcFile, err := driver.File(src, account)
+	if err != nil {
+		return err
+	}
+
+	dstDirFile, err := driver.File(filepath.Dir(dst), account)
+	if err != nil {
+		return err
+	}
+
+	_, err = GetState(account).Request(http.MethodPost, API_URL+"/batch/createBatchTask.action", nil, func(r *resty.Request) {
+		r.SetFormData(clientSuffix()).SetFormData(map[string]string{
+			"type": "MOVE",
+			"taskInfos": string(MustToBytes(utils.Json.Marshal(
+				[]*BatchTaskInfo{
+					{
+						FileId:   srcFile.Id,
+						FileName: srcFile.Name,
+						IsFolder: BoolToNumber(srcFile.IsDir()),
+					},
+				}))),
+			"targetFolderId": dstDirFile.Id,
+		})
+		if isFamily(account) {
+			r.SetFormData(map[string]string{
+				"familyId": account.SiteId,
+			})
+		}
+	}, account)
+	return err
+}
+
+/*
+func (driver Cloud189) Move(src string, dst string, account *model.Account) error {
+	srcFile, err := driver.File(src, account)
+	if err != nil {
+		return err
+	}
+
+	dstDirFile, err := driver.File(filepath.Dir(dst), account)
+	if err != nil {
+		return err
+	}
+
+	var queryParam map[string]string
+	fullUrl := API_URL
+	method := http.MethodPost
+	if isFamily(account) {
+		fullUrl += "/family/file"
+		method = http.MethodGet
+	}
+	if srcFile.IsDir() {
+		fullUrl += "/moveFolder.action"
+		queryParam = map[string]string{
+			"folderId":       srcFile.Id,
+			"destFolderName": srcFile.Name,
+		}
+	} else {
+		fullUrl += "/moveFile.action"
+		queryParam = map[string]string{
+			"fileId":       srcFile.Id,
+			"destFileName": srcFile.Name,
+		}
+	}
+
+	_, err = GetState(account).Request(method, fullUrl, nil, func(r *resty.Request) {
+		r.SetQueryParams(queryParam).SetQueryParams(clientSuffix())
+		if isFamily(account) {
+			r.SetQueryParams(map[string]string{
+				"familyId":     account.SiteId,
+				"destParentId": dstDirFile.Id,
+			})
+		} else {
+			r.SetQueryParam("destParentFolderId", dstDirFile.Id)
+		}
+	}, account)
+	return err
+}*/
+
+func (driver Cloud189) Rename(src string, dst string, account *model.Account) error {
+	srcFile, err := driver.File(src, account)
+	if err != nil {
+		return err
+	}
+
+	var queryParam map[string]string
+	fullUrl := API_URL
+	method := http.MethodPost
+	if isFamily(account) {
+		fullUrl += "/family/file"
+		method = http.MethodGet
+	}
+	if srcFile.IsDir() {
+		fullUrl += "/renameFolder.action"
+		queryParam = map[string]string{
+			"folderId":       srcFile.Id,
+			"destFolderName": filepath.Base(dst),
+		}
+	} else {
+		fullUrl += "/renameFile.action"
+		queryParam = map[string]string{
+			"fileId":       srcFile.Id,
+			"destFileName": filepath.Base(dst),
+		}
+	}
+
+	_, err = GetState(account).Request(method, fullUrl, nil, func(r *resty.Request) {
+		r.SetQueryParams(queryParam).SetQueryParams(clientSuffix())
+		if isFamily(account) {
+			r.SetQueryParam("familyId", account.SiteId)
+		}
+	}, account)
+	return err
+}
+
+func (driver Cloud189) Copy(src string, dst string, account *model.Account) error {
+	srcFile, err := driver.File(src, account)
+	if err != nil {
+		return err
+	}
+
+	dstDirFile, err := driver.File(filepath.Dir(dst), account)
+	if err != nil {
+		return err
+	}
+
+	_, err = GetState(account).Request(http.MethodPost, API_URL+"/batch/createBatchTask.action", nil, func(r *resty.Request) {
+		r.SetFormData(clientSuffix()).SetFormData(map[string]string{
+			"type": "COPY",
+			"taskInfos": string(MustToBytes(utils.Json.Marshal(
+				[]*BatchTaskInfo{
+					{
+						FileId:   srcFile.Id,
+						FileName: srcFile.Name,
+						IsFolder: BoolToNumber(srcFile.IsDir()),
+					},
+				}))),
+			"targetFolderId": dstDirFile.Id,
+			"targetFileName": filepath.Base(dst),
+		})
+		if isFamily(account) {
+			r.SetFormData(map[string]string{
+				"familyId": account.SiteId,
+			})
+		}
+	}, account)
+	return err
+}
+
+func (driver Cloud189) Delete(path string, account *model.Account) error {
+	path = utils.ParsePath(path)
+	srcFile, err := driver.File(path, account)
+	if err != nil {
+		return err
+	}
+
+	_, err = GetState(account).Request(http.MethodPost, API_URL+"/batch/createBatchTask.action", nil, func(r *resty.Request) {
+		r.SetFormData(clientSuffix()).SetFormData(map[string]string{
+			"type": "DELETE",
+			"taskInfos": string(MustToBytes(utils.Json.Marshal(
+				[]*BatchTaskInfo{
+					{
+						FileId:   srcFile.Id,
+						FileName: srcFile.Name,
+						IsFolder: BoolToNumber(srcFile.IsDir()),
+					},
+				}))),
+		})
+
+		if isFamily(account) {
+			r.SetFormData(map[string]string{
+				"familyId": account.SiteId,
+			})
+		}
+	}, account)
+	return err
+}
+
+func (driver Cloud189) Upload(file *model.FileStream, account *model.Account) error {
+	if file == nil {
+		return base.ErrEmptyFile
+	}
+
+	parentFile, err := driver.File(file.ParentPath, account)
+	if err != nil {
+		return err
+	}
+	if !parentFile.IsDir() {
+		return base.ErrNotFolder
+	}
+
+	if account.Bool1 {
+		return driver.FastUpload(file, parentFile, account)
+	}
+	return driver.CommonUpload(file, parentFile, account)
+	/*
+		if isFamily(account) {
+			return driver.uploadFamily(file, parentFile, account)
+		}
+		return driver.uploadPerson(file, parentFile, account)
+	*/
+}
+
+func (driver Cloud189) CommonUpload(file *model.FileStream, parentFile *model.File, account *model.Account) error {
+	// 初始化上传
+	state := GetState(account)
+	const DEFAULT int64 = 10485760
+	count := int(math.Ceil(float64(file.Size) / float64(DEFAULT)))
+
+	params := Params{
+		"parentFolderId": parentFile.Id,
+		"fileName":       url.PathEscape(file.Name),
+		"fileSize":       fmt.Sprint(file.Size),
+		"sliceSize":      fmt.Sprint(DEFAULT),
+		"lazyCheck":      "1",
+	}
+
+	fullUrl := UPLOAD_URL
+	if isFamily(account) {
+		params.Set("familyId", account.SiteId)
+		fullUrl += "/family"
+	} else {
+		//params.Set("extend", `{"opScene":"1","relativepath":"","rootfolderid":""}`)
+		fullUrl += "/person"
+	}
+
+	var initMultiUpload InitMultiUploadResp
+	_, err := state.Request(http.MethodGet, fullUrl+"/initMultiUpload", params, func(r *resty.Request) { r.SetQueryParams(clientSuffix()).SetResult(&initMultiUpload) }, account)
+	if err != nil {
+		return err
+	}
+
+	fileMd5 := md5.New()
+	silceMd5 := md5.New()
+	silceMd5Hexs := make([]string, 0, count)
+	byteData := bytes.NewBuffer(make([]byte, DEFAULT))
+	for i := 1; i <= count; i++ {
+		byteData.Reset()
+		silceMd5.Reset()
+		if n, err := io.CopyN(io.MultiWriter(fileMd5, silceMd5, byteData), file, DEFAULT); err != io.EOF && n == 0 {
+			return err
+		}
+		md5Bytes := silceMd5.Sum(nil)
+		silceMd5Hexs = append(silceMd5Hexs, strings.ToUpper(hex.EncodeToString(md5Bytes)))
+		silceMd5Base64 := base64.StdEncoding.EncodeToString(md5Bytes)
+
+		var uploadUrl UploadUrlsResp
+		_, err = state.Request(http.MethodGet, fullUrl+"/getMultiUploadUrls",
+			Params{"partInfo": fmt.Sprintf("%d-%s", i, silceMd5Base64), "uploadFileId": initMultiUpload.Data.UploadFileID},
+			func(r *resty.Request) { r.SetQueryParams(clientSuffix()).SetResult(&uploadUrl) },
+			account)
+		if err != nil {
+			return err
+		}
+
+		uploadData := uploadUrl.UploadUrls[fmt.Sprint("partNumber_", i)]
+		req, _ := http.NewRequest(http.MethodPut, uploadData.RequestURL, byteData)
+		for k, v := range ParseHttpHeader(uploadData.RequestHeader) {
+			req.Header.Set(k, v)
+		}
+		for k, v := range clientSuffix() {
+			req.URL.RawQuery += fmt.Sprintf("&%s=%s", k, v)
+		}
+		r, err := base.HttpClient.Do(req)
+		if err != nil {
+			return err
+		}
+		if r.StatusCode != http.StatusOK {
+			data, _ := io.ReadAll(r.Body)
+			return fmt.Errorf(string(data))
+		}
+	}
+
+	fileMd5Hex := strings.ToUpper(hex.EncodeToString(fileMd5.Sum(nil)))
+	sliceMd5Hex := fileMd5Hex
+	if int64(file.Size) > DEFAULT {
+		sliceMd5Hex = strings.ToUpper(utils.GetMD5Encode(strings.Join(silceMd5Hexs, "\n")))
+	}
+
+	_, err = state.Request(http.MethodGet, fullUrl+"/commitMultiUploadFile",
+		Params{
+			"uploadFileId": initMultiUpload.Data.UploadFileID,
+			"fileMd5":      fileMd5Hex,
+			"sliceMd5":     sliceMd5Hex,
+			"lazyCheck":    "1",
+			"isLog":        "0",
+			"opertype":     "3",
+		},
+		func(r *resty.Request) { r.SetQueryParams(clientSuffix()) }, account)
+	return err
+}
+
+func (driver Cloud189) FastUpload(file *model.FileStream, parentFile *model.File, account *model.Account) error {
+	tempFile, err := ioutil.TempFile(conf.Conf.TempDir, "file-*")
+	if err != nil {
+		return err
+	}
+	defer tempFile.Close()
+	defer os.Remove(tempFile.Name())
+
+	// 初始化上传
+	state := GetState(account)
+
+	const DEFAULT int64 = 10485760
+	count := int(math.Ceil(float64(file.Size) / float64(DEFAULT)))
+
+	// 优先计算所需信息
+	fileMd5 := md5.New()
+	silceMd5 := md5.New()
+	silceMd5Hexs := make([]string, 0, count)
+	silceMd5Base64s := make([]string, 0, count)
+	for i := 1; i <= count; i++ {
+		silceMd5.Reset()
+		if n, err := io.CopyN(io.MultiWriter(fileMd5, silceMd5, tempFile), file, DEFAULT); err != nil && n == 0 {
+			return err
+		}
+		md5Byte := silceMd5.Sum(nil)
+		silceMd5Hexs = append(silceMd5Hexs, strings.ToUpper(hex.EncodeToString(md5Byte)))
+		silceMd5Base64s = append(silceMd5Base64s, fmt.Sprint(i, "-", base64.StdEncoding.EncodeToString(md5Byte)))
+	}
+	fileMd5Hex := strings.ToUpper(hex.EncodeToString(fileMd5.Sum(nil)))
+	sliceMd5Hex := fileMd5Hex
+	if int64(file.Size) > DEFAULT {
+		sliceMd5Hex = strings.ToUpper(utils.GetMD5Encode(strings.Join(silceMd5Hexs, "\n")))
+	}
+
+	params := Params{
+		"parentFolderId": parentFile.Id,
+		"fileName":       url.PathEscape(file.Name),
+		"fileSize":       fmt.Sprint(file.Size),
+		"fileMd5":        fileMd5Hex,
+		"sliceSize":      fmt.Sprint(DEFAULT),
+		"sliceMd5":       sliceMd5Hex,
+	}
+
+	fullUrl := UPLOAD_URL
+	if isFamily(account) {
+		params.Set("familyId", account.SiteId)
+		fullUrl += "/family"
+	} else {
+		//params.Set("extend", `{"opScene":"1","relativepath":"","rootfolderid":""}`)
+		fullUrl += "/person"
+	}
+
+	var uploadInfo InitMultiUploadResp
+	_, err = state.Request(http.MethodGet, fullUrl+"/initMultiUpload", params, func(r *resty.Request) { r.SetQueryParams(clientSuffix()).SetResult(&uploadInfo) }, account)
+	if err != nil {
+		return err
+	}
+
+	if uploadInfo.Data.FileDataExists != 1 {
+		var uploadUrls UploadUrlsResp
+		_, err := state.Request(http.MethodGet, fullUrl+"/getMultiUploadUrls",
+			Params{
+				"uploadFileId": uploadInfo.Data.UploadFileID,
+				"partInfo":     strings.Join(silceMd5Base64s, ","),
+			},
+			func(r *resty.Request) { r.SetQueryParams(clientSuffix()).SetResult(&uploadUrls) },
+			account)
+		if err != nil {
+			return err
+		}
+		for i := 1; i <= count; i++ {
+			uploadData := uploadUrls.UploadUrls[fmt.Sprint("partNumber_", i)]
+			req, _ := http.NewRequest(http.MethodPut, uploadData.RequestURL, io.NewSectionReader(tempFile, int64(i-1)*DEFAULT, DEFAULT))
+			for k, v := range ParseHttpHeader(uploadData.RequestHeader) {
+				req.Header.Set(k, v)
+			}
+			for k, v := range clientSuffix() {
+				req.URL.RawQuery += fmt.Sprintf("&%s=%s", k, v)
+			}
+			r, err := base.HttpClient.Do(req)
+			if err != nil {
+				return err
+			}
+			if r.StatusCode != http.StatusOK {
+				data, _ := io.ReadAll(r.Body)
+				return fmt.Errorf(string(data))
+			}
+		}
+	}
+
+	_, err = state.Request(http.MethodGet, fullUrl+"/commitMultiUploadFile",
+		Params{
+			"uploadFileId": uploadInfo.Data.UploadFileID,
+			"isLog":        "0",
+			"opertype":     "3",
+		},
+		func(r *resty.Request) { r.SetQueryParams(clientSuffix()) },
+		account)
+	return err
+}
+
+/*
+func (driver Cloud189) uploadFamily(file *model.FileStream, parentFile *model.File, account *model.Account) error {
+	tempFile, err := ioutil.TempFile(conf.Conf.TempDir, "file-*")
+	if err != nil {
+		return err
+	}
+
+	defer tempFile.Close()
+	defer os.Remove(tempFile.Name())
+
+	fileMd5 := md5.New()
+	if _, err = io.Copy(io.MultiWriter(fileMd5, tempFile), file); err != nil {
+		return err
+	}
+
+	client := GetState(account)
+	var createUpload CreateUploadFileResult
+	_, err = client.Request(http.MethodGet, API_URL+"/family/file/createFamilyFile.action", nil, func(r *resty.Request) {
+		r.SetQueryParams(map[string]string{
+			"fileMd5":      hex.EncodeToString(fileMd5.Sum(nil)),
+			"fileName":     file.Name,
+			"familyId":     account.SiteId,
+			"parentId":     parentFile.Id,
+			"resumePolicy": "1",
+			"fileSize":     fmt.Sprint(file.Size),
+		})
+		r.SetQueryParams(clientSuffix())
+		r.SetResult(&createUpload)
+	}, account)
+	if err != nil {
+		return err
+	}
+
+	if createUpload.FileDataExists != 1 {
+		if createUpload.UploadFileId, err = driver.uploadFileData(file, tempFile, createUpload, account); err != nil {
+			return err
+		}
+	}
+
+	_, err = client.Request(http.MethodGet, createUpload.FileCommitUrl, nil, func(r *resty.Request) {
+		r.SetQueryParams(clientSuffix())
+		r.SetHeaders(map[string]string{
+			"FamilyId":     account.SiteId,
+			"uploadFileId": fmt.Sprint(createUpload.UploadFileId),
+			"ResumePolicy": "1",
+		})
+	}, account)
+	return err
+}
+
+func (driver Cloud189) uploadPerson(file *model.FileStream, parentFile *model.File, account *model.Account) error {
+	tempFile, err := ioutil.TempFile(conf.Conf.TempDir, "file-*")
+	if err != nil {
+		return err
+	}
+
+	defer tempFile.Close()
+	defer os.Remove(tempFile.Name())
+
+	fileMd5 := md5.New()
+	if _, err = io.Copy(io.MultiWriter(fileMd5, tempFile), file); err != nil {
+		return err
+	}
+
+	client := GetState(account)
+	var createUpload CreateUploadFileResult
+	_, err = client.Request(http.MethodPost, API_URL+"/createUploadFile.action", nil, func(r *resty.Request) {
+		r.SetQueryParams(clientSuffix())
+		r.SetFormData(clientSuffix()).SetFormData(map[string]string{
+			"parentFolderId": parentFile.Id,
+			"baseFileId":     "",
+			"fileName":       file.Name,
+			"size":           fmt.Sprint(file.Size),
+			"md5":            hex.EncodeToString(fileMd5.Sum(nil)),
+			//  "lastWrite":      param.LastWrite,
+			//	"localPath":      strings.ReplaceAll(file.ParentPath, "\\", "/"),
+			"opertype":     "1",
+			"flag":         "1",
+			"resumePolicy": "1",
+			"isLog":        "0",
+			"fileExt":      "",
+		})
+		r.SetResult(&createUpload)
+	}, account)
+	if err != nil {
+		return err
+	}
+
+	if createUpload.FileDataExists != 1 {
+		if createUpload.UploadFileId, err = driver.uploadFileData(file, tempFile, createUpload, account); err != nil {
+			return err
+		}
+	}
+
+	_, err = client.Request(http.MethodPost, createUpload.FileCommitUrl, nil, func(r *resty.Request) {
+		r.SetQueryParams(clientSuffix())
+		r.SetFormData(map[string]string{
+			"uploadFileId": fmt.Sprint(createUpload.UploadFileId),
+			"opertype":     "5", //5 覆盖 1 重命名
+			"ResumePolicy": "1",
+			"isLog":        "0",
+		})
+	}, account)
+	return err
+}
+
+func (driver Cloud189) uploadFileData(file *model.FileStream, tempFile *os.File, createUpload CreateUploadFileResult, account *model.Account) (int64, error) {
+	uploadFileState, err := driver.getUploadFileState(createUpload.UploadFileId, account)
+	if err != nil {
+		return 0, err
+	}
+
+	if uploadFileState.FileDataExists == 1 || uploadFileState.DataSize == int64(file.Size) {
+		return uploadFileState.UploadFileId, nil
+	}
+
+	if _, err = tempFile.Seek(uploadFileState.DataSize, io.SeekStart); err != nil {
+		return 0, err
+	}
+
+	_, err = GetState(account).Request("PUT", uploadFileState.FileUploadUrl, nil, func(r *resty.Request) {
+		r.SetQueryParams(clientSuffix())
+		r.SetHeaders(map[string]string{
+			"Content-Type":           "application/octet-stream",
+			"ResumePolicy":           "1",
+			"Edrive-UploadFileRange": fmt.Sprintf("bytes=%d-%d", uploadFileState.DataSize, file.Size),
+			"Expect":                 "100-continue",
+		})
+		if isFamily(account) {
+			r.SetHeaders(map[string]string{
+				"familyId":     account.SiteId,
+				"UploadFileId": fmt.Sprint(uploadFileState.UploadFileId),
+			})
+		} else {
+			r.SetHeader("Edrive-UploadFileId", fmt.Sprint(uploadFileState.UploadFileId))
+		}
+		r.SetBody(tempFile)
+	}, account)
+	return uploadFileState.UploadFileId, err
+}
+
+func (driver Cloud189) getUploadFileState(uploadFileId int64, account *model.Account) (*UploadFileStatusResult, error) {
+	fullUrl := API_URL
+	if isFamily(account) {
+		fullUrl += "/family/file/getFamilyFileStatus.action"
+	} else {
+		fullUrl += "/getUploadFileStatus.action"
+	}
+	var uploadFileState UploadFileStatusResult
+	_, err := GetState(account).Request(http.MethodGet, fullUrl, nil, func(r *resty.Request) {
+		r.SetQueryParams(clientSuffix())
+		r.SetQueryParams(map[string]string{
+			"uploadFileId": fmt.Sprint(uploadFileId),
+			"resumePolicy": "1",
+		})
+		if isFamily(account) {
+			r.SetQueryParam("familyId", account.SiteId)
+		}
+		r.SetResult(&uploadFileState)
+	}, account)
+	if err != nil {
+		return nil, err
+	}
+	return &uploadFileState, nil
+}*/
+
+var _ base.Driver = (*Cloud189)(nil)

drivers/189pc/type.go

@@ -0,0 +1,180 @@
+package _189
+
+import "encoding/xml"
+
+type LoginParam struct {
+	CaptchaToken string
+	Lt           string
+	ParamId      string
+	ReqId        string
+	jRsaKey      string
+
+	vCodeID string
+	vCodeRS string
+}
+
+// 居然有四种返回方式
+type Erron struct {
+	ResCode    string `json:"res_code"`
+	ResMessage string `json:"res_message"`
+
+	XMLName xml.Name `xml:"error"`
+	Code    string   `json:"code" xml:"code"`
+	Message string   `json:"message" xml:"message"`
+
+	// Code    string `json:"code"`
+	Msg string `json:"msg"`
+
+	ErrorCode string `json:"errorCode"`
+	ErrorMsg  string `json:"errorMsg"`
+}
+
+// 刷新session返回
+type UserSessionResp struct {
+	ResCode    int    `json:"res_code"`
+	ResMessage string `json:"res_message"`
+
+	LoginName string `json:"loginName"`
+
+	KeepAlive       int `json:"keepAlive"`
+	GetFileDiffSpan int `json:"getFileDiffSpan"`
+	GetUserInfoSpan int `json:"getUserInfoSpan"`
+
+	// 个人云
+	SessionKey    string `json:"sessionKey"`
+	SessionSecret string `json:"sessionSecret"`
+	// 家庭云
+	FamilySessionKey    string `json:"familySessionKey"`
+	FamilySessionSecret string `json:"familySessionSecret"`
+}
+
+//登录返回
+type appSessionResp struct {
+	UserSessionResp
+
+	IsSaveName string `json:"isSaveName"`
+
+	// 会话刷新Token
+	AccessToken string `json:"accessToken"`
+	//Token刷新
+	RefreshToken string `json:"refreshToken"`
+}
+
+type FamilyInfoListResp struct {
+	FamilyInfoResp []FamilyInfoResp `json:"familyInfoResp"`
+}
+type FamilyInfoResp struct {
+	Count      int    `json:"count"`
+	CreateTime string `json:"createTime"`
+	FamilyID   int    `json:"familyId"`
+	RemarkName string `json:"remarkName"`
+	Type       int    `json:"type"`
+	UseFlag    int    `json:"useFlag"`
+	UserRole   int    `json:"userRole"`
+}
+
+/*文件部分*/
+// 文件
+type Cloud189File struct {
+	CreateDate string `json:"createDate"`
+	FileCata   int64  `json:"fileCata"`
+	Icon       struct {
+		//iconOption 5
+		SmallUrl string `json:"smallUrl"`
+		LargeUrl string `json:"largeUrl"`
+
+		// iconOption 10
+		Max600    string `json:"max600"`
+		MediumURL string `json:"mediumUrl"`
+	} `json:"icon"`
+	ID          int64  `json:"id"`
+	LastOpTime  string `json:"lastOpTime"`
+	Md5         string `json:"md5"`
+	MediaType   int    `json:"mediaType"`
+	Name        string `json:"name"`
+	Orientation int64  `json:"orientation"`
+	Rev         string `json:"rev"`
+	Size        int64  `json:"size"`
+	StarLabel   int64  `json:"starLabel"`
+}
+
+// 文件夹
+type Cloud189Folder struct {
+	ID       int64  `json:"id"`
+	ParentID int64  `json:"parentId"`
+	Name     string `json:"name"`
+
+	FileCata  int64 `json:"fileCata"`
+	FileCount int64 `json:"fileCount"`
+
+	LastOpTime string `json:"lastOpTime"`
+	CreateDate string `json:"createDate"`
+
+	FileListSize int64  `json:"fileListSize"`
+	Rev          string `json:"rev"`
+	StarLabel    int64  `json:"starLabel"`
+}
+
+type Cloud189FilesResp struct {
+	//ResCode    int    `json:"res_code"`
+	//ResMessage string `json:"res_message"`
+	FileListAO struct {
+		Count      int              `json:"count"`
+		FileList   []Cloud189File   `json:"fileList"`
+		FolderList []Cloud189Folder `json:"folderList"`
+	} `json:"fileListAO"`
+}
+
+// TaskInfo 任务信息
+type BatchTaskInfo struct {
+	// FileId 文件ID
+	FileId string `json:"fileId"`
+	// FileName 文件名
+	FileName string `json:"fileName"`
+	// IsFolder 是否是文件夹，0-否，1-是
+	IsFolder int `json:"isFolder"`
+	// SrcParentId 文件所在父目录ID
+	//SrcParentId string `json:"srcParentId"`
+}
+
+/*
+type CreateUploadFileResult struct {
+	// UploadFileId 上传文件请求ID
+	UploadFileId int64 `json:"uploadFileId"`
+	// FileUploadUrl 上传文件数据的URL路径
+	FileUploadUrl string `json:"fileUploadUrl"`
+	// FileCommitUrl 上传文件完成后确认路径
+	FileCommitUrl string `json:"fileCommitUrl"`
+	// FileDataExists 文件是否已存在云盘中，0-未存在，1-已存在
+	FileDataExists int `json:"fileDataExists"`
+}
+
+type UploadFileStatusResult struct {
+	// 上传文件的ID
+	UploadFileId int64 `json:"uploadFileId"`
+	// 已上传的大小
+	DataSize       int64  `json:"dataSize"`
+	FileUploadUrl  string `json:"fileUploadUrl"`
+	FileCommitUrl  string `json:"fileCommitUrl"`
+	FileDataExists int    `json:"fileDataExists"`
+}
+*/
+
+type InitMultiUploadResp struct {
+	//Code string `json:"code"`
+	Data struct {
+		UploadType     int    `json:"uploadType"`
+		UploadHost     string `json:"uploadHost"`
+		UploadFileID   string `json:"uploadFileId"`
+		FileDataExists int    `json:"fileDataExists"`
+	} `json:"data"`
+}
+type UploadUrlsResp struct {
+	Code       string          `json:"code"`
+	UploadUrls map[string]Part `json:"uploadUrls"`
+}
+
+type Part struct {
+	RequestURL    string `json:"requestURL"`
+	RequestHeader string `json:"requestHeader"`
+}

drivers/189pc/util.go

@@ -0,0 +1,177 @@
+package _189
+
+import (
+	"bytes"
+	"crypto/aes"
+	"crypto/hmac"
+	"crypto/rand"
+	"crypto/rsa"
+	"crypto/sha1"
+	"crypto/x509"
+	"encoding/base64"
+	"encoding/hex"
+	"encoding/pem"
+	"fmt"
+	rand2 "math/rand"
+	"net/http"
+	"net/url"
+	"sort"
+	"strings"
+	"time"
+
+	"github.com/Xhofe/alist/model"
+)
+
+const (
+	APP_ID      = "8025431004"
+	CLIENT_TYPE = "10020"
+	VERSION     = "6.2"
+
+	WEB_URL    = "https://cloud.189.cn"
+	AUTH_URL   = "https://open.e.189.cn"
+	API_URL    = "https://api.cloud.189.cn"
+	UPLOAD_URL = "https://upload.cloud.189.cn"
+
+	RETURN_URL = "https://m.cloud.189.cn/zhuanti/2020/loginErrorPc/index.html"
+
+	PC  = "TELEPC"
+	MAC = "TELEMAC"
+
+	CHANNEL_ID = "web_cloud.189.cn"
+)
+
+func clientSuffix() map[string]string {
+	return map[string]string{
+		"clientType": PC,
+		"version":    VERSION,
+		"channelId":  CHANNEL_ID,
+		"rand":       fmt.Sprintf("%d_%d", rand2.Int63n(1e5), rand2.Int63n(1e10)),
+	}
+}
+
+// 带params的SignatureOfHmac HMAC签名
+func signatureOfHmac(sessionSecret, sessionKey, operate, fullUrl, dateOfGmt, param string) string {
+	u, _ := url.Parse(fullUrl)
+	mac := hmac.New(sha1.New, []byte(sessionSecret))
+	data := fmt.Sprintf("SessionKey=%s&Operate=%s&RequestURI=%s&Date=%s", sessionKey, operate, u.Path, dateOfGmt)
+	if param != "" {
+		data += fmt.Sprintf("&params=%s", param)
+	}
+	mac.Write([]byte(data))
+	return strings.ToUpper(hex.EncodeToString(mac.Sum(nil)))
+}
+
+// 获取http规范的时间
+func getHttpDateStr() string {
+	return time.Now().UTC().Format(http.TimeFormat)
+}
+
+// RAS 加密用户名密码
+func rsaEncrypt(publicKey, origData string) string {
+	block, _ := pem.Decode([]byte(publicKey))
+	pubInterface, _ := x509.ParsePKIXPublicKey(block.Bytes)
+	data, _ := rsa.EncryptPKCS1v15(rand.Reader, pubInterface.(*rsa.PublicKey), []byte(origData))
+	return base64ToHex(base64.StdEncoding.EncodeToString(data))
+}
+
+// aes 加密params
+func AesECBEncrypt(data, key string) string {
+	block, _ := aes.NewCipher([]byte(key))
+	paddingData := PKCS7Padding([]byte(data), block.BlockSize())
+	decrypted := make([]byte, len(paddingData))
+	size := block.BlockSize()
+	for src, dst := paddingData, decrypted; len(src) > 0; src, dst = src[size:], dst[size:] {
+		block.Encrypt(dst[:size], src[:size])
+	}
+	return strings.ToUpper(hex.EncodeToString(decrypted))
+}
+
+func PKCS7Padding(ciphertext []byte, blockSize int) []byte {
+	padding := blockSize - len(ciphertext)%blockSize
+	padtext := bytes.Repeat([]byte{byte(padding)}, padding)
+	return append(ciphertext, padtext...)
+}
+
+// 时间戳
+func timestamp() int64 {
+	return time.Now().UTC().UnixNano() / 1e6
+}
+
+func base64ToHex(a string) string {
+	v, _ := base64.StdEncoding.DecodeString(a)
+	return strings.ToUpper(hex.EncodeToString(v))
+}
+
+func isFamily(account *model.Account) bool {
+	return account.InternalType == "Family"
+}
+
+func toFamilyOrderBy(o string) string {
+	switch o {
+	case "filename":
+		return "1"
+	case "filesize":
+		return "2"
+	case "lastOpTime":
+		return "3"
+	default:
+		return "1"
+	}
+}
+
+func ParseHttpHeader(str string) map[string]string {
+	header := make(map[string]string)
+	for _, value := range strings.Split(str, "&") {
+		i := strings.Index(value, "=")
+		header[strings.TrimSpace(value[0:i])] = strings.TrimSpace(value[i+1:])
+	}
+	return header
+}
+
+func MustString(str string, err error) string {
+	return str
+}
+
+func MustToBytes(b []byte, err error) []byte {
+	return b
+}
+
+func BoolToNumber(b bool) int {
+	if b {
+		return 1
+	}
+	return 0
+}
+
+func MustParseTime(str string) *time.Time {
+	loc, _ := time.LoadLocation("Local")
+	lastOpTime, _ := time.ParseInLocation("2006-01-02 15:04:05", str, loc)
+	return &lastOpTime
+}
+
+type Params map[string]string
+
+func (p Params) Set(k, v string) {
+	p[k] = v
+}
+
+func (p Params) Encode() string {
+	if p == nil {
+		return ""
+	}
+	var buf strings.Builder
+	keys := make([]string, 0, len(p))
+	for k := range p {
+		keys = append(keys, k)
+	}
+	sort.Strings(keys)
+	for _, k := range keys {
+		if buf.Len() > 0 {
+			buf.WriteByte('&')
+		}
+		buf.WriteString(k)
+		buf.WriteByte('=')
+		buf.WriteString(p[k])
+	}
+	return buf.String()
+}

drivers/alidrive/alidrive.go

@@ -3,44 +3,17 @@ package alidrive
 import (
 	"errors"
 	"fmt"
-	"github.com/Xhofe/alist/conf"
 	"github.com/Xhofe/alist/drivers/base"
 	"github.com/Xhofe/alist/model"
 	"github.com/Xhofe/alist/utils"
 	"github.com/go-resty/resty/v2"
+	jsoniter "github.com/json-iterator/go"
 	log "github.com/sirupsen/logrus"
 	"path/filepath"
-	"strings"
-	"time"
 )
 
 var aliClient = resty.New()
 
-type AliRespError struct {
-	Code    string `json:"code"`
-	Message string `json:"message"`
-}
-
-type AliFiles struct {
-	Items      []AliFile `json:"items"`
-	NextMarker string    `json:"next_marker"`
-}
-
-type AliFile struct {
-	DriveId       string     `json:"drive_id"`
-	CreatedAt     *time.Time `json:"created_at"`
-	FileExtension string     `json:"file_extension"`
-	FileId        string     `json:"file_id"`
-	Type          string     `json:"type"`
-	Name          string     `json:"name"`
-	Category      string     `json:"category"`
-	ParentFileId  string     `json:"parent_file_id"`
-	UpdatedAt     *time.Time `json:"updated_at"`
-	Size          int64      `json:"size"`
-	Thumbnail     string     `json:"thumbnail"`
-	Url           string     `json:"url"`
-}
-
 func (driver AliDrive) FormatFile(file *AliFile) *model.File {
 	f := &model.File{
 		Id:        file.FileId,
@@ -51,17 +24,7 @@ func (driver AliDrive) FormatFile(file *AliFile) *model.File {
 		Driver:    driver.Config().Name,
 		Url:       file.Url,
 	}
-	if file.Type == "folder" {
-		f.Type = conf.FOLDER
-	} else {
-		f.Type = utils.GetFileType(file.FileExtension)
-	}
-	if file.Category == "video" {
-		f.Type = conf.VIDEO
-	}
-	if file.Category == "image" {
-		f.Type = conf.IMAGE
-	}
+	f.Type = file.GetType()
 	return f
 }
 
@@ -158,7 +121,7 @@ func (driver AliDrive) RefreshToken(account *model.Account) error {
 	return nil
 }
 
-func (driver AliDrive) Rename(fileId, name string, account *model.Account) error {
+func (driver AliDrive) rename(fileId, name string, account *model.Account) error {
 	var resp base.Json
 	var e AliRespError
 	_, err := aliClient.R().SetResult(&resp).SetError(&e).
@@ -179,7 +142,7 @@ func (driver AliDrive) Rename(fileId, name string, account *model.Account) error
 				return err
 			} else {
 				_ = model.SaveAccount(account)
-				return driver.Rename(fileId, name, account)
+				return driver.rename(fileId, name, account)
 			}
 		}
 		return fmt.Errorf("%s", e.Message)
@@ -190,7 +153,7 @@ func (driver AliDrive) Rename(fileId, name string, account *model.Account) error
 	return fmt.Errorf("%+v", resp)
 }
 
-func (driver AliDrive) Batch(srcId,dstId string, account *model.Account) error {
+func (driver AliDrive) batch(srcId, dstId string, url string, account *model.Account) error {
 	var e AliRespError
 	res, err := aliClient.R().SetError(&e).
 		SetHeader("authorization", "Bearer\t"+account.AccessToken).
@@ -200,14 +163,15 @@ func (driver AliDrive) Batch(srcId,dstId string, account *model.Account) error {
 					"headers": base.Json{
 						"Content-Type": "application/json",
 					},
-					"method":"POST",
-					"id":srcId,
-					"body":base.Json{
-						"drive_id": account.DriveId,
-						"file_id":srcId,
-						"to_drive_id":account.DriveId,
-						"to_parent_file_id":dstId,
+					"method": "POST",
+					"id":     srcId,
+					"body": base.Json{
+						"drive_id":          account.DriveId,
+						"file_id":           srcId,
+						"to_drive_id":       account.DriveId,
+						"to_parent_file_id": dstId,
 					},
+					"url": url,
 				},
 			},
 			"resource": "file",
@@ -222,12 +186,13 @@ func (driver AliDrive) Batch(srcId,dstId string, account *model.Account) error {
 				return err
 			} else {
 				_ = model.SaveAccount(account)
-				return driver.Batch(srcId, dstId, account)
+				return driver.batch(srcId, dstId, url, account)
 			}
 		}
 		return fmt.Errorf("%s", e.Message)
 	}
-	if strings.Contains(res.String(), `"status":200`) {
+	status := jsoniter.Get(res.Body(), "responses", 0, "status").ToInt()
+	if status < 400 && status >= 100 {
 		return nil
 	}
 	return errors.New(res.String())
@@ -236,6 +201,7 @@ func (driver AliDrive) Batch(srcId,dstId string, account *model.Account) error {
 func init() {
 	base.RegisterDriver(&AliDrive{})
 	aliClient.
+		SetTimeout(base.DefaultTimeout).
 		SetRetryCount(3).
 		SetHeader("user-agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.88 Safari/537.36").
 		SetHeader("content-type", "application/json").

drivers/alidrive/driver.go

@@ -2,19 +2,25 @@ package alidrive
 
 import (
 	"bytes"
+	"crypto/sha1"
+	"encoding/base64"
+	"encoding/hex"
 	"errors"
 	"fmt"
+	"io"
+	"io/ioutil"
+	"math"
+	"math/big"
+	"net/http"
+	"os"
+	"path/filepath"
+
 	"github.com/Xhofe/alist/conf"
 	"github.com/Xhofe/alist/drivers/base"
 	"github.com/Xhofe/alist/model"
 	"github.com/Xhofe/alist/utils"
-	"github.com/gin-gonic/gin"
 	"github.com/robfig/cron/v3"
 	log "github.com/sirupsen/logrus"
-	"io"
-	"math"
-	"net/http"
-	"path/filepath"
 )
 
 type AliDrive struct{}
@@ -60,6 +66,11 @@ func (driver AliDrive) Items() []base.Item {
 			Required:    false,
 			Description: ">0 and <=200",
 		},
+		{
+			Name:  "bool_1",
+			Label: "fast upload",
+			Type:  base.TypeBool,
+		},
 	}
 }
 
@@ -67,6 +78,9 @@ func (driver AliDrive) Save(account *model.Account, old *model.Account) error {
 	if old != nil {
 		conf.Cron.Remove(cron.EntryID(old.CronId))
 	}
+	if account == nil {
+		return nil
+	}
 	if account.RootFolder == "" {
 		account.RootFolder = "root"
 	}
@@ -85,15 +99,15 @@ func (driver AliDrive) Save(account *model.Account, old *model.Account) error {
 	log.Debugf("user info: %+v", resp)
 	account.DriveId = resp["default_drive_id"].(string)
 	cronId, err := conf.Cron.AddFunc("@every 2h", func() {
-		name := account.Name
-		log.Debugf("ali account name: %s", name)
-		newAccount, ok := model.GetAccount(name)
+		id := account.ID
+		log.Debugf("ali account id: %d", id)
+		newAccount, err := model.GetAccountById(id)
 		log.Debugf("ali account: %+v", newAccount)
-		if !ok {
+		if err != nil {
 			return
 		}
-		err = driver.RefreshToken(&newAccount)
-		_ = model.SaveAccount(&newAccount)
+		err = driver.RefreshToken(newAccount)
+		_ = model.SaveAccount(newAccount)
 	})
 	if err != nil {
 		return err
@@ -188,6 +202,12 @@ func (driver AliDrive) Link(args base.Args, account *model.Account) (*base.Link,
 		return nil, fmt.Errorf("%s", e.Message)
 	}
 	return &base.Link{
+		Headers: []base.Header{
+			{
+				Name:  "Referer",
+				Value: "https://www.aliyundrive.com/",
+			},
+		},
 		Url: resp["url"].(string),
 	}, nil
 }
@@ -209,10 +229,10 @@ func (driver AliDrive) Path(path string, account *model.Account) (*model.File, [
 	return nil, files, nil
 }
 
-func (driver AliDrive) Proxy(c *gin.Context, account *model.Account) {
-	c.Request.Header.Del("Origin")
-	c.Request.Header.Set("Referer", "https://www.aliyundrive.com/")
-}
+//func (driver AliDrive) Proxy(r *http.Request, account *model.Account) {
+//	r.Header.Del("Origin")
+//	r.Header.Set("Referer", "https://www.aliyundrive.com/")
+//}
 
 func (driver AliDrive) Preview(path string, account *model.Account) (interface{}, error) {
 	file, err := driver.GetFile(path, account)
@@ -286,39 +306,47 @@ func (driver AliDrive) MakeDir(path string, account *model.Account) error {
 		return fmt.Errorf("%s", e.Message)
 	}
 	if resp["file_name"] == name {
-		_ = base.DeleteCache(dir, account)
 		return nil
 	}
 	return fmt.Errorf("%+v", resp)
 }
 
 func (driver AliDrive) Move(src string, dst string, account *model.Account) error {
-	srcDir, _ := filepath.Split(src)
-	dstDir, dstName := filepath.Split(dst)
+	dstDir, _ := filepath.Split(dst)
 	srcFile, err := driver.File(src, account)
 	if err != nil {
 		return err
 	}
-	// rename
-	if srcDir == dstDir {
-		err = driver.Rename(srcFile.Id, dstName, account)
-	} else {
-		// move
-		dstDirFile, err := driver.File(dstDir, account)
-		if err != nil {
-			return err
-		}
-		err = driver.Batch(srcFile.Id, dstDirFile.Id, account)
-	}
+	dstDirFile, err := driver.File(dstDir, account)
 	if err != nil {
-		_ = base.DeleteCache(srcDir, account)
-		_ = base.DeleteCache(dstDir, account)
+		return err
 	}
+	err = driver.batch(srcFile.Id, dstDirFile.Id, "/file/move", account)
+	return err
+}
+
+func (driver AliDrive) Rename(src string, dst string, account *model.Account) error {
+	_, dstName := filepath.Split(dst)
+	srcFile, err := driver.File(src, account)
+	if err != nil {
+		return err
+	}
+	err = driver.rename(srcFile.Id, dstName, account)
 	return err
 }
 
 func (driver AliDrive) Copy(src string, dst string, account *model.Account) error {
-	return base.ErrNotSupport
+	dstDir, _ := filepath.Split(dst)
+	srcFile, err := driver.File(src, account)
+	if err != nil {
+		return err
+	}
+	dstDirFile, err := driver.File(dstDir, account)
+	if err != nil {
+		return err
+	}
+	err = driver.batch(srcFile.Id, dstDirFile.Id, "/file/copy", account)
+	return err
 }
 
 func (driver AliDrive) Delete(path string, account *model.Account) error {
@@ -348,8 +376,7 @@ func (driver AliDrive) Delete(path string, account *model.Account) error {
 		}
 		return fmt.Errorf("%s", e.Message)
 	}
-	if res.StatusCode() == 204 {
-		_ = base.DeleteCache(utils.Dir(path), account)
+	if res.StatusCode() < 400 {
 		return nil
 	}
 	return errors.New(res.String())
@@ -361,15 +388,15 @@ type UploadResp struct {
 	PartInfoList []struct {
 		UploadUrl string `json:"upload_url"`
 	} `json:"part_info_list"`
+
+	RapidUpload bool `json:"rapid_upload"`
 }
 
 func (driver AliDrive) Upload(file *model.FileStream, account *model.Account) error {
 	if file == nil {
 		return base.ErrEmptyFile
 	}
-	const DEFAULT uint64 = 10485760
-	var count = int64(math.Ceil(float64(file.GetSize()) / float64(DEFAULT)))
-	var finish uint64 = 0
+
 	parentFile, err := driver.File(file.ParentPath, account)
 	if err != nil {
 		return err
@@ -377,32 +404,44 @@ func (driver AliDrive) Upload(file *model.FileStream, account *model.Account) er
 	if !parentFile.IsDir() {
 		return base.ErrNotFolder
 	}
+
+	const DEFAULT int64 = 10485760
+	var count = int(math.Ceil(float64(file.GetSize()) / float64(DEFAULT)))
+
+	partInfoList := make([]base.Json, 0, count)
+	for i := 1; i <= count; i++ {
+		partInfoList = append(partInfoList, base.Json{"part_number": i})
+	}
+
+	reqBody := base.Json{
+		"check_name_mode": "overwrite",
+		"drive_id":        account.DriveId,
+		"name":            file.GetFileName(),
+		"parent_file_id":  parentFile.Id,
+		"part_info_list":  partInfoList,
+		"size":            file.GetSize(),
+		"type":            "file",
+	}
+
+	if account.Bool1 {
+		buf := make([]byte, 1024)
+		n, _ := file.Read(buf[:])
+		reqBody["pre_hash"] = utils.GetSHA1Encode(string(buf[:n]))
+		file.File = io.NopCloser(io.MultiReader(bytes.NewReader(buf[:n]), file.File))
+	} else {
+		reqBody["content_hash_name"] = "none"
+		reqBody["proof_version"] = "v1"
+	}
+
 	var resp UploadResp
 	var e AliRespError
-	partInfoList := make([]base.Json, 0)
-	var i int64
-	for i = 0; i < count; i++ {
-		partInfoList = append(partInfoList, base.Json{
-			"part_number": i + 1,
-		})
+	client := aliClient.R().SetResult(&resp).SetError(&e).SetHeader("authorization", "Bearer\t"+account.AccessToken).SetBody(reqBody)
+
+	_, err = client.Post("https://api.aliyundrive.com/adrive/v2/file/createWithFolders")
+	if err != nil {
+		return err
 	}
-	_, err = aliClient.R().SetResult(&resp).SetError(&e).
-		SetHeader("authorization", "Bearer\t"+account.AccessToken).
-		SetBody(base.Json{
-			"check_name_mode": "auto_rename",
-			// content_hash
-			"content_hash_name": "none",
-			"drive_id":          account.DriveId,
-			"name":              file.GetFileName(),
-			"parent_file_id":    parentFile.Id,
-			"part_info_list":    partInfoList,
-			//proof_code
-			"proof_version": "v1",
-			"size":          file.GetSize(),
-			"type":          "file",
-		}).Post("https://api.aliyundrive.com/adrive/v2/file/createWithFolders") // /v2/file/create_with_proof
-	//log.Debugf("%+v\n%+v", resp, e)
-	if e.Code != "" {
+	if e.Code != "" && e.Code != "PreHashMatched" {
 		if e.Code == "AccessTokenInvalid" {
 			err = driver.RefreshToken(account)
 			if err != nil {
@@ -414,26 +453,60 @@ func (driver AliDrive) Upload(file *model.FileStream, account *model.Account) er
 		}
 		return fmt.Errorf("%s", e.Message)
 	}
-	var byteSize uint64
-	for i = 0; i < count; i++ {
-		byteSize = file.GetSize() - finish
-		if DEFAULT < byteSize {
-			byteSize = DEFAULT
-		}
-		log.Debugf("%d,%d", byteSize, finish)
-		byteData := make([]byte, byteSize)
-		n, err := io.ReadFull(file, byteData)
-		//n, err := file.Read(byteData)
-		//byteData, err := io.ReadAll(file)
-		//n := len(byteData)
-		log.Debug(err, n)
+
+	if e.Code == "PreHashMatched" && account.Bool1 {
+		tempFile, err := ioutil.TempFile(conf.Conf.TempDir, "file-*")
 		if err != nil {
 			return err
 		}
 
-		finish += uint64(n)
+		defer tempFile.Close()
+		defer os.Remove(tempFile.Name())
 
-		req, err := http.NewRequest("PUT", resp.PartInfoList[i].UploadUrl, bytes.NewBuffer(byteData))
+		delete(reqBody, "pre_hash")
+		h := sha1.New()
+		if _, err = io.Copy(io.MultiWriter(tempFile, h), file.File); err != nil {
+			return err
+		}
+		reqBody["content_hash"] = hex.EncodeToString(h.Sum(nil))
+		reqBody["content_hash_name"] = "sha1"
+		reqBody["proof_version"] = "v1"
+
+		/*
+			js 隐性转换太坑不知道有没有bug
+			var n = e.access_token，
+			r = new BigNumber('0x'.concat(md5(n).slice(0, 16)))，
+			i = new BigNumber(t.file.size)，
+			o = i ? r.mod(i) : new gt.BigNumber(0);
+			(t.file.slice(o.toNumber(), Math.min(o.plus(8).toNumber(), t.file.size)))
+		*/
+		buf := make([]byte, 8)
+		r, _ := new(big.Int).SetString(utils.GetMD5Encode(account.AccessToken)[:16], 16)
+		i := new(big.Int).SetUint64(file.Size)
+		o := r.Mod(r, i)
+		n, _ := io.NewSectionReader(tempFile, o.Int64(), 8).Read(buf[:8])
+		reqBody["proof_code"] = base64.StdEncoding.EncodeToString(buf[:n])
+
+		_, err = client.Post("https://api.aliyundrive.com/adrive/v2/file/createWithFolders")
+		if err != nil {
+			return err
+		}
+		if e.Code != "" && e.Code != "PreHashMatched" {
+			return fmt.Errorf("%s", e.Message)
+		}
+
+		if resp.RapidUpload {
+			return nil
+		}
+
+		if _, err = tempFile.Seek(0, io.SeekStart); err != nil {
+			return err
+		}
+		file.File = tempFile
+	}
+
+	for _, partInfo := range resp.PartInfoList {
+		req, err := http.NewRequest("PUT", partInfo.UploadUrl, io.LimitReader(file.File, DEFAULT))
 		if err != nil {
 			return err
 		}
@@ -458,7 +531,10 @@ func (driver AliDrive) Upload(file *model.FileStream, account *model.Account) er
 			"file_id":   resp.FileId,
 			"upload_id": resp.UploadId,
 		}).Post("https://api.aliyundrive.com/v2/file/complete")
-	if e.Code != "" {
+	if err != nil {
+		return err
+	}
+	if e.Code != "" && e.Code != "PreHashMatched" {
 		//if e.Code == "AccessTokenInvalid" {
 		//	err = driver.RefreshToken(account)
 		//	if err != nil {
@@ -471,7 +547,6 @@ func (driver AliDrive) Upload(file *model.FileStream, account *model.Account) er
 		return fmt.Errorf("%s", e.Message)
 	}
 	if resp2["file_id"] == resp.FileId {
-		_ = base.DeleteCache(file.ParentPath, account)
 		return nil
 	}
 	return fmt.Errorf("%+v", resp2)

drivers/alidrive/types.go

@@ -0,0 +1,53 @@
+package alidrive
+
+import (
+	"github.com/Xhofe/alist/conf"
+	"github.com/Xhofe/alist/utils"
+	"time"
+)
+
+type AliRespError struct {
+	Code    string `json:"code"`
+	Message string `json:"message"`
+}
+
+type AliFiles struct {
+	Items      []AliFile `json:"items"`
+	NextMarker string    `json:"next_marker"`
+}
+
+type AliFile struct {
+	DriveId       string     `json:"drive_id"`
+	CreatedAt     *time.Time `json:"created_at"`
+	FileExtension string     `json:"file_extension"`
+	FileId        string     `json:"file_id"`
+	Type          string     `json:"type"`
+	Name          string     `json:"name"`
+	Category      string     `json:"category"`
+	ParentFileId  string     `json:"parent_file_id"`
+	UpdatedAt     *time.Time `json:"updated_at"`
+	Size          int64      `json:"size"`
+	Thumbnail     string     `json:"thumbnail"`
+	Url           string     `json:"url"`
+}
+
+func (f AliFile) GetSize() uint64 {
+	return uint64(f.Size)
+}
+
+func (f AliFile) GetName() string {
+	return f.Name
+}
+
+func (f AliFile) GetType() int {
+	if f.Type == "folder" {
+		return conf.FOLDER
+	}
+	if f.Category == "video" {
+		return conf.VIDEO
+	}
+	if f.Category == "image" {
+		return conf.IMAGE
+	}
+	return utils.GetFileType(f.FileExtension)
+}

drivers/alist/alist.go

@@ -13,7 +13,11 @@ type BaseResp struct {
 
 type PathResp struct {
 	BaseResp
-	Data []model.File `json:"data"`
+	Data struct {
+		Type string `json:"type"`
+		//Meta  Meta         `json:"meta"`
+		Files []model.File `json:"files"`
+	} `json:"data"`
 }
 
 type PreviewResp struct {
@@ -25,7 +29,7 @@ func (driver *Alist) Login(account *model.Account) error {
 	var resp BaseResp
 	_, err := base.RestyClient.R().SetResult(&resp).
 		SetHeader("Authorization", account.AccessToken).
-		Get(account.SiteUrl+"/api/admin/login")
+		Get(account.SiteUrl + "/api/admin/login")
 	if err != nil {
 		return err
 	}

drivers/alist/driver.go

@@ -7,7 +7,6 @@ import (
 	"github.com/Xhofe/alist/drivers/base"
 	"github.com/Xhofe/alist/model"
 	"github.com/Xhofe/alist/utils"
-	"github.com/gin-gonic/gin"
 	"path/filepath"
 	"strings"
 	"time"
@@ -48,6 +47,9 @@ func (driver Alist) Items() []base.Item {
 }
 
 func (driver Alist) Save(account *model.Account, old *model.Account) error {
+	if account == nil {
+		return nil
+	}
 	account.SiteUrl = strings.TrimRight(account.SiteUrl, "/")
 	if account.RootFolder == "" {
 		account.RootFolder = "/"
@@ -136,16 +138,16 @@ func (driver Alist) Path(path string, account *model.Account) (*model.File, []mo
 	if resp.Code != 200 {
 		return nil, nil, errors.New(resp.Message)
 	}
-	if resp.Message == "file" {
-		return &resp.Data[0], nil, nil
+	if resp.Data.Type == "file" {
+		return &resp.Data.Files[0], nil, nil
 	}
-	if len(resp.Data) > 0 {
-		_ = base.SetCache(path, resp.Data, account)
+	if len(resp.Data.Files) > 0 {
+		_ = base.SetCache(path, resp.Data.Files, account)
 	}
-	return nil, resp.Data, nil
+	return nil, resp.Data.Files, nil
 }
 
-func (driver Alist) Proxy(c *gin.Context, account *model.Account) {}
+//func (driver Alist) Proxy(r *http.Request, account *model.Account) {}
 
 func (driver Alist) Preview(path string, account *model.Account) (interface{}, error) {
 	var resp PathResp
@@ -171,6 +173,10 @@ func (driver Alist) Move(src string, dst string, account *model.Account) error {
 	return base.ErrNotImplement
 }
 
+func (driver Alist) Rename(src string, dst string, account *model.Account) error {
+	return base.ErrNotImplement
+}
+
 func (driver Alist) Copy(src string, dst string, account *model.Account) error {
 	return base.ErrNotImplement
 }

drivers/all.go

@@ -2,19 +2,30 @@ package drivers
 
 import (
 	_ "github.com/Xhofe/alist/drivers/123"
+	_ "github.com/Xhofe/alist/drivers/139"
 	_ "github.com/Xhofe/alist/drivers/189"
+	_ "github.com/Xhofe/alist/drivers/189pc"
 	_ "github.com/Xhofe/alist/drivers/alidrive"
 	_ "github.com/Xhofe/alist/drivers/alist"
+	_ "github.com/Xhofe/alist/drivers/baidu"
 	"github.com/Xhofe/alist/drivers/base"
 	_ "github.com/Xhofe/alist/drivers/ftp"
 	_ "github.com/Xhofe/alist/drivers/google"
 	_ "github.com/Xhofe/alist/drivers/lanzou"
+	_ "github.com/Xhofe/alist/drivers/mediatrack"
 	_ "github.com/Xhofe/alist/drivers/native"
 	_ "github.com/Xhofe/alist/drivers/onedrive"
 	_ "github.com/Xhofe/alist/drivers/pikpak"
+	_ "github.com/Xhofe/alist/drivers/quark"
 	_ "github.com/Xhofe/alist/drivers/s3"
+	_ "github.com/Xhofe/alist/drivers/sftp"
 	_ "github.com/Xhofe/alist/drivers/shandian"
+	_ "github.com/Xhofe/alist/drivers/teambition"
+	_ "github.com/Xhofe/alist/drivers/uss"
 	_ "github.com/Xhofe/alist/drivers/webdav"
+	_ "github.com/Xhofe/alist/drivers/xunlei"
+	_ "github.com/Xhofe/alist/drivers/yandex"
+	_ "github.com/Xhofe/alist/drivers/baiduphoto"
 	log "github.com/sirupsen/logrus"
 	"strings"
 )

drivers/baidu/baidu.go

@@ -0,0 +1,185 @@
+package baidu
+
+import (
+	"fmt"
+	"github.com/Xhofe/alist/conf"
+	"github.com/Xhofe/alist/drivers/base"
+	"github.com/Xhofe/alist/model"
+	"github.com/Xhofe/alist/utils"
+	"github.com/go-resty/resty/v2"
+	jsoniter "github.com/json-iterator/go"
+	"path"
+	"strconv"
+)
+
+func (driver Baidu) RefreshToken(account *model.Account) error {
+	err := driver.refreshToken(account)
+	if err != nil && err == base.ErrEmptyToken {
+		err = driver.refreshToken(account)
+	}
+	if err != nil {
+		account.Status = err.Error()
+	}
+	_ = model.SaveAccount(account)
+	return err
+}
+
+func (driver Baidu) refreshToken(account *model.Account) error {
+	u := "https://openapi.baidu.com/oauth/2.0/token"
+	var resp base.TokenResp
+	var e TokenErrResp
+	_, err := base.RestyClient.R().SetResult(&resp).SetError(&e).SetQueryParams(map[string]string{
+		"grant_type":    "refresh_token",
+		"refresh_token": account.RefreshToken,
+		"client_id":     account.ClientId,
+		"client_secret": account.ClientSecret,
+	}).Get(u)
+	if err != nil {
+		return err
+	}
+	if e.Error != "" {
+		return fmt.Errorf("%s : %s", e.Error, e.ErrorDescription)
+	}
+	if resp.RefreshToken == "" {
+		return base.ErrEmptyToken
+	}
+	account.Status = "work"
+	account.AccessToken, account.RefreshToken = resp.AccessToken, resp.RefreshToken
+	return nil
+}
+
+func (driver Baidu) Request(fullurl string, method int, headers, query, form map[string]string, data interface{}, resp interface{}, account *model.Account) ([]byte, error) {
+	req := base.RestyClient.R()
+	req.SetQueryParam("access_token", account.AccessToken)
+	if headers != nil {
+		req.SetHeaders(headers)
+	}
+	if query != nil {
+		req.SetQueryParams(query)
+	}
+	if form != nil {
+		req.SetFormData(form)
+	}
+	if data != nil {
+		req.SetBody(data)
+	}
+	if resp != nil {
+		req.SetResult(resp)
+	}
+	var res *resty.Response
+	var err error
+	switch method {
+	case base.Get:
+		res, err = req.Get(fullurl)
+	case base.Post:
+		res, err = req.Post(fullurl)
+	case base.Patch:
+		res, err = req.Patch(fullurl)
+	case base.Delete:
+		res, err = req.Delete(fullurl)
+	case base.Put:
+		res, err = req.Put(fullurl)
+	default:
+		return nil, base.ErrNotSupport
+	}
+	if err != nil {
+		return nil, err
+	}
+	//log.Debug(res.String())
+	errno := jsoniter.Get(res.Body(), "errno").ToInt()
+	if errno != 0 {
+		if errno == -6 {
+			err = driver.RefreshToken(account)
+			if err != nil {
+				return nil, err
+			}
+			return driver.Request(fullurl, method, headers, query, form, data, resp, account)
+		}
+		return nil, fmt.Errorf("errno: %d, refer to https://pan.baidu.com/union/doc/", errno)
+	}
+	return res.Body(), nil
+}
+
+func (driver Baidu) Get(pathname string, params map[string]string, resp interface{}, account *model.Account) ([]byte, error) {
+	return driver.Request("https://pan.baidu.com/rest/2.0"+pathname, base.Get, nil, params, nil, nil, resp, account)
+}
+
+func (driver Baidu) Post(pathname string, params map[string]string, data interface{}, resp interface{}, account *model.Account) ([]byte, error) {
+	return driver.Request("https://pan.baidu.com/rest/2.0"+pathname, base.Post, nil, params, nil, data, resp, account)
+}
+
+func (driver Baidu) manage(opera string, filelist interface{}, account *model.Account) ([]byte, error) {
+	params := map[string]string{
+		"method": "filemanager",
+		"opera":  opera,
+	}
+	marshal, err := utils.Json.Marshal(filelist)
+	if err != nil {
+		return nil, err
+	}
+	data := fmt.Sprintf("async=0&filelist=%s&ondup=newcopy", string(marshal))
+	return driver.Post("/xpan/file", params, data, nil, account)
+}
+
+func (driver Baidu) GetFiles(dir string, account *model.Account) ([]model.File, error) {
+	dir = utils.Join(account.RootFolder, dir)
+	start := 0
+	limit := 200
+	params := map[string]string{
+		"method": "list",
+		"dir":    dir,
+		"web":    "web",
+	}
+	if account.OrderBy != "" {
+		params["order"] = account.OrderBy
+		if account.OrderDirection == "desc" {
+			params["desc"] = "1"
+		}
+	}
+	res := make([]model.File, 0)
+	for {
+		params["start"] = strconv.Itoa(start)
+		params["limit"] = strconv.Itoa(limit)
+		start += limit
+		var resp ListResp
+		_, err := driver.Get("/xpan/file", params, &resp, account)
+		if err != nil {
+			return nil, err
+		}
+		if len(resp.List) == 0 {
+			break
+		}
+		for _, f := range resp.List {
+			file := model.File{
+				Id:        strconv.FormatInt(f.FsId, 10),
+				Name:      f.ServerFilename,
+				Size:      f.Size,
+				Driver:    driver.Config().Name,
+				UpdatedAt: getTime(f.ServerMtime),
+				Thumbnail: f.Thumbs.Url3,
+			}
+			if f.Isdir == 1 {
+				file.Type = conf.FOLDER
+			} else {
+				file.Type = utils.GetFileType(path.Ext(f.ServerFilename))
+			}
+			res = append(res, file)
+		}
+	}
+	return res, nil
+}
+
+func (driver Baidu) create(path string, size uint64, isdir int, uploadid, block_list string, account *model.Account) ([]byte, error) {
+	params := map[string]string{
+		"method": "create",
+	}
+	data := fmt.Sprintf("path=%s&size=%d&isdir=%d", path, size, isdir)
+	if uploadid != "" {
+		data += fmt.Sprintf("&uploadid=%s&block_list=%s", uploadid, block_list)
+	}
+	return driver.Post("/xpan/file", params, data, nil, account)
+}
+
+func init() {
+	base.RegisterDriver(&Baidu{})
+}

drivers/baidu/driver.go

@@ -0,0 +1,399 @@
+package baidu
+
+import (
+	"bytes"
+	"crypto/md5"
+	"encoding/hex"
+	"fmt"
+	"github.com/Xhofe/alist/conf"
+	"github.com/Xhofe/alist/drivers/base"
+	"github.com/Xhofe/alist/model"
+	"github.com/Xhofe/alist/utils"
+	log "github.com/sirupsen/logrus"
+	"io"
+	"io/ioutil"
+	"math"
+	"os"
+	"path/filepath"
+	"strconv"
+	"strings"
+)
+
+type Baidu struct{}
+
+func (driver Baidu) Config() base.DriverConfig {
+	return base.DriverConfig{
+		Name: "Baidu.Disk",
+	}
+}
+
+func (driver Baidu) Items() []base.Item {
+	return []base.Item{
+		{
+			Name:     "refresh_token",
+			Label:    "refresh token",
+			Type:     base.TypeString,
+			Required: true,
+		},
+		{
+			Name:     "root_folder",
+			Label:    "root folder path",
+			Type:     base.TypeString,
+			Default:  "/",
+			Required: true,
+		},
+		{
+			Name:     "order_by",
+			Label:    "order_by",
+			Type:     base.TypeSelect,
+			Default:  "name",
+			Values:   "name,time,size",
+			Required: false,
+		},
+		{
+			Name:     "order_direction",
+			Label:    "order_direction",
+			Type:     base.TypeSelect,
+			Values:   "asc,desc",
+			Default:  "asc",
+			Required: false,
+		},
+		{
+			Name:     "internal_type",
+			Label:    "download api",
+			Type:     base.TypeSelect,
+			Required: true,
+			Values:   "official,crack",
+			Default:  "official",
+		},
+		{
+			Name:     "client_id",
+			Label:    "client id",
+			Default:  "iYCeC9g08h5vuP9UqvPHKKSVrKFXGa1v",
+			Type:     base.TypeString,
+			Required: true,
+		},
+		{
+			Name:     "client_secret",
+			Label:    "client secret",
+			Default:  "jXiFMOPVPCWlO2M5CwWQzffpNPaGTRBG",
+			Type:     base.TypeString,
+			Required: true,
+		},
+	}
+}
+
+func (driver Baidu) Save(account *model.Account, old *model.Account) error {
+	if account == nil {
+		return nil
+	}
+	return driver.RefreshToken(account)
+}
+
+func (driver Baidu) File(path string, account *model.Account) (*model.File, error) {
+	path = utils.ParsePath(path)
+	if path == "/" {
+		return &model.File{
+			Id:        account.RootFolder,
+			Name:      account.Name,
+			Size:      0,
+			Type:      conf.FOLDER,
+			Driver:    driver.Config().Name,
+			UpdatedAt: account.UpdatedAt,
+		}, nil
+	}
+	dir, name := filepath.Split(path)
+	files, err := driver.Files(dir, account)
+	if err != nil {
+		return nil, err
+	}
+	for _, file := range files {
+		if file.Name == name {
+			return &file, nil
+		}
+	}
+	return nil, base.ErrPathNotFound
+}
+
+func (driver Baidu) Files(path string, account *model.Account) ([]model.File, error) {
+	path = utils.ParsePath(path)
+	cache, err := base.GetCache(path, account)
+	if err == nil {
+		files, _ := cache.([]model.File)
+		return files, nil
+	}
+	files, err := driver.GetFiles(path, account)
+	if err != nil {
+		return nil, err
+	}
+	if len(files) > 0 {
+		_ = base.SetCache(path, files, account)
+	}
+	return files, nil
+}
+
+func (driver Baidu) Link(args base.Args, account *model.Account) (*base.Link, error) {
+	if account.InternalType == "crack" {
+		return driver.LinkCrack(args, account)
+	}
+	return driver.LinkOfficial(args, account)
+}
+
+func (driver Baidu) LinkOfficial(args base.Args, account *model.Account) (*base.Link, error) {
+	file, err := driver.File(args.Path, account)
+	if err != nil {
+		return nil, err
+	}
+	if file.IsDir() {
+		return nil, base.ErrNotFile
+	}
+	var resp DownloadResp
+	params := map[string]string{
+		"method": "filemetas",
+		"fsids":  fmt.Sprintf("[%s]", file.Id),
+		"dlink":  "1",
+	}
+	_, err = driver.Get("/xpan/multimedia", params, &resp, account)
+	if err != nil {
+		return nil, err
+	}
+	u := fmt.Sprintf("%s&access_token=%s", resp.List[0].Dlink, account.AccessToken)
+	res, err := base.NoRedirectClient.R().SetHeader("User-Agent", "pan.baidu.com").Head(u)
+	if err != nil {
+		return nil, err
+	}
+	//if res.StatusCode() == 302 {
+	u = res.Header().Get("location")
+	//}
+	return &base.Link{
+		Url: u,
+		Headers: []base.Header{
+			{Name: "User-Agent", Value: "pan.baidu.com"},
+		}}, nil
+}
+
+func (driver Baidu) LinkCrack(args base.Args, account *model.Account) (*base.Link, error) {
+	file, err := driver.File(args.Path, account)
+	if err != nil {
+		return nil, err
+	}
+	if file.IsDir() {
+		return nil, base.ErrNotFile
+	}
+	var resp DownloadResp2
+	param := map[string]string{
+		"target": fmt.Sprintf("[\"%s\"]", utils.Join(account.RootFolder, args.Path)),
+		"dlink":  "1",
+		"web":    "5",
+		"origin": "dlna",
+	}
+	_, err = driver.Request("https://pan.baidu.com/api/filemetas", base.Get, nil, param, nil, nil, &resp, account)
+	if err != nil {
+		return nil, err
+	}
+	return &base.Link{
+		Url: resp.Info[0].Dlink,
+		Headers: []base.Header{
+			{Name: "User-Agent", Value: "pan.baidu.com"},
+		}}, nil
+}
+
+func (driver Baidu) Path(path string, account *model.Account) (*model.File, []model.File, error) {
+	file, err := driver.File(path, account)
+	if err != nil {
+		return nil, nil, err
+	}
+	if !file.IsDir() {
+		return file, nil, nil
+	}
+	files, err := driver.Files(path, account)
+	if err != nil {
+		return nil, nil, err
+	}
+	return nil, files, nil
+}
+
+//func (driver Baidu) Proxy(r *http.Request, account *model.Account) {
+//	r.Header.Set("User-Agent", "pan.baidu.com")
+//}
+
+func (driver Baidu) Preview(path string, account *model.Account) (interface{}, error) {
+	return nil, base.ErrNotSupport
+}
+
+func (driver Baidu) MakeDir(path string, account *model.Account) error {
+	_, err := driver.create(utils.Join(account.RootFolder, path), 0, 1, "", "", account)
+	return err
+}
+
+func (driver Baidu) Move(src string, dst string, account *model.Account) error {
+	path := utils.Join(account.RootFolder, src)
+	dest, newname := utils.Split(utils.Join(account.RootFolder, dst))
+	data := []base.Json{
+		{
+			"path":    path,
+			"dest":    dest,
+			"newname": newname,
+		},
+	}
+	_, err := driver.manage("move", data, account)
+	return err
+}
+
+func (driver Baidu) Rename(src string, dst string, account *model.Account) error {
+	path := utils.Join(account.RootFolder, src)
+	newname := utils.Base(dst)
+	data := []base.Json{
+		{
+			"path":    path,
+			"newname": newname,
+		},
+	}
+	_, err := driver.manage("rename", data, account)
+	return err
+}
+
+func (driver Baidu) Copy(src string, dst string, account *model.Account) error {
+	path := utils.Join(account.RootFolder, src)
+	dest, newname := utils.Split(utils.Join(account.RootFolder, dst))
+	data := []base.Json{
+		{
+			"path":    path,
+			"dest":    dest,
+			"newname": newname,
+		},
+	}
+	_, err := driver.manage("copy", data, account)
+	return err
+}
+
+func (driver Baidu) Delete(path string, account *model.Account) error {
+	path = utils.Join(account.RootFolder, path)
+	data := []string{path}
+	_, err := driver.manage("delete", data, account)
+	return err
+}
+
+func (driver Baidu) Upload(file *model.FileStream, account *model.Account) error {
+	if file == nil {
+		return base.ErrEmptyFile
+	}
+	tempFile, err := ioutil.TempFile(conf.Conf.TempDir, "file-*")
+	if err != nil {
+		return err
+	}
+	defer func() {
+		_ = tempFile.Close()
+		_ = os.Remove(tempFile.Name())
+	}()
+	_, err = io.Copy(tempFile, file)
+	if err != nil {
+		return err
+	}
+	_, err = tempFile.Seek(0, io.SeekStart)
+	if err != nil {
+		return err
+	}
+	var Default uint64 = 4 * 1024 * 1024
+	defaultByteData := make([]byte, Default)
+	count := int(math.Ceil(float64(file.GetSize()) / float64(Default)))
+	var SliceSize uint64 = 256 * 1024
+	// cal md5
+	h1 := md5.New()
+	h2 := md5.New()
+	block_list := make([]string, 0)
+	content_md5 := ""
+	slice_md5 := ""
+	left := file.GetSize()
+	for i := 0; i < count; i++ {
+		byteSize := Default
+		var byteData []byte
+		if left < Default {
+			byteSize = left
+			byteData = make([]byte, byteSize)
+		} else {
+			byteData = defaultByteData
+		}
+		left -= byteSize
+		_, err = io.ReadFull(tempFile, byteData)
+		if err != nil {
+			return err
+		}
+		h1.Write(byteData)
+		h2.Write(byteData)
+		block_list = append(block_list, fmt.Sprintf("\"%s\"", hex.EncodeToString(h2.Sum(nil))))
+		h2.Reset()
+	}
+	content_md5 = hex.EncodeToString(h1.Sum(nil))
+	_, err = tempFile.Seek(0, io.SeekStart)
+	if err != nil {
+		return err
+	}
+	if file.GetSize() <= SliceSize {
+		slice_md5 = content_md5
+	} else {
+		sliceData := make([]byte, SliceSize)
+		_, err = io.ReadFull(tempFile, sliceData)
+		if err != nil {
+			return err
+		}
+		h2.Write(sliceData)
+		slice_md5 = hex.EncodeToString(h2.Sum(nil))
+		_, err = tempFile.Seek(0, io.SeekStart)
+		if err != nil {
+			return err
+		}
+	}
+	path := encodeURIComponent(utils.Join(account.RootFolder, file.ParentPath, file.Name))
+	block_list_str := fmt.Sprintf("[%s]", strings.Join(block_list, ","))
+	data := fmt.Sprintf("path=%s&size=%d&isdir=0&autoinit=1&block_list=%s&content-md5=%s&slice-md5=%s",
+		path, file.GetSize(),
+		block_list_str,
+		content_md5, slice_md5)
+	params := map[string]string{
+		"method": "precreate",
+	}
+	var precreateResp PrecreateResp
+	_, err = driver.Post("/xpan/file", params, data, &precreateResp, account)
+	if err != nil {
+		return err
+	}
+	log.Debugf("%+v", precreateResp)
+	if precreateResp.ReturnType == 2 {
+		return nil
+	}
+	params = map[string]string{
+		"method":       "upload",
+		"access_token": account.AccessToken,
+		"type":         "tmpfile",
+		"path":         path,
+		"uploadid":     precreateResp.Uploadid,
+	}
+	left = file.GetSize()
+	for _, partseq := range precreateResp.BlockList {
+		byteSize := Default
+		var byteData []byte
+		if left < Default {
+			byteSize = left
+			byteData = make([]byte, byteSize)
+		} else {
+			byteData = defaultByteData
+		}
+		left -= byteSize
+		_, err = io.ReadFull(tempFile, byteData)
+		if err != nil {
+			return err
+		}
+		u := "https://d.pcs.baidu.com/rest/2.0/pcs/superfile2"
+		params["partseq"] = strconv.Itoa(partseq)
+		res, err := base.RestyClient.R().SetQueryParams(params).SetFileReader("file", file.Name, bytes.NewReader(byteData)).Post(u)
+		if err != nil {
+			return err
+		}
+		log.Debugln(res.String())
+	}
+	_, err = driver.create(path, file.GetSize(), 0, precreateResp.Uploadid, block_list_str, account)
+	return err
+}
+
+var _ base.Driver = (*Baidu)(nil)

drivers/baidu/types.go

@@ -0,0 +1,143 @@
+package baidu
+
+type TokenErrResp struct {
+	ErrorDescription string `json:"error_description"`
+	Error            string `json:"error"`
+}
+
+type File struct {
+	//TkbindId     int    `json:"tkbind_id"`
+	//OwnerType    int    `json:"owner_type"`
+	//Category     int    `json:"category"`
+	//RealCategory string `json:"real_category"`
+	FsId        int64 `json:"fs_id"`
+	ServerMtime int64 `json:"server_mtime"`
+	//OperId      int   `json:"oper_id"`
+	//ServerCtime int   `json:"server_ctime"`
+	Thumbs struct {
+		//Icon string `json:"icon"`
+		Url3 string `json:"url3"`
+		//Url2 string `json:"url2"`
+		//Url1 string `json:"url1"`
+	} `json:"thumbs"`
+	//Wpfile         int    `json:"wpfile"`
+	//LocalMtime     int    `json:"local_mtime"`
+	Size int64 `json:"size"`
+	//ExtentTinyint7 int    `json:"extent_tinyint7"`
+	Path string `json:"path"`
+	//Share          int    `json:"share"`
+	//ServerAtime    int    `json:"server_atime"`
+	//Pl             int    `json:"pl"`
+	//LocalCtime     int    `json:"local_ctime"`
+	ServerFilename string `json:"server_filename"`
+	//Md5            string `json:"md5"`
+	//OwnerId        int    `json:"owner_id"`
+	//Unlist int `json:"unlist"`
+	Isdir int `json:"isdir"`
+}
+
+type ListResp struct {
+	Errno     int    `json:"errno"`
+	GuidInfo  string `json:"guid_info"`
+	List      []File `json:"list"`
+	RequestId int64  `json:"request_id"`
+	Guid      int    `json:"guid"`
+}
+
+type DownloadResp struct {
+	Errmsg string `json:"errmsg"`
+	Errno  int    `json:"errno"`
+	List   []struct {
+		//Category    int    `json:"category"`
+		//DateTaken   int    `json:"date_taken,omitempty"`
+		Dlink string `json:"dlink"`
+		//Filename    string `json:"filename"`
+		//FsId        int64  `json:"fs_id"`
+		//Height      int    `json:"height,omitempty"`
+		//Isdir       int    `json:"isdir"`
+		//Md5         string `json:"md5"`
+		//OperId      int    `json:"oper_id"`
+		//Path        string `json:"path"`
+		//ServerCtime int    `json:"server_ctime"`
+		//ServerMtime int    `json:"server_mtime"`
+		//Size        int    `json:"size"`
+		//Thumbs      struct {
+		//	Icon string `json:"icon,omitempty"`
+		//	Url1 string `json:"url1,omitempty"`
+		//	Url2 string `json:"url2,omitempty"`
+		//	Url3 string `json:"url3,omitempty"`
+		//} `json:"thumbs"`
+		//Width int `json:"width,omitempty"`
+	} `json:"list"`
+	//Names struct {
+	//} `json:"names"`
+	RequestId string `json:"request_id"`
+}
+
+type DownloadResp2 struct {
+	Errno int `json:"errno"`
+	Info  []struct {
+		//ExtentTinyint4 int `json:"extent_tinyint4"`
+		//ExtentTinyint1 int `json:"extent_tinyint1"`
+		//Bitmap string `json:"bitmap"`
+		//Category int `json:"category"`
+		//Isdir int `json:"isdir"`
+		//Videotag int `json:"videotag"`
+		Dlink string `json:"dlink"`
+		//OperID int64 `json:"oper_id"`
+		//PathMd5 int `json:"path_md5"`
+		//Wpfile int `json:"wpfile"`
+		//LocalMtime int `json:"local_mtime"`
+		/*Thumbs struct {
+			Icon string `json:"icon"`
+			URL3 string `json:"url3"`
+			URL2 string `json:"url2"`
+			URL1 string `json:"url1"`
+		} `json:"thumbs"`*/
+		//PlaySource int `json:"play_source"`
+		//Share int `json:"share"`
+		//FileKey string `json:"file_key"`
+		//Errno int `json:"errno"`
+		//LocalCtime int `json:"local_ctime"`
+		//Rotate int `json:"rotate"`
+		//Metadata time.Time `json:"metadata"`
+		//Height int `json:"height"`
+		//SampleRate int `json:"sample_rate"`
+		//Width int `json:"width"`
+		//OwnerType int `json:"owner_type"`
+		//Privacy int `json:"privacy"`
+		//ExtentInt3 int64 `json:"extent_int3"`
+		//RealCategory string `json:"real_category"`
+		//SrcLocation string `json:"src_location"`
+		//MetaInfo string `json:"meta_info"`
+		//ID string `json:"id"`
+		//Duration int `json:"duration"`
+		//FileSize string `json:"file_size"`
+		//Channels int `json:"channels"`
+		//UseSegment int `json:"use_segment"`
+		//ServerCtime int `json:"server_ctime"`
+		//Resolution string `json:"resolution"`
+		//OwnerID int `json:"owner_id"`
+		//ExtraInfo string `json:"extra_info"`
+		//Size int `json:"size"`
+		//FsID int64 `json:"fs_id"`
+		//ExtentTinyint3 int `json:"extent_tinyint3"`
+		//Md5 string `json:"md5"`
+		//Path string `json:"path"`
+		//FrameRate int `json:"frame_rate"`
+		//ExtentTinyint2 int `json:"extent_tinyint2"`
+		//ServerFilename string `json:"server_filename"`
+		//ServerMtime int `json:"server_mtime"`
+		//TkbindID int `json:"tkbind_id"`
+	} `json:"info"`
+	RequestID int64 `json:"request_id"`
+}
+
+type PrecreateResp struct {
+	Path       string `json:"path"`
+	Uploadid   string `json:"uploadid"`
+	ReturnType int    `json:"return_type"`
+	BlockList  []int  `json:"block_list"`
+	Errno      int    `json:"errno"`
+	RequestId  int64  `json:"request_id"`
+}

drivers/baidu/util.go

@@ -0,0 +1,18 @@
+package baidu
+
+import (
+	"net/url"
+	"strings"
+	"time"
+)
+
+func getTime(t int64) *time.Time {
+	tm := time.Unix(t, 0)
+	return &tm
+}
+
+func encodeURIComponent(str string) string {
+	r := url.QueryEscape(str)
+	r = strings.ReplaceAll(r, "+", "%20")
+	return r
+}

drivers/baiduphoto/baidu.go

@@ -0,0 +1,259 @@
+package baiduphoto
+
+import (
+	"fmt"
+	"net/http"
+
+	"github.com/Xhofe/alist/drivers/base"
+	"github.com/Xhofe/alist/model"
+	"github.com/Xhofe/alist/utils"
+	"github.com/go-resty/resty/v2"
+	log "github.com/sirupsen/logrus"
+)
+
+func (driver Baidu) RefreshToken(account *model.Account) error {
+	err := driver.refreshToken(account)
+	if err != nil && err == base.ErrEmptyToken {
+		err = driver.refreshToken(account)
+	}
+	if err != nil {
+		account.Status = err.Error()
+	}
+	_ = model.SaveAccount(account)
+	return err
+}
+
+func (driver Baidu) refreshToken(account *model.Account) error {
+	u := "https://openapi.baidu.com/oauth/2.0/token"
+	var resp base.TokenResp
+	var e TokenErrResp
+	_, err := base.RestyClient.R().
+		SetResult(&resp).
+		SetError(&e).
+		SetQueryParams(map[string]string{
+			"grant_type":    "refresh_token",
+			"refresh_token": account.RefreshToken,
+			"client_id":     account.ClientId,
+			"client_secret": account.ClientSecret,
+		}).Get(u)
+	if err != nil {
+		return err
+	}
+	if e.ErrorMsg != "" {
+		return &e
+	}
+	if resp.RefreshToken == "" {
+		return base.ErrEmptyToken
+	}
+	account.Status = "work"
+	account.AccessToken, account.RefreshToken = resp.AccessToken, resp.RefreshToken
+	return nil
+}
+
+func (driver Baidu) Request(method string, url string, callback func(*resty.Request), account *model.Account) (*resty.Response, error) {
+	req := base.RestyClient.R()
+	req.SetQueryParam("access_token", account.AccessToken)
+	if callback != nil {
+		callback(req)
+	}
+
+	res, err := req.Execute(method, url)
+	if err != nil {
+		return nil, err
+	}
+	log.Debug(res.String())
+
+	var erron Erron
+	if err = utils.Json.Unmarshal(res.Body(), &erron); err != nil {
+		return nil, err
+	}
+
+	switch erron.Errno {
+	case 0:
+		return res, nil
+	case -6:
+		if err = driver.RefreshToken(account); err != nil {
+			return nil, err
+		}
+	default:
+		return nil, fmt.Errorf("errno: %d, refer to https://photo.baidu.com/union/doc", erron.Errno)
+	}
+	return driver.Request(method, url, callback, account)
+}
+
+// 获取所有根文件
+func (driver Baidu) GetAllFile(account *model.Account) (files []File, err error) {
+	var cursor string
+
+	for {
+		var resp FileListResp
+		_, err = driver.Request(http.MethodGet, FILE_API_URL+"/list", func(r *resty.Request) {
+			r.SetQueryParams(map[string]string{
+				"need_thumbnail":     "1",
+				"need_filter_hidden": "0",
+				"cursor":             cursor,
+			})
+			r.SetResult(&resp)
+		}, account)
+		if err != nil {
+			return
+		}
+
+		cursor = resp.Cursor
+		files = append(files, resp.List...)
+
+		if !resp.HasNextPage() {
+			return
+		}
+	}
+}
+
+// 获取所有相册
+func (driver Baidu) GetAllAlbum(account *model.Account) (albums []Album, err error) {
+	var cursor string
+	for {
+		var resp AlbumListResp
+		_, err = driver.Request(http.MethodGet, ALBUM_API_URL+"/list", func(r *resty.Request) {
+			r.SetQueryParams(map[string]string{
+				"need_amount": "1",
+				"limit":       "100",
+				"cursor":      cursor,
+			})
+			r.SetResult(&resp)
+		}, account)
+		if err != nil {
+			return
+		}
+		if albums == nil {
+			albums = make([]Album, 0, resp.TotalCount)
+		}
+
+		cursor = resp.Cursor
+		albums = append(albums, resp.List...)
+
+		if !resp.HasNextPage() {
+			return
+		}
+	}
+}
+
+// 获取相册中所有文件
+func (driver Baidu) GetAllAlbumFile(albumID string, account *model.Account) (files []AlbumFile, err error) {
+	var cursor string
+	for {
+		var resp AlbumFileListResp
+		_, err = driver.Request(http.MethodGet, ALBUM_API_URL+"/listfile", func(r *resty.Request) {
+			r.SetQueryParams(map[string]string{
+				"album_id":    splitID(albumID)[0],
+				"need_amount": "1",
+				"limit":       "1000",
+				"cursor":      cursor,
+			})
+			r.SetResult(&resp)
+		}, account)
+		if err != nil {
+			return
+		}
+		if files == nil {
+			files = make([]AlbumFile, 0, resp.TotalCount)
+		}
+
+		cursor = resp.Cursor
+		files = append(files, resp.List...)
+
+		if !resp.HasNextPage() {
+			return
+		}
+	}
+}
+
+// 创建相册
+func (driver Baidu) CreateAlbum(name string, account *model.Account) error {
+	if !checkName(name) {
+		return ErrNotSupportName
+	}
+	_, err := driver.Request(http.MethodPost, ALBUM_API_URL+"/create", func(r *resty.Request) {
+		r.SetQueryParams(map[string]string{
+			"title":  name,
+			"tid":    getTid(),
+			"source": "0",
+		})
+	}, account)
+	return err
+}
+
+// 相册改名
+func (driver Baidu) SetAlbumName(albumID string, name string, account *model.Account) error {
+	if !checkName(name) {
+		return ErrNotSupportName
+	}
+
+	e := splitID(albumID)
+	_, err := driver.Request(http.MethodPost, ALBUM_API_URL+"/settitle", func(r *resty.Request) {
+		r.SetFormData(map[string]string{
+			"title":    name,
+			"album_id": e[0],
+			"tid":      e[1],
+		})
+	}, account)
+	return err
+}
+
+// 删除相册
+func (driver Baidu) DeleteAlbum(albumID string, account *model.Account) error {
+	e := splitID(albumID)
+	_, err := driver.Request(http.MethodPost, ALBUM_API_URL+"/delete", func(r *resty.Request) {
+		r.SetFormData(map[string]string{
+			"album_id":            e[0],
+			"tid":                 e[1],
+			"delete_origin_image": "0", // 是否删除原图 0 不删除
+		})
+	}, account)
+	return err
+}
+
+// 删除相册文件
+func (driver Baidu) DeleteAlbumFile(albumID string, account *model.Account, fileIDs ...string) error {
+	e := splitID(albumID)
+	_, err := driver.Request(http.MethodPost, ALBUM_API_URL+"/delfile", func(r *resty.Request) {
+		r.SetFormData(map[string]string{
+			"album_id":   e[0],
+			"tid":        e[1],
+			"list":       fsidsFormat(fileIDs...),
+			"del_origin": "0", // 是否删除原图 0 不删除 1 删除
+		})
+	}, account)
+	return err
+}
+
+// 增加相册文件
+func (driver Baidu) AddAlbumFile(albumID string, account *model.Account, fileIDs ...string) error {
+	e := splitID(albumID)
+	_, err := driver.Request(http.MethodGet, ALBUM_API_URL+"/addfile", func(r *resty.Request) {
+		r.SetQueryParams(map[string]string{
+			"album_id": e[0],
+			"tid":      e[1],
+			"list":     fsidsFormatNotUk(fileIDs...),
+		})
+	}, account)
+	return err
+}
+
+// 保存相册文件为根文件
+func (driver Baidu) CopyAlbumFile(albumID string, account *model.Account, fileID string) (*CopyFile, error) {
+	var resp CopyFileResp
+	e := splitID(fileID)
+	_, err := driver.Request(http.MethodPost, ALBUM_API_URL+"/copyfile", func(r *resty.Request) {
+		r.SetFormData(map[string]string{
+			"album_id": splitID(albumID)[0],
+			"tid":      e[2],
+			"uk":       e[1],
+			"list":     fsidsFormatNotUk(fileID),
+		})
+		r.SetResult(&resp)
+	}, account)
+	if err != nil {
+		return nil, err
+	}
+	return &resp.List[0], err
+}

drivers/baiduphoto/driver.go

@@ -0,0 +1,452 @@
+package baiduphoto
+
+import (
+	"crypto/md5"
+	"encoding/hex"
+	"fmt"
+	"io"
+	"io/ioutil"
+	"math"
+	"net/http"
+	"os"
+	"path/filepath"
+
+	"github.com/Xhofe/alist/conf"
+	"github.com/Xhofe/alist/drivers/base"
+	"github.com/Xhofe/alist/model"
+	"github.com/Xhofe/alist/utils"
+	"github.com/go-resty/resty/v2"
+)
+
+type Baidu struct{}
+
+func init() {
+	base.RegisterDriver(new(Baidu))
+}
+
+func (driver Baidu) Config() base.DriverConfig {
+	return base.DriverConfig{
+		Name:      "Baidu.Photo",
+		LocalSort: true,
+	}
+}
+
+func (driver Baidu) Items() []base.Item {
+	return []base.Item{
+		{
+			Name:     "refresh_token",
+			Label:    "refresh token",
+			Type:     base.TypeString,
+			Required: true,
+		},
+		{
+			Name:  "root_folder",
+			Label: "album_id",
+			Type:  base.TypeString,
+		},
+		{
+			Name:     "client_id",
+			Label:    "client id",
+			Default:  "iYCeC9g08h5vuP9UqvPHKKSVrKFXGa1v",
+			Type:     base.TypeString,
+			Required: true,
+		},
+		{
+			Name:     "client_secret",
+			Label:    "client secret",
+			Default:  "jXiFMOPVPCWlO2M5CwWQzffpNPaGTRBG",
+			Type:     base.TypeString,
+			Required: true,
+		},
+	}
+}
+
+func (driver Baidu) Save(account *model.Account, old *model.Account) error {
+	if account == nil {
+		return nil
+	}
+	return driver.RefreshToken(account)
+}
+
+func (driver Baidu) File(path string, account *model.Account) (*model.File, error) {
+	path = utils.ParsePath(path)
+	if path == "/" {
+		return &model.File{
+			Id:        account.RootFolder,
+			Name:      account.Name,
+			Size:      0,
+			Type:      conf.FOLDER,
+			Driver:    driver.Config().Name,
+			UpdatedAt: account.UpdatedAt,
+		}, nil
+	}
+
+	dir, name := filepath.Split(path)
+	files, err := driver.Files(dir, account)
+	if err != nil {
+		return nil, err
+	}
+	for _, file := range files {
+		if file.Name == name {
+			return &file, nil
+		}
+	}
+	return nil, base.ErrPathNotFound
+}
+
+func (driver Baidu) Files(path string, account *model.Account) ([]model.File, error) {
+	path = utils.ParsePath(path)
+	var files []model.File
+	cache, err := base.GetCache(path, account)
+	if err == nil {
+		files, _ = cache.([]model.File)
+		return files, nil
+	}
+
+	file, err := driver.File(path, account)
+	if err != nil {
+		return nil, err
+	}
+
+	if IsAlbum(file) {
+		albumFiles, err := driver.GetAllAlbumFile(file.Id, account)
+		if err != nil {
+			return nil, err
+		}
+		files = make([]model.File, 0, len(albumFiles))
+		for _, file := range albumFiles {
+			var thumbnail string
+			if len(file.Thumburl) > 0 {
+				thumbnail = file.Thumburl[0]
+			}
+			files = append(files, model.File{
+				Id:        joinID(file.Fsid, file.Uk, file.Tid),
+				Name:      file.Name(),
+				Size:      file.Size,
+				Type:      utils.GetFileType(filepath.Ext(file.Path)),
+				Driver:    driver.Config().Name,
+				UpdatedAt: getTime(file.Mtime),
+				Thumbnail: thumbnail,
+			})
+		}
+	} else if IsRoot(file) {
+		albums, err := driver.GetAllAlbum(account)
+		if err != nil {
+			return nil, err
+		}
+
+		files = make([]model.File, 0, len(albums))
+		for _, album := range albums {
+			files = append(files, model.File{
+				Id:        joinID(album.AlbumID, album.Tid),
+				Name:      album.Title,
+				Size:      0,
+				Type:      conf.FOLDER,
+				Driver:    driver.Config().Name,
+				UpdatedAt: getTime(album.Mtime),
+			})
+		}
+	} else {
+		return nil, base.ErrNotSupport
+	}
+
+	if len(files) > 0 {
+		_ = base.SetCache(path, files, account)
+	}
+	return files, nil
+}
+
+func (driver Baidu) Link(args base.Args, account *model.Account) (*base.Link, error) {
+	file, err := driver.File(args.Path, account)
+	if err != nil {
+		return nil, err
+	}
+	if !IsAlbumFile(file) {
+		return nil, base.ErrNotSupport
+	}
+
+	album, err := driver.File(filepath.Dir(utils.ParsePath(args.Path)), account)
+	if err != nil {
+		return nil, err
+	}
+
+	e := splitID(file.Id)
+	res, err := base.NoRedirectClient.R().
+		SetQueryParams(map[string]string{
+			"access_token": account.AccessToken,
+			"album_id":     splitID(album.Id)[0],
+			"tid":          e[2],
+			"fsid":         e[0],
+			"uk":           e[1],
+		}).
+		Head(ALBUM_API_URL + "/download")
+	if err != nil {
+		return nil, err
+	}
+	return &base.Link{
+		Headers: []base.Header{
+			{Name: "User-Agent", Value: base.UserAgent},
+		},
+		Url: res.Header().Get("location"),
+	}, nil
+}
+
+func (driver Baidu) Path(path string, account *model.Account) (*model.File, []model.File, error) {
+	path = utils.ParsePath(path)
+	file, err := driver.File(path, account)
+	if err != nil {
+		return nil, nil, err
+	}
+	if !file.IsDir() {
+		return file, nil, nil
+	}
+	files, err := driver.Files(path, account)
+	if err != nil {
+		return nil, nil, err
+	}
+	return nil, files, nil
+}
+
+func (driver Baidu) Preview(path string, account *model.Account) (interface{}, error) {
+	return nil, base.ErrNotSupport
+}
+
+func (driver Baidu) Rename(src string, dst string, account *model.Account) error {
+	srcFile, err := driver.File(src, account)
+	if err != nil {
+		return err
+	}
+
+	if IsAlbum(srcFile) {
+		return driver.SetAlbumName(srcFile.Id, filepath.Base(dst), account)
+	}
+	return base.ErrNotSupport
+}
+
+func (driver Baidu) MakeDir(path string, account *model.Account) error {
+	dir, name := filepath.Split(path)
+	parentFile, err := driver.File(dir, account)
+	if err != nil {
+		return err
+	}
+
+	if !IsRoot(parentFile) {
+		return base.ErrNotSupport
+	}
+	return driver.CreateAlbum(name, account)
+}
+
+func (driver Baidu) Move(src string, dst string, account *model.Account) error {
+	srcFile, err := driver.File(src, account)
+	if err != nil {
+		return err
+	}
+
+	if IsAlbumFile(srcFile) {
+		// 移动相册文件
+		dstAlbum, err := driver.File(filepath.Dir(dst), account)
+		if err != nil {
+			return err
+		}
+		if !IsAlbum(dstAlbum) {
+			return base.ErrNotSupport
+		}
+
+		srcAlbum, err := driver.File(filepath.Dir(src), account)
+		if err != nil {
+			return err
+		}
+
+		newFile, err := driver.CopyAlbumFile(srcAlbum.Id, account, srcFile.Id)
+		if err != nil {
+			return err
+		}
+		err = driver.DeleteAlbumFile(srcAlbum.Id, account, srcFile.Id)
+		if err != nil {
+			return err
+		}
+		err = driver.AddAlbumFile(dstAlbum.Id, account, joinID(newFile.Fsid))
+		if err != nil {
+			return err
+		}
+		return nil
+	}
+	return base.ErrNotSupport
+}
+
+func (driver Baidu) Copy(src string, dst string, account *model.Account) error {
+	srcFile, err := driver.File(src, account)
+	if err != nil {
+		return err
+	}
+
+	if IsAlbumFile(srcFile) {
+		// 复制相册文件
+		dstAlbum, err := driver.File(filepath.Dir(dst), account)
+		if err != nil {
+			return err
+		}
+		if !IsAlbum(dstAlbum) {
+			return base.ErrNotSupport
+		}
+
+		srcAlbum, err := driver.File(filepath.Dir(src), account)
+		if err != nil {
+			return err
+		}
+
+		newFile, err := driver.CopyAlbumFile(srcAlbum.Id, account, srcFile.Id)
+		if err != nil {
+			return err
+		}
+		err = driver.AddAlbumFile(dstAlbum.Id, account, joinID(newFile.Fsid))
+		if err != nil {
+			return err
+		}
+		return nil
+	}
+	return base.ErrNotSupport
+}
+
+func (driver Baidu) Delete(path string, account *model.Account) error {
+	file, err := driver.File(path, account)
+	if err != nil {
+		return err
+	}
+
+	// 删除相册
+	if IsAlbum(file) {
+		return driver.DeleteAlbum(file.Id, account)
+	}
+
+	// 生成相册文件
+	if IsAlbumFile(file) {
+		// 删除相册文件
+		album, err := driver.File(filepath.Dir(path), account)
+		if err != nil {
+			return err
+		}
+		return driver.DeleteAlbumFile(album.Id, account, file.Id)
+	}
+	return base.ErrNotSupport
+}
+
+func (driver Baidu) Upload(file *model.FileStream, account *model.Account) error {
+	if file == nil {
+		return base.ErrEmptyFile
+	}
+
+	parentFile, err := driver.File(file.ParentPath, account)
+	if err != nil {
+		return err
+	}
+
+	if !IsAlbum(parentFile) {
+		return base.ErrNotSupport
+	}
+
+	tempFile, err := ioutil.TempFile(conf.Conf.TempDir, "file-*")
+	if err != nil {
+		return err
+	}
+	defer func() {
+		tempFile.Close()
+		os.Remove(tempFile.Name())
+	}()
+
+	// 计算需要的数据
+	const DEFAULT = 1 << 22
+	const SliceSize = 1 << 18
+	count := int(math.Ceil(float64(file.Size) / float64(DEFAULT)))
+
+	sliceMD5List := make([]string, 0, count)
+	fileMd5 := md5.New()
+	sliceMd5 := md5.New()
+	for i := 1; i <= count; i++ {
+		if n, err := io.CopyN(io.MultiWriter(fileMd5, sliceMd5, tempFile), file, DEFAULT); err != io.EOF && n == 0 {
+			return err
+		}
+		sliceMD5List = append(sliceMD5List, hex.EncodeToString(sliceMd5.Sum(nil)))
+		sliceMd5.Reset()
+	}
+
+	if _, err = tempFile.Seek(0, io.SeekStart); err != nil {
+		return err
+	}
+
+	content_md5 := hex.EncodeToString(fileMd5.Sum(nil))
+	slice_md5 := content_md5
+	if file.GetSize() > SliceSize {
+		sliceData := make([]byte, SliceSize)
+		if _, err = io.ReadFull(tempFile, sliceData); err != nil {
+			return err
+		}
+		sliceMd5.Write(sliceData)
+		slice_md5 = hex.EncodeToString(sliceMd5.Sum(nil))
+		if _, err = tempFile.Seek(0, io.SeekStart); err != nil {
+			return err
+		}
+	}
+
+	// 开始执行上传
+	params := map[string]string{
+		"autoinit":    "1",
+		"isdir":       "0",
+		"rtype":       "1",
+		"ctype":       "11",
+		"path":        utils.ParsePath(file.Name),
+		"size":        fmt.Sprint(file.Size),
+		"slice-md5":   slice_md5,
+		"content-md5": content_md5,
+		"block_list":  MustString(utils.Json.MarshalToString(sliceMD5List)),
+	}
+
+	// 预上传
+	var precreateResp PrecreateResp
+	_, err = driver.Request(http.MethodPost, FILE_API_URL+"/precreate", func(r *resty.Request) {
+		r.SetFormData(params)
+		r.SetResult(&precreateResp)
+	}, account)
+	if err != nil {
+		return err
+	}
+
+	switch precreateResp.ReturnType {
+	case 1: // 上传文件
+		uploadParams := map[string]string{
+			"method":   "upload",
+			"path":     params["path"],
+			"uploadid": precreateResp.UploadID,
+		}
+
+		for i := 0; i < count; i++ {
+			uploadParams["partseq"] = fmt.Sprint(i)
+			_, err = driver.Request(http.MethodPost, "https://c3.pcs.baidu.com/rest/2.0/pcs/superfile2", func(r *resty.Request) {
+				r.SetQueryParams(uploadParams)
+				r.SetFileReader("file", file.Name, io.LimitReader(tempFile, DEFAULT))
+			}, account)
+			if err != nil {
+				return err
+			}
+		}
+		fallthrough
+	case 2: // 创建文件
+		params["uploadid"] = precreateResp.UploadID
+		_, err = driver.Request(http.MethodPost, FILE_API_URL+"/create", func(r *resty.Request) {
+			r.SetFormData(params)
+			r.SetResult(&precreateResp)
+		}, account)
+		if err != nil {
+			return err
+		}
+		fallthrough
+	case 3: // 增加到相册
+		err = driver.AddAlbumFile(parentFile.Id, account, joinID(precreateResp.Data.FsID))
+		if err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+var _ base.Driver = (*Baidu)(nil)

drivers/baiduphoto/types.go

@@ -0,0 +1,125 @@
+package baiduphoto
+
+import (
+	"fmt"
+	"path/filepath"
+)
+
+type TokenErrResp struct {
+	ErrorDescription string `json:"error_description"`
+	ErrorMsg         string `json:"error"`
+}
+
+func (e *TokenErrResp) Error() string {
+	return fmt.Sprint(e.ErrorMsg, " : ", e.ErrorDescription)
+}
+
+type Erron struct {
+	Errno     int `json:"errno"`
+	RequestID int `json:"request_id"`
+}
+
+type Page struct {
+	HasMore int    `json:"has_more"`
+	Cursor  string `json:"cursor"`
+}
+
+func (p Page) HasNextPage() bool {
+	return p.HasMore == 1
+}
+
+type (
+	FileListResp struct {
+		Page
+		List []File `json:"list"`
+	}
+
+	File struct {
+		Fsid     int64    `json:"fsid"` // 文件ID
+		Path     string   `json:"path"` // 文件路径
+		Size     int64    `json:"size"`
+		Ctime    int64    `json:"ctime"` // 创建时间 s
+		Mtime    int64    `json:"mtime"` // 修改时间 s
+		Thumburl []string `json:"thumburl"`
+	}
+)
+
+func (f File) Name() string {
+	return filepath.Base(f.Path)
+}
+
+/*相册部分*/
+type (
+	AlbumListResp struct {
+		Page
+		List       []Album `json:"list"`
+		Reset      int64   `json:"reset"`
+		TotalCount int64   `json:"total_count"`
+	}
+
+	Album struct {
+		AlbumID    string `json:"album_id"`
+		Tid        int64  `json:"tid"`
+		Title      string `json:"title"`
+		JoinTime   int64  `json:"join_time"`
+		CreateTime int64  `json:"create_time"`
+		Mtime      int64  `json:"mtime"`
+	}
+
+	AlbumFileListResp struct {
+		Page
+		List       []AlbumFile `json:"list"`
+		Reset      int64       `json:"reset"`
+		TotalCount int64       `json:"total_count"`
+	}
+
+	AlbumFile struct {
+		File
+		Tid int64 `json:"tid"`
+		Uk  int64 `json:"uk"`
+	}
+)
+
+type (
+	CopyFileResp struct {
+		List []CopyFile `json:"list"`
+	}
+	CopyFile struct {
+		FromFsid  int64  `json:"from_fsid"` // 源ID
+		Fsid      int64  `json:"fsid"`      // 目标ID
+		Path      string `json:"path"`
+		ShootTime int    `json:"shoot_time"`
+	}
+)
+
+/*上传部分*/
+type (
+	UploadFile struct {
+		FsID           int64  `json:"fs_id"`
+		Size           int    `json:"size"`
+		Md5            string `json:"md5"`
+		ServerFilename string `json:"server_filename"`
+		Path           string `json:"path"`
+		Ctime          int    `json:"ctime"`
+		Mtime          int    `json:"mtime"`
+		Isdir          int    `json:"isdir"`
+		Category       int    `json:"category"`
+		ServerMd5      string `json:"server_md5"`
+		ShootTime      int    `json:"shoot_time"`
+	}
+
+	CreateFileResp struct {
+		Data UploadFile `json:"data"`
+	}
+
+	PrecreateResp struct {
+		ReturnType int `json:"return_type"` //存在返回2 不存在返回1 已经保存3
+		//存在返回
+		CreateFileResp
+
+		//不存在返回
+		Path      string  `json:"path"`
+		UploadID  string  `json:"uploadid"`
+		Blocklist []int64 `json:"block_list"`
+	}
+)

drivers/baiduphoto/util.go

@@ -0,0 +1,83 @@
+package baiduphoto
+
+import (
+	"errors"
+	"fmt"
+	"math"
+	"math/rand"
+	"regexp"
+	"strings"
+	"time"
+
+	"github.com/Xhofe/alist/model"
+)
+
+const (
+	API_URL       = "https://photo.baidu.com/youai"
+	ALBUM_API_URL = API_URL + "/album/v1"
+	FILE_API_URL  = API_URL + "/file/v1"
+)
+
+var (
+	ErrNotSupportName = errors.New("only chinese and english, numbers and underscores are supported, and the length is no more than 20")
+)
+
+//Tid生成
+func getTid() string {
+	return fmt.Sprintf("3%d%.0f", time.Now().Unix(), math.Floor(9000000*rand.Float64()+1000000))
+}
+
+// 检查名称
+func checkName(name string) bool {
+	return len(name) <= 20 && regexp.MustCompile("[\u4e00-\u9fa5A-Za-z0-9_]").MatchString(name)
+}
+
+func getTime(t int64) *time.Time {
+	tm := time.Unix(t, 0)
+	return &tm
+}
+
+func fsidsFormat(ids ...string) string {
+	var buf []string
+	for _, id := range ids {
+		e := strings.Split(id, "|")
+		buf = append(buf, fmt.Sprintf("{\"fsid\":%s,\"uk\":%s}", e[0], e[1]))
+	}
+	return fmt.Sprintf("[%s]", strings.Join(buf, ","))
+}
+
+func fsidsFormatNotUk(ids ...string) string {
+	var buf []string
+	for _, id := range ids {
+		buf = append(buf, fmt.Sprintf("{\"fsid\":%s}", strings.Split(id, "|")[0]))
+	}
+	return fmt.Sprintf("[%s]", strings.Join(buf, ","))
+}
+
+func splitID(id string) []string {
+	return strings.SplitN(id, "|", 3)[:3]
+}
+
+func joinID(ids ...interface{}) string {
+	idsStr := make([]string, 0, len(ids))
+	for _, id := range ids {
+		idsStr = append(idsStr, fmt.Sprint(id))
+	}
+	return strings.Join(idsStr, "|")
+}
+
+func IsAlbum(file *model.File) bool {
+	return file.Id != "" && file.IsDir()
+}
+
+func IsAlbumFile(file *model.File) bool {
+	return file.Id != "" && !file.IsDir()
+}
+
+func IsRoot(file *model.File) bool {
+	return file.Id == "" && file.IsDir()
+}
+
+func MustString(str string, err error) string {
+	return str
+}

drivers/base/base.go

@@ -0,0 +1,61 @@
+package base
+
+import "github.com/Xhofe/alist/model"
+
+type Base struct{}
+
+func (b Base) Config() DriverConfig {
+	return DriverConfig{}
+}
+
+func (b Base) Items() []Item {
+	return nil
+}
+
+func (b Base) Save(account *model.Account, old *model.Account) error {
+	return ErrNotImplement
+}
+
+func (b Base) File(path string, account *model.Account) (*model.File, error) {
+	return nil, ErrNotImplement
+}
+
+func (b Base) Files(path string, account *model.Account) ([]model.File, error) {
+	return nil, ErrNotImplement
+}
+
+func (b Base) Link(args Args, account *model.Account) (*Link, error) {
+	return nil, ErrNotImplement
+}
+
+func (b Base) Path(path string, account *model.Account) (*model.File, []model.File, error) {
+	return nil, nil, ErrNotImplement
+}
+
+func (b Base) Preview(path string, account *model.Account) (interface{}, error) {
+	return nil, ErrNotImplement
+}
+
+func (b Base) MakeDir(path string, account *model.Account) error {
+	return ErrNotImplement
+}
+
+func (b Base) Move(src string, dst string, account *model.Account) error {
+	return ErrNotImplement
+}
+
+func (b Base) Rename(src string, dst string, account *model.Account) error {
+	return ErrNotImplement
+}
+
+func (b Base) Copy(src string, dst string, account *model.Account) error {
+	return ErrNotImplement
+}
+
+func (b Base) Delete(path string, account *model.Account) error {
+	return ErrNotImplement
+}
+
+func (b Base) Upload(file *model.FileStream, account *model.Account) error {
+	return ErrNotImplement
+}

drivers/base/cache.go

@@ -1,7 +1,6 @@
 package base
 
 import (
-	"fmt"
 	"github.com/Xhofe/alist/conf"
 	"github.com/Xhofe/alist/model"
 	"github.com/Xhofe/alist/utils"
@@ -9,12 +8,39 @@ import (
 )
 
 func KeyCache(path string, account *model.Account) string {
-	path = utils.ParsePath(path)
-	return fmt.Sprintf("%s%s", account.Name, path)
+	//path = utils.ParsePath(path)
+	key := utils.ParsePath(utils.Join(account.Name, path))
+	log.Debugln("cache key: ", key)
+	return key
 }
 
-func SetCache(path string, obj interface{}, account *model.Account) error {
-	return conf.Cache.Set(conf.Ctx, KeyCache(path, account), obj, nil)
+func SaveSearchFiles[T model.ISearchFile](key string, obj []T) {
+	err := model.DeleteSearchFilesByPath(key)
+	if err != nil {
+		log.Errorln("failed create search files", err)
+		return
+	}
+	files := make([]model.SearchFile, len(obj))
+	for i := 0; i < len(obj); i++ {
+		files[i] = model.SearchFile{
+			Path: key,
+			Name: obj[i].GetName(),
+			Size: obj[i].GetSize(),
+			Type: obj[i].GetType(),
+		}
+	}
+	err = model.CreateSearchFiles(files)
+	if err != nil {
+		log.Errorln("failed create search files", err)
+	}
+}
+
+func SetCache[T model.ISearchFile](path string, obj []T, account *model.Account) error {
+	key := KeyCache(path, account)
+	if conf.GetBool("enable search") {
+		go SaveSearchFiles(key, obj)
+	}
+	return conf.Cache.Set(conf.Ctx, key, obj, nil)
 }
 
 func GetCache(path string, account *model.Account) (interface{}, error) {

drivers/base/driver.go

@@ -2,10 +2,10 @@ package base
 
 import (
 	"github.com/Xhofe/alist/model"
-	"github.com/gin-gonic/gin"
 	"github.com/go-resty/resty/v2"
 	log "github.com/sirupsen/logrus"
 	"net/http"
+	"time"
 )
 
 type DriverConfig struct {
@@ -19,8 +19,9 @@ type DriverConfig struct {
 }
 
 type Args struct {
-	Path string
-	IP   string
+	Path   string
+	IP     string
+	Header http.Header
 }
 
 type Driver interface {
@@ -38,14 +39,16 @@ type Driver interface {
 	Link(args Args, account *model.Account) (*Link, error)
 	// Path 取路径（文件或文件夹）
 	Path(path string, account *model.Account) (*model.File, []model.File, error)
-	// Proxy 代理处理
-	Proxy(c *gin.Context, account *model.Account)
+	// Deprecated Proxy 代理处理
+	//Proxy(r *http.Request, account *model.Account)
 	// Preview 预览
 	Preview(path string, account *model.Account) (interface{}, error)
 	// MakeDir 创建文件夹
 	MakeDir(path string, account *model.Account) error
 	// Move 移动/改名
 	Move(src string, dst string, account *model.Account) error
+	// Rename 改名
+	Rename(src string, dst string, account *model.Account) error
 	// Copy 拷贝
 	Copy(src string, dst string, account *model.Account) error
 	// Delete 删除
@@ -60,6 +63,7 @@ type Item struct {
 	Name        string `json:"name"`
 	Label       string `json:"label"`
 	Type        string `json:"type"`
+	Default     string `json:"default"`
 	Values      string `json:"values"`
 	Required    bool   `json:"required"`
 	Description string `json:"description"`
@@ -82,19 +86,21 @@ func GetDriversMap() map[string]Driver {
 }
 
 func GetDrivers() map[string][]Item {
-	res := make(map[string][]Item, 0)
+	res := make(map[string][]Item)
 	for k, v := range driversMap {
+		webdavDirect := Item{
+			Name:        "webdav_direct",
+			Label:       "webdav direct",
+			Type:        TypeBool,
+			Required:    true,
+			Description: "Transfer the WebDAV of this account through the native",
+		}
 		if v.Config().OnlyProxy {
-			res[k] = v.Items()
+			res[k] = append([]Item{
+				webdavDirect,
+			}, v.Items()...)
 		} else {
 			res[k] = append([]Item{
-				//{
-				//	Name:        "allow_proxy",
-				//	Label:       "allow_proxy",
-				//	Type:        TypeBool,
-				//	Required:    true,
-				//	Description: "allow proxy",
-				//},
 				{
 					Name:        "proxy",
 					Label:       "proxy",
@@ -109,13 +115,20 @@ func GetDrivers() map[string][]Item {
 					Required:    true,
 					Description: "Transfer the WebDAV of this account through the server",
 				},
+				webdavDirect,
 			}, v.Items()...)
 		}
 		res[k] = append([]Item{
 			{
 				Name:  "down_proxy_url",
 				Label: "down_proxy_url",
-				Type:  TypeString,
+				Type:  TypeText,
+			},
+			{
+				Name:   "extract_folder",
+				Label:  "extract_folder",
+				Values: "front,back",
+				Type:   TypeSelect,
 			},
 		}, res[k]...)
 		if v.Config().ApiProxy {
@@ -152,6 +165,8 @@ func GetDrivers() map[string][]Item {
 var NoRedirectClient *resty.Client
 var RestyClient = resty.New()
 var HttpClient = &http.Client{}
+var UserAgent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.88 Safari/537.36"
+var DefaultTimeout = time.Second * 20
 
 func init() {
 	NoRedirectClient = resty.New().SetRedirectPolicy(
@@ -159,8 +174,8 @@ func init() {
 			return http.ErrUseLastResponse
 		}),
 	)
-	userAgent := "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.88 Safari/537.36"
-	NoRedirectClient.SetHeader("user-agent", userAgent)
-	RestyClient.SetHeader("user-agent", userAgent)
+	NoRedirectClient.SetHeader("user-agent", UserAgent)
+	RestyClient.SetHeader("user-agent", UserAgent)
 	RestyClient.SetRetryCount(3)
+	RestyClient.SetTimeout(DefaultTimeout)
 }

drivers/base/types.go

@@ -3,6 +3,7 @@ package base
 import (
 	"errors"
 	"io"
+	"net/http"
 )
 
 var (
@@ -12,6 +13,8 @@ var (
 	ErrNotSupport   = errors.New("not support")
 	ErrNotFolder    = errors.New("not a folder")
 	ErrEmptyFile    = errors.New("empty file")
+	ErrRelativePath = errors.New("access using relative path is not allowed")
+	ErrEmptyToken   = errors.New("empty token")
 )
 
 const (
@@ -19,6 +22,7 @@ const (
 	TypeSelect = "select"
 	TypeBool   = "bool"
 	TypeNumber = "number"
+	TypeText   = "text"
 )
 
 const (
@@ -42,7 +46,10 @@ type Header struct {
 }
 
 type Link struct {
-	Url     string   `json:"url"`
-	Headers []Header `json:"headers"`
-	Data    io.ReadCloser
+	Url      string   `json:"url"`
+	Headers  []Header `json:"headers"`
+	Data     io.ReadCloser
+	FilePath string `json:"path"` // for native
+	Status   int
+	Header   http.Header
 }

drivers/ftp/driver.go

@@ -5,7 +5,6 @@ import (
 	"github.com/Xhofe/alist/drivers/base"
 	"github.com/Xhofe/alist/model"
 	"github.com/Xhofe/alist/utils"
-	"github.com/gin-gonic/gin"
 	"github.com/jlaffaye/ftp"
 	log "github.com/sirupsen/logrus"
 	"path/filepath"
@@ -53,15 +52,25 @@ func (driver FTP) Items() []base.Item {
 }
 
 func (driver FTP) Save(account *model.Account, old *model.Account) error {
+	if old != nil {
+		conn, ok := connMap[old.Name]
+		if ok {
+			err := conn.Quit()
+			log.Error("ftp:", err)
+			delete(connMap, old.Name)
+		}
+	}
+	if account == nil {
+		return nil
+	}
 	if account.RootFolder == "" {
 		account.RootFolder = "/"
 	}
-	conn, err := driver.Login(account)
+	_, err := driver.Login(account)
 	if err != nil {
 		account.Status = err.Error()
 	} else {
 		account.Status = "work"
-		_ = conn.Quit()
 	}
 	_ = model.SaveAccount(account)
 	return err
@@ -106,7 +115,7 @@ func (driver FTP) Files(path string, account *model.Account) ([]model.File, erro
 	if err != nil {
 		return nil, err
 	}
-	defer func() { _ = conn.Quit() }()
+	//defer func() { _ = conn.Quit() }()
 	entries, err := conn.List(realPath)
 	if err != nil {
 		return nil, err
@@ -144,7 +153,7 @@ func (driver FTP) Link(args base.Args, account *model.Account) (*base.Link, erro
 	if err != nil {
 		return nil, err
 	}
-	defer func() { _ = conn.Quit() }()
+	//defer func() { _ = conn.Quit() }()
 	resp, err := conn.Retr(realPath)
 	if err != nil {
 		return nil, err
@@ -176,9 +185,9 @@ func (driver FTP) Path(path string, account *model.Account) (*model.File, []mode
 	return nil, files, nil
 }
 
-func (driver FTP) Proxy(c *gin.Context, account *model.Account) {
-
-}
+//func (driver FTP) Proxy(r *http.Request, account *model.Account) {
+//
+//}
 
 func (driver FTP) Preview(path string, account *model.Account) (interface{}, error) {
 	return nil, base.ErrNotSupport
@@ -191,35 +200,27 @@ func (driver FTP) MakeDir(path string, account *model.Account) error {
 	if err != nil {
 		return err
 	}
-	defer func() { _ = conn.Quit() }()
+	//defer func() { _ = conn.Quit() }()
 	err = conn.MakeDir(realPath)
-	if err == nil {
-		_ = base.DeleteCache(utils.Dir(path), account)
-	}
 	return err
 }
 
 func (driver FTP) Move(src string, dst string, account *model.Account) error {
-	//if utils.Dir(src) != utils.Dir(dst) {
-	//	return base.ErrNotSupport
-	//}
 	realSrc := utils.Join(account.RootFolder, src)
 	realDst := utils.Join(account.RootFolder, dst)
 	conn, err := driver.Login(account)
 	if err != nil {
 		return err
 	}
-	defer func() { _ = conn.Quit() }()
+	//defer func() { _ = conn.Quit() }()
 	err = conn.Rename(realSrc, realDst)
-	if err != nil {
-		_ = base.DeleteCache(utils.Dir(src), account)
-		if utils.Dir(src) != utils.Dir(dst) {
-			_ = base.DeleteCache(utils.Dir(dst), account)
-		}
-	}
 	return err
 }
 
+func (driver FTP) Rename(src string, dst string, account *model.Account) error {
+	return driver.Move(src, dst, account)
+}
+
 func (driver FTP) Copy(src string, dst string, account *model.Account) error {
 	return base.ErrNotSupport
 }
@@ -231,11 +232,8 @@ func (driver FTP) Delete(path string, account *model.Account) error {
 	if err != nil {
 		return err
 	}
-	defer func() { _ = conn.Quit() }()
+	//defer func() { _ = conn.Quit() }()
 	err = conn.Delete(realPath)
-	if err == nil {
-		_ = base.DeleteCache(utils.Dir(path), account)
-	}
 	return err
 }
 
@@ -248,11 +246,8 @@ func (driver FTP) Upload(file *model.FileStream, account *model.Account) error {
 	if err != nil {
 		return err
 	}
-	defer func() { _ = conn.Quit() }()
+	//defer func() { _ = conn.Quit() }()
 	err = conn.Stor(realPath, file)
-	if err == nil {
-		_ = base.DeleteCache(utils.Dir(file.ParentPath), account)
-	}
 	return err
 }
 

drivers/ftp/ftp.go

@@ -6,7 +6,18 @@ import (
 	"github.com/jlaffaye/ftp"
 )
 
+var connMap map[string]*ftp.ServerConn
+
 func (driver FTP) Login(account *model.Account) (*ftp.ServerConn, error) {
+	conn, ok := connMap[account.Name]
+	if ok {
+		_, err := conn.CurrentDir()
+		if err == nil {
+			return conn, nil
+		} else {
+			delete(connMap, account.Name)
+		}
+	}
 	conn, err := ftp.Connect(account.SiteUrl)
 	if err != nil {
 		return nil, err
@@ -15,9 +26,11 @@ func (driver FTP) Login(account *model.Account) (*ftp.ServerConn, error) {
 	if err != nil {
 		return nil, err
 	}
+	connMap[account.Name] = conn
 	return conn, nil
 }
 
 func init() {
 	base.RegisterDriver(&FTP{})
-}
+	connMap = make(map[string]*ftp.ServerConn)
+}

drivers/google/driver.go

@@ -6,7 +6,6 @@ import (
 	"github.com/Xhofe/alist/drivers/base"
 	"github.com/Xhofe/alist/model"
 	"github.com/Xhofe/alist/utils"
-	"github.com/gin-gonic/gin"
 	log "github.com/sirupsen/logrus"
 	"io/ioutil"
 	"path/filepath"
@@ -30,12 +29,14 @@ func (driver GoogleDrive) Items() []base.Item {
 			Label:    "client id",
 			Type:     base.TypeString,
 			Required: true,
+			Default:  "202264815644.apps.googleusercontent.com",
 		},
 		{
 			Name:     "client_secret",
 			Label:    "client secret",
 			Type:     base.TypeString,
 			Required: true,
+			Default:  "X4Z3ca8xfWDb1Voo-F9a7ZxJ",
 		},
 		{
 			Name:     "refresh_token",
@@ -67,6 +68,9 @@ func (driver GoogleDrive) Items() []base.Item {
 }
 
 func (driver GoogleDrive) Save(account *model.Account, old *model.Account) error {
+	if account == nil {
+		return nil
+	}
 	account.Proxy = true
 	err := driver.RefreshToken(account)
 	if err != nil {
@@ -175,9 +179,9 @@ func (driver GoogleDrive) Path(path string, account *model.Account) (*model.File
 	return nil, files, nil
 }
 
-func (driver GoogleDrive) Proxy(c *gin.Context, account *model.Account) {
-	c.Request.Header.Add("Authorization", "Bearer "+account.AccessToken)
-}
+//func (driver GoogleDrive) Proxy(r *http.Request, account *model.Account) {
+//	r.Header.Add("Authorization", "Bearer "+account.AccessToken)
+//}
 
 func (driver GoogleDrive) Preview(path string, account *model.Account) (interface{}, error) {
 	return nil, base.ErrNotSupport
@@ -194,9 +198,6 @@ func (driver GoogleDrive) MakeDir(path string, account *model.Account) error {
 		"mimeType": "application/vnd.google-apps.folder",
 	}
 	_, err = driver.Request("https://www.googleapis.com/drive/v3/files", base.Post, nil, nil, nil, &data, nil, account)
-	if err == nil {
-		_ = base.DeleteCache(utils.Dir(path), account)
-	}
 	return err
 }
 
@@ -206,29 +207,28 @@ func (driver GoogleDrive) Move(src string, dst string, account *model.Account) e
 	if err != nil {
 		return err
 	}
-	if utils.Dir(src) == utils.Dir(dst) {
-		// rename
-		data := base.Json{
-			"name": utils.Base(dst),
-		}
-		_, err = driver.Request(url, base.Patch, nil, nil, nil, &data, nil, account)
-	} else {
-		dstParentFile, err := driver.File(utils.Dir(dst), account)
-		if err != nil {
-			return err
-		}
-		query := map[string]string{
-			"addParents":    dstParentFile.Id,
-			"removeParents": "root",
-		}
-		_, err = driver.Request(url, base.Patch, nil, query, nil, nil, nil, account)
+	dstParentFile, err := driver.File(utils.Dir(dst), account)
+	if err != nil {
+		return err
 	}
-	if err == nil {
-		_ = base.DeleteCache(utils.Dir(src), account)
-		if utils.Dir(src) != utils.Dir(dst) {
-			_ = base.DeleteCache(utils.Dir(dst), account)
-		}
+	query := map[string]string{
+		"addParents":    dstParentFile.Id,
+		"removeParents": "root",
 	}
+	_, err = driver.Request(url, base.Patch, nil, query, nil, nil, nil, account)
+	return err
+}
+
+func (driver GoogleDrive) Rename(src string, dst string, account *model.Account) error {
+	srcFile, err := driver.File(src, account)
+	url := "https://www.googleapis.com/drive/v3/files/" + srcFile.Id
+	if err != nil {
+		return err
+	}
+	data := base.Json{
+		"name": utils.Base(dst),
+	}
+	_, err = driver.Request(url, base.Patch, nil, nil, nil, &data, nil, account)
 	return err
 }
 
@@ -243,9 +243,6 @@ func (driver GoogleDrive) Delete(path string, account *model.Account) error {
 		return err
 	}
 	_, err = driver.Request(url, base.Delete, nil, nil, nil, nil, nil, account)
-	if err == nil {
-		_ = base.DeleteCache(utils.Dir(path), account)
-	}
 	return err
 }
 
@@ -286,9 +283,6 @@ func (driver GoogleDrive) Upload(file *model.FileStream, account *model.Account)
 	putUrl := res.Header().Get("location")
 	byteData, _ := ioutil.ReadAll(file)
 	_, err = driver.Request(putUrl, base.Put, nil, nil, nil, byteData, nil, account)
-	if err == nil {
-		_ = base.DeleteCache(file.ParentPath, account)
-	}
 	return err
 }
 

drivers/google/googledrive.go

@@ -2,15 +2,10 @@ package google
 
 import (
 	"fmt"
-	"github.com/Xhofe/alist/conf"
 	"github.com/Xhofe/alist/drivers/base"
 	"github.com/Xhofe/alist/model"
-	"github.com/Xhofe/alist/utils"
 	"github.com/go-resty/resty/v2"
 	log "github.com/sirupsen/logrus"
-	"path/filepath"
-	"strconv"
-	"time"
 )
 
 type TokenError struct {
@@ -44,19 +39,6 @@ func (driver GoogleDrive) RefreshToken(account *model.Account) error {
 	return nil
 }
 
-type File struct {
-	Id            string     `json:"id"`
-	Name          string     `json:"name"`
-	MimeType      string     `json:"mimeType"`
-	ModifiedTime  *time.Time `json:"modifiedTime"`
-	Size          string     `json:"size"`
-	ThumbnailLink string     `json:"thumbnailLink"`
-}
-
-func (driver GoogleDrive) IsDir(mimeType string) bool {
-	return mimeType == "application/vnd.google-apps.folder" || mimeType == "application/vnd.google-apps.shortcut"
-}
-
 func (driver GoogleDrive) FormatFile(file *File, account *model.Account) *model.File {
 	f := &model.File{
 		Id:        file.Id,
@@ -65,16 +47,11 @@ func (driver GoogleDrive) FormatFile(file *File, account *model.Account) *model.
 		UpdatedAt: file.ModifiedTime,
 		Url:       "",
 	}
-	if driver.IsDir(file.MimeType) {
-		f.Type = conf.FOLDER
-	} else {
-		size, _ := strconv.ParseInt(file.Size, 10, 64)
-		f.Size = size
-		f.Type = utils.GetFileType(filepath.Ext(file.Name))
-	}
+	f.Size = int64(file.GetSize())
+	f.Type = file.GetType()
 	if file.ThumbnailLink != "" {
-		if account.DownProxyUrl != "" {
-			f.Thumbnail = fmt.Sprintf("%s/%s", account.DownProxyUrl, file.ThumbnailLink)
+		if account.APIProxyUrl != "" {
+			f.Thumbnail = fmt.Sprintf("%s/%s", account.APIProxyUrl, file.ThumbnailLink)
 		} else {
 			f.Thumbnail = file.ThumbnailLink
 		}

drivers/google/types.go

@@ -0,0 +1,38 @@
+package google
+
+import (
+	"github.com/Xhofe/alist/conf"
+	"github.com/Xhofe/alist/utils"
+	"path"
+	"strconv"
+	"time"
+)
+
+type File struct {
+	Id            string     `json:"id"`
+	Name          string     `json:"name"`
+	MimeType      string     `json:"mimeType"`
+	ModifiedTime  *time.Time `json:"modifiedTime"`
+	Size          string     `json:"size"`
+	ThumbnailLink string     `json:"thumbnailLink"`
+}
+
+func (f File) GetSize() uint64 {
+	if f.GetType() == conf.FOLDER {
+		return 0
+	}
+	size, _ := strconv.ParseUint(f.Size, 10, 64)
+	return size
+}
+
+func (f File) GetName() string {
+	return f.Name
+}
+
+func (f File) GetType() int {
+	mimeType := f.MimeType
+	if mimeType == "application/vnd.google-apps.folder" || mimeType == "application/vnd.google-apps.shortcut" {
+		return conf.FOLDER
+	}
+	return utils.GetFileType(path.Ext(f.Name))
+}

drivers/lanzou/driver.go

@@ -5,7 +5,6 @@ import (
 	"github.com/Xhofe/alist/drivers/base"
 	"github.com/Xhofe/alist/model"
 	"github.com/Xhofe/alist/utils"
-	"github.com/gin-gonic/gin"
 	log "github.com/sirupsen/logrus"
 	"path/filepath"
 )
@@ -33,17 +32,19 @@ func (driver Lanzou) Items() []base.Item {
 			Label:       "cookie",
 			Type:        base.TypeString,
 			Description: "about 15 days valid",
+			Required:    true,
+		},
+		{
+			Name:     "site_url",
+			Label:    "share url",
+			Type:     base.TypeString,
+			Required: true,
 		},
 		{
 			Name:  "root_folder",
 			Label: "root folder file_id",
 			Type:  base.TypeString,
 		},
-		{
-			Name:  "site_url",
-			Label: "share url",
-			Type:  base.TypeString,
-		},
 		{
 			Name:  "password",
 			Label: "share password",
@@ -53,6 +54,9 @@ func (driver Lanzou) Items() []base.Item {
 }
 
 func (driver Lanzou) Save(account *model.Account, old *model.Account) error {
+	if account == nil {
+		return nil
+	}
 	if account.InternalType == "cookie" {
 		if account.RootFolder == "" {
 			account.RootFolder = "-1"
@@ -121,18 +125,27 @@ func (driver Lanzou) Link(args base.Args, account *model.Account) (*base.Link, e
 	}
 	log.Debugf("down file: %+v", file)
 	downId := file.Id
+	pwd := ""
 	if account.InternalType == "cookie" {
-		downId, err = driver.GetDownPageId(file.Id, account)
+		downId, pwd, err = driver.GetDownPageId(file.Id, account)
 		if err != nil {
 			return nil, err
 		}
 	}
-	url, err := driver.GetLink(downId)
+	var url string
+	//if pwd != "" {
+	//url, err = driver.GetLinkWithPassword(downId, pwd, account)
+	//} else {
+	url, err = driver.GetLink(downId, pwd, account)
+	//}
 	if err != nil {
 		return nil, err
 	}
 	link := base.Link{
 		Url: url,
+		Headers: []base.Header{
+			{Name: "User-Agent", Value: base.UserAgent},
+		},
 	}
 	return &link, nil
 }
@@ -154,9 +167,9 @@ func (driver Lanzou) Path(path string, account *model.Account) (*model.File, []m
 	return nil, files, nil
 }
 
-func (driver Lanzou) Proxy(c *gin.Context, account *model.Account) {
-	c.Request.Header.Del("Origin")
-}
+//func (driver Lanzou) Proxy(r *http.Request, account *model.Account) {
+//	r.Header.Del("Origin")
+//}
 
 func (driver Lanzou) Preview(path string, account *model.Account) (interface{}, error) {
 	return nil, base.ErrNotSupport
@@ -170,6 +183,10 @@ func (driver *Lanzou) Move(src string, dst string, account *model.Account) error
 	return base.ErrNotImplement
 }
 
+func (driver *Lanzou) Rename(src string, dst string, account *model.Account) error {
+	return base.ErrNotImplement
+}
+
 func (driver *Lanzou) Copy(src string, dst string, account *model.Account) error {
 	return base.ErrNotImplement
 }

drivers/lanzou/lanzou.go

@@ -2,30 +2,15 @@ package lanzou
 
 import (
 	"fmt"
-	"github.com/Xhofe/alist/conf"
 	"github.com/Xhofe/alist/drivers/base"
 	"github.com/Xhofe/alist/model"
-	"github.com/Xhofe/alist/utils"
-	"github.com/go-resty/resty/v2"
 	log "github.com/sirupsen/logrus"
-	"path/filepath"
+	"net/url"
 	"regexp"
 	"strconv"
 	"time"
 )
 
-var lanzouClient = resty.New()
-
-type LanZouFile struct {
-	Name    string `json:"name"`
-	NameAll string `json:"name_all"`
-	Id      string `json:"id"`
-	FolId   string `json:"fol_id"`
-	Size    string `json:"size"`
-	Time    string `json:"time"`
-	Folder  bool
-}
-
 func (driver *Lanzou) FormatFile(file *LanZouFile) *model.File {
 	now := time.Now()
 	f := &model.File{
@@ -37,12 +22,11 @@ func (driver *Lanzou) FormatFile(file *LanZouFile) *model.File {
 		UpdatedAt: &now,
 	}
 	if file.Folder {
-		f.Type = conf.FOLDER
 		f.Id = file.FolId
 	} else {
 		f.Name = file.NameAll
-		f.Type = utils.GetFileType(filepath.Ext(file.NameAll))
 	}
+	f.Type = file.GetType()
 	return f
 }
 
@@ -57,7 +41,7 @@ func (driver *Lanzou) GetFiles(folderId string, account *model.Account) ([]LanZo
 		files := make([]LanZouFile, 0)
 		var resp LanZouFilesResp
 		// folders
-		res, err := lanzouClient.R().SetResult(&resp).SetHeader("Cookie", account.AccessToken).
+		res, err := base.RestyClient.R().SetResult(&resp).SetHeader("Cookie", account.AccessToken).
 			SetFormData(map[string]string{
 				"task":      "47",
 				"folder_id": folderId,
@@ -76,7 +60,7 @@ func (driver *Lanzou) GetFiles(folderId string, account *model.Account) ([]LanZo
 		// files
 		pg := 1
 		for {
-			_, err = lanzouClient.R().SetResult(&resp).SetHeader("Cookie", account.AccessToken).
+			_, err = base.RestyClient.R().SetResult(&resp).SetHeader("Cookie", account.AccessToken).
 				SetFormData(map[string]string{
 					"task":      "5",
 					"folder_id": folderId,
@@ -103,7 +87,11 @@ func (driver *Lanzou) GetFiles(folderId string, account *model.Account) ([]LanZo
 func (driver *Lanzou) GetFilesByUrl(account *model.Account) ([]LanZouFile, error) {
 	files := make([]LanZouFile, 0)
 	shareUrl := account.SiteUrl
-	res, err := lanzouClient.R().Get(shareUrl)
+	u, err := url.Parse(shareUrl)
+	if err != nil {
+		return nil, err
+	}
+	res, err := base.RestyClient.R().Get(shareUrl)
 	if err != nil {
 		return nil, err
 	}
@@ -116,7 +104,10 @@ func (driver *Lanzou) GetFilesByUrl(account *model.Account) ([]LanZouFile, error
 	uid := regexp.MustCompile(`'uid':'(.+?)',`).FindStringSubmatch(res.String())[1]
 	rep := regexp.MustCompile(`'rep':'(.+?)',`).FindStringSubmatch(res.String())[1]
 	up := regexp.MustCompile(`'up':(.+?),`).FindStringSubmatch(res.String())[1]
-	ls := regexp.MustCompile(`'ls':(.+?),`).FindStringSubmatch(res.String())[1]
+	ls := ""
+	if account.Password != "" {
+		ls = regexp.MustCompile(`'ls':(.+?),`).FindStringSubmatch(res.String())[1]
+	}
 	tName := regexp.MustCompile(`'t':(.+?),`).FindStringSubmatch(res.String())[1]
 	kName := regexp.MustCompile(`'k':(.+?),`).FindStringSubmatch(res.String())[1]
 	t := regexp.MustCompile(`var ` + tName + ` = '(.+?)';`).FindStringSubmatch(res.String())[1]
@@ -124,7 +115,7 @@ func (driver *Lanzou) GetFilesByUrl(account *model.Account) ([]LanZouFile, error
 	pg := 1
 	for {
 		var resp LanZouFilesResp
-		res, err = lanzouClient.R().SetResult(&resp).SetFormData(map[string]string{
+		res, err = base.RestyClient.R().SetResult(&resp).SetFormData(map[string]string{
 			"lx":  lx,
 			"fid": fid,
 			"uid": uid,
@@ -135,7 +126,7 @@ func (driver *Lanzou) GetFilesByUrl(account *model.Account) ([]LanZouFile, error
 			"up":  up,
 			"ls":  ls,
 			"pwd": account.Password,
-		}).Post("https://wwa.lanzouo.com/filemoreajax.php")
+		}).Post(fmt.Sprintf("https://%s/filemoreajax.php", u.Host))
 		if err != nil {
 			log.Debug(err)
 			break
@@ -148,6 +139,7 @@ func (driver *Lanzou) GetFilesByUrl(account *model.Account) ([]LanZouFile, error
 			break
 		}
 		pg++
+		time.Sleep(time.Second)
 		files = append(files, resp.Text...)
 	}
 	return files, nil
@@ -158,30 +150,22 @@ func (driver *Lanzou) GetFilesByUrl(account *model.Account) ([]LanZouFile, error
 //	IsNewd string `json:"is_newd"`
 //}
 
-// 获取下载页面的ID
-func (driver *Lanzou) GetDownPageId(fileId string, account *model.Account) (string, error) {
-	var resp LanZouFilesResp
-	res, err := lanzouClient.R().SetResult(&resp).SetHeader("Cookie", account.AccessToken).
+// GetDownPageId 获取下载页面的ID
+func (driver *Lanzou) GetDownPageId(fileId string, account *model.Account) (string, string, error) {
+	var resp DownPageResp
+	res, err := base.RestyClient.R().SetResult(&resp).SetHeader("Cookie", account.AccessToken).
 		SetFormData(map[string]string{
 			"task":    "22",
 			"file_id": fileId,
 		}).Post("https://pc.woozooo.com/doupload.php")
 	if err != nil {
-		return "", err
+		return "", "", err
 	}
 	log.Debug(res.String())
 	if resp.Zt != 1 {
-		return "", fmt.Errorf("%v", resp.Info)
+		return "", "", fmt.Errorf("%v", resp.Info)
 	}
-	info, ok := resp.Info.(map[string]interface{})
-	if !ok {
-		return "", fmt.Errorf("%v", resp.Info)
-	}
-	fid, ok := info["f_id"].(string)
-	if !ok {
-		return "", fmt.Errorf("%v", info["f_id"])
-	}
-	return fid, nil
+	return resp.Info.FId, resp.Info.Pwd, nil
 }
 
 type LanzouLinkResp struct {
@@ -190,50 +174,98 @@ type LanzouLinkResp struct {
 	Zt  int    `json:"zt"`
 }
 
-func (driver *Lanzou) GetLink(downId string) (string, error) {
-	res, err := lanzouClient.R().Get("https://wwa.lanzouo.com/" + downId)
+func (driver *Lanzou) GetLink(downId string, pwd string, account *model.Account) (string, error) {
+	shareUrl := account.SiteUrl
+	u, err := url.Parse(shareUrl)
+	if err != nil {
+		return "", err
+	}
+	log.Debugln(fmt.Sprintf("https://%s/%s", u.Host, downId))
+	res, err := base.RestyClient.R().Get(fmt.Sprintf("https://%s/%s", u.Host, downId))
 	if err != nil {
 		return "", err
 	}
 	iframe := regexp.MustCompile(`<iframe class="ifr2" name=".{2,20}" src="(.+?)"`).FindStringSubmatch(res.String())
 	if len(iframe) == 0 {
-		return "", fmt.Errorf("get down empty page")
+		return driver.GetLinkWithPassword(downId, pwd, res.String(), account)
 	}
-	iframeUrl := "https://wwa.lanzouo.com" + iframe[1]
-	res, err = lanzouClient.R().Get(iframeUrl)
+	iframeUrl := fmt.Sprintf("https://%s%s", u.Host, iframe[1])
+	res, err = base.RestyClient.R().Get(iframeUrl)
 	if err != nil {
 		return "", err
 	}
+	log.Debugln(res.String())
 	ajaxdata := regexp.MustCompile(`var ajaxdata = '(.+?)'`).FindStringSubmatch(res.String())
 	if len(ajaxdata) == 0 {
 		return "", fmt.Errorf("get iframe empty page")
 	}
 	signs := ajaxdata[1]
-	sign := regexp.MustCompile(`var ispostdowns = '(.+?)';`).FindStringSubmatch(res.String())[1]
-	websignkey := regexp.MustCompile(`'websignkey':'(.+?)'`).FindStringSubmatch(res.String())[1]
+	//sign := regexp.MustCompile(`var ispostdowns = '(.+?)';`).FindStringSubmatch(res.String())[1]
+	sign := regexp.MustCompile(`'sign':'(.+?)',`).FindStringSubmatch(res.String())[1]
+	//websign := regexp.MustCompile(`'websign':'(.+?)'`).FindStringSubmatch(res.String())[1]
+	websign := ""
+	websignR := regexp.MustCompile(`var websign = '(.+?)'`).FindStringSubmatch(res.String())
+	if len(websignR) > 1 {
+		websign = websignR[1]
+	}
+	//websign := ""
+	//websignkey := regexp.MustCompile(`'websignkey':'(.+?)'`).FindStringSubmatch(res.String())[1]
+	websignkey := regexp.MustCompile(`var websignkey = '(.+?)';`).FindStringSubmatch(res.String())[1]
 	var resp LanzouLinkResp
 	form := map[string]string{
 		"action":     "downprocess",
 		"signs":      signs,
 		"sign":       sign,
 		"ves":        "1",
-		"websign":    "",
+		"websign":    websign,
 		"websignkey": websignkey,
 	}
 	log.Debugf("form: %+v", form)
-	_, err = lanzouClient.R().SetResult(&resp).
-		SetHeader("origin", "https://wwa.lanzouo.com").
+	res, err = base.RestyClient.R().SetResult(&resp).
+		SetHeader("origin", "https://"+u.Host).
 		SetHeader("referer", iframeUrl).
-		SetFormData(form).Post("https://wwa.lanzouo.com/ajaxm.php")
+		SetFormData(form).Post(fmt.Sprintf("https://%s/ajaxm.php", u.Host))
+	log.Debug(res.String())
+	if err != nil {
+		return "", err
+	}
 	if resp.Zt == 1 {
 		return resp.Dom + "/file/" + resp.Url, nil
 	}
-	return "", fmt.Errorf("can't get link")
+	return "", fmt.Errorf("failed get link")
+}
+
+func (driver *Lanzou) GetLinkWithPassword(downId string, pwd string, html string, account *model.Account) (string, error) {
+	shareUrl := account.SiteUrl
+	u, err := url.Parse(shareUrl)
+	if err != nil {
+		return "", err
+	}
+	if html == "" {
+		log.Debugln(fmt.Sprintf("https://%s/%s", u.Host, downId))
+		res, err := base.RestyClient.R().Get(fmt.Sprintf("https://%s/%s", u.Host, downId))
+		if err != nil {
+			return "", err
+		}
+		html = res.String()
+	}
+
+	data := regexp.MustCompile(`data : '(.+?)'\+pwd,`).FindStringSubmatch(html)[1] + pwd
+	var resp LanzouLinkResp
+	_, err = base.RestyClient.R().SetResult(&resp).SetHeaders(map[string]string{
+		"Referer":      fmt.Sprintf("https://%s/%s", u.Host, downId),
+		"Origin":       "https://" + u.Host,
+		"content-type": "application/x-www-form-urlencoded",
+	}).SetBody(data).Post(fmt.Sprintf("https://%s/ajaxm.php", u.Host))
+	if err != nil {
+		return "", err
+	}
+	if resp.Zt == 1 {
+		return resp.Dom + "/file/" + resp.Url, nil
+	}
+	return "", fmt.Errorf("failed get link with password")
 }
 
 func init() {
 	base.RegisterDriver(&Lanzou{})
-	lanzouClient.
-		SetRetryCount(3).
-		SetHeader("user-agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.88 Safari/537.36")
 }

drivers/lanzou/types.go

@@ -0,0 +1,47 @@
+package lanzou
+
+import (
+	"github.com/Xhofe/alist/conf"
+	"github.com/Xhofe/alist/utils"
+	"path"
+)
+
+type LanZouFile struct {
+	Name    string `json:"name"`
+	NameAll string `json:"name_all"`
+	Id      string `json:"id"`
+	FolId   string `json:"fol_id"`
+	Size    string `json:"size"`
+	Time    string `json:"time"`
+	Folder  bool
+}
+
+func (f LanZouFile) GetSize() uint64 {
+	return 0
+}
+
+func (f LanZouFile) GetName() string {
+	if f.Folder {
+		return f.Name
+	}
+	return f.NameAll
+}
+
+func (f LanZouFile) GetType() int {
+	if f.Folder {
+		return conf.FOLDER
+	}
+	return utils.GetFileType(path.Ext(f.NameAll))
+}
+
+type DownPageResp struct {
+	Zt   int `json:"zt"`
+	Info struct {
+		Pwd    string `json:"pwd"`
+		Onof   string `json:"onof"`
+		FId    string `json:"f_id"`
+		Taoc   string `json:"taoc"`
+		IsNewd string `json:"is_newd"`
+	} `json:"info"`
+	Text interface{} `json:"text"`
+}

drivers/mediatrack/driver.go

@@ -0,0 +1,317 @@
+package mediatrack
+
+import (
+	"crypto/md5"
+	"encoding/hex"
+	"fmt"
+	"github.com/Xhofe/alist/conf"
+	"github.com/Xhofe/alist/drivers/base"
+	"github.com/Xhofe/alist/model"
+	"github.com/Xhofe/alist/utils"
+	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/aws/credentials"
+	"github.com/aws/aws-sdk-go/aws/session"
+	"github.com/aws/aws-sdk-go/service/s3/s3manager"
+	"github.com/google/uuid"
+	jsoniter "github.com/json-iterator/go"
+	log "github.com/sirupsen/logrus"
+	"io"
+	"io/ioutil"
+	"os"
+	"path/filepath"
+)
+
+type MediaTrack struct{}
+
+func (driver MediaTrack) Config() base.DriverConfig {
+	return base.DriverConfig{
+		Name: "MediaTrack",
+	}
+}
+
+func (driver MediaTrack) Items() []base.Item {
+	return []base.Item{
+		{
+			Name:        "access_token",
+			Label:       "Token",
+			Type:        base.TypeString,
+			Description: "Unknown expiration time",
+			Required:    true,
+		},
+		{
+			Name:     "root_folder",
+			Label:    "root folder file_id",
+			Type:     base.TypeString,
+			Required: true,
+		},
+		{
+			Name:        "order_by",
+			Label:       "order_by",
+			Type:        base.TypeSelect,
+			Values:      "updated_at,title,size",
+			Required:    true,
+			Description: "title",
+		},
+		{
+			Name:     "order_direction",
+			Label:    "desc",
+			Type:     base.TypeSelect,
+			Values:   "true,false",
+			Required: true,
+			Default:  "false",
+		},
+	}
+}
+
+func (driver MediaTrack) Save(account *model.Account, old *model.Account) error {
+	if account == nil {
+		return nil
+	}
+	return nil
+}
+
+func (driver MediaTrack) File(path string, account *model.Account) (*model.File, error) {
+	path = utils.ParsePath(path)
+	if path == "/" {
+		return &model.File{
+			Id:        account.RootFolder,
+			Name:      account.Name,
+			Size:      0,
+			Type:      conf.FOLDER,
+			Driver:    driver.Config().Name,
+			UpdatedAt: account.UpdatedAt,
+		}, nil
+	}
+	dir, name := filepath.Split(path)
+	files, err := driver.Files(dir, account)
+	if err != nil {
+		return nil, err
+	}
+	for _, file := range files {
+		if file.Name == name {
+			return &file, nil
+		}
+	}
+	return nil, base.ErrPathNotFound
+}
+
+func (driver MediaTrack) Files(path string, account *model.Account) ([]model.File, error) {
+	path = utils.ParsePath(path)
+	var files []model.File
+	cache, err := base.GetCache(path, account)
+	if err == nil {
+		files, _ = cache.([]model.File)
+	} else {
+		file, err := driver.File(path, account)
+		if err != nil {
+			return nil, err
+		}
+		files, err = driver.GetFiles(file.Id, account)
+		if err != nil {
+			return nil, err
+		}
+		if len(files) > 0 {
+			_ = base.SetCache(path, files, account)
+		}
+	}
+	return files, nil
+}
+
+func (driver MediaTrack) Link(args base.Args, account *model.Account) (*base.Link, error) {
+	file, err := driver.File(args.Path, account)
+	if err != nil {
+		return nil, err
+	}
+	pre := "https://jayce.api.mediatrack.cn/v3/assets/" + file.Id
+	body, err := driver.Request(pre+"/token", base.Get, nil, nil, nil, nil, nil, account)
+	if err != nil {
+		return nil, err
+	}
+	url := pre + "/raw"
+	res, err := base.NoRedirectClient.R().SetQueryParam("token", jsoniter.Get(body, "data").ToString()).Get(url)
+	return &base.Link{Url: res.Header().Get("location")}, nil
+}
+
+func (driver MediaTrack) Path(path string, account *model.Account) (*model.File, []model.File, error) {
+	path = utils.ParsePath(path)
+	log.Debugf("MediaTrack path: %s", path)
+	file, err := driver.File(path, account)
+	if err != nil {
+		return nil, nil, err
+	}
+	if !file.IsDir() {
+		return file, nil, nil
+	}
+	files, err := driver.Files(path, account)
+	if err != nil {
+		return nil, nil, err
+	}
+	return nil, files, nil
+}
+
+//func (driver MediaTrack) Proxy(r *http.Request, account *model.Account) {
+//
+//}
+
+func (driver MediaTrack) Preview(path string, account *model.Account) (interface{}, error) {
+	return nil, base.ErrNotImplement
+}
+
+func (driver MediaTrack) MakeDir(path string, account *model.Account) error {
+	parentFile, err := driver.File(utils.Dir(path), account)
+	if err != nil {
+		return err
+	}
+	url := fmt.Sprintf("https://jayce.api.mediatrack.cn/v3/assets/%s/children", parentFile.Id)
+	_, err = driver.Request(url, base.Post, nil, nil, nil, base.Json{
+		"type":  1,
+		"title": utils.Base(path),
+	}, nil, account)
+	return err
+}
+
+func (driver MediaTrack) Move(src string, dst string, account *model.Account) error {
+	srcFile, err := driver.File(src, account)
+	if err != nil {
+		return err
+	}
+	dstParentFile, err := driver.File(utils.Dir(dst), account)
+	if err != nil {
+		return err
+	}
+	data := base.Json{
+		"parent_id": dstParentFile.Id,
+		"ids":       []string{srcFile.Id},
+	}
+	url := "https://jayce.api.mediatrack.cn/v4/assets/batch/move"
+	_, err = driver.Request(url, base.Post, nil, nil, nil, data, nil, account)
+	return err
+}
+
+func (driver MediaTrack) Rename(src string, dst string, account *model.Account) error {
+	srcFile, err := driver.File(src, account)
+	if err != nil {
+		return err
+	}
+	url := "https://jayce.api.mediatrack.cn/v3/assets/" + srcFile.Id
+	data := base.Json{
+		"title": utils.Base(dst),
+	}
+	_, err = driver.Request(url, base.Put, nil, nil, nil, data, nil, account)
+	return err
+}
+
+func (driver MediaTrack) Copy(src string, dst string, account *model.Account) error {
+	srcFile, err := driver.File(src, account)
+	if err != nil {
+		return err
+	}
+	dstParentFile, err := driver.File(utils.Dir(dst), account)
+	if err != nil {
+		return err
+	}
+	data := base.Json{
+		"parent_id": dstParentFile.Id,
+		"ids":       []string{srcFile.Id},
+	}
+	url := "https://jayce.api.mediatrack.cn/v4/assets/batch/clone"
+	_, err = driver.Request(url, base.Post, nil, nil, nil, data, nil, account)
+	return err
+}
+
+func (driver MediaTrack) Delete(path string, account *model.Account) error {
+	parentFile, err := driver.File(utils.Dir(path), account)
+	if err != nil {
+		return err
+	}
+	file, err := driver.File(path, account)
+	if err != nil {
+		return err
+	}
+	data := base.Json{
+		"origin_id": parentFile.Id,
+		"ids":       []string{file.Id},
+	}
+	url := "https://jayce.api.mediatrack.cn/v4/assets/batch/delete"
+	_, err = driver.Request(url, base.Delete, nil, nil, nil, data, nil, account)
+	return err
+}
+
+func (driver MediaTrack) Upload(file *model.FileStream, account *model.Account) error {
+	if file == nil {
+		return base.ErrEmptyFile
+	}
+	parentFile, err := driver.File(file.ParentPath, account)
+	if err != nil {
+		return err
+	}
+	src := "assets/" + uuid.New().String()
+	var resp UploadResp
+	_, err = driver.Request("https://jayce.api.mediatrack.cn/v3/storage/tokens/asset", base.Get, nil, map[string]string{
+		"src": src,
+	}, nil, nil, &resp, account)
+	if err != nil {
+		return err
+	}
+	credential := resp.Data.Credentials
+	cfg := &aws.Config{
+		Credentials: credentials.NewStaticCredentials(credential.TmpSecretID, credential.TmpSecretKey, credential.Token),
+		Region:      &resp.Data.Region,
+		Endpoint:    aws.String("cos.accelerate.myqcloud.com"),
+	}
+	s, err := session.NewSession(cfg)
+	if err != nil {
+		return err
+	}
+	tempFile, err := ioutil.TempFile(conf.Conf.TempDir, "file-*")
+	if err != nil {
+		return err
+	}
+	defer func() {
+		_ = tempFile.Close()
+		_ = os.Remove(tempFile.Name())
+	}()
+	_, err = io.Copy(tempFile, file)
+	if err != nil {
+		return err
+	}
+	_, err = tempFile.Seek(0, io.SeekStart)
+	if err != nil {
+		return err
+	}
+	uploader := s3manager.NewUploader(s)
+	input := &s3manager.UploadInput{
+		Bucket: &resp.Data.Bucket,
+		Key:    &resp.Data.Object,
+		Body:   tempFile,
+	}
+	_, err = uploader.Upload(input)
+	if err != nil {
+		return err
+	}
+	url := fmt.Sprintf("https://jayce.api.mediatrack.cn/v3/assets/%s/children", parentFile.Id)
+	_, err = tempFile.Seek(0, io.SeekStart)
+	if err != nil {
+		return err
+	}
+	h := md5.New()
+	_, err = io.Copy(h, tempFile)
+	if err != nil {
+		return err
+	}
+	hash := hex.EncodeToString(h.Sum(nil))
+	data := base.Json{
+		"category":    0,
+		"description": file.GetFileName(),
+		"hash":        hash,
+		"mime":        file.MIMEType,
+		"size":        file.GetSize(),
+		"src":         src,
+		"title":       file.GetFileName(),
+		"type":        0,
+	}
+	_, err = driver.Request(url, base.Post, nil, nil, nil, data, nil, account)
+	return err
+}
+
+var _ base.Driver = (*MediaTrack)(nil)

drivers/mediatrack/mediatrack.go

@@ -0,0 +1,183 @@
+package mediatrack
+
+import (
+	"errors"
+	"fmt"
+	"github.com/Xhofe/alist/conf"
+	"github.com/Xhofe/alist/drivers/base"
+	"github.com/Xhofe/alist/model"
+	"github.com/Xhofe/alist/utils"
+	"github.com/go-resty/resty/v2"
+	log "github.com/sirupsen/logrus"
+	"path"
+	"strconv"
+	"time"
+)
+
+type BaseResp struct {
+	Status  string `json:"status"`
+	Message string `json:"message"`
+}
+
+type T struct {
+	BaseResp
+}
+
+func (driver MediaTrack) Request(url string, method int, headers, query, form map[string]string, data interface{}, resp interface{}, account *model.Account) ([]byte, error) {
+	req := base.RestyClient.R()
+	req.SetHeader("Authorization", "Bearer "+account.AccessToken)
+	if headers != nil {
+		req.SetHeaders(headers)
+	}
+	if query != nil {
+		req.SetQueryParams(query)
+	}
+	if form != nil {
+		req.SetFormData(form)
+	}
+	if data != nil {
+		req.SetBody(data)
+	}
+	var e BaseResp
+	req.SetResult(&e)
+	var err error
+	var res *resty.Response
+	switch method {
+	case base.Get:
+		res, err = req.Get(url)
+	case base.Post:
+		res, err = req.Post(url)
+	case base.Delete:
+		res, err = req.Delete(url)
+	case base.Patch:
+		res, err = req.Patch(url)
+	case base.Put:
+		res, err = req.Put(url)
+	default:
+		return nil, base.ErrNotSupport
+	}
+	if err != nil {
+		return nil, err
+	}
+	log.Debugln(res.String())
+	if e.Status != "SUCCESS" {
+		return nil, errors.New(e.Message)
+	}
+	if resp != nil {
+		err = utils.Json.Unmarshal(res.Body(), resp)
+	}
+	return res.Body(), err
+}
+
+type File struct {
+	Category     int           `json:"category"`
+	ChildAssets  []interface{} `json:"childAssets"`
+	CommentCount int           `json:"comment_count"`
+	CoverAsset   interface{}   `json:"cover_asset"`
+	CoverAssetID string        `json:"cover_asset_id"`
+	CreatedAt    time.Time     `json:"created_at"`
+	DeletedAt    string        `json:"deleted_at"`
+	Description  string        `json:"description"`
+	File         *struct {
+		Cover string `json:"cover"`
+		Src   string `json:"src"`
+	} `json:"file"`
+	//FileID string `json:"file_id"`
+	ID string `json:"id"`
+
+	Size       string        `json:"size"`
+	Thumbnails []interface{} `json:"thumbnails"`
+	Title      string        `json:"title"`
+	UpdatedAt  time.Time     `json:"updated_at"`
+}
+
+func (driver MediaTrack) formatFile(file *File) *model.File {
+	f := model.File{
+		Id:        file.ID,
+		Name:      file.Title,
+		Size:      0,
+		Driver:    driver.Config().Name,
+		UpdatedAt: &file.UpdatedAt,
+	}
+	if file.File == nil {
+		// folder
+		f.Type = conf.FOLDER
+	} else {
+		size, _ := strconv.ParseInt(file.Size, 10, 64)
+		f.Size = size
+		f.Type = utils.GetFileType(path.Ext(file.Title))
+		if file.File.Cover != "" {
+			f.Thumbnail = "https://nano.mtres.cn/" + file.File.Cover
+		}
+	}
+	return &f
+}
+
+type ChildrenResp struct {
+	Status string `json:"status"`
+	Data   struct {
+		Total  int    `json:"total"`
+		Assets []File `json:"assets"`
+	} `json:"data"`
+	Path      string `json:"path"`
+	TraceID   string `json:"trace_id"`
+	RequestID string `json:"requestId"`
+}
+
+func (driver MediaTrack) GetFiles(parentId string, account *model.Account) ([]model.File, error) {
+	files := make([]model.File, 0)
+	url := fmt.Sprintf("https://jayce.api.mediatrack.cn/v4/assets/%s/children", parentId)
+	sort := ""
+	if account.OrderBy != "" {
+		if account.OrderDirection == "true" {
+			sort = "-"
+		}
+		sort += account.OrderBy
+	}
+	page := 1
+	for {
+		var resp ChildrenResp
+		_, err := driver.Request(url, base.Get, nil, map[string]string{
+			"page": strconv.Itoa(page),
+			"size": "50",
+			"sort": sort,
+		}, nil, nil, &resp, account)
+		if err != nil {
+			return nil, err
+		}
+		if len(resp.Data.Assets) == 0 {
+			break
+		}
+		page++
+		for _, file := range resp.Data.Assets {
+			files = append(files, *driver.formatFile(&file))
+		}
+	}
+	return files, nil
+}
+
+type UploadResp struct {
+	Status string `json:"status"`
+	Data   struct {
+		Credentials struct {
+			TmpSecretID  string    `json:"TmpSecretId"`
+			TmpSecretKey string    `json:"TmpSecretKey"`
+			Token        string    `json:"Token"`
+			ExpiredTime  int       `json:"ExpiredTime"`
+			Expiration   time.Time `json:"Expiration"`
+			StartTime    int       `json:"StartTime"`
+		} `json:"credentials"`
+		Object string `json:"object"`
+		Bucket string `json:"bucket"`
+		Region string `json:"region"`
+		URL    string `json:"url"`
+		Size   string `json:"size"`
+	} `json:"data"`
+	Path      string `json:"path"`
+	TraceID   string `json:"trace_id"`
+	RequestID string `json:"requestId"`
+}
+
+func init() {
+	base.RegisterDriver(&MediaTrack{})
+}

drivers/native/driver.go

@@ -6,7 +6,6 @@ import (
 	"github.com/Xhofe/alist/drivers/base"
 	"github.com/Xhofe/alist/model"
 	"github.com/Xhofe/alist/utils"
-	"github.com/gin-gonic/gin"
 	log "github.com/sirupsen/logrus"
 	"io"
 	"io/ioutil"
@@ -39,6 +38,9 @@ func (driver Native) Items() []base.Item {
 }
 
 func (driver Native) Save(account *model.Account, old *model.Account) error {
+	if account == nil {
+		return nil
+	}
 	log.Debugf("save a account: [%s]", account.Name)
 	if !utils.Exists(account.RootFolder) {
 		account.Status = fmt.Sprintf("[%s] not exist", account.RootFolder)
@@ -55,6 +57,9 @@ func (driver Native) Save(account *model.Account, old *model.Account) error {
 }
 
 func (driver Native) File(path string, account *model.Account) (*model.File, error) {
+	if utils.IsContain(strings.Split(path, "/"), "..") {
+		return nil, base.ErrRelativePath
+	}
 	fullPath := filepath.Join(account.RootFolder, path)
 	if !utils.Exists(fullPath) {
 		return nil, base.ErrPathNotFound
@@ -66,7 +71,6 @@ func (driver Native) File(path string, account *model.Account) (*model.File, err
 	time := f.ModTime()
 	file := &model.File{
 		Name:      f.Name(),
-		Size:      f.Size(),
 		UpdatedAt: &time,
 		Driver:    driver.Config().Name,
 	}
@@ -74,11 +78,15 @@ func (driver Native) File(path string, account *model.Account) (*model.File, err
 		file.Type = conf.FOLDER
 	} else {
 		file.Type = utils.GetFileType(filepath.Ext(f.Name()))
+		file.Size = f.Size()
 	}
 	return file, nil
 }
 
 func (driver Native) Files(path string, account *model.Account) ([]model.File, error) {
+	if utils.IsContain(strings.Split(path, "/"), "..") {
+		return nil, base.ErrRelativePath
+	}
 	fullPath := filepath.Join(account.RootFolder, path)
 	if !utils.Exists(fullPath) {
 		return nil, base.ErrPathNotFound
@@ -95,7 +103,6 @@ func (driver Native) Files(path string, account *model.Account) ([]model.File, e
 		time := f.ModTime()
 		file := model.File{
 			Name:      f.Name(),
-			Size:      f.Size(),
 			Type:      0,
 			UpdatedAt: &time,
 			Driver:    driver.Config().Name,
@@ -104,14 +111,22 @@ func (driver Native) Files(path string, account *model.Account) ([]model.File, e
 			file.Type = conf.FOLDER
 		} else {
 			file.Type = utils.GetFileType(filepath.Ext(f.Name()))
+			file.Size = f.Size()
 		}
 		files = append(files, file)
 	}
-	model.SortFiles(files, account)
+	_, err = base.GetCache(path, account)
+	if len(files) != 0 && err != nil {
+		_ = base.SetCache(path, files, account)
+	}
 	return files, nil
 }
 
 func (driver Native) Link(args base.Args, account *model.Account) (*base.Link, error) {
+	_, err := driver.File(args.Path, account)
+	if err != nil {
+		return nil, err
+	}
 	fullPath := filepath.Join(account.RootFolder, args.Path)
 	s, err := os.Stat(fullPath)
 	if err != nil {
@@ -121,7 +136,7 @@ func (driver Native) Link(args base.Args, account *model.Account) (*base.Link, e
 		return nil, base.ErrNotFile
 	}
 	link := base.Link{
-		Url: fullPath,
+		FilePath: fullPath,
 	}
 	return &link, nil
 }
@@ -144,27 +159,40 @@ func (driver Native) Path(path string, account *model.Account) (*model.File, []m
 	return nil, files, nil
 }
 
-func (driver Native) Proxy(c *gin.Context, account *model.Account) {
-	// unnecessary
-}
+//func (driver Native) Proxy(r *http.Request, account *model.Account) {
+//	// unnecessary
+//}
 
 func (driver Native) Preview(path string, account *model.Account) (interface{}, error) {
 	return nil, base.ErrNotSupport
 }
 
 func (driver Native) MakeDir(path string, account *model.Account) error {
+	if utils.IsContain(strings.Split(path, "/"), "..") {
+		return base.ErrRelativePath
+	}
 	fullPath := filepath.Join(account.RootFolder, path)
 	err := os.MkdirAll(fullPath, 0700)
 	return err
 }
 
 func (driver Native) Move(src string, dst string, account *model.Account) error {
+	if utils.IsContain(strings.Split(src+"/"+dst, "/"), "..") {
+		return base.ErrRelativePath
+	}
 	fullSrc := filepath.Join(account.RootFolder, src)
 	fullDst := filepath.Join(account.RootFolder, dst)
 	return os.Rename(fullSrc, fullDst)
 }
 
+func (driver Native) Rename(src string, dst string, account *model.Account) error {
+	return driver.Move(src, dst, account)
+}
+
 func (driver Native) Copy(src string, dst string, account *model.Account) error {
+	if utils.IsContain(strings.Split(src+"/"+dst, "/"), "..") {
+		return base.ErrRelativePath
+	}
 	fullSrc := filepath.Join(account.RootFolder, src)
 	fullDst := filepath.Join(account.RootFolder, dst)
 	srcFile, err := driver.File(src, account)
@@ -184,6 +212,9 @@ func (driver Native) Copy(src string, dst string, account *model.Account) error
 }
 
 func (driver Native) Delete(path string, account *model.Account) error {
+	if utils.IsContain(strings.Split(path, "/"), "..") {
+		return base.ErrRelativePath
+	}
 	fullPath := filepath.Join(account.RootFolder, path)
 	file, err := driver.File(path, account)
 	if err != nil {
@@ -199,6 +230,9 @@ func (driver Native) Upload(file *model.FileStream, account *model.Account) erro
 	if file == nil {
 		return base.ErrEmptyFile
 	}
+	if utils.IsContain(strings.Split(file.ParentPath, "/"), "..") {
+		return base.ErrRelativePath
+	}
 	fullPath := filepath.Join(account.RootFolder, file.ParentPath, file.Name)
 	_, err := driver.File(filepath.Join(file.ParentPath, file.Name), account)
 	if err == nil {
@@ -218,6 +252,16 @@ func (driver Native) Upload(file *model.FileStream, account *model.Account) erro
 	defer func() {
 		_ = out.Close()
 	}()
+	//var buf bytes.Buffer
+	//reader := io.TeeReader(file, &buf)
+	//h := md5.New()
+	//_, err = io.Copy(h, reader)
+	//if err != nil {
+	//	return err
+	//}
+	//hash := hex.EncodeToString(h.Sum(nil))
+	//log.Debugln("md5:", hash)
+	//_, err = io.Copy(out, &buf)
 	_, err = io.Copy(out, file)
 	return err
 }

drivers/onedrive/driver.go

@@ -6,8 +6,6 @@ import (
 	"github.com/Xhofe/alist/drivers/base"
 	"github.com/Xhofe/alist/model"
 	"github.com/Xhofe/alist/utils"
-	"github.com/gin-gonic/gin"
-	"github.com/robfig/cron/v3"
 	log "github.com/sirupsen/logrus"
 	"path/filepath"
 )
@@ -55,6 +53,7 @@ func (driver Onedrive) Items() []base.Item {
 			Label:    "redirect uri",
 			Type:     base.TypeString,
 			Required: true,
+			Default:  "https://tool.nn.ci/onedrive/callback",
 		},
 		{
 			Name:     "refresh_token",
@@ -92,37 +91,37 @@ func (driver Onedrive) Items() []base.Item {
 }
 
 func (driver Onedrive) Save(account *model.Account, old *model.Account) error {
+	//if old != nil {
+	//	conf.Cron.Remove(cron.EntryID(old.CronId))
+	//}
+	if account == nil {
+		return nil
+	}
 	_, ok := onedriveHostMap[account.Zone]
 	if !ok {
 		return fmt.Errorf("no [%s] zone", account.Zone)
 	}
-	if old != nil {
-		conf.Cron.Remove(cron.EntryID(old.CronId))
-	}
 	account.RootFolder = utils.ParsePath(account.RootFolder)
 	err := driver.RefreshToken(account)
+	_ = model.SaveAccount(account)
 	if err != nil {
 		return err
 	}
-	cronId, err := conf.Cron.AddFunc("@every 1h", func() {
-		name := account.Name
-		log.Debugf("onedrive account name: %s", name)
-		newAccount, ok := model.GetAccount(name)
-		log.Debugf("onedrive account: %+v", newAccount)
-		if !ok {
-			return
-		}
-		err = driver.RefreshToken(&newAccount)
-		_ = model.SaveAccount(&newAccount)
-	})
-	if err != nil {
-		return err
-	}
-	account.CronId = int(cronId)
-	err = model.SaveAccount(account)
-	if err != nil {
-		return err
-	}
+	//cronId, err := conf.Cron.AddFunc("@every 1h", func() {
+	//	name := account.Name
+	//	log.Debugf("onedrive account name: %s", name)
+	//	newAccount, ok := model.GetAccount(name)
+	//	log.Debugf("onedrive account: %+v", newAccount)
+	//	if !ok {
+	//		return
+	//	}
+	//	err = driver.RefreshToken(&newAccount)
+	//	_ = model.SaveAccount(&newAccount)
+	//})
+	//if err != nil {
+	//	return err
+	//}
+	//account.CronId = int(cronId)
 	return nil
 }
 
@@ -177,7 +176,7 @@ func (driver Onedrive) Link(args base.Args, account *model.Account) (*base.Link,
 	if err != nil {
 		return nil, err
 	}
-	if file.File.MimeType == "" {
+	if file.File == nil {
 		return nil, base.ErrNotFile
 	}
 	link := base.Link{
@@ -202,9 +201,9 @@ func (driver Onedrive) Path(path string, account *model.Account) (*model.File, [
 	return nil, files, nil
 }
 
-func (driver Onedrive) Proxy(c *gin.Context, account *model.Account) {
-	c.Request.Header.Del("Origin")
-}
+//func (driver Onedrive) Proxy(r *http.Request, account *model.Account) {
+//	r.Header.Del("Origin")
+//}
 
 func (driver Onedrive) Preview(path string, account *model.Account) (interface{}, error) {
 	return nil, base.ErrNotSupport
@@ -218,14 +217,10 @@ func (driver Onedrive) MakeDir(path string, account *model.Account) error {
 		"@microsoft.graph.conflictBehavior": "rename",
 	}
 	_, err := driver.Request(url, base.Post, nil, nil, nil, &data, nil, account)
-	if err == nil {
-		_ = base.DeleteCache(utils.Dir(path), account)
-	}
 	return err
 }
 
 func (driver Onedrive) Move(src string, dst string, account *model.Account) error {
-	log.Debugf("onedrive move")
 	dstParentFile, err := driver.GetFile(account, utils.Dir(dst))
 	if err != nil {
 		return err
@@ -238,15 +233,13 @@ func (driver Onedrive) Move(src string, dst string, account *model.Account) erro
 	}
 	url := driver.GetMetaUrl(account, false, src)
 	_, err = driver.Request(url, base.Patch, nil, nil, nil, &data, nil, account)
-	if err == nil {
-		_ = base.DeleteCache(utils.Dir(src), account)
-		if utils.Dir(src) != utils.Dir(dst) {
-			_ = base.DeleteCache(utils.Dir(dst), account)
-		}
-	}
 	return err
 }
 
+func (driver Onedrive) Rename(src string, dst string, account *model.Account) error {
+	return driver.Move(src, dst, account)
+}
+
 func (driver Onedrive) Copy(src string, dst string, account *model.Account) error {
 	dstParentFile, err := driver.GetFile(account, utils.Dir(dst))
 	if err != nil {
@@ -261,21 +254,12 @@ func (driver Onedrive) Copy(src string, dst string, account *model.Account) erro
 	}
 	url := driver.GetMetaUrl(account, false, src) + "/copy"
 	_, err = driver.Request(url, base.Post, nil, nil, nil, &data, nil, account)
-	if err == nil {
-		_ = base.DeleteCache(utils.Dir(src), account)
-		if utils.Dir(src) != utils.Dir(dst) {
-			_ = base.DeleteCache(utils.Dir(dst), account)
-		}
-	}
 	return err
 }
 
 func (driver Onedrive) Delete(path string, account *model.Account) error {
 	url := driver.GetMetaUrl(account, false, path)
 	_, err := driver.Request(url, base.Delete, nil, nil, nil, nil, nil, account)
-	if err == nil {
-		_ = base.DeleteCache(utils.Dir(path), account)
-	}
 	return err
 }
 
@@ -289,9 +273,6 @@ func (driver Onedrive) Upload(file *model.FileStream, account *model.Account) er
 	} else {
 		err = driver.UploadBig(file, account)
 	}
-	if err == nil {
-		_ = base.DeleteCache(utils.Dir(file.ParentPath), account)
-	}
 	return err
 }
 

drivers/onedrive/onedrive.go

@@ -19,8 +19,6 @@ import (
 	"time"
 )
 
-var oneClient = resty.New()
-
 type Host struct {
 	Oauth string
 	Api   string
@@ -47,7 +45,7 @@ var onedriveHostMap = map[string]Host{
 
 func (driver Onedrive) GetMetaUrl(account *model.Account, auth bool, path string) string {
 	path = filepath.Join(account.RootFolder, path)
-	log.Debugf(path)
+	//log.Debugf(path)
 	host, _ := onedriveHostMap[account.Zone]
 	if auth {
 		return host.Oauth
@@ -81,7 +79,7 @@ type OneTokenErr struct {
 
 func (driver Onedrive) RefreshToken(account *model.Account) error {
 	err := driver.refreshToken(account)
-	if err != nil && err.Error() == "empty refresh_token" {
+	if err != nil && err == base.ErrEmptyToken {
 		return driver.refreshToken(account)
 	}
 	return err
@@ -91,7 +89,7 @@ func (driver Onedrive) refreshToken(account *model.Account) error {
 	url := driver.GetMetaUrl(account, true, "") + "/common/oauth2/v2.0/token"
 	var resp base.TokenResp
 	var e OneTokenErr
-	_, err := oneClient.R().SetResult(&resp).SetError(&e).SetFormData(map[string]string{
+	_, err := base.RestyClient.R().SetResult(&resp).SetError(&e).SetFormData(map[string]string{
 		"grant_type":    "refresh_token",
 		"client_id":     account.ClientId,
 		"client_secret": account.ClientSecret,
@@ -109,8 +107,8 @@ func (driver Onedrive) refreshToken(account *model.Account) error {
 		account.Status = "work"
 	}
 	if resp.RefreshToken == "" {
-		account.Status = "empty refresh_token"
-		return errors.New("empty refresh_token")
+		account.Status = base.ErrEmptyToken.Error()
+		return base.ErrEmptyToken
 	}
 	account.RefreshToken, account.AccessToken = resp.RefreshToken, resp.AccessToken
 	return nil
@@ -122,7 +120,7 @@ type OneFile struct {
 	Size                 int64      `json:"size"`
 	LastModifiedDateTime *time.Time `json:"lastModifiedDateTime"`
 	Url                  string     `json:"@microsoft.graph.downloadUrl"`
-	File                 struct {
+	File                 *struct {
 		MimeType string `json:"mimeType"`
 	} `json:"file"`
 	Thumbnails []struct {
@@ -159,7 +157,7 @@ func (driver Onedrive) FormatFile(file *OneFile) *model.File {
 	if len(file.Thumbnails) > 0 {
 		f.Thumbnail = file.Thumbnails[0].Medium.Url
 	}
-	if file.File.MimeType == "" {
+	if file.File == nil {
 		f.Type = conf.FOLDER
 	} else {
 		f.Type = utils.GetFileType(filepath.Ext(file.Name))
@@ -178,16 +176,17 @@ func (driver Onedrive) GetFiles(account *model.Account, path string) ([]OneFile,
 	}
 	for nextLink != "" {
 		var files OneFiles
-		var e OneRespErr
-		_, err := oneClient.R().SetResult(&files).SetError(&e).
-			SetHeader("Authorization", "Bearer  "+account.AccessToken).
-			Get(nextLink)
+		_, err := driver.Request(nextLink, base.Get, nil, nil, nil, nil, &files, account)
+		//var e OneRespErr
+		//_, err := oneClient.R().SetResult(&files).SetError(&e).
+		//	SetHeader("Authorization", "Bearer  "+account.AccessToken).
+		//	Get(nextLink)
 		if err != nil {
 			return nil, err
 		}
-		if e.Error.Code != "" {
-			return nil, fmt.Errorf("%s", e.Error.Message)
-		}
+		//if e.Error.Code != "" {
+		//	return nil, fmt.Errorf("%s", e.Error.Message)
+		//}
 		res = append(res, files.Value...)
 		nextLink = files.NextLink
 	}
@@ -196,16 +195,18 @@ func (driver Onedrive) GetFiles(account *model.Account, path string) ([]OneFile,
 
 func (driver Onedrive) GetFile(account *model.Account, path string) (*OneFile, error) {
 	var file OneFile
-	var e OneRespErr
-	_, err := oneClient.R().SetResult(&file).SetError(&e).
-		SetHeader("Authorization", "Bearer  "+account.AccessToken).
-		Get(driver.GetMetaUrl(account, false, path))
+	//var e OneRespErr
+	u := driver.GetMetaUrl(account, false, path)
+	_, err := driver.Request(u, base.Get, nil, nil, nil, nil, &file, account)
+	//_, err := oneClient.R().SetResult(&file).SetError(&e).
+	//	SetHeader("Authorization", "Bearer  "+account.AccessToken).
+	//	Get(driver.GetMetaUrl(account, false, path))
 	if err != nil {
 		return nil, err
 	}
-	if e.Error.Code != "" {
-		return nil, fmt.Errorf("%s", e.Error.Message)
-	}
+	//if e.Error.Code != "" {
+	//	return nil, fmt.Errorf("%s", e.Error.Message)
+	//}
 	return &file, nil
 }
 
@@ -252,7 +253,7 @@ func (driver Onedrive) Request(url string, method int, headers, query, form map[
 	if err != nil {
 		return nil, err
 	}
-	log.Debug(res.String())
+	//log.Debug(res.String())
 	if e.Error.Code != "" {
 		if e.Error.Code == "InvalidAuthenticationToken" {
 			err = driver.RefreshToken(account)
@@ -314,5 +315,4 @@ func (driver Onedrive) UploadBig(file *model.FileStream, account *model.Account)
 
 func init() {
 	base.RegisterDriver(&Onedrive{})
-	oneClient.SetRetryCount(3)
 }

drivers/operate/operate.go

@@ -0,0 +1,111 @@
+package operate
+
+import (
+	"github.com/Xhofe/alist/drivers/base"
+	"github.com/Xhofe/alist/model"
+	"github.com/Xhofe/alist/utils"
+	log "github.com/sirupsen/logrus"
+	"runtime/debug"
+)
+
+func Save(driver base.Driver, account, old *model.Account) error {
+	return driver.Save(account, old)
+}
+
+func Path(driver base.Driver, account *model.Account, path string) (*model.File, []model.File, error) {
+	return driver.Path(path, account)
+}
+
+func Files(driver base.Driver, account *model.Account, path string) ([]model.File, error) {
+	_, files, err := Path(driver, account, path)
+	if err != nil {
+		return nil, err
+	}
+	if files == nil {
+		return nil, base.ErrNotFolder
+	}
+	return files, nil
+}
+
+func File(driver base.Driver, account *model.Account, path string) (*model.File, error) {
+	return driver.File(path, account)
+}
+
+func MakeDir(driver base.Driver, account *model.Account, path string, clearCache bool) error {
+	log.Debugf("mkdir: %s", path)
+	_, err := Files(driver, account, path)
+	if err != base.ErrPathNotFound {
+		return nil
+	}
+	err = driver.MakeDir(path, account)
+	if err == nil && clearCache {
+		_ = base.DeleteCache(utils.Dir(path), account)
+	}
+	if err != nil {
+		log.Errorf("mkdir error: %s", err.Error())
+	}
+	return err
+}
+
+func Move(driver base.Driver, account *model.Account, src, dst string, clearCache bool) error {
+	log.Debugf("move %s to %s", src, dst)
+	rename := false
+	if utils.Dir(src) == utils.Dir(dst) {
+		rename = true
+	}
+	var err error
+	if rename {
+		err = driver.Rename(src, dst, account)
+	} else {
+		err = driver.Move(src, dst, account)
+	}
+	if err == nil && clearCache {
+		_ = base.DeleteCache(utils.Dir(src), account)
+		if !rename {
+			_ = base.DeleteCache(utils.Dir(dst), account)
+		}
+	}
+	if err != nil {
+		log.Errorf("move error: %s", err.Error())
+	}
+	return err
+}
+
+func Copy(driver base.Driver, account *model.Account, src, dst string, clearCache bool) error {
+	log.Debugf("copy %s to %s", src, dst)
+	err := driver.Copy(src, dst, account)
+	if err == nil && clearCache {
+		_ = base.DeleteCache(utils.Dir(dst), account)
+	}
+	if err != nil {
+		log.Errorf("copy error: %s", err.Error())
+	}
+	return err
+}
+
+func Delete(driver base.Driver, account *model.Account, path string, clearCache bool) error {
+	log.Debugf("delete %s", path)
+	err := driver.Delete(path, account)
+	if err == nil && clearCache {
+		_ = base.DeleteCache(utils.Dir(path), account)
+	}
+	if err != nil {
+		log.Errorf("delete error: %s", err.Error())
+	}
+	return err
+}
+
+func Upload(driver base.Driver, account *model.Account, file *model.FileStream, clearCache bool) error {
+	defer func() {
+		_ = file.Close()
+	}()
+	err := driver.Upload(file, account)
+	if err == nil && clearCache {
+		_ = base.DeleteCache(file.ParentPath, account)
+	}
+	if err != nil {
+		log.Errorf("upload error: %s", err.Error())
+	}
+	debug.FreeOSMemory()
+	return err
+}

drivers/pikpak/driver.go

@@ -6,8 +6,10 @@ import (
 	"github.com/Xhofe/alist/drivers/base"
 	"github.com/Xhofe/alist/model"
 	"github.com/Xhofe/alist/utils"
-	"github.com/aliyun/aliyun-oss-go-sdk/oss"
-	"github.com/gin-gonic/gin"
+	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/aws/credentials"
+	"github.com/aws/aws-sdk-go/aws/session"
+	"github.com/aws/aws-sdk-go/service/s3/s3manager"
 	jsoniter "github.com/json-iterator/go"
 	log "github.com/sirupsen/logrus"
 	"path/filepath"
@@ -48,6 +50,9 @@ func (driver PikPak) Items() []base.Item {
 }
 
 func (driver PikPak) Save(account *model.Account, old *model.Account) error {
+	if account == nil {
+		return nil
+	}
 	err := driver.Login(account)
 	return err
 }
@@ -114,9 +119,14 @@ func (driver PikPak) Link(args base.Args, account *model.Account) (*base.Link, e
 	if err != nil {
 		return nil, err
 	}
-	return &base.Link{
+	link := base.Link{
 		Url: resp.WebContentLink,
-	}, nil
+	}
+	if len(resp.Medias) > 0 && resp.Medias[0].Link.Url != "" {
+		log.Debugln("use media link")
+		link.Url = resp.Medias[0].Link.Url
+	}
+	return &link, nil
 }
 
 func (driver PikPak) Path(path string, account *model.Account) (*model.File, []model.File, error) {
@@ -136,9 +146,9 @@ func (driver PikPak) Path(path string, account *model.Account) (*model.File, []m
 	return nil, files, nil
 }
 
-func (driver PikPak) Proxy(c *gin.Context, account *model.Account) {
-
-}
+//func (driver PikPak) Proxy(r *http.Request, account *model.Account) {
+//
+//}
 
 func (driver PikPak) Preview(path string, account *model.Account) (interface{}, error) {
 	return nil, base.ErrNotSupport
@@ -159,41 +169,37 @@ func (driver PikPak) MakeDir(path string, account *model.Account) error {
 		"parent_id": parentFile.Id,
 		"name":      name,
 	}, nil, account)
-	if err == nil {
-		_ = base.DeleteCache(dir, account)
-	}
 	return err
 }
 
 func (driver PikPak) Move(src string, dst string, account *model.Account) error {
-	srcDir, _ := filepath.Split(src)
-	dstDir, dstName := filepath.Split(dst)
+	dstDir, _ := filepath.Split(dst)
 	srcFile, err := driver.File(src, account)
 	if err != nil {
 		return err
 	}
-	// rename
-	if srcDir == dstDir {
-		_, err = driver.Request("https://api-drive.mypikpak.com/drive/v1/files/"+srcFile.Id, base.Patch, nil, &base.Json{
-			"name": dstName,
-		}, nil, account)
-	} else {
-		// move
-		dstDirFile, err := driver.File(dstDir, account)
-		if err != nil {
-			return err
-		}
-		_, err = driver.Request("https://api-drive.mypikpak.com/drive/v1/files:batchMove", base.Post, nil, &base.Json{
-			"ids": []string{srcFile.Id},
-			"to": base.Json{
-				"parent_id": dstDirFile.Id,
-			},
-		}, nil, account)
+	dstDirFile, err := driver.File(dstDir, account)
+	if err != nil {
+		return err
 	}
-	if err == nil {
-		_ = base.DeleteCache(srcDir, account)
-		_ = base.DeleteCache(dstDir, account)
+	_, err = driver.Request("https://api-drive.mypikpak.com/drive/v1/files:batchMove", base.Post, nil, &base.Json{
+		"ids": []string{srcFile.Id},
+		"to": base.Json{
+			"parent_id": dstDirFile.Id,
+		},
+	}, nil, account)
+	return err
+}
+
+func (driver PikPak) Rename(src string, dst string, account *model.Account) error {
+	_, dstName := filepath.Split(dst)
+	srcFile, err := driver.File(src, account)
+	if err != nil {
+		return err
 	}
+	_, err = driver.Request("https://api-drive.mypikpak.com/drive/v1/files/"+srcFile.Id, base.Patch, nil, &base.Json{
+		"name": dstName,
+	}, nil, account)
 	return err
 }
 
@@ -212,9 +218,6 @@ func (driver PikPak) Copy(src string, dst string, account *model.Account) error
 			"parent_id": dstDirFile.Id,
 		},
 	}, nil, account)
-	if err == nil {
-		_ = base.DeleteCache(utils.Dir(dst), account)
-	}
 	return err
 }
 
@@ -226,9 +229,6 @@ func (driver PikPak) Delete(path string, account *model.Account) error {
 	_, err = driver.Request("https://api-drive.mypikpak.com/drive/v1/files:batchTrash", base.Post, nil, &base.Json{
 		"ids": []string{file.Id},
 	}, nil, account)
-	if err == nil {
-		_ = base.DeleteCache(utils.Dir(path), account)
-	}
 	return err
 }
 
@@ -260,24 +260,71 @@ func (driver PikPak) Upload(file *model.FileStream, account *model.Account) erro
 	accessKeyId := params.Get("access_key_id").ToString()
 	accessKeySecret := params.Get("access_key_secret").ToString()
 	securityToken := params.Get("security_token").ToString()
-	client, err := oss.New("https://"+endpoint, accessKeyId,
-		accessKeySecret, oss.SecurityToken(securityToken))
+	key := params.Get("key").ToString()
+	bucket := params.Get("bucket").ToString()
+	cfg := &aws.Config{
+		Credentials: credentials.NewStaticCredentials(accessKeyId, accessKeySecret, securityToken),
+		Region:      aws.String("pikpak"),
+		Endpoint:    &endpoint,
+	}
+	s, err := session.NewSession(cfg)
 	if err != nil {
 		return err
 	}
-	bucket, err := client.Bucket(params.Get("bucket").ToString())
-	if err != nil {
-		return err
-	}
-	signedURL, err := bucket.SignURL(params.Get("key").ToString(), oss.HTTPPut, 60)
-	if err != nil {
-		return err
-	}
-	err = bucket.PutObjectWithURL(signedURL, file)
-	if err == nil {
-		_ = base.DeleteCache(file.ParentPath, account)
+	uploader := s3manager.NewUploader(s)
+	input := &s3manager.UploadInput{
+		Bucket: &bucket,
+		Key:    &key,
+		Body:   file,
 	}
+	_, err = uploader.Upload(input)
 	return err
 }
 
+// use aliyun-oss-sdk
+//func (driver PikPak) Upload(file *model.FileStream, account *model.Account) error {
+//	if file == nil {
+//		return base.ErrEmptyFile
+//	}
+//	parentFile, err := driver.File(file.ParentPath, account)
+//	if err != nil {
+//		return err
+//	}
+//	data := base.Json{
+//		"kind":        "drive#file",
+//		"name":        file.GetFileName(),
+//		"size":        file.GetSize(),
+//		"hash":        "1CF254FBC456E1B012CD45C546636AA62CF8350E",
+//		"upload_type": "UPLOAD_TYPE_RESUMABLE",
+//		"objProvider": base.Json{"provider": "UPLOAD_TYPE_UNKNOWN"},
+//		"parent_id":   parentFile.Id,
+//	}
+//	res, err := driver.Request("https://api-drive.mypikpak.com/drive/v1/files", base.Post, nil, &data, nil, account)
+//	if err != nil {
+//		return err
+//	}
+//	params := jsoniter.Get(res, "resumable").Get("params")
+//	endpoint := params.Get("endpoint").ToString()
+//	endpointS := strings.Split(endpoint, ".")
+//	endpoint = strings.Join(endpointS[1:], ".")
+//	accessKeyId := params.Get("access_key_id").ToString()
+//	accessKeySecret := params.Get("access_key_secret").ToString()
+//	securityToken := params.Get("security_token").ToString()
+//	client, err := oss.New("https://"+endpoint, accessKeyId,
+//		accessKeySecret, oss.SecurityToken(securityToken))
+//	if err != nil {
+//		return err
+//	}
+//	bucket, err := client.Bucket(params.Get("bucket").ToString())
+//	if err != nil {
+//		return err
+//	}
+//	signedURL, err := bucket.SignURL(params.Get("key").ToString(), oss.HTTPPut, 60)
+//	if err != nil {
+//		return err
+//	}
+//	err = bucket.PutObjectWithURL(signedURL, file)
+//	return err
+//}
+
 var _ base.Driver = (*PikPak)(nil)

drivers/pikpak/pikpak.go

@@ -144,6 +144,37 @@ type File struct {
 	Size           string     `json:"size"`
 	ThumbnailLink  string     `json:"thumbnail_link"`
 	WebContentLink string     `json:"web_content_link"`
+	Medias         []Media    `json:"medias"`
+}
+
+type Media struct {
+	MediaId   string `json:"media_id"`
+	MediaName string `json:"media_name"`
+	Video     struct {
+		Height     int    `json:"height"`
+		Width      int    `json:"width"`
+		Duration   int    `json:"duration"`
+		BitRate    int    `json:"bit_rate"`
+		FrameRate  int    `json:"frame_rate"`
+		VideoCodec string `json:"video_codec"`
+		AudioCodec string `json:"audio_codec"`
+		VideoType  string `json:"video_type"`
+	} `json:"video"`
+	Link struct {
+		Url    string    `json:"url"`
+		Token  string    `json:"token"`
+		Expire time.Time `json:"expire"`
+	} `json:"link"`
+	NeedMoreQuota  bool          `json:"need_more_quota"`
+	VipTypes       []interface{} `json:"vip_types"`
+	RedirectLink   string        `json:"redirect_link"`
+	IconLink       string        `json:"icon_link"`
+	IsDefault      bool          `json:"is_default"`
+	Priority       int           `json:"priority"`
+	IsOrigin       bool          `json:"is_origin"`
+	ResolutionName string        `json:"resolution_name"`
+	IsVisible      bool          `json:"is_visible"`
+	Category       string        `json:"category"`
 }
 
 func (driver PikPak) FormatFile(file *File) *model.File {

drivers/quark/driver.go

@@ -0,0 +1,327 @@
+package quark
+
+import (
+	"crypto/md5"
+	"crypto/sha1"
+	"encoding/hex"
+	"github.com/Xhofe/alist/conf"
+	"github.com/Xhofe/alist/drivers/base"
+	"github.com/Xhofe/alist/model"
+	"github.com/Xhofe/alist/utils"
+	log "github.com/sirupsen/logrus"
+	"io"
+	"io/ioutil"
+	"os"
+	"path/filepath"
+)
+
+type Quark struct{}
+
+func (driver Quark) Config() base.DriverConfig {
+	return base.DriverConfig{
+		Name:      "Quark",
+		OnlyProxy: true,
+	}
+}
+
+func (driver Quark) Items() []base.Item {
+	return []base.Item{
+		{
+			Name:        "access_token",
+			Label:       "Cookie",
+			Type:        base.TypeString,
+			Required:    true,
+			Description: "Unknown expiration time",
+		},
+		{
+			Name:     "root_folder",
+			Label:    "root folder file_id",
+			Type:     base.TypeString,
+			Required: true,
+			Default:  "0",
+		},
+		{
+			Name:     "order_by",
+			Label:    "order_by",
+			Type:     base.TypeSelect,
+			Values:   "file_type,file_name,updated_at",
+			Required: true,
+			Default:  "file_name",
+		},
+		{
+			Name:     "order_direction",
+			Label:    "order_direction",
+			Type:     base.TypeSelect,
+			Values:   "asc,desc",
+			Required: true,
+			Default:  "asc",
+		},
+	}
+}
+
+func (driver Quark) Save(account *model.Account, old *model.Account) error {
+	if account == nil {
+		return nil
+	}
+	_, err := driver.Get("/config", nil, nil, account)
+	if err == nil {
+		account.Status = "work"
+	} else {
+		account.Status = err.Error()
+	}
+	_ = model.SaveAccount(account)
+	return err
+}
+
+func (driver Quark) File(path string, account *model.Account) (*model.File, error) {
+	path = utils.ParsePath(path)
+	if path == "/" {
+		return &model.File{
+			Id:        account.RootFolder,
+			Name:      account.Name,
+			Size:      0,
+			Type:      conf.FOLDER,
+			Driver:    driver.Config().Name,
+			UpdatedAt: account.UpdatedAt,
+		}, nil
+	}
+	dir, name := filepath.Split(path)
+	files, err := driver.Files(dir, account)
+	if err != nil {
+		return nil, err
+	}
+	for _, file := range files {
+		if file.Name == name {
+			return &file, nil
+		}
+	}
+	return nil, base.ErrPathNotFound
+}
+
+func (driver Quark) Files(path string, account *model.Account) ([]model.File, error) {
+	path = utils.ParsePath(path)
+	var files []model.File
+	cache, err := base.GetCache(path, account)
+	if err == nil {
+		files, _ = cache.([]model.File)
+	} else {
+		file, err := driver.File(path, account)
+		if err != nil {
+			return nil, err
+		}
+		files, err = driver.GetFiles(file.Id, account)
+		if err != nil {
+			return nil, err
+		}
+		if len(files) > 0 {
+			_ = base.SetCache(path, files, account)
+		}
+	}
+	return files, nil
+}
+
+func (driver Quark) Link(args base.Args, account *model.Account) (*base.Link, error) {
+	path := args.Path
+	file, err := driver.File(path, account)
+	if err != nil {
+		return nil, err
+	}
+	data := base.Json{
+		"fids": []string{file.Id},
+	}
+	var resp DownResp
+	_, err = driver.Post("/file/download", data, &resp, account)
+	if err != nil {
+		return nil, err
+	}
+	return &base.Link{
+		Url: resp.Data[0].DownloadUrl,
+		Headers: []base.Header{
+			{Name: "Cookie", Value: account.AccessToken},
+			{Name: "Referer", Value: "https://pan.quark.cn"},
+		},
+	}, nil
+}
+
+func (driver Quark) Path(path string, account *model.Account) (*model.File, []model.File, error) {
+	path = utils.ParsePath(path)
+	log.Debugf("quark path: %s", path)
+	file, err := driver.File(path, account)
+	if err != nil {
+		return nil, nil, err
+	}
+	if !file.IsDir() {
+		return file, nil, nil
+	}
+	files, err := driver.Files(path, account)
+	if err != nil {
+		return nil, nil, err
+	}
+	return nil, files, nil
+}
+
+func (driver Quark) Preview(path string, account *model.Account) (interface{}, error) {
+	return nil, base.ErrNotSupport
+}
+
+func (driver Quark) MakeDir(path string, account *model.Account) error {
+	parentFile, err := driver.File(utils.Dir(path), account)
+	if err != nil {
+		return err
+	}
+	data := base.Json{
+		"dir_init_lock": false,
+		"dir_path":      "",
+		"file_name":     utils.Base(path),
+		"pdir_fid":      parentFile.Id,
+	}
+	_, err = driver.Post("/file", data, nil, account)
+	return err
+}
+
+func (driver Quark) Move(src string, dst string, account *model.Account) error {
+	srcFile, err := driver.File(src, account)
+	if err != nil {
+		return err
+	}
+	dstParentFile, err := driver.File(utils.Dir(dst), account)
+	if err != nil {
+		return err
+	}
+	data := base.Json{
+		"action_type":  1,
+		"exclude_fids": []string{},
+		"filelist":     []string{srcFile.Id},
+		"to_pdir_fid":  dstParentFile.Id,
+	}
+	_, err = driver.Post("/file/move", data, nil, account)
+	return err
+}
+
+func (driver Quark) Rename(src string, dst string, account *model.Account) error {
+	srcFile, err := driver.File(src, account)
+	if err != nil {
+		return err
+	}
+	data := base.Json{
+		"fid":       srcFile.Id,
+		"file_name": utils.Base(dst),
+	}
+	_, err = driver.Post("/file/rename", data, nil, account)
+	return err
+}
+
+func (driver Quark) Copy(src string, dst string, account *model.Account) error {
+	return base.ErrNotSupport
+}
+
+func (driver Quark) Delete(path string, account *model.Account) error {
+	srcFile, err := driver.File(path, account)
+	if err != nil {
+		return err
+	}
+	data := base.Json{
+		"action_type":  1,
+		"exclude_fids": []string{},
+		"filelist":     []string{srcFile.Id},
+	}
+	_, err = driver.Post("/file/delete", data, nil, account)
+	return err
+}
+
+func (driver Quark) Upload(file *model.FileStream, account *model.Account) error {
+	if file == nil {
+		return base.ErrEmptyFile
+	}
+	parentFile, err := driver.File(file.ParentPath, account)
+	if err != nil {
+		return err
+	}
+	tempFile, err := ioutil.TempFile(conf.Conf.TempDir, "file-*")
+	if err != nil {
+		return err
+	}
+	defer func() {
+		_ = tempFile.Close()
+		_ = os.Remove(tempFile.Name())
+	}()
+	_, err = io.Copy(tempFile, file)
+	if err != nil {
+		return err
+	}
+	_, err = tempFile.Seek(0, io.SeekStart)
+	if err != nil {
+		return err
+	}
+	m := md5.New()
+	_, err = io.Copy(m, tempFile)
+	if err != nil {
+		return err
+	}
+	_, err = tempFile.Seek(0, io.SeekStart)
+	if err != nil {
+		return err
+	}
+	md5Str := hex.EncodeToString(m.Sum(nil))
+	s := sha1.New()
+	_, err = io.Copy(s, tempFile)
+	if err != nil {
+		return err
+	}
+	_, err = tempFile.Seek(0, io.SeekStart)
+	if err != nil {
+		return err
+	}
+	sha1Str := hex.EncodeToString(s.Sum(nil))
+	// pre
+	pre, err := driver.UpPre(file, parentFile.Id, account)
+	if err != nil {
+		return err
+	}
+	log.Debugln("hash: ", md5Str, sha1Str)
+	// hash
+	finish, err := driver.UpHash(md5Str, sha1Str, pre.Data.TaskId, account)
+	if err != nil {
+		return err
+	}
+	if finish {
+		return nil
+	}
+	// part up
+	partSize := pre.Metadata.PartSize
+	var bytes []byte
+	md5s := make([]string, 0)
+	defaultBytes := make([]byte, partSize)
+	left := int64(file.GetSize())
+	partNumber := 1
+	for left > 0 {
+		if left > int64(partSize) {
+			bytes = defaultBytes
+		} else {
+			bytes = make([]byte, left)
+		}
+		_, err := io.ReadFull(tempFile, bytes)
+		if err != nil {
+			return err
+		}
+		left -= int64(partSize)
+		log.Debugf("left: %d", left)
+		m, err := driver.UpPart(pre, file.GetMIMEType(), partNumber, bytes, account)
+		//m, err := driver.UpPart(pre, file.GetMIMEType(), partNumber, bytes, account, md5Str, sha1Str)
+		if err != nil {
+			return err
+		}
+		if m == "finish" {
+			return nil
+		}
+		md5s = append(md5s, m)
+		partNumber++
+	}
+	err = driver.UpCommit(pre, md5s, account)
+	if err != nil {
+		return err
+	}
+	return driver.UpFinish(pre, account)
+}
+
+var _ base.Driver = (*Quark)(nil)

drivers/quark/quark.go

@@ -0,0 +1,272 @@
+package quark
+
+import (
+	"crypto/md5"
+	"encoding/base64"
+	"errors"
+	"fmt"
+	"github.com/Xhofe/alist/drivers/base"
+	"github.com/Xhofe/alist/model"
+	"github.com/Xhofe/alist/utils"
+	"github.com/Xhofe/alist/utils/cookie"
+	"github.com/go-resty/resty/v2"
+	log "github.com/sirupsen/logrus"
+	"net/http"
+	"strconv"
+	"strings"
+	"time"
+)
+
+func (driver Quark) Request(pathname string, method int, headers, query, form map[string]string, data interface{}, resp interface{}, account *model.Account) ([]byte, error) {
+	u := "https://drive.quark.cn/1/clouddrive" + pathname
+	req := base.RestyClient.R()
+	req.SetHeaders(map[string]string{
+		"Cookie":  account.AccessToken,
+		"Accept":  "application/json, text/plain, */*",
+		"Referer": "https://pan.quark.cn/",
+	})
+	req.SetQueryParam("pr", "ucpro")
+	req.SetQueryParam("fr", "pc")
+	if headers != nil {
+		req.SetHeaders(headers)
+	}
+	if query != nil {
+		req.SetQueryParams(query)
+	}
+	if form != nil {
+		req.SetFormData(form)
+	}
+	if data != nil {
+		req.SetBody(data)
+	}
+	if resp != nil {
+		req.SetResult(resp)
+	}
+	var e Resp
+	var err error
+	var res *resty.Response
+	req.SetError(&e)
+	switch method {
+	case base.Get:
+		res, err = req.Get(u)
+	case base.Post:
+		res, err = req.Post(u)
+	case base.Delete:
+		res, err = req.Delete(u)
+	case base.Patch:
+		res, err = req.Patch(u)
+	case base.Put:
+		res, err = req.Put(u)
+	default:
+		return nil, base.ErrNotSupport
+	}
+	if err != nil {
+		return nil, err
+	}
+	__puus := cookie.GetCookie(res.Cookies(), "__puus")
+	if __puus != nil {
+		account.AccessToken = cookie.SetStr(account.AccessToken, "__puus", __puus.Value)
+		_ = model.SaveAccount(account)
+	}
+	//log.Debugf("%s response: %s", pathname, res.String())
+	if e.Status >= 400 || e.Code != 0 {
+		return nil, errors.New(e.Message)
+	}
+	return res.Body(), nil
+}
+
+func (driver Quark) Get(pathname string, query map[string]string, resp interface{}, account *model.Account) ([]byte, error) {
+	return driver.Request(pathname, base.Get, nil, query, nil, nil, resp, account)
+}
+
+func (driver Quark) Post(pathname string, data interface{}, resp interface{}, account *model.Account) ([]byte, error) {
+	return driver.Request(pathname, base.Post, nil, nil, nil, data, resp, account)
+}
+
+func (driver Quark) GetFiles(parent string, account *model.Account) ([]model.File, error) {
+	files := make([]model.File, 0)
+	page := 1
+	size := 100
+	query := map[string]string{
+		"pdir_fid":     parent,
+		"_size":        strconv.Itoa(size),
+		"_fetch_total": "1",
+		"_sort":        "file_type:asc," + account.OrderBy + ":" + account.OrderDirection,
+	}
+	for {
+		query["_page"] = strconv.Itoa(page)
+		var resp SortResp
+		_, err := driver.Get("/file/sort", query, &resp, account)
+		if err != nil {
+			return nil, err
+		}
+		for _, f := range resp.Data.List {
+			files = append(files, *driver.formatFile(&f))
+		}
+		if page*size >= resp.Metadata.Total {
+			break
+		}
+		page++
+	}
+	return files, nil
+}
+
+func (driver Quark) UpPre(file *model.FileStream, parentId string, account *model.Account) (UpPreResp, error) {
+	now := time.Now()
+	data := base.Json{
+		"ccp_hash_update": true,
+		"dir_name":        "",
+		"file_name":       file.Name,
+		"format_type":     file.MIMEType,
+		"l_created_at":    now.UnixMilli(),
+		"l_updated_at":    now.UnixMilli(),
+		"pdir_fid":        parentId,
+		"size":            file.Size,
+	}
+	log.Debugf("uppre data: %+v", data)
+	var resp UpPreResp
+	_, err := driver.Post("/file/upload/pre", data, &resp, account)
+	return resp, err
+}
+
+func (driver Quark) UpHash(md5, sha1, taskId string, account *model.Account) (bool, error) {
+	data := base.Json{
+		"md5":     md5,
+		"sha1":    sha1,
+		"task_id": taskId,
+	}
+	log.Debugf("hash: %+v", data)
+	var resp HashResp
+	_, err := driver.Post("/file/update/hash", data, &resp, account)
+	return resp.Data.Finish, err
+}
+
+func (driver Quark) UpPart(pre UpPreResp, mineType string, partNumber int, bytes []byte, account *model.Account) (string, error) {
+	//func (driver Quark) UpPart(pre UpPreResp, mineType string, partNumber int, bytes []byte, account *model.Account, md5Str, sha1Str string) (string, error) {
+	timeStr := time.Now().UTC().Format(http.TimeFormat)
+	data := base.Json{
+		"auth_info": pre.Data.AuthInfo,
+		"auth_meta": fmt.Sprintf(`PUT
+
+%s
+%s
+x-oss-date:%s
+x-oss-user-agent:aliyun-sdk-js/6.6.1 Chrome 98.0.4758.80 on Windows 10 64-bit
+/%s/%s?partNumber=%d&uploadId=%s`,
+			mineType, timeStr, timeStr, pre.Data.Bucket, pre.Data.ObjKey, partNumber, pre.Data.UploadId),
+		"task_id": pre.Data.TaskId,
+	}
+	var resp UpAuthResp
+	_, err := driver.Post("/file/upload/auth", data, &resp, account)
+	if err != nil {
+		return "", err
+	}
+	//if partNumber == 1 {
+	//	finish, err := driver.UpHash(md5Str, sha1Str, pre.Data.TaskId, account)
+	//	if err != nil {
+	//		return "", err
+	//	}
+	//	if finish {
+	//		return "finish", nil
+	//	}
+	//}
+	u := fmt.Sprintf("https://%s.%s/%s", pre.Data.Bucket, pre.Data.UploadUrl[7:], pre.Data.ObjKey)
+	res, err := base.RestyClient.R().
+		SetHeaders(map[string]string{
+			"Authorization":    resp.Data.AuthKey,
+			"Content-Type":     mineType,
+			"Referer":          "https://pan.quark.cn/",
+			"x-oss-date":       timeStr,
+			"x-oss-user-agent": "aliyun-sdk-js/6.6.1 Chrome 98.0.4758.80 on Windows 10 64-bit",
+		}).
+		SetQueryParams(map[string]string{
+			"partNumber": strconv.Itoa(partNumber),
+			"uploadId":   pre.Data.UploadId,
+		}).SetBody(bytes).Put(u)
+	if res.StatusCode() != 200 {
+		return "", fmt.Errorf("up status: %d, error: %s", res.StatusCode(), res.String())
+	}
+	return res.Header().Get("ETag"), nil
+}
+
+func (driver Quark) UpCommit(pre UpPreResp, md5s []string, account *model.Account) error {
+	timeStr := time.Now().UTC().Format(http.TimeFormat)
+	log.Debugf("md5s: %+v", md5s)
+	bodyBuilder := strings.Builder{}
+	bodyBuilder.WriteString(`<?xml version="1.0" encoding="UTF-8"?>
+<CompleteMultipartUpload>
+`)
+	for i, m := range md5s {
+		bodyBuilder.WriteString(fmt.Sprintf(`<Part>
+<PartNumber>%d</PartNumber>
+<ETag>%s</ETag>
+</Part>
+`, i+1, m))
+	}
+	bodyBuilder.WriteString("</CompleteMultipartUpload>")
+	body := bodyBuilder.String()
+	m := md5.New()
+	m.Write([]byte(body))
+	contentMd5 := base64.StdEncoding.EncodeToString(m.Sum(nil))
+	callbackBytes, err := utils.Json.Marshal(pre.Data.Callback)
+	if err != nil {
+		return err
+	}
+	callbackBase64 := base64.StdEncoding.EncodeToString(callbackBytes)
+	data := base.Json{
+		"auth_info": pre.Data.AuthInfo,
+		"auth_meta": fmt.Sprintf(`POST
+%s
+application/xml
+%s
+x-oss-callback:%s
+x-oss-date:%s
+x-oss-user-agent:aliyun-sdk-js/6.6.1 Chrome 98.0.4758.80 on Windows 10 64-bit
+/%s/%s?uploadId=%s`,
+			contentMd5, timeStr, callbackBase64, timeStr,
+			pre.Data.Bucket, pre.Data.ObjKey, pre.Data.UploadId),
+		"task_id": pre.Data.TaskId,
+	}
+	log.Debugf("xml: %s", body)
+	log.Debugf("auth data: %+v", data)
+	var resp UpAuthResp
+	_, err = driver.Post("/file/upload/auth", data, &resp, account)
+	if err != nil {
+		return err
+	}
+	u := fmt.Sprintf("https://%s.%s/%s", pre.Data.Bucket, pre.Data.UploadUrl[7:], pre.Data.ObjKey)
+	res, err := base.RestyClient.R().
+		SetHeaders(map[string]string{
+			"Authorization":    resp.Data.AuthKey,
+			"Content-MD5":      contentMd5,
+			"Content-Type":     "application/xml",
+			"Referer":          "https://pan.quark.cn/",
+			"x-oss-callback":   callbackBase64,
+			"x-oss-date":       timeStr,
+			"x-oss-user-agent": "aliyun-sdk-js/6.6.1 Chrome 98.0.4758.80 on Windows 10 64-bit",
+		}).
+		SetQueryParams(map[string]string{
+			"uploadId": pre.Data.UploadId,
+		}).SetBody(body).Post(u)
+	if res.StatusCode() != 200 {
+		return fmt.Errorf("up status: %d, error: %s", res.StatusCode(), res.String())
+	}
+	return nil
+}
+
+func (driver Quark) UpFinish(pre UpPreResp, account *model.Account) error {
+	data := base.Json{
+		"obj_key": pre.Data.ObjKey,
+		"task_id": pre.Data.TaskId,
+	}
+	_, err := driver.Post("/file/upload/finish", data, nil, account)
+	if err != nil {
+		return err
+	}
+	time.Sleep(time.Second)
+	return nil
+}
+
+func init() {
+	base.RegisterDriver(&Quark{})
+}

drivers/quark/types.go

@@ -0,0 +1,134 @@
+package quark
+
+type Resp struct {
+	Status  int    `json:"status"`
+	Code    int    `json:"code"`
+	Message string `json:"message"`
+	//ReqId     string `json:"req_id"`
+	//Timestamp int    `json:"timestamp"`
+}
+
+type File struct {
+	Fid      string `json:"fid"`
+	FileName string `json:"file_name"`
+	//PdirFid      string `json:"pdir_fid"`
+	//Category     int    `json:"category"`
+	//FileType     int    `json:"file_type"`
+	Size int64 `json:"size"`
+	//FormatType   string `json:"format_type"`
+	//Status       int    `json:"status"`
+	//Tags         string `json:"tags,omitempty"`
+	//LCreatedAt   int64  `json:"l_created_at"`
+	LUpdatedAt int64 `json:"l_updated_at"`
+	//NameSpace    int    `json:"name_space"`
+	//IncludeItems int    `json:"include_items,omitempty"`
+	//RiskType     int    `json:"risk_type"`
+	//BackupSign   int    `json:"backup_sign"`
+	//Duration     int    `json:"duration"`
+	//FileSource   string `json:"file_source"`
+	File bool `json:"file"`
+	//CreatedAt    int64 `json:"created_at"`
+	UpdatedAt int64 `json:"updated_at"`
+	//PrivateExtra struct {} `json:"_private_extra"`
+	//ObjCategory string `json:"obj_category,omitempty"`
+	//Thumbnail string `json:"thumbnail,omitempty"`
+}
+
+type SortResp struct {
+	Resp
+	Data struct {
+		List []File `json:"list"`
+	} `json:"data"`
+	Metadata struct {
+		Size  int    `json:"_size"`
+		Page  int    `json:"_page"`
+		Count int    `json:"_count"`
+		Total int    `json:"_total"`
+		Way   string `json:"way"`
+	} `json:"metadata"`
+}
+
+type DownResp struct {
+	Resp
+	Data []struct {
+		//Fid          string `json:"fid"`
+		//FileName     string `json:"file_name"`
+		//PdirFid      string `json:"pdir_fid"`
+		//Category     int    `json:"category"`
+		//FileType     int    `json:"file_type"`
+		//Size         int    `json:"size"`
+		//FormatType   string `json:"format_type"`
+		//Status       int    `json:"status"`
+		//Tags         string `json:"tags"`
+		//LCreatedAt   int64  `json:"l_created_at"`
+		//LUpdatedAt   int64  `json:"l_updated_at"`
+		//NameSpace    int    `json:"name_space"`
+		//Thumbnail    string `json:"thumbnail"`
+		DownloadUrl string `json:"download_url"`
+		//Md5          string `json:"md5"`
+		//RiskType     int    `json:"risk_type"`
+		//RangeSize    int    `json:"range_size"`
+		//BackupSign   int    `json:"backup_sign"`
+		//ObjCategory  string `json:"obj_category"`
+		//Duration     int    `json:"duration"`
+		//FileSource   string `json:"file_source"`
+		//File         bool   `json:"file"`
+		//CreatedAt    int64  `json:"created_at"`
+		//UpdatedAt    int64  `json:"updated_at"`
+		//PrivateExtra struct {
+		//} `json:"_private_extra"`
+	} `json:"data"`
+	//Metadata struct {
+	//	Acc2 string `json:"acc2"`
+	//	Acc1 string `json:"acc1"`
+	//} `json:"metadata"`
+}
+
+type UpPreResp struct {
+	Resp
+	Data struct {
+		TaskId    string `json:"task_id"`
+		Finish    bool   `json:"finish"`
+		UploadId  string `json:"upload_id"`
+		ObjKey    string `json:"obj_key"`
+		UploadUrl string `json:"upload_url"`
+		Fid       string `json:"fid"`
+		Bucket    string `json:"bucket"`
+		Callback  struct {
+			CallbackUrl  string `json:"callbackUrl"`
+			CallbackBody string `json:"callbackBody"`
+		} `json:"callback"`
+		FormatType string `json:"format_type"`
+		Size       int    `json:"size"`
+		AuthInfo   string `json:"auth_info"`
+	} `json:"data"`
+	Metadata struct {
+		PartThread int    `json:"part_thread"`
+		Acc2       string `json:"acc2"`
+		Acc1       string `json:"acc1"`
+		PartSize   int    `json:"part_size"` // 分片大小
+	} `json:"metadata"`
+}
+
+type HashResp struct {
+	Resp
+	Data struct {
+		Finish     bool   `json:"finish"`
+		Fid        string `json:"fid"`
+		Thumbnail  string `json:"thumbnail"`
+		FormatType string `json:"format_type"`
+	} `json:"data"`
+	Metadata struct {
+	} `json:"metadata"`
+}
+
+type UpAuthResp struct {
+	Resp
+	Data struct {
+		AuthKey string        `json:"auth_key"`
+		Speed   int           `json:"speed"`
+		Headers []interface{} `json:"headers"`
+	} `json:"data"`
+	Metadata struct {
+	} `json:"metadata"`
+}

drivers/quark/util.go

@@ -0,0 +1,31 @@
+package quark
+
+import (
+	"github.com/Xhofe/alist/conf"
+	"github.com/Xhofe/alist/model"
+	"github.com/Xhofe/alist/utils"
+	"path"
+	"time"
+)
+
+func getTime(t int64) *time.Time {
+	tm := time.UnixMilli(t)
+	//log.Debugln(tm)
+	return &tm
+}
+
+func (driver Quark) formatFile(f *File) *model.File {
+	file := model.File{
+		Id:        f.Fid,
+		Name:      f.FileName,
+		Size:      f.Size,
+		Driver:    driver.Config().Name,
+		UpdatedAt: getTime(f.UpdatedAt),
+	}
+	if f.File {
+		file.Type = utils.GetFileType(path.Ext(f.FileName))
+	} else {
+		file.Type = conf.FOLDER
+	}
+	return &file
+}

drivers/s3/driver.go

@@ -1,6 +1,7 @@
 package s3
 
 import (
+	"bytes"
 	"fmt"
 	"github.com/Xhofe/alist/conf"
 	"github.com/Xhofe/alist/drivers/base"
@@ -8,11 +9,10 @@ import (
 	"github.com/Xhofe/alist/utils"
 	"github.com/aws/aws-sdk-go/service/s3"
 	"github.com/aws/aws-sdk-go/service/s3/s3manager"
-	"github.com/gin-gonic/gin"
 	log "github.com/sirupsen/logrus"
+	"io/ioutil"
 	"net/url"
 	"path/filepath"
-	"strings"
 	"time"
 )
 
@@ -71,14 +71,36 @@ func (driver S3) Items() []base.Item {
 		},
 		{
 			Name:        "limit",
-			Label:       "url expire time(hours)",
+			Label:       "Sign url expire time(hours)",
 			Type:        base.TypeNumber,
 			Description: "default 4 hours",
 		},
+		{
+			Name:        "zone",
+			Label:       "placeholder filename",
+			Type:        base.TypeString,
+			Description: "default empty string",
+			Default:     defaultPlaceholderName,
+		},
+		{
+			Name:  "bool_1",
+			Label: "S3ForcePathStyle",
+			Type:  base.TypeBool,
+		},
+		{
+			Name:    "internal_type",
+			Label:   "ListObject Version",
+			Type:    base.TypeSelect,
+			Values:  "v1,v2",
+			Default: "v1",
+		},
 	}
 }
 
 func (driver S3) Save(account *model.Account, old *model.Account) error {
+	if account == nil {
+		return nil
+	}
 	if account.Limit == 0 {
 		account.Limit = 4
 	}
@@ -125,7 +147,11 @@ func (driver S3) Files(path string, account *model.Account) ([]model.File, error
 	if err == nil {
 		files, _ = cache.([]model.File)
 	} else {
-		files, err = driver.List(path, account)
+		if account.InternalType == "v2" {
+			files, err = driver.ListV2(path, account)
+		} else {
+			files, err = driver.List(path, account)
+		}
 		if err == nil && len(files) > 0 {
 			_ = base.SetCache(path, files, account)
 		}
@@ -134,19 +160,28 @@ func (driver S3) Files(path string, account *model.Account) ([]model.File, error
 }
 
 func (driver S3) Link(args base.Args, account *model.Account) (*base.Link, error) {
-	client, err := driver.GetClient(account)
+	client, err := driver.GetClient(account, true)
 	if err != nil {
 		return nil, err
 	}
-	path := strings.TrimPrefix(args.Path, "/")
+	path := driver.GetKey(args.Path, account, false)
 	disposition := fmt.Sprintf(`attachment;filename="%s"`, url.QueryEscape(utils.Base(path)))
 	input := &s3.GetObjectInput{
-		Bucket:                     &account.Bucket,
-		Key:                        &path,
-		ResponseContentDisposition: &disposition,
+		Bucket: &account.Bucket,
+		Key:    &path,
+		//ResponseContentDisposition: &disposition,
+	}
+	if account.CustomHost == "" {
+		input.ResponseContentDisposition = &disposition
 	}
 	req, _ := client.GetObjectRequest(input)
-	link, err := req.Presign(time.Hour * time.Duration(account.Limit))
+	var link string
+	if account.CustomHost != "" {
+		err = req.Build()
+		link = req.HTTPRequest.URL.String()
+	} else {
+		link, err = req.Presign(time.Hour * time.Duration(account.Limit))
+	}
 	if err != nil {
 		return nil, err
 	}
@@ -172,17 +207,28 @@ func (driver S3) Path(path string, account *model.Account) (*model.File, []model
 	return nil, files, nil
 }
 
-func (driver S3) Proxy(c *gin.Context, account *model.Account) {
-
-}
+//func (driver S3) Proxy(r *http.Request, account *model.Account) {
+//
+//}
 
 func (driver S3) Preview(path string, account *model.Account) (interface{}, error) {
 	return nil, base.ErrNotSupport
 }
 
 func (driver S3) MakeDir(path string, account *model.Account) error {
-	// not support, default as success
-	return nil
+	// not support, generate a placeholder file
+	_, err := driver.File(path, account)
+	// exist
+	if err != base.ErrPathNotFound {
+		return nil
+	}
+	return driver.Upload(&model.FileStream{
+		File:       ioutil.NopCloser(bytes.NewReader([]byte{})),
+		Size:       0,
+		ParentPath: path,
+		Name:       getPlaceholderName(account.Zone),
+		MIMEType:   "application/octet-stream",
+	}, account)
 }
 
 func (driver S3) Move(src string, dst string, account *model.Account) error {
@@ -193,8 +239,12 @@ func (driver S3) Move(src string, dst string, account *model.Account) error {
 	return driver.Delete(src, account)
 }
 
+func (driver S3) Rename(src string, dst string, account *model.Account) error {
+	return driver.Move(src, dst, account)
+}
+
 func (driver S3) Copy(src string, dst string, account *model.Account) error {
-	client, err := driver.GetClient(account)
+	client, err := driver.GetClient(account, false)
 	if err != nil {
 		return err
 	}
@@ -210,14 +260,11 @@ func (driver S3) Copy(src string, dst string, account *model.Account) error {
 		Key:        &dstKey,
 	}
 	_, err = client.CopyObject(input)
-	if err == nil {
-		_ = base.DeleteCache(dst, account)
-	}
 	return err
 }
 
 func (driver S3) Delete(path string, account *model.Account) error {
-	client, err := driver.GetClient(account)
+	client, err := driver.GetClient(account, false)
 	if err != nil {
 		return err
 	}
@@ -231,9 +278,6 @@ func (driver S3) Delete(path string, account *model.Account) error {
 		Key:    &key,
 	}
 	_, err = client.DeleteObject(input)
-	if err == nil {
-		_ = base.DeleteCache(utils.Dir(path), account)
-	}
 	return err
 }
 
@@ -247,15 +291,13 @@ func (driver S3) Upload(file *model.FileStream, account *model.Account) error {
 	}
 	uploader := s3manager.NewUploader(s)
 	key := driver.GetKey(utils.Join(file.ParentPath, file.GetFileName()), account, false)
+	log.Debugln("key:", key)
 	input := &s3manager.UploadInput{
 		Bucket: &account.Bucket,
 		Key:    &key,
 		Body:   file,
 	}
 	_, err := uploader.Upload(input)
-	if err == nil {
-		_ = base.DeleteCache(file.ParentPath, account)
-	}
 	return err
 }
 

drivers/s3/s3.go

@@ -1,6 +1,7 @@
 package s3
 
 import (
+	"errors"
 	"fmt"
 	"github.com/Xhofe/alist/conf"
 	"github.com/Xhofe/alist/drivers/base"
@@ -22,20 +23,21 @@ var sessionsMap map[string]*session.Session
 
 func (driver S3) NewSession(account *model.Account) (*session.Session, error) {
 	cfg := &aws.Config{
-		Credentials: credentials.NewStaticCredentials(account.AccessKey, account.AccessSecret, ""),
-		Region:      &account.Region,
-		Endpoint:    &account.Endpoint,
+		Credentials:      credentials.NewStaticCredentials(account.AccessKey, account.AccessSecret, ""),
+		Region:           &account.Region,
+		Endpoint:         &account.Endpoint,
+		S3ForcePathStyle: aws.Bool(account.Bool1),
 	}
 	return session.NewSession(cfg)
 }
 
-func (driver S3) GetClient(account *model.Account) (*s3.S3, error) {
+func (driver S3) GetClient(account *model.Account, link bool) (*s3.S3, error) {
 	s, ok := sessionsMap[account.Name]
 	if !ok {
 		return nil, fmt.Errorf("can't find [%s] session", account.Name)
 	}
 	client := s3.New(s)
-	if account.CustomHost != "" {
+	if link && account.CustomHost != "" {
 		cURL, err := url.Parse(account.CustomHost)
 		if err != nil {
 			return nil, err
@@ -54,7 +56,7 @@ func (driver S3) GetClient(account *model.Account) (*s3.S3, error) {
 func (driver S3) List(prefix string, account *model.Account) ([]model.File, error) {
 	prefix = driver.GetKey(prefix, account, true)
 	log.Debugf("list: %s", prefix)
-	client, err := driver.GetClient(account)
+	client, err := driver.GetClient(account, false)
 	if err != nil {
 		return nil, err
 	}
@@ -73,9 +75,10 @@ func (driver S3) List(prefix string, account *model.Account) ([]model.File, erro
 			return nil, err
 		}
 		for _, object := range listObjectsResult.CommonPrefixes {
+			name := utils.Base(strings.Trim(*object.Prefix, "/"))
 			file := model.File{
 				//Id:        *object.Key,
-				Name:      utils.Base(strings.Trim(*object.Prefix, "/")),
+				Name:      name,
 				Driver:    driver.Config().Name,
 				UpdatedAt: account.UpdatedAt,
 				TimeStr:   "-",
@@ -84,9 +87,13 @@ func (driver S3) List(prefix string, account *model.Account) ([]model.File, erro
 			files = append(files, file)
 		}
 		for _, object := range listObjectsResult.Contents {
+			name := utils.Base(*object.Key)
+			if name == getPlaceholderName(account.Zone) {
+				continue
+			}
 			file := model.File{
 				//Id:        *object.Key,
-				Name:      utils.Base(*object.Key),
+				Name:      name,
 				Size:      *object.Size,
 				Driver:    driver.Config().Name,
 				UpdatedAt: object.LastModified,
@@ -94,6 +101,9 @@ func (driver S3) List(prefix string, account *model.Account) ([]model.File, erro
 			}
 			files = append(files, file)
 		}
+		if listObjectsResult.IsTruncated == nil {
+			return nil, errors.New("IsTruncated nil")
+		}
 		if *listObjectsResult.IsTruncated {
 			marker = *listObjectsResult.NextMarker
 		} else {
@@ -103,6 +113,73 @@ func (driver S3) List(prefix string, account *model.Account) ([]model.File, erro
 	return files, nil
 }
 
+func (driver S3) ListV2(prefix string, account *model.Account) ([]model.File, error) {
+	prefix = driver.GetKey(prefix, account, true)
+	//if prefix == "" {
+	//	prefix = "/"
+	//}
+	log.Debugf("list: %s", prefix)
+	client, err := driver.GetClient(account, false)
+	if err != nil {
+		return nil, err
+	}
+	files := make([]model.File, 0)
+	var continuationToken, startAfter *string
+	for {
+		input := &s3.ListObjectsV2Input{
+			Bucket:            &account.Bucket,
+			ContinuationToken: continuationToken,
+			Prefix:            &prefix,
+			Delimiter:         aws.String("/"),
+			StartAfter:        startAfter,
+		}
+		listObjectsResult, err := client.ListObjectsV2(input)
+		if err != nil {
+			return nil, err
+		}
+		log.Debugf("resp: %+v", listObjectsResult)
+		for _, object := range listObjectsResult.CommonPrefixes {
+			name := utils.Base(strings.Trim(*object.Prefix, "/"))
+			file := model.File{
+				//Id:        *object.Key,
+				Name:      name,
+				Driver:    driver.Config().Name,
+				UpdatedAt: account.UpdatedAt,
+				TimeStr:   "-",
+				Type:      conf.FOLDER,
+			}
+			files = append(files, file)
+		}
+		for _, object := range listObjectsResult.Contents {
+			name := utils.Base(*object.Key)
+			if name == getPlaceholderName(account.Zone) {
+				continue
+			}
+			file := model.File{
+				//Id:        *object.Key,
+				Name:      name,
+				Size:      *object.Size,
+				Driver:    driver.Config().Name,
+				UpdatedAt: object.LastModified,
+				Type:      utils.GetFileType(path.Ext(*object.Key)),
+			}
+			files = append(files, file)
+		}
+		if !aws.BoolValue(listObjectsResult.IsTruncated) {
+			break
+		}
+		if listObjectsResult.NextContinuationToken != nil {
+			continuationToken = listObjectsResult.NextContinuationToken
+			continue
+		}
+		if len(listObjectsResult.Contents) == 0 {
+			break
+		}
+		startAfter = listObjectsResult.Contents[len(listObjectsResult.Contents)-1].Key
+	}
+	return files, nil
+}
+
 func (driver S3) GetKey(path string, account *model.Account, dir bool) string {
 	path = utils.Join(account.RootFolder, path)
 	path = strings.TrimPrefix(path, "/")
@@ -113,6 +190,6 @@ func (driver S3) GetKey(path string, account *model.Account, dir bool) string {
 }
 
 func init() {
-	sessionsMap = make(map[string]*session.Session, 0)
+	sessionsMap = make(map[string]*session.Session)
 	base.RegisterDriver(&S3{})
 }

drivers/s3/util.go

@@ -0,0 +1,10 @@
+package s3
+
+var defaultPlaceholderName = ".placeholder"
+
+func getPlaceholderName(placeholder string) string {
+	if placeholder == "" {
+		return defaultPlaceholderName
+	}
+	return placeholder
+}

drivers/sftp/driver.go

@@ -0,0 +1,220 @@
+package template
+
+import (
+	"github.com/Xhofe/alist/conf"
+	"github.com/Xhofe/alist/drivers/base"
+	"github.com/Xhofe/alist/model"
+	"github.com/Xhofe/alist/utils"
+	"io"
+	"path"
+	"path/filepath"
+)
+
+type SFTP struct {
+}
+
+func (driver SFTP) Config() base.DriverConfig {
+	return base.DriverConfig{
+		Name:      "SFTP",
+		OnlyProxy: true,
+		OnlyLocal: true,
+		LocalSort: true,
+	}
+}
+
+func (driver SFTP) Items() []base.Item {
+	// TODO fill need info
+	return []base.Item{
+		{
+			Name:     "site_url",
+			Label:    "ip/host",
+			Type:     base.TypeString,
+			Required: true,
+		},
+		{
+			Name:     "limit",
+			Label:    "port",
+			Type:     base.TypeNumber,
+			Required: true,
+			Default:  "22",
+		},
+		{
+			Name:     "username",
+			Label:    "username",
+			Type:     base.TypeString,
+			Required: true,
+		},
+		{
+			Name:     "password",
+			Label:    "password",
+			Type:     base.TypeString,
+			Required: true,
+		},
+		{
+			Name:     "root_folder",
+			Label:    "root folder path",
+			Type:     base.TypeString,
+			Default:  "/",
+			Required: true,
+		},
+	}
+}
+
+func (driver SFTP) Save(account *model.Account, old *model.Account) error {
+	if old != nil {
+		clientsMap.Lock()
+		defer clientsMap.Unlock()
+		delete(clientsMap.clients, old.Name)
+	}
+	if account == nil {
+		return nil
+	}
+	_, err := GetClient(account)
+	if err != nil {
+		account.Status = err.Error()
+	} else {
+		account.Status = "work"
+	}
+	_ = model.SaveAccount(account)
+	return err
+}
+
+func (driver SFTP) File(path string, account *model.Account) (*model.File, error) {
+	path = utils.ParsePath(path)
+	if path == "/" {
+		return &model.File{
+			Id:        account.RootFolder,
+			Name:      account.Name,
+			Size:      0,
+			Type:      conf.FOLDER,
+			Driver:    driver.Config().Name,
+			UpdatedAt: account.UpdatedAt,
+		}, nil
+	}
+	dir, name := filepath.Split(path)
+	files, err := driver.Files(dir, account)
+	if err != nil {
+		return nil, err
+	}
+	for _, file := range files {
+		if file.Name == name {
+			return &file, nil
+		}
+	}
+	return nil, base.ErrPathNotFound
+}
+
+func (driver SFTP) Files(path string, account *model.Account) ([]model.File, error) {
+	path = utils.ParsePath(path)
+	remotePath := utils.Join(account.RootFolder, path)
+	cache, err := base.GetCache(path, account)
+	if err == nil {
+		files, _ := cache.([]model.File)
+		return files, nil
+	}
+	client, err := GetClient(account)
+	if err != nil {
+		return nil, err
+	}
+	var files []model.File
+	rawFiles, err := client.Files(remotePath)
+	if err != nil {
+		return nil, err
+	}
+	for i := 0; i < len(rawFiles); i++ {
+		files = append(files, driver.formatFile(rawFiles[i]))
+	}
+	if len(files) > 0 {
+		_ = base.SetCache(path, files, account)
+	}
+	return files, nil
+}
+
+func (driver SFTP) Link(args base.Args, account *model.Account) (*base.Link, error) {
+	client, err := GetClient(account)
+	if err != nil {
+		return nil, err
+	}
+	remoteFileName := utils.Join(account.RootFolder, args.Path)
+	remoteFile, err := client.Open(remoteFileName)
+	if err != nil {
+		return nil, err
+	}
+	return &base.Link{
+		Data: remoteFile,
+	}, nil
+}
+
+func (driver SFTP) Path(path string, account *model.Account) (*model.File, []model.File, error) {
+	path = utils.ParsePath(path)
+	file, err := driver.File(path, account)
+	if err != nil {
+		return nil, nil, err
+	}
+	if !file.IsDir() {
+		return file, nil, nil
+	}
+	files, err := driver.Files(path, account)
+	if err != nil {
+		return nil, nil, err
+	}
+	return nil, files, nil
+}
+
+func (driver SFTP) Preview(path string, account *model.Account) (interface{}, error) {
+	//TODO preview interface if driver support
+	return nil, base.ErrNotImplement
+}
+
+func (driver SFTP) MakeDir(path string, account *model.Account) error {
+	client, err := GetClient(account)
+	if err != nil {
+		return err
+	}
+	return client.MkdirAll(utils.Join(account.RootFolder, path))
+}
+
+func (driver SFTP) Move(src string, dst string, account *model.Account) error {
+	return driver.Rename(src, dst, account)
+}
+
+func (driver SFTP) Rename(src string, dst string, account *model.Account) error {
+	client, err := GetClient(account)
+	if err != nil {
+		return err
+	}
+	return client.Rename(utils.Join(account.RootFolder, src), utils.Join(account.RootFolder, dst))
+}
+
+func (driver SFTP) Copy(src string, dst string, account *model.Account) error {
+	return base.ErrNotSupport
+}
+
+func (driver SFTP) Delete(path string, account *model.Account) error {
+	client, err := GetClient(account)
+	if err != nil {
+		return err
+	}
+	return client.Remove(utils.Join(account.RootFolder, path))
+}
+
+func (driver SFTP) Upload(file *model.FileStream, account *model.Account) error {
+	if file == nil {
+		return base.ErrEmptyFile
+	}
+	client, err := GetClient(account)
+	if err != nil {
+		return err
+	}
+	dstFile, err := client.Create(path.Join(account.RootFolder, file.ParentPath, file.Name))
+	if err != nil {
+		return err
+	}
+	defer func() {
+		_ = dstFile.Close()
+	}()
+	_, err = io.Copy(dstFile, file)
+	return err
+}
+
+var _ base.Driver = (*SFTP)(nil)

drivers/sftp/sftp.go

@@ -0,0 +1,110 @@
+package template
+
+import (
+	"fmt"
+	"github.com/Xhofe/alist/conf"
+	"github.com/Xhofe/alist/drivers/base"
+	"github.com/Xhofe/alist/model"
+	"github.com/Xhofe/alist/utils"
+	"github.com/pkg/sftp"
+	"golang.org/x/crypto/ssh"
+	"os"
+	"path"
+	"sync"
+)
+
+var clientsMap = struct {
+	sync.Mutex
+	clients map[string]*Client
+}{clients: make(map[string]*Client)}
+
+func GetClient(account *model.Account) (*Client, error) {
+	clientsMap.Lock()
+	defer clientsMap.Unlock()
+	if v, ok := clientsMap.clients[account.Name]; ok {
+		return v, nil
+	}
+	conn, err := ssh.Dial("tcp", fmt.Sprintf("%s:%d", account.SiteUrl, account.Limit), &ssh.ClientConfig{
+		User:            account.Username,
+		Auth:            []ssh.AuthMethod{ssh.Password(account.Password)},
+		HostKeyCallback: ssh.InsecureIgnoreHostKey(),
+	})
+	if err != nil {
+		return nil, err
+	}
+	client, err := sftp.NewClient(conn)
+	if err != nil {
+		return nil, err
+	}
+	c := &Client{client}
+	clientsMap.clients[account.Name] = c
+	return c, nil
+}
+
+type Client struct {
+	*sftp.Client
+}
+
+func (client *Client) Files(remotePath string) ([]os.FileInfo, error) {
+	return client.ReadDir(remotePath)
+}
+
+func (client *Client) Remove(remotePath string) error {
+	f, err := client.Stat(remotePath)
+	if err != nil {
+		return nil
+	}
+	if f.IsDir() {
+		return client.removeDirectory(remotePath)
+	} else {
+		return client.removeFile(remotePath)
+	}
+}
+
+func (client *Client) removeDirectory(remotePath string) error {
+	//打不开,说明要么文件路径错误了,要么是第一次部署
+	remoteFiles, err := client.ReadDir(remotePath)
+	if err != nil {
+		return err
+	}
+	for _, backupDir := range remoteFiles {
+		remoteFilePath := path.Join(remotePath, backupDir.Name())
+		if backupDir.IsDir() {
+			err := client.removeDirectory(remoteFilePath)
+			if err != nil {
+				return err
+			}
+		} else {
+			err := client.Remove(path.Join(remoteFilePath))
+			if err != nil {
+				return err
+			}
+		}
+	}
+	return client.RemoveDirectory(remotePath)
+}
+
+func (client *Client) removeFile(remotePath string) error {
+	return client.Remove(utils.Join(remotePath))
+}
+
+func (driver SFTP) formatFile(f os.FileInfo) model.File {
+	t := f.ModTime()
+	file := model.File{
+		//Id:        f.Id,
+		Name:      f.Name(),
+		Size:      f.Size(),
+		Driver:    driver.Config().Name,
+		UpdatedAt: &t,
+	}
+	if f.IsDir() {
+		file.Type = conf.FOLDER
+	} else {
+		file.Type = utils.GetFileType(path.Ext(f.Name()))
+	}
+	return file
+}
+
+func init() {
+	base.RegisterDriver(&SFTP{})
+}

drivers/sftp/types.go

@@ -0,0 +1,18 @@
+package template
+
+import "time"
+
+// write all struct here
+
+type Resp struct {
+	Code    int    `json:"code"`
+	Message string `json:"message"`
+}
+
+type File struct {
+	Id        string     `json:"id"`
+	FileName  string     `json:"file_name"`
+	Size      int64      `json:"size"`
+	File      bool       `json:"file"`
+	UpdatedAt *time.Time `json:"updated_at"`
+}

drivers/sftp/util.go

@@ -0,0 +1,3 @@
+package template
+
+// write util func here, such as cal sign

drivers/shandian/driver.go

@@ -6,7 +6,6 @@ import (
 	"github.com/Xhofe/alist/drivers/base"
 	"github.com/Xhofe/alist/model"
 	"github.com/Xhofe/alist/utils"
-	"github.com/gin-gonic/gin"
 	log "github.com/sirupsen/logrus"
 	"path/filepath"
 	"strconv"
@@ -48,6 +47,9 @@ func (driver Shandian) Items() []base.Item {
 }
 
 func (driver Shandian) Save(account *model.Account, old *model.Account) error {
+	if account == nil {
+		return nil
+	}
 	if account.RootFolder == "" {
 		account.RootFolder = "0"
 	}
@@ -151,9 +153,9 @@ func (driver Shandian) Path(path string, account *model.Account) (*model.File, [
 	return nil, files, nil
 }
 
-func (driver Shandian) Proxy(c *gin.Context, account *model.Account) {
-
-}
+//func (driver Shandian) Proxy(r *http.Request, account *model.Account) {
+//
+//}
 
 func (driver Shandian) Preview(path string, account *model.Account) (interface{}, error) {
 	return nil, base.ErrNotSupport
@@ -169,9 +171,6 @@ func (driver Shandian) MakeDir(path string, account *model.Account) error {
 		"name": utils.Base(path),
 	}
 	_, err = driver.Post("https://shandianpan.com/api/pan/mkdir", data, nil, account)
-	if err == nil {
-		_ = base.DeleteCache(utils.Dir(path), account)
-	}
 	return err
 }
 
@@ -180,30 +179,28 @@ func (driver Shandian) Move(src string, dst string, account *model.Account) erro
 	if err != nil {
 		return err
 	}
-	if utils.Dir(src) == utils.Dir(dst) {
-		// rename
-		data := map[string]interface{}{
-			"id":   srcFile.Id,
-			"name": utils.Base(dst),
-		}
-		_, err = driver.Post("https://shandianpan.com/api/pan/change", data, nil, account)
-	} else {
-		dstParentFile, err := driver.File(utils.Dir(dst), account)
-		if err != nil {
-			return err
-		}
-		data := map[string]interface{}{
-			"id":    srcFile.Id,
-			"to_id": dstParentFile.Id,
-		}
-		_, err = driver.Post("https://shandianpan.com/api/pan/move", data, nil, account)
+	dstParentFile, err := driver.File(utils.Dir(dst), account)
+	if err != nil {
+		return err
 	}
-	if err == nil {
-		_ = base.DeleteCache(utils.Dir(src), account)
-		if utils.Dir(src) != utils.Dir(dst) {
-			_ = base.DeleteCache(utils.Dir(dst), account)
-		}
+	data := map[string]interface{}{
+		"id":    srcFile.Id,
+		"to_id": dstParentFile.Id,
 	}
+	_, err = driver.Post("https://shandianpan.com/api/pan/move", data, nil, account)
+	return err
+}
+
+func (driver Shandian) Rename(src string, dst string, account *model.Account) error {
+	srcFile, err := driver.File(src, account)
+	if err != nil {
+		return err
+	}
+	data := map[string]interface{}{
+		"id":   srcFile.Id,
+		"name": utils.Base(dst),
+	}
+	_, err = driver.Post("https://shandianpan.com/api/pan/change", data, nil, account)
 	return err
 }
 
@@ -220,9 +217,6 @@ func (driver Shandian) Delete(path string, account *model.Account) error {
 		"id": file.Id,
 	}
 	_, err = driver.Post("https://shandianpan.com/api/pan/recycle-in", data, nil, account)
-	if err == nil {
-		_ = base.DeleteCache(utils.Dir(path), account)
-	}
 	return err
 }
 
@@ -243,7 +237,11 @@ func (driver Shandian) Upload(file *model.FileStream, account *model.Account) er
 		"id":   parentId,
 		"name": file.GetFileName(),
 	}
-	_, err = driver.Post("https://shandianpan.com/api/pan/upload", data, &resp, account)
+	res, err := driver.Post("https://shandianpan.com/api/pan/upload", data, nil, account)
+	if err != nil {
+		return err
+	}
+	err = utils.Json.Unmarshal(res, &resp)
 	if err != nil {
 		return err
 	}
@@ -272,7 +270,6 @@ func (driver Shandian) Upload(file *model.FileStream, account *model.Account) er
 		return err
 	}
 	if r.Code == 0 {
-		_ = base.DeleteCache(file.ParentPath, account)
 		return nil
 	}
 	return errors.New(r.Msg)

drivers/teambition/driver.go

@@ -0,0 +1,286 @@
+package teambition
+
+import (
+	"github.com/Xhofe/alist/conf"
+	"github.com/Xhofe/alist/drivers/base"
+	"github.com/Xhofe/alist/model"
+	"github.com/Xhofe/alist/utils"
+	log "github.com/sirupsen/logrus"
+	"path/filepath"
+)
+
+type Teambition struct{}
+
+func (driver Teambition) Config() base.DriverConfig {
+	return base.DriverConfig{
+		Name: "Teambition",
+	}
+}
+
+func (driver Teambition) Items() []base.Item {
+	return []base.Item{
+		{
+			Name:     "internal_type",
+			Label:    "Teambition type",
+			Type:     base.TypeSelect,
+			Required: true,
+			Values:   "China,International",
+		},
+		{
+			Name:        "access_token",
+			Label:       "Cookie",
+			Type:        base.TypeString,
+			Required:    true,
+			Description: "Unknown expiration time",
+		},
+		{
+			Name:     "zone",
+			Label:    "Project id",
+			Type:     base.TypeString,
+			Required: true,
+		},
+		{
+			Name:     "root_folder",
+			Label:    "root folder file_id",
+			Type:     base.TypeString,
+			Required: true,
+		},
+		{
+			Name:     "order_by",
+			Label:    "order_by",
+			Type:     base.TypeSelect,
+			Values:   "fileName,fileSize,updated,created",
+			Required: true,
+			Default:  "fileName",
+		},
+		{
+			Name:     "order_direction",
+			Label:    "order_direction",
+			Type:     base.TypeSelect,
+			Values:   "Asc,Desc",
+			Required: true,
+			Default:  "Asc",
+		},
+	}
+}
+
+func (driver Teambition) Save(account *model.Account, old *model.Account) error {
+	if account == nil {
+		return nil
+	}
+	_, err := driver.Request("/api/v2/roles", base.Get, nil, nil, nil, nil, nil, account)
+	return err
+}
+
+func (driver Teambition) File(path string, account *model.Account) (*model.File, error) {
+	path = utils.ParsePath(path)
+	if path == "/" {
+		return &model.File{
+			Id:        account.RootFolder,
+			Name:      account.Name,
+			Size:      0,
+			Type:      conf.FOLDER,
+			Driver:    driver.Config().Name,
+			UpdatedAt: account.UpdatedAt,
+		}, nil
+	}
+	dir, name := filepath.Split(path)
+	files, err := driver.Files(dir, account)
+	if err != nil {
+		return nil, err
+	}
+	for _, file := range files {
+		if file.Name == name {
+			return &file, nil
+		}
+	}
+	return nil, base.ErrPathNotFound
+}
+
+func (driver Teambition) Files(path string, account *model.Account) ([]model.File, error) {
+	path = utils.ParsePath(path)
+	var files []model.File
+	cache, err := base.GetCache(path, account)
+	if err == nil {
+		files, _ = cache.([]model.File)
+	} else {
+		file, err := driver.File(path, account)
+		if err != nil {
+			return nil, err
+		}
+		files, err = driver.GetFiles(file.Id, account)
+		if err != nil {
+			return nil, err
+		}
+		if len(files) > 0 {
+			_ = base.SetCache(path, files, account)
+		}
+	}
+	return files, nil
+}
+
+func (driver Teambition) Link(args base.Args, account *model.Account) (*base.Link, error) {
+	path := args.Path
+	file, err := driver.File(path, account)
+	if err != nil {
+		return nil, err
+	}
+	url := file.Url
+	res, err := base.NoRedirectClient.R().Get(url)
+	if res.StatusCode() == 302 {
+		url = res.Header().Get("location")
+	}
+	return &base.Link{Url: url}, nil
+}
+
+func (driver Teambition) Path(path string, account *model.Account) (*model.File, []model.File, error) {
+	path = utils.ParsePath(path)
+	log.Debugf("teambition path: %s", path)
+	file, err := driver.File(path, account)
+	if err != nil {
+		return nil, nil, err
+	}
+	if !file.IsDir() {
+		return file, nil, nil
+	}
+	files, err := driver.Files(path, account)
+	if err != nil {
+		return nil, nil, err
+	}
+	return nil, files, nil
+}
+
+//func (driver Teambition) Proxy(r *http.Request, account *model.Account) {
+//
+//}
+
+func (driver Teambition) Preview(path string, account *model.Account) (interface{}, error) {
+	return nil, base.ErrNotSupport
+}
+
+func (driver Teambition) MakeDir(path string, account *model.Account) error {
+	parentFile, err := driver.File(utils.Dir(path), account)
+	if err != nil {
+		return err
+	}
+	data := base.Json{
+		"objectType":     "collection",
+		"_projectId":     account.Zone,
+		"_creatorId":     "",
+		"created":        "",
+		"updated":        "",
+		"title":          utils.Base(path),
+		"color":          "blue",
+		"description":    "",
+		"workCount":      0,
+		"collectionType": "",
+		"recentWorks":    []interface{}{},
+		"_parentId":      parentFile.Id,
+		"subCount":       nil,
+	}
+	_, err = driver.Request("/api/collections", base.Post, nil, nil, nil, &data, nil, account)
+	return err
+}
+
+func (driver Teambition) Move(src string, dst string, account *model.Account) error {
+	srcFile, err := driver.File(src, account)
+	if err != nil {
+		return err
+	}
+	dstParentFile, err := driver.File(utils.Dir(dst), account)
+	if err != nil {
+		return err
+	}
+	pre := "/api/works/"
+	if srcFile.IsDir() {
+		pre = "/api/collections/"
+	}
+	_, err = driver.Request(pre+srcFile.Id+"/move", base.Put, nil, nil, nil, &base.Json{
+		"_parentId": dstParentFile.Id,
+	}, nil, account)
+	return err
+}
+
+func (driver Teambition) Rename(src string, dst string, account *model.Account) error {
+	srcFile, err := driver.File(src, account)
+	if err != nil {
+		return err
+	}
+	pre := "/api/works/"
+	data := base.Json{
+		"fileName": utils.Base(dst),
+	}
+	if srcFile.IsDir() {
+		pre = "/api/collections/"
+		data = base.Json{
+			"title": utils.Base(dst),
+		}
+	}
+	_, err = driver.Request(pre+srcFile.Id, base.Put, nil, nil, nil, &data, nil, account)
+	return err
+}
+
+func (driver Teambition) Copy(src string, dst string, account *model.Account) error {
+	srcFile, err := driver.File(src, account)
+	if err != nil {
+		return err
+	}
+	dstParentFile, err := driver.File(utils.Dir(dst), account)
+	if err != nil {
+		return err
+	}
+	pre := "/api/works/"
+	if srcFile.IsDir() {
+		pre = "/api/collections/"
+	}
+	_, err = driver.Request(pre+srcFile.Id+"/fork", base.Put, nil, nil, nil, &base.Json{
+		"_parentId": dstParentFile.Id,
+	}, nil, account)
+	return err
+}
+
+func (driver Teambition) Delete(path string, account *model.Account) error {
+	srcFile, err := driver.File(path, account)
+	if err != nil {
+		return err
+	}
+	pre := "/api/works/"
+	if srcFile.IsDir() {
+		pre = "/api/collections/"
+	}
+	_, err = driver.Request(pre+srcFile.Id+"/archive", base.Post, nil, nil, nil, nil, nil, account)
+	return err
+}
+
+func (driver Teambition) Upload(file *model.FileStream, account *model.Account) error {
+	if file == nil {
+		return base.ErrEmptyFile
+	}
+	parentFile, err := driver.File(file.ParentPath, account)
+	if !parentFile.IsDir() {
+		return base.ErrNotFolder
+	}
+	if err != nil {
+		return err
+	}
+	res, err := driver.Request("/projects", base.Get, nil, nil, nil, nil, nil, account)
+	if err != nil {
+		return err
+	}
+	token := GetBetweenStr(string(res), "strikerAuth":"", "","phoneForLogin")
+	var newFile *FileUpload
+	if file.Size <= 20971520 {
+		// post upload
+		newFile, err = driver.upload(file, token, account)
+	} else {
+		// chunk upload
+		//err = base.ErrNotImplement
+		newFile, err = driver.chunkUpload(file, token, account)
+	}
+	if err != nil {
+		return err
+	}
+	return driver.finishUpload(newFile, parentFile.Id, account)
+}
+
+var _ base.Driver = (*Teambition)(nil)

drivers/teambition/teambition.go

@@ -0,0 +1,237 @@
+package teambition
+
+import (
+	"errors"
+	"fmt"
+	"github.com/Xhofe/alist/conf"
+	"github.com/Xhofe/alist/drivers/base"
+	"github.com/Xhofe/alist/model"
+	"github.com/Xhofe/alist/utils"
+	"github.com/go-resty/resty/v2"
+	log "github.com/sirupsen/logrus"
+	"io"
+	"path"
+	"strconv"
+	"time"
+)
+
+type ErrResp struct {
+	Name    string `json:"name"`
+	Message string `json:"message"`
+}
+
+func (driver Teambition) Request(pathname string, method int, headers, query, form map[string]string, data interface{}, resp interface{}, account *model.Account) ([]byte, error) {
+	url := "https://www.teambition.com" + pathname
+	if account.InternalType == "International" {
+		url = "https://us.teambition.com" + pathname
+	}
+	req := base.RestyClient.R()
+	req.SetHeader("Cookie", account.AccessToken)
+	if headers != nil {
+		req.SetHeaders(headers)
+	}
+	if query != nil {
+		req.SetQueryParams(query)
+	}
+	if form != nil {
+		req.SetFormData(form)
+	}
+	if data != nil {
+		req.SetBody(data)
+	}
+	if resp != nil {
+		req.SetResult(resp)
+	}
+	var e ErrResp
+	var err error
+	var res *resty.Response
+	req.SetError(&e)
+	switch method {
+	case base.Get:
+		res, err = req.Get(url)
+	case base.Post:
+		res, err = req.Post(url)
+	case base.Delete:
+		res, err = req.Delete(url)
+	case base.Patch:
+		res, err = req.Patch(url)
+	case base.Put:
+		res, err = req.Put(url)
+	default:
+		return nil, base.ErrNotSupport
+	}
+	if err != nil {
+		return nil, err
+	}
+	if e.Name != "" {
+		return nil, errors.New(e.Message)
+	}
+	return res.Body(), nil
+}
+
+func (driver Teambition) GetFiles(parentId string, account *model.Account) ([]model.File, error) {
+	files := make([]model.File, 0)
+	page := 1
+	for {
+		var collections []Collection
+		_, err := driver.Request("/api/collections", base.Get, nil, map[string]string{
+			"_parentId":  parentId,
+			"_projectId": account.Zone,
+			"order":      account.OrderBy + account.OrderDirection,
+			"count":      "50",
+			"page":       strconv.Itoa(page),
+		}, nil, nil, &collections, account)
+		if err != nil {
+			return nil, err
+		}
+		if len(collections) == 0 {
+			break
+		}
+		page++
+		for _, collection := range collections {
+			if collection.Title == "" {
+				continue
+			}
+			files = append(files, model.File{
+				Id:        collection.ID,
+				Name:      collection.Title,
+				Size:      0,
+				Type:      conf.FOLDER,
+				Driver:    driver.Config().Name,
+				UpdatedAt: collection.Updated,
+			})
+		}
+	}
+	page = 1
+	for {
+		var works []Work
+		_, err := driver.Request("/api/works", base.Get, nil, map[string]string{
+			"_parentId":  parentId,
+			"_projectId": account.Zone,
+			"order":      account.OrderBy + account.OrderDirection,
+			"count":      "50",
+			"page":       strconv.Itoa(page),
+		}, nil, nil, &works, account)
+		if err != nil {
+			return nil, err
+		}
+		if len(works) == 0 {
+			break
+		}
+		page++
+		for _, work := range works {
+			files = append(files, model.File{
+				Id:        work.ID,
+				Name:      work.FileName,
+				Size:      work.FileSize,
+				Type:      utils.GetFileType(path.Ext(work.FileName)),
+				Driver:    driver.Config().Name,
+				UpdatedAt: work.Updated,
+				Thumbnail: work.Thumbnail,
+				Url:       work.DownloadURL,
+			})
+		}
+	}
+	return files, nil
+}
+
+func (driver Teambition) upload(file *model.FileStream, token string, account *model.Account) (*FileUpload, error) {
+	prefix := "tcs"
+	if account.InternalType == "International" {
+		prefix = "us-tcs"
+	}
+	var newFile FileUpload
+	_, err := base.RestyClient.R().SetResult(&newFile).SetHeader("Authorization", token).
+		SetMultipartFormData(map[string]string{
+			"name": file.GetFileName(),
+			"type": file.GetMIMEType(),
+			"size": strconv.FormatUint(file.GetSize(), 10),
+			//"lastModifiedDate": "",
+		}).SetMultipartField("file", file.GetFileName(), file.GetMIMEType(), file).
+		Post(fmt.Sprintf("https://%s.teambition.net/upload", prefix))
+	if err != nil {
+		return nil, err
+	}
+	return &newFile, nil
+}
+
+func (driver Teambition) chunkUpload(file *model.FileStream, token string, account *model.Account) (*FileUpload, error) {
+	prefix := "tcs"
+	referer := "https://www.teambition.com/"
+	if account.InternalType == "International" {
+		prefix = "us-tcs"
+		referer = "https://us.teambition.com/"
+	}
+	var newChunk ChunkUpload
+	_, err := base.RestyClient.R().SetResult(&newChunk).SetHeader("Authorization", token).
+		SetBody(base.Json{
+			"fileName":    file.GetFileName(),
+			"fileSize":    file.GetSize(),
+			"lastUpdated": time.Now(),
+		}).Post(fmt.Sprintf("https://%s.teambition.net/upload/chunk", prefix))
+	if err != nil {
+		return nil, err
+	}
+	for i := 0; i < newChunk.Chunks; i++ {
+		chunkSize := newChunk.ChunkSize
+		if i == newChunk.Chunks-1 {
+			chunkSize = int(file.GetSize()) - i*chunkSize
+		}
+		log.Debugf("%d : %d", i, chunkSize)
+		chunkData := make([]byte, chunkSize)
+		_, err = io.ReadFull(file, chunkData)
+		if err != nil {
+			return nil, err
+		}
+		u := fmt.Sprintf("https://%s.teambition.net/upload/chunk/%s?chunk=%d&chunks=%d",
+			prefix, newChunk.FileKey, i+1, newChunk.Chunks)
+		log.Debugf("url: %s", u)
+		res, err := base.RestyClient.R().SetHeaders(map[string]string{
+			"Authorization": token,
+			"Content-Type":  "application/octet-stream",
+			"Referer":       referer,
+		}).SetBody(chunkData).Post(u)
+		if err != nil {
+			return nil, err
+		}
+		log.Debug(res.Status(), res.String())
+		//req, err := http.NewRequest("POST",
+		//	u,
+		//	bytes.NewBuffer(chunkData))
+		//if err != nil {
+		//	return nil, err
+		//}
+		//req.Header.Set("Authorization", token)
+		//req.Header.Set("Content-Type", "application/octet-stream")
+		//req.Header.Set("Referer", "https://www.teambition.com/")
+		//resp, err := base.HttpClient.Do(req)
+		//res, _ := ioutil.ReadAll(resp.Body)
+		//log.Debugf("chunk upload status: %s, res: %s", resp.Status, string(res))
+		if err != nil {
+			return nil, err
+		}
+	}
+	res, err := base.RestyClient.R().SetHeader("Authorization", token).Post(
+		fmt.Sprintf("https://%s.teambition.net/upload/chunk/%s",
+			prefix, newChunk.FileKey))
+	log.Debug(res.Status(), res.String())
+	if err != nil {
+		return nil, err
+	}
+	return &newChunk.FileUpload, nil
+}
+
+func (driver Teambition) finishUpload(file *FileUpload, parentId string, account *model.Account) error {
+	file.InvolveMembers = []interface{}{}
+	file.Visible = "members"
+	file.ParentId = parentId
+	_, err := driver.Request("/api/works", base.Post, nil, nil, nil, base.Json{
+		"works":     []FileUpload{*file},
+		"_parentId": parentId,
+	}, nil, account)
+	return err
+}
+
+func init() {
+	base.RegisterDriver(&Teambition{})
+}

drivers/teambition/types.go

@@ -0,0 +1,63 @@
+package teambition
+
+import "time"
+
+type Collection struct {
+	ID      string     `json:"_id"`
+	Title   string     `json:"title"`
+	Updated *time.Time `json:"updated"`
+}
+
+type Work struct {
+	ID           string     `json:"_id"`
+	FileName     string     `json:"fileName"`
+	FileSize     int64      `json:"fileSize"`
+	FileKey      string     `json:"fileKey"`
+	FileCategory string     `json:"fileCategory"`
+	DownloadURL  string     `json:"downloadUrl"`
+	ThumbnailURL string     `json:"thumbnailUrl"`
+	Thumbnail    string     `json:"thumbnail"`
+	Updated      *time.Time `json:"updated"`
+	PreviewURL   string     `json:"previewUrl"`
+}
+
+type FileUpload struct {
+	FileKey        string        `json:"fileKey"`
+	FileName       string        `json:"fileName"`
+	FileType       string        `json:"fileType"`
+	FileSize       int           `json:"fileSize"`
+	FileCategory   string        `json:"fileCategory"`
+	ImageWidth     int           `json:"imageWidth"`
+	ImageHeight    int           `json:"imageHeight"`
+	InvolveMembers []interface{} `json:"involveMembers"`
+	Source         string        `json:"source"`
+	Visible        string        `json:"visible"`
+	ParentId       string        `json:"_parentId"`
+}
+
+type ChunkUpload struct {
+	FileUpload
+	Storage        string        `json:"storage"`
+	MimeType       string        `json:"mimeType"`
+	Chunks         int           `json:"chunks"`
+	ChunkSize      int           `json:"chunkSize"`
+	Created        time.Time     `json:"created"`
+	FileMD5        string        `json:"fileMD5"`
+	LastUpdated    time.Time     `json:"lastUpdated"`
+	UploadedChunks []interface{} `json:"uploadedChunks"`
+	Token          struct {
+		AppID          string    `json:"AppID"`
+		OrganizationID string    `json:"OrganizationID"`
+		UserID         string    `json:"UserID"`
+		Exp            time.Time `json:"Exp"`
+		Storage        string    `json:"Storage"`
+		Resource       string    `json:"Resource"`
+		Speed          int       `json:"Speed"`
+	} `json:"token"`
+	DownloadUrl    string      `json:"downloadUrl"`
+	ThumbnailUrl   string      `json:"thumbnailUrl"`
+	PreviewUrl     string      `json:"previewUrl"`
+	ImmPreviewUrl  string      `json:"immPreviewUrl"`
+	PreviewExt     string      `json:"previewExt"`
+	LastUploadTime interface{} `json:"lastUploadTime"`
+}

drivers/teambition/util.go

@@ -0,0 +1,18 @@
+package teambition
+
+import "strings"
+
+func GetBetweenStr(str, start, end string) string {
+	n := strings.Index(str, start)
+	if n == -1 {
+		return ""
+	}
+	n = n + len(start)
+	str = string([]byte(str)[n:])
+	m := strings.Index(str, end)
+	if m == -1 {
+		return ""
+	}
+	str = string([]byte(str)[:m])
+	return str
+}

drivers/template/driver.go

@@ -0,0 +1,151 @@
+package template
+
+import (
+	"github.com/Xhofe/alist/conf"
+	"github.com/Xhofe/alist/drivers/base"
+	"github.com/Xhofe/alist/model"
+	"github.com/Xhofe/alist/utils"
+	"path/filepath"
+)
+
+type Template struct {
+	base.Base
+}
+
+func (driver Template) Config() base.DriverConfig {
+	return base.DriverConfig{
+		Name:          "Template",
+		OnlyProxy:     false,
+		OnlyLocal:     false,
+		ApiProxy:      false,
+		NoNeedSetLink: false,
+		NoCors:        false,
+		LocalSort:     false,
+	}
+}
+
+func (driver Template) Items() []base.Item {
+	// TODO fill need info
+	return []base.Item{
+		{
+			Name:     "refresh_token",
+			Label:    "refresh token",
+			Type:     base.TypeString,
+			Required: true,
+		},
+		{
+			Name:     "root_folder",
+			Label:    "root folder path",
+			Type:     base.TypeString,
+			Default:  "/",
+			Required: true,
+		},
+	}
+}
+
+func (driver Template) Save(account *model.Account, old *model.Account) error {
+	// TODO test available or init
+	return nil
+}
+
+func (driver Template) File(path string, account *model.Account) (*model.File, error) {
+	path = utils.ParsePath(path)
+	if path == "/" {
+		return &model.File{
+			Id:        account.RootFolder,
+			Name:      account.Name,
+			Size:      0,
+			Type:      conf.FOLDER,
+			Driver:    driver.Config().Name,
+			UpdatedAt: account.UpdatedAt,
+		}, nil
+	}
+	dir, name := filepath.Split(path)
+	files, err := driver.Files(dir, account)
+	if err != nil {
+		return nil, err
+	}
+	for _, file := range files {
+		if file.Name == name {
+			return &file, nil
+		}
+	}
+	return nil, base.ErrPathNotFound
+}
+
+func (driver Template) Files(path string, account *model.Account) ([]model.File, error) {
+	path = utils.ParsePath(path)
+	cache, err := base.GetCache(path, account)
+	if err == nil {
+		files, _ := cache.([]model.File)
+		return files, nil
+	}
+	var files []model.File
+	// TODO get files
+	if err != nil {
+		return nil, err
+	}
+	if len(files) > 0 {
+		_ = base.SetCache(path, files, account)
+	}
+	return files, nil
+}
+
+func (driver Template) Link(args base.Args, account *model.Account) (*base.Link, error) {
+	// TODO get file link
+	return nil, base.ErrNotImplement
+}
+
+func (driver Template) Path(path string, account *model.Account) (*model.File, []model.File, error) {
+	path = utils.ParsePath(path)
+	file, err := driver.File(path, account)
+	if err != nil {
+		return nil, nil, err
+	}
+	if !file.IsDir() {
+		return file, nil, nil
+	}
+	files, err := driver.Files(path, account)
+	if err != nil {
+		return nil, nil, err
+	}
+	return nil, files, nil
+}
+
+// Optional function
+//func (driver Template) Preview(path string, account *model.Account) (interface{}, error) {
+//	//TODO preview interface if driver support
+//	return nil, base.ErrNotImplement
+//}
+//
+//func (driver Template) MakeDir(path string, account *model.Account) error {
+//	//TODO make dir
+//	return base.ErrNotImplement
+//}
+//
+//func (driver Template) Move(src string, dst string, account *model.Account) error {
+//	//TODO move file/dir
+//	return base.ErrNotImplement
+//}
+//
+//func (driver Template) Rename(src string, dst string, account *model.Account) error {
+//	//TODO rename file/dir
+//	return base.ErrNotImplement
+//}
+//
+//func (driver Template) Copy(src string, dst string, account *model.Account) error {
+//	//TODO copy file/dir
+//	return base.ErrNotImplement
+//}
+//
+//func (driver Template) Delete(path string, account *model.Account) error {
+//	//TODO delete file/dir
+//	return base.ErrNotImplement
+//}
+//
+//func (driver Template) Upload(file *model.FileStream, account *model.Account) error {
+//	//TODO upload file
+//	return base.ErrNotImplement
+//}
+
+var _ base.Driver = (*Template)(nil)