💚 fix release actions

.github/workflows/build.yml

@@ -25,35 +25,64 @@ jobs:
         with:
           node-version: '16'
 
-#      - name: Setup docker
-#        uses: docker-practice/actions-setup-docker@master
-
       - name: Checkout
         uses: actions/checkout@v2
         with:
           ref: v2
           path: alist
 
-      - name: Checkout web repo
-        uses: actions/checkout@v2
-        with:
-          repository: Xhofe/alist-web
-          ref: v2
-          path: alist-web
-
       - name: Set up xgo
         run: |
-          docker pull techknowlogick/xgo:latest
-          go install src.techknowlogick.com/xgo@latest
+          docker pull crazymax/xgo:latest
+          go install github.com/crazy-max/xgo@latest
           sudo apt install upx
 
       - name: Build
         run: |
           mv alist/build.sh .
-          bash build.sh
+          bash build.sh web
+          mv dist/* alist/public
+          bash build.sh build
 
       - name: Upload artifact
         uses: actions/upload-artifact@v2
         with:
           name: artifact
           path: alist/build
+  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
+          mv dist/* public
+      - 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/s390x

.github/workflows/docker.yml

@@ -1,48 +0,0 @@
-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/s390x

.github/workflows/release.yml

@@ -19,14 +19,6 @@ jobs:
         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:
@@ -35,35 +27,57 @@ jobs:
           persist-credentials: false
           fetch-depth: 0
 
-      - name: Checkout web repo
-        uses: actions/checkout@v2
-        with:
-          repository: Xhofe/alist-web
-          ref: v2
-          path: alist-web
-          persist-credentials: false
-          fetch-depth: 0
-
       - name: Set up xgo
         run: |
-          docker pull techknowlogick/xgo:latest
-          go install src.techknowlogick.com/xgo@latest
+          docker pull crazymax/xgo:latest
+          go install github.com/crazy-max/xgo@latest
           sudo apt install upx
 
       - name: Build
         run: |
           mv alist/build.sh .
+          bash build.sh cdn
+          mv dist/* alist/public
           bash build.sh release
 
-      - 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
         with:
-          files: alist/build/compress/*
+          files: alist/build/compress/*
+  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 cdn
+          mv dist/* public
+      - 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/s390x

README.md

@@ -18,20 +18,23 @@ English | [中文](./README_cn.md)
 
 ## Features
 
-- [x] multiple storage
+- [x] Multiple storage
   - [x] Local storage
-  - [x] [aliyundrive](https://www.aliyundrive.com/)
-  - [x] OneDrive / Sharepoint ([global](https://www.office.com/), [cn](https://portal.partner.microsoftonline.cn),de,us）
+  - [x] [Aliyundrive](https://www.aliyundrive.com/)
+  - [x] OneDrive / Sharepoint ([global](https://www.office.com/), [cn](https://portal.partner.microsoftonline.cn),de,us)
   - [x] [189cloud](https://cloud.189.cn)
   - [x] [GoogleDrive](https://drive.google.com/)
   - [x] [123pan](https://www.123pan.com/)
-  - [x] [lanzou](https://pc.woozooo.com/)
+  - [x] [Lanzou](https://pc.woozooo.com/)
   - [x] [Alist](https://github.com/Xhofe/alist)
   - [x] FTP
   - [x] [PikPak](https://www.mypikpak.com/)
   - [x] [ShandianPan](https://shandianpan.com/)
   - [x] [S3](https://aws.amazon.com/s3/)
   - [x] WebDav
+  - [x] Teambition([China](https://www.teambition.com/ ),[International](https://us.teambition.com/ ))
+  - [x] [Mediatrack](https://www.mediatrack.cn/)
+  - [x] [139yun](https://yun.139.com/) (Personal, Family)
 - [x] Easy to deploy and out-of-the-box
 - [x] File preview (PDF, markdown, code, plain text, ...)
 - [x] Image preview in gallery mode
@@ -42,12 +45,12 @@ English | [中文](./README_cn.md)
 - [x] Dark mode
 - [x] I18n
 - [x] Protected routes (password protection and authentication) 
-- [x] WebDav (A small part readonly, see https://alist-doc.nn.ci/en/docs/intro for details)
+- [x] WebDav (see https://alist-doc.nn.ci/en/docs/webdav for details)
 - [x] [Docker Deploy](https://hub.docker.com/r/xhofe/alist)
 - [x] Cloudflare workers proxy
 - [x] File/Folder package download
 - [x] Support video list playback and subtitles(ass,srt,vtt)
-- [x] Web upload(Can allow visitors to upload)
+- [x] Web upload(Can allow visitors to upload) and delete
 
 ## Discussion
 
@@ -65,7 +68,7 @@ Available at: <https://alist.nn.ci>.
 
 ## License
 
-The `AList` is open-source software licensed under the MIT license.
+The `AList` is open-source software licensed under the AGPL-3.0 license.
 
 ---
 

README_cn.md

@@ -31,6 +31,9 @@
   - [x] [闪电盘](https://shandianpan.com/)
   - [x] [S3](https://aws.amazon.com/cn/s3/)
   - [x] WebDav
+  - [x] Teambition（[中国](https://www.teambition.com/ )，[国际](https://us.teambition.com/ )）
+  - [x] [分秒帧](https://www.mediatrack.cn/)
+  - [x] [和彩云](https://yun.139.com/) (个人云, 家庭云)
 - [x] 部署方便，开箱即用
 - [x] 文件预览（PDF、markdown、代码、纯文本……）
 - [x] 画廊模式下的图像预览
@@ -41,12 +44,12 @@
 - [x] 黑暗模式
 - [x] 国际化
 - [x] 受保护的路由（密码保护和身份验证）
-- [x] WebDav（少部分只读，具体见https://alist-doc.nn.ci/docs/intro ）
+- [x] WebDav（具体见https://alist-doc.nn.ci/docs/webdav ）
 - [x] [Docker 部署](https://hub.docker.com/r/xhofe/alist)
 - [x] Cloudflare workers 中转
 - [x] 文件/文件夹打包下载
 - [x] 支持视频列表播放和字幕(ass,srt,vtt)
-- [x] 网页上传(可以允许访客上传)
+- [x] 网页上传(可以允许访客上传)，删除
 
 ## 讨论
 
@@ -64,7 +67,7 @@
 
 ##  许可
 
-`AList` 是在 MIT 许可下许可的开源软件。
+`AList` 是在 AGPL-3.0 许可下许可的开源软件。
 
 ---
 

bootstrap/conf.go

@@ -1,7 +1,6 @@
 package bootstrap
 
 import (
-	"encoding/json"
 	"github.com/Xhofe/alist/conf"
 	"github.com/Xhofe/alist/utils"
 	log "github.com/sirupsen/logrus"
@@ -28,9 +27,18 @@ func InitConf() {
 		log.Fatalf("reading config file error:%s", err.Error())
 	}
 	conf.Conf = new(conf.Config)
-	err = json.Unmarshal(config, conf.Conf)
+	err = utils.Json.Unmarshal(config, conf.Conf)
 	if err != nil {
 		log.Fatalf("load config error: %s", err.Error())
 	}
 	log.Debugf("config:%+v", conf.Conf)
+	// update config.json struct
+	confBody, err := utils.Json.Marshal(conf.Conf)
+	if err != nil {
+		log.Fatalf("marshal config error:%s", err.Error())
+	}
+	err = ioutil.WriteFile(conf.ConfigFile, confBody, 0777)
+	if err != nil {
+		log.Fatalf("update config struct error: %s", err.Error())
+	}
 }

bootstrap/model.go

@@ -19,6 +19,7 @@ import (
 
 func InitModel() {
 	log.Infof("init model...")
+	var err error
 	databaseConfig := conf.Conf.Database
 	newLogger := logger.New(
 		log2.New(os.Stdout, "\r\n", log2.LstdFlags),
@@ -72,9 +73,13 @@ func InitModel() {
 		log.Fatalf("not supported database type: %s", databaseConfig.Type)
 	}
 	log.Infof("auto migrate model...")
-	err := conf.DB.AutoMigrate(&model.SettingItem{}, &model.Account{}, &model.Meta{})
+	if databaseConfig.Type == "mysql" {
+		err = conf.DB.Set("gorm:table_options", "ENGINE=InnoDB CHARSET=utf8mb4").
+			AutoMigrate(&model.SettingItem{}, &model.Account{}, &model.Meta{})
+	} else {
+		err = conf.DB.AutoMigrate(&model.SettingItem{}, &model.Account{}, &model.Meta{})
+	}
 	if err != nil {
 		log.Fatalf("failed to auto migrate")
 	}
 }
-

bootstrap/setting.go

@@ -131,6 +131,14 @@ func InitSettings() {
 			Access:      model.PRIVATE,
 			Group:       model.FRONT,
 		},
+		{
+			Key:         "home emoji",
+			Value:       "🏠",
+			Type:        "string",
+			Description: "emoji in front of home in nav",
+			Access:      model.PUBLIC,
+			Group:       model.FRONT,
+		},
 		{
 			Key:         "animation",
 			Value:       "true",
@@ -195,6 +203,22 @@ func InitSettings() {
 			Access:      model.PRIVATE,
 			Group:       model.BACK,
 		},
+		{
+			Key:         "load type",
+			Value:       "all",
+			Type:        "select",
+			Values:      "all,load more,auto load more,pagination",
+			Description: "Not recommended to choose to auto load more, it has bugs now",
+			Access:      model.PUBLIC,
+			Group:       model.FRONT,
+		},
+		{
+			Key:    "default page size",
+			Value:  "30",
+			Type:   "number",
+			Access: model.PUBLIC,
+			Group:  model.FRONT,
+		},
 	}
 	for i, _ := range settings {
 		v := settings[i]
@@ -207,7 +231,7 @@ func InitSettings() {
 					log.Fatalf("failed write setting: %s", err.Error())
 				}
 			} else {
-				log.Fatal("can't get setting: %s", err.Error())
+				log.Fatalf("can't get setting: %s", err.Error())
 			}
 		} else {
 			//o.Version = conf.GitTag

build.sh

@@ -1,17 +1,24 @@
 #!/bin/bash
-if [ "$1" == "web" ]; then
-  git clone https://github.com/Xhofe/alist-web.git
-  cd alist-web || exit
+
+# 构建前端,在当前目录产生一个dist文件夹
+BUILD_WEB() {
+  git clone https://github.com/alist-org/alist-web.git
+  cd alist-web
   yarn
   yarn build
-  mv dist/* ../public
+  mv dist ..
   cd ..
-  exit 0
-fi
+  rm -rf alist-web
+}
 
-go env -w GOPROXY=https://goproxy.cn,https://mirrors.aliyun.com/goproxy/,https://goproxy.io,direct
+CDN_WEB() {
+  curl -L https://github.com/alist-org/alist-web/releases/latest/download/dist.tar.gz -o dist.tar.gz
+  tar -zxvf dist.tar.gz
+  rm -f dist.tar.gz
+}
 
-if [ "$1" == "docker" ]; then
+# 在DOCKER中构建
+BUILD_DOCKER() {
   appName="alist"
   builtAt="$(date +'%F %T %z')"
   goVersion=$(go version | sed 's/go version //')
@@ -25,40 +32,20 @@ if [ "$1" == "docker" ]; then
 -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
+  "
+  go build -o ./bin/alist -ldflags="$ldflags" -tags=jsoniter alist.go
+}
 
-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 ..
-  mv dist/index.html ../alist/public
-  #  构建local
-  yarn build
-  mv dist/index.html dist/local.html
-  mv dist/* ../alist/public
-else
-  yarn build
-  mv dist/* ../alist/public
-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)
-
-echo "build version: $gitTag"
-
-ldflags="\
+BUILD() {
+  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)
+  echo "build version: $gitTag"
+  ldflags="\
 -w -s \
 -X 'github.com/Xhofe/alist/conf.BuiltAt=$builtAt' \
 -X 'github.com/Xhofe/alist/conf.GoVersion=$goVersion' \
@@ -67,44 +54,47 @@ ldflags="\
 -X 'github.com/Xhofe/alist/conf.GitTag=$gitTag' \
 "
 
-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
-    mv md5.txt compress
-    for i in `find . -type f -name "$appName-linux-*"`
-    do
-      tar -czvf compress/"$i".tar.gz "$i"
-    done
-    for i in `find . -type f -name "$appName-darwin-*"`
-    do
-      tar -czvf compress/"$i".tar.gz "$i"
-    done
-    for i in `find . -type f -name "$appName-windows-*"`
-    do
-      zip compress/$(echo $i | sed 's/\.[^.]*$//').zip "$i"
-    done
-fi
-cd ../..
+  if [ "$1" == "release" ]; then
+    xgo -out "$appName" -ldflags="$ldflags" -tags=jsoniter .
+  else
+    xgo -targets=linux/amd64,windows/amd64 -out alist -ldflags="$ldflags" -tags=jsoniter .
+  fi
+  mkdir "build"
+  mv alist-* build
+  cd build
+  upx -9 ./*
+  find . -type f -print0 | xargs -0 md5sum >md5.txt
+  cat md5.txt
+  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
+RELEASE() {
+  cd alist/build
+  mkdir compress
+  mv md5.txt compress
+  for i in $(find . -type f -name "$appName-linux-*"); do
+    tar -czvf compress/"$i".tar.gz "$i"
+  done
+  for i in $(find . -type f -name "$appName-darwin-*"); do
+    tar -czvf compress/"$i".tar.gz "$i"
+  done
+  for i in $(find . -type f -name "$appName-windows-*"); do
+    zip compress/$(echo $i | sed 's/\.[^.]*$//').zip "$i"
+  done
+  cd ../..
+}
+
+if [ "$1" = "web" ]; then
+  BUILD_WEB
+elif [ "$1" = "cdn" ]; then
+  CDN_WEB
+elif [ "$1" = "docker" ]; then
+  BUILD_DOCKER
+elif [ "$1" = "build" ]; then
+  BUILD build
+elif [ "$1" = "release" ]; then
+  BUILD release
+  RELEASE
+else
+  echo -e "${RED_COLOR} 错误的命令${RES}"
+fi

conf/var.go

@@ -5,6 +5,7 @@ import (
 	"github.com/eko/gocache/v2/cache"
 	"github.com/robfig/cron/v3"
 	"gorm.io/gorm"
+	"strconv"
 )
 
 var (
@@ -33,21 +34,63 @@ var (
 		"js", "md", "json", "conf", "ini", "vue", "php", "py", "bat", "gitignore", "yml",
 		"go", "sh", "c", "cpp", "h", "hpp", "tsx", "vtt", "srt", "ass"}
 	OfficeTypes = []string{"doc", "docx", "xls", "xlsx", "ppt", "pptx", "pdf"}
-	VideoTypes  = []string{"mp4", "mkv", "avi", "mov", "rmvb", "webm"}
+	VideoTypes  = []string{"mp4", "mkv", "avi", "mov", "rmvb", "webm", "flv"}
 	AudioTypes  = []string{"mp3", "flac", "ogg", "m4a", "wav"}
 	ImageTypes  = []string{"jpg", "tiff", "jpeg", "png", "gif", "bmp", "svg", "ico"}
 )
 
-// settings
+var settingsMap = make(map[string]string, 0)
+
+func Set(key string, value string) {
+	settingsMap[key] = value
+}
+
+func GetStr(key string) string {
+	value, ok := settingsMap[key]
+	if !ok {
+		return ""
+	}
+	return value
+}
+
+func GetBool(key string) bool {
+	value, ok := settingsMap[key]
+	if !ok {
+		return false
+	}
+	return value == "true"
+}
+
+func GetInt(key string, defaultV int) int {
+	value, ok := settingsMap[key]
+	if !ok {
+		return defaultV
+	}
+	v, err := strconv.Atoi(value)
+	if err != nil {
+		return defaultV
+	}
+	return v
+}
+
+var (
+	LoadSettings = []string{
+		"check parent folder", "check down link", "WebDAV username", "WebDAV password",
+		"Visitor WebDAV username", "Visitor WebDAV password",
+		"default page size", "load type",
+	}
+)
+
 var (
 	RawIndexHtml string
+	ManageHtml   string
 	IndexHtml    string
-	CheckParent  bool
-	CheckDown    bool
+	Token        string
 
-	Token              string
-	DavUsername        string
-	DavPassword        string
-	VisitorDavUsername string
-	VisitorDavPassword string
+	//CheckParent        bool
+	//CheckDown          bool
+	//DavUsername        string
+	//DavPassword        string
+	//VisitorDavUsername string
+	//VisitorDavPassword string
 )

drivers/123/123.go

@@ -1,8 +1,6 @@
 package _23
 
 import (
-	"crypto/hmac"
-	"crypto/sha256"
 	"errors"
 	"fmt"
 	"github.com/Xhofe/alist/conf"
@@ -12,7 +10,6 @@ import (
 	"github.com/go-resty/resty/v2"
 	jsoniter "github.com/json-iterator/go"
 	log "github.com/sirupsen/logrus"
-	"math/rand"
 	"path/filepath"
 	"strconv"
 	"time"
@@ -55,6 +52,18 @@ type Pan123DownResp struct {
 	} `json:"data"`
 }
 
+type UploadResp struct {
+	BaseResp
+	Data struct {
+		AccessKeyId     string `json:"AccessKeyId"`
+		Bucket          string `json:"Bucket"`
+		Key             string `json:"Key"`
+		SecretAccessKey string `json:"SecretAccessKey"`
+		SessionToken    string `json:"SessionToken"`
+		FileId          int64  `json:"FileId"`
+	} `json:"data"`
+}
+
 func (driver Pan123) Login(account *model.Account) error {
 	url := "https://www.123pan.com/api/user/sign_in"
 	if account.APIProxyUrl != "" {
@@ -205,27 +214,16 @@ func (driver Pan123) GetFile(path string, account *model.Account) (*Pan123File,
 	return nil, base.ErrPathNotFound
 }
 
-func RandStr(length int) string {
-	str := "123456789abcdefghijklmnopqrstuvwxyz"
-	bytes := []byte(str)
-	var result []byte
-	rand.Seed(time.Now().UnixNano() + int64(rand.Intn(100)))
-	for i := 0; i < length; i++ {
-		result = append(result, bytes[rand.Intn(len(bytes))])
-	}
-	return string(result)
-}
-
-func HMAC(message string, secret string) string {
-	key := []byte(secret)
-	h := hmac.New(sha256.New, key)
-	h.Write([]byte(message))
-	//	fmt.Println(h.Sum(nil))
-	//sha := hex.EncodeToString(h.Sum(nil))
-	//	fmt.Println(sha)
-	//return sha
-	return string(h.Sum(nil))
-}
+//func HMAC(message string, secret string) string {
+//	key := []byte(secret)
+//	h := hmac.New(sha256.New, key)
+//	h.Write([]byte(message))
+//	//	fmt.Println(h.Sum(nil))
+//	//sha := hex.EncodeToString(h.Sum(nil))
+//	//	fmt.Println(sha)
+//	//return sha
+//	return string(h.Sum(nil))
+//}
 
 func init() {
 	base.RegisterDriver(&Pan123{})

drivers/139/139.go

@@ -0,0 +1,175 @@
+package _39
+
+import (
+	"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"
+	"path"
+	"time"
+)
+
+func (driver Cloud139) Request(pathname string, method int, headers, query, form map[string]string, data interface{}, resp interface{}, account *model.Account) ([]byte, error) {
+	url := "https://yun.139.com" + pathname
+	req := base.RestyClient.R()
+	randStr := randomStr(16)
+	ts := time.Now().Format("2006-01-02 15:04:05")
+	log.Debugf("%+v", data)
+	body, err := utils.Json.Marshal(data)
+	if err != nil {
+		return nil, err
+	}
+	sign := calSign(string(body), ts, randStr)
+	svcType := "1"
+	if isFamily(account) {
+		svcType = "2"
+	}
+	req.SetHeaders(map[string]string{
+		"Accept":         "application/json, text/plain, */*",
+		"CMS-DEVICE":     "default",
+		"Cookie":         account.AccessToken,
+		"mcloud-channel": "1000101",
+		"mcloud-client":  "10701",
+		//"mcloud-route": "001",
+		"mcloud-sign": fmt.Sprintf("%s,%s,%s", ts, randStr, sign),
+		//"mcloud-skey":"",
+		"mcloud-version":      "6.6.0",
+		"Origin":              "https://yun.139.com",
+		"Referer":             "https://yun.139.com/w/",
+		"x-DeviceInfo":        "||9|6.6.0|chrome|95.0.4638.69|uwIy75obnsRPIwlJSd7D9GhUvFwG96ce||macos 10.15.2||zh-CN|||",
+		"x-huawei-channelSrc": "10000034",
+		"x-inner-ntwk":        "2",
+		"x-m4c-caller":        "PC",
+		"x-m4c-src":           "10002",
+		"x-SvcType":           svcType,
+	})
+	if headers != nil {
+		req.SetHeaders(headers)
+	}
+	if query != nil {
+		req.SetQueryParams(query)
+	}
+	if form != nil {
+		req.SetFormData(form)
+	}
+	if data != nil {
+		req.SetBody(data)
+	}
+	var e BaseResp
+	//var err error
+	var res *resty.Response
+	req.SetResult(&e)
+	switch method {
+	case base.Get:
+		res, err = req.Get(url)
+	case base.Post:
+		res, err = req.Post(url)
+	case base.Delete:
+		res, err = req.Delete(url)
+	case base.Patch:
+		res, err = req.Patch(url)
+	case base.Put:
+		res, err = req.Put(url)
+	default:
+		return nil, base.ErrNotSupport
+	}
+	if err != nil {
+		return nil, err
+	}
+	log.Debugln(res.String())
+	if !e.Success {
+		return nil, errors.New(e.Message)
+	}
+	if resp != nil {
+		err = utils.Json.Unmarshal(res.Body(), resp)
+		if err != nil {
+			return nil, err
+		}
+	}
+	return res.Body(), nil
+}
+
+func (driver Cloud139) Post(pathname string, data interface{}, resp interface{}, account *model.Account) ([]byte, error) {
+	return driver.Request(pathname, base.Post, nil, nil, nil, data, resp, account)
+}
+
+func (driver Cloud139) GetFiles(catalogID string, account *model.Account) ([]model.File, error) {
+	start := 0
+	limit := 100
+	files := make([]model.File, 0)
+	for {
+		data := base.Json{
+			"catalogID":       catalogID,
+			"sortDirection":   1,
+			"startNumber":     start + 1,
+			"endNumber":       start + limit,
+			"filterType":      0,
+			"catalogSortType": 0,
+			"contentSortType": 0,
+			"commonAccountInfo": base.Json{
+				"account":     account.Username,
+				"accountType": 1,
+			},
+		}
+		var resp GetDiskResp
+		_, err := driver.Post("/orchestration/personalCloud/catalog/v1.0/getDisk", data, &resp, account)
+		if err != nil {
+			return nil, err
+		}
+		for _, catalog := range resp.Data.GetDiskResult.CatalogList {
+			f := model.File{
+				Id:        catalog.CatalogID,
+				Name:      catalog.CatalogName,
+				Size:      0,
+				Type:      conf.FOLDER,
+				Driver:    driver.Config().Name,
+				UpdatedAt: getTime(catalog.UpdateTime),
+			}
+			files = append(files, f)
+		}
+		for _, content := range resp.Data.GetDiskResult.ContentList {
+			f := model.File{
+				Id:        content.ContentID,
+				Name:      content.ContentName,
+				Size:      int64(content.ContentSize),
+				Type:      utils.GetFileType(path.Ext(content.ContentName)),
+				Driver:    driver.Config().Name,
+				UpdatedAt: getTime(content.UpdateTime),
+				Thumbnail: content.ThumbnailURL,
+				//Thumbnail: content.BigthumbnailURL,
+			}
+			files = append(files, f)
+		}
+		if start+limit >= resp.Data.GetDiskResult.NodeCount {
+			break
+		}
+		start += limit
+	}
+	return files, nil
+}
+
+func (driver Cloud139) GetLink(contentId string, account *model.Account) (string, error) {
+	data := base.Json{
+		"appName":   "",
+		"contentID": contentId,
+		"commonAccountInfo": base.Json{
+			"account":     "18627147660",
+			"accountType": 1,
+		},
+	}
+	res, err := driver.Post("/orchestration/personalCloud/uploadAndDownload/v1.0/downloadRequest",
+		data, nil, account)
+	if err != nil {
+		return "", err
+	}
+	return jsoniter.Get(res, "data", "downloadURL").ToString(), nil
+}
+
+func init() {
+	base.RegisterDriver(&Cloud139{})
+}

