fix(pikpak): domain block and change to NET (#7350)

* fix(storage): store storages map when init storage panic

* fix(drivers): add nil check to drop method

.github/workflows/beta_release.yml

@@ -0,0 +1,124 @@
+name: beta release
+
+on:
+  push:
+    branches: [ 'main' ]
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
+permissions:
+  contents: write
+
+jobs:
+  changelog:
+    strategy:
+      matrix:
+        platform: [ ubuntu-latest ]
+        go-version: [ '1.21' ]
+    name: Beta Release Changelog
+    runs-on: ${{ matrix.platform }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Create or update ref
+        id: create-or-update-ref
+        uses: ovsds/create-or-update-ref-action@v1
+        with:
+          ref: tags/beta
+          sha: ${{ github.sha }}
+
+      - name: Delete beta tag
+        run: git tag -d beta
+        continue-on-error: true
+
+      - name: changelog # or changelogithub@0.12 if ensure the stable result
+        id: changelog
+        run: |
+          git tag -l
+          npx changelogithub --output CHANGELOG.md
+#          npx changelogen@latest --output CHANGELOG.md
+
+      - name: Upload assets
+        uses: softprops/action-gh-release@v2
+        with:
+          body_path: CHANGELOG.md
+          files: CHANGELOG.md
+          prerelease: true
+          tag_name: beta
+
+  release:
+    needs:
+      - changelog
+    strategy:
+      matrix:
+        include:
+          - target: '!(*musl*|*windows-arm64*|*android*|*freebsd*)' # xgo
+            hash: "md5"
+          - target: 'linux-!(arm*)-musl*' #musl-not-arm
+            hash: "md5-linux-musl"
+          - target: 'linux-arm*-musl*' #musl-arm
+            hash: "md5-linux-musl-arm"
+          - target: 'windows-arm64' #win-arm64
+            hash: "md5-windows-arm64"
+          - target: 'android-*' #android
+            hash: "md5-android"
+          - target: 'freebsd-*' #freebsd
+            hash: "md5-freebsd"
+
+    name: Beta Release
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Setup Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: '1.22'
+
+      - name: Setup web
+        run: bash build.sh dev web
+
+      - name: Build
+        id: test-action
+        uses: go-cross/cgo-actions@v1
+        with:
+          targets: ${{ matrix.target }}
+          musl-target-format: $os-$musl-$arch
+          out-dir: build
+
+      - name: Compress
+        run: |
+          bash build.sh zip ${{ matrix.hash }}
+          
+      - name: Upload assets
+        uses: softprops/action-gh-release@v2
+        with:
+          files: build/compress/*
+          prerelease: true
+          tag_name: beta
+          
+  desktop:
+    needs:
+      - release
+    name: Beta Release Desktop
+    runs-on: ubuntu-latest
+    steps:
+      - uses: peter-evans/create-or-update-comment@v4
+        with:
+          issue-number: 69
+          body: |
+            /release-beta
+            - triggered by @${{ github.actor }}
+            - commit sha: ${{ github.sha }}
+            - view files: https://github.com/alist-org/alist/tree/${{ github.sha }}
+          reactions: 'rocket'
+          token: ${{ secrets.MY_TOKEN }}
+          repository: alist-org/desktop-release

.github/workflows/build_docker.yml

@@ -23,6 +23,12 @@ jobs:
         uses: docker/metadata-action@v5
         with:
           images: xhofe/alist
+          tags: |
+            type=schedule
+            type=ref,event=branch
+            type=ref,event=tag
+            type=ref,event=pr
+            type=raw,value=beta,enable={{is_default_branch}}
 
       - name: Docker meta with ffmpeg
         id: meta-ffmpeg
@@ -30,7 +36,13 @@ jobs:
         with:
           images: xhofe/alist
           flavor: |
-            suffix=-ffmpeg,onlatest=true
+            suffix=-ffmpeg
+          tags: |
+            type=schedule
+            type=ref,event=branch
+            type=ref,event=tag
+            type=ref,event=pr
+            type=raw,value=beta,enable={{is_default_branch}}
 
       - uses: actions/setup-go@v5
         with:
@@ -41,7 +53,7 @@ jobs:
         uses: actions/cache@v4
         with:
           path: build/musl-libs
-          key: docker-musl-libs
+          key: docker-musl-libs-v2
 
       - name: Download Musl Library
         if: steps.cache-musl.outputs.cache-hit != 'true'
@@ -72,22 +84,19 @@ jobs:
           push: ${{ github.event_name == 'push' }}
           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
-
-      - name: Replace dockerfile tag
-        run: |
-          sed -i -e "s/latest/main/g" Dockerfile.ffmpeg
+          platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/386,linux/arm/v6,linux/s390x,linux/ppc64le,linux/riscv64
 
       - name: Build and push with ffmpeg
         id: docker_build_ffmpeg
         uses: docker/build-push-action@v6
         with:
           context: .
-          file: Dockerfile.ffmpeg
+          file: Dockerfile.ci
           push: ${{ github.event_name == 'push' }}
           tags: ${{ steps.meta-ffmpeg.outputs.tags }}
           labels: ${{ steps.meta-ffmpeg.outputs.labels }}
-          platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/386,linux/arm/v6,linux/s390x
+          build-args: INSTALL_FFMPEG=true
+          platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/386,linux/arm/v6,linux/s390x,linux/ppc64le,linux/riscv64
 
   build_docker_with_aria2:
     needs: build_docker

.github/workflows/changelog.yml

@@ -3,7 +3,7 @@ name: auto changelog
 on:
   push:
     tags:
-      - '*'
+      - 'v*'
 
 jobs:
   changelog:
@@ -14,6 +14,11 @@ jobs:
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
+
+      - name: Delete beta tag
+        run: git tag -d beta
+        continue-on-error: true
+
       - run: npx changelogithub # or changelogithub@0.12 if ensure the stable result
         env:
           GITHUB_TOKEN: ${{secrets.MY_TOKEN}}

.github/workflows/release_docker.yml

@@ -3,7 +3,7 @@ name: release_docker
 on:
   push:
     tags:
-      - '*'
+      - 'v*'
 
 jobs:
   release_docker:
@@ -22,7 +22,7 @@ jobs:
         uses: actions/cache@v4
         with:
           path: build/musl-libs
-          key: docker-musl-libs
+          key: docker-musl-libs-v2
 
       - name: Download Musl Library
         if: steps.cache-musl.outputs.cache-hit != 'true'
@@ -58,7 +58,7 @@ jobs:
           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
+          platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/386,linux/arm/v6,linux/s390x,linux/ppc64le,linux/riscv64
 
       - name: Docker meta with ffmpeg
         id: meta-ffmpeg
@@ -74,11 +74,12 @@ jobs:
         uses: docker/build-push-action@v6
         with:
           context: .
-          file: Dockerfile.ffmpeg
+          file: Dockerfile.ci
           push: true
           tags: ${{ steps.meta-ffmpeg.outputs.tags }}
           labels: ${{ steps.meta-ffmpeg.outputs.labels }}
-          platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/386,linux/arm/v6,linux/s390x
+          build-args: INSTALL_FFMPEG=true
+          platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/386,linux/arm/v6,linux/s390x,linux/ppc64le,linux/riscv64
 
   release_docker_with_aria2:
     needs: release_docker

.github/workflows/release_freebsd.yml

@@ -0,0 +1,34 @@
+name: release_freebsd
+
+on:
+  release:
+    types: [ published ]
+
+jobs:
+  release_freebsd:
+    strategy:
+      matrix:
+        platform: [ ubuntu-latest ]
+        go-version: [ '1.21' ]
+    name: Release
+    runs-on: ${{ matrix.platform }}
+    steps:
+
+      - name: Setup Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: ${{ matrix.go-version }}
+
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Build
+        run: |
+          bash build.sh release freebsd
+
+      - name: Upload assets
+        uses: softprops/action-gh-release@v2
+        with:
+          files: build/compress/*

Dockerfile

@@ -8,16 +8,23 @@ COPY ./ ./
 RUN bash build.sh release docker
 
 FROM alpine:edge
+
+ARG INSTALL_FFMPEG=false
 LABEL MAINTAINER="i@nn.ci"
-VOLUME /opt/alist/data/
+
 WORKDIR /opt/alist/
-COPY --from=builder /app/bin/alist ./
-COPY entrypoint.sh /entrypoint.sh
+
 RUN apk update && \
     apk upgrade --no-cache && \
     apk add --no-cache bash ca-certificates su-exec tzdata; \
-    chmod +x /entrypoint.sh && \
+    [ "$INSTALL_FFMPEG" = "true" ] && apk add --no-cache ffmpeg; \
     rm -rf /var/cache/apk/*
+
+COPY --from=builder /app/bin/alist ./
+COPY entrypoint.sh /entrypoint.sh
+RUN chmod +x /entrypoint.sh && /entrypoint.sh version
+
 ENV PUID=0 PGID=0 UMASK=022
+VOLUME /opt/alist/data/
 EXPOSE 5244 5245
 CMD [ "/entrypoint.sh" ]

Dockerfile.ci

@@ -1,16 +1,22 @@
 FROM alpine:edge
+
 ARG TARGETPLATFORM
+ARG INSTALL_FFMPEG=false
 LABEL MAINTAINER="i@nn.ci"
-VOLUME /opt/alist/data/
+
 WORKDIR /opt/alist/
-COPY /build/${TARGETPLATFORM}/alist ./
-COPY entrypoint.sh /entrypoint.sh
+
 RUN apk update && \
     apk upgrade --no-cache && \
     apk add --no-cache bash ca-certificates su-exec tzdata; \
-    chmod +x /entrypoint.sh && \
-    rm -rf /var/cache/apk/* && \
-    /entrypoint.sh version
+    [ "$INSTALL_FFMPEG" = "true" ] && apk add --no-cache ffmpeg; \
+    rm -rf /var/cache/apk/*
+
+COPY /build/${TARGETPLATFORM}/alist ./
+COPY entrypoint.sh /entrypoint.sh
+RUN chmod +x /entrypoint.sh && /entrypoint.sh version
+
 ENV PUID=0 PGID=0 UMASK=022
+VOLUME /opt/alist/data/
 EXPOSE 5244 5245
 CMD [ "/entrypoint.sh" ]

Dockerfile.ffmpeg

@@ -1,4 +0,0 @@
-FROM xhofe/alist:latest
-RUN apk update && \
-    apk add --no-cache ffmpeg \
-    rm -rf /var/cache/apk/*

README.md

@@ -117,7 +117,7 @@ https://alist.nn.ci/guide/sponsor.html
 
 - [VidHub](https://apps.apple.com/app/apple-store/id1659622164?pt=118612019&ct=alist&mt=8) - An elegant cloud video player within the Apple ecosystem. Support for iPhone, iPad, Mac, and Apple TV.
 - [亚洲云](https://www.asiayun.com/aff/QQCOOQKZ) - 高防服务器|服务器租用|福州高防|广东电信|香港服务器|美国服务器|海外服务器 - 国内靠谱的企业级云计算服务提供商 (sponsored Chinese API server)
-- [找资源](https://zhaoziyuan.pw/) - 阿里云盘资源搜索引擎
+- [找资源](http://zhaoziyuan2.cc/) - 阿里云盘资源搜索引擎
 
 ## Contributors
 

README_cn.md

@@ -115,7 +115,7 @@ AList 是一个开源软件，如果你碰巧喜欢这个项目，并希望我
 
 - [VidHub](https://apps.apple.com/app/apple-store/id1659622164?pt=118612019&ct=alist&mt=8) - 苹果生态下优雅的网盘视频播放器，iPhone，iPad，Mac，Apple TV全平台支持。
 - [亚洲云](https://www.asiayun.com/aff/QQCOOQKZ) - 高防服务器|服务器租用|福州高防|广东电信|香港服务器|美国服务器|海外服务器 - 国内靠谱的企业级云计算服务提供商 (国内API服务器赞助)
-- [找资源](https://zhaoziyuan.pw/) - 阿里云盘资源搜索引擎
+- [找资源](http://zhaoziyuan2.cc/) - 阿里云盘资源搜索引擎
 
 ## 贡献者
 

README_ja.md

@@ -117,7 +117,7 @@ https://alist.nn.ci/guide/sponsor.html
 
 - [VidHub](https://apps.apple.com/app/apple-store/id1659622164?pt=118612019&ct=alist&mt=8) - An elegant cloud video player within the Apple ecosystem. Support for iPhone, iPad, Mac, and Apple TV.
 - [亚洲云](https://www.asiayun.com/aff/QQCOOQKZ) - 高防服务器|服务器租用|福州高防|广东电信|香港服务器|美国服务器|海外服务器 - 国内靠谱的企业级云计算服务提供商 (sponsored Chinese API server)
-- [找资源](https://zhaoziyuan.pw/) - 阿里云盘资源搜索引擎
+- [找资源](http://zhaoziyuan2.cc/) - 阿里云盘资源搜索引擎
 
 ## コントリビューター
 

build.sh

@@ -8,6 +8,7 @@ if [ "$1" = "dev" ]; then
   version="dev"
   webVersion="dev"
 else
+  git tag -d beta
   version=$(git describe --abbrev=0 --tags)
   webVersion=$(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')
 fi
@@ -92,7 +93,7 @@ BuildDocker() {
 PrepareBuildDockerMusl() {
   mkdir -p build/musl-libs
   BASE="https://musl.cc/"
-  FILES=(x86_64-linux-musl-cross aarch64-linux-musl-cross i486-linux-musl-cross s390x-linux-musl-cross armv6-linux-musleabihf-cross armv7l-linux-musleabihf-cross)
+  FILES=(x86_64-linux-musl-cross aarch64-linux-musl-cross i486-linux-musl-cross s390x-linux-musl-cross armv6-linux-musleabihf-cross armv7l-linux-musleabihf-cross riscv64-linux-musl-cross powerpc64le-linux-musl-cross)
   for i in "${FILES[@]}"; do
     url="${BASE}${i}.tgz"
     lib_tgz="build/${i}.tgz"
@@ -111,8 +112,8 @@ BuildDockerMultiplatform() {
   docker_lflags="--extldflags '-static -fpic' $ldflags"
   export CGO_ENABLED=1
 
-  OS_ARCHES=(linux-amd64 linux-arm64 linux-386 linux-s390x)
-  CGO_ARGS=(x86_64-linux-musl-gcc aarch64-linux-musl-gcc i486-linux-musl-gcc s390x-linux-musl-gcc)
+  OS_ARCHES=(linux-amd64 linux-arm64 linux-386 linux-s390x linux-riscv64 linux-ppc64le)
+  CGO_ARGS=(x86_64-linux-musl-gcc aarch64-linux-musl-gcc i486-linux-musl-gcc s390x-linux-musl-gcc riscv64-linux-musl-gcc powerpc64le-linux-musl-gcc)
   for i in "${!OS_ARCHES[@]}"; do
     os_arch=${OS_ARCHES[$i]}
     cgo_cc=${CGO_ARGS[$i]}
@@ -232,6 +233,29 @@ BuildReleaseAndroid() {
   done
 }
 
+BuildReleaseFreeBSD() {
+  rm -rf .git/
+  mkdir -p "build/freebsd"
+  OS_ARCHES=(amd64 arm64 i386)
+  GO_ARCHES=(amd64 arm64 386)
+  CGO_ARGS=(x86_64-unknown-freebsd14.1 aarch64-unknown-freebsd14.1 i386-unknown-freebsd14.1)
+  for i in "${!OS_ARCHES[@]}"; do
+    os_arch=${OS_ARCHES[$i]}
+    cgo_cc="clang --target=${CGO_ARGS[$i]} --sysroot=/opt/freebsd/${os_arch}"
+    echo building for freebsd-${os_arch}
+    sudo mkdir -p "/opt/freebsd/${os_arch}"
+    wget -q https://download.freebsd.org/releases/${os_arch}/14.1-RELEASE/base.txz
+    sudo tar -xf ./base.txz -C /opt/freebsd/${os_arch}
+    rm base.txz
+    export GOOS=freebsd
+    export GOARCH=${GO_ARCHES[$i]}
+    export CC=${cgo_cc}
+    export CGO_ENABLED=1
+    export CGO_LDFLAGS="-fuse-ld=lld"
+    go build -o ./build/$appName-freebsd-$os_arch -ldflags="$ldflags" -tags=jsoniter .
+  done
+}
+
 MakeRelease() {
   cd build
   mkdir compress
@@ -250,6 +274,11 @@ MakeRelease() {
     tar -czvf compress/"$i".tar.gz alist
     rm -f alist
   done
+  for i in $(find . -type f -name "$appName-freebsd-*"); do
+    cp "$i" alist
+    tar -czvf compress/"$i".tar.gz alist
+    rm -f alist
+  done
   for i in $(find . -type f -name "$appName-windows-*"); do
     cp "$i" alist.exe
     zip compress/$(echo $i | sed 's/\.[^.]*$//').zip alist.exe
@@ -267,6 +296,8 @@ if [ "$1" = "dev" ]; then
     BuildDocker
   elif [ "$2" = "docker-multiplatform" ]; then
       BuildDockerMultiplatform
+  elif [ "$2" = "web" ]; then
+    echo "web only"
   else
     BuildDev
   fi
@@ -285,6 +316,11 @@ elif [ "$1" = "release" ]; then
   elif [ "$2" = "android" ]; then
     BuildReleaseAndroid
     MakeRelease "md5-android.txt"
+  elif [ "$2" = "freebsd" ]; then
+    BuildReleaseFreeBSD
+    MakeRelease "md5-freebsd.txt"
+  elif [ "$2" = "web" ]; then
+    echo "web only"
   else
     BuildRelease
     MakeRelease "md5.txt"
@@ -293,6 +329,8 @@ elif [ "$1" = "prepare" ]; then
   if [ "$2" = "docker-multiplatform" ]; then
     PrepareBuildDockerMusl
   fi
+elif [ "$1" = "zip" ]; then
+  MakeRelease "$2".txt
 else
   echo -e "Parameter error"
 fi

cmd/lang.go

@@ -139,7 +139,7 @@ var LangCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		err := os.MkdirAll("lang", 0777)
 		if err != nil {
-			utils.Log.Fatal("failed create folder: %s", err.Error())
+			utils.Log.Fatalf("failed create folder: %s", err.Error())
 		}
 		generateDriversJson()
 		generateSettingsJson()

drivers/115/appver.go

@@ -0,0 +1,43 @@
+package _115
+
+import (
+	driver115 "github.com/SheltonZhu/115driver/pkg/driver"
+	"github.com/alist-org/alist/v3/drivers/base"
+	log "github.com/sirupsen/logrus"
+)
+
+var (
+	md5Salt = "Qclm8MGWUv59TnrR0XPg"
+	appVer  = "27.0.5.7"
+)
+
+func (d *Pan115) getAppVersion() ([]driver115.AppVersion, error) {
+	result := driver115.VersionResp{}
+	resp, err := base.RestyClient.R().Get(driver115.ApiGetVersion)
+
+	err = driver115.CheckErr(err, &result, resp)
+	if err != nil {
+		return nil, err
+	}
+
+	return result.Data.GetAppVersions(), nil
+}
+
+func (d *Pan115) getAppVer() string {
+	// todo add some cache？
+	vers, err := d.getAppVersion()
+	if err != nil {
+		log.Warnf("[115] get app version failed: %v", err)
+		return appVer
+	}
+	for _, ver := range vers {
+		if ver.AppName == "win" {
+			return ver.Version
+		}
+	}
+	return appVer
+}
+
+func (d *Pan115) initAppVer() {
+	appVer = d.getAppVer()
+}

drivers/115/driver.go

@@ -3,6 +3,7 @@ package _115
 import (
 	"context"
 	"strings"
+	"sync"
 
 	driver115 "github.com/SheltonZhu/115driver/pkg/driver"
 	"github.com/alist-org/alist/v3/internal/driver"
@@ -16,8 +17,9 @@ import (
 type Pan115 struct {
 	model.Storage
 	Addition
-	client  *driver115.Pan115Client
-	limiter *rate.Limiter
+	client     *driver115.Pan115Client
+	limiter    *rate.Limiter
+	appVerOnce sync.Once
 }
 
 func (d *Pan115) Config() driver.Config {
@@ -29,6 +31,7 @@ func (d *Pan115) GetAddition() driver.Additional {
 }
 
 func (d *Pan115) Init(ctx context.Context) error {
+	d.appVerOnce.Do(d.initAppVer)
 	if d.LimitRate > 0 {
 		d.limiter = rate.NewLimiter(rate.Limit(d.LimitRate), 1)
 	}
@@ -76,28 +79,60 @@ func (d *Pan115) Link(ctx context.Context, file model.Obj, args model.LinkArgs)
 	return link, nil
 }
 
-func (d *Pan115) MakeDir(ctx context.Context, parentDir model.Obj, dirName string) error {
+func (d *Pan115) MakeDir(ctx context.Context, parentDir model.Obj, dirName string) (model.Obj, error) {
 	if err := d.WaitLimit(ctx); err != nil {
-		return err
+		return nil, err
 	}
-	if _, err := d.client.Mkdir(parentDir.GetID(), dirName); err != nil {
-		return err
+
+	result := driver115.MkdirResp{}
+	form := map[string]string{
+		"pid":   parentDir.GetID(),
+		"cname": dirName,
 	}
-	return nil
+	req := d.client.NewRequest().
+		SetFormData(form).
+		SetResult(&result).
+		ForceContentType("application/json;charset=UTF-8")
+
+	resp, err := req.Post(driver115.ApiDirAdd)
+
+	err = driver115.CheckErr(err, &result, resp)
+	if err != nil {
+		return nil, err
+	}
+	f, err := d.getNewFile(result.FileID)
+	if err != nil {
+		return nil, nil
+	}
+	return f, nil
 }
 
-func (d *Pan115) Move(ctx context.Context, srcObj, dstDir model.Obj) error {
+func (d *Pan115) Move(ctx context.Context, srcObj, dstDir model.Obj) (model.Obj, error) {
 	if err := d.WaitLimit(ctx); err != nil {
-		return err
+		return nil, err
 	}
-	return d.client.Move(dstDir.GetID(), srcObj.GetID())
+	if err := d.client.Move(dstDir.GetID(), srcObj.GetID()); err != nil {
+		return nil, err
+	}
+	f, err := d.getNewFile(srcObj.GetID())
+	if err != nil {
+		return nil, nil
+	}
+	return f, nil
 }
 
-func (d *Pan115) Rename(ctx context.Context, srcObj model.Obj, newName string) error {
+func (d *Pan115) Rename(ctx context.Context, srcObj model.Obj, newName string) (model.Obj, error) {
 	if err := d.WaitLimit(ctx); err != nil {
-		return err
+		return nil, err
 	}
-	return d.client.Rename(srcObj.GetID(), newName)
+	if err := d.client.Rename(srcObj.GetID(), newName); err != nil {
+		return nil, err
+	}
+	f, err := d.getNewFile((srcObj.GetID()))
+	if err != nil {
+		return nil, nil
+	}
+	return f, nil
 }
 
 func (d *Pan115) Copy(ctx context.Context, srcObj, dstDir model.Obj) error {
@@ -114,9 +149,9 @@ func (d *Pan115) Remove(ctx context.Context, obj model.Obj) error {
 	return d.client.Delete(obj.GetID())
 }
 
-func (d *Pan115) Put(ctx context.Context, dstDir model.Obj, stream model.FileStreamer, up driver.UpdateProgress) error {
+func (d *Pan115) Put(ctx context.Context, dstDir model.Obj, stream model.FileStreamer, up driver.UpdateProgress) (model.Obj, error) {
 	if err := d.WaitLimit(ctx); err != nil {
-		return err
+		return nil, err
 	}
 
 	var (
@@ -125,10 +160,10 @@ func (d *Pan115) Put(ctx context.Context, dstDir model.Obj, stream model.FileStr
 	)
 
 	if ok, err := d.client.UploadAvailable(); err != nil || !ok {
-		return err
+		return nil, err
 	}
 	if stream.GetSize() > d.client.UploadMetaInfo.SizeLimit {
-		return driver115.ErrUploadTooLarge
+		return nil, driver115.ErrUploadTooLarge
 	}
 	//if digest, err = d.client.GetDigestResult(stream); err != nil {
 	//	return err
@@ -141,22 +176,22 @@ func (d *Pan115) Put(ctx context.Context, dstDir model.Obj, stream model.FileStr
 	}
 	reader, err := stream.RangeRead(http_range.Range{Start: 0, Length: hashSize})
 	if err != nil {
-		return err
+		return nil, err
 	}
 	preHash, err := utils.HashReader(utils.SHA1, reader)
 	if err != nil {
-		return err
+		return nil, err
 	}
 	preHash = strings.ToUpper(preHash)
 	fullHash := stream.GetHash().GetHash(utils.SHA1)
 	if len(fullHash) <= 0 {
 		tmpF, err := stream.CacheFullInTempFile()
 		if err != nil {
-			return err
+			return nil, err
 		}
 		fullHash, err = utils.HashFile(utils.SHA1, tmpF)
 		if err != nil {
-			return err
+			return nil, err
 		}
 	}
 	fullHash = strings.ToUpper(fullHash)
@@ -165,20 +200,36 @@ func (d *Pan115) Put(ctx context.Context, dstDir model.Obj, stream model.FileStr
 	// note that 115 add timeout for rapid-upload,
 	// and "sig invalid" err is thrown even when the hash is correct after timeout.
 	if fastInfo, err = d.rapidUpload(stream.GetSize(), stream.GetName(), dirID, preHash, fullHash, stream); err != nil {
-		return err
+		return nil, err
 	}
 	if matched, err := fastInfo.Ok(); err != nil {
-		return err
+		return nil, err
 	} else if matched {
-		return nil
+		f, err := d.getNewFileByPickCode(fastInfo.PickCode)
+		if err != nil {
+			return nil, nil
+		}
+		return f, nil
 	}
 
+	var uploadResult *UploadResult
 	// 闪传失败，上传
-	if stream.GetSize() <= utils.KB { // 文件大小小于1KB，改用普通模式上传
-		return d.client.UploadByOSS(&fastInfo.UploadOSSParams, stream, dirID)
+	if stream.GetSize() <= 10*utils.MB { // 文件大小小于10MB，改用普通模式上传
+		if uploadResult, err = d.UploadByOSS(&fastInfo.UploadOSSParams, stream, dirID); err != nil {
+			return nil, err
+		}
+	} else {
+		// 分片上传
+		if uploadResult, err = d.UploadByMultipart(&fastInfo.UploadOSSParams, stream.GetSize(), stream, dirID); err != nil {
+			return nil, err
+		}
 	}
-	// 分片上传
-	return d.UploadByMultipart(&fastInfo.UploadOSSParams, stream.GetSize(), stream, dirID)
+
+	file, err := d.getNewFile(uploadResult.Data.FileID)
+	if err != nil {
+		return nil, nil
+	}
+	return file, nil
 }
 
 func (d *Pan115) OfflineList(ctx context.Context) ([]*driver115.OfflineTask, error) {

drivers/115/meta.go

@@ -8,18 +8,18 @@ import (
 type Addition struct {
 	Cookie       string  `json:"cookie" type:"text" help:"one of QR code token and cookie required"`
 	QRCodeToken  string  `json:"qrcode_token" type:"text" help:"one of QR code token and cookie required"`
-	QRCodeSource string  `json:"qrcode_source" type:"select" options:"web,android,ios,linux,mac,windows,tv" default:"linux" help:"select the QR code device, default linux"`
-	PageSize     int64   `json:"page_size" type:"number" default:"56" help:"list api per page size of 115 driver"`
-	LimitRate    float64 `json:"limit_rate" type:"number" default:"2" help:"limit all api request rate (1r/[limit_rate]s)"`
+	QRCodeSource string  `json:"qrcode_source" type:"select" options:"web,android,ios,tv,alipaymini,wechatmini,qandroid" default:"linux" help:"select the QR code device, default linux"`
+	PageSize     int64   `json:"page_size" type:"number" default:"1000" help:"list api per page size of 115 driver"`
+	LimitRate    float64 `json:"limit_rate" type:"number" default:"2" help:"limit all api request rate ([limit]r/1s)"`
 	driver.RootID
 }
 
 var config = driver.Config{
 	Name:        "115 Cloud",
 	DefaultRoot: "0",
-	//OnlyProxy:   true,
-	//OnlyLocal:         true,
-	//NoOverwriteUpload: true,
+	// OnlyProxy:   true,
+	// OnlyLocal:         true,
+	// NoOverwriteUpload: true,
 }
 
 func init() {

drivers/115/types.go

@@ -1,10 +1,11 @@
 package _115
 
 import (
+	"time"
+
 	"github.com/SheltonZhu/115driver/pkg/driver"
 	"github.com/alist-org/alist/v3/internal/model"
 	"github.com/alist-org/alist/v3/pkg/utils"
-	"time"
 )
 
 var _ model.Obj = (*FileObj)(nil)
@@ -20,3 +21,18 @@ func (f *FileObj) CreateTime() time.Time {
 func (f *FileObj) GetHash() utils.HashInfo {
 	return utils.NewHashInfo(utils.SHA1, f.Sha1)
 }
+
+type UploadResult struct {
+	driver.BasicResp
+	Data struct {
+		PickCode string `json:"pick_code"`
+		FileSize int    `json:"file_size"`
+		FileID   string `json:"file_id"`
+		ThumbURL string `json:"thumb_url"`
+		Sha1     string `json:"sha1"`
+		Aid      int    `json:"aid"`
+		FileName string `json:"file_name"`
+		Cid      string `json:"cid"`
+		IsVideo  int    `json:"is_video"`
+	} `json:"data"`
+}

drivers/115_share/meta.go

@@ -8,8 +8,8 @@ import (
 type Addition struct {
 	Cookie       string  `json:"cookie" type:"text" help:"one of QR code token and cookie required"`
 	QRCodeToken  string  `json:"qrcode_token" type:"text" help:"one of QR code token and cookie required"`
-	QRCodeSource string  `json:"qrcode_source" type:"select" options:"web,android,ios,linux,mac,windows,tv" default:"linux" help:"select the QR code device, default linux"`
-	PageSize     int64   `json:"page_size" type:"number" default:"20" help:"list api per page size of 115 driver"`
+	QRCodeSource string  `json:"qrcode_source" type:"select" options:"web,android,ios,tv,alipaymini,wechatmini,qandroid" default:"linux" help:"select the QR code device, default linux"`
+	PageSize     int64   `json:"page_size" type:"number" default:"1000" help:"list api per page size of 115 driver"`
 	LimitRate    float64 `json:"limit_rate" type:"number" default:"2" help:"limit all api request rate (1r/[limit_rate]s)"`
 	ShareCode    string  `json:"share_code" type:"text" required:"true" help:"share code of 115 share link"`
 	ReceiveCode  string  `json:"receive_code" type:"text" required:"true" help:"receive code of 115 share link"`

drivers/123/driver.go

@@ -82,6 +82,7 @@ func (d *Pan123) Link(ctx context.Context, file model.Obj, args model.LinkArgs)
 			"type":      f.Type,
 		}
 		resp, err := d.request(DownloadInfo, http.MethodPost, func(req *resty.Request) {
+			
 			req.SetBody(data).SetHeaders(headers)
 		}, nil)
 		if err != nil {