:bug: fix onedrive slow response

.gitattributes

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

.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-latest]
-        go-version: [1.15]
+        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,28 +1,69 @@
 name: release
+
 on:
   push:
     tags:
       - '*'
 
 jobs:
-  goreleaser:
-    runs-on: ubuntu-latest
+  release:
+    strategy:
+      matrix:
+        platform: [ubuntu-latest]
+        go-version: [1.17]
+    name: Release
+    runs-on: ${{ matrix.platform }}
     steps:
-      -
-        name: Checkout
-        uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
-      -
-        name: Set up Go
+      - name: Setup Go
         uses: actions/setup-go@v2
         with:
-          go-version: 1.15
-      -
-        name: Run GoReleaser
-        uses: goreleaser/goreleaser-action@v2
+          go-version: ${{ matrix.go-version }}
+
+#      - name: Setup docker
+#        uses: docker-practice/actions-setup-docker@master
+
+      - name: Setup Node
+        uses: actions/setup-node@v2
         with:
-          version: latest
-          args: release --rm-dist
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          node-version: '16'
+
+      - name: Checkout
+        uses: actions/checkout@v2
+        with:
+          ref: v2
+          path: alist
+          persist-credentials: false
+          fetch-depth: 0
+
+      - name: Checkout web repo
+        uses: actions/checkout@v2
+        with:
+          repository: Xhofe/alist-web
+          ref: v2
+          path: alist-web
+          persist-credentials: false
+          fetch-depth: 0
+
+      - name: Set up xgo
+        run: |
+          docker pull techknowlogick/xgo:latest
+          go install src.techknowlogick.com/xgo@latest
+          sudo apt install upx
+
+      - name: Build
+        run: |
+          mv alist/build.sh .
+          bash build.sh release
+
+      - name: Upload asserts files
+        uses: ad-m/github-push-action@master
+        with:
+          github_token: ${{ secrets.MY_TOKEN }}
+          branch: cdn
+          directory: alist-web
+          repository: Xhofe/alist-web
+
+      - name: Release
+        uses: softprops/action-gh-release@v1
+        with:
+          files: alist/build/compress/*

.gitignore

@@ -20,6 +20,9 @@ dist/
 
 # Dependency directories (remove the comment below to include it)
 # vendor/
-*.yml
 bin/*
-alist
+alist
+*.json
+public/index.html
+public/assets/
+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,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,13 +1,11 @@
+<h2 align="center">Alist</h2>
 <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" alt="Release version"></a>
-  <a href="https://github.com/Xhofe/alist/actions?query=workflow%3ABuild"><img src="https://github.com/Xhofe/alist/workflows/build/badge.svg" alt="Build status"></a>
-  <a href="https://github.com/Xhofe/alist/releases"><img src="https://img.shields.io/github/downloads/Xhofe/alist/latest/total" alt="Downloads"></a>
-  <a href="https://github.com/Xhofe/alist/blob/main/LICENSE"><img src="https://img.shields.io/github/license/Xhofe/alist" alt="License"></a>
+  <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>
+  <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://pay.xhofe.top">
-    <img src="https://img.shields.io/badge/%24-donate-ff69b4.svg" alt="donate">
+    <img src="https://img.shields.io/badge/%24-donate-ff69b4.svg?style=flat-square" alt="donate">
   </a>
 </p>
 
@@ -15,7 +13,7 @@
 
 ### 这是什么？
 
-一款阿里云盘的目录文件列表程序，后端基于`golang`最好的`http`框架`gin`，前端使用`vue`和`ant design`。
+一款支持多种存储的目录文件列表程序，后端基于`gin`，前端使用`react`。
 
 ### 前端项目地址
 
@@ -27,35 +25,21 @@
 
 ### 预览
 
-<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/世纪互联
+- 天翼云盘
+- GoogleDrive
+- 123pan
+- ...
 
 ### 如何使用
 
-- https://www.nn.ci/archives/alist.html
+- https://alist-doc.nn.ci/
 
 ### License
 

alidrive/auth.go

@@ -1,75 +0,0 @@
-package alidrive
-
-import (
-	"encoding/json"
-	"fmt"
-	"github.com/Xhofe/alist/conf"
-	"github.com/Xhofe/alist/utils"
-	log "github.com/sirupsen/logrus"
-)
-
-func TokenLogin() (*TokenLoginResp, error) {
-	log.Infof("尝试使用token登录...")
-	url:="https://auth.aliyundrive.com/v2/oauth/token_login"
-	req:=TokenLoginReq{Token:conf.Conf.AliDrive.LoginToken}
-	log.Debugf("token_login_req:%+v",req)
-	var tokenLogin TokenLoginResp
-	if body, err := DoPost(url, req,false); err != nil {
-		log.Errorf("tokenLogin-doPost出错:%s",err.Error())
-		return nil,err
-	}else {
-		if err = json.Unmarshal(body,&tokenLogin);err!=nil {
-			log.Errorf("解析json[%s]出错:%s",string(body),err.Error())
-			return nil,err
-		}
-	}
-	if tokenLogin.IsAvailable() {
-		return &tokenLogin,nil
-	}
-	return nil,fmt.Errorf("登录token失效,请更换:%s",tokenLogin.Message)
-}
-
-func GetToken(tokenLogin *TokenLoginResp) (*TokenResp,error) {
-	log.Infof("获取API token...")
-	url:="https://websv.aliyundrive.com/token/get"
-	code:=utils.GetCode(tokenLogin.Goto)
-	if code == "" {
-		return nil,fmt.Errorf("获取code出错")
-	}
-	req:=GetTokenReq{Code:code}
-	var token TokenResp
-	if body, err := DoPost(url, req,false); err != nil {
-		log.Errorf("tokenLogin-doPost出错:%s",err.Error())
-		return nil,err
-	}else {
-		if err = json.Unmarshal(body,&token);err!=nil {
-			log.Errorf("解析json[%s]出错:%s",string(body),err.Error())
-			log.Errorf("此处json解析失败应该是code失效")
-			return nil,fmt.Errorf("code失效")
-		}
-	}
-	return &token,nil
-}
-
-func RefreshToken() bool {
-	log.Infof("刷新token...")
-	url:="https://websv.aliyundrive.com/token/refresh"
-	req:=RefreshTokenReq{RefreshToken:conf.Conf.AliDrive.RefreshToken}
-	var token TokenResp
-	if body, err := DoPost(url, req,false); 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解析失败应该是refresh_token失效")
-			return false
-		}
-	}
-	//刷新成功 更新token并写入文件
-	conf.Conf.AliDrive.AccessToken=token.AccessToken
-	conf.Conf.AliDrive.RefreshToken=token.RefreshToken
-	conf.Authorization=token.TokenType+"\t"+token.AccessToken
-	utils.WriteToYml(conf.Con,conf.Conf)
-	return true
-}

alidrive/const.go

@@ -1,5 +0,0 @@
-package alidrive
-
-var (
-	User	*UserInfo
-)

alidrive/req_bean.go

@@ -1,46 +0,0 @@
-package alidrive
-
-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"`
-}
-
-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"`
-}
-
-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"`
-}
-
-type TokenLoginReq struct {
-	Token 		string	`json:"token"`
-}
-
-type GetTokenReq struct {
-	Code	string	`json:"code"`
-}
-
-type RefreshTokenReq struct {
-	RefreshToken string	`json:"refresh_token"`
-}

alidrive/resp_bean.go

@@ -1,136 +0,0 @@
-package alidrive
-
-import (
-	log "github.com/sirupsen/logrus"
-	"io/ioutil"
-	"net/http"
-	"strings"
-	"time"
-)
-
-type RespError struct {
-	Code    string `json:"code"`
-	Message string `json:"message"`
-}
-
-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"`
-}
-
-type Files struct {
-	RespError
-	Items      []File `json:"items"`
-	NextMarker string `json:"next_marker"`
-	Readme     string `json:"readme"`
-	Paths       []Path `json:"paths"`
-}
-
-type Path struct {
-	Name   string `json:"name"`
-	FileId string `json:"file_id"`
-}
-
-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"`
-}
-
-func (resp *RespError) IsAvailable() bool {
-	return resp.Code == ""
-}
-
-type TokenLoginResp struct {
-	RespError
-	Goto string `json:"goto"`
-}
-
-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"`
-}
-
-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 ""
-}
-
-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,7 +1,61 @@
 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/model"
+	"github.com/Xhofe/alist/server"
+	"github.com/gin-gonic/gin"
+	log "github.com/sirupsen/logrus"
+)
+
+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.Parse()
+}
+
+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
+	}
+	bootstrap.InitSettings()
+	bootstrap.InitAccounts()
+	bootstrap.InitCache()
+	return true
+}
 
 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)
+	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"
+	"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 := drivers.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,36 +0,0 @@
-package bootstrap
-
-import (
-	"github.com/Xhofe/alist/alidrive"
-	"github.com/Xhofe/alist/conf"
-	log "github.com/sirupsen/logrus"
-)
-
-func InitAliDrive() bool {
-	log.Infof("初始化阿里云盘...")
-	//首先token_login
-	if conf.Conf.AliDrive.RefreshToken == "" {
-		tokenLogin,err:=alidrive.TokenLogin()
-		if err!=nil {
-			log.Errorf("登录失败:%s",err.Error())
-			return false
-		}
-		//然后get_token
-		token,err:=alidrive.GetToken(tokenLogin)
-		if err!=nil {
-			return false
-		}
-		conf.Authorization=token.TokenType+"\t"+token.AccessToken
-	}else {
-		conf.Authorization=conf.Bearer+conf.Conf.AliDrive.AccessToken
-	}
-	log.Debugf("token:%s",conf.Authorization)
-	user,err:=alidrive.GetUserInfo()
-	if err != nil {
-		log.Errorf("初始化用户失败:%s",err.Error())
-		return false
-	}
-	log.Infof("当前用户信息:%+v",user)
-	alidrive.User=user
-	return true
-}

bootstrap/cache.go

@@ -2,14 +2,17 @@ package bootstrap
 
 import (
 	"github.com/Xhofe/alist/conf"
-	"github.com/patrickmn/go-cache"
+	"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() {
-	if conf.Conf.Cache.Enable {
-		log.Infof("初始化缓存...")
-		conf.Cache=cache.New(time.Duration(conf.Conf.Cache.Expiration)*time.Minute,time.Duration(conf.Conf.Cache.CleanupInterval)*time.Minute)
-	}
+	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,12 +0,0 @@
-package bootstrap
-
-import (
-	"github.com/Xhofe/alist/conf"
-	log "github.com/sirupsen/logrus"
-	"net/http"
-)
-
-func InitClient()  {
-	log.Infof("初始化client...")
-	conf.Client=&http.Client{}
-}

bootstrap/cmd.go

@@ -1,66 +0,0 @@
-package bootstrap
-
-import (
-	"flag"
-	"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.StringVar(&conf.Con,"conf","conf.yml","config file")
-}
-
-func Run()  {
-	flag.Parse()
-	if conf.Help {
-		flag.Usage()
-		return
-	}
-	start()
-}
-
-func printASC()  {
-	log.Info(`
- ________  ___       ___  ________  _________   
-|\   __  \|\  \     |\  \|\   ____\|\___   ___\ 
-\ \  \|\  \ \  \    \ \  \ \  \___|\|___ \  \_| 
- \ \   __  \ \  \    \ \  \ \_____  \   \ \  \  
-  \ \  \ \  \ \  \____\ \  \|____|\  \   \ \  \ 
-   \ \__\ \__\ \_______\ \__\____\_\  \   \ \__\
-    \|__|\|__|\|_______|\|__|\_________\   \|__|
-                            \|_________|
-`)
-}
-
-func start() {
-	InitLog()
-	printASC()
-	CheckUpdate()
-	if !ReadConf(conf.Con) {
-		log.Errorf("读取配置文件时出现错误,启动失败.")
-		return
-	}
-	InitClient()
-	if !InitAliDrive() {
-		log.Errorf("初始化阿里云盘出现错误,启动失败.")
-		return
-	}
-	InitCache()
-	InitCron()
-	server()
-}
-
-func server() {
-	baseServer:="0.0.0.0:"+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())
-	}
-}