Compare commits
6 Commits
Author | SHA1 | Date | |
---|---|---|---|
3b2a729dc6 | |||
d18a752732 | |||
b9676182c9 | |||
434eb25408 | |||
858291876b | |||
dcebf5257f |
2
.github/workflows/build.yml
vendored
2
.github/workflows/build.yml
vendored
@ -1,4 +1,4 @@
|
||||
name: Build
|
||||
name: build
|
||||
|
||||
on:
|
||||
push:
|
||||
|
2
.github/workflows/release.yml
vendored
2
.github/workflows/release.yml
vendored
@ -1,4 +1,4 @@
|
||||
name: Release
|
||||
name: release
|
||||
on:
|
||||
push:
|
||||
tags:
|
||||
|
@ -3,7 +3,7 @@
|
||||
</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/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://pay.xhofe.top">
|
||||
|
@ -1,46 +1,52 @@
|
||||
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"`
|
||||
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"`
|
||||
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"
|
||||
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 '测试文件'"
|
||||
Query string `json:"query"` // "name match '测试文件'"
|
||||
|
||||
VideoThumbnailProcess string `json:"video_thumbnail_process"`
|
||||
VideoThumbnailProcess string `json:"video_thumbnail_process"`
|
||||
}
|
||||
|
||||
type TokenLoginReq struct {
|
||||
Token string `json:"token"`
|
||||
Token string `json:"token"`
|
||||
}
|
||||
|
||||
type GetTokenReq struct {
|
||||
Code string `json:"code"`
|
||||
Code string `json:"code"`
|
||||
}
|
||||
|
||||
type RefreshTokenReq struct {
|
||||
RefreshToken string `json:"refresh_token"`
|
||||
}
|
||||
RefreshToken string `json:"refresh_token"`
|
||||
}
|
||||
|
||||
type OfficePreviewUrlReq struct {
|
||||
AccessToken string `json:"access_token"`
|
||||
DriveId string `json:"drive_id"`
|
||||
FileId string `json:"file_id"`
|
||||
}
|
||||
|
@ -20,25 +20,11 @@ func GetFile(fileId string) (*File, error) {
|
||||
ImageThumbnailProcess: conf.ImageThumbnailProcess,
|
||||
VideoThumbnailProcess: conf.VideoThumbnailProcess,
|
||||
}
|
||||
var file File
|
||||
if body, err := DoPost(url, req,true); err != nil {
|
||||
log.Errorf("doPost出错:%s",err.Error())
|
||||
var resp File
|
||||
if err := BodyToJson(url, req, &resp, true); err!=nil {
|
||||
return nil,err
|
||||
}else {
|
||||
if err = json.Unmarshal(body,&file);err !=nil {
|
||||
log.Errorf("解析json[%s]出错:%s",string(body),err.Error())
|
||||
return nil,err
|
||||
}
|
||||
}
|
||||
if file.IsAvailable() {
|
||||
return &file,nil
|
||||
}
|
||||
if file.Code==conf.AccessTokenInvalid {
|
||||
if RefreshToken() {
|
||||
return GetFile(fileId)
|
||||
}
|
||||
}
|
||||
return nil,fmt.Errorf(file.Message)
|
||||
return &resp,nil
|
||||
}
|
||||
|
||||
func Search(key string,limit int, marker string) (*Files, error) {
|
||||
@ -53,25 +39,11 @@ func Search(key string,limit int, marker string) (*Files, error) {
|
||||
Query: fmt.Sprintf("name match '%s'",key),
|
||||
VideoThumbnailProcess: conf.VideoThumbnailProcess,
|
||||
}
|
||||
var files Files
|
||||
if body, err := DoPost(url, req,true); err != nil {
|
||||
log.Errorf("doPost出错:%s",err.Error())
|
||||
var resp Files
|
||||
if err := BodyToJson(url, req, &resp, true); err!=nil {
|
||||
return nil,err
|
||||
}else {
|
||||
if err = json.Unmarshal(body,&files);err !=nil {
|
||||
log.Errorf("解析json[%s]出错:%s",string(body),err.Error())
|
||||
return nil,err
|
||||
}
|
||||
}
|
||||
if files.IsAvailable() {
|
||||
return &files,nil
|
||||
}
|
||||
if files.Code==conf.AccessTokenInvalid {
|
||||
if RefreshToken() {
|
||||
return Search(key,limit,marker)
|
||||
}
|
||||
}
|
||||
return nil,fmt.Errorf(files.Message)
|
||||
return &resp,nil
|
||||
}
|
||||
|
||||
func GetRoot(limit int,marker string,orderBy string,orderDirection string) (*Files,error) {
|
||||
@ -92,48 +64,56 @@ func GetList(parent string,limit int,marker string,orderBy string,orderDirection
|
||||
ParentFileId: parent,
|
||||
VideoThumbnailProcess: conf.VideoThumbnailProcess,
|
||||
}
|
||||
var files Files
|
||||
if body, err := DoPost(url, req,true); err != nil {
|
||||
log.Errorf("doPost出错:%s",err.Error())
|
||||
var resp Files
|
||||
if err := BodyToJson(url, req, &resp, true); err!=nil {
|
||||
return nil,err
|
||||
}else {
|
||||
if err = json.Unmarshal(body,&files);err !=nil {
|
||||
log.Errorf("解析json[%s]出错:%s",string(body),err.Error())
|
||||
return nil,err
|
||||
}
|
||||
}
|
||||
if files.IsAvailable() {
|
||||
return &files,nil
|
||||
}
|
||||
if files.Code==conf.AccessTokenInvalid {
|
||||
if RefreshToken() {
|
||||
return GetRoot(limit,marker,orderBy,orderDirection)
|
||||
}
|
||||
}
|
||||
return nil,fmt.Errorf(files.Message)
|
||||
return &resp,nil
|
||||
}
|
||||
|
||||
func GetUserInfo() (*UserInfo,error) {
|
||||
url:=conf.Conf.AliDrive.ApiUrl+"/user/get"
|
||||
var user UserInfo
|
||||
if body, err := DoPost(url, map[string]interface{}{},true); err != nil {
|
||||
log.Errorf("doPost出错:%s",err.Error())
|
||||
var resp UserInfo
|
||||
if err := BodyToJson(url, map[string]interface{}{}, &resp, true); err!=nil {
|
||||
return nil,err
|
||||
}
|
||||
return &resp,nil
|
||||
}
|
||||
|
||||
func GetOfficePreviewUrl(fileId string) (*OfficePreviewUrlResp,error) {
|
||||
url:=conf.Conf.AliDrive.ApiUrl+"/file/get_office_preview_url"
|
||||
req:=OfficePreviewUrlReq{
|
||||
AccessToken: conf.Conf.AliDrive.AccessToken,
|
||||
DriveId: User.DefaultDriveId,
|
||||
FileId: fileId,
|
||||
}
|
||||
var resp OfficePreviewUrlResp
|
||||
if err := BodyToJson(url, req, &resp, true); err!=nil {
|
||||
return nil,err
|
||||
}
|
||||
return &resp,nil
|
||||
}
|
||||
|
||||
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())
|
||||
return err
|
||||
}else {
|
||||
if err = json.Unmarshal(body,&user);err !=nil {
|
||||
if err = json.Unmarshal(body,&resp);err!=nil {
|
||||
log.Errorf("解析json[%s]出错:%s",string(body),err.Error())
|
||||
return nil,err
|
||||
return err
|
||||
}
|
||||
}
|
||||
if user.IsAvailable() {
|
||||
return &user,nil
|
||||
if resp.IsAvailable() {
|
||||
return nil
|
||||
}
|
||||
if user.Code==conf.AccessTokenInvalid {
|
||||
if resp.GetCode() == conf.AccessTokenInvalid {
|
||||
resp.SetCode("")
|
||||
if RefreshToken() {
|
||||
return GetUserInfo()
|
||||
return BodyToJson(url,req,resp,auth)
|
||||
}
|
||||
}
|
||||
return nil,fmt.Errorf(user.Message)
|
||||
return fmt.Errorf(resp.GetMessage())
|
||||
}
|
||||
|
||||
func DoPost(url string,request interface{},auth bool) (body []byte, err error) {
|
||||
|
@ -8,11 +8,34 @@ import (
|
||||
"time"
|
||||
)
|
||||
|
||||
type RespHandle interface {
|
||||
IsAvailable() bool
|
||||
GetCode() string
|
||||
GetMessage() string
|
||||
SetCode(code string)
|
||||
}
|
||||
|
||||
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
|
||||
}
|
||||
|
||||
type UserInfo struct {
|
||||
RespError
|
||||
DomainId string `json:"domain_id"`
|
||||
@ -36,7 +59,7 @@ type Files struct {
|
||||
Items []File `json:"items"`
|
||||
NextMarker string `json:"next_marker"`
|
||||
Readme string `json:"readme"`
|
||||
Paths []Path `json:"paths"`
|
||||
Paths []Path `json:"paths"`
|
||||
}
|
||||
|
||||
type Path struct {
|
||||
@ -72,11 +95,7 @@ type File struct {
|
||||
Url string `json:"url"`
|
||||
ImageMediaMetadata map[string]interface{} `json:"image_media_metadata"`
|
||||
|
||||
Paths []Path `json:"paths"`
|
||||
}
|
||||
|
||||
func (resp *RespError) IsAvailable() bool {
|
||||
return resp.Code == ""
|
||||
Paths []Path `json:"paths"`
|
||||
}
|
||||
|
||||
type TokenLoginResp struct {
|
||||
@ -104,11 +123,17 @@ type TokenResp struct {
|
||||
DeviceId string `json:"device_id"`
|
||||
}
|
||||
|
||||
type OfficePreviewUrlResp struct {
|
||||
RespError
|
||||
PreviewUrl string `json:"preview_url"`
|
||||
AccessToken string `json:"access_token"`
|
||||
}
|
||||
|
||||
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:])]
|
||||
files.Items = fileList[:i+copy(fileList[i:], fileList[i+1:])]
|
||||
return file.Name[10:]
|
||||
}
|
||||
}
|
||||
|
@ -2,6 +2,7 @@ package bootstrap
|
||||
|
||||
import (
|
||||
"flag"
|
||||
"fmt"
|
||||
"github.com/Xhofe/alist/conf"
|
||||
serv "github.com/Xhofe/alist/server"
|
||||
"github.com/gin-gonic/gin"
|
||||
@ -11,6 +12,7 @@ import (
|
||||
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.Con,"conf","conf.yml","config file")
|
||||
}
|
||||
|
||||
@ -20,6 +22,10 @@ func Run() {
|
||||
flag.Usage()
|
||||
return
|
||||
}
|
||||
if conf.Version {
|
||||
fmt.Println("Current version:"+conf.VERSION)
|
||||
return
|
||||
}
|
||||
start()
|
||||
}
|
||||
|
||||
|
@ -6,6 +6,7 @@ import (
|
||||
log "github.com/sirupsen/logrus"
|
||||
"gopkg.in/yaml.v2"
|
||||
"io/ioutil"
|
||||
"strings"
|
||||
)
|
||||
|
||||
func ReadConf(config string) bool {
|
||||
@ -25,5 +26,6 @@ func ReadConf(config string) bool {
|
||||
return false
|
||||
}
|
||||
log.Debugf("config:%+v",conf.Conf)
|
||||
conf.Origins = strings.Split(conf.Conf.Server.SiteUrl,",")
|
||||
return true
|
||||
}
|
@ -3,6 +3,7 @@ package bootstrap
|
||||
import (
|
||||
"encoding/json"
|
||||
"github.com/Xhofe/alist/conf"
|
||||
"github.com/Xhofe/alist/utils"
|
||||
log "github.com/sirupsen/logrus"
|
||||
"io/ioutil"
|
||||
"net/http"
|
||||
@ -15,6 +16,7 @@ type GithubRelease struct {
|
||||
}
|
||||
|
||||
func CheckUpdate() {
|
||||
log.Infof("检查更新...")
|
||||
url:="https://api.github.com/repos/Xhofe/alist/releases/latest"
|
||||
resp,err:=http.Get(url)
|
||||
if err!=nil {
|
||||
@ -32,8 +34,10 @@ func CheckUpdate() {
|
||||
log.Warnf("解析更新失败:%s",err.Error())
|
||||
return
|
||||
}
|
||||
if conf.VERSION == release.TagName {
|
||||
log.Infof("当前已是最新版本:%s",release.TagName)
|
||||
lasted:=release.TagName[1:]
|
||||
now:=conf.VERSION[1:]
|
||||
if utils.VersionCompare(lasted,now) != 1 {
|
||||
log.Infof("当前已是最新版本:%s",conf.VERSION)
|
||||
}else {
|
||||
log.Infof("发现新版本:%s",release.TagName)
|
||||
log.Infof("请至'%s'获取更新.",release.HtmlUrl)
|
||||
|
@ -1,17 +1,23 @@
|
||||
info:
|
||||
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"
|
||||
autoplay: true #视频是否自动播放
|
||||
preview:
|
||||
url: https://view.alist.nn.ci/onlinePreview?url= #extensions中包含的后缀名预览的地址,默认使用了kkFileView,可以自行搭建
|
||||
pre_process: [base64,encodeURIComponent] #对地址的处理,支持base64,encodeURIComponent,encodeURI
|
||||
extensions: [zip,rar,jar,tar,gzip] #使用上面的url预览的文件后缀,这是只是示例
|
||||
text: [txt,htm,html,xml,java,properties,sql,js,md,json,conf,ini,vue,php,py,bat,gitignore,yml,go,sh,c,cpp,h,hpp] #要预览的文本文件的后缀,可以自行添加
|
||||
max_size: 5242880
|
||||
server:
|
||||
port: "5244" #程序监听端口
|
||||
search: true #是否开启搜索接口,开启搜索之后密码和根目录都会失效,所以前端暂时不做搜索
|
||||
static: dist #前端文件目录
|
||||
site_url: '*' #建议直接填*,若有信任域名要求,可填写其他,逗号分割
|
||||
cache:
|
||||
enable: true #是否开启缓存
|
||||
expiration: 60 #缓存失效时间(单位:分钟)
|
||||
|
@ -3,8 +3,6 @@ package conf
|
||||
type Config struct {
|
||||
Info struct{
|
||||
Title string `yaml:"title" json:"title"`
|
||||
SiteUrl string `yaml:"site_url" json:"site_url"`//网站url
|
||||
BackendUrl string `yaml:"backend_url" json:"backend_url"`//后端地址
|
||||
Logo string `yaml:"logo" json:"logo"`
|
||||
FooterText string `yaml:"footer_text" json:"footer_text"`
|
||||
FooterUrl string `yaml:"footer_url" json:"footer_url"`
|
||||
@ -24,6 +22,7 @@ type Config struct {
|
||||
Port string `yaml:"port"`//端口
|
||||
Search bool `yaml:"search" json:"search"`//允许搜索
|
||||
Static string `yaml:"static"`
|
||||
SiteUrl string `yaml:"site_url" json:"site_url"`//网站url
|
||||
} `yaml:"server"`
|
||||
Cache struct{
|
||||
Enable bool `yaml:"enable"`
|
||||
|
@ -8,17 +8,20 @@ import (
|
||||
var(
|
||||
Debug bool
|
||||
Help bool
|
||||
Version bool
|
||||
Con string
|
||||
Client *http.Client
|
||||
Authorization string
|
||||
|
||||
Cache *cache.Cache
|
||||
|
||||
Origins []string
|
||||
)
|
||||
|
||||
var Conf = new(Config)
|
||||
|
||||
const (
|
||||
VERSION="v0.1.4"
|
||||
VERSION="v0.1.6"
|
||||
|
||||
ImageThumbnailProcess="image/resize,w_50"
|
||||
VideoThumbnailProcess="video/snapshot,t_0,f_jpg,w_50"
|
||||
|
@ -2,7 +2,7 @@ package controllers
|
||||
|
||||
import "github.com/gin-gonic/gin"
|
||||
|
||||
func metaResponse(code int, msg string) gin.H {
|
||||
func MetaResponse(code int, msg string) gin.H {
|
||||
return gin.H{
|
||||
"meta":gin.H{
|
||||
"code":code,
|
||||
@ -11,7 +11,7 @@ func metaResponse(code int, msg string) gin.H {
|
||||
}
|
||||
}
|
||||
|
||||
func dataResponse(data interface{}) gin.H {
|
||||
func DataResponse(data interface{}) gin.H {
|
||||
return gin.H{
|
||||
"meta":gin.H{
|
||||
"code":200,
|
||||
|
@ -12,7 +12,7 @@ import (
|
||||
func Get(c *gin.Context) {
|
||||
var get alidrive.GetReq
|
||||
if err := c.ShouldBindJSON(&get); err != nil {
|
||||
c.JSON(200,metaResponse(400,"Bad Request"))
|
||||
c.JSON(200, MetaResponse(400,"Bad Request"))
|
||||
return
|
||||
}
|
||||
log.Debugf("get:%+v",get)
|
||||
@ -22,25 +22,25 @@ func Get(c *gin.Context) {
|
||||
// file,exist:=conf.Cache.Get(cacheKey)
|
||||
// if exist {
|
||||
// log.Debugf("使用了缓存:%s",cacheKey)
|
||||
// c.JSON(200,dataResponse(file))
|
||||
// c.JSON(200,DataResponse(file))
|
||||
// return
|
||||
// }
|
||||
//}
|
||||
file,err:=alidrive.GetFile(get.FileId)
|
||||
if err !=nil {
|
||||
c.JSON(200,metaResponse(500,err.Error()))
|
||||
c.JSON(200, MetaResponse(500,err.Error()))
|
||||
return
|
||||
}
|
||||
paths,err:=alidrive.GetPaths(get.FileId)
|
||||
if err!=nil {
|
||||
c.JSON(200,metaResponse(500,err.Error()))
|
||||
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))
|
||||
c.JSON(200, DataResponse(file))
|
||||
}
|
||||
|
||||
func Down(c *gin.Context) {
|
||||
@ -58,7 +58,7 @@ func Down(c *gin.Context) {
|
||||
//}
|
||||
file,err:=alidrive.GetFile(fileId)
|
||||
if err != nil {
|
||||
c.JSON(200, metaResponse(500,err.Error()))
|
||||
c.JSON(200, MetaResponse(500,err.Error()))
|
||||
return
|
||||
}
|
||||
//if conf.Conf.Cache.Enable {
|
||||
|
@ -17,7 +17,7 @@ type ListReq struct {
|
||||
func List(c *gin.Context) {
|
||||
var list ListReq
|
||||
if err := c.ShouldBindJSON(&list);err!=nil {
|
||||
c.JSON(200, metaResponse(400,"Bad Request"))
|
||||
c.JSON(200, MetaResponse(400,"Bad Request"))
|
||||
return
|
||||
}
|
||||
log.Debugf("list:%+v",list)
|
||||
@ -27,7 +27,7 @@ func List(c *gin.Context) {
|
||||
files,exist:=conf.Cache.Get(cacheKey)
|
||||
if exist {
|
||||
log.Debugf("使用了缓存:%s",cacheKey)
|
||||
c.JSON(200, dataResponse(files))
|
||||
c.JSON(200, DataResponse(files))
|
||||
return
|
||||
}
|
||||
}
|
||||
@ -47,21 +47,21 @@ func List(c *gin.Context) {
|
||||
files,err=alidrive.GetList(list.ParentFileId,list.Limit,list.Marker,list.OrderBy,list.OrderDirection)
|
||||
}
|
||||
if err!=nil {
|
||||
c.JSON(200, metaResponse(500,err.Error()))
|
||||
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."))
|
||||
c.JSON(200, MetaResponse(401,"need password."))
|
||||
return
|
||||
}
|
||||
c.JSON(200, metaResponse(401,"wrong password."))
|
||||
c.JSON(200, MetaResponse(401,"wrong password."))
|
||||
return
|
||||
}
|
||||
paths,err:=alidrive.GetPaths(list.ParentFileId)
|
||||
if err!=nil {
|
||||
c.JSON(200, metaResponse(500,err.Error()))
|
||||
c.JSON(200, MetaResponse(500,err.Error()))
|
||||
return
|
||||
}
|
||||
files.Paths=*paths
|
||||
@ -69,5 +69,5 @@ func List(c *gin.Context) {
|
||||
if conf.Conf.Cache.Enable {
|
||||
conf.Cache.Set(cacheKey,files,cache.DefaultExpiration)
|
||||
}
|
||||
c.JSON(200, dataResponse(files))
|
||||
c.JSON(200, DataResponse(files))
|
||||
}
|
22
server/controllers/offie_preview.go
Normal file
22
server/controllers/offie_preview.go
Normal file
@ -0,0 +1,22 @@
|
||||
package controllers
|
||||
|
||||
import (
|
||||
"github.com/Xhofe/alist/alidrive"
|
||||
"github.com/gin-gonic/gin"
|
||||
log "github.com/sirupsen/logrus"
|
||||
)
|
||||
|
||||
func OfficePreview(c *gin.Context) {
|
||||
var req alidrive.OfficePreviewUrlReq
|
||||
if err := c.ShouldBindJSON(&req); err != nil {
|
||||
c.JSON(200, MetaResponse(400,"Bad Request"))
|
||||
return
|
||||
}
|
||||
log.Debugf("preview_req:%+v",req)
|
||||
preview,err:=alidrive.GetOfficePreviewUrl(req.FileId)
|
||||
if err!=nil {
|
||||
c.JSON(200, MetaResponse(500,err.Error()))
|
||||
return
|
||||
}
|
||||
c.JSON(200, DataResponse(preview))
|
||||
}
|
@ -11,12 +11,12 @@ import (
|
||||
|
||||
func Search(c *gin.Context) {
|
||||
if !conf.Conf.Server.Search {
|
||||
c.JSON(200, metaResponse(403,"Not allow 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"))
|
||||
c.JSON(200, MetaResponse(400,"Bad Request"))
|
||||
return
|
||||
}
|
||||
log.Debugf("search:%+v",search)
|
||||
@ -26,7 +26,7 @@ func Search(c *gin.Context) {
|
||||
files,exist:=conf.Cache.Get(cacheKey)
|
||||
if exist {
|
||||
log.Debugf("使用了缓存:%s",cacheKey)
|
||||
c.JSON(200, dataResponse(files))
|
||||
c.JSON(200, DataResponse(files))
|
||||
return
|
||||
}
|
||||
}
|
||||
@ -39,11 +39,11 @@ func Search(c *gin.Context) {
|
||||
//}
|
||||
files,err:=alidrive.Search(search.Query,search.Limit,search.OrderBy)
|
||||
if err != nil {
|
||||
c.JSON(200, metaResponse(500,err.Error()))
|
||||
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))
|
||||
c.JSON(200, DataResponse(files))
|
||||
}
|
@ -6,7 +6,7 @@ import (
|
||||
)
|
||||
|
||||
func Info(c *gin.Context) {
|
||||
c.JSON(200, dataResponse(conf.Conf.Info))
|
||||
c.JSON(200, DataResponse(conf.Conf.Info))
|
||||
}
|
||||
|
||||
func RefreshCache(c *gin.Context) {
|
||||
@ -14,12 +14,12 @@ func RefreshCache(c *gin.Context) {
|
||||
if conf.Conf.Cache.Enable {
|
||||
if password == conf.Conf.Cache.RefreshPassword {
|
||||
conf.Cache.Flush()
|
||||
c.JSON(200,metaResponse(200,"flush success."))
|
||||
c.JSON(200, MetaResponse(200,"flush success."))
|
||||
return
|
||||
}
|
||||
c.JSON(200,metaResponse(401,"wrong password."))
|
||||
c.JSON(200, MetaResponse(401,"wrong password."))
|
||||
return
|
||||
}
|
||||
c.JSON(200,metaResponse(400,"disabled cache."))
|
||||
c.JSON(200, MetaResponse(400,"disabled cache."))
|
||||
return
|
||||
}
|
@ -2,26 +2,34 @@ package server
|
||||
|
||||
import (
|
||||
"github.com/Xhofe/alist/conf"
|
||||
"github.com/Xhofe/alist/server/controllers"
|
||||
"github.com/Xhofe/alist/utils"
|
||||
"github.com/gin-gonic/gin"
|
||||
"net/http"
|
||||
)
|
||||
|
||||
func CrosHandler() gin.HandlerFunc {
|
||||
return func(context *gin.Context) {
|
||||
method := context.Request.Method
|
||||
context.Writer.Header().Set("Access-Control-Allow-Origin", "*")
|
||||
context.Header("Access-Control-Allow-Origin", conf.Conf.Info.SiteUrl) // 设置允许访问所有域
|
||||
context.Header("Access-Control-Allow-Methods", "POST, GET, OPTIONS, PUT, DELETE,UPDATE")
|
||||
context.Header("Access-Control-Allow-Headers", "Authorization, Content-Length, X-CSRF-Token, Token,session,X_Requested_With,Accept, Origin, Host, Connection, Accept-Encoding, Accept-Language,DNT, X-CustomHeader, Keep-Alive, User-Agent, X-Requested-With, If-Modified-Since, Cache-Control, Content-Type, Pragma,token,openid,opentoken")
|
||||
context.Header("Access-Control-Expose-Headers", "Content-Length, Access-Control-Allow-Origin, Access-Control-Allow-Headers,Cache-Control,Content-Language,Content-Type,Expires,Last-Modified,Pragma,FooBar")
|
||||
context.Header("Access-Control-Max-Age", "172800")
|
||||
context.Header("Access-Control-Allow-Credentials", "true")
|
||||
//context.Set("content-type", "application/json") //设置返回格式是json
|
||||
|
||||
if method == "OPTIONS" {
|
||||
context.JSON(http.StatusOK, gin.H{})
|
||||
origin:=context.GetHeader("Origin")
|
||||
// 同源
|
||||
if origin == "" {
|
||||
context.Next()
|
||||
return
|
||||
}
|
||||
method := context.Request.Method
|
||||
// 设置跨域
|
||||
context.Header("Access-Control-Allow-Origin",origin)
|
||||
context.Header("Access-Control-Allow-Methods", "POST, GET, OPTIONS, PUT, DELETE,UPDATE")
|
||||
context.Header("Access-Control-Allow-Headers", "Content-Length,session,Accept, Origin, Host, Connection, Accept-Encoding, Accept-Language, Keep-Alive, User-Agent, Cache-Control, Content-Type")
|
||||
context.Header("Access-Control-Expose-Headers", "Content-Length,Cache-Control,Content-Language,Content-Type,Expires,Last-Modified")
|
||||
context.Header("Access-Control-Max-Age", "172800")
|
||||
// 信任域名
|
||||
if conf.Conf.Server.SiteUrl!="*"&&utils.ContainsString(conf.Origins,context.GetHeader("Origin"))==-1 {
|
||||
context.JSON(200,controllers.MetaResponse(413,"The origin is not in the site_url list, please configure it correctly."))
|
||||
context.Abort()
|
||||
}
|
||||
if method == "OPTIONS" {
|
||||
context.AbortWithStatus(204)
|
||||
}
|
||||
|
||||
//处理请求
|
||||
context.Next()
|
||||
}
|
||||
|
@ -25,6 +25,7 @@ func InitApiRouter(engine *gin.Engine) {
|
||||
v2.POST("/get",controllers.Get)
|
||||
v2.POST("/list",controllers.List)
|
||||
v2.POST("/search",controllers.Search)
|
||||
v2.POST("/office_preview",controllers.OfficePreview)
|
||||
}
|
||||
engine.GET("/d/*file_id",controllers.Down)
|
||||
engine.GET("/cache/:password",controllers.RefreshCache)
|
||||
|
@ -3,6 +3,8 @@ package utils
|
||||
import (
|
||||
log "github.com/sirupsen/logrus"
|
||||
"net/url"
|
||||
"strconv"
|
||||
"strings"
|
||||
)
|
||||
|
||||
func GetCode(rawUrl string) string {
|
||||
@ -13,4 +15,41 @@ func GetCode(rawUrl string) string {
|
||||
}
|
||||
code:=u.Query().Get("code")
|
||||
return code
|
||||
}
|
||||
|
||||
func ContainsString(array []string, val string) (index int) {
|
||||
index = -1
|
||||
for i := 0; i < len(array); i++ {
|
||||
if array[i] == val {
|
||||
index = i
|
||||
return
|
||||
}
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
func VersionCompare(version1, version2 string) int {
|
||||
a := strings.Split(version1, ".")
|
||||
b := strings.Split(version2, ".")
|
||||
flag := 1
|
||||
if len(a) > len(b) {
|
||||
a, b = b, a
|
||||
flag = -1
|
||||
}
|
||||
for i := range a {
|
||||
x, _ := strconv.Atoi(a[i])
|
||||
y, _ := strconv.Atoi(b[i])
|
||||
if x < y {
|
||||
return -1 * flag
|
||||
} else if x > y {
|
||||
return 1 * flag
|
||||
}
|
||||
}
|
||||
for _, v:= range b[len(a):] {
|
||||
y, _ := strconv.Atoi(v)
|
||||
if y > 0 {
|
||||
return -1 * flag
|
||||
}
|
||||
}
|
||||
return 0
|
||||
}
|
Reference in New Issue
Block a user