🐛 refer to https://github.com/ad-m/github-push-action/issues/44#issuecomment-581706892

.github/workflows/build.yml

@@ -15,11 +15,19 @@ jobs:
     name: Build
     runs-on: ${{ matrix.platform }}
     steps:
-      - name: Set up Go
+      - name: Setup Go
         uses: actions/setup-go@v2
         with:
           go-version: ${{ matrix.go-version }}
 
+      - name: Set up Node
+        uses: actions/setup-node@v2
+        with:
+          node-version: '16'
+
+#      - name: Setup docker
+#        uses: docker-practice/actions-setup-docker@master
+
       - name: Checkout
         uses: actions/checkout@v2
         with:
@@ -33,29 +41,16 @@ jobs:
           ref: v2
           path: alist-web
 
-      - name: Set up Node
-        uses: actions/setup-node@v2
-        with:
-          node-version: '16'
-
       - name: Set up xgo
         run: |
           docker pull techknowlogick/xgo:latest
           go install src.techknowlogick.com/xgo@latest
           sudo apt install upx
 
-      - name: Build web
-        run: |
-          cd alist-web
-          yarn
-          yarn build
-          cd ..
-
       - name: Build
         run: |
-          cd alist
+          mv alist/build.sh .
           bash build.sh
-          cd ..
 
       - name: Upload artifact
         uses: actions/upload-artifact@v2

.github/workflows/release.yml

@@ -1,4 +1,4 @@
-name: build
+name: release
 
 on:
   push:
@@ -14,16 +14,26 @@ jobs:
     name: Release
     runs-on: ${{ matrix.platform }}
     steps:
-      - name: Set up Go
+      - name: Setup Go
         uses: actions/setup-go@v2
         with:
           go-version: ${{ matrix.go-version }}
 
+#      - name: Setup docker
+#        uses: docker-practice/actions-setup-docker@master
+
+      - name: Setup Node
+        uses: actions/setup-node@v2
+        with:
+          node-version: '16'
+
       - name: Checkout
         uses: actions/checkout@v2
         with:
           ref: v2
           path: alist
+          persist-credentials: false
+          fetch-depth: 0
 
       - name: Checkout web repo
         uses: actions/checkout@v2
@@ -31,11 +41,8 @@ jobs:
           repository: Xhofe/alist-web
           ref: v2
           path: alist-web
-
-      - name: Set up Node
-        uses: actions/setup-node@v2
-        with:
-          node-version: '16'
+          persist-credentials: false
+          fetch-depth: 0
 
       - name: Set up xgo
         run: |
@@ -43,18 +50,18 @@ jobs:
           go install src.techknowlogick.com/xgo@latest
           sudo apt install upx
 
-      - name: Build web
-        run: |
-          cd alist-web
-          yarn
-          yarn build
-          cd ..
-
       - name: Build
         run: |
-          cd alist
+          mv alist/build.sh .
           bash build.sh release
-          cd ..
+
+      - name: Upload asserts files
+        uses: ad-m/github-push-action@master
+        with:
+          github_token: ${{ secrets.MY_TOKEN }}
+          branch: cdn
+          directory: alist-web
+          repository: Xhofe/alist-web
 
       - name: Release
         uses: softprops/action-gh-release@v1

alist.go

@@ -13,14 +13,6 @@ import (
 	"net/http"
 )
 
