:bug: fix upload get wrong content-type

.gitattributes

@@ -1,2 +0,0 @@
-# Auto detect text files and perform LF normalization
-* text=auto

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -0,0 +1,39 @@
+name: "Bug report"
+description: Bug report
+labels: [pending triage]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to fill out this bug report!
+  - type: input
+    id: version
+    attributes:
+      label: Alist Version / Alist 版本
+      description: What version of our software are you running?
+      placeholder: v2.0.0
+    validations:
+      required: true
+  - type: textarea
+    id: bug-description
+    attributes:
+      label: Describe the bug / 问题描述
+    validations:
+      required: true
+  - type: textarea
+    id: reproduction
+    attributes:
+      label: Reproduction / 复现链接
+      description: |
+        Please provide a link to a repo that can reproduce the problem you ran into.
+        请提供能复现此问题的链接
+    validations:
+      required: false
+  - type: textarea
+    id: logs
+    attributes:
+      label: 日志 / Logs
+      description: |
+        Please copy and paste any relevant log output.
+        请复制粘贴错误日志，或者截图
+      render: shell

.github/ISSUE_TEMPLATE/config.yml

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

.github/workflows/build.yml

@@ -2,70 +2,58 @@ name: build
 
 on:
   push:
-    branches: [ main ]
+    branches: [ v2 ]
   pull_request:
-    branches: [ main ]
+    branches: [ v2 ]
 
 jobs:
-
   build:
     strategy:
       matrix:
-        platform: [ubuntu-16.04]
-        go-version: [1.15]
+        platform: [ubuntu-latest]
+        go-version: [1.17]
     name: Build
     runs-on: ${{ matrix.platform }}
     steps:
-
-      - name: Set up Go
+      - name: Setup Go
         uses: actions/setup-go@v2
         with:
           go-version: ${{ matrix.go-version }}
 
-      - name: Check out code into the Go module directory
+      - name: Set up Node
+        uses: actions/setup-node@v2
+        with:
+          node-version: '16'
+
+#      - name: Setup docker
+#        uses: docker-practice/actions-setup-docker@master
+
+      - name: Checkout
         uses: actions/checkout@v2
+        with:
+          ref: v2
+          path: alist
 
-      - name: Get dependencies
+      - name: Checkout web repo
+        uses: actions/checkout@v2
+        with:
+          repository: Xhofe/alist-web
+          ref: v2
+          path: alist-web
+
+      - name: Set up xgo
         run: |
-          sudo apt-get update
-          sudo apt-get -y install gcc-mingw-w64-x86-64
-          sudo apt-get -y install gcc-arm-linux-gnueabihf libc6-dev-armhf-cross
-          sudo apt-get -y install gcc-aarch64-linux-gnu libc6-dev-arm64-cross
-          go get -v -t -d ./...
-          if [ -f Gopkg.toml ]; then
-              curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh
-              dep ensure
-          fi
-      - name: Build linux
+          docker pull techknowlogick/xgo:latest
+          go install src.techknowlogick.com/xgo@latest
+          sudo apt install upx
+
+      - name: Build
         run: |
-          CC=gcc CGO_ENABLED=1 GOOS=linux GOARCH=amd64 go build -o alist_linux_amd64 alist.go
-          CC=aarch64-linux-gnu-gcc CGO_ENABLED=1 GOOS=linux GOARCH=arm64 go build -o alist_linux_arm64 alist.go
-          CC=arm-linux-gnueabihf-gcc CGO_ENABLED=1 GOOS=linux GOARCH=arm go build -o alist_linux_arm alist.go
+          mv alist/build.sh .
+          bash build.sh
 
-      - name: Build windows
-        run: |
-          CC=x86_64-w64-mingw32-gcc CGO_ENABLED=1 GOOS=windows GOARCH=amd64 go build -o alist_windows_amd64.exe alist.go
-
-      - name: Upload artifacts linux_amd64
+      - name: Upload artifact
         uses: actions/upload-artifact@v2
         with:
-          name: alist_linux_amd64
-          path: alist_linux_amd64
-
-      - name: Upload artifacts linux_arm64
-        uses: actions/upload-artifact@v2
-        with:
-          name: alist_linux_arm64
-          path: alist_linux_arm64
-
-      - name: Upload artifacts linux_arm
-        uses: actions/upload-artifact@v2
-        with:
-          name: alist_linux_arm
-          path: alist_linux_arm
-
-      - name: Upload artifacts windows_amd64
-        uses: actions/upload-artifact@v2
-        with:
-          name: alist_windows_amd64
-          path: alist_windows_amd64.exe
+          name: artifact
+          path: alist/build

.github/workflows/docker.yml

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

.github/workflows/release.yml

