From 0d609daffa93f22daaec0ae3aeab3ae987409da3 Mon Sep 17 00:00:00 2001
From: qaiu <736226400@qq.com>
Date: Wed, 18 Sep 2024 15:41:56 +0800
Subject: [PATCH] =?UTF-8?q?1.=20123=E5=90=8E=E7=BC=80=E5=A4=84=E7=90=86=20?=
 =?UTF-8?q?2.=20=E4=BF=AE=E5=A4=8D=E7=BC=93=E5=AD=98=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E6=88=B3=E6=A0=BC=E5=BC=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 parser/src/main/java/cn/qaiu/parser/PanDomainTemplate.java | 4 ++--
 .../cn/qaiu/lz/common/interceptorImpl/LogStatistics.java   | 1 +
 .../src/main/java/cn/qaiu/lz/common/util/URLParamUtil.java | 7 +++++--
 .../java/cn/qaiu/lz/web/service/impl/CacheServiceImpl.java | 2 +-
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/parser/src/main/java/cn/qaiu/parser/PanDomainTemplate.java b/parser/src/main/java/cn/qaiu/parser/PanDomainTemplate.java
index e1c87bb..ac53679 100644
--- a/parser/src/main/java/cn/qaiu/parser/PanDomainTemplate.java
+++ b/parser/src/main/java/cn/qaiu/parser/PanDomainTemplate.java
@@ -57,8 +57,8 @@ public enum PanDomainTemplate {
             WsTool.class),
     // https://www.123pan.com/s/
     YE("123网盘",
-            "https://www\\.123pan\\.com/s/(.+)\\.html",
-            "https://www.123pan.com/s/{shareKey}.html",
+            "https://www\\.123pan\\.com/s/(.+)",
+            "https://www.123pan.com/s/{shareKey}",
             YeTool.class),
     // https://www.ecpan.cn/web/#/yunpanProxy?path=%2F%23%2Fdrive%2Foutside&data={code}&isShare=1
     EC("移动云空间",
diff --git a/web-service/src/main/java/cn/qaiu/lz/common/interceptorImpl/LogStatistics.java b/web-service/src/main/java/cn/qaiu/lz/common/interceptorImpl/LogStatistics.java
index cb68323..7d2543c 100644
--- a/web-service/src/main/java/cn/qaiu/lz/common/interceptorImpl/LogStatistics.java
+++ b/web-service/src/main/java/cn/qaiu/lz/common/interceptorImpl/LogStatistics.java
@@ -35,6 +35,7 @@ public class LogStatistics implements AfterInterceptor {
 
         ParserLogInfo parserLogInfo = new ParserLogInfo();
         parserLogInfo.setPath(ctx.request().uri());
+        if (responseData == null) return;
         if (responseData.containsKey("code") && responseData.getInteger("code") == 500) {
             log.error("code 500: {} {}", ctx.request().path(), responseData.getString("msg"));
         } else {
diff --git a/web-service/src/main/java/cn/qaiu/lz/common/util/URLParamUtil.java b/web-service/src/main/java/cn/qaiu/lz/common/util/URLParamUtil.java
index 5625e98..168561e 100644
--- a/web-service/src/main/java/cn/qaiu/lz/common/util/URLParamUtil.java
+++ b/web-service/src/main/java/cn/qaiu/lz/common/util/URLParamUtil.java
@@ -21,15 +21,18 @@ public class URLParamUtil {
      * @return 完整的URL字符串
      */
     public static String parserParams(HttpServerRequest request) {
+
         String url = request.absoluteURI();
         MultiMap params = request.params();
-
         // 处理URL截断的情况，例如: url='https://...&key=...&code=...'
         if (params.contains("url")) {
             String encodedUrl = params.get("url");
             url = handleTruncatedUrl(encodedUrl, params);
+            if (url.endsWith(".html")) {
+                // 123云盘的后缀处理
+                url = url.replace(".html", "");
+            }
         }
-
         return url;
     }
 
diff --git a/web-service/src/main/java/cn/qaiu/lz/web/service/impl/CacheServiceImpl.java b/web-service/src/main/java/cn/qaiu/lz/web/service/impl/CacheServiceImpl.java
index cf14982..3085f44 100644
--- a/web-service/src/main/java/cn/qaiu/lz/web/service/impl/CacheServiceImpl.java
+++ b/web-service/src/main/java/cn/qaiu/lz/web/service/impl/CacheServiceImpl.java
@@ -63,7 +63,7 @@ public class CacheServiceImpl implements CacheService {
     }
 
     private String generateDate(Long ts) {
-        return DateFormatUtils.format(new Date(ts), "yyyy-MM-dd hh:mm:ss");
+        return DateFormatUtils.format(new Date(ts), "yyyy-MM-dd HH:mm:ss");
     }
 
     @Override