fix: recognize 123pan uid.share links and trim paste input

Clipboard auto-detect now matches {userId}.share.123pan.cn/123pan/{key}, and the share URL field is trimmed on paste and blur. Split web-service compiler args so IDE rebuilds no longer wipe classes.

Co-authored-by: Cursor <cursoragent@cursor.com>

.github/workflows/maven.yml

@@ -8,7 +8,7 @@ on:
   workflow_dispatch:
   push:
     tags:
-      - '*'
+      - 'v*'
     branches-ignore:
       - '*'
     paths-ignore:
@@ -262,9 +262,27 @@ jobs:
         name: ${{ matrix.artifact-name }}
         path: ${{ matrix.artifact-name }}.zip
 
-    - name: 上传到 Release
+  # ================================================================
+  # 阶段三：创建 GitHub Release（只跑一次，避免矩阵任务重复拼接更新日志）
+  # ================================================================
+  publish-release:
+    name: 发布 GitHub Release
+    needs: native-package
+    if: github.event_name != 'pull_request' && github.ref_type == 'tag'
+    runs-on: ubuntu-latest
+    steps:
+    - name: 下载原生安装包
+      uses: actions/download-artifact@v4
+      with:
+        pattern: netdisk-fast-download-*
+        merge-multiple: true
+
+    - name: 创建 Release
       uses: softprops/action-gh-release@v2
       with:
-        files: ${{ matrix.artifact-name }}.zip
+        files: |
+          netdisk-fast-download-linux-amd64.zip
+          netdisk-fast-download-windows-amd64.zip
         tag_name: ${{ github.ref_name }}
         generate_release_notes: true
+        fail_on_unmatched_files: true

README.md

