修改缓存策略，提高读取性能

pom.xml

@@ -30,6 +30,12 @@
             <version>3.14.9</version>
         </dependency>
 
+        <dependency>
+            <groupId>com.github.ben-manes.caffeine</groupId>
+            <artifactId>caffeine</artifactId>
+            <version>2.7.0</version>
+        </dependency>
+
 
         <dependency>
             <groupId>org.springframework.boot</groupId>

src/main/java/com/github/zxbu/webdavteambition/client/AliYunDriverClient.java

@@ -7,6 +7,7 @@ import okhttp3.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.util.Assert;
+import org.springframework.util.StringUtils;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -92,8 +93,12 @@ public class AliYunDriverClient {
     }
 
 
-    public InputStream download(String url) {
+    public InputStream download(String url, String range) {
-        Request request = new Request.Builder().header("referer", "https://www.aliyundrive.com/").url(url).build();
+        Request.Builder builder = new Request.Builder().header("referer", "https://www.aliyundrive.com/");
+        if (StringUtils.hasLength(range)) {
+            builder.header("range", range);
+        }
+        Request request = builder.url(url).build();
         Response response = null;
         try {
             response = okHttpClient.newCall(request).execute();

src/main/java/com/github/zxbu/webdavteambition/model/DownloadRequest.java

@@ -3,6 +3,7 @@ package com.github.zxbu.webdavteambition.model;
 public class DownloadRequest {
     private String drive_id;
     private String file_id;
+    private Integer expire_sec = 14400;
 
     public String getDrive_id() {
         return drive_id;
@@ -19,4 +20,12 @@ public class DownloadRequest {
     public void setFile_id(String file_id) {
         this.file_id = file_id;
     }
+
+    public Integer getExpire_sec() {
+        return expire_sec;
+    }
+
+    public void setExpire_sec(Integer expire_sec) {
+        this.expire_sec = expire_sec;
+    }
 }

src/main/java/com/github/zxbu/webdavteambition/store/AliYunDriverClientService.java

@@ -2,6 +2,8 @@ package com.github.zxbu.webdavteambition.store;
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.github.benmanes.caffeine.cache.Cache;
+import com.github.benmanes.caffeine.cache.Caffeine;
 import com.github.zxbu.webdavteambition.client.AliYunDriverClient;
 import com.github.zxbu.webdavteambition.model.*;
 import com.github.zxbu.webdavteambition.model.result.TFile;
@@ -21,6 +23,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.TimeUnit;
 
 @Service
 public class AliYunDriverClientService {
@@ -29,7 +32,12 @@ public class AliYunDriverClientService {
     private static String rootPath = "/";
     private static int chunkSize = 10485760; // 10MB
     private TFile rootTFile = null;
-    private final ThreadLocal<Map<String, Set<TFile>>> tFilesCache = new ThreadLocal<>();
+
+    private static Cache<String, Set<TFile>> tFilesCache = Caffeine.newBuilder()
+            .initialCapacity(128)
+            .maximumSize(1024)
+            .expireAfterWrite(1, TimeUnit.MINUTES)
+            .build();
 
     private final AliYunDriverClient client;
 
@@ -42,12 +50,7 @@ public class AliYunDriverClientService {
     }
 
     public Set<TFile> getTFiles(String nodeId) {
-        Map<String, Set<TFile>> map = tFilesCache.get();
+        Set<TFile> tFiles = tFilesCache.get(nodeId, key -> {
-        if (map == null) {
-            map = new ConcurrentHashMap<>();
-            tFilesCache.set(map);
-        }
-        Set<TFile> tFiles = map.computeIfAbsent(nodeId, key -> {
             // 获取真实的文件列表
             return getTFiles2(nodeId);
         });
@@ -276,14 +279,14 @@ public class AliYunDriverClientService {
         return getNodeIdByPath2(path);
     }
 
-    public InputStream download(String path) {
+    public InputStream download(String path, String range) {
         TFile file = getTFileByPath(path);
         DownloadRequest downloadRequest = new DownloadRequest();
         downloadRequest.setDrive_id(client.getDriveId());
         downloadRequest.setFile_id(file.getFile_id());
         String json = client.post("/file/get_download_url", downloadRequest);
         Object url = JsonUtil.getJsonNodeValue(json, "url");
-        return client.download(url.toString());
+        return client.download(url.toString(), range);
     }
 
     private TFile getNodeIdByPath2(String path) {
@@ -357,11 +360,7 @@ public class AliYunDriverClientService {
         return path;
     }
 
-    public void clearCache() {
+    private void clearCache() {
-        Map<String, Set<TFile>> map = tFilesCache.get();
+        tFilesCache.invalidateAll();
-        if (map != null) {
-            map.clear();
-        }
-
     }
 }

src/main/java/com/github/zxbu/webdavteambition/store/AliYunDriverFileSystemStore.java

@@ -36,31 +36,29 @@ public class AliYunDriverFileSystemStore implements IWebdavStore {
 
     @Override
     public void destroy() {
-        LOGGER.debug("destroy");
+        LOGGER.info("destroy");
 
     }
 
     @Override
     public ITransaction begin(Principal principal, HttpServletRequest req, HttpServletResponse resp) {
-        LOGGER.debug("begin");
+        LOGGER.info("begin");
-        aliYunDriverClientService.clearCache();
         return new Transaction(principal, req, resp);
     }
 
     @Override
     public void checkAuthentication(ITransaction transaction) {
-        LOGGER.debug("checkAuthentication");
+        LOGGER.info("checkAuthentication");
     }
 
     @Override
     public void commit(ITransaction transaction) {
-        aliYunDriverClientService.clearCache();
+        LOGGER.info("commit");
-        LOGGER.debug("commit");
     }
 
     @Override
     public void rollback(ITransaction transaction) {
-        LOGGER.debug("rollback");
+        LOGGER.info("rollback");
 
     }
 
@@ -79,8 +77,10 @@ public class AliYunDriverFileSystemStore implements IWebdavStore {
 
     @Override
     public InputStream getResourceContent(ITransaction transaction, String resourceUri) {
-        LOGGER.debug("getResourceContent: {}", resourceUri);
+        LOGGER.info("getResourceContent: {}", resourceUri);
-        return aliYunDriverClientService.download(resourceUri);
+        String range = transaction.getRequest().getHeader("range");
+        return aliYunDriverClientService.download(resourceUri, range);
+
     }
 
     @Override
@@ -113,7 +113,7 @@ public class AliYunDriverFileSystemStore implements IWebdavStore {
 
     @Override
     public String[] getChildrenNames(ITransaction transaction, String folderUri) {
-        LOGGER.debug("getChildrenNames: {}", folderUri);
+        LOGGER.info("getChildrenNames: {}", folderUri);
         TFile tFile = aliYunDriverClientService.getTFileByPath(folderUri);
         if (tFile.getType().equals(FileType.file.name())) {
             return new String[0];
@@ -126,7 +126,7 @@ public class AliYunDriverFileSystemStore implements IWebdavStore {
 
     @Override
     public long getResourceLength(ITransaction transaction, String path) {
-        LOGGER.debug("getResourceLength: {}", path);
+        LOGGER.info("getResourceLength: {}", path);
         TFile tFile = aliYunDriverClientService.getTFileByPath(path);
         if (tFile == null || tFile.getSize() == null) {
             return 384;
@@ -164,7 +164,7 @@ public class AliYunDriverFileSystemStore implements IWebdavStore {
     public StoredObject getStoredObject(ITransaction transaction, String uri) {
 
 
-        LOGGER.debug("getStoredObject: {}", uri);
+        LOGGER.info("getStoredObject: {}", uri);
         TFile tFile = aliYunDriverClientService.getTFileByPath(uri);
         if (tFile != null) {
             StoredObject so = new StoredObject();

src/main/java/net/sf/webdav/methods/DoGet.java

@@ -61,27 +61,31 @@ public class DoGet extends DoHead {
             OutputStream out = resp.getOutputStream();
             InputStream in = _store.getResourceContent(transaction, path);
             try {
-                int read = -1;
+                if (in != null) {
-                byte[] copyBuffer = new byte[BUF_SIZE];
+                    int read = -1;
+                    byte[] copyBuffer = new byte[BUF_SIZE];
 
-                while ((read = in.read(copyBuffer, 0, copyBuffer.length)) != -1) {
+                    while ((read = in.read(copyBuffer, 0, copyBuffer.length)) != -1) {
-                    out.write(copyBuffer, 0, read);
+                        out.write(copyBuffer, 0, read);
+                    }
                 }
             } finally {
                 // flushing causes a IOE if a file is opened on the webserver
                 // client disconnected before server finished sending response
                 try {
-                    in.close();
+                    if (in != null) {
+                        in.close();
+                    }
                 } catch (Exception e) {
                     LOG.warn("Closing InputStream causes Exception!\n"
-                            + e.toString());
+                            ,e);
                 }
                 try {
                     out.flush();
                     out.close();
                 } catch (Exception e) {
                     LOG.warn("Flushing OutputStream causes Exception!\n"
-                            + e.toString());
+                            ,e);
                 }
             }
         } catch (Exception e) {