drivers/139/family.go

@@ -0,0 +1,74 @@
+package _39
+
+import (
+	"github.com/Xhofe/alist/conf"
+	"github.com/Xhofe/alist/drivers/base"
+	"github.com/Xhofe/alist/model"
+	"github.com/Xhofe/alist/utils"
+	jsoniter "github.com/json-iterator/go"
+	"path"
+)
+
+func (driver Cloud139) familyGetFiles(catalogID string, account *model.Account) ([]model.File, error) {
+	pageNum := 1
+	files := make([]model.File, 0)
+	for {
+		data := newJson(base.Json{
+			"catalogID":       catalogID,
+			"contentSortType": 0,
+			"pageInfo": base.Json{
+				"pageNum":  pageNum,
+				"pageSize": 100,
+			},
+			"sortDirection": 1,
+		}, account)
+
+		var resp QueryContentListResp
+		_, err := driver.Post("/orchestration/familyCloud/content/v1.0/queryContentList", data, &resp, account)
+		if err != nil {
+			return nil, err
+		}
+		for _, catalog := range resp.Data.CloudCatalogList {
+			f := model.File{
+				Id:        catalog.CatalogID,
+				Name:      catalog.CatalogName,
+				Size:      0,
+				Type:      conf.FOLDER,
+				Driver:    driver.Config().Name,
+				UpdatedAt: getTime(catalog.LastUpdateTime),
+			}
+			files = append(files, f)
+		}
+		for _, content := range resp.Data.CloudContentList {
+			f := model.File{
+				Id:        content.ContentID,
+				Name:      content.ContentName,
+				Size:      int64(content.ContentSize),
+				Type:      utils.GetFileType(path.Ext(content.ContentName)),
+				Driver:    driver.Config().Name,
+				UpdatedAt: getTime(content.LastUpdateTime),
+				Thumbnail: content.ThumbnailURL,
+				//Thumbnail: content.BigthumbnailURL,
+			}
+			files = append(files, f)
+		}
+		if 100*pageNum > resp.Data.TotalCount {
+			break
+		}
+		pageNum++
+	}
+	return files, nil
+}
+
+func (driver Cloud139) familyLink(contentId string, account *model.Account) (string, error) {
+	data := newJson(base.Json{
+		"contentID": contentId,
+		//"path":"",
+	}, account)
+	res, err := driver.Post("/orchestration/familyCloud/content/v1.0/getFileDownLoadURL",
+		data, nil, account)
+	if err != nil {
+		return "", err
+	}
+	return jsoniter.Get(res, "data", "downloadURL").ToString(), nil
+}