@@ -1,4 +1,5 @@
 name: release
+
 on:
   push:
     tags:
@@ -8,110 +9,61 @@ jobs:
   release:
     strategy:
       matrix:
-        platform: [ ubuntu-16.04 ]
-        go-version: [ 1.15 ]
-    name: Build
+        platform: [ubuntu-latest]
+        go-version: [1.17]
+    name: Release
     runs-on: ${{ matrix.platform }}
     steps:
-      - name: Set up Go
+      - name: Setup Go
         uses: actions/setup-go@v2
         with:
           go-version: ${{ matrix.go-version }}
 
-      - name: Get version
-        id: get_version
-        run: echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\//}
+#      - name: Setup docker
+#        uses: docker-practice/actions-setup-docker@master
 
-      - name: Check out code into the Go module directory
+      - name: Setup Node
+        uses: actions/setup-node@v2
+        with:
+          node-version: '16'
+
+      - name: Checkout
         uses: actions/checkout@v2
+        with:
+          ref: v2
+          path: alist
+          persist-credentials: false
+          fetch-depth: 0
 
-      - name: Get dependencies
+      - name: Checkout web repo
+        uses: actions/checkout@v2
+        with:
+          repository: Xhofe/alist-web
+          ref: v2
+          path: alist-web
+          persist-credentials: false
+          fetch-depth: 0
+
+      - name: Set up xgo
         run: |
-          sudo apt-get update
-          sudo apt-get -y install gcc-mingw-w64-x86-64
-          sudo apt-get -y install gcc-arm-linux-gnueabihf libc6-dev-armhf-cross
-          sudo apt-get -y install gcc-aarch64-linux-gnu libc6-dev-arm64-cross
-          go get -v -t -d ./...
-          if [ -f Gopkg.toml ]; then
-              curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh
-              dep ensure
-          fi
+          docker pull techknowlogick/xgo:latest
+          go install src.techknowlogick.com/xgo@latest
+          sudo apt install upx
 
-      - name: Build linux
+      - name: Build
         run: |
-          CC=gcc CGO_ENABLED=1 GOOS=linux GOARCH=amd64 go build -o linux_amd64/alist alist.go
-          CC=aarch64-linux-gnu-gcc CGO_ENABLED=1 GOOS=linux GOARCH=arm64 go build -o linux_arm64/alist alist.go
-          CC=arm-linux-gnueabihf-gcc CGO_ENABLED=1 GOOS=linux GOARCH=arm go build -o linux_arm/alist alist.go
+          mv alist/build.sh .
+          bash build.sh release
 
-      - name: Build windows
-        run: |
-          CC=x86_64-w64-mingw32-gcc CGO_ENABLED=1 GOOS=windows GOARCH=amd64 go build -o windows_amd64/alist.exe alist.go
-
-      - name: compress
-        run: |
-          tar -czvf alist_linux_amd64.tar.gz linux_amd64/alist conf.yml.example
-          tar -czvf alist_linux_arm64.tar.gz linux_arm64/alist conf.yml.example
-          tar -czvf alist_linux_arm.tar.gz linux_arm/alist conf.yml.example
-          zip alist_windows_amd64.zip windows_amd64/alist.exe conf.yml.example
-
-      - name: Build Changelog
-        id: github_release
-        uses: mikepenz/release-changelog-builder-action@main
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Create Release
-        id: create_release
-        uses: actions/create-release@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Upload asserts files
+        uses: ad-m/github-push-action@master
         with:
-          tag_name: ${{ github.ref }}
-          release_name: Release ${{ github.ref }}
-          body: ${{steps.github_release.outputs.changelog}}
-          draft: false
-          prerelease: false
+          github_token: ${{ secrets.MY_TOKEN }}
+          branch: cdn
+          directory: alist-web
+          repository: Xhofe/alist-web
 
-      - name: Upload alist_linux_amd64
-        id: upload-release-linux-amd64
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Release
+        uses: softprops/action-gh-release@v1
         with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: alist_linux_amd64.tar.gz
