:bug: refer to https://github.com/ad-m/github-push-action/issues/44#issuecomment-581706892

.gitattributes

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

.github/workflows/build.yml

@@ -2,81 +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: Build linux_386
-        run: |
-          sudo apt-get -y install libc6-dev-i386
-          CC=gcc CGO_ENABLED=1 GOOS=linux GOARCH=386 go build -o alist_linux_386 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: Upload artifacts linux_386
-        uses: actions/upload-artifact@v2
-        with:
-          name: alist_linux_386
-          path: alist_linux_386
+          name: artifact
+          path: alist/build

.github/workflows/release.yml

@@ -1,4 +1,5 @@
 name: release
+
 on:
   push:
     tags:
@@ -8,127 +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: Build linux_386
-        run: |
-          sudo apt-get -y install libc6-dev-i386
-          CC=gcc CGO_ENABLED=1 GOOS=linux GOARCH=386 go build -o linux_386/alist 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
-          tar -czvf alist_linux_386.tar.gz linux_386/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_linux_386
-        id: upload-release-linux-386
-        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_386.tar.gz
-          asset_name: alist_${{ steps.get_version.outputs.VERSION }}_linux_386.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,8 @@ dist/
 
 # Dependency directories (remove the comment below to include it)
 # vendor/
-*.yml
 bin/*
-alist
+alist
+*.json
+public/index.html
+public/assets/

LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2020 微凉
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

README.md

@@ -1,6 +1,4 @@
-<p align="center">
-    <img src="https://img.oez.cc/2020/12/24/1fb16bc25a4f6.png" alt="AList Logo" width=200/>
-</p>
+<h2 align="center">Alist</h2>
 <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>
   <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>
@@ -15,7 +13,7 @@
 
 ### 这是什么？
 
-一款阿里云盘的目录文件列表程序，后端基于`golang`最好的`http`框架`gin`，前端使用`vue`和`ant design`。
+一款支持多种存储的目录文件列表程序，后端基于`go-fiber`，前端使用`react`。
 
 ### 前端项目地址
 
@@ -23,37 +21,18 @@
 
 ### 演示地址
 
-- https://alist.nn.ci (稳定版本)
-- https://alist.now.sh (开发版本)
-- https://alist-plyr.now.sh (plyr分支版本)
+- https://alist.nn.ci
 
 ### 预览
 
-<a href="https://alist.nn.ci/"><img src="https://img.oez.cc/2020/12/24/d81d2dab3e5f0.png"></a>
+<a href="https://alist.nn.ci/"><img src="https://store.heytapimage.com/cdo-portal/feedback/202111/03/695ef77854a144e928518efde38db97a.png"></a>
 
-### 支持的功能
+### 支持的存储
 
-- 自动刷新`token`，`refresh_token`自动更新，失效时间未知，本人使用过程中没有失效过。
-- 图片、视频、音频预览
-- 目录加密
-- `Readme`渲染
-- 自定义根目录
-- 文件直链下载
-- …
-
-#### TODO
-
-- [x] 排序
-- [x] 文件预览
-  - [x] 图片
-  - [x] 视频 
-  - [x] 音频
-- [x] `Readme`渲染
-- [x] 密码加密
-- [ ] 搜索与翻页
-- [x] 文件直链
-- [ ] 路径优化
-- [x] 缓存
+- 本地存储
+- 阿里云盘
+- Onedrive
+- ...
 
 ### 如何使用
 

alidrive/auth.go

@@ -1,49 +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://auth.aliyundrive.com/v2/account/token"
-	req := RefreshTokenReq{RefreshToken: drive.RefreshToken , GrantType: "refresh_token"}
-	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
-		}
-	}
-	if token.Code != "" {
-		log.Errorf("盘[%s]刷新token出错：%s", drive.Name, token.Message)
-		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/post_json.go

@@ -1,80 +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"
-)
-
-// 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/req_bean.go

@@ -1,74 +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"`
-	GrantType    string `json:"grant_type"`
-}
-
-// office_preview_url request bean
-type OfficePreviewUrlReq struct {
-	AccessToken string `json:"access_token"`
-	DriveId     string `json:"drive_id"`
-	FileId      string `json:"file_id"`
-}
-
-// video preview url request bean
-type VideoPreviewUrlReq struct {
-	DriveId     string `json:"drive_id"`
-	FileId      string `json:"file_id"`
-}

alidrive/request.go

@@ -1,123 +0,0 @@
-package alidrive
-
-import (
-	"fmt"
-	"github.com/Xhofe/alist/conf"
-)
-
-// 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
-}
-
-// get video preview url
-func GetVideoPreviewUrl(fileId string, drive *conf.Drive) (*VideoPreviewUrlResp, error) {
-	url := conf.Conf.AliDrive.ApiUrl + "/databox/get_video_play_info"
-	req := VideoPreviewUrlReq{
-		DriveId:     drive.DefaultDriveId,
-		FileId:      fileId,
-	}
-	var resp VideoPreviewUrlResp
-	if err := BodyToJson(url, req, &resp, drive); err != nil {
-		return nil, err
-	}
-	return &resp, nil
-}

alidrive/resp_bean.go

@@ -1,156 +0,0 @@
-package alidrive
-
-import (
-	"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"`
-}
-
-type VideoPreviewUrlResp struct {
-	RespError
-	TemplateList []struct {
-		TemplateId string `json:"template_id"`
-		Status     string `json:"status"`
-		Url        string `json:"url"`
-	} `json:"template_list"`
-}

alidrive/utils.go

@@ -1,41 +0,0 @@
-package alidrive
-
-import (
-	log "github.com/sirupsen/logrus"
-	"io/ioutil"
-	"net/http"
-	"strings"
-)
-
-// 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,48 @@
 package main
 
-import "github.com/Xhofe/alist/bootstrap"
+import (
+	"flag"
+	"fmt"
+	"github.com/Xhofe/alist/bootstrap"
+	"github.com/Xhofe/alist/conf"
+	"github.com/Xhofe/alist/public"
+	"github.com/Xhofe/alist/server"
+	"github.com/gofiber/fiber/v2"
+	"github.com/gofiber/fiber/v2/middleware/filesystem"
+	log "github.com/sirupsen/logrus"
+	"net/http"
+)
+
+func init() {
+	flag.StringVar(&conf.ConfigFile, "conf", "config.json", "config file")
+	flag.BoolVar(&conf.Debug, "debug", false, "start with debug mode")
+	flag.BoolVar(&conf.Version, "version", false, "print version info")
+	flag.Parse()
+}
+
+func Init() {
+	bootstrap.InitLog()
+	bootstrap.InitConf()
+	bootstrap.InitCron()
+	bootstrap.InitModel()
+	bootstrap.InitCache()
+}
 
-// 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
+	}
+	Init()
+	app := fiber.New()
+	server.InitApiRouter(app)
+	app.Use("/", filesystem.New(filesystem.Config{
+		Root:         http.FS(public.Public),
+		NotFoundFile: "index.html",
+	}))
+	log.Info("starting server")
+	err := app.Listen(fmt.Sprintf(":%d", conf.Conf.Port))
+	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/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
-}

bootstrap/cache.go

@@ -0,0 +1,18 @@
+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...")
+	goCacheClient := goCache.New(60*time.Minute, 120*time.Minute)
+	goCacheStore := store.NewGoCache(goCacheClient, nil)
+	conf.Cache = cache.New(goCacheStore)
+}

bootstrap/client.go

@@ -1,17 +0,0 @@
-package bootstrap
-
-import (
-	"crypto/tls"
-	"github.com/Xhofe/alist/conf"
-	log "github.com/sirupsen/logrus"
-	"net/http"
-)
-
-// init request client
-func InitClient() {
-	log.Infof("初始化client...")
-	tr := &http.Transport{
-		TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
-	}
-	conf.Client = &http.Client{Transport: tr}
-}

bootstrap/cmd.go

@@ -1,83 +0,0 @@
-package bootstrap
-
-import (
-	"flag"
-	"fmt"
-
-	"github.com/Xhofe/alist/conf"
-	serv "github.com/Xhofe/alist/server"
-	"github.com/gin-gonic/gin"
-	log "github.com/sirupsen/logrus"
-)
-
-func init() {
-	flag.BoolVar(&conf.Debug, "debug", false, "use debug mode")
-	flag.BoolVar(&conf.Help, "help", false, "show usage help")
-	flag.BoolVar(&conf.Version, "version", false, "show version info")
-	flag.StringVar(&conf.ConfigFile, "conf", "conf.yml", "config file")
-	flag.BoolVar(&conf.SkipUpdate, "skip-update", false, "skip update")
-}
-
-// bootstrap run
-func Run() {
-	flag.Parse()
-	if conf.Help {
-		flag.Usage()
-		return
-	}
-	if conf.Version {
-		fmt.Println("Current version:" + conf.VERSION)
-		return
-	}
-	start()
-}
-
-// print asc
-func printASC() {
-	log.Info(`
- ________  ___       ___  ________  _________   
-|\   __  \|\  \     |\  \|\   ____\|\___   ___\ 
-\ \  \|\  \ \  \    \ \  \ \  \___|\|___ \  \_| 
- \ \   __  \ \  \    \ \  \ \_____  \   \ \  \  
-  \ \  \ \  \ \  \____\ \  \|____|\  \   \ \  \ 
-   \ \__\ \__\ \_______\ \__\____\_\  \   \ \__\
-    \|__|\|__|\|_______|\|__|\_________\   \|__|
-                            \|_________|
-`)
-}
-
-// start server
-func start() {
-	InitLog()
-	printASC()
-	if !conf.SkipUpdate {
-		CheckUpdate()
-	}
-	if !ReadConf(conf.ConfigFile) {
-		log.Errorf("读取配置文件时出现错误,启动失败.")
-		return
-	}
-	InitClient()
-	if !InitAliDrive() {
-		log.Errorf("初始化阿里云盘出现错误,启动失败.")
-		return
-	}
-	if !InitModel() {
-		log.Errorf("初始化数据库出现错误,启动失败.")
-		return
-	}
-	InitCron()
-	server()
-}
-
-// start http server
-func server() {
-	baseServer := conf.Conf.Server.Address + ":" + conf.Conf.Server.Port
-	r := gin.Default()
-	serv.InitRouter(r)
-	log.Infof("Starting server @ %s", baseServer)
-	err := r.Run(baseServer)
-	if err != nil {
-		log.Errorf("Server failed start:%s", err.Error())
-	}
-}

bootstrap/conf.go

@@ -0,0 +1,32 @@
+package bootstrap
+
+import (
+	"encoding/json"
+	"github.com/Xhofe/alist/conf"
+	"github.com/Xhofe/alist/utils"
+	log "github.com/sirupsen/logrus"
+	"io/ioutil"
+)
+
+// 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")
+		conf.Conf = conf.DefaultConfig()
+		if !utils.WriteToJson(conf.ConfigFile, conf.Conf) {
+			log.Fatalf("failed to create default config file")
+		}
+		return
+	}
+	config, err := ioutil.ReadFile(conf.ConfigFile)
+	if err != nil {
+		log.Fatalf("reading config file error:%s", err.Error())
+	}
+	conf.Conf = new(conf.Config)
+	err = json.Unmarshal(config, conf.Conf)
+	if err != nil {
+		log.Fatalf("load config error: %s", err.Error())
+	}
+	log.Debugf("config:%+v", conf.Conf)
+}

bootstrap/config.go

@@ -1,33 +0,0 @@
-package bootstrap
-
-import (
-	"github.com/Xhofe/alist/conf"
-	"github.com/Xhofe/alist/utils"
-	log "github.com/sirupsen/logrus"
-	"gopkg.in/yaml.v2"
-	"io/ioutil"
-	"strings"
-)
-
-// read config file
-func ReadConf(config string) bool {
-	log.Infof("读取配置文件...")
-	if !utils.Exists(config) {
-		log.Infof("找不到配置文件:%s", config)
-		return false
-	}
-	confFile, err := ioutil.ReadFile(config)
-	if err != nil {
-		log.Errorf("读取配置文件时发生错误:%s", err.Error())
-		return false
-	}
-	err = yaml.Unmarshal(confFile, conf.Conf)
-	if err != nil {
-		log.Errorf("加载配置文件时发生错误:%s", err.Error())
-		return false
-	}
-	log.Debugf("config:%+v", conf.Conf)
-	conf.Conf.Info.Roots = utils.GetNames()
-	conf.Origins = strings.Split(conf.Conf.Server.SiteUrl, ",")
-	return true
-}