Compare commits

...

4 Commits

Author SHA1 Message Date
9cb548d4f7 跳过检查更新 2021-02-27 20:06:09 +08:00
0e7083a713 Merge pull request #27 from 122cygf/main
 下载链接有效期延长到四小时
2021-02-26 13:14:55 +08:00
46f09836f3 下载链接有效期延长到四小时 2021-02-26 12:37:44 +08:00
e146054679 📝 add notes 2021-02-04 10:02:34 +08:00
26 changed files with 146 additions and 37 deletions

View File

@ -2,12 +2,12 @@
<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>
@ -23,7 +23,9 @@
### 演示地址
- https://alist.nn.ci
- https://alist.nn.ci (稳定版本)
- https://alist.now.sh (开发版本)
- https://alist-plyr.now.sh (plyr分支版本)
### 预览

View File

@ -8,6 +8,7 @@ import (
log "github.com/sirupsen/logrus"
)
// use token login
func TokenLogin() (*TokenLoginResp, error) {
log.Infof("尝试使用token登录...")
url:="https://auth.aliyundrive.com/v2/oauth/token_login"
@ -29,6 +30,7 @@ func TokenLogin() (*TokenLoginResp, error) {
return nil,fmt.Errorf("登录token失效,请更换:%s",tokenLogin.Message)
}
// get access token
func GetToken(tokenLogin *TokenLoginResp) (*TokenResp,error) {
log.Infof("获取API token...")
url:="https://websv.aliyundrive.com/token/get"
@ -51,6 +53,7 @@ func GetToken(tokenLogin *TokenLoginResp) (*TokenResp,error) {
return &token,nil
}
// refresh access_token token by refresh_token
func RefreshToken() bool {
log.Infof("刷新token...")
url:="https://websv.aliyundrive.com/token/refresh"

View File

@ -1,5 +1,6 @@
package alidrive
// list request bean
type ListReq struct {
DriveId string `json:"drive_id"`
Fields string `json:"fields"`
@ -13,6 +14,7 @@ type ListReq struct {
VideoThumbnailProcess string `json:"video_thumbnail_process"`
}
// get request bean
type GetReq struct {
DriveId string `json:"drive_id"`
FileId string `json:"file_id"`
@ -20,6 +22,15 @@ type GetReq struct {
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"`
@ -33,18 +44,22 @@ type SearchReq struct {
VideoThumbnailProcess string `json:"video_thumbnail_process"`
}
// token_login request bean
type TokenLoginReq struct {
Token string `json:"token"`
}
// get_token request bean
type GetTokenReq struct {
Code string `json:"code"`
}
// refresh_token request bean
type RefreshTokenReq struct {
RefreshToken string `json:"refresh_token"`
}
// office_preview_url request bean
type OfficePreviewUrlReq struct {
AccessToken string `json:"access_token"`
DriveId string `json:"drive_id"`

View File

@ -12,6 +12,7 @@ import (
"time"
)
// get file
func GetFile(fileId string) (*File, error) {
url:=conf.Conf.AliDrive.ApiUrl+"/file/get"
req:=GetReq{
@ -27,6 +28,22 @@ func GetFile(fileId string) (*File, error) {
return &resp,nil
}
// get download_url
func GetDownLoadUrl(fileId string) (*DownloadResp, error) {
url:=conf.Conf.AliDrive.ApiUrl+"/file/get_download_url"
req:=DownloadReq{
DriveId: User.DefaultDriveId,
FileId: fileId,
ExpireSec: 14400,
}
var resp DownloadResp
if err := BodyToJson(url, req, &resp, true); err!=nil {
return nil,err
}
return &resp,nil
}
// search by keyword
func Search(key string,limit int, marker string) (*Files, error) {
url:=conf.Conf.AliDrive.ApiUrl+"/file/search"
req:=SearchReq{
@ -46,10 +63,12 @@ func Search(key string,limit int, marker string) (*Files, error) {
return &resp,nil
}
// get root folder
func GetRoot(limit int,marker string,orderBy string,orderDirection string) (*Files,error) {
return GetList(conf.Conf.AliDrive.RootFolder,limit,marker,orderBy,orderDirection)
}
// get folder list by file_id
func GetList(parent string,limit int,marker string,orderBy string,orderDirection string) (*Files,error) {
url:=conf.Conf.AliDrive.ApiUrl+"/file/list"
req:=ListReq{
@ -71,6 +90,7 @@ func GetList(parent string,limit int,marker string,orderBy string,orderDirection
return &resp,nil
}
// get user info
func GetUserInfo() (*UserInfo,error) {
url:=conf.Conf.AliDrive.ApiUrl+"/user/get"
var resp UserInfo
@ -80,6 +100,7 @@ func GetUserInfo() (*UserInfo,error) {
return &resp,nil
}
// get office preview url and token
func GetOfficePreviewUrl(fileId string) (*OfficePreviewUrlResp,error) {
url:=conf.Conf.AliDrive.ApiUrl+"/file/get_office_preview_url"
req:=OfficePreviewUrlReq{
@ -94,6 +115,7 @@ func GetOfficePreviewUrl(fileId string) (*OfficePreviewUrlResp,error) {
return &resp,nil
}
// convert body to json
func BodyToJson(url string, req interface{}, resp RespHandle,auth bool) error {
if body,err := DoPost(url,req,auth);err!=nil {
log.Errorf("doPost出错:%s",err.Error())
@ -116,6 +138,7 @@ func BodyToJson(url string, req interface{}, resp RespHandle,auth bool) error {
return fmt.Errorf(resp.GetMessage())
}
// do post request
func DoPost(url string,request interface{},auth bool) (body []byte, err error) {
var(
resp *http.Response

View File

@ -8,13 +8,15 @@ import (
"time"
)
// response bean methods
type RespHandle interface {
IsAvailable() bool
GetCode() string
GetMessage() string
SetCode(code string)
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"`
@ -24,18 +26,19 @@ func (resp *RespError) IsAvailable() bool {
return resp.Code == ""
}
func (resp *RespError)GetCode() string {
func (resp *RespError) GetCode() string {
return resp.Code
}
func (resp *RespError)GetMessage() string {
func (resp *RespError) GetMessage() string {
return resp.Message
}
func (resp *RespError)SetCode(code string) {
resp.Code=code
func (resp *RespError) SetCode(code string) {
resp.Code = code
}
// user_info response bean
type UserInfo struct {
RespError
DomainId string `json:"domain_id"`
@ -54,19 +57,22 @@ type UserInfo struct {
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"`
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"`
@ -98,11 +104,25 @@ type File struct {
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"`
@ -123,12 +143,14 @@ type TokenResp struct {
DeviceId string `json:"device_id"`
}
// office_preview_url response bean
type OfficePreviewUrlResp struct {
RespError
PreviewUrl string `json:"preview_url"`
AccessToken string `json:"access_token"`
}
// check password
func HasPassword(files *Files) string {
fileList := files.Items
for i, file := range fileList {
@ -140,6 +162,7 @@ func HasPassword(files *Files) string {
return ""
}
// Deprecated: check readme, implemented by the front end now
func HasReadme(files *Files) string {
fileList := files.Items
for _, file := range fileList {

View File

@ -2,6 +2,7 @@ package main
import "github.com/Xhofe/alist/bootstrap"
// main function
func main() {
bootstrap.Run()
}

View File

@ -6,6 +6,7 @@ import (
log "github.com/sirupsen/logrus"
)
// init aliyun drive
func InitAliDrive() bool {
log.Infof("初始化阿里云盘...")
//首先token_login

View File

@ -7,6 +7,7 @@ import (
"time"
)
// init cache
func InitCache() {
if conf.Conf.Cache.Enable {
log.Infof("初始化缓存...")

View File

@ -6,6 +6,7 @@ import (
"net/http"
)
// init request client
func InitClient() {
log.Infof("初始化client...")
conf.Client=&http.Client{}

View File

@ -14,8 +14,10 @@ func init() {
flag.BoolVar(&conf.Help,"help",false,"show usage help")
flag.BoolVar(&conf.Version,"version",false,"show version info")
flag.StringVar(&conf.Con,"conf","conf.yml","config file")
flag.BoolVar(&conf.SkipUpdate,"skip-update",false,"skip update")
}
// bootstrap run
func Run() {
flag.Parse()
if conf.Help {
@ -29,6 +31,7 @@ func Run() {
start()
}
// print asc
func printASC() {
log.Info(`
________ ___ ___ ________ _________
@ -42,10 +45,13 @@ func printASC() {
`)
}
// start server
func start() {
InitLog()
printASC()
CheckUpdate()
if !conf.SkipUpdate {
CheckUpdate()
}
if !ReadConf(conf.Con) {
log.Errorf("读取配置文件时出现错误,启动失败.")
return
@ -60,6 +66,7 @@ func start() {
server()
}
// start http server
func server() {
baseServer:="0.0.0.0:"+conf.Conf.Server.Port
r:=gin.Default()

View File

@ -9,6 +9,7 @@ import (
"strings"
)
// read config file
func ReadConf(config string) bool {
log.Infof("读取配置文件...")
if !utils.Exists(config) {

View File

@ -8,10 +8,12 @@ import (
var Cron *cron.Cron
// refresh token func for cron
func refreshToken() {
alidrive.RefreshToken()
}
// init cron jobs
func InitCron() {
log.Infof("初始化定时任务:刷新token")
Cron=cron.New()

View File

@ -6,6 +6,7 @@ import (
log "github.com/sirupsen/logrus"
)
// init logrus
func InitLog() {
if conf.Debug {
log.SetLevel(log.DebugLevel)

View File

@ -9,12 +9,14 @@ import (
"net/http"
)
// github release response bean
type GithubRelease struct {
TagName string `json:"tag_name"`
HtmlUrl string `json:"html_url"`
Body string `json:"body"`
}
// check updtae
func CheckUpdate() {
log.Infof("检查更新...")
url:="https://api.github.com/repos/Xhofe/alist/releases/latest"

View File

@ -1,5 +1,6 @@
package conf
// config struct
type Config struct {
Info struct{
Title string `yaml:"title" json:"title"`

View File

@ -6,22 +6,24 @@ import (
)
var(
Debug bool
Help bool
Version bool
Con string
Client *http.Client
Authorization string
Debug bool // is debug command
Help bool // is help command
Version bool // is print version command
Con string // config file
SkipUpdate bool // skip update
Cache *cache.Cache
Client *http.Client // request client
Authorization string // authorization string
Origins []string
Cache *cache.Cache // cache
Origins []string // allow origins
)
var Conf = new(Config)
const (
VERSION="v0.1.6"
VERSION="v0.1.7"
ImageThumbnailProcess="image/resize,w_50"
VideoThumbnailProcess="video/snapshot,t_0,f_jpg,w_50"

View File

@ -2,6 +2,7 @@ package controllers
import "github.com/gin-gonic/gin"
// common meta response
func MetaResponse(code int, msg string) gin.H {
return gin.H{
"meta":gin.H{
@ -11,6 +12,7 @@ func MetaResponse(code int, msg string) gin.H {
}
}
// common data response
func DataResponse(data interface{}) gin.H {
return gin.H{
"meta":gin.H{

View File

@ -7,8 +7,8 @@ import (
"strings"
)
// handle get request
// 因为下载地址有时效,所以去掉了文件请求和直链的缓存
func Get(c *gin.Context) {
var get alidrive.GetReq
if err := c.ShouldBindJSON(&get); err != nil {
@ -37,6 +37,12 @@ func Get(c *gin.Context) {
return
}
file.Paths=*paths
download,err:=alidrive.GetDownLoadUrl(get.FileId)
if err!=nil {
c.JSON(200, MetaResponse(500,err.Error()))
return
}
file.DownloadUrl=download.Url
//if conf.Conf.Cache.Enable {
// conf.Cache.Set(cacheKey,file,cache.DefaultExpiration)
//}
@ -56,7 +62,7 @@ func Down(c *gin.Context) {
// return
// }
//}
file,err:=alidrive.GetFile(fileId)
file,err:=alidrive.GetDownLoadUrl(fileId)
if err != nil {
c.JSON(200, MetaResponse(500,err.Error()))
return
@ -64,6 +70,6 @@ func Down(c *gin.Context) {
//if conf.Conf.Cache.Enable {
// conf.Cache.Set(cacheKey,file.DownloadUrl,cache.DefaultExpiration)
//}
c.Redirect(301,file.DownloadUrl)
c.Redirect(301,file.Url)
return
}

View File

@ -9,11 +9,13 @@ import (
log "github.com/sirupsen/logrus"
)
// list request bean
type ListReq struct {
Password string `json:"password"`
alidrive.ListReq
}
// handle list request
func List(c *gin.Context) {
var list ListReq
if err := c.ShouldBindJSON(&list);err!=nil {
@ -65,7 +67,7 @@ func List(c *gin.Context) {
return
}
files.Paths=*paths
files.Readme=alidrive.HasReadme(files)
//files.Readme=alidrive.HasReadme(files)
if conf.Conf.Cache.Enable {
conf.Cache.Set(cacheKey,files,cache.DefaultExpiration)
}

View File

@ -6,6 +6,7 @@ import (
log "github.com/sirupsen/logrus"
)
// handle office_preview request
func OfficePreview(c *gin.Context) {
var req alidrive.OfficePreviewUrlReq
if err := c.ShouldBindJSON(&req); err != nil {

View File

@ -9,6 +9,7 @@ import (
log "github.com/sirupsen/logrus"
)
// handle search request
func Search(c *gin.Context) {
if !conf.Conf.Server.Search {
c.JSON(200, MetaResponse(403,"Not allow search."))

View File

@ -5,10 +5,12 @@ import (
"github.com/gin-gonic/gin"
)
// handle info request
func Info(c *gin.Context) {
c.JSON(200, DataResponse(conf.Conf.Info))
}
// handle refresh_cache request
func RefreshCache(c *gin.Context) {
password:=c.Param("password")
if conf.Conf.Cache.Enable {

View File

@ -7,7 +7,8 @@ import (
"github.com/gin-gonic/gin"
)
func CrosHandler() gin.HandlerFunc {
// handle cors request
func CorsHandler() gin.HandlerFunc {
return func(context *gin.Context) {
origin:=context.GetHeader("Origin")
// 同源

View File

@ -8,17 +8,19 @@ import (
log "github.com/sirupsen/logrus"
)
// init router
func InitRouter(engine *gin.Engine) {
log.Infof("初始化路由...")
engine.Use(CrosHandler())
InitApiRouter(engine)
}
func InitApiRouter(engine *gin.Engine) {
engine.Use(CorsHandler())
engine.Use(static.Serve("/",static.LocalFile(conf.Conf.Server.Static,false)))
engine.NoRoute(func(c *gin.Context) {
c.File(conf.Conf.Server.Static+"/index.html")
})
InitApiRouter(engine)
}
// init api router
func InitApiRouter(engine *gin.Engine) {
v2:=engine.Group("/api")
{
v2.GET("/info",controllers.Info)

View File

@ -7,6 +7,7 @@ import (
"strings"
)
// get code from url
func GetCode(rawUrl string) string {
u,err:=url.Parse(rawUrl)
if err!=nil {
@ -17,6 +18,7 @@ func GetCode(rawUrl string) string {
return code
}
// determine whether to include
func ContainsString(array []string, val string) (index int) {
index = -1
for i := 0; i < len(array); i++ {
@ -28,6 +30,7 @@ func ContainsString(array []string, val string) (index int) {
return
}
// compare version
func VersionCompare(version1, version2 string) int {
a := strings.Split(version1, ".")
b := strings.Split(version2, ".")

View File

@ -8,6 +8,7 @@ import (
"path/filepath"
)
// determine whether the file exists
func Exists(name string) bool {
if _, err := os.Stat(name); err != nil {
if os.IsNotExist(err) {
@ -17,6 +18,7 @@ func Exists(name string) bool {
return true
}
// 嵌套创建文件
func CreatNestedFile(path string) (*os.File, error) {
basePath := filepath.Dir(path)
if !Exists(basePath) {
@ -29,6 +31,7 @@ func CreatNestedFile(path string) (*os.File, error) {
return os.Create(path)
}
// write struct to yaml file
func WriteToYml(src string,conf interface{}){
data,err := yaml.Marshal(conf)
if err!=nil {