-          asset_name: alist_${{ steps.get_version.outputs.VERSION }}_linux_amd64.tar.gz
-          asset_content_type: application/gzip
-
-      - name: Upload alist_linux_arm64
-        id: upload-release-linux-arm64
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: alist_linux_arm64.tar.gz
-          asset_name: alist_${{ steps.get_version.outputs.VERSION }}_linux_arm64.tar.gz
-          asset_content_type: application/gzip
-
-      - name: Upload alist_linux_arm
-        id: upload-release-linux-arm
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: alist_linux_arm.tar.gz
-          asset_name: alist_${{ steps.get_version.outputs.VERSION }}_linux_arm.tar.gz
-          asset_content_type: application/gzip
-
-      - name: Upload alist_windows_amd64
-        id: upload-release-windows-amd64
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: alist_windows_amd64.zip
-          asset_name: alist_${{ steps.get_version.outputs.VERSION }}_windows_amd64.zip
-          asset_content_type: application/zip
+          files: alist/build/compress/*

.gitignore

@@ -20,6 +20,10 @@ dist/
 
 # Dependency directories (remove the comment below to include it)
 # vendor/
-*.yml
 bin/*
-alist
+/alist
+*.json
+public/index.html
+public/assets/
+public/public/
+data/

Dockerfile

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

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020 微凉
+Copyright (c) 2020 Xhofe
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -18,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+SOFTWARE.

README.md

@@ -1,64 +1,72 @@
-<p align="center">
-    <img src="https://img.oez.cc/2020/12/24/1fb16bc25a4f6.png" alt="AList Logo" width=200/>
-</p>
-<p align="center">
-  <a href="https://github.com/Xhofe/alist/releases"><img src="https://img.shields.io/github/release/Xhofe/alist?style=flat-square" alt="Release version"></a>
+<div align="center">
+  <h3><a href="https://alist.nn.ci">Alist</a></h3>
+  <p><em>🗂️Another file list program that supports multiple storage, powered by Gin and React.</em></p>
+  <a href="https://github.com/Xhofe/alist/releases"><img src="https://img.shields.io/github/release/Xhofe/alist?style=flat-square" alt="latest version"></a>
+  <a href="https://github.com/Xhofe/alist/discussions"><img src="https://img.shields.io/github/discussions/Xhofe/alist?color=%23ED8936&style=flat-square" alt="discussions"></a>
   <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/releases"><img src="https://img.shields.io/github/downloads/Xhofe/alist/total?style=flat-square" alt="Downloads"></a>
-  <a href="https://github.com/Xhofe/alist/blob/main/LICENSE"><img src="https://img.shields.io/github/license/Xhofe/alist?style=flat-square" alt="License"></a>
+  <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>
+  <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 href="https://pay.xhofe.top">
     <img src="https://img.shields.io/badge/%24-donate-ff69b4.svg?style=flat-square" alt="donate">
   </a>
-</p>
+</div>
+
 
 ---
 
-### 这是什么？
+English | [中文](./README_cn.md)
 
-一款阿里云盘的目录文件列表程序，后端基于`golang`最好的`http`框架`gin`，前端使用`vue`和`ant design`。
+## Features
 
-### 前端项目地址
+- [x] multiple storage
+  - [x] Local storage
+  - [x] [aliyundrive](https://www.aliyundrive.com/)
+  - [x] OneDrive / Sharepoint ([global](https://www.office.com/), [cn](https://portal.partner.microsoftonline.cn),de,us）
+  - [x] [189cloud](https://cloud.189.cn)
+  - [x] [GoogleDrive](https://drive.google.com/)
+  - [x] [123pan](https://www.123pan.com/)
+  - [x] [lanzou](https://pc.woozooo.com/)
+  - [x] [Alist](https://github.com/Xhofe/alist)
+  - [x] FTP
+  - [x] [PikPak](https://www.mypikpak.com/)
+  - [x] [ShandianPan](https://shandianpan.com/)
+  - [x] [S3](https://aws.amazon.com/s3/)
+  - [x] WebDav
+- [x] 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 (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] WebDav (A small part readonly, see https://alist-doc.nn.ci/en/docs/intro 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)
 
-- https://github.com/Xhofe/alist-web
+## Discussion
 
-### 演示地址
+Please go to our [discussion forum](https://github.com/Xhofe/alist/discussions) for general questions, **issues are for bug reports  only.**
 
-- https://alist.nn.ci (稳定版本)
-- https://alist.now.sh (开发版本)
-- https://alist-plyr.now.sh (plyr分支版本)
+## Demo
 
-### 预览
+Available at: <https://alist.nn.ci>.
 
-<a href="https://alist.nn.ci/"><img src="https://img.oez.cc/2020/12/24/d81d2dab3e5f0.png"></a>
+![demo](https://inews.gtimg.com/newsapp_ls/0/14256614096/0)
 
-### 支持的功能
+## Document
 
-- 自动刷新`token`，`refresh_token`自动更新，失效时间未知，本人使用过程中没有失效过。
-- 图片、视频、音频预览
-- 目录加密
-- `Readme`渲染
-- 自定义根目录
-- 文件直链下载
-- …
+<https://alist-doc.nn.ci/en/>
 
-#### TODO
+## License
 
-- [x] 排序
-- [x] 文件预览
-  - [x] 图片
-  - [x] 视频 
-  - [x] 音频
-- [x] `Readme`渲染
-- [x] 密码加密
-- [ ] 搜索与翻页
-- [x] 文件直链
-- [ ] 路径优化
-- [x] 缓存
+The `AList` is open-source software licensed under the MIT license.
 
-### 如何使用
+---
 
-- https://www.nn.ci/archives/alist.html
-
-### License
-
-The `AList` is open-source software licensed under the MIT license.
+> [@Blog](https://www.nn.ci/) · [@GitHub](https://github.com/Xhofe)

README_cn.md

@@ -0,0 +1,71 @@
+<div align="center">
+  <h3><a href="https://alist.nn.ci">Alist</a></h3>
+  <p><em>🗂️一个支持多存储的文件列表程序，使用 Gin 和 React 。</em></p>
+  <a href="https://github.com/Xhofe/alist/releases"><img src="https://img.shields.io/github/release/Xhofe/alist?style=flat-square" alt="latest version"></a>
+  <a href="https://github.com/Xhofe/alist/discussions"><img src="https://img.shields.io/github/discussions/Xhofe/alist?color=%23ED8936&style=flat-square" alt="discussions"></a>
+  <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/releases"><img src="https://img.shields.io/github/downloads/Xhofe/alist/total?style=flat-square&color=%239F7AEA" alt="Downloads"></a>
+  <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 href="https://pay.xhofe.top">
+    <img src="https://img.shields.io/badge/%24-donate-ff69b4.svg?style=flat-square" alt="donate">
+  </a>
+</div>
+
+---
+
+[English](./README.md) | 中文
+
+## 支持
+
+- [x] 多种存储
+  - [x] 本地存储
+  - [x] [阿里云盘](https://www.aliyundrive.com/)
+  - [x] OneDrive / Sharepoint（[国际版](https://www.office.com/), [世纪互联](https://portal.partner.microsoftonline.cn),de,us）
+  - [x] [天翼云盘](https://cloud.189.cn)
+  - [x] [GoogleDrive](https://drive.google.com/)
+  - [x] [123云盘](https://www.123pan.com/)
+  - [x] [蓝奏云](https://pc.woozooo.com/)
+  - [x] [Alist](https://github.com/Xhofe/alist)
+  - [x] FTP
+  - [x] [PikPak](https://www.mypikpak.com/)
+  - [x] [闪电盘](https://shandianpan.com/)
+  - [x] [S3](https://aws.amazon.com/cn/s3/)
+  - [x] WebDav
+- [x] 部署方便，开箱即用
+- [x] 文件预览（PDF、markdown、代码、纯文本……）
+- [x] 画廊模式下的图像预览
+- [x] 视频和音频预览（mp4、mp3 等）
+- [x] Office 文档预览（docx、pptx、xlsx、...）
+- [x] `README.md` 预览渲染
+- [x] 文件永久链接复制和直接文件下载
+- [x] 黑暗模式
+- [x] 国际化
+- [x] 受保护的路由（密码保护和身份验证）
+- [x] WebDav（少部分只读，具体见https://alist-doc.nn.ci/docs/intro ）
+- [x] [Docker 部署](https://hub.docker.com/r/xhofe/alist)
+- [x] Cloudflare workers 中转
+- [x] 文件/文件夹打包下载
+- [x] 支持视频列表播放和字幕(ass,srt,vtt)
+- [x] 网页上传(可以允许访客上传)
+
+## 讨论
+
+一般问题请到[讨论论坛](https://github.com/Xhofe/alist/discussions) ，**issue仅针对错误报告。**
+
+## 演示
+
+<https://alist.nn.ci>。
+
+![演示](https://inews.gtimg.com/newsapp_ls/0/14256614096/0)
+
+## 文档
+
+<https://alist-doc.nn.ci/>
+
+##  许可
+
+`AList` 是在 MIT 许可下许可的开源软件。
+
+---
+
+> [@Blog](https://www.nn.ci/) · [@GitHub](https://github.com/Xhofe)

alidrive/auth.go

@@ -1,45 +0,0 @@
-package alidrive
-
-import (
-	"encoding/json"
-	"github.com/Xhofe/alist/conf"
-	"github.com/Xhofe/alist/utils"
-	log "github.com/sirupsen/logrus"
-)
-
-// refresh access_token token by refresh_token
-func RefreshToken(drive *conf.Drive) bool {
-	log.Infof("刷新[%s]token...", drive.Name)
-	url := "https://websv.aliyundrive.com/token/refresh"
-	req := RefreshTokenReq{RefreshToken: drive.RefreshToken}
-	var token TokenResp
-	if body, err := DoPost(url, req, ""); err != nil {
-		log.Errorf("tokenLogin-doPost出错:%s", err.Error())
-		return false
-	} else {
-		if err = json.Unmarshal(body, &token); err != nil {
-			log.Errorf("解析json[%s]出错:%s", string(body), err.Error())
-			log.Errorf("此处json解析失败应该是[%s]refresh_token失效", drive.Name)
-			return false
-		}
-	}
-	//刷新成功 更新token
-	drive.AccessToken = token.AccessToken
-	drive.RefreshToken = token.RefreshToken
-	return true
-}
-
-func RefreshTokenAll() string {
-	log.Infof("刷新所有token...")
-	res := ""
-	for i, drive := range conf.Conf.AliDrive.Drives {
-		if !RefreshToken(&conf.Conf.AliDrive.Drives[i]) {
-			res = res + drive.Name + ","
-		}
-	}
-	utils.WriteToYml(conf.ConfigFile, conf.Conf)
-	if res != "" {
-		return res[:len(res)-1]
-	}
-	return ""
-}

alidrive/req_bean.go

@@ -1,67 +0,0 @@
-package alidrive
-
-// list request bean
-type ListReq struct {
-	DriveId               string `json:"drive_id"`
-	Fields                string `json:"fields"`
-	ImageThumbnailProcess string `json:"image_thumbnail_process"`
-	ImageUrlProcess       string `json:"image_url_process"`
-	Limit                 int    `json:"limit"`
-	Marker                string `json:"marker"`
-	OrderBy               string `json:"order_by"`
-	OrderDirection        string `json:"order_direction"`
-	ParentFileId          string `json:"parent_file_id"`
-	VideoThumbnailProcess string `json:"video_thumbnail_process"`
-}
-
-// get request bean
-type GetReq struct {
-	DriveId               string `json:"drive_id"`
-	FileId                string `json:"file_id"`
-	ImageThumbnailProcess string `json:"image_thumbnail_process"`
-	VideoThumbnailProcess string `json:"video_thumbnail_process"`
-}
-
-// download request bean
-type DownloadReq struct {
-	DriveId   string `json:"drive_id"`
-	FileId    string `json:"file_id"`
-	ExpireSec int    `json:"expire_sec"`
-	FileName  string `json:"file_name"`
-}
-
-// search request bean
-type SearchReq struct {
-	DriveId               string `json:"drive_id"`
-	ImageThumbnailProcess string `json:"image_thumbnail_process"`
-	ImageUrlProcess       string `json:"image_url_process"`
-	Limit                 int    `json:"limit"`
-	Marker                string `json:"marker"`
-	OrderBy               string `json:"order_by"` //"type ASC,updated_at DESC"
-
-	Query string `json:"query"` // "name match '测试文件'"
-
-	VideoThumbnailProcess string `json:"video_thumbnail_process"`
-}
-
-// token_login request bean
-type TokenLoginReq struct {
-	Token string `json:"token"`
-}
-
-// get_token request bean
-type GetTokenReq struct {
-	Code string `json:"code"`
-}
-
-// refresh_token request bean
-type RefreshTokenReq struct {
-	RefreshToken string `json:"refresh_token"`
-}
-
-// office_preview_url request bean
-type OfficePreviewUrlReq struct {
-	AccessToken string `json:"access_token"`
-	DriveId     string `json:"drive_id"`
-	FileId      string `json:"file_id"`
-}

alidrive/request.go

@@ -1,183 +0,0 @@
-package alidrive
-
-import (
-	"bytes"
-	"encoding/json"
-	"fmt"
-	"github.com/Xhofe/alist/conf"
-	log "github.com/sirupsen/logrus"
-	"io/ioutil"
-	"net/http"
-	"strings"
-	"time"
-)
-
-// get file
-func GetFile(fileId string, drive *conf.Drive) (*File, error) {
-	url := conf.Conf.AliDrive.ApiUrl + "/file/get"
-	req := GetReq{
-		DriveId:               drive.DefaultDriveId,
-		FileId:                fileId,
-		ImageThumbnailProcess: conf.ImageThumbnailProcess,
-		VideoThumbnailProcess: conf.VideoThumbnailProcess,
-	}
-	var resp File
-	if err := BodyToJson(url, req, &resp, drive); err != nil {
-		return nil, err
-	}
-	return &resp, nil
-}
-
-// get download_url
-func GetDownLoadUrl(fileId string, drive *conf.Drive) (*DownloadResp, error) {
-	url := conf.Conf.AliDrive.ApiUrl + "/file/get_download_url"
-	req := DownloadReq{
-		DriveId:   drive.DefaultDriveId,
-		FileId:    fileId,
-		ExpireSec: 14400,
-	}
-	var resp DownloadResp
-	if err := BodyToJson(url, req, &resp, drive); err != nil {
-		return nil, err
-	}
-	return &resp, nil
-}
-
-// search by keyword
-func Search(key string, limit int, marker string, drive *conf.Drive) (*Files, error) {
-	url := conf.Conf.AliDrive.ApiUrl + "/file/search"
-	req := SearchReq{
-		DriveId:               drive.DefaultDriveId,
-		ImageThumbnailProcess: conf.ImageThumbnailProcess,
-		ImageUrlProcess:       conf.ImageUrlProcess,
-		Limit:                 limit,
-		Marker:                marker,
-		OrderBy:               conf.OrderSearch,
-		Query:                 fmt.Sprintf("name match '%s'", key),
-		VideoThumbnailProcess: conf.VideoThumbnailProcess,
-	}
-	var resp Files
-	if err := BodyToJson(url, req, &resp, drive); err != nil {
-		return nil, err
-	}
-	return &resp, nil
-}
-
-// get root folder
-func GetRoot(limit int, marker string, orderBy string, orderDirection string, drive *conf.Drive) (*Files, error) {
-	return GetList(drive.RootFolder, limit, marker, orderBy, orderDirection, drive)
-}
-
-// get folder list by file_id
-func GetList(parent string, limit int, marker string, orderBy string, orderDirection string, drive *conf.Drive) (*Files, error) {
-	url := conf.Conf.AliDrive.ApiUrl + "/file/list"
-	req := ListReq{
-		DriveId:               drive.DefaultDriveId,
-		Fields:                "*",
-		ImageThumbnailProcess: conf.ImageThumbnailProcess,
-		ImageUrlProcess:       conf.ImageUrlProcess,
-		Limit:                 limit,
-		Marker:                marker,
-		OrderBy:               orderBy,
-		OrderDirection:        orderDirection,
-		ParentFileId:          parent,
-		VideoThumbnailProcess: conf.VideoThumbnailProcess,
-	}
-	var resp Files
-	if err := BodyToJson(url, req, &resp, drive); err != nil {
-		return nil, err
-	}
-	return &resp, nil
-}
-
-// get user info
-func GetUserInfo(drive *conf.Drive) (*UserInfo, error) {
-	url := conf.Conf.AliDrive.ApiUrl + "/user/get"
-	var resp UserInfo
-	if err := BodyToJson(url, map[string]interface{}{}, &resp, drive); err != nil {
-		return nil, err
-	}
-	return &resp, nil
-}
-
-// get office preview url and token
-func GetOfficePreviewUrl(fileId string, drive *conf.Drive) (*OfficePreviewUrlResp, error) {
-	url := conf.Conf.AliDrive.ApiUrl + "/file/get_office_preview_url"
-	req := OfficePreviewUrlReq{
-		AccessToken: drive.AccessToken,
-		DriveId:     drive.DefaultDriveId,
-		FileId:      fileId,
-	}
-	var resp OfficePreviewUrlResp
-	if err := BodyToJson(url, req, &resp, drive); err != nil {
-		return nil, err
-	}
-	return &resp, nil
-}
-
-// convert body to json
-func BodyToJson(url string, req interface{}, resp RespHandle, drive *conf.Drive) error {
-	if body, err := DoPost(url, req, drive.AccessToken); err != nil {
-		log.Errorf("doPost出错:%s", err.Error())
-		return err
-	} else {
-		if err = json.Unmarshal(body, &resp); err != nil {
-			log.Errorf("解析json[%s]出错:%s", string(body), err.Error())
-			return err
-		}
-	}
-	if resp.IsAvailable() {
-		return nil
-	}
-	if resp.GetCode() == conf.AccessTokenInvalid {
-		resp.SetCode("")
-		if RefreshToken(drive) {
-			return BodyToJson(url, req, resp, drive)
-		}
-	}
-	return fmt.Errorf(resp.GetMessage())
-}
-
-// do post request
-func DoPost(url string, request interface{}, auth string) (body []byte, err error) {
-	var (
-		resp *http.Response
-	)
-	requestBody := new(bytes.Buffer)
-	err = json.NewEncoder(requestBody).Encode(request)
-	if err != nil {
-		log.Errorf("创建requestBody出错:%s", err.Error())
-	}
-	req, err := http.NewRequest("POST", url, requestBody)
-	log.Debugf("do_post_req:%+v", req)
-	if err != nil {
-		log.Errorf("创建request出错:%s", err.Error())
-		return
-	}
-	if auth != "" {
-		req.Header.Set("authorization", conf.Bearer+auth)
-	}
-	req.Header.Add("content-type", "application/json")
-	req.Header.Add("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")
-	req.Header.Add("origin", "https://aliyundrive.com")
-	req.Header.Add("accept", "*/*")
-	req.Header.Add("Accept-Language", "zh-CN,zh;q=0.8,en-US;q=0.5,en;q=0.3")
-	req.Header.Add("Connection", "keep-alive")
-
-	for retryCount := 3; retryCount >= 0; retryCount-- {
-		if resp, err = conf.Client.Do(req); err != nil && strings.Contains(err.Error(), "timeout") {
-			<-time.After(time.Second)
-		} else {
-			break
-		}
-	}
-	if err != nil {
-		log.Errorf("请求阿里云盘api时出错:%s", err.Error())
-		return
-	}
-	if body, err = ioutil.ReadAll(resp.Body); err != nil {
-		log.Errorf("读取api返回内容失败")
-	}
-	log.Debugf("请求返回信息:%s", string(body))
-	return
-}

