From c6127c029f76c42bd07683945527986bcfbdd8fb Mon Sep 17 00:00:00 2001
From: quericy <quericy@live.com>
Date: Thu, 14 Apr 2022 10:06:46 +0800
Subject: [PATCH] fix: modify extract driveId regex in WebDavController

---
 .../zfile/config/webdav/adapter/WebDavUrlAdapterImpl.java       | 2 +-
 .../java/im/zhaojun/zfile/controller/home/WebDavController.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/im/zhaojun/zfile/config/webdav/adapter/WebDavUrlAdapterImpl.java b/src/main/java/im/zhaojun/zfile/config/webdav/adapter/WebDavUrlAdapterImpl.java
index bc81d67..99ab632 100644
--- a/src/main/java/im/zhaojun/zfile/config/webdav/adapter/WebDavUrlAdapterImpl.java
+++ b/src/main/java/im/zhaojun/zfile/config/webdav/adapter/WebDavUrlAdapterImpl.java
@@ -27,7 +27,7 @@ public class WebDavUrlAdapterImpl implements UrlAdapter {
     @Override
     public String getUrl(Request request) {
         // 匹配url前缀和驱动器ID
-        Matcher matcher = RegexMatchUtils.match("^" + ZFileConstant.WEB_DAV_PREFIX + "/(\\d+?)(.*)",
+        Matcher matcher = RegexMatchUtils.match("^" + ZFileConstant.WEB_DAV_PREFIX + "/(\\d+)(.*)",
                 HttpManager.decodeUrl(request.getAbsolutePath()));
         final String driveId = RegexMatchUtils.getIndexResult(matcher, 1);
         if (driveId == null) {
diff --git a/src/main/java/im/zhaojun/zfile/controller/home/WebDavController.java b/src/main/java/im/zhaojun/zfile/controller/home/WebDavController.java
index 80ebeb6..1418c1b 100644
--- a/src/main/java/im/zhaojun/zfile/controller/home/WebDavController.java
+++ b/src/main/java/im/zhaojun/zfile/controller/home/WebDavController.java
@@ -153,7 +153,7 @@ public class WebDavController {
      */
     private Integer getDriveId() {
         String requestUrl = HttpManager.decodeUrl(HttpManager.request().getAbsolutePath());
-        final String driveId = RegexMatchUtils.matchByIndex("^" + ZFileConstant.WEB_DAV_PREFIX + "/(\\d+?)(.*)", requestUrl, 1);
+        final String driveId = RegexMatchUtils.matchByIndex("^" + ZFileConstant.WEB_DAV_PREFIX + "/(\\d+)(.*)", requestUrl, 1);
         return driveId != null ? Integer.valueOf(driveId) : null;
     }
 }
\ No newline at end of file