代码结构优化

修复123pan解析错误的问题#9
2025-12-16 12:23:03 +00:00 · 2023-08-10 01:38:20 +08:00
parent 8ffd35f2f0
commit aafbf05d34
20 changed files with 215 additions and 236 deletions
--- a/core/src/main/java/cn/qaiu/vx/core/Deploy.java
+++ b/core/src/main/java/cn/qaiu/vx/core/Deploy.java
@@ -7,6 +7,7 @@ import cn.qaiu.vx.core.verticle.ReverseProxyVerticle;
 import cn.qaiu.vx.core.verticle.RouterVerticle;
 import cn.qaiu.vx.core.verticle.ServiceVerticle;
 import io.vertx.core.*;
+import io.vertx.core.impl.launcher.commands.VersionCommand;
 import io.vertx.core.json.JsonObject;
 import io.vertx.core.shareddata.LocalMap;
 import org.slf4j.Logger;
@@ -95,7 +96,7 @@ public final class Deploy {

        System.out.printf(logoTemplete,
                conf.getString("version_app"),
-                conf.getString("version_vertx"),
+                VersionCommand.getVersion(),
                conf.getString("copyright"),
                year
        );
--- a/core/src/main/java/cn/qaiu/vx/core/interceptor/Interceptor.java
+++ b/core/src/main/java/cn/qaiu/vx/core/interceptor/Interceptor.java
@@ -12,8 +12,10 @@ import io.vertx.ext.web.RoutingContext;
 public interface Interceptor {

    default Handler<RoutingContext> doHandle() {
-        return this::handle;
+        return this::beforeHandle;
    }

-    void handle(RoutingContext context);
+    void beforeHandle(RoutingContext context);
+
+    void afterHandle(RoutingContext context);
 }
--- a/core/src/main/java/cn/qaiu/vx/core/util/ReflectionUtil.java
+++ b/core/src/main/java/cn/qaiu/vx/core/util/ReflectionUtil.java
@@ -70,11 +70,11 @@ public final class ReflectionUtil {
        // 发现注解api层 没有继承父类时 这里反射一直有问题(Scanner SubTypesScanner was not configured)
        // 因此这里需要手动配置各种Scanner扫描器 -- https://blog.csdn.net/qq_29499107/article/details/106889781
        configurationBuilder.setScanners(
-                new SubTypesScanner(false), //允许getAllTypes获取所有Object的子类, 不设置为false则 getAllTypes 会报错.默认为true.
+                Scanners.SubTypes.filterResultsBy(s -> true), //允许getAllTypes获取所有Object的子类, 不设置为false则 getAllTypes 会报错.默认为true.
                new MethodParameterNamesScanner(), //设置方法参数名称 扫描器,否则调用getConstructorParamNames 会报错
-                new MethodAnnotationsScanner(), //设置方法注解 扫描器, 否则getConstructorsAnnotatedWith,getMethodsAnnotatedWith 会报错
+                Scanners.MethodsAnnotated, //设置方法注解 扫描器, 否则getConstructorsAnnotatedWith,getMethodsAnnotatedWith 会报错
                new MemberUsageScanner(),  //设置 member 扫描器,否则 getMethodUsage 会报错, 不推荐使用,有可能会报错 Caused by: java.lang.ClassCastException: javassist.bytecode.InterfaceMethodrefInfo cannot be cast to javassist.bytecode.MethodrefInfo
-                new TypeAnnotationsScanner() //设置类注解 扫描器 ,否则 getTypesAnnotatedWith 会报错
+                Scanners.TypesAnnotated //设置类注解 扫描器 ,否则 getTypesAnnotatedWith 会报错
        );

        configurationBuilder.filterInputsBy(filterBuilder);
--- a/web-service/src/main/java/cn/qaiu/lz/common/interceptorImpl/DefaultInterceptor.java
+++ b/web-service/src/main/java/cn/qaiu/lz/common/interceptorImpl/DefaultInterceptor.java
@@ -2,15 +2,10 @@ package cn.qaiu.lz.common.interceptorImpl;

 import cn.qaiu.vx.core.base.BaseHttpApi;
 import cn.qaiu.vx.core.interceptor.Interceptor;
-import cn.qaiu.vx.core.model.JsonResult;
-import cn.qaiu.vx.core.util.CommonUtil;
 import cn.qaiu.vx.core.util.SharedDataUtil;
-import cn.qaiu.vx.core.util.VertxHolder;
 import io.vertx.core.json.JsonArray;
-import io.vertx.core.shareddata.LocalMap;
 import io.vertx.ext.web.RoutingContext;
 import lombok.extern.slf4j.Slf4j;
-import lombok.val;

 /**
 * 默认拦截器实现
@@ -23,7 +18,12 @@ public class DefaultInterceptor implements Interceptor, BaseHttpApi {
    private final JsonArray ignores = SharedDataUtil.getJsonArrayForCustomConfig("ignoresReg");

    @Override
-    public void handle(RoutingContext ctx) {
+    public void beforeHandle(RoutingContext ctx) {
        ctx.next();
    }
+
+    @Override
+    public void afterHandle(RoutingContext context) {
+
+    }
 }
--- a/web-service/src/main/java/cn/qaiu/lz/common/parser/IPanTool.java
+++ b/web-service/src/main/java/cn/qaiu/lz/common/parser/IPanTool.java
@@ -4,42 +4,42 @@ import cn.qaiu.lz.common.parser.impl.*;
 import io.vertx.core.Future;

 public interface IPanTool {
-    Future<String> parse(String data, String code);
+    Future<String> parse();

-    static IPanTool typeMatching(String type) {
+    static IPanTool typeMatching(String type, String key, String pwd) {
        return switch (type) {
-            case "lz" -> new LzTool();
-            case "cow" -> new CowTool();
-            case "ec" -> new EcTool();
-            case "fc" -> new FcTool();
-            case "uc" -> new UcTool();
-            case "ye" -> new YeTool();
-            case "fj" -> new FjTool();
+            case "lz" -> new LzTool(key, pwd);
+            case "cow" -> new CowTool(key, pwd);
+            case "ec" -> new EcTool(key, pwd);
+            case "fc" -> new FcTool(key, pwd);
+            case "uc" -> new UcTool(key, pwd);
+            case "ye" -> new YeTool(key, pwd);
+            case "fj" -> new FjTool(key, pwd);
            default -> {
-                throw new IllegalArgumentException("未知分享类型");
+                throw new UnsupportedOperationException("未知分享类型");
            }
        };
    }

-    static IPanTool shareURLPrefixMatching(String url) {
+    static IPanTool shareURLPrefixMatching(String url, String pwd) {

        if (url.startsWith(CowTool.SHARE_URL_PREFIX)) {
-            return new CowTool();
+            return new CowTool(url, pwd);
        } else if (url.startsWith(EcTool.SHARE_URL_PREFIX)) {
-            return new EcTool();
+            return new EcTool(url, pwd);
        } else if (url.startsWith(FcTool.SHARE_URL_PREFIX0)) {
-            return new FcTool();
+            return new FcTool(url, pwd);
        } else if (url.startsWith(UcTool.SHARE_URL_PREFIX)) {
-            return new UcTool();
+            return new UcTool(url, pwd);
        } else if (url.startsWith(YeTool.SHARE_URL_PREFIX)) {
-            return new YeTool();
+            return new YeTool(url, pwd);
        } else if (url.startsWith(FjTool.SHARE_URL_PREFIX)) {
-            return new FjTool();
+            return new FjTool(url, pwd);
        } else if (url.contains("lanzou")) {
-            return new LzTool();
+            return new LzTool(url, pwd);
        }

-        throw new IllegalArgumentException("未知分享类型");
+        throw new UnsupportedOperationException("未知分享类型");
    }

 }
--- a/web-service/src/main/java/cn/qaiu/lz/common/parser/impl/CowTool.java
+++ b/web-service/src/main/java/cn/qaiu/lz/common/parser/impl/CowTool.java
@@ -1,14 +1,10 @@
 package cn.qaiu.lz.common.parser.impl;

 import cn.qaiu.lz.common.parser.IPanTool;
+import cn.qaiu.lz.common.parser.PanBase;
 import cn.qaiu.lz.common.util.CommonUtils;
-import cn.qaiu.lz.common.util.PanExceptionUtils;
-import cn.qaiu.vx.core.util.VertxHolder;
 import io.vertx.core.Future;
-import io.vertx.core.Promise;
 import io.vertx.core.json.JsonObject;
-import io.vertx.ext.web.client.WebClient;
-import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;

 /**
@@ -17,17 +13,19 @@ import org.apache.commons.lang3.StringUtils;
 * @author <a href="https://qaiu.top">QAIU</a>
 * @date 2023/4/21 21:19
 */
-@Slf4j
-public class CowTool implements IPanTool {
+public class CowTool extends PanBase implements IPanTool {

    private static final String API_REQUEST_URL = "https://cowtransfer.com/core/api/transfer/share";
    public static final String SHARE_URL_PREFIX = "https://cowtransfer.com/s/";

-    public Future<String> parse(String data, String code) {
-        Promise<String> promise = Promise.promise();
-        WebClient client = WebClient.create(VertxHolder.getVertxInstance());
-        String key = CommonUtils.adaptShortPaths(SHARE_URL_PREFIX, data);
-        client.getAbs(API_REQUEST_URL + "?uniqueUrl=" + key).send().onSuccess(res -> {
+    public CowTool(String key, String pwd) {
+        super(key, pwd);
+    }
+
+    public Future<String> parse() {
+        key = CommonUtils.adaptShortPaths(SHARE_URL_PREFIX, key);
+        String url = API_REQUEST_URL + "?uniqueUrl=" + key;
+        client.getAbs(url).send().onSuccess(res -> {
            JsonObject resJson = res.bodyAsJsonObject();
            if ("success".equals(resJson.getString("message")) && resJson.containsKey("data")) {
                JsonObject dataJson = resJson.getJsonObject("data");
@@ -44,19 +42,15 @@ public class CowTool implements IPanTool {
                            promise.complete(downloadUrl);
                            return;
                        }
-
-                        log.error("cow parse fail: {}; downloadUrl is empty", url2);
-                        promise.fail("cow parse fail: " + url2 + "; downloadUrl is empty");
+                        fail("cow parse fail: {}; downloadUrl is empty", url2);
                        return;
                    }
-                    log.error("cow parse fail: {}; json: {}", url2, res2Json);
-                    promise.fail("cow parse fail: " + url2 + "; json:" + res2Json);
-                });
+                    fail("cow parse fail: {}; json: {}", url2, res2Json);
+                }).onFailure(handleFail(url2));
                return;
            }
-            log.error("cow parse fail: {}; json: {}", key, resJson);
-            promise.fail("cow parse fail: " + key + "; json:" + resJson);
-        }).onFailure(t -> promise.fail(PanExceptionUtils.fillRunTimeException("Cow", key, t)));
+            fail("cow parse fail: {}; json: {}", key, resJson);
+        }).onFailure(handleFail(url));
        return promise.future();
    }