alidrive/resp_bean.go

@@ -1,184 +0,0 @@
-package alidrive
-
-import (
-	log "github.com/sirupsen/logrus"
-	"io/ioutil"
-	"net/http"
-	"strings"
-	"time"
-)
-
-// response bean methods
-type RespHandle interface {
-	IsAvailable() bool   // check available
-	GetCode() string     // get err code
-	GetMessage() string  // get err message
-	SetCode(code string) // set err code
-}
-
-// common response bean
-type RespError struct {
-	Code    string `json:"code"`
-	Message string `json:"message"`
-}
-
-func (resp *RespError) IsAvailable() bool {
-	return resp.Code == ""
-}
-
-func (resp *RespError) GetCode() string {
-	return resp.Code
-}
-
-func (resp *RespError) GetMessage() string {
-	return resp.Message
-}
-
-func (resp *RespError) SetCode(code string) {
-	resp.Code = code
-}
-
-// user_info response bean
-type UserInfo struct {
-	RespError
-	DomainId       string                 `json:"domain_id"`
-	UserId         string                 `json:"user_id"`
-	Avatar         string                 `json:"avatar"`
-	CreatedAt      int64                  `json:"created_at"`
-	UpdatedAt      int64                  `json:"updated_at"`
-	Email          string                 `json:"email"`
-	NickName       string                 `json:"nick_name"`
-	Phone          string                 `json:"phone"`
-	Role           string                 `json:"role"`
-	Status         string                 `json:"status"`
-	UserName       string                 `json:"user_name"`
-	Description    string                 `json:"description"`
-	DefaultDriveId string                 `json:"default_drive_id"`
-	UserData       map[string]interface{} `json:"user_data"`
-}
-
-// folder files response bean
-type Files struct {
-	RespError
-	Items      []File `json:"items"`
-	NextMarker string `json:"next_marker"`
-	Readme     string `json:"readme"` // Deprecated
-	Paths      []Path `json:"paths"`
-}
-
-// path bean
-type Path struct {
-	Name   string `json:"name"`
-	FileId string `json:"file_id"`
-}
-
-// file response bean
-type File struct {
-	RespError
-	DriveId       string     `json:"drive_id"`
-	CreatedAt     *time.Time `json:"created_at"`
-	DomainId      string     `json:"domain_id"`
-	EncryptMode   string     `json:"encrypt_mode"`
-	FileExtension string     `json:"file_extension"`
-	FileId        string     `json:"file_id"`
-	Hidden        bool       `json:"hidden"`
-	Name          string     `json:"name"`
-	ParentFileId  string     `json:"parent_file_id"`
-	Starred       bool       `json:"starred"`
-	Status        string     `json:"status"`
-	Type          string     `json:"type"`
-	UpdatedAt     *time.Time `json:"updated_at"`
-	// 文件多出部分
-	Category           string                 `json:"category"`
-	ContentHash        string                 `json:"content_hash"`
-	ContentHashName    string                 `json:"content_hash_name"`
-	ContentType        string                 `json:"content_type"`
-	Crc64Hash          string                 `json:"crc_64_hash"`
-	DownloadUrl        string                 `json:"download_url"`
-	PunishFlag         int64                  `json:"punish_flag"`
-	Size               int64                  `json:"size"`
-	Thumbnail          string                 `json:"thumbnail"`
-	Url                string                 `json:"url"`
-	ImageMediaMetadata map[string]interface{} `json:"image_media_metadata"`
-
-	Paths []Path `json:"paths"`
-}
-
-type DownloadResp struct {
-	RespError
-	Expiration string `json:"expiration"`
-	Method     string `json:"method"`
-	Size       int64  `json:"size"`
-	Url        string `json:"url"`
-	//RateLimit struct{
-	//	PartSize int `json:"part_size"`
-	//	PartSpeed int `json:"part_speed"`
-	//} `json:"rate_limit"`//rate limit
-}
-
-// token_login response bean
-type TokenLoginResp struct {
-	RespError
-	Goto string `json:"goto"`
-}
-
-// token response bean
-type TokenResp struct {
-	RespError
-	AccessToken  string `json:"access_token"`
-	RefreshToken string `json:"refresh_token"`
-	ExpiresIn    int    `json:"expires_in"`
-	TokenType    string `json:"token_type"`
-
-	UserInfo
-
-	DefaultSboxDriveId string        `json:"default_sbox_drive_id"`
-	ExpireTime         *time.Time    `json:"expire_time"`
-	State              string        `json:"state"`
-	ExistLink          []interface{} `json:"exist_link"`
-	NeedLink           bool          `json:"need_link"`
-	PinSetup           bool          `json:"pin_setup"`
-	IsFirstLogin       bool          `json:"is_first_login"`
-	NeedRpVerify       bool          `json:"need_rp_verify"`
-	DeviceId           string        `json:"device_id"`
-}
-
-// office_preview_url response bean
-type OfficePreviewUrlResp struct {
-	RespError
-	PreviewUrl  string `json:"preview_url"`
-	AccessToken string `json:"access_token"`
-}
-
-// check password
-func HasPassword(files *Files) string {
-	fileList := files.Items
-	for i, file := range fileList {
-		if strings.HasPrefix(file.Name, ".password-") {
-			files.Items = fileList[:i+copy(fileList[i:], fileList[i+1:])]
-			return file.Name[10:]
-		}
-	}
-	return ""
-}
-
-// Deprecated: check readme, implemented by the front end now
-func HasReadme(files *Files) string {
-	fileList := files.Items
-	for _, file := range fileList {
-		if file.Name == "Readme.md" {
-			resp, err := http.Get(file.Url)
-			if err != nil {
-				log.Errorf("Get Readme出错:%s", err.Error())
-				return ""
-			}
-			data, err := ioutil.ReadAll(resp.Body)
-			if err != nil {
-				log.Errorf("读取 Readme出错:%s", err.Error())
-				return ""
-			}
-			return string(data)
-		}
-	}
-	return ""
-}

