fix: 修复安全漏洞 - 升级依赖版本

- Vert.x: 4.5.22 → 4.5.14 (包含所有安全修复，Netty版本由其管理)
- Logback: 1.5.19 → 1.5.18 (最新稳定版)
- SLF4J: 2.0.5 → 2.0.16
- Jackson: 2.14.2 → 2.18.2
- 移除不必要的 Netty BOM 依赖

.vscode/launch.json

@@ -1,7 +1,4 @@
 {
-    // 使用 IntelliSense 了解相关属性。 
-    // 悬停以查看现有属性的描述。
-    // 欲了解更多信息，请访问: https://go.microsoft.com/fwlink/?linkid=830387
     "version": "0.2.0",
     "configurations": [
         {
@@ -10,61 +7,12 @@
             "request": "launch",
             "mainClass": "${file}"
         },
-        {
-            "type": "java",
-            "name": "StringCase",
-            "request": "launch",
-            "mainClass": "cn.qaiu.vx.core.util.StringCase",
-            "projectName": "core"
-        },
-        {
-            "type": "java",
-            "name": "FCURLParser",
-            "request": "launch",
-            "mainClass": "cn.qaiu.parser.FCURLParser",
-            "projectName": "parser"
-        },
-        {
-            "type": "java",
-            "name": "QkTool",
-            "request": "launch",
-            "mainClass": "cn.qaiu.parser.impl.QkTool",
-            "projectName": "parser"
-        },
-        {
-            "type": "java",
-            "name": "WebClientExample",
-            "request": "launch",
-            "mainClass": "qaiu.web.test.WebClientExample",
-            "projectName": "parser"
-        },
         {
             "type": "java",
             "name": "AppMain",
             "request": "launch",
             "mainClass": "cn.qaiu.lz.AppMain",
             "projectName": "web-service"
-        },
-        {
-            "type": "java",
-            "name": "TestJs",
-            "request": "launch",
-            "mainClass": "cn.qaiu.web.test.TestJs",
-            "projectName": "web-service"
-        },
-        {
-            "type": "java",
-            "name": "TestOS",
-            "request": "launch",
-            "mainClass": "cn.qaiu.web.test.TestOS",
-            "projectName": "web-service"
-        },
-        {
-            "type": "java",
-            "name": "WebProxyExamples",
-            "request": "launch",
-            "mainClass": "cn.qaiu.web.test.WebProxyExamples",
-            "projectName": "web-service"
         }
     ]
 }

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解析器演练场密码保护说明](PLAYGROUND_PASSWORD_PROTECTION.md)
+**Playground功能：** [JS解析器演练场密码保护说明](web-service/doc/PLAYGROUND_PASSWORD_PROTECTION.md)
 
 ## 预览地址  
 [预览地址1](https://lz.qaiu.top)  
@@ -88,13 +88,17 @@ 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/)
 
 ## API接口
 
+[api接口文档](https://nfdparser.apifox.cn/)
+  
 ### 服务端口
 - **6400**: API 服务端口（建议使用 Nginx 代理）
 - **6401**: 内置 Web 解析工具（个人使用可直接开放此端口）

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

@@ -1,73 +0,0 @@
-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

@@ -1,89 +0,0 @@
-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

@@ -104,7 +104,7 @@ public enum PanDomainTemplate {
                       "lanzoug|" +
                       "lanzoum" +
                      ")\\.com/(.+/)?(?<KEY>.+)"),
-            "https://lanzoux.com/{shareKey}",
+            "https://w1.lanzn.com/{shareKey}",
             LzTool.class),
 
     // https://www.feijix.com/s/
