mirror of
https://github.com/OpenListTeam/OpenList.git
synced 2026-10-10 21:13:10 +08:00
Compare commits
37 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| f0013320a6 | |||
| 974caf74d9 | |||
| 0bb02664c7 | |||
| 6c5a0cba6e | |||
| 7e21e12e11 | |||
| 11489d8856 | |||
| 6d824a4ee9 | |||
| 8d74d070d4 | |||
| 77aae6660e | |||
| 76081a81a6 | |||
| 8760ab283d | |||
| 61ab27398c | |||
| 2e64df7e3d | |||
| 9561f0c951 | |||
| 03f5a54764 | |||
| 9952c3e90b | |||
| d94e319df3 | |||
| b51b2deea1 | |||
| 7dda701f1e | |||
| 3b93445648 | |||
| a353081126 | |||
| a5b2f998ab | |||
| 4d0d892ce7 | |||
| 8e9ddcf81e | |||
| 5c6344cac0 | |||
| 7076efb6be | |||
| 6d19b49a8d | |||
| 4fa11879f2 | |||
| abe9d9237a | |||
| e4d206d59c | |||
| 8636014397 | |||
| c0f50ffeff | |||
| b677d6ad21 | |||
| 443067b80f | |||
| 3138e031f5 | |||
| d137ef8759 | |||
| 389226662c |
@@ -11,7 +11,7 @@ jobs:
|
||||
build:
|
||||
strategy:
|
||||
matrix:
|
||||
platform: [ubuntu-latest]
|
||||
platform: [ubuntu-16.04]
|
||||
go-version: [1.15]
|
||||
name: Build
|
||||
runs-on: ${{ matrix.platform }}
|
||||
@@ -46,6 +46,11 @@ jobs:
|
||||
run: |
|
||||
CC=x86_64-w64-mingw32-gcc CGO_ENABLED=1 GOOS=windows GOARCH=amd64 go build -o alist_windows_amd64.exe alist.go
|
||||
|
||||
- name: Build linux_386
|
||||
run: |
|
||||
sudo apt-get -y install libc6-dev-i386
|
||||
CC=gcc CGO_ENABLED=1 GOOS=linux GOARCH=386 go build -o alist_linux_386 alist.go
|
||||
|
||||
- name: Upload artifacts linux_amd64
|
||||
uses: actions/upload-artifact@v2
|
||||
with:
|
||||
@@ -68,4 +73,10 @@ jobs:
|
||||
uses: actions/upload-artifact@v2
|
||||
with:
|
||||
name: alist_windows_amd64
|
||||
path: alist_windows_amd64.exe
|
||||
path: alist_windows_amd64.exe
|
||||
|
||||
- name: Upload artifacts linux_386
|
||||
uses: actions/upload-artifact@v2
|
||||
with:
|
||||
name: alist_linux_386
|
||||
path: alist_linux_386
|
||||
|
||||
+122
-16
@@ -5,24 +5,130 @@ on:
|
||||
- '*'
|
||||
|
||||
jobs:
|
||||
goreleaser:
|
||||
runs-on: ubuntu-latest
|
||||
release:
|
||||
strategy:
|
||||
matrix:
|
||||
platform: [ ubuntu-16.04 ]
|
||||
go-version: [ 1.15 ]
|
||||
name: Build
|
||||
runs-on: ${{ matrix.platform }}
|
||||
steps:
|
||||
-
|
||||
name: Checkout
|
||||
uses: actions/checkout@v2
|
||||
with:
|
||||
fetch-depth: 0
|
||||
-
|
||||
name: Set up Go
|
||||
- name: Set up Go
|
||||
uses: actions/setup-go@v2
|
||||
with:
|
||||
go-version: 1.15
|
||||
-
|
||||
name: Run GoReleaser
|
||||
uses: goreleaser/goreleaser-action@v2
|
||||
with:
|
||||
version: latest
|
||||
args: release --rm-dist
|
||||
go-version: ${{ matrix.go-version }}
|
||||
|
||||
- name: Get version
|
||||
id: get_version
|
||||
run: echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\//}
|
||||
|
||||
- name: Check out code into the Go module directory
|
||||
uses: actions/checkout@v2
|
||||
|
||||
- name: Get dependencies
|
||||
run: |
|
||||
sudo apt-get update
|
||||
sudo apt-get -y install gcc-mingw-w64-x86-64
|
||||
sudo apt-get -y install gcc-arm-linux-gnueabihf libc6-dev-armhf-cross
|
||||
sudo apt-get -y install gcc-aarch64-linux-gnu libc6-dev-arm64-cross
|
||||
go get -v -t -d ./...
|
||||
if [ -f Gopkg.toml ]; then
|
||||
curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh
|
||||
dep ensure
|
||||
fi
|
||||
|
||||
- name: Build linux
|
||||
run: |
|
||||
CC=gcc CGO_ENABLED=1 GOOS=linux GOARCH=amd64 go build -o linux_amd64/alist alist.go
|
||||
CC=aarch64-linux-gnu-gcc CGO_ENABLED=1 GOOS=linux GOARCH=arm64 go build -o linux_arm64/alist alist.go
|
||||
CC=arm-linux-gnueabihf-gcc CGO_ENABLED=1 GOOS=linux GOARCH=arm go build -o linux_arm/alist alist.go
|
||||
|
||||
- name: Build windows
|
||||
run: |
|
||||
CC=x86_64-w64-mingw32-gcc CGO_ENABLED=1 GOOS=windows GOARCH=amd64 go build -o windows_amd64/alist.exe alist.go
|
||||
|
||||
- name: Build linux_386
|
||||
run: |
|
||||
sudo apt-get -y install libc6-dev-i386
|
||||
CC=gcc CGO_ENABLED=1 GOOS=linux GOARCH=386 go build -o linux_386/alist alist.go
|
||||
|
||||
- name: compress
|
||||
run: |
|
||||
tar -czvf alist_linux_amd64.tar.gz linux_amd64/alist conf.yml.example
|
||||
tar -czvf alist_linux_arm64.tar.gz linux_arm64/alist conf.yml.example
|
||||
tar -czvf alist_linux_arm.tar.gz linux_arm/alist conf.yml.example
|
||||
tar -czvf alist_linux_386.tar.gz linux_386/alist conf.yml.example
|
||||
zip alist_windows_amd64.zip windows_amd64/alist.exe conf.yml.example
|
||||
|
||||
- name: Build Changelog
|
||||
id: github_release
|
||||
uses: mikepenz/release-changelog-builder-action@main
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
|
||||
- name: Create Release
|
||||
id: create_release
|
||||
uses: actions/create-release@v1
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
with:
|
||||
tag_name: ${{ github.ref }}
|
||||
release_name: Release ${{ github.ref }}
|
||||
body: ${{steps.github_release.outputs.changelog}}
|
||||
draft: false
|
||||
prerelease: false
|
||||
|
||||
- name: Upload alist_linux_amd64
|
||||
id: upload-release-linux-amd64
|
||||
uses: actions/upload-release-asset@v1
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
with:
|
||||
upload_url: ${{ steps.create_release.outputs.upload_url }}
|
||||
asset_path: alist_linux_amd64.tar.gz
|
||||
asset_name: alist_${{ steps.get_version.outputs.VERSION }}_linux_amd64.tar.gz
|
||||
asset_content_type: application/gzip
|
||||
|
||||
- name: Upload alist_linux_arm64
|
||||
id: upload-release-linux-arm64
|
||||
uses: actions/upload-release-asset@v1
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
with:
|
||||
upload_url: ${{ steps.create_release.outputs.upload_url }}
|
||||
asset_path: alist_linux_arm64.tar.gz
|
||||
asset_name: alist_${{ steps.get_version.outputs.VERSION }}_linux_arm64.tar.gz
|
||||
asset_content_type: application/gzip
|
||||
|
||||
- name: Upload alist_linux_arm
|
||||
id: upload-release-linux-arm
|
||||
uses: actions/upload-release-asset@v1
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
with:
|
||||
upload_url: ${{ steps.create_release.outputs.upload_url }}
|
||||
asset_path: alist_linux_arm.tar.gz
|
||||
asset_name: alist_${{ steps.get_version.outputs.VERSION }}_linux_arm.tar.gz
|
||||
asset_content_type: application/gzip
|
||||
|
||||
- name: Upload alist_linux_386
|
||||
id: upload-release-linux-386
|
||||
uses: actions/upload-release-asset@v1
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
with:
|
||||
upload_url: ${{ steps.create_release.outputs.upload_url }}
|
||||
asset_path: alist_linux_386.tar.gz
|
||||
asset_name: alist_${{ steps.get_version.outputs.VERSION }}_linux_386.tar.gz
|
||||
asset_content_type: application/gzip
|
||||
|
||||
- name: Upload alist_windows_amd64
|
||||
id: upload-release-windows-amd64
|
||||
uses: actions/upload-release-asset@v1
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
with:
|
||||
upload_url: ${{ steps.create_release.outputs.upload_url }}
|
||||
asset_path: alist_windows_amd64.zip
|
||||
asset_name: alist_${{ steps.get_version.outputs.VERSION }}_windows_amd64.zip
|
||||
asset_content_type: application/zip
|
||||
+32
-61
@@ -2,77 +2,48 @@ package alidrive
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"github.com/Xhofe/alist/conf"
|
||||
"github.com/Xhofe/alist/utils"
|
||||
log "github.com/sirupsen/logrus"
|
||||
)
|
||||
|
||||
// use token login
|
||||
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)
|
||||
}
|
||||
|
||||
// get access token
|
||||
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
|
||||
}
|
||||
|
||||
// refresh access_token token by refresh_token
|
||||
func RefreshToken() bool {
|
||||
log.Infof("刷新token...")
|
||||
url:="https://websv.aliyundrive.com/token/refresh"
|
||||
req:=RefreshTokenReq{RefreshToken:conf.Conf.AliDrive.RefreshToken}
|
||||
func RefreshToken(drive *conf.Drive) bool {
|
||||
log.Infof("刷新[%s]token...", drive.Name)
|
||||
url := "https://auth.aliyundrive.com/v2/account/token"
|
||||
req := RefreshTokenReq{RefreshToken: drive.RefreshToken , GrantType: "refresh_token"}
|
||||
var token TokenResp
|
||||
if body, err := DoPost(url, req,false); err != nil {
|
||||
log.Errorf("tokenLogin-doPost出错:%s",err.Error())
|
||||
if body, err := DoPost(url, req, ""); 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失效")
|
||||
} else {
|
||||
if err = json.Unmarshal(body, &token); err != nil {
|
||||
log.Errorf("解析json[%s]出错:%s", string(body), err.Error())
|
||||
log.Errorf("此处json解析失败应该是[%s]refresh_token失效", drive.Name)
|
||||
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)
|
||||
if token.Code != "" {
|
||||
log.Errorf("盘[%s]刷新token出错:%s", drive.Name, token.Message)
|
||||
return false
|
||||
}
|
||||
//刷新成功 更新token
|
||||
drive.AccessToken = token.AccessToken
|
||||
drive.RefreshToken = token.RefreshToken
|
||||
return true
|
||||
}
|
||||
|
||||
func RefreshTokenAll() string {
|
||||
log.Infof("刷新所有token...")
|
||||
res := ""
|
||||
for i, drive := range conf.Conf.AliDrive.Drives {
|
||||
if !RefreshToken(&conf.Conf.AliDrive.Drives[i]) {
|
||||
res = res + drive.Name + ","
|
||||
}
|
||||
}
|
||||
utils.WriteToYml(conf.ConfigFile, conf.Conf)
|
||||
if res != "" {
|
||||
return res[:len(res)-1]
|
||||
}
|
||||
return ""
|
||||
}
|
||||
|
||||
@@ -1,5 +0,0 @@
|
||||
package alidrive
|
||||
|
||||
var (
|
||||
User *UserInfo
|
||||
)
|
||||
@@ -0,0 +1,80 @@
|
||||
package alidrive
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"github.com/Xhofe/alist/conf"
|
||||
log "github.com/sirupsen/logrus"
|
||||
"io/ioutil"
|
||||
"net/http"
|
||||
"strings"
|
||||
"time"
|
||||
)
|
||||
|
||||
// convert body to json
|
||||
func BodyToJson(url string, req interface{}, resp RespHandle, drive *conf.Drive) error {
|
||||
if body, err := DoPost(url, req, drive.AccessToken); err != nil {
|
||||
log.Errorf("doPost出错:%s", err.Error())
|
||||
return err
|
||||
} else {
|
||||
if err = json.Unmarshal(body, &resp); err != nil {
|
||||
log.Errorf("解析json[%s]出错:%s", string(body), err.Error())
|
||||
return err
|
||||
}
|
||||
}
|
||||
if resp.IsAvailable() {
|
||||
return nil
|
||||
}
|
||||
if resp.GetCode() == conf.AccessTokenInvalid {
|
||||
resp.SetCode("")
|
||||
if RefreshToken(drive) {
|
||||
return BodyToJson(url, req, resp, drive)
|
||||
}
|
||||
}
|
||||
return fmt.Errorf(resp.GetMessage())
|
||||
}
|
||||
|
||||
// do post request
|
||||
func DoPost(url string, request interface{}, auth string) (body []byte, err error) {
|
||||
var (
|
||||
resp *http.Response
|
||||
)
|
||||
requestBody := new(bytes.Buffer)
|
||||
err = json.NewEncoder(requestBody).Encode(request)
|
||||
if err != nil {
|
||||
log.Errorf("创建requestBody出错:%s", err.Error())
|
||||
}
|
||||
req, err := http.NewRequest("POST", url, requestBody)
|
||||
log.Debugf("do_post_req:%+v", req)
|
||||
if err != nil {
|
||||
log.Errorf("创建request出错:%s", err.Error())
|
||||
return
|
||||
}
|
||||
if auth != "" {
|
||||
req.Header.Set("authorization", conf.Bearer+auth)
|
||||
}
|
||||
req.Header.Add("content-type", "application/json")
|
||||
req.Header.Add("user-agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.88 Safari/537.36")
|
||||
req.Header.Add("origin", "https://aliyundrive.com")
|
||||
req.Header.Add("accept", "*/*")
|
||||
req.Header.Add("Accept-Language", "zh-CN,zh;q=0.8,en-US;q=0.5,en;q=0.3")
|
||||
req.Header.Add("Connection", "keep-alive")
|
||||
|
||||
for retryCount := 3; retryCount >= 0; retryCount-- {
|
||||
if resp, err = conf.Client.Do(req); err != nil && strings.Contains(err.Error(), "timeout") {
|
||||
<-time.After(time.Second)
|
||||
} else {
|
||||
break
|
||||
}
|
||||
}
|
||||
if err != nil {
|
||||
log.Errorf("请求阿里云盘api时出错:%s", err.Error())
|
||||
return
|
||||
}
|
||||
if body, err = ioutil.ReadAll(resp.Body); err != nil {
|
||||
log.Errorf("读取api返回内容失败")
|
||||
}
|
||||
log.Debugf("请求返回信息:%s", string(body))
|
||||
return
|
||||
}
|
||||
+11
-4
@@ -24,10 +24,10 @@ type GetReq struct {
|
||||
|
||||
// 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"`
|
||||
DriveId string `json:"drive_id"`
|
||||
FileId string `json:"file_id"`
|
||||
ExpireSec int `json:"expire_sec"`
|
||||
FileName string `json:"file_name"`
|
||||
}
|
||||
|
||||
// search request bean
|
||||
@@ -57,6 +57,7 @@ type GetTokenReq struct {
|
||||
// refresh_token request bean
|
||||
type RefreshTokenReq struct {
|
||||
RefreshToken string `json:"refresh_token"`
|
||||
GrantType string `json:"grant_type"`
|
||||
}
|
||||
|
||||
// office_preview_url request bean
|
||||
@@ -65,3 +66,9 @@ type OfficePreviewUrlReq struct {
|
||||
DriveId string `json:"drive_id"`
|
||||
FileId string `json:"file_id"`
|
||||
}
|
||||
|
||||
// video preview url request bean
|
||||
type VideoPreviewUrlReq struct {
|
||||
DriveId string `json:"drive_id"`
|
||||
FileId string `json:"file_id"`
|
||||
}
|
||||
|
||||
+57
-138
File diff suppressed because it is too large
Load Diff
+7
-35
@@ -1,10 +1,6 @@
|
||||
package alidrive
|
||||
|
||||
import (
|
||||
log "github.com/sirupsen/logrus"
|
||||
"io/ioutil"
|
||||
"net/http"
|
||||
"strings"
|
||||
"time"
|
||||
)
|
||||
|
||||
@@ -150,35 +146,11 @@ type OfficePreviewUrlResp struct {
|
||||
AccessToken string `json:"access_token"`
|
||||
}
|
||||
|
||||
// check password
|
||||
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:])]
|
||||
return file.Name[10:]
|
||||
}
|
||||
}
|
||||
return ""
|
||||
}
|
||||
|
||||
// Deprecated: check readme, implemented by the front end now
|
||||
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 ""
|
||||
type VideoPreviewUrlResp struct {
|
||||
RespError
|
||||
TemplateList []struct {
|
||||
TemplateId string `json:"template_id"`
|
||||
Status string `json:"status"`
|
||||
Url string `json:"url"`
|
||||
} `json:"template_list"`
|
||||
}
|
||||
|
||||
@@ -0,0 +1,41 @@
|
||||
package alidrive
|
||||
|
||||
import (
|
||||
log "github.com/sirupsen/logrus"
|
||||
"io/ioutil"
|
||||
"net/http"
|
||||
"strings"
|
||||
)
|
||||
|
||||
// check password
|
||||
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:])]
|
||||
return file.Name[10:]
|
||||
}
|
||||
}
|
||||
return ""
|
||||
}
|
||||
|
||||
// Deprecated: check readme, implemented by the front end now
|
||||
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 ""
|
||||
}
|
||||
+17
-21
@@ -10,28 +10,24 @@ import (
|
||||
func InitAliDrive() bool {
|
||||
log.Infof("初始化阿里云盘...")
|
||||
//首先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+"\t"+token.AccessToken
|
||||
}else {
|
||||
conf.Authorization=conf.Bearer+conf.Conf.AliDrive.AccessToken
|
||||
res := alidrive.RefreshTokenAll()
|
||||
if res != "" {
|
||||
log.Errorf("盘[%s]refresh_token失效,请检查", res)
|
||||
}
|
||||
log.Debugf("token:%s",conf.Authorization)
|
||||
user,err:=alidrive.GetUserInfo()
|
||||
if err != nil {
|
||||
log.Errorf("初始化用户失败:%s",err.Error())
|
||||
return false
|
||||
log.Debugf("config:%+v", conf.Conf)
|
||||
for i, _ := range conf.Conf.AliDrive.Drives {
|
||||
InitDriveId(&conf.Conf.AliDrive.Drives[i])
|
||||
}
|
||||
log.Infof("当前用户信息:%+v",user)
|
||||
alidrive.User=user
|
||||
return true
|
||||
}
|
||||
|
||||
func InitDriveId(drive *conf.Drive) bool {
|
||||
user, err := alidrive.GetUserInfo(drive)
|
||||
if err != nil {
|
||||
log.Errorf("初始化盘[%s]失败:%s", drive.Name, err.Error())
|
||||
return false
|
||||
}
|
||||
drive.DefaultDriveId = user.DefaultDriveId
|
||||
log.Infof("初始化盘[%s]成功:%+v", drive.Name, user)
|
||||
return true
|
||||
}
|
||||
|
||||
@@ -1,16 +0,0 @@
|
||||
package bootstrap
|
||||
|
||||
import (
|
||||
"github.com/Xhofe/alist/conf"
|
||||
"github.com/patrickmn/go-cache"
|
||||
log "github.com/sirupsen/logrus"
|
||||
"time"
|
||||
)
|
||||
|
||||
// init cache
|
||||
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)
|
||||
}
|
||||
}
|
||||
+7
-3
@@ -1,13 +1,17 @@
|
||||
package bootstrap
|
||||
|
||||
import (
|
||||
"crypto/tls"
|
||||
"github.com/Xhofe/alist/conf"
|
||||
log "github.com/sirupsen/logrus"
|
||||
"net/http"
|
||||
)
|
||||
|
||||
// init request client
|
||||
func InitClient() {
|
||||
func InitClient() {
|
||||
log.Infof("初始化client...")
|
||||
conf.Client=&http.Client{}
|
||||
}
|
||||
tr := &http.Transport{
|
||||
TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
|
||||
}
|
||||
conf.Client = &http.Client{Transport: tr}
|
||||
}
|
||||
|
||||
+21
-17
@@ -3,6 +3,7 @@ package bootstrap
|
||||
import (
|
||||
"flag"
|
||||
"fmt"
|
||||
|
||||
"github.com/Xhofe/alist/conf"
|
||||
serv "github.com/Xhofe/alist/server"
|
||||
"github.com/gin-gonic/gin"
|
||||
@@ -10,29 +11,29 @@ 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")
|
||||
flag.BoolVar(&conf.SkipUpdate,"skip-update",false,"skip update")
|
||||
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.ConfigFile, "conf", "conf.yml", "config file")
|
||||
flag.BoolVar(&conf.SkipUpdate, "skip-update", false, "skip update")
|
||||
}
|
||||
|
||||
// bootstrap run
|
||||
func Run() {
|
||||
func Run() {
|
||||
flag.Parse()
|
||||
if conf.Help {
|
||||
flag.Usage()
|
||||
return
|
||||
}
|
||||
if conf.Version {
|
||||
fmt.Println("Current version:"+conf.VERSION)
|
||||
fmt.Println("Current version:" + conf.VERSION)
|
||||
return
|
||||
}
|
||||
start()
|
||||
}
|
||||
|
||||
// print asc
|
||||
func printASC() {
|
||||
func printASC() {
|
||||
log.Info(`
|
||||
________ ___ ___ ________ _________
|
||||
|\ __ \|\ \ |\ \|\ ____\|\___ ___\
|
||||
@@ -52,7 +53,7 @@ func start() {
|
||||
if !conf.SkipUpdate {
|
||||
CheckUpdate()
|
||||
}
|
||||
if !ReadConf(conf.Con) {
|
||||
if !ReadConf(conf.ConfigFile) {
|
||||
log.Errorf("读取配置文件时出现错误,启动失败.")
|
||||
return
|
||||
}
|
||||
@@ -61,19 +62,22 @@ func start() {
|
||||
log.Errorf("初始化阿里云盘出现错误,启动失败.")
|
||||
return
|
||||
}
|
||||
InitCache()
|
||||
if !InitModel() {
|
||||
log.Errorf("初始化数据库出现错误,启动失败.")
|
||||
return
|
||||
}
|
||||
InitCron()
|
||||
server()
|
||||
}
|
||||
|
||||
// start http server
|
||||
func server() {
|
||||
baseServer:="0.0.0.0:"+conf.Conf.Server.Port
|
||||
r:=gin.Default()
|
||||
baseServer := conf.Conf.Server.Address + ":" + conf.Conf.Server.Port
|
||||
r := gin.Default()
|
||||
serv.InitRouter(r)
|
||||
log.Infof("Starting server @ %s",baseServer)
|
||||
err:=r.Run(baseServer)
|
||||
if err!=nil {
|
||||
log.Errorf("Server failed start:%s",err.Error())
|
||||
log.Infof("Starting server @ %s", baseServer)
|
||||
err := r.Run(baseServer)
|
||||
if err != nil {
|
||||
log.Errorf("Server failed start:%s", err.Error())
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+10
-9
@@ -13,20 +13,21 @@ import (
|
||||
func ReadConf(config string) bool {
|
||||
log.Infof("读取配置文件...")
|
||||
if !utils.Exists(config) {
|
||||
log.Infof("找不到配置文件:%s",config)
|
||||
log.Infof("找不到配置文件:%s", config)
|
||||
return false
|
||||
}
|
||||
confFile,err:=ioutil.ReadFile(config)
|
||||
if err !=nil {
|
||||
log.Errorf("读取配置文件时发生错误:%s",err.Error())
|
||||
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())
|
||||
if err != nil {
|
||||
log.Errorf("加载配置文件时发生错误:%s", err.Error())
|
||||
return false
|
||||
}
|
||||
log.Debugf("config:%+v",conf.Conf)
|
||||
conf.Origins = strings.Split(conf.Conf.Server.SiteUrl,",")
|
||||
log.Debugf("config:%+v", conf.Conf)
|
||||
conf.Conf.Info.Roots = utils.GetNames()
|
||||
conf.Origins = strings.Split(conf.Conf.Server.SiteUrl, ",")
|
||||
return true
|
||||
}
|
||||
}
|
||||
|
||||
+7
-7
@@ -9,17 +9,17 @@ import (
|
||||
var Cron *cron.Cron
|
||||
|
||||
// refresh token func for cron
|
||||
func refreshToken() {
|
||||
alidrive.RefreshToken()
|
||||
func refreshToken() {
|
||||
alidrive.RefreshTokenAll()
|
||||
}
|
||||
|
||||
// init cron jobs
|
||||
func InitCron() {
|
||||
log.Infof("初始化定时任务:刷新token")
|
||||
Cron=cron.New()
|
||||
_,err:=Cron.AddFunc("@every 2h",refreshToken)
|
||||
if err!=nil {
|
||||
log.Errorf("添加启动任务失败:%s",err.Error())
|
||||
Cron = cron.New()
|
||||
_, err := Cron.AddFunc("@every 2h", refreshToken)
|
||||
if err != nil {
|
||||
log.Errorf("添加启动任务失败:%s", err.Error())
|
||||
}
|
||||
Cron.Start()
|
||||
}
|
||||
}
|
||||
|
||||
+6
-6
@@ -10,13 +10,13 @@ import (
|
||||
func InitLog() {
|
||||
if conf.Debug {
|
||||
log.SetLevel(log.DebugLevel)
|
||||
}else {
|
||||
} else {
|
||||
gin.SetMode(gin.ReleaseMode)
|
||||
}
|
||||
log.SetFormatter(&log.TextFormatter{
|
||||
ForceColors:true,
|
||||
EnvironmentOverrideColors:true,
|
||||
TimestampFormat:"2006-01-02 15:04:05",
|
||||
FullTimestamp:true,
|
||||
ForceColors: true,
|
||||
EnvironmentOverrideColors: true,
|
||||
TimestampFormat: "2006-01-02 15:04:05",
|
||||
FullTimestamp: true,
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,74 @@
|
||||
package bootstrap
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"github.com/Xhofe/alist/conf"
|
||||
"github.com/Xhofe/alist/server/models"
|
||||
"github.com/Xhofe/alist/utils"
|
||||
log "github.com/sirupsen/logrus"
|
||||
"gorm.io/driver/mysql"
|
||||
"gorm.io/driver/sqlite"
|
||||
"gorm.io/gorm"
|
||||
"gorm.io/gorm/schema"
|
||||
"strings"
|
||||
)
|
||||
|
||||
func InitModel() bool {
|
||||
log.Infof("初始化数据库...")
|
||||
dbConfig := conf.Conf.Database
|
||||
switch dbConfig.Type {
|
||||
case "sqlite3":
|
||||
{
|
||||
if !(strings.HasSuffix(dbConfig.DBFile, ".db") && len(dbConfig.DBFile) > 3) {
|
||||
log.Errorf("db名称不正确.")
|
||||
return false
|
||||
}
|
||||
needMigrate := !utils.Exists(dbConfig.DBFile)
|
||||
db, err := gorm.Open(sqlite.Open(dbConfig.DBFile), &gorm.Config{
|
||||
NamingStrategy: schema.NamingStrategy{
|
||||
TablePrefix: dbConfig.TablePrefix,
|
||||
},
|
||||
})
|
||||
if err != nil {
|
||||
log.Errorf("连接数据库出现错误:%s", err.Error())
|
||||
return false
|
||||
}
|
||||
conf.DB = db
|
||||
if needMigrate {
|
||||
log.Infof("迁移数据库...")
|
||||
err = conf.DB.AutoMigrate(&models.File{})
|
||||
if err != nil {
|
||||
log.Errorf("数据库迁移失败:%s", err.Error())
|
||||
return false
|
||||
}
|
||||
//models.BuildTreeAll()
|
||||
}
|
||||
return true
|
||||
}
|
||||
case "mysql":
|
||||
{
|
||||
dsn := fmt.Sprintf("%s:%s@tcp(%s:%d)/%s?charset=utf8mb4&parseTime=True&loc=Local",
|
||||
dbConfig.User, dbConfig.Password, dbConfig.Host, dbConfig.Port, dbConfig.Name)
|
||||
db, err := gorm.Open(mysql.Open(dsn), &gorm.Config{
|
||||
NamingStrategy: schema.NamingStrategy{
|
||||
TablePrefix: dbConfig.TablePrefix,
|
||||
},
|
||||
})
|
||||
if err != nil {
|
||||
log.Errorf("连接数据库出现错误:%s", err.Error())
|
||||
return false
|
||||
}
|
||||
conf.DB = db
|
||||
log.Infof("迁移数据库...")
|
||||
err = conf.DB.AutoMigrate(&models.File{})
|
||||
if err != nil {
|
||||
log.Errorf("数据库迁移失败:%s", err.Error())
|
||||
return false
|
||||
}
|
||||
return true
|
||||
}
|
||||
default:
|
||||
log.Errorf("不支持的数据库类型:%s", dbConfig.Type)
|
||||
return false
|
||||
}
|
||||
}
|
||||
+22
-22
@@ -11,37 +11,37 @@ import (
|
||||
|
||||
// github release response bean
|
||||
type GithubRelease struct {
|
||||
TagName string `json:"tag_name"`
|
||||
HtmlUrl string `json:"html_url"`
|
||||
Body string `json:"body"`
|
||||
TagName string `json:"tag_name"`
|
||||
HtmlUrl string `json:"html_url"`
|
||||
Body string `json:"body"`
|
||||
}
|
||||
|
||||
// check updtae
|
||||
// check update
|
||||
func CheckUpdate() {
|
||||
log.Infof("检查更新...")
|
||||
url:="https://api.github.com/repos/Xhofe/alist/releases/latest"
|
||||
resp,err:=http.Get(url)
|
||||
if err!=nil {
|
||||
log.Warnf("检查更新失败:%s",err.Error())
|
||||
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())
|
||||
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())
|
||||
err = json.Unmarshal(body, &release)
|
||||
if err != nil {
|
||||
log.Warnf("解析更新失败:%s", err.Error())
|
||||
return
|
||||
}
|
||||
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)
|
||||
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)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+21
-16
@@ -8,23 +8,28 @@ info:
|
||||
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 #缓存失效时间(单位:分钟)
|
||||
cleanup_interval: 120 #清理失效缓存间隔
|
||||
refresh_password: password #手动清理缓存密码
|
||||
address: "0.0.0.0"
|
||||
port: "5244"
|
||||
search: true
|
||||
static: dist
|
||||
site_url: '*'
|
||||
password: password #用于重建目录
|
||||
ali_drive:
|
||||
api_url: https://api.aliyundrive.com/v2 #阿里云盘api,无需修改
|
||||
root_folder: root #根目录
|
||||
refresh_token: need
|
||||
api_url: https://api.aliyundrive.com/v2
|
||||
max_files_count: 3000
|
||||
drives:
|
||||
- refresh_token: xxx #refresh_token
|
||||
root_folder: root #根目录的file_id
|
||||
name: drive0 #盘名,多个盘不可重复
|
||||
password: pass #该盘密码,空则不设密码,修改需要重建生效
|
||||
hide: false #是否在主页隐藏该盘,不可全部隐藏,至少暴露一个
|
||||
- refresh_token: xxx
|
||||
root_folder: root
|
||||
name: drive1
|
||||
password: pass
|
||||
hide: false
|
||||
database:
|
||||
type: sqlite3
|
||||
dBFile: alist.db
|
||||
|
||||
+52
-39
@@ -1,43 +1,56 @@
|
||||
package conf
|
||||
|
||||
type Drive struct {
|
||||
AccessToken string `yaml:"-"`
|
||||
RefreshToken string `yaml:"refresh_token"`
|
||||
RootFolder string `yaml:"root_folder"` //根目录id
|
||||
Name string `yaml:"name"`
|
||||
Password string `yaml:"password"`
|
||||
Hide bool `yaml:"hide"`
|
||||
DefaultDriveId string `yaml:"-"`
|
||||
}
|
||||
|
||||
// config struct
|
||||
type Config struct {
|
||||
Info struct{
|
||||
Title string `yaml:"title" json:"title"`
|
||||
Logo string `yaml:"logo" json:"logo"`
|
||||
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"`
|
||||
SiteUrl string `yaml:"site_url" json:"site_url"`//网站url
|
||||
} `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
|
||||
//Authorization string `yaml:"authorization"`//授权token
|
||||
LoginToken string `yaml:"login_token"`
|
||||
AccessToken string `yaml:"access_token"`
|
||||
RefreshToken string `yaml:"refresh_token"`
|
||||
MaxFilesCount int `yaml:"max_files_count"`
|
||||
} `yaml:"ali_drive"`
|
||||
}
|
||||
Info struct {
|
||||
Title string `yaml:"title" json:"title"`
|
||||
Roots []string `yaml:"-" json:"roots"`
|
||||
Logo string `yaml:"logo" json:"logo"`
|
||||
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 {
|
||||
Address string `yaml:"address"`
|
||||
Port string `yaml:"port"` //端口
|
||||
Search bool `yaml:"search"` //允许搜索
|
||||
Static string `yaml:"static"`
|
||||
SiteUrl string `yaml:"site_url"` //网站url
|
||||
Password string `yaml:"password"`
|
||||
} `yaml:"server"`
|
||||
AliDrive struct {
|
||||
ApiUrl string `yaml:"api_url"` //阿里云盘api
|
||||
MaxFilesCount int `yaml:"max_files_count"`
|
||||
Drives []Drive `yaml:"drives"`
|
||||
} `yaml:"ali_drive"`
|
||||
Database struct {
|
||||
Type string `yaml:"type"`
|
||||
User string `yaml:"user"`
|
||||
Password string `yaml:"password"`
|
||||
Host string `yaml:"host"`
|
||||
Port int `yaml:"port"`
|
||||
Name string `yaml:"name"`
|
||||
TablePrefix string `yaml:"tablePrefix"`
|
||||
DBFile string `yaml:"dBFile"`
|
||||
} `yaml:"database"`
|
||||
}
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user