fix: config json and env tag

Co-authored-by: eaglexmw <eagle_xmw@163.com>

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -1,6 +1,6 @@
 name: "Bug report"
 description: Bug report
-labels: [bug]
+labels: [pending triage]
 body:
   - type: markdown
     attributes:
@@ -12,10 +12,9 @@ body:
       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.nn.ci).
+        - 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`).
-        - label: I'm sure I'm using the latest version
   - type: input
     id: version
     attributes:
@@ -24,14 +23,6 @@ body:
       placeholder: v2.0.0
     validations:
       required: true
-  - type: input
-    id: driver
-    attributes:
-      label: Driver used / 使用的存储驱动
-      description: What storage driver are you using?
-      placeholder: "for example: Onedrive"
-    validations:
-      required: true
   - type: textarea
     id: bug-description
     attributes:

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -1,13 +1,13 @@
 name: "Feature request"
 description: Feature request
-labels: [enhancement]
+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.nn.ci).
+        - 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.

.github/workflows/auto_lang.yml

@@ -1,64 +0,0 @@
-name: auto_lang
-
-on:
-  push:
-    branches:
-      - 'main'
-    paths:
-      - 'drivers/**'
-      - 'internal/bootstrap/data/setting.go'
-  workflow_dispatch:
-
-jobs:
-  auto_lang:
-    strategy:
-      matrix:
-        platform: [ ubuntu-latest ]
-        go-version: [ 1.19 ]
-    name: auto generate lang.json
-    runs-on: ${{ matrix.platform }}
-    steps:
-      - name: Setup go
-        uses: actions/setup-go@v2
-        with:
-          go-version: ${{ matrix.go-version }}
-
-      - name: Checkout alist
-        uses: actions/checkout@v2
-        with:
-          path: alist
-
-      - name: Checkout alist-web
-        uses: actions/checkout@v3
-        with:
-          repository: 'alist-org/alist-web'
-          ref: main
-          persist-credentials: false
-          fetch-depth: 0
-          path: alist-web
-
-      - name: Generate lang
-        run: |
-          cd alist
-          go run ./main.go lang
-          cd ..
-      - name: Copy lang file
-        run: |
-          cp -f ./alist/lang/*.json ./alist-web/src/lang/en/ 2>/dev/null || :
-
-      - name: Commit git
-        run: |
-          cd alist-web
-          git add .
-          git config --local user.email "i@nn.ci"
-          git config --local user.name "Noah Hsu"
-          git commit -m "chore: auto update i18n file" -a 2>/dev/null || :
-          cd ..
-
-      - name: Push lang files
-        uses: ad-m/github-push-action@master
-        with:
-          github_token: ${{ secrets.MY_TOKEN }}
-          branch: main
-          directory: alist-web
-          repository: alist-org/alist-web

.github/workflows/build.yml

@@ -20,8 +20,15 @@ jobs:
         with:
           go-version: ${{ matrix.go-version }}
 
+      - name: Set up Node
+        uses: actions/setup-node@v2
+        with:
+          node-version: '16'
+
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
+        with:
+          path: alist
 
       - name: Install dependencies
         run: |
@@ -31,10 +38,13 @@ jobs:
 
       - name: Build
         run: |
-          bash build.sh dev
+          mv alist/build.sh .
+          bash build.sh web
+          mv dist/* alist/public
+          bash build.sh build
 
       - name: Upload artifact
         uses: actions/upload-artifact@v2
         with:
-          name: alist
+          name: artifact
-          path: dist
+          path: alist/build

.github/workflows/build_docker.yml

@@ -2,7 +2,7 @@ name: build_docker
 
 on:
   push:
-    branches: [ main ]
+    branches: [ v2 ]
 
 jobs:
   build_docker:
@@ -16,9 +16,14 @@ jobs:
         uses: docker/metadata-action@v3
         with:
           images: xhofe/alist
-      - name: Replace release with dev
+      - name: Set up Node
+        uses: actions/setup-node@v2
+        with:
+          node-version: '16'
+      - name: Build web
         run: |
-          sed -i 's/release/dev/g' Dockerfile
+          bash build.sh web
+          mv dist/* public
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v1
       - name: Set up Docker Buildx
@@ -36,4 +41,4 @@ jobs:
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
-          platforms: linux/amd64,linux/arm64
+          platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/386,linux/arm/v6,linux/s390x

.github/workflows/issue_check_inactive.yml

@@ -1,17 +0,0 @@
-name: Check inactive
-
-on:
-  schedule:
-    - cron: "0 0 1 * *"
-
-jobs:
-  check-inactive:
-    runs-on: ubuntu-latest
-    steps:
-      - name: check-inactive
-        uses: actions-cool/issues-helper@v3
-        with:
-          actions: 'check-inactive'
-          token: ${{ secrets.GITHUB_TOKEN }}
-          inactive-day: 30
-          body: Hello, this issue has been inactive for more than 30 days and will be closed if inactive for another 30 days.

.github/workflows/issue_check_question.yml

@@ -1,21 +1,20 @@
-name: Close need info
+name: Check need info
 
 on:
   schedule:
     - cron: "0 0 */7 * *"
 
 jobs:
-  close-need-info:
+  check-need-info:
     runs-on: ubuntu-latest
     steps:
       - name: close-issues
-        uses: actions-cool/issues-helper@v3
+        uses: actions-cool/issues-helper@v2
         with:
           actions: 'close-issues'
           token: ${{ secrets.GITHUB_TOKEN }}
           labels: 'question'
           inactive-day: 7
-          close-reason: 'not_planned'
           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_close_inactive.yml

@@ -1,20 +0,0 @@
-name: Close inactive
-
-on:
-  schedule:
-    - cron: "0 0 */7 * *"
-
-jobs:
-  close-inactive:
-    runs-on: ubuntu-latest
-    steps:
-      - name: close-issues
-        uses: actions-cool/issues-helper@v3
-        with:
-          actions: 'close-issues'
-          token: ${{ secrets.GITHUB_TOKEN }}
-          labels: 'inactive'
-          inactive-day: 30
-          close-reason: 'not_planned'
-          body: |
-            Hello @${{ github.event.issue.user.login }}, this issue was closed due to inactive more than 60 days. You can reopen or recreate it if you think it should continue.

.github/workflows/issue_duplicate.yml

@@ -19,7 +19,7 @@ jobs:
             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@v3
+        uses: actions-cool/issues-helper@v2
         with:
           actions: 'close-issue'
           token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/issue_invalid.yml

@@ -19,7 +19,7 @@ jobs:
             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@v3
+        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_similarity.yml

@@ -1,19 +0,0 @@
-name: Issues Similarity Analysis
-
-on:
-  issues:
-    types: [opened, edited]
-
-jobs:
-  similarity-analysis:
-    runs-on: ubuntu-latest
-    steps:
-      - name: analysis
-        uses: actions-cool/issues-similarity-analysis@v1
-        with:
-          filter-threshold: 0.5
-          comment-title: '### See'
-          comment-body: '${index}. ${similarity} #${number}'
-          show-footer: false
-          show-mentioned: true
-          since-days: 730

.github/workflows/issue_translate.yml

@@ -1,13 +0,0 @@
-name: Translation Helper
-
-on:
-  pull_request_target:
-    types: [opened]
-  issues:
-    types: [opened]
-
-jobs:
-  translate:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions-cool/translation-helper@v1.2.0

.github/workflows/issue_wontfix.yml

@@ -19,7 +19,7 @@ jobs:
             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@v3
+        uses: actions-cool/issues-helper@v2
         with:
           actions: 'close-issue'
           token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/release.yml

@@ -16,7 +16,7 @@ jobs:
           fetch-depth: 0
       - run: npx changelogithub # or changelogithub@0.12 if ensure the stable result
         env:
-          GITHUB_TOKEN: ${{secrets.MY_TOKEN}}
+          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
   release:
     needs: changelog
     strategy:
@@ -34,9 +34,12 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
         with:
+          ref: v2
+          path: alist
+          persist-credentials: false
           fetch-depth: 0
 
-      - name: Install dependencies
+      - name: Install upx
         run: |
           docker pull techknowlogick/xgo:latest
           go install src.techknowlogick.com/xgo@latest
@@ -44,9 +47,12 @@ jobs:
 
       - name: Build
         run: |
+          mv alist/build.sh .
+          bash build.sh cdn
+          mv dist/* alist/public
           bash build.sh release
 
       - name: Release
         uses: softprops/action-gh-release@v1
         with:
-          files: build/compress/*
+          files: alist/build/compress/*

.github/workflows/release_docker.yml

@@ -6,31 +6,34 @@ on:
       - '*'
 
 jobs:
-  release_docker:
+  docker_release:
     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 cdn
+          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

.gitignore

@@ -1,7 +1,7 @@
 .idea/
 .DS_Store
 output/
-/dist/
+dist/
 
 # Binaries for programs and plugins
 *.exe
@@ -21,9 +21,10 @@ output/
 # Dependency directories (remove the comment below to include it)
 # vendor/
 bin/*
+/alist
+/alist.exe
 *.json
-data/
+public/*.html
-log/
+public/assets/
-lang/
+public/public/
-public/dist/*
+data/
-!public/dist/README.md

CODE_OF_CONDUCT.md

@@ -1,128 +0,0 @@
-# Contributor Covenant Code of Conduct
-
-## Our Pledge
-
-We as members, contributors, and leaders pledge to make participation in our
-community a harassment-free experience for everyone, regardless of age, body
-size, visible or invisible disability, ethnicity, sex characteristics, gender
-identity and expression, level of experience, education, socio-economic status,
-nationality, personal appearance, race, religion, or sexual identity
-and orientation.
-
-We pledge to act and interact in ways that contribute to an open, welcoming,
-diverse, inclusive, and healthy community.
-
-## Our Standards
-
-Examples of behavior that contributes to a positive environment for our
-community include:
-
-* Demonstrating empathy and kindness toward other people
-* Being respectful of differing opinions, viewpoints, and experiences
-* Giving and gracefully accepting constructive feedback
-* Accepting responsibility and apologizing to those affected by our mistakes,
-  and learning from the experience
-* Focusing on what is best not just for us as individuals, but for the
-  overall community
-
-Examples of unacceptable behavior include:
-
-* The use of sexualized language or imagery, and sexual attention or
-  advances of any kind
-* Trolling, insulting or derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or email
-  address, without their explicit permission
-* Other conduct which could reasonably be considered inappropriate in a
-  professional setting
-
-## Enforcement Responsibilities
-
-Community leaders are responsible for clarifying and enforcing our standards of
-acceptable behavior and will take appropriate and fair corrective action in
-response to any behavior that they deem inappropriate, threatening, offensive,
-or harmful.
-
-Community leaders have the right and responsibility to remove, edit, or reject
-comments, commits, code, wiki edits, issues, and other contributions that are
-not aligned to this Code of Conduct, and will communicate reasons for moderation
-decisions when appropriate.
-
-## Scope
-
-This Code of Conduct applies within all community spaces, and also applies when
-an individual is officially representing the community in public spaces.
-Examples of representing our community include using an official e-mail address,
-posting via an official social media account, or acting as an appointed
-representative at an online or offline event.
-
-## Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported to the community leaders responsible for enforcement at
-i@nn.ci.
-All complaints will be reviewed and investigated promptly and fairly.
-
-All community leaders are obligated to respect the privacy and security of the
-reporter of any incident.
-
-## Enforcement Guidelines
-
-Community leaders will follow these Community Impact Guidelines in determining
-the consequences for any action they deem in violation of this Code of Conduct:
-
-### 1. Correction
-
-**Community Impact**: Use of inappropriate language or other behavior deemed
-unprofessional or unwelcome in the community.
-
-**Consequence**: A private, written warning from community leaders, providing
-clarity around the nature of the violation and an explanation of why the
-behavior was inappropriate. A public apology may be requested.
-
-### 2. Warning
-
-**Community Impact**: A violation through a single incident or series
-of actions.
-
-**Consequence**: A warning with consequences for continued behavior. No
-interaction with the people involved, including unsolicited interaction with
-those enforcing the Code of Conduct, for a specified period of time. This
-includes avoiding interactions in community spaces as well as external channels
-like social media. Violating these terms may lead to a temporary or
-permanent ban.
-
-### 3. Temporary Ban
-
-**Community Impact**: A serious violation of community standards, including
-sustained inappropriate behavior.
-
-**Consequence**: A temporary ban from any sort of interaction or public
-communication with the community for a specified period of time. No public or
-private interaction with the people involved, including unsolicited interaction
-with those enforcing the Code of Conduct, is allowed during this period.
-Violating these terms may lead to a permanent ban.
-
-### 4. Permanent Ban
-
-**Community Impact**: Demonstrating a pattern of violation of community
-standards, including sustained inappropriate behavior,  harassment of an
-individual, or aggression toward or disparagement of classes of individuals.
-
-**Consequence**: A permanent ban from any sort of public interaction within
-the community.
-
-## Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage],
-version 2.0, available at
-https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
-
-Community Impact Guidelines were inspired by [Mozilla's code of conduct
-enforcement ladder](https://github.com/mozilla/diversity).
-
-[homepage]: https://www.contributor-covenant.org
-
-For answers to common questions about this code of conduct, see the FAQ at
-https://www.contributor-covenant.org/faq. Translations are available at
-https://www.contributor-covenant.org/translations.

CONTRIBUTING.md

@@ -14,24 +14,21 @@ Prerequisites:
 Clone `alist` and `alist-web` anywhere:
 
 ```shell
-$ git clone https://github.com/alist-org/alist.git
+$ git clone https://github.com/Xhofe/alist.git
-$ git clone --recurse-submodules https://github.com/alist-org/alist-web.git
+$ git clone https://github.com/Xhofe/alist-web.git
 ```
-You should switch to the `main` branch for development.
+You should switch to the dev branch for development.
 
 ## Preview your change
 ### backend
 ```shell
-$ go run main.go
+$ go run alist.go
 ```
 ### frontend
 ```shell
-$ pnpm dev
+$ yarn dev
 ```
 
-## Add a new driver
-Copy `drivers/template` folder and rename it, and follow the comments in it.
-
 ## Create a commit
 
 Commit messages should be well formatted, and to make that "standardized".
@@ -76,6 +73,7 @@ Must be one of the following:
 * **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`,
@@ -104,4 +102,4 @@ 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
-`main` branch.
+`dev` branch.

Dockerfile

@@ -2,8 +2,8 @@ FROM alpine:edge as builder
 LABEL stage=go-builder
 WORKDIR /app/
 COPY ./ ./
-RUN apk add --no-cache bash git go gcc musl-dev curl; \
+RUN apk add --no-cache bash git go gcc musl-dev; \
-    bash build.sh release 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", "server", "--no-prefix" ]
+CMD [ "./alist", "-docker" ]

README.md

@@ -1,90 +1,79 @@
 <div align="center">
   <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>🗂️A file list program that supports multiple storage, powered by Gin and Solidjs.</em></p>
+  <p><em>🗂️Another file list program that supports multiple storage, powered by Gin and React.</em></p>
-  <a href="https://goreportcard.com/report/github.com/alist-org/alist/v3">
+  <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>
-    <img src="https://goreportcard.com/badge/github.com/alist-org/alist/v3" alt="latest version" />
+  <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>
-  </a>
+  <a href="https://github.com/Xhofe/alist/actions?query=workflow%3ABuild"><img src="https://img.shields.io/github/workflow/status/Xhofe/alist/build?style=flat-square" alt="Build status"></a>
-  <a href="https://github.com/Xhofe/alist/blob/main/LICENSE">
+  <a href="https://github.com/Xhofe/alist/releases"><img src="https://img.shields.io/github/downloads/Xhofe/alist/total?style=flat-square&color=%239F7AEA" alt="Downloads"></a>
-    <img src="https://img.shields.io/github/license/Xhofe/alist" alt="License" />
+  <a href="https://github.com/Xhofe/alist/blob/v2/LICENSE"><img src="https://img.shields.io/github/license/Xhofe/alist?style=flat-square" alt="License"></a>
-  </a>
-  <a href="https://github.com/Xhofe/alist/discussions">
-    <img src="https://img.shields.io/github/discussions/Xhofe/alist?color=%23ED8936" alt="discussions" />
-  </a>
-  <a href="https://github.com/Xhofe/alist/actions?query=workflow%3ABuild">
-    <img src="https://img.shields.io/github/workflow/status/Xhofe/alist/build" alt="Build status" />
-  </a>
-  <a href="https://github.com/Xhofe/alist/releases">
-    <img src="https://img.shields.io/github/release/Xhofe/alist" alt="latest version" />
-  </a>
-  <a href="https://github.com/Xhofe/alist/releases">
-    <img src="https://img.shields.io/github/downloads/Xhofe/alist/total?color=%239F7AEA" alt="Downloads" />
-  </a>
-  <a title="Crowdin" target="_blank" href="https://crwd.in/alist">
-    <img src="https://badges.crowdin.net/alist/localized.svg">
-  </a>
   <a href="https://pay.xhofe.top">
-    <img src="https://img.shields.io/badge/%24-sponsor-ff69b4.svg" alt="sponsor" />
+    <img src="https://img.shields.io/badge/%24-donate-ff69b4.svg?style=flat-square" alt="donate">
   </a>
 </div>
 
 ---
 
-English | [中文](./README_cn.md) | [Contributors](./CONTRIBUTORS.md) | [Contributing](./CONTRIBUTING.md) | [CODE_OF_CONDUCT](./CODE_OF_CONDUCT.md)
+English | [中文](./README_cn.md) | [Contributors](./CONTRIBUTORS.md) | [Contributing](./CONTRIBUTING.md)
 
 ## Features
 
 - [x] Multiple storage
