:bug: 刷新token与跨域问题

.gitattributes

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

.github/workflows/build.yml

@@ -1,59 +0,0 @@
-name: build
-
-on:
-  push:
-    branches: [ v2 ]
-  pull_request:
-    branches: [ v2 ]
-
-jobs:
-  build:
-    strategy:
-      matrix:
-        platform: [ubuntu-latest]
-        go-version: [1.17]
-    name: Build
-    runs-on: ${{ matrix.platform }}
-    steps:
-      - name: Setup Go
-        uses: actions/setup-go@v2
-        with:
-          go-version: ${{ matrix.go-version }}
-
-      - 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: Checkout web repo
-        uses: actions/checkout@v2
-        with:
-          repository: Xhofe/alist-web
-          ref: v2
-          path: alist-web
-
-      - 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
-
-      - name: Upload artifact
-        uses: actions/upload-artifact@v2
-        with:
-          name: artifact
-          path: alist/build

.github/workflows/release.yml

@@ -1,69 +1,28 @@
-name: release
-
+name: Release
 on:
   push:
     tags:
       - '*'
 
 jobs:
-  release:
-    strategy:
-      matrix:
-        platform: [ubuntu-latest]
-        go-version: [1.17]
-    name: Release
-    runs-on: ${{ matrix.platform }}
+  goreleaser:
+    runs-on: ubuntu-latest
     steps:
-      - name: Setup Go
+      -
+        name: Checkout
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      -
+        name: Set up Go
         uses: actions/setup-go@v2
         with:
-          go-version: ${{ matrix.go-version }}
-
-#      - name: Setup docker
-#        uses: docker-practice/actions-setup-docker@master
-
-      - name: Setup Node
-        uses: actions/setup-node@v2
+          go-version: 1.15
+      -
+        name: Run GoReleaser
+        uses: goreleaser/goreleaser-action@v2
         with:
-          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/*
+          version: latest
+          args: release --rm-dist
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitignore

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

LICENSE

@@ -0,0 +1,21 @@
+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,19 +1,20 @@
-<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>
-  <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>
+    <img src="https://img.oez.cc/2020/12/24/1fb16bc25a4f6.png" alt="RenewalManage 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%3ARelease"><img src="https://github.com/Xhofe/alist/workflows/Release/badge.svg" alt="Release status"></a>
+  <a href="https://github.com/Xhofe/RenewalManage/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://pay.xhofe.top">
-    <img src="https://img.shields.io/badge/%24-donate-ff69b4.svg?style=flat-square" alt="donate">
+    <img src="https://img.shields.io/badge/%24-donate-ff69b4.svg" alt="donate">
   </a>
 </p>
-
 ---
 
 ### 这是什么？
 
-一款支持多种存储的目录文件列表程序，后端基于`go-fiber`，前端使用`react`。
+一款阿里云盘的目录文件列表程序，后端基于`golang`最好的`http`框架`gin`，前端使用`vue`和`ant design`。
 
 ### 前端项目地址
 
@@ -25,18 +26,35 @@
 
 ### 预览
 
-<a href="https://alist.nn.ci/"><img src="https://store.heytapimage.com/cdo-portal/feedback/202111/03/695ef77854a144e928518efde38db97a.png"></a>
+<a href="https://alist.nn.ci/"><img src="https://img.oez.cc/2020/12/24/d81d2dab3e5f0.png"></a>
 
-### 支持的存储
+### 支持的功能
 
-- 本地存储
-- 阿里云盘
-- Onedrive
-- ...
+- 自动刷新`token`，`refresh_token`自动更新，失效时间未知，本人使用过程中没有失效过。
+- 图片、视频、音频预览
+- 目录加密
+- `Readme`渲染
+- 自定义根目录
+- …
+
+#### TODO
+
+- [x] 排序
+- [ ] 文件预览
+  - [x] 图片
+  - [x] 视频 
+  - [x] 音频
+  - [ ] 文档
+- [x] `Readme`渲染
+- [x] 密码加密
+- [ ] 搜索与翻页
+- [ ] 文件直链
+- [ ] 路径优化
+- [ ] 缓存
 
 ### 如何使用
 
-- https://www.nn.ci/archives/alist.html
+正在写……
 
 ### License
 

alidrive/auth.go

@@ -0,0 +1,75 @@
+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

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

alidrive/req_bean.go

@@ -0,0 +1,46 @@
+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

@@ -0,0 +1,135 @@
+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      int                    `json:"created_at"`
+	UpdatedAt      int                    `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         int                    `json:"punish_flag"`
+	Size               int                    `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 _, file := range fileList {
+		if strings.HasPrefix(file.Name, ".password-") {
+			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,48 +1,7 @@
 package main
 
-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()
-}
+import "github.com/Xhofe/alist/bootstrap"
 
 func main() {
-	if conf.Version {
-		fmt.Printf("Built At: %s\nGo Version: %s\nAuthor: %s\nCommit ID: %s\nVersion: %s\n", conf.BuiltAt, conf.GoVersion, conf.GitAuthor, conf.GitCommit, conf.GitTag)
-		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())
-	}
-}
+	bootstrap.Run()
+}

alist_test.go

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

bootstrap/alidrive.go

@@ -0,0 +1,34 @@
+package bootstrap
+
+import (
+	"github.com/Xhofe/alist/alidrive"
+	"github.com/Xhofe/alist/conf"
+	log "github.com/sirupsen/logrus"
+)
+
+func InitAliDrive() bool {
+	//首先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+" "+token.AccessToken
+	}
+	conf.Authorization=conf.Bearer+conf.Conf.AliDrive.AccessToken
+	log.Infof("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

@@ -1,18 +0,0 @@
-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

@@ -0,0 +1,10 @@
+package bootstrap
+
+import (
+	"github.com/Xhofe/alist/conf"
+	"net/http"
+)
+
+func InitClient()  {
+	conf.Client=&http.Client{}
+}

bootstrap/cmd.go

@@ -0,0 +1,64 @@
+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()
+	InitClient()
+	if !ReadConf(conf.Con) {
+		log.Errorf("读取配置文件时出现错误,启动失败.")
+		return
+	}
+	if !InitAliDrive() {
+		log.Errorf("初始化阿里云盘出现错误,启动失败.")
+		return
+	}
+	InitCron()
+	server()
+}
+
+func server() {
+	baseServer:="0.0.0.0:"+conf.Conf.Server.Port
+	log.Infof("Starting server @ %s",baseServer)
+	r:=gin.Default()
+	serv.InitRouter(r)
+	err:=r.Run(baseServer)
+	if err!=nil {
+		log.Errorf("Server failed start:%s",err.Error())
+	}
+}

bootstrap/conf.go

@@ -1,32 +0,0 @@
-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

@@ -0,0 +1,28 @@
+package bootstrap
+
+import (
+	"github.com/Xhofe/alist/conf"
+	"github.com/Xhofe/alist/utils"
+	log "github.com/sirupsen/logrus"
+	"gopkg.in/yaml.v2"
+	"io/ioutil"
+)
+
+func ReadConf(config string) bool {
+	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)
+	return true
+}

bootstrap/cron.go

@@ -1,14 +1,23 @@
 package bootstrap
 
 import (
-	"github.com/Xhofe/alist/conf"
+	"github.com/Xhofe/alist/alidrive"
 	"github.com/robfig/cron/v3"
 	log "github.com/sirupsen/logrus"
 )
 
-// InitCron init cron
-func InitCron() {
-	log.Infof("init cron...")
-	conf.Cron = cron.New()
-	conf.Cron.Start()
+var Cron *cron.Cron
+
+func refreshToken()  {
+	alidrive.RefreshToken()
 }
+
+func InitCron() {
+	log.Infof("初始化定时任务:刷新token")
+	Cron=cron.New()
+	_,err:=Cron.AddFunc("@every 2h",refreshToken)
+	if err!=nil {
+		log.Errorf("添加启动任务失败:%s",err.Error())
+	}
+	Cron.Start()
+}