From 0e6bcbfa11aab3ba1c917e0c12432b98d9f1e67c Mon Sep 17 00:00:00 2001 From: zhaojun1998 Date: Sat, 21 Dec 2019 11:06:29 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E7=BC=93=E5=AD=98=E9=99=8D?= =?UTF-8?q?=E7=BA=A7=E4=B8=BA=E5=AE=9E=E7=8E=B0=E7=B1=BB=E7=BC=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/im/zhaojun/aliyun/service/AliyunServiceImpl.java | 6 ++++++ src/main/java/im/zhaojun/common/service/FileService.java | 3 --- src/main/java/im/zhaojun/ftp/service/FtpServiceImpl.java | 6 ++++++ .../java/im/zhaojun/huawei/service/HuaweiServiceImpl.java | 6 ++++++ .../java/im/zhaojun/qiniu/service/QiniuServiceImpl.java | 6 ++++++ src/main/java/im/zhaojun/tencent/TencentServiceImpl.java | 6 ++++++ 6 files changed, 30 insertions(+), 3 deletions(-) diff --git a/src/main/java/im/zhaojun/aliyun/service/AliyunServiceImpl.java b/src/main/java/im/zhaojun/aliyun/service/AliyunServiceImpl.java index 05d6e1d..8c0a501 100644 --- a/src/main/java/im/zhaojun/aliyun/service/AliyunServiceImpl.java +++ b/src/main/java/im/zhaojun/aliyun/service/AliyunServiceImpl.java @@ -4,6 +4,7 @@ import cn.hutool.core.util.URLUtil; import com.aliyun.oss.OSS; import com.aliyun.oss.OSSClientBuilder; import com.aliyun.oss.model.*; +import im.zhaojun.common.config.ZFileCacheConfiguration; import im.zhaojun.common.model.StorageConfig; import im.zhaojun.common.model.dto.FileItemDTO; import im.zhaojun.common.model.enums.FileTypeEnum; @@ -14,6 +15,8 @@ import im.zhaojun.common.util.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; +import org.springframework.cache.annotation.CacheConfig; +import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -24,6 +27,7 @@ import java.util.List; import java.util.Map; @Service +@CacheConfig(cacheNames = ZFileCacheConfiguration.CACHE_NAME, keyGenerator = "keyGenerator") public class AliyunServiceImpl implements FileService { private static final Logger log = LoggerFactory.getLogger(AliyunServiceImpl.class); @@ -77,6 +81,7 @@ public class AliyunServiceImpl implements FileService { } @Override + @Cacheable public List fileList(String path) { path = StringUtils.removeFirstSeparator(path); @@ -107,6 +112,7 @@ public class AliyunServiceImpl implements FileService { } @Override + @Cacheable public String getDownloadUrl(String path) { path = StringUtils.removeFirstSeparator(path); diff --git a/src/main/java/im/zhaojun/common/service/FileService.java b/src/main/java/im/zhaojun/common/service/FileService.java index 198011e..41ba4cf 100644 --- a/src/main/java/im/zhaojun/common/service/FileService.java +++ b/src/main/java/im/zhaojun/common/service/FileService.java @@ -8,7 +8,6 @@ import im.zhaojun.common.util.StringUtils; import org.springframework.aop.framework.AopContext; import org.springframework.cache.annotation.CacheConfig; import org.springframework.cache.annotation.CacheEvict; -import org.springframework.cache.annotation.Cacheable; import javax.annotation.PostConstruct; import java.util.ArrayDeque; @@ -18,10 +17,8 @@ import java.util.List; @CacheConfig(cacheNames = ZFileCacheConfiguration.CACHE_NAME, keyGenerator = "keyGenerator") public interface FileService { - @Cacheable(condition = "#root.targetClass.simpleName != 'LocalServiceImpl'") List fileList(String path) throws Exception; - @Cacheable String getDownloadUrl(String path) throws Exception; @PostConstruct diff --git a/src/main/java/im/zhaojun/ftp/service/FtpServiceImpl.java b/src/main/java/im/zhaojun/ftp/service/FtpServiceImpl.java index 972d293..049e92f 100644 --- a/src/main/java/im/zhaojun/ftp/service/FtpServiceImpl.java +++ b/src/main/java/im/zhaojun/ftp/service/FtpServiceImpl.java @@ -2,6 +2,7 @@ package im.zhaojun.ftp.service; import cn.hutool.core.util.URLUtil; import cn.hutool.extra.ftp.Ftp; +import im.zhaojun.common.config.ZFileCacheConfiguration; import im.zhaojun.common.model.StorageConfig; import im.zhaojun.common.model.dto.FileItemDTO; import im.zhaojun.common.model.enums.FileTypeEnum; @@ -12,6 +13,8 @@ import im.zhaojun.common.util.StringUtils; import org.apache.commons.net.ftp.FTPFile; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.cache.annotation.CacheConfig; +import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -20,6 +23,7 @@ import java.util.List; import java.util.Map; @Service +@CacheConfig(cacheNames = ZFileCacheConfiguration.CACHE_NAME, keyGenerator = "keyGenerator") public class FtpServiceImpl implements FileService { private static final Logger log = LoggerFactory.getLogger(FtpServiceImpl.class); @@ -62,6 +66,7 @@ public class FtpServiceImpl implements FileService { } @Override + @Cacheable public List fileList(String path) { FTPFile[] ftpFiles = ftp.lsFiles(path); @@ -83,6 +88,7 @@ public class FtpServiceImpl implements FileService { } @Override + @Cacheable public String getDownloadUrl(String path) { return URLUtil.complateUrl(domain, path); } diff --git a/src/main/java/im/zhaojun/huawei/service/HuaweiServiceImpl.java b/src/main/java/im/zhaojun/huawei/service/HuaweiServiceImpl.java index 58cb8dc..2251d29 100644 --- a/src/main/java/im/zhaojun/huawei/service/HuaweiServiceImpl.java +++ b/src/main/java/im/zhaojun/huawei/service/HuaweiServiceImpl.java @@ -3,6 +3,7 @@ package im.zhaojun.huawei.service; import cn.hutool.core.util.URLUtil; import com.obs.services.ObsClient; import com.obs.services.model.*; +import im.zhaojun.common.config.ZFileCacheConfiguration; import im.zhaojun.common.model.StorageConfig; import im.zhaojun.common.model.dto.FileItemDTO; import im.zhaojun.common.model.enums.FileTypeEnum; @@ -13,6 +14,8 @@ import im.zhaojun.common.util.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; +import org.springframework.cache.annotation.CacheConfig; +import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -22,6 +25,7 @@ import java.util.List; import java.util.Map; @Service +@CacheConfig(cacheNames = ZFileCacheConfiguration.CACHE_NAME, keyGenerator = "keyGenerator") public class HuaweiServiceImpl implements FileService { private static final Logger log = LoggerFactory.getLogger(HuaweiServiceImpl.class); @@ -69,6 +73,7 @@ public class HuaweiServiceImpl implements FileService { } @Override + @Cacheable public List fileList(String path) throws Exception { path = StringUtils.removeFirstSeparator(path); @@ -107,6 +112,7 @@ public class HuaweiServiceImpl implements FileService { } @Override + @Cacheable public String getDownloadUrl(String path) throws Exception { path = StringUtils.removeFirstSeparator(path); TemporarySignatureRequest req = new TemporarySignatureRequest(HttpMethodEnum.GET, timeout); diff --git a/src/main/java/im/zhaojun/qiniu/service/QiniuServiceImpl.java b/src/main/java/im/zhaojun/qiniu/service/QiniuServiceImpl.java index 2490e8c..06a8ac0 100644 --- a/src/main/java/im/zhaojun/qiniu/service/QiniuServiceImpl.java +++ b/src/main/java/im/zhaojun/qiniu/service/QiniuServiceImpl.java @@ -7,6 +7,7 @@ import com.qiniu.storage.Configuration; import com.qiniu.storage.model.FileInfo; import com.qiniu.storage.model.FileListing; import com.qiniu.util.Auth; +import im.zhaojun.common.config.ZFileCacheConfiguration; import im.zhaojun.common.model.StorageConfig; import im.zhaojun.common.model.dto.FileItemDTO; import im.zhaojun.common.model.enums.FileTypeEnum; @@ -17,6 +18,8 @@ import im.zhaojun.common.util.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; +import org.springframework.cache.annotation.CacheConfig; +import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -26,6 +29,7 @@ import java.util.List; import java.util.Map; @Service +@CacheConfig(cacheNames = ZFileCacheConfiguration.CACHE_NAME, keyGenerator = "keyGenerator") public class QiniuServiceImpl implements FileService { private static final Logger log = LoggerFactory.getLogger(QiniuServiceImpl.class); @@ -78,6 +82,7 @@ public class QiniuServiceImpl implements FileService { } @Override + @Cacheable public List fileList(String path) throws Exception { path = StringUtils.removeFirstSeparator(path); List fileItemList = new ArrayList<>(); @@ -119,6 +124,7 @@ public class QiniuServiceImpl implements FileService { } @Override + @Cacheable public String getDownloadUrl(String path) { String url = URLUtil.complateUrl(domain, path); if (isPrivate) { diff --git a/src/main/java/im/zhaojun/tencent/TencentServiceImpl.java b/src/main/java/im/zhaojun/tencent/TencentServiceImpl.java index 8fb6ef0..15daee3 100644 --- a/src/main/java/im/zhaojun/tencent/TencentServiceImpl.java +++ b/src/main/java/im/zhaojun/tencent/TencentServiceImpl.java @@ -9,6 +9,7 @@ import com.qcloud.cos.model.COSObjectSummary; import com.qcloud.cos.model.ListObjectsRequest; import com.qcloud.cos.model.ObjectListing; import com.qcloud.cos.region.Region; +import im.zhaojun.common.config.ZFileCacheConfiguration; import im.zhaojun.common.model.StorageConfig; import im.zhaojun.common.model.dto.FileItemDTO; import im.zhaojun.common.model.enums.FileTypeEnum; @@ -19,6 +20,8 @@ import im.zhaojun.common.util.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; +import org.springframework.cache.annotation.CacheConfig; +import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -29,6 +32,7 @@ import java.util.List; import java.util.Map; @Service +@CacheConfig(cacheNames = ZFileCacheConfiguration.CACHE_NAME, keyGenerator = "keyGenerator") public class TencentServiceImpl implements FileService { private static final Logger log = LoggerFactory.getLogger(TencentServiceImpl.class); @@ -78,6 +82,7 @@ public class TencentServiceImpl implements FileService { } } + @Cacheable @Override public List fileList(String path) { path = StringUtils.removeFirstSeparator(path); @@ -106,6 +111,7 @@ public class TencentServiceImpl implements FileService { return fileItemList; } + @Cacheable @Override public String getDownloadUrl(String path) { Date expirationDate = new Date(System.currentTimeMillis() + timeout * 1000);