🆕 新版本

README.md

@@ -42,17 +42,16 @@
 #### TODO
 
 - [x] 排序
-- [ ] 文件预览
+- [x] 文件预览
   - [x] 图片
   - [x] 视频 
   - [x] 音频
-  - [ ] 文档
 - [x] `Readme`渲染
 - [x] 密码加密
 - [ ] 搜索与翻页
-- [ ] 文件直链
+- [x] 文件直链
 - [ ] 路径优化
-- [ ] 缓存
+- [x] 缓存
 
 ### 如何使用
 

alidrive/auth.go

@@ -12,7 +12,7 @@ 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)
+	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())

alidrive/request.go

@@ -146,7 +146,7 @@ func DoPost(url string,request interface{},auth bool) (body []byte, err error) {
 		log.Errorf("创建requestBody出错:%s",err.Error())
 	}
 	req,err:=http.NewRequest("POST",url,requestBody)
-	log.Debugf("do_post_req:%v",req)
+	log.Debugf("do_post_req:%+v",req)
 	if err != nil {
 		log.Errorf("创建request出错:%s",err.Error())
 		return

bootstrap/alidrive.go

@@ -24,13 +24,13 @@ func InitAliDrive() bool {
 	}else {
 		conf.Authorization=conf.Bearer+conf.Conf.AliDrive.AccessToken
 	}
-	log.Infof("token:%s",conf.Authorization)
+	log.Debugf("token:%s",conf.Authorization)
 	user,err:=alidrive.GetUserInfo()
 	if err != nil {
 		log.Errorf("初始化用户失败:%s",err.Error())
 		return false
 	}
-	log.Infof("当前用户信息:%v",user)
+	log.Infof("当前用户信息:%+v",user)
 	alidrive.User=user
 	return true
 }

bootstrap/cache.go

@@ -0,0 +1,15 @@
+package bootstrap
+
+import (
+	"github.com/Xhofe/alist/conf"
+	"github.com/patrickmn/go-cache"
+	log "github.com/sirupsen/logrus"
+	"time"
+)
+
+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)
+	}
+}

bootstrap/cmd.go