@@ -28,25 +28,31 @@ QQ交流群：1017480890
 [公益解析，lz0站](https://lz0.qaiu.top)  
 [专业版](https://189.qaiu.top)  
   
-
 ## 快速开始
-命令行下载分享文件：  
-```shell
-curl -LOJ "https://lz.qaiu.top/parser?url=https://share.feijipan.com/s/Tk1F2kGQ&pwd=1234"  
-```
-或者使用wget:  
-```shell
-wget -O bilibili.mp4 "https://lz.qaiu.top/parser?url=https://share.feijipan.com/s/Tk1F2kGQ&pwd=1234"
-```
-或者使用浏览器[直接访问](https://nfd-parser.github.io/nfd-preview/preview.html?src=https%3A%2F%2Flz.qaiu.top%2Fparser%3Furl%3Dhttps%3A%2F%2Fwww.ilanzou.com%2Fs%2FCDx6xKbT&name=bilibili.mp4&ext=mp4):
-```
-### 调用演示站下载：
-https://lz.qaiu.top/parser?url=https://www.ilanzou.com/s/CDx6xKbT&pwd=1234  
-### 调用演示站预览：
-https://nfd-parser.github.io/nfd-preview/preview.html?src=https%3A%2F%2Flz.qaiu.top%2Fparser%3Furl%3Dhttps%3A%2F%2Fwww.ilanzou.com%2Fs%2FCDx6xKbT&name=bilibili.mp4&ext=mp4  
 
+以带提取码的分享链接为例（提取码 `1234`），链接中含 `#`、`&`，作为 `url` 参数传入前必须做 URL 编码：
+
+`https://www.ecpan.cn/web/#/yunpanProxy?path=%2F%23%2Fdrive%2Foutside&data=70017ece572737b12b30709b7f029308eJD0&isShare=1`
+
+**命令行下载**
+
+```shell
+# curl
+curl -LOJ "https://lz.qaiu.top/parser?url=https%3A%2F%2Fwww.ecpan.cn%2Fweb%2F%23%2FyunpanProxy%3Fpath%3D%252F%2523%252Fdrive%252Foutside%26data%3D70017ece572737b12b30709b7f029308eJD0%26isShare%3D1&pwd=1234"
+
+# wget
+wget -O v01 "https://lz.qaiu.top/parser?url=https%3A%2F%2Fwww.ecpan.cn%2Fweb%2F%23%2FyunpanProxy%3Fpath%3D%252F%2523%252Fdrive%252Foutside%26data%3D70017ece572737b12b30709b7f029308eJD0%26isShare%3D1&pwd=1234"
 ```
 
+**短链方式**（key 取分享链接的 `data` 参数，提取码用 `@` 拼接）
+
+| 用途 | 地址 |
+| --- | --- |
+| 下载 | `https://lz.qaiu.top/ec/70017ece572737b12b30709b7f029308eJD0@1234` |
+| 在线预览 | [点击访问](https://nfd-parser.github.io/nfd-preview/preview.html?src=https%3A%2F%2Flz.qaiu.top%2Fec%2F70017ece572737b12b30709b7f029308eJD0%401234&name=v01&ext=mp4) |
+
+> 无提取码时去掉 `&pwd=1234` / `@1234` 即可；预览页 `src` 需编码（`@` → `%40`），用短链可避免二次编码。
+
 **解析器模块文档：** [parser/README.md](parser/README.md)
 
 **JavaScript解析器文档：** [JavaScript解析器开发指南](parser/doc/JAVASCRIPT_PARSER_GUIDE.md) | [自定义解析器扩展指南](parser/doc/CUSTOM_PARSER_GUIDE.md) | [快速开始](parser/doc/CUSTOM_PARSER_QUICKSTART.md)
@@ -133,6 +139,7 @@ GET /json/parser?url={分享链接}&pwd={密码}
 ```
 GET /json/{网盘标识}/{分享key}@{密码}
 ```
+注意： 移动云云空间的 `分享key` 取分享链接中的 `data` 参数值
 
 #### 3. 文件夹解析（v0.1.8fixed3+）
 
@@ -230,11 +237,6 @@ auths:
 
 如果只是临时调用一次，不想改动服务端配置，也可以用上面提到的 `auth` 参数临时传递（`authType` 可选 `password`/`accesstoken`/`authorization`），无需重启服务，仅本次请求生效。
 
-### 特殊说明
-
-- 移动云云空间的 `分享key` 取分享链接中的 `data` 参数值
-- 移动云云空间、小飞机网盘的加密分享可忽略密码参数
-
 ### 示例
 
 ```bash
@@ -455,7 +457,7 @@ docker run --rm -v /var/run/docker.sock:/var/run/docker.sock containrrr/watchtow
 > 注意: netdisk-fast-download.service中的ExecStart的路径改为实际路径
 ```shell
 cd ~
-wget -O netdisk-fast-download.zip https://github.com/qaiu/netdisk-fast-download/releases/download/v0.4.2/netdisk-fast-download-linux-amd64.zip
+wget -O netdisk-fast-download.zip https://github.com/qaiu/netdisk-fast-download/releases/download/v0.4.5/netdisk-fast-download-linux-amd64.zip
 unzip netdisk-fast-download.zip
 cd netdisk-fast-download
 bash service-install.sh

core/src/main/java/cn/qaiu/vx/core/util/CommonUtil.java

@@ -162,13 +162,18 @@ public class CommonUtil {
             try (var is = CommonUtil.class.getClassLoader().getResourceAsStream("app.properties")) {
                 if (is != null) {
                     properties.load(is);
-                    if (!properties.isEmpty()) {
+                    String version = properties.getProperty("app.version");
-                        appVersion = properties.getProperty("app.version") + "build" + properties.getProperty("build");
+                    String build = properties.getProperty("build");
+                    if (version != null && !version.contains("${")) {
+                        appVersion = version + "build" + (build == null || build.contains("${") ? "" : build);
                     }
                 }
-            } catch (IOException e) {
+            } catch (Exception e) {
                 LOGGER.error("读取app.properties失败", e);
             }
+            if (appVersion == null) {
+                appVersion = "unknown";
+            }
         }
         return appVersion;
     }

parser/pom.xml

@@ -63,7 +63,7 @@
         <lombok.version>1.18.38</lombok.version>
         <slf4j.version>2.0.16</slf4j.version>
         <commons-lang3.version>3.18.0</commons-lang3.version>
-        <jackson.version>2.18.6</jackson.version>
+        <jackson.version>2.18.9</jackson.version>
         <logback.version>1.5.32</logback.version>
         <junit.version>4.13.2</junit.version>
     </properties>

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

@@ -368,9 +368,12 @@ public abstract class PanBase implements IPanTool, Closeable {
         // 检查响应头中的Content-Encoding是否为gzip
         String contentEncoding = res.getHeader("Content-Encoding");
         try {
-            if ("gzip".equalsIgnoreCase(contentEncoding)) {
+            if ("gzip".equalsIgnoreCase(contentEncoding) && res.body() instanceof Buffer gzipBody
+                    && gzipBody.length() >= 2
+                    && (gzipBody.getByte(0) & 0xff) == 0x1f
+                    && (gzipBody.getByte(1) & 0xff) == 0x8b) {
                 // 如果是gzip压缩的响应体，解压（只解压一次，缓存结果）
-                String decompressed = decompressGzip((Buffer) res.body());
+                String decompressed = decompressGzip(gzipBody);
                 return new JsonObject(decompressed);
             } else {
                 return res.bodyAsJsonObject();

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

@@ -121,9 +121,9 @@ public enum PanDomainTemplate {
             "https://lecloud.lenovo.com/share/{shareKey}",
             LeTool.class),
 
-    // https://v2.fangcloud.com/s/
+    // https://v2.fangcloud.com/s/  https://v2.fangcloud.cn/h5/share/ (移动端H5落地页)
     FC("亿方云",
-            compile("https://v2\\.fangcloud\\.(com|cn)/(s|share|sharing)/(?<KEY>.+)"),
+            compile("https://v2\\.fangcloud\\.(com|cn)/(?:h5/)?(s|share|sharing)/(?<KEY>.+)"),
             "https://v2.fangcloud.com/s/{shareKey}",
             "https://www.fangcloud.com/",
             FcTool.class),

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

@@ -22,6 +22,7 @@ public class FcTool extends PanBase {
 
     public static final String SHARE_URL_PREFIX = "https://v2.fangcloud.com/sharing/";
     public static final String SHARE_URL_PREFIX2 = "https://v2.fangcloud.cn/sharing/";
+    private static final String SHARE_INFO_URL = "https://v2.fangcloud.cn/apps/share_links/info/";
     private static final String DOWN_REQUEST_URL = "https://v2.fangcloud.cn/apps/files/download?file_id={fid}" +
             "&scenario=share&unique_name={uname}";
 
@@ -38,6 +39,25 @@ public class FcTool extends PanBase {
         final String dataKey = shareLinkInfo.getShareKey();
         final String pwd = shareLinkInfo.getSharePassword();
         WebClientSession sClient = WebClientSession.create(client);
+        // 先查询分享有效性, 避免分享已失效/已过期时仍去解析HTML, 报出令人困惑的技术错误
+        sClient.getAbs(SHARE_INFO_URL + dataKey).send().onSuccess(infoRes -> {
+            JsonObject infoJson = asJson(infoRes);
+            if (promise.future().isComplete()) {
+                return;
+            }
+            JsonObject process = infoJson.getJsonObject("process");
+            boolean isClosed = process != null && Boolean.TRUE.equals(process.getBoolean("is_closed"));
+            boolean isExpired = process != null && Boolean.TRUE.equals(process.getBoolean("is_expired"));
+            if (process == null || isClosed || isExpired) {
+                fail("分享已失效或不存在");
+                return;
+            }
+            doParse(dataKey, pwd, sClient);
+        }).onFailure(handleFail(SHARE_INFO_URL + dataKey));
+        return promise.future();
+    }
+
+    private void doParse(String dataKey, String pwd, WebClientSession sClient) {
         // 第一次请求 自动重定向
         sClient.getAbs(SHARE_URL_PREFIX + dataKey).send().onSuccess(res -> {
 
@@ -67,7 +87,6 @@ public class FcTool extends PanBase {
             }
             getDownURL(dataKey, promise, res, sClient);
         }).onFailure(handleFail(SHARE_URL_PREFIX + dataKey));
-        return promise.future();
     }
 
     private void getDownURL(String dataKey, Promise<String> promise, HttpResponse<Buffer> res,

parser/src/main/java/cn/qaiu/util/HttpResponseHelper.java

@@ -119,8 +119,18 @@ public class HttpResponseHelper {
         };
     }
 
+    private static boolean looksLikeGzip(Buffer compressed) {
+        return compressed != null && compressed.length() >= 2
+                && (compressed.getByte(0) & 0xff) == 0x1f
+                && (compressed.getByte(1) & 0xff) == 0x8b;
+    }
+
     // -------------------- gzip --------------------
     private static String decompressGzip(Buffer compressed) throws IOException {
+        // Vert.x 可能已解压但仍带 Content-Encoding: gzip，再走 GZIPInputStream 会变成 ZipException
+        if (!looksLikeGzip(compressed)) {
+            return compressed.toString(StandardCharsets.UTF_8);
+        }
         try (ByteArrayInputStream bais = new ByteArrayInputStream(compressed.getBytes());
              GZIPInputStream gzis = new GZIPInputStream(bais);
              InputStreamReader isr = new InputStreamReader(gzis, StandardCharsets.UTF_8);

parser/src/main/java/cn/qaiu/util/JsContent.java

@@ -101,59 +101,384 @@ public interface JsContent {
             """;
     String lz = """
             /**
-             * 蓝奏云解析器js签名获取工具
+             * 蓝奏云解析器 JS 沙箱：伪装 jQuery / document / window。
+             * 新版页面会用 document.cookie、location.reload、querySelector、
+             * $('#pwd').val()、.html()、.css() 等，这里做成可链式的最小实现。
+             * kdns.js 在浏览器里是 `var killdns = true`，需一并注入，否则 kd 会被改成 0。
              */
                         
             var signObj;
+            var __lzPwd = '';
+            var killdns = true;
                         
+            function __lzSetPwd(p) {
+              __lzPwd = p == null ? '' : String(p);
+            }
+                        
+            function __lzEl(id) {
+              var nid = String(id == null ? '' : id).replace(/^[#.]/, '');
+              var el = {
+                id: nid,
+                _value: nid === 'pwd' ? __lzPwd : '',
+                checked: false,
+                disabled: false,
+                innerHTML: '',
+                innerText: '',
+                textContent: '',
+                className: '',
+                style: { display: '', visibility: '', width: '', height: '' },
+                classList: {
+                  add: function () {},
+                  remove: function () {},
+                  contains: function () { return false; },
+                  toggle: function () {}
+                },
+                setAttribute: function () {},
+                getAttribute: function () { return null; },
+                removeAttribute: function () {},
+                addEventListener: function (t, fn) {
+                  if (typeof fn === 'function') {
+                    try { fn(); } catch (e) {}
+                  }
+                },
+                removeEventListener: function () {},
+                appendChild: function (n) { return n; },
+                removeChild: function (n) { return n; },
+                insertBefore: function (n) { return n; },
+                click: function () {},
+                focus: function () {},
+                blur: function () {},
+                submit: function () {},
+                select: function () {},
+                reset: function () {}
+              };
+              el.parentNode = el;
+              el.parentElement = el;
+              el.children = [];
+              el.childNodes = [];
+              el.firstChild = null;
+              el.lastChild = null;
+              try {
+                Object.defineProperty(el, 'value', {
+                  get: function () { return nid === 'pwd' ? __lzPwd : el._value; },
+                  set: function (v) {
+                    el._value = v;
+                    if (nid === 'pwd') {
+                      __lzPwd = v == null ? '' : String(v);
+                    }
+                  }
+                });
+              } catch (e) {
+                el.value = el._value;
+              }
+              return el;
+            }
+                        
+            function __lzJq(sel) {
+              var id = '';
+              if (typeof sel === 'string') {
+                id = sel.replace(/^[#.]/, '');
+              } else if (sel && sel.id) {
+                id = String(sel.id);
+              }
+              var el = (sel && sel.style && sel.addEventListener) ? sel : __lzEl(id);
+              var api = {
+                0: el,
+                length: 1,
+                selector: sel,
+                ready: function (fn) {
+                  if (typeof fn === 'function') {
+                    try { fn(jQuery); } catch (e) {}
+                  }
+                  return api;
+                },
+                on: function (t, fn) {
+                  if (typeof fn === 'function') {
+                    try { fn(); } catch (e) {}
+                  }
+                  return api;
+                },
+                off: function () { return api; },
+                bind: function (t, fn) { return api.on(t, fn); },
+                unbind: function () { return api; },
+                click: function (fn) {
+                  if (typeof fn === 'function') {
+                    try { fn(); } catch (e) {}
+                  }
+                  return api;
+                },
+                focus: function (fn) {
+                  if (typeof fn === 'function') {
+                    try { fn(); } catch (e) {}
+                  }
+                  return api;
+                },
+                blur: function () { return api; },
+                keyup: function (fn) {
+                  if (typeof fn === 'function') {
+                    try { fn(); } catch (e) {}
+                  }
+                  return api;
+                },
+                keydown: function (fn) { return api.keyup(fn); },
+                keypress: function (fn) { return api.keyup(fn); },
+                submit: function (fn) { return api.click(fn); },
+                change: function (fn) { return api.click(fn); },
+                hover: function () { return api; },
+                val: function (v) {
+                  if (arguments.length === 0) {
+                    if (typeof el.value !== 'undefined') {
+                      return el.value;
+                    }
+                    return (id === 'pwd') ? __lzPwd : '';
+                  }
+                  el.value = v;
+                  return api;
+                },
+                html: function (v) {
+                  if (arguments.length === 0) {
+                    return el.innerHTML;
+                  }
+                  el.innerHTML = v;
+                  return api;
+                },
+                text: function (v) {
+                  if (arguments.length === 0) {
+                    return el.innerText;
+                  }
+                  el.innerText = v;
+                  el.textContent = v;
+                  return api;
+                },
+                attr: function (k, v) {
+                  if (arguments.length < 2) {
+                    return null;
+                  }
+                  return api;
+                },
+                prop: function (k, v) {
+                  if (arguments.length < 2) {
+                    return false;
+                  }
+                  return api;
+                },
+                css: function () { return api; },
+                addClass: function () { return api; },
+                removeClass: function () { return api; },
+                toggleClass: function () { return api; },
+                hasClass: function () { return false; },
+                show: function () {
+                  el.style.display = '';
+                  return api;
+                },
+                hide: function () {
+                  el.style.display = 'none';
+                  return api;
+                },
+                fadeIn: function () { return api; },
+                fadeOut: function () { return api; },
+                animate: function () { return api; },
+                find: function () { return api; },
+                parent: function () { return api; },
+                children: function () { return api; },
+                eq: function () { return api; },
+                first: function () { return api; },
+                last: function () { return api; },
+                each: function (fn) {
+                  if (typeof fn === 'function') {
+                    try { fn.call(el, 0, el); } catch (e) {}
+                  }
+                  return api;
+                },
+                append: function () { return api; },
+                prepend: function () { return api; },
+                remove: function () { return api; },
+                empty: function () { return api; },
+                ajax: function (obj) {
+                  signObj = obj;
+                  return api;
+                },
+                get: function () { return el; }
+              };
+              return api;
+            }
                         
             var $, jQuery;
-                        
+            $ = jQuery = function (sel) {
-            $ = jQuery = function () {
+              if (typeof sel === 'function') {
-              return new jQuery.fn.init();
+                try { sel(jQuery); } catch (e) {}
-            }
+                return __lzJq(document);
+              }
+              return __lzJq(sel);
+            };
                         
             jQuery.fn = jQuery.prototype = {
-              init: function () {
+              init: function (sel) {
-                return {
+                return __lzJq(sel);
-                  focus: function (a) {
+              }
-                        
+            };
-                  },
-                  keyup: function(a) {
-                        
-                  },
-                  ajax: function (obj) {
-                    signObj = obj
-                  },
-                  val: function(a) {
-                        
-                  },
-                        
-                }
-              },
-                        
-            }
-                        
             jQuery.fn.init.prototype = jQuery.fn;
-                        
+            $.fn = jQuery.fn;
                         
             $.ajax = function (obj) {
-              signObj = obj
+              signObj = obj;
-            }
+              return {
+                done: function () { return this; },
+                fail: function () { return this; },
+                always: function () { return this; }
+              };
+            };
+            $.get = function () {};
+            $.post = function () {};
+            $.extend = function () {
+              var t = arguments[0] || {};
+              for (var i = 1; i < arguments.length; i++) {
+                var s = arguments[i];
+                if (s) {
+                  for (var k in s) {
+                    if (s.hasOwnProperty(k)) {
+                      t[k] = s[k];
+                    }
+                  }
+                }
+              }
+              return t;
+            };
+            $.each = function (obj, fn) {
+              if (!obj || typeof fn !== 'function') {
+                return obj;
+              }
+              if (typeof obj.length === 'number') {
+                for (var i = 0; i < obj.length; i++) {
+                  fn.call(obj[i], i, obj[i]);
+                }
+              } else {
+                for (var k in obj) {
+                  if (obj.hasOwnProperty(k)) {
+                    fn.call(obj[k], k, obj[k]);
+                  }
+                }
+              }
+              return obj;
+            };
+            $.isFunction = function (f) { return typeof f === 'function'; };
+            $.isArray = function (a) {
+              return Object.prototype.toString.call(a) === '[object Array]';
+            };
+            $.trim = function (s) {
+              return s == null ? '' : String(s).replace(/^\\s+|\\s+$/g, '');
+            };
+                        
+            var __lzLocation = {
+              href: '',
+              search: '',
+              pathname: '/',
+              hash: '',
+              host: '',
+              hostname: '',
+              protocol: 'https:',
+              port: '',
+              origin: '',
+              assign: function () {},
+              replace: function () {},
+              reload: function () {}
+            };
                         
             var document = {
-              getElementById: function (v) {
+              cookie: '',
-                return {
+              title: '',
-                  value: 'v',
+              domain: '',
-                  style: {
+              referrer: '',
-                    display: ''
+              readyState: 'complete',
-                  },
+              hidden: false,
-                  addEventListener: function() {}
+              visibilityState: 'visible',
+              documentElement: null,
+              body: null,
+              head: null,
+              location: __lzLocation,
+              getElementById: function (id) { return __lzEl(id); },
+              getElementsByClassName: function () { return []; },
+              getElementsByTagName: function (t) {
+                return t === 'script' ? [] : [__lzEl(t)];
+              },
+              getElementsByName: function () { return []; },
+              querySelector: function (s) { return __lzEl(s); },
+              querySelectorAll: function (s) { return [__lzEl(s)]; },
+              createElement: function (t) { return __lzEl(t); },
+              createTextNode: function (t) { return { nodeValue: t, data: t }; },
+              createDocumentFragment: function () { return __lzEl('fragment'); },
+              addEventListener: function (t, fn) {
+                if (typeof fn === 'function') {
+                  try { fn(); } catch (e) {}
                 }
               },
+              removeEventListener: function () {},
+              write: function () {},
+              writeln: function () {},
+              open: function () {},
+              close: function () {}
+            };
+            document.documentElement = __lzEl('html');
+            document.body = __lzEl('body');
+            document.head = __lzEl('head');
+                        
+            var navigator = {
+              userAgent: 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/134.0.0.0 Safari/537.36',
+              platform: 'Win32',
+              language: 'zh-CN',
+              cookieEnabled: true,
+              onLine: true
+            };
+                        
+            var location = __lzLocation;
+            var console = {
+              log: function () {},
+              warn: function () {},
+              error: function () {},
+              info: function () {},
+              debug: function () {}
+            };
+                        
+            function setTimeout(fn, delay) {
+              if (typeof fn === 'function' && (!delay || delay <= 0)) {
+                try { fn(); } catch (e) {}
+              }
+              return 0;
             }
-            
+            function setInterval() { return 0; }
-            var window = {location: {}}
+            function clearTimeout() {}
+            function clearInterval() {}
+                        
+            var window = {
+              location: __lzLocation,
+              document: document,
+              navigator: navigator,
+              console: console,
+              innerWidth: 1920,
+              innerHeight: 1080,
+              setTimeout: setTimeout,
+              setInterval: setInterval,
+              clearTimeout: clearTimeout,
+              clearInterval: clearInterval,
+              addEventListener: function (t, fn) {
+                if (typeof fn === 'function') {
+                  try { fn(); } catch (e) {}
+                }
+              },
+              removeEventListener: function () {},
+              atob: function (s) { return s; },
+              btoa: function (s) { return s; }
+            };
+            window.window = window;
+            window.top = window;
+            window.self = window;
+            window.parent = window;
+            window.jQuery = jQuery;
+            window.$ = $;
+                        
+            var top = window;
+            var self = window;
+            var parent = window;
             """;
 
     String kwSignString = """

parser/src/main/java/cn/qaiu/util/JsExecUtils.java

@@ -50,21 +50,47 @@ public class JsExecUtils {
      */
     public static ScriptObjectMirror executeDynamicJs(String jsText, String funName) throws ScriptException,
             NoSuchMethodException {
-        ScriptEngine engine = ENGINE_MANAGER.getEngineByName("JavaScript"); // 得到脚本引擎
+        return executeDynamicJs(jsText, funName, null);
+    }
+
+    /**
+     * @param pwd 分享密码，写入伪 DOM（#pwd / getElementById('pwd')），供新版页面取值
+     */
+    public static ScriptObjectMirror executeDynamicJs(String jsText, String funName, String pwd) throws ScriptException,
+            NoSuchMethodException {
+        ScriptEngine engine = ENGINE_MANAGER.getEngineByName("JavaScript");
         try {
-            engine.eval(JsContent.lz + "\n" + jsText);
+            engine.eval(JsContent.lz);
             Invocable inv = (Invocable) engine;
-            //调用js中的函数
+            if (pwd != null) {
-            if (StringUtils.isNotEmpty(funName)) {
+                inv.invokeFunction("__lzSetPwd", pwd);
-                inv.invokeFunction(funName);
             }
-            return (ScriptObjectMirror) engine.get("signObj");
+            try {
+                engine.eval(jsText);
+                if (StringUtils.isNotEmpty(funName)) {
+                    inv.invokeFunction(funName);
+                }
+            } catch (ScriptException | NoSuchMethodException | RuntimeException e) {
+                ScriptObjectMirror captured = asSignObj(engine.get("signObj"));
+                if (captured != null) {
+                    return captured;
+                }
+                throw e;
+            }
+            return asSignObj(engine.get("signObj"));
         } finally {
-            // 清理引擎持有的引用，帮助 GC 回收
             clearEngineBindings(engine);
         }
     }
 
+    private static ScriptObjectMirror asSignObj(Object sign) {
+        if (sign instanceof ScriptObjectMirror mirror
+                && (mirror.get("url") != null || mirror.get("data") != null)) {
+            return mirror;
+        }
+        return null;
+    }
+
 
     /**
      * 调用执行js文件（使用缓存的 ScriptEngineManager 创建新引擎实例）

parser/src/main/resources/js/lz.js

@@ -1,46 +1,379 @@
 /**
- * 蓝奏云解析器js签名获取工具
+ * 蓝奏云解析器 JS 沙箱：伪装 jQuery / document / window。
+ * 新版页面会用 document.cookie、location.reload、querySelector、
+ * $('#pwd').val()、.html()、.css() 等，这里做成可链式的最小实现。
+ * kdns.js 在浏览器里是 `var killdns = true`，需一并注入，否则 kd 会被改成 0。
  */
 
 var signObj;
+var __lzPwd = '';
+var killdns = true;
 
+function __lzSetPwd(p) {
+  __lzPwd = p == null ? '' : String(p);
+}
+
+function __lzEl(id) {
+  var nid = String(id == null ? '' : id).replace(/^[#.]/, '');
+  var el = {
+    id: nid,
+    _value: nid === 'pwd' ? __lzPwd : '',
+    checked: false,
+    disabled: false,
+    innerHTML: '',
+    innerText: '',
+    textContent: '',
+    className: '',
+    style: { display: '', visibility: '', width: '', height: '' },
+    classList: {
+      add: function () {},
+      remove: function () {},
+      contains: function () { return false; },
+      toggle: function () {}
+    },
+    setAttribute: function () {},
+    getAttribute: function () { return null; },
+    removeAttribute: function () {},
+    addEventListener: function (t, fn) {
+      if (typeof fn === 'function') {
+        try { fn(); } catch (e) {}
+      }
+    },
+    removeEventListener: function () {},
+    appendChild: function (n) { return n; },
+    removeChild: function (n) { return n; },
+    insertBefore: function (n) { return n; },
+    click: function () {},
+    focus: function () {},
+    blur: function () {},
+    submit: function () {},
+    select: function () {},
+    reset: function () {}
+  };
+  el.parentNode = el;
+  el.parentElement = el;
+  el.children = [];
+  el.childNodes = [];
+  el.firstChild = null;
+  el.lastChild = null;
+  try {
+    Object.defineProperty(el, 'value', {
+      get: function () { return nid === 'pwd' ? __lzPwd : el._value; },
+      set: function (v) {
+        el._value = v;
+        if (nid === 'pwd') {
+          __lzPwd = v == null ? '' : String(v);
+        }
+      }
+    });
+  } catch (e) {
+    el.value = el._value;
+  }
+  return el;
+}
+
+function __lzJq(sel) {
+  var id = '';
+  if (typeof sel === 'string') {
+    id = sel.replace(/^[#.]/, '');
+  } else if (sel && sel.id) {
+    id = String(sel.id);
+  }
+  var el = (sel && sel.style && sel.addEventListener) ? sel : __lzEl(id);
+  var api = {
+    0: el,
+    length: 1,
+    selector: sel,
+    ready: function (fn) {
+      if (typeof fn === 'function') {
+        try { fn(jQuery); } catch (e) {}
+      }
+      return api;
+    },
+    on: function (t, fn) {
+      if (typeof fn === 'function') {
+        try { fn(); } catch (e) {}
+      }
+      return api;
+    },
+    off: function () { return api; },
+    bind: function (t, fn) { return api.on(t, fn); },
+    unbind: function () { return api; },
+    click: function (fn) {
+      if (typeof fn === 'function') {
+        try { fn(); } catch (e) {}
+      }
+      return api;
+    },
+    focus: function (fn) {
+      if (typeof fn === 'function') {
+        try { fn(); } catch (e) {}
+      }
+      return api;
+    },
+    blur: function () { return api; },
+    keyup: function (fn) {
+      if (typeof fn === 'function') {
+        try { fn(); } catch (e) {}
+      }
+      return api;
+    },
+    keydown: function (fn) { return api.keyup(fn); },
+    keypress: function (fn) { return api.keyup(fn); },
+    submit: function (fn) { return api.click(fn); },
+    change: function (fn) { return api.click(fn); },
+    hover: function () { return api; },
+    val: function (v) {
+      if (arguments.length === 0) {
+        if (typeof el.value !== 'undefined') {
+          return el.value;
+        }
+        return (id === 'pwd') ? __lzPwd : '';
+      }
+      el.value = v;
+      return api;
+    },
+    html: function (v) {
+      if (arguments.length === 0) {
+        return el.innerHTML;
+      }
+      el.innerHTML = v;
+      return api;
+    },
+    text: function (v) {
+      if (arguments.length === 0) {
+        return el.innerText;
+      }
+      el.innerText = v;
+      el.textContent = v;
+      return api;
+    },
+    attr: function (k, v) {
+      if (arguments.length < 2) {
+        return null;
+      }
+      return api;
+    },
+    prop: function (k, v) {
+      if (arguments.length < 2) {
+        return false;
+      }
+      return api;
+    },
+    css: function () { return api; },
+    addClass: function () { return api; },
+    removeClass: function () { return api; },
+    toggleClass: function () { return api; },
+    hasClass: function () { return false; },
+    show: function () {
+      el.style.display = '';
+      return api;
+    },
+    hide: function () {
+      el.style.display = 'none';
+      return api;
+    },
+    fadeIn: function () { return api; },
+    fadeOut: function () { return api; },
+    animate: function () { return api; },
+    find: function () { return api; },
+    parent: function () { return api; },
+    children: function () { return api; },
+    eq: function () { return api; },
+    first: function () { return api; },
+    last: function () { return api; },
+    each: function (fn) {
+      if (typeof fn === 'function') {
+        try { fn.call(el, 0, el); } catch (e) {}
+      }
+      return api;
+    },
+    append: function () { return api; },
+    prepend: function () { return api; },
+    remove: function () { return api; },
+    empty: function () { return api; },
+    ajax: function (obj) {
+      signObj = obj;
+      return api;
+    },
+    get: function () { return el; }
+  };
+  return api;
+}
 
 var $, jQuery;
-
+$ = jQuery = function (sel) {
-$ = jQuery = function () {
+  if (typeof sel === 'function') {
-  return new jQuery.fn.init();
+    try { sel(jQuery); } catch (e) {}
-}
+    return __lzJq(document);
+  }
+  return __lzJq(sel);
+};
 
 jQuery.fn = jQuery.prototype = {
-  init: function () {
+  init: function (sel) {
-    return {
+    return __lzJq(sel);
-      focus: function (a) {
+  }
-
+};
-      },
-      keyup: function(a) {
-
-      },
-      ajax: function (obj) {
-        signObj = obj
-      }
-
-    }
-  },
-
-}
-
 jQuery.fn.init.prototype = jQuery.fn;
+$.fn = jQuery.fn;
 
-
-// 伪装jquery.ajax函数获取关键数据
 $.ajax = function (obj) {
-  signObj = obj
+  signObj = obj;
-}
+  return {
+    done: function () { return this; },
+    fail: function () { return this; },
+    always: function () { return this; }
+  };
+};
+$.get = function () {};
+$.post = function () {};
+$.extend = function () {
+  var t = arguments[0] || {};
+  for (var i = 1; i < arguments.length; i++) {
+    var s = arguments[i];
+    if (s) {
+      for (var k in s) {
+        if (s.hasOwnProperty(k)) {
+          t[k] = s[k];
+        }
+      }
+    }
+  }
+  return t;
+};
+$.each = function (obj, fn) {
+  if (!obj || typeof fn !== 'function') {
+    return obj;
+  }
+  if (typeof obj.length === 'number') {
+    for (var i = 0; i < obj.length; i++) {
+      fn.call(obj[i], i, obj[i]);
+    }
+  } else {
+    for (var k in obj) {
+      if (obj.hasOwnProperty(k)) {
+        fn.call(obj[k], k, obj[k]);
+      }
+    }
+  }
+  return obj;
+};
+$.isFunction = function (f) { return typeof f === 'function'; };
+$.isArray = function (a) {
+  return Object.prototype.toString.call(a) === '[object Array]';
+};
+$.trim = function (s) {
+  return s == null ? '' : String(s).replace(/^\s+|\s+$/g, '');
+};
+
+var __lzLocation = {
+  href: '',
+  search: '',
+  pathname: '/',
+  hash: '',
+  host: '',
+  hostname: '',
+  protocol: 'https:',
+  port: '',
+  origin: '',
+  assign: function () {},
+  replace: function () {},
+  reload: function () {}
+};
 
 var document = {
-  getElementById: function (v) {
+  cookie: '',
-    return {
+  title: '',
-      value: 'v'
+  domain: '',
+  referrer: '',
+  readyState: 'complete',
+  hidden: false,
+  visibilityState: 'visible',
+  documentElement: null,
+  body: null,
+  head: null,
+  location: __lzLocation,
+  getElementById: function (id) { return __lzEl(id); },
+  getElementsByClassName: function () { return []; },
+  getElementsByTagName: function (t) {
+    return t === 'script' ? [] : [__lzEl(t)];
+  },
+  getElementsByName: function () { return []; },
+  querySelector: function (s) { return __lzEl(s); },
+  querySelectorAll: function (s) { return [__lzEl(s)]; },
+  createElement: function (t) { return __lzEl(t); },
+  createTextNode: function (t) { return { nodeValue: t, data: t }; },
+  createDocumentFragment: function () { return __lzEl('fragment'); },
+  addEventListener: function (t, fn) {
+    if (typeof fn === 'function') {
+      try { fn(); } catch (e) {}
     }
   },
+  removeEventListener: function () {},
+  write: function () {},
+  writeln: function () {},
+  open: function () {},
+  close: function () {}
+};
+document.documentElement = __lzEl('html');
+document.body = __lzEl('body');
+document.head = __lzEl('head');
+
+var navigator = {
+  userAgent: 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/134.0.0.0 Safari/537.36',
+  platform: 'Win32',
+  language: 'zh-CN',
+  cookieEnabled: true,
+  onLine: true
+};
+
+var location = __lzLocation;
+var console = {
+  log: function () {},
+  warn: function () {},
+  error: function () {},
+  info: function () {},
+  debug: function () {}
+};
+
+function setTimeout(fn, delay) {
+  if (typeof fn === 'function' && (!delay || delay <= 0)) {
+    try { fn(); } catch (e) {}
+  }
+  return 0;
 }
+function setInterval() { return 0; }
+function clearTimeout() {}
+function clearInterval() {}
+
+var window = {
+  location: __lzLocation,
+  document: document,
+  navigator: navigator,
+  console: console,
+  innerWidth: 1920,
+  innerHeight: 1080,
+  setTimeout: setTimeout,
+  setInterval: setInterval,
+  clearTimeout: clearTimeout,
+  clearInterval: clearInterval,
+  addEventListener: function (t, fn) {
+    if (typeof fn === 'function') {
+      try { fn(); } catch (e) {}
+    }
+  },
+  removeEventListener: function () {},
+  atob: function (s) { return s; },
+  btoa: function (s) { return s; }
+};
+window.window = window;
+window.top = window;
+window.self = window;
+window.parent = window;
+window.jQuery = jQuery;
+window.$ = $;
+
+var top = window;
+var self = window;
+var parent = window;

parser/src/test/java/cn/qaiu/parser/PanDomainTemplateTest.java

@@ -170,6 +170,10 @@ public class PanDomainTemplateTest {
                 assertTrue("YE should match redirected mshare URL", redirectedUrl.find());
                 assertEquals("lN7UVv-pbYJ", redirectedUrl.group("KEY"));
 
+                Matcher shareUrl = yePattern.matcher("https://1815268665.share.123pan.cn/123pan/iaKtVv-r4aCd");
+                assertTrue("YE should match uid.share.123pan.cn URL", shareUrl.find());
+                assertEquals("iaKtVv-r4aCd", shareUrl.group("KEY"));
+
                 Matcher htmlUrl = yePattern.matcher("https://www.123278.com/s/lN7UVv-pbYJ.html?pwd=abcd");
                 assertTrue("YE should match html URL with query", htmlUrl.find());
                 assertEquals("lN7UVv-pbYJ", htmlUrl.group("KEY"));

parser/src/test/java/cn/qaiu/util/JsExecUtilsLzTest.java

@@ -0,0 +1,90 @@
+package cn.qaiu.util;
+
+import org.junit.Test;
+import org.openjdk.nashorn.api.scripting.ScriptObjectMirror;
+
+import java.util.Map;
+
+import static org.junit.Assert.*;
+
+/**
+ * 新版蓝奏页面会调用更多 document / jQuery API，沙箱必须能跑完并抓住 $.ajax。
+ */
+public class JsExecUtilsLzTest {
+
+    @Test
+    public void testNewIframeAjaxWithDomApis() throws Exception {
+        String js = """
+                var lanosso = '';
+                var down_1 = '';
+                var wsk_sign = 'c20230908';
+                var wp_sign = 'SIGN_ABC';
+                var ajaxdata = 'MrBR';
+                var kdns = 1;
+                if (typeof(killdns)=='undefined'){
+                    var kdns = 0;
+                }
+                document.cookie = 'x=1';
+                document.location.reload();
+                document.querySelector('#tourl');
+                document.createElement('div');
+                $.ajax({
+                    type : 'post',
+                    url : '/ajaxfile.php?file=150233466',
+                    data : { 'action':'downprocess','websignkey':ajaxdata,'signs':ajaxdata,'sign':wp_sign,'websign':'','kd':kdns,'ves':1 },
+                    dataType : 'json',
+                    success:function(msg){
+                        $("#tourl").html("ok");
+                        $("#outime").css("display","block");
+                    }
+                });
+                """;
+        ScriptObjectMirror sign = JsExecUtils.executeDynamicJs(js, null);
+        assertNotNull(sign);
+        assertEquals("/ajaxfile.php?file=150233466", String.valueOf(sign.get("url")));
+        @SuppressWarnings("unchecked")
+        Map<String, Object> data = (Map<String, Object>) sign.get("data");
+        assertEquals("downprocess", String.valueOf(data.get("action")));
+        assertEquals("SIGN_ABC", String.valueOf(data.get("sign")));
+        assertEquals("MrBR", String.valueOf(data.get("websignkey")));
+        assertEquals("1", String.valueOf(data.get("kd")));
+    }
+
+    @Test
+    public void testPwdViaJqueryValAndDocument() throws Exception {
+        String js = """
+                function down_p(){
+                    var pwd = $('#pwd').val();
+                    var pwd2 = document.getElementById('pwd').value;
+                    var pwd3 = document.querySelector('#pwd').value;
+                    $(".passwdinput").focus();
+                    $.ajax({
+                        type : 'post',
+                        url : '/ajaxm.php',
+                        data : { 'action':'downprocess','sign':'S1','p':pwd,'p2':pwd2,'p3':pwd3 }
+                    });
+                }
+                """;
+        ScriptObjectMirror sign = JsExecUtils.executeDynamicJs(js, "down_p", "e4k4");
+        assertNotNull(sign);
+        @SuppressWarnings("unchecked")
+        Map<String, Object> data = (Map<String, Object>) sign.get("data");
+        assertEquals("e4k4", String.valueOf(data.get("p")));
+        assertEquals("e4k4", String.valueOf(data.get("p2")));
+        assertEquals("e4k4", String.valueOf(data.get("p3")));
+    }
+
+    @Test
+    public void testReadyAndSuccessCallbackDoNotDropAjax() throws Exception {
+        String js = """
+                $(function(){
+                    document.getElementById('rpt').style.display = 'none';
+                    $.ajax({ url: '/ajaxm.php?file=1', data: { a: 1 } });
+                    $("#tourl").html("x");
+                });
+                """;
+        ScriptObjectMirror sign = JsExecUtils.executeDynamicJs(js, null);
+        assertNotNull(sign);
+        assertTrue(String.valueOf(sign.get("url")).contains("ajaxm.php"));
+    }
+}

pom.xml

@@ -17,7 +17,7 @@
     </modules>
 
     <properties>
-        <revision>0.4.2</revision>
+        <revision>0.4.5</revision>
         <java.version>17</java.version>
         <maven.compiler.source>17</maven.compiler.source>
         <maven.compiler.target>17</maven.compiler.target>

verify_fangcloud_share.py

@@ -0,0 +1,169 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+"""
+亿方云 (FangCloud) 分享链接有效性验证脚本
+
+用法: 直接 `python3 verify_fangcloud_share.py` 运行, 分享链接已写死在 SHARE_URL
+里 (不走命令行传参), 要换链接就直接改这个常量。
+
+根因(已用真实分享链接验证确认)
+--------------------------------
+GET https://v2.fangcloud.cn/apps/share_links/info/{uname}
+返回的是 200 + JSON, 结构形如:
+
+    {
+      "process": {
+        "is_closed": false,
+        "is_expired": false,
+        "item": {"type": "file", "id": 45006535173, "name": "..."},
+        ...
+      }
+    }
+
+FcTool.java 原来的实现判断有效性时读的是响应体**顶层**的 "is_valid" 字段
+(`json.getBoolean("is_valid")`), 但这个字段根本不存在于该接口的实际响应里
+(有效性信息实际上是 process.is_closed / process.is_expired, 且没有任何
+名叫 "is_valid" 的字段) —— 所以旧的判断逻辑其实从未真正读取过这个接口的
+有效性判断, 而是走的另一套 HTML 抓取 typed_id 的流程, 分享失效时会得到一个
+"未匹配到文件id(typed_id)" 这种令人困惑的技术报错, 而不是清晰的"分享已失效"。
+
+修复方案(已同步到 FcTool.java): 解析前先请求一次
+https://v2.fangcloud.cn/apps/share_links/info/{uname}, 用
+process.is_closed / process.is_expired 判断分享是否有效, 无效则直接返回
+"分享已失效或不存在", 有效再继续走原来的 HTML + files/download 流程。
+
+本脚本用于本地复现/回归验证这条判断逻辑, 并顺带跑一遍完整的取直链流程。
+"""
+
+import re
+import sys
+import requests
+
+# 直接写死分享链接, 不通过命令行参数传入
+SHARE_URL = "https://v2.fangcloud.cn/h5/share/ded6dc6b9c3672b40b769804bf"
+
+# 如果分享有密码, 在这里填上, 没有就留空字符串
+SHARE_PASSWORD = ""
+
+HEADERS = {
+    "User-Agent": (
+        "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 "
+        "(KHTML, like Gecko) Chrome/124.0.0.0 Safari/537.36"
+    ),
+    "Accept": "application/json, text/html;q=0.9, */*;q=0.8",
+    "Accept-Language": "zh-CN,zh;q=0.9,en;q=0.8",
+}
+
+# 修复后的正则, 额外兼容 /h5/share/ 移动端落地页路径 (对齐 PanDomainTemplate.FC)
+FC_REGEX = re.compile(r"https://v2\.fangcloud\.(com|cn)/(?:h5/)?(s|share|sharing)/(?P<KEY>.+)")
+
+SHARE_INFO_URL = "https://v2.fangcloud.cn/apps/share_links/info/{key}"
+SHARE_URL_PREFIX = "https://v2.fangcloud.com/sharing/{key}"
+DOWN_REQUEST_URL = "https://v2.fangcloud.cn/apps/files/download"
+
+TYPED_ID_RE = re.compile(r'id="typed_id"\s+value="file_(\d+)"')
+
+
+def extract_share_key(url: str) -> str:
+    m = FC_REGEX.search(url)
+    if not m:
+        raise ValueError(f"无法从链接中提取 shareKey (正则不匹配): {url}")
+    return m.group("KEY")
+
+
+def check_is_valid(share_key: str, session: requests.Session) -> bool:
+    print("=" * 70)
+    print("Step 1. 请求 share_links/info 判断分享有效性 (对齐 FcTool.java 修复后的逻辑)")
+    print("=" * 70)
+    url = SHARE_INFO_URL.format(key=share_key)
+    r = session.get(url, timeout=15)
+    print(f"GET {url}")
+    print(f"状态码: {r.status_code}")
+    try:
+        data = r.json()
+    except Exception:
+        print("响应不是合法JSON => 判定分享已失效或不存在\n")
+        return False
+
+    process = data.get("process")
+    if not process:
+        print("响应中没有 process 字段 => 判定分享已失效或不存在\n")
+        return False
+
+    is_closed = bool(process.get("is_closed"))
+    is_expired = bool(process.get("is_expired"))
+    item = process.get("item")
+    print(f"is_closed = {is_closed}, is_expired = {is_expired}, item = {item}")
+
+    if is_closed or is_expired:
+        print("=> 分享已失效或不存在\n")
+        return False
+
+    print("=> 分享有效\n")
+    return True
+
+
+def get_download_url(share_key: str, pwd: str, session: requests.Session) -> str:
+    print("=" * 70)
+    print("Step 2. 走原有 HTML + files/download 流程取直链")
+    print("=" * 70)
+    r = session.get(SHARE_URL_PREFIX.format(key=share_key), timeout=15)
+    print(f"GET {SHARE_URL_PREFIX.format(key=share_key)} -> {r.status_code}, 最终URL: {r.url}")
+
+    html = r.text
+    if pwd:
+        # 加密分享: 提交密码换取跳转后的落地页 (此处仅示意, 具体见 FcTool.java)
+        m = re.search(r'name="requesttoken"\s+value="([a-zA-Z0-9_+=]+)"', html)
+        if not m:
+            raise RuntimeError("未匹配到加密分享的密码输入页面的 requesttoken")
+        token = m.group(1)
+        r2 = session.post(
+            "https://v2.fangcloud.cn/sharing/" + share_key,
+            data={"requesttoken": token, "password": pwd},
+            timeout=15,
+        )
+        html = r2.text
+
+    m = TYPED_ID_RE.search(html)
+    if not m:
+        raise RuntimeError("未匹配到文件id(typed_id), 分享可能是文件夹或页面结构有变化")
+    fid = m.group(1)
+    print(f"提取到 file_id = {fid}")
+
+    r3 = session.get(
+        DOWN_REQUEST_URL,
+        params={"file_id": fid, "scenario": "share", "unique_name": share_key},
+        timeout=15,
+        allow_redirects=False,
+    )
+    print(f"GET {DOWN_REQUEST_URL} -> {r3.status_code}")
+    if r3.status_code in (301, 302) and r3.headers.get("Location"):
+        return r3.headers["Location"]
+    data = r3.json()
+    if not data.get("success"):
+        raise RuntimeError(f"取直链失败: {data}")
+    return data["download_url"]
+
+
+def main() -> None:
+    share_key = extract_share_key(SHARE_URL)
+    print(f"分享链接: {SHARE_URL}")
+    print(f"提取到的 shareKey: {share_key}\n")
+
+    session = requests.Session()
+    session.headers.update(HEADERS)
+
+    if not check_is_valid(share_key, session):
+        print("结论: 分享无效, 不再继续取直链。")
+        sys.exit(1)
+
+    try:
+        url = get_download_url(share_key, SHARE_PASSWORD, session)
+        print(f"\n>>> 直链: {url}")
+    except Exception as e:
+        print(f"\n取直链失败: {e}")
+        sys.exit(1)
+
+
+if __name__ == "__main__":
+    main()

web-front/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nfd-web",
-  "version": "0.4.2",
+  "version": "0.4.5",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve",

web-front/src/parserUrl1.js

@@ -246,8 +246,8 @@
             storage: 'hash'
         },
         '123pan': {
-            reg: /((?:https?:\/\/)?www\.(123pan|123865|123684)\.com\/s\/[\w-]{6,})/,
+            reg: /((?:https?:\/\/)?(?:[a-zA-Z\d-]+\.(?:m?share)\.123pan\.cn\/123pan\/[\w-]+|(?:www\.)?(?:123panpay|123pan|123\d{3})\.(?:com|cn)\/s\/[\w-]{6,}(?:\.html)?)(?:\?[^#\s]*)?)/i,
-            host: /www\.123pan\.com/,
+            host: /(?:[a-zA-Z\d-]+\.(?:m?share)\.123pan\.cn|(?:www\.)?(?:123panpay|123pan|123\d{3})\.(?:com|cn))/i,
             input: ['.ca-fot input', ".appinput .appinput"],
             button: ['.ca-fot button', ".appinput button"],
             name: '123云盘',
@@ -377,6 +377,7 @@
         parseLink(text = '') {
             let obj = {name: '', link: '', storage: '', storagePwdName: ''};
             if (text) {
+                text = String(text).trim();
                 try {
                     text = decodeURIComponent(text);
                 } catch {
@@ -390,6 +391,9 @@
                         let matches = text.match(val.reg);
                         obj.name = val.name;
                         obj.link = matches[0];
+                        if (obj.link && !/^https?:\/\//i.test(obj.link)) {
+                            obj.link = 'https://' + obj.link.replace(/^\/\//, '');
+                        }
                         obj.storage = val.storage;
                         obj.storagePwdName = val.storagePwdName || null;
                         if (val.replaceHost) {

web-front/src/views/Home.vue

@@ -90,7 +90,7 @@
             <!-- 开关按钮，控制是否自动读取剪切板 -->
             <el-switch v-model="autoReadClipboard" active-text="自动识别剪切板"></el-switch>
 
-            <el-input placeholder="请粘贴分享链接(http://或https://)" v-model="link" id="url" @paste="onPaste">
+            <el-input placeholder="请粘贴分享链接(http://或https://)" v-model="link" id="url" @paste="onPaste" @blur="normalizeShortcutInput">
               <template #prepend>分享链接</template>
               <template #append v-if="!autoReadClipboard">
                 <el-button @click="getPaste(true)">读取剪切板</el-button>
@@ -1143,10 +1143,24 @@ export default {
     normalizeShortcutInput() {
       if (!this.link) return
       const trimmed = this.link.trim()
-      if (!trimmed) return
+      if (!trimmed) {
+        this.link = ''
+        return
+      }
+      this.link = trimmed
 
-      // 已经是直接链接，跳过
+      // 已经是直接链接：仍尝试从整段文本中抽出标准分享地址
-      if (trimmed.startsWith('http://') || trimmed.startsWith('https://')) return
+      if (trimmed.startsWith('http://') || trimmed.startsWith('https://')) {
+        const linkInfo = parserUrl.parseLink(trimmed)
+        if (linkInfo.link) {
+          this.link = linkInfo.link
+          const pwd = parserUrl.parsePwd(trimmed)
+          if (!this.password && pwd) {
+            this.password = pwd
+          }
+        }
+        return
+      }
 
       // 尝试短格式
       const shortInfo = this.expandShortFormat(trimmed)
@@ -1420,7 +1434,7 @@ export default {
     // 获取剪切板内容
     async getPaste(isManual = false) {
       try {
-        const text = await navigator.clipboard.readText()
+        const text = (await navigator.clipboard.readText() || '').trim()
 
         const shortInfo = this.expandShortFormat(text)
         if (shortInfo) {

web-service/pom.xml

@@ -30,6 +30,16 @@
             <groupId>cn.qaiu</groupId>
             <artifactId>parser</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <version>${jackson.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.datatype</groupId>
+            <artifactId>jackson-datatype-jsr310</artifactId>
+            <version>${jackson.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
@@ -81,7 +91,8 @@
                         ${project.basedir}/src/main/generated
                     </generatedSourcesDirectory>
                     <compilerArgs>
-                        <arg>-AoutputDirectory=${project.basedir}/src/main -Xlint:unchecked</arg>
+                        <arg>-AoutputDirectory=${project.basedir}/src/main</arg>
+                        <arg>-Xlint:unchecked</arg>
                     </compilerArgs>
                 </configuration>
             </plugin>

web-service/src/main/java/cn/qaiu/lz/web/controller/ParserApi.java

@@ -463,11 +463,14 @@ public class ParserApi {
     // 获取版本号
     @RouteMapping("/build-version")
     public String getVersion() {
-        return CommonUtil.getAppVersion()
+        String version = CommonUtil.getAppVersion();
+        if (version == null || version.isBlank()) {
+            return "unknown";
+        }
+        return version
         .replace("-", "")
         .replace("Z", "")
         .replace("T", "_")
-        .replace("-", "")
         .replace(":", "");
     }