--- a/web-service/src/main/java/cn/qaiu/lz/common/parser/impl/EcTool.java
+++ b/web-service/src/main/java/cn/qaiu/lz/common/parser/impl/EcTool.java
@@ -1,22 +1,17 @@
 package cn.qaiu.lz.common.parser.impl;

 import cn.qaiu.lz.common.parser.IPanTool;
+import cn.qaiu.lz.common.parser.PanBase;
 import cn.qaiu.lz.common.util.CommonUtils;
-import cn.qaiu.lz.common.util.PanExceptionUtils;
-import cn.qaiu.vx.core.util.VertxHolder;
 import io.vertx.core.Future;
-import io.vertx.core.Promise;
 import io.vertx.core.json.JsonArray;
 import io.vertx.core.json.JsonObject;
-import io.vertx.ext.web.client.WebClient;
 import io.vertx.uritemplate.UriTemplate;
-import lombok.extern.slf4j.Slf4j;

 /**
 * 移动云空间解析
 */
-@Slf4j
-public class EcTool implements IPanTool {
+public class EcTool extends PanBase implements IPanTool {
    private static final String FIRST_REQUEST_URL = "https://www.ecpan.cn/drive/fileextoverrid" +
            ".do?chainUrlTemplate=https:%2F%2Fwww.ecpan" +
            ".cn%2Fweb%2F%23%2FyunpanProxy%3Fpath%3D%252F%2523%252Fdrive%252Foutside&parentId=-1&data={dataKey}";
@@ -25,10 +20,12 @@ public class EcTool implements IPanTool {

    public static final String SHARE_URL_PREFIX = "www.ecpan.cn/";

-    public Future<String> parse(String data, String code) {
-        String dataKey = CommonUtils.adaptShortPaths(SHARE_URL_PREFIX, data);
-        Promise<String> promise = Promise.promise();
-        WebClient client = WebClient.create(VertxHolder.getVertxInstance());
+    public EcTool(String key, String pwd) {
+        super(key, pwd);
+    }
+
+    public Future<String> parse() {
+        String dataKey = CommonUtils.adaptShortPaths(SHARE_URL_PREFIX, key);
        // 第一次请求 获取文件信息
        client.getAbs(UriTemplate.of(FIRST_REQUEST_URL)).setTemplateParam("dataKey", dataKey).send().onSuccess(res -> {
                    JsonObject jsonObject = res.bodyAsJsonObject();
@@ -37,8 +34,7 @@ public class EcTool implements IPanTool {
                            .getJsonObject("var")
                            .getJsonObject("chainFileInfo");
                    if (fileInfo.containsKey("errMesg")) {
-                        promise.fail(new RuntimeException(DOWNLOAD_REQUEST_URL + " 解析失败: "
-                                + fileInfo.getString("errMesg")) + " key = " + dataKey);
+                        fail("{} 解析失败:{} key = {}", FIRST_REQUEST_URL, fileInfo.getString("errMesg"), dataKey);
                        return;
                    }
                    JsonObject cloudpFile = fileInfo.getJsonObject("cloudpFile");
@@ -55,9 +51,9 @@ public class EcTool implements IPanTool {
                        JsonObject jsonRes = res2.bodyAsJsonObject();
                        log.debug("ecPan get download url -> {}", res2.body().toString());
                        promise.complete(jsonRes.getJsonObject("var").getString("downloadUrl"));
-                    }).onFailure(t -> promise.fail(PanExceptionUtils.fillRunTimeException("Ec", dataKey, t)));
+                    }).onFailure(handleFail(""));
                }
-        ).onFailure(t -> promise.fail(PanExceptionUtils.fillRunTimeException("Ec", dataKey, t)));;
+        ).onFailure(handleFail(FIRST_REQUEST_URL));
        return promise.future();
    }
 }
--- a/web-service/src/main/java/cn/qaiu/lz/common/parser/impl/FcTool.java
+++ b/web-service/src/main/java/cn/qaiu/lz/common/parser/impl/FcTool.java
@@ -1,18 +1,14 @@
 package cn.qaiu.lz.common.parser.impl;

 import cn.qaiu.lz.common.parser.IPanTool;
+import cn.qaiu.lz.common.parser.PanBase;
 import cn.qaiu.lz.common.util.CommonUtils;
-import cn.qaiu.lz.common.util.PanExceptionUtils;
-import cn.qaiu.vx.core.util.VertxHolder;
 import io.vertx.core.Future;
 import io.vertx.core.MultiMap;
 import io.vertx.core.Promise;
-import io.vertx.core.Vertx;
 import io.vertx.core.buffer.Buffer;
 import io.vertx.core.json.JsonObject;
 import io.vertx.ext.web.client.HttpResponse;
-import io.vertx.ext.web.client.WebClient;
-import io.vertx.ext.web.client.WebClientOptions;
 import io.vertx.ext.web.client.WebClientSession;
 import io.vertx.uritemplate.UriTemplate;
 import org.apache.commons.lang3.StringUtils;
@@ -23,7 +19,7 @@ import java.util.regex.Pattern;
 /**
 * 360亿方云
 */