-    - [x] Local storage
+  - [x] Local storage
-    - [x] [Aliyundrive](https://www.aliyundrive.com/)
+  - [x] [Aliyundrive](https://www.aliyundrive.com/)
-    - [x] OneDrive / Sharepoint ([global](https://www.office.com/), [cn](https://portal.partner.microsoftonline.cn),de,us)
+  - [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] [189cloud](https://cloud.189.cn) (Personal, Family)
-    - [x] [GoogleDrive](https://drive.google.com/)
+  - [x] [GoogleDrive](https://drive.google.com/)
-    - [x] [123pan](https://www.123pan.com/)
+  - [x] [123pan](https://www.123pan.com/)
-    - [x] FTP / SFTP
+  - [x] [Lanzou](https://pc.woozooo.com/)
-    - [x] [PikPak](https://www.mypikpak.com/)
+  - [x] [Alist](https://github.com/Xhofe/alist)
-    - [x] [S3](https://aws.amazon.com/s3/)
+  - [x] FTP
-    - [x] [UPYUN Storage Service](https://www.upyun.com/products/file-storage)
+  - [x] [PikPak](https://www.mypikpak.com/)
-    - [x] WebDav(Support OneDrive/SharePoint without API)
+  - [x] [ShandianPan](https://shandianpan.com/)
-    - [x] Teambition([China](https://www.teambition.com/ ),[International](https://us.teambition.com/ ))
+  - [x] [S3](https://aws.amazon.com/s3/)
-    - [x] [Mediatrack](https://www.mediatrack.cn/)
+  - [x] WebDav(Support OneDrive/SharePoint without API)
-    - [x] [139yun](https://yun.139.com/) (Personal, Family)
+  - [x] Teambition([China](https://www.teambition.com/ ),[International](https://us.teambition.com/ ))
-    - [x] [YandexDisk](https://disk.yandex.com/)
+  - [x] [Mediatrack](https://www.mediatrack.cn/)
-    - [x] [BaiduNetdisk](http://pan.baidu.com/)
+  - [x] [139yun](https://yun.139.com/) (Personal, Family)
-    - [x] [Quark](https://pan.quark.cn)
+  - [x] [Yandex.Disk](https://disk.yandex.com/)
-    - [x] [Thunder](https://pan.xunlei.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
-- [x] Video and audio preview, support lyrics and subtitles
+- [x] Video and audio preview (mp4, mp3, ...)
 - [x] Office documents preview (docx, pptx, xlsx, ...)
 - [x] `README.md` preview rendering
 - [x] File permalink copy and direct file download
 - [x] Dark mode
 - [x] I18n
-- [x] Protected routes (password protection and authentication)
+- [x] Protected routes (password protection and authentication) 
-- [x] WebDav (see https://alist.nn.ci/guide/webdav.html 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), delete, mkdir, rename, move and copy
-- [x] Offline download
-- [x] Copy files between two storage
-
-## Document
-
-<https://alist.nn.ci/>
-
-## Demo
-
-<https://pan.nn.ci>
 
 ## Discussion
 
 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://store.heytapimage.com/cdo-portal/feedback/202202/20/b271627971e29f0c7c9d59935b6ef381.png)
+
+## Document
+
+<https://alist-doc.nn.ci/en/>
+
 ## Special sponsors
 - [找资源 - 阿里云盘资源搜索引擎](https://zhaoziyuan.la/)
-- [KinhDown 百度云盘不限速下载！永久免费！已稳定运行3年！非常可靠!](https://kinhdown.com/?Type=Tutorials)
+- [KinhDown 百度云盘不限速下载！永久免费！以稳定运行3年！非常可靠!](https://kinhdown.com/?Type=Tutorials)
 - [JetBrains: Essential tools for software developers and teams](https://www.jetbrains.com/)
 
 ## License

README_cn.md

@@ -1,90 +1,79 @@
 <div align="center">
   <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 和 Solidjs。</em></p>
+  <p><em>🗂️一个支持多存储的文件列表程序，使用 Gin 和 React 。</em></p>
-  <a href="https://goreportcard.com/report/github.com/alist-org/alist/v3">
+  <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>
-    <img src="https://goreportcard.com/badge/github.com/alist-org/alist/v3" alt="latest version" />
+  <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>
-  </a>
+  <a href="https://github.com/Xhofe/alist/actions?query=workflow%3ABuild"><img src="https://img.shields.io/github/workflow/status/Xhofe/alist/build?style=flat-square" alt="Build status"></a>
-  <a href="https://github.com/Xhofe/alist/blob/main/LICENSE">
+  <a href="https://github.com/Xhofe/alist/releases"><img src="https://img.shields.io/github/downloads/Xhofe/alist/total?style=flat-square&color=%239F7AEA" alt="Downloads"></a>
-    <img src="https://img.shields.io/github/license/Xhofe/alist" alt="License" />
+  <a href="https://github.com/Xhofe/alist/blob/v2/LICENSE"><img src="https://img.shields.io/github/license/Xhofe/alist?style=flat-square" alt="License"></a>
-  </a>
-  <a href="https://github.com/Xhofe/alist/discussions">
-    <img src="https://img.shields.io/github/discussions/Xhofe/alist?color=%23ED8936" alt="discussions" />
-  </a>
-  <a href="https://github.com/Xhofe/alist/actions?query=workflow%3ABuild">
-    <img src="https://img.shields.io/github/workflow/status/Xhofe/alist/build" alt="Build status" />
-  </a>
-  <a href="https://github.com/Xhofe/alist/releases">
-    <img src="https://img.shields.io/github/release/Xhofe/alist" alt="latest version" />
-  </a>
-  <a href="https://github.com/Xhofe/alist/releases">
-    <img src="https://img.shields.io/github/downloads/Xhofe/alist/total?color=%239F7AEA" alt="Downloads" />
-  </a>
-  <a title="Crowdin" target="_blank" href="https://crwd.in/alist">
-    <img src="https://badges.crowdin.net/alist/localized.svg">
-  </a>
   <a href="https://pay.xhofe.top">
-    <img src="https://img.shields.io/badge/%24-sponsor-ff69b4.svg" alt="sponsor" />
+    <img src="https://img.shields.io/badge/%24-donate-ff69b4.svg?style=flat-square" alt="donate">
   </a>
 </div>
 
 ---
 
-[English](./README.md) | 中文 | [Contributors](./CONTRIBUTORS.md) | [Contributing](./CONTRIBUTING.md) | [CODE_OF_CONDUCT](./CODE_OF_CONDUCT.md)
+[English](./README.md) | 中文 | [Contributors](./CONTRIBUTORS.md) | [Contributing](./CONTRIBUTING.md)
 
-## Features
+## 支持
 
 - [x] 多种存储
-    - [x] 本地存储
+  - [x] 本地存储
-    - [x] [阿里云盘](https://www.aliyundrive.com/)
+  - [x] [阿里云盘](https://www.aliyundrive.com/)
-    - [x] OneDrive / Sharepoint（[国际版](https://www.office.com/), [世纪互联](https://portal.partner.microsoftonline.cn),de,us）
+  - [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] [GoogleDrive](https://drive.google.com/)
-    - [x] [123云盘](https://www.123pan.com/)
+  - [x] [123云盘](https://www.123pan.com/)
-    - [x] FTP / SFTP
+  - [x] [蓝奏云](https://pc.woozooo.com/)
-    - [x] [PikPak](https://www.mypikpak.com/)
+  - [x] [Alist](https://github.com/Xhofe/alist)
-    - [x] [S3](https://aws.amazon.com/cn/s3/)
+  - [x] FTP
-    - [x] [又拍云对象存储](https://www.upyun.com/products/file-storage)
+  - [x] [PikPak](https://www.mypikpak.com/)
-    - [x] WebDav(支持无API的OneDrive/SharePoint)
+  - [x] [闪电盘](https://shandianpan.com/)
-    - [x] Teambition（[中国](https://www.teambition.com/ )，[国际](https://us.teambition.com/ )）
+  - [x] [S3](https://aws.amazon.com/cn/s3/)
-    - [x] [分秒帧](https://www.mediatrack.cn/)
+  - [x] WebDav(支持无API的OneDrive/SharePoint)
-    - [x] [和彩云](https://yun.139.com/) (个人云, 家庭云)
+  - [x] Teambition（[中国](https://www.teambition.com/ )，[国际](https://us.teambition.com/ )）
-    - [x] [Yandex.Disk](https://disk.yandex.com/)
+  - [x] [分秒帧](https://www.mediatrack.cn/)
-    - [x] [百度网盘](http://pan.baidu.com/)
+  - [x] [和彩云](https://yun.139.com/) (个人云, 家庭云)
-    - [x] [夸克网盘](https://pan.quark.cn)
+  - [x] [Yandex.Disk](https://disk.yandex.com/)
-    - [x] [迅雷网盘](https://pan.xunlei.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] 画廊模式下的图像预览
-- [x] 视频和音频预览，支持歌词和字幕
+- [x] 视频和音频预览（mp4、mp3 等）
 - [x] Office 文档预览（docx、pptx、xlsx、...）
 - [x] `README.md` 预览渲染
 - [x] 文件永久链接复制和直接文件下载
 - [x] 黑暗模式
 - [x] 国际化
 - [x] 受保护的路由（密码保护和身份验证）
-- [x] WebDav (具体见 https://alist.nn.ci/zh/guide/webdav.html)
+- [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] 离线下载
-- [x] 跨存储复制文件
 
-## Document
+## 讨论
-
-<https://alist.nn.ci/zh/>
-
-## Demo
-
-<https://pan.nn.ci>
-
-## Discussion
 
 一般问题请到[讨论论坛](https://github.com/Xhofe/alist/discussions) ，**issue仅针对错误报告和功能请求。**
 
-## Special sponsors
+## 演示
+
+<https://alist.nn.ci>。
+
+![演示](https://store.heytapimage.com/cdo-portal/feedback/202202/20/b271627971e29f0c7c9d59935b6ef381.png)
+
+## 文档
+
+<https://alist-doc.nn.ci/>
+
+## 特别赞助
 - [找资源 - 阿里云盘资源搜索引擎](https://zhaoziyuan.la/)
-- [KinhDown 百度云盘不限速下载！永久免费！已稳定运行3年！非常可靠!](https://kinhdown.com/?Type=Tutorials)
+- [KinhDown 百度云盘不限速下载！永久免费！以稳定运行3年！非常可靠!](https://kinhdown.com/?Type=Tutorials)
 - [JetBrains: Essential tools for software developers and teams](https://www.jetbrains.com/)
 
 ##  许可

alist.go

@@ -0,0 +1,59 @@
+package main
+
+import (
+	"fmt"
+	"github.com/Xhofe/alist/bootstrap"
+	"github.com/Xhofe/alist/conf"
+	_ "github.com/Xhofe/alist/drivers"
+	"github.com/Xhofe/alist/model"
+	"github.com/Xhofe/alist/server"
+	"github.com/gin-gonic/gin"
+	log "github.com/sirupsen/logrus"
+)
+
+func Init() bool {
+	bootstrap.InitConf()
+	bootstrap.InitCron()
+	bootstrap.InitModel()
+	if conf.Password {
+		pass, err := model.GetSettingByKey("password")
+		if err != nil {
+			log.Errorf(err.Error())
+			return false
+		}
+		fmt.Printf("your password: %s\n", pass.Value)
+		return false
+	}
+	server.InitIndex()
+	bootstrap.InitSettings()
+	bootstrap.InitAccounts()
+	bootstrap.InitCache()
+	return true
+}
+
+func main() {
+	if conf.Version {
+		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() {
+		return
+	}
+	if !conf.Debug {
+		gin.SetMode(gin.ReleaseMode)
+	}
+	r := gin.Default()
+	server.InitApiRouter(r)
+	base := fmt.Sprintf("%s:%d", conf.Conf.Address, conf.Conf.Port)
+	log.Infof("start server @ %s", base)
+	var err error
+	if conf.Conf.Scheme.Https {
+		err = r.RunTLS(base, conf.Conf.Scheme.CertFile, conf.Conf.Scheme.KeyFile)
+	} else {
+		err = r.Run(base)
+	}
+	if err != nil {
+		log.Errorf("failed to start: %s", err.Error())
+	}
+}

bootstrap/account.go

@@ -0,0 +1,33 @@
+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"
+)
+
+func InitAccounts() {
+	log.Infof("init accounts...")
+	var accounts []model.Account
+	if err := conf.DB.Find(&accounts).Error; err != nil {
+		log.Fatalf("failed sync init accounts")
+	}
+	for i, account := range accounts {
+		model.RegisterAccount(account)
+		driver, ok := base.GetDriver(account.Type)
+		if !ok {
+			log.Errorf("no [%s] driver", account.Type)
+		} else {
+			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 {
+				log.Infof("success init account: %s, type: %s", account.Name, account.Type)
+			}
+		}
+	}
+}

bootstrap/cache.go

@@ -0,0 +1,22 @@
+package bootstrap
+
+import (
+	"github.com/Xhofe/alist/conf"
+	"github.com/eko/gocache/v2/cache"
+	"github.com/eko/gocache/v2/store"
+	goCache "github.com/patrickmn/go-cache"
+	log "github.com/sirupsen/logrus"
+	"time"
+)
+
+// InitCache init cache
+func InitCache() {
+	log.Infof("init cache...")
+	c := conf.Conf.Cache
+	if c.Expiration == 0 {
+		c.Expiration, c.CleanupInterval = 60, 120
+	}
+	goCacheClient := goCache.New(time.Duration(c.Expiration)*time.Minute, time.Duration(c.CleanupInterval)*time.Minute)
+	goCacheStore := store.NewGoCache(goCacheClient, nil)
+	conf.Cache = cache.New(goCacheStore)
+}

bootstrap/conf.go

@@ -0,0 +1,71 @@
+package bootstrap
+
+import (
+	"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
+func InitConf() {
+	log.Infof("reading config file: %s", conf.ConfigFile)
+	if !utils.Exists(conf.ConfigFile) {
+		log.Infof("config file not exists, creating default config file")
+		_, err := utils.CreatNestedFile(conf.ConfigFile)
+		if err != nil {
+			log.Fatalf("failed to create config file")
+		}
+		conf.Conf = conf.DefaultConfig()
+		if !utils.WriteToJson(conf.ConfigFile, conf.Conf) {
+			log.Fatalf("failed to create default config file")
+		}
+	} 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())
+		}
+	}
+	if !conf.Conf.Force {
+		confFromEnv()
+	}
+	err := os.RemoveAll(filepath.Join(conf.Conf.TempDir))
+	if err != nil {
+		log.Errorln("failed delete temp file:", err)
+	}
+	err = os.MkdirAll(conf.Conf.TempDir, 0700)
+	if err != nil {
+		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())
+	}
+}

bootstrap/cron.go

@@ -0,0 +1,14 @@
+package bootstrap
+
+import (
+	"github.com/Xhofe/alist/conf"
+	"github.com/robfig/cron/v3"
+	log "github.com/sirupsen/logrus"
+)
+
+// InitCron init cron
+func InitCron() {
+	log.Infof("init cron...")
+	conf.Cron = cron.New()
+	conf.Cron.Start()
+}

bootstrap/log.go

@@ -0,0 +1,36 @@
+package bootstrap
+
+import (
+	"flag"
+	"github.com/Xhofe/alist/conf"
+	log "github.com/sirupsen/logrus"
+)
+
+// InitLog init log
+func InitLog() {
+	if conf.Debug {
+		log.SetLevel(log.DebugLevel)
+		log.SetReportCaller(true)
+	}
+	if conf.Password || conf.Version {
+		log.SetLevel(log.WarnLevel)
+	}
+	log.SetFormatter(&log.TextFormatter{
+		//DisableColors: true,
+		ForceColors:               true,
+		EnvironmentOverrideColors: true,
+		TimestampFormat:           "2006-01-02 15:04:05",
+		FullTimestamp:             true,
+	})
+	log.Infof("init log...")
+}
+
+func init() {
+	flag.StringVar(&conf.ConfigFile, "conf", "data/config.json", "config file")
+	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

@@ -0,0 +1,84 @@
+package bootstrap
+
+import (
+	"fmt"
+	"github.com/Xhofe/alist/conf"
+	"github.com/Xhofe/alist/model"
+	log "github.com/sirupsen/logrus"
+	"gorm.io/driver/mysql"
+	"gorm.io/driver/postgres"
+	"gorm.io/driver/sqlite"
+	"gorm.io/gorm"
+	"gorm.io/gorm/logger"
+	"gorm.io/gorm/schema"
+	log2 "log"
+	"os"
+	"strings"
+	"time"
+)
+
+func InitModel() {
+	log.Infof("init model...")
+	var err error
+	databaseConfig := conf.Conf.Database
+	newLogger := logger.New(
+		log2.New(os.Stdout, "\r\n", log2.LstdFlags),
+		logger.Config{
+			SlowThreshold:             time.Second,
+			LogLevel:                  logger.Silent,
+			IgnoreRecordNotFoundError: true,
+			Colorful:                  true,
+		},
+	)
+	gormConfig := &gorm.Config{
+		NamingStrategy: schema.NamingStrategy{
+			TablePrefix: databaseConfig.TablePrefix,
+		},
+		Logger: newLogger,
+	}
+	switch databaseConfig.Type {
+	case "sqlite3":
+		{
+			if !(strings.HasSuffix(databaseConfig.DBFile, ".db") && len(databaseConfig.DBFile) > 3) {
+				log.Fatalf("db name error.")
+			}
+			db, err := gorm.Open(sqlite.Open(databaseConfig.DBFile), gormConfig)
+			if err != nil {
+				log.Fatalf("failed to connect database:%s", err.Error())
+			}
+			conf.DB = db
+		}
+	case "mysql":
+		{
+			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())
+			}
+			conf.DB = db
+		}
+	case "postgres":
+		{
+			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...")
+	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: %s", err.Error())
+	}
+}

bootstrap/setting.go

@@ -0,0 +1,323 @@
+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"
+)
+
+func InitSettings() {
+	log.Infof("init settings...")
+
+	err := model.SaveSetting(model.Version)
+	if err != nil {
+		log.Fatalf("failed write setting: %s", err.Error())
+	}
+
+	settings := []model.SettingItem{
+		{
+			Key:         "title",
+			Value:       "Alist",
+			Description: "title",
+			Type:        "string",
+			Access:      model.PUBLIC,
+			Group:       model.FRONT,
+		},
+		{
+			Key:         "password",
+			Value:       utils.RandomStr(8),
+			Description: "password",
+			Type:        "string",
+			Access:      model.PRIVATE,
+			Group:       model.BACK,
+		},
+		{
+			Key:         "logo",
+			Value:       "https://cdn.jsdelivr.net/gh/alist-org/logo@main/can_circle.svg",
+			Description: "logo",
+			Type:        "string",
+			Access:      model.PUBLIC,
+			Group:       model.FRONT,
+		},
+		{
+			Key:         "favicon",
+			Value:       "https://cdn.jsdelivr.net/gh/alist-org/logo@main/logo.svg",
+			Description: "favicon",
+			Type:        "string",
+			Access:      model.PUBLIC,
+			Group:       model.FRONT,
+		},
+		{
+			Key:         "icon color",
+			Value:       "#1890ff",
+			Description: "icon's color",
+			Type:        "string",
+			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, ","),
+			Type:        "string",
+			Description: "text type extensions",
+			Group:       model.FRONT,
+		},
+		{
+			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://cdn.jsdelivr.net/gh/alist-org/logo@main/circle_center.svg",
+			Description: "music cover image",
+			Type:        "string",
+			Access:      model.PUBLIC,
+			Group:       model.FRONT,
+		},
+		{
+			Key:         "site beian",
+			Description: "chinese beian info",
+			Type:        "string",
+			Access:      model.PUBLIC,
+			Group:       model.FRONT,
+		},
+		{
+			Key:         "global readme url",
+			Description: "Default display when directory has no readme",
+			Type:        "string",
+			Access:      model.PUBLIC,
+			Group:       model.FRONT,
+		},
+		{
+			Key:    "pdf viewer url",
+			Type:   "string",
+			Value:  "https://alist-org.github.io/pdf.js/web/viewer.html?file=$url",
+			Access: model.PUBLIC,
+			Group:  model.FRONT,
+		},
+		{
+			Key:    "autoplay video",
+			Value:  "false",
+			Type:   "bool",
+			Access: model.PUBLIC,
+			Group:  model.FRONT,
+		},
+		{
+			Key:    "autoplay audio",
+			Value:  "false",
+			Type:   "bool",
+			Access: model.PUBLIC,
+			Group:  model.FRONT,
+		},
+		{
+			Key:         "check parent folder",
+			Value:       "false",
+			Type:        "bool",
+			Description: "check parent folder password",
+			Access:      model.PRIVATE,
+			Group:       model.BACK,
+		},
+		{
+			Key:         "customize head",
+			Value:       "",
+			Type:        "text",
+			Description: "Customize head, placed at the beginning of the head",
+			Access:      model.PRIVATE,
+			Group:       model.FRONT,
+		},
+		{
+			Key:         "customize body",
+			Value:       "",
+			Type:        "text",
+			Description: "Customize script, placed at the end of the body",
+			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",
+			Type:        "bool",
+			Description: "when there are a lot of files, the animation will freeze when opening",
+			Access:      model.PUBLIC,
+			Group:       model.FRONT,
+		},
+		{
+			Key:         "check down link",
+			Value:       "false",
+			Type:        "bool",
+			Description: "check down link password, your link will be 'https://alist.com/d/filename?pw=xxx'",
+			Access:      model.PUBLIC,
+			Group:       model.BACK,
+		},
+		{
+			Key:         "WebDAV username",
+			Value:       "admin",
+			Description: "WebDAV username",
+			Type:        "string",
+			Access:      model.PRIVATE,
+			Group:       model.BACK,
+		},
+		{
+			Key:         "WebDAV password",
+			Value:       utils.RandomStr(8),
+			Description: "WebDAV password",
+			Type:        "string",
+			Access:      model.PRIVATE,
+			Group:       model.BACK,
+		},
+		{
+			Key:         "artplayer whitelist",
+			Value:       "*",
+			Description: "refer to https://artplayer.org/document/options#whitelist",
+			Type:        "string",
+			Access:      model.PUBLIC,
+			Group:       model.FRONT,
+		},
+		{
+			Key:         "artplayer autoSize",
+			Value:       "true",
+			Description: "refer to https://artplayer.org/document/options#autosize",
+			Type:        "bool",
+			Access:      model.PUBLIC,
+			Group:       model.FRONT,
+		},
+		{
+			Key:         "Visitor WebDAV username",
+			Value:       "guest",
+			Description: "Visitor WebDAV username",
+			Type:        "string",
+			Access:      model.PRIVATE,
+			Group:       model.BACK,
+		},
+		{
+			Key:         "Visitor WebDAV password",
+			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.nn.ci/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]
+		v.Version = conf.GitTag
+		o, err := model.GetSettingByKey(v.Key)
+		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.Fatalf("can't get setting: %s", err.Error())
+			}
+		} else {
+			//o.Version = conf.GitTag
+			//err = model.SaveSetting(*o)
+			v.Value = o.Value
+			err = model.SaveSetting(v)
+			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,130 +1,157 @@
-appName="alist"
+#!/bin/bash
-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)
 
-if [ "$1" = "dev" ]; then
+# 构建前端,在当前目录产生一个dist文件夹
-  version="dev"
+BUILD_WEB() {
-  webVersion="dev"
+  git clone https://github.com/alist-org/web-v2.git
-else
+  cd web-v2
-  version=$(git describe --abbrev=0 --tags)
+  yarn
-  webVersion=$(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')
+  yarn build
-fi
+  sed -i -e "s/\/CDN_URL\//\//g" dist/index.html
-
+  sed -i -e "s/assets/\/assets/g" dist/index.html
-echo "build version: $gitTag"
+  rm -f dist/index.html-e
-
+  mv dist ..
-ldflags="\
+  cd .. || exit
--w -s \
+  rm -rf web-v2
--X 'github.com/alist-org/alist/v3/internal/conf.BuiltAt=$builtAt' \
--X 'github.com/alist-org/alist/v3/internal/conf.GoVersion=$goVersion' \
--X 'github.com/alist-org/alist/v3/internal/conf.GitAuthor=$gitAuthor' \
--X 'github.com/alist-org/alist/v3/internal/conf.GitCommit=$gitCommit' \
--X 'github.com/alist-org/alist/v3/internal/conf.Version=$version' \
--X 'github.com/alist-org/alist/v3/internal/conf.WebVersion=$webVersion' \
-"
-
-FetchWebDev() {
-  curl -L https://codeload.github.com/alist-org/web-dist/tar.gz/refs/heads/dev -o web-dist-dev.tar.gz
-  tar -zxvf web-dist-dev.tar.gz
-  rm -rf public/dist
-  mv -f web-dist-dev/dist public
-  rm -rf web-dist-dev web-dist-dev.tar.gz
 }
 
-FetchWebRelease() {
+CDN_WEB() {
-  curl -L https://github.com/alist-org/alist-web/releases/latest/download/dist.tar.gz -o dist.tar.gz
+  curl -L https://github.com/alist-org/web-v2/releases/latest/download/dist.tar.gz -o dist.tar.gz
   tar -zxvf dist.tar.gz
-  rm -rf public/dist
+  rm -f dist.tar.gz
-  mv -f dist public
-  rm -rf dist.tar.gz
 }
 
-BuildDev() {
+# 在DOCKER中构建
-  rm -rf .git/
+BUILD_DOCKER() {
-  xgo -targets=linux/amd64,windows/amd64,darwin/amd64 -out "$appName" -ldflags="$ldflags" -tags=jsoniter .
+  appName="alist"
-  mkdir -p "dist"
+  builtAt="$(date +'%F %T %z')"
-  mv alist-* dist
+  goVersion=$(go version | sed 's/go version //')
-  cd dist
+  gitAuthor=$(git show -s --format='format:%aN <%ae>' HEAD)
-  upx -9 ./alist-linux*
+  gitCommit=$(git log --pretty=format:"%h" -1)
-  upx -9 ./alist-windows*
+  gitTag=$(git describe --long --tags --dirty --always)
-  find . -type f -print0 | xargs -0 md5sum >md5.txt
+  webTag=$(wget -qO- -t1 -T2 "https://api.github.com/repos/alist-org/web-v2/releases/latest" | grep "tag_name" | head -n 1 | awk -F ":" '{print $2}' | sed 's/\"//g;s/,//g;s/ //g')
-  cat md5.txt
+  ldflags="\
-}
+-w -s \
-
+-X 'github.com/Xhofe/alist/conf.BuiltAt=$builtAt' \
-BuildDocker() {
+-X 'github.com/Xhofe/alist/conf.GoVersion=$goVersion' \
-  go build -o ./bin/alist -ldflags="$ldflags" -tags=jsoniter .
+-X 'github.com/Xhofe/alist/conf.GitAuthor=$gitAuthor' \
-}
+-X 'github.com/Xhofe/alist/conf.GitCommit=$gitCommit' \
-
+-X 'github.com/Xhofe/alist/conf.GitTag=$gitTag' \
-BuildRelease() {
+-X 'github.com/Xhofe/alist/conf.WebTag=$webTag' \
+  "
+  go build -o ./bin/alist -ldflags="$ldflags" -tags=jsoniter alist.go
+}
+
+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/web-v2/releases/latest" | grep "tag_name" | head -n 1 | awk -F ":" '{print $2}' | sed 's/\"//g;s/,//g;s/ //g')
+  echo "build version: $gitTag"
+
+  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"
-  muslflags="--extldflags '-static -fpic' $ldflags"
+  mv alist-* build
-  BASE="https://musl.nn.ci/"
+  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
+}
+
+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/web-v2/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]}
+      os_arch=${OS_ARCHES[$i]}
-    cgo_cc=${CGO_ARGS[$i]}
+      cgo_cc=${CGO_ARGS[$i]}
-    echo building for ${os_arch}
+      echo building for ${os_arch}
-    export GOOS=${os_arch%%-*}
+      export GOOS=${os_arch%%-*}
-    export GOARCH=${os_arch##*-}
+      export GOARCH=${os_arch##*-}
-    export CC=${cgo_cc}
+      export CC=${cgo_cc}
-    export CGO_ENABLED=1
+      export CGO_ENABLED=1
-    go build -o ./build/$appName-$os_arch -ldflags="$muslflags" -tags=jsoniter .
+      go build -o ./build/$appName-$os_arch -ldflags="$ldflags" -tags=jsoniter alist.go
   done
-  xgo -out "$appName" -ldflags="$ldflags" -tags=jsoniter .
+  cd .. || exit
-  # why? Because some target platforms seem to have issues with upx compression
+}
+
+RELEASE() {
+  cd alist/build
   upx -9 ./alist-linux-amd64
   upx -9 ./alist-windows*
-  mv alist-* build
-}
-
-MakeRelease() {
-  cd build
-  mkdir compress
-  for i in $(find . -type f -name "$appName-linux-*"); do
-    cp "$i" alist
-    tar -czvf compress/"$i".tar.gz alist
-    rm -f alist
-  done
-  for i in $(find . -type f -name "$appName-darwin-*"); do
-    cp "$i" alist
-    tar -czvf compress/"$i".tar.gz alist
-    rm -f alist
-  done
-  for i in $(find . -type f -name "$appName-windows-*"); do
-    cp "$i" alist.exe
-    zip compress/$(echo $i | sed 's/\.[^.]*$//').zip alist.exe
-    rm -f alist.exe
-  done
-  cd compress
   find . -type f -print0 | xargs -0 md5sum >md5.txt
   cat md5.txt
-  cd ../..
+  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" = "dev" ]; then
+if [ "$1" = "web" ]; then
-  FetchWebDev
+  BUILD_WEB
-  if [ "$2" = "docker" ]; then
+elif [ "$1" = "cdn" ]; then
-    BuildDocker
+  CDN_WEB
-  else
+elif [ "$1" = "docker" ]; then
-    BuildDev
+  BUILD_DOCKER
-  fi
+elif [ "$1" = "build" ]; then
+  BUILD build
 elif [ "$1" = "release" ]; then
-  FetchWebRelease
+  BUILD_MUSL
-  if [ "$2" = "docker" ]; then
+  BUILD release
-    BuildDocker
+  RELEASE
-  else
-    BuildRelease
-    MakeRelease
-  fi
 else
-  echo -e "Parameter error"
+  echo -e "${RED_COLOR} Parameter error ${RES}"
-fi
+fi

cmd/admin.go

@@ -1,40 +0,0 @@
-/*
-Copyright © 2022 NAME HERE <EMAIL ADDRESS>
-*/
-package cmd
-
-import (
-	"github.com/alist-org/alist/v3/internal/db"
-	"github.com/alist-org/alist/v3/pkg/utils"
-	"github.com/spf13/cobra"
-)
-
-// passwordCmd represents the password command
-var passwordCmd = &cobra.Command{
-	Use:     "admin",
-	Aliases: []string{"password"},
-	Short:   "Show admin user's info",
-	Run: func(cmd *cobra.Command, args []string) {
-		Init()
-		admin, err := db.GetAdmin()
-		if err != nil {
-			utils.Log.Errorf("failed get admin user: %+v", err)
-		} else {
-			utils.Log.Infof("admin user's info: \nusername: %s\npassword: %s", admin.Username, admin.Password)
-		}
-	},
-}
-
-func init() {
-	rootCmd.AddCommand(passwordCmd)
-
-	// Here you will define your flags and configuration settings.
-
-	// Cobra supports Persistent Flags which will work for this command
-	// and all subcommands, e.g.:
-	// passwordCmd.PersistentFlags().String("foo", "", "A help for foo")
-
-	// Cobra supports local flags which will only run when this command
-	// is called directly, e.g.:
-	// passwordCmd.Flags().BoolP("toggle", "t", false, "Help message for toggle")
-}

cmd/cancel2FA.go

@@ -1,42 +0,0 @@
-/*
-Copyright © 2022 NAME HERE <EMAIL ADDRESS>
-*/
-package cmd
-
-import (
-	"github.com/alist-org/alist/v3/internal/db"
-	"github.com/alist-org/alist/v3/pkg/utils"
-	"github.com/spf13/cobra"
-)
-
-// cancel2FACmd represents the delete2fa command
-var cancel2FACmd = &cobra.Command{
-	Use:   "cancel2fa",
-	Short: "Delete 2FA of admin user",
-	Run: func(cmd *cobra.Command, args []string) {
-		Init()
-		admin, err := db.GetAdmin()
-		if err != nil {
-			utils.Log.Errorf("failed to get admin user: %+v", err)
-		} else {
-			err := db.Cancel2FAByUser(admin)
-			if err != nil {
-				utils.Log.Errorf("failed to cancel 2FA: %+v", err)
-			}
-		}
-	},
-}
-
-func init() {
-	rootCmd.AddCommand(cancel2FACmd)
-
-	// Here you will define your flags and configuration settings.
-
-	// Cobra supports Persistent Flags which will work for this command
-	// and all subcommands, e.g.:
-	// cancel2FACmd.PersistentFlags().String("foo", "", "A help for foo")
-
-	// Cobra supports local flags which will only run when this command
-	// is called directly, e.g.:
-	// cancel2FACmd.Flags().BoolP("toggle", "t", false, "Help message for toggle")
-}

cmd/common.go

@@ -1,13 +0,0 @@
-package cmd
-
-import (
-	"github.com/alist-org/alist/v3/internal/bootstrap"
-	"github.com/alist-org/alist/v3/internal/bootstrap/data"
-)
-
-func Init() {
-	bootstrap.InitConfig()
-	bootstrap.Log()
-	bootstrap.InitDB()
-	data.InitData()
-}

cmd/flags/config.go

@@ -1,8 +0,0 @@
-package flags
-
-var (
-	Config   string // config file
-	Debug    bool
-	NoPrefix bool
-	Dev      bool
-)

cmd/lang.go

@@ -1,152 +0,0 @@
-/*
-Package cmd
-Copyright © 2022 Noah Hsu<i@nn.ci>
-*/
-package cmd
-
-import (
-	"fmt"
-	"io"
-	"os"
-	"reflect"
-	"strings"
-
-	_ "github.com/alist-org/alist/v3/drivers"
-	"github.com/alist-org/alist/v3/internal/bootstrap/data"
-	"github.com/alist-org/alist/v3/internal/conf"
-	"github.com/alist-org/alist/v3/internal/op"
-	"github.com/alist-org/alist/v3/pkg/utils"
-	log "github.com/sirupsen/logrus"
-	"github.com/spf13/cobra"
-)
-
-type KV[V any] map[string]V
-
-type Drivers KV[KV[interface{}]]
-
-func firstUpper(s string) string {
-	if s == "" {
-		return ""
-	}
-	return strings.ToUpper(s[:1]) + s[1:]
-}
-
-func convert(s string) string {
-	ss := strings.Split(s, "_")
-	ans := strings.Join(ss, " ")
-	return firstUpper(ans)
-}
-
-func writeFile(name string, data interface{}) {
-	f, err := os.Open(fmt.Sprintf("../alist-web/src/lang/en/%s.json", name))
-	if err != nil {
-		log.Errorf("failed to open %s.json: %+v", name, err)
-		return
-	}
-	defer f.Close()
-	content, err := io.ReadAll(f)
-	if err != nil {
-		log.Errorf("failed to read %s.json: %+v", name, err)
-		return
-	}
-	oldData := make(map[string]interface{})
-	newData := make(map[string]interface{})
-	err = utils.Json.Unmarshal(content, &oldData)
-	if err != nil {
-		log.Errorf("failed to unmarshal %s.json: %+v", name, err)
-		return
-	}
-	content, err = utils.Json.Marshal(data)
-	if err != nil {
-		log.Errorf("failed to marshal json: %+v", err)
-		return
-	}
-	err = utils.Json.Unmarshal(content, &newData)
-	if err != nil {
-		log.Errorf("failed to unmarshal json: %+v", err)
-		return
-	}
-	if reflect.DeepEqual(oldData, newData) {
-		log.Infof("%s.json no changed, skip", name)
-	} else {
-		log.Infof("%s.json changed, update file", name)
-		//log.Infof("old: %+v\nnew:%+v", oldData, data)
-		utils.WriteJsonToFile(fmt.Sprintf("lang/%s.json", name), data)
-	}
-}
-
-func generateDriversJson() {
-	drivers := make(Drivers)
-	drivers["drivers"] = make(KV[interface{}])
-	driverInfoMap := op.GetDriverInfoMap()
-	for k, v := range driverInfoMap {
-		drivers["drivers"][k] = convert(k)
-		items := make(KV[interface{}])
-		for i := range v.Additional {
-			item := v.Additional[i]
-			items[item.Name] = convert(item.Name)
-			if item.Help != "" {
-				items[fmt.Sprintf("%s-tips", item.Name)] = item.Help
-			}
-			if item.Type == conf.TypeSelect && len(item.Options) > 0 {
-				options := make(KV[string])
-				_options := strings.Split(item.Options, ",")
-				for _, o := range _options {
-					options[o] = convert(o)
-				}
-				items[fmt.Sprintf("%ss", item.Name)] = options
-			}
-		}
-		drivers[k] = items
-	}
-	writeFile("drivers", drivers)
-}
-
-func generateSettingsJson() {
-	settings := data.InitialSettings()
-	settingsLang := make(KV[any])
-	for _, setting := range settings {
-		settingsLang[setting.Key] = convert(setting.Key)
-		if setting.Help != "" {
-			settingsLang[fmt.Sprintf("%s-tips", setting.Key)] = setting.Help
-		}
-		if setting.Type == conf.TypeSelect && len(setting.Options) > 0 {
-			options := make(KV[string])
-			_options := strings.Split(setting.Options, ",")
-			for _, o := range _options {
-				options[o] = convert(o)
-			}
-			settingsLang[fmt.Sprintf("%ss", setting.Key)] = options
-		}
-	}
-	writeFile("settings", settingsLang)
-	//utils.WriteJsonToFile("lang/settings.json", settingsLang)
-}
-
-// langCmd represents the lang command
-var langCmd = &cobra.Command{
-	Use:   "lang",
-	Short: "Generate language json file",
-	Run: func(cmd *cobra.Command, args []string) {
-		err := os.MkdirAll("lang", 0777)
-		if err != nil {
-			utils.Log.Fatal("failed create folder: %s", err.Error())
-		}
-		generateDriversJson()
-		generateSettingsJson()
-	},
-}
-
-func init() {
-	rootCmd.AddCommand(langCmd)
-
-	// Here you will define your flags and configuration settings.
-
-	// Cobra supports Persistent Flags which will work for this command
-	// and all subcommands, e.g.:
-	// langCmd.PersistentFlags().String("foo", "", "A help for foo")
-
-	// Cobra supports local flags which will only run when this command
-	// is called directly, e.g.:
-	// langCmd.Flags().BoolP("toggle", "t", false, "Help message for toggle")
-}

cmd/root.go

@@ -1,31 +0,0 @@
-package cmd
-
-import (
-	"fmt"
-	"os"
-
-	"github.com/alist-org/alist/v3/cmd/flags"
-	"github.com/spf13/cobra"
-)
-
-var rootCmd = &cobra.Command{
-	Use:   "alist",
-	Short: "A file list program that supports multiple storage.",
-	Long: `A file list program that supports multiple storage,
-built with love by Xhofe and friends in Go/Solid.js.
-Complete documentation is available at https://alist.nn.ci/`,
-}
-
-func Execute() {
-	if err := rootCmd.Execute(); err != nil {
-		fmt.Fprintln(os.Stderr, err)
-		os.Exit(1)
-	}
-}
-
-func init() {
-	rootCmd.PersistentFlags().StringVar(&flags.Config, "conf", "data/config.json", "config file")
-	rootCmd.PersistentFlags().BoolVar(&flags.Debug, "debug", false, "start with debug mode")
-	rootCmd.PersistentFlags().BoolVar(&flags.NoPrefix, "no-prefix", false, "disable env prefix")
-	rootCmd.PersistentFlags().BoolVar(&flags.Dev, "dev", false, "start with dev mode")
-}

cmd/server.go

@@ -1,90 +0,0 @@
-package cmd
-
-import (
-	"context"
-	"fmt"
-	"net/http"
-	"os"
-	"os/signal"
-	"syscall"
-	"time"
-
-	"github.com/alist-org/alist/v3/cmd/flags"
-	_ "github.com/alist-org/alist/v3/drivers"
-	"github.com/alist-org/alist/v3/internal/bootstrap"
-	"github.com/alist-org/alist/v3/internal/conf"
-	"github.com/alist-org/alist/v3/pkg/utils"
-	"github.com/alist-org/alist/v3/server"
-	"github.com/gin-gonic/gin"
-	log "github.com/sirupsen/logrus"
-	"github.com/spf13/cobra"
-)
-
-// serverCmd represents the server command
-var serverCmd = &cobra.Command{
-	Use:   "server",
-	Short: "Start the server at the specified address",
-	Long: `Start the server at the specified address
-the address is defined in config file`,
-	Run: func(cmd *cobra.Command, args []string) {
-		Init()
-		bootstrap.InitAria2()
-		bootstrap.LoadStorages()
-		if !flags.Debug && !flags.Dev {
-			gin.SetMode(gin.ReleaseMode)
-		}
-		r := gin.New()
-		r.Use(gin.LoggerWithWriter(log.StandardLogger().Out), gin.RecoveryWithWriter(log.StandardLogger().Out))
-		server.Init(r)
-		base := fmt.Sprintf("%s:%d", conf.Conf.Address, conf.Conf.Port)
-		utils.Log.Infof("start server @ %s", base)
-		srv := &http.Server{Addr: base, Handler: r}
-		go func() {
-			var err error
-			if conf.Conf.Scheme.Https {
-				//err = r.RunTLS(base, conf.Conf.Scheme.CertFile, conf.Conf.Scheme.KeyFile)
-				err = srv.ListenAndServeTLS(conf.Conf.Scheme.CertFile, conf.Conf.Scheme.KeyFile)
-			} else {
-				err = srv.ListenAndServe()
-			}
-			if err != nil && err != http.ErrServerClosed {
-				utils.Log.Fatalf("failed to start: %s", err.Error())
-			}
-		}()
-		// Wait for interrupt signal to gracefully shutdown the server with
-		// a timeout of 5 seconds.
-		quit := make(chan os.Signal)
-		// kill (no param) default send syscanll.SIGTERM
-		// kill -2 is syscall.SIGINT
-		// kill -9 is syscall. SIGKILL but can"t be catch, so don't need add it
-		signal.Notify(quit, syscall.SIGINT, syscall.SIGTERM)
-		<-quit
-		utils.Log.Println("Shutdown Server ...")
-
-		ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second)
-		defer cancel()
-		if err := srv.Shutdown(ctx); err != nil {
-			utils.Log.Fatal("Server Shutdown:", err)
-		}
-		// catching ctx.Done(). timeout of 3 seconds.
-		select {
-		case <-ctx.Done():
-			utils.Log.Println("timeout of 3 seconds.")
-		}
-		utils.Log.Println("Server exiting")
-	},
-}
-
-func init() {
-	rootCmd.AddCommand(serverCmd)
-
-	// Here you will define your flags and configuration settings.
-
-	// Cobra supports Persistent Flags which will work for this command
-	// and all subcommands, e.g.:
-	// serverCmd.PersistentFlags().String("foo", "", "A help for foo")
-
-	// Cobra supports local flags which will only run when this command
-	// is called directly, e.g.:
-	// serverCmd.Flags().BoolP("toggle", "t", false, "Help message for toggle")
-}

cmd/version.go

@@ -1,44 +0,0 @@
-/*
-Copyright © 2022 NAME HERE <EMAIL ADDRESS>
-
-*/
-package cmd
-
-import (
-	"fmt"
-	"os"
-
-	"github.com/alist-org/alist/v3/internal/conf"
-	"github.com/spf13/cobra"
-)
-
-// versionCmd represents the version command
-var versionCmd = &cobra.Command{
-	Use:   "version",
-	Short: "Show current version of AList",
-	Run: func(cmd *cobra.Command, args []string) {
-		fmt.Printf(`Built At: %s
-Go Version: %s
-Author: %s
-Commit ID: %s
-Version: %s
-WebVersion: %s
-`,
-			conf.BuiltAt, conf.GoVersion, conf.GitAuthor, conf.GitCommit, conf.Version, conf.WebVersion)
-		os.Exit(0)
-	},
-}
-
-func init() {
-	rootCmd.AddCommand(versionCmd)
-
-	// Here you will define your flags and configuration settings.
-
-	// Cobra supports Persistent Flags which will work for this command
-	// and all subcommands, e.g.:
-	// versionCmd.PersistentFlags().String("foo", "", "A help for foo")
-
-	// Cobra supports local flags which will only run when this command
-	// is called directly, e.g.:
-	// versionCmd.Flags().BoolP("toggle", "t", false, "Help message for toggle")
-}

conf/config.go

@@ -0,0 +1,58 @@
+package conf
+
+type Database struct {
+	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" 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" env:"CACHE_EXPIRATION"`
+	CleanupInterval int64 `json:"cleanup_interval" env:"CLEANUP_INTERVAL"`
+}
+
+type Config struct {
+	Force       bool        `json:"force"`
+	Address     string      `json:"address" env:"ADDR"`
+	Port        int         `json:"port" env:"PORT"`
+	Assets      string      `json:"assets" env:"ASSETS"`
+	LocalAssets string      `json:"local_assets" env:"LOCAL_ASSETS"`
+	SubFolder   string      `json:"sub_folder" env:"SUB_FOLDER"`
+	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:      "/",
+		SubFolder:   "",
+		LocalAssets: "",
+		TempDir:     "data/temp",
+		Database: Database{
+			Type:        "sqlite3",
+			Port:        0,
+			TablePrefix: "x_",
+			DBFile:      "data/data.db",
+		},
+		Cache: CacheConfig{
+			Expiration:      60,
+			CleanupInterval: 120,
+		},
+	}
+}

conf/const.go

@@ -0,0 +1,11 @@
+package conf
+
+const (
+	UNKNOWN = iota
+	FOLDER
+	OFFICE
+	VIDEO
+	AUDIO
+	TEXT
+	IMAGE
+)

conf/var.go

@@ -0,0 +1,104 @@
+package conf
+
+import (
+	"context"
+	"github.com/eko/gocache/v2/cache"
+	"github.com/fatih/color"
+	"github.com/robfig/cron/v3"
+	"gorm.io/gorm"
+	"strconv"
+)
+
+var (
+	BuiltAt   string
+	GoVersion string
+	GitAuthor string
+	GitCommit string
+	GitTag    string = "dev"
+	WebTag    string
+)
+
+var (
+	ConfigFile string // config file
+	Conf       *Config
+	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", "flv", "m4v"}
+	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",
+	}
+)
+
+var (
+	RawIndexHtml string
+	ManageHtml   string
+	IndexHtml    string
+	Token        string
+
+	//CheckParent        bool
+	//CheckDown          bool
+	//DavUsername        string
+	//DavPassword        string
+	//VisitorDavUsername string
+	//VisitorDavPassword string
+)

drivers/123/123.go

@@ -0,0 +1,178 @@
+package _23
+
+import (
+	"errors"
+	"fmt"
+	"path/filepath"
+	"strconv"
+
+	"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"
+)
+
+func (driver Pan123) Login(account *model.Account) error {
+	url := "https://www.123pan.com/api/user/sign_in"
+	if account.APIProxyUrl != "" {
+		url = fmt.Sprintf("%s/%s", account.APIProxyUrl, url)
+	}
+	var resp Pan123TokenResp
+	_, err := base.RestyClient.R().
+		SetResult(&resp).
+		SetBody(base.Json{
+			"passport": account.Username,
+			"password": account.Password,
+		}).Post(url)
+	if err != nil {
+		return err
+	}
+	if resp.Code != 200 {
+		err = fmt.Errorf(resp.Message)
+		account.Status = resp.Message
+	} else {
+		account.Status = "work"
+		account.AccessToken = resp.Data.Token
+	}
+	_ = model.SaveAccount(account)
+	return err
+}
+
+func (driver Pan123) FormatFile(file *File) *model.File {
+	f := &model.File{
+		Id:        strconv.FormatInt(file.FileId, 10),
+		Name:      file.FileName,
+		Size:      file.Size,
+		Driver:    driver.Config().Name,
+		UpdatedAt: file.UpdateAt,
+		Thumbnail: file.DownloadUrl,
+	}
+	f.Type = file.GetType()
+	return f
+}
+
+func (driver Pan123) GetFiles(parentId string, account *model.Account) ([]File, error) {
+	next := "0"
+	res := make([]File, 0)
+	for next != "-1" {
+		var resp Pan123Files
+		query := map[string]string{
+			"driveId":        "0",
+			"limit":          "100",
+			"next":           next,
+			"orderBy":        account.OrderBy,
+			"orderDirection": account.OrderDirection,
+			"parentFileId":   parentId,
+			"trashed":        "false",
+		}
+		_, err := driver.Request("https://www.123pan.com/api/file/list/new",
+			base.Get, nil, query, nil, &resp, false, account)
+		if err != nil {
+			return nil, err
+		}
+		next = resp.Data.Next
+		res = append(res, resp.Data.InfoList...)
+	}
+	return res, nil
+}
+
+func (driver Pan123) Request(url string, method int, headers, query map[string]string, data *base.Json, resp interface{}, proxy bool, account *model.Account) ([]byte, error) {
+	rawUrl := url
+	if account.APIProxyUrl != "" && proxy {
+		url = fmt.Sprintf("%s/%s", account.APIProxyUrl, url)
+	}
+	req := base.RestyClient.R()
+	req.SetHeader("Authorization", "Bearer "+account.AccessToken)
+	if headers != nil {
+		req.SetHeaders(headers)
+	}
+	if query != nil {
+		req.SetQueryParams(query)
+	}
+	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(url)
+	case base.Post:
+		res, err = req.Post(url)
+	default:
+		return nil, base.ErrNotSupport
+	}
+	if err != nil {
+		return nil, err
+	}
+	log.Debug(res.String())
+	body := res.Body()
+	code := jsoniter.Get(body, "code").ToInt()
+	if code != 0 {
+		if code == 401 {
+			err := driver.Login(account)
+			if err != nil {
+				return nil, err
+			}
+			return driver.Request(rawUrl, method, headers, query, data, resp, proxy, account)
+		}
+		return nil, errors.New(jsoniter.Get(body, "message").ToString())
+	}
+	return body, nil
+}
+
+//func (driver Pan123) Post(url string, data base.Json, account *model.Account) ([]byte, error) {
+//	res, err := pan123Client.R().
+//		SetHeader("authorization", "Bearer "+account.AccessToken).
+//		SetBody(data).Post(url)
+//	if err != nil {
+//		return nil, err
+//	}
+//	body := res.Body()
+//	if jsoniter.Get(body, "code").ToInt() != 0 {
+//		return nil, errors.New(jsoniter.Get(body, "message").ToString())
+//	}
+//	return body, nil
+//}
+
+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)
+	if err != nil {
+		return nil, err
+	}
+	parentFiles_, _ := base.GetCache(dir, account)
+	parentFiles, _ := parentFiles_.([]File)
+	for _, file := range parentFiles {
+		if file.FileName == name {
+			//if file.Type != conf.FOLDER {
+			//	return &file, err
+			//} else {
+			//	return nil, base.ErrNotFile
+			//}
+			return &file, nil
+		}
+	}
+	return nil, base.ErrPathNotFound
+}
+
+//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,198 +1,335 @@
-package _123
+package _23
 
 import (
 	"bytes"
-	"context"
 	"crypto/md5"
 	"encoding/binary"
 	"encoding/hex"
 	"fmt"
 	"io"
-	"net/http"
+	"io/ioutil"
 	"net/url"
 	"os"
+	"path/filepath"
+	"strconv"
 
-	"github.com/alist-org/alist/v3/drivers/base"
+	"github.com/Xhofe/alist/conf"
-	"github.com/alist-org/alist/v3/internal/driver"
+	"github.com/Xhofe/alist/drivers/base"
-	"github.com/alist-org/alist/v3/internal/errs"
+	"github.com/Xhofe/alist/model"
-	"github.com/alist-org/alist/v3/internal/model"
+	"github.com/Xhofe/alist/utils"
-	"github.com/alist-org/alist/v3/pkg/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/go-resty/resty/v2"
 	log "github.com/sirupsen/logrus"
 )
 
-type Pan123 struct {
+type Pan123 struct{}
-	model.Storage
-	Addition
-	AccessToken string
-}
 
-func (d *Pan123) Config() driver.Config {
+func (driver Pan123) Config() base.DriverConfig {
-	return config
+	return base.DriverConfig{
-}
+		Name: "123Pan",
-
-func (d *Pan123) GetAddition() driver.Additional {
-	return d.Addition
-}
-
-func (d *Pan123) Init(ctx context.Context, storage model.Storage) error {
-	d.Storage = storage
-	err := utils.Json.UnmarshalFromString(d.Storage.Addition, &d.Addition)
-	if err != nil {
-		return err
 	}
-	return d.login()
 }
 
-func (d *Pan123) Drop(ctx context.Context) error {
+func (driver Pan123) Items() []base.Item {
-	return nil
+	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,
+			Required: false,
+		},
+		{
+			Name:     "order_by",
+			Label:    "order_by",
+			Type:     base.TypeSelect,
+			Values:   "name,fileId,updateAt,createAt",
+			Required: true,
+			Default:  "name",
+		},
+		{
+			Name:     "order_direction",
+			Label:    "order_direction",
+			Type:     base.TypeSelect,
+			Values:   "asc,desc",
+			Required: true,
+			Default:  "asc",
+		},
+		{
+			Name:        "bool_1",
+			Label:       "stream upload",
+			Type:        base.TypeBool,
+			Description: "io stream upload (test)",
+		},
+	}
 }
 
-func (d *Pan123) List(ctx context.Context, dir model.Obj, args model.ListArgs) ([]model.Obj, error) {
+func (driver Pan123) Save(account *model.Account, old *model.Account) error {
-	files, err := d.getFiles(dir.GetID())
+	if account == nil {
+		return nil
+	}
+	if account.RootFolder == "" {
+		account.RootFolder = "0"
+	}
+	err := driver.Login(account)
+	return err
+}
+
+func (driver Pan123) 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
 	}
-	return utils.SliceConvert(files, func(src File) (model.Obj, error) {
+	for _, file := range files {
-		return src, nil
+		if file.Name == name {
-	})
+			return &file, nil
+		}
+	}
+	return nil, base.ErrPathNotFound
 }
 
-//func (d *Pan123) Get(ctx context.Context, path string) (model.Obj, error) {
+func (driver Pan123) Files(path string, account *model.Account) ([]model.File, error) {
-//	// this is optional
+	path = utils.ParsePath(path)
-//	return nil, errs.NotImplement
+	var rawFiles []File
+	cache, err := base.GetCache(path, account)
+	if err == nil {
+		rawFiles, _ = cache.([]File)
+	} else {
+		file, err := driver.File(path, account)
+		if err != nil {
+			return nil, err
+		}
+		rawFiles, err = driver.GetFiles(file.Id, account)
+		if err != nil {
+			return nil, err
+		}
+		if len(rawFiles) > 0 {
+			_ = base.SetCache(path, rawFiles, account)
+		}
+	}
+	files := make([]model.File, 0, len(rawFiles))
+	for _, file := range rawFiles {
+		files = append(files, *driver.FormatFile(&file))
+	}
+	return files, nil
+}
+
+func (driver Pan123) Link(args base.Args, account *model.Account) (*base.Link, error) {
+	log.Debugf("%+v", args)
+	file, err := driver.GetFile(utils.ParsePath(args.Path), account)
+	if err != nil {
+		return nil, err
+	}
+	var resp Pan123DownResp
+	var headers map[string]string
+	if !utils.IsLocalIPAddr(args.IP) {
+		headers = map[string]string{
+			//"X-Real-IP":       "1.1.1.1",
+			"X-Forwarded-For": args.IP,
+		}
+	}
+	data := base.Json{
+		"driveId":   0,
+		"etag":      file.Etag,
+		"fileId":    file.FileId,
+		"fileName":  file.FileName,
+		"s3keyFlag": file.S3KeyFlag,
+		"size":      file.Size,
+		"type":      file.Type,
+	}
+	_, err = driver.Request("https://www.123pan.com/api/file/download_info",
+		base.Post, headers, nil, &data, &resp, false, account)
+	//_, err = pan123Client.R().SetResult(&resp).SetHeader("authorization", "Bearer "+account.AccessToken).
+	//	SetBody().Post("https://www.123pan.com/api/file/download_info")
+	if err != nil {
+		return nil, err
+	}
+	u, err := url.Parse(resp.Data.DownloadUrl)
+	if err != nil {
+		return nil, err
+	}
+	u_ := fmt.Sprintf("https://%s%s", u.Host, u.Path)
+	res, err := base.NoRedirectClient.R().SetQueryParamsFromValues(u.Query()).Head(u_)
+	if err != nil {
+		return nil, err
+	}
+	log.Debug(res.String())
+	link := base.Link{
+		Url: resp.Data.DownloadUrl,
+	}
+	log.Debugln("res code: ", res.StatusCode())
+	if res.StatusCode() == 302 {
+		link.Url = res.Header().Get("location")
+	}
+	return &link, nil
+}
+
+func (driver Pan123) Path(path string, account *model.Account) (*model.File, []model.File, error) {
+	path = utils.ParsePath(path)
+	log.Debugf("pan123 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 Pan123) Proxy(r *http.Request, account *model.Account) {
+//	r.Header.Del("origin")
 //}
 
-func (d *Pan123) Link(ctx context.Context, file model.Obj, args model.LinkArgs) (*model.Link, error) {
+func (driver Pan123) Preview(path string, account *model.Account) (interface{}, error) {
-	if f, ok := file.(File); ok {
+	return nil, base.ErrNotSupport
-		var resp DownResp
-		var headers map[string]string
-		if !utils.IsLocalIPAddr(args.IP) {
-			headers = map[string]string{
-				//"X-Real-IP":       "1.1.1.1",
-				"X-Forwarded-For": args.IP,
-			}
-		}
-		data := base.Json{
-			"driveId":   0,
-			"etag":      f.Etag,
-			"fileId":    f.FileId,
-			"fileName":  f.FileName,
-			"s3keyFlag": f.S3KeyFlag,
-			"size":      f.Size,
-			"type":      f.Type,
-		}
-		_, err := d.request("https://www.123pan.com/api/file/download_info", http.MethodPost, func(req *resty.Request) {
-			req.SetBody(data).SetHeaders(headers)
-		}, &resp)
-		if err != nil {
-			return nil, err
-		}
-		u, err := url.Parse(resp.Data.DownloadUrl)
-		if err != nil {
-			return nil, err
-		}
-		u_ := fmt.Sprintf("https://%s%s", u.Host, u.Path)
-		res, err := base.NoRedirectClient.R().SetQueryParamsFromValues(u.Query()).Head(u_)
-		if err != nil {
-			return nil, err
-		}
-		log.Debug(res.String())
-		link := model.Link{
-			URL: resp.Data.DownloadUrl,
-		}
-		log.Debugln("res code: ", res.StatusCode())
-		if res.StatusCode() == 302 {
-			link.URL = res.Header().Get("location")
-		}
-		return &link, nil
-	} else {
-		return nil, fmt.Errorf("can't convert obj")
-	}
 }
 
-func (d *Pan123) MakeDir(ctx context.Context, parentDir model.Obj, dirName string) error {
+func (driver Pan123) 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
+	}
+	parentFileId, _ := strconv.Atoi(parentFile.Id)
 	data := base.Json{
 		"driveId":      0,
 		"etag":         "",
-		"fileName":     dirName,
+		"fileName":     name,
-		"parentFileId": parentDir.GetID(),
+		"parentFileId": parentFileId,
 		"size":         0,
 		"type":         1,
 	}
-	_, err := d.request("https://www.123pan.com/api/file/upload_request", http.MethodPost, func(req *resty.Request) {
+	_, err = driver.Request("https://www.123pan.com/api/file/upload_request",
-		req.SetBody(data)
+		base.Post, nil, nil, &data, nil, false, account)
-	}, nil)
 	return err
 }
 
-func (d *Pan123) Move(ctx context.Context, srcObj, dstDir model.Obj) error {
+func (driver Pan123) Move(src string, dst string, account *model.Account) error {
-	data := base.Json{
+	dstDir, _ := filepath.Split(dst)
-		"fileIdList":   []base.Json{{"FileId": srcObj.GetID()}},
+	srcFile, err := driver.File(src, account)
-		"parentFileId": dstDir.GetID(),
+	if err != nil {
+		return err
 	}
-	_, err := d.request("https://www.123pan.com/api/file/mod_pid", http.MethodPost, func(req *resty.Request) {
+	fileId, _ := strconv.Atoi(srcFile.Id)
-		req.SetBody(data)
+
-	}, nil)
+	dstDirFile, err := driver.File(dstDir, account)
+	if err != nil {
+		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 (d *Pan123) Rename(ctx context.Context, srcObj model.Obj, newName string) error {
+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":   srcObj.GetID(),
+		"fileId":   fileId,
-		"fileName": newName,
+		"fileName": dstName,
 	}
-	_, err := d.request("https://www.123pan.com/api/file/rename", http.MethodPost, func(req *resty.Request) {
+	_, err = driver.Request("https://www.123pan.com/api/file/rename",
-		req.SetBody(data)
+		base.Post, nil, nil, &data, nil, false, account)
-	}, nil)
 	return err
 }
 
-func (d *Pan123) Copy(ctx context.Context, srcObj, dstDir model.Obj) error {
+func (driver Pan123) Copy(src string, dst string, account *model.Account) error {
-	return errs.NotSupport
+	return base.ErrNotSupport
 }
 
-func (d *Pan123) Remove(ctx context.Context, obj model.Obj) error {
+func (driver Pan123) Delete(path string, account *model.Account) error {
-	if f, ok := obj.(File); ok {
+	file, err := driver.GetFile(path, account)
-		data := base.Json{
+	if err != nil {
-			"driveId":           0,
-			"operation":         true,
-			"fileTrashInfoList": []File{f},
-		}
-		_, err := d.request("https://www.123pan.com/a/api/file/trash", http.MethodPost, func(req *resty.Request) {
-			req.SetBody(data)
-		}, nil)
 		return err
-	} else {
-		return fmt.Errorf("can't convert obj")
 	}
+	log.Debugln("delete 123 file: ", file)
+	data := base.Json{
+		"driveId":           0,
+		"operation":         true,
+		"fileTrashInfoList": []File{*file},
+	}
+	_, err = driver.Request("https://www.123pan.com/b/api/file/trash",
+		base.Post, nil, nil, &data, nil, false, account)
+	return err
 }
 
-func (d *Pan123) Put(ctx context.Context, dstDir model.Obj, stream model.FileStreamer, up driver.UpdateProgress) error {
+func (driver Pan123) 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
+	}
+
 	const DEFAULT int64 = 10485760
 	var uploadFile io.Reader
 	h := md5.New()
-	if d.StreamUpload && stream.GetSize() > DEFAULT {
+	if account.Bool1 && file.GetSize() > uint64(DEFAULT) {
 		// 只计算前10MIB
 		buf := bytes.NewBuffer(make([]byte, 0, DEFAULT))
-		if n, err := io.CopyN(io.MultiWriter(buf, h), stream, DEFAULT); err != io.EOF && n == 0 {
+		if n, err := io.CopyN(io.MultiWriter(buf, h), file, DEFAULT); err != io.EOF && n == 0 {
 			return err
 		}
 		// 增加额外参数防止MD5碰撞
-		h.Write([]byte(stream.GetName()))
+		h.Write([]byte(file.Name))
 		num := make([]byte, 8)
-		binary.BigEndian.PutUint64(num, uint64(stream.GetSize()))
+		binary.BigEndian.PutUint64(num, file.Size)
 		h.Write(num)
 		// 拼装
-		uploadFile = io.MultiReader(buf, stream)
+		uploadFile = io.MultiReader(buf, file)
 	} else {
 		// 计算完整文件MD5
-		tempFile, err := utils.CreateTempFile(stream.GetReadCloser())
+		tempFile, err := ioutil.TempFile(conf.Conf.TempDir, "file-*")
 		if err != nil {
 			return err
 		}
@@ -200,9 +337,11 @@ func (d *Pan123) Put(ctx context.Context, dstDir model.Obj, stream model.FileStr
 			_ = tempFile.Close()
 			_ = os.Remove(tempFile.Name())
 		}()
-		if _, err = io.Copy(h, tempFile); err != nil {
+
+		if _, err = io.Copy(io.MultiWriter(tempFile, h), file); err != nil {
 			return err
 		}
+
 		_, err = tempFile.Seek(0, io.SeekStart)
 		if err != nil {
 			return err
@@ -214,15 +353,15 @@ func (d *Pan123) Put(ctx context.Context, dstDir model.Obj, stream model.FileStr
 		"driveId":      0,
 		"duplicate":    2, // 2->覆盖 1->重命名 0->默认
 		"etag":         etag,
-		"fileName":     stream.GetName(),
+		"fileName":     file.GetFileName(),
-		"parentFileId": dstDir.GetID(),
+		"parentFileId": parentFile.Id,
-		"size":         stream.GetSize(),
+		"size":         file.GetSize(),
 		"type":         0,
 	}
 	var resp UploadResp
-	_, err := d.request("https://www.123pan.com/api/file/upload_request", http.MethodPost, func(req *resty.Request) {
+	_, err = driver.Request("https://www.123pan.com/api/file/upload_request",
-		req.SetBody(data)
+		base.Post, map[string]string{"app-version": "1.1"}, nil, &data, &resp, false, account)
-	}, &resp)
+	//res, err := driver.Post("https://www.123pan.com/api/file/upload_request", data, account)
 	if err != nil {
 		return err
 	}
@@ -249,12 +388,74 @@ func (d *Pan123) Put(ctx context.Context, dstDir model.Obj, stream model.FileStr
 	if err != nil {
 		return err
 	}
-	_, err = d.request("https://www.123pan.com/api/file/upload_complete", http.MethodPost, func(req *resty.Request) {
+	_, err = driver.Request("https://www.123pan.com/api/file/upload_complete", base.Post, nil, nil, &base.Json{
-		req.SetBody(base.Json{
+		"fileId": resp.Data.FileId,
-			"fileId": resp.Data.FileId,
+	}, nil, false, account)
-		})
-	}, nil)
 	return err
 }
 
-var _ driver.Driver = (*Pan123)(nil)
+//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/meta.go

@@ -1,30 +0,0 @@
-package _123
-
-import (
-	"github.com/alist-org/alist/v3/internal/driver"
-	"github.com/alist-org/alist/v3/internal/op"
-)
-
-type Addition struct {
-	Username       string `json:"username" required:"true"`
-	Password       string `json:"password" required:"true"`
-	OrderBy        string `json:"order_by" type:"select" options:"name,fileId,updateAt,createAt" default:"name"`
-	OrderDirection string `json:"order_direction" type:"select" options:"asc,desc" default:"asc"`
-	driver.RootID
-	// define other
-	StreamUpload bool `json:"stream_upload"`
-	//Field string `json:"field" type:"select" required:"true" options:"a,b,c" default:"a"`
-}
-
-var config = driver.Config{
-	Name:        "123Pan",
-	DefaultRoot: "0",
-}
-
-func New() driver.Driver {
-	return &Pan123{}
-}
-
-func init() {
-	op.RegisterDriver(config, New)
-}

drivers/123/types.go

@@ -1,67 +1,52 @@
-package _123
+package _23
 
 import (
-	"strconv"
+	"path"
 	"time"
 
-	"github.com/alist-org/alist/v3/internal/model"
+	"github.com/Xhofe/alist/conf"
+	"github.com/Xhofe/alist/utils"
 )
 
-type BaseResp struct {
-	Code    int    `json:"code"`
-	Message string `json:"message"`
-}
-
-type TokenResp struct {
-	BaseResp
-	Data struct {
-		Token string `json:"token"`
-	} `json:"data"`
-}
-
 type File struct {
-	FileName    string    `json:"FileName"`
+	FileName    string     `json:"FileName"`
-	Size        int64     `json:"Size"`
+	Size        int64      `json:"Size"`
-	UpdateAt    time.Time `json:"UpdateAt"`
+	UpdateAt    *time.Time `json:"UpdateAt"`
-	FileId      int64     `json:"FileId"`
+	FileId      int64      `json:"FileId"`
-	Type        int       `json:"Type"`
+	Type        int        `json:"Type"`
-	Etag        string    `json:"Etag"`
+	Etag        string     `json:"Etag"`
-	S3KeyFlag   string    `json:"S3KeyFlag"`
+	S3KeyFlag   string     `json:"S3KeyFlag"`
-	DownloadUrl string    `json:"DownloadUrl"`
+	DownloadUrl string     `json:"DownloadUrl"`
 }
 
-func (f File) GetPath() string {
+func (f File) GetSize() uint64 {
-	return ""
+	return uint64(f.Size)
-}
-
-func (f File) GetSize() int64 {
-	return f.Size
 }
 
 func (f File) GetName() string {
 	return f.FileName
 }
 
-func (f File) ModTime() time.Time {
+func (f File) GetType() int {
-	return f.UpdateAt
+	if f.Type == 1 {
+		return conf.FOLDER
+	}
+	return utils.GetFileType(path.Ext(f.FileName))
 }
 
-func (f File) IsDir() bool {
+type BaseResp struct {
-	return f.Type == 1
+	Code    int    `json:"code"`
+	Message string `json:"message"`
 }
 
-func (f File) GetID() string {
+type Pan123TokenResp struct {
-	return strconv.FormatInt(f.FileId, 10)
+	BaseResp
+	Data struct {
+		Token string `json:"token"`
+	} `json:"data"`
 }
 
-var _ model.Obj = (*File)(nil)
+type Pan123Files struct {
-
-//func (f File) Thumb() string {
-//
-//}
-//var _ model.Thumb = (*File)(nil)
-
-type Files struct {
 	BaseResp
 	Data struct {
 		InfoList []File `json:"InfoList"`
@@ -69,7 +54,7 @@ type Files struct {
 	} `json:"data"`
 }
 
-type DownResp struct {
+type Pan123DownResp struct {
 	BaseResp
 	Data struct {
 		DownloadUrl string `json:"DownloadUrl"`

drivers/123/util.go

@@ -1,87 +0,0 @@
-package _123
-
-import (
-	"errors"
-	"fmt"
-	"net/http"
-
-	"github.com/alist-org/alist/v3/drivers/base"
-	"github.com/go-resty/resty/v2"
-	jsoniter "github.com/json-iterator/go"
-)
-
-// do others that not defined in Driver interface
-
-func (d *Pan123) login() error {
-	url := "https://www.123pan.com/api/user/sign_in"
-	var resp TokenResp
-	_, err := base.RestyClient.R().
-		SetResult(&resp).
-		SetBody(base.Json{
-			"passport": d.Username,
-			"password": d.Password,
-		}).Post(url)
-	if err != nil {
-		return err
-	}
-	if resp.Code != 200 {
-		err = fmt.Errorf(resp.Message)
-	} else {
-		d.AccessToken = resp.Data.Token
-	}
-	return err
-}
-
-func (d *Pan123) request(url string, method string, callback base.ReqCallback, resp interface{}) ([]byte, error) {
-	req := base.RestyClient.R()
-	req.SetHeader("Authorization", "Bearer "+d.AccessToken)
-	if callback != nil {
-		callback(req)
-	}
-	if resp != nil {
-		req.SetResult(resp)
-	}
-	res, err := req.Execute(method, url)
-	if err != nil {
-		return nil, err
-	}
-	body := res.Body()
-	code := jsoniter.Get(body, "code").ToInt()
-	if code != 0 {
-		if code == 401 {
-			err := d.login()
-			if err != nil {
-				return nil, err
-			}
-			return d.request(url, method, callback, resp)
-		}
-		return nil, errors.New(jsoniter.Get(body, "message").ToString())
-	}
-	return body, nil
-}
-
-func (d *Pan123) getFiles(parentId string) ([]File, error) {
-	next := "0"
-	res := make([]File, 0)
-	for next != "-1" {
-		var resp Files
-		query := map[string]string{
-			"driveId":        "0",
-			"limit":          "100",
-			"next":           next,
-			"orderBy":        d.OrderBy,
-			"orderDirection": d.OrderDirection,
-			"parentFileId":   parentId,
-			"trashed":        "false",
-		}
-		_, err := d.request("https://www.123pan.com/api/file/list/new", http.MethodGet, func(req *resty.Request) {
-			req.SetQueryParams(query)
-		}, &resp)
-		if err != nil {
-			return nil, err
-		}
-		next = resp.Data.Next
-		res = append(res, resp.Data.InfoList...)
-	}
-	return res, nil
-}

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

@@ -1,115 +1,225 @@
-package _139
+package _39
 
 import (
 	"bytes"
-	"context"
 	"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"
-
-	"github.com/alist-org/alist/v3/drivers/base"
-	"github.com/alist-org/alist/v3/internal/driver"
-	"github.com/alist-org/alist/v3/internal/errs"
-	"github.com/alist-org/alist/v3/internal/model"
-	"github.com/alist-org/alist/v3/pkg/utils"
-	log "github.com/sirupsen/logrus"
 )
 
-type Yun139 struct {
+type Cloud139 struct{}
-	model.Storage
-	Addition
-}
 
-func (d *Yun139) Config() driver.Config {
+func (driver Cloud139) Config() base.DriverConfig {
-	return config
+	return base.DriverConfig{
-}
+		Name:      "139Yun",
-
+		LocalSort: true,
-func (d *Yun139) GetAddition() driver.Additional {
-	return d.Addition
-}
-
-func (d *Yun139) Init(ctx context.Context, storage model.Storage) error {
-	d.Storage = storage
-	err := utils.Json.UnmarshalFromString(d.Storage.Addition, &d.Addition)
-	if err != nil {
-		return err
 	}
-	_, err = d.post("/orchestration/personalCloud/user/v1.0/qryUserExternInfo", base.Json{
+}
+
+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":     d.Account,
+				"account":     account.Username,
 				"accountType": 1,
 			},
 		},
-	}, nil)
+	}, nil, account)
 	return err
 }
 
-func (d *Yun139) Drop(ctx context.Context) error {
+func (driver Cloud139) File(path string, account *model.Account) (*model.File, error) {
-	return nil
+	path = utils.ParsePath(path)
-}
+	if path == "/" {
-
+		return &model.File{
-func (d *Yun139) List(ctx context.Context, dir model.Obj, args model.ListArgs) ([]model.Obj, error) {
+			Id:        account.RootFolder,
-	if d.isFamily() {
+			Name:      account.Name,
-		return d.familyGetFiles(dir.GetID())
+			Size:      0,
-	} else {
+			Type:      conf.FOLDER,
-		return d.getFiles(dir.GetID())
+			Driver:    driver.Config().Name,
+			UpdatedAt: account.UpdatedAt,
+		}, nil
 	}
-}
+	dir, name := filepath.Split(path)
-
+	files, err := driver.Files(dir, account)
-//func (d *Yun139) Get(ctx context.Context, path string) (model.Obj, error) {
-//	// this is optional
-//	return nil, errs.NotImplement
-//}
-
-func (d *Yun139) Link(ctx context.Context, file model.Obj, args model.LinkArgs) (*model.Link, error) {
-	u, err := d.getLink(file.GetID())
 	if err != nil {
 		return nil, err
 	}
-	return &model.Link{URL: u}, nil
+	for _, file := range files {
+		if file.Name == name {
+			return &file, nil
+		}
+	}
+	return nil, base.ErrPathNotFound
 }
 
-func (d *Yun139) MakeDir(ctx context.Context, parentDir model.Obj, dirName string) error {
+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": parentDir.GetID(),
+			"parentCatalogID": parentFile.Id,
-			"newCatalogName":  dirName,
+			"newCatalogName":  utils.Base(path),
 			"commonAccountInfo": base.Json{
-				"account":     d.Account,
+				"account":     account.Username,
 				"accountType": 1,
 			},
 		},
 	}
 	pathname := "/orchestration/personalCloud/catalog/v1.0/createCatalogExt"
-	if d.isFamily() {
+	if isFamily(account) {
 		data = base.Json{
-			"cloudID": d.CloudID,
+			"cloudID": account.SiteId,
 			"commonAccountInfo": base.Json{
-				"account":     d.Account,
+				"account":     account.Username,
 				"accountType": 1,
 			},
-			"docLibName": dirName,
+			"docLibName": utils.Base(path),
 		}
 		pathname = "/orchestration/familyCloud/cloudCatalog/v1.0/createCloudDoc"
 	}
-	_, err := d.post(pathname,
+	_, err = driver.Post(pathname,
-		data, nil)
+		data, nil, account)
 	return err
 }
 
-func (d *Yun139) Move(ctx context.Context, srcObj, dstDir model.Obj) error {
+func (driver Cloud139) Move(src string, dst string, account *model.Account) error {
-	if d.isFamily() {
+	if isFamily(account) {
-		return errs.NotImplement
+		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 srcObj.IsDir() {
+	if srcFile.IsDir() {
-		catalogInfoList = append(catalogInfoList, srcObj.GetID())
+		catalogInfoList = append(catalogInfoList, srcFile.Id)
 	} else {
-		contentInfoList = append(contentInfoList, srcObj.GetID())
+		contentInfoList = append(contentInfoList, srcFile.Id)
 	}
 	data := base.Json{
 		"createBatchOprTaskReq": base.Json{
@@ -118,60 +228,72 @@ func (d *Yun139) Move(ctx context.Context, srcObj, dstDir model.Obj) error {
 			"taskInfo": base.Json{
 				"contentInfoList": contentInfoList,
 				"catalogInfoList": catalogInfoList,
-				"newCatalogID":    dstDir.GetID(),
+				"newCatalogID":    dstParentFile.Id,
 			},
 			"commonAccountInfo": base.Json{
-				"account":     d.Account,
+				"account":     account.Username,
 				"accountType": 1,
 			},
 		},
 	}
 	pathname := "/orchestration/personalCloud/batchOprTask/v1.0/createBatchOprTask"
-	_, err := d.post(pathname, data, nil)
+	_, err = driver.Post(pathname, data, nil, account)
 	return err
 }
 
-func (d *Yun139) Rename(ctx context.Context, srcObj model.Obj, newName string) error {
+func (driver Cloud139) Rename(src string, dst string, account *model.Account) error {
-	if d.isFamily() {
+	if isFamily(account) {
-		return errs.NotImplement
+		return base.ErrNotSupport
+	}
+	srcFile, err := driver.File(src, account)
+	if err != nil {
+		return err
 	}
 	var data base.Json
 	var pathname string
-	if srcObj.IsDir() {
+	if srcFile.IsDir() {
 		data = base.Json{
-			"catalogID":   srcObj.GetID(),
+			"catalogID":   srcFile.Id,
-			"catalogName": newName,
+			"catalogName": utils.Base(dst),
 			"commonAccountInfo": base.Json{
-				"account":     d.Account,
+				"account":     account.Username,
 				"accountType": 1,
 			},
 		}
 		pathname = "/orchestration/personalCloud/catalog/v1.0/updateCatalogInfo"
 	} else {
 		data = base.Json{
-			"contentID":   srcObj.GetID(),
+			"contentID":   srcFile.Id,
-			"contentName": newName,
+			"contentName": utils.Base(dst),
 			"commonAccountInfo": base.Json{
-				"account":     d.Account,
+				"account":     account.Username,
 				"accountType": 1,
 			},
 		}
 		pathname = "/orchestration/personalCloud/content/v1.0/updateContentInfo"
 	}
-	_, err := d.post(pathname, data, nil)
+	_, err = driver.Post(pathname, data, nil, account)
 	return err
 }
 
-func (d *Yun139) Copy(ctx context.Context, srcObj, dstDir model.Obj) error {
+func (driver Cloud139) Copy(src string, dst string, account *model.Account) error {
-	if d.isFamily() {
+	if isFamily(account) {
-		return errs.NotImplement
+		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 srcObj.IsDir() {
+	if srcFile.IsDir() {
-		catalogInfoList = append(catalogInfoList, srcObj.GetID())
+		catalogInfoList = append(catalogInfoList, srcFile.Id)
 	} else {
-		contentInfoList = append(contentInfoList, srcObj.GetID())
+		contentInfoList = append(contentInfoList, srcFile.Id)
 	}
 	data := base.Json{
 		"createBatchOprTaskReq": base.Json{
@@ -180,26 +302,30 @@ func (d *Yun139) Copy(ctx context.Context, srcObj, dstDir model.Obj) error {
 			"taskInfo": base.Json{
 				"contentInfoList": contentInfoList,
 				"catalogInfoList": catalogInfoList,
-				"newCatalogID":    dstDir.GetID(),
+				"newCatalogID":    dstParentFile.Id,
 			},
 			"commonAccountInfo": base.Json{
-				"account":     d.Account,
+				"account":     account.Username,
 				"accountType": 1,
 			},
 		},
 	}
 	pathname := "/orchestration/personalCloud/batchOprTask/v1.0/createBatchOprTask"
-	_, err := d.post(pathname, data, nil)
+	_, err = driver.Post(pathname, data, nil, account)
 	return err
 }
 
-func (d *Yun139) Remove(ctx context.Context, obj model.Obj) error {
+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 obj.IsDir() {
+	if file.IsDir() {
-		catalogInfoList = append(catalogInfoList, obj.GetID())
+		catalogInfoList = append(catalogInfoList, file.Id)
 	} else {
-		contentInfoList = append(contentInfoList, obj.GetID())
+		contentInfoList = append(contentInfoList, file.Id)
 	}
 	data := base.Json{
 		"createBatchOprTaskReq": base.Json{
@@ -211,18 +337,18 @@ func (d *Yun139) Remove(ctx context.Context, obj model.Obj) error {
 				"catalogInfoList": catalogInfoList,
 			},
 			"commonAccountInfo": base.Json{
-				"account":     d.Account,
+				"account":     account.Username,
 				"accountType": 1,
 			},
 		},
 	}
 	pathname := "/orchestration/personalCloud/batchOprTask/v1.0/createBatchOprTask"
-	if d.isFamily() {
+	if isFamily(account) {
 		data = base.Json{
 			"catalogList": catalogInfoList,
 			"contentList": contentInfoList,
 			"commonAccountInfo": base.Json{
-				"account":     d.Account,
+				"account":     account.Username,
 				"accountType": 1,
 			},
 			"sourceCatalogType": 1002,
@@ -230,61 +356,71 @@ func (d *Yun139) Remove(ctx context.Context, obj model.Obj) error {
 		}
 		pathname = "/orchestration/familyCloud/batchOprTask/v1.0/createBatchOprTask"
 	}
-	_, err := d.post(pathname, data, nil)
+	_, err = driver.Post(pathname, data, nil, account)
 	return err
 }
 
-func (d *Yun139) Put(ctx context.Context, dstDir model.Obj, stream model.FileStreamer, up driver.UpdateProgress) error {
+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":    stream.GetSize(),
+		"totalSize":    file.Size,
 		"uploadContentList": []base.Json{{
-			"contentName": stream.GetName(),
+			"contentName": file.Name,
-			"contentSize": stream.GetSize(),
+			"contentSize": file.Size,
 			// "digest": "5a3231986ce7a6b46e408612d385bafa"
 		}},
-		"parentCatalogID": dstDir.GetID(),
+		"parentCatalogID": parentFile.Id,
 		"newCatalogName":  "",
 		"commonAccountInfo": base.Json{
-			"account":     d.Account,
+			"account":     account.Username,
 			"accountType": 1,
 		},
 	}
 	pathname := "/orchestration/personalCloud/uploadAndDownload/v1.0/pcUploadFileRequest"
-	if d.isFamily() {
+	if isFamily(account) {
-		data = d.newJson(base.Json{
+		data = newJson(base.Json{
 			"fileCount":    1,
 			"manualRename": 2,
 			"operation":    0,
 			"path":         "",
 			"seqNo":        "",
-			"totalSize":    stream.GetSize(),
+			"totalSize":    file.Size,
 			"uploadContentList": []base.Json{{
-				"contentName": stream.GetName(),
+				"contentName": file.Name,
-				"contentSize": stream.GetSize(),
+				"contentSize": file.Size,
 				// "digest": "5a3231986ce7a6b46e408612d385bafa"
 			}},
-		})
+		}, account)
 		pathname = "/orchestration/familyCloud/content/v1.0/getFileUploadURL"
-		return errs.NotImplement
+		return base.ErrNotSupport
 	}
 	var resp UploadResp
-	_, err := d.post(pathname, data, &resp)
+	_, err = driver.Post(pathname, data, &resp, account)
 	if err != nil {
 		return err
 	}
-	var Default int64 = 10485760
+	var Default uint64 = 10485760
-	part := int(math.Ceil(float64(stream.GetSize()) / float64(Default)))
+	part := int(math.Ceil(float64(file.Size) / float64(Default)))
-	var start int64 = 0
+	var start uint64 = 0
 	for i := 0; i < part; i++ {
-		byteSize := stream.GetSize() - start
+		byteSize := file.Size - start
 		if byteSize > Default {
 			byteSize = Default
 		}
 		byteData := make([]byte, byteSize)
-		_, err = io.ReadFull(stream, byteData)
+		_, err = io.ReadFull(file, byteData)
 		if err != nil {
 			return err
 		}
@@ -294,10 +430,10 @@ func (d *Yun139) Put(ctx context.Context, dstDir model.Obj, stream model.FileStr
 		}
 		headers := map[string]string{
 			"Accept":         "*/*",
-			"Content-Type":   "text/plain;name=" + unicode(stream.GetName()),
+			"Content-Type":   "text/plain;name=" + unicode(file.Name),
-			"contentSize":    strconv.FormatInt(stream.GetSize(), 10),
+			"contentSize":    strconv.FormatUint(file.Size, 10),
 			"range":          fmt.Sprintf("bytes=%d-%d", start, start+byteSize-1),
-			"content-length": strconv.FormatInt(byteSize, 10),
+			"content-length": strconv.FormatUint(byteSize, 10),
 			"uploadtaskID":   resp.Data.UploadResult.UploadTaskID,
 			"rangeType":      "0",
 			"Referer":        "https://yun.139.com/",
@@ -314,9 +450,8 @@ func (d *Yun139) Put(ctx context.Context, dstDir model.Obj, stream model.FileStr
 		log.Debugf("%+v", res)
 		res.Body.Close()
 		start += byteSize
-		up(i * 100 / part)
 	}
 	return nil
 }
 
-var _ driver.Driver = (*Yun139)(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/meta.go

@@ -1,25 +0,0 @@
-package _139
-
-import (
-	"github.com/alist-org/alist/v3/internal/driver"
-	"github.com/alist-org/alist/v3/internal/op"
-)
-
-type Addition struct {
-	Account string `json:"account" required:"true"`
-	Cookie  string `json:"cookie" type:"text" required:"true"`
-	driver.RootID
-	Type    string `json:"type" type:"select" options:"personal,family" default:"personal"`
-	CloudID string `json:"cloud_id"`
-}
-
-var config = driver.Config{
-	Name:      "139Yun",
-	LocalSort: true,
-}
-
-func init() {
-	op.RegisterDriver(config, func() driver.Driver {
-		return &Yun139{}
-	})
-}

drivers/139/types.go

@@ -1,4 +1,4 @@
-package _139
+package _39
 
 type BaseResp struct {
 	Success bool   `json:"success"`

drivers/139/util.go

@@ -1,30 +1,17 @@
-package _139
+package _39
 
 import (
 	"encoding/base64"
-	"errors"
+	"github.com/Xhofe/alist/drivers/base"
-	"fmt"
+	"github.com/Xhofe/alist/model"
-	"net/http"
+	"github.com/Xhofe/alist/utils"
 	"net/url"
 	"sort"
 	"strconv"
 	"strings"
 	"time"
-
-	"github.com/alist-org/alist/v3/drivers/base"
-	"github.com/alist-org/alist/v3/internal/model"
-	"github.com/alist-org/alist/v3/pkg/utils"
-	"github.com/alist-org/alist/v3/pkg/utils/random"
-	"github.com/go-resty/resty/v2"
-	jsoniter "github.com/json-iterator/go"
-	log "github.com/sirupsen/logrus"
 )
 
-// do others that not defined in Driver interface
-func (d *Yun139) isFamily() bool {
-	return d.Type == "family"
-}
-
 func encodeURIComponent(str string) string {
 	r := url.QueryEscape(str)
 	r = strings.Replace(r, "+", "%20", -1)
@@ -44,200 +31,13 @@ func calSign(body, ts, randStr string) string {
 	return res
 }
 
-func getTime(t string) time.Time {
+func getTime(t string) *time.Time {
 	stamp, _ := time.ParseInLocation("20060102150405", t, time.Local)
-	return stamp
+	return &stamp
 }
 
-func (d *Yun139) request(pathname string, method string, callback base.ReqCallback, resp interface{}) ([]byte, error) {
+func isFamily(account *model.Account) bool {
-	url := "https://yun.139.com" + pathname
+	return account.InternalType == "Family"
-	req := base.RestyClient.R()
-	randStr := random.String(16)
-	ts := time.Now().Format("2006-01-02 15:04:05")
-	if callback != nil {
-		callback(req)
-	}
-	body, err := utils.Json.Marshal(req.Body)
-	if err != nil {
-		return nil, err
-	}
-	sign := calSign(string(body), ts, randStr)
-	svcType := "1"
-	if d.isFamily() {
-		svcType = "2"
-	}
-	req.SetHeaders(map[string]string{
-		"Accept":         "application/json, text/plain, */*",
-		"CMS-DEVICE":     "default",
-		"Cookie":         d.Cookie,
-		"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,
-	})
-
-	var e BaseResp
-	req.SetResult(&e)
-	res, err := req.Execute(method, url)
-	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 (d *Yun139) post(pathname string, data interface{}, resp interface{}) ([]byte, error) {
-	return d.request(pathname, http.MethodPost, func(req *resty.Request) {
-		req.SetBody(data)
-	}, resp)
-}
-
-func (d *Yun139) getFiles(catalogID string) ([]model.Obj, error) {
-	start := 0
-	limit := 100
-	files := make([]model.Obj, 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":     d.Account,
-				"accountType": 1,
-			},
-		}
-		var resp GetDiskResp
-		_, err := d.post("/orchestration/personalCloud/catalog/v1.0/getDisk", data, &resp)
-		if err != nil {
-			return nil, err
-		}
-		for _, catalog := range resp.Data.GetDiskResult.CatalogList {
-			f := model.Object{
-				ID:       catalog.CatalogID,
-				Name:     catalog.CatalogName,
-				Size:     0,
-				Modified: getTime(catalog.UpdateTime),
-				IsFolder: true,
-			}
-			files = append(files, &f)
-		}
-		for _, content := range resp.Data.GetDiskResult.ContentList {
-			f := model.ObjThumb{
-				Object: model.Object{
-					ID:       content.ContentID,
-					Name:     content.ContentName,
-					Size:     content.ContentSize,
-					Modified: getTime(content.UpdateTime),
-				},
-				Thumbnail: model.Thumbnail{Thumbnail: content.ThumbnailURL},
-				//Thumbnail: content.BigthumbnailURL,
-			}
-			files = append(files, &f)
-		}
-		if start+limit >= resp.Data.GetDiskResult.NodeCount {
-			break
-		}
-		start += limit
-	}
-	return files, nil
-}
-
-func (d *Yun139) newJson(data map[string]interface{}) base.Json {
-	common := map[string]interface{}{
-		"catalogType": 3,
-		"cloudID":     d.CloudID,
-		"cloudType":   1,
-		"commonAccountInfo": base.Json{
-			"account":     d.Account,
-			"accountType": 1,
-		},
-	}
-	return utils.MergeMap(data, common)
-}
-
-func (d *Yun139) familyGetFiles(catalogID string) ([]model.Obj, error) {
-	pageNum := 1
-	files := make([]model.Obj, 0)
-	for {
-		data := d.newJson(base.Json{
-			"catalogID":       catalogID,
-			"contentSortType": 0,
-			"pageInfo": base.Json{
-				"pageNum":  pageNum,
-				"pageSize": 100,
-			},
-			"sortDirection": 1,
-		})
-		var resp QueryContentListResp
-		_, err := d.post("/orchestration/familyCloud/content/v1.0/queryContentList", data, &resp)
-		if err != nil {
-			return nil, err
-		}
-		for _, catalog := range resp.Data.CloudCatalogList {
-			f := model.Object{
-				ID:       catalog.CatalogID,
-				Name:     catalog.CatalogName,
-				Size:     0,
-				IsFolder: true,
-				Modified: getTime(catalog.LastUpdateTime),
-			}
-			files = append(files, &f)
-		}
-		for _, content := range resp.Data.CloudContentList {
-			f := model.ObjThumb{
-				Object: model.Object{
-					ID:       content.ContentID,
-					Name:     content.ContentName,
-					Size:     content.ContentSize,
-					Modified: getTime(content.LastUpdateTime),
-				},
-				Thumbnail: model.Thumbnail{Thumbnail: content.ThumbnailURL},
-				//Thumbnail: content.BigthumbnailURL,
-			}
-			files = append(files, &f)
-		}
-		if 100*pageNum > resp.Data.TotalCount {
-			break
-		}
-		pageNum++
-	}
-	return files, nil
-}
-
-func (d *Yun139) getLink(contentId string) (string, error) {
-	data := base.Json{
-		"appName":   "",
-		"contentID": contentId,
-		"commonAccountInfo": base.Json{
-			"account":     d.Account,
-			"accountType": 1,
-		},
-	}
-	res, err := d.post("/orchestration/personalCloud/uploadAndDownload/v1.0/downloadRequest",
-		data, nil)
-	if err != nil {
-		return "", err
-	}
-	return jsoniter.Get(res, "data", "downloadURL").ToString(), nil
 }
 
 func unicode(str string) string {
@@ -245,3 +45,26 @@ func unicode(str string) string {
 	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

@@ -0,0 +1,620 @@
+package _89
+
+import (
+	"bytes"
+	"crypto/md5"
+	"encoding/base64"
+	"encoding/hex"
+	"errors"
+	"fmt"
+	"io"
+	"math"
+	"net/http"
+	"regexp"
+	"strconv"
+	"strings"
+	"time"
+
+	"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"
+)
+
+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{
+		Id:        strconv.FormatInt(file.Id, 10),
+		Name:      file.Name,
+		Size:      file.Size,
+		Driver:    driver.Config().Name,
+		UpdatedAt: nil,
+		Thumbnail: file.Icon.SmallUrl,
+		Url:       file.Url,
+	}
+	loc, _ := time.LoadLocation("Local")
+	lastOpTime, err := time.ParseInLocation("2006-01-02 15:04:05", file.LastOpTime, loc)
+	if err == nil {
+		f.UpdatedAt = &lastOpTime
+	}
+	if file.Size == -1 {
+		f.Size = 0
+	}
+	f.Type = file.GetType()
+	return f
+}
+
+//func (c Cloud189) GetFile(path string, account *model.Account) (*Cloud189File, error) {
+//	dir, name := filepath.Split(path)
+//	dir = utils.ParsePath(dir)
+//	_, _, err := c.ParentPath(dir, account)
+//	if err != nil {
+//		return nil, err
+//	}
+//	parentFiles_, _ := conf.Cache.Get(conf.Ctx, fmt.Sprintf("%s%s", account.Name, dir))
+//	parentFiles, _ := parentFiles_.([]Cloud189File)
+//	for _, file := range parentFiles {
+//		if file.Name == name {
+//			if file.Size != -1 {
+//				return &file, err
+//			} else {
+//				return nil, ErrNotFile
+//			}
+//		}
+//	}
+//	return nil, ErrPathNotFound
+//}
+
+type LoginResp struct {
+	Msg    string `json:"msg"`
+	Result int    `json:"result"`
+	ToUrl  string `json:"toUrl"`
+}
+
+// Login refer to PanIndex
+func (driver Cloud189) Login(account *model.Account) error {
+	client := resty.New()
+	//client.SetCookieJar(cookieJar)
+	client.SetTimeout(base.DefaultTimeout)
+	client.SetRetryCount(3)
+	client.SetHeader("Referer", "https://cloud.189.cn/")
+	client.SetHeader("User-Agent", base.UserAgent)
+	url := "https://cloud.189.cn/api/portal/loginUrl.action?redirectURL=https%3A%2F%2Fcloud.189.cn%2Fmain.action"
+	b := ""
+	lt := ""
+	ltText := regexp.MustCompile(`lt = "(.+?)"`)
+	var res *resty.Response
+	var err error
+	for i := 0; i < 3; i++ {
+		res, err = client.R().Get(url)
+		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 {
+			lt = ltTextArr[1]
+			break
+		} else {
+			<-time.After(time.Second)
+		}
+	}
+	if lt == "" {
+		return fmt.Errorf("get page: %s \nstatus: %d \nrequest url: %s\nredirect url: %s",
+			b, res.StatusCode(), res.RawResponse.Request.URL.String(), res.Header().Get("location"))
+	}
+	captchaToken := regexp.MustCompile(`captchaToken' value='(.+?)'`).FindStringSubmatch(b)[1]
+	returnUrl := regexp.MustCompile(`returnUrl = '(.+?)'`).FindStringSubmatch(b)[1]
+	paramId := regexp.MustCompile(`paramId = "(.+?)"`).FindStringSubmatch(b)[1]
+	//reqId := regexp.MustCompile(`reqId = "(.+?)"`).FindStringSubmatch(b)[1]
+	jRsakey := regexp.MustCompile(`j_rsaKey" value="(\S+)"`).FindStringSubmatch(b)[1]
+	vCodeID := regexp.MustCompile(`picCaptcha\.do\?token\=([A-Za-z0-9\&\=]+)`).FindStringSubmatch(b)[1]
+	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, 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().
+		SetHeaders(map[string]string{
+			"lt":         lt,
+			"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",
+			"Referer":    "https://open.e.189.cn/",
+			"accept":     "application/json;charset=UTF-8",
+		}).SetFormData(map[string]string{
+		"appKey":       "cloud",
+		"accountType":  "01",
+		"userName":     "{RSA}" + userRsa,
+		"password":     "{RSA}" + passwordRsa,
+		"validateCode": vCodeRS,
+		"captchaToken": captchaToken,
+		"returnUrl":    returnUrl,
+		"mailSuffix":   "@pan.cn",
+		"paramId":      paramId,
+		"clientType":   "10010",
+		"dynamicCheck": "FALSE",
+		"cb_SaveName":  "1",
+		"isOauth2":     "false",
+	}).Post(url)
+	if err != nil {
+		return err
+	}
+	err = utils.Json.Unmarshal(res.Body(), &loginResp)
+	if err != nil {
+		log.Error(err.Error())
+		return err
+	}
+	if loginResp.Result != 0 {
+		return fmt.Errorf(loginResp.Msg)
+	}
+	_, err = client.R().Get(loginResp.ToUrl)
+	if err != nil {
+		log.Errorf(err.Error())
+		return err
+	}
+	client189Map[account.Name] = client
+	return nil
+}
+
+func (driver Cloud189) isFamily(account *model.Account) bool {
+	return account.InternalType == "Family"
+}
+
+func (driver Cloud189) GetFiles(fileId string, account *model.Account) ([]Cloud189File, error) {
+	res := make([]Cloud189File, 0)
+	pageNum := 1
+
+	for {
+		var resp Cloud189Files
+		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
+		}
+		err = utils.Json.Unmarshal(body, &resp)
+		if err != nil {
+			return nil, err
+		}
+		if resp.ResCode != 0 {
+			return nil, fmt.Errorf(resp.ResMessage)
+		}
+		if resp.FileListAO.Count == 0 {
+			break
+		}
+		for _, folder := range resp.FileListAO.FolderList {
+			res = append(res, Cloud189File{
+				Id:         folder.Id,
+				LastOpTime: folder.LastOpTime,
+				Name:       folder.Name,
+				Size:       -1,
+			})
+		}
+		res = append(res, resp.FileListAO.FileList...)
+		pageNum++
+	}
+	return res, nil
+}
+
+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 res *resty.Response
+	switch method {
+	case base.Get:
+		res, err = req.Get(url)
+	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, query, form, nil, account)
+		}
+	}
+	if jsoniter.Get(res.Body(), "res_code").ToInt() != 0 {
+		err = errors.New(jsoniter.Get(res.Body(), "res_message").ToString())
+	}
+	return res.Body(), err
+}
+
+func (driver Cloud189) GetSessionKey(account *model.Account) (string, error) {
+	//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
+	}
+	sessionKey := jsoniter.Get(resp, "sessionKey").ToString()
+	//info.SessionKey = sessionKey
+	return sessionKey, nil
+}
+
+func (driver Cloud189) GetResKey(account *model.Account) (string, string, error) {
+	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
+	}
+	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) 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
+	}
+	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", 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(uri + "---" + jsoniter.Get(data, "msg").ToString())
+	}
+	return data, nil
+}
+
+// NewUpload Error: signature check false
+func (driver Cloud189) NewUpload(file *model.FileStream, account *model.Account) error {
+	sessionKey, err := driver.GetSessionKey(account)
+	if err != nil {
+		account.Status = err.Error()
+	} else {
+		account.Status = "work"
+		account.DriveId = sessionKey
+	}
+	_ = 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:])
+		}
+
+		r, err := base.HttpClient.Do(req)
+		log.Debugf("%+v %+v", r, r.Request.Header)
+		r.Body.Close()
+		if err != nil {
+			return err
+		}
+	}
+	fileMd5 := hex.EncodeToString(md5Sum.Sum(nil))
+	sliceMd5 := fileMd5
+	if file.GetSize() > DEFAULT {
+		sliceMd5 = utils.GetMD5Encode(strings.Join(md5s, "\n"))
+	}
+	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 (driver Cloud189) OldUpload(file *model.FileStream, account *model.Account) error {
+	//return base.ErrNotImplement
+	client, err := driver.getClient(account)
+	if err != nil {
+		return err
+	}
+	parentFile, err := driver.File(file.ParentPath, account)
+	if err != nil {
+		return err
+	}
+	// 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
+	}
+	if jsoniter.Get(res.Body(), "MD5").ToString() != "" {
+		return nil
+	}
+	log.Debugf(res.String())
+	return errors.New(res.String())
+}

drivers/189/driver.go

@@ -1,71 +1,182 @@
-package _189
+package _89
 
 import (
-	"context"
+	"fmt"
 	"net/http"
+	"path/filepath"
 	"strings"
 
-	"github.com/alist-org/alist/v3/drivers/base"
+	"github.com/Xhofe/alist/conf"
-	"github.com/alist-org/alist/v3/internal/driver"
+	"github.com/Xhofe/alist/drivers/base"
-	"github.com/alist-org/alist/v3/internal/model"
+	"github.com/Xhofe/alist/model"
-	"github.com/alist-org/alist/v3/pkg/utils"
+	"github.com/Xhofe/alist/utils"
 	"github.com/go-resty/resty/v2"
 	log "github.com/sirupsen/logrus"
 )
 
-type Cloud189 struct {
+type Cloud189 struct{}
-	model.Storage
+
-	Addition
+func (driver Cloud189) Config() base.DriverConfig {
-	client     *resty.Client
+	return base.DriverConfig{
-	rsa        Rsa
+		Name:      "189Cloud",
-	sessionKey string
+		LocalSort: true,
+	}
 }
 
-func (d *Cloud189) Config() driver.Config {
+func (driver Cloud189) Items() []base.Item {
-	return config
+	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,
+			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 (d *Cloud189) GetAddition() driver.Additional {
+func (driver Cloud189) Save(account *model.Account, old *model.Account) error {
-	return d.Addition
+	if old != nil {
-}
+		delete(client189Map, old.Name)
-
+	}
-func (d *Cloud189) Init(ctx context.Context, storage model.Storage) error {
+	if account == nil {
-	d.Storage = storage
+		return nil
-	err := utils.Json.UnmarshalFromString(d.Storage.Addition, &d.Addition)
+	}
-	if err != nil {
+	if err := driver.Login(account); err != nil {
+		account.Status = err.Error()
+		_ = model.SaveAccount(account)
 		return err
 	}
-	d.client = resty.New().
+	sessionKey, err := driver.GetSessionKey(account)
-		SetTimeout(base.DefaultTimeout).
+	if err != nil {
-		SetRetryCount(3).
+		account.Status = err.Error()
-		SetHeader("Referer", "https://cloud.189.cn/").
+	} else {
-		SetHeader("User-Agent", base.UserAgent)
+		account.Status = "work"
-	return d.login()
+		account.DriveId = sessionKey
+	}
+	_ = model.SaveAccount(account)
+	return err
 }
 
-func (d *Cloud189) Drop(ctx context.Context) error {
+func (driver Cloud189) File(path string, account *model.Account) (*model.File, error) {
-	return nil
+	path = utils.ParsePath(path)
-}
+	if path == "/" {
-
+		return &model.File{
-func (d *Cloud189) List(ctx context.Context, dir model.Obj, args model.ListArgs) ([]model.Obj, error) {
+			Id:        account.RootFolder,
-	return d.getFiles(dir.GetID())
+			Name:      account.Name,
-}
+			Size:      0,
-
+			Type:      conf.FOLDER,
-//func (d *Cloud189) Get(ctx context.Context, path string) (model.Obj, error) {
+			Driver:    driver.Config().Name,
-//	// this is optional
+			UpdatedAt: account.UpdatedAt,
-//	return nil, errs.NotImplement
+		}, nil
-//}
+	}
-
+	dir, name := filepath.Split(path)
-func (d *Cloud189) Link(ctx context.Context, file model.Obj, args model.LinkArgs) (*model.Link, error) {
+	files, err := driver.Files(dir, account)
-	var resp DownResp
-	u := "https://cloud.189.cn/api/portal/getFileInfo.action"
-	_, err := d.request(u, http.MethodGet, func(req *resty.Request) {
-		req.SetQueryParam("fileId", file.GetID())
-	}, &resp)
 	if err != nil {
 		return nil, err
 	}
-	client := resty.NewWithClient(d.client.GetClient()).SetRedirectPolicy(
+	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)
+	var rawFiles []Cloud189File
+	cache, err := base.GetCache(path, account)
+	if err == nil {
+		rawFiles, _ = cache.([]Cloud189File)
+	} else {
+		file, err := driver.File(path, account)
+		if err != nil {
+			return nil, err
+		}
+		rawFiles, err = driver.GetFiles(file.Id, account)
+		if err != nil {
+			return nil, err
+		}
+		if len(rawFiles) > 0 {
+			_ = base.SetCache(path, rawFiles, account)
+		}
+	}
+	files := make([]model.File, 0)
+	for _, file := range rawFiles {
+		files = append(files, *driver.FormatFile(&file))
+	}
+	return 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
+	}
+	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
+	}
+	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)
+	}
+	client, err := driver.getClient(account)
+	if err != nil {
+		return nil, err
+	}
+	client = resty.NewWithClient(client.GetClient()).SetRedirectPolicy(
 		resty.RedirectPolicyFunc(func(req *http.Request, via []*http.Request) error {
 			return http.ErrUseLastResponse
 		}))
@@ -75,43 +186,88 @@ func (d *Cloud189) Link(ctx context.Context, file model.Obj, args model.LinkArgs
 	}
 	log.Debugln(res.Status())
 	log.Debugln(res.String())
-	link := model.Link{}
+	link := base.Link{
+		Headers: []base.Header{
+			{Name: "User-Agent", Value: base.UserAgent},
+			//{Name: "Authorization", Value: ""},
+		},
+	}
 	log.Debugln("first url:", resp.FileDownloadUrl)
 	if res.StatusCode() == 302 {
-		link.URL = res.Header().Get("location")
+		link.Url = res.Header().Get("location")
-		log.Debugln("second url:", link.URL)
+		log.Debugln("second url:", link.Url)
-		_, _ = client.R().Get(link.URL)
+		_, _ = client.R().Get(link.Url)
 		if res.StatusCode() == 302 {
-			link.URL = res.Header().Get("location")
+			link.Url = res.Header().Get("location")
 		}
-		log.Debugln("third url:", link.URL)
+		log.Debugln("third url:", link.Url)
 	} else {
-		link.URL = resp.FileDownloadUrl
+		link.Url = resp.FileDownloadUrl
 	}
-	link.URL = strings.Replace(link.URL, "http://", "https://", 1)
+	link.Url = strings.Replace(link.Url, "http://", "https://", 1)
 	return &link, nil
 }
 
-func (d *Cloud189) MakeDir(ctx context.Context, parentDir model.Obj, dirName string) error {
+func (driver Cloud189) Path(path string, account *model.Account) (*model.File, []model.File, error) {
-	form := map[string]string{
+	path = utils.ParsePath(path)
-		"parentFolderId": parentDir.GetID(),
+	log.Debugf("189 path: %s", path)
-		"folderName":     dirName,
+	file, err := driver.File(path, account)
+	if err != nil {
+		return nil, nil, err
 	}
-	_, err := d.request("https://cloud.189.cn/api/open/file/createFolder.action", http.MethodPost, func(req *resty.Request) {
+	if !file.IsDir() {
-		req.SetFormData(form)
+		return file, nil, nil
-	}, nil)
+	}
+	files, err := driver.Files(path, account)
+	if err != nil {
+		return nil, nil, err
+	}
+	return nil, files, nil
+}
+
+//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
+}
+
+func (driver Cloud189) MakeDir(path string, account *model.Account) error {
+	dir, name := filepath.Split(path)
+	parent, err := driver.File(dir, account)
+	if err != nil {
+		return err
+	}
+	if !parent.IsDir() {
+		return base.ErrNotFolder
+	}
+	form := map[string]string{
+		"parentFolderId": parent.Id,
+		"folderName":     name,
+	}
+	_, err = driver.Request("https://cloud.189.cn/api/open/file/createFolder.action", base.Post, nil, form, nil, account)
 	return err
 }
 
-func (d *Cloud189) Move(ctx context.Context, srcObj, dstDir model.Obj) error {
+func (driver Cloud189) Move(src string, dst string, account *model.Account) error {
+	dstDir, dstName := 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
+	}
 	isFolder := 0
-	if srcObj.IsDir() {
+	if srcFile.IsDir() {
 		isFolder = 1
 	}
 	taskInfos := []base.Json{
 		{
-			"fileId":   srcObj.GetID(),
+			"fileId":   srcFile.Id,
-			"fileName": srcObj.GetName(),
+			"fileName": dstName,
 			"isFolder": isFolder,
 		},
 	}
@@ -121,43 +277,53 @@ func (d *Cloud189) Move(ctx context.Context, srcObj, dstDir model.Obj) error {
 	}
 	form := map[string]string{
 		"type":           "MOVE",
-		"targetFolderId": dstDir.GetID(),
+		"targetFolderId": dstDirFile.Id,
 		"taskInfos":      string(taskInfosBytes),
 	}
-	_, err = d.request("https://cloud.189.cn/api/open/batch/createBatchTask.action", http.MethodPost, func(req *resty.Request) {
+	_, err = driver.Request("https://cloud.189.cn/api/open/batch/createBatchTask.action", base.Post, nil, form, nil, account)
-		req.SetFormData(form)
-	}, nil)
 	return err
 }
 
-func (d *Cloud189) Rename(ctx context.Context, srcObj model.Obj, newName string) error {
+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 srcObj.IsDir() {
+	if srcFile.IsDir() {
 		url = "https://cloud.189.cn/api/open/file/renameFolder.action"
 		idKey = "folderId"
 		nameKey = "destFolderName"
 	}
 	form := map[string]string{
-		idKey:   srcObj.GetID(),
+		idKey:   srcFile.Id,
-		nameKey: newName,
+		nameKey: dstName,
 	}
-	_, err := d.request(url, http.MethodPost, func(req *resty.Request) {
+	_, err = driver.Request(url, base.Post, nil, form, nil, account)
-		req.SetFormData(form)
-	}, nil)
 	return err
 }
 
-func (d *Cloud189) Copy(ctx context.Context, srcObj, dstDir model.Obj) error {
+func (driver Cloud189) Copy(src string, dst string, account *model.Account) error {
+	dstDir, dstName := 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
+	}
 	isFolder := 0
-	if srcObj.IsDir() {
+	if srcFile.IsDir() {
 		isFolder = 1
 	}
 	taskInfos := []base.Json{
 		{
-			"fileId":   srcObj.GetID(),
+			"fileId":   srcFile.Id,
-			"fileName": srcObj.GetName(),
+			"fileName": dstName,
 			"isFolder": isFolder,
 		},
 	}
@@ -167,24 +333,27 @@ func (d *Cloud189) Copy(ctx context.Context, srcObj, dstDir model.Obj) error {
 	}
 	form := map[string]string{
 		"type":           "COPY",
-		"targetFolderId": dstDir.GetID(),
+		"targetFolderId": dstDirFile.Id,
 		"taskInfos":      string(taskInfosBytes),
 	}
-	_, err = d.request("https://cloud.189.cn/api/open/batch/createBatchTask.action", http.MethodPost, func(req *resty.Request) {
+	_, err = driver.Request("https://cloud.189.cn/api/open/batch/createBatchTask.action", base.Post, nil, form, nil, account)
-		req.SetFormData(form)
-	}, nil)
 	return err
 }
 
-func (d *Cloud189) Remove(ctx context.Context, obj model.Obj) error {
+func (driver Cloud189) Delete(path string, account *model.Account) error {
+	path = utils.ParsePath(path)
+	file, err := driver.File(path, account)
+	if err != nil {
+		return err
+	}
 	isFolder := 0
-	if obj.IsDir() {
+	if file.IsDir() {
 		isFolder = 1
 	}
 	taskInfos := []base.Json{
 		{
-			"fileId":   obj.GetID(),
+			"fileId":   file.Id,
-			"fileName": obj.GetName(),
+			"fileName": file.Name,
 			"isFolder": isFolder,
 		},
 	}
@@ -197,14 +366,17 @@ func (d *Cloud189) Remove(ctx context.Context, obj model.Obj) error {
 		"targetFolderId": "",
 		"taskInfos":      string(taskInfosBytes),
 	}
-	_, err = d.request("https://cloud.189.cn/api/open/batch/createBatchTask.action", http.MethodPost, func(req *resty.Request) {
+	_, err = driver.Request("https://cloud.189.cn/api/open/batch/createBatchTask.action", base.Post, nil, form, nil, account)
-		req.SetFormData(form)
-	}, nil)
 	return err
 }
 
-func (d *Cloud189) Put(ctx context.Context, dstDir model.Obj, stream model.FileStreamer, up driver.UpdateProgress) error {
+func (driver Cloud189) Upload(file *model.FileStream, account *model.Account) error {
-	return d.newUpload(dstDir, stream, up)
+	//return base.ErrNotImplement
+	if file == nil {
+		return base.ErrEmptyFile
+	}
+	return driver.NewUpload(file, account)
+	//return driver.OldUpload(file, account)
 }
 
-var _ driver.Driver = (*Cloud189)(nil)
+var _ base.Driver = (*Cloud189)(nil)

drivers/189/help.go

@@ -1,186 +0,0 @@
-package _189
-
-import (
-	"bytes"
-	"crypto/aes"
-	"crypto/hmac"
-	"crypto/md5"
-	"crypto/rand"
-	"crypto/rsa"
-	"crypto/sha1"
-	"crypto/x509"
-	"encoding/base64"
-	"encoding/hex"
-	"encoding/pem"
-	"fmt"
-	"net/url"
-	"regexp"
-	"strconv"
-	"strings"
-
-	myrand "github.com/alist-org/alist/v3/pkg/utils/random"
-	log "github.com/sirupsen/logrus"
-)
-
-func random() string {
-	return fmt.Sprintf("0.%17v", myrand.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 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 * myrand.Rand.Float32())
-		if msg[0] == 120 {
-			i = t
-		} else {
-			i = 3&t | 8
-		}
-		return []byte(strconv.FormatInt(i, 16))
-	})
-	return string(data)
-}

drivers/189/meta.go

@@ -1,24 +0,0 @@
-package _189
-
-import (
-	"github.com/alist-org/alist/v3/internal/driver"
-	"github.com/alist-org/alist/v3/internal/op"
-)
-
-type Addition struct {
-	Username string `json:"username" required:"true"`
-	Password string `json:"password" required:"true"`
-	driver.RootID
-}
-
-var config = driver.Config{
-	Name:        "189Cloud",
-	LocalSort:   true,
-	DefaultRoot: "-11",
-}
-
-func init() {
-	op.RegisterDriver(config, func() driver.Driver {
-		return &Cloud189{}
-	})
-}

drivers/189/types.go

@@ -1,17 +1,17 @@
-package _189
+package _89
 
-type LoginResp struct {
+import (
-	Msg    string `json:"msg"`
+	"github.com/Xhofe/alist/conf"
-	Result int    `json:"result"`
+	"github.com/Xhofe/alist/utils"
-	ToUrl  string `json:"toUrl"`
+	"path"
-}
+)
 
-type Error struct {
+type Cloud189Error struct {
 	ErrorCode string `json:"errorCode"`
 	ErrorMsg  string `json:"errorMsg"`
 }
 
-type File struct {
+type Cloud189File struct {
 	Id         int64  `json:"id"`
 	LastOpTime string `json:"lastOpTime"`
 	Name       string `json:"name"`
@@ -23,19 +23,37 @@ type File struct {
 	Url string `json:"url"`
 }
 
-type Folder struct {
+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 Files struct {
+type Cloud189Files struct {
 	ResCode    int    `json:"res_code"`
 	ResMessage string `json:"res_message"`
 	FileListAO struct {
-		Count      int      `json:"count"`
+		Count      int              `json:"count"`
-		FileList   []File   `json:"fileList"`
+		FileList   []Cloud189File   `json:"fileList"`
-		FolderList []Folder `json:"folderList"`
+		FolderList []Cloud189Folder `json:"folderList"`
 	} `json:"fileListAO"`
 }
 
@@ -49,13 +67,18 @@ type Part struct {
 	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 Down struct {
+type Cloud189Down struct {
 	ResCode         int    `json:"res_code"`
 	ResMessage      string `json:"res_message"`
 	FileDownloadUrl string `json:"fileDownloadUrl"`

drivers/189/util.go

@@ -1,394 +1,199 @@
-package _189
+package _89
 
 import (
 	"bytes"
+	"crypto/aes"
+	"crypto/hmac"
 	"crypto/md5"
+	"crypto/rand"
+	"crypto/rsa"
+	"crypto/sha1"
+	"crypto/x509"
 	"encoding/base64"
 	"encoding/hex"
-	"errors"
+	"encoding/pem"
 	"fmt"
-	"io"
+	"github.com/Xhofe/alist/drivers/base"
-	"math"
+	"github.com/Xhofe/alist/utils"
-	"net/http"
+	"github.com/go-resty/resty/v2"
+	log "github.com/sirupsen/logrus"
+	"net/url"
 	"regexp"
 	"strconv"
 	"strings"
-	"time"
-
-	"github.com/alist-org/alist/v3/drivers/base"
-	"github.com/alist-org/alist/v3/internal/conf"
-	"github.com/alist-org/alist/v3/internal/driver"
-	"github.com/alist-org/alist/v3/internal/model"
-	"github.com/alist-org/alist/v3/internal/setting"
-	"github.com/alist-org/alist/v3/pkg/utils"
-	myrand "github.com/alist-org/alist/v3/pkg/utils/random"
-	"github.com/go-resty/resty/v2"
-	jsoniter "github.com/json-iterator/go"
-	log "github.com/sirupsen/logrus"
 )
 
-// do others that not defined in Driver interface
+func random() string {
-
+	return fmt.Sprintf("0.%17v", utils.Rand.Int63n(100000000000000000))
-func (d *Cloud189) login() error {
-	url := "https://cloud.189.cn/api/portal/loginUrl.action?redirectURL=https%3A%2F%2Fcloud.189.cn%2Fmain.action"
-	b := ""
-	lt := ""
-	ltText := regexp.MustCompile(`lt = "(.+?)"`)
-	var res *resty.Response
-	var err error
-	for i := 0; i < 3; i++ {
-		res, err = d.client.R().Get(url)
-		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 {
-			lt = ltTextArr[1]
-			break
-		} else {
-			<-time.After(time.Second)
-		}
-	}
-	if lt == "" {
-		return fmt.Errorf("get page: %s \nstatus: %d \nrequest url: %s\nredirect url: %s",
-			b, res.StatusCode(), res.RawResponse.Request.URL.String(), res.Header().Get("location"))
-	}
-	captchaToken := regexp.MustCompile(`captchaToken' value='(.+?)'`).FindStringSubmatch(b)[1]
-	returnUrl := regexp.MustCompile(`returnUrl = '(.+?)'`).FindStringSubmatch(b)[1]
-	paramId := regexp.MustCompile(`paramId = "(.+?)"`).FindStringSubmatch(b)[1]
-	//reqId := regexp.MustCompile(`reqId = "(.+?)"`).FindStringSubmatch(b)[1]
-	jRsakey := regexp.MustCompile(`j_rsaKey" value="(\S+)"`).FindStringSubmatch(b)[1]
-	vCodeID := regexp.MustCompile(`picCaptcha\.do\?token\=([A-Za-z0-9\&\=]+)`).FindStringSubmatch(b)[1]
-	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 := d.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
-		}
-		// Enter the verification code manually
-		//err = message.GetMessenger().WaitSend(message.Message{
-		//	Type:    "image",
-		//	Content: "data:image/png;base64," + base64.StdEncoding.EncodeToString(imgRes.Body()),
-		//}, 10)
-		//if err != nil {
-		//	return err
-		//}
-		//vCodeRS, err = message.GetMessenger().WaitReceive(30)
-		// use ocr api
-		vRes, err := base.RestyClient.R().SetMultipartField(
-			"image", "validateCode.png", "image/png", bytes.NewReader(imgRes.Body())).
-			Post(setting.GetStr(conf.OcrApi))
-		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(d.Username), jRsakey, true)
-	passwordRsa := RsaEncode([]byte(d.Password), jRsakey, true)
-	url = "https://open.e.189.cn/api/logbox/oauth2/loginSubmit.do"
-	var loginResp LoginResp
-	res, err = d.client.R().
-		SetHeaders(map[string]string{
-			"lt":         lt,
-			"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",
-			"Referer":    "https://open.e.189.cn/",
-			"accept":     "application/json;charset=UTF-8",
-		}).SetFormData(map[string]string{
-		"appKey":       "cloud",
-		"accountType":  "01",
-		"userName":     "{RSA}" + userRsa,
-		"password":     "{RSA}" + passwordRsa,
-		"validateCode": vCodeRS,
-		"captchaToken": captchaToken,
-		"returnUrl":    returnUrl,
-		"mailSuffix":   "@pan.cn",
-		"paramId":      paramId,
-		"clientType":   "10010",
-		"dynamicCheck": "FALSE",
-		"cb_SaveName":  "1",
-		"isOauth2":     "false",
-	}).Post(url)
-	if err != nil {
-		return err
-	}
-	err = utils.Json.Unmarshal(res.Body(), &loginResp)
-	if err != nil {
-		log.Error(err.Error())
-		return err
-	}
-	if loginResp.Result != 0 {
-		return fmt.Errorf(loginResp.Msg)
-	}
-	_, err = d.client.R().Get(loginResp.ToUrl)
-	return err
 }
 
-func (d *Cloud189) request(url string, method string, callback base.ReqCallback, resp interface{}) ([]byte, error) {
+func RsaEncode(origData []byte, j_rsakey string, hex bool) string {
-	var e Error
+	publicKey := []byte("-----BEGIN PUBLIC KEY-----\n" + j_rsakey + "\n-----END PUBLIC KEY-----")
-	req := d.client.R().SetError(&e).
+	block, _ := pem.Decode(publicKey)
-		SetHeader("Accept", "application/json;charset=UTF-8").
+	pubInterface, _ := x509.ParsePKIXPublicKey(block.Bytes)
-		SetQueryParams(map[string]string{
+	pub := pubInterface.(*rsa.PublicKey)
-			"noCache": random(),
+	b, err := rsa.EncryptPKCS1v15(rand.Reader, pub, origData)
-		})
-	if callback != nil {
-		callback(req)
-	}
-	if resp != nil {
-		req.SetResult(resp)
-	}
-	res, err := req.Execute(method, url)
 	if err != nil {
-		return nil, err
+		log.Errorf("err: %s", err.Error())
 	}
-	//log.Debug(res.String())
+	res := base64.StdEncoding.EncodeToString(b)
-	if e.ErrorCode != "" {
+	if hex {
-		if e.ErrorCode == "InvalidSessionKey" {
+		return b64tohex(res)
-			err = d.login()
+	}
-			if err != nil {
+	return res
-				return nil, err
+}
+
+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)
 			}
-			return d.request(url, method, callback, resp)
 		}
 	}
-	if jsoniter.Get(res.Body(), "res_code").ToInt() != 0 {
+	if e == 1 {
-		err = errors.New(jsoniter.Get(res.Body(), "res_message").ToString())
+		d += int2char(c << 2)
 	}
-	return res.Body(), err
+	return d
 }
 
-func (d *Cloud189) getFiles(fileId string) ([]model.Obj, error) {
+func qs(form map[string]string) string {
-	res := make([]model.Obj, 0)
+	f := make(url.Values)
-	pageNum := 1
+	for k, v := range form {
-	loc, _ := time.LoadLocation("Local")
+		f.Set(k, v)
-	for {
+	}
-		var resp Files
+	return EncodeParam(f)
-		_, err := d.request("https://cloud.189.cn/api/open/file/listFiles.action", http.MethodGet, func(req *resty.Request) {
+	//strList := make([]string, 0)
-			req.SetQueryParams(map[string]string{
+	//for k, v := range form {
-				//"noCache":    random(),
+	//	strList = append(strList, fmt.Sprintf("%s=%s", k, url.QueryEscape(v)))
-				"pageSize":   "60",
+	//}
-				"pageNum":    strconv.Itoa(pageNum),
+	//return strings.Join(strList, "&")
-				"mediaType":  "0",
+}
-				"folderId":   fileId,
+
-				"iconOption": "5",
+func EncodeParam(v url.Values) string {
-				"orderBy":    "lastOpTime", //account.OrderBy
+	if v == nil {
-				"descending": "true",       //account.OrderDirection
+		return ""
-			})
+	}
-		}, &resp)
+	var buf strings.Builder
-		if err != nil {
+	keys := make([]string, 0, len(v))
-			return nil, err
+	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)
+			//}
 		}
-		if resp.FileListAO.Count == 0 {
+	}
-			break
+	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
 		}
-		for _, folder := range resp.FileListAO.FolderList {
+		return []byte(strconv.FormatInt(i, 16))
-			lastOpTime, _ := time.ParseInLocation("2006-01-02 15:04:05", folder.LastOpTime, loc)
-			res = append(res, &model.Object{
-				ID:       strconv.FormatInt(folder.Id, 10),
-				Name:     folder.Name,
-				Modified: lastOpTime,
-				IsFolder: true,
-			})
-		}
-		for _, file := range resp.FileListAO.FileList {
-			lastOpTime, _ := time.ParseInLocation("2006-01-02 15:04:05", file.LastOpTime, loc)
-			res = append(res, &model.ObjThumb{
-				Object: model.Object{
-					ID:       strconv.FormatInt(file.Id, 10),
-					Name:     file.Name,
-					Modified: lastOpTime,
-				},
-				Thumbnail: model.Thumbnail{Thumbnail: file.Icon.SmallUrl},
-			})
-		}
-		pageNum++
-	}
-	return res, nil
-}
-
-func (d *Cloud189) oldUpload(dstDir model.Obj, file model.FileStreamer) error {
-	res, err := d.client.R().SetMultipartFormData(map[string]string{
-		"parentId":   dstDir.GetID(),
-		"sessionKey": "??",
-		"opertype":   "1",
-		"fname":      file.GetName(),
-	}).SetMultipartField("Filedata", file.GetName(), file.GetMimetype(), file).Post("https://hb02.upload.cloud.189.cn/v1/DCIWebUploadAction")
-	if err != nil {
-		return err
-	}
-	if utils.Json.Get(res.Body(), "MD5").ToString() != "" {
-		return nil
-	}
-	log.Debugf(res.String())
-	return errors.New(res.String())
-}
-
-func (d *Cloud189) getSessionKey() (string, error) {
-	resp, err := d.request("https://cloud.189.cn/v2/getUserBriefInfo.action", http.MethodGet, nil, nil)
-	if err != nil {
-		return "", err
-	}
-	sessionKey := utils.Json.Get(resp, "sessionKey").ToString()
-	return sessionKey, nil
-}
-
-func (d *Cloud189) getResKey() (string, string, error) {
-	now := time.Now().UnixMilli()
-	if d.rsa.Expire > now {
-		return d.rsa.PubKey, d.rsa.PkId, nil
-	}
-	resp, err := d.request("https://cloud.189.cn/api/security/generateRsaKey.action", http.MethodGet, nil, nil)
-	if err != nil {
-		return "", "", err
-	}
-	pubKey, pkId := utils.Json.Get(resp, "pubKey").ToString(), utils.Json.Get(resp, "pkId").ToString()
-	d.rsa.PubKey, d.rsa.PkId = pubKey, pkId
-	d.rsa.Expire = utils.Json.Get(resp, "expire").ToInt64()
-	return pubKey, pkId, nil
-}
-
-func (d *Cloud189) uploadRequest(uri string, form map[string]string, 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*myrand.Rand.Float32())]
-
-	e := qs(form)
-	data := AesEncrypt([]byte(e), []byte(l[0:16]))
-	h := hex.EncodeToString(data)
-
-	sessionKey := d.sessionKey
-	signature := hmacSha1(fmt.Sprintf("SessionKey=%s&Operate=GET&RequestURI=%s&Date=%s&params=%s", sessionKey, uri, c, h), l)
-
-	pubKey, pkId, err := d.getResKey()
-	if err != nil {
-		return nil, err
-	}
-	b := RsaEncode([]byte(l), pubKey, false)
-	req := d.client.R().SetHeaders(map[string]string{
-		"accept":         "application/json;charset=UTF-8",
-		"SessionKey":     sessionKey,
-		"Signature":      signature,
-		"X-Request-Date": c,
-		"X-Request-ID":   r,
-		"EncryptionText": b,
-		"PkId":           pkId,
 	})
-	if resp != nil {
+	return string(data)
-		req.SetResult(resp)
-	}
-	res, err := req.Get("https://upload.cloud.189.cn" + uri + "?params=" + h)
-	if err != nil {
-		return nil, err
-	}
-	data = res.Body()
-	if utils.Json.Get(data, "code").ToString() != "SUCCESS" {
-		return nil, errors.New(uri + "---" + jsoniter.Get(data, "msg").ToString())
-	}
-	return data, nil
 }
 
-func (d *Cloud189) newUpload(dstDir model.Obj, file model.FileStreamer, up driver.UpdateProgress) error {
+//func SHA1(v, l string) []byte {
-	sessionKey, err := d.getSessionKey()
+//	key := []byte(l)
-	if err != nil {
+//	mac := hmac.New(sha1.New, key)
-		return err
+//	mac.Write([]byte(v))
-	}
+//	return mac.Sum(nil)
-	d.sessionKey = sessionKey
+//}
-	const DEFAULT int64 = 10485760
-	var count = int64(math.Ceil(float64(file.GetSize()) / float64(DEFAULT)))
-
-	res, err := d.uploadRequest("/person/initMultiUpload", map[string]string{
-		"parentFolderId": dstDir.GetID(),
-		"fileName":       encode(file.GetName()),
-		"fileSize":       strconv.FormatInt(file.GetSize(), 10),
-		"sliceSize":      strconv.FormatInt(DEFAULT, 10),
-		"lazyCheck":      "1",
-	}, nil)
-	if err != nil {
-		return err
-	}
-	uploadFileId := jsoniter.Get(res, "data", "uploadFileId").ToString()
-	//_, err = d.uploadRequest("/person/getUploadedPartsInfo", map[string]string{
-	//	"uploadFileId": uploadFileId,
-	//}, nil)
-	var finish int64 = 0
-	var i int64
-	var byteSize int64
-	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 += int64(n)
-		md5Bytes := getMd5(byteData)
-		md5Hex := hex.EncodeToString(md5Bytes)
-		md5Base64 := base64.StdEncoding.EncodeToString(md5Bytes)
-		md5s = append(md5s, strings.ToUpper(md5Hex))
-		md5Sum.Write(byteData)
-		var resp UploadUrlsResp
-		res, err = d.uploadRequest("/person/getMultiUploadUrls", map[string]string{
-			"partInfo":     fmt.Sprintf("%s-%s", strconv.FormatInt(i, 10), md5Base64),
-			"uploadFileId": uploadFileId,
-		}, &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:])
-		}
-
-		r, err := base.HttpClient.Do(req)
-		log.Debugf("%+v %+v", r, r.Request.Header)
-		r.Body.Close()
-		if err != nil {
-			return err
-		}
-		up(int(i * 100 / count))
-	}
-	fileMd5 := hex.EncodeToString(md5Sum.Sum(nil))
-	sliceMd5 := fileMd5
-	if file.GetSize() > DEFAULT {
-		sliceMd5 = utils.GetMD5Encode(strings.Join(md5s, "\n"))
-	}
-	res, err = d.uploadRequest("/person/commitMultiUploadFile", map[string]string{
-		"uploadFileId": uploadFileId,
-		"fileMd5":      fileMd5,
-		"sliceMd5":     sliceMd5,
-		"lazyCheck":    "1",
-		"opertype":     "3",
-	}, nil)
-	return err
-}

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/meta.go

@@ -1,29 +0,0 @@
-package _189pc
-
-import (
-	"github.com/alist-org/alist/v3/internal/driver"
-	"github.com/alist-org/alist/v3/internal/op"
-)
-
-type Addition struct {
-	Username string `json:"username" required:"true"`
-	Password string `json:"password" required:"true"`
-	VCode    string `json:"validate_code"`
-	driver.RootID
-	OrderBy        string `json:"order_by" type:"select" options:"filename,filesize,lastOpTime" default:"filename"`
-	OrderDirection string `json:"order_direction" type:"select" options:"asc,desc" default:"asc"`
-	Type           string `json:"type" type:"select" options:"personal,family" default:"personal"`
-	FamilyID       string `json:"family_id"`
-	RapidUpload    bool   `json:"rapid_upload"`
-}
-
-var config = driver.Config{
-	Name:        "189CloudPC",
-	DefaultRoot: "-11",
-}
-
-func init() {
-	op.RegisterDriver(config, func() driver.Driver {
-		return &Yun189PC{}
-	})
-}

drivers/189pc/type.go

@@ -1,15 +1,20 @@
-package _189pc
+package _189
 
-import (
+import "encoding/xml"
-	"encoding/xml"
+
-	"fmt"
+type LoginParam struct {
-	"sort"
+	CaptchaToken string
-	"strings"
+	Lt           string
-	"time"
+	ParamId      string
-)
+	ReqId        string
+	jRsaKey      string
+
+	vCodeID string
+	vCodeRS string
+}
 
 // 居然有四种返回方式
-type RespErr struct {
+type Erron struct {
 	ResCode    string `json:"res_code"`
 	ResMessage string `json:"res_message"`
 
@@ -24,43 +29,6 @@ type RespErr struct {
 	ErrorMsg  string `json:"errorMsg"`
 }
 
-// 登陆需要的参数
-type LoginParam struct {
-	// 加密后的用户名和密码
-	RsaUsername string
-	RsaPassword string
-
-	// rsa密钥
-	jRsaKey string
-
-	// 请求头参数
-	Lt    string
-	ReqId string
-
-	// 表单参数
-	ParamId string
-
-	// 验证码
-	CaptchaToken string
-}
-
-// 登陆加密相关
-type EncryptConfResp struct {
-	Result int `json:"result"`
-	Data   struct {
-		UpSmsOn   string `json:"upSmsOn"`
-		Pre       string `json:"pre"`
-		PreDomain string `json:"preDomain"`
-		PubKey    string `json:"pubKey"`
-	} `json:"data"`
-}
-
-type LoginResp struct {
-	Msg    string `json:"msg"`
-	Result int    `json:"result"`
-	ToUrl  string `json:"toUrl"`
-}
-
 // 刷新session返回
 type UserSessionResp struct {
 	ResCode    int    `json:"res_code"`
@@ -80,8 +48,8 @@ type UserSessionResp struct {
 	FamilySessionSecret string `json:"familySessionSecret"`
 }
 
-// 登录返回
+//登录返回
-type AppSessionResp struct {
+type appSessionResp struct {
 	UserSessionResp
 
 	IsSaveName string `json:"isSaveName"`
@@ -92,7 +60,6 @@ type AppSessionResp struct {
 	RefreshToken string `json:"refreshToken"`
 }
 
-// 家庭云账户
 type FamilyInfoListResp struct {
 	FamilyInfoResp []FamilyInfoResp `json:"familyInfoResp"`
 }
@@ -129,23 +96,8 @@ type Cloud189File struct {
 	Rev         string `json:"rev"`
 	Size        int64  `json:"size"`
 	StarLabel   int64  `json:"starLabel"`
-
-	parseTime *time.Time
 }
 
-func (c *Cloud189File) GetSize() int64  { return c.Size }
-func (c *Cloud189File) GetName() string { return c.Name }
-func (c *Cloud189File) ModTime() time.Time {
-	if c.parseTime == nil {
-		c.parseTime = MustParseTime(c.LastOpTime)
-	}
-	return *c.parseTime
-}
-func (c *Cloud189File) IsDir() bool     { return false }
-func (c *Cloud189File) GetID() string   { return fmt.Sprint(c.ID) }
-func (c *Cloud189File) GetPath() string { return "" }
-func (c *Cloud189File) Thumb() string   { return c.Icon.SmallUrl }
-
 // 文件夹
 type Cloud189Folder struct {
 	ID       int64  `json:"id"`
@@ -161,22 +113,8 @@ type Cloud189Folder struct {
 	FileListSize int64  `json:"fileListSize"`
 	Rev          string `json:"rev"`
 	StarLabel    int64  `json:"starLabel"`
-
-	parseTime *time.Time
 }
 
-func (c *Cloud189Folder) GetSize() int64  { return 0 }
-func (c *Cloud189Folder) GetName() string { return c.Name }
-func (c *Cloud189Folder) ModTime() time.Time {
-	if c.parseTime == nil {
-		c.parseTime = MustParseTime(c.LastOpTime)
-	}
-	return *c.parseTime
-}
-func (c *Cloud189Folder) IsDir() bool     { return true }
-func (c *Cloud189Folder) GetID() string   { return fmt.Sprint(c.ID) }
-func (c *Cloud189Folder) GetPath() string { return "" }
-
 type Cloud189FilesResp struct {
 	//ResCode    int    `json:"res_code"`
 	//ResMessage string `json:"res_message"`
@@ -199,7 +137,29 @@ type BatchTaskInfo struct {
 	//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 {
@@ -213,34 +173,8 @@ 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 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 i := range keys {
-		if buf.Len() > 0 {
-			buf.WriteByte('&')
-		}
-		buf.WriteString(keys[i])
-		buf.WriteByte('=')
-		buf.WriteString(p[keys[i]])
-	}
-	return buf.String()
-}

drivers/189pc/util.go

@@ -1,4 +1,4 @@
-package _189pc
+package _189
 
 import (
 	"bytes"
@@ -8,32 +8,52 @@ import (
 	"crypto/rsa"
 	"crypto/sha1"
 	"crypto/x509"
+	"encoding/base64"
 	"encoding/hex"
 	"encoding/pem"
 	"fmt"
+	rand2 "math/rand"
 	"net/http"
-	"regexp"
+	"net/url"
+	"sort"
 	"strings"
 	"time"
 
-	"github.com/alist-org/alist/v3/pkg/utils/random"
+	"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 {
-	rand := random.Rand
 	return map[string]string{
 		"clientType": PC,
 		"version":    VERSION,
 		"channelId":  CHANNEL_ID,
-		"rand":       fmt.Sprintf("%d_%d", rand.Int63n(1e5), rand.Int63n(1e10)),
+		"rand":       fmt.Sprintf("%d_%d", rand2.Int63n(1e5), rand2.Int63n(1e10)),
 	}
 }
 
 // 带params的SignatureOfHmac HMAC签名
 func signatureOfHmac(sessionSecret, sessionKey, operate, fullUrl, dateOfGmt, param string) string {
-	urlpath := regexp.MustCompile(`://[^/]+((/[^/\s?#]+)*)`).FindStringSubmatch(fullUrl)[1]
+	u, _ := url.Parse(fullUrl)
 	mac := hmac.New(sha1.New, []byte(sessionSecret))
-	data := fmt.Sprintf("SessionKey=%s&Operate=%s&RequestURI=%s&Date=%s", sessionKey, operate, urlpath, dateOfGmt)
+	data := fmt.Sprintf("SessionKey=%s&Operate=%s&RequestURI=%s&Date=%s", sessionKey, operate, u.Path, dateOfGmt)
 	if param != "" {
 		data += fmt.Sprintf("&params=%s", param)
 	}
@@ -41,12 +61,17 @@ func signatureOfHmac(sessionSecret, sessionKey, operate, fullUrl, dateOfGmt, par
 	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 {
+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 strings.ToUpper(hex.EncodeToString(data))
+	return base64ToHex(base64.StdEncoding.EncodeToString(data))
 }
 
 // aes 加密params
@@ -67,19 +92,18 @@ func PKCS7Padding(ciphertext []byte, blockSize int) []byte {
 	return append(ciphertext, padtext...)
 }
 
-// 获取http规范的时间
-func getHttpDateStr() string {
-	return time.Now().UTC().Format(http.TimeFormat)
-}
-
 // 时间戳
 func timestamp() int64 {
 	return time.Now().UTC().UnixNano() / 1e6
 }
 
-func MustParseTime(str string) *time.Time {
+func base64ToHex(a string) string {
-	lastOpTime, _ := time.ParseInLocation("2006-01-02 15:04:05 -07", str+" +08", time.Local)
+	v, _ := base64.StdEncoding.DecodeString(a)
-	return &lastOpTime
+	return strings.ToUpper(hex.EncodeToString(v))
+}
+
+func isFamily(account *model.Account) bool {
+	return account.InternalType == "Family"
 }
 
 func toFamilyOrderBy(o string) string {
@@ -95,17 +119,6 @@ func toFamilyOrderBy(o string) string {
 	}
 }
 
-func toDesc(o string) string {
-	switch o {
-	case "desc":
-		return "true"
-	case "asc":
-		fallthrough
-	default:
-		return "false"
-	}
-}
-
 func ParseHttpHeader(str string) map[string]string {
 	header := make(map[string]string)
 	for _, value := range strings.Split(str, "&") {
@@ -129,3 +142,36 @@ func BoolToNumber(b bool) int {
 	}
 	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/189pc/utils.go

@@ -1,658 +0,0 @@
-package _189pc
-
-import (
-	"bytes"
-	"context"
-	"crypto/md5"
-	"encoding/base64"
-	"encoding/hex"
-	"fmt"
-	"io"
-	"math"
-	"net/http"
-	"net/http/cookiejar"
-	"net/url"
-	"os"
-	"regexp"
-	"strings"
-
-	"github.com/alist-org/alist/v3/drivers/base"
-	"github.com/alist-org/alist/v3/internal/conf"
-	"github.com/alist-org/alist/v3/internal/driver"
-	"github.com/alist-org/alist/v3/internal/model"
-	"github.com/alist-org/alist/v3/internal/op"
-	"github.com/alist-org/alist/v3/internal/setting"
-	"github.com/alist-org/alist/v3/pkg/utils"
-	"github.com/go-resty/resty/v2"
-	"github.com/google/uuid"
-	jsoniter "github.com/json-iterator/go"
-)
-
-const (
-	ACCOUNT_TYPE = "02"
-	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 (y *Yun189PC) request(url, method string, callback base.ReqCallback, params Params, resp interface{}) ([]byte, error) {
-	dateOfGmt := getHttpDateStr()
-	sessionKey := y.tokenInfo.SessionKey
-	sessionSecret := y.tokenInfo.SessionSecret
-	if y.isFamily() {
-		sessionKey = y.tokenInfo.FamilySessionKey
-		sessionSecret = y.tokenInfo.FamilySessionSecret
-	}
-
-	req := y.client.R().SetQueryParams(clientSuffix()).SetHeaders(map[string]string{
-		"Date":         dateOfGmt,
-		"SessionKey":   sessionKey,
-		"X-Request-ID": uuid.NewString(),
-	})
-
-	// 设置params
-	var paramsData string
-	if params != nil {
-		paramsData = AesECBEncrypt(params.Encode(), sessionSecret[:16])
-		req.SetQueryParam("params", paramsData)
-	}
-	req.SetHeader("Signature", signatureOfHmac(sessionSecret, sessionKey, method, url, dateOfGmt, paramsData))
-
-	if callback != nil {
-		callback(req)
-	}
-	if resp != nil {
-		req.SetResult(resp)
-	}
-	res, err := req.Execute(method, url)
-	if err != nil {
-		return nil, err
-	}
-	var erron RespErr
-	utils.Json.Unmarshal(res.Body(), &erron)
-
-	if erron.ResCode != "" {
-		return nil, fmt.Errorf("res_code: %s ,res_msg: %s", erron.ResCode, erron.ResMessage)
-	}
-	if erron.Code != "" && erron.Code != "SUCCESS" {
-		if erron.Msg != "" {
-			return nil, fmt.Errorf("code: %s ,msg: %s", erron.Code, erron.Msg)
-		}
-		if erron.Message != "" {
-			return nil, fmt.Errorf("code: %s ,msg: %s", erron.Code, erron.Message)
-		}
-		return nil, fmt.Errorf(res.String())
-	}
-	switch erron.ErrorCode {
-	case "":
-		break
-	case "InvalidSessionKey":
-		if err = y.refreshSession(); err != nil {
-			return nil, err
-		}
-		return y.request(url, method, callback, params, resp)
-	default:
-		return nil, fmt.Errorf("err_code: %s ,err_msg: %s", erron.ErrorCode, erron.ErrorMsg)
-	}
-
-	if strings.Contains(res.String(), "userSessionBO is null") {
-		if err = y.refreshSession(); err != nil {
-			return nil, err
-		}
-		return y.request(url, method, callback, params, resp)
-	}
-
-	resCode := utils.Json.Get(res.Body(), "res_code").ToInt64()
-	message := utils.Json.Get(res.Body(), "res_message").ToString()
-	switch resCode {
-	case 0:
-		return res.Body(), nil
-	default:
-		return nil, fmt.Errorf("res_code: %d ,res_msg: %s", resCode, message)
-	}
-}
-
-func (y *Yun189PC) get(url string, callback base.ReqCallback, resp interface{}) ([]byte, error) {
-	return y.request(url, http.MethodGet, callback, nil, resp)
-}
-
-func (y *Yun189PC) post(url string, callback base.ReqCallback, resp interface{}) ([]byte, error) {
-	return y.request(url, http.MethodPost, callback, nil, resp)
-}
-
-func (y *Yun189PC) getFiles(ctx context.Context, fileId string) ([]model.Obj, error) {
-	fullUrl := API_URL
-	if y.isFamily() {
-		fullUrl += "/family/file"
-	}
-	fullUrl += "/listFiles.action"
-
-	res := make([]model.Obj, 0, 130)
-	for pageNum := 1; ; pageNum++ {
-		var resp Cloud189FilesResp
-		_, err := y.get(fullUrl, func(r *resty.Request) {
-			r.SetContext(ctx)
-			r.SetQueryParams(map[string]string{
-				"folderId":   fileId,
-				"fileType":   "0",
-				"mediaAttr":  "0",
-				"iconOption": "5",
-				"pageNum":    fmt.Sprint(pageNum),
-				"pageSize":   "130",
-			})
-			if y.isFamily() {
-				r.SetQueryParams(map[string]string{
-					"familyId":   y.FamilyID,
-					"orderBy":    toFamilyOrderBy(y.OrderBy),
-					"descending": toDesc(y.OrderDirection),
-				})
-			} else {
-				r.SetQueryParams(map[string]string{
-					"recursive":  "0",
-					"orderBy":    y.OrderBy,
-					"descending": toDesc(y.OrderDirection),
-				})
-			}
-		}, &resp)
-		if err != nil {
-			return nil, err
-		}
-		// 获取完毕跳出
-		if resp.FileListAO.Count == 0 {
-			break
-		}
-
-		for i := 0; i < len(resp.FileListAO.FolderList); i++ {
-			res = append(res, &resp.FileListAO.FolderList[i])
-		}
-		for i := 0; i < len(resp.FileListAO.FileList); i++ {
-			res = append(res, &resp.FileListAO.FileList[i])
-		}
-	}
-	return res, nil
-}
-
-func (y *Yun189PC) login() (err error) {
-	// 初始化登陆所需参数
-	if y.loginParam == nil {
-		if err = y.initLoginParam(); err != nil {
-			// 验证码也通过错误返回
-			return err
-		}
-	}
-
-	defer func() {
-		// 销毁验证码
-		y.VCode = ""
-		// 销毁登陆参数
-		y.loginParam = nil
-		// 遇到错误，重新加载登陆参数
-		if err != nil {
-			if err1 := y.initLoginParam(); err1 != nil {
-				err = fmt.Errorf("err1: %s \nerr2: %s", err, err1)
-			}
-		}
-	}()
-
-	param := y.loginParam
-	var loginresp LoginResp
-	_, err = y.client.R().
-		ForceContentType("application/json;charset=UTF-8").SetResult(&loginresp).
-		SetHeaders(map[string]string{
-			"REQID": param.ReqId,
-			"lt":    param.Lt,
-		}).
-		SetFormData(map[string]string{
-			"appKey":       APP_ID,
-			"accountType":  ACCOUNT_TYPE,
-			"userName":     param.RsaUsername,
-			"password":     param.RsaPassword,
-			"validateCode": y.VCode,
-			"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
-	}
-	if loginresp.ToUrl == "" {
-		return fmt.Errorf("login failed,No toUrl obtained, msg: %s", loginresp.Msg)
-	}
-
-	// 获取Session
-	var erron RespErr
-	var tokenInfo AppSessionResp
-	_, err = y.client.R().
-		SetResult(&tokenInfo).SetError(&erron).
-		SetQueryParams(clientSuffix()).
-		SetQueryParam("redirectURL", url.QueryEscape(loginresp.ToUrl)).
-		Post(API_URL + "/getSessionForPC.action")
-	if err != nil {
-		return
-	}
-
-	if erron.ResCode != "" {
-		err = fmt.Errorf(erron.ResMessage)
-		return
-	}
-	if tokenInfo.ResCode != 0 {
-		err = fmt.Errorf(tokenInfo.ResMessage)
-		return
-	}
-	y.tokenInfo = &tokenInfo
-	return
-}
-
-/* 初始化登陆需要的参数
-*  如果遇到验证码返回错误
- */
-func (y *Yun189PC) initLoginParam() error {
-	// 清除cookie
-	jar, _ := cookiejar.New(nil)
-	y.client.SetCookieJar(jar)
-
-	res, err := y.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 err
-	}
-
-	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],
-	}
-
-	// 获取rsa公钥
-	var encryptConf EncryptConfResp
-	_, err = y.client.R().
-		ForceContentType("application/json;charset=UTF-8").SetResult(&encryptConf).
-		SetFormData(map[string]string{"appId": APP_ID}).
-		Post(AUTH_URL + "/api/logbox/config/encryptConf.do")
-	if err != nil {
-		return err
-	}
-
-	param.jRsaKey = fmt.Sprintf("-----BEGIN PUBLIC KEY-----\n%s\n-----END PUBLIC KEY-----", encryptConf.Data.PubKey)
-	param.RsaUsername = encryptConf.Data.Pre + RsaEncrypt(param.jRsaKey, y.Username)
-	param.RsaPassword = encryptConf.Data.Pre + RsaEncrypt(param.jRsaKey, y.Password)
-
-	// 判断是否需要验证码
-	res, err = y.client.R().
-		SetFormData(map[string]string{
-			"appKey":      APP_ID,
-			"accountType": ACCOUNT_TYPE,
-			"userName":    param.RsaUsername,
-		}).
-		Post(AUTH_URL + "/api/logbox/oauth2/needcaptcha.do")
-	if err != nil {
-		return err
-	}
-
-	y.loginParam = &param
-	if res.String() != "0" {
-		imgRes, err := y.client.R().
-			SetQueryParams(map[string]string{
-				"token": param.CaptchaToken,
-				"REQID": param.ReqId,
-				"rnd":   fmt.Sprint(timestamp()),
-			}).
-			Get(AUTH_URL + "/api/logbox/oauth2/picCaptcha.do")
-		if err != nil {
-			return fmt.Errorf("failed to obtain verification code")
-		}
-
-		// 尝试使用ocr
-		vRes, err := base.RestyClient.R().
-			SetMultipartField("image", "validateCode.png", "image/png", bytes.NewReader(imgRes.Body())).
-			Post(setting.GetStr(conf.OcrApi))
-		if err == nil && jsoniter.Get(vRes.Body(), "status").ToInt() == 200 {
-			y.VCode = jsoniter.Get(vRes.Body(), "result").ToString()
-		}
-
-		// ocr无法处理，返回验证码图片给前端
-		if len(y.VCode) != 4 {
-			return fmt.Errorf("need validate code: data:image/png;base64,%s", base64.StdEncoding.EncodeToString(res.Body()))
-		}
-	}
-	return nil
-}
-
-// 刷新会话
-func (y *Yun189PC) refreshSession() (err error) {
-	var erron RespErr
-	var userSessionResp UserSessionResp
-	_, err = y.client.R().
-		SetResult(&userSessionResp).SetError(&erron).
-		SetQueryParams(clientSuffix()).
-		SetQueryParams(map[string]string{
-			"appId":       APP_ID,
-			"accessToken": y.tokenInfo.AccessToken,
-		}).
-		SetHeader("X-Request-ID", uuid.NewString()).
-		Get(API_URL + "/getSessionForPC.action")
-	if err != nil {
-		return err
-	}
-
-	// 错误影响正常访问，下线该储存
-	defer func() {
-		if err != nil {
-			y.GetStorage().SetStatus(fmt.Sprintf("%+v", err.Error()))
-			op.MustSaveDriverStorage(y)
-		}
-	}()
-
-	switch erron.ResCode {
-	case "":
-		break
-	case "UserInvalidOpenToken":
-		if err = y.login(); err != nil {
-			return err
-		}
-	default:
-		err = fmt.Errorf("res_code: %s ,res_msg: %s", erron.ResCode, erron.ResMessage)
-		return
-	}
-
-	switch userSessionResp.ResCode {
-	case 0:
-		y.tokenInfo.UserSessionResp = userSessionResp
-	default:
-		err = fmt.Errorf("code: %d , msg: %s", userSessionResp.ResCode, userSessionResp.ResMessage)
-	}
-	return
-}
-
-// 普通上传
-func (y *Yun189PC) CommonUpload(ctx context.Context, dstDir model.Obj, file model.FileStreamer, up driver.UpdateProgress) (err error) {
-	const DEFAULT int64 = 10485760
-	var count = int64(math.Ceil(float64(file.GetSize()) / float64(DEFAULT)))
-
-	params := Params{
-		"parentFolderId": dstDir.GetID(),
-		"fileName":       url.QueryEscape(file.GetName()),
-		"fileSize":       fmt.Sprint(file.GetSize()),
-		"sliceSize":      fmt.Sprint(DEFAULT),
-		"lazyCheck":      "1",
-	}
-
-	fullUrl := UPLOAD_URL
-	if y.isFamily() {
-		params.Set("familyId", y.FamilyID)
-		fullUrl += "/family"
-	} else {
-		//params.Set("extend", `{"opScene":"1","relativepath":"","rootfolderid":""}`)
-		fullUrl += "/person"
-	}
-
-	// 初始化上传
-	var initMultiUpload InitMultiUploadResp
-	_, err = y.request(fullUrl+"/initMultiUpload", http.MethodGet, func(req *resty.Request) {
-		req.SetContext(ctx)
-	}, params, &initMultiUpload)
-	if err != nil {
-		return err
-	}
-
-	fileMd5 := md5.New()
-	silceMd5 := md5.New()
-	silceMd5Hexs := make([]string, 0, count)
-	byteData := bytes.NewBuffer(make([]byte, DEFAULT))
-	for i := int64(1); i <= count; i++ {
-		select {
-		case <-ctx.Done():
-			return ctx.Err()
-		default:
-		}
-
-		// 读取块
-		byteData.Reset()
-		silceMd5.Reset()
-		_, err := io.CopyN(io.MultiWriter(fileMd5, silceMd5, byteData), file, DEFAULT)
-		if err != io.EOF && err != io.ErrUnexpectedEOF && err != nil {
-			return err
-		}
-
-		// 计算块md5并进行hex和base64编码
-		md5Bytes := silceMd5.Sum(nil)
-		silceMd5Hexs = append(silceMd5Hexs, strings.ToUpper(hex.EncodeToString(md5Bytes)))
-		silceMd5Base64 := base64.StdEncoding.EncodeToString(md5Bytes)
-
-		// 获取上传链接
-		var uploadUrl UploadUrlsResp
-		_, err = y.request(fullUrl+"/getMultiUploadUrls", http.MethodGet,
-			func(req *resty.Request) {
-				req.SetContext(ctx)
-			}, Params{
-				"partInfo":     fmt.Sprintf("%d-%s", i, silceMd5Base64),
-				"uploadFileId": initMultiUpload.Data.UploadFileID,
-			}, &uploadUrl)
-		if err != nil {
-			return err
-		}
-
-		// 开始上传
-		uploadData := uploadUrl.UploadUrls[fmt.Sprint("partNumber_", i)]
-		res, err := y.putClient.R().
-			SetContext(ctx).
-			SetQueryParams(clientSuffix()).
-			SetHeaders(ParseHttpHeader(uploadData.RequestHeader)).
-			SetBody(byteData).
-			Put(uploadData.RequestURL)
-		if err != nil {
-			return err
-		}
-		if res.StatusCode() != http.StatusOK {
-			return fmt.Errorf("updload fail,msg: %s", res.String())
-		}
-		up(int(i * 100 / count))
-	}
-
-	fileMd5Hex := strings.ToUpper(hex.EncodeToString(fileMd5.Sum(nil)))
-	sliceMd5Hex := fileMd5Hex
-	if file.GetSize() > DEFAULT {
-		sliceMd5Hex = strings.ToUpper(utils.GetMD5Encode(strings.Join(silceMd5Hexs, "\n")))
-	}
-
-	// 提交上传
-	_, err = y.request(fullUrl+"/commitMultiUploadFile", http.MethodGet,
-		func(req *resty.Request) {
-			req.SetContext(ctx)
-		}, Params{
-			"uploadFileId": initMultiUpload.Data.UploadFileID,
-			"fileMd5":      fileMd5Hex,
-			"sliceMd5":     sliceMd5Hex,
-			"lazyCheck":    "1",
-			"isLog":        "0",
-			"opertype":     "3",
-		}, nil)
-	return err
-}
-
-// 快传
-func (y *Yun189PC) FastUpload(ctx context.Context, dstDir model.Obj, file model.FileStreamer, up driver.UpdateProgress) (err error) {
-	// 需要获取完整文件md5,必须支持 io.Seek
-	tempFile, err := utils.CreateTempFile(file.GetReadCloser())
-	if err != nil {
-		return err
-	}
-	defer func() {
-		_ = tempFile.Close()
-		_ = os.Remove(tempFile.Name())
-	}()
-	file.SetReadCloser(tempFile)
-
-	const DEFAULT int64 = 10485760
-	count := int(math.Ceil(float64(file.GetSize()) / float64(DEFAULT)))
-
-	// 优先计算所需信息
-	fileMd5 := md5.New()
-	silceMd5 := md5.New()
-	silceMd5Hexs := make([]string, 0, count)
-	silceMd5Base64s := make([]string, 0, count)
-	for i := 1; i <= count; i++ {
-		select {
-		case <-ctx.Done():
-			return ctx.Err()
-		default:
-		}
-
-		silceMd5.Reset()
-		if _, err := io.CopyN(io.MultiWriter(fileMd5, silceMd5), file, DEFAULT); err != nil && err != io.EOF && err != io.ErrUnexpectedEOF {
-			return err
-		}
-		md5Byte := silceMd5.Sum(nil)
-		silceMd5Hexs = append(silceMd5Hexs, strings.ToUpper(hex.EncodeToString(md5Byte)))
-		silceMd5Base64s = append(silceMd5Base64s, fmt.Sprint(i, "-", base64.StdEncoding.EncodeToString(md5Byte)))
-	}
-	file.GetReadCloser().(*os.File).Seek(0, io.SeekStart)
-
-	fileMd5Hex := strings.ToUpper(hex.EncodeToString(fileMd5.Sum(nil)))
-	sliceMd5Hex := fileMd5Hex
-	if file.GetSize() > DEFAULT {
-		sliceMd5Hex = strings.ToUpper(utils.GetMD5Encode(strings.Join(silceMd5Hexs, "\n")))
-	}
-
-	// 检测是否支持快传
-	params := Params{
-		"parentFolderId": dstDir.GetID(),
-		"fileName":       url.QueryEscape(file.GetName()),
-		"fileSize":       fmt.Sprint(file.GetSize()),
-		"fileMd5":        fileMd5Hex,
-		"sliceSize":      fmt.Sprint(DEFAULT),
-		"sliceMd5":       sliceMd5Hex,
-	}
-
-	fullUrl := UPLOAD_URL
-	if y.isFamily() {
-		params.Set("familyId", y.FamilyID)
-		fullUrl += "/family"
-	} else {
-		//params.Set("extend", `{"opScene":"1","relativepath":"","rootfolderid":""}`)
-		fullUrl += "/person"
-	}
-
-	var uploadInfo InitMultiUploadResp
-	_, err = y.request(fullUrl+"/initMultiUpload", http.MethodGet, func(req *resty.Request) {
-		req.SetContext(ctx)
-	}, params, &uploadInfo)
-	if err != nil {
-		return err
-	}
-
-	// 网盘中不存在该文件，开始上传
-	if uploadInfo.Data.FileDataExists != 1 {
-		var uploadUrls UploadUrlsResp
-		_, err = y.request(fullUrl+"/getMultiUploadUrls", http.MethodGet,
-			func(req *resty.Request) {
-				req.SetContext(ctx)
-			}, Params{
-				"uploadFileId": uploadInfo.Data.UploadFileID,
-				"partInfo":     strings.Join(silceMd5Base64s, ","),
-			}, &uploadUrls)
-		if err != nil {
-			return err
-		}
-
-		for i := 1; i <= count; i++ {
-			select {
-			case <-ctx.Done():
-				return ctx.Err()
-			default:
-			}
-
-			uploadData := uploadUrls.UploadUrls[fmt.Sprint("partNumber_", i)]
-			res, err := y.putClient.R().
-				SetContext(ctx).
-				SetQueryParams(clientSuffix()).
-				SetHeaders(ParseHttpHeader(uploadData.RequestHeader)).
-				SetBody(io.LimitReader(file, DEFAULT)).
-				Put(uploadData.RequestURL)
-			if err != nil {
-				return err
-			}
-			if res.StatusCode() != http.StatusOK {
-				return fmt.Errorf("updload fail,msg: %s", res.String())
-			}
-			up(int(i * 100 / count))
-		}
-	}
-
-	// 提交
-	_, err = y.request(fullUrl+"/commitMultiUploadFile", http.MethodGet,
-		func(req *resty.Request) {
-			req.SetContext(ctx)
-		}, Params{
-			"uploadFileId": uploadInfo.Data.UploadFileID,
-			"isLog":        "0",
-			"opertype":     "3",
-		}, nil)
-	return err
-}
-
-func (y *Yun189PC) isFamily() bool {
-	return y.Type == "family"
-}
-
-func (y *Yun189PC) isLogin() bool {
-	if y.tokenInfo == nil {
-		return false
-	}
-	_, err := y.get(API_URL+"/getUserInfo.action", nil, nil)
-	return err == nil
-}
-
-// 获取家庭云所有用户信息
-func (y *Yun189PC) getFamilyInfoList() ([]FamilyInfoResp, error) {
-	var resp FamilyInfoListResp
-	_, err := y.get(API_URL+"/family/manage/getFamilyList.action", nil, &resp)
-	if err != nil {
-		return nil, err
-	}
-	return resp.FamilyInfoResp, nil
-}
-
-// 抽取家庭云ID
-func (y *Yun189PC) getFamilyID() (string, error) {
-	infos, err := y.getFamilyInfoList()
-	if err != nil {
-		return "", err
-	}
-	if len(infos) == 0 {
-		return "", fmt.Errorf("cannot get automatically,please input family_id")
-	}
-	for _, info := range infos {
-		if strings.Contains(y.tokenInfo.LoginName, info.RemarkName) {
-			return fmt.Sprint(info.FamilyID), nil
-		}
-	}
-	return fmt.Sprint(infos[0].FamilyID), nil
-}

drivers/alidrive/alidrive.go

@@ -0,0 +1,209 @@
+package alidrive
+
+import (
+	"errors"
+	"fmt"
+	"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"
+)
+
+var aliClient = resty.New()
+
+func (driver AliDrive) FormatFile(file *AliFile) *model.File {
+	f := &model.File{
+		Id:        file.FileId,
+		Name:      file.Name,
+		Size:      file.Size,
+		UpdatedAt: file.UpdatedAt,
+		Thumbnail: file.Thumbnail,
+		Driver:    driver.Config().Name,
+		Url:       file.Url,
+	}
+	f.Type = file.GetType()
+	return f
+}
+
+func (driver AliDrive) GetFiles(fileId string, account *model.Account) ([]AliFile, error) {
+	marker := "first"
+	res := make([]AliFile, 0)
+	for marker != "" {
+		if marker == "first" {
+			marker = ""
+		}
+		var resp AliFiles
+		var e AliRespError
+		_, err := aliClient.R().
+			SetResult(&resp).
+			SetError(&e).
+			SetHeader("authorization", "Bearer\t"+account.AccessToken).
+			SetBody(base.Json{
+				"drive_id":                account.DriveId,
+				"fields":                  "*",
+				"image_thumbnail_process": "image/resize,w_400/format,jpeg",
+				"image_url_process":       "image/resize,w_1920/format,jpeg",
+				"limit":                   account.Limit,
+				"marker":                  marker,
+				"order_by":                account.OrderBy,
+				"order_direction":         account.OrderDirection,
+				"parent_file_id":          fileId,
+				"video_thumbnail_process": "video/snapshot,t_0,f_jpg,ar_auto,w_300",
+				"url_expire_sec":          14400,
+			}).Post("https://api.aliyundrive.com/v2/file/list")
+		if err != nil {
+			return nil, err
+		}
+		if e.Code != "" {
+			if e.Code == "AccessTokenInvalid" {
+				err = driver.RefreshToken(account)
+				if err != nil {
+					return nil, err
+				} else {
+					_ = model.SaveAccount(account)
+					return driver.GetFiles(fileId, account)
+				}
+			}
+			return nil, fmt.Errorf("%s", e.Message)
+		}
+		marker = resp.NextMarker
+		res = append(res, resp.Items...)
+	}
+	return res, nil
+}
+
+func (driver AliDrive) GetFile(path string, account *model.Account) (*AliFile, error) {
+	dir, name := filepath.Split(path)
+	dir = utils.ParsePath(dir)
+	_, err := driver.Files(dir, account)
+	if err != nil {
+		return nil, err
+	}
+	parentFiles_, _ := base.GetCache(dir, account)
+	parentFiles, _ := parentFiles_.([]AliFile)
+	for _, file := range parentFiles {
+		if file.Name == name {
+			if file.Type == "file" {
+				return &file, err
+			} else {
+				return nil, fmt.Errorf("not file")
+			}
+		}
+	}
+	return nil, base.ErrPathNotFound
+}
+
+func (driver AliDrive) RefreshToken(account *model.Account) error {
+	url := "https://auth.aliyundrive.com/v2/account/token"
+	var resp base.TokenResp
+	var e AliRespError
+	_, err := aliClient.R().
+		//ForceContentType("application/json").
+		SetBody(base.Json{"refresh_token": account.RefreshToken, "grant_type": "refresh_token"}).
+		SetResult(&resp).
+		SetError(&e).
+		Post(url)
+	if err != nil {
+		account.Status = err.Error()
+		return err
+	}
+	log.Debugf("%+v,%+v", resp, e)
+	if e.Code != "" {
+		account.Status = e.Message
+		return fmt.Errorf("failed to refresh token: %s", e.Message)
+	} else {
+		account.Status = "work"
+	}
+	account.RefreshToken, account.AccessToken = resp.RefreshToken, resp.AccessToken
+	return nil
+}
+
+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).
+		SetHeader("authorization", "Bearer\t"+account.AccessToken).
+		SetBody(base.Json{
+			"check_name_mode": "refuse",
+			"drive_id":        account.DriveId,
+			"file_id":         fileId,
+			"name":            name,
+		}).Post("https://api.aliyundrive.com/v3/file/update")
+	if err != nil {
+		return err
+	}
+	if e.Code != "" {
+		if e.Code == "AccessTokenInvalid" {
+			err = driver.RefreshToken(account)
+			if err != nil {
+				return err
+			} else {
+				_ = model.SaveAccount(account)
+				return driver.rename(fileId, name, account)
+			}
+		}
+		return fmt.Errorf("%s", e.Message)
+	}
+	if resp["name"] == name {
+		return nil
+	}
+	return fmt.Errorf("%+v", resp)
+}
+
+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).
+		SetBody(base.Json{
+			"requests": []base.Json{
+				{
+					"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,
+					},
+					"url": url,
+				},
+			},
+			"resource": "file",
+		}).Post("https://api.aliyundrive.com/v3/batch")
+	if err != nil {
+		return err
+	}
+	if e.Code != "" {
+		if e.Code == "AccessTokenInvalid" {
+			err = driver.RefreshToken(account)
+			if err != nil {
+				return err
+			} else {
+				_ = model.SaveAccount(account)
+				return driver.batch(srcId, dstId, url, account)
+			}
+		}
+		return fmt.Errorf("%s", e.Message)
+	}
+	status := jsoniter.Get(res.Body(), "responses", 0, "status").ToInt()
+	if status < 400 && status >= 100 {
+		return nil
+	}
+	return errors.New(res.String())
+}
+
+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").
+		SetHeader("origin", "https://www.aliyundrive.com")
+}

drivers/alidrive/driver.go

@@ -0,0 +1,566 @@
+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/robfig/cron/v3"
+	log "github.com/sirupsen/logrus"
+)
+
+type AliDrive struct{}
+
+func (driver AliDrive) Config() base.DriverConfig {
+	return base.DriverConfig{
+		Name: "AliDrive",
+	}
+}
+
+func (driver AliDrive) Items() []base.Item {
+	return []base.Item{
+		{
+			Name:     "refresh_token",
+			Label:    "refresh token",
+			Type:     base.TypeString,
+			Required: true,
+		},
+		{
+			Name:     "root_folder",
+			Label:    "root folder file_id",
+			Type:     base.TypeString,
+			Required: false,
+		},
+		{
+			Name:     "order_by",
+			Label:    "order_by",
+			Type:     base.TypeSelect,
+			Values:   "name,size,updated_at,created_at",
+			Required: false,
+		},
+		{
+			Name:     "order_direction",
+			Label:    "order_direction",
+			Type:     base.TypeSelect,
+			Values:   "ASC,DESC",
+			Required: false,
+		},
+		{
+			Name:        "limit",
+			Label:       "limit",
+			Type:        base.TypeNumber,
+			Required:    false,
+			Description: ">0 and <=200",
+		},
+		{
+			Name:  "bool_1",
+			Label: "fast upload",
+			Type:  base.TypeBool,
+		},
+	}
+}
+
+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"
+	}
+	if account.Limit == 0 {
+		account.Limit = 200
+	}
+	err := driver.RefreshToken(account)
+	if err != nil {
+		return err
+	}
+	var resp base.Json
+	_, _ = aliClient.R().SetResult(&resp).
+		SetBody("{}").
+		SetHeader("authorization", "Bearer\t"+account.AccessToken).
+		Post("https://api.aliyundrive.com/v2/user/get")
+	log.Debugf("user info: %+v", resp)
+	account.DriveId = resp["default_drive_id"].(string)
+	cronId, err := conf.Cron.AddFunc("@every 2h", func() {
+		id := account.ID
+		log.Debugf("ali account id: %d", id)
+		newAccount, err := model.GetAccountById(id)
+		log.Debugf("ali account: %+v", newAccount)
+		if err != nil {
+			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
+	}
+	return nil
+}
+
+func (driver AliDrive) 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 AliDrive) Files(path string, account *model.Account) ([]model.File, error) {
+	path = utils.ParsePath(path)
+	var rawFiles []AliFile
+	cache, err := base.GetCache(path, account)
+	if err == nil {
+		rawFiles, _ = cache.([]AliFile)
+	} else {
+		file, err := driver.File(path, account)
+		if err != nil {
+			return nil, err
+		}
+		rawFiles, err = driver.GetFiles(file.Id, account)
+		if err != nil {
+			return nil, err
+		}
+		if len(rawFiles) > 0 {
+			_ = base.SetCache(path, rawFiles, account)
+		}
+	}
+	files := make([]model.File, 0)
+	for _, file := range rawFiles {
+		files = append(files, *driver.FormatFile(&file))
+	}
+	return files, nil
+}
+
+func (driver AliDrive) Link(args base.Args, account *model.Account) (*base.Link, error) {
+	file, err := driver.File(args.Path, account)
+	if err != nil {
+		return nil, err
+	}
+	var resp base.Json
+	var e AliRespError
+	_, err = aliClient.R().SetResult(&resp).
+		SetError(&e).
+		SetHeader("authorization", "Bearer\t"+account.AccessToken).
+		SetBody(base.Json{
+			"drive_id":   account.DriveId,
+			"file_id":    file.Id,
+			"expire_sec": 14400,
+		}).Post("https://api.aliyundrive.com/v2/file/get_download_url")
+	if err != nil {
+		return nil, err
+	}
+	if e.Code != "" {
+		if e.Code == "AccessTokenInvalid" {
+			err = driver.RefreshToken(account)
+			if err != nil {
+				return nil, err
+			} else {
+				_ = model.SaveAccount(account)
+				return driver.Link(args, account)
+			}
+		}
+		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
+}
+
+func (driver AliDrive) Path(path string, account *model.Account) (*model.File, []model.File, error) {
+	path = utils.ParsePath(path)
+	log.Debugf("ali 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 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)
+	if err != nil {
+		return nil, err
+	}
+	// office
+	var resp base.Json
+	var e AliRespError
+	var url string
+	req := base.Json{
+		"drive_id": account.DriveId,
+		"file_id":  file.FileId,
+	}
+	switch file.Category {
+	case "doc":
+		{
+			url = "https://api.aliyundrive.com/v2/file/get_office_preview_url"
+			req["access_token"] = account.AccessToken
+		}
+	case "video":
+		{
+			url = "https://api.aliyundrive.com/v2/file/get_video_preview_play_info"
+			req["category"] = "live_transcoding"
+		}
+	default:
+		return nil, base.ErrNotSupport
+	}
+	_, err = aliClient.R().SetResult(&resp).SetError(&e).
+		SetHeader("authorization", "Bearer\t"+account.AccessToken).
+		SetBody(req).Post(url)
+	if err != nil {
+		return nil, err
+	}
+	if e.Code != "" {
+		return nil, fmt.Errorf("%s", e.Message)
+	}
+	return resp, nil
+}
+
+func (driver AliDrive) 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
+	}
+	var resp base.Json
+	var e AliRespError
+	_, err = aliClient.R().SetResult(&resp).SetError(&e).
+		SetHeader("authorization", "Bearer\t"+account.AccessToken).
+		SetBody(base.Json{
+			"check_name_mode": "refuse",
+			"drive_id":        account.DriveId,
+			"name":            name,
+			"parent_file_id":  parentFile.Id,
+			"type":            "folder",
+		}).Post("https://api.aliyundrive.com/adrive/v2/file/createWithFolders")
+	if e.Code != "" {
+		if e.Code == "AccessTokenInvalid" {
+			err = driver.RefreshToken(account)
+			if err != nil {
+				return err
+			} else {
+				_ = model.SaveAccount(account)
+				return driver.MakeDir(path, account)
+			}
+		}
+		return fmt.Errorf("%s", e.Message)
+	}
+	if resp["file_name"] == name {
+		return nil
+	}
+	return fmt.Errorf("%+v", resp)
+}
+
+func (driver AliDrive) Move(src string, dst string, account *model.Account) error {
+	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/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 {
+	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 {
+	file, err := driver.File(path, account)
+	if err != nil {
+		return err
+	}
+	var e AliRespError
+	res, err := aliClient.R().SetError(&e).
+		SetHeader("authorization", "Bearer\t"+account.AccessToken).
+		SetBody(base.Json{
+			"drive_id": account.DriveId,
+			"file_id":  file.Id,
+		}).Post("https://api.aliyundrive.com/v2/recyclebin/trash")
+	if err != nil {
+		return err
+	}
+	if e.Code != "" {
+		if e.Code == "AccessTokenInvalid" {
+			err = driver.RefreshToken(account)
+			if err != nil {
+				return err
+			} else {
+				_ = model.SaveAccount(account)
+				return driver.Delete(path, account)
+			}
+		}
+		return fmt.Errorf("%s", e.Message)
+	}
+	if res.StatusCode() < 400 {
+		return nil
+	}
+	return errors.New(res.String())
+}
+
+type UploadResp struct {
+	FileId       string `json:"file_id"`
+	UploadId     string `json:"upload_id"`
+	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
+	}
+
+	parentFile, err := driver.File(file.ParentPath, account)
+	if err != nil {
+		return err
+	}
+	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 := bytes.NewBuffer(make([]byte, 0, 1024))
+		io.CopyN(buf, file, 1024)
+		reqBody["pre_hash"] = utils.GetSHA1Encode(buf.String())
+		// 把头部拼接回去
+		file.File = struct {
+			io.Reader
+			io.Closer
+		}{
+			Reader: io.MultiReader(buf, file.File),
+			Closer: file.File,
+		}
+	} else {
+		reqBody["content_hash_name"] = "none"
+		reqBody["proof_version"] = "v1"
+	}
+
+	var resp UploadResp
+	var e AliRespError
+	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
+	}
+	if e.Code != "" && e.Code != "PreHashMatched" {
+		if e.Code == "AccessTokenInvalid" {
+			err = driver.RefreshToken(account)
+			if err != nil {
+				return err
+			} else {
+				_ = model.SaveAccount(account)
+				return driver.Upload(file, account)
+			}
+		}
+		return fmt.Errorf("%s", e.Message)
+	}
+
+	if account.Bool1 && e.Code == "PreHashMatched" {
+		tempFile, err := ioutil.TempFile(conf.Conf.TempDir, "file-*")
+		if err != nil {
+			return err
+		}
+
+		defer func() {
+			_ = tempFile.Close()
+			_ = os.Remove(tempFile.Name())
+		}()
+
+		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
+		}
+		res, err := base.HttpClient.Do(req)
+		if err != nil {
+			return err
+		}
+		log.Debugf("%+v", res)
+		res.Body.Close()
+		//res, err := base.BaseClient.R().
+		//	SetHeader("Content-Type","").
+		//	SetBody(byteData).Put(resp.PartInfoList[i].UploadUrl)
+		//if err != nil {
+		//	return err
+		//}
+		//log.Debugf("put to %s : %d,%s", resp.PartInfoList[i].UploadUrl, res.StatusCode(),res.String())
+	}
+	var resp2 base.Json
+	_, err = aliClient.R().SetResult(&resp2).SetError(&e).
+		SetHeader("authorization", "Bearer\t"+account.AccessToken).
+		SetBody(base.Json{
+			"drive_id":  account.DriveId,
+			"file_id":   resp.FileId,
+			"upload_id": resp.UploadId,
+		}).Post("https://api.aliyundrive.com/v2/file/complete")
+	if err != nil {
+		return err
+	}
+	if e.Code != "" && e.Code != "PreHashMatched" {
+		//if e.Code == "AccessTokenInvalid" {
+		//	err = driver.RefreshToken(account)
+		//	if err != nil {
+		//		return err
+		//	} else {
+		//		_ = model.SaveAccount(account)
+		//		return driver.Upload(file, account)
+		//	}
+		//}
+		return fmt.Errorf("%s", e.Message)
+	}
+	if resp2["file_id"] == resp.FileId {
+		return nil
+	}
+	return fmt.Errorf("%+v", resp2)
+}
+
+var _ base.Driver = (*AliDrive)(nil)

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

@@ -0,0 +1,44 @@
+package alist
+
+import (
+	"errors"
+	"github.com/Xhofe/alist/drivers/base"
+	"github.com/Xhofe/alist/model"
+)
+
+type BaseResp struct {
+	Code    int    `json:"code"`
+	Message string `json:"message"`
+}
+
+type PathResp struct {
+	BaseResp
+	Data struct {
+		Type string `json:"type"`
+		//Meta  Meta         `json:"meta"`
+		Files []model.File `json:"files"`
+	} `json:"data"`
+}
+
+type PreviewResp struct {
+	BaseResp
+	Data interface{} `json:"data"`
+}
+
+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")
+	if err != nil {
+		return err
+	}
+	if resp.Code != 200 {
+		return errors.New(resp.Message)
+	}
+	return nil
+}
+
+func init() {
+	base.RegisterDriver(&Alist{})
+}

drivers/alist/driver.go

@@ -0,0 +1,192 @@
+package alist
+
+import (
+	"errors"
+	"fmt"
+	"github.com/Xhofe/alist/conf"
+	"github.com/Xhofe/alist/drivers/base"
+	"github.com/Xhofe/alist/model"
+	"github.com/Xhofe/alist/utils"
+	"path/filepath"
+	"strings"
+	"time"
+)
+
+type Alist struct{}
+
+func (driver Alist) Config() base.DriverConfig {
+	return base.DriverConfig{
+		Name:          "Alist",
+		NoNeedSetLink: true,
+		NoCors:        true,
+	}
+}
+
+func (driver Alist) Items() []base.Item {
+	return []base.Item{
+		{
+			Name:     "site_url",
+			Label:    "alist site url",
+			Type:     base.TypeString,
+			Required: true,
+		},
+		{
+			Name:        "access_token",
+			Label:       "token",
+			Type:        base.TypeString,
+			Description: "admin token",
+			Required:    true,
+		},
+		{
+			Name:     "root_folder",
+			Label:    "root folder path",
+			Type:     base.TypeString,
+			Required: false,
+		},
+	}
+}
+
+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 = "/"
+	}
+	err := driver.Login(account)
+	if err == nil {
+		account.Status = "work"
+	} else {
+		account.Status = err.Error()
+	}
+	_ = model.SaveAccount(account)
+	return err
+}
+
+func (driver Alist) File(path string, account *model.Account) (*model.File, error) {
+	now := time.Now()
+	if path == "/" {
+		return &model.File{
+			Id:        "root",
+			Name:      "root",
+			Size:      0,
+			Type:      conf.FOLDER,
+			Driver:    driver.Config().Name,
+			UpdatedAt: &now,
+		}, nil
+	}
+	_, files, err := driver.Path(utils.Dir(path), account)
+	if err != nil {
+		return nil, err
+	}
+	if files == nil {
+		return nil, base.ErrPathNotFound
+	}
+	name := utils.Base(path)
+	for _, file := range files {
+		if file.Name == name {
+			return &file, nil
+		}
+	}
+	return nil, base.ErrPathNotFound
+}
+
+func (driver Alist) Files(path string, account *model.Account) ([]model.File, error) {
+	//return nil, base.ErrNotImplement
+	_, files, err := driver.Path(path, account)
+	if err != nil {
+		return nil, err
+	}
+	if files == nil {
+		return nil, base.ErrNotFolder
+	}
+	return files, nil
+}
+
+func (driver Alist) Link(args base.Args, account *model.Account) (*base.Link, error) {
+	path := args.Path
+	path = utils.ParsePath(path)
+	name := utils.Base(path)
+	flag := "d"
+	if utils.GetFileType(filepath.Ext(path)) == conf.TEXT {
+		flag = "p"
+	}
+	link := base.Link{}
+	link.Url = fmt.Sprintf("%s/%s%s?sign=%s", account.SiteUrl, flag, utils.Join(utils.ParsePath(account.RootFolder), path), utils.SignWithToken(name, conf.Token))
+	return &link, nil
+}
+
+func (driver Alist) Path(path string, account *model.Account) (*model.File, []model.File, error) {
+	path = utils.ParsePath(path)
+	path = filepath.Join(account.RootFolder, path)
+	path = strings.ReplaceAll(path, "\\", "/")
+	cache, err := base.GetCache(path, account)
+	if err == nil {
+		files := cache.([]model.File)
+		return nil, files, nil
+	}
+	var resp PathResp
+	_, err = base.RestyClient.R().SetResult(&resp).
+		SetHeader("Authorization", account.AccessToken).
+		SetBody(base.Json{
+			"path": path,
+		}).Post(account.SiteUrl + "/api/public/path")
+	if err != nil {
+		return nil, nil, err
+	}
+	if resp.Code != 200 {
+		return nil, nil, errors.New(resp.Message)
+	}
+	if resp.Data.Type == "file" {
+		return &resp.Data.Files[0], nil, nil
+	}
+	if len(resp.Data.Files) > 0 {
+		_ = base.SetCache(path, resp.Data.Files, account)
+	}
+	return nil, resp.Data.Files, nil
+}
+
+//func (driver Alist) Proxy(r *http.Request, account *model.Account) {}
+
+func (driver Alist) Preview(path string, account *model.Account) (interface{}, error) {
+	var resp PathResp
+	_, err := base.RestyClient.R().SetResult(&resp).
+		SetHeader("Authorization", account.AccessToken).
+		SetBody(base.Json{
+			"path": path,
+		}).Post(account.SiteUrl + "/api/public/preview")
+	if err != nil {
+		return nil, err
+	}
+	if resp.Code != 200 {
+		return nil, errors.New(resp.Message)
+	}
+	return resp.Data, nil
+}
+
+func (driver Alist) MakeDir(path string, account *model.Account) error {
+	return base.ErrNotImplement
+}
+
+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
+}
+
+func (driver Alist) Delete(path string, account *model.Account) error {
+	return base.ErrNotImplement
+}
+
+func (driver Alist) Upload(file *model.FileStream, account *model.Account) error {
+	return base.ErrNotImplement
+}
+
+var _ base.Driver = (*Alist)(nil)

drivers/aliyundrive/driver.go

@@ -1,314 +0,0 @@
-package aliyundrive
-
-import (
-	"bytes"
-	"context"
-	"crypto/sha1"
-	"encoding/base64"
-	"encoding/hex"
-	"fmt"
-	"io"
-	"math"
-	"math/big"
-	"net/http"
-	"os"
-	"time"
-
-	"github.com/alist-org/alist/v3/drivers/base"
-	"github.com/alist-org/alist/v3/internal/conf"
-	"github.com/alist-org/alist/v3/internal/driver"
-	"github.com/alist-org/alist/v3/internal/errs"
-	"github.com/alist-org/alist/v3/internal/model"
-	"github.com/alist-org/alist/v3/pkg/cron"
-	"github.com/alist-org/alist/v3/pkg/utils"
-	"github.com/go-resty/resty/v2"
-	log "github.com/sirupsen/logrus"
-)
-
-type AliDrive struct {
-	model.Storage
-	Addition
-	AccessToken string
-	cron        *cron.Cron
-	DriveId     string
-}
-
-func (d *AliDrive) Config() driver.Config {
-	return config
-}
-
-func (d *AliDrive) GetAddition() driver.Additional {
-	return d.Addition
-}
-
-func (d *AliDrive) Init(ctx context.Context, storage model.Storage) error {
-	d.Storage = storage
-	err := utils.Json.UnmarshalFromString(d.Storage.Addition, &d.Addition)
-	if err != nil {
-		return err
-	}
-	// TODO login / refresh token
-	//op.MustSaveDriverStorage(d)
-	err = d.refreshToken()
-	if err != nil {
-		return err
-	}
-	// get driver id
-	res, err, _ := d.request("https://api.aliyundrive.com/v2/user/get", http.MethodPost, nil, nil)
-	if err != nil {
-		return err
-	}
-	d.DriveId = utils.Json.Get(res, "default_drive_id").ToString()
-	d.cron = cron.NewCron(time.Hour * 2)
-	d.cron.Do(func() {
-		err := d.refreshToken()
-		if err != nil {
-			log.Errorf("%+v", err)
-		}
-	})
-	return err
-}
-
-func (d *AliDrive) Drop(ctx context.Context) error {
-	if d.cron != nil {
-		d.cron.Stop()
-	}
-	return nil
-}
-
-func (d *AliDrive) List(ctx context.Context, dir model.Obj, args model.ListArgs) ([]model.Obj, error) {
-	files, err := d.getFiles(dir.GetID())
-	if err != nil {
-		return nil, err
-	}
-	return utils.SliceConvert(files, func(src File) (model.Obj, error) {
-		return fileToObj(src), nil
-	})
-}
-
-//func (d *AliDrive) Get(ctx context.Context, path string) (model.Obj, error) {
-//	// TODO this is optional
-//	return nil, errs.NotImplement
-//}
-
-func (d *AliDrive) Link(ctx context.Context, file model.Obj, args model.LinkArgs) (*model.Link, error) {
-	data := base.Json{
-		"drive_id":   d.DriveId,
-		"file_id":    file.GetID(),
-		"expire_sec": 14400,
-	}
-	res, err, _ := d.request("https://api.aliyundrive.com/v2/file/get_download_url", http.MethodPost, func(req *resty.Request) {
-		req.SetBody(data)
-	}, nil)
-	if err != nil {
-		return nil, err
-	}
-	return &model.Link{
-		Header: http.Header{
-			"Referer": []string{"https://www.aliyundrive.com/"},
-		},
-		URL: utils.Json.Get(res, "url").ToString(),
-	}, nil
-}
-
-func (d *AliDrive) MakeDir(ctx context.Context, parentDir model.Obj, dirName string) error {
-	_, err, _ := d.request("https://api.aliyundrive.com/adrive/v2/file/createWithFolders", http.MethodPost, func(req *resty.Request) {
-		req.SetBody(base.Json{
-			"check_name_mode": "refuse",
-			"drive_id":        d.DriveId,
-			"name":            dirName,
-			"parent_file_id":  parentDir.GetID(),
-			"type":            "folder",
-		})
-	}, nil)
-	return err
-}
-
-func (d *AliDrive) Move(ctx context.Context, srcObj, dstDir model.Obj) error {
-	err := d.batch(srcObj.GetID(), dstDir.GetID(), "/file/move")
-	return err
-}
-
-func (d *AliDrive) Rename(ctx context.Context, srcObj model.Obj, newName string) error {
-	_, err, _ := d.request("https://api.aliyundrive.com/v3/file/update", http.MethodPost, func(req *resty.Request) {
-		req.SetBody(base.Json{
-			"check_name_mode": "refuse",
-			"drive_id":        d.DriveId,
-			"file_id":         srcObj.GetID(),
-			"name":            newName,
-		})
-	}, nil)
-	return err
-}
-
-func (d *AliDrive) Copy(ctx context.Context, srcObj, dstDir model.Obj) error {
-	err := d.batch(srcObj.GetID(), dstDir.GetID(), "/file/copy")
-	return err
-}
-
-func (d *AliDrive) Remove(ctx context.Context, obj model.Obj) error {
-	_, err, _ := d.request("https://api.aliyundrive.com/v2/recyclebin/trash", http.MethodPost, func(req *resty.Request) {
-		req.SetBody(base.Json{
-			"drive_id": d.DriveId,
-			"file_id":  obj.GetID(),
-		})
-	}, nil)
-	return err
-}
-
-func (d *AliDrive) Put(ctx context.Context, dstDir model.Obj, stream model.FileStreamer, up driver.UpdateProgress) error {
-	file := model.FileStream{
-		Obj:        stream,
-		ReadCloser: stream,
-		Mimetype:   stream.GetMimetype(),
-	}
-	const DEFAULT int64 = 10485760
-	var count = int(math.Ceil(float64(stream.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":        d.DriveId,
-		"name":            file.GetName(),
-		"parent_file_id":  dstDir.GetID(),
-		"part_info_list":  partInfoList,
-		"size":            file.GetSize(),
-		"type":            "file",
-	}
-
-	if d.RapidUpload {
-		buf := bytes.NewBuffer(make([]byte, 0, 1024))
-		io.CopyN(buf, file, 1024)
-		reqBody["pre_hash"] = utils.GetSHA1Encode(buf.String())
-		// 把头部拼接回去
-		file.ReadCloser = struct {
-			io.Reader
-			io.Closer
-		}{
-			Reader: io.MultiReader(buf, file),
-			Closer: file,
-		}
-	} else {
-		reqBody["content_hash_name"] = "none"
-		reqBody["proof_version"] = "v1"
-	}
-
-	var resp UploadResp
-	_, err, e := d.request("https://api.aliyundrive.com/adrive/v2/file/createWithFolders", http.MethodPost, func(req *resty.Request) {
-		req.SetBody(reqBody)
-	}, &resp)
-
-	if err != nil && e.Code != "PreHashMatched" {
-		return err
-	}
-
-	if d.RapidUpload && e.Code == "PreHashMatched" {
-		tempFile, err := os.CreateTemp(conf.Conf.TempDir, "file-*")
-		if err != nil {
-			return err
-		}
-		defer func() {
-			_ = tempFile.Close()
-			_ = os.Remove(tempFile.Name())
-		}()
-		delete(reqBody, "pre_hash")
-		h := sha1.New()
-		if _, err = io.Copy(io.MultiWriter(tempFile, h), 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(d.AccessToken)[:16], 16)
-		i := new(big.Int).SetInt64(file.GetSize())
-		o := r.Mod(r, i)
-		n, _ := io.NewSectionReader(tempFile, o.Int64(), 8).Read(buf[:8])
-		reqBody["proof_code"] = base64.StdEncoding.EncodeToString(buf[:n])
-
-		_, err, e := d.request("https://api.aliyundrive.com/adrive/v2/file/createWithFolders", http.MethodPost, func(req *resty.Request) {
-			req.SetBody(reqBody)
-		}, &resp)
-		if err != nil && e.Code != "PreHashMatched" {
-			return err
-		}
-		if resp.RapidUpload {
-			return nil
-		}
-		// 秒传失败
-		if _, err = tempFile.Seek(0, io.SeekStart); err != nil {
-			return err
-		}
-		file.ReadCloser = tempFile
-	}
-
-	for i, partInfo := range resp.PartInfoList {
-		req, err := http.NewRequest("PUT", partInfo.UploadUrl, io.LimitReader(file, DEFAULT))
-		if err != nil {
-			return err
-		}
-		res, err := base.HttpClient.Do(req)
-		if err != nil {
-			return err
-		}
-		res.Body.Close()
-		if count > 0 {
-			up(i * 100 / count)
-		}
-	}
-	var resp2 base.Json
-	_, err, e = d.request("https://api.aliyundrive.com/v2/file/complete", http.MethodPost, func(req *resty.Request) {
-		req.SetBody(base.Json{
-			"drive_id":  d.DriveId,
-			"file_id":   resp.FileId,
-			"upload_id": resp.UploadId,
-		})
-	}, &resp2)
-	if err != nil && e.Code != "PreHashMatched" {
-		return err
-	}
-	if resp2["file_id"] == resp.FileId {
-		return nil
-	}
-	return fmt.Errorf("%+v", resp2)
-}
-
-func (d *AliDrive) Other(ctx context.Context, args model.OtherArgs) (interface{}, error) {
-	var resp base.Json
-	var url string
-	data := base.Json{
-		"drive_id": d.DriveId,
-		"file_id":  args.Obj.GetID(),
-	}
-	switch args.Method {
-	case "doc_preview":
-		url = "https://api.aliyundrive.com/v2/file/get_office_preview_url"
-		data["access_token"] = d.AccessToken
-	case "video_preview":
-		url = "https://api.aliyundrive.com/v2/file/get_video_preview_play_info"
-		data["category"] = "live_transcoding"
-	default:
-		return nil, errs.NotSupport
-	}
-	_, err, _ := d.request(url, http.MethodPost, func(req *resty.Request) {
-		req.SetBody(data)
-	}, &resp)
-	if err != nil {
-		return nil, err
-	}
-	return resp, nil
-}
-
-var _ driver.Driver = (*AliDrive)(nil)

drivers/aliyundrive/meta.go

@@ -1,27 +0,0 @@
-package aliyundrive
-
-import (
-	"github.com/alist-org/alist/v3/internal/driver"
-	"github.com/alist-org/alist/v3/internal/op"
-)
-
-type Addition struct {
-	driver.RootID
-	RefreshToken   string `json:"refresh_token" required:"true"`
-	OrderBy        string `json:"order_by" type:"select" options:"name,size,updated_at,created_at"`
-	OrderDirection string `json:"order_direction" type:"select" options:"ASC,DESC"`
-	RapidUpload    bool   `json:"rapid_upload"`
-}
-
-var config = driver.Config{
-	Name:        "Aliyundrive",
-	DefaultRoot: "root",
-}
-
-func New() driver.Driver {
-	return &AliDrive{}
-}
-
-func init() {
-	op.RegisterDriver(config, New)
-}

drivers/aliyundrive/types.go

@@ -1,54 +0,0 @@
-package aliyundrive
-
-import (
-	"time"
-
-	"github.com/alist-org/alist/v3/internal/model"
-)
-
-type RespErr struct {
-	Code    string `json:"code"`
-	Message string `json:"message"`
-}
-
-type Files struct {
-	Items      []File `json:"items"`
-	NextMarker string `json:"next_marker"`
-}
-
-type File 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 fileToObj(f File) *model.ObjThumb {
-	return &model.ObjThumb{
-		Object: model.Object{
-			ID:       f.FileId,
-			Name:     f.Name,
-			Size:     f.Size,
-			Modified: f.UpdatedAt,
-			IsFolder: f.Type == "folder",
-		},
-	}
-}
-
-type UploadResp struct {
-	FileId       string `json:"file_id"`
-	UploadId     string `json:"upload_id"`
-	PartInfoList []struct {
-		UploadUrl string `json:"upload_url"`
-	} `json:"part_info_list"`
-
-	RapidUpload bool `json:"rapid_upload"`
-}

drivers/aliyundrive/util.go

@@ -1,133 +0,0 @@
-package aliyundrive
-
-import (
-	"errors"
-	"fmt"
-	"net/http"
-
-	"github.com/alist-org/alist/v3/drivers/base"
-	"github.com/alist-org/alist/v3/internal/op"
-	"github.com/alist-org/alist/v3/pkg/utils"
-	"github.com/go-resty/resty/v2"
-)
-
-// do others that not defined in Driver interface
-
-func (d *AliDrive) refreshToken() error {
-	url := "https://auth.aliyundrive.com/v2/account/token"
-	var resp base.TokenResp
-	var e RespErr
-	_, err := base.RestyClient.R().
-		//ForceContentType("application/json").
-		SetBody(base.Json{"refresh_token": d.RefreshToken, "grant_type": "refresh_token"}).
-		SetResult(&resp).
-		SetError(&e).
-		Post(url)
-	if err != nil {
-		return err
-	}
-	if e.Code != "" {
-		return fmt.Errorf("failed to refresh token: %s", e.Message)
-	}
-	d.RefreshToken, d.AccessToken = resp.RefreshToken, resp.AccessToken
-	op.MustSaveDriverStorage(d)
-	return nil
-}
-
-func (d *AliDrive) request(url, method string, callback base.ReqCallback, resp interface{}) ([]byte, error, RespErr) {
-	req := base.RestyClient.R()
-	req.SetHeader("Authorization", "Bearer\t"+d.AccessToken)
-	req.SetHeader("content-type", "application/json")
-	req.SetHeader("origin", "https://www.aliyundrive.com")
-	if callback != nil {
-		callback(req)
-	} else {
-		req.SetBody("{}")
-	}
-	if resp != nil {
-		req.SetResult(resp)
-	}
-	var e RespErr
-	req.SetError(&e)
-	res, err := req.Execute(method, url)
-	if err != nil {
-		return nil, err, e
-	}
-	if e.Code != "" {
-		if e.Code == "AccessTokenInvalid" {
-			err = d.refreshToken()
-			if err != nil {
-				return nil, err, e
-			}
-			return d.request(url, method, callback, resp)
-		}
-		return nil, errors.New(e.Message), e
-	}
-	return res.Body(), nil, e
-}
-
-func (d *AliDrive) getFiles(fileId string) ([]File, error) {
-	marker := "first"
-	res := make([]File, 0)
-	for marker != "" {
-		if marker == "first" {
-			marker = ""
-		}
-		var resp Files
-		data := base.Json{
-			"drive_id":                d.DriveId,
-			"fields":                  "*",
-			"image_thumbnail_process": "image/resize,w_400/format,jpeg",
-			"image_url_process":       "image/resize,w_1920/format,jpeg",
-			"limit":                   200,
-			"marker":                  marker,
-			"order_by":                d.OrderBy,
-			"order_direction":         d.OrderDirection,
-			"parent_file_id":          fileId,
-			"video_thumbnail_process": "video/snapshot,t_0,f_jpg,ar_auto,w_300",
-			"url_expire_sec":          14400,
-		}
-		_, err, _ := d.request("https://api.aliyundrive.com/v2/file/list", http.MethodPost, func(req *resty.Request) {
-			req.SetBody(data)
-		}, &resp)
-
-		if err != nil {
-			return nil, err
-		}
-		marker = resp.NextMarker
-		res = append(res, resp.Items...)
-	}
-	return res, nil
-}
-
-func (d *AliDrive) batch(srcId, dstId string, url string) error {
-	res, err, _ := d.request("https://api.aliyundrive.com/v3/batch", http.MethodPost, func(req *resty.Request) {
-		req.SetBody(base.Json{
-			"requests": []base.Json{
-				{
-					"headers": base.Json{
-						"Content-Type": "application/json",
-					},
-					"method": "POST",
-					"id":     srcId,
-					"body": base.Json{
-						"drive_id":          d.DriveId,
-						"file_id":           srcId,
-						"to_drive_id":       d.DriveId,
-						"to_parent_file_id": dstId,
-					},
-					"url": url,
-				},
-			},
-			"resource": "file",
-		})
-	}, nil)
-	if err != nil {
-		return err
-	}
-	status := utils.Json.Get(res, "responses", 0, "status").ToInt()
-	if status < 400 && status >= 100 {
-		return nil
-	}
-	return errors.New(string(res))
-}

drivers/all.go

@@ -1,31 +1,52 @@
 package drivers
 
 import (
-	_ "github.com/alist-org/alist/v3/drivers/123"
+	_ "github.com/Xhofe/alist/drivers/123"
-	_ "github.com/alist-org/alist/v3/drivers/139"
+	_ "github.com/Xhofe/alist/drivers/139"
-	_ "github.com/alist-org/alist/v3/drivers/189"
+	_ "github.com/Xhofe/alist/drivers/189"
-	_ "github.com/alist-org/alist/v3/drivers/189pc"
+	_ "github.com/Xhofe/alist/drivers/189pc"
-	_ "github.com/alist-org/alist/v3/drivers/aliyundrive"
+	_ "github.com/Xhofe/alist/drivers/alidrive"
-	_ "github.com/alist-org/alist/v3/drivers/baidu_netdisk"
+	_ "github.com/Xhofe/alist/drivers/alist"
-	_ "github.com/alist-org/alist/v3/drivers/ftp"
+	_ "github.com/Xhofe/alist/drivers/baidu"
-	_ "github.com/alist-org/alist/v3/drivers/google_drive"
+	"github.com/Xhofe/alist/drivers/base"
-	_ "github.com/alist-org/alist/v3/drivers/local"
+	_ "github.com/Xhofe/alist/drivers/ftp"
-	_ "github.com/alist-org/alist/v3/drivers/mediatrack"
+	_ "github.com/Xhofe/alist/drivers/google"
-	_ "github.com/alist-org/alist/v3/drivers/onedrive"
+	_ "github.com/Xhofe/alist/drivers/lanzou"
-	_ "github.com/alist-org/alist/v3/drivers/pikpak"
+	_ "github.com/Xhofe/alist/drivers/mediatrack"
-	_ "github.com/alist-org/alist/v3/drivers/quark"
+	_ "github.com/Xhofe/alist/drivers/native"
-	_ "github.com/alist-org/alist/v3/drivers/s3"
+	_ "github.com/Xhofe/alist/drivers/onedrive"
-	_ "github.com/alist-org/alist/v3/drivers/sftp"
+	_ "github.com/Xhofe/alist/drivers/pikpak"
-	_ "github.com/alist-org/alist/v3/drivers/teambition"
+	_ "github.com/Xhofe/alist/drivers/quark"
-	_ "github.com/alist-org/alist/v3/drivers/thunder"
+	_ "github.com/Xhofe/alist/drivers/s3"
-	_ "github.com/alist-org/alist/v3/drivers/uss"
+	_ "github.com/Xhofe/alist/drivers/sftp"
-	_ "github.com/alist-org/alist/v3/drivers/virtual"
+	_ "github.com/Xhofe/alist/drivers/shandian"
-	_ "github.com/alist-org/alist/v3/drivers/webdav"
+	_ "github.com/Xhofe/alist/drivers/teambition"
-	_ "github.com/alist-org/alist/v3/drivers/yandex_disk"
+	_ "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"
 )
 
-// All do nothing,just for import
+var NoCors string
-// same as _ import
+var NoUpload string
-func All() {
 
+func GetConfig() {
+	for k, v := range base.GetDriversMap() {
+		if v.Config().NoCors {
+			NoCors += k + ","
+		}
+		if v.Upload(nil, nil) != base.ErrEmptyFile {
+			NoUpload += k + ","
+		}
+	}
+	NoCors = strings.Trim(NoCors, ",")
+	NoUpload += "root"
+}
+
+func init() {
+	log.Debug("all init")
+	GetConfig()
 }

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

@@ -1,11 +1,4 @@
-package baidu_netdisk
+package baidu
-
-import (
-	"strconv"
-	"time"
-
-	"github.com/alist-org/alist/v3/internal/model"
-)
 
 type TokenErrResp struct {
 	ErrorDescription string `json:"error_description"`
@@ -43,19 +36,6 @@ type File struct {
 	Isdir int `json:"isdir"`
 }
 
-func fileToObj(f File) *model.ObjThumb {
-	return &model.ObjThumb{
-		Object: model.Object{
-			ID:       strconv.FormatInt(f.FsId, 10),
-			Name:     f.ServerFilename,
-			Size:     f.Size,
-			Modified: time.Unix(f.ServerMtime, 0),
-			IsFolder: f.Isdir == 1,
-		},
-		Thumbnail: model.Thumbnail{Thumbnail: f.Thumbs.Url3},
-	}
-}
-
 type ListResp struct {
 	Errno     int    `json:"errno"`
 	GuidInfo  string `json:"guid_info"`

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/baidu_netdisk/driver.go

@@ -1,233 +0,0 @@
-package baidu_netdisk
-
-import (
-	"bytes"
-	"context"
-	"crypto/md5"
-	"encoding/hex"
-	"fmt"
-	"io"
-	"math"
-	"os"
-	stdpath "path"
-	"strconv"
-	"strings"
-
-	"github.com/alist-org/alist/v3/drivers/base"
-	"github.com/alist-org/alist/v3/internal/driver"
-	"github.com/alist-org/alist/v3/internal/model"
-	"github.com/alist-org/alist/v3/pkg/utils"
-	log "github.com/sirupsen/logrus"
-)
-
-type BaiduNetdisk struct {
-	model.Storage
-	Addition
-	AccessToken string
-}
-
-func (d *BaiduNetdisk) Config() driver.Config {
-	return config
-}
-
-func (d *BaiduNetdisk) GetAddition() driver.Additional {
-	return d.Addition
-}
-
-func (d *BaiduNetdisk) Init(ctx context.Context, storage model.Storage) error {
-	d.Storage = storage
-	err := utils.Json.UnmarshalFromString(d.Storage.Addition, &d.Addition)
-	if err != nil {
-		return err
-	}
-	return d.refreshToken()
-}
-
-func (d *BaiduNetdisk) Drop(ctx context.Context) error {
-	return nil
-}
-
-func (d *BaiduNetdisk) List(ctx context.Context, dir model.Obj, args model.ListArgs) ([]model.Obj, error) {
-	files, err := d.getFiles(dir.GetPath())
-	if err != nil {
-		return nil, err
-	}
-	return utils.SliceConvert(files, func(src File) (model.Obj, error) {
-		return fileToObj(src), nil
-	})
-}
-
-//func (d *BaiduNetdisk) Get(ctx context.Context, path string) (model.Obj, error) {
-//	// this is optional
-//	return nil, errs.NotImplement
-//}
-
-func (d *BaiduNetdisk) Link(ctx context.Context, file model.Obj, args model.LinkArgs) (*model.Link, error) {
-	if d.DownloadAPI == "crack" {
-		return d.linkCrack(file, args)
-	}
-	return d.linkOfficial(file, args)
-}
-
-func (d *BaiduNetdisk) MakeDir(ctx context.Context, parentDir model.Obj, dirName string) error {
-	_, err := d.create(stdpath.Join(parentDir.GetPath(), dirName), 0, 1, "", "")
-	return err
-}
-
-func (d *BaiduNetdisk) Move(ctx context.Context, srcObj, dstDir model.Obj) error {
-	data := []base.Json{
-		{
-			"path":    srcObj.GetPath(),
-			"dest":    dstDir.GetPath(),
-			"newname": srcObj.GetName(),
-		},
-	}
-	_, err := d.manage("move", data)
-	return err
-}
-
-func (d *BaiduNetdisk) Rename(ctx context.Context, srcObj model.Obj, newName string) error {
-	data := []base.Json{
-		{
-			"path":    srcObj.GetPath(),
-			"newname": newName,
-		},
-	}
-	_, err := d.manage("rename", data)
-	return err
-}
-
-func (d *BaiduNetdisk) Copy(ctx context.Context, srcObj, dstDir model.Obj) error {
-	dest, newname := stdpath.Split(dstDir.GetPath())
-	data := []base.Json{
-		{
-			"path":    srcObj.GetPath(),
-			"dest":    dest,
-			"newname": newname,
-		},
-	}
-	_, err := d.manage("copy", data)
-	return err
-}
-
-func (d *BaiduNetdisk) Remove(ctx context.Context, obj model.Obj) error {
-	data := []string{obj.GetPath()}
-	_, err := d.manage("delete", data)
-	return err
-}
-
-func (d *BaiduNetdisk) Put(ctx context.Context, dstDir model.Obj, stream model.FileStreamer, up driver.UpdateProgress) error {
-	tempFile, err := utils.CreateTempFile(stream.GetReadCloser())
-	if err != nil {
-		return err
-	}
-	defer func() {
-		_ = tempFile.Close()
-		_ = os.Remove(tempFile.Name())
-	}()
-	var Default int64 = 4 * 1024 * 1024
-	defaultByteData := make([]byte, Default)
-	count := int(math.Ceil(float64(stream.GetSize()) / float64(Default)))
-	var SliceSize int64 = 256 * 1024
-	// cal md5
-	h1 := md5.New()
-	h2 := md5.New()
-	block_list := make([]string, 0)
-	content_md5 := ""
-	slice_md5 := ""
-	left := stream.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 stream.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(stdpath.Join(dstDir.GetPath(), stream.GetName()))
-	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, stream.GetSize(),
-		block_list_str,
-		content_md5, slice_md5)
-	params := map[string]string{
-		"method": "precreate",
-	}
-	var precreateResp PrecreateResp
-	_, err = d.post("/xpan/file", params, data, &precreateResp)
-	if err != nil {
-		return err
-	}
-	log.Debugf("%+v", precreateResp)
-	if precreateResp.ReturnType == 2 {
-		return nil
-	}
-	params = map[string]string{
-		"method":       "upload",
-		"access_token": d.AccessToken,
-		"type":         "tmpfile",
-		"path":         path,
-		"uploadid":     precreateResp.Uploadid,
-	}
-	left = stream.GetSize()
-	for i, 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", stream.GetName(), bytes.NewReader(byteData)).Post(u)
-		if err != nil {
-			return err
-		}
-		log.Debugln(res.String())
-		if len(precreateResp.BlockList) > 0 {
-			up(i * 100 / len(precreateResp.BlockList))
-		}
-	}
-	_, err = d.create(path, stream.GetSize(), 0, precreateResp.Uploadid, block_list_str)
-	return err
-}
-
-var _ driver.Driver = (*BaiduNetdisk)(nil)

drivers/baidu_netdisk/meta.go

@@ -1,29 +0,0 @@
-package baidu_netdisk
-
-import (
-	"github.com/alist-org/alist/v3/internal/driver"
-	"github.com/alist-org/alist/v3/internal/op"
-)
-
-type Addition struct {
-	RefreshToken string `json:"refresh_token" required:"true"`
-	driver.RootPath
-	OrderBy        string `json:"order_by" type:"select" options:"name,time,size" default:"name"`
-	OrderDirection string `json:"order_direction" type:"select" options:"asc,desc" default:"asc"`
-	DownloadAPI    string `json:"download_api" type:"select" options:"official,crack" default:"official"`
-	ClientID       string `json:"client_id" required:"true" default:"iYCeC9g08h5vuP9UqvPHKKSVrKFXGa1v"`
-	ClientSecret   string `json:"client_secret" required:"true" default:"jXiFMOPVPCWlO2M5CwWQzffpNPaGTRBG"`
-}
-
-var config = driver.Config{
-	Name:        "BaiduNetdisk",
-	DefaultRoot: "/",
-}
-
-func New() driver.Driver {
-	return &BaiduNetdisk{}
-}
-
-func init() {
-	op.RegisterDriver(config, New)
-}

drivers/baidu_netdisk/util.go

@@ -1,201 +0,0 @@
-package baidu_netdisk
-
-import (
-	"fmt"
-	"net/http"
-	"net/url"
-	"strconv"
-	"strings"
-
-	"github.com/alist-org/alist/v3/drivers/base"
-	"github.com/alist-org/alist/v3/internal/errs"
-	"github.com/alist-org/alist/v3/internal/model"
-	"github.com/alist-org/alist/v3/internal/op"
-	"github.com/alist-org/alist/v3/pkg/utils"
-	"github.com/go-resty/resty/v2"
-)
-
-// do others that not defined in Driver interface
-
-func (d *BaiduNetdisk) refreshToken() error {
-	err := d._refreshToken()
-	if err != nil && err == errs.EmptyToken {
-		err = d._refreshToken()
-	}
-	return err
-}
-
-func (d *BaiduNetdisk) _refreshToken() 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": d.RefreshToken,
-		"client_id":     d.ClientID,
-		"client_secret": d.ClientSecret,
-	}).Get(u)
-	if err != nil {
-		return err
-	}
-	if e.Error != "" {
-		return fmt.Errorf("%s : %s", e.Error, e.ErrorDescription)
-	}
-	if resp.RefreshToken == "" {
-		return errs.EmptyToken
-	}
-	d.AccessToken, d.RefreshToken = resp.AccessToken, resp.RefreshToken
-	op.MustSaveDriverStorage(d)
-	return nil
-}
-
-func (d *BaiduNetdisk) request(furl string, method string, callback base.ReqCallback, resp interface{}) ([]byte, error) {
-	req := base.RestyClient.R()
-	req.SetQueryParam("access_token", d.AccessToken)
-	if callback != nil {
-		callback(req)
-	}
-	if resp != nil {
-		req.SetResult(resp)
-	}
-	res, err := req.Execute(method, furl)
-	if err != nil {
-		return nil, err
-	}
-	errno := utils.Json.Get(res.Body(), "errno").ToInt()
-	if errno != 0 {
-		if errno == -6 {
-			err = d.refreshToken()
-			if err != nil {
-				return nil, err
-			}
-			return d.request(furl, method, callback, resp)
-		}
-		return nil, fmt.Errorf("errno: %d, refer to https://pan.baidu.com/union/doc/", errno)
-	}
-	return res.Body(), nil
-}
-
-func (d *BaiduNetdisk) get(pathname string, params map[string]string, resp interface{}) ([]byte, error) {
-	return d.request("https://pan.baidu.com/rest/2.0"+pathname, http.MethodGet, func(req *resty.Request) {
-		req.SetQueryParams(params)
-	}, resp)
-}
-
-func (d *BaiduNetdisk) post(pathname string, params map[string]string, data interface{}, resp interface{}) ([]byte, error) {
-	return d.request("https://pan.baidu.com/rest/2.0"+pathname, http.MethodPost, func(req *resty.Request) {
-		req.SetQueryParams(params)
-		req.SetBody(data)
-	}, resp)
-}
-
-func (d *BaiduNetdisk) getFiles(dir string) ([]File, error) {
-	start := 0
-	limit := 200
-	params := map[string]string{
-		"method": "list",
-		"dir":    dir,
-		"web":    "web",
-	}
-	if d.OrderBy != "" {
-		params["order"] = d.OrderBy
-		if d.OrderDirection == "desc" {
-			params["desc"] = "1"
-		}
-	}
-	res := make([]File, 0)
-	for {
-		params["start"] = strconv.Itoa(start)
-		params["limit"] = strconv.Itoa(limit)
-		start += limit
-		var resp ListResp
-		_, err := d.get("/xpan/file", params, &resp)
-		if err != nil {
-			return nil, err
-		}
-		if len(resp.List) == 0 {
-			break
-		}
-		res = append(res, resp.List...)
-	}
-	return res, nil
-}
-
-func (d *BaiduNetdisk) linkOfficial(file model.Obj, args model.LinkArgs) (*model.Link, error) {
-	var resp DownloadResp
-	params := map[string]string{
-		"method": "filemetas",
-		"fsids":  fmt.Sprintf("[%s]", file.GetID()),
-		"dlink":  "1",
-	}
-	_, err := d.get("/xpan/multimedia", params, &resp)
-	if err != nil {
-		return nil, err
-	}
-	u := fmt.Sprintf("%s&access_token=%s", resp.List[0].Dlink, d.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 &model.Link{
-		URL: u,
-		Header: http.Header{
-			"User-Agent": []string{"pan.baidu.com"},
-		},
-	}, nil
-}
-
-func (d *BaiduNetdisk) linkCrack(file model.Obj, args model.LinkArgs) (*model.Link, error) {
-	var resp DownloadResp2
-	param := map[string]string{
-		"target": fmt.Sprintf("[\"%s\"]", file.GetPath()),
-		"dlink":  "1",
-		"web":    "5",
-		"origin": "dlna",
-	}
-	_, err := d.request("https://pan.baidu.com/api/filemetas", http.MethodGet, func(req *resty.Request) {
-		req.SetQueryParams(param)
-	}, &resp)
-	if err != nil {
-		return nil, err
-	}
-	return &model.Link{
-		URL: resp.Info[0].Dlink,
-		Header: http.Header{
-			"User-Agent": []string{"pan.baidu.com"},
-		},
-	}, nil
-}
-
-func (d *BaiduNetdisk) manage(opera string, filelist interface{}) ([]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 d.post("/xpan/file", params, data, nil)
-}
-
-func (d *BaiduNetdisk) create(path string, size int64, isdir int, uploadid, block_list string) ([]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 d.post("/xpan/file", params, data, nil)
-}
-
-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_V1+"/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,502 @@
+package baiduphoto
+
+import (
+	"crypto/md5"
+	"encoding/hex"
+	"fmt"
+	"io"
+	"io/ioutil"
+	"math"
+	"net/http"
+	"os"
+
+	"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:     "internal_type",
+			Label:    "download api",
+			Type:     base.TypeSelect,
+			Required: true,
+			Values:   "file,album",
+			Default:  "album",
+		},
+		{
+			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 := utils.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(utils.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) {
+	if account.InternalType == "file" {
+		return driver.LinkFile(args, account)
+	}
+	return driver.LinkAlbum(args, account)
+}
+
+func (driver Baidu) LinkAlbum(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(utils.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) LinkFile(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(utils.Dir(utils.ParsePath(args.Path)), account)
+	if err != nil {
+		return nil, err
+	}
+	// 拷贝到根目录
+	cfile, err := driver.CopyAlbumFile(album.Id, account, file.Id)
+	if err != nil {
+		return nil, err
+	}
+
+	res, err := driver.Request(http.MethodGet, FILE_API_URL_V2+"/download", func(r *resty.Request) {
+		r.SetQueryParams(map[string]string{
+			"fsid": fmt.Sprint(cfile.Fsid),
+		})
+	}, account)
+	if err != nil {
+		return nil, err
+	}
+	return &base.Link{
+		Headers: []base.Header{
+			{Name: "User-Agent", Value: base.UserAgent},
+		},
+		Url: utils.Json.Get(res.Body(), "dlink").ToString(),
+	}, 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, utils.Base(dst), account)
+	}
+	return base.ErrNotSupport
+}
+
+func (driver Baidu) MakeDir(path string, account *model.Account) error {
+	dir, name := utils.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(utils.Dir(dst), account)
+		if err != nil {
+			return err
+		}
+		if !IsAlbum(dstAlbum) {
+			return base.ErrNotSupport
+		}
+
+		srcAlbum, err := driver.File(utils.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(utils.Dir(dst), account)
+		if err != nil {
+			return err
+		}
+		if !IsAlbum(dstAlbum) {
+			return base.ErrNotSupport
+		}
+
+		srcAlbum, err := driver.File(utils.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(utils.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_V1+"/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_V1+"/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,126 @@
+package baiduphoto
+
+import (
+	"fmt"
+
+	"github.com/Xhofe/alist/utils"
+)
+
+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 utils.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           int64  `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,84 @@
+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_V1 = API_URL + "/file/v1"
+	FILE_API_URL_V2 = API_URL + "/file/v2"
+)
+
+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

@@ -0,0 +1,58 @@
+package base
+
+import (
+	"github.com/Xhofe/alist/conf"
+	"github.com/Xhofe/alist/model"
+	"github.com/Xhofe/alist/utils"
+	log "github.com/sirupsen/logrus"
+	"strings"
+)
+
+func KeyCache(path string, account *model.Account) string {
+	//path = utils.ParsePath(path)
+	key := utils.ParsePath(utils.Join(account.Name, path))
+	log.Debugln("cache key: ", key)
+	return key
+}
+
+func SaveSearchFiles[T model.ISearchFile](key string, obj []T) {
+	if strings.Contains(key, ".balance") {
+		return
+	}
+	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) {
+	return conf.Cache.Get(conf.Ctx, KeyCache(path, account))
+}
+
+func DeleteCache(path string, account *model.Account) error {
+	err := conf.Cache.Delete(conf.Ctx, KeyCache(path, account))
+	log.Debugf("delete cache %s: %+v", path, err)
+	return err
+}

drivers/base/client.go

@@ -1,30 +0,0 @@
-package base
-
-import (
-	"net/http"
-	"time"
-
-	"github.com/go-resty/resty/v2"
-)
-
-var NoRedirectClient *resty.Client
-var RestyClient = NewRestyClient()
-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 * 10
-
-func init() {
-	NoRedirectClient = resty.New().SetRedirectPolicy(
-		resty.RedirectPolicyFunc(func(req *http.Request, via []*http.Request) error {
-			return http.ErrUseLastResponse
-		}),
-	)
-	NoRedirectClient.SetHeader("user-agent", UserAgent)
-}
-
-func NewRestyClient() *resty.Client {
-	return resty.New().
-		SetHeader("user-agent", UserAgent).
-		SetRetryCount(3).
-		SetTimeout(DefaultTimeout)
-}

drivers/base/driver.go

@@ -0,0 +1,181 @@
+package base
+
+import (
+	"github.com/Xhofe/alist/model"
+	"github.com/go-resty/resty/v2"
+	log "github.com/sirupsen/logrus"
+	"net/http"
+	"time"
+)
+
+type DriverConfig struct {
+	Name          string
+	OnlyProxy     bool // 必须使用代理（本机或者其他机器）
+	OnlyLocal     bool // 必须本机返回的
+	ApiProxy      bool // 使用API中转的
+	NoNeedSetLink bool // 不需要设置链接的
+	NoCors        bool // 不可以跨域
+	LocalSort     bool // 本地排序
+}
+
+type Args struct {
+	Path   string
+	IP     string
+	Header http.Header
+}
+
+type Driver interface {
+	// Config 配置
+	Config() DriverConfig
+	// Items 账号所需参数
+	Items() []Item
+	// Save 保存时处理
+	Save(account *model.Account, old *model.Account) error
+	// File 取文件
+	File(path string, account *model.Account) (*model.File, error)
+	// Files 取文件夹
+	Files(path string, account *model.Account) ([]model.File, error)
+	// Link 取链接
+	Link(args Args, account *model.Account) (*Link, error)
+	// Path 取路径（文件或文件夹）
+	Path(path string, account *model.Account) (*model.File, []model.File, error)
+	// 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 删除
+	Delete(path string, account *model.Account) error
+	// Upload 上传
+	Upload(file *model.FileStream, account *model.Account) error
+	// TODO
+	//Search(path string, keyword string, account *model.Account) ([]*model.File, error)
+}
+
+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"`
+}
+
+var driversMap = map[string]Driver{}
+
+func RegisterDriver(driver Driver) {
+	log.Infof("register driver: [%s]", driver.Config().Name)
+	driversMap[driver.Config().Name] = driver
+}
+
+func GetDriver(name string) (driver Driver, ok bool) {
+	driver, ok = driversMap[name]
+	return
+}
+
+func GetDriversMap() map[string]Driver {
+	return driversMap
+}
+
+func GetDrivers() map[string][]Item {
+	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] = append([]Item{
+				webdavDirect,
+			}, v.Items()...)
+		} else {
+			res[k] = append([]Item{
+				{
+					Name:        "proxy",
+					Label:       "proxy",
+					Type:        TypeBool,
+					Required:    true,
+					Description: "web proxy",
+				},
+				{
+					Name:        "webdav_proxy",
+					Label:       "webdav proxy",
+					Type:        TypeBool,
+					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:  TypeText,
+			},
+			{
+				Name:   "extract_folder",
+				Label:  "extract_folder",
+				Values: "front,back",
+				Type:   TypeSelect,
+			},
+		}, res[k]...)
+		if v.Config().ApiProxy {
+			res[k] = append([]Item{
+				{
+					Name:  "api_proxy_url",
+					Label: "api_proxy_url",
+					Type:  TypeString,
+				},
+			}, res[k]...)
+		}
+		if v.Config().LocalSort {
+			res[k] = append(res[k], []Item{
+				{
+					Name:     "order_by",
+					Label:    "order_by",
+					Type:     TypeSelect,
+					Values:   "name,size,updated_at",
+					Required: false,
+				},
+				{
+					Name:     "order_direction",
+					Label:    "order_direction",
+					Type:     TypeSelect,
+					Values:   "ASC,DESC",
+					Required: false,
+				},
+			}...)
+		}
+	}
+	return res
+}
+
+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(
+		resty.RedirectPolicyFunc(func(req *http.Request, via []*http.Request) error {
+			return http.ErrUseLastResponse
+		}),
+	)
+	NoRedirectClient.SetHeader("user-agent", UserAgent)
+	RestyClient.SetHeader("user-agent", UserAgent)
+	RestyClient.SetRetryCount(3)
+	RestyClient.SetTimeout(DefaultTimeout)
+}

drivers/base/types.go

@@ -1,6 +1,37 @@
 package base
 
-import "github.com/go-resty/resty/v2"
+import (
+	"errors"
+	"io"
+	"net/http"
+)
+
+var (
+	ErrPathNotFound = errors.New("path not found")
+	ErrNotFile      = errors.New("not file")
+	ErrNotImplement = errors.New("not implement")
+	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 (
+	TypeString = "string"
+	TypeSelect = "select"
+	TypeBool   = "bool"
+	TypeNumber = "number"
+	TypeText   = "text"
+)
+
+const (
+	Get = iota
+	Post
+	Put
+	Delete
+	Patch
+)
 
 type Json map[string]interface{}
 
@@ -9,4 +40,16 @@ type TokenResp struct {
 	RefreshToken string `json:"refresh_token"`
 }
 
-type ReqCallback func(req *resty.Request)
+type Header struct {
+	Name  string `json:"name"`
+	Value string `json:"value"`
+}
+
+type Link struct {
+	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

@@ -1,130 +1,262 @@
 package ftp
 
 import (
-	"context"
+	"github.com/Xhofe/alist/conf"
-	stdpath "path"
+	"github.com/Xhofe/alist/drivers/base"
-
+	"github.com/Xhofe/alist/model"
-	"github.com/alist-org/alist/v3/internal/driver"
+	"github.com/Xhofe/alist/utils"
-	"github.com/alist-org/alist/v3/internal/errs"
-	"github.com/alist-org/alist/v3/internal/model"
-	"github.com/alist-org/alist/v3/pkg/utils"
 	"github.com/jlaffaye/ftp"
+	log "github.com/sirupsen/logrus"
+	"path/filepath"
 )
 
-type FTP struct {
+type FTP struct{}
-	model.Storage
+
-	Addition
+func (driver FTP) Config() base.DriverConfig {
-	conn *ftp.ServerConn
+	return base.DriverConfig{
+		Name:          "FTP",
+		OnlyProxy:     true,
+		OnlyLocal:     true,
+		NoNeedSetLink: true,
+		LocalSort:     true,
+	}
 }
 
-func (d *FTP) Config() driver.Config {
+func (driver FTP) Items() []base.Item {
-	return config
+	return []base.Item{
+		{
+			Name:     "site_url",
+			Label:    "ftp host url",
+			Type:     base.TypeString,
+			Required: true,
+		},
+		{
+			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,
+			Required: false,
+		},
+	}
 }
 
-func (d *FTP) GetAddition() driver.Additional {
+func (driver FTP) Save(account *model.Account, old *model.Account) error {
-	return d.Addition
+	if old != nil {
-}
+		conn, ok := connMap[old.Name]
-
+		if ok {
-func (d *FTP) Init(ctx context.Context, storage model.Storage) error {
+			err := conn.Quit()
-	d.Storage = storage
+			log.Error("ftp:", err)
-	err := utils.Json.UnmarshalFromString(d.Storage.Addition, &d.Addition)
+			delete(connMap, old.Name)
+		}
+	}
+	if account == nil {
+		return nil
+	}
+	if account.RootFolder == "" {
+		account.RootFolder = "/"
+	}
+	_, err := driver.Login(account)
 	if err != nil {
-		return err
+		account.Status = err.Error()
+	} else {
+		account.Status = "work"
 	}
-	return d.login()
+	_ = model.SaveAccount(account)
+	return err
 }
 
-func (d *FTP) Drop(ctx context.Context) error {
+func (driver FTP) File(path string, account *model.Account) (*model.File, error) {
-	if d.conn != nil {
+	log.Debugf("file: %s", path)
-		_ = d.conn.Logout()
+	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
 	}
-	return nil
+	dir, name := filepath.Split(path)
-}
+	files, err := driver.Files(dir, account)
-
-func (d *FTP) List(ctx context.Context, dir model.Obj, args model.ListArgs) ([]model.Obj, error) {
-	if err := d.login(); err != nil {
-		return nil, err
-	}
-	entries, err := d.conn.List(dir.GetPath())
 	if err != nil {
 		return nil, err
 	}
-	res := make([]model.Obj, 0)
+	for _, file := range files {
+		if file.Name == name {
+			return &file, nil
+		}
+	}
+	return nil, base.ErrPathNotFound
+}
+
+func (driver FTP) Files(path string, account *model.Account) ([]model.File, error) {
+	log.Debugf("files: %s", path)
+	path = utils.ParsePath(path)
+	cache, err := base.GetCache(path, account)
+	if err == nil {
+		files, _ := cache.([]model.File)
+		return files, nil
+	}
+	realPath := utils.Join(account.RootFolder, path)
+	conn, err := driver.Login(account)
+	if err != nil {
+		return nil, err
+	}
+	//defer func() { _ = conn.Quit() }()
+	entries, err := conn.List(realPath)
+	if err != nil {
+		return nil, err
+	}
+	res := make([]model.File, 0)
 	for i, _ := range entries {
 		entry := entries[i]
 		if entry.Name == "." || entry.Name == ".." {
 			continue
 		}
-		f := model.Object{
+		f := model.File{
-			Name:     entry.Name,
+			Name:      entry.Name,
-			Size:     int64(entry.Size),
+			Size:      int64(entry.Size),
-			Modified: entry.Time,
+			UpdatedAt: &entry.Time,
-			IsFolder: entry.Type == ftp.EntryTypeFolder,
+			Driver:    driver.Config().Name,
 		}
-		res = append(res, &f)
+		if entry.Type == ftp.EntryTypeFolder {
+			f.Type = conf.FOLDER
+		} else {
+			f.Type = utils.GetFileType(filepath.Ext(entry.Name))
+		}
+		res = append(res, f)
+	}
+	if len(res) > 0 {
+		_ = base.SetCache(path, res, account)
 	}
 	return res, nil
 }
 
-//func (d *FTP) Get(ctx context.Context, path string) (model.Obj, error) {
+func (driver FTP) Link(args base.Args, account *model.Account) (*base.Link, error) {
-//	// this is optional
+	path := args.Path
-//	return nil, errs.NotImplement
+	path = utils.ParsePath(path)
-//}
+	realPath := utils.Join(account.RootFolder, path)
-
+	conn, err := driver.Login(account)
-func (d *FTP) Link(ctx context.Context, file model.Obj, args model.LinkArgs) (*model.Link, error) {
-	if err := d.login(); err != nil {
-		return nil, err
-	}
-	resp, err := d.conn.Retr(file.GetPath())
 	if err != nil {
 		return nil, err
 	}
-	return &model.Link{
+	//defer func() { _ = conn.Quit() }()
+	resp, err := conn.Retr(realPath)
+	if err != nil {
+		return nil, err
+	}
+	//defer func() { _ = resp.Close() }()
+	//data, err := ioutil.ReadAll(resp)
+	//if err != nil {
+	//	return nil, err
+	//}
+	return &base.Link{
 		Data: resp,
 	}, nil
 }
 
-func (d *FTP) MakeDir(ctx context.Context, parentDir model.Obj, dirName string) error {
+func (driver FTP) Path(path string, account *model.Account) (*model.File, []model.File, error) {
-	if err := d.login(); err != nil {
+	log.Debugf("ftp path: %s", path)
-		return err
+	file, err := driver.File(path, account)
+	if err != nil {
+		return nil, nil, err
 	}
-	return d.conn.MakeDir(stdpath.Join(parentDir.GetPath(), dirName))
+	if !file.IsDir() {
+		//file.Url, _ = driver.Link(path, account)
+		return file, nil, nil
+	}
+	files, err := driver.Files(path, account)
+	if err != nil {
+		return nil, nil, err
+	}
+	return nil, files, nil
 }
 
-func (d *FTP) Move(ctx context.Context, srcObj, dstDir model.Obj) error {
+//func (driver FTP) Proxy(r *http.Request, account *model.Account) {
-	if err := d.login(); err != nil {
+//
-		return err
+//}
-	}
+
-	return d.conn.Rename(srcObj.GetPath(), stdpath.Join(dstDir.GetPath(), srcObj.GetName()))
+func (driver FTP) Preview(path string, account *model.Account) (interface{}, error) {
+	return nil, base.ErrNotSupport
 }
 
-func (d *FTP) Rename(ctx context.Context, srcObj model.Obj, newName string) error {
+func (driver FTP) MakeDir(path string, account *model.Account) error {
-	if err := d.login(); err != nil {
+	path = utils.ParsePath(path)
+	realPath := utils.Join(account.RootFolder, path)
+	conn, err := driver.Login(account)
+	if err != nil {
 		return err
 	}
-	return d.conn.Rename(srcObj.GetPath(), stdpath.Join(stdpath.Dir(srcObj.GetPath()), newName))
+	//defer func() { _ = conn.Quit() }()
+	err = conn.MakeDir(realPath)
+	return err
 }
 
-func (d *FTP) Copy(ctx context.Context, srcObj, dstDir model.Obj) error {
+func (driver FTP) Move(src string, dst string, account *model.Account) error {
-	return errs.NotSupport
+	realSrc := utils.Join(account.RootFolder, src)
-}
+	realDst := utils.Join(account.RootFolder, dst)
-
+	conn, err := driver.Login(account)
-func (d *FTP) Remove(ctx context.Context, obj model.Obj) error {
+	if err != nil {
-	if err := d.login(); err != nil {
 		return err
 	}
-	if obj.IsDir() {
+	//defer func() { _ = conn.Quit() }()
-		return d.conn.RemoveDirRecur(obj.GetPath())
+	err = conn.Rename(realSrc, realDst)
+	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
+}
+
+func (driver FTP) Delete(path string, account *model.Account) error {
+	path = utils.ParsePath(path)
+	file, err := driver.File(path, account)
+	if err != nil {
+		return err
+	}
+	realPath := utils.Join(account.RootFolder, path)
+	conn, err := driver.Login(account)
+	if err != nil {
+		return err
+	}
+	//defer func() { _ = conn.Quit() }()
+	if file.IsDir() {
+		err = conn.RemoveDirRecur(realPath)
 	} else {
-		return d.conn.Delete(obj.GetPath())
+		err = conn.Delete(realPath)
 	}
+	return err
 }
 
-func (d *FTP) Put(ctx context.Context, dstDir model.Obj, stream model.FileStreamer, up driver.UpdateProgress) error {
+func (driver FTP) Upload(file *model.FileStream, account *model.Account) error {
-	if err := d.login(); err != nil {
+	if file == nil {
+		return base.ErrEmptyFile
+	}
+	realPath := utils.Join(account.RootFolder, file.ParentPath, file.Name)
+	conn, err := driver.Login(account)
+	if err != nil {
 		return err
 	}
-	return d.conn.Stor(stdpath.Join(dstDir.GetPath(), stream.GetName()), stream)
+	//defer func() { _ = conn.Quit() }()
+	err = conn.Stor(realPath, file)
+	return err
 }
 
-var _ driver.Driver = (*FTP)(nil)
+var _ base.Driver = (*FTP)(nil)

drivers/ftp/ftp.go

@@ -0,0 +1,36 @@
+package ftp
+
+import (
+	"github.com/Xhofe/alist/drivers/base"
+	"github.com/Xhofe/alist/model"
+	"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
+	}
+	err = conn.Login(account.Username, account.Password)
+	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/ftp/meta.go

@@ -1,28 +0,0 @@
-package ftp
-
-import (
-	"github.com/alist-org/alist/v3/internal/driver"
-	"github.com/alist-org/alist/v3/internal/op"
-)
-
-type Addition struct {
-	Address  string `json:"address" required:"true"`
-	Username string `json:"username" required:"true"`
-	Password string `json:"password" required:"true"`
-	driver.RootPath
-}
-
-var config = driver.Config{
-	Name:        "FTP",
-	LocalSort:   true,
-	OnlyLocal:   true,
-	DefaultRoot: "/",
-}
-
-func New() driver.Driver {
-	return &FTP{}
-}
-
-func init() {
-	op.RegisterDriver(config, New)
-}

drivers/ftp/types.go

@@ -1 +0,0 @@
-package ftp

drivers/ftp/util.go

@@ -1,23 +0,0 @@
-package ftp
-
-import "github.com/jlaffaye/ftp"
-
-// do others that not defined in Driver interface
-
-func (d *FTP) login() error {
-	if d.conn != nil {
-		_, err := d.conn.CurrentDir()
-		if err == nil {
-			return nil
-		}
-	}
-	conn, err := ftp.Dial(d.Address)
-	if err != nil {
-		return err
-	}
-	err = conn.Login(d.Username, d.Password)
-	if err != nil {
-		return err
-	}
-	return nil
-}

drivers/google/driver.go

@@ -0,0 +1,289 @@
+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"
+	log "github.com/sirupsen/logrus"
+	"io/ioutil"
+	"path/filepath"
+)
+
+type GoogleDrive struct{}
+
+func (driver GoogleDrive) Config() base.DriverConfig {
+	return base.DriverConfig{
+		Name:          "GoogleDrive",
+		OnlyProxy:     true,
+		ApiProxy:      true,
+		NoNeedSetLink: true,
+	}
+}
+
+func (driver GoogleDrive) Items() []base.Item {
+	return []base.Item{
+		{
+			Name:     "client_id",
+			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",
+			Label:    "refresh token",
+			Type:     base.TypeString,
+			Required: true,
+		},
+		{
+			Name:     "root_folder",
+			Label:    "root folder file_id",
+			Type:     base.TypeString,
+			Required: false,
+		},
+		{
+			Name:        "order_by",
+			Label:       "order_by",
+			Type:        base.TypeString,
+			Required:    false,
+			Description: "such as: folder,name,modifiedTime",
+		},
+		{
+			Name:     "order_direction",
+			Label:    "order_direction",
+			Type:     base.TypeSelect,
+			Values:   "asc,desc",
+			Required: false,
+		},
+	}
+}
+
+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 {
+		account.Status = err.Error()
+		_ = model.SaveAccount(account)
+		return err
+	}
+	if account.RootFolder == "" {
+		account.RootFolder = "root"
+	}
+	account.Status = "work"
+	_ = model.SaveAccount(account)
+	return nil
+}
+
+func (driver GoogleDrive) 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 GoogleDrive) Files(path string, account *model.Account) ([]model.File, error) {
+	path = utils.ParsePath(path)
+	var rawFiles []File
+	cache, err := base.GetCache(path, account)
+	if err == nil {
+		rawFiles, _ = cache.([]File)
+	} else {
+		file, err := driver.File(path, account)
+		if err != nil {
+			return nil, err
+		}
+		rawFiles, err = driver.GetFiles(file.Id, account)
+		if err != nil {
+			return nil, err
+		}
+		if len(rawFiles) > 0 {
+			_ = base.SetCache(path, rawFiles, account)
+		}
+	}
+	files := make([]model.File, 0)
+	for _, file := range rawFiles {
+		files = append(files, *driver.FormatFile(&file, account))
+	}
+	return files, nil
+}
+
+func (driver GoogleDrive) Link(args base.Args, account *model.Account) (*base.Link, error) {
+	file, err := driver.File(args.Path, account)
+	if err != nil {
+		return nil, err
+	}
+	if file.Type == conf.FOLDER {
+		return nil, base.ErrNotFile
+	}
+	url := fmt.Sprintf("https://www.googleapis.com/drive/v3/files/%s?includeItemsFromAllDrives=true&supportsAllDrives=true", file.Id)
+	_, err = driver.Request(url, base.Get, nil, nil, nil, nil, nil, account)
+	if err != nil {
+		return nil, err
+	}
+	link := base.Link{
+		Url: url + "&alt=media",
+		Headers: []base.Header{
+			{
+				Name:  "Authorization",
+				Value: "Bearer " + account.AccessToken,
+			},
+		},
+	}
+	return &link, nil
+}
+
+func (driver GoogleDrive) Path(path string, account *model.Account) (*model.File, []model.File, error) {
+	path = utils.ParsePath(path)
+	log.Debugf("google 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 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
+}
+
+func (driver GoogleDrive) MakeDir(path string, account *model.Account) error {
+	parentFile, err := driver.File(utils.Dir(path), account)
+	if err != nil {
+		return err
+	}
+	data := base.Json{
+		"name":     utils.Base(path),
+		"parents":  []string{parentFile.Id},
+		"mimeType": "application/vnd.google-apps.folder",
+	}
+	_, err = driver.Request("https://www.googleapis.com/drive/v3/files", base.Post, nil, nil, nil, &data, nil, account)
+	return err
+}
+
+func (driver GoogleDrive) Move(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
+	}
+	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)
+	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
+}
+
+func (driver GoogleDrive) Copy(src string, dst string, account *model.Account) error {
+	return base.ErrNotSupport
+}
+
+func (driver GoogleDrive) Delete(path string, account *model.Account) error {
+	file, err := driver.File(path, account)
+	url := "https://www.googleapis.com/drive/v3/files/" + file.Id
+	if err != nil {
+		return err
+	}
+	_, err = driver.Request(url, base.Delete, nil, nil, nil, nil, nil, account)
+	return err
+}
+
+func (driver GoogleDrive) 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{
+		"name":    file.Name,
+		"parents": []string{parentFile.Id},
+	}
+	var e Error
+	url := "https://www.googleapis.com/upload/drive/v3/files?uploadType=resumable&supportsAllDrives=true"
+	if account.APIProxyUrl != "" {
+		url = fmt.Sprintf("%s/%s", account.APIProxyUrl, url)
+	}
+	res, err := base.NoRedirectClient.R().SetHeader("Authorization", "Bearer "+account.AccessToken).
+		SetError(&e).SetBody(data).
+		Post(url)
+	if err != nil {
+		return err
+	}
+	if e.Error.Code != 0 {
+		if e.Error.Code == 401 {
+			err = driver.RefreshToken(account)
+			if err != nil {
+				_ = model.SaveAccount(account)
+				return err
+			}
+			return driver.Upload(file, account)
+		}
+		return fmt.Errorf("%s: %v", e.Error.Message, e.Error.Errors)
+	}
+	putUrl := res.Header().Get("location")
+	byteData, _ := ioutil.ReadAll(file)
+	_, err = driver.Request(putUrl, base.Put, nil, nil, nil, byteData, nil, account)
+	return err
+}
+
+var _ base.Driver = (*GoogleDrive)(nil)

drivers/google/googledrive.go

@@ -0,0 +1,175 @@
+package google
+
+import (
+	"fmt"
+	"github.com/Xhofe/alist/drivers/base"
+	"github.com/Xhofe/alist/model"
+	"github.com/go-resty/resty/v2"
+	log "github.com/sirupsen/logrus"
+)
+
+type TokenError struct {
+	Error            string `json:"error"`
+	ErrorDescription string `json:"error_description"`
+}
+
+func (driver GoogleDrive) RefreshToken(account *model.Account) error {
+	url := "https://www.googleapis.com/oauth2/v4/token"
+	if account.APIProxyUrl != "" {
+		url = fmt.Sprintf("%s/%s", account.APIProxyUrl, url)
+	}
+	var resp base.TokenResp
+	var e TokenError
+	res, err := base.RestyClient.R().SetResult(&resp).SetError(&e).
+		SetFormData(map[string]string{
+			"client_id":     account.ClientId,
+			"client_secret": account.ClientSecret,
+			"refresh_token": account.RefreshToken,
+			"grant_type":    "refresh_token",
+		}).Post(url)
+	if err != nil {
+		return err
+	}
+	log.Debug(res.String())
+	if e.Error != "" {
+		return fmt.Errorf(e.Error)
+	}
+	account.AccessToken = resp.AccessToken
+	account.Status = "work"
+	return nil
+}
+
+func (driver GoogleDrive) FormatFile(file *File, account *model.Account) *model.File {
+	f := &model.File{
+		Id:        file.Id,
+		Name:      file.Name,
+		Driver:    driver.Config().Name,
+		UpdatedAt: file.ModifiedTime,
+		Url:       "",
+	}
+	f.Size = int64(file.GetSize())
+	f.Type = file.GetType()
+	if file.ThumbnailLink != "" {
+		if account.APIProxyUrl != "" {
+			f.Thumbnail = fmt.Sprintf("%s/%s", account.APIProxyUrl, file.ThumbnailLink)
+		} else {
+			f.Thumbnail = file.ThumbnailLink
+		}
+	}
+	return f
+}
+
+type Files struct {
+	NextPageToken string `json:"nextPageToken"`
+	Files         []File `json:"files"`
+}
+
+type Error struct {
+	Error struct {
+		Errors []struct {
+			Domain       string `json:"domain"`
+			Reason       string `json:"reason"`
+			Message      string `json:"message"`
+			LocationType string `json:"location_type"`
+			Location     string `json:"location"`
+		}
+		Code    int    `json:"code"`
+		Message string `json:"message"`
+	} `json:"error"`
+}
+
+func (driver GoogleDrive) GetFiles(id string, account *model.Account) ([]File, error) {
+	pageToken := "first"
+	res := make([]File, 0)
+	for pageToken != "" {
+		if pageToken == "first" {
+			pageToken = ""
+		}
+		var resp Files
+		orderBy := "folder,name,modifiedTime desc"
+		if account.OrderBy != "" {
+			orderBy = account.OrderBy + " " + account.OrderDirection
+		}
+		query := map[string]string{
+			"orderBy":  orderBy,
+			"fields":   "files(id,name,mimeType,size,modifiedTime,thumbnailLink),nextPageToken",
+			"pageSize": "1000",
+			"q":        fmt.Sprintf("'%s' in parents and trashed = false", id),
+			//"includeItemsFromAllDrives": "true",
+			//"supportsAllDrives":         "true",
+			"pageToken": pageToken,
+		}
+		_, err := driver.Request("https://www.googleapis.com/drive/v3/files",
+			base.Get, nil, query, nil, nil, &resp, account)
+		if err != nil {
+			return nil, err
+		}
+		pageToken = resp.NextPageToken
+		res = append(res, resp.Files...)
+	}
+	return res, nil
+}
+
+func (driver GoogleDrive) Request(url string, method int, headers, query, form map[string]string, data interface{}, resp interface{}, account *model.Account) ([]byte, error) {
+	rawUrl := url
+	if account.APIProxyUrl != "" {
+		url = fmt.Sprintf("%s/%s", account.APIProxyUrl, url)
+	}
+	req := base.RestyClient.R()
+	req.SetHeader("Authorization", "Bearer "+account.AccessToken)
+	req.SetQueryParam("includeItemsFromAllDrives", "true")
+	req.SetQueryParam("supportsAllDrives", "true")
+	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
+	var e Error
+	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
+	}
+	log.Debug(res.String())
+	if e.Error.Code != 0 {
+		if e.Error.Code == 401 {
+			err = driver.RefreshToken(account)
+			if err != nil {
+				_ = model.SaveAccount(account)
+				return nil, err
+			}
+			return driver.Request(rawUrl, method, headers, query, form, data, resp, account)
+		}
+		return nil, fmt.Errorf("%s: %v", e.Error.Message, e.Error.Errors)
+	}
+	return res.Body(), nil
+}
+
+func init() {
+	base.RegisterDriver(&GoogleDrive{})
+}

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/google_drive/driver.go

@@ -1,144 +0,0 @@
-package google_drive
-
-import (
-	"context"
-	"fmt"
-	"net/http"
-
-	"github.com/alist-org/alist/v3/drivers/base"
-	"github.com/alist-org/alist/v3/internal/driver"
-	"github.com/alist-org/alist/v3/internal/errs"
-	"github.com/alist-org/alist/v3/internal/model"
-	"github.com/alist-org/alist/v3/pkg/utils"
-	"github.com/go-resty/resty/v2"
-)
-
-type GoogleDrive struct {
-	model.Storage
-	Addition
-	AccessToken string
-}
-
-func (d *GoogleDrive) Config() driver.Config {
-	return config
-}
-
-func (d *GoogleDrive) GetAddition() driver.Additional {
-	return d.Addition
-}
-
-func (d *GoogleDrive) Init(ctx context.Context, storage model.Storage) error {
-	d.Storage = storage
-	err := utils.Json.UnmarshalFromString(d.Storage.Addition, &d.Addition)
-	if err != nil {
-		return err
-	}
-	return d.refreshToken()
-}
-
-func (d *GoogleDrive) Drop(ctx context.Context) error {
-	return nil
-}
-
-func (d *GoogleDrive) List(ctx context.Context, dir model.Obj, args model.ListArgs) ([]model.Obj, error) {
-	files, err := d.getFiles(dir.GetID())
-	if err != nil {
-		return nil, err
-	}
-	return utils.SliceConvert(files, func(src File) (model.Obj, error) {
-		return fileToObj(src), nil
-	})
-}
-
-//func (d *GoogleDrive) Get(ctx context.Context, path string) (model.Obj, error) {
-//	// this is optional
-//	return nil, errs.NotImplement
-//}
-
-func (d *GoogleDrive) Link(ctx context.Context, file model.Obj, args model.LinkArgs) (*model.Link, error) {
-	url := fmt.Sprintf("https://www.googleapis.com/drive/v3/files/%s?includeItemsFromAllDrives=true&supportsAllDrives=true", file.GetID())
-	link := model.Link{
-		URL: url + "&alt=media",
-		Header: http.Header{
-			"Authorization": []string{"Bearer " + d.AccessToken},
-		},
-	}
-	return &link, nil
-}
-
-func (d *GoogleDrive) MakeDir(ctx context.Context, parentDir model.Obj, dirName string) error {
-	data := base.Json{
-		"name":     dirName,
-		"parents":  []string{parentDir.GetID()},
-		"mimeType": "application/vnd.google-apps.folder",
-	}
-	_, err := d.request("https://www.googleapis.com/drive/v3/files", http.MethodPost, func(req *resty.Request) {
-		req.SetBody(data)
-	}, nil)
-	return err
-}
-
-func (d *GoogleDrive) Move(ctx context.Context, srcObj, dstDir model.Obj) error {
-	query := map[string]string{
-		"addParents":    dstDir.GetID(),
-		"removeParents": "root",
-	}
-	url := "https://www.googleapis.com/drive/v3/files/" + srcObj.GetID()
-	_, err := d.request(url, http.MethodPatch, func(req *resty.Request) {
-		req.SetQueryParams(query)
-	}, nil)
-	return err
-}
-
-func (d *GoogleDrive) Rename(ctx context.Context, srcObj model.Obj, newName string) error {
-	data := base.Json{
-		"name": newName,
-	}
-	url := "https://www.googleapis.com/drive/v3/files/" + srcObj.GetID()
-	_, err := d.request(url, http.MethodPatch, func(req *resty.Request) {
-		req.SetBody(data)
-	}, nil)
-	return err
-}
-
-func (d *GoogleDrive) Copy(ctx context.Context, srcObj, dstDir model.Obj) error {
-	return errs.NotSupport
-}
-
-func (d *GoogleDrive) Remove(ctx context.Context, obj model.Obj) error {
-	url := "https://www.googleapis.com/drive/v3/files/" + obj.GetID()
-	_, err := d.request(url, http.MethodDelete, nil, nil)
-	return err
-}
-
-func (d *GoogleDrive) Put(ctx context.Context, dstDir model.Obj, stream model.FileStreamer, up driver.UpdateProgress) error {
-	data := base.Json{
-		"name":    stream.GetName(),
-		"parents": []string{dstDir.GetID()},
-	}
-	var e Error
-	url := "https://www.googleapis.com/upload/drive/v3/files?uploadType=resumable&supportsAllDrives=true"
-	res, err := base.NoRedirectClient.R().SetHeader("Authorization", "Bearer "+d.AccessToken).
-		SetError(&e).SetBody(data).
-		Post(url)
-	if err != nil {
-		return err
-	}
-	if e.Error.Code != 0 {
-		if e.Error.Code == 401 {
-			err = d.refreshToken()
-			if err != nil {
-				return err
-			}
-			return d.Put(ctx, dstDir, stream, up)
-		}
-		return fmt.Errorf("%s: %v", e.Error.Message, e.Error.Errors)
-	}
-	putUrl := res.Header().Get("location")
-	_, err = d.request(putUrl, http.MethodPut, func(req *resty.Request) {
-		req.SetBody(stream.GetReadCloser())
-	}, nil)
-	return err
-}
-
-var _ driver.Driver = (*GoogleDrive)(nil)