更新aList的url为/d/{path}(?sign={sign})

ikaros-dev · Sep 16, 2024 · 9322e73 · 9322e73
1 parent 60cbfa7
commit 9322e73
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/CHANGELOG.MD b/CHANGELOG.MD
@@ -4,7 +4,7 @@
 
 # 15.2.0
 
-
+- 更新aList的url为/d/{path}(?sign={sign})
 
 # v0.12.11
 

diff --git a/src/main/java/run/ikaros/plugin/alist/AListClient.java b/src/main/java/run/ikaros/plugin/alist/AListClient.java
@@ -29,6 +29,8 @@
 import run.ikaros.api.store.enums.AttachmentType;
 import run.ikaros.plugin.alist.AListConst.ConfigMapKey;
 
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
 import java.time.Duration;
 import java.time.LocalDateTime;
 import java.util.*;
@@ -90,7 +92,12 @@ private Mono<Void> createAttachmentRecursively(List<String> paths, Long parentId
                 })
                 .flatMap(aListAttachment -> {
                     String path = getPathByPathArr(aListAttachment.getPaths());
-                    return Mono.just(fetchAttachmentDetail(path, aListAttachment));
+                    AListAttachment att = fetchAttachmentDetail(path, aListAttachment);
+                    String name = path.substring(path.lastIndexOf('/') + 1);
+                    att.setRaw_url(token.getUrl()
+                            + "/d" + path.replace(name, URLEncoder.encode(name, StandardCharsets.UTF_8).replace("+", "%20"))
+                            + (StringUtils.isNotBlank(att.getSign()) ? "?sign=" + att.getSign() : ""));
+                    return Mono.just(att);
                 })
                 .flatMap(this::saveAListAttachment)
                 .flatMap(aListAttachment -> {
@@ -309,7 +316,11 @@ public AListToken cm2token(ConfigMap cm) {
         if (cmd == null) {
             cmd = new HashMap<>();
         }
-        token.setUrl(cmd.get(ConfigMapKey.apiBaseUrl));
+        String url = cmd.get(ConfigMapKey.apiBaseUrl);
+        if (url.endsWith("/")) {
+            url = url.substring(0, url.length() - 1);
+        }
+        token.setUrl(url);
         token.setUsername(cmd.get(ConfigMapKey.apiUsername));
         token.setPassword(cmd.get(ConfigMapKey.apiPassword));
         token.setEnableAutoTokenRefresh(