Fixed 蓝奏云目录解析cookie验证问题

README.md

@@ -40,7 +40,7 @@ https://nfd-parser.github.io/nfd-preview/preview.html?src=https%3A%2F%2Flz.qaiu.
 
 **JavaScript解析器文档：** [JavaScript解析器开发指南](parser/doc/JAVASCRIPT_PARSER_GUIDE.md) | [自定义解析器扩展指南](parser/doc/CUSTOM_PARSER_GUIDE.md) | [快速开始](parser/doc/CUSTOM_PARSER_QUICKSTART.md)
 
-**Playground功能：** [JS解析器演练场密码保护说明](web-service/doc/PLAYGROUND_PASSWORD_PROTECTION.md)
+**Playground功能：** [JS解析器演练场密码保护说明](PLAYGROUND_PASSWORD_PROTECTION.md)
 
 ## 预览地址  
 [预览地址1](https://lz.qaiu.top)  
@@ -88,9 +88,7 @@ main分支依赖JDK17, 提供了JDK11分支[main-jdk11](https://github.com/qaiu/
 - Onedrive-pod
 - Dropbox-pdp
 - iCloud-pic
-### 专属版提供
+### 仅专属版提供
-- [夸克云盘-qk](https://pan.quark.cn/)
-- [UC云盘-uc](https://fast.uc.cn/)
 - [移动云盘-p139](https://yun.139.com/)
 - [联通云盘-pwo](https://pan.wo.cn/)
 - [天翼云盘-p189](https://cloud.189.cn/)

core/src/main/generated/cn/qaiu/vx/core/verticle/conf/HttpProxyConfConverter.java

@@ -0,0 +1,73 @@
+package cn.qaiu.vx.core.verticle.conf;
+
+import io.vertx.core.json.JsonObject;
+import io.vertx.core.json.JsonArray;
+import io.vertx.core.json.impl.JsonUtil;
+import java.time.Instant;
+import java.time.format.DateTimeFormatter;
+import java.util.Base64;
+
+/**
+ * Converter and mapper for {@link cn.qaiu.vx.core.verticle.conf.HttpProxyConf}.
+ * NOTE: This class has been automatically generated from the {@link cn.qaiu.vx.core.verticle.conf.HttpProxyConf} original class using Vert.x codegen.
+ */
+public class HttpProxyConfConverter {
+
+
+  private static final Base64.Decoder BASE64_DECODER = JsonUtil.BASE64_DECODER;
+  private static final Base64.Encoder BASE64_ENCODER = JsonUtil.BASE64_ENCODER;
+
+   static void fromJson(Iterable<java.util.Map.Entry<String, Object>> json, HttpProxyConf obj) {
+    for (java.util.Map.Entry<String, Object> member : json) {
+      switch (member.getKey()) {
+        case "password":
+          if (member.getValue() instanceof String) {
+            obj.setPassword((String)member.getValue());
+          }
+          break;
+        case "port":
+          if (member.getValue() instanceof Number) {
+            obj.setPort(((Number)member.getValue()).intValue());
+          }
+          break;
+        case "preProxyOptions":
+          if (member.getValue() instanceof JsonObject) {
+            obj.setPreProxyOptions(new io.vertx.core.net.ProxyOptions((io.vertx.core.json.JsonObject)member.getValue()));
+          }
+          break;
+        case "timeout":
+          if (member.getValue() instanceof Number) {
+            obj.setTimeout(((Number)member.getValue()).intValue());
+          }
+          break;
+        case "username":
+          if (member.getValue() instanceof String) {
+            obj.setUsername((String)member.getValue());
+          }
+          break;
+      }
+    }
+  }
+
+   static void toJson(HttpProxyConf obj, JsonObject json) {
+    toJson(obj, json.getMap());
+  }
+
+   static void toJson(HttpProxyConf obj, java.util.Map<String, Object> json) {
+    if (obj.getPassword() != null) {
+      json.put("password", obj.getPassword());
+    }
+    if (obj.getPort() != null) {
+      json.put("port", obj.getPort());
+    }
+    if (obj.getPreProxyOptions() != null) {
+      json.put("preProxyOptions", obj.getPreProxyOptions().toJson());
+    }
+    if (obj.getTimeout() != null) {
+      json.put("timeout", obj.getTimeout());
+    }
+    if (obj.getUsername() != null) {
+      json.put("username", obj.getUsername());
+    }
+  }
+}

core/src/main/java/cn/qaiu/vx/core/verticle/conf/HttpProxyConf.java

@@ -0,0 +1,89 @@
+package cn.qaiu.vx.core.verticle.conf;
+
+import io.vertx.codegen.annotations.DataObject;
+import io.vertx.codegen.json.annotations.JsonGen;
+import io.vertx.core.json.JsonObject;
+import io.vertx.core.net.ProxyOptions;
+
+import java.util.UUID;
+
+@DataObject
+@JsonGen(publicConverter = false)
+public class HttpProxyConf {
+
+    public static final String DEFAULT_USERNAME = UUID.randomUUID().toString();
+
+    public static final String DEFAULT_PASSWORD = UUID.randomUUID().toString();
+
+    public static final Integer DEFAULT_PORT = 6402;
+
+    public static final Integer DEFAULT_TIMEOUT = 15000;
+
+    Integer timeout;
+
+    String username;
+
+    String password;
+
+    Integer port;
+
+    ProxyOptions preProxyOptions;
+
+    public HttpProxyConf() {
+        this.username = DEFAULT_USERNAME;
+        this.password = DEFAULT_PASSWORD;
+        this.timeout = DEFAULT_PORT;
+        this.timeout = DEFAULT_TIMEOUT;
+        this.preProxyOptions = new ProxyOptions();
+    }
+
+    public HttpProxyConf(JsonObject json) {
+        this();
+    }
+
+
+    public Integer getTimeout() {
+        return timeout;
+    }
+
+    public HttpProxyConf setTimeout(Integer timeout) {
+        this.timeout = timeout;
+        return this;
+    }
+
+    public String getUsername() {
+        return username;
+    }
+
+    public HttpProxyConf setUsername(String username) {
+        this.username = username;
+        return this;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    public HttpProxyConf setPassword(String password) {
+        this.password = password;
+        return this;
+    }
+
+    public Integer getPort() {
+        return port;
+    }
+
+    public HttpProxyConf setPort(Integer port) {
+        this.port = port;
+        return this;
+    }
+
+    public ProxyOptions getPreProxyOptions() {
+        return preProxyOptions;
+    }
+
+    public HttpProxyConf setPreProxyOptions(ProxyOptions preProxyOptions) {
+        this.preProxyOptions = preProxyOptions;
+        return this;
+    }
+}

parser/src/main/java/cn/qaiu/parser/PanDomainTemplate.java

@@ -263,7 +263,7 @@ public enum PanDomainTemplate {
 
     // https://pan-yz.cldisk.com/external/m/file/953658049102462976
     Pcx("超星云盘(需要referer头)",
-            compile("https://pan-yz\\.(chaoxing\\.com|cldisk\\.com)/external/m/file/(?<KEY>\\w+)(\\?.*)?"),
+            compile("https://pan-yz\\.cldisk\\.com/external/m/file/(?<KEY>\\w+)"),
             "https://pan-yz.cldisk.com/external/m/file/{shareKey}",
             PcxTool.class),
     // WPS：分享格式：https://www.kdocs.cn/l/ck0azivLlDi3 ；API格式：https://www.kdocs.cn/api/office/file/{shareKey}/download 

parser/src/main/java/cn/qaiu/parser/impl/PcxTool.java

@@ -1,13 +1,11 @@
 package cn.qaiu.parser.impl;
 
-import cn.qaiu.entity.FileInfo;
 import cn.qaiu.entity.ShareLinkInfo;
 import cn.qaiu.parser.PanBase;
-import cn.qaiu.util.FileSizeConverter;
 import io.vertx.core.Future;
-
+import io.vertx.core.MultiMap;
-import java.util.regex.Matcher;
+import io.vertx.core.json.JsonObject;
-import java.util.regex.Pattern;
+import io.vertx.uritemplate.UriTemplate;
 
 /**
  * <a href="https://passport2.chaoxing.com">超星云盘</a>
@@ -21,135 +19,24 @@ public class PcxTool extends PanBase {
     public Future<String> parse() {
         client.getAbs(shareLinkInfo.getShareUrl())
                 .send().onSuccess(res -> {
+                    // 'download':  'https://d0.ananas.chaoxing.com/download/de08dcf546e4dd88a17bead86ff6338d?at_=1740211698795&ak_=d62a3acbd5ce43e1e8565b67990691e4&ad_=8c4ef22e980ee0dd9532ec3757ab19f8&fn=33.c'
                     String body = res.bodyAsString();
-                    try {
+                    // 获取download
-                        // 提取文件信息
+                    String str = "var fileinfo = {";
-                        setFileInfo(body);
+                    String fileInfo = res.bodyAsString().substring(res.bodyAsString().indexOf(str) + str.length() - 1
-                        
+                            , res.bodyAsString().indexOf("};") + 1);
-                        // 直接用正则提取download链接
+                    fileInfo = fileInfo.replace("'", "\"");
-                        String download = extractDownloadUrl(body);
+                    JsonObject jsonObject = new JsonObject(fileInfo);
-                        if (download != null && download.contains("fn=")) {
+                    String download = jsonObject.getString("download");
-                            complete(download);
+                    if (download.contains("fn=")) {
-                        } else {
+                        complete(download);
-                            fail("获取下载链接失败");
+                    } else {
-                        }
+                        fail("获取下载链接失败: 不支持的文件类型: {}", jsonObject.getString("suffix"));
-                    } catch (Exception e) {
-                        fail("解析文件信息失败: {}", e.getMessage());
                     }
                 }).onFailure(handleFail(shareLinkInfo.getShareUrl()));
         return promise.future();
     }
 
-    /**
-     * 从HTML中提取download链接
-     */
-    private String extractDownloadUrl(String html) {
-        // 匹配 'download': 'https://xxx' 或 "download": "https://xxx"
-        Pattern pattern = Pattern.compile("['\"]download['\"]\\s*:\\s*['\"]([^'\"]+)['\"]");
-        Matcher matcher = pattern.matcher(html);
-        if (matcher.find()) {
-            return matcher.group(1);
-        }
-        return null;
-    }
-    
-    /**
-     * 从HTML中提取文件信息并设置到shareLinkInfo
-     */
-    private void setFileInfo(String html) {
-        try {
-            FileInfo fileInfo = new FileInfo();
-            
-            // 提取文件名：从<title>标签或文件名input
-            String fileName = extractByRegex(html, "<title>([^<]+)</title>");
-            if (fileName == null) {
-                fileName = extractByRegex(html, "<input id=\"filename\" type=\"hidden\" value=\"([^\"]+)\"");
-            }
-            
-            // 提取文件大小：'filesize': 'xxx' 或 "filesize": "xxx"
-            String fileSizeStr = extractByRegex(html, "['\"]filesize['\"]\\s*:\\s*['\"]([^'\"]+)['\"]");
-            Long fileSize = null;
-            if (fileSizeStr != null) {
-                try {
-                    fileSize = Long.parseLong(fileSizeStr);
-                } catch (NumberFormatException ignored) {}
-            }
-            
-            // 提取文件类型/后缀：'suffix': 'xxx' 或 "suffix": "xxx"
-            String suffix = extractByRegex(html, "['\"]suffix['\"]\\s*:\\s*['\"]([^'\"]+)['\"]");
-            
-            // 提取objectId（文件ID）：'objectId': 'xxx' 或 "objectId": "xxx"
-            String objectId = extractByRegex(html, "['\"]objectId['\"]\\s*:\\s*['\"]([^'\"]+)['\"]");
-            
-            // 提取创建者：'creator': 'xxx' 或 "creator": "xxx"
-            String creator = extractByRegex(html, "['\"]creator['\"]\\s*:\\s*['\"]([^'\"]+)['\"]");
-            
-            // 提取上传时间：'uploadDate': timestamp
-            String uploadDate = extractByRegex(html, "['\"]uploadDate['\"]\\s*:\\s*(\\d+)");
-            
-            // 提取缩略图：'thumbnail': 'xxx' 或 "thumbnail": "xxx"
-            String thumbnail = extractByRegex(html, "['\"]thumbnail['\"]\\s*:\\s*['\"]([^'\"]+)['\"]");
-            
-            // 设置文件信息
-            if (fileName != null) {
-                fileInfo.setFileName(fileName);
-            }
-            
-            if (fileSize != null) {
-                fileInfo.setSize(fileSize);
-                fileInfo.setSizeStr(FileSizeConverter.convertToReadableSize(fileSize));
-            }
-            
-            if (suffix != null) {
-                fileInfo.setFileType(suffix);
-            }
-            
-            if (objectId != null) {
-                fileInfo.setFileId(objectId);
-            }
-            
-            if (creator != null) {
-                fileInfo.setCreateBy(creator);
-            }
-            
-            if (uploadDate != null) {
-                try {
-                    long timestamp = Long.parseLong(uploadDate);
-                    // 转换为日期格式
-                    java.time.Instant instant = java.time.Instant.ofEpochMilli(timestamp);
-                    java.time.LocalDateTime dateTime = java.time.LocalDateTime.ofInstant(instant, 
-                            java.time.ZoneId.systemDefault());
-                    fileInfo.setCreateTime(dateTime.format(
-                            java.time.format.DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
-                } catch (NumberFormatException ignored) {}
-            }
-            
-            if (thumbnail != null) {
-                fileInfo.setPreviewUrl(thumbnail);
-            }
-            
-            fileInfo.setPanType(shareLinkInfo.getType());
-            
-            // 将文件信息存储到shareLinkInfo的otherParam中
-            shareLinkInfo.getOtherParam().put("fileInfo", fileInfo);
-            
-        } catch (Exception e) {
-            log.warn("提取文件信息失败: {}", e.getMessage());
-        }
-    }
-    
-    /**
-     * 使用正则表达式提取内容
-     */
-    private String extractByRegex(String text, String regex) {
-        Pattern pattern = Pattern.compile(regex);
-        Matcher matcher = pattern.matcher(text);
-        if (matcher.find()) {
-            return matcher.group(1);
-        }
-        return null;
-    }
-
 
 //    public static void main(String[] args) {
 //        String s = new PcxTool(ShareLinkInfo.newBuilder().shareUrl("https://pan-yz.cldisk.com/external/m/file/953658049102462976")

pom.xml

@@ -25,16 +25,14 @@
 
         <packageDirectory>${project.basedir}/web-service/target/package</packageDirectory>
 
-        <!-- Vert.x 4.5.24 已包含安全修复，无需单独指定 Netty 版本 -->
+        <vertx.version>4.5.22</vertx.version>
-        <vertx.version>4.5.14</vertx.version>
         <org.reflections.version>0.10.2</org.reflections.version>
         <lombok.version>1.18.38</lombok.version>
-        <slf4j.version>2.0.16</slf4j.version>
+        <slf4j.version>2.0.5</slf4j.version>
         <commons-lang3.version>3.18.0</commons-lang3.version>
         <commons-beanutils2.version>2.0.0</commons-beanutils2.version>
-        <jackson.version>2.18.2</jackson.version>
+        <jackson.version>2.14.2</jackson.version>
-        <!-- Logback 最新稳定版 -->
+        <logback.version>1.5.19</logback.version>
-        <logback.version>1.5.18</logback.version>
         <junit.version>4.13.2</junit.version>
     </properties>
 
@@ -48,18 +46,6 @@
                 <scope>import</scope>
             </dependency>
 
-            <!-- 统一管理 logback 版本 -->
-            <dependency>
-                <groupId>ch.qos.logback</groupId>
-                <artifactId>logback-classic</artifactId>
-                <version>${logback.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>ch.qos.logback</groupId>
-                <artifactId>logback-core</artifactId>
-                <version>${logback.version}</version>
-            </dependency>
-
             <dependency>
                 <groupId>cn.qaiu</groupId>
                 <artifactId>core</artifactId>