🔧 修改配置文件

alidrive/req_bean.go

@@ -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"`
+}

alidrive/request.go

@@ -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) {

alidrive/resp_bean.go

@@ -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:]
 		}
 	}

bootstrap/cmd.go

@@ -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()
 }
 

conf.yml.example

@@ -7,12 +7,12 @@ info:
   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: [doc,docx,ppt,pptx,xls,xlsx,pdf] #使用上面的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
+  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 #是否开启搜索接口,开启搜索之后密码和根目录都会失效,所以前端暂时不做搜索

conf/const.go

@@ -8,6 +8,7 @@ import (
 var(
 	Debug bool
 	Help bool
+	Version bool
 	Con string
 	Client *http.Client
 	Authorization string
@@ -20,7 +21,7 @@ var(
 var Conf = new(Config)
 
 const (
-	VERSION="v0.1.5"
+	VERSION="v0.1.6"
 
 	ImageThumbnailProcess="image/resize,w_50"
 	VideoThumbnailProcess="video/snapshot,t_0,f_jpg,w_50"

server/controllers/offie_preview.go

@@ -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))
+}

server/router.go

@@ -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)