-public class FcTool implements IPanTool {
+public class FcTool extends PanBase implements IPanTool {

    public static final String SHARE_URL_PREFIX0 = "https://v2.fangcloud.com/s";
    public static final String SHARE_URL_PREFIX = "https://v2.fangcloud.com/sharing/";
@@ -31,45 +27,44 @@ public class FcTool implements IPanTool {
    private static final String DOWN_REQUEST_URL = "https://v2.fangcloud.cn/apps/files/download?file_id={fid}" +
            "&scenario=share&unique_name={uname}";

-    public Future<String> parse(String data, String code) {
-        data = data.replace("share","sharing");
+    public FcTool(String key, String pwd) {
+        super(key, pwd);
+    }
+
+    public Future<String> parse() {
+        String data = key.replace("share","sharing");
        String dataKey = CommonUtils.adaptShortPaths(SHARE_URL_PREFIX, data);
-
-        Promise<String> promise = Promise.promise();
-
-        Vertx vertx = VertxHolder.getVertxInstance();
-        WebClient client = WebClient.create(vertx);
        WebClientSession sClient = WebClientSession.create(client);
        // 第一次请求 自动重定向
        sClient.getAbs(SHARE_URL_PREFIX + dataKey).send().onSuccess(res -> {

            // 判断是否是加密分享
-            if (StringUtils.isNotEmpty(code)) {
+            if (StringUtils.isNotEmpty(pwd)) {
                // 获取requesttoken
                String html = res.bodyAsString();
                Pattern compile = Pattern.compile("name=\"requesttoken\"\\s+value=\"([a-zA-Z0-9_+=]+)\"");
                Matcher matcher = compile.matcher(html);
                if (!matcher.find()) {
-                    promise.fail(SHARE_URL_PREFIX + " 未匹配到加密分享的密码输入页面的requesttoken: \n" + html);
+                    fail(SHARE_URL_PREFIX + " 未匹配到加密分享的密码输入页面的requesttoken");
                    return;
                }
                String token = matcher.group(1);

                sClient.postAbs(SHARE_URL_PREFIX2 + dataKey).sendForm(MultiMap.caseInsensitiveMultiMap()
                        .set("requesttoken", token)
-                        .set("password", code)).onSuccess(res2 -> {
+                        .set("password", pwd)).onSuccess(res2 -> {
                    if (res2.statusCode() == 302) {
-                        sClient.getAbs(res2.getHeader("Location")).send().onSuccess(res3 ->
-                                getDownURL(dataKey, promise, res3, sClient))
-                                .onFailure(t -> promise.fail(PanExceptionUtils.fillRunTimeException("Fc", dataKey, t)));
+                        sClient.getAbs(res2.getHeader("Location")).send()
+                                .onSuccess(res3 -> getDownURL(dataKey, promise, res3, sClient))
+                                .onFailure(handleFail(res2.getHeader("Location")));
                        return;
                    }
-                    promise.fail(SHARE_URL_PREFIX + " 密码跳转后获取重定向失败 \n" + html);
-                }).onFailure(t -> promise.fail(PanExceptionUtils.fillRunTimeException("Fc", dataKey, t)));
+                    fail(SHARE_URL_PREFIX + " 密码跳转后获取重定向失败");
+                }).onFailure(handleFail(SHARE_URL_PREFIX2));
                return;
            }
            getDownURL(dataKey, promise, res, sClient);
-        }).onFailure(t -> promise.fail(PanExceptionUtils.fillRunTimeException("Fc", dataKey, t)));
+        }).onFailure(handleFail(SHARE_URL_PREFIX + dataKey));
        return promise.future();
    }

@@ -80,14 +75,12 @@ public class FcTool implements IPanTool {
        Pattern compile = Pattern.compile("id=\"typed_id\"\\s+value=\"file_(\\d+)\"");
        Matcher matcher = compile.matcher(html);
        if (!matcher.find()) {
-            promise.fail(SHARE_URL_PREFIX + " 未匹配到文件id(typed_id): \n" + html);
+            fail(SHARE_URL_PREFIX + " 未匹配到文件id(typed_id)");
            return;
        }
        String fid = matcher.group(1);

        // 创建一个不自动重定向的WebClientSession
-        WebClient clientNoRedirects = WebClient.create(VertxHolder.getVertxInstance(),
-                new WebClientOptions().setFollowRedirects(false));
        WebClientSession sClientNoRedirects = WebClientSession.create(clientNoRedirects, sClient.cookieStore());
        // 第二次请求
        sClientNoRedirects.getAbs(UriTemplate.of(DOWN_REQUEST_URL))
@@ -97,14 +90,14 @@ public class FcTool implements IPanTool {
                    try {
                        resJson = res2.bodyAsJsonObject();
                    } catch (Exception e) {
-                        promise.fail(DOWN_REQUEST_URL + " 第二次请求没有返回JSON, 可能下载受限: " + res2.bodyAsString());
+                        fail(e, DOWN_REQUEST_URL + " 第二次请求没有返回JSON, 可能下载受限");
                        return;
                    }
                    if (!resJson.getBoolean("success")) {
-                        promise.fail(DOWN_REQUEST_URL + " 第二次请求未得到正确相应: " + resJson);
+                        fail(DOWN_REQUEST_URL + " 第二次请求未得到正确相应: " + resJson);
                        return;
                    }
                    promise.complete(resJson.getString("download_url"));
-                }).onFailure(t -> promise.fail(PanExceptionUtils.fillRunTimeException("Fc", dataKey, t)));
+                }).onFailure(handleFail(DOWN_REQUEST_URL));
    }
 }
--- a/web-service/src/main/java/cn/qaiu/lz/common/parser/impl/FjTool.java
+++ b/web-service/src/main/java/cn/qaiu/lz/common/parser/impl/FjTool.java
@@ -1,13 +1,12 @@
 package cn.qaiu.lz.common.parser.impl;

 import cn.qaiu.lz.common.parser.IPanTool;
+import cn.qaiu.lz.common.parser.PanBase;
 import cn.qaiu.lz.common.util.AESUtils;
 import cn.qaiu.lz.common.util.CommonUtils;
-import cn.qaiu.lz.common.util.PanExceptionUtils;
 import cn.qaiu.vx.core.util.VertxHolder;
 import io.vertx.core.Future;
 import io.vertx.core.MultiMap;
-import io.vertx.core.Promise;
 import io.vertx.core.json.JsonObject;
 import io.vertx.ext.web.client.WebClient;
 import io.vertx.ext.web.client.WebClientOptions;
@@ -20,7 +19,7 @@ import java.util.UUID;
 *
 * @version V016_230609
 */
