ci: prettify auto generate changelog

Co-authored-by: eaglexmw <eagle_xmw@163.com>

.all-contributorsrc

@@ -78,11 +78,20 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "XZB-1248",
+      "name": "XZB-1248",
+      "avatar_url": "https://avatars.githubusercontent.com/u/28593573?v=4",
+      "profile": "https://github.com/XZB-1248",
+      "contributions": [
+        "code"
+      ]
     }
   ],
   "contributorsPerLine": 7,
   "projectName": "alist",
-  "projectOwner": "Xhofe",
+  "projectOwner": "alist-org",
   "repoType": "github",
   "repoHost": "https://github.com",
   "skipCi": true

.github/workflows/release.yml

@@ -6,7 +6,19 @@ on:
       - '*'
 
 jobs:
+  changelog:
+    name: Create Release
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      - run: npx changelogithub # or changelogithub@0.12 if ensure the stable result
+        env:
+          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
   release:
+    needs: changelog
     strategy:
       matrix:
         platform: [ubuntu-latest]

CONTRIBUTORS.md

@@ -1,5 +1,5 @@
 <!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
-[![All Contributors](https://img.shields.io/badge/all_contributors-8-orange.svg?style=flat-square)](#contributors-)
+[![All Contributors](https://img.shields.io/badge/all_contributors-9-orange.svg?style=flat-square)](#contributors-)
 <!-- ALL-CONTRIBUTORS-BADGE:END -->
 
 ## Contributors ✨
@@ -11,16 +11,17 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
 <!-- markdownlint-disable -->
 <table>
   <tr>
-    <td align="center"><a href="http://nn.ci"><img src="https://avatars.githubusercontent.com/u/36558727?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Xhofe</b></sub></a><br /><a href="https://github.com/Xhofe/alist/commits?author=Xhofe" title="Code">💻</a> <a href="#ideas-Xhofe" title="Ideas, Planning, & Feedback">🤔</a> <a href="https://github.com/Xhofe/alist/commits?author=Xhofe" title="Documentation">📖</a></td>
-    <td align="center"><a href="https://github.com/foxxorcat"><img src="https://avatars.githubusercontent.com/u/95907542?v=4?s=100" width="100px;" alt=""/><br /><sub><b>foxxorcat</b></sub></a><br /><a href="https://github.com/Xhofe/alist/commits?author=foxxorcat" title="Code">💻</a></td>
-    <td align="center"><a href="https://www.iflu.cf/"><img src="https://avatars.githubusercontent.com/u/63903027?v=4?s=100" width="100px;" alt=""/><br /><sub><b>道辰</b></sub></a><br /><a href="https://github.com/Xhofe/alist/commits?author=DaoChen6" title="Documentation">📖</a></td>
-    <td align="center"><a href="https://vg-land.github.io/"><img src="https://avatars.githubusercontent.com/u/16739728?v=4?s=100" width="100px;" alt=""/><br /><sub><b>vg-land</b></sub></a><br /><a href="https://github.com/Xhofe/alist/commits?author=vg-land" title="Code">💻</a></td>
-    <td align="center"><a href="https://c5y.moe"><img src="https://avatars.githubusercontent.com/u/18461360?v=4?s=100" width="100px;" alt=""/><br /><sub><b>凌莞~(=^▽^=)</b></sub></a><br /><a href="https://github.com/Xhofe/alist/commits?author=Clansty" title="Documentation">📖</a></td>
-    <td align="center"><a href="https://github.com/Windman1320"><img src="https://avatars.githubusercontent.com/u/9999486?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Windman</b></sub></a><br /><a href="https://github.com/Xhofe/alist/commits?author=Windman1320" title="Code">💻</a></td>
-    <td align="center"><a href="https://github.com/ericarena"><img src="https://avatars.githubusercontent.com/u/4518927?v=4?s=100" width="100px;" alt=""/><br /><sub><b>ericarena</b></sub></a><br /><a href="https://github.com/Xhofe/alist/commits?author=ericarena" title="Code">💻</a></td>
+    <td align="center"><a href="http://nn.ci"><img src="https://avatars.githubusercontent.com/u/36558727?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Xhofe</b></sub></a><br /><a href="https://github.com/alist-org/alist/commits?author=Xhofe" title="Code">💻</a> <a href="#ideas-Xhofe" title="Ideas, Planning, & Feedback">🤔</a> <a href="https://github.com/alist-org/alist/commits?author=Xhofe" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://github.com/foxxorcat"><img src="https://avatars.githubusercontent.com/u/95907542?v=4?s=100" width="100px;" alt=""/><br /><sub><b>foxxorcat</b></sub></a><br /><a href="https://github.com/alist-org/alist/commits?author=foxxorcat" title="Code">💻</a></td>
+    <td align="center"><a href="https://www.iflu.cf/"><img src="https://avatars.githubusercontent.com/u/63903027?v=4?s=100" width="100px;" alt=""/><br /><sub><b>道辰</b></sub></a><br /><a href="https://github.com/alist-org/alist/commits?author=DaoChen6" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://vg-land.github.io/"><img src="https://avatars.githubusercontent.com/u/16739728?v=4?s=100" width="100px;" alt=""/><br /><sub><b>vg-land</b></sub></a><br /><a href="https://github.com/alist-org/alist/commits?author=vg-land" title="Code">💻</a></td>
+    <td align="center"><a href="https://c5y.moe"><img src="https://avatars.githubusercontent.com/u/18461360?v=4?s=100" width="100px;" alt=""/><br /><sub><b>凌莞~(=^▽^=)</b></sub></a><br /><a href="https://github.com/alist-org/alist/commits?author=Clansty" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://github.com/Windman1320"><img src="https://avatars.githubusercontent.com/u/9999486?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Windman</b></sub></a><br /><a href="https://github.com/alist-org/alist/commits?author=Windman1320" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/ericarena"><img src="https://avatars.githubusercontent.com/u/4518927?v=4?s=100" width="100px;" alt=""/><br /><sub><b>ericarena</b></sub></a><br /><a href="https://github.com/alist-org/alist/commits?author=ericarena" title="Code">💻</a></td>
   </tr>
   <tr>
-    <td align="center"><a href="https://github.com/WntFlm"><img src="https://avatars.githubusercontent.com/u/34620278?v=4?s=100" width="100px;" alt=""/><br /><sub><b>WntFlm</b></sub></a><br /><a href="https://github.com/Xhofe/alist/commits?author=WntFlm" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/WntFlm"><img src="https://avatars.githubusercontent.com/u/34620278?v=4?s=100" width="100px;" alt=""/><br /><sub><b>WntFlm</b></sub></a><br /><a href="https://github.com/alist-org/alist/commits?author=WntFlm" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/XZB-1248"><img src="https://avatars.githubusercontent.com/u/28593573?v=4?s=100" width="100px;" alt=""/><br /><sub><b>XZB-1248</b></sub></a><br /><a href="https://github.com/alist-org/alist/commits?author=XZB-1248" title="Code">💻</a></td>
   </tr>
 </table>
 

README.md

@@ -72,7 +72,8 @@ Available at: <https://alist.nn.ci>.
 <https://alist-doc.nn.ci/en/>
 
 ## Special sponsors
-- [Find Resources - Aliyundrive Resource Search Engine](https://zhaoziyuan.la/)
+- [找资源 - 阿里云盘资源搜索引擎](https://zhaoziyuan.la/)
+- [KinhDown 百度云盘不限速下载！永久免费！以稳定运行3年！非常可靠!](https://kinhdown.com/?Type=Tutorials)
 - [JetBrains: Essential tools for software developers and teams](https://www.jetbrains.com/)
 
 ## License

README_cn.md

@@ -73,6 +73,7 @@
 
 ## 特别赞助
 - [找资源 - 阿里云盘资源搜索引擎](https://zhaoziyuan.la/)
+- [KinhDown 百度云盘不限速下载！永久免费！以稳定运行3年！非常可靠!](https://kinhdown.com/?Type=Tutorials)
 - [JetBrains: Essential tools for software developers and teams](https://www.jetbrains.com/)
 
 ##  许可

build.sh

@@ -2,8 +2,8 @@
 
 # 构建前端,在当前目录产生一个dist文件夹
 BUILD_WEB() {
-  git clone https://github.com/alist-org/alist-web.git
-  cd alist-web
+  git clone https://github.com/alist-org/web-v2.git
+  cd web-v2
   yarn
   yarn build
   sed -i -e "s/\/CDN_URL\//\//g" dist/index.html
@@ -11,11 +11,11 @@ BUILD_WEB() {
   rm -f dist/index.html-e
   mv dist ..
   cd .. || exit
-  rm -rf alist-web
+  rm -rf web-v2
 }
 
 CDN_WEB() {
-  curl -L https://github.com/alist-org/alist-web/releases/latest/download/dist.tar.gz -o dist.tar.gz
+  curl -L https://github.com/alist-org/web-v2/releases/latest/download/dist.tar.gz -o dist.tar.gz
   tar -zxvf dist.tar.gz
   rm -f dist.tar.gz
 }
@@ -28,7 +28,7 @@ BUILD_DOCKER() {
   gitAuthor=$(git show -s --format='format:%aN <%ae>' HEAD)
   gitCommit=$(git log --pretty=format:"%h" -1)
   gitTag=$(git describe --long --tags --dirty --always)
-  webTag=$(wget -qO- -t1 -T2 "https://api.github.com/repos/alist-org/alist-web/releases/latest" | grep "tag_name" | head -n 1 | awk -F ":" '{print $2}' | sed 's/\"//g;s/,//g;s/ //g')
+  webTag=$(wget -qO- -t1 -T2 "https://api.github.com/repos/alist-org/web-v2/releases/latest" | grep "tag_name" | head -n 1 | awk -F ":" '{print $2}' | sed 's/\"//g;s/,//g;s/ //g')
   ldflags="\
 -w -s \
 -X 'github.com/Xhofe/alist/conf.BuiltAt=$builtAt' \
@@ -49,7 +49,7 @@ BUILD() {
   gitAuthor=$(git show -s --format='format:%aN <%ae>' HEAD)
   gitCommit=$(git log --pretty=format:"%h" -1)
   gitTag=$(git describe --long --tags --dirty --always)
-  webTag=$(wget -qO- -t1 -T2 "https://api.github.com/repos/alist-org/alist-web/releases/latest" | grep "tag_name" | head -n 1 | awk -F ":" '{print $2}' | sed 's/\"//g;s/,//g;s/ //g')
+  webTag=$(wget -qO- -t1 -T2 "https://api.github.com/repos/alist-org/web-v2/releases/latest" | grep "tag_name" | head -n 1 | awk -F ":" '{print $2}' | sed 's/\"//g;s/,//g;s/ //g')
   echo "build version: $gitTag"
 
   ldflags="\
@@ -95,7 +95,7 @@ BUILD_MUSL() {
   gitAuthor=$(git show -s --format='format:%aN <%ae>' HEAD)
   gitCommit=$(git log --pretty=format:"%h" -1)
   gitTag=$(git describe --long --tags --dirty --always)
-  webTag=$(wget -qO- -t1 -T2 "https://api.github.com/repos/alist-org/alist-web/releases/latest" | grep "tag_name" | head -n 1 | awk -F ":" '{print $2}' | sed 's/\"//g;s/,//g;s/ //g')
+  webTag=$(wget -qO- -t1 -T2 "https://api.github.com/repos/alist-org/web-v2/releases/latest" | grep "tag_name" | head -n 1 | awk -F ":" '{print $2}' | sed 's/\"//g;s/,//g;s/ //g')
   ldflags="\
 -w -s --extldflags '-static -fpic' \
 -X 'github.com/Xhofe/alist/conf.BuiltAt=$builtAt' \

conf/config.go

@@ -28,6 +28,8 @@ type Config struct {
 	Address  string      `json:"address" env:"ADDR"`
 	Port     int         `json:"port" env:"PORT"`
 	Assets   string      `json:"assets" env:"ASSETS"`
+	LocalAssets string   `json:"localassets" env:"LOCALASSETS"`
+	SubFolder string     `json:"subfolder" env:"SUBFOLDER"`
 	Database Database    `json:"database"`
 	Scheme   Scheme      `json:"scheme"`
 	Cache    CacheConfig `json:"cache"`
@@ -39,6 +41,8 @@ func DefaultConfig() *Config {
 		Address: "0.0.0.0",
 		Port:    5244,
 		Assets:  "https://npm.elemecdn.com/alist-web@$version/dist",
+		SubFolder: "",
+		LocalAssets: "",
 		TempDir: "data/temp",
 		Database: Database{
 			Type:        "sqlite3",

drivers/123/driver.go

@@ -176,7 +176,7 @@ func (driver Pan123) Link(args base.Args, account *model.Account) (*base.Link, e
 		return nil, err
 	}
 	u_ := fmt.Sprintf("https://%s%s", u.Host, u.Path)
-	res, err := base.NoRedirectClient.R().SetQueryParamsFromValues(u.Query()).Get(u_)
+	res, err := base.NoRedirectClient.R().SetQueryParamsFromValues(u.Query()).Head(u_)
 	if err != nil {
 		return nil, err
 	}
@@ -184,6 +184,7 @@ func (driver Pan123) Link(args base.Args, account *model.Account) (*base.Link, e
 	link := base.Link{
 		Url: resp.Data.DownloadUrl,
 	}
+	log.Debugln("res code: ", res.StatusCode())
 	if res.StatusCode() == 302 {
 		link.Url = res.Header().Get("location")
 	}

drivers/139/driver.go

@@ -270,7 +270,7 @@ func (driver Cloud139) Rename(src string, dst string, account *model.Account) er
 				"accountType": 1,
 			},
 		}
-		pathname = "/orchestration/personalCloud/catalog/v1.0/updateContentInfo"
+		pathname = "/orchestration/personalCloud/content/v1.0/updateContentInfo"
 	}
 	_, err = driver.Post(pathname, data, nil, account)
 	return err

drivers/189/189.go

@@ -7,13 +7,6 @@ import (
 	"encoding/hex"
 	"errors"
 	"fmt"
-	"github.com/Xhofe/alist/conf"
-	"github.com/Xhofe/alist/drivers/base"
-	"github.com/Xhofe/alist/model"
-	"github.com/Xhofe/alist/utils"
-	"github.com/go-resty/resty/v2"
-	jsoniter "github.com/json-iterator/go"
-	log "github.com/sirupsen/logrus"
 	"io"
 	"math"
 	"net/http"
@@ -21,6 +14,14 @@ import (
 	"strconv"
 	"strings"
 	"time"
+
+	"github.com/Xhofe/alist/conf"
+	"github.com/Xhofe/alist/drivers/base"
+	"github.com/Xhofe/alist/model"
+	"github.com/Xhofe/alist/utils"
+	"github.com/go-resty/resty/v2"
+	jsoniter "github.com/json-iterator/go"
+	log "github.com/sirupsen/logrus"
 )
 
 var client189Map map[string]*resty.Client
@@ -98,6 +99,7 @@ func (driver Cloud189) Login(account *model.Account) error {
 	client.SetTimeout(base.DefaultTimeout)
 	client.SetRetryCount(3)
 	client.SetHeader("Referer", "https://cloud.189.cn/")
+	client.SetHeader("User-Agent", base.UserAgent)
 	url := "https://cloud.189.cn/api/portal/loginUrl.action?redirectURL=https%3A%2F%2Fcloud.189.cn%2Fmain.action"
 	b := ""
 	lt := ""

drivers/189/driver.go

@@ -2,15 +2,16 @@ package _89
 
 import (
 	"fmt"
+	"net/http"
+	"path/filepath"
+	"strings"
+
 	"github.com/Xhofe/alist/conf"
 	"github.com/Xhofe/alist/drivers/base"
 	"github.com/Xhofe/alist/model"
 	"github.com/Xhofe/alist/utils"
 	"github.com/go-resty/resty/v2"
 	log "github.com/sirupsen/logrus"
-	"net/http"
-	"path/filepath"
-	"strings"
 )
 
 type Cloud189 struct{}
@@ -179,23 +180,27 @@ func (driver Cloud189) Link(args base.Args, account *model.Account) (*base.Link,
 		resty.RedirectPolicyFunc(func(req *http.Request, via []*http.Request) error {
 			return http.ErrUseLastResponse
 		}))
-	res, err := client.R().Get("https:" + resp.FileDownloadUrl)
+	res, err := client.R().SetHeader("User-Agent", base.UserAgent).Get("https:" + resp.FileDownloadUrl)
 	if err != nil {
 		return nil, err
 	}
 	log.Debugln(res.Status())
+	log.Debugln(res.String())
 	link := base.Link{
 		Headers: []base.Header{
 			{Name: "User-Agent", Value: base.UserAgent},
 			//{Name: "Authorization", Value: ""},
 		},
 	}
+	log.Debugln("first url:", resp.FileDownloadUrl)
 	if res.StatusCode() == 302 {
 		link.Url = res.Header().Get("location")
-		res, err = client.R().Get(link.Url)
+		log.Debugln("second url:", link.Url)
+		_, _ = client.R().Get(link.Url)
 		if res.StatusCode() == 302 {
 			link.Url = res.Header().Get("location")
 		}
+		log.Debugln("third url:", link.Url)
 	} else {
 		link.Url = resp.FileDownloadUrl
 	}

drivers/alist/driver.go

@@ -113,7 +113,7 @@ func (driver Alist) Link(args base.Args, account *model.Account) (*base.Link, er
 		flag = "p"
 	}
 	link := base.Link{}
-	link.Url = fmt.Sprintf("%s/%s%s?sign=%s", account.SiteUrl, flag, path, utils.SignWithToken(name, conf.Token))
+	link.Url = fmt.Sprintf("%s/%s%s?sign=%s", account.SiteUrl, flag, utils.Join(utils.ParsePath(account.RootFolder), path), utils.SignWithToken(name, conf.Token))
 	return &link, nil
 }
 

server/common/proxy.go

@@ -26,7 +26,7 @@ func Proxy(w http.ResponseWriter, r *http.Request, link *base.Link, file *model.
 			_ = link.Data.Close()
 		}()
 		w.Header().Set("Content-Type", "application/octet-stream")
-		w.Header().Set("Content-Disposition", fmt.Sprintf(`attachment; filename=%s`, file.Name))
+		w.Header().Set("Content-Disposition", fmt.Sprintf(`attachment; filename="%s"; filename*=UTF-8''%s`, file.Name, url.QueryEscape(file.Name)))
 		w.Header().Set("Content-Length", strconv.FormatInt(file.Size, 10))
 		if link.Header != nil {
 			for h, val := range link.Header {
@@ -57,7 +57,7 @@ func Proxy(w http.ResponseWriter, r *http.Request, link *base.Link, file *model.
 		if err != nil {
 			return err
 		}
-		w.Header().Set("Content-Disposition", fmt.Sprintf(`attachment; filename=%s`, url.QueryEscape(file.Name)))
+		w.Header().Set("Content-Disposition", fmt.Sprintf(`attachment; filename="%s"; filename*=UTF-8''%s`, file.Name, url.QueryEscape(file.Name)))
 		http.ServeContent(w, r, file.Name, fileStat.ModTime(), f)
 		return nil
 	} else {

server/static.go

@@ -2,11 +2,14 @@ package server
 
 import (
 	"io/fs"
+	"os"
 	"io/ioutil"
 	"net/http"
 	"net/http/pprof"
 	"strings"
+	"path/filepath"
 
+	"github.com/Xhofe/alist/utils"
 	"github.com/Xhofe/alist/conf"
 	"github.com/Xhofe/alist/public"
 	"github.com/gin-gonic/gin"
@@ -19,31 +22,65 @@ func InitIndex() {
 	if !strings.Contains(conf.Conf.Assets, "/") {
 		conf.Conf.Assets = conf.DefaultConfig().Assets
 	}
-	index, err = public.Public.Open("index.html")
+	// if LocalAssets is local path, read local index.html.
+	if (utils.IsDir(filepath.Dir(conf.Conf.LocalAssets))) && utils.Exists(filepath.Join(conf.Conf.LocalAssets, "index.html")) {
+		index, err = os.Open(filepath.Join(conf.Conf.LocalAssets, "index.html"))
+		defer index.Close()
+		log.Infof("used local index.html")
+	} else {
+		index, err = public.Public.Open("index.html")
+	}
 	if err != nil {
 		log.Fatal(err.Error())
 	}
-	data, _ := ioutil.ReadAll(index)
+    data, _ := ioutil.ReadAll(index)
+	conf.RawIndexHtml = string(data)
+	// if exist SUB_FOLDER, replace it by config: SubFolder
+	subfolder := strings.Trim(conf.Conf.SubFolder, "/")
+	if strings.Contains(conf.RawIndexHtml, "SUB_FOLDER") {
+		conf.RawIndexHtml = strings.ReplaceAll(conf.RawIndexHtml, "SUB_FOLDER", subfolder)
+	}
 	cdnUrl := strings.ReplaceAll(conf.Conf.Assets, "$version", conf.WebTag)
 	cdnUrl = strings.TrimRight(cdnUrl, "/")
-	conf.RawIndexHtml = string(data)
 	if strings.Contains(conf.RawIndexHtml, "CDN_URL") {
-		conf.RawIndexHtml = strings.ReplaceAll(conf.RawIndexHtml, "/CDN_URL", cdnUrl)
-		conf.RawIndexHtml = strings.ReplaceAll(conf.RawIndexHtml, "assets/", cdnUrl+"/assets/")
+		if (cdnUrl == "") && (subfolder != "") {
+			conf.RawIndexHtml = strings.ReplaceAll(conf.RawIndexHtml, "CDN_URL", subfolder)
+			conf.RawIndexHtml = strings.ReplaceAll(conf.RawIndexHtml, "assets/", "/" + subfolder+"/assets/")	
+		} else {
+			conf.RawIndexHtml = strings.ReplaceAll(conf.RawIndexHtml, "/CDN_URL", cdnUrl)
+			conf.RawIndexHtml = strings.ReplaceAll(conf.RawIndexHtml, "assets/", cdnUrl+"/assets/")	
+		}
 	}
 }
 
 func Static(r *gin.Engine) {
+	var assets fs.FS
+	var pub fs.FS
+	var err error
+	var fsys fs.FS
 	//InitIndex()
-	assets, err := fs.Sub(public.Public, "assets")
+	// if LocalAssets is local path, read local assets.
+	fsys = os.DirFS(conf.Conf.LocalAssets)
+	if (utils.IsDir(filepath.Dir(conf.Conf.LocalAssets))) && utils.Exists(filepath.Join(conf.Conf.LocalAssets, "assets")) {
+		assets, err = fs.Sub(fsys, "assets")
+		log.Infof("used local assets")
+	} else {
+		assets, err = fs.Sub(public.Public, "assets")
+	}
 	if err != nil {
 		log.Fatalf("can't find assets folder")
 	}
-	pub, err := fs.Sub(public.Public, "public")
+	r.StaticFS("/assets/", http.FS(assets))
+    // if LocalAssets is local path, read local assets.
+	if (utils.IsDir(filepath.Dir(conf.Conf.LocalAssets))) && utils.Exists(filepath.Join(conf.Conf.LocalAssets, "public")) {
+		pub, err = fs.Sub(fsys, "public")
+		log.Infof("used local public")
+	} else {
+		pub, err = fs.Sub(public.Public, "public")
+	}
 	if err != nil {
 		log.Fatalf("can't find public folder")
 	}
-	r.StaticFS("/assets/", http.FS(assets))
 	r.StaticFS("/public/", http.FS(pub))
 	r.NoRoute(func(c *gin.Context) {
 		c.Header("Content-Type", "text/html")