alist.go

@@ -1,8 +1,59 @@
 package main
 
-import "github.com/Xhofe/alist/bootstrap"
+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.InitLog()
+	bootstrap.InitConf()
+	bootstrap.InitCron()
+	bootstrap.InitModel()
+	if conf.Password {
+		pass, err := model.GetSettingByKey("password")
+		if err != nil {
+			log.Errorf(err.Error())
+			return false
+		}
+		log.Infof("current password: %s", pass.Value)
+		return false
+	}
+	server.InitIndex()
+	bootstrap.InitSettings()
+	bootstrap.InitAccounts()
+	bootstrap.InitCache()
+	return true
+}
 
-// main function
 func main() {
-	bootstrap.Run()
-}
+	if conf.Version {
+		fmt.Printf("Built At: %s\nGo Version: %s\nAuthor: %s\nCommit ID: %s\nVersion: %s\n", conf.BuiltAt, conf.GoVersion, conf.GitAuthor, conf.GitCommit, conf.GitTag)
+		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())
+	}
+}

alist_test.go

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

bootstrap/account.go

@@ -0,0 +1,30 @@
+package bootstrap
+
+import (
+	"github.com/Xhofe/alist/conf"
+	"github.com/Xhofe/alist/drivers/base"
+	"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 {
+			err := driver.Save(&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/alidrive.go

@@ -1,33 +0,0 @@
-package bootstrap
-
-import (
-	"github.com/Xhofe/alist/alidrive"
-	"github.com/Xhofe/alist/conf"
-	log "github.com/sirupsen/logrus"
-)
-
-// init aliyun drive
-func InitAliDrive() bool {
-	log.Infof("初始化阿里云盘...")
-	//首先token_login
-	res := alidrive.RefreshTokenAll()
-	if res != "" {
-		log.Errorf("盘[%s]refresh_token失效,请检查", res)
-	}
-	log.Debugf("config:%+v", conf.Conf)
-	for i, _ := range conf.Conf.AliDrive.Drives {
-		InitDriveId(&conf.Conf.AliDrive.Drives[i])
-	}
-	return true
-}
-
-func InitDriveId(drive *conf.Drive) bool {
-	user, err := alidrive.GetUserInfo(drive)
-	if err != nil {
-		log.Errorf("初始化盘[%s]失败:%s", drive.Name, err.Error())
-		return false
-	}
-	drive.DefaultDriveId = user.DefaultDriveId
-	log.Infof("初始化盘[%s]成功:%+v", drive.Name, user)
-	return true
-}