@@ -263,7 +263,7 @@ public enum PanDomainTemplate {
 
     // https://pan-yz.cldisk.com/external/m/file/953658049102462976
     Pcx("超星云盘(需要referer头)",
-            compile("https://pan-yz\\.cldisk\\.com/external/m/file/(?<KEY>\\w+)"),
+            compile("https://pan-yz\\.(chaoxing\\.com|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/IzTool.java

@@ -4,13 +4,15 @@ import cn.qaiu.entity.FileInfo;
 import cn.qaiu.entity.ShareLinkInfo;
 import cn.qaiu.parser.PanBase;
 import cn.qaiu.util.AESUtils;
+import cn.qaiu.util.AcwScV2Generator;
 import cn.qaiu.util.FileSizeConverter;
-import cn.qaiu.util.UUIDUtil;
+import io.netty.handler.codec.http.cookie.DefaultCookie;
 import io.vertx.core.Future;
 import io.vertx.core.MultiMap;
 import io.vertx.core.Promise;
 import io.vertx.core.json.JsonArray;
 import io.vertx.core.json.JsonObject;
+import io.vertx.ext.web.client.WebClientSession;
 import io.vertx.uritemplate.UriTemplate;
 import org.apache.commons.lang3.StringUtils;
 
@@ -18,10 +20,12 @@ import java.util.*;
 
 /**
  * 蓝奏云优享
- *
+ * v019b22
  */
 public class IzTool extends PanBase {
 
+    WebClientSession webClientSession = WebClientSession.create(clientNoRedirects);
+
     private static final String API_URL_PREFIX = "https://api.ilanzou.com/unproved/";
 
     private static final String FIRST_REQUEST_URL = API_URL_PREFIX + "recommend/list?devType=6&devModel=Chrome" +
@@ -70,6 +74,19 @@ public class IzTool extends PanBase {
         super(shareLinkInfo);
     }
 
+    private void setCookie(String html) {
+        int beginIndex = html.indexOf("arg1='") + 6;
+        String arg1 = html.substring(beginIndex, html.indexOf("';", beginIndex));
+        String acw_sc__v2 = AcwScV2Generator.acwScV2Simple(arg1);
+        // 创建一个 Cookie 并放入 CookieStore
+        DefaultCookie nettyCookie = new DefaultCookie("acw_sc__v2", acw_sc__v2);
+        nettyCookie.setDomain(".ilanzou.com"); // 设置域名
+        nettyCookie.setPath("/");             // 设置路径
+        nettyCookie.setSecure(false);
+        nettyCookie.setHttpOnly(false);
+        webClientSession.cookieStore().put(nettyCookie);
+    }
+
     public Future<String> parse() {
         String shareId = shareLinkInfo.getShareKey();
 
@@ -80,19 +97,52 @@ public class IzTool extends PanBase {
         // POST https://api.ilanzou.com/ws/recommend/list?devType=6&devModel=Chrome&extra=2&shareId=146731&type=0&offset=1&limit=60
         String url = StringUtils.isBlank(shareLinkInfo.getSharePassword()) ? FIRST_REQUEST_URL
                 : (FIRST_REQUEST_URL + "&code=" + shareLinkInfo.getSharePassword());
-        client.postAbs(UriTemplate.of(VIP_REQUEST_URL))
+        webClientSession.postAbs(UriTemplate.of(VIP_REQUEST_URL))
                 .setTemplateParam("uuid", uuid)
                 .setTemplateParam("ts", tsEncode)
                 .send().onSuccess(r0 -> { // 忽略res
                     // 第一次请求 获取文件信息
                     // POST https://api.feijipan.com/ws/recommend/list?devType=6&devModel=Chrome&extra=2&shareId=146731&type=0&offset=1&limit=60
-                    client.postAbs(UriTemplate.of(url))
+                    webClientSession.postAbs(UriTemplate.of(url))
                             .putHeaders(header)
                             .setTemplateParam("shareId", shareId)
                             .setTemplateParam("uuid", uuid)
                             .setTemplateParam("ts", tsEncode)
                             .send().onSuccess(res -> {
-                                JsonObject resJson = asJson(res);
+                                String resBody = asText(res);
+                                // 检查是否包含 cookie 验证
+                                if (resBody.contains("var arg1='")) {
+                                    webClientSession = WebClientSession.create(clientNoRedirects);
+                                    setCookie(resBody);
+                                    // 重新请求
+                                    webClientSession.postAbs(UriTemplate.of(url))
+                                            .putHeaders(header)
+                                            .setTemplateParam("shareId", shareId)
+                                            .setTemplateParam("uuid", uuid)
+                                            .setTemplateParam("ts", tsEncode)
+                                            .send().onSuccess(res2 -> {
+                                                handleParseResponse(asText(res2), shareId);
+                                            }).onFailure(handleFail(FIRST_REQUEST_URL));
+                                    return;
+                                }
+                                handleParseResponse(resBody, shareId);
+                            }).onFailure(handleFail(FIRST_REQUEST_URL));
+                });
+        return promise.future();
+    }
+
+    private void handleParseResponse(String resBody, String shareId) {
+        JsonObject resJson;
+        try {
+            resJson = new JsonObject(resBody);
+        } catch (Exception e) {
+            fail(FIRST_REQUEST_URL + " 解析JSON失败: " + resBody);
+            return;
+        }
+        if (resJson.isEmpty()) {
+            fail(FIRST_REQUEST_URL + " 返回内容为空");
+            return;
+        }
         if (resJson.getInteger("code") != 200) {
             fail(FIRST_REQUEST_URL + " 返回异常: " + resJson);
             return;
@@ -125,7 +175,7 @@ public class IzTool extends PanBase {
         String fidEncode = AESUtils.encrypt2HexIz(fileId + "|" + userId);
         String auth = AESUtils.encrypt2HexIz(fileId + "|" + nowTs);
         // 第二次请求
-                                clientNoRedirects.getAbs(UriTemplate.of(SECOND_REQUEST_URL))
+        webClientSession.getAbs(UriTemplate.of(SECOND_REQUEST_URL))
                 .setTemplateParam("fidEncode", fidEncode)
                 .setTemplateParam("uuid", uuid)
                 .setTemplateParam("ts", tsEncode)
@@ -139,9 +189,6 @@ public class IzTool extends PanBase {
                     }
                     promise.complete(headers.get("Location"));
                 }).onFailure(handleFail(SECOND_REQUEST_URL));
-                            }).onFailure(handleFail(FIRST_REQUEST_URL));
-                });
-        return promise.future();
     }
 
     @Override
@@ -174,7 +221,7 @@ public class IzTool extends PanBase {
         log.debug("开始解析目录: {}, shareId: {}, uuid: {}, ts: {}", id, shareId, uuid, tsEncode);
         // 开始解析目录: 164312216, shareId: bPMsbg5K, uuid: 0fmVWTx2Ea4zFwkpd7KXf, ts: 20865d7b7f00828279f437cd1f097860
         // 拿到目录ID
-        client.postAbs(UriTemplate.of(FILE_LIST_URL))
+        webClientSession.postAbs(UriTemplate.of(FILE_LIST_URL))
                 .putHeaders(header)
                 .setTemplateParam("shareId", shareId)
                 .setTemplateParam("uuid", uuid)
@@ -264,7 +311,7 @@ public class IzTool extends PanBase {
     public Future<String> parseById() {
         // 第二次请求
         JsonObject paramJson = (JsonObject)shareLinkInfo.getOtherParam().get("paramJson");
-        clientNoRedirects.getAbs(UriTemplate.of(SECOND_REQUEST_URL))
+        webClientSession.getAbs(UriTemplate.of(SECOND_REQUEST_URL))
                 .setTemplateParam("fidEncode", paramJson.getString("fidEncode"))
                 .setTemplateParam("uuid", paramJson.getString("uuid"))
                 .setTemplateParam("ts", paramJson.getString("ts"))

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

@@ -11,14 +11,12 @@ import io.vertx.core.Promise;
 import io.vertx.core.json.JsonObject;
 import io.vertx.ext.web.client.WebClient;
 import io.vertx.ext.web.client.WebClientSession;
-import org.apache.commons.lang3.RegExUtils;
 import org.openjdk.nashorn.api.scripting.ScriptObjectMirror;
 
 import javax.script.ScriptException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import java.util.TreeMap;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -29,13 +27,14 @@ import java.util.regex.Pattern;
  */
 public class LzTool extends PanBase {
 
-    public static final String SHARE_URL_PREFIX = "https://wwwwp.lanzoup.com";
+    WebClientSession webClientSession = WebClientSession.create(clientNoRedirects);
+
+    public static final String SHARE_URL_PREFIX = "https://w1.lanzn.com/";
     MultiMap headers0 = HeaderUtils.parseHeaders("""
         Accept: text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.7
         Accept-Encoding: gzip, deflate
         Accept-Language: zh-CN,zh;q=0.9,en;q=0.8,en-GB;q=0.7,en-US;q=0.6
         Cache-Control: max-age=0
-        Cookie: codelen=1; pc_ad1=1
         DNT: 1
         Priority: u=0, i
         Sec-CH-UA: "Chromium";v="140", "Not=A?Brand";v="24", "Microsoft Edge";v="140"
@@ -63,6 +62,25 @@ public class LzTool extends PanBase {
                 .putHeaders(headers0)
                 .send().onSuccess(res -> {
                     String html = asText(res);
+                    if (html.contains("var arg1='")) {
+                        webClientSession = WebClientSession.create(clientNoRedirects);
+                        setCookie(html);
+                        webClientSession.getAbs(sUrl)
+                                .putHeaders(headers0)
+                                .send().onSuccess(res2 -> {
+                                    String html2 = asText(res2);
+                                    doParser(html2, pwd, sUrl);
+                                });
+
+                    } else {
+                        doParser(html, pwd, sUrl);
+                    }
+
+                }).onFailure(handleFail(sUrl));
+        return promise.future();
+    }
+
+    private void doParser(String html, String pwd, String sUrl) {
         try {
             setFileInfo(html, shareLinkInfo);
         } catch (Exception e) {
@@ -76,40 +94,68 @@ public class LzTool extends PanBase {
             try {
                 String jsText = getJsByPwd(pwd, html, "document.getElementById('rpt')");
                 ScriptObjectMirror scriptObjectMirror = JsExecUtils.executeDynamicJs(jsText, "down_p");
-                            getDownURL(sUrl, client, scriptObjectMirror);
+                getDownURL(sUrl, scriptObjectMirror);
             } catch (Exception e) {
                 fail(e, "js引擎执行失败");
             }
-                    } else {
+        }
+        else {
             // 没有密码
             String iframePath = matcher.group(1);
-                        client.getAbs(SHARE_URL_PREFIX + iframePath).send().onSuccess(res2 -> {
+            String absoluteURI = SHARE_URL_PREFIX + iframePath;
-                            String html2 = res2.bodyAsString();
+            webClientSession.getAbs(absoluteURI).putHeaders(headers0).send().onSuccess(res2 -> {
-
+                String html2= asText(res2);
-                            // 去TMD正则
                 // Matcher matcher2 = Pattern.compile("'sign'\s*:\s*'(\\w+)'").matcher(html2);
                 String jsText = getJsText(html2);
                 if (jsText == null) {
-                                fail(SHARE_URL_PREFIX + iframePath + " -> " + sUrl + ": js脚本匹配失败, 可能分享已失效");
+                    headers0.add("Referer", absoluteURI);
+                    setCookie(html2);
+                    webClientSession.getAbs(absoluteURI).send().onSuccess(res3 -> {
+                        String html3= asText(res3);
+                        String jsText3 = getJsText(html3);
+                        if (jsText3 != null) {
+                            try {
+                                ScriptObjectMirror scriptObjectMirror = JsExecUtils.executeDynamicJs(jsText3, null);
+                                getDownURL(sUrl, scriptObjectMirror);
+                            } catch (ScriptException | NoSuchMethodException e) {
+                                fail(e, "引擎执行失败");
+                            }
+                        } else  {
+
+                            fail(SHARE_URL_PREFIX + iframePath + " -> " + sUrl + ": 获取失败0, 可能分享已失效");
                             return;
                         }
+                    });
+                } else {
                     try {
                         ScriptObjectMirror scriptObjectMirror = JsExecUtils.executeDynamicJs(jsText, null);
-                                getDownURL(sUrl, client, scriptObjectMirror);
+                        getDownURL(sUrl, scriptObjectMirror);
                     } catch (ScriptException | NoSuchMethodException e) {
                         fail(e, "js引擎执行失败");
                     }
+                }
             }).onFailure(handleFail(SHARE_URL_PREFIX));
         }
-                }).onFailure(handleFail(sUrl));
+    }
-        return promise.future();
+
+    private void setCookie(String html2) {
+        int beginIndex = html2.indexOf("arg1='") + 6;
+        String arg1 = html2.substring(beginIndex, html2.indexOf("';", beginIndex));
+        String acw_sc__v2 = AcwScV2Generator.acwScV2Simple(arg1);
+        // 创建一个 Cookie 并放入 CookieStore
+        DefaultCookie nettyCookie = new DefaultCookie("acw_sc__v2", acw_sc__v2);
+        nettyCookie.setDomain(".lanzn.com"); // 设置域名
+        nettyCookie.setPath("/");             // 设置路径
+        nettyCookie.setSecure(false);
+        nettyCookie.setHttpOnly(false);
+        webClientSession.cookieStore().put(nettyCookie);
     }
 
     private String getJsByPwd(String pwd, String html, String subText) {
         String jsText = getJsText(html);
 
         if (jsText == null) {
-            throw new RuntimeException("js脚本匹配失败, 可能分享已失效");
+            throw new RuntimeException("获取失败1, 可能分享已失效");
         }
         jsText = jsText.replace("document.getElementById('pwd').value", "\"" + pwd + "\"");
         int i = jsText.indexOf(subText);
@@ -131,7 +177,7 @@ public class LzTool extends PanBase {
         return html.substring(startPos, endPos).replaceAll("<!--.*-->", "");
     }
 
-    private void getDownURL(String key, WebClient client, Map<String, ?> obj) {
+    private void getDownURL(String key, Map<String, ?> obj) {
         if (obj == null) {
             fail("需要访问密码");
             return;
@@ -163,7 +209,7 @@ public class LzTool extends PanBase {
         headers.set("referer", key);
         // action=downprocess&signs=%3Fctdf&websignkey=I5gl&sign=BWMGOF1sBTRWXwI9BjZdYVA7BDhfNAIyUG9UawJtUGMIPlAhACkCa1UyUTAAYFxvUj5XY1E7UGFXaFVq&websign=&kd=1&ves=1
         String url = SHARE_URL_PREFIX + url0;
-        client.postAbs(url).putHeaders(headers).sendForm(map).onSuccess(res2 -> {
+        webClientSession.postAbs(url).putHeaders(headers).sendForm(map).onSuccess(res2 -> {
             try {
                 JsonObject urlJson = asJson(res2);
                 String name = urlJson.getString("inf");
@@ -178,7 +224,6 @@ public class LzTool extends PanBase {
 
                 String downUrl = urlJson.getString("dom") + "/file/" + urlJson.getString("url");
                 headers.remove("Referer");
-                WebClientSession webClientSession = WebClientSession.create(client);
                 webClientSession.getAbs(downUrl).putHeaders(headers).send()
                         .onSuccess(res3 -> {
                             String location = res3.headers().get("Location");
@@ -195,12 +240,13 @@ public class LzTool extends PanBase {
                                 nettyCookie.setPath("/");             // 设置路径
                                 nettyCookie.setSecure(false);
                                 nettyCookie.setHttpOnly(false);
-                                webClientSession.cookieStore().put(nettyCookie);
+                                WebClientSession webClientSession2 = WebClientSession.create(clientNoRedirects);
-                                webClientSession.getAbs(downUrl).putHeaders(headers).send()
+                                webClientSession2.cookieStore().put(nettyCookie);
+                                webClientSession2.getAbs(downUrl).putHeaders(headers).send()
                                         .onSuccess(res4 -> {
                                             String location0 = res4.headers().get("Location");
                                             if (location0 == null) {
-                                                fail(downUrl + " -> 直链获取失败, 可能分享已失效");
+                                                fail(downUrl + " -> 直链获取失败2, 可能分享已失效");
                                             } else {
                                                 setDateAndComplate(location0);
                                             }
@@ -248,9 +294,24 @@ public class LzTool extends PanBase {
         String sUrl = shareLinkInfo.getShareUrl();
         String pwd = shareLinkInfo.getSharePassword();
 
-        WebClient client = clientNoRedirects;
+        webClientSession.getAbs(sUrl).send().onSuccess(res -> {
-        client.getAbs(sUrl).send().onSuccess(res -> {
             String html = res.bodyAsString();
+            // 检查是否需要 cookie 验证
+            if (html.contains("var arg1='")) {
+                webClientSession = WebClientSession.create(clientNoRedirects);
+                setCookie(html);
+                // 重新请求
+                webClientSession.getAbs(sUrl).send().onSuccess(res2 -> {
+                    handleFileListParse(res2.bodyAsString(), pwd, sUrl, promise);
+                }).onFailure(err -> promise.fail(err));
+                return;
+            }
+            handleFileListParse(html, pwd, sUrl, promise);
+        }).onFailure(err -> promise.fail(err));
+        return promise.future();
+    }
+
+    private void handleFileListParse(String html, String pwd, String sUrl, Promise<List<FileInfo>> promise) {
         try {
             String jsText = getJsByPwd(pwd, html, "var urls =window.location.href");
             ScriptObjectMirror scriptObjectMirror = JsExecUtils.executeDynamicJs(jsText, "file");
@@ -261,8 +322,27 @@ public class LzTool extends PanBase {
             MultiMap headers = getHeaders(sUrl);
 
             String url = SHARE_URL_PREFIX + "/filemoreajax.php?file=" + data.get("fid");
-                client.postAbs(url).putHeaders(headers).sendForm(map).onSuccess(res2 -> {
+            webClientSession.postAbs(url).putHeaders(headers).sendForm(map).onSuccess(res2 -> {
-                    JsonObject fileListJson = asJson(res2);
+                String resBody = asText(res2);
+                // 再次检查是否需要 cookie 验证
+                if (resBody.contains("var arg1='")) {
+                    setCookie(resBody);
+                    // 重新请求
+                    webClientSession.postAbs(url).putHeaders(headers).sendForm(map).onSuccess(res3 -> {
+                        handleFileListResponse(asText(res3), promise);
+                    }).onFailure(err -> promise.fail(err));
+                    return;
+                }
+                handleFileListResponse(resBody, promise);
+            }).onFailure(err -> promise.fail(err));
+        } catch (ScriptException | NoSuchMethodException e) {
+            promise.fail(e);
+        }
+    }
+
+    private void handleFileListResponse(String responseBody, Promise<List<FileInfo>> promise) {
+        try {
+            JsonObject fileListJson = new JsonObject(responseBody);
             if (fileListJson.getInteger("zt") != 1) {
                 promise.fail(baseMsg() + fileListJson.getString("info"));
                 return;
@@ -301,12 +381,9 @@ public class LzTool extends PanBase {
                 list.add(fileInfo);
             });
             promise.complete(list);
-                });
+        } catch (Exception e) {
-            } catch (ScriptException | NoSuchMethodException e) {
             promise.fail(e);
         }
-        });
-        return promise.future();
     }
 
     void setFileInfo(String html, ShareLinkInfo shareLinkInfo) {

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

@@ -1,11 +1,13 @@
 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 io.vertx.core.json.JsonObject;
+import java.util.regex.Matcher;
-import io.vertx.uritemplate.UriTemplate;
+import java.util.regex.Pattern;
 
 /**
  * <a href="https://passport2.chaoxing.com">超星云盘</a>
@@ -19,24 +21,135 @@ 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();
-                    // 获取download
+                    try {
-                    String str = "var fileinfo = {";
+                        // 提取文件信息
-                    String fileInfo = res.bodyAsString().substring(res.bodyAsString().indexOf(str) + str.length() - 1
+                        setFileInfo(body);
-                            , res.bodyAsString().indexOf("};") + 1);
+                        
-                    fileInfo = fileInfo.replace("'", "\"");
+                        // 直接用正则提取download链接
-                    JsonObject jsonObject = new JsonObject(fileInfo);
+                        String download = extractDownloadUrl(body);
-                    String download = jsonObject.getString("download");
+                        if (download != null && download.contains("fn=")) {
-                    if (download.contains("fn=")) {
                             complete(download);
                         } else {
-                        fail("获取下载链接失败: 不支持的文件类型: {}", jsonObject.getString("suffix"));
+                            fail("获取下载链接失败");
+                        }
+                    } 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,14 +25,16 @@
 
         <packageDirectory>${project.basedir}/web-service/target/package</packageDirectory>
 
-        <vertx.version>4.5.22</vertx.version>
+        <!-- Vert.x 4.5.24 已包含安全修复，无需单独指定 Netty 版本 -->
+        <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.5</slf4j.version>
+        <slf4j.version>2.0.16</slf4j.version>
         <commons-lang3.version>3.18.0</commons-lang3.version>
         <commons-beanutils2.version>2.0.0</commons-beanutils2.version>
-        <jackson.version>2.14.2</jackson.version>
+        <jackson.version>2.18.2</jackson.version>
-        <logback.version>1.5.19</logback.version>
+        <!-- Logback 最新稳定版 -->
+        <logback.version>1.5.18</logback.version>
         <junit.version>4.13.2</junit.version>
     </properties>
 
@@ -46,6 +48,18 @@
                 <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>