Merge remote-tracking branch 'upstream/main' into deps/resty-v3

.github/ISSUE_TEMPLATE/00-bug_report_zh.yml

@@ -25,11 +25,11 @@ body:
         - label: |
             我确认我的描述清晰，语法礼貌，能帮助开发者快速定位问题，并符合社区规则。
         - label: |
-            我已确认阅读了[OpenList文档](https://doc.oplist.org)。
+            我已确认阅读了[OpenList文档](https://docs.oplist.org)。
         - label: |
             我已确认没有重复的问题或讨论。
         - label: |
-            我已确认是`OpenList`的问题，而不是其他原因（例如 [网络](https://doc.oplist.org/faq/howto#tls-handshake-timeout-read-connection-reset-by-peer-dns-lookup-failed-connect-connection-refused-client-timeout-exceeded-while-awaiting-headers-no-such-host-1) ，`依赖`或`操作`）。
+            我已确认是`OpenList`的问题，而不是其他原因（例如 [网络](https://docs.oplist.org/zh/faq/howto.html#tls-handshake-timeout-read-connection-reset-by-peer-dns-lookup-failed-connect-connection-refused-client-timeout-exceeded-while-awaiting-headers-no-such-host) ，`依赖`或`操作`）。
         - label: |
             我认为此问题必须由`OpenList`处理，而非第三方。
         - label: |
@@ -72,7 +72,7 @@ body:
     attributes:
       label: 日志（可选）
       description: |
-        请复制粘贴错误日志，或者截图。(可隐藏隐私字段) [查看方法](https://doc.oplist.org/faq/howto#%E5%A6%82%E4%BD%95%E5%BF%AB%E9%80%9F%E5%AE%9A%E4%BD%8Dbug)
+        请复制粘贴错误日志，或者截图。(可隐藏隐私字段)
   - type: textarea
     id: reproduction
     attributes:

.github/ISSUE_TEMPLATE/01-bug_report_en.yml

@@ -25,11 +25,11 @@ body:
         - label: |
             I confirm my description is clear, polite, helps developers quickly locate the issue, and complies with community rules.
         - label: |
-            I have read the [OpenList documentation](https://doc.oplist.org).
+            I have read the [OpenList documentation](https://docs.oplist.org).
         - label: |
             I confirm there are no duplicate issues or discussions.
         - label: |
-            I confirm this is an `OpenList` issue, not caused by other reasons (such as [network](https://doc.oplist.org/faq/howto#tls-handshake-timeout-read-connection-reset-by-peer-dns-lookup-failed-connect-connection-refused-client-timeout-exceeded-while-awaiting-headers-no-such-host-1), dependencies, or operation).
+            I confirm this is an `OpenList` issue, not caused by other reasons (such as [network](https://docs.oplist.org/faq/howto.html#tls-handshake-timeout-read-connection-reset-by-peer-dns-lookup-failed-connect-connection-refused-client-timeout-exceeded-while-awaiting-headers-no-such-host), dependencies, or operation).
         - label: |
             I believe this issue must be handled by `OpenList` and not by a third party.
         - label: |
@@ -72,7 +72,7 @@ body:
     attributes:
       label: Logs (optional)
       description: |
-        Please copy and paste any relevant log output or screenshots. (You may mask sensitive fields) [Guide](https://doc.oplist.org/faq/howto#how-to-quickly-locate-bugs)
+        Please copy and paste any relevant log output or screenshots. (You may mask sensitive fields)
   - type: textarea
     id: reproduction
     attributes:

.github/ISSUE_TEMPLATE/02-feature_request_zh.yml

@@ -19,7 +19,7 @@ body:
         - label: |
             我确认我的描述清晰，语法礼貌，能帮助开发者快速定位问题，并符合社区规则。
         - label: |
-            我已确认阅读了[OpenList文档](https://doc.oplist.org)。
+            我已确认阅读了[OpenList文档](https://docs.oplist.org)。
         - label: |
             我已确认没有重复的问题或讨论。
         - label: |

.github/ISSUE_TEMPLATE/03-feature_request_en.yml

@@ -19,7 +19,7 @@ body:
         - label: |
             I confirm my description is clear, polite, helps developers quickly locate the issue, and complies with community rules.
         - label: |
-            I have read the [OpenList documentation](https://doc.oplist.org).
+            I have read the [OpenList documentation](https://docs.oplist.org).
         - label: |
             I confirm there are no duplicate issues or discussions.
         - label: |

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,56 +0,0 @@
-<!--
-  Provide a general summary of your changes in the Title above.
-  The PR title must start with `feat(): `, `docs(): `, `fix(): `, `style(): `, or `refactor(): `, `chore(): `. For example: `feat(component): add new feature`.
-  If it spans multiple components, use the main component as the prefix and enumerate in the title, describe in the body.
--->
-<!--
-  在上方标题中提供您更改的总体摘要。
-  PR 标题需以 `feat(): `, `docs(): `, `fix(): `, `style(): `, `refactor(): `, `chore(): ` 其中之一开头，例如：`feat(component): 新增功能`。
-  如果跨多个组件，请使用主要组件作为前缀，并在标题中枚举、描述中说明。
--->
-
-## Description / 描述
-
-<!-- Describe your changes in detail -->
-<!-- 详细描述您的更改 -->
-
-## Motivation and Context / 背景
-
-<!-- Why is this change required? What problem does it solve? -->
-<!-- 为什么需要此更改？它解决了什么问题？ -->
-
-<!-- If it fixes an open issue, please link to the issue here. -->
-<!-- 如果修复了一个打开的issue，请在此处链接到该issue -->
-
-Closes #XXXX
-
-<!-- or -->
-<!-- 或者 -->
-
-Relates to #XXXX
-
-## How Has This Been Tested? / 测试
-
-<!-- Please describe in detail how you tested your changes. -->
-<!-- 请详细描述您如何测试更改 -->
-
-## Checklist / 检查清单
-
-<!-- Go over all the following points, and put an `x` in all the boxes that apply. -->
-<!-- 检查以下所有要点，并在所有适用的框中打`x` -->
-
-<!-- If you're unsure about any of these, don't hesitate to ask. We're here to help! -->
-<!-- 如果您对其中任何一项不确定，请不要犹豫提问。我们会帮助您！ -->
-
-- [ ] I have read the [CONTRIBUTING](https://github.com/OpenListTeam/OpenList/blob/main/CONTRIBUTING.md) document.
-      我已阅读 [CONTRIBUTING](https://github.com/OpenListTeam/OpenList/blob/main/CONTRIBUTING.md) 文档。
-- [ ] I have formatted my code with `go fmt` or [prettier](https://prettier.io/).
-      我已使用 `go fmt` 或 [prettier](https://prettier.io/) 格式化提交的代码。
-- [ ] I have added appropriate labels to this PR (or mentioned needed labels in the description if lacking permissions).
-      我已为此 PR 添加了适当的标签（如无权限或需要的标签不存在，请在描述中说明，管理员将后续处理）。
-- [ ] I have requested review from relevant code authors using the "Request review" feature when applicable.
-      我已在适当情况下使用"Request review"功能请求相关代码作者进行审查。
-- [ ] I have updated the repository accordingly (If it’s needed).
-      我已相应更新了相关仓库（若适用）。
-  - [ ] [OpenList-Frontend](https://github.com/OpenListTeam/OpenList-Frontend) #XXXX
-  - [ ] [OpenList-Docs](https://github.com/OpenListTeam/OpenList-Docs) #XXXX

.github/workflows/beta_release.yml

@@ -14,8 +14,12 @@ permissions:
 
 jobs:
   changelog:
+    strategy:
+      matrix:
+        platform: [ubuntu-latest]
+        go-version: ["1.21"]
     name: Beta Release Changelog
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.platform }}
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -61,7 +65,7 @@ jobs:
     strategy:
       matrix:
         include:
-          - target: "!(*musl*|*windows-arm64*|*windows7-*|*android*|*freebsd*)" # xgo and loongarch
+          - target: "!(*musl*|*windows-arm64*|*android*|*freebsd*)" # xgo
             hash: "md5"
           - target: "linux-!(arm*)-musl*" #musl-not-arm
             hash: "md5-linux-musl"
@@ -69,8 +73,6 @@ jobs:
             hash: "md5-linux-musl-arm"
           - target: "windows-arm64" #win-arm64
             hash: "md5-windows-arm64"
-          - target: "windows7-*" #win7
-            hash: "md5-windows7"
           - target: "android-*" #android
             hash: "md5-android"
           - target: "freebsd-*" #freebsd
@@ -87,29 +89,27 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v5
         with:
-          go-version: "1.25.0"
+          go-version: "1.22"
 
       - name: Setup web
         run: bash build.sh dev web
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          FRONTEND_REPO: ${{ vars.FRONTEND_REPO }}
 
       - name: Build
-        uses: OpenListTeam/cgo-actions@v1.2.2
+        uses: OpenListTeam/cgo-actions@v1.1.2
         with:
           targets: ${{ matrix.target }}
           musl-target-format: $os-$musl-$arch
-          github-token: ${{ secrets.GITHUB_TOKEN }}
           out-dir: build
           output: openlist-$target$ext
           musl-base-url: "https://github.com/OpenListTeam/musl-compilers/releases/latest/download/"
           x-flags: |
             github.com/OpenListTeam/OpenList/v4/internal/conf.BuiltAt=$built_at
-            github.com/OpenListTeam/OpenList/v4/internal/conf.GitAuthor=The OpenList Projects Contributors <noreply@openlist.team>
+            github.com/OpenListTeam/OpenList/v4/internal/conf.GitAuthor=OpenList
             github.com/OpenListTeam/OpenList/v4/internal/conf.GitCommit=$git_commit
             github.com/OpenListTeam/OpenList/v4/internal/conf.Version=$tag
-            github.com/OpenListTeam/OpenList/v4/internal/conf.WebVersion=rolling
+            github.com/OpenListTeam/OpenList/v4/internal/conf.WebVersion=dev
 
       - name: Compress
         run: |

.github/workflows/build.yml

@@ -1,6 +1,8 @@
 name: Test Build
 
 on:
+  push:
+    branches: ["main"]
   pull_request:
     branches: ["main"]
   workflow_dispatch:
@@ -13,6 +15,7 @@ jobs:
   build:
     strategy:
       matrix:
+        platform: [ubuntu-latest]
         target:
           - darwin-amd64
           - darwin-arm64
@@ -21,8 +24,8 @@ jobs:
           - linux-amd64-musl
           - windows-arm64
           - android-arm64
-    name: Build ${{ matrix.target }}
-    runs-on: ubuntu-latest
+    name: Build
+    runs-on: ${{ matrix.platform }}
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -33,31 +36,28 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v5
         with:
-          go-version: "1.25.0"
+          go-version: "1.22"
 
       - name: Setup web
         run: bash build.sh dev web
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          FRONTEND_REPO: ${{ vars.FRONTEND_REPO }}
 
       - name: Build
-        uses: OpenListTeam/cgo-actions@v1.2.2
+        uses: OpenListTeam/cgo-actions@v1.1.2
         with:
           targets: ${{ matrix.target }}
           musl-target-format: $os-$musl-$arch
-          github-token: ${{ secrets.GITHUB_TOKEN }}
           out-dir: build
           x-flags: |
             github.com/OpenListTeam/OpenList/v4/internal/conf.BuiltAt=$built_at
-            github.com/OpenListTeam/OpenList/v4/internal/conf.GitAuthor=The OpenList Projects Contributors <noreply@openlist.team>
+            github.com/OpenListTeam/OpenList/v4/internal/conf.GitAuthor=OpenList
             github.com/OpenListTeam/OpenList/v4/internal/conf.GitCommit=$git_commit
             github.com/OpenListTeam/OpenList/v4/internal/conf.Version=$tag
-            github.com/OpenListTeam/OpenList/v4/internal/conf.WebVersion=rolling
-          output: openlist$ext
+            github.com/OpenListTeam/OpenList/v4/internal/conf.WebVersion=dev
 
       - name: Upload artifact
         uses: actions/upload-artifact@v4
         with:
-          name: openlist_${{ steps.short-sha.outputs.sha }}_${{ matrix.target }}
+          name: openlist_${{ env.SHA }}_${{ matrix.target }}
           path: build/*

.github/workflows/changelog.yml

@@ -1,4 +1,4 @@
-name: Release Automatic changelog
+name: Automatic changelog
 
 on:
   push:

.github/workflows/release.yml

@@ -8,34 +8,24 @@ permissions:
   contents: write
 
 jobs:
-  # Set release to prerelease first
-  prerelease:
-    name: Set Prerelease
-    runs-on: ubuntu-latest
-    steps:
-      - name: Prerelease
-        uses: irongut/EditRelease@v1.2.0
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          id: ${{ github.event.release.id }}
-          prerelease: true
-
-  # Main release job for all platforms
   release:
-    needs: prerelease
     strategy:
       matrix:
-        build-type: [ 'standard', 'lite' ]
-        target-platform: [ '', 'android', 'freebsd', 'linux_musl', 'linux_musl_arm' ]
-    name: Release ${{ matrix.target-platform && format('{0} ', matrix.target-platform) || '' }}${{ matrix.build-type == 'lite' && 'Lite' || '' }}
-    runs-on: ubuntu-latest
+        platform: [ ubuntu-latest ]
+        go-version: [ '1.21' ]
+    name: Release
+    runs-on: ${{ matrix.platform }}
     steps:
 
       - name: Free Disk Space (Ubuntu)
-        if: matrix.target-platform == ''
         uses: jlumbroso/free-disk-space@main
         with:
+          # this might remove tools that are actually needed,
+          # if set to "true" but frees about 6 GB
           tool-cache: false
+          
+          # all of these default to true, but feel free to set to
+          # "false" if necessary for your workflow
           android: true
           dotnet: true
           haskell: true
@@ -43,10 +33,17 @@ jobs:
           docker-images: true
           swap-storage: true
 
+      - name: Prerelease
+        uses: irongut/EditRelease@v1.2.0
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          id: ${{ github.event.release.id }}
+          prerelease: true
+
       - name: Setup Go
         uses: actions/setup-go@v5
         with:
-          go-version: '1.25.0'
+          go-version: ${{ matrix.go-version }}
 
       - name: Checkout
         uses: actions/checkout@v4
@@ -54,7 +51,6 @@ jobs:
           fetch-depth: 0
 
       - name: Install dependencies
-        if: matrix.target-platform == ''
         run: |
           sudo snap install zig --classic --beta
           docker pull crazymax/xgo:latest
@@ -63,15 +59,74 @@ jobs:
 
       - name: Build
         run: |
-          bash build.sh release ${{ matrix.build-type == 'lite' && 'lite' || '' }} ${{ matrix.target-platform }}
+          bash build.sh release
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Upload assets
+        uses: softprops/action-gh-release@v2
+        with:
+          files: build/compress/*
+          prerelease: false
+
+  release-lite:
+    strategy:
+      matrix:
+        platform: [ ubuntu-latest ]
+        go-version: [ '1.21' ]
+    name: Release Lite
+    runs-on: ${{ matrix.platform }}
+    steps:
+
+      - name: Free Disk Space (Ubuntu)
+        uses: jlumbroso/free-disk-space@main
+        with:
+          # this might remove tools that are actually needed,
+          # if set to "true" but frees about 6 GB
+          tool-cache: false
+          
+          # all of these default to true, but feel free to set to
+          # "false" if necessary for your workflow
+          android: true
+          dotnet: true
+          haskell: true
+          large-packages: true
+          docker-images: true
+          swap-storage: true
+
+      - name: Prerelease
+        uses: irongut/EditRelease@v1.2.0
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          id: ${{ github.event.release.id }}
+          prerelease: true
+
+      - 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: Install dependencies
+        run: |
+          sudo snap install zig --classic --beta
+          docker pull crazymax/xgo:latest
+          go install github.com/crazy-max/xgo@latest
+          sudo apt install upx
+
+      - name: Build
+        run: |
+          bash build.sh release lite
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          FRONTEND_REPO: ${{ vars.FRONTEND_REPO }}
 
       - name: Upload assets
         uses: softprops/action-gh-release@v2
         with:
           files: build/compress/*
           prerelease: false
-          tag_name: ${{ github.event.release.tag_name }}
 

.github/workflows/release_android.yml

@@ -0,0 +1,69 @@
+name: Release builds (Android)
+
+on:
+  release:
+    types: [ published ]
+    
+permissions:
+  contents: write
+
+jobs:
+  release_android:
+    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 android
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Upload assets
+        uses: softprops/action-gh-release@v2
+        with:
+          files: build/compress/*
+
+  release_android_lite:
+    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 lite android
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Upload assets
+        uses: softprops/action-gh-release@v2
+        with:
+          files: build/compress/*

.github/workflows/release_docker.yml

@@ -31,8 +31,11 @@ env:
   REGISTRY: ghcr.io
   ARTIFACT_NAME: 'binaries_docker_release'
   ARTIFACT_NAME_LITE: 'binaries_docker_release_lite'
-  RELEASE_PLATFORMS: 'linux/amd64,linux/arm64,linux/arm/v7,linux/386,linux/arm/v6,linux/ppc64le,linux/riscv64,linux/loong64' ### Temporarily disable Docker builds for linux/s390x architectures for unknown reasons.
+  RELEASE_PLATFORMS: 'linux/amd64,linux/arm64,linux/arm/v7,linux/386,linux/arm/v6,linux/s390x,linux/ppc64le,linux/riscv64'
   IMAGE_PUSH: ${{ github.event_name == 'push' || github.event_name == 'workflow_dispatch' }}
+  IMAGE_IS_PROD: ${{ github.ref_type == 'tag' || github.event.inputs.as_latest == 'true' }}
+  IMAGE_TAGS_BETA: |
+    type=raw,value=beta,enable={{is_default_branch}}
 
 permissions:
   packages: write
@@ -47,7 +50,7 @@ jobs:
 
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.25.0'
+          go-version: 'stable'
 
       - name: Cache Musl
         id: cache-musl
@@ -62,11 +65,17 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
+      - name: Build go binary (beta)
+        if: env.IMAGE_IS_PROD != 'true'
+        run: bash build.sh beta docker-multiplatform
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
       - name: Build go binary (release)
+        if: env.IMAGE_IS_PROD == 'true'
         run: bash build.sh release docker-multiplatform
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          FRONTEND_REPO: ${{ vars.FRONTEND_REPO }}
 
       - name: Upload artifacts
         uses: actions/upload-artifact@v4
@@ -79,7 +88,7 @@ jobs:
             !build/musl-libs/**
 
   build_binary_lite:
-    name: Build Binaries for Docker Release (Lite)
+    name: Build Binaries for Docker Release
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -87,7 +96,7 @@ jobs:
 
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.25.0'
+          go-version: 'stable'
 
       - name: Cache Musl
         id: cache-musl
@@ -102,11 +111,17 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
+      - name: Build go binary (beta)
+        if: env.IMAGE_IS_PROD != 'true'
+        run: bash build.sh beta lite docker-multiplatform
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
       - name: Build go binary (release)
+        if: env.IMAGE_IS_PROD == 'true'
         run: bash build.sh release lite docker-multiplatform
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          FRONTEND_REPO: ${{ vars.FRONTEND_REPO }}
 
       - name: Upload artifacts
         uses: actions/upload-artifact@v4
@@ -127,19 +142,15 @@ jobs:
         image: ["latest", "ffmpeg", "aria2", "aio"]
         include:
           - image: "latest"
-            base_image_tag: "base"
             build_arg: ""
             tag_favor: ""
           - image: "ffmpeg"
-            base_image_tag: "ffmpeg"
             build_arg: INSTALL_FFMPEG=true
             tag_favor: "suffix=-ffmpeg,onlatest=true"
           - image: "aria2"
-            base_image_tag: "aria2"
             build_arg: INSTALL_ARIA2=true
             tag_favor: "suffix=-aria2,onlatest=true"
           - image: "aio"
-            base_image_tag: "aio"
             build_arg: |
               INSTALL_FFMPEG=true
               INSTALL_ARIA2=true
@@ -170,7 +181,7 @@ jobs:
         if: env.IMAGE_PUSH == 'true'
         uses: docker/login-action@v3
         with:
-          username: ${{ vars.DOCKERHUB_ORG_NAME_BACKUP || env.DOCKERHUB_ORG_NAME }}
+          username: ${{ env.DOCKERHUB_ORG_NAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Docker meta
@@ -181,11 +192,13 @@ jobs:
             ${{ env.REGISTRY }}/${{ env.GHCR_ORG_NAME }}/${{ env.IMAGE_NAME }}
             ${{ env.DOCKERHUB_ORG_NAME }}/${{ env.IMAGE_NAME_DOCKERHUB }}
           tags: >
-            ${{ github.event_name == 'workflow_dispatch'
+            ${{ env.IMAGE_IS_PROD == 'true' && (
+              github.event_name == 'workflow_dispatch'
                 && format('type=raw,value={0}', github.event.inputs.manual_tag)
-              || format('type=raw,value={0}', github.ref_name) }}
+              || format('type=raw,value={0}', github.ref_name)
+            ) || env.IMAGE_TAGS_BETA }}
           flavor: |
-            latest=${{ github.event_name == 'push' || github.event.inputs.as_latest == 'true' }}
+            latest=${{ env.IMAGE_IS_PROD }}
             ${{ matrix.tag_favor }}
 
       - name: Build and push
@@ -195,35 +208,29 @@ jobs:
           context: .
           file: Dockerfile.ci
           push: ${{ env.IMAGE_PUSH == 'true' }}
-          build-args: |
-            BASE_IMAGE_TAG=${{ matrix.base_image_tag }}
-            ${{ matrix.build_arg }}
+          build-args: ${{ matrix.build_arg }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
           platforms: ${{ env.RELEASE_PLATFORMS }}
 
   release_docker_lite:
     needs: build_binary_lite
-    name: Release Docker image (Lite)
+    name: Release Docker image
     runs-on: ubuntu-latest
     strategy:
       matrix:
         image: ["latest", "ffmpeg", "aria2", "aio"]
         include:
           - image: "latest"
-            base_image_tag: "base"
             build_arg: ""
             tag_favor: "suffix=-lite,onlatest=true"
           - image: "ffmpeg"
-            base_image_tag: "ffmpeg"
             build_arg: INSTALL_FFMPEG=true
             tag_favor: "suffix=-lite-ffmpeg,onlatest=true"
           - image: "aria2"
-            base_image_tag: "aria2"
             build_arg: INSTALL_ARIA2=true
             tag_favor: "suffix=-lite-aria2,onlatest=true"
           - image: "aio"
-            base_image_tag: "aio"
             build_arg: |
               INSTALL_FFMPEG=true
               INSTALL_ARIA2=true
@@ -254,7 +261,7 @@ jobs:
         if: env.IMAGE_PUSH == 'true'
         uses: docker/login-action@v3
         with:
-          username: ${{ vars.DOCKERHUB_ORG_NAME_BACKUP || env.DOCKERHUB_ORG_NAME }}
+          username: ${{ env.DOCKERHUB_ORG_NAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Docker meta
@@ -265,11 +272,13 @@ jobs:
             ${{ env.REGISTRY }}/${{ env.GHCR_ORG_NAME }}/${{ env.IMAGE_NAME }}
             ${{ env.DOCKERHUB_ORG_NAME }}/${{ env.IMAGE_NAME_DOCKERHUB }}
           tags: >
-            ${{ github.event_name == 'workflow_dispatch'
+            ${{ env.IMAGE_IS_PROD == 'true' && (
+              github.event_name == 'workflow_dispatch'
                 && format('type=raw,value={0}', github.event.inputs.manual_tag)
-              || format('type=raw,value={0}', github.ref_name) }}
+              || format('type=raw,value={0}', github.ref_name)
+            ) || env.IMAGE_TAGS_BETA }}
           flavor: |
-            latest=${{ github.event_name == 'push' || github.event.inputs.as_latest == 'true' }}
+            latest=${{ env.IMAGE_IS_PROD }}
             ${{ matrix.tag_favor }}
 
       - name: Build and push
@@ -279,9 +288,7 @@ jobs:
           context: .
           file: Dockerfile.ci
           push: ${{ env.IMAGE_PUSH == 'true' }}
-          build-args: |
-            BASE_IMAGE_TAG=${{ matrix.base_image_tag }}
-            ${{ matrix.build_arg }}
+          build-args: ${{ matrix.build_arg }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
           platforms: ${{ env.RELEASE_PLATFORMS }}

.github/workflows/release_freebsd.yml

@@ -0,0 +1,69 @@
+name: Release builds (Freebsd)
+
+on:
+  release:
+    types: [ published ]
+
+permissions:
+  contents: write
+
+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
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Upload assets
+        uses: softprops/action-gh-release@v2
+        with:
+          files: build/compress/*
+
+  release_freebsd_lite:
+    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 lite freebsd
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Upload assets
+        uses: softprops/action-gh-release@v2
+        with:
+          files: build/compress/*

.github/workflows/release_linux_musl.yml

@@ -0,0 +1,69 @@
+name: Release builds (linux_musl)
+
+on:
+  release:
+    types: [ published ]
+
+permissions:
+  contents: write
+
+jobs:
+  release_linux_musl:
+    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 linux_musl
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Upload assets
+        uses: softprops/action-gh-release@v2
+        with:
+          files: build/compress/*
+
+  release_linux_musl_lite:
+    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 lite linux_musl
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Upload assets
+        uses: softprops/action-gh-release@v2
+        with:
+          files: build/compress/*

.github/workflows/release_linux_musl_arm.yml

@@ -0,0 +1,70 @@
+name: Release builds (linux_musl_arm)
+
+on:
+  release:
+    types: [ published ]
+    
+permissions:
+  contents: write
+
+jobs:
+  release_linux_musl_arm:
+    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 linux_musl_arm
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Upload assets
+        uses: softprops/action-gh-release@v2
+        with:
+          files: build/compress/*
+
+  release_linux_musl_arm_lite:
+    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 lite linux_musl_arm
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Upload assets
+        uses: softprops/action-gh-release@v2
+        with:
+          files: build/compress/*      
+ 

.github/workflows/sync_repo.yml

@@ -1,38 +0,0 @@
-name: Sync to Gitee
-
-on:
-  push:
-    branches:
-      - main
-  workflow_dispatch:
-
-jobs:
-  sync:
-    runs-on: ubuntu-latest
-    name: Sync GitHub to Gitee
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: Setup SSH
-        run: |
-          mkdir -p ~/.ssh
-          echo "${{ secrets.GITEE_SSH_PRIVATE_KEY }}" > ~/.ssh/id_rsa
-          chmod 600 ~/.ssh/id_rsa
-          ssh-keyscan gitee.com >> ~/.ssh/known_hosts
-
-      - name: Create single commit and push
-        run: |
-          git config user.name "GitHub Actions"
-          git config user.email "actions@github.com"
-          
-          # Create a new branch
-          git checkout --orphan new-main
-          git add .
-          git commit -m "Sync from GitHub: $(date)"
-
-          # Add Gitee remote and force push
-          git remote add gitee ${{ vars.GITEE_REPO_URL }}
-          git push --force gitee new-main:main

.github/workflows/test_docker.yml

@@ -1,4 +1,4 @@
-name: Beta Release (Docker)
+name: Docker Beta Release
 
 on:
   workflow_dispatch:
@@ -20,7 +20,8 @@ env:
   IMAGE_NAME_DOCKERHUB: openlist
   REGISTRY: ghcr.io
   ARTIFACT_NAME: 'binaries_docker_release'
-  RELEASE_PLATFORMS: 'linux/amd64,linux/arm64,linux/arm/v7,linux/386,linux/arm/v6,linux/ppc64le,linux/riscv64,linux/loong64' ### Temporarily disable Docker builds for linux/s390x architectures for unknown reasons.
+  ARTIFACT_NAME_LITE: 'binaries_docker_release_lite'
+  RELEASE_PLATFORMS: 'linux/amd64,linux/arm64,linux/arm/v7,linux/386,linux/arm/v6,linux/s390x,linux/ppc64le,linux/riscv64'
   IMAGE_PUSH: ${{ github.event_name == 'push' }}
   IMAGE_TAGS_BETA: |
     type=ref,event=pr
@@ -28,7 +29,7 @@ env:
 
 jobs:
   build_binary:
-    name: Build Binaries for Docker Release (Beta)
+    name: Build Binaries for Docker Release
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -36,7 +37,7 @@ jobs:
 
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.25.0'
+          go-version: 'stable'
 
       - name: Cache Musl
         id: cache-musl
@@ -55,7 +56,6 @@ jobs:
         run: bash build.sh beta docker-multiplatform
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          FRONTEND_REPO: ${{ vars.FRONTEND_REPO }}
 
       - name: Upload artifacts
         uses: actions/upload-artifact@v4
@@ -69,7 +69,7 @@ jobs:
 
   release_docker:
     needs: build_binary
-    name: Release Docker image (Beta)
+    name: Release Docker image
     runs-on: ubuntu-latest
     permissions:
       packages: write
@@ -78,19 +78,15 @@ jobs:
         image: ["latest", "ffmpeg", "aria2", "aio"]
         include:
           - image: "latest"
-            base_image_tag: "base"
             build_arg: ""
             tag_favor: ""
           - image: "ffmpeg"
-            base_image_tag: "ffmpeg"
             build_arg: INSTALL_FFMPEG=true
             tag_favor: "suffix=-ffmpeg,onlatest=true"
           - image: "aria2"
-            base_image_tag: "aria2"
             build_arg: INSTALL_ARIA2=true
             tag_favor: "suffix=-aria2,onlatest=true"
           - image: "aio"
-            base_image_tag: "aio"
             build_arg: |
               INSTALL_FFMPEG=true
               INSTALL_ARIA2=true
@@ -121,7 +117,7 @@ jobs:
         if: env.IMAGE_PUSH == 'true'
         uses: docker/login-action@v3
         with:
-          username: ${{ vars.DOCKERHUB_ORG_NAME_BACKUP || env.DOCKERHUB_ORG_NAME }}
+          username: ${{ env.DOCKERHUB_ORG_NAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Docker meta
@@ -142,9 +138,7 @@ jobs:
           context: .
           file: Dockerfile.ci
           push: ${{ env.IMAGE_PUSH == 'true' }}
-          build-args: |
-            BASE_IMAGE_TAG=${{ matrix.base_image_tag }}
-            ${{ matrix.build_arg }}
+          build-args: ${{ matrix.build_arg }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
           platforms: ${{ env.RELEASE_PLATFORMS }}

.github/workflows/trigger-makefile-update.yml

@@ -19,7 +19,7 @@ jobs:
         uses: peter-evans/repository-dispatch@v3
         with:
           token: ${{ secrets.EXTERNAL_REPO_TOKEN_LUCI_APP_OPENLIST }}
-          repository: ${{ vars.HOOK_REPO || 'OpenListTeam/OpenList-OpenWRT' }}
+          repository: ${{ vars.HOOK_REPO || 'OpenListTeam/luci-app-openlist' }}
           event-type: update-hashes
           client-payload: |
             {

CONTRIBUTING.md

@@ -2,76 +2,106 @@
 
 ## Setup your machine
 
-`OpenList` is written in [Go](https://golang.org/) and [SolidJS](https://www.solidjs.com/).
+`OpenList` is written in [Go](https://golang.org/) and [React](https://reactjs.org/).
 
 Prerequisites:
 
 - [git](https://git-scm.com)
-- [Go 1.24+](https://golang.org/doc/install)
+- [Go 1.20+](https://golang.org/doc/install)
 - [gcc](https://gcc.gnu.org/)
 - [nodejs](https://nodejs.org/)
 
-## Cloning a fork
-
-Fork and clone `OpenList` and `OpenList-Frontend` anywhere:
+Clone `OpenList` and `OpenList-Frontend` anywhere:
 
 ```shell
-$ git clone https://github.com/<your-username>/OpenList.git
-$ git clone --recurse-submodules https://github.com/<your-username>/OpenList-Frontend.git
-```
-
-## Creating a branch
-
-Create a new branch from the `main` branch, with an appropriate name.
-
-```shell
-$ git checkout -b <branch-name>
+$ git clone https://github.com/OpenListTeam/OpenList.git
+$ git clone --recurse-submodules https://github.com/OpenListTeam/OpenList-Frontend.git
 ```
+You should switch to the `main` branch for development.
 
 ## Preview your change
-
 ### backend
-
 ```shell
 $ go run main.go
 ```
-
 ### frontend
-
 ```shell
 $ pnpm dev
 ```
 
 ## Add a new driver
-
 Copy `drivers/template` folder and rename it, and follow the comments in it.
 
 ## Create a commit
 
 Commit messages should be well formatted, and to make that "standardized".
 
-Submit your pull request. For PR titles, follow [Conventional Commits](https://www.conventionalcommits.org).
+### Commit Message Format
+Each commit message consists of a **header**, a **body** and a **footer**.  The header has a special
+format that includes a **type**, a **scope** and a **subject**:
 
-https://github.com/OpenListTeam/OpenList/issues/376
+```
+<type>(<scope>): <subject>
+<BLANK LINE>
+<body>
+<BLANK LINE>
+<footer>
+```
 
-It's suggested to sign your commits. See: [How to sign commits](https://docs.github.com/en/authentication/managing-commit-signature-verification/signing-commits)
+The **header** is mandatory and the **scope** of the header is optional.
+
+Any line of the commit message cannot be longer than 100 characters! This allows the message to be easier
+to read on GitHub as well as in various git tools.
+
+### Revert
+If the commit reverts a previous commit, it should begin with `revert: `, followed by the header
+of the reverted commit.
+In the body it should say: `This reverts commit <hash>.`, where the hash is the SHA of the commit
+being reverted.
+
+### Type
+Must be one of the following:
+
+* **feat**: A new feature
+* **fix**: A bug fix
+* **docs**: Documentation only changes
+* **style**: Changes that do not affect the meaning of the code (white-space, formatting, missing
+  semi-colons, etc)
+* **refactor**: A code change that neither fixes a bug nor adds a feature
+* **perf**: A code change that improves performance
+* **test**: Adding missing or correcting existing tests
+* **build**: Affects project builds or dependency modifications
+* **revert**: Restore the previous commit
+* **ci**: Continuous integration of related file modifications
+* **chore**: Changes to the build process or auxiliary tools and libraries such as documentation
+  generation
+* **release**: Release a new version
+
+### Scope
+The scope could be anything specifying place of the commit change. For example `$location`,
+`$browser`, `$compile`, `$rootScope`, `ngHref`, `ngClick`, `ngView`, etc...
+
+You can use `*` when the change affects more than a single scope.
+
+### Subject
+The subject contains succinct description of the change:
+
+* use the imperative, present tense: "change" not "changed" nor "changes"
+* don't capitalize first letter
+* no dot (.) at the end
+
+### Body
+Just as in the **subject**, use the imperative, present tense: "change" not "changed" nor "changes".
+The body should include the motivation for the change and contrast this with previous behavior.
+
+### Footer
+The footer should contain any information about **Breaking Changes** and is also the place to
+[reference GitHub issues that this commit closes](https://help.github.com/articles/closing-issues-via-commit-messages/).
+
+**Breaking Changes** should start with the word `BREAKING CHANGE:` with a space or two newlines.
+The rest of the commit message is then used for this.
 
 ## Submit a pull request
 
-Please make sure your code has been formatted with `go fmt` or [prettier](https://prettier.io/) before submitting.
-
-Push your branch to your `openlist` fork and open a pull request against the `main` branch.
-
-## Merge your pull request
-
-Your pull request will be merged after review. Please wait for the maintainer to merge your pull request after review.
-
-At least 1 approving review is required by reviewers with write access. You can also request a review from maintainers.
-
-## Delete your branch
-
-(Optional) After your pull request is merged, you can delete your branch.
-
----
-
-Thank you for your contribution! Let's make OpenList better together!
+Push your branch to your `openlist` fork and open a pull request against the
+`main` branch.

Dockerfile

@@ -1,7 +1,4 @@
-### Default image is base. You can add other support by modifying BASE_IMAGE_TAG. The following parameters are supported: base (default), aria2, ffmpeg, aio
-ARG BASE_IMAGE_TAG=base
-
-FROM alpine:edge AS builder
+FROM docker.io/library/alpine:edge AS builder
 LABEL stage=go-builder
 WORKDIR /app/
 RUN apk add --no-cache bash curl jq gcc git go musl-dev
@@ -10,27 +7,36 @@ RUN go mod download
 COPY ./ ./
 RUN bash build.sh release docker
 
-FROM openlistteam/openlist-base-image:${BASE_IMAGE_TAG}
-LABEL MAINTAINER="OpenList"
+FROM alpine:edge
+
 ARG INSTALL_FFMPEG=false
 ARG INSTALL_ARIA2=false
-ARG USER=openlist
-ARG UID=1001
-ARG GID=1001
+LABEL MAINTAINER="OpenList"
 
 WORKDIR /opt/openlist/
 
-RUN addgroup -g ${GID} ${USER} && \
-    adduser -D -u ${UID} -G ${USER} ${USER} && \
-    mkdir -p /opt/openlist/data
+RUN apk update && \
+    apk upgrade --no-cache && \
+    apk add --no-cache bash ca-certificates su-exec tzdata; \
+    [ "$INSTALL_FFMPEG" = "true" ] && apk add --no-cache ffmpeg; \
+    [ "$INSTALL_ARIA2" = "true" ] && apk add --no-cache curl aria2 && \
+        mkdir -p /opt/aria2/.aria2 && \
+        wget https://github.com/P3TERX/aria2.conf/archive/refs/heads/master.tar.gz -O /tmp/aria-conf.tar.gz && \
+        tar -zxvf /tmp/aria-conf.tar.gz -C /opt/aria2/.aria2 --strip-components=1 && rm -f /tmp/aria-conf.tar.gz && \
+        sed -i 's|rpc-secret|#rpc-secret|g' /opt/aria2/.aria2/aria2.conf && \
+        sed -i 's|/root/.aria2|/opt/aria2/.aria2|g' /opt/aria2/.aria2/aria2.conf && \
+        sed -i 's|/root/.aria2|/opt/aria2/.aria2|g' /opt/aria2/.aria2/script.conf && \
+        sed -i 's|/root|/opt/aria2|g' /opt/aria2/.aria2/aria2.conf && \
+        sed -i 's|/root|/opt/aria2|g' /opt/aria2/.aria2/script.conf && \
+        touch /opt/aria2/.aria2/aria2.session && \
+        /opt/aria2/.aria2/tracker.sh ; \
+    rm -rf /var/cache/apk/*
 
-COPY --from=builder --chmod=755 --chown=${UID}:${GID} /app/bin/openlist ./
-COPY --chmod=755 --chown=${UID}:${GID} entrypoint.sh /entrypoint.sh
-
-USER ${USER}
+COPY --chmod=755 --from=builder /app/bin/openlist ./
+COPY --chmod=755 entrypoint.sh /entrypoint.sh
 RUN /entrypoint.sh version
 
-ENV UMASK=022 RUN_ARIA2=${INSTALL_ARIA2}
+ENV PUID=0 PGID=0 UMASK=022 RUN_ARIA2=${INSTALL_ARIA2}
 VOLUME /opt/openlist/data/
 EXPOSE 5244 5245
 CMD [ "/entrypoint.sh" ]

Dockerfile.ci

@@ -1,26 +1,34 @@
-ARG BASE_IMAGE_TAG=base
-FROM ghcr.io/openlistteam/openlist-base-image:${BASE_IMAGE_TAG}
-LABEL MAINTAINER="OpenList"
+FROM docker.io/library/alpine:edge
+
 ARG TARGETPLATFORM
 ARG INSTALL_FFMPEG=false
 ARG INSTALL_ARIA2=false
-ARG USER=openlist
-ARG UID=1001
-ARG GID=1001
+LABEL MAINTAINER="OpenList"
 
 WORKDIR /opt/openlist/
 
-RUN addgroup -g ${GID} ${USER} && \
-    adduser -D -u ${UID} -G ${USER} ${USER} && \
-    mkdir -p /opt/openlist/data
+RUN apk update && \
+    apk upgrade --no-cache && \
+    apk add --no-cache bash ca-certificates su-exec tzdata; \
+    [ "$INSTALL_FFMPEG" = "true" ] && apk add --no-cache ffmpeg; \
+    [ "$INSTALL_ARIA2" = "true" ] && apk add --no-cache curl aria2 && \
+        mkdir -p /opt/aria2/.aria2 && \
+        wget https://github.com/P3TERX/aria2.conf/archive/refs/heads/master.tar.gz -O /tmp/aria-conf.tar.gz && \
+        tar -zxvf /tmp/aria-conf.tar.gz -C /opt/aria2/.aria2 --strip-components=1 && rm -f /tmp/aria-conf.tar.gz && \
+        sed -i 's|rpc-secret|#rpc-secret|g' /opt/aria2/.aria2/aria2.conf && \
+        sed -i 's|/root/.aria2|/opt/aria2/.aria2|g' /opt/aria2/.aria2/aria2.conf && \
+        sed -i 's|/root/.aria2|/opt/aria2/.aria2|g' /opt/aria2/.aria2/script.conf && \
+        sed -i 's|/root|/opt/aria2|g' /opt/aria2/.aria2/aria2.conf && \
+        sed -i 's|/root|/opt/aria2|g' /opt/aria2/.aria2/script.conf && \
+        touch /opt/aria2/.aria2/aria2.session && \
+        /opt/aria2/.aria2/tracker.sh ; \
+    rm -rf /var/cache/apk/*
 
-COPY --chmod=755 --chown=${UID}:${GID} /build/${TARGETPLATFORM}/openlist ./
-COPY --chmod=755 --chown=${UID}:${GID} entrypoint.sh /entrypoint.sh
-
-USER ${USER}
+COPY --chmod=755 /build/${TARGETPLATFORM}/openlist ./
+COPY --chmod=755 entrypoint.sh /entrypoint.sh
 RUN /entrypoint.sh version
 
-ENV UMASK=022 RUN_ARIA2=${INSTALL_ARIA2}
+ENV PUID=0 PGID=0 UMASK=022 RUN_ARIA2=${INSTALL_ARIA2}
 VOLUME /opt/openlist/data/
 EXPOSE 5244 5245
 CMD [ "/entrypoint.sh" ]

README.md

@@ -20,34 +20,6 @@
 - [CODE OF CONDUCT](./CODE_OF_CONDUCT.md)
 - [LICENSE](./LICENSE)
 
-## Disclaimer
-
-OpenList is an open-source project independently maintained by the OpenList Team, following the AGPL-3.0 license and committed to maintaining complete code openness and modification transparency.
-
-We have noticed the emergence of some third-party projects in the community with names similar to this project, such as OpenListApp/OpenListApp, as well as some paid proprietary software using the same or similar naming. To avoid user confusion, we hereby declare:
-
-- OpenList has no official association with any third-party derivative projects.
-
-- All software, code, and services of this project are maintained by the OpenList Team and are freely available on GitHub.
-
-- Project documentation and API services primarily rely on charitable resources provided by Cloudflare. There are currently no paid plans or commercial deployments, and the use of existing features does not involve any costs.
-
-We respect the community's rights to free use and derivative development, but we also strongly urge downstream projects:
-
-- Should not use the "OpenList" name for impersonation promotion or commercial gain;
-
-- Must not distribute OpenList-based code in a closed-source manner or violate AGPL license terms.
-
-To better maintain healthy ecosystem development, we recommend:
-
-- Clearly indicate the project source and choose appropriate open-source licenses in accordance with the open-source spirit;
-
-- If involving commercial use, please avoid using "OpenList" or any confusing naming as the project name;
-
-- If you need to use materials located under OpenListTeam/Logo, you may modify and use them under compliance with the agreement.
-
-Thank you for your support and understanding of the OpenList project.
-
 ## Features
 
 - [x] Multiple storages
@@ -65,7 +37,6 @@ Thank you for your support and understanding of the OpenList project.
   - [x] [WebDAV](https://en.wikipedia.org/wiki/WebDAV)
   - [x] Teambition([China](https://www.teambition.com), [International](https://us.teambition.com))
   - [x] [Mediatrack](https://www.mediatrack.cn)
-  - [x] [MediaFire](https://www.mediafire.com)
   - [x] [139yun](https://yun.139.com) (Personal, Family, Group)
   - [x] [YandexDisk](https://disk.yandex.com)
   - [x] [BaiduNetdisk](http://pan.baidu.com)
@@ -75,6 +46,7 @@ Thank you for your support and understanding of the OpenList project.
   - [x] [Thunder](https://pan.xunlei.com)
   - [x] [Lanzou](https://www.lanzou.com)
   - [x] [ILanzou](https://www.ilanzou.com)
+  - [x] [Aliyundrive share](https://www.alipan.com)
   - [x] [Google photo](https://photos.google.com)
   - [x] [Mega.nz](https://mega.nz)
   - [x] [Baidu photo](https://photo.baidu.com)
@@ -85,15 +57,6 @@ Thank you for your support and understanding of the OpenList project.
   - [x] [FeijiPan](https://www.feijipan.com)
   - [x] [dogecloud](https://www.dogecloud.com/product/oss)
   - [x] [Azure Blob Storage](https://azure.microsoft.com/products/storage/blobs)
-  - [x] [Chaoxing](https://www.chaoxing.com)
-  - [x] [CNB](https://cnb.cool/)
-  - [x] [Degoo](https://degoo.com)
-  - [x] [Doubao](https://www.doubao.com)
-  - [x] [Febbox](https://www.febbox.com)
-  - [x] [GitHub](https://github.com)
-  - [x] [OpenList](https://github.com/OpenListTeam/OpenList)
-  - [x] [Teldrive](https://github.com/tgdrive/teldrive)
-  - [x] [Weiyun](https://www.weiyun.com)
 - [x] Easy to deploy and out-of-the-box
 - [x] File preview (PDF, markdown, code, plain text, ...)
 - [x] Image preview in gallery mode
@@ -115,9 +78,8 @@ Thank you for your support and understanding of the OpenList project.
 
 ## Document
 
-- 📘 [Global Site](https://doc.oplist.org)
-- 📚 [Backup Site](https://doc.openlist.team)
-- 🌏 [CN Site](https://doc.oplist.org.cn)
+- 📘 [Docs & Install Guide](https://docs.oplist.org)
+- 📚 [Backup Docs Site](https://docs.openlist.team)
 
 ## Demo
 

README_cn.md

@@ -20,34 +20,6 @@
 - [行为准则](./CODE_OF_CONDUCT.md)
 - [许可证](./LICENSE)
 
-## 免责声明
-
-OpenList 是一个由 OpenList 团队独立维护的开源项目，遵循 AGPL-3.0 许可证，致力于保持完整的代码开放性和修改透明性。
-
-我们注意到社区中出现了一些与本项目名称相似的第三方项目，如 OpenListApp/OpenListApp，以及部分采用相同或近似命名的收费专有软件。为避免用户误解，现声明如下：
-
-- OpenList 与任何第三方衍生项目无官方关联。
-
-- 本项目的全部软件、代码与服务由 OpenList 团队维护，可在 GitHub 免费获取。
-
-- 项目文档与 API 服务均主要依托于 Cloudflare 提供的公益资源，目前无任何收费计划或商业部署，现有功能使用不涉及任何支出。
-
-我们尊重社区的自由使用与衍生开发权利，但也强烈呼吁下游项目：
-
-- 不应以“OpenList”名义进行冒名宣传或获取商业利益；
-
-- 不得将基于 OpenList 的代码进行闭源分发或违反 AGPL 许可证条款。
-
-为了更好地维护生态健康发展，我们建议：
-
-- 明确注明项目来源，并以符合开源精神的方式选择适当的开源许可证；
-
-- 如涉及商业用途，请避免使用“OpenList”或任何会产生混淆的方式作为项目名称；
-
-- 若需使用本项目位于 OpenListTeam/Logo 下的素材，可在遵守协议的前提下进行修改后使用。
-
-感谢您对 OpenList 项目的支持与理解。
-
 ## 功能
 
 - [x] 多种存储
@@ -65,7 +37,6 @@ OpenList 是一个由 OpenList 团队独立维护的开源项目，遵循 AGPL-3
   - [x] [WebDAV](https://en.wikipedia.org/wiki/WebDAV)
   - [x] Teambition([中国](https://www.teambition.com), [国际](https://us.teambition.com))
   - [x] [分秒帧](https://www.mediatrack.cn)
-  - [x] [MediaFire](https://www.mediafire.com)
   - [x] [和彩云](https://yun.139.com)（个人、家庭、群组）
   - [x] [YandexDisk](https://disk.yandex.com)
   - [x] [百度网盘](http://pan.baidu.com)
@@ -75,6 +46,7 @@ OpenList 是一个由 OpenList 团队独立维护的开源项目，遵循 AGPL-3
   - [x] [迅雷网盘](https://pan.xunlei.com)
   - [x] [蓝奏云](https://www.lanzou.com)
   - [x] [蓝奏云优享版](https://www.ilanzou.com)
+  - [x] [阿里云盘分享](https://www.alipan.com)
   - [x] [Google 相册](https://photos.google.com)
   - [x] [Mega.nz](https://mega.nz)
   - [x] [百度相册](https://photo.baidu.com)
@@ -85,15 +57,6 @@ OpenList 是一个由 OpenList 团队独立维护的开源项目，遵循 AGPL-3
   - [x] [飞机盘](https://www.feijipan.com)
   - [x] [多吉云](https://www.dogecloud.com/product/oss)
   - [x] [Azure Blob Storage](https://azure.microsoft.com/products/storage/blobs)
-  - [x] [超星](https://www.chaoxing.com)
-  - [x] [CNB](https://cnb.cool/)
-  - [x] [Degoo](https://degoo.com)
-  - [x] [豆包](https://www.doubao.com)
-  - [x] [Febbox](https://www.febbox.com)
-  - [x] [GitHub](https://github.com)
-  - [x] [OpenList](https://github.com/OpenListTeam/OpenList)
-  - [x] [Teldrive](https://github.com/tgdrive/teldrive)
-  - [x] [微云](https://www.weiyun.com)
 - [x] 部署方便，开箱即用
 - [x] 文件预览（PDF、markdown、代码、纯文本等）
 - [x] 画廊模式下的图片预览
@@ -115,9 +78,8 @@ OpenList 是一个由 OpenList 团队独立维护的开源项目，遵循 AGPL-3
 
 ## 文档
 
-- 🌏 [国内站点](https://doc.oplist.org.cn)
-- 📘 [海外站点](https://doc.oplist.org)
-- 📚 [备用站点](https://doc.openlist.team)
+- 📘 [文档与安装指南](https://docs.oplist.org)
+- 📚 [备用文档站点](https://docs.openlist.team)
 
 ## 演示
 

README_ja.md

@@ -20,34 +20,6 @@
 - [行動規範](./CODE_OF_CONDUCT.md)
 - [ライセンス](./LICENSE)
 
-## 免責事項
-
-OpenListは、OpenListチームが独立して維持するオープンソースプロジェクトであり、AGPL-3.0ライセンスに従い、完全なコードの開放性と変更の透明性を維持することに専念しています。
-
-コミュニティ内で、OpenListApp/OpenListAppなど、本プロジェクトと類似した名称を持つサードパーティプロジェクトや、同一または類似した命名を採用する有料専有ソフトウェアが出現していることを確認しています。ユーザーの誤解を避けるため、以下のように宣言いたします：
-
-- OpenListは、いかなるサードパーティ派生プロジェクトとも公式な関連性はありません。
-
-- 本プロジェクトのすべてのソフトウェア、コード、サービスはOpenListチームによって維持され、GitHubで無料で取得できます。
-
-- プロジェクトドキュメントとAPIサービスは主にCloudflareが提供する公益リソースに依存しており、現在有料プランや商業展開はなく、既存機能の使用に費用は発生しません。
-
-私たちはコミュニティの自由な使用と派生開発の権利を尊重しますが、下流プロジェクトに強く呼びかけます：
-
-- 「OpenList」の名前で偽装宣伝や商業利益を得るべきではありません；
-
-- OpenListベースのコードをクローズドソースで配布したり、AGPLライセンス条項に違反してはいけません。
-
-エコシステムの健全な発展をより良く維持するため、以下を推奨します：
-
-- プロジェクトの出典を明確に示し、オープンソース精神に合致する適切なオープンソースライセンスを選択する；
-
-- 商業用途が関わる場合は、「OpenList」や混乱を招く可能性のある名前をプロジェクト名として使用することを避ける；
-
-- OpenListTeam/Logo下の素材を使用する必要がある場合は、協定を遵守した上で修正して使用できます。
-
-OpenListプロジェクトへのご支援とご理解をありがとうございます。
-
 ## 特徴
 
 - [x] 複数ストレージ
@@ -74,6 +46,7 @@ OpenListプロジェクトへのご支援とご理解をありがとうござい
   - [x] [Thunder](https://pan.xunlei.com)
   - [x] [Lanzou](https://www.lanzou.com)
   - [x] [ILanzou](https://www.ilanzou.com)
+  - [x] [Aliyundrive share](https://www.alipan.com)
   - [x] [Google photo](https://photos.google.com)
   - [x] [Mega.nz](https://mega.nz)
   - [x] [Baidu photo](https://photo.baidu.com)
@@ -84,16 +57,6 @@ OpenListプロジェクトへのご支援とご理解をありがとうござい
   - [x] [FeijiPan](https://www.feijipan.com)
   - [x] [dogecloud](https://www.dogecloud.com/product/oss)
   - [x] [Azure Blob Storage](https://azure.microsoft.com/products/storage/blobs)
-  - [x] [Chaoxing](https://www.chaoxing.com)
-  - [x] [CNB](https://cnb.cool/)
-  - [x] [Degoo](https://degoo.com)
-  - [x] [Doubao](https://www.doubao.com)
-  - [x] [Febbox](https://www.febbox.com)
-  - [x] [GitHub](https://github.com)
-  - [x] [OpenList](https://github.com/OpenListTeam/OpenList)
-  - [x] [Teldrive](https://github.com/tgdrive/teldrive)
-  - [x] [Weiyun](https://www.weiyun.com)
-  - [x] [MediaFire](https://www.mediafire.com)
 - [x] 簡単にデプロイでき、すぐに使える
 - [x] ファイルプレビュー（PDF、markdown、コード、テキストなど）
 - [x] ギャラリーモードでの画像プレビュー
@@ -115,9 +78,8 @@ OpenListプロジェクトへのご支援とご理解をありがとうござい
 
 ## ドキュメント
 
-- 📘 [グローバルサイト](https://doc.oplist.org)
-- 📚 [バックアップサイト](https://doc.openlist.team)
-- 🌏 [CNサイト](https://doc.oplist.org.cn)
+- 📘 [ドキュメント・インストールガイド](https://docs.oplist.org)
+- 📚 [バックアップドキュメントサイト](https://docs.openlist.team)
 
 ## デモ
 

README_nl.md

@@ -20,34 +20,6 @@
 - [Gedragscode](./CODE_OF_CONDUCT.md)
 - [Licentie](./LICENSE)
 
-## Disclaimer
-
-OpenList is een open-source project dat onafhankelijk wordt onderhouden door het OpenList Team, volgend op de AGPL-3.0 licentie en toegewijd aan het behouden van volledige code openheid en transparantie van wijzigingen.
-
-We hebben gemerkt dat er in de gemeenschap enkele derde partij projecten zijn verschenen met namen vergelijkbaar met dit project, zoals OpenListApp/OpenListApp, evenals enkele betaalde eigendomssoftware die dezelfde of soortgelijke naamgeving gebruikt. Om verwarring bij gebruikers te voorkomen, verklaren we hierbij:
-
-- OpenList heeft geen officiële associatie met enige derde partij afgeleide projecten.
-
-- Alle software, code en diensten van dit project worden onderhouden door het OpenList Team en zijn gratis beschikbaar op GitHub.
-
-- Projectdocumentatie en API diensten zijn voornamelijk afhankelijk van liefdadigheidsbronnen verstrekt door Cloudflare. Er zijn momenteel geen betaalplannen of commerciële implementaties, en het gebruik van bestaande functies brengt geen kosten met zich mee.
-
-We respecteren de rechten van de gemeenschap voor vrij gebruik en afgeleide ontwikkeling, maar we roepen downstream projecten ook ten zeerste op:
-
-- Mogen niet de "OpenList" naam gebruiken voor namaakpromotie of commercieel gewin;
-
-- Mogen OpenList-gebaseerde code niet distribueren op een closed-source manier of AGPL licentievoorwaarden schenden.
-
-Om een gezonde ecosysteemontwikkeling beter te onderhouden, bevelen we aan:
-
-- Duidelijk de projectbron aangeven en passende open-source licenties kiezen in overeenstemming met de open-source geest;
-
-- Bij commercieel gebruik, vermijd het gebruik van "OpenList" of enige verwarrende naamgeving als projectnaam;
-
-- Als u materialen onder OpenListTeam/Logo moet gebruiken, kunt u deze wijzigen en gebruiken onder naleving van de overeenkomst.
-
-Dank u voor uw ondersteuning en begrip
-
 ## Functies
 
 - [x] Meerdere opslagmogelijkheden
@@ -64,7 +36,6 @@ Dank u voor uw ondersteuning en begrip
   - [x] [UPYUN Storage Service](https://www.upyun.com/products/file-storage)
   - [x] [WebDAV](https://en.wikipedia.org/wiki/WebDAV)
   - [x] Teambition([China](https://www.teambition.com), [Internationaal](https://us.teambition.com))
-  - [x] [MediaFire](https://www.mediafire.com)
   - [x] [Mediatrack](https://www.mediatrack.cn)
   - [x] [139yun](https://yun.139.com) (Persoonlijk, Familie, Groep)
   - [x] [YandexDisk](https://disk.yandex.com)
@@ -75,6 +46,7 @@ Dank u voor uw ondersteuning en begrip
   - [x] [Thunder](https://pan.xunlei.com)
   - [x] [Lanzou](https://www.lanzou.com)
   - [x] [ILanzou](https://www.ilanzou.com)
+  - [x] [Aliyundrive share](https://www.alipan.com)
   - [x] [Google photo](https://photos.google.com)
   - [x] [Mega.nz](https://mega.nz)
   - [x] [Baidu photo](https://photo.baidu.com)
@@ -85,15 +57,6 @@ Dank u voor uw ondersteuning en begrip
   - [x] [FeijiPan](https://www.feijipan.com)
   - [x] [dogecloud](https://www.dogecloud.com/product/oss)
   - [x] [Azure Blob Storage](https://azure.microsoft.com/products/storage/blobs)
-  - [x] [Chaoxing](https://www.chaoxing.com)
-  - [x] [CNB](https://cnb.cool/)
-  - [x] [Degoo](https://degoo.com)
-  - [x] [Doubao](https://www.doubao.com)
-  - [x] [Febbox](https://www.febbox.com)
-  - [x] [GitHub](https://github.com)
-  - [x] [OpenList](https://github.com/OpenListTeam/OpenList)
-  - [x] [Teldrive](https://github.com/tgdrive/teldrive)
-  - [x] [Weiyun](https://www.weiyun.com)
 - [x] Eenvoudig te implementeren en direct te gebruiken
 - [x] Bestandsvoorbeeld (PDF, markdown, code, platte tekst, ...)
 - [x] Afbeeldingsvoorbeeld in galerijweergave
@@ -115,9 +78,8 @@ Dank u voor uw ondersteuning en begrip
 
 ## Documentatie
 
-- 📘 [Global Site](https://doc.oplist.org)
-- 📚 [Backup Site](https://doc.openlist.team)
-- 🌏 [CN Site](https://doc.oplist.org.cn)
+- 📘 [Documentatie & Installatiegids](https://docs.oplist.org)
+- 📚 [Back-up documentatiesite](https://docs.openlist.team)
 
 ## Demo
 

build.sh

@@ -4,9 +4,6 @@ builtAt="$(date +'%F %T %z')"
 gitAuthor="The OpenList Projects Contributors <noreply@openlist.team>"
 gitCommit=$(git log --pretty=format:"%h" -1)
 
-# Set frontend repository, default to OpenListTeam/OpenList-Frontend
-frontendRepo="${FRONTEND_REPO:-OpenListTeam/OpenList-Frontend}"
-
 githubAuthArgs=""
 if [ -n "$GITHUB_TOKEN" ]; then
   githubAuthArgs="--header \"Authorization: Bearer $GITHUB_TOKEN\""
@@ -20,15 +17,15 @@ fi
 
 if [ "$1" = "dev" ]; then
   version="dev"
-  webVersion="rolling"
+  webVersion="dev"
 elif [ "$1" = "beta" ]; then
   version="beta"
-  webVersion="rolling"
+  webVersion="dev"
 else
   git tag -d beta || true
   # Always true if there's no tag
   version=$(git describe --abbrev=0 --tags 2>/dev/null || echo "v0.0.0")
-  webVersion=$(eval "curl -fsSL --max-time 2 $githubAuthArgs \"https://api.github.com/repos/$frontendRepo/releases/latest\"" | grep "tag_name" | head -n 1 | awk -F ":" '{print $2}' | sed 's/\"//g;s/,//g;s/ //g')
+  webVersion=$(eval "curl -fsSL --max-time 2 $githubAuthArgs \"https://api.github.com/repos/OpenListTeam/OpenList-Frontend/releases/latest\"" | grep "tag_name" | head -n 1 | awk -F ":" '{print $2}' | sed 's/\"//g;s/,//g;s/ //g')
 fi
 
 echo "backend version: $version"
@@ -48,21 +45,30 @@ ldflags="\
 -X 'github.com/OpenListTeam/OpenList/v4/internal/conf.WebVersion=$webVersion' \
 "
 
-FetchWebRolling() {
-  pre_release_json=$(eval "curl -fsSL --max-time 2 $githubAuthArgs -H \"Accept: application/vnd.github.v3+json\" \"https://api.github.com/repos/$frontendRepo/releases/tags/rolling\"")
+FetchWebDev() {
+  pre_release_tag=$(eval "curl -fsSL --max-time 2 $githubAuthArgs https://api.github.com/repos/OpenListTeam/OpenList-Frontend/releases" | jq -r 'map(select(.prerelease)) | first | .tag_name')
+  if [ -z "$pre_release_tag" ] || [ "$pre_release_tag" == "null" ]; then
+    # fall back to latest release
+    pre_release_json=$(eval "curl -fsSL --max-time 2 $githubAuthArgs -H \"Accept: application/vnd.github.v3+json\" \"https://api.github.com/repos/OpenListTeam/OpenList-Frontend/releases/latest\"")
+  else
+    pre_release_json=$(eval "curl -fsSL --max-time 2 $githubAuthArgs -H \"Accept: application/vnd.github.v3+json\" \"https://api.github.com/repos/OpenListTeam/OpenList-Frontend/releases/tags/$pre_release_tag\"")
+  fi
   pre_release_assets=$(echo "$pre_release_json" | jq -r '.assets[].browser_download_url')
   
-  # There is no lite for rolling
-  pre_release_tar_url=$(echo "$pre_release_assets" | grep "openlist-frontend-dist" | grep -v "lite" | grep "\.tar\.gz$")
+  if [ "$useLite" = true ]; then
+    pre_release_tar_url=$(echo "$pre_release_assets" | grep "openlist-frontend-dist-lite" | grep "\.tar\.gz$")
+  else
+    pre_release_tar_url=$(echo "$pre_release_assets" | grep "openlist-frontend-dist" | grep -v "lite" | grep "\.tar\.gz$")
+  fi
   
-  curl -fsSL "$pre_release_tar_url" -o dist.tar.gz
+  curl -fsSL "$pre_release_tar_url" -o web-dist-dev.tar.gz
   rm -rf public/dist && mkdir -p public/dist
-  tar -zxvf dist.tar.gz -C public/dist
-  rm -rf dist.tar.gz
+  tar -zxvf web-dist-dev.tar.gz -C public/dist
+  rm -rf web-dist-dev.tar.gz
 }
 
 FetchWebRelease() {
-  release_json=$(eval "curl -fsSL --max-time 2 $githubAuthArgs -H \"Accept: application/vnd.github.v3+json\" \"https://api.github.com/repos/$frontendRepo/releases/latest\"")
+  release_json=$(eval "curl -fsSL --max-time 2 $githubAuthArgs -H \"Accept: application/vnd.github.v3+json\" \"https://api.github.com/repos/OpenListTeam/OpenList-Frontend/releases/latest\"")
   release_assets=$(echo "$release_json" | jq -r '.assets[].browser_download_url')
   
   if [ "$useLite" = true ]; then
@@ -89,45 +95,6 @@ BuildWinArm64() {
   go build -o "$1" -ldflags="$ldflags" -tags=jsoniter .
 }
 
-BuildWin7() {
-  # Setup Win7 Go compiler (patched version that supports Windows 7)
-  go_version=$(go version | grep -o 'go[0-9]\+\.[0-9]\+\.[0-9]\+' | sed 's/go//')
-  echo "Detected Go version: $go_version"
-  
-  curl -fsSL --retry 3 -o go-win7.zip -H "Authorization: Bearer $GITHUB_TOKEN" \
-    "https://github.com/XTLS/go-win7/releases/download/patched-${go_version}/go-for-win7-linux-amd64.zip"
-  
-  rm -rf go-win7
-  unzip go-win7.zip -d go-win7
-  rm go-win7.zip
-  
-  # Set permissions for all wrapper files
-  chmod +x ./wrapper/zcc-win7
-  chmod +x ./wrapper/zcxx-win7
-  chmod +x ./wrapper/zcc-win7-386
-  chmod +x ./wrapper/zcxx-win7-386
-  
-  # Build for both 386 and amd64 architectures
-  for arch in "386" "amd64"; do
-    echo "building for windows7-${arch}"
-    export GOOS=windows
-    export GOARCH=${arch}
-    export CGO_ENABLED=1
-    
-    # Use architecture-specific wrapper files
-    if [ "$arch" = "386" ]; then
-      export CC=$(pwd)/wrapper/zcc-win7-386
-      export CXX=$(pwd)/wrapper/zcxx-win7-386
-    else
-      export CC=$(pwd)/wrapper/zcc-win7
-      export CXX=$(pwd)/wrapper/zcxx-win7
-    fi
-    
-    # Use the patched Go compiler for Win7 compatibility
-    $(pwd)/go-win7/bin/go build -o "${1}-${arch}.exe" -ldflags="$ldflags" -tags=jsoniter .
-  done
-}
-
 BuildDev() {
   rm -rf .git/
   mkdir -p "dist"
@@ -154,8 +121,8 @@ BuildDev() {
   xgo -targets=windows/amd64,darwin/amd64,darwin/arm64 -out "$appName" -ldflags="$ldflags" -tags=jsoniter .
   mv "$appName"-* dist
   cd dist
-  # cp ./"$appName"-windows-amd64.exe ./"$appName"-windows-amd64-upx.exe
-  # upx -9 ./"$appName"-windows-amd64-upx.exe
+  cp ./"$appName"-windows-amd64.exe ./"$appName"-windows-amd64-upx.exe
+  upx -9 ./"$appName"-windows-amd64-upx.exe
   find . -type f -print0 | xargs -0 md5sum >md5.txt
   cat md5.txt
 }
@@ -167,7 +134,7 @@ BuildDocker() {
 PrepareBuildDockerMusl() {
   mkdir -p build/musl-libs
   BASE="https://github.com/OpenListTeam/musl-compilers/releases/latest/download/"
-  FILES=(x86_64-linux-musl-cross aarch64-linux-musl-cross i486-linux-musl-cross armv6-linux-musleabihf-cross armv7l-linux-musleabihf-cross riscv64-linux-musl-cross powerpc64le-linux-musl-cross loongarch64-linux-musl-cross) ## Disable s390x-linux-musl-cross builds
+  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"
@@ -186,8 +153,8 @@ BuildDockerMultiplatform() {
   docker_lflags="--extldflags '-static -fpic' $ldflags"
   export CGO_ENABLED=1
 
-  OS_ARCHES=(linux-amd64 linux-arm64 linux-386 linux-riscv64 linux-ppc64le linux-loong64) ## Disable linux-s390x builds
-  CGO_ARGS=(x86_64-linux-musl-gcc aarch64-linux-musl-gcc i486-linux-musl-gcc riscv64-linux-musl-gcc powerpc64le-linux-musl-gcc loongarch64-linux-musl-gcc) ## Disable s390x-linux-musl-gcc builds
+  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]}
@@ -219,171 +186,12 @@ BuildRelease() {
   rm -rf .git/
   mkdir -p "build"
   BuildWinArm64 ./build/"$appName"-windows-arm64.exe
-  BuildWin7 ./build/"$appName"-windows7
   xgo -out "$appName" -ldflags="$ldflags" -tags=jsoniter .
   # why? Because some target platforms seem to have issues with upx compression
-  # upx -9 ./"$appName"-linux-amd64
-  # cp ./"$appName"-windows-amd64.exe ./"$appName"-windows-amd64-upx.exe
-  # upx -9 ./"$appName"-windows-amd64-upx.exe
+  upx -9 ./"$appName"-linux-amd64
+  cp ./"$appName"-windows-amd64.exe ./"$appName"-windows-amd64-upx.exe
+  upx -9 ./"$appName"-windows-amd64-upx.exe
   mv "$appName"-* build
-  
-  # Build LoongArch with glibc (both old world abi1.0 and new world abi2.0)
-  # Separate from musl builds to avoid cache conflicts
-  BuildLoongGLIBC ./build/$appName-linux-loong64-abi1.0 abi1.0
-  BuildLoongGLIBC ./build/$appName-linux-loong64 abi2.0
-}
-
-BuildLoongGLIBC() {
-  local target_abi="$2"
-  local output_file="$1"
-  local oldWorldGoVersion="1.25.0"
-  
-  if [ "$target_abi" = "abi1.0" ]; then
-    echo building for linux-loong64-abi1.0
-  else
-    echo building for linux-loong64-abi2.0
-    target_abi="abi2.0"  # Default to abi2.0 if not specified
-  fi
-  
-  # Note: No longer need global cache cleanup since ABI1.0 uses isolated cache directory
-  echo "Using optimized cache strategy: ABI1.0 has isolated cache, ABI2.0 uses standard cache"
-  
-  if [ "$target_abi" = "abi1.0" ]; then
-    # Setup abi1.0 toolchain and patched Go compiler similar to cgo-action implementation
-    echo "Setting up Loongson old-world ABI1.0 toolchain and patched Go compiler..."
-    
-    # Download and setup patched Go compiler for old-world
-    if ! curl -fsSL --retry 3 -H "Authorization: Bearer $GITHUB_TOKEN" \
-      "https://github.com/loong64/loong64-abi1.0-toolchains/releases/download/20250821/go${oldWorldGoVersion}.linux-amd64.tar.gz" \
-      -o go-loong64-abi1.0.tar.gz; then
-      echo "Error: Failed to download patched Go compiler for old-world ABI1.0"
-      if [ -n "$GITHUB_TOKEN" ]; then
-        echo "Error output from curl:"
-        curl -fsSL --retry 3 -H "Authorization: Bearer $GITHUB_TOKEN" \
-          "https://github.com/loong64/loong64-abi1.0-toolchains/releases/download/20250821/go${oldWorldGoVersion}.linux-amd64.tar.gz" \
-          -o go-loong64-abi1.0.tar.gz || true
-      fi
-      return 1
-    fi
-    
-    rm -rf go-loong64-abi1.0
-    mkdir go-loong64-abi1.0
-    if ! tar -xzf go-loong64-abi1.0.tar.gz -C go-loong64-abi1.0 --strip-components=1; then
-      echo "Error: Failed to extract patched Go compiler"
-      return 1
-    fi
-    rm go-loong64-abi1.0.tar.gz
-    
-    # Download and setup GCC toolchain for old-world
-    if ! curl -fsSL --retry 3 -H "Authorization: Bearer $GITHUB_TOKEN" \
-      "https://github.com/loong64/loong64-abi1.0-toolchains/releases/download/20250722/loongson-gnu-toolchain-8.3.novec-x86_64-loongarch64-linux-gnu-rc1.1.tar.xz" \
-      -o gcc8-loong64-abi1.0.tar.xz; then
-      echo "Error: Failed to download GCC toolchain for old-world ABI1.0"
-      if [ -n "$GITHUB_TOKEN" ]; then
-        echo "Error output from curl:"
-        curl -fsSL --retry 3 -H "Authorization: Bearer $GITHUB_TOKEN" \
-          "https://github.com/loong64/loong64-abi1.0-toolchains/releases/download/20250722/loongson-gnu-toolchain-8.3.novec-x86_64-loongarch64-linux-gnu-rc1.1.tar.xz" \
-          -o gcc8-loong64-abi1.0.tar.xz || true
-      fi
-      return 1
-    fi
-    
-    rm -rf gcc8-loong64-abi1.0
-    mkdir gcc8-loong64-abi1.0
-    if ! tar -Jxf gcc8-loong64-abi1.0.tar.xz -C gcc8-loong64-abi1.0 --strip-components=1; then
-      echo "Error: Failed to extract GCC toolchain"
-      return 1
-    fi
-    rm gcc8-loong64-abi1.0.tar.xz
-    
-    # Setup separate cache directory for ABI1.0 to avoid cache pollution
-    abi1_cache_dir="$(pwd)/go-loong64-abi1.0-cache"
-    mkdir -p "$abi1_cache_dir"
-    echo "Using separate cache directory for ABI1.0: $abi1_cache_dir"
-    
-    # Use patched Go compiler for old-world build (critical for ABI1.0 compatibility)
-    echo "Building with patched Go compiler for old-world ABI1.0..."
-    echo "Using isolated cache directory: $abi1_cache_dir"
-    
-    # Use env command to set environment variables locally without affecting global environment
-    if ! env GOOS=linux GOARCH=loong64 \
-        CC="$(pwd)/gcc8-loong64-abi1.0/bin/loongarch64-linux-gnu-gcc" \
-        CXX="$(pwd)/gcc8-loong64-abi1.0/bin/loongarch64-linux-gnu-g++" \
-        CGO_ENABLED=1 \
-        GOCACHE="$abi1_cache_dir" \
-        $(pwd)/go-loong64-abi1.0/bin/go build -a -o "$output_file" -ldflags="$ldflags" -tags=jsoniter .; then
-      echo "Error: Build failed with patched Go compiler"
-      echo "Attempting retry with cache cleanup..."
-      env GOCACHE="$abi1_cache_dir" $(pwd)/go-loong64-abi1.0/bin/go clean -cache
-      if ! env GOOS=linux GOARCH=loong64 \
-          CC="$(pwd)/gcc8-loong64-abi1.0/bin/loongarch64-linux-gnu-gcc" \
-          CXX="$(pwd)/gcc8-loong64-abi1.0/bin/loongarch64-linux-gnu-g++" \
-          CGO_ENABLED=1 \
-          GOCACHE="$abi1_cache_dir" \
-          $(pwd)/go-loong64-abi1.0/bin/go build -a -o "$output_file" -ldflags="$ldflags" -tags=jsoniter .; then
-        echo "Error: Build failed again after cache cleanup"
-        echo "Build environment details:"
-        echo "GOOS=linux"
-        echo "GOARCH=loong64" 
-        echo "CC=$(pwd)/gcc8-loong64-abi1.0/bin/loongarch64-linux-gnu-gcc"
-        echo "CXX=$(pwd)/gcc8-loong64-abi1.0/bin/loongarch64-linux-gnu-g++"
-        echo "CGO_ENABLED=1"
-        echo "GOCACHE=$abi1_cache_dir"
-        echo "Go version: $($(pwd)/go-loong64-abi1.0/bin/go version)"
-        echo "GCC version: $($(pwd)/gcc8-loong64-abi1.0/bin/loongarch64-linux-gnu-gcc --version | head -1)"
-        return 1
-      fi
-    fi
-  else
-    # Setup abi2.0 toolchain for new world glibc build
-    echo "Setting up new-world ABI2.0 toolchain..."
-    if ! curl -fsSL --retry 3 -H "Authorization: Bearer $GITHUB_TOKEN" \
-      "https://github.com/loong64/cross-tools/releases/download/20250507/x86_64-cross-tools-loongarch64-unknown-linux-gnu-legacy.tar.xz" \
-      -o gcc12-loong64-abi2.0.tar.xz; then
-      echo "Error: Failed to download GCC toolchain for new-world ABI2.0"
-      if [ -n "$GITHUB_TOKEN" ]; then
-        echo "Error output from curl:"
-        curl -fsSL --retry 3 -H "Authorization: Bearer $GITHUB_TOKEN" \
-          "https://github.com/loong64/cross-tools/releases/download/20250507/x86_64-cross-tools-loongarch64-unknown-linux-gnu-legacy.tar.xz" \
-          -o gcc12-loong64-abi2.0.tar.xz || true
-      fi
-      return 1
-    fi
-    
-    rm -rf gcc12-loong64-abi2.0
-    mkdir gcc12-loong64-abi2.0
-    if ! tar -Jxf gcc12-loong64-abi2.0.tar.xz -C gcc12-loong64-abi2.0 --strip-components=1; then
-      echo "Error: Failed to extract GCC toolchain"
-      return 1
-    fi
-    rm gcc12-loong64-abi2.0.tar.xz
-    
-    export GOOS=linux
-    export GOARCH=loong64
-    export CC=$(pwd)/gcc12-loong64-abi2.0/bin/loongarch64-unknown-linux-gnu-gcc
-    export CXX=$(pwd)/gcc12-loong64-abi2.0/bin/loongarch64-unknown-linux-gnu-g++
-    export CGO_ENABLED=1
-    
-    # Use standard Go compiler for new-world build
-    echo "Building with standard Go compiler for new-world ABI2.0..."
-    if ! go build -a -o "$output_file" -ldflags="$ldflags" -tags=jsoniter .; then
-      echo "Error: Build failed with standard Go compiler"
-      echo "Attempting retry with cache cleanup..."
-      go clean -cache
-      if ! go build -a -o "$output_file" -ldflags="$ldflags" -tags=jsoniter .; then
-        echo "Error: Build failed again after cache cleanup"
-        echo "Build environment details:"
-        echo "GOOS=$GOOS"
-        echo "GOARCH=$GOARCH"
-        echo "CC=$CC"
-        echo "CXX=$CXX"
-        echo "CGO_ENABLED=$CGO_ENABLED"
-        echo "Go version: $(go version)"
-        echo "GCC version: $($CC --version | head -1)"
-        return 1
-      fi
-    fi
-  fi
 }
 
 BuildReleaseLinuxMusl() {
@@ -441,7 +249,6 @@ BuildReleaseLinuxMuslArm() {
   done
 }
 
-
 BuildReleaseAndroid() {
   rm -rf .git/
   mkdir -p "build"
@@ -471,7 +278,6 @@ BuildReleaseFreeBSD() {
   freebsd_version=$(eval "curl -fsSL --max-time 2 $githubAuthArgs \"https://api.github.com/repos/freebsd/freebsd-src/tags\"" | \
     jq -r '.[].name' | \
     grep '^release/14\.' | \
-    grep -v -- '-p[0-9]*$' | \
     sort -V | \
     tail -1 | \
     sed 's/release\///' | \
@@ -537,7 +343,7 @@ MakeRelease() {
     tar -czvf compress/"$i$liteSuffix".tar.gz "$appName"
     rm -f "$appName"
   done
-  for i in $(find . -type f \( -name "$appName-windows-*" -o -name "$appName-windows7-*" \)); do
+  for i in $(find . -type f -name "$appName-windows-*"); do
     cp "$i" "$appName".exe
     zip compress/$(echo $i | sed 's/\.[^.]*$//')$liteSuffix.zip "$appName".exe
     rm -f "$appName".exe
@@ -584,7 +390,7 @@ for arg in "$@"; do
 done
 
 if [ "$buildType" = "dev" ]; then
-  FetchWebRolling
+  FetchWebDev
   if [ "$dockerType" = "docker" ]; then
     BuildDocker
   elif [ "$dockerType" = "docker-multiplatform" ]; then
@@ -596,7 +402,7 @@ if [ "$buildType" = "dev" ]; then
   fi
 elif [ "$buildType" = "release" -o "$buildType" = "beta" ]; then
   if [ "$buildType" = "beta" ]; then
-    FetchWebRolling
+    FetchWebDev
   else
     FetchWebRelease
   fi
@@ -677,5 +483,4 @@ else
   echo -e "  $0 release"
   echo -e "  $0 release lite"
   echo -e "  $0 release docker lite"
-  echo -e "  $0 release linux_musl"
 fi

cmd/admin.go

@@ -4,8 +4,6 @@ Copyright © 2022 NAME HERE <EMAIL ADDRESS>
 package cmd
 
 import (
-	"fmt"
-
 	"github.com/OpenListTeam/OpenList/v4/internal/conf"
 	"github.com/OpenListTeam/OpenList/v4/internal/op"
 	"github.com/OpenListTeam/OpenList/v4/internal/setting"
@@ -26,11 +24,10 @@ var AdminCmd = &cobra.Command{
 		if err != nil {
 			utils.Log.Errorf("failed get admin user: %+v", err)
 		} else {
-			utils.Log.Infof("get admin user from CLI")
-			fmt.Println("Admin user's username:", admin.Username)
-			fmt.Println("The password can only be output at the first startup, and then stored as a hash value, which cannot be reversed")
-			fmt.Println("You can reset the password with a random string by running [openlist admin random]")
-			fmt.Println("You can also set a new password by running [openlist admin set NEW_PASSWORD]")
+			utils.Log.Infof("Admin user's username: %s", admin.Username)
+			utils.Log.Infof("The password can only be output at the first startup, and then stored as a hash value, which cannot be reversed")
+			utils.Log.Infof("You can reset the password with a random string by running [openlist admin random]")
+			utils.Log.Infof("You can also set a new password by running [openlist admin set NEW_PASSWORD]")
 		}
 	},
 }
@@ -39,7 +36,6 @@ var RandomPasswordCmd = &cobra.Command{
 	Use:   "random",
 	Short: "Reset admin user's password to a random string",
 	Run: func(cmd *cobra.Command, args []string) {
-		utils.Log.Infof("reset admin user's password to a random string from CLI")
 		newPwd := random.String(8)
 		setAdminPassword(newPwd)
 	},
@@ -48,12 +44,12 @@ var RandomPasswordCmd = &cobra.Command{
 var SetPasswordCmd = &cobra.Command{
 	Use:   "set",
 	Short: "Set admin user's password",
-	RunE: func(cmd *cobra.Command, args []string) error {
+	Run: func(cmd *cobra.Command, args []string) {
 		if len(args) == 0 {
-			return fmt.Errorf("Please enter the new password")
+			utils.Log.Errorf("Please enter the new password")
+			return
 		}
 		setAdminPassword(args[0])
-		return nil
 	},
 }
 
@@ -64,8 +60,7 @@ var ShowTokenCmd = &cobra.Command{
 		Init()
 		defer Release()
 		token := setting.GetStr(conf.Token)
-		utils.Log.Infof("show admin token from CLI")
-		fmt.Println("Admin token:", token)
+		utils.Log.Infof("Admin token: %s", token)
 	},
 }
 
@@ -82,10 +77,9 @@ func setAdminPassword(pwd string) {
 		utils.Log.Errorf("failed update admin user: %+v", err)
 		return
 	}
-	utils.Log.Infof("admin user has been update from CLI")
-	fmt.Println("admin user has been updated:")
-	fmt.Println("username:", admin.Username)
-	fmt.Println("password:", pwd)
+	utils.Log.Infof("admin user has been updated:")
+	utils.Log.Infof("username: %s", admin.Username)
+	utils.Log.Infof("password: %s", pwd)
 	DelAdminCacheOnline()
 }
 

cmd/cancel2FA.go

@@ -4,8 +4,6 @@ Copyright © 2022 NAME HERE <EMAIL ADDRESS>
 package cmd
 
 import (
-	"fmt"
-
 	"github.com/OpenListTeam/OpenList/v4/internal/op"
 	"github.com/OpenListTeam/OpenList/v4/pkg/utils"
 	"github.com/spf13/cobra"
@@ -26,8 +24,7 @@ var Cancel2FACmd = &cobra.Command{
 			if err != nil {
 				utils.Log.Errorf("failed to cancel 2FA: %+v", err)
 			} else {
-				utils.Log.Infof("2FA is canceled from CLI")
-				fmt.Println("2FA canceled")
+				utils.Log.Info("2FA canceled")
 				DelAdminCacheOnline()
 			}
 		}

cmd/root.go

@@ -16,7 +16,7 @@ var RootCmd = &cobra.Command{
 	Short: "A file list program that supports multiple storage.",
 	Long: `A file list program that supports multiple storage,
 built with love by OpenListTeam.
-Complete documentation is available at https://doc.oplist.org/`,
+Complete documentation is available at https://docs.openlist.team/`,
 }
 
 func Execute() {

cmd/server.go

@@ -19,7 +19,6 @@ import (
 	"github.com/OpenListTeam/OpenList/v4/internal/fs"
 	"github.com/OpenListTeam/OpenList/v4/pkg/utils"
 	"github.com/OpenListTeam/OpenList/v4/server"
-	"github.com/OpenListTeam/OpenList/v4/server/middlewares"
 	"github.com/OpenListTeam/sftpd-openlist"
 	ftpserver "github.com/fclairamb/ftpserverlib"
 	"github.com/gin-gonic/gin"
@@ -48,15 +47,7 @@ the address is defined in config file`,
 			gin.SetMode(gin.ReleaseMode)
 		}
 		r := gin.New()
-
-		// gin log
-		if conf.Conf.Log.Filter.Enable {
-			r.Use(middlewares.FilteredLogger())
-		} else {
-			r.Use(gin.LoggerWithWriter(log.StandardLogger().Out))
-		}
-		r.Use(gin.RecoveryWithWriter(log.StandardLogger().Out))
-
+		r.Use(gin.LoggerWithWriter(log.StandardLogger().Out), gin.RecoveryWithWriter(log.StandardLogger().Out))
 		server.Init(r)
 		var httpHandler http.Handler = r
 		if conf.Conf.Scheme.EnableH2c {
@@ -65,7 +56,6 @@ the address is defined in config file`,
 		var httpSrv, httpsSrv, unixSrv *http.Server
 		if conf.Conf.Scheme.HttpPort != -1 {
 			httpBase := fmt.Sprintf("%s:%d", conf.Conf.Scheme.Address, conf.Conf.Scheme.HttpPort)
-			fmt.Printf("start HTTP server @ %s\n", httpBase)
 			utils.Log.Infof("start HTTP server @ %s", httpBase)
 			httpSrv = &http.Server{Addr: httpBase, Handler: httpHandler}
 			go func() {
@@ -77,7 +67,6 @@ the address is defined in config file`,
 		}
 		if conf.Conf.Scheme.HttpsPort != -1 {
 			httpsBase := fmt.Sprintf("%s:%d", conf.Conf.Scheme.Address, conf.Conf.Scheme.HttpsPort)
-			fmt.Printf("start HTTPS server @ %s\n", httpsBase)
 			utils.Log.Infof("start HTTPS server @ %s", httpsBase)
 			httpsSrv = &http.Server{Addr: httpsBase, Handler: r}
 			go func() {
@@ -88,7 +77,6 @@ the address is defined in config file`,
 			}()
 		}
 		if conf.Conf.Scheme.UnixFile != "" {
-			fmt.Printf("start unix server @ %s\n", conf.Conf.Scheme.UnixFile)
 			utils.Log.Infof("start unix server @ %s", conf.Conf.Scheme.UnixFile)
 			unixSrv = &http.Server{Handler: httpHandler}
 			go func() {
@@ -117,7 +105,6 @@ the address is defined in config file`,
 			s3r.Use(gin.LoggerWithWriter(log.StandardLogger().Out), gin.RecoveryWithWriter(log.StandardLogger().Out))
 			server.InitS3(s3r)
 			s3Base := fmt.Sprintf("%s:%d", conf.Conf.Scheme.Address, conf.Conf.S3.Port)
-			fmt.Printf("start S3 server @ %s\n", s3Base)
 			utils.Log.Infof("start S3 server @ %s", s3Base)
 			go func() {
 				var err error
@@ -142,7 +129,6 @@ the address is defined in config file`,
 			if err != nil {
 				utils.Log.Fatalf("failed to start ftp driver: %s", err.Error())
 			} else {
-				fmt.Printf("start ftp server on %s\n", conf.Conf.FTP.Listen)
 				utils.Log.Infof("start ftp server on %s", conf.Conf.FTP.Listen)
 				go func() {
 					ftpServer = ftpserver.NewFtpServer(ftpDriver)
@@ -161,7 +147,6 @@ the address is defined in config file`,
 			if err != nil {
 				utils.Log.Fatalf("failed to start sftp driver: %s", err.Error())
 			} else {
-				fmt.Printf("start sftp server on %s", conf.Conf.SFTP.Listen)
 				utils.Log.Infof("start sftp server on %s", conf.Conf.SFTP.Listen)
 				go func() {
 					sftpServer = sftpd.NewSftpServer(sftpDriver)

cmd/storage.go

@@ -4,7 +4,6 @@ Copyright © 2023 NAME HERE <EMAIL ADDRESS>
 package cmd
 
 import (
-	"fmt"
 	"os"
 	"strconv"
 
@@ -23,61 +22,28 @@ var storageCmd = &cobra.Command{
 }
 
 var disableStorageCmd = &cobra.Command{
-	Use:   "disable [mount path]",
-	Short: "Disable a storage by mount path",
-	RunE: func(cmd *cobra.Command, args []string) error {
+	Use:   "disable",
+	Short: "Disable a storage",
+	Run: func(cmd *cobra.Command, args []string) {
 		if len(args) < 1 {
-			return fmt.Errorf("mount path is required")
+			utils.Log.Errorf("mount path is required")
+			return
 		}
 		mountPath := args[0]
 		Init()
 		defer Release()
 		storage, err := db.GetStorageByMountPath(mountPath)
 		if err != nil {
-			return fmt.Errorf("failed to query storage: %+v", err)
-		}
-		storage.Disabled = true
-		err = db.UpdateStorage(storage)
-		if err != nil {
-			return fmt.Errorf("failed to update storage: %+v", err)
-		}
-		utils.Log.Infof("Storage with mount path [%s] has been disabled from CLI", mountPath)
-		fmt.Printf("Storage with mount path [%s] has been disabled\n", mountPath)
-		return nil
-	},
-}
-
-var deleteStorageCmd = &cobra.Command{
-	Use:   "delete [id]",
-	Short: "Delete a storage by id",
-	RunE: func(cmd *cobra.Command, args []string) error {
-		if len(args) < 1 {
-			return fmt.Errorf("id is required")
-		}
-		id, err := strconv.Atoi(args[0])
-		if err != nil {
-			return fmt.Errorf("id must be a number")
-		}
-
-		if force, _ := cmd.Flags().GetBool("force"); force {
-			fmt.Printf("Are you sure you want to delete storage with id [%d]? [y/N]: ", id)
-			var confirm string
-			fmt.Scanln(&confirm)
-			if confirm != "y" && confirm != "Y" {
-				fmt.Println("Delete operation cancelled.")
-				return nil
+			utils.Log.Errorf("failed to query storage: %+v", err)
+		} else {
+			storage.Disabled = true
+			err = db.UpdateStorage(storage)
+			if err != nil {
+				utils.Log.Errorf("failed to update storage: %+v", err)
+			} else {
+				utils.Log.Infof("Storage with mount path [%s] have been disabled", mountPath)
 			}
 		}
-
-		Init()
-		defer Release()
-		err = db.DeleteStorageById(uint(id))
-		if err != nil {
-			return fmt.Errorf("failed to delete storage by id: %+v", err)
-		}
-		utils.Log.Infof("Storage with id [%d] have been deleted from CLI", id)
-		fmt.Printf("Storage with id [%d] have been deleted\n", id)
-		return nil
 	},
 }
 
@@ -122,14 +88,14 @@ var storageTableHeight int
 var listStorageCmd = &cobra.Command{
 	Use:   "list",
 	Short: "List all storages",
-	RunE: func(cmd *cobra.Command, args []string) error {
+	Run: func(cmd *cobra.Command, args []string) {
 		Init()
 		defer Release()
 		storages, _, err := db.GetStorages(1, -1)
 		if err != nil {
-			return fmt.Errorf("failed to query storages: %+v", err)
+			utils.Log.Errorf("failed to query storages: %+v", err)
 		} else {
-			fmt.Printf("Found %d storages\n", len(storages))
+			utils.Log.Infof("Found %d storages", len(storages))
 			columns := []table.Column{
 				{Title: "ID", Width: 4},
 				{Title: "Driver", Width: 16},
@@ -172,11 +138,10 @@ var listStorageCmd = &cobra.Command{
 
 			m := model{t}
 			if _, err := tea.NewProgram(m).Run(); err != nil {
-				fmt.Printf("failed to run program: %+v\n", err)
+				utils.Log.Errorf("failed to run program: %+v", err)
 				os.Exit(1)
 			}
 		}
-		return nil
 	},
 }
 
@@ -186,8 +151,6 @@ func init() {
 	storageCmd.AddCommand(disableStorageCmd)
 	storageCmd.AddCommand(listStorageCmd)
 	storageCmd.PersistentFlags().IntVarP(&storageTableHeight, "height", "H", 10, "Table height")
-	storageCmd.AddCommand(deleteStorageCmd)
-	deleteStorageCmd.Flags().BoolP("force", "f", false, "Force delete without confirmation")
 	// Here you will define your flags and configuration settings.
 
 	// Cobra supports Persistent Flags which will work for this command

cmd/user.go

@@ -9,7 +9,7 @@ import (
 	"github.com/OpenListTeam/OpenList/v4/internal/op"
 	"github.com/OpenListTeam/OpenList/v4/internal/setting"
 	"github.com/OpenListTeam/OpenList/v4/pkg/utils"
-	"github.com/go-resty/resty/v2"
+	"resty.dev/v3"
 )
 
 func DelAdminCacheOnline() {
@@ -42,8 +42,8 @@ func DelUserCacheOnline(username string) {
 		utils.Log.Warnf("[del_user_cache_online] failed: %+v", res.String())
 		return
 	}
-	code := utils.Json.Get(res.Body(), "code").ToInt()
-	msg := utils.Json.Get(res.Body(), "message").ToString()
+	code := utils.Json.Get(res.Bytes(), "code").ToInt()
+	msg := utils.Json.Get(res.Bytes(), "message").ToString()
 	if code != 200 {
 		utils.Log.Errorf("[del_user_cache_online] error: %s", msg)
 		return

docker-compose.yml

@@ -6,9 +6,10 @@ services:
     ports:
       - '5244:5244'
       - '5245:5245'
-    user: '0:0'
     environment:
+      - PUID=0
+      - PGID=0
       - UMASK=022
-      - TZ=Asia/Shanghai
+      - TZ=UTC
     container_name: openlist
     image: 'openlistteam/openlist:latest'

drivers/115/appver.go

@@ -1,60 +1,43 @@
 package _115
 
 import (
-	"errors"
 	"github.com/OpenListTeam/OpenList/v4/drivers/base"
-	"github.com/OpenListTeam/OpenList/v4/pkg/utils"
-	driver115 "github.com/SheltonZhu/115driver/pkg/driver"
+	driver115 "github.com/j2rong4cn/115driver/pkg/driver"
 	log "github.com/sirupsen/logrus"
 )
 
 var (
 	md5Salt = "Qclm8MGWUv59TnrR0XPg"
-	appVer  = "35.6.0.3"
+	appVer  = "27.0.5.7"
 )
 
-func (d *Pan115) getAppVersion() (string, error) {
-	result := VersionResp{}
-	res, err := base.RestyClient.R().Get(driver115.ApiGetVersion)
+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 "", err
+		return nil, err
 	}
-	err = utils.Json.Unmarshal(res.Body(), &result)
-	if err != nil {
-		return "", err
-	}
-	if len(result.Error) > 0 {
-		return "", errors.New(result.Error)
-	}
-	return result.Data.Win.Version, nil
+
+	return result.Data.GetAppVersions(), nil
 }
 
 func (d *Pan115) getAppVer() string {
-	ver, err := d.getAppVersion()
+	// todo add some cache？
+	vers, err := d.getAppVersion()
 	if err != nil {
 		log.Warnf("[115] get app version failed: %v", err)
 		return appVer
 	}
-	if len(ver) > 0 {
-		return ver
+	for _, ver := range vers {
+		if ver.AppName == "win" {
+			return ver.Version
+		}
 	}
 	return appVer
 }
 
 func (d *Pan115) initAppVer() {
 	appVer = d.getAppVer()
-	log.Debugf("use app version: %v", appVer)
-}
-
-type VersionResp struct {
-	Error string   `json:"error,omitempty"`
-	Data  Versions `json:"data"`
-}
-
-type Versions struct {
-	Win Version `json:"win"`
-}
-
-type Version struct {
-	Version string `json:"version_code"`
 }

drivers/115/driver.go

@@ -10,7 +10,7 @@ import (
 	streamPkg "github.com/OpenListTeam/OpenList/v4/internal/stream"
 	"github.com/OpenListTeam/OpenList/v4/pkg/http_range"
 	"github.com/OpenListTeam/OpenList/v4/pkg/utils"
-	driver115 "github.com/SheltonZhu/115driver/pkg/driver"
+	driver115 "github.com/j2rong4cn/115driver/pkg/driver"
 	"github.com/pkg/errors"
 	"golang.org/x/time/rate"
 )
@@ -93,7 +93,7 @@ func (d *Pan115) MakeDir(ctx context.Context, parentDir model.Obj, dirName strin
 	req := d.client.NewRequest().
 		SetFormData(form).
 		SetResult(&result).
-		ForceContentType("application/json;charset=UTF-8")
+		SetForceResponseContentType("application/json;charset=UTF-8")
 
 	resp, err := req.Post(driver115.ApiDirAdd)
 
@@ -186,7 +186,7 @@ func (d *Pan115) Put(ctx context.Context, dstDir model.Obj, stream model.FileStr
 	preHash = strings.ToUpper(preHash)
 	fullHash := stream.GetHash().GetHash(utils.SHA1)
 	if len(fullHash) != utils.SHA1.Width {
-		_, fullHash, err = streamPkg.CacheFullAndHash(stream, &up, utils.SHA1)
+		_, fullHash, err = streamPkg.CacheFullInTempFileAndHash(stream, utils.SHA1)
 		if err != nil {
 			return nil, err
 		}
@@ -245,17 +245,4 @@ func (d *Pan115) DeleteOfflineTasks(ctx context.Context, hashes []string, delete
 	return d.client.DeleteOfflineTasks(hashes, deleteFiles)
 }
 
-func (d *Pan115) GetDetails(ctx context.Context) (*model.StorageDetails, error) {
-	info, err := d.client.GetInfo()
-	if err != nil {
-		return nil, err
-	}
-	return &model.StorageDetails{
-		DiskUsage: model.DiskUsage{
-			TotalSpace: uint64(info.SpaceInfo.AllTotal.Size),
-			FreeSpace:  uint64(info.SpaceInfo.AllRemain.Size),
-		},
-	}, nil
-}
-
 var _ driver.Driver = (*Pan115)(nil)

drivers/115/meta.go

@@ -18,6 +18,7 @@ var config = driver.Config{
 	Name:        "115 Cloud",
 	DefaultRoot: "0",
 	// OnlyProxy:   true,
+	// OnlyLocal:         true,
 	// NoOverwriteUpload: true,
 }
 

drivers/115/types.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/OpenListTeam/OpenList/v4/internal/model"
 	"github.com/OpenListTeam/OpenList/v4/pkg/utils"
-	"github.com/SheltonZhu/115driver/pkg/driver"
+	"github.com/j2rong4cn/115driver/pkg/driver"
 )
 
 var _ model.Obj = (*FileObj)(nil)

drivers/115/util.go

@@ -24,9 +24,9 @@ import (
 	"github.com/OpenListTeam/OpenList/v4/pkg/utils"
 	"github.com/aliyun/aliyun-oss-go-sdk/oss"
 
-	cipher "github.com/SheltonZhu/115driver/pkg/crypto/ec115"
-	crypto "github.com/SheltonZhu/115driver/pkg/crypto/m115"
-	driver115 "github.com/SheltonZhu/115driver/pkg/driver"
+	cipher "github.com/j2rong4cn/115driver/pkg/crypto/ec115"
+	crypto "github.com/j2rong4cn/115driver/pkg/crypto/m115"
+	driver115 "github.com/j2rong4cn/115driver/pkg/driver"
 	"github.com/pkg/errors"
 )
 
@@ -88,7 +88,7 @@ func (d *Pan115) getNewFileByPickCode(pickCode string) (*FileObj, error) {
 	result := driver115.GetFileInfoResponse{}
 	req := d.client.NewRequest().
 		SetQueryParam("pick_code", pickCode).
-		ForceContentType("application/json;charset=UTF-8").
+		SetForceResponseContentType("application/json;charset=UTF-8").
 		SetResult(&result)
 	resp, err := req.Get(driver115.ApiFileInfo)
 	if err := driver115.CheckErr(err, &result, resp); err != nil {
@@ -125,7 +125,7 @@ func (d *Pan115) DownloadWithUA(pickCode, ua string) (*driver115.DownloadInfo, e
 	req.Header.Set("Cookie", d.Cookie)
 	req.Header.Set("User-Agent", ua)
 
-	resp, err := d.client.Client.GetClient().Do(req)
+	resp, err := d.client.Client.Client().Do(req)
 	if err != nil {
 		return nil, err
 	}
@@ -227,7 +227,7 @@ func (d *Pan115) rapidUpload(fileSize int64, fileName, dirID, preID, fileID stri
 		if err != nil {
 			return nil, err
 		}
-		data := resp.RawBody()
+		data := resp.Body
 		defer data.Close()
 		if bodyBytes, err = io.ReadAll(data); err != nil {
 			return nil, err
@@ -321,7 +321,7 @@ func (d *Pan115) UploadByMultipart(ctx context.Context, params *driver115.Upload
 		err       error
 	)
 
-	tmpF, err := s.CacheFullAndWriter(&up, nil)
+	tmpF, err := s.CacheFullInTempFile()
 	if err != nil {
 		return nil, err
 	}

drivers/115_open/driver.go

@@ -8,7 +8,6 @@ import (
 	"strings"
 	"time"
 
-	sdk "github.com/OpenListTeam/115-sdk-go"
 	"github.com/OpenListTeam/OpenList/v4/cmd/flags"
 	"github.com/OpenListTeam/OpenList/v4/drivers/base"
 	"github.com/OpenListTeam/OpenList/v4/internal/driver"
@@ -17,6 +16,7 @@ import (
 	"github.com/OpenListTeam/OpenList/v4/internal/stream"
 	"github.com/OpenListTeam/OpenList/v4/pkg/http_range"
 	"github.com/OpenListTeam/OpenList/v4/pkg/utils"
+	sdk "github.com/OpenListTeam/115-sdk-go"
 	"golang.org/x/time/rate"
 )
 
@@ -131,23 +131,6 @@ func (d *Open115) Link(ctx context.Context, file model.Obj, args model.LinkArgs)
 	}, nil
 }
 
-func (d *Open115) GetObjInfo(ctx context.Context, path string) (model.Obj, error) {
-	if err := d.WaitLimit(ctx); err != nil {
-		return nil, err
-	}
-	resp, err := d.client.GetFolderInfoByPath(ctx, path)
-	if err != nil {
-		return nil, err
-	}
-	return &Obj{
-		Fid:  resp.FileID,
-		Fn:   resp.FileName,
-		Fc:   resp.FileCategory,
-		Sha1: resp.Sha1,
-		Pc:   resp.PickCode,
-	}, nil
-}
-
 func (d *Open115) MakeDir(ctx context.Context, parentDir model.Obj, dirName string) (model.Obj, error) {
 	if err := d.WaitLimit(ctx); err != nil {
 		return nil, err
@@ -239,7 +222,7 @@ func (d *Open115) Put(ctx context.Context, dstDir model.Obj, file model.FileStre
 	}
 	sha1 := file.GetHash().GetHash(utils.SHA1)
 	if len(sha1) != utils.SHA1.Width {
-		_, sha1, err = stream.CacheFullAndHash(file, &up, utils.SHA1)
+		_, sha1, err = stream.CacheFullInTempFileAndHash(file, utils.SHA1)
 		if err != nil {
 			return err
 		}
@@ -269,7 +252,6 @@ func (d *Open115) Put(ctx context.Context, dstDir model.Obj, file model.FileStre
 		return err
 	}
 	if resp.Status == 2 {
-		up(100)
 		return nil
 	}
 	// 2. two way verify
@@ -304,7 +286,6 @@ func (d *Open115) Put(ctx context.Context, dstDir model.Obj, file model.FileStre
 			return err
 		}
 		if resp.Status == 2 {
-			up(100)
 			return nil
 		}
 	}
@@ -321,43 +302,6 @@ func (d *Open115) Put(ctx context.Context, dstDir model.Obj, file model.FileStre
 	return nil
 }
 
-func (d *Open115) OfflineDownload(ctx context.Context, uris []string, dstDir model.Obj) ([]string, error) {
-	return d.client.AddOfflineTaskURIs(ctx, uris, dstDir.GetID())
-}
-
-func (d *Open115) DeleteOfflineTask(ctx context.Context, infoHash string, deleteFiles bool) error {
-	return d.client.DeleteOfflineTask(ctx, infoHash, deleteFiles)
-}
-
-func (d *Open115) OfflineList(ctx context.Context) (*sdk.OfflineTaskListResp, error) {
-	resp, err := d.client.OfflineTaskList(ctx, 1)
-	if err != nil {
-		return nil, err
-	}
-	return resp, nil
-}
-
-func (d *Open115) GetDetails(ctx context.Context) (*model.StorageDetails, error) {
-	userInfo, err := d.client.UserInfo(ctx)
-	if err != nil {
-		return nil, err
-	}
-	total, err := userInfo.RtSpaceInfo.AllTotal.Size.Int64()
-	if err != nil {
-		return nil, err
-	}
-	free, err := userInfo.RtSpaceInfo.AllRemain.Size.Int64()
-	if err != nil {
-		return nil, err
-	}
-	return &model.StorageDetails{
-		DiskUsage: model.DiskUsage{
-			TotalSpace: uint64(total),
-			FreeSpace:  uint64(free),
-		},
-	}, nil
-}
-
 // func (d *Open115) GetArchiveMeta(ctx context.Context, obj model.Obj, args model.ArchiveArgs) (model.ArchiveMeta, error) {
 // 	// TODO get archive file meta-info, return errs.NotImplement to use an internal archive tool, optional
 // 	return nil, errs.NotImplement

drivers/115_open/meta.go

@@ -11,14 +11,23 @@ type Addition struct {
 	// define other
 	OrderBy        string  `json:"order_by" type:"select" options:"file_name,file_size,user_utime,file_type"`
 	OrderDirection string  `json:"order_direction" type:"select" options:"asc,desc"`
-	LimitRate      float64 `json:"limit_rate" type:"float" default:"1" help:"limit all api request rate ([limit]r/1s)"`
+	LimitRate      float64  `json:"limit_rate,string" type:"float" default:"1" help:"limit all api request rate ([limit]r/1s)"`
 	AccessToken    string  `json:"access_token" required:"true"`
 	RefreshToken   string  `json:"refresh_token" required:"true"`
 }
 
 var config = driver.Config{
-	Name:        "115 Open",
-	DefaultRoot: "0",
+	Name:              "115 Open",
+	LocalSort:         false,
+	OnlyLocal:         false,
+	OnlyProxy:         false,
+	NoCache:           false,
+	NoUpload:          false,
+	NeedMs:            false,
+	DefaultRoot:       "0",
+	CheckStatus:       false,
+	Alert:             "",
+	NoOverwriteUpload: false,
 }
 
 func init() {

drivers/115_open/upload.go

@@ -6,13 +6,12 @@ import (
 	"io"
 	"time"
 
-	sdk "github.com/OpenListTeam/115-sdk-go"
 	"github.com/OpenListTeam/OpenList/v4/internal/driver"
 	"github.com/OpenListTeam/OpenList/v4/internal/model"
-	streamPkg "github.com/OpenListTeam/OpenList/v4/internal/stream"
 	"github.com/OpenListTeam/OpenList/v4/pkg/utils"
 	"github.com/aliyun/aliyun-oss-go-sdk/oss"
 	"github.com/avast/retry-go"
+	sdk "github.com/OpenListTeam/115-sdk-go"
 )
 
 func calPartSize(fileSize int64) int64 {
@@ -70,6 +69,9 @@ func (d *Open115) singleUpload(ctx context.Context, tempF model.File, tokenResp
 // }
 
 func (d *Open115) multpartUpload(ctx context.Context, stream model.FileStreamer, up driver.UpdateProgress, tokenResp *sdk.UploadGetTokenResp, initResp *sdk.UploadInitResp) error {
+	fileSize := stream.GetSize()
+	chunkSize := calPartSize(fileSize)
+
 	ossClient, err := oss.New(tokenResp.Endpoint, tokenResp.AccessKeyId, tokenResp.AccessKeySecret, oss.SecurityToken(tokenResp.SecurityToken))
 	if err != nil {
 		return err
@@ -84,13 +86,6 @@ func (d *Open115) multpartUpload(ctx context.Context, stream model.FileStreamer,
 		return err
 	}
 
-	fileSize := stream.GetSize()
-	chunkSize := calPartSize(fileSize)
-	ss, err := streamPkg.NewStreamSectionReader(stream, int(chunkSize), &up)
-	if err != nil {
-		return err
-	}
-
 	partNum := (stream.GetSize() + chunkSize - 1) / chunkSize
 	parts := make([]oss.UploadPart, partNum)
 	offset := int64(0)
@@ -103,13 +98,10 @@ func (d *Open115) multpartUpload(ctx context.Context, stream model.FileStreamer,
 		if i == partNum {
 			partSize = fileSize - (i-1)*chunkSize
 		}
-		rd, err := ss.GetSectionReader(offset, partSize)
-		if err != nil {
-			return err
-		}
-		rateLimitedRd := driver.NewLimitedUploadStream(ctx, rd)
+		rd := utils.NewMultiReadable(io.LimitReader(stream, partSize))
 		err = retry.Do(func() error {
-			rd.Seek(0, io.SeekStart)
+			_ = rd.Reset()
+			rateLimitedRd := driver.NewLimitedUploadStream(ctx, rd)
 			part, err := bucket.UploadPart(imur, rateLimitedRd, partSize, int(i))
 			if err != nil {
 				return err
@@ -120,7 +112,6 @@ func (d *Open115) multpartUpload(ctx context.Context, stream model.FileStreamer,
 			retry.Attempts(3),
 			retry.DelayType(retry.BackOffDelay),
 			retry.Delay(time.Second))
-		ss.FreeSectionReader(rd)
 		if err != nil {
 			return err
 		}
@@ -130,7 +121,7 @@ func (d *Open115) multpartUpload(ctx context.Context, stream model.FileStreamer,
 		} else {
 			offset += partSize
 		}
-		up(float64(offset) * 100 / float64(fileSize))
+		up(float64(offset) / float64(fileSize))
 	}
 
 	// callbackRespBytes := make([]byte, 1024)

drivers/115_share/driver.go

@@ -7,7 +7,7 @@ import (
 	"github.com/OpenListTeam/OpenList/v4/internal/errs"
 	"github.com/OpenListTeam/OpenList/v4/internal/model"
 	"github.com/OpenListTeam/OpenList/v4/pkg/utils"
-	driver115 "github.com/SheltonZhu/115driver/pkg/driver"
+	driver115 "github.com/j2rong4cn/115driver/pkg/driver"
 	"golang.org/x/time/rate"
 )
 

drivers/115_share/meta.go

@@ -19,7 +19,12 @@ type Addition struct {
 var config = driver.Config{
 	Name:        "115 Share",
 	DefaultRoot: "0",
-	NoUpload:    true,
+	// OnlyProxy:   true,
+	// OnlyLocal:         true,
+	CheckStatus:       false,
+	Alert:             "",
+	NoOverwriteUpload: true,
+	NoUpload:          true,
 }
 
 func init() {

drivers/115_share/utils.go

@@ -7,7 +7,7 @@ import (
 
 	"github.com/OpenListTeam/OpenList/v4/internal/model"
 	"github.com/OpenListTeam/OpenList/v4/pkg/utils"
-	driver115 "github.com/SheltonZhu/115driver/pkg/driver"
+	driver115 "github.com/j2rong4cn/115driver/pkg/driver"
 	"github.com/pkg/errors"
 )
 

drivers/123/driver.go

@@ -22,8 +22,8 @@ import (
 	"github.com/aws/aws-sdk-go/aws/credentials"
 	"github.com/aws/aws-sdk-go/aws/session"
 	"github.com/aws/aws-sdk-go/service/s3/s3manager"
-	"github.com/go-resty/resty/v2"
 	log "github.com/sirupsen/logrus"
+	"resty.dev/v3"
 )
 
 type Pan123 struct {
@@ -64,6 +64,14 @@ func (d *Pan123) List(ctx context.Context, dir model.Obj, args model.ListArgs) (
 
 func (d *Pan123) Link(ctx context.Context, file model.Obj, args model.LinkArgs) (*model.Link, error) {
 	if f, ok := file.(File); ok {
+		//var resp DownResp
+		var headers map[string]string
+		if !utils.IsLocalIPAddr(args.IP) {
+			headers = map[string]string{
+				//"X-Real-IP":       "1.1.1.1",
+				"X-Forwarded-For": args.IP,
+			}
+		}
 		data := base.Json{
 			"driveId":   0,
 			"etag":      f.Etag,
@@ -74,27 +82,26 @@ 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)
+
+			req.SetBody(data).SetHeaders(headers)
 		}, nil)
 		if err != nil {
 			return nil, err
 		}
 		downloadUrl := utils.Json.Get(resp, "data", "DownloadUrl").ToString()
-		ou, err := url.Parse(downloadUrl)
+		u, err := url.Parse(downloadUrl)
 		if err != nil {
 			return nil, err
 		}
-		u_ := ou.String()
-		nu := ou.Query().Get("params")
+		nu := u.Query().Get("params")
 		if nu != "" {
 			du, _ := base64.StdEncoding.DecodeString(nu)
-			u, err := url.Parse(string(du))
+			u, err = url.Parse(string(du))
 			if err != nil {
 				return nil, err
 			}
-			u_ = u.String()
 		}
-
+		u_ := u.String()
 		log.Debug("download url: ", u_)
 		res, err := base.NoRedirectClient.R().SetHeader("Referer", "https://www.123pan.com/").Get(u_)
 		if err != nil {
@@ -108,10 +115,10 @@ func (d *Pan123) Link(ctx context.Context, file model.Obj, args model.LinkArgs)
 		if res.StatusCode() == 302 {
 			link.URL = res.Header().Get("location")
 		} else if res.StatusCode() < 300 {
-			link.URL = utils.Json.Get(res.Body(), "data", "redirect_url").ToString()
+			link.URL = utils.Json.Get(res.Bytes(), "data", "redirect_url").ToString()
 		}
 		link.Header = http.Header{
-			"Referer": []string{fmt.Sprintf("%s://%s/", ou.Scheme, ou.Host)},
+			"Referer": []string{"https://www.123pan.com/"},
 		}
 		return &link, nil
 	} else {
@@ -181,7 +188,7 @@ func (d *Pan123) Put(ctx context.Context, dstDir model.Obj, file model.FileStrea
 	etag := file.GetHash().GetHash(utils.MD5)
 	var err error
 	if len(etag) < utils.MD5.Width {
-		_, etag, err = stream.CacheFullAndHash(file, &up, utils.MD5)
+		_, etag, err = stream.CacheFullInTempFileAndHash(file, utils.MD5)
 		if err != nil {
 			return err
 		}
@@ -253,15 +260,4 @@ func (d *Pan123) APIRateLimit(ctx context.Context, api string) error {
 	return limiter.Wait(ctx)
 }
 
-func (d *Pan123) GetDetails(ctx context.Context) (*model.StorageDetails, error) {
-	userInfo, err := d.getUserInfo(ctx)
-	if err != nil {
-		return nil, err
-	}
-	total := userInfo.Data.SpacePermanent + userInfo.Data.SpaceTemp
-	return &model.StorageDetails{
-		DiskUsage: driver.DiskUsageFromUsedAndTotal(userInfo.Data.SpaceUsed, total),
-	}, nil
-}
-
 var _ driver.Driver = (*Pan123)(nil)

drivers/123/meta.go

@@ -11,8 +11,7 @@ type Addition struct {
 	driver.RootID
 	//OrderBy        string `json:"order_by" type:"select" options:"file_id,file_name,size,update_at" default:"file_name"`
 	//OrderDirection string `json:"order_direction" type:"select" options:"asc,desc" default:"asc"`
-	AccessToken  string
-	UploadThread int `json:"UploadThread" type:"number" default:"3" help:"the threads of upload"`
+	AccessToken string
 }
 
 var config = driver.Config{
@@ -23,11 +22,6 @@ var config = driver.Config{
 
 func init() {
 	op.RegisterDriver(func() driver.Driver {
-		// 新增默认选项 要在RegisterDriver初始化设置 才会对正在使用的用户生效
-		return &Pan123{
-			Addition: Addition{
-				UploadThread: 3,
-			},
-		}
+		return &Pan123{}
 	})
 }

drivers/123/types.go

@@ -28,7 +28,7 @@ func (f File) CreateTime() time.Time {
 }
 
 func (f File) GetHash() utils.HashInfo {
-	return utils.NewHashInfo(utils.MD5, f.Etag)
+	return utils.HashInfo{}
 }
 
 func (f File) GetPath() string {
@@ -122,14 +122,3 @@ type S3PreSignedURLs struct {
 		PreSignedUrls map[string]string `json:"presignedUrls"`
 	} `json:"data"`
 }
-
-type UserInfoResp struct {
-	Data struct {
-		Uid            int64  `json:"UID"`
-		Nickname       string `json:"Nickname"`
-		SpaceUsed      uint64 `json:"SpaceUsed"`
-		SpacePermanent uint64 `json:"SpacePermanent"`
-		SpaceTemp      uint64 `json:"SpaceTemp"`
-		FileCount      int    `json:"FileCount"`
-	} `json:"data"`
-}

drivers/123/upload.go

@@ -6,17 +6,12 @@ import (
 	"io"
 	"net/http"
 	"strconv"
-	"time"
 
 	"github.com/OpenListTeam/OpenList/v4/drivers/base"
 	"github.com/OpenListTeam/OpenList/v4/internal/driver"
 	"github.com/OpenListTeam/OpenList/v4/internal/model"
-	"github.com/OpenListTeam/OpenList/v4/internal/stream"
-	"github.com/OpenListTeam/OpenList/v4/pkg/errgroup"
-	"github.com/OpenListTeam/OpenList/v4/pkg/singleflight"
 	"github.com/OpenListTeam/OpenList/v4/pkg/utils"
-	"github.com/avast/retry-go"
-	"github.com/go-resty/resty/v2"
+	"resty.dev/v3"
 )
 
 func (d *Pan123) getS3PreSignedUrls(ctx context.Context, upReq *UploadResp, start, end int) (*S3PreSignedURLs, error) {
@@ -74,21 +69,18 @@ func (d *Pan123) completeS3(ctx context.Context, upReq *UploadResp, file model.F
 }
 
 func (d *Pan123) newUpload(ctx context.Context, upReq *UploadResp, file model.FileStreamer, up driver.UpdateProgress) error {
-	// fetch s3 pre signed urls
-	size := file.GetSize()
-	chunkSize := int64(16 * utils.MB)
-	chunkCount := 1
-	if size > chunkSize {
-		chunkCount = int((size + chunkSize - 1) / chunkSize)
-	}
-
-	ss, err := stream.NewStreamSectionReader(file, int(chunkSize), &up)
+	tmpF, err := file.CacheFullInTempFile()
 	if err != nil {
 		return err
 	}
-
+	// fetch s3 pre signed urls
+	size := file.GetSize()
+	chunkSize := min(size, 16*utils.MB)
+	chunkCount := int(size / chunkSize)
 	lastChunkSize := size % chunkSize
-	if lastChunkSize == 0 {
+	if lastChunkSize > 0 {
+		chunkCount++
+	} else {
 		lastChunkSize = chunkSize
 	}
 	// only 1 batch is allowed
@@ -98,99 +90,73 @@ func (d *Pan123) newUpload(ctx context.Context, upReq *UploadResp, file model.Fi
 		batchSize = 10
 		getS3UploadUrl = d.getS3PreSignedUrls
 	}
-
-	thread := min(int(chunkCount), d.UploadThread)
-	threadG, uploadCtx := errgroup.NewOrderedGroupWithContext(ctx, thread,
-		retry.Attempts(3),
-		retry.Delay(time.Second),
-		retry.DelayType(retry.BackOffDelay))
 	for i := 1; i <= chunkCount; i += batchSize {
-		if utils.IsCanceled(uploadCtx) {
-			break
+		if utils.IsCanceled(ctx) {
+			return ctx.Err()
 		}
 		start := i
 		end := min(i+batchSize, chunkCount+1)
-		s3PreSignedUrls, err := getS3UploadUrl(uploadCtx, upReq, start, end)
+		s3PreSignedUrls, err := getS3UploadUrl(ctx, upReq, start, end)
 		if err != nil {
 			return err
 		}
 		// upload each chunk
-		for cur := start; cur < end; cur++ {
-			if utils.IsCanceled(uploadCtx) {
-				break
+		for j := start; j < end; j++ {
+			if utils.IsCanceled(ctx) {
+				return ctx.Err()
 			}
-			offset := int64(cur-1) * chunkSize
 			curSize := chunkSize
-			if cur == chunkCount {
+			if j == chunkCount {
 				curSize = lastChunkSize
 			}
-			var reader io.ReadSeeker
-			var rateLimitedRd io.Reader
-			threadG.GoWithLifecycle(errgroup.Lifecycle{
-				Before: func(ctx context.Context) error {
-					if reader == nil {
-						var err error
-						reader, err = ss.GetSectionReader(offset, curSize)
-						if err != nil {
-							return err
-						}
-						rateLimitedRd = driver.NewLimitedUploadStream(ctx, reader)
-					}
-					return nil
-				},
-				Do: func(ctx context.Context) error {
-					reader.Seek(0, io.SeekStart)
-					uploadUrl := s3PreSignedUrls.Data.PreSignedUrls[strconv.Itoa(cur)]
-					if uploadUrl == "" {
-						return fmt.Errorf("upload url is empty, s3PreSignedUrls: %+v", s3PreSignedUrls)
-					}
-					reader.Seek(0, io.SeekStart)
-					req, err := http.NewRequestWithContext(ctx, http.MethodPut, uploadUrl, rateLimitedRd)
-					if err != nil {
-						return err
-					}
-					req.ContentLength = curSize
-					//req.Header.Set("Content-Length", strconv.FormatInt(curSize, 10))
-					res, err := base.HttpClient.Do(req)
-					if err != nil {
-						return err
-					}
-					defer res.Body.Close()
-					if res.StatusCode == http.StatusForbidden {
-						singleflight.AnyGroup.Do(fmt.Sprintf("Pan123.newUpload_%p", threadG), func() (any, error) {
-							newS3PreSignedUrls, err := getS3UploadUrl(ctx, upReq, cur, end)
-							if err != nil {
-								return nil, err
-							}
-							s3PreSignedUrls.Data.PreSignedUrls = newS3PreSignedUrls.Data.PreSignedUrls
-							return nil, nil
-						})
-						if err != nil {
-							return err
-						}
-						return fmt.Errorf("upload s3 chunk %d failed, status code: %d", cur, res.StatusCode)
-					}
-					if res.StatusCode != http.StatusOK {
-						body, err := io.ReadAll(res.Body)
-						if err != nil {
-							return err
-						}
-						return fmt.Errorf("upload s3 chunk %d failed, status code: %d, body: %s", cur, res.StatusCode, body)
-					}
-					progress := 10.0 + 85.0*float64(threadG.Success())/float64(chunkCount)
-					up(progress)
-					return nil
-				},
-				After: func(err error) {
-					ss.FreeSectionReader(reader)
-				},
-			})
+			err = d.uploadS3Chunk(ctx, upReq, s3PreSignedUrls, j, end, io.NewSectionReader(tmpF, chunkSize*int64(j-1), curSize), curSize, false, getS3UploadUrl)
+			if err != nil {
+				return err
+			}
+			up(float64(j) * 100 / float64(chunkCount))
 		}
 	}
-	if err := threadG.Wait(); err != nil {
-		return err
-	}
-	defer up(100)
 	// complete s3 upload
 	return d.completeS3(ctx, upReq, file, chunkCount > 1)
 }
+
+func (d *Pan123) uploadS3Chunk(ctx context.Context, upReq *UploadResp, s3PreSignedUrls *S3PreSignedURLs, cur, end int, reader *io.SectionReader, curSize int64, retry bool, getS3UploadUrl func(ctx context.Context, upReq *UploadResp, start int, end int) (*S3PreSignedURLs, error)) error {
+	uploadUrl := s3PreSignedUrls.Data.PreSignedUrls[strconv.Itoa(cur)]
+	if uploadUrl == "" {
+		return fmt.Errorf("upload url is empty, s3PreSignedUrls: %+v", s3PreSignedUrls)
+	}
+	req, err := http.NewRequest("PUT", uploadUrl, driver.NewLimitedUploadStream(ctx, reader))
+	if err != nil {
+		return err
+	}
+	req = req.WithContext(ctx)
+	req.ContentLength = curSize
+	//req.Header.Set("Content-Length", strconv.FormatInt(curSize, 10))
+	res, err := base.HttpClient.Do(req)
+	if err != nil {
+		return err
+	}
+	defer res.Body.Close()
+	if res.StatusCode == http.StatusForbidden {
+		if retry {
+			return fmt.Errorf("upload s3 chunk %d failed, status code: %d", cur, res.StatusCode)
+		}
+		// refresh s3 pre signed urls
+		newS3PreSignedUrls, err := getS3UploadUrl(ctx, upReq, cur, end)
+		if err != nil {
+			return err
+		}
+		s3PreSignedUrls.Data.PreSignedUrls = newS3PreSignedUrls.Data.PreSignedUrls
+		// retry
+		reader.Seek(0, io.SeekStart)
+		return d.uploadS3Chunk(ctx, upReq, s3PreSignedUrls, cur, end, reader, curSize, true, getS3UploadUrl)
+	}
+	if res.StatusCode != http.StatusOK {
+		body, err := io.ReadAll(res.Body)
+		if err != nil {
+			return err
+		}
+		return fmt.Errorf("upload s3 chunk %d failed, status code: %d, body: %s", cur, res.StatusCode, body)
+	}
+	return nil
+}

drivers/123/util.go

@@ -15,9 +15,9 @@ import (
 
 	"github.com/OpenListTeam/OpenList/v4/drivers/base"
 	"github.com/OpenListTeam/OpenList/v4/pkg/utils"
-	"github.com/go-resty/resty/v2"
 	jsoniter "github.com/json-iterator/go"
 	log "github.com/sirupsen/logrus"
+	"resty.dev/v3"
 )
 
 // do others that not defined in Driver interface
@@ -43,7 +43,7 @@ const (
 	S3Auth           = MainApi + "/file/s3_upload_object/auth"
 	UploadCompleteV2 = MainApi + "/file/upload_complete/v2"
 	S3Complete       = MainApi + "/file/s3_complete_multipart_upload"
-	// AuthKeySalt      = "8-8D$sL8gPjom7bk#cY"
+	//AuthKeySalt      = "8-8D$sL8gPjom7bk#cY"
 )
 
 func signPath(path string, os string, version string) (k string, v string) {
@@ -172,10 +172,10 @@ func (d *Pan123) login() error {
 	if err != nil {
 		return err
 	}
-	if utils.Json.Get(res.Body(), "code").ToInt() != 200 {
-		err = fmt.Errorf(utils.Json.Get(res.Body(), "message").ToString())
+	if utils.Json.Get(res.Bytes(), "code").ToInt() != 200 {
+		err = fmt.Errorf(utils.Json.Get(res.Bytes(), "message").ToString())
 	} else {
-		d.AccessToken = utils.Json.Get(res.Body(), "data", "token").ToString()
+		d.AccessToken = utils.Json.Get(res.Bytes(), "data", "token").ToString()
 	}
 	return err
 }
@@ -222,7 +222,7 @@ do:
 	if err != nil {
 		return nil, err
 	}
-	body := res.Body()
+	body := res.Bytes()
 	code := utils.Json.Get(body, "code").ToInt()
 	if code != 0 {
 		if !isRetry && code == 401 {
@@ -282,14 +282,3 @@ func (d *Pan123) getFiles(ctx context.Context, parentId string, name string) ([]
 	}
 	return res, nil
 }
-
-func (d *Pan123) getUserInfo(ctx context.Context) (*UserInfoResp, error) {
-	var resp UserInfoResp
-	_, err := d.Request(UserInfo, http.MethodGet, func(req *resty.Request) {
-		req.SetContext(ctx)
-	}, &resp)
-	if err != nil {
-		return nil, err
-	}
-	return &resp, nil
-}

drivers/123_open/driver.go

@@ -2,9 +2,7 @@ package _123_open
 
 import (
 	"context"
-	"fmt"
 	"strconv"
-	"time"
 
 	"github.com/OpenListTeam/OpenList/v4/internal/driver"
 	"github.com/OpenListTeam/OpenList/v4/internal/errs"
@@ -17,7 +15,6 @@ import (
 type Open123 struct {
 	model.Storage
 	Addition
-	UID uint64
 }
 
 func (d *Open123) Config() driver.Config {
@@ -70,45 +67,13 @@ func (d *Open123) List(ctx context.Context, dir model.Obj, args model.ListArgs)
 func (d *Open123) Link(ctx context.Context, file model.Obj, args model.LinkArgs) (*model.Link, error) {
 	fileId, _ := strconv.ParseInt(file.GetID(), 10, 64)
 
-	if d.DirectLink {
-		res, err := d.getDirectLink(fileId)
-		if err != nil {
-			return nil, err
-		}
-
-		if d.DirectLinkPrivateKey == "" {
-			duration := 365 * 24 * time.Hour // 缓存1年
-			return &model.Link{
-				URL:        res.Data.URL,
-				Expiration: &duration,
-			}, nil
-		}
-
-		uid, err := d.getUID(ctx)
-		if err != nil {
-			return nil, err
-		}
-
-		duration := time.Duration(d.DirectLinkValidDuration) * time.Minute
-
-		newURL, err := d.SignURL(res.Data.URL, d.DirectLinkPrivateKey,
-			uid, duration)
-		if err != nil {
-			return nil, err
-		}
-
-		return &model.Link{
-			URL:        newURL,
-			Expiration: &duration,
-		}, nil
-	}
-
 	res, err := d.getDownloadInfo(fileId)
 	if err != nil {
 		return nil, err
 	}
 
-	return &model.Link{URL: res.Data.DownloadUrl}, nil
+	link := model.Link{URL: res.Data.DownloadUrl}
+	return &link, nil
 }
 
 func (d *Open123) MakeDir(ctx context.Context, parentDir model.Obj, dirName string) error {
@@ -130,22 +95,6 @@ func (d *Open123) Rename(ctx context.Context, srcObj model.Obj, newName string)
 }
 
 func (d *Open123) Copy(ctx context.Context, srcObj, dstDir model.Obj) error {
-	// 尝试使用上传+MD5秒传功能实现复制
-	// 1. 创建文件
-	// parentFileID 父目录id，上传到根目录时填写 0
-	parentFileId, err := strconv.ParseInt(dstDir.GetID(), 10, 64)
-	if err != nil {
-		return fmt.Errorf("parse parentFileID error: %v", err)
-	}
-	etag := srcObj.(File).Etag
-	createResp, err := d.create(parentFileId, srcObj.GetName(), etag, srcObj.GetSize(), 2, false)
-	if err != nil {
-		return err
-	}
-	// 是否秒传
-	if createResp.Data.Reuse {
-		return nil
-	}
 	return errs.NotSupport
 }
 
@@ -155,89 +104,26 @@ func (d *Open123) Remove(ctx context.Context, obj model.Obj) error {
 	return d.trash(fileId)
 }
 
-func (d *Open123) Put(ctx context.Context, dstDir model.Obj, file model.FileStreamer, up driver.UpdateProgress) (model.Obj, error) {
-	// 1. 创建文件
-	// parentFileID 父目录id，上传到根目录时填写 0
+func (d *Open123) Put(ctx context.Context, dstDir model.Obj, file model.FileStreamer, up driver.UpdateProgress) error {
 	parentFileId, err := strconv.ParseInt(dstDir.GetID(), 10, 64)
-	if err != nil {
-		return nil, fmt.Errorf("parse parentFileID error: %v", err)
-	}
-	// etag 文件md5
 	etag := file.GetHash().GetHash(utils.MD5)
+
 	if len(etag) < utils.MD5.Width {
-		_, etag, err = stream.CacheFullAndHash(file, &up, utils.MD5)
+		_, etag, err = stream.CacheFullInTempFileAndHash(file, utils.MD5)
 		if err != nil {
-			return nil, err
+			return err
 		}
 	}
 	createResp, err := d.create(parentFileId, file.GetName(), etag, file.GetSize(), 2, false)
 	if err != nil {
-		return nil, err
+		return err
 	}
-	// 是否秒传
 	if createResp.Data.Reuse {
-		// 秒传成功才会返回正确的 FileID，否则为 0
-		if createResp.Data.FileID != 0 {
-			return File{
-				FileName: file.GetName(),
-				Size:     file.GetSize(),
-				FileId:   createResp.Data.FileID,
-				Type:     2,
-				Etag:     etag,
-			}, nil
-		}
+		return nil
 	}
+	up(10)
 
-	// 2. 上传分片
-	err = d.Upload(ctx, file, createResp, up)
-	if err != nil {
-		return nil, err
-	}
-
-	// 3. 上传完毕
-	for range 60 {
-		uploadCompleteResp, err := d.complete(createResp.Data.PreuploadID)
-		// 返回错误代码未知，如：20103，文档也没有具体说
-		if err == nil && uploadCompleteResp.Data.Completed && uploadCompleteResp.Data.FileID != 0 {
-			up(100)
-			return File{
-				FileName: file.GetName(),
-				Size:     file.GetSize(),
-				FileId:   uploadCompleteResp.Data.FileID,
-				Type:     2,
-				Etag:     etag,
-			}, nil
-		}
-		// 若接口返回的completed为 false 时，则需间隔1秒继续轮询此接口，获取上传最终结果。
-		time.Sleep(time.Second)
-	}
-	return nil, fmt.Errorf("upload complete timeout")
+	return d.Upload(ctx, file, createResp, up)
 }
 
-func (d *Open123) GetDetails(ctx context.Context) (*model.StorageDetails, error) {
-	userInfo, err := d.getUserInfo(ctx)
-	if err != nil {
-		return nil, err
-	}
-	total := userInfo.Data.SpacePermanent + userInfo.Data.SpaceTemp
-	free := total - userInfo.Data.SpaceUsed
-	return &model.StorageDetails{
-		DiskUsage: model.DiskUsage{
-			TotalSpace: total,
-			FreeSpace:  free,
-		},
-	}, nil
-}
-
-func (d *Open123) OfflineDownload(ctx context.Context, url string, dir model.Obj, callback string) (int, error) {
-	return d.createOfflineDownloadTask(ctx, url, dir.GetID(), callback)
-}
-
-func (d *Open123) OfflineDownloadProcess(ctx context.Context, taskID int) (float64, int, error) {
-	return d.queryOfflineDownloadStatus(ctx, taskID)
-}
-
-var (
-	_ driver.Driver    = (*Open123)(nil)
-	_ driver.PutResult = (*Open123)(nil)
-)
+var _ driver.Driver = (*Open123)(nil)

drivers/123_open/meta.go

@@ -23,11 +23,6 @@ type Addition struct {
 	//  上传线程数
 	UploadThread int `json:"UploadThread" type:"number" default:"3" help:"the threads of upload"`
 
-	//  使用直链
-	DirectLink              bool   `json:"DirectLink" type:"bool" default:"false" required:"false" help:"use direct link when download file"`
-	DirectLinkPrivateKey    string `json:"DirectLinkPrivateKey" required:"false" help:"private key for direct link, if URL authentication is enabled"`
-	DirectLinkValidDuration int64  `json:"DirectLinkValidDuration" type:"number" default:"30" required:"false" help:"minutes, if URL authentication is enabled"`
-
 	driver.RootID
 }
 

drivers/123_open/types.go

@@ -19,7 +19,6 @@ func (a *ApiInfo) Require() {
 		a.token <- struct{}{}
 	}
 }
-
 func (a *ApiInfo) Release() {
 	if a.qps > 0 {
 		time.AfterFunc(time.Second, func() {
@@ -27,16 +26,13 @@ func (a *ApiInfo) Release() {
 		})
 	}
 }
-
 func (a *ApiInfo) SetQPS(qps int) {
 	a.qps = qps
 	a.token = make(chan struct{}, qps)
 }
-
 func (a *ApiInfo) NowLen() int {
 	return len(a.token)
 }
-
 func InitApiInfo(url string, qps int) *ApiInfo {
 	return &ApiInfo{
 		url:   url,
@@ -77,9 +73,7 @@ func (f File) GetName() string {
 }
 
 func (f File) CreateTime() time.Time {
-	// 返回的时间没有时区信息，默认 UTC+8
-	loc := time.FixedZone("UTC+8", 8*60*60)
-	parsedTime, err := time.ParseInLocation("2006-01-02 15:04:05", f.CreateAt, loc)
+	parsedTime, err := time.Parse("2006-01-02 15:04:05", f.CreateAt)
 	if err != nil {
 		return time.Now()
 	}
@@ -87,9 +81,7 @@ func (f File) CreateTime() time.Time {
 }
 
 func (f File) ModTime() time.Time {
-	// 返回的时间没有时区信息，默认 UTC+8
-	loc := time.FixedZone("UTC+8", 8*60*60)
-	parsedTime, err := time.ParseInLocation("2006-01-02 15:04:05", f.UpdateAt, loc)
+	parsedTime, err := time.Parse("2006-01-02 15:04:05", f.UpdateAt)
 	if err != nil {
 		return time.Now()
 	}
@@ -131,19 +123,19 @@ type RefreshTokenResp struct {
 type UserInfoResp struct {
 	BaseResp
 	Data struct {
-		UID uint64 `json:"uid"`
-		// Username       string `json:"username"`
-		// DisplayName    string `json:"displayName"`
-		// HeadImage      string `json:"headImage"`
-		// Passport       string `json:"passport"`
-		// Mail           string `json:"mail"`
-		SpaceUsed      uint64 `json:"spaceUsed"`
-		SpacePermanent uint64 `json:"spacePermanent"`
-		SpaceTemp      uint64 `json:"spaceTemp"`
-		// SpaceTempExpr  int64  `json:"spaceTempExpr"`
-		// Vip            bool   `json:"vip"`
-		// DirectTraffic  int64  `json:"directTraffic"`
-		// IsHideUID      bool   `json:"isHideUID"`
+		UID            int64  `json:"uid"`
+		Username       string `json:"username"`
+		DisplayName    string `json:"displayName"`
+		HeadImage      string `json:"headImage"`
+		Passport       string `json:"passport"`
+		Mail           string `json:"mail"`
+		SpaceUsed      int64  `json:"spaceUsed"`
+		SpacePermanent int64  `json:"spacePermanent"`
+		SpaceTemp      int64  `json:"spaceTemp"`
+		SpaceTempExpr  string `json:"spaceTempExpr"`
+		Vip            bool   `json:"vip"`
+		DirectTraffic  int64  `json:"directTraffic"`
+		IsHideUID      bool   `json:"isHideUID"`
 	} `json:"data"`
 }
 
@@ -162,27 +154,33 @@ type DownloadInfoResp struct {
 	} `json:"data"`
 }
 
-type DirectLinkResp struct {
-	BaseResp
-	Data struct {
-		URL string `json:"url"`
-	} `json:"data"`
-}
-
-// 创建文件V2返回
 type UploadCreateResp struct {
 	BaseResp
 	Data struct {
-		FileID      int64    `json:"fileID"`
-		PreuploadID string   `json:"preuploadID"`
-		Reuse       bool     `json:"reuse"`
-		SliceSize   int64    `json:"sliceSize"`
-		Servers     []string `json:"servers"`
+		FileID      int64  `json:"fileID"`
+		PreuploadID string `json:"preuploadID"`
+		Reuse       bool   `json:"reuse"`
+		SliceSize   int64  `json:"sliceSize"`
 	} `json:"data"`
 }
 
-// 上传完毕V2返回
+type UploadUrlResp struct {
+	BaseResp
+	Data struct {
+		PresignedURL string `json:"presignedURL"`
+	}
+}
+
 type UploadCompleteResp struct {
+	BaseResp
+	Data struct {
+		Async     bool  `json:"async"`
+		Completed bool  `json:"completed"`
+		FileID    int64 `json:"fileID"`
+	} `json:"data"`
+}
+
+type UploadAsyncResp struct {
 	BaseResp
 	Data struct {
 		Completed bool  `json:"completed"`
@@ -190,17 +188,18 @@ type UploadCompleteResp struct {
 	} `json:"data"`
 }
 
-type OfflineDownloadResp struct {
+type UploadResp struct {
 	BaseResp
 	Data struct {
-		TaskID int `json:"taskID"`
-	} `json:"data"`
-}
-
-type OfflineDownloadProcessResp struct {
-	BaseResp
-	Data struct {
-		Process float64 `json:"process"`
-		Status  int     `json:"status"`
+		AccessKeyId     string `json:"AccessKeyId"`
+		Bucket          string `json:"Bucket"`
+		Key             string `json:"Key"`
+		SecretAccessKey string `json:"SecretAccessKey"`
+		SessionToken    string `json:"SessionToken"`
+		FileId          int64  `json:"FileId"`
+		Reuse           bool   `json:"Reuse"`
+		EndPoint        string `json:"EndPoint"`
+		StorageNode     string `json:"StorageNode"`
+		UploadId        string `json:"UploadId"`
 	} `json:"data"`
 }

drivers/123_open/upload.go

@@ -1,28 +1,21 @@
 package _123_open
 
 import (
-	"bytes"
 	"context"
-	"encoding/json"
-	"fmt"
-	"io"
-	"mime/multipart"
 	"net/http"
-	"strconv"
 	"strings"
 	"time"
 
 	"github.com/OpenListTeam/OpenList/v4/drivers/base"
 	"github.com/OpenListTeam/OpenList/v4/internal/driver"
 	"github.com/OpenListTeam/OpenList/v4/internal/model"
-	"github.com/OpenListTeam/OpenList/v4/internal/stream"
 	"github.com/OpenListTeam/OpenList/v4/pkg/errgroup"
+	"github.com/OpenListTeam/OpenList/v4/pkg/http_range"
 	"github.com/OpenListTeam/OpenList/v4/pkg/utils"
 	"github.com/avast/retry-go"
-	"github.com/go-resty/resty/v2"
+	"resty.dev/v3"
 )
 
-// 创建文件 V2
 func (d *Open123) create(parentFileID int64, filename string, etag string, size int64, duplicate int, containDir bool) (*UploadCreateResp, error) {
 	var resp UploadCreateResp
 	_, err := d.Request(UploadCreate, http.MethodPost, func(req *resty.Request) {
@@ -41,136 +34,21 @@ func (d *Open123) create(parentFileID int64, filename string, etag string, size
 	return &resp, nil
 }
 
-// 上传分片 V2
-func (d *Open123) Upload(ctx context.Context, file model.FileStreamer, createResp *UploadCreateResp, up driver.UpdateProgress) error {
-	uploadDomain := createResp.Data.Servers[0]
-	size := file.GetSize()
-	chunkSize := createResp.Data.SliceSize
-
-	ss, err := stream.NewStreamSectionReader(file, int(chunkSize), &up)
-	if err != nil {
-		return err
-	}
-
-	uploadNums := (size + chunkSize - 1) / chunkSize
-	thread := min(int(uploadNums), d.UploadThread)
-	threadG, uploadCtx := errgroup.NewOrderedGroupWithContext(ctx, thread,
-		retry.Attempts(3),
-		retry.Delay(time.Second),
-		retry.DelayType(retry.BackOffDelay))
-
-	for partIndex := range uploadNums {
-		if utils.IsCanceled(uploadCtx) {
-			break
-		}
-		partIndex := partIndex
-		partNumber := partIndex + 1 // 分片号从1开始
-		offset := partIndex * chunkSize
-		size := min(chunkSize, size-offset)
-		var reader io.ReadSeeker
-		var rateLimitedRd io.Reader
-		sliceMD5 := ""
-		// 表单
-		b := bytes.NewBuffer(make([]byte, 0, 2048))
-		threadG.GoWithLifecycle(errgroup.Lifecycle{
-			Before: func(ctx context.Context) error {
-				if reader == nil {
-					var err error
-					// 每个分片一个reader
-					reader, err = ss.GetSectionReader(offset, size)
-					if err != nil {
-						return err
-					}
-					// 计算当前分片的MD5
-					sliceMD5, err = utils.HashReader(utils.MD5, reader)
-					if err != nil {
-						return err
-					}
-				}
-				return nil
-			},
-			Do: func(ctx context.Context) error {
-				// 重置分片reader位置，因为HashReader、上一次失败已经读取到分片EOF
-				reader.Seek(0, io.SeekStart)
-
-				b.Reset()
-				w := multipart.NewWriter(b)
-				// 添加表单字段
-				err = w.WriteField("preuploadID", createResp.Data.PreuploadID)
-				if err != nil {
-					return err
-				}
-				err = w.WriteField("sliceNo", strconv.FormatInt(partNumber, 10))
-				if err != nil {
-					return err
-				}
-				err = w.WriteField("sliceMD5", sliceMD5)
-				if err != nil {
-					return err
-				}
-				// 写入文件内容
-				_, err = w.CreateFormFile("slice", fmt.Sprintf("%s.part%d", file.GetName(), partNumber))
-				if err != nil {
-					return err
-				}
-				headSize := b.Len()
-				err = w.Close()
-				if err != nil {
-					return err
-				}
-				head := bytes.NewReader(b.Bytes()[:headSize])
-				tail := bytes.NewReader(b.Bytes()[headSize:])
-				rateLimitedRd = driver.NewLimitedUploadStream(ctx, io.MultiReader(head, reader, tail))
-				// 创建请求并设置header
-				req, err := http.NewRequestWithContext(ctx, http.MethodPost, uploadDomain+"/upload/v2/file/slice", rateLimitedRd)
-				if err != nil {
-					return err
-				}
-
-				// 设置请求头
-				req.Header.Add("Authorization", "Bearer "+d.AccessToken)
-				req.Header.Add("Content-Type", w.FormDataContentType())
-				req.Header.Add("Platform", "open_platform")
-
-				res, err := base.HttpClient.Do(req)
-				if err != nil {
-					return err
-				}
-				defer res.Body.Close()
-				if res.StatusCode != 200 {
-					return fmt.Errorf("slice %d upload failed, status code: %d", partNumber, res.StatusCode)
-				}
-				var resp BaseResp
-				respBody, err := io.ReadAll(res.Body)
-				if err != nil {
-					return err
-				}
-				err = json.Unmarshal(respBody, &resp)
-				if err != nil {
-					return err
-				}
-				if resp.Code != 0 {
-					return fmt.Errorf("slice %d upload failed: %s", partNumber, resp.Message)
-				}
-
-				progress := 10.0 + 85.0*float64(threadG.Success())/float64(uploadNums)
-				up(progress)
-				return nil
-			},
-			After: func(err error) {
-				ss.FreeSectionReader(reader)
-			},
+func (d *Open123) url(preuploadID string, sliceNo int64) (string, error) {
+	// get upload url
+	var resp UploadUrlResp
+	_, err := d.Request(UploadUrl, http.MethodPost, func(req *resty.Request) {
+		req.SetBody(base.Json{
+			"preuploadId": preuploadID,
+			"sliceNo":     sliceNo,
 		})
+	}, &resp)
+	if err != nil {
+		return "", err
 	}
-
-	if err := threadG.Wait(); err != nil {
-		return err
-	}
-
-	return nil
+	return resp.Data.PresignedURL, nil
 }
 
-// 上传完毕
 func (d *Open123) complete(preuploadID string) (*UploadCompleteResp, error) {
 	var resp UploadCompleteResp
 	_, err := d.Request(UploadComplete, http.MethodPost, func(req *resty.Request) {
@@ -183,3 +61,91 @@ func (d *Open123) complete(preuploadID string) (*UploadCompleteResp, error) {
 	}
 	return &resp, nil
 }
+
+func (d *Open123) async(preuploadID string) (*UploadAsyncResp, error) {
+	var resp UploadAsyncResp
+	_, err := d.Request(UploadAsync, http.MethodPost, func(req *resty.Request) {
+		req.SetBody(base.Json{
+			"preuploadID": preuploadID,
+		})
+	}, &resp)
+	if err != nil {
+		return nil, err
+	}
+	return &resp, nil
+}
+
+func (d *Open123) Upload(ctx context.Context, file model.FileStreamer, createResp *UploadCreateResp, up driver.UpdateProgress) error {
+	size := file.GetSize()
+	chunkSize := createResp.Data.SliceSize
+	uploadNums := (size + chunkSize - 1) / chunkSize
+	threadG, uploadCtx := errgroup.NewGroupWithContext(ctx, d.UploadThread,
+		retry.Attempts(3),
+		retry.Delay(time.Second),
+		retry.DelayType(retry.BackOffDelay))
+
+	for partIndex := int64(0); partIndex < uploadNums; partIndex++ {
+		if utils.IsCanceled(uploadCtx) {
+			return ctx.Err()
+		}
+		partIndex := partIndex
+		partNumber := partIndex + 1 // 分片号从1开始
+		offset := partIndex * chunkSize
+		size := min(chunkSize, size-offset)
+		limitedReader, err := file.RangeRead(http_range.Range{
+			Start:  offset,
+			Length: size})
+		if err != nil {
+			return err
+		}
+		limitedReader = driver.NewLimitedUploadStream(ctx, limitedReader)
+
+		threadG.Go(func(ctx context.Context) error {
+			uploadPartUrl, err := d.url(createResp.Data.PreuploadID, partNumber)
+			if err != nil {
+				return err
+			}
+
+			req, err := http.NewRequestWithContext(ctx, "PUT", uploadPartUrl, limitedReader)
+			if err != nil {
+				return err
+			}
+			req = req.WithContext(ctx)
+			req.ContentLength = size
+
+			res, err := base.HttpClient.Do(req)
+			if err != nil {
+				return err
+			}
+			_ = res.Body.Close()
+
+			progress := 10.0 + 85.0*float64(threadG.Success())/float64(uploadNums)
+			up(progress)
+			return nil
+		})
+	}
+
+	if err := threadG.Wait(); err != nil {
+		return err
+	}
+
+	uploadCompleteResp, err := d.complete(createResp.Data.PreuploadID)
+	if err != nil {
+		return err
+	}
+	if uploadCompleteResp.Data.Async == false || uploadCompleteResp.Data.Completed {
+		return nil
+	}
+
+	for {
+		uploadAsyncResp, err := d.async(createResp.Data.PreuploadID)
+		if err != nil {
+			return err
+		}
+		if uploadAsyncResp.Data.Completed {
+			break
+		}
+	}
+	up(100)
+	return nil
+}

drivers/123_open/util.go

@@ -1,42 +1,34 @@
 package _123_open
 
 import (
-	"context"
-	"crypto/md5"
 	"encoding/json"
 	"errors"
-	"fmt"
 	"net/http"
-	"net/url"
 	"strconv"
-	"strings"
 	"time"
 
 	"github.com/OpenListTeam/OpenList/v4/drivers/base"
 	"github.com/OpenListTeam/OpenList/v4/internal/op"
-	"github.com/go-resty/resty/v2"
-	"github.com/google/uuid"
 	log "github.com/sirupsen/logrus"
+	"resty.dev/v3"
 )
 
-var ( // 不同情况下获取的AccessTokenQPS限制不同 如下模块化易于拓展
+var ( //不同情况下获取的AccessTokenQPS限制不同 如下模块化易于拓展
 	Api = "https://open-api.123pan.com"
 
 	AccessToken    = InitApiInfo(Api+"/api/v1/access_token", 1)
 	RefreshToken   = InitApiInfo(Api+"/api/v1/oauth2/access_token", 1)
 	UserInfo       = InitApiInfo(Api+"/api/v1/user/info", 1)
-	FileList       = InitApiInfo(Api+"/api/v2/file/list", 3)
-	DownloadInfo   = InitApiInfo(Api+"/api/v1/file/download_info", 5)
-	DirectLink     = InitApiInfo(Api+"/api/v1/direct-link/url", 5)
+	FileList       = InitApiInfo(Api+"/api/v2/file/list", 4)
+	DownloadInfo   = InitApiInfo(Api+"/api/v1/file/download_info", 0)
 	Mkdir          = InitApiInfo(Api+"/upload/v1/file/mkdir", 2)
 	Move           = InitApiInfo(Api+"/api/v1/file/move", 1)
 	Rename         = InitApiInfo(Api+"/api/v1/file/name", 1)
 	Trash          = InitApiInfo(Api+"/api/v1/file/trash", 2)
-	UploadCreate   = InitApiInfo(Api+"/upload/v2/file/create", 2)
-	UploadComplete = InitApiInfo(Api+"/upload/v2/file/upload_complete", 0)
-
-	OfflineDownload        = InitApiInfo(Api+"/api/v1/offline/download", 1)
-	OfflineDownloadProcess = InitApiInfo(Api+"/api/v1/offline/download/process", 5)
+	UploadCreate   = InitApiInfo(Api+"/upload/v1/file/create", 2)
+	UploadUrl      = InitApiInfo(Api+"/upload/v1/file/get_upload_url", 0)
+	UploadComplete = InitApiInfo(Api+"/upload/v1/file/upload_complete", 0)
+	UploadAsync    = InitApiInfo(Api+"/upload/v1/file/upload_async_result", 1)
 )
 
 func (d *Open123) Request(apiInfo *ApiInfo, method string, callback base.ReqCallback, resp interface{}) ([]byte, error) {
@@ -64,7 +56,7 @@ func (d *Open123) Request(apiInfo *ApiInfo, method string, callback base.ReqCall
 		if err != nil {
 			return nil, err
 		}
-		body := res.Body()
+		body := res.Bytes()
 
 		// 解析为通用响应
 		var baseResp BaseResp
@@ -86,27 +78,12 @@ func (d *Open123) Request(apiInfo *ApiInfo, method string, callback base.ReqCall
 			return nil, errors.New(baseResp.Message)
 		}
 	}
+
 }
 
 func (d *Open123) flushAccessToken() error {
-	if d.ClientID != "" {
-		if d.RefreshToken != "" {
-			var resp RefreshTokenResp
-			_, err := d.Request(RefreshToken, http.MethodPost, func(req *resty.Request) {
-				req.SetQueryParam("client_id", d.ClientID)
-				if d.ClientSecret != "" {
-					req.SetQueryParam("client_secret", d.ClientSecret)
-				}
-				req.SetQueryParam("grant_type", "refresh_token")
-				req.SetQueryParam("refresh_token", d.RefreshToken)
-			}, &resp)
-			if err != nil {
-				return err
-			}
-			d.AccessToken = resp.AccessToken
-			d.RefreshToken = resp.RefreshToken
-			op.MustSaveDriverStorage(d)
-		} else if d.ClientSecret != "" {
+	if d.Addition.ClientID != "" {
+		if d.Addition.ClientSecret != "" {
 			var resp AccessTokenResp
 			_, err := d.Request(AccessToken, http.MethodPost, func(req *resty.Request) {
 				req.SetBody(base.Json{
@@ -119,62 +96,34 @@ func (d *Open123) flushAccessToken() error {
 			}
 			d.AccessToken = resp.Data.AccessToken
 			op.MustSaveDriverStorage(d)
+		} else if d.Addition.RefreshToken != "" {
+			var resp RefreshTokenResp
+			_, err := d.Request(RefreshToken, http.MethodPost, func(req *resty.Request) {
+				req.SetQueryParam("client_id", d.ClientID)
+				req.SetQueryParam("grant_type", "refresh_token")
+				req.SetQueryParam("refresh_token", d.Addition.RefreshToken)
+			}, &resp)
+			if err != nil {
+				return err
+			}
+			d.AccessToken = resp.AccessToken
+			d.RefreshToken = resp.RefreshToken
+			op.MustSaveDriverStorage(d)
 		}
 	}
 	return nil
 }
 
-func (d *Open123) SignURL(originURL, privateKey string, uid uint64, validDuration time.Duration) (newURL string, err error) {
-	// 生成Unix时间戳
-	ts := time.Now().Add(validDuration).Unix()
-
-	// 生成随机数（建议使用UUID，不能包含中划线（-））
-	rand := strings.ReplaceAll(uuid.New().String(), "-", "")
-
-	// 解析URL
-	objURL, err := url.Parse(originURL)
-	if err != nil {
-		return "", err
-	}
-
-	// 待签名字符串，格式：path-timestamp-rand-uid-privateKey
-	unsignedStr := fmt.Sprintf("%s-%d-%s-%d-%s", objURL.Path, ts, rand, uid, privateKey)
-	md5Hash := md5.Sum([]byte(unsignedStr))
-	// 生成鉴权参数，格式：timestamp-rand-uid-md5hash
-	authKey := fmt.Sprintf("%d-%s-%d-%x", ts, rand, uid, md5Hash)
-
-	// 添加鉴权参数到URL查询参数
-	v := objURL.Query()
-	v.Add("auth_key", authKey)
-	objURL.RawQuery = v.Encode()
-
-	return objURL.String(), nil
-}
-
-func (d *Open123) getUserInfo(ctx context.Context) (*UserInfoResp, error) {
+func (d *Open123) getUserInfo() (*UserInfoResp, error) {
 	var resp UserInfoResp
 
-	if _, err := d.Request(UserInfo, http.MethodGet, func(req *resty.Request) {
-		req.SetContext(ctx)
-	}, &resp); err != nil {
+	if _, err := d.Request(UserInfo, http.MethodGet, nil, &resp); err != nil {
 		return nil, err
 	}
 
 	return &resp, nil
 }
 
-func (d *Open123) getUID(ctx context.Context) (uint64, error) {
-	if d.UID != 0 {
-		return d.UID, nil
-	}
-	resp, err := d.getUserInfo(ctx)
-	if err != nil {
-		return 0, err
-	}
-	d.UID = resp.Data.UID
-	return resp.Data.UID, nil
-}
-
 func (d *Open123) getFiles(parentFileId int64, limit int, lastFileId int64) (*FileListResp, error) {
 	var resp FileListResp
 
@@ -189,6 +138,7 @@ func (d *Open123) getFiles(parentFileId int64, limit int, lastFileId int64) (*Fi
 				"searchData":   "",
 			})
 	}, &resp)
+
 	if err != nil {
 		return nil, err
 	}
@@ -211,21 +161,6 @@ func (d *Open123) getDownloadInfo(fileId int64) (*DownloadInfoResp, error) {
 	return &resp, nil
 }
 
-func (d *Open123) getDirectLink(fileId int64) (*DirectLinkResp, error) {
-	var resp DirectLinkResp
-
-	_, err := d.Request(DirectLink, http.MethodGet, func(req *resty.Request) {
-		req.SetQueryParams(map[string]string{
-			"fileID": strconv.FormatInt(fileId, 10),
-		})
-	}, &resp)
-	if err != nil {
-		return nil, err
-	}
-
-	return &resp, nil
-}
-
 func (d *Open123) mkdir(parentID int64, name string) error {
 	_, err := d.Request(Mkdir, http.MethodPost, func(req *resty.Request) {
 		req.SetBody(base.Json{
@@ -280,34 +215,3 @@ func (d *Open123) trash(fileId int64) error {
 
 	return nil
 }
-
-func (d *Open123) createOfflineDownloadTask(ctx context.Context, url string, dirID, callback string) (taskID int, err error) {
-	body := base.Json{
-		"url":   url,
-		"dirID": dirID,
-	}
-	if len(callback) > 0 {
-		body["callBackUrl"] = callback
-	}
-	var resp OfflineDownloadResp
-	_, err = d.Request(OfflineDownload, http.MethodPost, func(req *resty.Request) {
-		req.SetBody(body)
-	}, &resp)
-	if err != nil {
-		return 0, err
-	}
-	return resp.Data.TaskID, nil
-}
-
-func (d *Open123) queryOfflineDownloadStatus(ctx context.Context, taskID int) (process float64, status int, err error) {
-	var resp OfflineDownloadProcessResp
-	_, err = d.Request(OfflineDownloadProcess, http.MethodGet, func(req *resty.Request) {
-		req.SetQueryParams(map[string]string{
-			"taskID": strconv.Itoa(taskID),
-		})
-	}, &resp)
-	if err != nil {
-		return .0, 0, err
-	}
-	return resp.Data.Process, resp.Data.Status, nil
-}

drivers/123_share/driver.go

@@ -17,8 +17,8 @@ import (
 	"github.com/OpenListTeam/OpenList/v4/internal/errs"
 	"github.com/OpenListTeam/OpenList/v4/internal/model"
 	"github.com/OpenListTeam/OpenList/v4/pkg/utils"
-	"github.com/go-resty/resty/v2"
 	log "github.com/sirupsen/logrus"
+	"resty.dev/v3"
 )
 
 type Pan123Share struct {
@@ -70,6 +70,14 @@ func (d *Pan123Share) List(ctx context.Context, dir model.Obj, args model.ListAr
 func (d *Pan123Share) Link(ctx context.Context, file model.Obj, args model.LinkArgs) (*model.Link, error) {
 	// TODO return link of file, required
 	if f, ok := file.(File); ok {
+		//var resp DownResp
+		var headers map[string]string
+		if !utils.IsLocalIPAddr(args.IP) {
+			headers = map[string]string{
+				//"X-Real-IP":       "1.1.1.1",
+				"X-Forwarded-For": args.IP,
+			}
+		}
 		data := base.Json{
 			"shareKey":  d.ShareKey,
 			"SharePwd":  d.SharePwd,
@@ -79,27 +87,25 @@ func (d *Pan123Share) Link(ctx context.Context, file model.Obj, args model.LinkA
 			"size":      f.Size,
 		}
 		resp, err := d.request(DownloadInfo, http.MethodPost, func(req *resty.Request) {
-			req.SetBody(data)
+			req.SetBody(data).SetHeaders(headers)
 		}, nil)
 		if err != nil {
 			return nil, err
 		}
 		downloadUrl := utils.Json.Get(resp, "data", "DownloadURL").ToString()
-		ou, err := url.Parse(downloadUrl)
+		u, err := url.Parse(downloadUrl)
 		if err != nil {
 			return nil, err
 		}
-		u_ := ou.String()
-		nu := ou.Query().Get("params")
+		nu := u.Query().Get("params")
 		if nu != "" {
 			du, _ := base64.StdEncoding.DecodeString(nu)
-			u, err := url.Parse(string(du))
+			u, err = url.Parse(string(du))
 			if err != nil {
 				return nil, err
 			}
-			u_ = u.String()
 		}
-
+		u_ := u.String()
 		log.Debug("download url: ", u_)
 		res, err := base.NoRedirectClient.R().SetHeader("Referer", "https://www.123pan.com/").Get(u_)
 		if err != nil {
@@ -113,10 +119,10 @@ func (d *Pan123Share) Link(ctx context.Context, file model.Obj, args model.LinkA
 		if res.StatusCode() == 302 {
 			link.URL = res.Header().Get("location")
 		} else if res.StatusCode() < 300 {
-			link.URL = utils.Json.Get(res.Body(), "data", "redirect_url").ToString()
+			link.URL = utils.Json.Get(res.Bytes(), "data", "redirect_url").ToString()
 		}
 		link.Header = http.Header{
-			"Referer": []string{fmt.Sprintf("%s://%s/", ou.Scheme, ou.Host)},
+			"Referer": []string{"https://www.123pan.com/"},
 		}
 		return &link, nil
 	}

drivers/123_share/meta.go

@@ -15,10 +15,17 @@ type Addition struct {
 }
 
 var config = driver.Config{
-	Name:        "123PanShare",
-	LocalSort:   true,
-	NoUpload:    true,
-	DefaultRoot: "0",
+	Name:              "123PanShare",
+	LocalSort:         true,
+	OnlyLocal:         false,
+	OnlyProxy:         false,
+	NoCache:           false,
+	NoUpload:          true,
+	NeedMs:            false,
+	DefaultRoot:       "0",
+	CheckStatus:       false,
+	Alert:             "",
+	NoOverwriteUpload: false,
 }
 
 func init() {

drivers/123_share/types.go

@@ -24,7 +24,7 @@ type File struct {
 }
 
 func (f File) GetHash() utils.HashInfo {
-	return utils.NewHashInfo(utils.MD5, f.Etag)
+	return utils.HashInfo{}
 }
 
 func (f File) GetPath() string {

drivers/123_share/util.go

@@ -15,8 +15,8 @@ import (
 
 	"github.com/OpenListTeam/OpenList/v4/drivers/base"
 	"github.com/OpenListTeam/OpenList/v4/pkg/utils"
-	"github.com/go-resty/resty/v2"
 	jsoniter "github.com/json-iterator/go"
+	"resty.dev/v3"
 )
 
 const (
@@ -76,7 +76,7 @@ func (d *Pan123Share) request(url string, method string, callback base.ReqCallba
 	if err != nil {
 		return nil, err
 	}
-	body := res.Body()
+	body := res.Bytes()
 	code := utils.Json.Get(body, "code").ToInt()
 	if code != 0 {
 		return nil, errors.New(jsoniter.Get(body, "message").ToString())

drivers/139/driver.go

@@ -54,8 +54,7 @@ func (d *Yun139) Init(ctx context.Context) error {
 			"userInfo": base.Json{
 				"userType":    1,
 				"accountType": 1,
-				"accountName": d.Account,
-			},
+				"accountName": d.Account},
 			"modAddrType": 1,
 		}, &resp)
 		if err != nil {
@@ -523,27 +522,30 @@ func (d *Yun139) Put(ctx context.Context, dstDir model.Obj, stream model.FileStr
 		var err error
 		fullHash := stream.GetHash().GetHash(utils.SHA256)
 		if len(fullHash) != utils.SHA256.Width {
-			_, fullHash, err = streamPkg.CacheFullAndHash(stream, &up, utils.SHA256)
+			_, fullHash, err = streamPkg.CacheFullInTempFileAndHash(stream, utils.SHA256)
 			if err != nil {
 				return err
 			}
 		}
 
 		size := stream.GetSize()
-		partSize := d.getPartSize(size)
-		part := int64(1)
-		if size > partSize {
-			part = (size + partSize - 1) / partSize
+		var partSize = d.getPartSize(size)
+		part := size / partSize
+		if size%partSize > 0 {
+			part++
+		} else if part == 0 {
+			part = 1
 		}
-
-		// 生成所有 partInfos
 		partInfos := make([]PartInfo, 0, part)
 		for i := int64(0); i < part; i++ {
 			if utils.IsCanceled(ctx) {
 				return ctx.Err()
 			}
 			start := i * partSize
-			byteSize := min(size-start, partSize)
+			byteSize := size - start
+			if byteSize > partSize {
+				byteSize = partSize
+			}
 			partNumber := i + 1
 			partInfo := PartInfo{
 				PartNumber: partNumber,
@@ -591,20 +593,17 @@ func (d *Yun139) Put(ctx context.Context, dstDir model.Obj, stream model.FileStr
 		// resp.Data.RapidUpload: true 支持快传，但此处直接检测是否返回分片的上传地址
 		// 快传的情况下同样需要手动处理冲突
 		if resp.Data.PartInfos != nil {
-			// Progress
-			p := driver.NewProgress(size, up)
-			rateLimited := driver.NewLimitedUploadStream(ctx, stream)
+			// 读取前100个分片的上传地址
+			uploadPartInfos := resp.Data.PartInfos
 
-			// 先上传前100个分片
-			err = d.uploadPersonalParts(ctx, partInfos, resp.Data.PartInfos, rateLimited, p)
-			if err != nil {
-				return err
-			}
-
-			// 如果还有剩余分片，分批获取上传地址并上传
-			for i := 100; i < len(partInfos); i += 100 {
-				end := min(i+100, len(partInfos))
+			// 获取后续分片的上传地址
+			for i := 101; i < len(partInfos); i += 100 {
+				end := i + 100
+				if end > len(partInfos) {
+					end = len(partInfos)
+				}
 				batchPartInfos := partInfos[i:end]
+
 				moredata := base.Json{
 					"fileId":    resp.Data.FileId,
 					"uploadId":  resp.Data.UploadId,
@@ -620,13 +619,45 @@ func (d *Yun139) Put(ctx context.Context, dstDir model.Obj, stream model.FileStr
 				if err != nil {
 					return err
 				}
-				err = d.uploadPersonalParts(ctx, partInfos, moreresp.Data.PartInfos, rateLimited, p)
+				uploadPartInfos = append(uploadPartInfos, moreresp.Data.PartInfos...)
+			}
+
+			// Progress
+			p := driver.NewProgress(size, up)
+
+			rateLimited := driver.NewLimitedUploadStream(ctx, stream)
+			// 上传所有分片
+			for _, uploadPartInfo := range uploadPartInfos {
+				index := uploadPartInfo.PartNumber - 1
+				partSize := partInfos[index].PartSize
+				log.Debugf("[139] uploading part %+v/%+v", index, len(uploadPartInfos))
+				limitReader := io.LimitReader(rateLimited, partSize)
+
+				// Update Progress
+				r := io.TeeReader(limitReader, p)
+
+				req, err := http.NewRequest("PUT", uploadPartInfo.UploadUrl, r)
 				if err != nil {
 					return err
 				}
+				req = req.WithContext(ctx)
+				req.Header.Set("Content-Type", "application/octet-stream")
+				req.Header.Set("Content-Length", fmt.Sprint(partSize))
+				req.Header.Set("Origin", "https://yun.139.com")
+				req.Header.Set("Referer", "https://yun.139.com/")
+				req.ContentLength = partSize
+
+				res, err := base.HttpClient.Do(req)
+				if err != nil {
+					return err
+				}
+				_ = res.Body.Close()
+				log.Debugf("[139] uploaded: %+v", res)
+				if res.StatusCode != http.StatusOK {
+					return fmt.Errorf("unexpected status code: %d", res.StatusCode)
+				}
 			}
 
-			// 全部分片上传完毕后，complete
 			data = base.Json{
 				"contentHash":          fullHash,
 				"contentHashAlgorithm": "SHA256",
@@ -733,7 +764,7 @@ func (d *Yun139) Put(ctx context.Context, dstDir model.Obj, stream model.FileStr
 				"manualRename": 2,
 				"operation":    0,
 				"path":         path.Join(dstDir.GetPath(), dstDir.GetID()),
-				"seqNo":        random.String(32), // 序列号不能为空
+				"seqNo":        random.String(32), //序列号不能为空
 				"totalSize":    reportSize,
 				"uploadContentList": []base.Json{{
 					"contentName": stream.GetName(),
@@ -755,10 +786,12 @@ func (d *Yun139) Put(ctx context.Context, dstDir model.Obj, stream model.FileStr
 		size := stream.GetSize()
 		// Progress
 		p := driver.NewProgress(size, up)
-		partSize := d.getPartSize(size)
-		part := int64(1)
-		if size > partSize {
-			part = (size + partSize - 1) / partSize
+		var partSize = d.getPartSize(size)
+		part := size / partSize
+		if size%partSize > 0 {
+			part++
+		} else if part == 0 {
+			part = 1
 		}
 		rateLimited := driver.NewLimitedUploadStream(ctx, stream)
 		for i := int64(0); i < part; i++ {
@@ -772,10 +805,12 @@ func (d *Yun139) Put(ctx context.Context, dstDir model.Obj, stream model.FileStr
 			limitReader := io.LimitReader(rateLimited, byteSize)
 			// Update Progress
 			r := io.TeeReader(limitReader, p)
-			req, err := http.NewRequestWithContext(ctx, http.MethodPost, resp.Data.UploadResult.RedirectionURL, r)
+			req, err := http.NewRequest("POST", resp.Data.UploadResult.RedirectionURL, r)
 			if err != nil {
 				return err
 			}
+
+			req = req.WithContext(ctx)
 			req.Header.Set("Content-Type", "text/plain;name="+unicode(stream.GetName()))
 			req.Header.Set("contentSize", strconv.FormatInt(size, 10))
 			req.Header.Set("range", fmt.Sprintf("bytes=%d-%d", start, start+byteSize-1))
@@ -835,48 +870,4 @@ func (d *Yun139) Other(ctx context.Context, args model.OtherArgs) (interface{},
 	}
 }
 
-func (d *Yun139) GetDetails(ctx context.Context) (*model.StorageDetails, error) {
-	if d.UserDomainID == "" {
-		return nil, errs.NotImplement
-	}
-	var total, free uint64
-	if d.isFamily() {
-		diskInfo, err := d.getFamilyDiskInfo(ctx)
-		if err != nil {
-			return nil, err
-		}
-		totalMb, err := strconv.ParseUint(diskInfo.Data.DiskSize, 10, 64)
-		if err != nil {
-			return nil, fmt.Errorf("failed convert disk size into integer: %+v", err)
-		}
-		usedMb, err := strconv.ParseUint(diskInfo.Data.UsedSize, 10, 64)
-		if err != nil {
-			return nil, fmt.Errorf("failed convert used size into integer: %+v", err)
-		}
-		total = totalMb * 1024 * 1024
-		free = total - (usedMb * 1024 * 1024)
-	} else {
-		diskInfo, err := d.getPersonalDiskInfo(ctx)
-		if err != nil {
-			return nil, err
-		}
-		totalMb, err := strconv.ParseUint(diskInfo.Data.DiskSize, 10, 64)
-		if err != nil {
-			return nil, fmt.Errorf("failed convert disk size into integer: %+v", err)
-		}
-		freeMb, err := strconv.ParseUint(diskInfo.Data.FreeDiskSize, 10, 64)
-		if err != nil {
-			return nil, fmt.Errorf("failed convert free size into integer: %+v", err)
-		}
-		total = totalMb * 1024 * 1024
-		free = freeMb * 1024 * 1024
-	}
-	return &model.StorageDetails{
-		DiskUsage: model.DiskUsage{
-			TotalSpace: total,
-			FreeSpace:  free,
-		},
-	}, nil
-}
-
 var _ driver.Driver = (*Yun139)(nil)

drivers/139/meta.go

@@ -11,7 +11,6 @@ type Addition struct {
 	driver.RootID
 	Type                 string `json:"type" type:"select" options:"personal_new,family,group,personal" default:"personal_new"`
 	CloudID              string `json:"cloud_id"`
-	UserDomainID         string `json:"user_domain_id" help:"ud_id in Cookie, fill in to show disk usage"`
 	CustomUploadPartSize int64  `json:"custom_upload_part_size" type:"number" default:"0" help:"0 for auto"`
 	ReportRealSize       bool   `json:"report_real_size" type:"bool" default:"true" help:"Enable to report the real file size during upload"`
 	UseLargeThumbnail    bool   `json:"use_large_thumbnail" type:"bool" default:"false" help:"Enable to use large thumbnail for images"`

drivers/139/types.go

@@ -286,10 +286,8 @@ type PersonalUploadUrlResp struct {
 }
 
 type QueryRoutePolicyResp struct {
-	Success bool   `json:"success"`
-	Code    string `json:"code"`
-	Message string `json:"message"`
-	Data    struct {
+	BaseResp
+	Data struct {
 		RoutePolicyList []struct {
 			SiteID      string `json:"siteID"`
 			SiteCode    string `json:"siteCode"`
@@ -312,20 +310,3 @@ type RefreshTokenResp struct {
 	AccessToken string   `xml:"accessToken"`
 	Desc        string   `xml:"desc"`
 }
-
-type PersonalDiskInfoResp struct {
-	BaseResp
-	Data struct {
-		FreeDiskSize         string `json:"freeDiskSize"`
-		DiskSize             string `json:"diskSize"`
-		IsInfinitePicStorage *bool  `json:"isInfinitePicStorage"`
-	} `json:"data"`
-}
-
-type FamilyDiskInfoResp struct {
-	BaseResp
-	Data struct {
-		UsedSize string `json:"usedSize"`
-		DiskSize string `json:"diskSize"`
-	} `json:"data"`
-}

drivers/139/util.go

@@ -1,11 +1,9 @@
 package _139
 
 import (
-	"context"
 	"encoding/base64"
 	"errors"
 	"fmt"
-	"io"
 	"net/http"
 	"net/url"
 	"path"
@@ -15,14 +13,13 @@ import (
 	"time"
 
 	"github.com/OpenListTeam/OpenList/v4/drivers/base"
-	"github.com/OpenListTeam/OpenList/v4/internal/driver"
 	"github.com/OpenListTeam/OpenList/v4/internal/model"
 	"github.com/OpenListTeam/OpenList/v4/internal/op"
 	"github.com/OpenListTeam/OpenList/v4/pkg/utils"
 	"github.com/OpenListTeam/OpenList/v4/pkg/utils/random"
-	"github.com/go-resty/resty/v2"
 	jsoniter "github.com/json-iterator/go"
 	log "github.com/sirupsen/logrus"
+	"resty.dev/v3"
 )
 
 // do others that not defined in Driver interface
@@ -92,7 +89,7 @@ func (d *Yun139) refreshToken() error {
 	var resp RefreshTokenResp
 	reqBody := "<root><token>" + splits[2] + "</token><account>" + splits[1] + "</account><clienttype>656</clienttype></root>"
 	_, err = base.RestyClient.R().
-		ForceContentType("application/xml").
+		SetForceResponseContentType("application/xml").
 		SetBody(reqBody).
 		SetResult(&resp).
 		Post(url)
@@ -107,7 +104,8 @@ func (d *Yun139) refreshToken() error {
 	return nil
 }
 
-func (d *Yun139) request(url string, method string, callback base.ReqCallback, resp interface{}) ([]byte, error) {
+func (d *Yun139) request(pathname string, method string, callback base.ReqCallback, resp interface{}) ([]byte, error) {
+	url := "https://yun.139.com" + pathname
 	req := base.RestyClient.R()
 	randStr := random.String(16)
 	ts := time.Now().Format("2006-01-02 15:04:05")
@@ -152,29 +150,24 @@ func (d *Yun139) request(url string, method string, callback base.ReqCallback, r
 		return nil, errors.New(e.Message)
 	}
 	if resp != nil {
-		err = utils.Json.Unmarshal(res.Body(), resp)
+		err = utils.Json.Unmarshal(res.Bytes(), resp)
 		if err != nil {
 			return nil, err
 		}
 	}
-	return res.Body(), nil
+	return res.Bytes(), nil
 }
 
 func (d *Yun139) requestRoute(data interface{}, resp interface{}) ([]byte, error) {
+	body, err := utils.Json.Marshal(data)
+	if err != nil {
+		return nil, err
+	}
 	url := "https://user-njs.yun.139.com/user/route/qryRoutePolicy"
 	req := base.RestyClient.R()
 	randStr := random.String(16)
 	ts := time.Now().Format("2006-01-02 15:04:05")
-	callback := func(req *resty.Request) {
-		req.SetBody(data)
-	}
-	if callback != nil {
-		callback(req)
-	}
-	body, err := utils.Json.Marshal(req.Body)
-	if err != nil {
-		return nil, err
-	}
+	req.SetBody(data)
 	sign := calSign(string(body), ts, randStr)
 	svcType := "1"
 	if d.isFamily() {
@@ -201,24 +194,28 @@ func (d *Yun139) requestRoute(data interface{}, resp interface{}) ([]byte, error
 		"Inner-Hcy-Router-Https": "1",
 	})
 
-	var e BaseResp
-	req.SetResult(&e)
 	res, err := req.Execute(http.MethodPost, url)
+	if err != nil {
+		return nil, err
+	}
 	log.Debugln(res.String())
+	var e BaseResp
+	err = utils.Json.Unmarshal(res.Bytes(), &e)
+	if err != nil {
+		return nil, err
+	}
 	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
-		}
+	err = utils.Json.Unmarshal(res.Bytes(), resp)
+	if err != nil {
+		return nil, err
 	}
-	return res.Body(), nil
+	return res.Bytes(), err
 }
 
 func (d *Yun139) post(pathname string, data interface{}, resp interface{}) ([]byte, error) {
-	return d.request("https://yun.139.com"+pathname, http.MethodPost, func(req *resty.Request) {
+	return d.request(pathname, http.MethodPost, func(req *resty.Request) {
 		req.SetBody(data)
 	}, resp)
 }
@@ -267,7 +264,7 @@ func (d *Yun139) getFiles(catalogID string) ([]model.Obj, error) {
 					HashInfo: utils.NewHashInfo(utils.MD5, content.Digest),
 				},
 				Thumbnail: model.Thumbnail{Thumbnail: content.ThumbnailURL},
-				// Thumbnail: content.BigthumbnailURL,
+				//Thumbnail: content.BigthumbnailURL,
 			}
 			files = append(files, &f)
 		}
@@ -334,7 +331,7 @@ func (d *Yun139) familyGetFiles(catalogID string) ([]model.Obj, error) {
 					Path:     path, // 文件所在目录的Path
 				},
 				Thumbnail: model.Thumbnail{Thumbnail: content.ThumbnailURL},
-				// Thumbnail: content.BigthumbnailURL,
+				//Thumbnail: content.BigthumbnailURL,
 			}
 			files = append(files, &f)
 		}
@@ -389,7 +386,7 @@ func (d *Yun139) groupGetFiles(catalogID string) ([]model.Obj, error) {
 					Path:     path, // 文件所在目录的Path
 				},
 				Thumbnail: model.Thumbnail{Thumbnail: content.ThumbnailURL},
-				// Thumbnail: content.BigthumbnailURL,
+				//Thumbnail: content.BigthumbnailURL,
 			}
 			files = append(files, &f)
 		}
@@ -417,7 +414,6 @@ func (d *Yun139) getLink(contentId string) (string, error) {
 	}
 	return jsoniter.Get(res, "data", "downloadURL").ToString(), nil
 }
-
 func (d *Yun139) familyGetLink(contentId string, path string) (string, error) {
 	data := d.newJson(base.Json{
 		"contentID": contentId,
@@ -503,14 +499,13 @@ func (d *Yun139) personalRequest(pathname string, method string, callback base.R
 		return nil, errors.New(e.Message)
 	}
 	if resp != nil {
-		err = utils.Json.Unmarshal(res.Body(), resp)
+		err = utils.Json.Unmarshal(res.Bytes(), resp)
 		if err != nil {
 			return nil, err
 		}
 	}
-	return res.Body(), nil
+	return res.Bytes(), nil
 }
-
 func (d *Yun139) personalPost(pathname string, data interface{}, resp interface{}) ([]byte, error) {
 	return d.personalRequest(pathname, http.MethodPost, func(req *resty.Request) {
 		req.SetBody(data)
@@ -546,7 +541,7 @@ func (d *Yun139) personalGetFiles(fileId string) ([]model.Obj, error) {
 		}
 		nextPageCursor = resp.Data.NextPageCursor
 		for _, item := range resp.Data.Items {
-			isFolder := (item.Type == "folder")
+			var isFolder = (item.Type == "folder")
 			var f model.Obj
 			if isFolder {
 				f = &model.Object{
@@ -558,7 +553,7 @@ func (d *Yun139) personalGetFiles(fileId string) ([]model.Obj, error) {
 					IsFolder: isFolder,
 				}
 			} else {
-				Thumbnails := item.Thumbnails
+				var Thumbnails = item.Thumbnails
 				var ThumbnailUrl string
 				if d.UseLargeThumbnail {
 					for _, thumb := range Thumbnails {
@@ -601,7 +596,7 @@ func (d *Yun139) personalGetLink(fileId string) (string, error) {
 	if err != nil {
 		return "", err
 	}
-	cdnUrl := jsoniter.Get(res, "data", "cdnUrl").ToString()
+	var cdnUrl = jsoniter.Get(res, "data", "cdnUrl").ToString()
 	if cdnUrl != "" {
 		return cdnUrl, nil
 	} else {
@@ -615,91 +610,15 @@ func (d *Yun139) getAuthorization() string {
 	}
 	return d.Authorization
 }
-
 func (d *Yun139) getAccount() string {
 	if d.ref != nil {
 		return d.ref.getAccount()
 	}
 	return d.Account
 }
-
 func (d *Yun139) getPersonalCloudHost() string {
 	if d.ref != nil {
 		return d.ref.getPersonalCloudHost()
 	}
 	return d.PersonalCloudHost
 }
-
-func (d *Yun139) uploadPersonalParts(ctx context.Context, partInfos []PartInfo, uploadPartInfos []PersonalPartInfo, rateLimited *driver.RateLimitReader, p *driver.Progress) error {
-	// 确保数组以 PartNumber 从小到大排序
-	sort.Slice(uploadPartInfos, func(i, j int) bool {
-		return uploadPartInfos[i].PartNumber < uploadPartInfos[j].PartNumber
-	})
-
-	for _, uploadPartInfo := range uploadPartInfos {
-		index := uploadPartInfo.PartNumber - 1
-		if index < 0 || index >= len(partInfos) {
-			return fmt.Errorf("invalid PartNumber %d: index out of bounds (partInfos length: %d)", uploadPartInfo.PartNumber, len(partInfos))
-		}
-		partSize := partInfos[index].PartSize
-		log.Debugf("[139] uploading part %+v/%+v", index, len(partInfos))
-		limitReader := io.LimitReader(rateLimited, partSize)
-		r := io.TeeReader(limitReader, p)
-		req, err := http.NewRequestWithContext(ctx, http.MethodPut, uploadPartInfo.UploadUrl, r)
-		if err != nil {
-			return err
-		}
-		req.Header.Set("Content-Type", "application/octet-stream")
-		req.Header.Set("Content-Length", fmt.Sprint(partSize))
-		req.Header.Set("Origin", "https://yun.139.com")
-		req.Header.Set("Referer", "https://yun.139.com/")
-		req.ContentLength = partSize
-		err = func() error {
-			res, err := base.HttpClient.Do(req)
-			if err != nil {
-				return err
-			}
-			defer res.Body.Close()
-			log.Debugf("[139] uploaded: %+v", res)
-			if res.StatusCode != http.StatusOK {
-				body, _ := io.ReadAll(res.Body)
-				return fmt.Errorf("unexpected status code: %d, body: %s", res.StatusCode, string(body))
-			}
-			return nil
-		}()
-		if err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-func (d *Yun139) getPersonalDiskInfo(ctx context.Context) (*PersonalDiskInfoResp, error) {
-	data := map[string]interface{}{
-		"userDomainId": d.UserDomainID,
-	}
-	var resp PersonalDiskInfoResp
-	_, err := d.request("https://user-njs.yun.139.com/user/disk/getPersonalDiskInfo", http.MethodPost, func(req *resty.Request) {
-		req.SetBody(data)
-		req.SetContext(ctx)
-	}, &resp)
-	if err != nil {
-		return nil, err
-	}
-	return &resp, nil
-}
-
-func (d *Yun139) getFamilyDiskInfo(ctx context.Context) (*FamilyDiskInfoResp, error) {
-	data := map[string]interface{}{
-		"userDomainId": d.UserDomainID,
-	}
-	var resp FamilyDiskInfoResp
-	_, err := d.request("https://user-njs.yun.139.com/user/disk/getFamilyDiskInfo", http.MethodPost, func(req *resty.Request) {
-		req.SetBody(data)
-		req.SetContext(ctx)
-	}, &resp)
-	if err != nil {
-		return nil, err
-	}
-	return &resp, nil
-}

drivers/189/driver.go

@@ -9,8 +9,8 @@ import (
 	"github.com/OpenListTeam/OpenList/v4/internal/driver"
 	"github.com/OpenListTeam/OpenList/v4/internal/model"
 	"github.com/OpenListTeam/OpenList/v4/pkg/utils"
-	"github.com/go-resty/resty/v2"
 	log "github.com/sirupsen/logrus"
+	"resty.dev/v3"
 )
 
 type Cloud189 struct {
@@ -52,7 +52,7 @@ func (d *Cloud189) Link(ctx context.Context, file model.Obj, args model.LinkArgs
 	if err != nil {
 		return nil, err
 	}
-	client := resty.NewWithClient(d.client.GetClient()).SetRedirectPolicy(
+	client := resty.NewWithClient(d.client.Client()).SetRedirectPolicy(
 		resty.RedirectPolicyFunc(func(req *http.Request, via []*http.Request) error {
 			return http.ErrUseLastResponse
 		}))
@@ -194,17 +194,4 @@ func (d *Cloud189) Put(ctx context.Context, dstDir model.Obj, stream model.FileS
 	return d.newUpload(ctx, dstDir, stream, up)
 }
 
-func (d *Cloud189) GetDetails(ctx context.Context) (*model.StorageDetails, error) {
-	capacityInfo, err := d.getCapacityInfo(ctx)
-	if err != nil {
-		return nil, err
-	}
-	return &model.StorageDetails{
-		DiskUsage: model.DiskUsage{
-			TotalSpace: capacityInfo.CloudCapacityInfo.TotalSize,
-			FreeSpace:  capacityInfo.CloudCapacityInfo.FreeSize,
-		},
-	}, nil
-}
-
 var _ driver.Driver = (*Cloud189)(nil)

drivers/189/login.go

@@ -83,7 +83,7 @@ func (d *Cloud189) newLogin() error {
 	if err != nil {
 		return err
 	}
-	err = utils.Json.Unmarshal(res.Body(), &encryptConf)
+	err = utils.Json.Unmarshal(res.Bytes(), &encryptConf)
 	if err != nil {
 		return err
 	}
@@ -118,9 +118,9 @@ func (d *Cloud189) newLogin() error {
 		return err
 	}
 	log.Debugf("189 login resp body: %s", res.String())
-	loginResult := utils.Json.Get(res.Body(), "result").ToInt()
+	loginResult := utils.Json.Get(res.Bytes(), "result").ToInt()
 	if loginResult != 0 {
-		return errors.New(utils.Json.Get(res.Body(), "msg").ToString())
+		return errors.New(utils.Json.Get(res.Bytes(), "msg").ToString())
 	}
 	return nil
 }

drivers/189/types.go

@@ -66,21 +66,3 @@ type DownResp struct {
 	ResMessage      string `json:"res_message"`
 	FileDownloadUrl string `json:"downloadUrl"`
 }
-
-type CapacityResp struct {
-	ResCode           int    `json:"res_code"`
-	ResMessage        string `json:"res_message"`
-	Account           string `json:"account"`
-	CloudCapacityInfo struct {
-		FreeSize     uint64 `json:"freeSize"`
-		MailUsedSize uint64 `json:"mail189UsedSize"`
-		TotalSize    uint64 `json:"totalSize"`
-		UsedSize     uint64 `json:"usedSize"`
-	} `json:"cloudCapacityInfo"`
-	FamilyCapacityInfo struct {
-		FreeSize  uint64 `json:"freeSize"`
-		TotalSize uint64 `json:"totalSize"`
-		UsedSize  uint64 `json:"usedSize"`
-	} `json:"familyCapacityInfo"`
-	TotalSize uint64 `json:"totalSize"`
-}

drivers/189/util.go

@@ -20,9 +20,9 @@ import (
 	"github.com/OpenListTeam/OpenList/v4/internal/model"
 	"github.com/OpenListTeam/OpenList/v4/pkg/utils"
 	myrand "github.com/OpenListTeam/OpenList/v4/pkg/utils/random"
-	"github.com/go-resty/resty/v2"
 	jsoniter "github.com/json-iterator/go"
 	log "github.com/sirupsen/logrus"
+	"resty.dev/v3"
 )
 
 // do others that not defined in Driver interface
@@ -81,7 +81,7 @@ import (
 //		// Enter the verification code manually
 //		//err = message.GetMessenger().WaitSend(message.Message{
 //		//	Type:    "image",
-//		//	Content: "data:image/png;base64," + base64.StdEncoding.EncodeToString(imgRes.Body()),
+//		//	Content: "data:image/png;base64," + base64.StdEncoding.EncodeToString(imgRes.Body),
 //		//}, 10)
 //		//if err != nil {
 //		//	return err
@@ -89,15 +89,15 @@ import (
 //		//vCodeRS, err = message.GetMessenger().WaitReceive(30)
 //		// use ocr api
 //		vRes, err := base.RestyClient.R().SetMultipartField(
-//			"image", "validateCode.png", "image/png", bytes.NewReader(imgRes.Body())).
+//			"image", "validateCode.png", "image/png", bytes.NewReader(imgRes.Body)).
 //			Post(setting.GetStr(conf.OcrApi))
 //		if err != nil {
 //			return err
 //		}
-//		if jsoniter.Get(vRes.Body(), "status").ToInt() != 200 {
-//			return errors.New("ocr error:" + jsoniter.Get(vRes.Body(), "msg").ToString())
+//		if jsoniter.Get(vRes.Bytes(), "status").ToInt() != 200 {
+//			return errors.New("ocr error:" + jsoniter.Get(vRes.Bytes(), "msg").ToString())
 //		}
-//		vCodeRS = jsoniter.Get(vRes.Body(), "result").ToString()
+//		vCodeRS = jsoniter.Get(vRes.Bytes(), "result").ToString()
 //		log.Debugln("code: ", vCodeRS)
 //	}
 //	userRsa := RsaEncode([]byte(d.Username), jRsakey, true)
@@ -128,7 +128,7 @@ import (
 //	if err != nil {
 //		return err
 //	}
-//	err = utils.Json.Unmarshal(res.Body(), &loginResp)
+//	err = utils.Json.Unmarshal(res.Bytes(), &loginResp)
 //	if err != nil {
 //		log.Error(err.Error())
 //		return err
@@ -157,7 +157,7 @@ func (d *Cloud189) request(url string, method string, callback base.ReqCallback,
 	if err != nil {
 		return nil, err
 	}
-	// log.Debug(res.String())
+	//log.Debug(res.String())
 	if e.ErrorCode != "" {
 		if e.ErrorCode == "InvalidSessionKey" {
 			err = d.newLogin()
@@ -167,10 +167,10 @@ func (d *Cloud189) request(url string, method string, callback base.ReqCallback,
 			return d.request(url, method, callback, resp)
 		}
 	}
-	if jsoniter.Get(res.Body(), "res_code").ToInt() != 0 {
-		err = errors.New(jsoniter.Get(res.Body(), "res_message").ToString())
+	if jsoniter.Get(res.Bytes(), "res_code").ToInt() != 0 {
+		err = errors.New(jsoniter.Get(res.Bytes(), "res_message").ToString())
 	}
-	return res.Body(), err
+	return res.Bytes(), err
 }
 
 func (d *Cloud189) getFiles(fileId string) ([]model.Obj, error) {
@@ -186,8 +186,8 @@ func (d *Cloud189) getFiles(fileId string) ([]model.Obj, error) {
 				"mediaType":  "0",
 				"folderId":   fileId,
 				"iconOption": "5",
-				"orderBy":    "lastOpTime", // account.OrderBy
-				"descending": "true",       // account.OrderDirection
+				"orderBy":    "lastOpTime", //account.OrderBy
+				"descending": "true",       //account.OrderDirection
 			})
 		}, &resp)
 		if err != nil {
@@ -232,7 +232,7 @@ func (d *Cloud189) oldUpload(dstDir model.Obj, file model.FileStreamer) error {
 	if err != nil {
 		return err
 	}
-	if utils.Json.Get(res.Body(), "MD5").ToString() != "" {
+	if utils.Json.Get(res.Bytes(), "MD5").ToString() != "" {
 		return nil
 	}
 	log.Debugf(res.String())
@@ -297,7 +297,7 @@ func (d *Cloud189) uploadRequest(uri string, form map[string]string, resp interf
 	if err != nil {
 		return nil, err
 	}
-	data = res.Body()
+	data = res.Bytes()
 	if utils.Json.Get(data, "code").ToString() != "SUCCESS" {
 		return nil, errors.New(uri + "---" + jsoniter.Get(data, "msg").ToString())
 	}
@@ -311,7 +311,7 @@ func (d *Cloud189) newUpload(ctx context.Context, dstDir model.Obj, file model.F
 	}
 	d.sessionKey = sessionKey
 	const DEFAULT int64 = 10485760
-	count := int64(math.Ceil(float64(file.GetSize()) / float64(DEFAULT)))
+	var count = int64(math.Ceil(float64(file.GetSize()) / float64(DEFAULT)))
 
 	res, err := d.uploadRequest("/person/initMultiUpload", map[string]string{
 		"parentFolderId": dstDir.GetID(),
@@ -340,10 +340,10 @@ func (d *Cloud189) newUpload(ctx context.Context, dstDir model.Obj, file model.F
 		if DEFAULT < byteSize {
 			byteSize = DEFAULT
 		}
-		// log.Debugf("%d,%d", byteSize, finish)
+		//log.Debugf("%d,%d", byteSize, finish)
 		byteData := make([]byte, byteSize)
 		n, err := io.ReadFull(file, byteData)
-		// log.Debug(err, n)
+		//log.Debug(err, n)
 		if err != nil {
 			return err
 		}
@@ -365,10 +365,11 @@ func (d *Cloud189) newUpload(ctx context.Context, dstDir model.Obj, file model.F
 		log.Debugf("uploadData: %+v", uploadData)
 		requestURL := uploadData.RequestURL
 		uploadHeaders := strings.Split(decodeURIComponent(uploadData.RequestHeader), "&")
-		req, err := http.NewRequestWithContext(ctx, http.MethodPut, requestURL, driver.NewLimitedUploadStream(ctx, bytes.NewReader(byteData)))
+		req, err := http.NewRequest(http.MethodPut, requestURL, driver.NewLimitedUploadStream(ctx, bytes.NewReader(byteData)))
 		if err != nil {
 			return err
 		}
+		req = req.WithContext(ctx)
 		for _, v := range uploadHeaders {
 			i := strings.Index(v, "=")
 			req.Header.Set(v[0:i], v[i+1:])
@@ -395,14 +396,3 @@ func (d *Cloud189) newUpload(ctx context.Context, dstDir model.Obj, file model.F
 	}, nil)
 	return err
 }
-
-func (d *Cloud189) getCapacityInfo(ctx context.Context) (*CapacityResp, error) {
-	var resp CapacityResp
-	_, err := d.request("https://cloud.189.cn/api/portal/getUserSizeInfo.action", http.MethodGet, func(req *resty.Request) {
-		req.SetContext(ctx)
-	}, &resp)
-	if err != nil {
-		return nil, err
-	}
-	return &resp, nil
-}

drivers/189_tv/driver.go

@@ -1,6 +1,7 @@
 package _189_tv
 
 import (
+	"container/ring"
 	"context"
 	"net/http"
 	"strconv"
@@ -11,20 +12,18 @@ import (
 	"github.com/OpenListTeam/OpenList/v4/internal/driver"
 	"github.com/OpenListTeam/OpenList/v4/internal/errs"
 	"github.com/OpenListTeam/OpenList/v4/internal/model"
-	"github.com/OpenListTeam/OpenList/v4/pkg/cron"
-	"github.com/go-resty/resty/v2"
+	"resty.dev/v3"
 )
 
 type Cloud189TV struct {
 	model.Storage
 	Addition
-	client        *resty.Client
-	tokenInfo     *AppSessionResp
-	uploadThread  int
-	storageConfig driver.Config
-
-	TempUuid string
-	cron     *cron.Cron // 新增 cron 字段
+	client                  *resty.Client
+	tokenInfo               *AppSessionResp
+	uploadThread            int
+	familyTransferFolder    *ring.Ring
+	cleanFamilyTransferFile func()
+	storageConfig           driver.Config
 }
 
 func (y *Cloud189TV) Config() driver.Config {
@@ -69,7 +68,7 @@ func (y *Cloud189TV) Init(ctx context.Context) (err error) {
 	// 避免重复登陆
 	if !y.isLogin() || y.Addition.AccessToken == "" {
 		if err = y.login(); err != nil {
-			return err
+			return
 		}
 	}
 
@@ -80,17 +79,10 @@ func (y *Cloud189TV) Init(ctx context.Context) (err error) {
 		}
 	}
 
-	y.cron = cron.NewCron(time.Minute * 5)
-	y.cron.Do(y.keepAlive)
-
-	return err
+	return
 }
 
 func (y *Cloud189TV) Drop(ctx context.Context) error {
-	if y.cron != nil {
-		y.cron.Stop()
-		y.cron = nil
-	}
 	return nil
 }
 
@@ -134,7 +126,7 @@ func (y *Cloud189TV) Link(ctx context.Context, file model.Obj, args model.LinkAr
 	if err != nil {
 		return nil, err
 	}
-	defer res.RawBody().Close()
+	defer res.Body.Close()
 	if res.StatusCode() == 302 {
 		downloadUrl.URL = res.Header().Get("location")
 	}
@@ -244,6 +236,7 @@ func (y *Cloud189TV) Copy(ctx context.Context, srcObj, dstDir model.Obj) error {
 		FileName: srcObj.GetName(),
 		IsFolder: BoolToNumber(srcObj.IsDir()),
 	})
+
 	if err != nil {
 		return err
 	}
@@ -277,25 +270,5 @@ func (y *Cloud189TV) Put(ctx context.Context, dstDir model.Obj, stream model.Fil
 	}
 
 	return y.OldUpload(ctx, dstDir, stream, up, isFamily, overwrite)
-}
 
-func (y *Cloud189TV) GetDetails(ctx context.Context) (*model.StorageDetails, error) {
-	capacityInfo, err := y.getCapacityInfo(ctx)
-	if err != nil {
-		return nil, err
-	}
-	var total, free uint64
-	if y.isFamily() {
-		total = capacityInfo.FamilyCapacityInfo.TotalSize
-		free = capacityInfo.FamilyCapacityInfo.FreeSize
-	} else {
-		total = capacityInfo.CloudCapacityInfo.TotalSize
-		free = capacityInfo.CloudCapacityInfo.FreeSize
-	}
-	return &model.StorageDetails{
-		DiskUsage: model.DiskUsage{
-			TotalSpace: total,
-			FreeSpace:  free,
-		},
-	}, nil
 }

drivers/189_tv/meta.go

@@ -8,6 +8,7 @@ import (
 type Addition struct {
 	driver.RootID
 	AccessToken    string `json:"access_token"`
+	TempUuid       string
 	OrderBy        string `json:"order_by" type:"select" options:"filename,filesize,lastOpTime" default:"filename"`
 	OrderDirection string `json:"order_direction" type:"select" options:"asc,desc" default:"asc"`
 	Type           string `json:"type" type:"select" options:"personal,family" default:"personal"`

drivers/189_tv/types.go

@@ -316,21 +316,3 @@ type BatchTaskConflictTaskInfoResp struct {
 	TaskInfos      []BatchTaskInfo
 	TaskType       int `json:"taskType"`
 }
-
-type CapacityResp struct {
-	ResCode           int    `json:"res_code"`
-	ResMessage        string `json:"res_message"`
-	Account           string `json:"account"`
-	CloudCapacityInfo struct {
-		FreeSize     uint64 `json:"freeSize"`
-		MailUsedSize uint64 `json:"mail189UsedSize"`
-		TotalSize    uint64 `json:"totalSize"`
-		UsedSize     uint64 `json:"usedSize"`
-	} `json:"cloudCapacityInfo"`
-	FamilyCapacityInfo struct {
-		FreeSize  uint64 `json:"freeSize"`
-		TotalSize uint64 `json:"totalSize"`
-		UsedSize  uint64 `json:"usedSize"`
-	} `json:"familyCapacityInfo"`
-	TotalSize uint64 `json:"totalSize"`
-}

drivers/189_tv/utils.go

@@ -17,13 +17,12 @@ import (
 	"github.com/OpenListTeam/OpenList/v4/internal/driver"
 	"github.com/OpenListTeam/OpenList/v4/internal/model"
 	"github.com/OpenListTeam/OpenList/v4/internal/op"
-	"github.com/OpenListTeam/OpenList/v4/internal/stream"
 	"github.com/OpenListTeam/OpenList/v4/pkg/utils"
 
-	"github.com/go-resty/resty/v2"
 	"github.com/google/uuid"
 	jsoniter "github.com/json-iterator/go"
 	"github.com/pkg/errors"
+	"resty.dev/v3"
 )
 
 const (
@@ -66,13 +65,6 @@ func (y *Cloud189TV) AppKeySignatureHeader(url, method string) map[string]string
 }
 
 func (y *Cloud189TV) request(url, method string, callback base.ReqCallback, params map[string]string, resp interface{}, isFamily ...bool) ([]byte, error) {
-	return y.requestWithRetry(url, method, callback, params, resp, 0, isFamily...)
-}
-
-func (y *Cloud189TV) requestWithRetry(url, method string, callback base.ReqCallback, params map[string]string, resp interface{}, retryCount int, isFamily ...bool) ([]byte, error) {
-	if y.tokenInfo == nil {
-		return nil, fmt.Errorf("login failed")
-	}
 	req := y.client.R().SetQueryParams(clientSuffix())
 
 	if params != nil {
@@ -98,29 +90,14 @@ func (y *Cloud189TV) requestWithRetry(url, method string, callback base.ReqCallb
 
 	if strings.Contains(res.String(), "userSessionBO is null") ||
 		strings.Contains(res.String(), "InvalidSessionKey") {
-		// 限制重试次数，避免无限递归
-		if retryCount >= 3 {
-			y.Addition.AccessToken = ""
-			op.MustSaveDriverStorage(y)
-			return nil, errors.New("session expired after retry")
-		}
-
-		// 尝试刷新会话
-		if err := y.refreshSession(); err != nil {
-			// 如果刷新失败，说明AccessToken也已过期，需要重新登录
-			y.Addition.AccessToken = ""
-			op.MustSaveDriverStorage(y)
-			return nil, errors.New("session expired")
-		}
-		// 如果刷新成功，则重试原始请求（增加重试计数）
-		return y.requestWithRetry(url, method, callback, params, resp, retryCount+1, isFamily...)
+		return nil, errors.New("session expired")
 	}
 
 	// 处理错误
 	if erron.HasError() {
 		return nil, &erron
 	}
-	return res.Body(), nil
+	return res.Bytes(), nil
 }
 
 func (y *Cloud189TV) get(url string, callback base.ReqCallback, resp interface{}, isFamily ...bool) ([]byte, error) {
@@ -153,7 +130,6 @@ func (y *Cloud189TV) put(ctx context.Context, url string, headers map[string]str
 		}
 	}
 
-	// 请求完成后http.Client会Close Request.Body
 	resp, err := base.HttpClient.Do(req)
 	if err != nil {
 		return nil, err
@@ -176,7 +152,6 @@ func (y *Cloud189TV) put(ctx context.Context, url string, headers map[string]str
 	}
 	return body, nil
 }
-
 func (y *Cloud189TV) getFiles(ctx context.Context, fileId string, isFamily bool) ([]model.Obj, error) {
 	fullUrl := ApiUrl
 	if isFamily {
@@ -234,7 +209,7 @@ func (y *Cloud189TV) login() (err error) {
 	var erron RespErr
 	var tokenInfo AppSessionResp
 	if y.Addition.AccessToken == "" {
-		if y.TempUuid == "" {
+		if y.Addition.TempUuid == "" {
 			// 获取登录参数
 			var uuidInfo UuidInfoResp
 			req.SetResult(&uuidInfo).SetError(&erron)
@@ -242,8 +217,9 @@ func (y *Cloud189TV) login() (err error) {
 			req.SetHeaders(y.AppKeySignatureHeader(ApiUrl+"/family/manage/getQrCodeUUID.action",
 				http.MethodGet))
 			_, err = req.Execute(http.MethodGet, ApiUrl+"/family/manage/getQrCodeUUID.action")
+
 			if err != nil {
-				return err
+				return
 			}
 			if erron.HasError() {
 				return &erron
@@ -252,7 +228,7 @@ func (y *Cloud189TV) login() (err error) {
 			if uuidInfo.Uuid == "" {
 				return errors.New("uuidInfo is empty")
 			}
-			y.TempUuid = uuidInfo.Uuid
+			y.Addition.TempUuid = uuidInfo.Uuid
 			op.MustSaveDriverStorage(y)
 
 			// 展示二维码
@@ -280,10 +256,10 @@ func (y *Cloud189TV) login() (err error) {
 			// Signature
 			req.SetHeaders(y.AppKeySignatureHeader(ApiUrl+"/family/manage/qrcodeLoginResult.action",
 				http.MethodGet))
-			req.SetQueryParam("uuid", y.TempUuid)
+			req.SetQueryParam("uuid", y.Addition.TempUuid)
 			_, err = req.Execute(http.MethodGet, ApiUrl+"/family/manage/qrcodeLoginResult.action")
 			if err != nil {
-				return err
+				return
 			}
 			if erron.HasError() {
 				return &erron
@@ -292,6 +268,7 @@ func (y *Cloud189TV) login() (err error) {
 				return errors.New("E189AccessToken is empty")
 			}
 			y.Addition.AccessToken = accessTokenResp.E189AccessToken
+			y.Addition.TempUuid = ""
 		}
 	}
 	// 获取SessionKey 和 SessionSecret
@@ -303,7 +280,7 @@ func (y *Cloud189TV) login() (err error) {
 	reqb.SetQueryParam("e189AccessToken", y.Addition.AccessToken)
 	_, err = reqb.Execute(http.MethodGet, ApiUrl+"/family/manage/loginFamilyMerge.action")
 	if err != nil {
-		return err
+		return
 	}
 
 	if erron.HasError() {
@@ -312,45 +289,7 @@ func (y *Cloud189TV) login() (err error) {
 
 	y.tokenInfo = &tokenInfo
 	op.MustSaveDriverStorage(y)
-	return err
-}
-
-// refreshSession 尝试使用现有的 AccessToken 刷新会话
-func (y *Cloud189TV) refreshSession() (err error) {
-	var erron RespErr
-	var tokenInfo AppSessionResp
-	reqb := y.client.R().SetQueryParams(clientSuffix())
-	reqb.SetResult(&tokenInfo).SetError(&erron)
-	// Signature
-	reqb.SetHeaders(y.AppKeySignatureHeader(ApiUrl+"/family/manage/loginFamilyMerge.action",
-		http.MethodGet))
-	reqb.SetQueryParam("e189AccessToken", y.Addition.AccessToken)
-	_, err = reqb.Execute(http.MethodGet, ApiUrl+"/family/manage/loginFamilyMerge.action")
-	if err != nil {
-		return err
-	}
-
-	if erron.HasError() {
-		return &erron
-	}
-
-	y.tokenInfo = &tokenInfo
-	return nil
-}
-
-func (y *Cloud189TV) keepAlive() {
-	_, err := y.get(ApiUrl+"/keepUserSession.action", func(r *resty.Request) {
-		r.SetQueryParams(clientSuffix())
-	}, nil)
-	if err != nil {
-		utils.Log.Warnf("189tv: Failed to keep user session alive: %v", err)
-		// 如果keepAlive失败，尝试刷新session
-		if refreshErr := y.refreshSession(); refreshErr != nil {
-			utils.Log.Errorf("189tv: Failed to refresh session after keepAlive error: %v", refreshErr)
-		}
-	} else {
-		utils.Log.Debugf("189tv: User session kept alive successfully.")
-	}
+	return
 }
 
 func (y *Cloud189TV) RapidUpload(ctx context.Context, dstDir model.Obj, stream model.FileStreamer, isFamily bool, overwrite bool) (model.Obj, error) {
@@ -373,14 +312,11 @@ func (y *Cloud189TV) RapidUpload(ctx context.Context, dstDir model.Obj, stream m
 
 // 旧版本上传，家庭云不支持覆盖
 func (y *Cloud189TV) OldUpload(ctx context.Context, dstDir model.Obj, file model.FileStreamer, up driver.UpdateProgress, isFamily bool, overwrite bool) (model.Obj, error) {
-	fileMd5 := file.GetHash().GetHash(utils.MD5)
-	tempFile := file.GetFile()
-	var err error
-	if len(fileMd5) != utils.MD5.Width {
-		tempFile, fileMd5, err = stream.CacheFullAndHash(file, &up, utils.MD5)
-	} else if tempFile == nil {
-		tempFile, err = file.CacheFullAndWriter(&up, nil)
+	tempFile, err := file.CacheFullInTempFile()
+	if err != nil {
+		return nil, err
 	}
+	fileMd5, err := utils.HashFile(utils.MD5, tempFile)
 	if err != nil {
 		return nil, err
 	}
@@ -393,10 +329,6 @@ func (y *Cloud189TV) OldUpload(ctx context.Context, dstDir model.Obj, file model
 
 	// 网盘中不存在该文件，开始上传
 	status := GetUploadFileStatusResp{CreateUploadFileResp: *uploadInfo}
-	// driver.RateLimitReader会尝试Close底层的reader
-	// 但这里的tempFile是一个*os.File，Close后就没法继续读了
-	// 所以这里用io.NopCloser包一层
-	rateLimitedRd := driver.NewLimitedUploadStream(ctx, io.NopCloser(tempFile))
 	for status.GetSize() < file.GetSize() && status.FileDataExists != 1 {
 		if utils.IsCanceled(ctx) {
 			return nil, ctx.Err()
@@ -414,7 +346,7 @@ func (y *Cloud189TV) OldUpload(ctx context.Context, dstDir model.Obj, file model
 			header["Edrive-UploadFileId"] = fmt.Sprint(status.UploadFileId)
 		}
 
-		_, err := y.put(ctx, status.FileUploadUrl, header, true, rateLimitedRd, isFamily)
+		_, err := y.put(ctx, status.FileUploadUrl, header, true, io.NopCloser(tempFile), isFamily)
 		if err, ok := err.(*RespErr); ok && err.Code != "InputStreamReadError" {
 			return nil, err
 		}
@@ -477,6 +409,7 @@ func (y *Cloud189TV) OldUploadCreate(ctx context.Context, parentID string, fileM
 			})
 		}
 	}, &uploadInfo, isFamily)
+
 	if err != nil {
 		return nil, err
 	}
@@ -630,15 +563,3 @@ func (y *Cloud189TV) WaitBatchTask(aType string, taskID string, t time.Duration)
 		time.Sleep(t)
 	}
 }
-
-func (y *Cloud189TV) getCapacityInfo(ctx context.Context) (*CapacityResp, error) {
-	fullUrl := ApiUrl + "/portal/getUserSizeInfo.action"
-	var resp CapacityResp
-	_, err := y.get(fullUrl, func(req *resty.Request) {
-		req.SetContext(ctx)
-	}, &resp)
-	if err != nil {
-		return nil, err
-	}
-	return &resp, nil
-}

drivers/189pc/driver.go

@@ -12,22 +12,21 @@ import (
 	"github.com/OpenListTeam/OpenList/v4/internal/driver"
 	"github.com/OpenListTeam/OpenList/v4/internal/errs"
 	"github.com/OpenListTeam/OpenList/v4/internal/model"
-	"github.com/OpenListTeam/OpenList/v4/pkg/cron"
 	"github.com/OpenListTeam/OpenList/v4/pkg/utils"
-	"github.com/go-resty/resty/v2"
 	"github.com/google/uuid"
+	"resty.dev/v3"
 )
 
 type Cloud189PC struct {
 	model.Storage
 	Addition
 
+	identity string
+
 	client *resty.Client
 
-	loginParam  *LoginParam
-	qrcodeParam *QRLoginParam
-
-	tokenInfo *AppSessionResp
+	loginParam *LoginParam
+	tokenInfo  *AppSessionResp
 
 	uploadThread int
 
@@ -36,7 +35,6 @@ type Cloud189PC struct {
 
 	storageConfig driver.Config
 	ref           *Cloud189PC
-	cron          *cron.Cron
 }
 
 func (y *Cloud189PC) Config() driver.Config {
@@ -86,22 +84,14 @@ func (y *Cloud189PC) Init(ctx context.Context) (err error) {
 			})
 		}
 
-		// 先尝试用Token刷新，之后尝试登陆
-		if y.Addition.RefreshToken != "" {
-			y.tokenInfo = &AppSessionResp{RefreshToken: y.Addition.RefreshToken}
-			if err = y.refreshToken(); err != nil {
-				return err
-			}
-		} else {
+		// 避免重复登陆
+		identity := utils.GetMD5EncodeStr(y.Username + y.Password)
+		if !y.isLogin() || y.identity != identity {
+			y.identity = identity
 			if err = y.login(); err != nil {
-				return err
+				return
 			}
 		}
-
-		// 初始化并启动 cron 任务
-		y.cron = cron.NewCron(time.Duration(time.Minute * 5))
-		// 每5分钟执行一次 keepAlive
-		y.cron.Do(y.keepAlive)
 	}
 
 	// 处理家庭云ID
@@ -124,7 +114,7 @@ func (y *Cloud189PC) Init(ctx context.Context) (err error) {
 			utils.Log.Errorf("cleanFamilyTransferFolderError:%s", err)
 		}
 	})
-	return err
+	return
 }
 
 func (d *Cloud189PC) InitReference(storage driver.Driver) error {
@@ -138,10 +128,6 @@ func (d *Cloud189PC) InitReference(storage driver.Driver) error {
 
 func (y *Cloud189PC) Drop(ctx context.Context) error {
 	y.ref = nil
-	if y.cron != nil {
-		y.cron.Stop()
-		y.cron = nil
-	}
 	return nil
 }
 
@@ -185,7 +171,7 @@ func (y *Cloud189PC) Link(ctx context.Context, file model.Obj, args model.LinkAr
 	if err != nil {
 		return nil, err
 	}
-	defer res.RawBody().Close()
+	defer res.Body.Close()
 	if res.StatusCode() == 302 {
 		downloadUrl.URL = res.Header().Get("location")
 	}
@@ -305,6 +291,7 @@ func (y *Cloud189PC) Copy(ctx context.Context, srcObj, dstDir model.Obj) error {
 		FileName: srcObj.GetName(),
 		IsFolder: BoolToNumber(srcObj.IsDir()),
 	})
+
 	if err != nil {
 		return err
 	}
@@ -410,24 +397,3 @@ func (y *Cloud189PC) Put(ctx context.Context, dstDir model.Obj, stream model.Fil
 		return y.StreamUpload(ctx, dstDir, stream, up, isFamily, overwrite)
 	}
 }
-
-func (y *Cloud189PC) GetDetails(ctx context.Context) (*model.StorageDetails, error) {
-	capacityInfo, err := y.getCapacityInfo(ctx)
-	if err != nil {
-		return nil, err
-	}
-	var total, free uint64
-	if y.isFamily() {
-		total = capacityInfo.FamilyCapacityInfo.TotalSize
-		free = capacityInfo.FamilyCapacityInfo.FreeSize
-	} else {
-		total = capacityInfo.CloudCapacityInfo.TotalSize
-		free = capacityInfo.CloudCapacityInfo.FreeSize
-	}
-	return &model.StorageDetails{
-		DiskUsage: model.DiskUsage{
-			TotalSpace: total,
-			FreeSpace:  free,
-		},
-	}, nil
-}

drivers/189pc/help.go

@@ -80,20 +80,6 @@ func timestamp() int64 {
 	return time.Now().UTC().UnixNano() / 1e6
 }
 
-// formatDate formats a time.Time object into the "YYYY-MM-DDHH:mm:ssSSS" format.
-func formatDate(t time.Time) string {
-	// The layout string "2006-01-0215:04:05.000" corresponds to:
-	// 2006 -> Year (YYYY)
-	// 01   -> Month (MM)
-	// 02   -> Day (DD)
-	// 15   -> Hour (HH)
-	// 04   -> Minute (mm)
-	// 05   -> Second (ss)
-	// 000  -> Millisecond (SSS) with leading zeros
-	// Note the lack of a separator between the date and hour, matching the desired output.
-	return t.Format("2006-01-0215:04:05.000")
-}
-
 func MustParseTime(str string) *time.Time {
 	lastOpTime, _ := time.ParseInLocation("2006-01-02 15:04:05 -07", str+" +08", time.Local)
 	return &lastOpTime

drivers/189pc/meta.go

@@ -6,11 +6,9 @@ import (
 )
 
 type Addition struct {
-	LoginType    string `json:"login_type" type:"select" options:"password,qrcode" default:"password" required:"true"`
-	Username     string `json:"username" required:"true"`
-	Password     string `json:"password" required:"true"`
-	VCode        string `json:"validate_code"`
-	RefreshToken string `json:"refresh_token" help:"To switch accounts, please clear this field"`
+	Username string `json:"username" required:"true"`
+	Password string `json:"password" required:"true"`
+	VCode    string `json:"validate_code"`
 	driver.RootID
 	OrderBy        string `json:"order_by" type:"select" options:"filename,filesize,lastOpTime" default:"filename"`
 	OrderDirection string `json:"order_direction" type:"select" options:"asc,desc" default:"asc"`

drivers/189pc/types.go

@@ -68,27 +68,6 @@ func (e *RespErr) Error() string {
 	return ""
 }
 
-type BaseLoginParam struct {
-	// 请求头参数
-	Lt    string
-	ReqId string
-
-	// 表单参数
-	ParamId string
-
-	// 验证码
-	CaptchaToken string
-}
-
-// QRLoginParam 用于暂存二维码登录过程中的参数
-type QRLoginParam struct {
-	BaseLoginParam
-
-	UUID       string `json:"uuid"`
-	EncodeUUID string `json:"encodeuuid"`
-	EncryUUID  string `json:"encryuuid"`
-}
-
 // 登陆需要的参数
 type LoginParam struct {
 	// 加密后的用户名和密码
@@ -98,7 +77,15 @@ type LoginParam struct {
 	// rsa密钥
 	jRsaKey string
 
-	BaseLoginParam
+	// 请求头参数
+	Lt    string
+	ReqId string
+
+	// 表单参数
+	ParamId string
+
+	// 验证码
+	CaptchaToken string
 }
 
 // 登陆加密相关
@@ -409,21 +396,3 @@ func (p Params) Encode() string {
 	}
 	return buf.String()
 }
-
-type CapacityResp struct {
-	ResCode           int    `json:"res_code"`
-	ResMessage        string `json:"res_message"`
-	Account           string `json:"account"`
-	CloudCapacityInfo struct {
-		FreeSize     uint64 `json:"freeSize"`
-		MailUsedSize uint64 `json:"mail189UsedSize"`
-		TotalSize    uint64 `json:"totalSize"`
-		UsedSize     uint64 `json:"usedSize"`
-	} `json:"cloudCapacityInfo"`
-	FamilyCapacityInfo struct {
-		FreeSize  uint64 `json:"freeSize"`
-		TotalSize uint64 `json:"totalSize"`
-		UsedSize  uint64 `json:"usedSize"`
-	} `json:"familyCapacityInfo"`
-	TotalSize uint64 `json:"totalSize"`
-}

drivers/189pc/utils.go

@@ -7,7 +7,6 @@ import (
 	"encoding/hex"
 	"encoding/xml"
 	"fmt"
-	"hash"
 	"io"
 	"net/http"
 	"net/http/cookiejar"
@@ -29,13 +28,12 @@ import (
 	"github.com/OpenListTeam/OpenList/v4/internal/stream"
 	"github.com/OpenListTeam/OpenList/v4/pkg/errgroup"
 	"github.com/OpenListTeam/OpenList/v4/pkg/utils"
-	"github.com/skip2/go-qrcode"
 
 	"github.com/avast/retry-go"
-	"github.com/go-resty/resty/v2"
 	"github.com/google/uuid"
 	jsoniter "github.com/json-iterator/go"
 	"github.com/pkg/errors"
+	"resty.dev/v3"
 )
 
 const (
@@ -55,9 +53,6 @@ const (
 	MAC = "TELEMAC"
 
 	CHANNEL_ID = "web_cloud.189.cn"
-
-	// Error codes
-	UserInvalidOpenTokenError = "UserInvalidOpenToken"
 )
 
 func (y *Cloud189PC) SignatureHeader(url, method, params string, isFamily bool) map[string]string {
@@ -90,9 +85,6 @@ func (y *Cloud189PC) EncryptParams(params Params, isFamily bool) string {
 }
 
 func (y *Cloud189PC) request(url, method string, callback base.ReqCallback, params Params, resp interface{}, isFamily ...bool) ([]byte, error) {
-	if y.getTokenInfo() == nil {
-		return nil, fmt.Errorf("login failed")
-	}
 	req := y.getClient().R().SetQueryParams(clientSuffix())
 
 	// 设置params
@@ -137,7 +129,7 @@ func (y *Cloud189PC) request(url, method string, callback base.ReqCallback, para
 	if erron.HasError() {
 		return nil, &erron
 	}
-	return res.Body(), nil
+	return res.Bytes(), nil
 }
 
 func (y *Cloud189PC) get(url string, callback base.ReqCallback, resp interface{}, isFamily ...bool) ([]byte, error) {
@@ -192,7 +184,6 @@ func (y *Cloud189PC) put(ctx context.Context, url string, headers map[string]str
 	}
 	return body, nil
 }
-
 func (y *Cloud189PC) getFiles(ctx context.Context, fileId string, isFamily bool) ([]model.Obj, error) {
 	res := make([]model.Obj, 0, 100)
 	for pageNum := 1; ; pageNum++ {
@@ -272,14 +263,7 @@ func (y *Cloud189PC) findFileByName(ctx context.Context, searchName string, fold
 	}
 }
 
-func (y *Cloud189PC) login() error {
-	if y.LoginType == "qrcode" {
-		return y.loginByQRCode()
-	}
-	return y.loginByPassword()
-}
-
-func (y *Cloud189PC) loginByPassword() (err error) {
+func (y *Cloud189PC) login() (err error) {
 	// 初始化登陆所需参数
 	if y.loginParam == nil {
 		if err = y.initLoginParam(); err != nil {
@@ -293,22 +277,17 @@ func (y *Cloud189PC) loginByPassword() (err error) {
 		// 销毁登陆参数
 		y.loginParam = nil
 		// 遇到错误，重新加载登陆参数(刷新验证码)
-		if err != nil {
-			if y.NoUseOcr {
-				if err1 := y.initLoginParam(); err1 != nil {
-					err = fmt.Errorf("err1: %s \nerr2: %s", err, err1)
-				}
+		if err != nil && y.NoUseOcr {
+			if err1 := y.initLoginParam(); err1 != nil {
+				err = fmt.Errorf("err1: %s \nerr2: %s", err, err1)
 			}
-
-			y.Status = err.Error()
-			op.MustSaveDriverStorage(y)
 		}
 	}()
 
 	param := y.loginParam
 	var loginresp LoginResp
 	_, err = y.client.R().
-		ForceContentType("application/json;charset=UTF-8").SetResult(&loginresp).
+		SetForceResponseContentType("application/json;charset=UTF-8").SetResult(&loginresp).
 		SetHeaders(map[string]string{
 			"REQID": param.ReqId,
 			"lt":    param.Lt,
@@ -346,7 +325,7 @@ func (y *Cloud189PC) loginByPassword() (err error) {
 		SetQueryParam("redirectURL", loginresp.ToUrl).
 		Post(API_URL + "/getSessionForPC.action")
 	if err != nil {
-		return err
+		return
 	}
 
 	if erron.HasError() {
@@ -354,106 +333,16 @@ func (y *Cloud189PC) loginByPassword() (err error) {
 	}
 	if tokenInfo.ResCode != 0 {
 		err = fmt.Errorf(tokenInfo.ResMessage)
-		return err
+		return
 	}
-	y.Addition.RefreshToken = tokenInfo.RefreshToken
 	y.tokenInfo = &tokenInfo
-	op.MustSaveDriverStorage(y)
-	return err
+	return
 }
 
-func (y *Cloud189PC) loginByQRCode() error {
-	if y.qrcodeParam == nil {
-		if err := y.initQRCodeParam(); err != nil {
-			// 二维码也通过错误返回
-			return err
-		}
-	}
-
-	var state struct {
-		Status      int    `json:"status"`
-		RedirectUrl string `json:"redirectUrl"`
-		Msg         string `json:"msg"`
-	}
-
-	now := time.Now()
-	_, err := y.client.R().
-		SetHeaders(map[string]string{
-			"Referer": AUTH_URL,
-			"Reqid":   y.qrcodeParam.ReqId,
-			"lt":      y.qrcodeParam.Lt,
-		}).
-		SetFormData(map[string]string{
-			"appId":      APP_ID,
-			"clientType": CLIENT_TYPE,
-			"returnUrl":  RETURN_URL,
-			"paramId":    y.qrcodeParam.ParamId,
-			"uuid":       y.qrcodeParam.UUID,
-			"encryuuid":  y.qrcodeParam.EncryUUID,
-			"date":       formatDate(now),
-			"timeStamp":  fmt.Sprint(now.UTC().UnixNano() / 1e6),
-		}).
-		ForceContentType("application/json;charset=UTF-8").
-		SetResult(&state).
-		Post(AUTH_URL + "/api/logbox/oauth2/qrcodeLoginState.do")
-	if err != nil {
-		return fmt.Errorf("failed to check QR code state: %w", err)
-	}
-
-	switch state.Status {
-	case 0: // 登录成功
-		var tokenInfo AppSessionResp
-		_, err = y.client.R().
-			SetResult(&tokenInfo).
-			SetQueryParams(clientSuffix()).
-			SetQueryParam("redirectURL", state.RedirectUrl).
-			Post(API_URL + "/getSessionForPC.action")
-		if err != nil {
-			return err
-		}
-		if tokenInfo.ResCode != 0 {
-			return fmt.Errorf(tokenInfo.ResMessage)
-		}
-		y.Addition.RefreshToken = tokenInfo.RefreshToken
-		y.tokenInfo = &tokenInfo
-		op.MustSaveDriverStorage(y)
-		return nil
-	case -11001: // 二维码过期
-		y.qrcodeParam = nil
-		return errors.New("QR code expired, please try again")
-	case -106: // 等待扫描
-		return y.genQRCode("QR code has not been scanned yet, please scan and save again")
-	case -11002: // 等待确认
-		return y.genQRCode("QR code has been scanned, please confirm the login on your phone and save again")
-	default: // 其他错误
-		y.qrcodeParam = nil
-		return fmt.Errorf("QR code login failed with status %d: %s", state.Status, state.Msg)
-	}
-}
-
-func (y *Cloud189PC) genQRCode(text string) error {
-	// 展示二维码
-	qrTemplate := `<body>
-	state: %s
-	<br><img src="data:image/jpeg;base64,%s"/>
-    <br>Or Click here: <a href="%s">Login</a>
-</body>`
-
-	// Generate QR code
-	qrCode, err := qrcode.Encode(y.qrcodeParam.UUID, qrcode.Medium, 256)
-	if err != nil {
-		return fmt.Errorf("failed to generate QR code: %v", err)
-	}
-
-	// Encode QR code to base64
-	qrCodeBase64 := base64.StdEncoding.EncodeToString(qrCode)
-
-	// Create the HTML page
-	qrPage := fmt.Sprintf(qrTemplate, text, qrCodeBase64, y.qrcodeParam.UUID)
-	return fmt.Errorf("need verify: \n%s", qrPage)
-}
-
-func (y *Cloud189PC) initBaseParams() (*BaseLoginParam, error) {
+/* 初始化登陆需要的参数
+*  如果遇到验证码返回错误
+ */
+func (y *Cloud189PC) initLoginParam() error {
 	// 清除cookie
 	jar, _ := cookiejar.New(nil)
 	y.client.SetCookieJar(jar)
@@ -467,51 +356,39 @@ func (y *Cloud189PC) initBaseParams() (*BaseLoginParam, error) {
 		}).
 		Get(WEB_URL + "/api/portal/unifyLoginForPC.action")
 	if err != nil {
-		return nil, err
+		return err
 	}
 
-	return &BaseLoginParam{
+	param := LoginParam{
 		CaptchaToken: regexp.MustCompile(`'captchaToken' value='(.+?)'`).FindStringSubmatch(res.String())[1],
 		Lt:           regexp.MustCompile(`lt = "(.+?)"`).FindStringSubmatch(res.String())[1],
 		ParamId:      regexp.MustCompile(`paramId = "(.+?)"`).FindStringSubmatch(res.String())[1],
 		ReqId:        regexp.MustCompile(`reqId = "(.+?)"`).FindStringSubmatch(res.String())[1],
-	}, nil
-}
-
-/* 初始化登陆需要的参数
- *  如果遇到验证码返回错误
- */
-func (y *Cloud189PC) initLoginParam() error {
-	y.loginParam = nil
-
-	baseParam, err := y.initBaseParams()
-	if err != nil {
-		return err
+		// jRsaKey:      regexp.MustCompile(`"j_rsaKey" value="(.+?)"`).FindStringSubmatch(res.String())[1],
 	}
 
-	y.loginParam = &LoginParam{BaseLoginParam: *baseParam}
-
 	// 获取rsa公钥
 	var encryptConf EncryptConfResp
 	_, err = y.client.R().
-		ForceContentType("application/json;charset=UTF-8").SetResult(&encryptConf).
+		SetForceResponseContentType("application/json;charset=UTF-8").SetResult(&encryptConf).
 		SetFormData(map[string]string{"appId": APP_ID}).
 		Post(AUTH_URL + "/api/logbox/config/encryptConf.do")
 	if err != nil {
 		return err
 	}
 
-	y.loginParam.jRsaKey = fmt.Sprintf("-----BEGIN PUBLIC KEY-----\n%s\n-----END PUBLIC KEY-----", encryptConf.Data.PubKey)
-	y.loginParam.RsaUsername = encryptConf.Data.Pre + RsaEncrypt(y.loginParam.jRsaKey, y.Username)
-	y.loginParam.RsaPassword = encryptConf.Data.Pre + RsaEncrypt(y.loginParam.jRsaKey, y.Password)
+	param.jRsaKey = fmt.Sprintf("-----BEGIN PUBLIC KEY-----\n%s\n-----END PUBLIC KEY-----", encryptConf.Data.PubKey)
+	param.RsaUsername = encryptConf.Data.Pre + RsaEncrypt(param.jRsaKey, y.Username)
+	param.RsaPassword = encryptConf.Data.Pre + RsaEncrypt(param.jRsaKey, y.Password)
+	y.loginParam = &param
 
 	// 判断是否需要验证码
 	resp, err := y.client.R().
-		SetHeader("REQID", y.loginParam.ReqId).
+		SetHeader("REQID", param.ReqId).
 		SetFormData(map[string]string{
 			"appKey":      APP_ID,
 			"accountType": ACCOUNT_TYPE,
-			"userName":    y.loginParam.RsaUsername,
+			"userName":    param.RsaUsername,
 		}).Post(AUTH_URL + "/api/logbox/oauth2/needcaptcha.do")
 	if err != nil {
 		return err
@@ -523,8 +400,8 @@ func (y *Cloud189PC) initLoginParam() error {
 	// 拉取验证码
 	imgRes, err := y.client.R().
 		SetQueryParams(map[string]string{
-			"token": y.loginParam.CaptchaToken,
-			"REQID": y.loginParam.ReqId,
+			"token": param.CaptchaToken,
+			"REQID": param.ReqId,
 			"rnd":   fmt.Sprint(timestamp()),
 		}).
 		Get(AUTH_URL + "/api/logbox/oauth2/picCaptcha.do")
@@ -534,55 +411,27 @@ func (y *Cloud189PC) initLoginParam() error {
 	if imgRes.Size() > 20 {
 		if setting.GetStr(conf.OcrApi) != "" && !y.NoUseOcr {
 			vRes, err := base.RestyClient.R().
-				SetMultipartField("image", "validateCode.png", "image/png", bytes.NewReader(imgRes.Body())).
+				SetMultipartField("image", "validateCode.png", "image/png", bytes.NewReader(imgRes.Bytes())).
 				Post(setting.GetStr(conf.OcrApi))
 			if err != nil {
 				return err
 			}
-			if jsoniter.Get(vRes.Body(), "status").ToInt() == 200 {
-				y.VCode = jsoniter.Get(vRes.Body(), "result").ToString()
+			if jsoniter.Get(vRes.Bytes(), "status").ToInt() == 200 {
+				y.VCode = jsoniter.Get(vRes.Bytes(), "result").ToString()
 				return nil
 			}
 		}
 
 		// 返回验证码图片给前端
-		return fmt.Errorf(`need img validate code: <img src="data:image/png;base64,%s"/>`, base64.StdEncoding.EncodeToString(imgRes.Body()))
+		return fmt.Errorf(`need img validate code: <img src="data:image/png;base64,%s"/>`, base64.StdEncoding.EncodeToString(imgRes.Bytes()))
 	}
 	return nil
 }
 
-// getQRCode 获取并返回二维码
-func (y *Cloud189PC) initQRCodeParam() (err error) {
-	y.qrcodeParam = nil
-
-	baseParam, err := y.initBaseParams()
-	if err != nil {
-		return err
-	}
-
-	var qrcodeParam QRLoginParam
-	_, err = y.client.R().
-		SetFormData(map[string]string{"appId": APP_ID}).
-		ForceContentType("application/json;charset=UTF-8").
-		SetResult(&qrcodeParam).
-		Post(AUTH_URL + "/api/logbox/oauth2/getUUID.do")
-	if err != nil {
-		return err
-	}
-	qrcodeParam.BaseLoginParam = *baseParam
-	y.qrcodeParam = &qrcodeParam
-
-	return y.genQRCode("please scan the QR code with the 189 Cloud app, then save the settings again.")
-}
-
 // 刷新会话
 func (y *Cloud189PC) refreshSession() (err error) {
-	return y.refreshSessionWithRetry(0)
-}
-
-func (y *Cloud189PC) refreshSessionWithRetry(retryCount int) (err error) {
 	if y.ref != nil {
-		return y.ref.refreshSessionWithRetry(retryCount)
+		return y.ref.refreshSession()
 	}
 	var erron RespErr
 	var userSessionResp UserSessionResp
@@ -599,102 +448,37 @@ func (y *Cloud189PC) refreshSessionWithRetry(retryCount int) (err error) {
 		return err
 	}
 
-	// token生效刷新token
+	// 错误影响正常访问，下线该储存
+	defer func() {
+		if err != nil {
+			y.GetStorage().SetStatus(fmt.Sprintf("%+v", err.Error()))
+			op.MustSaveDriverStorage(y)
+		}
+	}()
+
 	if erron.HasError() {
-		if erron.ResCode == UserInvalidOpenTokenError {
-			return y.refreshTokenWithRetry(retryCount)
+		if erron.ResCode == "UserInvalidOpenToken" {
+			if err = y.login(); err != nil {
+				return err
+			}
 		}
 		return &erron
 	}
 	y.tokenInfo.UserSessionResp = userSessionResp
-	return nil
-}
-
-// refreshToken 刷新token，失败时返回错误，不再直接调用login
-func (y *Cloud189PC) refreshToken() (err error) {
-	return y.refreshTokenWithRetry(0)
-}
-
-func (y *Cloud189PC) refreshTokenWithRetry(retryCount int) (err error) {
-	if y.ref != nil {
-		return y.ref.refreshTokenWithRetry(retryCount)
-	}
-
-	// 限制重试次数，避免无限递归
-	if retryCount >= 3 {
-		if y.Addition.RefreshToken != "" {
-			y.Addition.RefreshToken = ""
-			op.MustSaveDriverStorage(y)
-		}
-		return errors.New("refresh token failed after maximum retries")
-	}
-
-	var erron RespErr
-	var tokenInfo AppSessionResp
-	_, err = y.client.R().
-		SetResult(&tokenInfo).
-		ForceContentType("application/json;charset=UTF-8").
-		SetError(&erron).
-		SetFormData(map[string]string{
-			"clientId":     APP_ID,
-			"refreshToken": y.tokenInfo.RefreshToken,
-			"grantType":    "refresh_token",
-			"format":       "json",
-		}).
-		Post(AUTH_URL + "/api/oauth2/refreshToken.do")
-	if err != nil {
-		return err
-	}
-
-	// 如果刷新失败，返回错误给上层处理
-	if erron.HasError() {
-		if y.Addition.RefreshToken != "" {
-			y.Addition.RefreshToken = ""
-			op.MustSaveDriverStorage(y)
-		}
-
-		// 根据登录类型决定下一步行为
-		if y.LoginType == "qrcode" {
-			return errors.New("QR code session has expired, please re-scan the code to log in")
-		}
-		// 密码登录模式下，尝试回退到完整登录
-		return y.login()
-	}
-
-	y.Addition.RefreshToken = tokenInfo.RefreshToken
-	y.tokenInfo = &tokenInfo
-	op.MustSaveDriverStorage(y)
-	return y.refreshSessionWithRetry(retryCount + 1)
-}
-
-func (y *Cloud189PC) keepAlive() {
-	_, err := y.get(API_URL+"/keepUserSession.action", func(r *resty.Request) {
-		r.SetQueryParams(clientSuffix())
-	}, nil)
-	if err != nil {
-		utils.Log.Warnf("189pc: Failed to keep user session alive: %v", err)
-		// 如果keepAlive失败，尝试刷新session
-		if refreshErr := y.refreshSession(); refreshErr != nil {
-			utils.Log.Errorf("189pc: Failed to refresh session after keepAlive error: %v", refreshErr)
-		}
-	} else {
-		utils.Log.Debugf("189pc: User session kept alive successfully.")
-	}
+	return
 }
 
 // 普通上传
 // 无法上传大小为0的文件
 func (y *Cloud189PC) StreamUpload(ctx context.Context, dstDir model.Obj, file model.FileStreamer, up driver.UpdateProgress, isFamily bool, overwrite bool) (model.Obj, error) {
-	// 文件大小
-	fileSize := file.GetSize()
-	// 分片大小，不得为文件大小
-	sliceSize := partSize(fileSize)
+	size := file.GetSize()
+	sliceSize := partSize(size)
 
 	params := Params{
 		"parentFolderId": dstDir.GetID(),
 		"fileName":       url.QueryEscape(file.GetName()),
-		"fileSize":       fmt.Sprint(fileSize),
-		"sliceSize":      fmt.Sprint(sliceSize), // 必须为特定分片大小
+		"fileSize":       fmt.Sprint(file.GetSize()),
+		"sliceSize":      fmt.Sprint(sliceSize),
 		"lazyCheck":      "1",
 	}
 
@@ -703,7 +487,7 @@ func (y *Cloud189PC) StreamUpload(ctx context.Context, dstDir model.Obj, file mo
 		params.Set("familyId", y.FamilyID)
 		fullUrl += "/family"
 	} else {
-		// params.Set("extend", `{"opScene":"1","relativepath":"","rootfolderid":""}`)
+		//params.Set("extend", `{"opScene":"1","relativepath":"","rootfolderid":""}`)
 		fullUrl += "/person"
 	}
 
@@ -716,100 +500,66 @@ func (y *Cloud189PC) StreamUpload(ctx context.Context, dstDir model.Obj, file mo
 		return nil, err
 	}
 
-	ss, err := stream.NewStreamSectionReader(file, int(sliceSize), &up)
-	if err != nil {
-		return nil, err
-	}
-
-	threadG, upCtx := errgroup.NewOrderedGroupWithContext(ctx, y.uploadThread,
+	threadG, upCtx := errgroup.NewGroupWithContext(ctx, y.uploadThread,
 		retry.Attempts(3),
 		retry.Delay(time.Second),
 		retry.DelayType(retry.BackOffDelay))
 
-	count := 1
-	if fileSize > sliceSize {
-		count = int((fileSize + sliceSize - 1) / sliceSize)
-	}
-	lastPartSize := fileSize % sliceSize
-	if lastPartSize == 0 {
+	count := int(size / sliceSize)
+	lastPartSize := size % sliceSize
+	if lastPartSize > 0 {
+		count++
+	} else {
 		lastPartSize = sliceSize
 	}
-
-	silceMd5Hexs := make([]string, 0, count)
+	fileMd5 := utils.MD5.NewFunc()
 	silceMd5 := utils.MD5.NewFunc()
-	var writers io.Writer = silceMd5
-
-	fileMd5Hex := file.GetHash().GetHash(utils.MD5)
-	var fileMd5 hash.Hash
-	if len(fileMd5Hex) != utils.MD5.Width {
-		fileMd5 = utils.MD5.NewFunc()
-		writers = io.MultiWriter(silceMd5, fileMd5)
-	}
+	silceMd5Hexs := make([]string, 0, count)
+	teeReader := io.TeeReader(file, io.MultiWriter(fileMd5, silceMd5))
+	byteSize := sliceSize
 	for i := 1; i <= count; i++ {
 		if utils.IsCanceled(upCtx) {
 			break
 		}
-		offset := int64((i)-1) * sliceSize
-		partSize := sliceSize
 		if i == count {
-			partSize = lastPartSize
+			byteSize = lastPartSize
+		}
+		byteData := make([]byte, byteSize)
+		// 读取块
+		silceMd5.Reset()
+		if _, err := io.ReadFull(teeReader, byteData); err != io.EOF && err != nil {
+			return nil, err
 		}
-		partInfo := ""
-		var reader io.ReadSeeker
-		var rateLimitedRd io.Reader
-		threadG.GoWithLifecycle(errgroup.Lifecycle{
-			Before: func(ctx context.Context) error {
-				if reader == nil {
-					var err error
-					reader, err = ss.GetSectionReader(offset, partSize)
-					if err != nil {
-						return err
-					}
-					silceMd5.Reset()
-					w, err := utils.CopyWithBuffer(writers, reader)
-					if w != partSize {
-						return fmt.Errorf("failed to read all data: (expect =%d, actual =%d) %w", partSize, w, err)
-					}
-					// 计算块md5并进行hex和base64编码
-					md5Bytes := silceMd5.Sum(nil)
-					silceMd5Hexs = append(silceMd5Hexs, strings.ToUpper(hex.EncodeToString(md5Bytes)))
-					partInfo = fmt.Sprintf("%d-%s", i, base64.StdEncoding.EncodeToString(md5Bytes))
 
-					rateLimitedRd = driver.NewLimitedUploadStream(ctx, reader)
-				}
-				return nil
-			},
-			Do: func(ctx context.Context) error {
-				reader.Seek(0, io.SeekStart)
-				uploadUrls, err := y.GetMultiUploadUrls(ctx, isFamily, initMultiUpload.Data.UploadFileID, partInfo)
-				if err != nil {
-					return err
-				}
+		// 计算块md5并进行hex和base64编码
+		md5Bytes := silceMd5.Sum(nil)
+		silceMd5Hexs = append(silceMd5Hexs, strings.ToUpper(hex.EncodeToString(md5Bytes)))
+		partInfo := fmt.Sprintf("%d-%s", i, base64.StdEncoding.EncodeToString(md5Bytes))
 
-				// step.4 上传切片
-				uploadUrl := uploadUrls[0]
-				_, err = y.put(ctx, uploadUrl.RequestURL, uploadUrl.Headers, false, rateLimitedRd, isFamily)
-				if err != nil {
-					return err
-				}
-				up(float64(threadG.Success()) * 100 / float64(count))
-				return nil
-			},
-			After: func(err error) {
-				ss.FreeSectionReader(reader)
-			},
-		},
-		)
+		threadG.Go(func(ctx context.Context) error {
+			uploadUrls, err := y.GetMultiUploadUrls(ctx, isFamily, initMultiUpload.Data.UploadFileID, partInfo)
+			if err != nil {
+				return err
+			}
+
+			// step.4 上传切片
+			uploadUrl := uploadUrls[0]
+			_, err = y.put(ctx, uploadUrl.RequestURL, uploadUrl.Headers, false,
+				driver.NewLimitedUploadStream(ctx, bytes.NewReader(byteData)), isFamily)
+			if err != nil {
+				return err
+			}
+			up(float64(threadG.Success()) * 100 / float64(count))
+			return nil
+		})
 	}
 	if err = threadG.Wait(); err != nil {
 		return nil, err
 	}
 
-	if fileMd5 != nil {
-		fileMd5Hex = strings.ToUpper(hex.EncodeToString(fileMd5.Sum(nil)))
-	}
+	fileMd5Hex := strings.ToUpper(hex.EncodeToString(fileMd5.Sum(nil)))
 	sliceMd5Hex := fileMd5Hex
-	if fileSize > sliceSize {
+	if file.GetSize() > sliceSize {
 		sliceMd5Hex = strings.ToUpper(utils.GetMD5EncodeStr(strings.Join(silceMd5Hexs, "\n")))
 	}
 
@@ -870,16 +620,15 @@ func (y *Cloud189PC) FastUpload(ctx context.Context, dstDir model.Obj, file mode
 		cache = tmpF
 	}
 	sliceSize := partSize(size)
-	count := 1
-	if size > sliceSize {
-		count = int((size + sliceSize - 1) / sliceSize)
-	}
+	count := int(size / sliceSize)
 	lastSliceSize := size % sliceSize
-	if lastSliceSize == 0 {
+	if lastSliceSize > 0 {
+		count++
+	} else {
 		lastSliceSize = sliceSize
 	}
 
-	// step.1 优先计算所需信息
+	//step.1 优先计算所需信息
 	byteSize := sliceSize
 	fileMd5 := utils.MD5.NewFunc()
 	sliceMd5 := utils.MD5.NewFunc()
@@ -930,14 +679,14 @@ func (y *Cloud189PC) FastUpload(ctx context.Context, dstDir model.Obj, file mode
 	if isFamily {
 		fullUrl += "/family"
 	} else {
-		// params.Set("extend", `{"opScene":"1","relativepath":"","rootfolderid":""}`)
+		//params.Set("extend", `{"opScene":"1","relativepath":"","rootfolderid":""}`)
 		fullUrl += "/person"
 	}
 
 	// 尝试恢复进度
 	uploadProgress, ok := base.GetUploadProgress[*UploadProgress](y, y.getTokenInfo().SessionKey, fileMd5Hex)
 	if !ok {
-		// step.2 预上传
+		//step.2 预上传
 		params := Params{
 			"parentFolderId": dstDir.GetID(),
 			"fileName":       url.QueryEscape(file.GetName()),
@@ -989,8 +738,7 @@ func (y *Cloud189PC) FastUpload(ctx context.Context, dstDir model.Obj, file mode
 				}
 
 				// step.4 上传切片
-				rateLimitedRd := driver.NewLimitedUploadStream(ctx, io.NewSectionReader(cache, offset, byteSize))
-				_, err = y.put(ctx, uploadUrl.RequestURL, uploadUrl.Headers, false, rateLimitedRd, isFamily)
+				_, err = y.put(ctx, uploadUrl.RequestURL, uploadUrl.Headers, false, io.NewSectionReader(cache, offset, byteSize), isFamily)
 				if err != nil {
 					return err
 				}
@@ -1072,7 +820,7 @@ func (y *Cloud189PC) GetMultiUploadUrls(ctx context.Context, isFamily bool, uplo
 
 // 旧版本上传，家庭云不支持覆盖
 func (y *Cloud189PC) OldUpload(ctx context.Context, dstDir model.Obj, file model.FileStreamer, up driver.UpdateProgress, isFamily bool, overwrite bool) (model.Obj, error) {
-	tempFile, fileMd5, err := stream.CacheFullAndHash(file, &up, utils.MD5)
+	tempFile, fileMd5, err := stream.CacheFullInTempFileAndHash(file, utils.MD5)
 	if err != nil {
 		return nil, err
 	}
@@ -1166,6 +914,7 @@ func (y *Cloud189PC) OldUploadCreate(ctx context.Context, parentID string, fileM
 			})
 		}
 	}, &uploadInfo, isFamily)
+
 	if err != nil {
 		return nil, err
 	}
@@ -1475,15 +1224,3 @@ func (y *Cloud189PC) getClient() *resty.Client {
 	}
 	return y.client
 }
-
-func (y *Cloud189PC) getCapacityInfo(ctx context.Context) (*CapacityResp, error) {
-	fullUrl := API_URL + "/portal/getUserSizeInfo.action"
-	var resp CapacityResp
-	_, err := y.get(fullUrl, func(req *resty.Request) {
-		req.SetContext(ctx)
-	}, &resp)
-	if err != nil {
-		return nil, err
-	}
-	return &resp, nil
-}

drivers/alias/driver.go

@@ -3,9 +3,7 @@ package alias
 import (
 	"context"
 	"errors"
-	"fmt"
 	"io"
-	"net/url"
 	stdpath "path"
 	"strings"
 
@@ -13,17 +11,13 @@ import (
 	"github.com/OpenListTeam/OpenList/v4/internal/errs"
 	"github.com/OpenListTeam/OpenList/v4/internal/fs"
 	"github.com/OpenListTeam/OpenList/v4/internal/model"
-	"github.com/OpenListTeam/OpenList/v4/internal/op"
-	"github.com/OpenListTeam/OpenList/v4/internal/sign"
 	"github.com/OpenListTeam/OpenList/v4/internal/stream"
 	"github.com/OpenListTeam/OpenList/v4/pkg/utils"
-	"github.com/OpenListTeam/OpenList/v4/server/common"
 )
 
 type Alias struct {
 	model.Storage
 	Addition
-	rootOrder   []string
 	pathMap     map[string][]string
 	autoFlatten bool
 	oneKey      string
@@ -41,18 +35,13 @@ func (d *Alias) Init(ctx context.Context) error {
 	if d.Paths == "" {
 		return errors.New("paths is required")
 	}
-	paths := strings.Split(d.Paths, "\n")
-	d.rootOrder = make([]string, 0, len(paths))
 	d.pathMap = make(map[string][]string)
-	for _, path := range paths {
+	for _, path := range strings.Split(d.Paths, "\n") {
 		path = strings.TrimSpace(path)
 		if path == "" {
 			continue
 		}
 		k, v := getPair(path)
-		if _, ok := d.pathMap[k]; !ok {
-			d.rootOrder = append(d.rootOrder, k)
-		}
 		d.pathMap[k] = append(d.pathMap[k], v)
 	}
 	if len(d.pathMap) == 1 {
@@ -68,7 +57,6 @@ func (d *Alias) Init(ctx context.Context) error {
 }
 
 func (d *Alias) Drop(ctx context.Context) error {
-	d.rootOrder = nil
 	d.pathMap = nil
 	return nil
 }
@@ -86,51 +74,19 @@ func (d *Alias) Get(ctx context.Context, path string) (model.Obj, error) {
 	if !ok {
 		return nil, errs.ObjectNotFound
 	}
-	var ret *model.Object
-	provider := ""
 	for _, dst := range dsts {
-		rawPath := stdpath.Join(dst, sub)
-		obj, err := fs.Get(ctx, rawPath, &fs.GetArgs{NoLog: true})
-		if err != nil {
-			continue
-		}
-		storage, err := fs.GetStorage(rawPath, &fs.GetStoragesArgs{})
-		if ret == nil {
-			ret = &model.Object{
-				Path:     path,
-				Name:     obj.GetName(),
-				Size:     obj.GetSize(),
-				Modified: obj.ModTime(),
-				IsFolder: obj.IsDir(),
-				HashInfo: obj.GetHash(),
-			}
-			if !d.ProviderPassThrough || err != nil {
-				break
-			}
-			provider = storage.Config().Name
-		} else if err != nil || provider != storage.GetStorage().Driver {
-			provider = ""
-			break
+		obj, err := d.get(ctx, path, dst, sub)
+		if err == nil {
+			return obj, nil
 		}
 	}
-	if ret == nil {
-		return nil, errs.ObjectNotFound
-	}
-	if provider != "" {
-		return &model.ObjectProvider{
-			Object: *ret,
-			Provider: model.Provider{
-				Provider: provider,
-			},
-		}, nil
-	}
-	return ret, nil
+	return nil, errs.ObjectNotFound
 }
 
 func (d *Alias) List(ctx context.Context, dir model.Obj, args model.ListArgs) ([]model.Obj, error) {
 	path := dir.GetPath()
 	if utils.PathEqual(path, "/") && !d.autoFlatten {
-		return d.listRoot(ctx, args.WithStorageDetails && d.DetailsPassThrough), nil
+		return d.listRoot(), nil
 	}
 	root, sub := d.getRootAndPath(path)
 	dsts, ok := d.pathMap[root]
@@ -138,37 +94,9 @@ func (d *Alias) List(ctx context.Context, dir model.Obj, args model.ListArgs) ([
 		return nil, errs.ObjectNotFound
 	}
 	var objs []model.Obj
+	fsArgs := &fs.ListArgs{NoLog: true, Refresh: args.Refresh}
 	for _, dst := range dsts {
-		tmp, err := fs.List(ctx, stdpath.Join(dst, sub), &fs.ListArgs{
-			NoLog:              true,
-			Refresh:            args.Refresh,
-			WithStorageDetails: args.WithStorageDetails && d.DetailsPassThrough,
-		})
-		if err == nil {
-			tmp, err = utils.SliceConvert(tmp, func(obj model.Obj) (model.Obj, error) {
-				objRes := model.Object{
-					Name:     obj.GetName(),
-					Size:     obj.GetSize(),
-					Modified: obj.ModTime(),
-					IsFolder: obj.IsDir(),
-				}
-				if thumb, ok := model.GetThumb(obj); ok {
-					return &model.ObjThumb{
-						Object: objRes,
-						Thumbnail: model.Thumbnail{
-							Thumbnail: thumb,
-						},
-					}, nil
-				}
-				if details, ok := model.GetStorageDetails(obj); ok {
-					return &model.ObjStorageDetails{
-						Obj:                    &objRes,
-						StorageDetailsWithName: *details,
-					}, nil
-				}
-				return &objRes, nil
-			})
-		}
+		tmp, err := d.list(ctx, dst, sub, fsArgs)
 		if err == nil {
 			objs = append(objs, tmp...)
 		}
@@ -182,78 +110,26 @@ func (d *Alias) Link(ctx context.Context, file model.Obj, args model.LinkArgs) (
 	if !ok {
 		return nil, errs.ObjectNotFound
 	}
-	// proxy || ftp,s3
-	if common.GetApiUrl(ctx) == "" {
-		args.Redirect = false
-	}
 	for _, dst := range dsts {
-		reqPath := stdpath.Join(dst, sub)
-		link, fi, err := d.link(ctx, reqPath, args)
-		if err != nil {
-			continue
+		link, err := d.link(ctx, dst, sub, args)
+		if err == nil {
+			link.Expiration = nil // 去除非必要缓存，d.link里op.Lin有缓存
+			if !args.Redirect && len(link.URL) > 0 {
+				// 正常情况下 多并发 仅支持返回URL的驱动
+				// alias套娃alias 可以让crypt、mega等驱动(不返回URL的) 支持并发
+				if d.DownloadConcurrency > 0 {
+					link.Concurrency = d.DownloadConcurrency
+				}
+				if d.DownloadPartSize > 0 {
+					link.PartSize = d.DownloadPartSize * utils.KB
+				}
+			}
+			return link, nil
 		}
-		if link == nil {
-			// 重定向且需要通过代理
-			return &model.Link{
-				URL: fmt.Sprintf("%s/p%s?sign=%s",
-					common.GetApiUrl(ctx),
-					utils.EncodePath(reqPath, true),
-					sign.Sign(reqPath)),
-			}, nil
-		}
-
-		resultLink := *link
-		resultLink.SyncClosers = utils.NewSyncClosers(link)
-		if args.Redirect {
-			return &resultLink, nil
-		}
-
-		if resultLink.ContentLength == 0 {
-			resultLink.ContentLength = fi.GetSize()
-		}
-		if resultLink.MFile != nil {
-			return &resultLink, nil
-		}
-		if d.DownloadConcurrency > 0 {
-			resultLink.Concurrency = d.DownloadConcurrency
-		}
-		if d.DownloadPartSize > 0 {
-			resultLink.PartSize = d.DownloadPartSize * utils.KB
-		}
-		return &resultLink, nil
 	}
 	return nil, errs.ObjectNotFound
 }
 
-func (d *Alias) Other(ctx context.Context, args model.OtherArgs) (interface{}, error) {
-	root, sub := d.getRootAndPath(args.Obj.GetPath())
-	dsts, ok := d.pathMap[root]
-	if !ok {
-		return nil, errs.ObjectNotFound
-	}
-	for _, dst := range dsts {
-		rawPath := stdpath.Join(dst, sub)
-		storage, actualPath, err := op.GetStorageAndActualPath(rawPath)
-		if err != nil {
-			continue
-		}
-		other, ok := storage.(driver.Other)
-		if !ok {
-			continue
-		}
-		obj, err := op.GetUnwrap(ctx, storage, actualPath)
-		if err != nil {
-			continue
-		}
-		return other.Other(ctx, model.OtherArgs{
-			Obj:    obj,
-			Method: args.Method,
-			Data:   args.Data,
-		})
-	}
-	return nil, errs.NotImplement
-}
-
 func (d *Alias) MakeDir(ctx context.Context, parentDir model.Obj, dirName string) error {
 	if !d.Writable {
 		return errs.PermissionDenied
@@ -265,7 +141,7 @@ func (d *Alias) MakeDir(ctx context.Context, parentDir model.Obj, dirName string
 		}
 		return err
 	}
-	if errs.IsNotImplementError(err) {
+	if errs.IsNotImplement(err) {
 		return errors.New("same-name dirs cannot make sub-dir")
 	}
 	return err
@@ -276,14 +152,14 @@ func (d *Alias) Move(ctx context.Context, srcObj, dstDir model.Obj) error {
 		return errs.PermissionDenied
 	}
 	srcPath, err := d.getReqPath(ctx, srcObj, false)
-	if errs.IsNotImplementError(err) {
+	if errs.IsNotImplement(err) {
 		return errors.New("same-name files cannot be moved")
 	}
 	if err != nil {
 		return err
 	}
 	dstPath, err := d.getReqPath(ctx, dstDir, true)
-	if errs.IsNotImplementError(err) {
+	if errs.IsNotImplement(err) {
 		return errors.New("same-name dirs cannot be moved to")
 	}
 	if err != nil {
@@ -291,8 +167,7 @@ func (d *Alias) Move(ctx context.Context, srcObj, dstDir model.Obj) error {
 	}
 	if len(srcPath) == len(dstPath) {
 		for i := range srcPath {
-			_, e := fs.Move(ctx, *srcPath[i], *dstPath[i])
-			err = errors.Join(err, e)
+			err = errors.Join(err, fs.Move(ctx, *srcPath[i], *dstPath[i]))
 		}
 		return err
 	} else {
@@ -311,7 +186,7 @@ func (d *Alias) Rename(ctx context.Context, srcObj model.Obj, newName string) er
 		}
 		return err
 	}
-	if errs.IsNotImplementError(err) {
+	if errs.IsNotImplement(err) {
 		return errors.New("same-name files cannot be Rename")
 	}
 	return err
@@ -322,14 +197,14 @@ func (d *Alias) Copy(ctx context.Context, srcObj, dstDir model.Obj) error {
 		return errs.PermissionDenied
 	}
 	srcPath, err := d.getReqPath(ctx, srcObj, false)
-	if errs.IsNotImplementError(err) {
+	if errs.IsNotImplement(err) {
 		return errors.New("same-name files cannot be copied")
 	}
 	if err != nil {
 		return err
 	}
 	dstPath, err := d.getReqPath(ctx, dstDir, true)
-	if errs.IsNotImplementError(err) {
+	if errs.IsNotImplement(err) {
 		return errors.New("same-name dirs cannot be copied to")
 	}
 	if err != nil {
@@ -363,7 +238,7 @@ func (d *Alias) Remove(ctx context.Context, obj model.Obj) error {
 		}
 		return err
 	}
-	if errs.IsNotImplementError(err) {
+	if errs.IsNotImplement(err) {
 		return errors.New("same-name files cannot be Delete")
 	}
 	return err
@@ -376,29 +251,20 @@ func (d *Alias) Put(ctx context.Context, dstDir model.Obj, s model.FileStreamer,
 	reqPath, err := d.getReqPath(ctx, dstDir, true)
 	if err == nil {
 		if len(reqPath) == 1 {
-			storage, reqActualPath, err := op.GetStorageAndActualPath(*reqPath[0])
-			if err != nil {
-				return err
-			}
-			return op.Put(ctx, storage, reqActualPath, &stream.FileStream{
-				Obj:      s,
-				Mimetype: s.GetMimetype(),
-				Reader:   s,
-			}, up)
+			return fs.PutDirectly(ctx, *reqPath[0], s)
 		} else {
-			file, err := s.CacheFullAndWriter(nil, nil)
+			defer s.Close()
+			file, err := s.CacheFullInTempFile()
 			if err != nil {
 				return err
 			}
-			count := float64(len(reqPath) + 1)
-			up(100 / count)
-			for i, path := range reqPath {
+			for _, path := range reqPath {
 				err = errors.Join(err, fs.PutDirectly(ctx, *path, &stream.FileStream{
-					Obj:      s,
-					Mimetype: s.GetMimetype(),
-					Reader:   file,
+					Obj:          s,
+					Mimetype:     s.GetMimetype(),
+					WebPutAsTask: s.NeedStore(),
+					Reader:       file,
 				}))
-				up(float64(i+2) / float64(count) * 100)
 				_, e := file.Seek(0, io.SeekStart)
 				if e != nil {
 					return errors.Join(err, e)
@@ -407,7 +273,7 @@ func (d *Alias) Put(ctx context.Context, dstDir model.Obj, s model.FileStreamer,
 			return err
 		}
 	}
-	if errs.IsNotImplementError(err) {
+	if errs.IsNotImplement(err) {
 		return errors.New("same-name dirs cannot be Put")
 	}
 	return err
@@ -424,7 +290,7 @@ func (d *Alias) PutURL(ctx context.Context, dstDir model.Obj, name, url string)
 		}
 		return err
 	}
-	if errs.IsNotImplementError(err) {
+	if errs.IsNotImplement(err) {
 		return errors.New("same-name files cannot offline download")
 	}
 	return err
@@ -470,24 +336,18 @@ func (d *Alias) Extract(ctx context.Context, obj model.Obj, args model.ArchiveIn
 		return nil, errs.ObjectNotFound
 	}
 	for _, dst := range dsts {
-		reqPath := stdpath.Join(dst, sub)
-		link, err := d.extract(ctx, reqPath, args)
-		if err != nil {
-			continue
+		link, err := d.extract(ctx, dst, sub, args)
+		if err == nil {
+			if !args.Redirect && len(link.URL) > 0 {
+				if d.DownloadConcurrency > 0 {
+					link.Concurrency = d.DownloadConcurrency
+				}
+				if d.DownloadPartSize > 0 {
+					link.PartSize = d.DownloadPartSize * utils.KB
+				}
+			}
+			return link, nil
 		}
-		if link == nil {
-			return &model.Link{
-				URL: fmt.Sprintf("%s/ap%s?inner=%s&pass=%s&sign=%s",
-					common.GetApiUrl(ctx),
-					utils.EncodePath(reqPath, true),
-					utils.EncodePath(args.InnerPath, true),
-					url.QueryEscape(args.Password),
-					sign.SignArchive(reqPath)),
-			}, nil
-		}
-		resultLink := *link
-		resultLink.SyncClosers = utils.NewSyncClosers(link)
-		return &resultLink, nil
 	}
 	return nil, errs.NotImplement
 }
@@ -497,14 +357,14 @@ func (d *Alias) ArchiveDecompress(ctx context.Context, srcObj, dstDir model.Obj,
 		return errs.PermissionDenied
 	}
 	srcPath, err := d.getReqPath(ctx, srcObj, false)
-	if errs.IsNotImplementError(err) {
+	if errs.IsNotImplement(err) {
 		return errors.New("same-name files cannot be decompressed")
 	}
 	if err != nil {
 		return err
 	}
 	dstPath, err := d.getReqPath(ctx, dstDir, true)
-	if errs.IsNotImplementError(err) {
+	if errs.IsNotImplement(err) {
 		return errors.New("same-name dirs cannot be decompressed to")
 	}
 	if err != nil {

drivers/alias/meta.go

@@ -15,8 +15,6 @@ type Addition struct {
 	DownloadConcurrency int    `json:"download_concurrency" default:"0" required:"false" type:"number" help:"Need to enable proxy"`
 	DownloadPartSize    int    `json:"download_part_size" default:"0" type:"number" required:"false" help:"Need to enable proxy. Unit: KB"`
 	Writable            bool   `json:"writable" type:"bool" default:"false"`
-	ProviderPassThrough bool   `json:"provider_pass_through" type:"bool" default:"false"`
-	DetailsPassThrough  bool   `json:"details_pass_through" type:"bool" default:"false"`
 }
 
 var config = driver.Config{

drivers/alias/util.go

@@ -2,73 +2,37 @@ package alias
 
 import (
 	"context"
-	"errors"
+	"fmt"
+	"net/url"
 	stdpath "path"
 	"strings"
-	"sync"
-	"time"
 
 	"github.com/OpenListTeam/OpenList/v4/internal/driver"
 	"github.com/OpenListTeam/OpenList/v4/internal/errs"
 	"github.com/OpenListTeam/OpenList/v4/internal/fs"
 	"github.com/OpenListTeam/OpenList/v4/internal/model"
 	"github.com/OpenListTeam/OpenList/v4/internal/op"
+	"github.com/OpenListTeam/OpenList/v4/internal/sign"
+	"github.com/OpenListTeam/OpenList/v4/pkg/utils"
 	"github.com/OpenListTeam/OpenList/v4/server/common"
-	log "github.com/sirupsen/logrus"
 )
 
-func (d *Alias) listRoot(ctx context.Context, withDetails bool) []model.Obj {
+func (d *Alias) listRoot() []model.Obj {
 	var objs []model.Obj
-	var wg sync.WaitGroup
-	for _, k := range d.rootOrder {
+	for k := range d.pathMap {
 		obj := model.Object{
 			Name:     k,
 			IsFolder: true,
 			Modified: d.Modified,
 		}
-		idx := len(objs)
 		objs = append(objs, &obj)
-		v := d.pathMap[k]
-		if !withDetails || len(v) != 1 {
-			continue
-		}
-		remoteDriver, err := op.GetStorageByMountPath(v[0])
-		if err != nil {
-			continue
-		}
-		_, ok := remoteDriver.(driver.WithDetails)
-		if !ok {
-			continue
-		}
-		objs[idx] = &model.ObjStorageDetails{
-			Obj: objs[idx],
-			StorageDetailsWithName: model.StorageDetailsWithName{
-				StorageDetails: nil,
-				DriverName:     remoteDriver.Config().Name,
-			},
-		}
-		wg.Add(1)
-		go func() {
-			defer wg.Done()
-			c, cancel := context.WithTimeout(ctx, time.Second)
-			defer cancel()
-			details, e := op.GetStorageDetails(c, remoteDriver)
-			if e != nil {
-				if !errors.Is(e, errs.NotImplement) && !errors.Is(e, errs.StorageNotInit) {
-					log.Errorf("failed get %s storage details: %+v", remoteDriver.GetStorage().MountPath, e)
-				}
-				return
-			}
-			objs[idx].(*model.ObjStorageDetails).StorageDetails = details
-		}()
 	}
-	wg.Wait()
 	return objs
 }
 
 // do others that not defined in Driver interface
 func getPair(path string) (string, string) {
-	// path = strings.TrimSpace(path)
+	//path = strings.TrimSpace(path)
 	if strings.Contains(path, ":") {
 		pair := strings.SplitN(path, ":", 2)
 		if !strings.Contains(pair[0], "/") {
@@ -90,22 +54,79 @@ func (d *Alias) getRootAndPath(path string) (string, string) {
 	return parts[0], parts[1]
 }
 
-func (d *Alias) link(ctx context.Context, reqPath string, args model.LinkArgs) (*model.Link, model.Obj, error) {
+func (d *Alias) get(ctx context.Context, path string, dst, sub string) (model.Obj, error) {
+	obj, err := fs.Get(ctx, stdpath.Join(dst, sub), &fs.GetArgs{NoLog: true})
+	if err != nil {
+		return nil, err
+	}
+	return &model.Object{
+		Path:     path,
+		Name:     obj.GetName(),
+		Size:     obj.GetSize(),
+		Modified: obj.ModTime(),
+		IsFolder: obj.IsDir(),
+		HashInfo: obj.GetHash(),
+	}, nil
+}
+
+func (d *Alias) list(ctx context.Context, dst, sub string, args *fs.ListArgs) ([]model.Obj, error) {
+	objs, err := fs.List(ctx, stdpath.Join(dst, sub), args)
+	// the obj must implement the model.SetPath interface
+	// return objs, err
+	if err != nil {
+		return nil, err
+	}
+	return utils.SliceConvert(objs, func(obj model.Obj) (model.Obj, error) {
+		thumb, ok := model.GetThumb(obj)
+		objRes := model.Object{
+			Name:     obj.GetName(),
+			Size:     obj.GetSize(),
+			Modified: obj.ModTime(),
+			IsFolder: obj.IsDir(),
+		}
+		if !ok {
+			return &objRes, nil
+		}
+		return &model.ObjThumb{
+			Object: objRes,
+			Thumbnail: model.Thumbnail{
+				Thumbnail: thumb,
+			},
+		}, nil
+	})
+}
+
+func (d *Alias) link(ctx context.Context, dst, sub string, args model.LinkArgs) (*model.Link, error) {
+	reqPath := stdpath.Join(dst, sub)
+	// 参考 crypt 驱动
 	storage, reqActualPath, err := op.GetStorageAndActualPath(reqPath)
 	if err != nil {
-		return nil, nil, err
+		return nil, err
 	}
-	if !args.Redirect {
-		return op.Link(ctx, storage, reqActualPath, args)
+	useRawLink := len(common.GetApiUrl(ctx)) == 0 // ftp、s3
+	if !useRawLink {
+		_, ok := storage.(*Alias)
+		useRawLink = !ok && !args.Redirect
 	}
-	obj, err := fs.Get(ctx, reqPath, &fs.GetArgs{NoLog: true})
+	if useRawLink {
+		link, _, err := op.Link(ctx, storage, reqActualPath, args)
+		return link, err
+	}
+	_, err = fs.Get(ctx, reqPath, &fs.GetArgs{NoLog: true})
 	if err != nil {
-		return nil, nil, err
+		return nil, err
 	}
-	if common.ShouldProxy(storage, stdpath.Base(reqPath)) {
-		return nil, obj, nil
+	if common.ShouldProxy(storage, stdpath.Base(sub)) {
+		link := &model.Link{
+			URL: fmt.Sprintf("%s/p%s?sign=%s",
+				common.GetApiUrl(ctx),
+				utils.EncodePath(reqPath, true),
+				sign.Sign(reqPath)),
+		}
+		return link, nil
 	}
-	return op.Link(ctx, storage, reqActualPath, args)
+	link, _, err := op.Link(ctx, storage, reqActualPath, args)
+	return link, err
 }
 
 func (d *Alias) getReqPath(ctx context.Context, obj model.Obj, isParent bool) ([]*string, error) {
@@ -176,7 +197,8 @@ func (d *Alias) listArchive(ctx context.Context, dst, sub string, args model.Arc
 	return nil, errs.NotImplement
 }
 
-func (d *Alias) extract(ctx context.Context, reqPath string, args model.ArchiveInnerArgs) (*model.Link, error) {
+func (d *Alias) extract(ctx context.Context, dst, sub string, args model.ArchiveInnerArgs) (*model.Link, error) {
+	reqPath := stdpath.Join(dst, sub)
 	storage, reqActualPath, err := op.GetStorageAndActualPath(reqPath)
 	if err != nil {
 		return nil, err
@@ -184,12 +206,20 @@ func (d *Alias) extract(ctx context.Context, reqPath string, args model.ArchiveI
 	if _, ok := storage.(driver.ArchiveReader); !ok {
 		return nil, errs.NotImplement
 	}
-	if args.Redirect && common.ShouldProxy(storage, stdpath.Base(reqPath)) {
-		_, err := fs.Get(ctx, reqPath, &fs.GetArgs{NoLog: true})
-		if err == nil {
+	if args.Redirect && common.ShouldProxy(storage, stdpath.Base(sub)) {
+		_, err = fs.Get(ctx, reqPath, &fs.GetArgs{NoLog: true})
+		if err != nil {
 			return nil, err
 		}
-		return nil, nil
+		link := &model.Link{
+			URL: fmt.Sprintf("%s/ap%s?inner=%s&pass=%s&sign=%s",
+				common.GetApiUrl(ctx),
+				utils.EncodePath(reqPath, true),
+				utils.EncodePath(args.InnerPath, true),
+				url.QueryEscape(args.Password),
+				sign.SignArchive(reqPath)),
+		}
+		return link, nil
 	}
 	link, _, err := op.DriverExtract(ctx, storage, reqActualPath, args)
 	return link, err

drivers/aliyundrive/driver.go

@@ -22,8 +22,8 @@ import (
 	"github.com/OpenListTeam/OpenList/v4/internal/stream"
 	"github.com/OpenListTeam/OpenList/v4/pkg/cron"
 	"github.com/OpenListTeam/OpenList/v4/pkg/utils"
-	"github.com/go-resty/resty/v2"
 	log "github.com/sirupsen/logrus"
+	"resty.dev/v3"
 )
 
 type AliDrive struct {
@@ -45,7 +45,7 @@ func (d *AliDrive) GetAddition() driver.Additional {
 
 func (d *AliDrive) Init(ctx context.Context) error {
 	// TODO login / refresh token
-	// op.MustSaveDriverStorage(d)
+	//op.MustSaveDriverStorage(d)
 	err := d.refreshToken()
 	if err != nil {
 		return err
@@ -165,13 +165,13 @@ func (d *AliDrive) Remove(ctx context.Context, obj model.Obj) error {
 }
 
 func (d *AliDrive) Put(ctx context.Context, dstDir model.Obj, streamer model.FileStreamer, up driver.UpdateProgress) error {
-	file := &stream.FileStream{
+	file := stream.FileStream{
 		Obj:      streamer,
 		Reader:   streamer,
 		Mimetype: streamer.GetMimetype(),
 	}
 	const DEFAULT int64 = 10485760
-	count := int(math.Ceil(float64(streamer.GetSize()) / float64(DEFAULT)))
+	var count = int(math.Ceil(float64(streamer.GetSize()) / float64(DEFAULT)))
 
 	partInfoList := make([]base.Json, 0, count)
 	for i := 1; i <= count; i++ {
@@ -209,7 +209,7 @@ func (d *AliDrive) Put(ctx context.Context, dstDir model.Obj, streamer model.Fil
 				io.Closer
 			}{
 				Reader: io.MultiReader(buf, file),
-				Closer: file,
+				Closer: &file,
 			}
 		}
 	} else {
@@ -297,10 +297,11 @@ func (d *AliDrive) Put(ctx context.Context, dstDir model.Obj, streamer model.Fil
 		if d.InternalUpload {
 			url = partInfo.InternalUploadUrl
 		}
-		req, err := http.NewRequestWithContext(ctx, http.MethodPut, url, io.LimitReader(rateLimited, DEFAULT))
+		req, err := http.NewRequest("PUT", url, io.LimitReader(rateLimited, DEFAULT))
 		if err != nil {
 			return err
 		}
+		req = req.WithContext(ctx)
 		res, err := base.HttpClient.Do(req)
 		if err != nil {
 			return err
@@ -327,20 +328,6 @@ func (d *AliDrive) Put(ctx context.Context, dstDir model.Obj, streamer model.Fil
 	return fmt.Errorf("%+v", resp2)
 }
 
-func (d *AliDrive) GetDetails(ctx context.Context) (*model.StorageDetails, error) {
-	res, err, _ := d.request("https://api.aliyundrive.com/adrive/v1/user/driveCapacityDetails", http.MethodPost, func(req *resty.Request) {
-		req.SetContext(ctx)
-	}, nil)
-	if err != nil {
-		return nil, err
-	}
-	used := utils.Json.Get(res, "drive_used_size").ToUint64()
-	total := utils.Json.Get(res, "drive_total_size").ToUint64()
-	return &model.StorageDetails{
-		DiskUsage: driver.DiskUsageFromUsedAndTotal(used, total),
-	}, nil
-}
-
 func (d *AliDrive) Other(ctx context.Context, args model.OtherArgs) (interface{}, error) {
 	var resp base.Json
 	var url string

drivers/aliyundrive/util.go

@@ -11,8 +11,8 @@ import (
 	"github.com/OpenListTeam/OpenList/v4/internal/op"
 	"github.com/OpenListTeam/OpenList/v4/pkg/utils"
 	"github.com/dustinxie/ecc"
-	"github.com/go-resty/resty/v2"
 	"github.com/google/uuid"
+	"resty.dev/v3"
 )
 
 func (d *AliDrive) createSession() error {
@@ -62,7 +62,7 @@ func (d *AliDrive) refreshToken() error {
 	var resp base.TokenResp
 	var e RespErr
 	_, err := base.RestyClient.R().
-		//ForceContentType("application/json").
+		//SetForceResponseContentType("application/json").
 		SetBody(base.Json{"refresh_token": d.RefreshToken, "grant_type": "refresh_token"}).
 		SetResult(&resp).
 		SetError(&e).
@@ -134,7 +134,7 @@ func (d *AliDrive) request(url, method string, callback base.ReqCallback, resp i
 	} else if res.IsError() {
 		return nil, errors.New("bad status code " + res.Status()), e
 	}
-	return res.Body(), nil, e
+	return res.Bytes(), nil, e
 }
 
 func (d *AliDrive) getFiles(fileId string) ([]File, error) {

drivers/aliyundrive_open/driver.go

@@ -3,6 +3,7 @@ package aliyundrive_open
 import (
 	"context"
 	"errors"
+	"fmt"
 	"net/http"
 	"path/filepath"
 	"time"
@@ -12,8 +13,9 @@ import (
 	"github.com/OpenListTeam/OpenList/v4/internal/errs"
 	"github.com/OpenListTeam/OpenList/v4/internal/model"
 	"github.com/OpenListTeam/OpenList/v4/pkg/utils"
-	"github.com/go-resty/resty/v2"
+	"github.com/OpenListTeam/rateg"
 	log "github.com/sirupsen/logrus"
+	"resty.dev/v3"
 )
 
 type AliyundriveOpen struct {
@@ -22,8 +24,9 @@ type AliyundriveOpen struct {
 
 	DriveId string
 
-	limiter *limiter
-	ref     *AliyundriveOpen
+	limitList func(ctx context.Context, data base.Json) (*Files, error)
+	limitLink func(ctx context.Context, file model.Obj) (*model.Link, error)
+	ref       *AliyundriveOpen
 }
 
 func (d *AliyundriveOpen) Config() driver.Config {
@@ -35,23 +38,25 @@ func (d *AliyundriveOpen) GetAddition() driver.Additional {
 }
 
 func (d *AliyundriveOpen) Init(ctx context.Context) error {
-	d.limiter = getLimiterForUser(globalLimiterUserID) // First create a globally shared limiter to limit the initial requests.
 	if d.LIVPDownloadFormat == "" {
 		d.LIVPDownloadFormat = "jpeg"
 	}
 	if d.DriveType == "" {
 		d.DriveType = "default"
 	}
-	res, err := d.request(ctx, limiterOther, "/adrive/v1.0/user/getDriveInfo", http.MethodPost, nil)
+	res, err := d.request("/adrive/v1.0/user/getDriveInfo", http.MethodPost, nil)
 	if err != nil {
-		d.limiter.free()
-		d.limiter = nil
 		return err
 	}
 	d.DriveId = utils.Json.Get(res, d.DriveType+"_drive_id").ToString()
-	userid := utils.Json.Get(res, "user_id").ToString()
-	d.limiter.free()
-	d.limiter = getLimiterForUser(userid) // Allocate a corresponding limiter for each user.
+	d.limitList = rateg.LimitFnCtx(d.list, rateg.LimitFnOption{
+		Limit:  4,
+		Bucket: 1,
+	})
+	d.limitLink = rateg.LimitFnCtx(d.link, rateg.LimitFnOption{
+		Limit:  1,
+		Bucket: 1,
+	})
 	return nil
 }
 
@@ -65,8 +70,6 @@ func (d *AliyundriveOpen) InitReference(storage driver.Driver) error {
 }
 
 func (d *AliyundriveOpen) Drop(ctx context.Context) error {
-	d.limiter.free()
-	d.limiter = nil
 	d.ref = nil
 	return nil
 }
@@ -84,6 +87,9 @@ func (d *AliyundriveOpen) GetRoot(ctx context.Context) (model.Obj, error) {
 }
 
 func (d *AliyundriveOpen) List(ctx context.Context, dir model.Obj, args model.ListArgs) ([]model.Obj, error) {
+	if d.limitList == nil {
+		return nil, fmt.Errorf("driver not init")
+	}
 	files, err := d.getFiles(ctx, dir.GetID())
 	if err != nil {
 		return nil, err
@@ -101,8 +107,8 @@ func (d *AliyundriveOpen) List(ctx context.Context, dir model.Obj, args model.Li
 	return objs, err
 }
 
-func (d *AliyundriveOpen) Link(ctx context.Context, file model.Obj, args model.LinkArgs) (*model.Link, error) {
-	res, err := d.request(ctx, limiterLink, "/adrive/v1.0/openFile/getDownloadUrl", http.MethodPost, func(req *resty.Request) {
+func (d *AliyundriveOpen) link(ctx context.Context, file model.Obj) (*model.Link, error) {
+	res, err := d.request("/adrive/v1.0/openFile/getDownloadUrl", http.MethodPost, func(req *resty.Request) {
 		req.SetBody(base.Json{
 			"drive_id":   d.DriveId,
 			"file_id":    file.GetID(),
@@ -126,10 +132,17 @@ func (d *AliyundriveOpen) Link(ctx context.Context, file model.Obj, args model.L
 	}, nil
 }
 
+func (d *AliyundriveOpen) Link(ctx context.Context, file model.Obj, args model.LinkArgs) (*model.Link, error) {
+	if d.limitLink == nil {
+		return nil, fmt.Errorf("driver not init")
+	}
+	return d.limitLink(ctx, file)
+}
+
 func (d *AliyundriveOpen) MakeDir(ctx context.Context, parentDir model.Obj, dirName string) (model.Obj, error) {
 	nowTime, _ := getNowTime()
 	newDir := File{CreatedAt: nowTime, UpdatedAt: nowTime}
-	_, err := d.request(ctx, limiterOther, "/adrive/v1.0/openFile/create", http.MethodPost, func(req *resty.Request) {
+	_, err := d.request("/adrive/v1.0/openFile/create", http.MethodPost, func(req *resty.Request) {
 		req.SetBody(base.Json{
 			"drive_id":        d.DriveId,
 			"parent_file_id":  parentDir.GetID(),
@@ -155,7 +168,7 @@ func (d *AliyundriveOpen) MakeDir(ctx context.Context, parentDir model.Obj, dirN
 
 func (d *AliyundriveOpen) Move(ctx context.Context, srcObj, dstDir model.Obj) (model.Obj, error) {
 	var resp MoveOrCopyResp
-	_, err := d.request(ctx, limiterOther, "/adrive/v1.0/openFile/move", http.MethodPost, func(req *resty.Request) {
+	_, err := d.request("/adrive/v1.0/openFile/move", http.MethodPost, func(req *resty.Request) {
 		req.SetBody(base.Json{
 			"drive_id":          d.DriveId,
 			"file_id":           srcObj.GetID(),
@@ -185,7 +198,7 @@ func (d *AliyundriveOpen) Move(ctx context.Context, srcObj, dstDir model.Obj) (m
 
 func (d *AliyundriveOpen) Rename(ctx context.Context, srcObj model.Obj, newName string) (model.Obj, error) {
 	var newFile File
-	_, err := d.request(ctx, limiterOther, "/adrive/v1.0/openFile/update", http.MethodPost, func(req *resty.Request) {
+	_, err := d.request("/adrive/v1.0/openFile/update", http.MethodPost, func(req *resty.Request) {
 		req.SetBody(base.Json{
 			"drive_id": d.DriveId,
 			"file_id":  srcObj.GetID(),
@@ -217,7 +230,7 @@ func (d *AliyundriveOpen) Rename(ctx context.Context, srcObj model.Obj, newName
 
 func (d *AliyundriveOpen) Copy(ctx context.Context, srcObj, dstDir model.Obj) error {
 	var resp MoveOrCopyResp
-	_, err := d.request(ctx, limiterOther, "/adrive/v1.0/openFile/copy", http.MethodPost, func(req *resty.Request) {
+	_, err := d.request("/adrive/v1.0/openFile/copy", http.MethodPost, func(req *resty.Request) {
 		req.SetBody(base.Json{
 			"drive_id":          d.DriveId,
 			"file_id":           srcObj.GetID(),
@@ -243,7 +256,7 @@ func (d *AliyundriveOpen) Remove(ctx context.Context, obj model.Obj) error {
 	if d.RemoveWay == "delete" {
 		uri = "/adrive/v1.0/openFile/delete"
 	}
-	_, err := d.request(ctx, limiterOther, uri, http.MethodPost, func(req *resty.Request) {
+	_, err := d.request(uri, http.MethodPost, func(req *resty.Request) {
 		req.SetBody(base.Json{
 			"drive_id": d.DriveId,
 			"file_id":  obj.GetID(),
@@ -282,7 +295,7 @@ func (d *AliyundriveOpen) Other(ctx context.Context, args model.OtherArgs) (inte
 	default:
 		return nil, errs.NotSupport
 	}
-	_, err := d.request(ctx, limiterOther, uri, http.MethodPost, func(req *resty.Request) {
+	_, err := d.request(uri, http.MethodPost, func(req *resty.Request) {
 		req.SetBody(data).SetResult(&resp)
 	})
 	if err != nil {
@@ -291,21 +304,6 @@ func (d *AliyundriveOpen) Other(ctx context.Context, args model.OtherArgs) (inte
 	return resp, nil
 }
 
-func (d *AliyundriveOpen) GetDetails(ctx context.Context) (*model.StorageDetails, error) {
-	res, err := d.request(ctx, limiterOther, "/adrive/v1.0/user/getSpaceInfo", http.MethodPost, nil)
-	if err != nil {
-		return nil, err
-	}
-	total := utils.Json.Get(res, "personal_space_info", "total_size").ToUint64()
-	used := utils.Json.Get(res, "personal_space_info", "used_size").ToUint64()
-	return &model.StorageDetails{
-		DiskUsage: model.DiskUsage{
-			TotalSpace: total,
-			FreeSpace:  total - used,
-		},
-	}, nil
-}
-
 var _ driver.Driver = (*AliyundriveOpen)(nil)
 var _ driver.MkdirResult = (*AliyundriveOpen)(nil)
 var _ driver.MoveResult = (*AliyundriveOpen)(nil)

drivers/aliyundrive_open/limiter.go

@@ -1,96 +0,0 @@
-package aliyundrive_open
-
-import (
-	"context"
-	"fmt"
-	"sync"
-
-	"golang.org/x/time/rate"
-)
-
-// See document https://www.yuque.com/aliyundrive/zpfszx/mqocg38hlxzc5vcd
-// See issue https://github.com/OpenListTeam/OpenList/issues/724
-// We got limit per user per app, so the limiter should be global.
-
-type limiterType int
-
-const (
-	limiterList limiterType = iota
-	limiterLink
-	limiterOther
-)
-
-const (
-	listRateLimit       = 3.9  // 4 per second in document, but we use 3.9 per second to be safe
-	linkRateLimit       = 0.9  // 1 per second in document, but we use 0.9 per second to be safe
-	otherRateLimit      = 14.9 // 15 per second in document, but we use 14.9 per second to be safe
-	globalLimiterUserID = ""   // Global limiter user ID, used to limit the initial requests.
-)
-
-type limiter struct {
-	usedBy int
-	list   *rate.Limiter
-	link   *rate.Limiter
-	other  *rate.Limiter
-}
-
-var limiters = make(map[string]*limiter)
-var limitersLock = &sync.Mutex{}
-
-func getLimiterForUser(userid string) *limiter {
-	limitersLock.Lock()
-	defer limitersLock.Unlock()
-	defer func() {
-		// Clean up limiters that are no longer used.
-		for id, lim := range limiters {
-			if lim.usedBy <= 0 && id != globalLimiterUserID { // Do not delete the global limiter.
-				delete(limiters, id)
-			}
-		}
-	}()
-	if lim, ok := limiters[userid]; ok {
-		lim.usedBy++
-		return lim
-	}
-	lim := &limiter{
-		usedBy: 1,
-		list:   rate.NewLimiter(rate.Limit(listRateLimit), 1),
-		link:   rate.NewLimiter(rate.Limit(linkRateLimit), 1),
-		other:  rate.NewLimiter(rate.Limit(otherRateLimit), 1),
-	}
-	limiters[userid] = lim
-	return lim
-}
-
-func (l *limiter) wait(ctx context.Context, typ limiterType) error {
-	if l == nil {
-		return fmt.Errorf("driver not init")
-	}
-	switch typ {
-	case limiterList:
-		return l.list.Wait(ctx)
-	case limiterLink:
-		return l.link.Wait(ctx)
-	case limiterOther:
-		return l.other.Wait(ctx)
-	default:
-		return fmt.Errorf("unknown limiter type")
-	}
-}
-func (l *limiter) free() {
-	if l == nil {
-		return
-	}
-	limitersLock.Lock()
-	defer limitersLock.Unlock()
-	l.usedBy--
-}
-func (d *AliyundriveOpen) wait(ctx context.Context, typ limiterType) error {
-	if d == nil {
-		return fmt.Errorf("driver not init")
-	}
-	if d.ref != nil {
-		return d.ref.wait(ctx, typ) // If this is a reference driver, wait on the reference driver.
-	}
-	return d.limiter.wait(ctx, typ)
-}

drivers/aliyundrive_open/meta.go

@@ -12,7 +12,6 @@ type Addition struct {
 	OrderBy            string `json:"order_by" type:"select" options:"name,size,updated_at,created_at"`
 	OrderDirection     string `json:"order_direction" type:"select" options:"ASC,DESC"`
 	UseOnlineAPI       bool   `json:"use_online_api" default:"true"`
-	AlipanType         string `json:"alipan_type" required:"true" type:"select" default:"default" options:"default,alipanTV"`
 	APIAddress         string `json:"api_url_address" default:"https://api.oplist.org/alicloud/renewapi"`
 	ClientID           string `json:"client_id" help:"Keep it empty if you don't have one"`
 	ClientSecret       string `json:"client_secret" help:"Keep it empty if you don't have one"`
@@ -25,6 +24,12 @@ type Addition struct {
 
 var config = driver.Config{
 	Name:              "AliyundriveOpen",
+	LocalSort:         false,
+	OnlyLocal:         false,
+	OnlyProxy:         false,
+	NoCache:           false,
+	NoUpload:          false,
+	NeedMs:            false,
 	DefaultRoot:       "root",
 	NoOverwriteUpload: true,
 }

drivers/aliyundrive_open/upload.go

@@ -18,8 +18,8 @@ import (
 	"github.com/OpenListTeam/OpenList/v4/pkg/http_range"
 	"github.com/OpenListTeam/OpenList/v4/pkg/utils"
 	"github.com/avast/retry-go"
-	"github.com/go-resty/resty/v2"
 	log "github.com/sirupsen/logrus"
+	"resty.dev/v3"
 )
 
 func makePartInfos(size int) []base.Json {
@@ -50,10 +50,10 @@ func calPartSize(fileSize int64) int64 {
 	return partSize
 }
 
-func (d *AliyundriveOpen) getUploadUrl(ctx context.Context, count int, fileId, uploadId string) ([]PartInfo, error) {
+func (d *AliyundriveOpen) getUploadUrl(count int, fileId, uploadId string) ([]PartInfo, error) {
 	partInfoList := makePartInfos(count)
 	var resp CreateResp
-	_, err := d.request(ctx, limiterOther, "/adrive/v1.0/openFile/getUploadUrl", http.MethodPost, func(req *resty.Request) {
+	_, err := d.request("/adrive/v1.0/openFile/getUploadUrl", http.MethodPost, func(req *resty.Request) {
 		req.SetBody(base.Json{
 			"drive_id":       d.DriveId,
 			"file_id":        fileId,
@@ -69,7 +69,7 @@ func (d *AliyundriveOpen) uploadPart(ctx context.Context, r io.Reader, partInfo
 	if d.InternalUpload {
 		uploadUrl = strings.ReplaceAll(uploadUrl, "https://cn-beijing-data.aliyundrive.net/", "http://ccp-bj29-bj-1592982087.oss-cn-beijing-internal.aliyuncs.com/")
 	}
-	req, err := http.NewRequestWithContext(ctx, http.MethodPut, uploadUrl, r)
+	req, err := http.NewRequestWithContext(ctx, "PUT", uploadUrl, r)
 	if err != nil {
 		return err
 	}
@@ -84,10 +84,10 @@ func (d *AliyundriveOpen) uploadPart(ctx context.Context, r io.Reader, partInfo
 	return nil
 }
 
-func (d *AliyundriveOpen) completeUpload(ctx context.Context, fileId, uploadId string) (model.Obj, error) {
+func (d *AliyundriveOpen) completeUpload(fileId, uploadId string) (model.Obj, error) {
 	// 3. complete
 	var newFile File
-	_, err := d.request(ctx, limiterOther, "/adrive/v1.0/openFile/complete", http.MethodPost, func(req *resty.Request) {
+	_, err := d.request("/adrive/v1.0/openFile/complete", http.MethodPost, func(req *resty.Request) {
 		req.SetBody(base.Json{
 			"drive_id":  d.DriveId,
 			"file_id":   fileId,
@@ -137,8 +137,11 @@ func (d *AliyundriveOpen) calProofCode(stream model.FileStreamer) (string, error
 	}
 	buf := make([]byte, length)
 	n, err := io.ReadFull(reader, buf)
-	if n != int(length) {
-		return "", fmt.Errorf("failed to read all data: (expect =%d, actual =%d) %w", length, n, err)
+	if err == io.ErrUnexpectedEOF {
+		return "", fmt.Errorf("can't read data, expected=%d, got=%d", len(buf), n)
+	}
+	if err != nil {
+		return "", err
 	}
 	return base64.StdEncoding.EncodeToString(buf), nil
 }
@@ -180,7 +183,7 @@ func (d *AliyundriveOpen) upload(ctx context.Context, dstDir model.Obj, stream m
 		createData["pre_hash"] = hash
 	}
 	var createResp CreateResp
-	_, err, e := d.requestReturnErrResp(ctx, limiterOther, "/adrive/v1.0/openFile/create", http.MethodPost, func(req *resty.Request) {
+	_, err, e := d.requestReturnErrResp("/adrive/v1.0/openFile/create", http.MethodPost, func(req *resty.Request) {
 		req.SetBody(createData).SetResult(&createResp)
 	})
 	if err != nil {
@@ -191,7 +194,7 @@ func (d *AliyundriveOpen) upload(ctx context.Context, dstDir model.Obj, stream m
 
 		hash := stream.GetHash().GetHash(utils.SHA1)
 		if len(hash) != utils.SHA1.Width {
-			_, hash, err = streamPkg.CacheFullAndHash(stream, &up, utils.SHA1)
+			_, hash, err = streamPkg.CacheFullInTempFileAndHash(stream, utils.SHA1)
 			if err != nil {
 				return nil, err
 			}
@@ -205,7 +208,7 @@ func (d *AliyundriveOpen) upload(ctx context.Context, dstDir model.Obj, stream m
 		if err != nil {
 			return nil, fmt.Errorf("cal proof code error: %s", err.Error())
 		}
-		_, err = d.request(ctx, limiterOther, "/adrive/v1.0/openFile/create", http.MethodPost, func(req *resty.Request) {
+		_, err = d.request("/adrive/v1.0/openFile/create", http.MethodPost, func(req *resty.Request) {
 			req.SetBody(createData).SetResult(&createResp)
 		})
 		if err != nil {
@@ -216,20 +219,17 @@ func (d *AliyundriveOpen) upload(ctx context.Context, dstDir model.Obj, stream m
 	if !createResp.RapidUpload {
 		// 2. normal upload
 		log.Debugf("[aliyundive_open] normal upload")
-		ss, err := streamPkg.NewStreamSectionReader(stream, int(partSize), &up)
-		if err != nil {
-			return nil, err
-		}
 
 		preTime := time.Now()
 		var offset, length int64 = 0, partSize
+		//var length
 		for i := 0; i < len(createResp.PartInfoList); i++ {
 			if utils.IsCanceled(ctx) {
 				return nil, ctx.Err()
 			}
 			// refresh upload url if 50 minutes passed
 			if time.Since(preTime) > 50*time.Minute {
-				createResp.PartInfoList, err = d.getUploadUrl(ctx, count, createResp.FileId, createResp.UploadId)
+				createResp.PartInfoList, err = d.getUploadUrl(count, createResp.FileId, createResp.UploadId)
 				if err != nil {
 					return nil, err
 				}
@@ -238,19 +238,22 @@ func (d *AliyundriveOpen) upload(ctx context.Context, dstDir model.Obj, stream m
 			if remain := stream.GetSize() - offset; length > remain {
 				length = remain
 			}
-			rd, err := ss.GetSectionReader(offset, length)
-			if err != nil {
-				return nil, err
+			rd := utils.NewMultiReadable(io.LimitReader(stream, partSize))
+			if rapidUpload {
+				srd, err := stream.RangeRead(http_range.Range{Start: offset, Length: length})
+				if err != nil {
+					return nil, err
+				}
+				rd = utils.NewMultiReadable(srd)
 			}
-			rateLimitedRd := driver.NewLimitedUploadStream(ctx, rd)
 			err = retry.Do(func() error {
-				rd.Seek(0, io.SeekStart)
+				_ = rd.Reset()
+				rateLimitedRd := driver.NewLimitedUploadStream(ctx, rd)
 				return d.uploadPart(ctx, rateLimitedRd, createResp.PartInfoList[i])
 			},
 				retry.Attempts(3),
 				retry.DelayType(retry.BackOffDelay),
 				retry.Delay(time.Second))
-			ss.FreeSectionReader(rd)
 			if err != nil {
 				return nil, err
 			}
@@ -263,5 +266,5 @@ func (d *AliyundriveOpen) upload(ctx context.Context, dstDir model.Obj, stream m
 
 	log.Debugf("[aliyundrive_open] create file success, resp: %+v", createResp)
 	// 3. complete
-	return d.completeUpload(ctx, createResp.FileId, createResp.UploadId)
+	return d.completeUpload(createResp.FileId, createResp.UploadId)
 }

drivers/aliyundrive_open/util.go

@@ -13,13 +13,13 @@ import (
 	"github.com/OpenListTeam/OpenList/v4/internal/model"
 	"github.com/OpenListTeam/OpenList/v4/internal/op"
 	"github.com/OpenListTeam/OpenList/v4/pkg/utils"
-	"github.com/go-resty/resty/v2"
 	log "github.com/sirupsen/logrus"
+	"resty.dev/v3"
 )
 
 // do others that not defined in Driver interface
 
-func (d *AliyundriveOpen) _refreshToken(ctx context.Context) (string, string, error) {
+func (d *AliyundriveOpen) _refreshToken() (string, string, error) {
 	if d.UseOnlineAPI && d.APIAddress != "" {
 		u := d.APIAddress
 		var resp struct {
@@ -27,23 +27,13 @@ func (d *AliyundriveOpen) _refreshToken(ctx context.Context) (string, string, er
 			AccessToken  string `json:"access_token"`
 			ErrorMessage string `json:"text"`
 		}
-
-		// 根据AlipanType选项设置driver_txt
-		driverTxt := "alicloud_qr"
-		if d.AlipanType == "alipanTV" {
-			driverTxt = "alicloud_tv"
-		}
-		err := d.wait(ctx, limiterOther)
-		if err != nil {
-			return "", "", err
-		}
-		_, err = base.RestyClient.R().
+		_, err := base.RestyClient.R().
 			SetHeader("User-Agent", "Mozilla/5.0 (Macintosh; Apple macOS 15_5) AppleWebKit/537.36 (KHTML, like Gecko) Safari/537.36 Chrome/138.0.0.0 Openlist/425.6.30").
 			SetResult(&resp).
 			SetQueryParams(map[string]string{
 				"refresh_ui": d.RefreshToken,
 				"server_use": "true",
-				"driver_txt": driverTxt,
+				"driver_txt": "alicloud_qr",
 			}).
 			Get(u)
 		if err != nil {
@@ -57,19 +47,16 @@ func (d *AliyundriveOpen) _refreshToken(ctx context.Context) (string, string, er
 		}
 		return resp.RefreshToken, resp.AccessToken, nil
 	}
+
 	// 本地刷新逻辑，必须要求 client_id 和 client_secret
 	if d.ClientID == "" || d.ClientSecret == "" {
 		return "", "", fmt.Errorf("empty ClientID or ClientSecret")
 	}
-	err := d.wait(ctx, limiterOther)
-	if err != nil {
-		return "", "", err
-	}
 	url := API_URL + "/oauth/access_token"
 	//var resp base.TokenResp
 	var e ErrResp
 	res, err := base.RestyClient.R().
-		//ForceContentType("application/json").
+		//SetForceResponseContentType("application/json").
 		SetBody(base.Json{
 			"client_id":     d.ClientID,
 			"client_secret": d.ClientSecret,
@@ -86,7 +73,7 @@ func (d *AliyundriveOpen) _refreshToken(ctx context.Context) (string, string, er
 	if e.Code != "" {
 		return "", "", fmt.Errorf("failed to refresh token: %s", e.Message)
 	}
-	refresh, access := utils.Json.Get(res.Body(), "refresh_token").ToString(), utils.Json.Get(res.Body(), "access_token").ToString()
+	refresh, access := utils.Json.Get(res.Bytes(), "refresh_token").ToString(), utils.Json.Get(res.Bytes(), "access_token").ToString()
 	if refresh == "" {
 		return "", "", fmt.Errorf("failed to refresh token: refresh token is empty, resp: %s", res.String())
 	}
@@ -116,18 +103,18 @@ func getSub(token string) (string, error) {
 	return utils.Json.Get(bs, "sub").ToString(), nil
 }
 
-func (d *AliyundriveOpen) refreshToken(ctx context.Context) error {
+func (d *AliyundriveOpen) refreshToken() error {
 	if d.ref != nil {
-		return d.ref.refreshToken(ctx)
+		return d.ref.refreshToken()
 	}
-	refresh, access, err := d._refreshToken(ctx)
+	refresh, access, err := d._refreshToken()
 	for i := 0; i < 3; i++ {
 		if err == nil {
 			break
 		} else {
 			log.Errorf("[ali_open] failed to refresh token: %s", err)
 		}
-		refresh, access, err = d._refreshToken(ctx)
+		refresh, access, err = d._refreshToken()
 	}
 	if err != nil {
 		return err
@@ -138,12 +125,12 @@ func (d *AliyundriveOpen) refreshToken(ctx context.Context) error {
 	return nil
 }
 
-func (d *AliyundriveOpen) request(ctx context.Context, limitTy limiterType, uri, method string, callback base.ReqCallback, retry ...bool) ([]byte, error) {
-	b, err, _ := d.requestReturnErrResp(ctx, limitTy, uri, method, callback, retry...)
+func (d *AliyundriveOpen) request(uri, method string, callback base.ReqCallback, retry ...bool) ([]byte, error) {
+	b, err, _ := d.requestReturnErrResp(uri, method, callback, retry...)
 	return b, err
 }
 
-func (d *AliyundriveOpen) requestReturnErrResp(ctx context.Context, limitTy limiterType, uri, method string, callback base.ReqCallback, retry ...bool) ([]byte, error, *ErrResp) {
+func (d *AliyundriveOpen) requestReturnErrResp(uri, method string, callback base.ReqCallback, retry ...bool) ([]byte, error, *ErrResp) {
 	req := base.RestyClient.R()
 	// TODO check whether access_token is expired
 	req.SetHeader("Authorization", "Bearer "+d.getAccessToken())
@@ -155,10 +142,6 @@ func (d *AliyundriveOpen) requestReturnErrResp(ctx context.Context, limitTy limi
 	}
 	var e ErrResp
 	req.SetError(&e)
-	err := d.wait(ctx, limitTy)
-	if err != nil {
-		return nil, err, nil
-	}
 	res, err := req.Execute(method, API_URL+uri)
 	if err != nil {
 		if res != nil {
@@ -169,20 +152,20 @@ func (d *AliyundriveOpen) requestReturnErrResp(ctx context.Context, limitTy limi
 	isRetry := len(retry) > 0 && retry[0]
 	if e.Code != "" {
 		if !isRetry && (utils.SliceContains([]string{"AccessTokenInvalid", "AccessTokenExpired", "I400JD"}, e.Code) || d.getAccessToken() == "") {
-			err = d.refreshToken(ctx)
+			err = d.refreshToken()
 			if err != nil {
 				return nil, err, nil
 			}
-			return d.requestReturnErrResp(ctx, limitTy, uri, method, callback, true)
+			return d.requestReturnErrResp(uri, method, callback, true)
 		}
 		return nil, fmt.Errorf("%s:%s", e.Code, e.Message), &e
 	}
-	return res.Body(), nil, nil
+	return res.Bytes(), nil, nil
 }
 
 func (d *AliyundriveOpen) list(ctx context.Context, data base.Json) (*Files, error) {
 	var resp Files
-	_, err := d.request(ctx, limiterList, "/adrive/v1.0/openFile/list", http.MethodPost, func(req *resty.Request) {
+	_, err := d.request("/adrive/v1.0/openFile/list", http.MethodPost, func(req *resty.Request) {
 		req.SetBody(data).SetResult(&resp)
 	})
 	if err != nil {
@@ -211,7 +194,7 @@ func (d *AliyundriveOpen) getFiles(ctx context.Context, fileId string) ([]File,
 			//"video_thumbnail_width": 480,
 			//"image_thumbnail_width": 480,
 		}
-		resp, err := d.list(ctx, data)
+		resp, err := d.limitList(ctx, data)
 		if err != nil {
 			return nil, err
 		}

drivers/aliyundrive_share/driver.go

@@ -2,6 +2,7 @@ package aliyundrive_share
 
 import (
 	"context"
+	"fmt"
 	"net/http"
 	"time"
 
@@ -11,8 +12,9 @@ import (
 	"github.com/OpenListTeam/OpenList/v4/internal/model"
 	"github.com/OpenListTeam/OpenList/v4/pkg/cron"
 	"github.com/OpenListTeam/OpenList/v4/pkg/utils"
-	"github.com/go-resty/resty/v2"
+	"github.com/OpenListTeam/rateg"
 	log "github.com/sirupsen/logrus"
+	"resty.dev/v3"
 )
 
 type AliyundriveShare struct {
@@ -23,7 +25,8 @@ type AliyundriveShare struct {
 	DriveId     string
 	cron        *cron.Cron
 
-	limiter *limiter
+	limitList func(ctx context.Context, dir model.Obj) ([]model.Obj, error)
+	limitLink func(ctx context.Context, file model.Obj) (*model.Link, error)
 }
 
 func (d *AliyundriveShare) Config() driver.Config {
@@ -35,26 +38,29 @@ func (d *AliyundriveShare) GetAddition() driver.Additional {
 }
 
 func (d *AliyundriveShare) Init(ctx context.Context) error {
-	d.limiter = getLimiter()
-	err := d.refreshToken(ctx)
+	err := d.refreshToken()
 	if err != nil {
-		d.limiter.free()
-		d.limiter = nil
 		return err
 	}
-	err = d.getShareToken(ctx)
+	err = d.getShareToken()
 	if err != nil {
-		d.limiter.free()
-		d.limiter = nil
 		return err
 	}
 	d.cron = cron.NewCron(time.Hour * 2)
 	d.cron.Do(func() {
-		err := d.refreshToken(ctx)
+		err := d.refreshToken()
 		if err != nil {
 			log.Errorf("%+v", err)
 		}
 	})
+	d.limitList = rateg.LimitFnCtx(d.list, rateg.LimitFnOption{
+		Limit:  4,
+		Bucket: 1,
+	})
+	d.limitLink = rateg.LimitFnCtx(d.link, rateg.LimitFnOption{
+		Limit:  1,
+		Bucket: 1,
+	})
 	return nil
 }
 
@@ -62,14 +68,19 @@ func (d *AliyundriveShare) Drop(ctx context.Context) error {
 	if d.cron != nil {
 		d.cron.Stop()
 	}
-	d.limiter.free()
-	d.limiter = nil
 	d.DriveId = ""
 	return nil
 }
 
 func (d *AliyundriveShare) List(ctx context.Context, dir model.Obj, args model.ListArgs) ([]model.Obj, error) {
-	files, err := d.getFiles(ctx, dir.GetID())
+	if d.limitList == nil {
+		return nil, fmt.Errorf("driver not init")
+	}
+	return d.limitList(ctx, dir)
+}
+
+func (d *AliyundriveShare) list(ctx context.Context, dir model.Obj) ([]model.Obj, error) {
+	files, err := d.getFiles(dir.GetID())
 	if err != nil {
 		return nil, err
 	}
@@ -79,6 +90,13 @@ func (d *AliyundriveShare) List(ctx context.Context, dir model.Obj, args model.L
 }
 
 func (d *AliyundriveShare) Link(ctx context.Context, file model.Obj, args model.LinkArgs) (*model.Link, error) {
+	if d.limitLink == nil {
+		return nil, fmt.Errorf("driver not init")
+	}
+	return d.limitLink(ctx, file)
+}
+
+func (d *AliyundriveShare) link(ctx context.Context, file model.Obj) (*model.Link, error) {
 	data := base.Json{
 		"drive_id": d.DriveId,
 		"file_id":  file.GetID(),
@@ -87,7 +105,7 @@ func (d *AliyundriveShare) Link(ctx context.Context, file model.Obj, args model.
 		"share_id":   d.ShareId,
 	}
 	var resp ShareLinkResp
-	_, err := d.request(ctx, limiterLink, "https://api.alipan.com/v2/file/get_share_link_download_url", http.MethodPost, func(req *resty.Request) {
+	_, err := d.request("https://api.alipan.com/v2/file/get_share_link_download_url", http.MethodPost, func(req *resty.Request) {
 		req.SetHeader(CanaryHeaderKey, CanaryHeaderValue).SetBody(data).SetResult(&resp)
 	})
 	if err != nil {
@@ -117,7 +135,7 @@ func (d *AliyundriveShare) Other(ctx context.Context, args model.OtherArgs) (int
 	default:
 		return nil, errs.NotSupport
 	}
-	_, err := d.request(ctx, limiterOther, url, http.MethodPost, func(req *resty.Request) {
+	_, err := d.request(url, http.MethodPost, func(req *resty.Request) {
 		req.SetBody(data).SetResult(&resp)
 	})
 	if err != nil {

drivers/aliyundrive_share/limiter.go

@@ -1,67 +0,0 @@
-package aliyundrive_share
-
-import (
-	"context"
-	"fmt"
-
-	"golang.org/x/time/rate"
-)
-
-// See issue https://github.com/OpenListTeam/OpenList/issues/724
-// Seems there is no limit per user.
-
-type limiterType int
-
-const (
-	limiterList limiterType = iota
-	limiterLink
-	limiterOther
-)
-
-const (
-	listRateLimit  = 3.9  // 4 per second in document, but we use 3.9 per second to be safe
-	linkRateLimit  = 0.9  // 1 per second in document, but we use 0.9 per second to be safe
-	otherRateLimit = 14.9 // 15 per second in document, but we use 14.9 per second to be safe
-)
-
-type limiter struct {
-	list  *rate.Limiter
-	link  *rate.Limiter
-	other *rate.Limiter
-}
-
-func getLimiter() *limiter {
-	return &limiter{
-		list:  rate.NewLimiter(rate.Limit(listRateLimit), 1),
-		link:  rate.NewLimiter(rate.Limit(linkRateLimit), 1),
-		other: rate.NewLimiter(rate.Limit(otherRateLimit), 1),
-	}
-}
-
-func (l *limiter) wait(ctx context.Context, typ limiterType) error {
-	if l == nil {
-		return fmt.Errorf("driver not init")
-	}
-	switch typ {
-	case limiterList:
-		return l.list.Wait(ctx)
-	case limiterLink:
-		return l.link.Wait(ctx)
-	case limiterOther:
-		return l.other.Wait(ctx)
-	default:
-		return fmt.Errorf("unknown limiter type")
-	}
-}
-func (l *limiter) free() {
-
-}
-func (d *AliyundriveShare) wait(ctx context.Context, typ limiterType) error {
-	if d == nil {
-		return fmt.Errorf("driver not init")
-	}
-	//if d.ref != nil {
-	//	return d.ref.wait(ctx, typ) // If this is a reference driver, wait on the reference driver.
-	//}
-	return d.limiter.wait(ctx, typ)
-}

drivers/aliyundrive_share/util.go

@@ -1,7 +1,6 @@
 package aliyundrive_share
 
 import (
-	"context"
 	"errors"
 	"fmt"
 
@@ -16,15 +15,11 @@ const (
 	CanaryHeaderValue = "client=web,app=share,version=v2.3.1"
 )
 
-func (d *AliyundriveShare) refreshToken(ctx context.Context) error {
-	err := d.wait(ctx, limiterOther)
-	if err != nil {
-		return err
-	}
+func (d *AliyundriveShare) refreshToken() error {
 	url := "https://auth.alipan.com/v2/account/token"
 	var resp base.TokenResp
 	var e ErrorResp
-	_, err = base.RestyClient.R().
+	_, err := base.RestyClient.R().
 		SetBody(base.Json{"refresh_token": d.RefreshToken, "grant_type": "refresh_token"}).
 		SetResult(&resp).
 		SetError(&e).
@@ -41,11 +36,7 @@ func (d *AliyundriveShare) refreshToken(ctx context.Context) error {
 }
 
 // do others that not defined in Driver interface
-func (d *AliyundriveShare) getShareToken(ctx context.Context) error {
-	err := d.wait(ctx, limiterOther)
-	if err != nil {
-		return err
-	}
+func (d *AliyundriveShare) getShareToken() error {
 	data := base.Json{
 		"share_id": d.ShareId,
 	}
@@ -54,7 +45,7 @@ func (d *AliyundriveShare) getShareToken(ctx context.Context) error {
 	}
 	var e ErrorResp
 	var resp ShareTokenResp
-	_, err = base.RestyClient.R().
+	_, err := base.RestyClient.R().
 		SetResult(&resp).SetError(&e).SetBody(data).
 		Post("https://api.alipan.com/v2/share_link/get_share_token")
 	if err != nil {
@@ -67,7 +58,7 @@ func (d *AliyundriveShare) getShareToken(ctx context.Context) error {
 	return nil
 }
 
-func (d *AliyundriveShare) request(ctx context.Context, limitTy limiterType, url, method string, callback base.ReqCallback) ([]byte, error) {
+func (d *AliyundriveShare) request(url, method string, callback base.ReqCallback) ([]byte, error) {
 	var e ErrorResp
 	req := base.RestyClient.R().
 		SetError(&e).
@@ -80,10 +71,6 @@ func (d *AliyundriveShare) request(ctx context.Context, limitTy limiterType, url
 	} else {
 		req.SetBody("{}")
 	}
-	err := d.wait(ctx, limitTy)
-	if err != nil {
-		return nil, err
-	}
 	resp, err := req.Execute(method, url)
 	if err != nil {
 		return nil, err
@@ -91,22 +78,22 @@ func (d *AliyundriveShare) request(ctx context.Context, limitTy limiterType, url
 	if e.Code != "" {
 		if e.Code == "AccessTokenInvalid" || e.Code == "ShareLinkTokenInvalid" {
 			if e.Code == "AccessTokenInvalid" {
-				err = d.refreshToken(ctx)
+				err = d.refreshToken()
 			} else {
-				err = d.getShareToken(ctx)
+				err = d.getShareToken()
 			}
 			if err != nil {
 				return nil, err
 			}
-			return d.request(ctx, limitTy, url, method, callback)
+			return d.request(url, method, callback)
 		} else {
 			return nil, errors.New(e.Code + ": " + e.Message)
 		}
 	}
-	return resp.Body(), nil
+	return resp.Bytes(), nil
 }
 
-func (d *AliyundriveShare) getFiles(ctx context.Context, fileId string) ([]File, error) {
+func (d *AliyundriveShare) getFiles(fileId string) ([]File, error) {
 	files := make([]File, 0)
 	data := base.Json{
 		"image_thumbnail_process": "image/resize,w_160/format,jpeg",
@@ -123,10 +110,6 @@ func (d *AliyundriveShare) getFiles(ctx context.Context, fileId string) ([]File,
 		if data["marker"] == "first" {
 			data["marker"] = ""
 		}
-		err := d.wait(ctx, limiterList)
-		if err != nil {
-			return nil, err
-		}
 		var e ErrorResp
 		var resp ListResp
 		res, err := base.RestyClient.R().
@@ -140,11 +123,11 @@ func (d *AliyundriveShare) getFiles(ctx context.Context, fileId string) ([]File,
 		log.Debugf("aliyundrive share get files: %s", res.String())
 		if e.Code != "" {
 			if e.Code == "AccessTokenInvalid" || e.Code == "ShareLinkTokenInvalid" {
-				err = d.getShareToken(ctx)
+				err = d.getShareToken()
 				if err != nil {
 					return nil, err
 				}
-				return d.getFiles(ctx, fileId)
+				return d.getFiles(fileId)
 			}
 			return nil, errors.New(e.Message)
 		}

drivers/all.go

@@ -20,12 +20,9 @@ import (
 	_ "github.com/OpenListTeam/OpenList/v4/drivers/baidu_netdisk"
 	_ "github.com/OpenListTeam/OpenList/v4/drivers/baidu_photo"
 	_ "github.com/OpenListTeam/OpenList/v4/drivers/chaoxing"
-	_ "github.com/OpenListTeam/OpenList/v4/drivers/chunk"
 	_ "github.com/OpenListTeam/OpenList/v4/drivers/cloudreve"
 	_ "github.com/OpenListTeam/OpenList/v4/drivers/cloudreve_v4"
-	_ "github.com/OpenListTeam/OpenList/v4/drivers/cnb_releases"
 	_ "github.com/OpenListTeam/OpenList/v4/drivers/crypt"
-	_ "github.com/OpenListTeam/OpenList/v4/drivers/degoo"
 	_ "github.com/OpenListTeam/OpenList/v4/drivers/doubao"
 	_ "github.com/OpenListTeam/OpenList/v4/drivers/doubao_share"
 	_ "github.com/OpenListTeam/OpenList/v4/drivers/dropbox"
@@ -42,7 +39,6 @@ import (
 	_ "github.com/OpenListTeam/OpenList/v4/drivers/lanzou"
 	_ "github.com/OpenListTeam/OpenList/v4/drivers/lenovonas_share"
 	_ "github.com/OpenListTeam/OpenList/v4/drivers/local"
-	_ "github.com/OpenListTeam/OpenList/v4/drivers/mediafire"
 	_ "github.com/OpenListTeam/OpenList/v4/drivers/mediatrack"
 	_ "github.com/OpenListTeam/OpenList/v4/drivers/mega"
 	_ "github.com/OpenListTeam/OpenList/v4/drivers/misskey"
@@ -52,7 +48,6 @@ import (
 	_ "github.com/OpenListTeam/OpenList/v4/drivers/onedrive_app"
 	_ "github.com/OpenListTeam/OpenList/v4/drivers/onedrive_sharelink"
 	_ "github.com/OpenListTeam/OpenList/v4/drivers/openlist"
-	_ "github.com/OpenListTeam/OpenList/v4/drivers/openlist_share"
 	_ "github.com/OpenListTeam/OpenList/v4/drivers/pikpak"
 	_ "github.com/OpenListTeam/OpenList/v4/drivers/pikpak_share"
 	_ "github.com/OpenListTeam/OpenList/v4/drivers/quark_open"
@@ -64,7 +59,6 @@ import (
 	_ "github.com/OpenListTeam/OpenList/v4/drivers/smb"
 	_ "github.com/OpenListTeam/OpenList/v4/drivers/strm"
 	_ "github.com/OpenListTeam/OpenList/v4/drivers/teambition"
-	_ "github.com/OpenListTeam/OpenList/v4/drivers/teldrive"
 	_ "github.com/OpenListTeam/OpenList/v4/drivers/terabox"
 	_ "github.com/OpenListTeam/OpenList/v4/drivers/thunder"
 	_ "github.com/OpenListTeam/OpenList/v4/drivers/thunder_browser"

drivers/baidu_netdisk/driver.go

@@ -203,16 +203,15 @@ func (d *BaiduNetdisk) Put(ctx context.Context, dstDir model.Obj, stream model.F
 
 	streamSize := stream.GetSize()
 	sliceSize := d.getSliceSize(streamSize)
-	count := 1
-	if streamSize > sliceSize {
-		count = int((streamSize + sliceSize - 1) / sliceSize)
-	}
+	count := int(streamSize / sliceSize)
 	lastBlockSize := streamSize % sliceSize
-	if lastBlockSize == 0 {
+	if lastBlockSize > 0 {
+		count++
+	} else {
 		lastBlockSize = sliceSize
 	}
 
-	// cal md5 for first 256k data
+	//cal md5 for first 256k data
 	const SliceSize int64 = 256 * utils.KB
 	// cal md5
 	blockList := make([]string, 0, count)
@@ -284,7 +283,7 @@ func (d *BaiduNetdisk) Put(ctx context.Context, dstDir model.Obj, stream model.F
 		}
 		log.Debugf("%+v", precreateResp)
 		if precreateResp.ReturnType == 2 {
-			// rapid upload, since got md5 match from baidu server
+			//rapid upload, since got md5 match from baidu server
 			// 修复时间，具体原因见 Put 方法注释的 **注意**
 			precreateResp.File.Ctime = ctime
 			precreateResp.File.Mtime = mtime
@@ -356,20 +355,12 @@ func (d *BaiduNetdisk) uploadSlice(ctx context.Context, params map[string]string
 		return err
 	}
 	log.Debugln(res.RawResponse.Status + res.String())
-	errCode := utils.Json.Get(res.Body(), "error_code").ToInt()
-	errNo := utils.Json.Get(res.Body(), "errno").ToInt()
+	errCode := utils.Json.Get(res.Bytes(), "error_code").ToInt()
+	errNo := utils.Json.Get(res.Bytes(), "errno").ToInt()
 	if errCode != 0 || errNo != 0 {
 		return errs.NewErr(errs.StreamIncomplete, "error in uploading to baidu, will retry. response=%s", res.String())
 	}
 	return nil
 }
 
-func (d *BaiduNetdisk) GetDetails(ctx context.Context) (*model.StorageDetails, error) {
-	du, err := d.quota(ctx)
-	if err != nil {
-		return nil, err
-	}
-	return &model.StorageDetails{DiskUsage: du}, nil
-}
-
 var _ driver.Driver = (*BaiduNetdisk)(nil)

drivers/baidu_netdisk/types.go

@@ -189,12 +189,3 @@ type PrecreateResp struct {
 	// return_type=2
 	File File `json:"info"`
 }
-
-type QuotaResp struct {
-	Errno     int    `json:"errno"`
-	RequestId int64  `json:"request_id"`
-	Total     uint64 `json:"total"`
-	Used      uint64 `json:"used"`
-	//Free      uint64 `json:"free"`
-	//Expire    bool   `json:"expire"`
-}

drivers/baidu_netdisk/util.go

@@ -1,7 +1,6 @@
 package baidu_netdisk
 
 import (
-	"context"
 	"encoding/hex"
 	"errors"
 	"fmt"
@@ -12,14 +11,13 @@ import (
 	"unicode"
 
 	"github.com/OpenListTeam/OpenList/v4/drivers/base"
-	"github.com/OpenListTeam/OpenList/v4/internal/driver"
 	"github.com/OpenListTeam/OpenList/v4/internal/errs"
 	"github.com/OpenListTeam/OpenList/v4/internal/model"
 	"github.com/OpenListTeam/OpenList/v4/internal/op"
 	"github.com/OpenListTeam/OpenList/v4/pkg/utils"
 	"github.com/avast/retry-go"
-	"github.com/go-resty/resty/v2"
 	log "github.com/sirupsen/logrus"
+	"resty.dev/v3"
 )
 
 // do others that not defined in Driver interface
@@ -112,7 +110,7 @@ func (d *BaiduNetdisk) request(furl string, method string, callback base.ReqCall
 			return err
 		}
 		log.Debugf("[baidu_netdisk] req: %s, resp: %s", furl, res.String())
-		errno := utils.Json.Get(res.Body(), "errno").ToInt()
+		errno := utils.Json.Get(res.Bytes(), "errno").ToInt()
 		if errno != 0 {
 			if utils.SliceContains([]int{111, -6}, errno) {
 				log.Info("refreshing baidu_netdisk token.")
@@ -123,13 +121,13 @@ func (d *BaiduNetdisk) request(furl string, method string, callback base.ReqCall
 			}
 
 			if 31023 == errno && d.DownloadAPI == "crack_video" {
-				result = res.Body()
+				result = res.Bytes()
 				return nil
 			}
 
 			return fmt.Errorf("req: [%s] ,errno: %d, refer to https://pan.baidu.com/union/doc/", furl, errno)
 		}
-		result = res.Body()
+		result = res.Bytes()
 		return nil
 	},
 		retry.LastErrorOnly(true),
@@ -209,7 +207,7 @@ func (d *BaiduNetdisk) linkOfficial(file model.Obj, _ model.LinkArgs) (*model.Li
 	if err != nil {
 		return nil, err
 	}
-	// if res.StatusCode() == 302 {
+	//if res.StatusCode() == 302 {
 	u = res.Header().Get("location")
 	//}
 
@@ -383,17 +381,6 @@ func (d *BaiduNetdisk) getSliceSize(filesize int64) int64 {
 	return maxSliceSize
 }
 
-func (d *BaiduNetdisk) quota(ctx context.Context) (model.DiskUsage, error) {
-	var resp QuotaResp
-	_, err := d.request("https://pan.baidu.com/api/quota", http.MethodGet, func(req *resty.Request) {
-		req.SetContext(ctx)
-	}, &resp)
-	if err != nil {
-		return model.DiskUsage{}, err
-	}
-	return driver.DiskUsageFromUsedAndTotal(resp.Used, resp.Total), nil
-}
-
 // func encodeURIComponent(str string) string {
 // 	r := url.QueryEscape(str)
 // 	r = strings.ReplaceAll(r, "+", "%20")

drivers/baidu_photo/driver.go

@@ -21,7 +21,7 @@ import (
 	"github.com/OpenListTeam/OpenList/v4/pkg/errgroup"
 	"github.com/OpenListTeam/OpenList/v4/pkg/utils"
 	"github.com/avast/retry-go"
-	"github.com/go-resty/resty/v2"
+	"resty.dev/v3"
 )
 
 type BaiduPhoto struct {
@@ -262,12 +262,11 @@ func (d *BaiduPhoto) Put(ctx context.Context, dstDir model.Obj, stream model.Fil
 
 	// 计算需要的数据
 	streamSize := stream.GetSize()
-	count := 1
-	if streamSize > DEFAULT {
-		count = int((streamSize + DEFAULT - 1) / DEFAULT)
-	}
+	count := int(streamSize / DEFAULT)
 	lastBlockSize := streamSize % DEFAULT
-	if lastBlockSize == 0 {
+	if lastBlockSize > 0 {
+		count++
+	} else {
 		lastBlockSize = DEFAULT
 	}
 

drivers/baidu_photo/utils.go

@@ -12,7 +12,7 @@ import (
 	"github.com/OpenListTeam/OpenList/v4/drivers/base"
 	"github.com/OpenListTeam/OpenList/v4/internal/model"
 	"github.com/OpenListTeam/OpenList/v4/pkg/utils"
-	"github.com/go-resty/resty/v2"
+	"resty.dev/v3"
 )
 
 const (
@@ -38,7 +38,7 @@ func (d *BaiduPhoto) Request(client *resty.Client, furl string, method string, c
 		return nil, err
 	}
 
-	erron := utils.Json.Get(res.Body(), "errno").ToInt()
+	erron := utils.Json.Get(res.Bytes(), "errno").ToInt()
 	switch erron {
 	case 0:
 		break
@@ -63,7 +63,7 @@ func (d *BaiduPhoto) Request(client *resty.Client, furl string, method string, c
 //	if err != nil {
 //		return nil, err
 //	}
-//	return res.Body(), nil
+//	return res.Bytes(), nil
 //}
 
 // func (d *BaiduPhoto) refreshToken() error {

drivers/base/client.go

@@ -7,7 +7,7 @@ import (
 
 	"github.com/OpenListTeam/OpenList/v4/internal/conf"
 	"github.com/OpenListTeam/OpenList/v4/internal/net"
-	"github.com/go-resty/resty/v2"
+	"resty.dev/v3"
 )
 
 var (
@@ -34,7 +34,6 @@ func NewRestyClient() *resty.Client {
 	client := resty.New().
 		SetHeader("user-agent", UserAgent).
 		SetRetryCount(3).
-		SetRetryResetReaders(true).
 		SetTimeout(DefaultTimeout).
 		SetTLSClientConfig(&tls.Config{InsecureSkipVerify: conf.Conf.TlsInsecureSkipVerify})
 	return client

drivers/base/types.go

@@ -1,6 +1,6 @@
 package base
 
-import "github.com/go-resty/resty/v2"
+import "resty.dev/v3"
 
 type Json map[string]interface{}
 

drivers/chaoxing/driver.go

@@ -19,8 +19,8 @@ import (
 	"github.com/OpenListTeam/OpenList/v4/internal/op"
 	"github.com/OpenListTeam/OpenList/v4/pkg/cron"
 	"github.com/OpenListTeam/OpenList/v4/pkg/utils"
-	"github.com/go-resty/resty/v2"
 	"google.golang.org/appengine/log"
+	"resty.dev/v3"
 )
 
 type ChaoXing struct {
@@ -255,7 +255,7 @@ func (d *ChaoXing) Put(ctx context.Context, dstDir model.Obj, file model.FileStr
 		},
 		UpdateProgress: up,
 	})
-	req, err := http.NewRequestWithContext(ctx, http.MethodPost, "https://pan-yz.chaoxing.com/upload", r)
+	req, err := http.NewRequestWithContext(ctx, "POST", "https://pan-yz.chaoxing.com/upload", r)
 	if err != nil {
 		return err
 	}

drivers/chaoxing/meta.go

@@ -32,6 +32,7 @@ func init() {
 			config: driver.Config{
 				Name:              "ChaoXingGroupDrive",
 				OnlyProxy:         true,
+				OnlyLocal:         false,
 				DefaultRoot:       "-1",
 				NoOverwriteUpload: true,
 			},

drivers/chaoxing/util.go

@@ -12,7 +12,7 @@ import (
 	"strings"
 
 	"github.com/OpenListTeam/OpenList/v4/drivers/base"
-	"github.com/go-resty/resty/v2"
+	"resty.dev/v3"
 )
 
 func (d *ChaoXing) requestDownload(pathname string, method string, callback base.ReqCallback, resp interface{}) ([]byte, error) {
@@ -35,7 +35,7 @@ func (d *ChaoXing) requestDownload(pathname string, method string, callback base
 	if err != nil {
 		return nil, err
 	}
-	return res.Body(), nil
+	return res.Bytes(), nil
 }
 
 func (d *ChaoXing) request(pathname string, method string, callback base.ReqCallback, resp interface{}) ([]byte, error) {
@@ -61,7 +61,7 @@ func (d *ChaoXing) request(pathname string, method string, callback base.ReqCall
 	if err != nil {
 		return nil, err
 	}
-	return res.Body(), nil
+	return res.Bytes(), nil
 }
 
 func (d *ChaoXing) GetFiles(parent string) ([]File, error) {
@@ -167,7 +167,7 @@ func (d *ChaoXing) Login() (string, error) {
 		return "", err
 	}
 	// Create the request
-	req, err := http.NewRequest(http.MethodPost, "https://passport2.chaoxing.com/fanyalogin", body)
+	req, err := http.NewRequest("POST", "https://passport2.chaoxing.com/fanyalogin", body)
 	if err != nil {
 		return "", err
 	}

drivers/chunk/driver.go

@@ -1,501 +0,0 @@
-package chunk
-
-import (
-	"bytes"
-	"context"
-	"errors"
-	"fmt"
-	"io"
-	stdpath "path"
-	"strconv"
-	"strings"
-
-	"github.com/OpenListTeam/OpenList/v4/internal/driver"
-	"github.com/OpenListTeam/OpenList/v4/internal/errs"
-	"github.com/OpenListTeam/OpenList/v4/internal/fs"
-	"github.com/OpenListTeam/OpenList/v4/internal/model"
-	"github.com/OpenListTeam/OpenList/v4/internal/op"
-	"github.com/OpenListTeam/OpenList/v4/internal/sign"
-	"github.com/OpenListTeam/OpenList/v4/internal/stream"
-	"github.com/OpenListTeam/OpenList/v4/pkg/errgroup"
-	"github.com/OpenListTeam/OpenList/v4/pkg/http_range"
-	"github.com/OpenListTeam/OpenList/v4/pkg/utils"
-	"github.com/OpenListTeam/OpenList/v4/server/common"
-	"github.com/avast/retry-go"
-)
-
-type Chunk struct {
-	model.Storage
-	Addition
-}
-
-func (d *Chunk) Config() driver.Config {
-	return config
-}
-
-func (d *Chunk) GetAddition() driver.Additional {
-	return &d.Addition
-}
-
-func (d *Chunk) Init(ctx context.Context) error {
-	if d.PartSize <= 0 {
-		return errors.New("part size must be positive")
-	}
-	if len(d.ChunkPrefix) <= 0 {
-		return errors.New("chunk folder prefix must not be empty")
-	}
-	d.RemotePath = utils.FixAndCleanPath(d.RemotePath)
-	return nil
-}
-
-func (d *Chunk) Drop(ctx context.Context) error {
-	return nil
-}
-
-func (d *Chunk) Get(ctx context.Context, path string) (model.Obj, error) {
-	if utils.PathEqual(path, "/") {
-		return &model.Object{
-			Name:     "Root",
-			IsFolder: true,
-			Path:     "/",
-		}, nil
-	}
-	remoteStorage, remoteActualPath, err := op.GetStorageAndActualPath(d.RemotePath)
-	if err != nil {
-		return nil, err
-	}
-	remoteActualPath = stdpath.Join(remoteActualPath, path)
-	if remoteObj, err := op.Get(ctx, remoteStorage, remoteActualPath); err == nil {
-		return &model.Object{
-			Path:     path,
-			Name:     remoteObj.GetName(),
-			Size:     remoteObj.GetSize(),
-			Modified: remoteObj.ModTime(),
-			IsFolder: remoteObj.IsDir(),
-			HashInfo: remoteObj.GetHash(),
-		}, nil
-	}
-
-	remoteActualDir, name := stdpath.Split(remoteActualPath)
-	chunkName := d.ChunkPrefix + name
-	chunkObjs, err := op.List(ctx, remoteStorage, stdpath.Join(remoteActualDir, chunkName), model.ListArgs{})
-	if err != nil {
-		return nil, err
-	}
-	var totalSize int64 = 0
-	// 0号块默认为-1 以支持空文件
-	chunkSizes := []int64{-1}
-	h := make(map[*utils.HashType]string)
-	var first model.Obj
-	for _, o := range chunkObjs {
-		if o.IsDir() {
-			continue
-		}
-		if after, ok := strings.CutPrefix(o.GetName(), "hash_"); ok {
-			hn, value, ok := strings.Cut(strings.TrimSuffix(after, d.CustomExt), "_")
-			if ok {
-				ht, ok := utils.GetHashByName(hn)
-				if ok {
-					h[ht] = value
-				}
-			}
-			continue
-		}
-		idx, err := strconv.Atoi(strings.TrimSuffix(o.GetName(), d.CustomExt))
-		if err != nil {
-			continue
-		}
-		totalSize += o.GetSize()
-		if len(chunkSizes) > idx {
-			if idx == 0 {
-				first = o
-			}
-			chunkSizes[idx] = o.GetSize()
-		} else if len(chunkSizes) == idx {
-			chunkSizes = append(chunkSizes, o.GetSize())
-		} else {
-			newChunkSizes := make([]int64, idx+1)
-			copy(newChunkSizes, chunkSizes)
-			chunkSizes = newChunkSizes
-			chunkSizes[idx] = o.GetSize()
-		}
-	}
-	reqDir, _ := stdpath.Split(path)
-	objRes := chunkObject{
-		Object: model.Object{
-			Path:     stdpath.Join(reqDir, chunkName),
-			Name:     name,
-			Size:     totalSize,
-			Modified: first.ModTime(),
-			Ctime:    first.CreateTime(),
-		},
-		chunkSizes: chunkSizes,
-	}
-	if len(h) > 0 {
-		objRes.HashInfo = utils.NewHashInfoByMap(h)
-	}
-	return &objRes, nil
-}
-
-func (d *Chunk) List(ctx context.Context, dir model.Obj, args model.ListArgs) ([]model.Obj, error) {
-	remoteStorage, remoteActualPath, err := op.GetStorageAndActualPath(d.RemotePath)
-	if err != nil {
-		return nil, err
-	}
-	remoteActualDir := stdpath.Join(remoteActualPath, dir.GetPath())
-	remoteObjs, err := op.List(ctx, remoteStorage, remoteActualDir, model.ListArgs{
-		ReqPath: args.ReqPath,
-		Refresh: args.Refresh,
-	})
-	if err != nil {
-		return nil, err
-	}
-	result := make([]model.Obj, 0, len(remoteObjs))
-	listG, listCtx := errgroup.NewGroupWithContext(ctx, d.NumListWorkers, retry.Attempts(3))
-	for _, obj := range remoteObjs {
-		if utils.IsCanceled(listCtx) {
-			break
-		}
-		rawName := obj.GetName()
-		if obj.IsDir() {
-			if name, ok := strings.CutPrefix(rawName, d.ChunkPrefix); ok {
-				resultIdx := len(result)
-				result = append(result, nil)
-				listG.Go(func(ctx context.Context) error {
-					chunkObjs, err := op.List(ctx, remoteStorage, stdpath.Join(remoteActualDir, rawName), model.ListArgs{
-						ReqPath: stdpath.Join(args.ReqPath, rawName),
-						Refresh: args.Refresh,
-					})
-					if err != nil {
-						return err
-					}
-					totalSize := int64(0)
-					h := make(map[*utils.HashType]string)
-					first := obj
-					for _, o := range chunkObjs {
-						if o.IsDir() {
-							continue
-						}
-						if after, ok := strings.CutPrefix(strings.TrimSuffix(o.GetName(), d.CustomExt), "hash_"); ok {
-							hn, value, ok := strings.Cut(after, "_")
-							if ok {
-								ht, ok := utils.GetHashByName(hn)
-								if ok {
-									h[ht] = value
-								}
-								continue
-							}
-						}
-						idx, err := strconv.Atoi(strings.TrimSuffix(o.GetName(), d.CustomExt))
-						if err != nil {
-							continue
-						}
-						if idx == 0 {
-							first = o
-						}
-						totalSize += o.GetSize()
-					}
-					objRes := model.Object{
-						Name:     name,
-						Size:     totalSize,
-						Modified: first.ModTime(),
-						Ctime:    first.CreateTime(),
-					}
-					if len(h) > 0 {
-						objRes.HashInfo = utils.NewHashInfoByMap(h)
-					}
-					if !d.Thumbnail {
-						result[resultIdx] = &objRes
-					} else {
-						thumbPath := stdpath.Join(args.ReqPath, ".thumbnails", name+".webp")
-						thumb := fmt.Sprintf("%s/d%s?sign=%s",
-							common.GetApiUrl(ctx),
-							utils.EncodePath(thumbPath, true),
-							sign.Sign(thumbPath))
-						result[resultIdx] = &model.ObjThumb{
-							Object: objRes,
-							Thumbnail: model.Thumbnail{
-								Thumbnail: thumb,
-							},
-						}
-					}
-					return nil
-				})
-				continue
-			}
-		}
-
-		if !d.ShowHidden && strings.HasPrefix(rawName, ".") {
-			continue
-		}
-		thumb, ok := model.GetThumb(obj)
-		objRes := model.Object{
-			Name:     rawName,
-			Size:     obj.GetSize(),
-			Modified: obj.ModTime(),
-			IsFolder: obj.IsDir(),
-			HashInfo: obj.GetHash(),
-		}
-		if !ok {
-			result = append(result, &objRes)
-		} else {
-			result = append(result, &model.ObjThumb{
-				Object: objRes,
-				Thumbnail: model.Thumbnail{
-					Thumbnail: thumb,
-				},
-			})
-		}
-	}
-	if err = listG.Wait(); err != nil {
-		return nil, err
-	}
-	return result, nil
-}
-
-func (d *Chunk) Link(ctx context.Context, file model.Obj, args model.LinkArgs) (*model.Link, error) {
-	remoteStorage, remoteActualPath, err := op.GetStorageAndActualPath(d.RemotePath)
-	if err != nil {
-		return nil, err
-	}
-	chunkFile, ok := file.(*chunkObject)
-	remoteActualPath = stdpath.Join(remoteActualPath, file.GetPath())
-	if !ok {
-		l, _, err := op.Link(ctx, remoteStorage, remoteActualPath, args)
-		if err != nil {
-			return nil, err
-		}
-		resultLink := *l
-		resultLink.SyncClosers = utils.NewSyncClosers(l)
-		return &resultLink, nil
-	}
-	// 检查0号块不等于-1 以支持空文件
-	// 如果块数量大于1 最后一块不可能为0
-	// 只检查中间块是否有0
-	for i, l := 0, len(chunkFile.chunkSizes)-2; ; i++ {
-		if i == 0 {
-			if chunkFile.chunkSizes[i] == -1 {
-				return nil, fmt.Errorf("chunk part[%d] are missing", i)
-			}
-		} else if chunkFile.chunkSizes[i] == 0 {
-			return nil, fmt.Errorf("chunk part[%d] are missing", i)
-		}
-		if i >= l {
-			break
-		}
-	}
-	fileSize := chunkFile.GetSize()
-	mergedRrf := func(ctx context.Context, httpRange http_range.Range) (io.ReadCloser, error) {
-		start := httpRange.Start
-		length := httpRange.Length
-		if length < 0 || start+length > fileSize {
-			length = fileSize - start
-		}
-		if length == 0 {
-			return io.NopCloser(strings.NewReader("")), nil
-		}
-		rs := make([]io.Reader, 0)
-		cs := make(utils.Closers, 0)
-		var (
-			rc       io.ReadCloser
-			readFrom bool
-		)
-		for idx, chunkSize := range chunkFile.chunkSizes {
-			if readFrom {
-				l, o, err := op.Link(ctx, remoteStorage, stdpath.Join(remoteActualPath, d.getPartName(idx)), args)
-				if err != nil {
-					_ = cs.Close()
-					return nil, err
-				}
-				cs = append(cs, l)
-				chunkSize2 := l.ContentLength
-				if chunkSize2 <= 0 {
-					chunkSize2 = o.GetSize()
-				}
-				if chunkSize2 != chunkSize {
-					_ = cs.Close()
-					return nil, fmt.Errorf("chunk part[%d] size not match", idx)
-				}
-				rrf, err := stream.GetRangeReaderFromLink(chunkSize2, l)
-				if err != nil {
-					_ = cs.Close()
-					return nil, err
-				}
-				newLength := length - chunkSize2
-				if newLength >= 0 {
-					length = newLength
-					rc, err = rrf.RangeRead(ctx, http_range.Range{Length: -1})
-				} else {
-					rc, err = rrf.RangeRead(ctx, http_range.Range{Length: length})
-				}
-				if err != nil {
-					_ = cs.Close()
-					return nil, err
-				}
-				rs = append(rs, rc)
-				cs = append(cs, rc)
-				if newLength <= 0 {
-					return utils.ReadCloser{
-						Reader: io.MultiReader(rs...),
-						Closer: &cs,
-					}, nil
-				}
-			} else if newStart := start - chunkSize; newStart >= 0 {
-				start = newStart
-			} else {
-				l, o, err := op.Link(ctx, remoteStorage, stdpath.Join(remoteActualPath, d.getPartName(idx)), args)
-				if err != nil {
-					_ = cs.Close()
-					return nil, err
-				}
-				cs = append(cs, l)
-				chunkSize2 := l.ContentLength
-				if chunkSize2 <= 0 {
-					chunkSize2 = o.GetSize()
-				}
-				if chunkSize2 != chunkSize {
-					_ = cs.Close()
-					return nil, fmt.Errorf("chunk part[%d] size not match", idx)
-				}
-				rrf, err := stream.GetRangeReaderFromLink(chunkSize2, l)
-				if err != nil {
-					_ = cs.Close()
-					return nil, err
-				}
-				rc, err = rrf.RangeRead(ctx, http_range.Range{Start: start, Length: -1})
-				if err != nil {
-					_ = cs.Close()
-					return nil, err
-				}
-				length -= chunkSize2 - start
-				cs = append(cs, rc)
-				if length <= 0 {
-					return utils.ReadCloser{
-						Reader: rc,
-						Closer: &cs,
-					}, nil
-				}
-				rs = append(rs, rc)
-				readFrom = true
-			}
-		}
-		return nil, fmt.Errorf("invalid range: start=%d,length=%d,fileSize=%d", httpRange.Start, httpRange.Length, fileSize)
-	}
-	return &model.Link{
-		RangeReader: stream.RangeReaderFunc(mergedRrf),
-	}, nil
-}
-
-func (d *Chunk) MakeDir(ctx context.Context, parentDir model.Obj, dirName string) error {
-	path := stdpath.Join(d.RemotePath, parentDir.GetPath(), dirName)
-	return fs.MakeDir(ctx, path)
-}
-
-func (d *Chunk) Move(ctx context.Context, srcObj, dstDir model.Obj) error {
-	src := stdpath.Join(d.RemotePath, srcObj.GetPath())
-	dst := stdpath.Join(d.RemotePath, dstDir.GetPath())
-	_, err := fs.Move(ctx, src, dst)
-	return err
-}
-
-func (d *Chunk) Rename(ctx context.Context, srcObj model.Obj, newName string) error {
-	if _, ok := srcObj.(*chunkObject); ok {
-		newName = d.ChunkPrefix + newName
-	}
-	return fs.Rename(ctx, stdpath.Join(d.RemotePath, srcObj.GetPath()), newName)
-}
-
-func (d *Chunk) Copy(ctx context.Context, srcObj, dstDir model.Obj) error {
-	dst := stdpath.Join(d.RemotePath, dstDir.GetPath())
-	src := stdpath.Join(d.RemotePath, srcObj.GetPath())
-	_, err := fs.Copy(ctx, src, dst)
-	return err
-}
-
-func (d *Chunk) Remove(ctx context.Context, obj model.Obj) error {
-	return fs.Remove(ctx, stdpath.Join(d.RemotePath, obj.GetPath()))
-}
-
-func (d *Chunk) Put(ctx context.Context, dstDir model.Obj, file model.FileStreamer, up driver.UpdateProgress) error {
-	remoteStorage, remoteActualPath, err := op.GetStorageAndActualPath(d.RemotePath)
-	if err != nil {
-		return err
-	}
-	if (d.Thumbnail && dstDir.GetName() == ".thumbnails") || (d.ChunkLargeFileOnly && file.GetSize() <= d.PartSize) {
-		return op.Put(ctx, remoteStorage, stdpath.Join(remoteActualPath, dstDir.GetPath()), file, up)
-	}
-	upReader := &driver.ReaderUpdatingProgress{
-		Reader:         file,
-		UpdateProgress: up,
-	}
-	dst := stdpath.Join(remoteActualPath, dstDir.GetPath(), d.ChunkPrefix+file.GetName())
-	if d.StoreHash {
-		for ht, value := range file.GetHash().All() {
-			_ = op.Put(ctx, remoteStorage, dst, &stream.FileStream{
-				Obj: &model.Object{
-					Name:     fmt.Sprintf("hash_%s_%s%s", ht.Name, value, d.CustomExt),
-					Size:     1,
-					Modified: file.ModTime(),
-				},
-				Mimetype: "application/octet-stream",
-				Reader:   bytes.NewReader([]byte{0}), // 兼容不支持空文件的驱动
-			}, nil, true)
-		}
-	}
-	fullPartCount := int(file.GetSize() / d.PartSize)
-	tailSize := file.GetSize() % d.PartSize
-	if tailSize == 0 && fullPartCount > 0 {
-		fullPartCount--
-		tailSize = d.PartSize
-	}
-	partIndex := 0
-	for partIndex < fullPartCount {
-		err = op.Put(ctx, remoteStorage, dst, &stream.FileStream{
-			Obj: &model.Object{
-				Name:     d.getPartName(partIndex),
-				Size:     d.PartSize,
-				Modified: file.ModTime(),
-			},
-			Mimetype: file.GetMimetype(),
-			Reader:   io.LimitReader(upReader, d.PartSize),
-		}, nil, true)
-		if err != nil {
-			_ = op.Remove(ctx, remoteStorage, dst)
-			return err
-		}
-		partIndex++
-	}
-	err = op.Put(ctx, remoteStorage, dst, &stream.FileStream{
-		Obj: &model.Object{
-			Name:     d.getPartName(fullPartCount),
-			Size:     tailSize,
-			Modified: file.ModTime(),
-		},
-		Mimetype: file.GetMimetype(),
-		Reader:   upReader,
-	}, nil)
-	if err != nil {
-		_ = op.Remove(ctx, remoteStorage, dst)
-	}
-	return err
-}
-
-func (d *Chunk) getPartName(part int) string {
-	return fmt.Sprintf("%d%s", part, d.CustomExt)
-}
-
-func (d *Chunk) GetDetails(ctx context.Context) (*model.StorageDetails, error) {
-	remoteStorage, err := fs.GetStorage(d.RemotePath, &fs.GetStoragesArgs{})
-	if err != nil {
-		return nil, errs.NotImplement
-	}
-	remoteDetails, err := op.GetStorageDetails(ctx, remoteStorage)
-	if err != nil {
-		return nil, err
-	}
-	return &model.StorageDetails{
-		DiskUsage: remoteDetails.DiskUsage,
-	}, nil
-}
-
-var _ driver.Driver = (*Chunk)(nil)

drivers/chunk/meta.go

@@ -1,39 +0,0 @@
-package chunk
-
-import (
-	"github.com/OpenListTeam/OpenList/v4/internal/driver"
-	"github.com/OpenListTeam/OpenList/v4/internal/op"
-)
-
-type Addition struct {
-	RemotePath         string `json:"remote_path" required:"true"`
-	PartSize           int64  `json:"part_size" required:"true" type:"number" help:"bytes"`
-	ChunkLargeFileOnly bool   `json:"chunk_large_file_only" default:"false" help:"chunk only if file size > part_size"`
-	ChunkPrefix        string `json:"chunk_prefix" type:"string" default:"[openlist_chunk]" help:"the prefix of chunk folder"`
-	CustomExt          string `json:"custom_ext" type:"string"`
-	StoreHash          bool   `json:"store_hash" type:"bool" default:"true"`
-	NumListWorkers     int    `json:"num_list_workers" required:"true" type:"number" default:"5"`
-
-	Thumbnail  bool `json:"thumbnail" required:"true" default:"false" help:"enable thumbnail which pre-generated under .thumbnails folder"`
-	ShowHidden bool `json:"show_hidden"  default:"true" required:"false" help:"show hidden directories and files"`
-}
-
-var config = driver.Config{
-	Name:        "Chunk",
-	LocalSort:   true,
-	OnlyProxy:   true,
-	NoCache:     true,
-	DefaultRoot: "/",
-	NoLinkURL:   true,
-}
-
-func init() {
-	op.RegisterDriver(func() driver.Driver {
-		return &Chunk{
-			Addition: Addition{
-				ChunkPrefix:    "[openlist_chunk]",
-				NumListWorkers: 5,
-			},
-		}
-	})
-}