1. onedrive

常规测试
qaiu · Dec 18, 2024 · 4a3e734 · 4a3e734
1 parent 54cc212
commit 4a3e734
Show file tree

Hide file tree

Showing 9 changed files with 482 additions and 20 deletions.
diff --git a/note.txt b/note.txt
@@ -20,11 +20,11 @@ Cloudreve自建网盘 (ce) {origin}/s/{shareKey}
 缓存key -> 下载URL
 分享链接 -> add 网盘类型 pwd origin(私有化) -> 直链
 
-
-https://f.ws59.cn/f/e3peohu6192
-
 开源版 TODO
 1. 缓存优化, 配置自动重载
+2. 缓存删除接口(后台功能)
+3. JS脚本引擎 自定义解析
+
 
 
 专属版 功能设计

diff --git a/parser/src/main/java/cn/qaiu/parser/PanBase.java b/parser/src/main/java/cn/qaiu/parser/PanBase.java
@@ -36,7 +36,7 @@ public abstract class PanBase implements IPanTool {
      * Http client
      */
     protected WebClient client = WebClient.create(WebClientVertxInit.get(),
-            new WebClientOptions().setUserAgentEnabled(false));
+            new WebClientOptions());
 
     /**
      * Http client session (会话管理, 带cookie请求)

diff --git a/parser/src/main/java/cn/qaiu/parser/PanDomainTemplate.java b/parser/src/main/java/cn/qaiu/parser/PanDomainTemplate.java
@@ -90,9 +90,10 @@ public enum PanDomainTemplate {
             "https://qaiu.118pan.com/b{shareKey}",
             P118Tool.class),
     // https://www.vyuyun.com/s/QMa6ie?password=I4KG7H
+    // https://www.vyuyun.com/s/QMa6ie/file?password=I4KG7H
     PVYY("微雨云存储",
-            compile("https://www\\.vyuyun\\.com/s/(?<KEY>[a-zA-Z\\d-]+)(\\?password=.*)?"),
-            "https://www.vyuyun.com/s/{shareKey}",
+            compile("https://www\\.vyuyun\\.com/s/(?<KEY>[a-zA-Z\\d-]+)(/file)?(\\?password=(?<PWD>\\w+))?"),
+            "https://www.vyuyun.com/s/{shareKey}?password={pwd}",
             PvyyTool.class),
     // https://1drv.ms/w/s!Alg0feQmCv2rnRFd60DQOmMa-Oh_?e=buaRtp
     POD("OneDrive",

diff --git a/parser/src/main/java/cn/qaiu/parser/ParserCreate.java b/parser/src/main/java/cn/qaiu/parser/ParserCreate.java
@@ -43,9 +43,11 @@ public ParserCreate normalizeShareLink() {
             // 返回规范化的标准链接
             String standardUrl = getStandardUrlTemplate()
                     .replace("{shareKey}", shareKey);
-
             try {
                 String pwd = matcher.group(PWD);
+                if (StringUtils.isNotEmpty(pwd)) {
+                    shareLinkInfo.setSharePassword(pwd);
+                }
                 standardUrl = standardUrl .replace("{pwd}", pwd);
             } catch (Exception ignored) {}
 
@@ -107,7 +109,9 @@ public ShareLinkInfo getShareLinkInfo() {
     }
 
     public ParserCreate setShareLinkInfoPwd(String pwd) {
-        shareLinkInfo.setSharePassword(pwd);
+        if (pwd != null) {
+            shareLinkInfo.setSharePassword(pwd);
+        }
         return this;
     }
 

diff --git a/parser/src/main/java/cn/qaiu/parser/impl/EcTool.java b/parser/src/main/java/cn/qaiu/parser/impl/EcTool.java
@@ -1,6 +1,6 @@
 package cn.qaiu.parser.impl;
 
-import cn.qaiu.entity.ShareLinkInfo; 
+import cn.qaiu.entity.ShareLinkInfo;
 import cn.qaiu.parser.PanBase;
 import io.vertx.core.Future;
 import io.vertx.core.json.JsonArray;

diff --git a/parser/src/main/java/cn/qaiu/parser/impl/PodTool.java b/parser/src/main/java/cn/qaiu/parser/impl/PodTool.java
@@ -7,7 +7,6 @@
 import io.vertx.core.Promise;
 import io.vertx.core.WorkerExecutor;
 import io.vertx.core.json.JsonObject;
-import io.vertx.core.net.ProxyOptions;
 import io.vertx.uritemplate.UriTemplate;
 
 import java.io.IOException;
@@ -82,7 +81,6 @@ public Future<String> parse() {
                     .setTemplateParam("resid1", cid2)
                     .setTemplateParam("cid", cid1.toLowerCase())
                     .setTemplateParam("redeem", redeem)
-                    .proxy(new ProxyOptions().setHost("127.0.0.1").setPort(7890))
                     .send()
                     .onSuccess(r1 -> {
                         String auth =

diff --git a/web-front/src/App.vue b/web-front/src/App.vue
@@ -10,7 +10,7 @@
             <img :height="150" src="../public/images/lanzou111.png" alt="lz"></img>
           </div>
         </div>
-        <h3 style="text-align: center;">NFD网盘直链解析0.1.8_bate2(API演示)</h3>
+        <h3 style="text-align: center;">NFD网盘直链解析0.1.8_bate3(API演示)</h3>
         <div class="typo">
           <p style="text-align: center;">
             <span>
@@ -66,7 +66,7 @@
             <p style="text-align: center">
               <el-button style="margin-left: 40px;margin-bottom: 10px" @click="onSubmit">解析测试</el-button>
               <el-button style="margin-left: 20px;margin-bottom: 10px" @click="genMd">生成Markdown链接</el-button>
-              <el-button style="margin-left: 20px" @click="generateQRCode">生成二维码</el-button>
+              <el-button style="margin-left: 20px" @click="generateQRCode">扫码下载</el-button>
               <el-button style="margin-left: 20px" @click="getTj">链接信息统计</el-button>
             </p>
           </div>

diff --git a/web-service/src/main/resources/app-dev.yml b/web-service/src/main/resources/app-dev.yml
@@ -53,7 +53,7 @@ cache:
     cow:
     ec:
     fc:
-    fj: 30
+    fj:
     iz: 20
     le: 2879
     lz: 20
@@ -67,12 +67,12 @@ cache:
 
 # httpClient静态代理服务器配置(外网代理)
 proxy:
-  - panTypes: pgd,pdb
-    type: http # 支持http/socks4/socks5
-    host: 127.0.0.1
-    port: 7890
-    username:
-    password:
+#  - panTypes: pgd,pdb,pod
+#    type: http # 支持http/socks4/socks5
+#    host: 127.0.0.1
+#    port: 7890
+#    username:
+#    password:
 
 
 # 代理池配置