drivers/139/types.go

@@ -0,0 +1,187 @@
+package _39
+
+type BaseResp struct {
+	Success bool   `json:"success"`
+	Code    string `json:"code"`
+	Message string `json:"message"`
+}
+
+type Catalog struct {
+	CatalogID   string `json:"catalogID"`
+	CatalogName string `json:"catalogName"`
+	//CatalogType     int         `json:"catalogType"`
+	//CreateTime      string      `json:"createTime"`
+	UpdateTime string `json:"updateTime"`
+	//IsShared        bool        `json:"isShared"`
+	//CatalogLevel    int         `json:"catalogLevel"`
+	//ShareDoneeCount int         `json:"shareDoneeCount"`
+	//OpenType        int         `json:"openType"`
+	//ParentCatalogID string      `json:"parentCatalogId"`
+	//DirEtag         int         `json:"dirEtag"`
+	//Tombstoned      int         `json:"tombstoned"`
+	//ProxyID         interface{} `json:"proxyID"`
+	//Moved           int         `json:"moved"`
+	//IsFixedDir      int         `json:"isFixedDir"`
+	//IsSynced        interface{} `json:"isSynced"`
+	//Owner           string      `json:"owner"`
+	//Modifier        interface{} `json:"modifier"`
+	//Path            string      `json:"path"`
+	//ShareType       int         `json:"shareType"`
+	//SoftLink        interface{} `json:"softLink"`
+	//ExtProp1        interface{} `json:"extProp1"`
+	//ExtProp2        interface{} `json:"extProp2"`
+	//ExtProp3        interface{} `json:"extProp3"`
+	//ExtProp4        interface{} `json:"extProp4"`
+	//ExtProp5        interface{} `json:"extProp5"`
+	//ETagOprType     int         `json:"ETagOprType"`
+}
+
+type Content struct {
+	ContentID   string `json:"contentID"`
+	ContentName string `json:"contentName"`
+	//ContentSuffix   string      `json:"contentSuffix"`
+	ContentSize int `json:"contentSize"`
+	//ContentDesc     string      `json:"contentDesc"`
+	//ContentType     int         `json:"contentType"`
+	//ContentOrigin   int         `json:"contentOrigin"`
+	UpdateTime string `json:"updateTime"`
+	//CommentCount    int         `json:"commentCount"`
+	ThumbnailURL string `json:"thumbnailURL"`
+	//BigthumbnailURL string      `json:"bigthumbnailURL"`
+	//PresentURL      string      `json:"presentURL"`
+	//PresentLURL     string      `json:"presentLURL"`
+	//PresentHURL     string      `json:"presentHURL"`
+	//ContentTAGList  interface{} `json:"contentTAGList"`
+	//ShareDoneeCount int         `json:"shareDoneeCount"`
+	//Safestate       int         `json:"safestate"`
+	//Transferstate   int         `json:"transferstate"`
+	//IsFocusContent  int         `json:"isFocusContent"`
+	//UpdateShareTime interface{} `json:"updateShareTime"`
+	//UploadTime      string      `json:"uploadTime"`
+	//OpenType        int         `json:"openType"`
+	//AuditResult     int         `json:"auditResult"`
+	//ParentCatalogID string      `json:"parentCatalogId"`
+	//Channel         string      `json:"channel"`
+	//GeoLocFlag      string      `json:"geoLocFlag"`
+	//Digest          string      `json:"digest"`
+	//Version         string      `json:"version"`
+	//FileEtag        string      `json:"fileEtag"`
+	//FileVersion     string      `json:"fileVersion"`
+	//Tombstoned      int         `json:"tombstoned"`
+	//ProxyID         string      `json:"proxyID"`
+	//Moved           int         `json:"moved"`
+	//MidthumbnailURL string      `json:"midthumbnailURL"`
+	//Owner           string      `json:"owner"`
+	//Modifier        string      `json:"modifier"`
+	//ShareType       int         `json:"shareType"`
+	//ExtInfo         struct {
+	//	Uploader string `json:"uploader"`
+	//	Address  string `json:"address"`
+	//} `json:"extInfo"`
+	//Exif struct {
+	//	CreateTime    string      `json:"createTime"`
+	//	Longitude     interface{} `json:"longitude"`
+	//	Latitude      interface{} `json:"latitude"`
+	//	LocalSaveTime interface{} `json:"localSaveTime"`
+	//} `json:"exif"`
+	//CollectionFlag interface{} `json:"collectionFlag"`
+	//TreeInfo       interface{} `json:"treeInfo"`
+	//IsShared       bool        `json:"isShared"`
+	//ETagOprType    int         `json:"ETagOprType"`
+}
+
+type GetDiskResp struct {
+	BaseResp
+	Data struct {
+		Result struct {
+			ResultCode string      `json:"resultCode"`
+			ResultDesc interface{} `json:"resultDesc"`
+		} `json:"result"`
+		GetDiskResult struct {
+			ParentCatalogID string    `json:"parentCatalogID"`
+			NodeCount       int       `json:"nodeCount"`
+			CatalogList     []Catalog `json:"catalogList"`
+			ContentList     []Content `json:"contentList"`
+			IsCompleted     int       `json:"isCompleted"`
+		} `json:"getDiskResult"`
+	} `json:"data"`
+}
+
+type UploadResp struct {
+	BaseResp
+	Data struct {
+		Result struct {
+			ResultCode string      `json:"resultCode"`
+			ResultDesc interface{} `json:"resultDesc"`
+		} `json:"result"`
+		UploadResult struct {
+			UploadTaskID     string `json:"uploadTaskID"`
+			RedirectionURL   string `json:"redirectionUrl"`
+			NewContentIDList []struct {
+				ContentID     string `json:"contentID"`
+				ContentName   string `json:"contentName"`
+				IsNeedUpload  string `json:"isNeedUpload"`
+				FileEtag      int64  `json:"fileEtag"`
+				FileVersion   int64  `json:"fileVersion"`
+				OverridenFlag int    `json:"overridenFlag"`
+			} `json:"newContentIDList"`
+			CatalogIDList interface{} `json:"catalogIDList"`
+			IsSlice       interface{} `json:"isSlice"`
+		} `json:"uploadResult"`
+	} `json:"data"`
+}
+
+type CloudContent struct {
+	ContentID        string      `json:"contentID"`
+	Modifier         string      `json:"modifier"`
+	Nickname         string      `json:"nickname"`
+	CloudNickName    string      `json:"cloudNickName"`
+	ContentName      string      `json:"contentName"`
+	ContentType      int         `json:"contentType"`
+	ContentSuffix    string      `json:"contentSuffix"`
+	ContentSize      int         `json:"contentSize"`
+	ContentDesc      string      `json:"contentDesc"`
+	CreateTime       string      `json:"createTime"`
+	Shottime         interface{} `json:"shottime"`
+	LastUpdateTime   string      `json:"lastUpdateTime"`
+	ThumbnailURL     string      `json:"thumbnailURL"`
+	MidthumbnailURL  string      `json:"midthumbnailURL"`
+	BigthumbnailURL  string      `json:"bigthumbnailURL"`
+	PresentURL       string      `json:"presentURL"`
+	PresentLURL      string      `json:"presentLURL"`
+	PresentHURL      string      `json:"presentHURL"`
+	ParentCatalogID  string      `json:"parentCatalogID"`
+	Uploader         string      `json:"uploader"`
+	UploaderNickName string      `json:"uploaderNickName"`
+	TreeInfo         interface{} `json:"treeInfo"`
+	UpdateTime       interface{} `json:"updateTime"`
+	ExtInfo          struct {
+		Uploader string `json:"uploader"`
+	} `json:"extInfo"`
+	EtagOprType interface{} `json:"etagOprType"`
+}
+
+type CloudCatalog struct {
+	CatalogID       string `json:"catalogID"`
+	CatalogName     string `json:"catalogName"`
+	CloudID         string `json:"cloudID"`
+	CreateTime      string `json:"createTime"`
+	LastUpdateTime  string `json:"lastUpdateTime"`
+	Creator         string `json:"creator"`
+	CreatorNickname string `json:"creatorNickname"`
+}
+
+type QueryContentListResp struct {
+	BaseResp
+	Data struct {
+		Result struct {
+			ResultCode string `json:"resultCode"`
+			ResultDesc string `json:"resultDesc"`
+		} `json:"result"`
+		Path             string         `json:"path"`
+		CloudContentList []CloudContent `json:"cloudContentList"`
+		CloudCatalogList []CloudCatalog `json:"cloudCatalogList"`
+		TotalCount       int            `json:"totalCount"`
+		RecallContent    interface{}    `json:"recallContent"`
+	} `json:"data"`
+}