-public class FjTool implements IPanTool {
+public class FjTool extends PanBase implements IPanTool {

    public static final String SHARE_URL_PREFIX = "https://www.feijix.com/s/";
    private static final String API_URL_PREFIX = "https://api.feijipan.com/ws/";
@@ -31,10 +30,13 @@ public class FjTool implements IPanTool {
    private static final String SECOND_REQUEST_URL = API_URL_PREFIX + "file/redirect?downloadId={fidEncode}&enable=1" +
            "&devType=6&uuid={uuid}&timestamp={ts}&auth={auth}";

-    public Future<String> parse(String data, String code) {
-        String dataKey = CommonUtils.adaptShortPaths(SHARE_URL_PREFIX, data);
+    public FjTool(String key, String pwd) {
+        super(key, pwd);
+    }
+
+    public Future<String> parse() {
+        String dataKey = CommonUtils.adaptShortPaths(SHARE_URL_PREFIX, key);

-        Promise<String> promise = Promise.promise();
        WebClient client = WebClient.create(VertxHolder.getVertxInstance(),
                new WebClientOptions().setFollowRedirects(false));
        String shareId = String.valueOf(AESUtils.idEncrypt(dataKey));
@@ -44,11 +46,11 @@ public class FjTool implements IPanTool {
        client.postAbs(UriTemplate.of(FIRST_REQUEST_URL)).setTemplateParam("shareId", shareId).send().onSuccess(res -> {
            JsonObject resJson = res.bodyAsJsonObject();
            if (resJson.getInteger("code") != 200) {
-                promise.fail(FIRST_REQUEST_URL + " 返回异常: " + resJson);
+                fail(FIRST_REQUEST_URL + " 返回异常: " + resJson);
                return;
            }
            if (resJson.getJsonArray("list").size() == 0) {
-                promise.fail(FIRST_REQUEST_URL + " 解析文件列表为空: " + resJson);
+                fail(FIRST_REQUEST_URL + " 解析文件列表为空: " + resJson);
                return;
            }
            // 文件Id
@@ -67,12 +69,12 @@ public class FjTool implements IPanTool {
                    .setTemplateParam("auth", auth).send().onSuccess(res2 -> {
                        MultiMap headers = res2.headers();
                        if (!headers.contains("Location")) {
-                            promise.fail(SECOND_REQUEST_URL + " 未找到重定向URL: \n" + res.headers());
+                            fail(SECOND_REQUEST_URL + " 未找到重定向URL: \n" + res.headers());
                            return;
                        }
                        promise.complete(headers.get("Location"));
-                    }).onFailure(t -> promise.fail(PanExceptionUtils.fillRunTimeException("Fj", dataKey, t)));
-        }).onFailure(t -> promise.fail(PanExceptionUtils.fillRunTimeException("Fj", dataKey, t)));
+                    }).onFailure(handleFail(SECOND_REQUEST_URL));
+        }).onFailure(handleFail(FIRST_REQUEST_URL));

        return promise.future();
    }
--- a/web-service/src/main/java/cn/qaiu/lz/common/parser/impl/LzTool.java
+++ b/web-service/src/main/java/cn/qaiu/lz/common/parser/impl/LzTool.java
@@ -1,7 +1,7 @@
 package cn.qaiu.lz.common.parser.impl;

 import cn.qaiu.lz.common.parser.IPanTool;
-import cn.qaiu.lz.common.util.PanExceptionUtils;
+import cn.qaiu.lz.common.parser.PanBase;
 import cn.qaiu.vx.core.util.VertxHolder;
 import io.vertx.core.Future;
 import io.vertx.core.MultiMap;
@@ -19,17 +19,20 @@ import java.util.regex.Pattern;
 * @author QAIU
 * @version 1.0 update 2021/5/16 10:39
 */
-public class LzTool implements IPanTool {
+public class LzTool extends PanBase implements IPanTool {

    public static final String SHARE_URL_PREFIX = "https://wwwa.lanzoui.com";

-    public Future<String> parse(String data, String code) {
-        Promise<String> promise = Promise.promise();
-        String key = data.indexOf('/') > 0 ? data : SHARE_URL_PREFIX + "/" + data;
+    public LzTool(String key, String pwd) {
+        super(key, pwd);
+    }
+
+    public Future<String> parse() {
+        String sUrl = key.startsWith("https://") ? key : SHARE_URL_PREFIX + "/" + key;

        WebClient client = WebClient.create(VertxHolder.getVertxInstance(),
                new WebClientOptions().setFollowRedirects(false));
-        client.getAbs(key).send().onSuccess(res -> {
+        client.getAbs(sUrl).send().onSuccess(res -> {
            String html = res.bodyAsString();
            // 匹配iframe
            Pattern compile = Pattern.compile("src=\"(/fn\\?[a-zA-Z\\d_+/=]{16,})\"");
@@ -39,11 +42,11 @@ public class LzTool implements IPanTool {
                Pattern compile2 = Pattern.compile("sign=(\\w{16,})");
                Matcher matcher2 = compile2.matcher(html);
                if (!matcher2.find()) {
-                    promise.fail(key + ": sign正则匹配失败, 可能分享已失效: " + html);
+                    fail(sUrl + ": sign正则匹配失败, 可能分享已失效");
                    return;
                }
                String sign = matcher2.group(1);
-                getDownURL(promise, code, key, client, sign);
+                getDownURL(promise, sUrl, client, sign);
                return;
            }
            String iframePath = matcher.group(1);
@@ -52,17 +55,17 @@ public class LzTool implements IPanTool {
                System.out.println(html);
                Matcher matcher2 = Pattern.compile("'sign'\s*:\s*'(\\w+)'").matcher(html2);
                if (!matcher2.find()) {
-                    promise.fail(SHARE_URL_PREFIX + iframePath + " -> " + key + ": sign正则匹配失败, 可能分享已失效: " + html2);
+                    fail(SHARE_URL_PREFIX + iframePath + " -> " + sUrl + ": sign正则匹配失败, 可能分享已失效");
                    return;
                }
                String sign = matcher2.group(1);
-                getDownURL(promise, code, key, client, sign);
-            }).onFailure(t -> promise.fail(PanExceptionUtils.fillRunTimeException("Lz", key, t)));
-        }).onFailure(t -> promise.fail(PanExceptionUtils.fillRunTimeException("Lz", key, t)));
+                getDownURL(promise, sUrl, client, sign);
+            }).onFailure(handleFail(SHARE_URL_PREFIX));
+        }).onFailure(handleFail(sUrl));
        return promise.future();
    }

-    private void getDownURL(Promise<String> promise, String code, String key, WebClient client, String sign) {
+    private void getDownURL(Promise<String> promise, String key, WebClient client, String sign) {
        MultiMap headers = MultiMap.caseInsensitiveMultiMap();
        var userAgent2 = "Mozilla/5.0 (Linux; Android 6.0; Nexus 5 Build/MRA58N) AppleWebKit/537.36 (KHTML, " +
                "like " +
@@ -73,19 +76,20 @@ public class LzTool implements IPanTool {
        headers.set("Accept-Language", "zh-CN,zh;q=0.8,zh-TW;q=0.7,zh-HK;q=0.5,en-US;q=0.3,en;q=0.2");
        headers.set("sec-ch-ua-mobile", "sec-ch-ua-mobile");

-        client.postAbs(SHARE_URL_PREFIX + "/ajaxm.php").putHeaders(headers).sendForm(MultiMap
+        String url = SHARE_URL_PREFIX + "/ajaxm.php";
+        client.postAbs(url).putHeaders(headers).sendForm(MultiMap
                .caseInsensitiveMultiMap()
                .set("action", "downprocess")
-                .set("sign", sign).set("p", code)).onSuccess(res2 -> {
+                .set("sign", sign).set("p", pwd)).onSuccess(res2 -> {
            JsonObject urlJson = res2.bodyAsJsonObject();
            if (urlJson.getInteger("zt") != 1) {
-                promise.fail(urlJson.getString("inf"));
+                fail(urlJson.getString("inf"));
                return;
            }
            String downUrl = urlJson.getString("dom") + "/file/" + urlJson.getString("url");
            client.getAbs(downUrl).putHeaders(headers).send()
                    .onSuccess(res3 -> promise.complete(res3.headers().get("Location")))
-                    .onFailure(t -> promise.fail(PanExceptionUtils.fillRunTimeException("Lz", key, t)));
-        }).onFailure(t -> promise.fail(PanExceptionUtils.fillRunTimeException("Lz", key, t)));
+                    .onFailure(handleFail(downUrl));
+        }).onFailure(handleFail(url));
    }
 }
--- a/web-service/src/main/java/cn/qaiu/lz/common/parser/impl/QkTool.java
+++ b/web-service/src/main/java/cn/qaiu/lz/common/parser/impl/QkTool.java
@@ -4,7 +4,7 @@ import io.vertx.core.Future;
 import io.vertx.core.Promise;

 public class QkTool {
-    public static Future<String> parse(String data, String code) {
+    public static Future<String> parse() {
        Promise<String> promise = Promise.promise();

        return promise.future();
--- a/web-service/src/main/java/cn/qaiu/lz/common/parser/impl/UcTool.java
+++ b/web-service/src/main/java/cn/qaiu/lz/common/parser/impl/UcTool.java
@@ -1,22 +1,17 @@
 package cn.qaiu.lz.common.parser.impl;

 import cn.qaiu.lz.common.parser.IPanTool;
+import cn.qaiu.lz.common.parser.PanBase;
 import cn.qaiu.lz.common.util.CommonUtils;
-import cn.qaiu.lz.common.util.PanExceptionUtils;
-import cn.qaiu.vx.core.util.VertxHolder;
 import io.vertx.core.Future;
-import io.vertx.core.Promise;
 import io.vertx.core.json.JsonArray;
 import io.vertx.core.json.JsonObject;
-import io.vertx.ext.web.client.WebClient;
 import io.vertx.uritemplate.UriTemplate;
-import lombok.extern.slf4j.Slf4j;

 /**
 * UC网盘解析
 */
-@Slf4j
-public class UcTool implements IPanTool {
+public class UcTool extends PanBase implements IPanTool {
    private static final String API_URL_PREFIX = "https://pc-api.uc.cn/1/clouddrive/";

    public static final String SHARE_URL_PREFIX = "https://fast.uc.cn/s/";
@@ -29,11 +24,13 @@ public class UcTool implements IPanTool {

    private static final String THIRD_REQUEST_URL = API_URL_PREFIX + "file/download?entry=ft&fr=pc&pr=UCBrowser";

-    public Future<String> parse(String data, String code) {
-        var dataKey = CommonUtils.adaptShortPaths(SHARE_URL_PREFIX, data);
-        var passcode =  (code == null) ? "" : code;
-        Promise<String> promise = Promise.promise();
-        var client = WebClient.create(VertxHolder.getVertxInstance());
+    public UcTool(String key, String pwd) {
+        super(key, pwd);
+    }
+
+    public Future<String> parse() {
+        var dataKey = CommonUtils.adaptShortPaths(SHARE_URL_PREFIX, key);
+        var passcode =  (pwd == null) ? "" : pwd;
        var jsonObject = JsonObject.of("share_for_transfer", true);
        jsonObject.put("pwd_id", dataKey);
        jsonObject.put("passcode", passcode);
@@ -42,7 +39,7 @@ public class UcTool implements IPanTool {
                    log.debug("第一阶段 {}", res.body());
                    var resJson = res.bodyAsJsonObject();
                    if (resJson.getInteger("code") != 0) {
-                        promise.fail(FIRST_REQUEST_URL + " 返回异常: " + resJson);
+                        fail(FIRST_REQUEST_URL + " 返回异常: " + resJson);
                        return;
                    }
                    var stoken = resJson.getJsonObject("data").getString("stoken");
@@ -55,7 +52,7 @@ public class UcTool implements IPanTool {
                                log.debug("第二阶段 {}", res2.body());
                                JsonObject resJson2 = res2.bodyAsJsonObject();
                                if (resJson2.getInteger("code") != 0) {
-                                    promise.fail(FIRST_REQUEST_URL + " 返回异常: " + resJson2);
+                                    fail(FIRST_REQUEST_URL + " 返回异常: " + resJson2);
                                    return;
                                }
                                // 文件信息
@@ -71,15 +68,15 @@ public class UcTool implements IPanTool {
                                            log.debug("第三阶段 {}", res3.body());
                                            var resJson3 = res3.bodyAsJsonObject();
                                            if (resJson3.getInteger("code") != 0) {
-                                                promise.fail(FIRST_REQUEST_URL + " 返回异常: " + resJson2);
+                                                fail(FIRST_REQUEST_URL + " 返回异常: " + resJson2);
                                                return;
                                            }
                                            promise.complete(resJson3.getJsonArray("data").getJsonObject(0).getString("download_url"));
-                                        }).onFailure(t -> promise.fail(PanExceptionUtils.fillRunTimeException("Uc", dataKey, t)));
+                                        }).onFailure(handleFail(THIRD_REQUEST_URL));

-                            }).onFailure(t -> promise.fail(new RuntimeException("解析异常: ", t.fillInStackTrace())));
+                            }).onFailure(handleFail(SECOND_REQUEST_URL));
                }
-        ).onFailure(t -> promise.fail(PanExceptionUtils.fillRunTimeException("Uc", dataKey, t)));
+        ).onFailure(handleFail(FIRST_REQUEST_URL));
        return promise.future();
    }
 }
--- a/web-service/src/main/java/cn/qaiu/lz/common/parser/impl/YeTool.java
+++ b/web-service/src/main/java/cn/qaiu/lz/common/parser/impl/YeTool.java
@@ -1,22 +1,16 @@
 package cn.qaiu.lz.common.parser.impl;

 import cn.qaiu.lz.common.parser.IPanTool;
+import cn.qaiu.lz.common.parser.PanBase;
 import cn.qaiu.lz.common.util.CommonUtils;
 import cn.qaiu.lz.common.util.JsExecUtils;
-import cn.qaiu.lz.common.util.PanExceptionUtils;
-import cn.qaiu.vx.core.util.VertxHolder;
 import io.vertx.core.Future;
-import io.vertx.core.Promise;
 import io.vertx.core.json.JsonObject;
 import io.vertx.ext.web.client.WebClient;
 import io.vertx.uritemplate.UriTemplate;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.openjdk.nashorn.api.scripting.ScriptObjectMirror;

-import javax.script.ScriptException;
-import java.io.IOException;
 import java.net.MalformedURLException;
 import java.util.Base64;
 import java.util.Map;
@@ -26,30 +20,23 @@ import java.util.regex.Pattern;
 /**
 * 123网盘
 */
-@Slf4j
-public class YeTool implements IPanTool {
+public class YeTool extends PanBase implements IPanTool {
+
    public static final String SHARE_URL_PREFIX = "https://www.123pan.com/s/";
    public static final String FIRST_REQUEST_URL = SHARE_URL_PREFIX + "{key}.html";
-/*
-    private static final String GET_FILE_INFO_URL = "https://www.123pan.com/a/api/share/get?limit=100&next=1&orderBy" +
-            "=file_name&orderDirection=asc&shareKey={shareKey}&SharePwd={pwd}&ParentFileId=0&Page=1&event" +
-            "=homeListFile&operateType=1";
-    private static final String GET_FILE_INFO_URL="https://www.123pan
-    .com/b/api/share/get?limit=100&next=1&orderBy=file_name&orderDirection=asc" +
-            "&shareKey={shareKey}&SharePwd={pwd}&ParentFileId=0&Page=1&event=homeListFile&operateType=1&auth-key
-            ={authKey}";
-*/

-    private static final String GET_FILE_INFO_URL = "https://www.123pan.com/a/api/share/get?limit=100&next=1&orderBy" +
+    private static final String GET_FILE_INFO_URL = "https://www.123pan.com/b/api/share/get?limit=100&next=1&orderBy" +
            "=file_name&orderDirection=asc" +
            "&shareKey={shareKey}&SharePwd={pwd}&ParentFileId=0&Page=1&event=homeListFile&operateType=1";
-    private static final String DOWNLOAD_API_URL = "https://www.123pan.com/a/api/share/download/info?{authK}={authV}";
+    private static final String DOWNLOAD_API_URL = "https://www.123pan.com/b/api/share/download/info?{authK}={authV}";

-    public Future<String> parse(String data, String code) {
+    public YeTool(String key, String pwd) {
+        super(key, pwd);
+    }

-        String dataKey = CommonUtils.adaptShortPaths(SHARE_URL_PREFIX, data);
-        Promise<String> promise = Promise.promise();
-        WebClient client = WebClient.create(VertxHolder.getVertxInstance());
+    public Future<String> parse() {
+
+        String dataKey = CommonUtils.adaptShortPaths(SHARE_URL_PREFIX, key);

        client.getAbs(UriTemplate.of(FIRST_REQUEST_URL)).setTemplateParam("key", dataKey).send().onSuccess(res -> {

@@ -58,7 +45,7 @@ public class YeTool implements IPanTool {
            Matcher matcher = compile.matcher(html);

            if (!matcher.find()) {
-                promise.fail(html + "\n Ye: " + dataKey + " 正则匹配失败");
+                fail(html + "\n Ye: " + dataKey + " 正则匹配失败");
                return;
            }
            String fileInfoString = matcher.group(1);
@@ -67,45 +54,45 @@ public class YeTool implements IPanTool {
            JsonObject resListJson = fileInfoJson.getJsonObject("reslist");

            if (resJson == null || resJson.getInteger("code") != 0) {
-                promise.fail(dataKey + " 解析到异常JSON: " + resJson);
+                fail(dataKey + " 解析到异常JSON: " + resJson);
                return;
            }
            String shareKey = resJson.getJsonObject("data").getString("ShareKey");
            if (resListJson == null || resListJson.getInteger("code") != 0) {
                // 加密分享
-                if (StringUtils.isNotEmpty(code)) {
+                if (StringUtils.isNotEmpty(pwd)) {
                    client.getAbs(UriTemplate.of(GET_FILE_INFO_URL))
                            .setTemplateParam("shareKey", shareKey)
-                            .setTemplateParam("pwd", code)
+                            .setTemplateParam("pwd", pwd)
                            // .setTemplateParam("authKey", AESUtils.getAuthKey("/b/api/share/get"))
                            .putHeader("Platform", "web")
                            .putHeader("App-Version", "3")
                            .send().onSuccess(res2 -> {
                                JsonObject infoJson = res2.bodyAsJsonObject();
                                if (infoJson.getInteger("code") != 0) {
-                                    promise.fail("Ye: " + dataKey + " 状态码异常" + infoJson);
+                                    fail("{} 状态码异常 {}", dataKey, infoJson);
                                    return;
                                }
                                JsonObject getFileInfoJson =
                                        infoJson.getJsonObject("data").getJsonArray("InfoList").getJsonObject(0);
                                getFileInfoJson.put("ShareKey", shareKey);
-                                getDownUrl(promise, client, getFileInfoJson);
-                            }).onFailure(t -> promise.fail(PanExceptionUtils.fillRunTimeException("Ye", dataKey, t)));
+                                getDownUrl(client, getFileInfoJson);
+                            }).onFailure(this.handleFail(GET_FILE_INFO_URL));
                } else {
-                    promise.fail(dataKey + " 该分享需要密码");
+                    fail("该分享[{}]需要密码",dataKey);
                }
                return;
            }

            JsonObject reqBodyJson = resListJson.getJsonObject("data").getJsonArray("InfoList").getJsonObject(0);
            reqBodyJson.put("ShareKey", shareKey);
-            getDownUrl(promise, client, reqBodyJson);
-        }).onFailure(t -> promise.fail(PanExceptionUtils.fillRunTimeException("Ye", dataKey, t)));
+            getDownUrl(client, reqBodyJson);
+        }).onFailure(this.handleFail(FIRST_REQUEST_URL));

        return promise.future();
    }

-    private static void getDownUrl(Promise<String> promise, WebClient client, JsonObject reqBodyJson) {
+    private void getDownUrl(WebClient client, JsonObject reqBodyJson) {
        log.info(reqBodyJson.encodePrettily());
        JsonObject jsonObject = new JsonObject();
        // {"ShareKey":"iaKtVv-6OECd","FileID":2193732,"S3keyFlag":"1811834632-0","Size":4203111,
@@ -119,13 +106,9 @@ public class YeTool implements IPanTool {
        // 调用JS文件获取签名
        ScriptObjectMirror getSign;
        try {
-            getSign = JsExecUtils.executeJs("getSign", "/a/api/share/download/info");
-        } catch (ScriptException | IOException | NoSuchMethodException e) {
-            promise.fail(e);
-            return;
-        }
-        if (getSign == null) {
-            promise.fail(ArrayUtils.toString(getSign));
+            getSign = JsExecUtils.executeJs("getSign", "/b/api/share/download/info");
+        } catch (Exception e) {
+            fail(e, "JS函数执行异常");
            return;
        }
        log.info("ye getSign: {}={}", getSign.get("0").toString(), getSign.get("1").toString());
@@ -140,11 +123,11 @@ public class YeTool implements IPanTool {

                    try {
                        if (downURLJson.getInteger("code") != 0) {
-                            promise.fail("Ye: downURLJson返回值异常->" + downURLJson);
+                            fail("Ye: downURLJson返回值异常->" + downURLJson);
                            return;
                        }
                    } catch (Exception ignored) {
-                        promise.fail("Ye: downURLJson格式异常->" + downURLJson);
+                        fail("Ye: downURLJson格式异常->" + downURLJson);
                        return;
                    }
                    String downURL = downURLJson.getJsonObject("data").getString("DownloadURL");
@@ -159,23 +142,21 @@ public class YeTool implements IPanTool {
                            JsonObject res3Json = res3.bodyAsJsonObject();
                            try {
                                if (res3Json.getInteger("code") != 0) {
-                                    promise.fail("Ye: downUrl2返回值异常->" + res3Json);
+                                    fail("Ye: downUrl2返回值异常->" + res3Json);
                                    return;
                                }
                            } catch (Exception ignored) {
-                                promise.fail("Ye: downUrl2格式异常->" + downURLJson);
+                                fail("Ye: downUrl2格式异常->" + downURLJson);
                                return;
                            }

                            promise.complete(res3Json.getJsonObject("data").getString("redirect_url"));

-                        }).onFailure(t -> promise.fail(PanExceptionUtils.fillRunTimeException("Ye",
-                                reqBodyJson.encodePrettily(), t)));
+                        }).onFailure(this.handleFail("获取直链失败"));

                    } catch (MalformedURLException e) {
-                        promise.fail("urlParams解析异常" + e.getMessage());
+                        fail("urlParams解析异常" + e.getMessage());
                    }
-                }).onFailure(t -> promise.fail(PanExceptionUtils.fillRunTimeException("Ye",
-                        reqBodyJson.encodePrettily(), t)));
+                }).onFailure(this.handleFail(DOWNLOAD_API_URL));
    }
 }
