Address Wenshushu parser review feedback

Agent-Logs-Url: https://github.com/qaiu/netdisk-fast-download/sessions/8f8b8ba9-4a66-4757-a7f7-4ab342da729e

Co-authored-by: qaiu <29825328+qaiu@users.noreply.github.com>

core-database/pom.xml

@@ -65,7 +65,7 @@
         <dependency>
             <groupId>org.postgresql</groupId>
             <artifactId>postgresql</artifactId>
-            <version>42.7.11</version>
+            <version>42.7.3</version>
         </dependency>
 
     </dependencies>

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

@@ -37,6 +37,9 @@ public class WsTool extends PanBase {
 
         MultiMap headers = MultiMap.caseInsensitiveMultiMap();
         headers.set("User-Agent", userAgent2);
+        headers.set("Accept", "application/json, text/plain, */*");
+        headers.set("Content-Type", "application/json;charset=utf-8");
+        headers.set("Prod", "com.wenshushu.web.pc");
         headers.set("sec-ch-ua-platform", "Android");
         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");
@@ -50,7 +53,7 @@ public class WsTool extends PanBase {
                     try {
                         // 设置匿名登录token
                         String token = asJson(res).getJsonObject("data").getString("token");
-                        headers.set("X-Token", token);
+                        headers.set("X-TOKEN", token);
 
                         // 获取文件夹信息
                         httpClient.postAbs(SHARE_URL_API + "task/mgrtask").putHeaders(headers)
@@ -68,10 +71,10 @@ public class WsTool extends PanBase {
                                         String filebid  = asJson(res2).getJsonObject("data").getString("boxid");           // 文件夹bid
 
                                         // 调试输出文件夹信息
-                                        System.out.println("文件夹期限: " + filetime);
+                                        log.debug("文件夹期限: {}", filetime);
-                                        System.out.println("文件夹大小: " + filesize);
+                                        log.debug("文件夹大小: {}", filesize);
-                                        System.out.println("文件夹pid: " + filepid);
+                                        log.debug("文件夹pid: {}", filepid);
-                                        System.out.println("文件夹bid: " + filebid);
+                                        log.debug("文件夹bid: {}", filebid);
 
                                         // 获取文件信息
                                         httpClient.postAbs(SHARE_URL_API + "ufile/list").putHeaders(headers)
@@ -92,21 +95,21 @@ public class WsTool extends PanBase {
                                                 if (res3.statusCode() == 200) {
                                                     try {
                                                         // 获取文件信息
-                                                        String filename = asJson(res3).getJsonObject("data")
+                                                        JsonObject fileInfo = asJson(res3).getJsonObject("data")
-                                                            .getJsonArray("fileList").getJsonObject(0).getString("fname");          // 文件名称
+                                                            .getJsonArray("fileList").getJsonObject(0);
-                                                        String filefid  = asJson(res3).getJsonObject("data")
+                                                        String filename = fileInfo.getString("fname");                               // 文件名称
-                                                            .getJsonArray("fileList").getJsonObject(0).getString("fid");            // 文件fid
+                                                        String fileUfileid = fileInfo.getString("ufileid", fileInfo.getString("fid")); // 文件ufileid
 
                                                         // 调试输出文件信息
-                                                        System.out.println("文件名称: " + filename);
+                                                        log.debug("文件名称: {}", filename);
-                                                        System.out.println("文件fid: " + filefid);
+                                                        log.debug("文件ufileid: {}", fileUfileid);
 
                                                         // 检查文件是否失效
                                                         httpClient.postAbs(SHARE_URL_API + "dl/sign").putHeaders(headers)
                                                             .sendJsonObject(JsonObject.of(
-                                                                "consumeCode", 0,
+                                                                "ufileid", fileUfileid,
-                                                                "type", 1,
+                                                                // 新版接口不再需要consumeCode
-                                                                "ufileid", filefid
+                                                                "type", 1
                                                             )).onSuccess(res4 -> {
 
                                                                 if (res4.statusCode() == 200) {
@@ -115,7 +118,7 @@ public class WsTool extends PanBase {
                                                                         String fileurl = asJson(res4).getJsonObject("data").getString("url");
 
                                                                         // 调试输出文件直链
-                                                                        System.out.println("文件直链: " + fileurl);
+                                                                        log.debug("文件直链: {}", fileurl);
 
                                                                         if (!fileurl.equals("")) {
                                                                             promise.complete(URLDecoder.decode(fileurl, StandardCharsets.UTF_8));