@@ -39,6 +39,7 @@ func printASC()  {
 func start() {
 	InitLog()
 	printASC()
+	CheckUpdate()
 	if !ReadConf(conf.Con) {
 		log.Errorf("读取配置文件时出现错误,启动失败.")
 		return
@@ -48,6 +49,7 @@ func start() {
 		log.Errorf("初始化阿里云盘出现错误,启动失败.")
 		return
 	}
+	InitCache()
 	InitCron()
 	server()
 }

bootstrap/config.go

@@ -24,6 +24,6 @@ func ReadConf(config string) bool {
 		log.Errorf("加载配置文件时发生错误:%s",err.Error())
 		return false
 	}
-	log.Debugf("config:%v",conf.Conf)
+	log.Debugf("config:%+v",conf.Conf)
 	return true
 }

bootstrap/update.go

@@ -0,0 +1,41 @@
+package bootstrap
+
+import (
+	"encoding/json"
+	"github.com/Xhofe/alist/conf"
+	log "github.com/sirupsen/logrus"
+	"io/ioutil"
+	"net/http"
+)
+
+type GithubRelease struct {
+	TagName	string `json:"tag_name"`
+	HtmlUrl	string `json:"html_url"`
+	Body	string `json:"body"`
+}
+
+func CheckUpdate() {
+	url:="https://api.github.com/repos/Xhofe/alist/releases/latest"
+	resp,err:=http.Get(url)
+	if err!=nil {
+		log.Warnf("检查更新失败:%s",err.Error())
+		return
+	}
+	body,err:=ioutil.ReadAll(resp.Body)
+	if err!=nil {
+		log.Warnf("读取更新内容失败:%s",err.Error())
+		return
+	}
+	var release GithubRelease
+	err = json.Unmarshal(body,&release)
+	if err!=nil {
+		log.Warnf("解析更新失败:%s",err.Error())
+		return
+	}
+	if conf.VERSION == release.TagName {
+		log.Infof("当前已是最新版本:%s",release.TagName)
+	}else {
+		log.Infof("发现新版本:%s",release.TagName)
+		log.Infof("请至'%s'获取更新.",release.HtmlUrl)
+	}
+}

conf.yml.example

@@ -1,15 +1,24 @@
 info:
-  title: AList
-  site_url: http://localhost
-  logo:
+  title: AList #标题
+  site_url: http://localhost:5277 #前端地址
+  backend_url: http://localhost:5244 #后端地址
+  logo: "" #网站logo 如果填写,则会替换掉默认的
+  footer_text: Xhofe's Blog #网页底部文字
+  footer_url: https://www.nn.ci #网页底部文字链接
+  music_img: https://img.oez.cc/2020/12/19/0f8b57866bdb5.gif #预览音乐文件时的图片
+  check_update: true #前端是否显示更新
+  script: #自定义脚本,可以是脚本的链接，也可以直接是脚本内容,如document.querySelector('body').style="background-image:url('https://api.mtyqx.cn/api/random.php');background-attachment:fixed"
 server:
-  port: "5244"
-  search: true
-  static: dist
+  port: "5244" #程序监听端口
+  search: true #是否开启搜索接口,开启搜索之后密码和根目录都会失效,所以前端暂时不做搜索
+  static: dist #前端文件目录
+cache:
+  enable: true #是否开启缓存
+  expiration: 60 #缓存失效时间(单位:分钟)
+  cleanup_interval: 120 #清理失效缓存间隔
+  refresh_password: password #手动清理缓存密码
 ali_drive:
-  api_url: https://api.aliyundrive.com/v2
-  root_folder: root
-  token:
-  access_token:
+  api_url: https://api.aliyundrive.com/v2 #阿里云盘api,无需修改
+  root_folder: root #根目录
   refresh_token: need
-  max_files_count: 3000
+  max_files_count: 3000

conf/config.go

@@ -9,12 +9,28 @@ type Config struct {
 		FooterText		string		`yaml:"footer_text" json:"footer_text"`
 		FooterUrl		string		`yaml:"footer_url" json:"footer_url"`
 		MusicImg		string		`yaml:"music_img" json:"music_img"`
+		CheckUpdate		bool		`yaml:"check_update" json:"check_update"`
+		Script			string 		`yaml:"script" json:"script"`
+		Autoplay		bool		`yaml:"autoplay" json:"autoplay"`
+		Preview	struct{
+			Url			string		`yaml:"url" json:"url"`
+			PreProcess	[]string	`yaml:"pre_process" json:"pre_process"`
+			Extensions	[]string	`yaml:"extensions" json:"extensions"`
+			Text		[]string	`yaml:"text" json:"text"`
+			MaxSize		int			`yaml:"max_size" json:"max_size"`
+		}	`yaml:"preview" json:"preview"`
 	}	`yaml:"info"`
 	Server struct{
 		Port 			string 		`yaml:"port"`//端口
 		Search			bool		`yaml:"search" json:"search"`//允许搜索
 		Static			string		`yaml:"static"`
 	}	`yaml:"server"`
+	Cache struct{
+		Enable			bool		`yaml:"enable"`
+		Expiration		int			`yaml:"expiration"`
+		CleanupInterval	int			`yaml:"cleanup_interval"`
+		RefreshPassword	string		`yaml:"refresh_password"`
+	}
 	AliDrive struct{
 		ApiUrl			string		`yaml:"api_url"`//阿里云盘api
 		RootFolder		string		`yaml:"root_folder"`//根目录id

conf/const.go

@@ -1,6 +1,7 @@
 package conf
 
 import (
+	"github.com/patrickmn/go-cache"
 	"net/http"
 )
 
@@ -10,12 +11,14 @@ var(
 	Con string
 	Client *http.Client
 	Authorization string
+
+	Cache *cache.Cache
 )
 
 var Conf = new(Config)
 
 const (
-	VERSION="0.1.0"
+	VERSION="v0.1.4"
 
 	ImageThumbnailProcess="image/resize,w_50"
 	VideoThumbnailProcess="video/snapshot,t_0,f_jpg,w_50"

go.mod

@@ -11,6 +11,7 @@ require (
 	github.com/leodido/go-urn v1.2.1 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.1 // indirect
+	github.com/patrickmn/go-cache v2.1.0+incompatible
 	github.com/robfig/cron/v3 v3.0.0
 	github.com/sirupsen/logrus v1.7.0
 	github.com/ugorji/go v1.2.2 // indirect

go.sum

@@ -66,6 +66,9 @@ github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742 h1:Esafd1046DLD
 github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 github.com/modern-go/reflect2 v1.0.1 h1:9f412s+6RmYXLWZSEzVVgPGK7C2PphHj5RJrvfx9AWI=
 github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
+github.com/patrickmn/go-cache v1.0.0 h1:3gD5McaYs9CxjyK5AXGcq8gdeCARtd/9gJDUvVeaZ0Y=
+github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc=
+github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/robfig/cron/v3 v3.0.0 h1:kQ6Cb7aHOHTSzNVNEhmp8EcWKLb4CbiMW9h9VyIhO4E=

server/controllers.go

@@ -1,118 +0,0 @@
-package server
-
-import (
-	"github.com/Xhofe/alist/alidrive"
-	"github.com/Xhofe/alist/conf"
-	"github.com/gin-gonic/gin"
-	log "github.com/sirupsen/logrus"
-	"strings"
-)
-
-func Info(c *gin.Context) {
-	c.JSON(200,dataResponse(conf.Conf.Info))
-}
-
-func Get(c *gin.Context) {
-	var get alidrive.GetReq
-	if err := c.ShouldBindJSON(&get); err != nil {
-		c.JSON(200,metaResponse(400,"Bad Request"))
-		return
-	}
-	log.Debugf("get:%v",get)
-	file,err:=alidrive.GetFile(get.FileId)
-	if err !=nil {
-		c.JSON(200,metaResponse(500,err.Error()))
-		return
-	}
-	paths,err:=alidrive.GetPaths(get.FileId)
-	if err!=nil {
-		c.JSON(200,metaResponse(500,err.Error()))
-		return
-	}
-	file.Paths=*paths
-	c.JSON(200,dataResponse(file))
-}
-
-func List(c *gin.Context) {
-	var list ListReq
-	if err := c.ShouldBindJSON(&list);err!=nil {
-		c.JSON(200,metaResponse(400,"Bad Request"))
-		return
-	}
-	log.Debugf("list:%v",list)
-	var (
-		files *alidrive.Files
-		err error
-	)
-	if list.Limit == 0 {
-		list.Limit=50
-	}
-	if conf.Conf.AliDrive.MaxFilesCount!=0 {
-		list.Limit=conf.Conf.AliDrive.MaxFilesCount
-	}
-	if list.ParentFileId == "root" {
-		files,err=alidrive.GetRoot(list.Limit,list.Marker,list.OrderBy,list.OrderDirection)
-	}else {
-		files,err=alidrive.GetList(list.ParentFileId,list.Limit,list.Marker,list.OrderBy,list.OrderDirection)
-	}
-	if err!=nil {
-		c.JSON(200,metaResponse(500,err.Error()))
-		return
-	}
-	password:=alidrive.HasPassword(files)
-	if password!="" && password!=list.Password {
-		if list.Password=="" {
-			c.JSON(200,metaResponse(401,"need password."))
-			return
-		}
-		c.JSON(200,metaResponse(401,"wrong password."))
-		return
-	}
-	paths,err:=alidrive.GetPaths(list.ParentFileId)
-	if err!=nil {
-		c.JSON(200,metaResponse(500,err.Error()))
-		return
-	}
-	files.Paths=*paths
-	files.Readme=alidrive.HasReadme(files)
-	c.JSON(200,dataResponse(files))
-}
-
-func Search(c *gin.Context) {
-	if !conf.Conf.Server.Search {
-		c.JSON(200,metaResponse(403,"Not allow search."))
-		return
-	}
-	var search alidrive.SearchReq
-	if err := c.ShouldBindJSON(&search); err != nil {
-		c.JSON(200,metaResponse(400,"Bad Request"))
-		return
-	}
-	log.Debugf("search:%v",search)
-	if search.Limit == 0 {
-		search.Limit=50
-	}
-	// Search只支持0-100
-	//if conf.Conf.AliDrive.MaxFilesCount!=0 {
-	//	search.Limit=conf.Conf.AliDrive.MaxFilesCount
-	//}
-	files,err:=alidrive.Search(search.Query,search.Limit,search.OrderBy)
-	if err != nil {
-		c.JSON(200,metaResponse(500,err.Error()))
-		return
-	}
-	c.JSON(200,dataResponse(files))
-}
-
-func Down(c *gin.Context) {
-	fileIdParam:=c.Param("file_id")
-	log.Debugf("down:%s",fileIdParam)
-	fileId:=strings.Split(fileIdParam,"/")[1]
-	file,err:=alidrive.GetFile(fileId)
-	if err != nil {
-		c.JSON(200,metaResponse(500,err.Error()))
-		return
-	}
-	c.Redirect(301,file.DownloadUrl)
-	return
-}

server/controllers/common.go

@@ -1,4 +1,4 @@
-package server
+package controllers
 
 import "github.com/gin-gonic/gin"
 
@@ -19,4 +19,4 @@ func dataResponse(data interface{}) gin.H {
 		},
 		"data":data,
 	}
-}
+}

server/controllers/get.go

@@ -0,0 +1,69 @@
+package controllers
+
+import (
+	"github.com/Xhofe/alist/alidrive"
+	"github.com/gin-gonic/gin"
+	log "github.com/sirupsen/logrus"
+	"strings"
+)
+
+// 因为下载地址有时效，所以去掉了文件请求和直链的缓存
+
+func Get(c *gin.Context) {
+	var get alidrive.GetReq
+	if err := c.ShouldBindJSON(&get); err != nil {
+		c.JSON(200,metaResponse(400,"Bad Request"))
+		return
+	}
+	log.Debugf("get:%+v",get)
+	// cache
+	//cacheKey:=fmt.Sprintf("%s-%s","g",get.FileId)
+	//if conf.Conf.Cache.Enable {
+	//	file,exist:=conf.Cache.Get(cacheKey)
+	//	if exist {
+	//		log.Debugf("使用了缓存:%s",cacheKey)
+	//		c.JSON(200,dataResponse(file))
+	//		return
+	//	}
+	//}
+	file,err:=alidrive.GetFile(get.FileId)
+	if err !=nil {
+		c.JSON(200,metaResponse(500,err.Error()))
+		return
+	}
+	paths,err:=alidrive.GetPaths(get.FileId)
+	if err!=nil {
+		c.JSON(200,metaResponse(500,err.Error()))
+		return
+	}
+	file.Paths=*paths
+	//if conf.Conf.Cache.Enable {
+	//	conf.Cache.Set(cacheKey,file,cache.DefaultExpiration)
+	//}
+	c.JSON(200,dataResponse(file))
+}
+
+func Down(c *gin.Context) {
+	fileIdParam:=c.Param("file_id")
+	log.Debugf("down:%s",fileIdParam)
+	fileId:=strings.Split(fileIdParam,"/")[1]
+	//cacheKey:=fmt.Sprintf("%s-%s","d",fileId)
+	//if conf.Conf.Cache.Enable {
+	//	downloadUrl,exist:=conf.Cache.Get(cacheKey)
+	//	if exist {
+	//		log.Debugf("使用了缓存:%s",cacheKey)
+	//		c.Redirect(301,downloadUrl.(string))
+	//		return
+	//	}
+	//}
+	file,err:=alidrive.GetFile(fileId)
+	if err != nil {
+		c.JSON(200, metaResponse(500,err.Error()))
+		return
+	}
+	//if conf.Conf.Cache.Enable {
+	//	conf.Cache.Set(cacheKey,file.DownloadUrl,cache.DefaultExpiration)
+	//}
+	c.Redirect(301,file.DownloadUrl)
+	return
+}

server/controllers/list.go

@@ -0,0 +1,73 @@
+package controllers
+
+import (
+	"fmt"
+	"github.com/Xhofe/alist/alidrive"
+	"github.com/Xhofe/alist/conf"
+	"github.com/gin-gonic/gin"
+	"github.com/patrickmn/go-cache"
+	log "github.com/sirupsen/logrus"
+)
+
+type ListReq struct {
+	Password	string	`json:"password"`
+	alidrive.ListReq
+}
+
+func List(c *gin.Context) {
+	var list ListReq
+	if err := c.ShouldBindJSON(&list);err!=nil {
+		c.JSON(200, metaResponse(400,"Bad Request"))
+		return
+	}
+	log.Debugf("list:%+v",list)
+	// cache
+	cacheKey:=fmt.Sprintf("%s-%s-%s","l",list.ParentFileId,list.Password)
+	if conf.Conf.Cache.Enable {
+		files,exist:=conf.Cache.Get(cacheKey)
+		if exist {
+			log.Debugf("使用了缓存:%s",cacheKey)
+			c.JSON(200, dataResponse(files))
+			return
+		}
+	}
+	var (
+		files *alidrive.Files
+		err error
+	)
+	if list.Limit == 0 {
+		list.Limit=50
+	}
+	if conf.Conf.AliDrive.MaxFilesCount!=0 {
+		list.Limit=conf.Conf.AliDrive.MaxFilesCount
+	}
+	if list.ParentFileId == "root" {
+		files,err=alidrive.GetRoot(list.Limit,list.Marker,list.OrderBy,list.OrderDirection)
+	}else {
+		files,err=alidrive.GetList(list.ParentFileId,list.Limit,list.Marker,list.OrderBy,list.OrderDirection)
+	}
+	if err!=nil {
+		c.JSON(200, metaResponse(500,err.Error()))
+		return
+	}
+	password:=alidrive.HasPassword(files)
+	if password!="" && password!=list.Password {
+		if list.Password=="" {
+			c.JSON(200, metaResponse(401,"need password."))
+			return
+		}
+		c.JSON(200, metaResponse(401,"wrong password."))
+		return
+	}
+	paths,err:=alidrive.GetPaths(list.ParentFileId)
+	if err!=nil {
+		c.JSON(200, metaResponse(500,err.Error()))
+		return
+	}
+	files.Paths=*paths
+	files.Readme=alidrive.HasReadme(files)
+	if conf.Conf.Cache.Enable {
+		conf.Cache.Set(cacheKey,files,cache.DefaultExpiration)
+	}
+	c.JSON(200, dataResponse(files))
+}

server/controllers/search.go

@@ -0,0 +1,49 @@
+package controllers
+
+import (
+	"fmt"
+	"github.com/Xhofe/alist/alidrive"
+	"github.com/Xhofe/alist/conf"
+	"github.com/gin-gonic/gin"
+	"github.com/patrickmn/go-cache"
+	log "github.com/sirupsen/logrus"
+)
+
+func Search(c *gin.Context) {
+	if !conf.Conf.Server.Search {
+		c.JSON(200, metaResponse(403,"Not allow search."))
+		return
+	}
+	var search alidrive.SearchReq
+	if err := c.ShouldBindJSON(&search); err != nil {
+		c.JSON(200, metaResponse(400,"Bad Request"))
+		return
+	}
+	log.Debugf("search:%+v",search)
+	// cache
+	cacheKey:=fmt.Sprintf("%s-%s","s",search.Query)
+	if conf.Conf.Cache.Enable {
+		files,exist:=conf.Cache.Get(cacheKey)
+		if exist {
+			log.Debugf("使用了缓存:%s",cacheKey)
+			c.JSON(200, dataResponse(files))
+			return
+		}
+	}
+	if search.Limit == 0 {
+		search.Limit=50
+	}
+	// Search只支持0-100
+	//if conf.Conf.AliDrive.MaxFilesCount!=0 {
+	//	search.Limit=conf.Conf.AliDrive.MaxFilesCount
+	//}
+	files,err:=alidrive.Search(search.Query,search.Limit,search.OrderBy)
+	if err != nil {
+		c.JSON(200, metaResponse(500,err.Error()))
+		return
+	}
+	if conf.Conf.Cache.Enable {
+		conf.Cache.Set(cacheKey,files,cache.DefaultExpiration)
+	}
+	c.JSON(200, dataResponse(files))
+}

server/controllers/utils.go

@@ -0,0 +1,25 @@
+package controllers
+
+import (
+	"github.com/Xhofe/alist/conf"
+	"github.com/gin-gonic/gin"
+)
+
+func Info(c *gin.Context) {
+	c.JSON(200, dataResponse(conf.Conf.Info))
+}
+
+func RefreshCache(c *gin.Context) {
+	password:=c.Param("password")
+	if conf.Conf.Cache.Enable {
+		if password == conf.Conf.Cache.RefreshPassword {
+			conf.Cache.Flush()
+			c.JSON(200,metaResponse(200,"flush success."))
+			return
+		}
+		c.JSON(200,metaResponse(401,"wrong password."))
+		return
+	}
+	c.JSON(200,metaResponse(400,"disabled cache."))
+	return
+}

server/middlewares.go

@@ -19,7 +19,7 @@ func CrosHandler() gin.HandlerFunc {
 		//context.Set("content-type", "application/json")  //设置返回格式是json
 
 		if method == "OPTIONS" {
-			context.JSON(http.StatusOK, metaResponse(200,"Options Request!"))
+			context.JSON(http.StatusOK, gin.H{})
 		}
 
 		//处理请求

server/req_bean.go

@@ -1,8 +0,0 @@
-package server
-
-import "github.com/Xhofe/alist/alidrive"
-
-type ListReq struct {
-	Password	string	`json:"password"`
-	alidrive.ListReq
-}

server/router.go

@@ -2,6 +2,7 @@ package server
 
 import (
 	"github.com/Xhofe/alist/conf"
+	"github.com/Xhofe/alist/server/controllers"
 	"github.com/gin-contrib/static"
 	"github.com/gin-gonic/gin"
 	log "github.com/sirupsen/logrus"
@@ -20,10 +21,11 @@ func InitApiRouter(engine *gin.Engine) {
 	})
 	v2:=engine.Group("/api")
 	{
-		v2.GET("/info",Info)
-		v2.POST("/get",Get)
-		v2.POST("/list",List)
-		v2.POST("/search",Search)
+		v2.GET("/info",controllers.Info)
+		v2.POST("/get",controllers.Get)
+		v2.POST("/list",controllers.List)
+		v2.POST("/search",controllers.Search)
 	}
-	engine.GET("/d/*file_id",Down)
+	engine.GET("/d/*file_id",controllers.Down)
+	engine.GET("/cache/:password",controllers.RefreshCache)
 }