drivers/139/util.go

@@ -0,0 +1,81 @@
+package _39
+
+import (
+	"encoding/base64"
+	"github.com/Xhofe/alist/drivers/base"
+	"github.com/Xhofe/alist/model"
+	"github.com/Xhofe/alist/utils"
+	"math/rand"
+	"net/url"
+	"sort"
+	"strconv"
+	"strings"
+	"time"
+)
+
+func randomStr(n int) string {
+	builder := strings.Builder{}
+	t := "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"
+	for i := 0; i < n; i++ {
+		r := rand.Intn(len(t))
+		builder.WriteString(t[r : r+1])
+	}
+	return builder.String()
+}
+
+func encodeURIComponent(str string) string {
+	r := url.QueryEscape(str)
+	r = strings.Replace(r, "+", "%20", -1)
+	return r
+}
+
+func calSign(body, ts, randStr string) string {
+	body = strings.ReplaceAll(body, "\n", "")
+	body = strings.ReplaceAll(body, " ", "")
+	body = encodeURIComponent(body)
+	strs := strings.Split(body, "")
+	sort.Strings(strs)
+	body = strings.Join(strs, "")
+	body = base64.StdEncoding.EncodeToString([]byte(body))
+	res := utils.GetMD5Encode(body) + utils.GetMD5Encode(ts+":"+randStr)
+	res = strings.ToUpper(utils.GetMD5Encode(res))
+	return res
+}
+
+func getTime(t string) *time.Time {
+	stamp, _ := time.ParseInLocation("20060102150405", t, time.Local)
+	return &stamp
+}
+
+func isFamily(account *model.Account) bool {
+	return account.InternalType == "Family"
+}
+
+func unicode(str string) string {
+	textQuoted := strconv.QuoteToASCII(str)
+	textUnquoted := textQuoted[1 : len(textQuoted)-1]
+	return textUnquoted
+}
+
+func MergeMap(mObj ...map[string]interface{}) map[string]interface{} {
+	newObj := map[string]interface{}{}
+	for _, m := range mObj {
+		for k, v := range m {
+			newObj[k] = v
+		}
+	}
+	return newObj
+}
+
+func newJson(data map[string]interface{}, account *model.Account) map[string]interface{} {
+	common := map[string]interface{}{
+		"catalogType": 3,
+		"cloudID":     account.SiteId,
+		"cloudType":   1,
+		"commonAccountInfo": base.Json{
+			"account":     account.Username,
+			"accountType": 1,
+		},
+	}
+	return MergeMap(data, common)
+}