-var (
-	builtAt   string
-	goVersion string
-	gitAuthor string
-	gitCommit string
-	gitTag    string
-)
-
 func init() {
 	flag.StringVar(&conf.ConfigFile, "conf", "config.json", "config file")
 	flag.BoolVar(&conf.Debug, "debug", false, "start with debug mode")
@@ -38,7 +30,7 @@ func Init() {
 
 func main() {
 	if conf.Version {
-		fmt.Printf("Built At: %s\nGo Version: %s\nAuthor: %s\nCommit ID: %s\nVersion:%s\n", builtAt, goVersion, gitAuthor, gitCommit, gitTag)
+		fmt.Printf("Built At: %s\nGo Version: %s\nAuthor: %s\nCommit ID: %s\nVersion: %s\n", conf.BuiltAt, conf.GoVersion, conf.GitAuthor, conf.GitCommit, conf.GitTag)
 		return
 	}
 	Init()

bootstrap/model.go

@@ -5,7 +5,6 @@ import (
 	"github.com/Xhofe/alist/conf"
 	"github.com/Xhofe/alist/drivers"
 	"github.com/Xhofe/alist/model"
-	"github.com/Xhofe/alist/utils"
 	log "github.com/sirupsen/logrus"
 	"gorm.io/driver/mysql"
 	"gorm.io/driver/postgres"
@@ -106,85 +105,79 @@ func initAccounts() {
 
 func initSettings() {
 	log.Infof("init settings...")
-	version, err := model.GetSettingByKey("version")
-	if err != nil {
-		log.Debugf("first run")
-		version = &model.SettingItem{
-			Key:         "version",
-			Value:       "0.0.0",
-			Type:        "string",
-			Description: "version",
-			Group:       model.CONST,
-		}
+	version := model.SettingItem{
+		Key:         "version",
+		Value:       conf.GitTag,
+		Description: "version",
+		Group:       model.CONST,
 	}
-	settingsMap := map[string][]model.SettingItem{
-		"2.0.0": {
-			{
-				Key:         "title",
-				Value:       "Alist",
-				Description: "title",
-				Type:        "string",
-				Group:       model.PUBLIC,
-			},
-			{
-				Key:         "password",
-				Value:       "alist",
-				Type:        "string",
-				Description: "password",
-				Group:       model.PRIVATE,
-			},
-			{
-				Key:         "version",
-				Value:       "2.0.0",
-				Type:        "string",
-				Description: "version",
-				Group:       model.CONST,
-			},
-			{
-				Key:         "logo",
-				Value:       "https://store.heytapimage.com/cdo-portal/feedback/202110/30/d43c41c5d257c9bc36366e310374fb19.png",
-				Type:        "string",
-				Description: "logo",
-				Group:       model.PUBLIC,
-			},
-			{
-				Key:         "icon color",
-				Value:       "teal.300",
-				Type:        "string",
-				Description: "icon's color",
-				Group:       model.PUBLIC,
-			},
-			{
-				Key:         "text types",
-				Value:       "txt,htm,html,xml,java,properties,sql,js,md,json,conf,ini,vue,php,py,bat,gitignore,yml,go,sh,c,cpp,h,hpp",
-				Type:        "string",
-				Description: "text type extensions",
-			},
-			{
-				Key:         "readme file",
-				Value:       "hide",
-				Type:        "string",
-				Description: "hide readme file? (show/hide)",
-			},
-			{
-				Key:         "music cover",
-				Value:       "https://store.heytapimage.com/cdo-portal/feedback/202110/30/d43c41c5d257c9bc36366e310374fb19.png",
-				Type:        "string",
-				Description: "music cover image",
-			},
-			{
-				Key:         "site beian",
-				Type:        "string",
-				Description: "chinese beian info",
-			},
+
+	_ = model.SaveSetting(version)
+
+	settings := []model.SettingItem{
+		{
+			Key:         "title",
+			Value:       "Alist",
+			Description: "title",
+			Group:       model.PUBLIC,
+		},
+		{
+			Key:         "password",
+			Value:       "alist",
+			Description: "password",
+			Group:       model.PRIVATE,
+		},
+		{
+			Key:         "logo",
+			Value:       "https://store.heytapimage.com/cdo-portal/feedback/202110/30/d43c41c5d257c9bc36366e310374fb19.png",
+			Description: "logo",
+			Group:       model.PUBLIC,
+		},
+		{
+			Key:         "favicon",
+			Value:       "https://store.heytapimage.com/cdo-portal/feedback/202110/30/d43c41c5d257c9bc36366e310374fb19.png",
+			Description: "favicon",
+			Group:       model.PUBLIC,
+		},
+		{
+			Key:         "icon color",
+			Value:       "teal.300",
+			Description: "icon's color",
+			Group:       model.PUBLIC,
+		},
+		{
+			Key:         "text types",
+			Value:       "txt,htm,html,xml,java,properties,sql,js,md,json,conf,ini,vue,php,py,bat,gitignore,yml,go,sh,c,cpp,h,hpp",
+			Description: "text type extensions",
+		},
+		{
+			Key:         "readme file",
+			Value:       "hide",
+			Description: "hide readme file? (show/hide)",
+		},
+		{
+			Key:         "music cover",
+			Value:       "https://store.heytapimage.com/cdo-portal/feedback/202110/30/d43c41c5d257c9bc36366e310374fb19.png",
+			Description: "music cover image",
+			Group:       model.PUBLIC,
+		},
+		{
+			Key:         "site beian",
+			Description: "chinese beian info",
+			Group:       model.PUBLIC,
+		},
+		{
+			Key:         "home readme url",
+			Description: "when have multiple, the readme file to show",
+			Group:       model.PUBLIC,
 		},
 	}
-	for k, v := range settingsMap {
-		if utils.VersionCompare(k, version.Value) > 0 {
-			log.Infof("writing [v%s] settings", k)
-			err = model.SaveSettings(v)
+	for _, v := range settings {
+		_, err := model.GetSettingByKey(v.Key)
+		if err == gorm.ErrRecordNotFound {
+			err = model.SaveSetting(v)
 			if err != nil {
-				log.Fatalf("save settings error")
+				log.Fatalf("failed write setting: %s", err.Error())
 			}
 		}
 	}

build.sh

@@ -1,5 +1,18 @@
 #!/bin/bash
 
+cd alist-web || exit
+webCommit=$(git log --pretty=format:"%h" -1)
+echo "web commit id: $webCommit"
+yarn
+if [ "$1" == "release" ]; then
+  yarn build --base="https://cdn.jsdelivr.net/gh/Xhofe/alist-web@cdn/v2/$webCommit"
+  mv dist/assets ..
+else
+  yarn build
+fi
+cd ..
+
+cd alist
 appName="alist"
 builtAt="$(date +'%F %T %z')"
 goVersion=$(go version | sed 's/go version //')
@@ -9,27 +22,33 @@ gitCommit=$(git log --pretty=format:"%h" -1)
 if [ "$1" == "release" ]; then
   gitTag=$(git describe --abbrev=0 --tags)
 else
-  gitTag="beta"
+  gitTag=build-next
 fi
 
+echo "build version: $gitTag"
+
 ldflags="\
 -w -s \
--X 'main.builtAt=$builtAt' \
--X 'main.goVersion=$goVersion' \
--X 'main.gitAuthor=$gitAuthor' \
--X 'main.gitCommit=$gitCommit' \
--X 'main.gitTag=$gitTag' \
+-X 'github.com/Xhofe/alist/conf.BuiltAt=$builtAt' \
+-X 'github.com/Xhofe/alist/conf.GoVersion=$goVersion' \
+-X 'github.com/Xhofe/alist/conf.GitAuthor=$gitAuthor' \
+-X 'github.com/Xhofe/alist/conf.GitCommit=$gitCommit' \
+-X 'github.com/Xhofe/alist/conf.GitTag=$gitTag' \
 "
 
 cp -R ../alist-web/dist/* public
 
-xgo -out alist -ldflags="$ldflags" .
+if [ "$1" == "release" ]; then
+  xgo -out alist -ldflags="$ldflags" .
+else
+  xgo -targets=linux/amd64,windows/amd64,darwin/amd64 -out alist -ldflags="$ldflags" .
+fi
 mkdir "build"
 mv alist-* build
 cd build || exit
 upx -9 ./*
 find . -type f -print0 | xargs -0 md5sum > md5.txt
-
+cat md5.txt
 # compress file (release)
 if [ "$1" == "release" ]; then
     mkdir compress
@@ -46,4 +65,17 @@ if [ "$1" == "release" ]; then
     do
       zip compress/$(echo $i | sed 's/\.[^.]*$//').zip "$i"
     done
+fi
+cd ../..
+
+if [ "$1" == "release" ]; then
+  cd alist-web
+  git checkout cdn
+  mkdir "v2/$webCommit"
+  mv ../assets/ v2/$webCommit
+  git add .
+  git config --local user.email "i@nn.ci"
+  git config --local user.name "Xhofe"
+  git commit --allow-empty -m "upload $webCommit assets files" -a
+  cd ..
 fi

conf/var.go

@@ -7,6 +7,14 @@ import (
 	"gorm.io/gorm"
 )
 
+var (
+	BuiltAt   string
+	GoVersion string
+	GitAuthor string
+	GitCommit string
+	GitTag    string
+)
+
 var (
 	ConfigFile string // config file
 	Conf       *Config

drivers/alidrive.go

@@ -221,55 +221,57 @@ func (a AliDrive) Path(path string, account *model.Account) (*model.File, []*mod
 			return a.FormatFile(&file), nil, nil
 		} else {
 			files, _ := cache.([]AliFile)
-			res := make([]*model.File, 0)
-			for _, file = range files {
-				res = append(res, a.FormatFile(&file))
-			}
-			return nil, res, nil
-		}
-	} else {
-		fileId := account.RootFolder
-		if path != "/" {
-			dir, name := filepath.Split(path)
-			dir = utils.ParsePath(dir)
-			_, _, err = a.Path(dir, account)
-			if err != nil {
-				return nil, nil, err
-			}
-			parentFiles_, _ := conf.Cache.Get(conf.Ctx, fmt.Sprintf("%s%s", account.Name, dir))
-			parentFiles, _ := parentFiles_.([]AliFile)
-			found := false
-			for _, file := range parentFiles {
-				if file.Name == name {
-					found = true
-					if file.Type == "file" {
-						url, err := a.Link(path, account)
-						if err != nil {
-							return nil, nil, err
-						}
-						file.Url = url
-						return a.FormatFile(&file), nil, nil
-					} else {
-						fileId = file.FileId
-						break
-					}
+			if len(files) != 0 {
+				res := make([]*model.File, 0)
+				for _, file = range files {
+					res = append(res, a.FormatFile(&file))
 				}
-			}
-			if !found {
-				return nil, nil, fmt.Errorf("path not found")
+				return nil, res, nil
 			}
 		}
-		files, err := a.GetFiles(fileId, account)
+	}
+	// no cache or len(files) == 0
+	fileId := account.RootFolder
+	if path != "/" {
+		dir, name := filepath.Split(path)
+		dir = utils.ParsePath(dir)
+		_, _, err = a.Path(dir, account)
 		if err != nil {
 			return nil, nil, err
 		}
-		_ = conf.Cache.Set(conf.Ctx, fmt.Sprintf("%s%s", account.Name, path), files, nil)
-		res := make([]*model.File, 0)
-		for _, file := range files {
-			res = append(res, a.FormatFile(&file))
+		parentFiles_, _ := conf.Cache.Get(conf.Ctx, fmt.Sprintf("%s%s", account.Name, dir))
+		parentFiles, _ := parentFiles_.([]AliFile)
+		found := false
+		for _, file := range parentFiles {
+			if file.Name == name {
+				found = true
+				if file.Type == "file" {
+					url, err := a.Link(path, account)
+					if err != nil {
+						return nil, nil, err
+					}
+					file.Url = url
+					return a.FormatFile(&file), nil, nil
+				} else {
+					fileId = file.FileId
+					break
+				}
+			}
+		}
+		if !found {
+			return nil, nil, fmt.Errorf("path not found")
 		}
-		return nil, res, nil
 	}
+	files, err := a.GetFiles(fileId, account)
+	if err != nil {
+		return nil, nil, err
+	}
+	_ = conf.Cache.Set(conf.Ctx, fmt.Sprintf("%s%s", account.Name, path), files, nil)
+	res := make([]*model.File, 0)
+	for _, file := range files {
+		res = append(res, a.FormatFile(&file))
+	}
+	return nil, res, nil
 }
 
 func (a AliDrive) Link(path string, account *model.Account) (string, error) {
@@ -316,10 +318,12 @@ func (a AliDrive) RefreshToken(account *model.Account) error {
 		SetError(&e).
 		Post(url)
 	if err != nil {
+		account.Status = err.Error()
 		return err
 	}
 	log.Debugf("%+v,%+v", resp, e)
 	if e.Code != "" {
+		account.Status = e.Message
 		return fmt.Errorf("failed to refresh token: %s", e.Message)
 	}
 	account.RefreshToken, account.AccessToken = resp.RefreshToken, resp.AccessToken
@@ -354,9 +358,6 @@ func (a AliDrive) Save(account *model.Account, old *model.Account) error {
 			return
 		}
 		err = a.RefreshToken(&newAccount)
-		if err != nil {
-			newAccount.Status = err.Error()
-		}
 		_ = model.SaveAccount(newAccount)
 	})
 	if err != nil {

drivers/onedrive.go

@@ -115,8 +115,8 @@ func (o Onedrive) Items() []Item {
 			Required: true,
 		},
 		{
-			Name:     "site_url",
-			Label:    "site url",
+			Name:     "site_id",
+			Label:    "site id",
 			Type:     "string",
 			Required: false,
 		},
@@ -146,9 +146,11 @@ func (o Onedrive) RefreshToken(account *model.Account) error {
 		"refresh_token": account.RefreshToken,
 	}).Post(url)
 	if err != nil {
+		account.Status = err.Error()
 		return err
 	}
 	if e.Error != "" {
+		account.Status = e.ErrorDescription
 		return fmt.Errorf("%s", e.ErrorDescription)
 	}
 	account.RefreshToken, account.AccessToken = resp.RefreshToken, resp.AccessToken
@@ -280,9 +282,6 @@ func (o Onedrive) Save(account *model.Account, old *model.Account) error {
 			return
 		}
 		err = o.RefreshToken(&newAccount)
-		if err != nil {
-			newAccount.Status = err.Error()
-		}
 		_ = model.SaveAccount(newAccount)
 	})
 	if err != nil {

model/account.go

@@ -7,7 +7,7 @@ import (
 
 type Account struct {
 	Name           string `json:"name" gorm:"primaryKey" validate:"required"`
-	Index          int    `json:"index" validate:"required"`
+	Index          int    `json:"index"`
 	Type           string `json:"type"`
 	Username       string `json:"username"`
 	Password       string `json:"password"`
@@ -28,8 +28,8 @@ type Account struct {
 	Zone           string     `json:"zone"`
 	RedirectUri    string     `json:"redirect_uri"`
 	SiteUrl        string     `json:"site_url"`
-	SiteId         string
-	OnedriveType   string `json:"onedrive_type"`
+	SiteId         string     `json:"site_id"`
+	OnedriveType   string     `json:"onedrive_type"`
 }
 
 var accountsMap = map[string]Account{}

model/setting.go

@@ -14,7 +14,7 @@ type SettingItem struct {
 	Key         string `json:"key" gorm:"primaryKey" validate:"required"`
 	Value       string `json:"value"`
 	Description string `json:"description"`
-	Type        string `json:"type"`
+	//Type        string `json:"type"`
 	Group       int    `json:"group"`
 }
 
@@ -22,6 +22,10 @@ func SaveSettings(items []SettingItem) error {
 	return conf.DB.Save(items).Error
 }
 
+func SaveSetting(item SettingItem) error {
+	return conf.DB.Save(item).Error
+}
+
 func GetSettingsPublic() (*[]SettingItem, error) {
 	var items []SettingItem
 	if err := conf.DB.Where("`group` <> ?", 1).Find(&items).Error; err != nil {

server/meta.go

@@ -22,6 +22,7 @@ func SaveMeta(ctx *fiber.Ctx) error {
 	if err := validate.Struct(req); err != nil {
 		return ErrorResp(ctx, err, 400)
 	}
+	req.Path = utils.ParsePath(req.Path)
 	if err := model.SaveMeta(req); err != nil {
 		return ErrorResp(ctx, err, 500)
 	} else {
@@ -31,7 +32,7 @@ func SaveMeta(ctx *fiber.Ctx) error {
 
 func DeleteMeta(ctx *fiber.Ctx) error {
 	path := ctx.Query("path")
-	path = utils.ParsePath(path)
+	//path = utils.ParsePath(path)
 	if err := model.DeleteMeta(path); err != nil {
 		return ErrorResp(ctx, err, 500)
 	}