✨ add customize style / script

.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/docker.yml

@@ -0,0 +1,48 @@
+name: docker
+
+on:
+  push:
+    branches:
+      - 'v2'
+    tags:
+      - 'v*'
+  pull_request:
+    branches:
+      - 'v2'
+
+jobs:
+  docker:
+    name: Docker
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v3
+        with:
+          images: xhofe/alist
+      - name: Set up Node
+        uses: actions/setup-node@v2
+        with:
+          node-version: '16'
+      - name: Build web
+        run: bash build.sh web
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+      - name: Login to DockerHub
+        uses: docker/login-action@v1
+        with:
+          username: xhofe
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: Build and push
+        id: docker_build
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/386,linux/arm/v6,linux/ppc64le,linux/s390x

.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

.gitignore

@@ -24,4 +24,5 @@ bin/*
 alist
 *.json
 public/index.html
-public/assets/
+public/assets/
+data/

Dockerfile

@@ -0,0 +1,14 @@
+FROM alpine:edge as builder
+LABEL stage=go-builder
+WORKDIR /app/
+COPY ./ ./
+RUN apk add --no-cache bash git go gcc musl-dev; \
+    sh build.sh docker
+
+FROM alpine:edge
+LABEL MAINTAINER="i@nn.ci"
+VOLUME /opt/alist/data/
+WORKDIR /opt/alist/
+COPY --from=builder /app/bin/alist ./
+EXPOSE 5244
+CMD [ "./alist" ]

README.md

@@ -13,7 +13,7 @@
 
 ### 这是什么？
 
-一款支持多种存储的目录文件列表程序，后端基于`go-fiber`，前端使用`react`。
+一款支持多种存储的目录文件列表程序，后端基于`gin`，前端使用`react`。
 
 ### 前端项目地址
 
@@ -31,7 +31,7 @@
 
 - 本地存储
 - 阿里云盘
-- Onedrive
+- Onedrive/世纪互联
 - ...
 
 ### 如何使用

alist.go

@@ -5,24 +5,13 @@ import (
 	"fmt"
 	"github.com/Xhofe/alist/bootstrap"
 	"github.com/Xhofe/alist/conf"
-	"github.com/Xhofe/alist/public"
 	"github.com/Xhofe/alist/server"
-	"github.com/gofiber/fiber/v2"
-	"github.com/gofiber/fiber/v2/middleware/filesystem"
+	"github.com/gin-gonic/gin"
 	log "github.com/sirupsen/logrus"
-	"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.StringVar(&conf.ConfigFile, "conf", "data/config.json", "config file")
 	flag.BoolVar(&conf.Debug, "debug", false, "start with debug mode")
 	flag.BoolVar(&conf.Version, "version", false, "print version info")
 	flag.Parse()
@@ -38,18 +27,18 @@ 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()
-	app := fiber.New()
-	server.InitApiRouter(app)
-	app.Use("/", filesystem.New(filesystem.Config{
-		Root:         http.FS(public.Public),
-		NotFoundFile: "index.html",
-	}))
+	if !conf.Debug {
+		gin.SetMode(gin.ReleaseMode)
+	}
+	r := gin.Default()
+	server.InitApiRouter(r)
+
 	log.Info("starting server")
-	err := app.Listen(fmt.Sprintf(":%d", conf.Conf.Port))
+	err := r.Run(fmt.Sprintf("%s:%d", conf.Conf.Address, conf.Conf.Port))
 	if err != nil {
 		log.Errorf("failed to start: %s", err.Error())
 	}

bootstrap/conf.go

@@ -13,6 +13,10 @@ func InitConf() {
 	log.Infof("reading config file: %s", conf.ConfigFile)
 	if !utils.Exists(conf.ConfigFile) {
 		log.Infof("config file not exists, creating default config file")
+		_, err := utils.CreatNestedFile(conf.ConfigFile)
+		if err != nil {
+			log.Fatalf("failed to create config file")
+		}
 		conf.Conf = conf.DefaultConfig()
 		if !utils.WriteToJson(conf.ConfigFile, conf.Conf) {
 			log.Fatalf("failed to create default config file")

build.sh

@@ -1,35 +1,79 @@
 #!/bin/bash
+if [ "$1" == "web" ]; then
+  git clone https://github.com/Xhofe/alist-web.git
+  cd alist-web || exit
+  yarn
+  yarn build
+  mv dist/* ../public
+  cd ..
+  exit 0
+fi
 
+go env -w GOPROXY=https://goproxy.cn,https://mirrors.aliyun.com/goproxy/,https://goproxy.io,direct
+
+if [ "$1" == "docker" ]; then
+  appName="alist"
+  builtAt="$(date +'%F %T %z')"
+  goVersion=$(go version | sed 's/go version //')
+  gitAuthor=$(git show -s --format='format:%aN <%ae>' HEAD)
+  gitCommit=$(git log --pretty=format:"%h" -1)
+  gitTag=$(git describe --long --tags --dirty --always)
+  ldflags="\
+-w -s \
+-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' \
+"
+  go build -o ./bin/alist -ldflags="$ldflags" alist.go
+  exit 0
+fi
+
+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 //')
 gitAuthor=$(git show -s --format='format:%aN <%ae>' HEAD)
 gitCommit=$(git log --pretty=format:"%h" -1)
+gitTag=$(git describe --long --tags --dirty --always)
 
-if [ "$1" == "release" ]; then
-  gitTag=$(git describe --abbrev=0 --tags)
-else
-  gitTag="beta"
-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 -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 +90,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/config.go

@@ -28,7 +28,7 @@ func DefaultConfig() *Config {
 			Port:        0,
 			Name:        "",
 			TablePrefix: "x_",
-			DBFile:      "data.db",
+			DBFile:      "data/data.db",
 		},
 	}
 }

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
@@ -23,6 +31,16 @@ var (
 	TextTypes   = []string{"txt", "go", "md"}
 	OfficeTypes = []string{"doc", "docx", "xls", "xlsx", "ppt", "pptx", "pdf"}
 	VideoTypes  = []string{"mp4", "mkv", "avi", "mov", "rmvb"}
-	AudioTypes  = []string{"mp3", "flac", "ogg"}
+	AudioTypes  = []string{"mp3", "flac", "ogg", "m4a"}
 	ImageTypes  = []string{"jpg", "tiff", "jpeg", "png", "gif", "bmp", "svg"}
 )
+
+// settings
+var (
+	RawIndexHtml    string
+	IndexHtml       string
+	CheckParent     bool
+	//CustomizeStyle  string
+	//CustomizeScript string
+	//Favicon         string
+)

drivers/alidrive.go

@@ -5,8 +5,8 @@ import (
 	"github.com/Xhofe/alist/conf"
 	"github.com/Xhofe/alist/model"
 	"github.com/Xhofe/alist/utils"
+	"github.com/gin-gonic/gin"
 	"github.com/go-resty/resty/v2"
-	"github.com/gofiber/fiber/v2"
 	"github.com/robfig/cron/v3"
 	log "github.com/sirupsen/logrus"
 	"path/filepath"
@@ -67,6 +67,20 @@ func (a AliDrive) Preview(path string, account *model.Account) (interface{}, err
 
 func (a AliDrive) Items() []Item {
 	return []Item{
+		{
+			Name: "order_by",
+			Label: "order_by",
+			Type: "select",
+			Values: "name,size,updated_at,created_at",
+			Required: false,
+		},
+		{
+			Name: "order_direction",
+			Label: "order_direction",
+			Type: "select",
+			Values: "ASC,DESC",
+			Required: false,
+		},
 		{
 			Name:     "refresh_token",
 			Label:    "refresh token",
@@ -89,9 +103,9 @@ func (a AliDrive) Items() []Item {
 	}
 }
 
-func (a AliDrive) Proxy(ctx *fiber.Ctx) {
-	ctx.Request().Header.Del("Origin")
-	ctx.Request().Header.Set("Referer", "https://www.aliyundrive.com/")
+func (a AliDrive) Proxy(c *gin.Context) {
+	c.Request.Header.Del("Origin")
+	c.Request.Header.Set("Referer", "https://www.aliyundrive.com/")
 }
 
 type AliRespError struct {
@@ -177,7 +191,7 @@ func (a AliDrive) GetFiles(fileId string, account *model.Account) ([]AliFile, er
 				if err != nil {
 					return nil, err
 				} else {
-					_ = model.SaveAccount(*account)
+					_ = model.SaveAccount(account)
 					return a.GetFiles(fileId, account)
 				}
 			}
@@ -221,55 +235,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) {
@@ -296,7 +312,7 @@ func (a AliDrive) Link(path string, account *model.Account) (string, error) {
 			if err != nil {
 				return "", err
 			} else {
-				_ = model.SaveAccount(*account)
+				_ = model.SaveAccount(account)
 				return a.Link(path, account)
 			}
 		}
@@ -316,10 +332,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,16 +372,13 @@ 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)
+		_ = model.SaveAccount(&newAccount)
 	})
 	if err != nil {
 		return err
 	}
 	account.CronId = int(cronId)
-	err = model.SaveAccount(*account)
+	err = model.SaveAccount(account)
 	if err != nil {
 		return err
 	}

drivers/driver.go

@@ -2,7 +2,7 @@ package drivers
 
 import (
 	"github.com/Xhofe/alist/model"
-	"github.com/gofiber/fiber/v2"
+	"github.com/gin-gonic/gin"
 )
 
 type Driver interface {
@@ -10,7 +10,7 @@ type Driver interface {
 	Path(path string, account *model.Account) (*model.File, []*model.File, error)
 	Link(path string, account *model.Account) (string, error)
 	Save(account *model.Account, old *model.Account) error
-	Proxy(ctx *fiber.Ctx)
+	Proxy(c *gin.Context)
 	Preview(path string, account *model.Account) (interface{}, error)
 	// TODO
 	//MakeDir(path string, account *model.Account) error

drivers/native.go

@@ -5,7 +5,7 @@ import (
 	"github.com/Xhofe/alist/conf"
 	"github.com/Xhofe/alist/model"
 	"github.com/Xhofe/alist/utils"
-	"github.com/gofiber/fiber/v2"
+	"github.com/gin-gonic/gin"
 	log "github.com/sirupsen/logrus"
 	"io/ioutil"
 	"os"
@@ -31,7 +31,7 @@ func (n Native) Items() []Item {
 	}
 }
 
-func (n Native) Proxy(ctx *fiber.Ctx) {
+func (n Native) Proxy(c *gin.Context) {
 	// unnecessary
 }
 

drivers/onedrive.go

@@ -5,8 +5,8 @@ import (
 	"github.com/Xhofe/alist/conf"
 	"github.com/Xhofe/alist/model"
 	"github.com/Xhofe/alist/utils"
+	"github.com/gin-gonic/gin"
 	"github.com/go-resty/resty/v2"
-	"github.com/gofiber/fiber/v2"
 	"github.com/robfig/cron/v3"
 	"path/filepath"
 	"time"
@@ -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,24 +282,21 @@ 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)
+		_ = model.SaveAccount(&newAccount)
 	})
 	if err != nil {
 		return err
 	}
 	account.CronId = int(cronId)
-	err = model.SaveAccount(*account)
+	err = model.SaveAccount(account)
 	if err != nil {
 		return err
 	}
 	return nil
 }
 
-func (o Onedrive) Proxy(ctx *fiber.Ctx) {
-
+func (o Onedrive) Proxy(c *gin.Context) {
+	c.Request.Header.Del("Origin")
 }
 
 func (o Onedrive) Preview(path string, account *model.Account) (interface{}, error) {

go.mod

@@ -4,9 +4,9 @@ go 1.17
 
 require (
 	github.com/eko/gocache/v2 v2.1.0
+	github.com/gin-gonic/gin v1.7.4
 	github.com/go-playground/validator/v10 v10.9.0
 	github.com/go-resty/resty/v2 v2.6.0
-	github.com/gofiber/fiber/v2 v2.20.2
 	github.com/patrickmn/go-cache v2.1.0+incompatible
 	github.com/robfig/cron/v3 v3.0.0
 	github.com/sirupsen/logrus v1.8.1
@@ -18,17 +18,18 @@ require (
 
 require (
 	github.com/XiaoMi/pegasus-go-client v0.0.0-20210427083443-f3b6b08bc4c2 // indirect
-	github.com/andybalholm/brotli v1.0.3 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/bradfitz/gomemcache v0.0.0-20190913173617-a41fca850d0b // indirect
 	github.com/cenkalti/backoff/v4 v4.1.0 // indirect
 	github.com/cespare/xxhash/v2 v2.1.1 // indirect
 	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
+	github.com/gin-contrib/cors v1.3.1 // indirect
+	github.com/gin-contrib/sse v0.1.0 // indirect
 	github.com/go-playground/locales v0.14.0 // indirect
 	github.com/go-playground/universal-translator v0.18.0 // indirect
 	github.com/go-redis/redis/v8 v8.9.0 // indirect
 	github.com/go-sql-driver/mysql v1.6.0 // indirect
-	github.com/golang/protobuf v1.4.3 // indirect
+	github.com/golang/protobuf v1.5.2 // indirect
 	github.com/jackc/chunkreader/v2 v2.0.1 // indirect
 	github.com/jackc/pgconn v1.10.0 // indirect
 	github.com/jackc/pgio v1.0.0 // indirect
@@ -39,19 +40,20 @@ require (
 	github.com/jackc/pgx/v4 v4.13.0 // indirect
 	github.com/jinzhu/inflection v1.0.0 // indirect
 	github.com/jinzhu/now v1.1.2 // indirect
-	github.com/klauspost/compress v1.13.6 // indirect
+	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/leodido/go-urn v1.2.1 // indirect
+	github.com/mattn/go-isatty v0.0.14 // indirect
 	github.com/mattn/go-sqlite3 v1.14.9 // indirect
 	github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
+	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
+	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/pegasus-kv/thrift v0.13.0 // indirect
 	github.com/prometheus/client_golang v1.10.0 // indirect
 	github.com/prometheus/client_model v0.2.0 // indirect
 	github.com/prometheus/common v0.18.0 // indirect
 	github.com/prometheus/procfs v0.6.0 // indirect
 	github.com/spf13/cast v1.3.1 // indirect
-	github.com/valyala/bytebufferpool v1.0.0 // indirect
-	github.com/valyala/fasthttp v1.31.0 // indirect
-	github.com/valyala/tcplisten v1.0.0 // indirect
+	github.com/ugorji/go/codec v1.2.6 // indirect
 	go.opentelemetry.io/otel v0.20.0 // indirect
 	go.opentelemetry.io/otel/metric v0.20.0 // indirect
 	go.opentelemetry.io/otel/trace v0.20.0 // indirect
@@ -59,8 +61,9 @@ require (
 	golang.org/x/net v0.0.0-20210510120150-4163338589ed // indirect
 	golang.org/x/sys v0.0.0-20211023085530-d6a326fbbf70 // indirect
 	golang.org/x/text v0.3.7 // indirect
-	google.golang.org/protobuf v1.23.0 // indirect
+	google.golang.org/protobuf v1.27.1 // indirect
 	gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
 	gopkg.in/tomb.v2 v2.0.0-20161208151619-d5d1b5820637 // indirect
+	gopkg.in/yaml.v2 v2.4.0 // indirect
 	k8s.io/apimachinery v0.0.0-20191123233150-4c4803ed55e3 // indirect
 )

model/account.go

@@ -2,12 +2,14 @@ package model
 
 import (
 	"github.com/Xhofe/alist/conf"
+	"github.com/robfig/cron/v3"
 	"time"
 )
 
 type Account struct {
-	Name           string `json:"name" gorm:"primaryKey" validate:"required"`
-	Index          int    `json:"index" validate:"required"`
+	ID             uint   `json:"id" gorm:"primaryKey"`
+	Name           string `json:"name" gorm:"unique" binding:"required"`
+	Index          int    `json:"index"`
 	Type           string `json:"type"`
 	Username       string `json:"username"`
 	Password       string `json:"password"`
@@ -28,25 +30,37 @@ 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{}
 
 // SaveAccount save account to database
-func SaveAccount(account Account) error {
+func SaveAccount(account *Account) error {
 	if err := conf.DB.Save(account).Error; err != nil {
 		return err
 	}
-	RegisterAccount(account)
+	RegisterAccount(*account)
 	return nil
 }
 
-func DeleteAccount(name string) error {
-	account := Account{
-		Name: name,
+func CreateAccount(account *Account) error {
+	if err := conf.DB.Create(account).Error; err != nil {
+		return err
 	}
+	RegisterAccount(*account)
+	return nil
+}
+
+func DeleteAccount(id uint) error {
+	var account Account
+	account.ID = id
+	if err := conf.DB.First(&account).Error; err != nil {
+		return err
+	}
+	name := account.Name
+	conf.Cron.Remove(cron.EntryID(account.CronId))
 	if err := conf.DB.Delete(&account).Error; err != nil {
 		return err
 	}

model/meta.go

@@ -1,17 +1,20 @@
 package model
 
-import "github.com/Xhofe/alist/conf"
+import (
+	"github.com/Xhofe/alist/conf"
+	log "github.com/sirupsen/logrus"
+)
 
 type Meta struct {
-	Path     string `json:"path" gorm:"primaryKey" validate:"required"`
+	ID       uint   `json:"id" gorm:"primaryKey"`
+	Path     string `json:"path" gorm:"unique" binding:"required"`
 	Password string `json:"password"`
 	Hide     string `json:"hide"`
 }
 
 func GetMetaByPath(path string) (*Meta, error) {
 	var meta Meta
-	meta.Path = path
-	err := conf.DB.First(&meta).Error
+	err := conf.DB.Where("path = ?", path).First(&meta).Error
 	if err != nil {
 		return nil, err
 	}
@@ -19,11 +22,16 @@ func GetMetaByPath(path string) (*Meta, error) {
 }
 
 func SaveMeta(meta Meta) error {
-	return conf.DB.Save(meta).Error
+	return conf.DB.Save(&meta).Error
 }
 
-func DeleteMeta(path string) error {
-	meta := Meta{Path: path}
+func CreateMeta(meta Meta) error {
+	return conf.DB.Create(&meta).Error
+}
+
+func DeleteMeta(id uint) error {
+	meta := Meta{ID: id}
+	log.Debugf("delete meta: %+v", meta)
 	return conf.DB.Delete(&meta).Error
 }