--- a/web-service/src/main/java/cn/qaiu/lz/common/util/JsExecUtils.java
+++ b/web-service/src/main/java/cn/qaiu/lz/common/util/JsExecUtils.java
@@ -6,6 +6,7 @@ import javax.script.Invocable;
 import javax.script.ScriptEngine;
 import javax.script.ScriptEngineManager;
 import javax.script.ScriptException;
+import java.io.FileNotFoundException;
 import java.io.FileReader;
 import java.io.IOException;
 import java.net.URL;
@@ -17,26 +18,32 @@ import java.net.URL;
 */
 public class JsExecUtils {
    private static final String JS_PATH = "/js/ye123.js";
+    private static Invocable inv;

-    /**
-     * 调用js文件
-     */
-    public static ScriptObjectMirror executeJs(String functionName, Object... args) throws ScriptException,
-            IOException, NoSuchMethodException {
+    // 初始化脚本引擎
+    static {
        ScriptEngineManager engineManager = new ScriptEngineManager();
        ScriptEngine engine = engineManager.getEngineByName("JavaScript"); // 得到脚本引擎
        //获取文件所在的相对路径
        URL resource = JsExecUtils.class.getResource("/");
        if (resource == null) {
-            throw new ScriptException("js resource path is null");
+            throw new RuntimeException("js resource path is null");
        }
        String path = resource.getPath();
        String reader = path + JS_PATH;
-        FileReader fReader = new FileReader(reader);
-        engine.eval(fReader);
-        fReader.close();
+        try (FileReader fReader = new FileReader(reader)){
+            engine.eval(fReader);
+            fReader.close();
+            inv = (Invocable) engine;
+        } catch (IOException | ScriptException e) {
+            throw new RuntimeException(e);
+        }
+    }

-        Invocable inv = (Invocable) engine;
+    /**
+     * 调用js文件
+     */
+    public static ScriptObjectMirror executeJs(String functionName, Object... args) throws ScriptException, NoSuchMethodException {
        //调用js中的方法
        return (ScriptObjectMirror) inv.invokeFunction(functionName, args);
    }
--- a/web-service/src/main/java/cn/qaiu/lz/web/http/ServerApi.java
+++ b/web-service/src/main/java/cn/qaiu/lz/web/http/ServerApi.java
@@ -43,7 +43,7 @@ public class ServerApi {
            url = EcTool.SHARE_URL_PREFIX + request.getParam("data");
        }
        try {
-            IPanTool.shareURLPrefixMatching(url).parse(url, pwd).onSuccess(resUrl -> {
+            IPanTool.shareURLPrefixMatching(url, pwd).parse().onSuccess(resUrl -> {
                response.putHeader("location", resUrl).setStatusCode(302).end();
                promise.complete();
            }).onFailure(t -> promise.fail(t.fillInStackTrace()));
@@ -54,12 +54,12 @@ public class ServerApi {
    }

    @RouteMapping(value = "/json/parser", method = RouteMethod.GET, order = 3)
-    public Future<String> parseJson(HttpServerResponse response, HttpServerRequest request, String url, String pwd) {
+    public Future<String> parseJson(HttpServerRequest request, String url, String pwd) {
        if (url.contains(EcTool.SHARE_URL_PREFIX)) {
            // 默认读取Url参数会被截断手动获取一下其他参数
            url = EcTool.SHARE_URL_PREFIX + request.getParam("data");
        }
-        return IPanTool.shareURLPrefixMatching(url).parse(url, pwd);
+        return IPanTool.shareURLPrefixMatching(url, pwd).parse();
    }


@@ -72,7 +72,7 @@ public class ServerApi {
            code = keys[1];
        }

-        IPanTool.typeMatching(type).parse(key, code).onSuccess(resUrl -> response.putHeader("location", resUrl)
+        IPanTool.typeMatching(type, key, code).parse().onSuccess(resUrl -> response.putHeader("location", resUrl)
                .setStatusCode(302).end()).onFailure(t -> {
            response.putHeader(CONTENT_TYPE, "text/html;charset=utf-8");
            response.end(t.getMessage());
@@ -80,13 +80,13 @@ public class ServerApi {
    }

    @RouteMapping(value = "/json/:type/:key", method = RouteMethod.GET, order = 2)
-    public Future<String> parseKeyJson(HttpServerResponse response, String type, String key) {
+    public Future<String> parseKeyJson(String type, String key) {
        String code = "";
        if (key.contains("@")) {
            String[] keys = key.split("@");
            key = keys[0];
            code = keys[1];
        }
-        return IPanTool.typeMatching(type).parse(key, code);
+        return IPanTool.typeMatching(type, key, code).parse();
    }
 }
--- a/web-service/src/main/resources/app.yml
+++ b/web-service/src/main/resources/app.yml
@@ -1,7 +1,6 @@
 # 要激活的配置: dev--连接本地数据库; prod连接线上数据库
 active: dev
-# 框架版本号 和主版本号
-version_vertx: 4.4.1
+# 版本号
 version_app: 0.1.6
 # 公司名称 -> LOGO版权文字
 copyright: QAIU
--- a/web-service/src/main/resources/http-tools/pan-uc.http
+++ b/web-service/src/main/resources/http-tools/pan-uc.http
@@ -10,25 +10,44 @@ content-type: application/json
 {"pwd_id":"33197dd53ace4","passcode":"","share_for_transfer":true}

 ### UCpan 第二步 获取fid,share_fid_token GET传参pwd_id,passcode,stoken
-https://pc-api.uc.cn/1/clouddrive/transfer_share/detail?pwd_id=33197dd53ace4&passcode=&stoken=W5b1n2jeFld5RmIusaVOr3vA0vVSCWYQ7Mz8bT2coZM%3D
+https://pc-api.uc.cn/1/clouddrive/transfer_share/detail?pwd_id=33197dd53ace4&passcode=&stoken=4lXGIeQ6rdqjuOPW1MHJpqrQR3RWGFKSAAjpTibsR%2B8%3D
 content-type: application/json

 ### UCpan 第二步获取下载链接  POST json传入fids(fid),pwd_id,stoken,fids_token(share_fid_token)
+
 POST https://pc-api.uc.cn/1/clouddrive/file/download?entry=ft&fr=pc&pr=UCBrowser
 content-type: application/json
+#Cookie: __pus=7576a6d3a511ad7b4c5649a1d89c29ffAAQ06zBxHWghrwEbKRdqBrhXssuYiMIwLLVzi1f2K6qnSL95A79GIxXDEPlYS3NaPjDWOcWVuvbQ3HqTfvqRKr29

 {
  "fids": [
    "54c3cd90ed3e45119bb96ed99a562d40"
  ],
  "pwd_id": "33197dd53ace4",
-  "stoken": "W5b1n2jeFld5RmIusaVOr3vA0vVSCWYQ7Mz8bT2coZM=",
+  "stoken": "7P02U9tWJEkkMgbXaIJxAQyBiqcfPdkbDZ6XoiYsBiA=",
  "fids_token": [
-    "4cb5eabb0ce5a26d12ae5ab8acf68aec"
+    "e8a52adcda41d9e218e732b5de549d2a"
  ]
 }

 ###
 # @no-redirect
-https://dl-uf-zb.pds.uc.cn/l3PNAKfz/64623447/646b0de6e9f13000c9b14ba182b805312795a82a/646b0de6717e1bfa5bb44dd2a456f103c5177850?Expires=1690188688&OSSAccessKeyId=LTAIyYfxTqY7YZsg&Signature=gB3rN%2FxPal3ZpReRkB1M4cnvGF4%3D&x-oss-traffic-limit=503316480&response-content-disposition=attachment%3B%20filename%3DC%23%20Shell%20%28C%23%20Offline%20Compiler%29_2.5.16.apks&callback-var=eyJ4OmF1IjoiLSIsIng6c3AiOiIxOTkiLCJ4OnRva2VuIjoiMi0wNDBjYjFjMDNjNzU1YWY1NDc0NjkxNjNmOTYzYWY2NC0yLTctNjE0NDAtZGFjYjM2NjViYmFhNGY1ZTlkMzc4MDBlYzY0MDMxNjAtYTU2MGJiMmU1MzhlNzY0OTFkMDY1MjA2OGRiNmEzMzEiLCJ4OnR0bCI6IjEwODAwIn0%3D&callback=eyJjYWxsYmFja0JvZHlUeXBlIjoiYXBwbGljYXRpb24vanNvbiIsImNhbGxiYWNrU3RhZ2UiOiJiZWZvcmUtZXhlY3V0ZSIsImNhbGxiYWNrRmFpbHVyZUFjdGlvbiI6Imlnbm9yZSIsImNhbGxiYWNrVXJsIjoiaHR0cHM6Ly9hdXRoLWNkbi51Yy5jbi9vdXRlci9vc3MvY2hlY2twbGF5IiwiY2FsbGJhY2tCb2R5Ijoie1wiaG9zdFwiOiR7aHR0cEhlYWRlci5ob3N0fSxcInNpemVcIjoke3NpemV9LFwicmFuZ2VcIjoke2h0dHBIZWFkZXIucmFuZ2V9LFwicmVmZXJlclwiOiR7aHR0cEhlYWRlci5yZWZlcmVyfSxcImNvb2tpZVwiOiR7aHR0cEhlYWRlci5jb29raWV9LFwibWV0aG9kXCI6JHtodHRwSGVhZGVyLm1ldGhvZH0sXCJpcFwiOiR7Y2xpZW50SXB9LFwicG9ydFwiOiR7Y2xpZW50UG9ydH0sXCJvYmplY3RcIjoke29iamVjdH0sXCJzcFwiOiR7eDpzcH0sXCJ0b2tlblwiOiR7eDp0b2tlbn0sXCJhdVwiOiR7eDphdX0sXCJ0dGxcIjoke3g6dHRsfSxcImNsaWVudF90b2tlblwiOiR7cXVlcnlTdHJpbmcuY2xpZW50X3Rva2VufX0ifQ%3D%3D&ud=4-0-5-0-6-N-3-ft-0-2&__pus=7576a6d3a511ad7b4c5649a1d89c29ffAAQ06zBxHWghrwEbKRdqBrhXssuYiMIwLLVzi1f2K6qnSL95A79GIxXDEPlYS3NaPjDWOcWVuvbQ3HqTfvqRKr29
+https://dl-uf-zb.pds.uc.cn/l3PNAKfz/64623447/646b0de6e9f13000c9b14ba182b805312795a82a/646b0de6717e1bfa5bb44dd2a456f103c5177850?Expires=1691488145&OSSAccessKeyId=LTAIyYfxTqY7YZsg&Signature=MvUiIWszmMncqDrsLV%2BlL1HpuYw%3D&x-oss-traffic-limit=503316480&response-content-disposition=attachment%3B%20filename%3DC%23%20Shell%20%28C%23%20Offline%20Compiler%29_2.5.16.apks&callback-var=eyJ4OmF1IjoiLSIsIng6c3AiOiIxOTkiLCJ4OnRva2VuIjoiMi1iYzBhNTgxNTUwOGE0NmQwYmE4YzUxYjAyZGEwNjA5Yi01LTctNjE0NDAtZGFjYjM2NjViYmFhNGY1ZTlkMzc4MDBlYzY0MDMxNjAtNGZhNTliY2RkNzhlYTE0MDg0Mjc5OGVlNDMxZWFlMDciLCJ4OnR0bCI6IjEwODAwIn0%3D&callback=eyJjYWxsYmFja0JvZHlUeXBlIjoiYXBwbGljYXRpb24vanNvbiIsImNhbGxiYWNrU3RhZ2UiOiJiZWZvcmUtZXhlY3V0ZSIsImNhbGxiYWNrRmFpbHVyZUFjdGlvbiI6Imlnbm9yZSIsImNhbGxiYWNrVXJsIjoiaHR0cHM6Ly9hdXRoLWNkbi51Yy5jbi9vdXRlci9vc3MvY2hlY2twbGF5IiwiY2FsbGJhY2tCb2R5Ijoie1wiaG9zdFwiOiR7aHR0cEhlYWRlci5ob3N0fSxcInNpemVcIjoke3NpemV9LFwicmFuZ2VcIjoke2h0dHBIZWFkZXIucmFuZ2V9LFwicmVmZXJlclwiOiR7aHR0cEhlYWRlci5yZWZlcmVyfSxcImNvb2tpZVwiOiR7aHR0cEhlYWRlci5jb29raWV9LFwibWV0aG9kXCI6JHtodHRwSGVhZGVyLm1ldGhvZH0sXCJpcFwiOiR7Y2xpZW50SXB9LFwicG9ydFwiOiR7Y2xpZW50UG9ydH0sXCJvYmplY3RcIjoke29iamVjdH0sXCJzcFwiOiR7eDpzcH0sXCJ0b2tlblwiOiR7eDp0b2tlbn0sXCJhdVwiOiR7eDphdX0sXCJ0dGxcIjoke3g6dHRsfSxcImNsaWVudF90b2tlblwiOiR7cXVlcnlTdHJpbmcuY2xpZW50X3Rva2VufX0ifQ%3D%3D&ud=4-N-5-0-6-N-3-ft-0-2
 #Cookie: __pus=7576a6d3a511ad7b4c5649a1d89c29ffAAQ06zBxHWghrwEbKRdqBrhXssuYiMIwLLVzi1f2K6qnSL95A79GIxXDEPlYS3NaPjDWOcWVuvbQ3HqTfvqRKr29
+
+###
+https://dl-uf-zb.pds.uc.cn/l3PNAKfz/64623447/646b0de6e9f13000c9b14ba182b805312795a82a/646b0de6717e1bfa5bb44dd2a456f103c5177850?Expires=1691488387&OSSAccessKeyId=LTAIyYfxTqY7YZsg&Signature=WIy4UGCwd9eNdUnSexRVFUCFZcM%3D&x-oss-traffic-limit=503316480&response-content-disposition=attachment%3B%20filename%3DC%23%20Shell%20%28C%23%20Offline%20Compiler%29_2.5.16.apks&callback-var=eyJ4OmF1IjoiLSIsIng6c3AiOiIxOTkiLCJ4OnRva2VuIjoiMi0wNDBjYjFjMDNjNzU1YWY1NDc0NjkxNjNmOTYzYWY2NC0yLTctNjE0NDAtZGFjYjM2NjViYmFhNGY1ZTlkMzc4MDBlYzY0MDMxNjAtYTU2MGJiMmU1MzhlNzY0OTFkMDY1MjA2OGRiNmEzMzEiLCJ4OnR0bCI6IjEwODAwIn0%3D&callback=eyJjYWxsYmFja0JvZHlUeXBlIjoiYXBwbGljYXRpb24vanNvbiIsImNhbGxiYWNrU3RhZ2UiOiJiZWZvcmUtZXhlY3V0ZSIsImNhbGxiYWNrRmFpbHVyZUFjdGlvbiI6Imlnbm9yZSIsImNhbGxiYWNrVXJsIjoiaHR0cHM6Ly9hdXRoLWNkbi51Yy5jbi9vdXRlci9vc3MvY2hlY2twbGF5IiwiY2FsbGJhY2tCb2R5Ijoie1wiaG9zdFwiOiR7aHR0cEhlYWRlci5ob3N0fSxcInNpemVcIjoke3NpemV9LFwicmFuZ2VcIjoke2h0dHBIZWFkZXIucmFuZ2V9LFwicmVmZXJlclwiOiR7aHR0cEhlYWRlci5yZWZlcmVyfSxcImNvb2tpZVwiOiR7aHR0cEhlYWRlci5jb29raWV9LFwibWV0aG9kXCI6JHtodHRwSGVhZGVyLm1ldGhvZH0sXCJpcFwiOiR7Y2xpZW50SXB9LFwicG9ydFwiOiR7Y2xpZW50UG9ydH0sXCJvYmplY3RcIjoke29iamVjdH0sXCJzcFwiOiR7eDpzcH0sXCJ0b2tlblwiOiR7eDp0b2tlbn0sXCJhdVwiOiR7eDphdX0sXCJ0dGxcIjoke3g6dHRsfSxcImNsaWVudF90b2tlblwiOiR7cXVlcnlTdHJpbmcuY2xpZW50X3Rva2VufX0ifQ%3D%3D&ud=4-0-5-0-6-N-3-ft-0-2
+
+###
+#@no-cookie-jar
+https://dl-uf-zb.pds.uc.cn/l3PNAKfz/64623447/646b0de6e9f13000c9b14ba182b805312795a82a/646b0de6717e1bfa5bb44dd2a456f103c5177850?Expires=1691488539&OSSAccessKeyId=LTAIyYfxTqY7YZsg&Signature=rhD0OQTq2CuMUvp0ZphStKiyyw8%3D&x-oss-traffic-limit=503316480&response-content-disposition=attachment%3B%20filename%3DC%23%20Shell%20%28C%23%20Offline%20Compiler%29_2.5.16.apks&callback-var=eyJ4OmF1IjoiLSIsIng6c3AiOiIxOTkiLCJ4OnRva2VuIjoiMi02YTU3OGNkNjYyMTQzZWI4ODFjZTE0ZGYyNjk5OTQ4OS01LTctNjE0NDAtZGFjYjM2NjViYmFhNGY1ZTlkMzc4MDBlYzY0MDMxNjAtYzlhYWI1YjA5ZDNhYTA5MWU4NTJjNTJlNGRjYWJkZDYiLCJ4OnR0bCI6IjEwODAwIn0%3D&callback=eyJjYWxsYmFja0JvZHlUeXBlIjoiYXBwbGljYXRpb24vanNvbiIsImNhbGxiYWNrU3RhZ2UiOiJiZWZvcmUtZXhlY3V0ZSIsImNhbGxiYWNrRmFpbHVyZUFjdGlvbiI6Imlnbm9yZSIsImNhbGxiYWNrVXJsIjoiaHR0cHM6Ly9hdXRoLWNkbi51Yy5jbi9vdXRlci9vc3MvY2hlY2twbGF5IiwiY2FsbGJhY2tCb2R5Ijoie1wiaG9zdFwiOiR7aHR0cEhlYWRlci5ob3N0fSxcInNpemVcIjoke3NpemV9LFwicmFuZ2VcIjoke2h0dHBIZWFkZXIucmFuZ2V9LFwicmVmZXJlclwiOiR7aHR0cEhlYWRlci5yZWZlcmVyfSxcImNvb2tpZVwiOiR7aHR0cEhlYWRlci5jb29raWV9LFwibWV0aG9kXCI6JHtodHRwSGVhZGVyLm1ldGhvZH0sXCJpcFwiOiR7Y2xpZW50SXB9LFwicG9ydFwiOiR7Y2xpZW50UG9ydH0sXCJvYmplY3RcIjoke29iamVjdH0sXCJzcFwiOiR7eDpzcH0sXCJ0b2tlblwiOiR7eDp0b2tlbn0sXCJhdVwiOiR7eDphdX0sXCJ0dGxcIjoke3g6dHRsfSxcImNsaWVudF90b2tlblwiOiR7cXVlcnlTdHJpbmcuY2xpZW50X3Rva2VufX0ifQ%3D%3D&ud=4-N-5-0-6-N-3-ft-0-2
+Cookie: __pugs=efc5f3f9c041af5dc62eea4481901cbbAAT912628i+uT/WMwOFWBjJ1TjbKGC1j6cyGHSLVzwuPQP74d+rZXO4xJgdG93MC5DUDdgRJcg5y93waA/KPWDSeDY8LPgjB2Ha2tQ3sQ/MXMoRUi/LRdY3psAyC3YOlUDeFwLtkLAXABRgJhKTw6W0v
+
+
+
+###
+#@no-cookie-jar
+
+https://dl-uf-zb.pds.uc.cn/l3PNAKfz/64623447/646b0de6e9f13000c9b14ba182b805312795a82a/646b0de6717e1bfa5bb44dd2a456f103c5177850?Expires=1691489999&OSSAccessKeyId=LTAIyYfxTqY7YZsg&Signature=NbQLAEUCkvJxmSsRoIynZ%2BuPMvY%3D&x-oss-traffic-limit=503316480&response-content-disposition=attachment%3B%20filename%3DC%23%20Shell%20%28C%23%20Offline%20Compiler%29_2.5.16.apks&callback-var=eyJ4OmF1IjoiLSIsIng6c3AiOiIxOTkiLCJ4OnRva2VuIjoiMi0wNDBjYjFjMDNjNzU1YWY1NDc0NjkxNjNmOTYzYWY2NC0yLTctNjE0NDAtZGFjYjM2NjViYmFhNGY1ZTlkMzc4MDBlYzY0MDMxNjAtYTU2MGJiMmU1MzhlNzY0OTFkMDY1MjA2OGRiNmEzMzEiLCJ4OnR0bCI6IjEwODAwIn0%3D&callback=eyJjYWxsYmFja0JvZHlUeXBlIjoiYXBwbGljYXRpb24vanNvbiIsImNhbGxiYWNrU3RhZ2UiOiJiZWZvcmUtZXhlY3V0ZSIsImNhbGxiYWNrRmFpbHVyZUFjdGlvbiI6Imlnbm9yZSIsImNhbGxiYWNrVXJsIjoiaHR0cHM6Ly9hdXRoLWNkbi51Yy5jbi9vdXRlci9vc3MvY2hlY2twbGF5IiwiY2FsbGJhY2tCb2R5Ijoie1wiaG9zdFwiOiR7aHR0cEhlYWRlci5ob3N0fSxcInNpemVcIjoke3NpemV9LFwicmFuZ2VcIjoke2h0dHBIZWFkZXIucmFuZ2V9LFwicmVmZXJlclwiOiR7aHR0cEhlYWRlci5yZWZlcmVyfSxcImNvb2tpZVwiOiR7aHR0cEhlYWRlci5jb29raWV9LFwibWV0aG9kXCI6JHtodHRwSGVhZGVyLm1ldGhvZH0sXCJpcFwiOiR7Y2xpZW50SXB9LFwicG9ydFwiOiR7Y2xpZW50UG9ydH0sXCJvYmplY3RcIjoke29iamVjdH0sXCJzcFwiOiR7eDpzcH0sXCJ0b2tlblwiOiR7eDp0b2tlbn0sXCJhdVwiOiR7eDphdX0sXCJ0dGxcIjoke3g6dHRsfSxcImNsaWVudF90b2tlblwiOiR7cXVlcnlTdHJpbmcuY2xpZW50X3Rva2VufX0ifQ%3D%3D&ud=4-0-5-0-6-N-3-ft-0-2
+Cookie: __puus=dc48cb12577eb3df6fe84fdea250ad6fAAOF0LBv/M4HTtkYfuUNdcVLXHZl1x2mw8NQSdxo5abymS+irugphlPNv5kwQZkDI+pXaeOD22v/whNQT5AwUULF0q1nSNXmHqxr20AJjXlEhvbIZNgUfwmw8aOCyarrLi7o7w6w0Rod4DLCSeYGwlTF3P9jMcqCM+WqWHnxKY6i8gaXZkHLObatSHkwivB7Xpc=
+Referer: https://fast.uc.cn/
--- a/web-service/src/main/resources/http-tools/pan-ye.http
+++ b/web-service/src/main/resources/http-tools/pan-ye.http
@@ -119,8 +119,3 @@ Platform:web
 {"ShareKey":"iaKtVv-6OECd","behavior":1}

 ### eaefamemdead
-POST https://www.123pan.com/a/api/share/download/info?598392083=1691599441-4130548-2079498810
-App-Version:3
-Platform:web
-
-{"ShareKey":"iaKtVv-ICECd","FileID":2169781,"S3keyFlag":"1815268665-0","Size":163708684,"Etag":"e7f288198505ae4481d638f1f42f1477"}
--- a/web-service/src/main/resources/http-tools/test.http
+++ b/web-service/src/main/resources/http-tools/test.http
@@ -65,10 +65,10 @@ GET http://127.0.0.1:6400/fj/tIfhRqH

 ### 360亿方云
 # @no-redirect
-GET http://127.0.0.1:6400/parser?url=https://v2.fangcloud.com/share/2f238f7714cf61cdc631d23d18
+GET http://127.0.0.1:6400/parser?url=https://v2.fangcloud.com/sharing/fb54bdf03c66c04334fe3687a3

 ### 360亿方云
-GET http://127.0.0.1:6400/json/fc/30646fefc8bf936a4766ab8a5e
+GET http://127.0.0.1:6400/json/fc/fb54bdf03c66c04334fe3687a3

 ### 360亿方云
 # @no-redirect
--- a/web-service/src/main/resources/js/ye123.js
+++ b/web-service/src/main/resources/js/ye123.js
@@ -38,18 +38,7 @@ function _0x1b5d95(_0x278d1a) {
 function _0x4f141a(_0x4075b1) {

  for (var _0x4eddcb = arguments['length'] > 0x1 && void 0x0 !== arguments[0x1] ? arguments[0x1] : 0xa,
-
-         _0x4ee01e = function(_0x3bb99e) {
-           var _0x3bb99e = _0x3bb99e['replace'](/\\r\\n/g, '\x5cn');
-           for (var _0x585459 = '', _0x15c988 = 0x0; _0x15c988 < _0x3bb99e['length']; _0x15c988++) {
-             var _0x36bb3e = _0x3bb99e['charCodeAt'](_0x15c988);
-             _0x36bb3e < 0x80 ? _0x585459 += String['fromCharCode'](_0x36bb3e) : _0x36bb3e > 0x7f && _0x36bb3e < 0x800 ? (_0x585459 += String['fromCharCode'](_0x36bb3e >> 0x6 | 0xc0),
-               _0x585459 += String['fromCharCode'](0x3f & _0x36bb3e | 0x80)) : (_0x585459 += String['fromCharCode'](_0x36bb3e >> 0xc | 0xe0),
-               _0x585459 += String['fromCharCode'](_0x36bb3e >> 0x6 & 0x3f | 0x80),
-               _0x585459 += String['fromCharCode'](0x3f & _0x36bb3e | 0x80));
-           }
-           return _0x585459;
-         }, _0x2fc680 = function() {
+         _0x2fc680 = function() {
      for (var _0x515c63, _0x361314 = [], _0x4cbdba = 0x0; _0x4cbdba < 0x100; _0x4cbdba++) {
        _0x515c63 = _0x4cbdba;
        for (var _0x460960 = 0x0; _0x460960 < 0x8; _0x460960++)
@@ -59,7 +48,7 @@ function _0x4f141a(_0x4075b1) {
      return _0x361314;
    },
         _0x4aed86 = _0x2fc680(),
-         _0x5880f0 = _0x4ee01e(_0x4075b1),
+         _0x5880f0 = _0x4075b1,
         _0x492393 = -0x1, _0x25d82c = 0x0;
       _0x25d82c < _0x5880f0['length'];
       _0x25d82c++)