From de2f7e4b802e541023b907c804c19bd247a97be1 Mon Sep 17 00:00:00 2001 From: zhaojun1998 Date: Sun, 8 Mar 2020 11:11:12 +0800 Subject: [PATCH] =?UTF-8?q?:hammer:=20=E9=87=8D=E6=9E=84=E4=BB=A3=E7=A0=81?= =?UTF-8?q?,=20=E4=BC=98=E5=8C=96=E7=9B=AE=E5=BD=95=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zhaojun/{ => zfile}/ZfileApplication.java | 2 +- .../{common => zfile}/cache/ZFileCache.java | 8 ++-- .../{common => zfile}/config/CacheConfig.java | 4 +- .../config/ContentTypeTextToTextJson.java | 5 ++- .../{common => zfile}/config/CorsFilter.java | 2 +- .../config/GlobalScheduleTask.java | 18 ++++----- .../config/OneDriveConfig.java | 14 +++---- .../config/StorageTypeFactory.java | 16 ++++---- .../config/WebMvcConfig.java | 4 +- .../config/ZFileConfiguration.java | 2 +- .../controller/AdminController.java | 37 +++++++++-------- .../controller/CacheController.java | 21 +++++----- .../controller/CommonController.java | 10 ++--- .../controller/FileController.java | 40 +++++++++---------- .../controller/InstallController.java | 16 ++++---- .../controller/LocalController.java | 8 ++-- .../controller/OneDriveController.java | 8 ++-- .../controller/PageController.java | 17 ++++---- .../core/FileListCacheAop.java} | 15 +++---- .../core/StorageStrategyInitCheckAop.java} | 16 ++++---- .../exception/GlobleExceptionHandler.java | 4 +- .../exception/InitializeException.java | 2 +- .../exception/NotExistFileException.java | 2 +- .../exception/SearchDisableException.java | 2 +- ...StorageStrategyUninitializedException.java | 2 +- .../UnknownStorageTypeException.java | 2 +- .../filter}/MyCorsFilter.java | 2 +- .../annotation/CheckStorageStrategyInit.java | 2 +- .../model/constant/StorageConfigConstant.java | 2 +- .../model/constant/SystemConfigConstant.java | 2 +- .../model/constant/ZFileConstant.java | 6 ++- .../model/dto/AudioInfoDTO.java | 2 +- .../model/dto/CacheConfigDTO.java | 2 +- .../model/dto/FileItemDTO.java | 4 +- .../model/dto/InstallModelDTO.java | 4 +- .../model/dto/ResultBean.java | 2 +- .../model/dto/SiteConfigDTO.java | 2 +- .../model/dto/StorageStrategyDTO.java | 7 +++- .../model/dto/SystemConfigDTO.java | 6 +-- .../model/entity}/StorageConfig.java | 4 +- .../model/entity}/SystemConfig.java | 2 +- .../model/enums/FileTypeEnum.java | 2 +- .../model/enums/StorageTypeEnum.java | 2 +- .../model/enums/StorageTypeEnumConvert.java | 2 +- .../StorageTypeEnumDeSerializerConvert.java | 2 +- .../StorageTypeEnumSerializerConvert.java | 2 +- .../model/support}/FilePageModel.java | 4 +- .../model => zfile/model/support}/Jvm.java | 2 +- .../model => zfile/model/support}/Mem.java | 8 ++-- .../model/support}/OneDriveToken.java | 2 +- .../model => zfile/model/support}/Sys.java | 2 +- .../model/support}/SystemMonitorInfo.java | 5 ++- .../repository/StorageConfigRepository.java | 6 +-- .../repository/SystemConfigRepository.java | 4 +- .../security/Md5PasswordEncoder.java | 2 +- .../security/MySecurityConfig.java | 19 ++++----- .../security/MyUserDetailsServiceImpl.java | 6 +-- .../service/StorageConfigService.java | 8 ++-- .../service/SystemConfigService.java | 30 +++++++------- .../service/SystemService.java | 17 ++++---- .../base/AbstractBaseFileService.java} | 25 +++++++----- .../base/AbstractOneDriveServiceBase.java} | 28 +++++++------ .../base/AbstractS3BaseFileService.java} | 13 +++--- .../service/base/BaseFileService.java} | 6 +-- .../service/impl}/AliyunServiceImpl.java | 14 +++---- .../service/impl}/FtpServiceImpl.java | 38 ++++++------------ .../service/impl}/HuaweiServiceImpl.java | 14 +++---- .../service/impl}/LocalServiceImpl.java | 30 +++++++------- .../service/impl}/MinIOServiceImpl.java | 14 +++---- .../impl}/OneDriveChinaServiceImpl.java | 18 ++++----- .../service/impl}/OneDriveServiceImpl.java | 18 ++++----- .../service/impl}/QiniuServiceImpl.java | 14 +++---- .../service/impl}/S3ServiceImpl.java | 14 +++---- .../service/impl}/TencentServiceImpl.java | 14 +++---- .../service/impl}/UFileServiceImpl.java | 5 +-- .../service/impl}/UpYunServiceImpl.java | 24 +++++------ .../support}/FileAsyncCacheService.java | 23 ++++++----- .../service/support}/FileCacheService.java | 5 ++- .../support}/SystemMonitorService.java | 7 ++-- .../{common => zfile}/util/AudioHelper.java | 6 +-- .../util/FileComparator.java | 6 +-- .../{common => zfile}/util/FileUtil.java | 2 +- .../{common => zfile}/util/HttpUtil.java | 2 +- .../util/NaturalOrderComparator.java | 20 +++++++--- .../util/SpringContextHolder.java | 2 +- .../util/StartupListener.java | 12 ++---- .../{common => zfile}/util/StringUtils.java | 2 +- 87 files changed, 422 insertions(+), 405 deletions(-) rename src/main/java/im/zhaojun/{ => zfile}/ZfileApplication.java (95%) rename src/main/java/im/zhaojun/{common => zfile}/cache/ZFileCache.java (92%) rename src/main/java/im/zhaojun/{common => zfile}/config/CacheConfig.java (84%) rename src/main/java/im/zhaojun/{common => zfile}/config/ContentTypeTextToTextJson.java (94%) rename src/main/java/im/zhaojun/{common => zfile}/config/CorsFilter.java (97%) rename src/main/java/im/zhaojun/{common => zfile}/config/GlobalScheduleTask.java (82%) rename src/main/java/im/zhaojun/{onedrive/common => zfile}/config/OneDriveConfig.java (82%) rename src/main/java/im/zhaojun/{common => zfile}/config/StorageTypeFactory.java (68%) rename src/main/java/im/zhaojun/{common => zfile}/config/WebMvcConfig.java (90%) rename src/main/java/im/zhaojun/{common => zfile}/config/ZFileConfiguration.java (95%) rename src/main/java/im/zhaojun/{common => zfile}/controller/AdminController.java (84%) rename src/main/java/im/zhaojun/{common => zfile}/controller/CacheController.java (78%) rename src/main/java/im/zhaojun/{common => zfile}/controller/CommonController.java (88%) rename src/main/java/im/zhaojun/{common => zfile}/controller/FileController.java (84%) rename src/main/java/im/zhaojun/{common => zfile}/controller/InstallController.java (87%) rename src/main/java/im/zhaojun/{local => zfile}/controller/LocalController.java (87%) rename src/main/java/im/zhaojun/{onedrive/common => zfile}/controller/OneDriveController.java (83%) rename src/main/java/im/zhaojun/{common => zfile}/controller/PageController.java (74%) rename src/main/java/im/zhaojun/{common/aop/FileListCacheAspect.java => zfile/core/FileListCacheAop.java} (75%) rename src/main/java/im/zhaojun/{common/aspect/StorageStrategyInitCheckAspect.java => zfile/core/StorageStrategyInitCheckAop.java} (57%) rename src/main/java/im/zhaojun/{common => zfile}/exception/GlobleExceptionHandler.java (96%) rename src/main/java/im/zhaojun/{common => zfile}/exception/InitializeException.java (94%) rename src/main/java/im/zhaojun/{common => zfile}/exception/NotExistFileException.java (94%) rename src/main/java/im/zhaojun/{common => zfile}/exception/SearchDisableException.java (94%) rename src/main/java/im/zhaojun/{common => zfile}/exception/StorageStrategyUninitializedException.java (95%) rename src/main/java/im/zhaojun/{common => zfile}/exception/UnknownStorageTypeException.java (95%) rename src/main/java/im/zhaojun/{common/security => zfile/filter}/MyCorsFilter.java (96%) rename src/main/java/im/zhaojun/{common => zfile/model}/annotation/CheckStorageStrategyInit.java (89%) rename src/main/java/im/zhaojun/{common => zfile}/model/constant/StorageConfigConstant.java (96%) rename src/main/java/im/zhaojun/{common => zfile}/model/constant/SystemConfigConstant.java (93%) rename src/main/java/im/zhaojun/{common => zfile}/model/constant/ZFileConstant.java (86%) rename src/main/java/im/zhaojun/{common => zfile}/model/dto/AudioInfoDTO.java (96%) rename src/main/java/im/zhaojun/{common => zfile}/model/dto/CacheConfigDTO.java (90%) rename src/main/java/im/zhaojun/{common => zfile}/model/dto/FileItemDTO.java (94%) rename src/main/java/im/zhaojun/{common => zfile}/model/dto/InstallModelDTO.java (95%) rename src/main/java/im/zhaojun/{common => zfile}/model/dto/ResultBean.java (98%) rename src/main/java/im/zhaojun/{common => zfile}/model/dto/SiteConfigDTO.java (91%) rename src/main/java/im/zhaojun/{common => zfile}/model/dto/StorageStrategyDTO.java (54%) rename src/main/java/im/zhaojun/{common => zfile}/model/dto/SystemConfigDTO.java (86%) rename src/main/java/im/zhaojun/{common/model => zfile/model/entity}/StorageConfig.java (92%) rename src/main/java/im/zhaojun/{common/model => zfile/model/entity}/SystemConfig.java (96%) rename src/main/java/im/zhaojun/{common => zfile}/model/enums/FileTypeEnum.java (90%) rename src/main/java/im/zhaojun/{common => zfile}/model/enums/StorageTypeEnum.java (97%) rename src/main/java/im/zhaojun/{common => zfile}/model/enums/StorageTypeEnumConvert.java (92%) rename src/main/java/im/zhaojun/{common => zfile}/model/enums/StorageTypeEnumDeSerializerConvert.java (89%) rename src/main/java/im/zhaojun/{common => zfile}/model/enums/StorageTypeEnumSerializerConvert.java (93%) rename src/main/java/im/zhaojun/{common/model => zfile/model/support}/FilePageModel.java (74%) rename src/main/java/im/zhaojun/{common/model => zfile/model/support}/Jvm.java (94%) rename src/main/java/im/zhaojun/{common/model => zfile/model/support}/Mem.java (65%) rename src/main/java/im/zhaojun/{onedrive/common/model => zfile/model/support}/OneDriveToken.java (86%) rename src/main/java/im/zhaojun/{common/model => zfile/model/support}/Sys.java (96%) rename src/main/java/im/zhaojun/{common/model => zfile/model/support}/SystemMonitorInfo.java (72%) rename src/main/java/im/zhaojun/{common => zfile}/repository/StorageConfigRepository.java (83%) rename src/main/java/im/zhaojun/{common => zfile}/repository/SystemConfigRepository.java (82%) rename src/main/java/im/zhaojun/{common => zfile}/security/Md5PasswordEncoder.java (93%) rename src/main/java/im/zhaojun/{common => zfile}/security/MySecurityConfig.java (90%) rename src/main/java/im/zhaojun/{common => zfile}/security/MyUserDetailsServiceImpl.java (89%) rename src/main/java/im/zhaojun/{common => zfile}/service/StorageConfigService.java (85%) rename src/main/java/im/zhaojun/{common => zfile}/service/SystemConfigService.java (82%) rename src/main/java/im/zhaojun/{common => zfile}/service/SystemService.java (81%) rename src/main/java/im/zhaojun/{common/service/AbstractFileService.java => zfile/service/base/AbstractBaseFileService.java} (82%) rename src/main/java/im/zhaojun/{onedrive/common/service/AbstractOneDriveService.java => zfile/service/base/AbstractOneDriveServiceBase.java} (89%) rename src/main/java/im/zhaojun/{common/service/AbstractS3FileService.java => zfile/service/base/AbstractS3BaseFileService.java} (91%) rename src/main/java/im/zhaojun/{common/service/FileService.java => zfile/service/base/BaseFileService.java} (80%) rename src/main/java/im/zhaojun/{aliyun/service => zfile/service/impl}/AliyunServiceImpl.java (85%) rename src/main/java/im/zhaojun/{ftp/service => zfile/service/impl}/FtpServiceImpl.java (81%) rename src/main/java/im/zhaojun/{huawei/service => zfile/service/impl}/HuaweiServiceImpl.java (85%) rename src/main/java/im/zhaojun/{local/service => zfile/service/impl}/LocalServiceImpl.java (80%) rename src/main/java/im/zhaojun/{minio => zfile/service/impl}/MinIOServiceImpl.java (85%) rename src/main/java/im/zhaojun/{onedrive/china/service => zfile/service/impl}/OneDriveChinaServiceImpl.java (84%) rename src/main/java/im/zhaojun/{onedrive/international/service => zfile/service/impl}/OneDriveServiceImpl.java (84%) rename src/main/java/im/zhaojun/{qiniu/service => zfile/service/impl}/QiniuServiceImpl.java (85%) rename src/main/java/im/zhaojun/{s3 => zfile/service/impl}/S3ServiceImpl.java (86%) rename src/main/java/im/zhaojun/{tencent => zfile/service/impl}/TencentServiceImpl.java (85%) rename src/main/java/im/zhaojun/{ufile/service => zfile/service/impl}/UFileServiceImpl.java (64%) rename src/main/java/im/zhaojun/{upyun/service => zfile/service/impl}/UpYunServiceImpl.java (86%) rename src/main/java/im/zhaojun/{common/service => zfile/service/support}/FileAsyncCacheService.java (87%) rename src/main/java/im/zhaojun/{common/service => zfile/service/support}/FileCacheService.java (85%) rename src/main/java/im/zhaojun/{common/service => zfile/service/support}/SystemMonitorService.java (68%) rename src/main/java/im/zhaojun/{common => zfile}/util/AudioHelper.java (94%) rename src/main/java/im/zhaojun/{common => zfile}/util/FileComparator.java (91%) rename src/main/java/im/zhaojun/{common => zfile}/util/FileUtil.java (98%) rename src/main/java/im/zhaojun/{common => zfile}/util/HttpUtil.java (96%) rename src/main/java/im/zhaojun/{common => zfile}/util/NaturalOrderComparator.java (92%) rename src/main/java/im/zhaojun/{common => zfile}/util/SpringContextHolder.java (98%) rename src/main/java/im/zhaojun/{common => zfile}/util/StartupListener.java (83%) rename src/main/java/im/zhaojun/{common => zfile}/util/StringUtils.java (98%) diff --git a/src/main/java/im/zhaojun/ZfileApplication.java b/src/main/java/im/zhaojun/zfile/ZfileApplication.java similarity index 95% rename from src/main/java/im/zhaojun/ZfileApplication.java rename to src/main/java/im/zhaojun/zfile/ZfileApplication.java index 683c42d..6476903 100644 --- a/src/main/java/im/zhaojun/ZfileApplication.java +++ b/src/main/java/im/zhaojun/zfile/ZfileApplication.java @@ -1,4 +1,4 @@ -package im.zhaojun; +package im.zhaojun.zfile; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/src/main/java/im/zhaojun/common/cache/ZFileCache.java b/src/main/java/im/zhaojun/zfile/cache/ZFileCache.java similarity index 92% rename from src/main/java/im/zhaojun/common/cache/ZFileCache.java rename to src/main/java/im/zhaojun/zfile/cache/ZFileCache.java index f2f12c3..1880e11 100644 --- a/src/main/java/im/zhaojun/common/cache/ZFileCache.java +++ b/src/main/java/im/zhaojun/zfile/cache/ZFileCache.java @@ -1,9 +1,9 @@ -package im.zhaojun.common.cache; +package im.zhaojun.zfile.cache; import cn.hutool.core.util.StrUtil; -import im.zhaojun.common.model.dto.FileItemDTO; -import im.zhaojun.common.model.dto.SystemConfigDTO; -import im.zhaojun.common.service.SystemConfigService; +import im.zhaojun.zfile.model.dto.FileItemDTO; +import im.zhaojun.zfile.model.dto.SystemConfigDTO; +import im.zhaojun.zfile.service.SystemConfigService; import org.springframework.stereotype.Component; import javax.annotation.Resource; diff --git a/src/main/java/im/zhaojun/common/config/CacheConfig.java b/src/main/java/im/zhaojun/zfile/config/CacheConfig.java similarity index 84% rename from src/main/java/im/zhaojun/common/config/CacheConfig.java rename to src/main/java/im/zhaojun/zfile/config/CacheConfig.java index c87513f..dccea69 100644 --- a/src/main/java/im/zhaojun/common/config/CacheConfig.java +++ b/src/main/java/im/zhaojun/zfile/config/CacheConfig.java @@ -1,6 +1,6 @@ -package im.zhaojun.common.config; +package im.zhaojun.zfile.config; -import im.zhaojun.common.model.dto.FileItemDTO; +import im.zhaojun.zfile.model.dto.FileItemDTO; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/src/main/java/im/zhaojun/common/config/ContentTypeTextToTextJson.java b/src/main/java/im/zhaojun/zfile/config/ContentTypeTextToTextJson.java similarity index 94% rename from src/main/java/im/zhaojun/common/config/ContentTypeTextToTextJson.java rename to src/main/java/im/zhaojun/zfile/config/ContentTypeTextToTextJson.java index 61a456f..045f32b 100644 --- a/src/main/java/im/zhaojun/common/config/ContentTypeTextToTextJson.java +++ b/src/main/java/im/zhaojun/zfile/config/ContentTypeTextToTextJson.java @@ -1,4 +1,4 @@ -package im.zhaojun.common.config; +package im.zhaojun.zfile.config; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -12,6 +12,9 @@ import java.io.IOException; import java.net.URI; import java.util.Collections; +/** + * @author zhaojun + */ public class ContentTypeTextToTextJson implements ClientHttpRequestInterceptor { private static final Logger LOG = LoggerFactory.getLogger(ContentTypeTextToTextJson.class); diff --git a/src/main/java/im/zhaojun/common/config/CorsFilter.java b/src/main/java/im/zhaojun/zfile/config/CorsFilter.java similarity index 97% rename from src/main/java/im/zhaojun/common/config/CorsFilter.java rename to src/main/java/im/zhaojun/zfile/config/CorsFilter.java index c88e7f5..8620917 100644 --- a/src/main/java/im/zhaojun/common/config/CorsFilter.java +++ b/src/main/java/im/zhaojun/zfile/config/CorsFilter.java @@ -1,4 +1,4 @@ -package im.zhaojun.common.config; +package im.zhaojun.zfile.config; import org.springframework.http.HttpHeaders; import org.springframework.web.cors.CorsUtils; diff --git a/src/main/java/im/zhaojun/common/config/GlobalScheduleTask.java b/src/main/java/im/zhaojun/zfile/config/GlobalScheduleTask.java similarity index 82% rename from src/main/java/im/zhaojun/common/config/GlobalScheduleTask.java rename to src/main/java/im/zhaojun/zfile/config/GlobalScheduleTask.java index deaac8e..5ef09bc 100644 --- a/src/main/java/im/zhaojun/common/config/GlobalScheduleTask.java +++ b/src/main/java/im/zhaojun/zfile/config/GlobalScheduleTask.java @@ -1,12 +1,12 @@ -package im.zhaojun.common.config; +package im.zhaojun.zfile.config; -import im.zhaojun.common.cache.ZFileCache; -import im.zhaojun.common.model.enums.StorageTypeEnum; -import im.zhaojun.common.service.AbstractFileService; -import im.zhaojun.common.service.StorageConfigService; -import im.zhaojun.common.service.SystemConfigService; -import im.zhaojun.onedrive.china.service.OneDriveChinaServiceImpl; -import im.zhaojun.onedrive.international.service.OneDriveServiceImpl; +import im.zhaojun.zfile.cache.ZFileCache; +import im.zhaojun.zfile.model.enums.StorageTypeEnum; +import im.zhaojun.zfile.service.base.AbstractBaseFileService; +import im.zhaojun.zfile.service.StorageConfigService; +import im.zhaojun.zfile.service.SystemConfigService; +import im.zhaojun.zfile.service.impl.OneDriveChinaServiceImpl; +import im.zhaojun.zfile.service.impl.OneDriveServiceImpl; import lombok.extern.slf4j.Slf4j; import org.springframework.context.annotation.Configuration; import org.springframework.scheduling.annotation.EnableScheduling; @@ -48,7 +48,7 @@ public class GlobalScheduleTask { try { log.debug("尝试调用 OneDrive 自动刷新 AccessToken 定时任务"); - AbstractFileService currentFileService = systemConfigService.getCurrentFileService(); + AbstractBaseFileService currentFileService = systemConfigService.getCurrentFileService(); if (!(currentFileService instanceof OneDriveServiceImpl || currentFileService instanceof OneDriveChinaServiceImpl)) { diff --git a/src/main/java/im/zhaojun/onedrive/common/config/OneDriveConfig.java b/src/main/java/im/zhaojun/zfile/config/OneDriveConfig.java similarity index 82% rename from src/main/java/im/zhaojun/onedrive/common/config/OneDriveConfig.java rename to src/main/java/im/zhaojun/zfile/config/OneDriveConfig.java index deb559b..9bdee73 100644 --- a/src/main/java/im/zhaojun/onedrive/common/config/OneDriveConfig.java +++ b/src/main/java/im/zhaojun/zfile/config/OneDriveConfig.java @@ -1,11 +1,11 @@ -package im.zhaojun.onedrive.common.config; +package im.zhaojun.zfile.config; -import im.zhaojun.common.model.StorageConfig; -import im.zhaojun.common.model.constant.StorageConfigConstant; -import im.zhaojun.common.model.enums.StorageTypeEnum; -import im.zhaojun.common.service.StorageConfigService; -import im.zhaojun.onedrive.china.service.OneDriveChinaServiceImpl; -import im.zhaojun.onedrive.international.service.OneDriveServiceImpl; +import im.zhaojun.zfile.model.entity.StorageConfig; +import im.zhaojun.zfile.model.constant.StorageConfigConstant; +import im.zhaojun.zfile.model.enums.StorageTypeEnum; +import im.zhaojun.zfile.service.StorageConfigService; +import im.zhaojun.zfile.service.impl.OneDriveChinaServiceImpl; +import im.zhaojun.zfile.service.impl.OneDriveServiceImpl; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Lazy; diff --git a/src/main/java/im/zhaojun/common/config/StorageTypeFactory.java b/src/main/java/im/zhaojun/zfile/config/StorageTypeFactory.java similarity index 68% rename from src/main/java/im/zhaojun/common/config/StorageTypeFactory.java rename to src/main/java/im/zhaojun/zfile/config/StorageTypeFactory.java index e2a927d..d7e1dc1 100644 --- a/src/main/java/im/zhaojun/common/config/StorageTypeFactory.java +++ b/src/main/java/im/zhaojun/zfile/config/StorageTypeFactory.java @@ -1,7 +1,7 @@ -package im.zhaojun.common.config; +package im.zhaojun.zfile.config; -import im.zhaojun.common.model.enums.StorageTypeEnum; -import im.zhaojun.common.service.AbstractFileService; +import im.zhaojun.zfile.model.enums.StorageTypeEnum; +import im.zhaojun.zfile.service.base.AbstractBaseFileService; import org.springframework.beans.BeansException; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextAware; @@ -15,7 +15,7 @@ import java.util.Map; @Component public class StorageTypeFactory implements ApplicationContextAware { - private static Map storageTypeEnumFileServiceMap; + private static Map storageTypeEnumFileServiceMap; private static ApplicationContext applicationContext; @@ -27,15 +27,15 @@ public class StorageTypeFactory implements ApplicationContextAware { applicationContext = act; // 获取 Spring 容器中所有 FileService 类型的类 - storageTypeEnumFileServiceMap = act.getBeansOfType(AbstractFileService.class); + storageTypeEnumFileServiceMap = act.getBeansOfType(AbstractBaseFileService.class); } /** * 获取指定存储类型 Service */ - public static AbstractFileService getStorageTypeService(StorageTypeEnum type) { - AbstractFileService result = null; - for (AbstractFileService fileService : storageTypeEnumFileServiceMap.values()) { + public static AbstractBaseFileService getStorageTypeService(StorageTypeEnum type) { + AbstractBaseFileService result = null; + for (AbstractBaseFileService fileService : storageTypeEnumFileServiceMap.values()) { if (fileService.getStorageTypeEnum() == type) { result = fileService; break; diff --git a/src/main/java/im/zhaojun/common/config/WebMvcConfig.java b/src/main/java/im/zhaojun/zfile/config/WebMvcConfig.java similarity index 90% rename from src/main/java/im/zhaojun/common/config/WebMvcConfig.java rename to src/main/java/im/zhaojun/zfile/config/WebMvcConfig.java index f755a3c..d888c44 100644 --- a/src/main/java/im/zhaojun/common/config/WebMvcConfig.java +++ b/src/main/java/im/zhaojun/zfile/config/WebMvcConfig.java @@ -1,6 +1,6 @@ -package im.zhaojun.common.config; +package im.zhaojun.zfile.config; -import im.zhaojun.common.model.enums.StorageTypeEnumDeSerializerConvert; +import im.zhaojun.zfile.model.enums.StorageTypeEnumDeSerializerConvert; import org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory; import org.springframework.boot.web.servlet.server.ServletWebServerFactory; import org.springframework.context.annotation.Bean; diff --git a/src/main/java/im/zhaojun/common/config/ZFileConfiguration.java b/src/main/java/im/zhaojun/zfile/config/ZFileConfiguration.java similarity index 95% rename from src/main/java/im/zhaojun/common/config/ZFileConfiguration.java rename to src/main/java/im/zhaojun/zfile/config/ZFileConfiguration.java index aee5ced..57405fd 100644 --- a/src/main/java/im/zhaojun/common/config/ZFileConfiguration.java +++ b/src/main/java/im/zhaojun/zfile/config/ZFileConfiguration.java @@ -1,4 +1,4 @@ -package im.zhaojun.common.config; +package im.zhaojun.zfile.config; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/src/main/java/im/zhaojun/common/controller/AdminController.java b/src/main/java/im/zhaojun/zfile/controller/AdminController.java similarity index 84% rename from src/main/java/im/zhaojun/common/controller/AdminController.java rename to src/main/java/im/zhaojun/zfile/controller/AdminController.java index 047d614..f0223a3 100644 --- a/src/main/java/im/zhaojun/common/controller/AdminController.java +++ b/src/main/java/im/zhaojun/zfile/controller/AdminController.java @@ -1,19 +1,19 @@ -package im.zhaojun.common.controller; +package im.zhaojun.zfile.controller; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ZipUtil; -import im.zhaojun.common.config.StorageTypeFactory; -import im.zhaojun.common.model.StorageConfig; -import im.zhaojun.common.model.SystemMonitorInfo; -import im.zhaojun.common.model.dto.ResultBean; -import im.zhaojun.common.model.dto.StorageStrategyDTO; -import im.zhaojun.common.model.dto.SystemConfigDTO; -import im.zhaojun.common.model.enums.StorageTypeEnum; -import im.zhaojun.common.service.AbstractFileService; -import im.zhaojun.common.service.FileAsyncCacheService; -import im.zhaojun.common.service.StorageConfigService; -import im.zhaojun.common.service.SystemConfigService; -import im.zhaojun.common.util.FileUtil; +import im.zhaojun.zfile.config.StorageTypeFactory; +import im.zhaojun.zfile.model.entity.StorageConfig; +import im.zhaojun.zfile.model.support.SystemMonitorInfo; +import im.zhaojun.zfile.model.dto.ResultBean; +import im.zhaojun.zfile.model.dto.StorageStrategyDTO; +import im.zhaojun.zfile.model.dto.SystemConfigDTO; +import im.zhaojun.zfile.model.enums.StorageTypeEnum; +import im.zhaojun.zfile.service.base.AbstractBaseFileService; +import im.zhaojun.zfile.service.support.FileAsyncCacheService; +import im.zhaojun.zfile.service.StorageConfigService; +import im.zhaojun.zfile.service.SystemConfigService; +import im.zhaojun.zfile.util.FileUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.http.ResponseEntity; @@ -105,7 +105,7 @@ public class AdminController { List result = new ArrayList<>(); StorageTypeEnum[] values = StorageTypeEnum.values(); for (StorageTypeEnum value : values) { - AbstractFileService storageTypeService = StorageTypeFactory.getStorageTypeService(value); + AbstractBaseFileService storageTypeService = StorageTypeFactory.getStorageTypeService(value); result.add(new StorageStrategyDTO(value.getKey(), value.getDescription(), storageTypeService.getIsInitialized())); @@ -118,10 +118,9 @@ public class AdminController { * @param storageStrategyConfig 保存表单值 * @param storageStrategy 所属策略 * @return 操作结果 - * @throws Exception 表单解析出错异常 */ @PostMapping("/storage-strategy") - public ResultBean save(@RequestParam Map storageStrategyConfig, StorageTypeEnum storageStrategy) throws Exception { + public ResultBean save(@RequestParam Map storageStrategyConfig, StorageTypeEnum storageStrategy) { // 保存设置. List storageConfigList = storageConfigService.selectStorageConfigByType(storageStrategy); for (StorageConfig storageConfig : storageConfigList) { @@ -132,7 +131,7 @@ public class AdminController { storageConfigService.updateStorageConfig(storageConfigList); // 获取当前修改的存储策略 Service, 尝试调用初始化. - AbstractFileService updateStorageStrategyService = StorageTypeFactory.getStorageTypeService(storageStrategy); + AbstractBaseFileService updateStorageStrategyService = StorageTypeFactory.getStorageTypeService(storageStrategy); updateStorageStrategyService.init(); // 如果修改的为当前启用的缓存, 则重新进行缓存. @@ -142,7 +141,7 @@ public class AdminController { log.debug("检测到更新了当前启用的存储策略 {}, 已清理缓存.", currentStorageStrategy); } - AbstractFileService fileService = systemConfigService.getCurrentFileService(); + AbstractBaseFileService fileService = systemConfigService.getCurrentFileService(); fileService.clearFileCache(); fileAsyncCacheService.cacheGlobalFile(); } @@ -170,7 +169,7 @@ public class AdminController { if (storageStrategy == null) { log.info("尚未配置存储策略."); } else { - AbstractFileService fileService = systemConfigService.getCurrentFileService(); + AbstractBaseFileService fileService = systemConfigService.getCurrentFileService(); fileService.init(); fileService.clearFileCache(); log.info("切换至存储类型: {}", storageStrategy.getDescription()); diff --git a/src/main/java/im/zhaojun/common/controller/CacheController.java b/src/main/java/im/zhaojun/zfile/controller/CacheController.java similarity index 78% rename from src/main/java/im/zhaojun/common/controller/CacheController.java rename to src/main/java/im/zhaojun/zfile/controller/CacheController.java index 8a34fa8..08b2044 100644 --- a/src/main/java/im/zhaojun/common/controller/CacheController.java +++ b/src/main/java/im/zhaojun/zfile/controller/CacheController.java @@ -1,19 +1,18 @@ -package im.zhaojun.common.controller; +package im.zhaojun.zfile.controller; -import im.zhaojun.common.cache.ZFileCache; -import im.zhaojun.common.model.dto.CacheConfigDTO; -import im.zhaojun.common.model.dto.ResultBean; -import im.zhaojun.common.service.AbstractFileService; -import im.zhaojun.common.service.FileAsyncCacheService; -import im.zhaojun.common.service.FileCacheService; -import im.zhaojun.common.service.SystemConfigService; +import im.zhaojun.zfile.cache.ZFileCache; +import im.zhaojun.zfile.model.dto.CacheConfigDTO; +import im.zhaojun.zfile.model.dto.ResultBean; +import im.zhaojun.zfile.service.base.AbstractBaseFileService; +import im.zhaojun.zfile.service.support.FileAsyncCacheService; +import im.zhaojun.zfile.service.support.FileCacheService; +import im.zhaojun.zfile.service.SystemConfigService; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; -import java.util.Set; /** * @author zhaojun @@ -48,7 +47,7 @@ public class CacheController { @GetMapping("/config") public ResultBean cacheConfig() { - AbstractFileService fileService = systemConfigService.getCurrentFileService(); + AbstractBaseFileService fileService = systemConfigService.getCurrentFileService(); CacheConfigDTO cacheConfigDTO = new CacheConfigDTO(); cacheConfigDTO.setEnableCache(systemConfigService.getEnableCache()); cacheConfigDTO.setCacheFinish(fileAsyncCacheService.isCacheFinish()); @@ -61,7 +60,7 @@ public class CacheController { @PostMapping("/refresh") public ResultBean refreshCache(String key) throws Exception { - AbstractFileService fileService = systemConfigService.getCurrentFileService(); + AbstractBaseFileService fileService = systemConfigService.getCurrentFileService(); fileService.refreshCache(key); return ResultBean.success(); } diff --git a/src/main/java/im/zhaojun/common/controller/CommonController.java b/src/main/java/im/zhaojun/zfile/controller/CommonController.java similarity index 88% rename from src/main/java/im/zhaojun/common/controller/CommonController.java rename to src/main/java/im/zhaojun/zfile/controller/CommonController.java index 76cbee1..fa5bd2c 100644 --- a/src/main/java/im/zhaojun/common/controller/CommonController.java +++ b/src/main/java/im/zhaojun/zfile/controller/CommonController.java @@ -1,9 +1,9 @@ -package im.zhaojun.common.controller; +package im.zhaojun.zfile.controller; -import im.zhaojun.common.model.dto.ResultBean; -import im.zhaojun.common.model.enums.StorageTypeEnum; -import im.zhaojun.common.util.AudioHelper; -import im.zhaojun.common.util.HttpUtil; +import im.zhaojun.zfile.model.dto.ResultBean; +import im.zhaojun.zfile.model.enums.StorageTypeEnum; +import im.zhaojun.zfile.util.AudioHelper; +import im.zhaojun.zfile.util.HttpUtil; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; diff --git a/src/main/java/im/zhaojun/common/controller/FileController.java b/src/main/java/im/zhaojun/zfile/controller/FileController.java similarity index 84% rename from src/main/java/im/zhaojun/common/controller/FileController.java rename to src/main/java/im/zhaojun/zfile/controller/FileController.java index 565ada3..26ce0b3 100644 --- a/src/main/java/im/zhaojun/common/controller/FileController.java +++ b/src/main/java/im/zhaojun/zfile/controller/FileController.java @@ -1,22 +1,22 @@ -package im.zhaojun.common.controller; +package im.zhaojun.zfile.controller; import cn.hutool.core.util.BooleanUtil; import cn.hutool.core.util.URLUtil; -import im.zhaojun.common.annotation.CheckStorageStrategyInit; -import im.zhaojun.common.exception.SearchDisableException; -import im.zhaojun.common.model.FilePageModel; -import im.zhaojun.common.model.constant.ZFileConstant; -import im.zhaojun.common.model.dto.FileItemDTO; -import im.zhaojun.common.model.dto.ResultBean; -import im.zhaojun.common.model.dto.SiteConfigDTO; -import im.zhaojun.common.model.dto.SystemConfigDTO; -import im.zhaojun.common.service.AbstractFileService; -import im.zhaojun.common.service.FileAsyncCacheService; -import im.zhaojun.common.service.SystemConfigService; -import im.zhaojun.common.service.SystemService; -import im.zhaojun.common.util.FileComparator; -import im.zhaojun.common.util.HttpUtil; -import im.zhaojun.common.util.StringUtils; +import im.zhaojun.zfile.model.annotation.CheckStorageStrategyInit; +import im.zhaojun.zfile.exception.SearchDisableException; +import im.zhaojun.zfile.model.support.FilePageModel; +import im.zhaojun.zfile.model.constant.ZFileConstant; +import im.zhaojun.zfile.model.dto.FileItemDTO; +import im.zhaojun.zfile.model.dto.ResultBean; +import im.zhaojun.zfile.model.dto.SiteConfigDTO; +import im.zhaojun.zfile.model.dto.SystemConfigDTO; +import im.zhaojun.zfile.service.base.AbstractBaseFileService; +import im.zhaojun.zfile.service.support.FileAsyncCacheService; +import im.zhaojun.zfile.service.SystemConfigService; +import im.zhaojun.zfile.service.SystemService; +import im.zhaojun.zfile.util.FileComparator; +import im.zhaojun.zfile.util.HttpUtil; +import im.zhaojun.zfile.util.StringUtils; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -57,11 +57,11 @@ public class FileController { @RequestParam(defaultValue = "asc") String order, @RequestParam(required = false) String password, @RequestParam(defaultValue = "1") Integer page) throws Exception { - AbstractFileService fileService = systemConfigService.getCurrentFileService(); + AbstractBaseFileService fileService = systemConfigService.getCurrentFileService(); List fileItemList = fileService.fileList(StringUtils.removeDuplicateSeparator("/" + path + "/")); for (FileItemDTO fileItemDTO : fileItemList) { if (ZFileConstant.PASSWORD_FILE_NAME.equals(fileItemDTO.getName())) { - String expectedPasswordContent = null; + String expectedPasswordContent; try { expectedPasswordContent = HttpUtil.getTextContent(fileItemDTO.getUrl() + '1'); } catch (HttpClientErrorException httpClientErrorException) { @@ -110,7 +110,7 @@ public class FileController { @RequestParam(defaultValue = "name") String sortBy, @RequestParam(defaultValue = "asc") String order, @RequestParam(defaultValue = "1") Integer page) { - AbstractFileService fileService = systemConfigService.getCurrentFileService(); + AbstractBaseFileService fileService = systemConfigService.getCurrentFileService(); SystemConfigDTO systemConfigDTO = systemConfigService.getSystemConfig(); if (BooleanUtil.isFalse(systemConfigDTO.getSearchEnable())) { throw new SearchDisableException("搜索功能未开启"); @@ -166,7 +166,7 @@ public class FileController { @CheckStorageStrategyInit @GetMapping("/directlink") public ResultBean directlink(String path) { - AbstractFileService fileService = systemConfigService.getCurrentFileService(); + AbstractBaseFileService fileService = systemConfigService.getCurrentFileService(); return ResultBean.successData(fileService.getFileItem(path)); } } diff --git a/src/main/java/im/zhaojun/common/controller/InstallController.java b/src/main/java/im/zhaojun/zfile/controller/InstallController.java similarity index 87% rename from src/main/java/im/zhaojun/common/controller/InstallController.java rename to src/main/java/im/zhaojun/zfile/controller/InstallController.java index e4d1ca4..cbcb727 100644 --- a/src/main/java/im/zhaojun/common/controller/InstallController.java +++ b/src/main/java/im/zhaojun/zfile/controller/InstallController.java @@ -1,13 +1,13 @@ -package im.zhaojun.common.controller; +package im.zhaojun.zfile.controller; import cn.hutool.crypto.SecureUtil; -import im.zhaojun.common.model.StorageConfig; -import im.zhaojun.common.model.dto.InstallModelDTO; -import im.zhaojun.common.model.dto.ResultBean; -import im.zhaojun.common.model.dto.SystemConfigDTO; -import im.zhaojun.common.model.enums.StorageTypeEnum; -import im.zhaojun.common.service.StorageConfigService; -import im.zhaojun.common.service.SystemConfigService; +import im.zhaojun.zfile.model.entity.StorageConfig; +import im.zhaojun.zfile.model.dto.InstallModelDTO; +import im.zhaojun.zfile.model.dto.ResultBean; +import im.zhaojun.zfile.model.dto.SystemConfigDTO; +import im.zhaojun.zfile.model.enums.StorageTypeEnum; +import im.zhaojun.zfile.service.StorageConfigService; +import im.zhaojun.zfile.service.SystemConfigService; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RestController; diff --git a/src/main/java/im/zhaojun/local/controller/LocalController.java b/src/main/java/im/zhaojun/zfile/controller/LocalController.java similarity index 87% rename from src/main/java/im/zhaojun/local/controller/LocalController.java rename to src/main/java/im/zhaojun/zfile/controller/LocalController.java index b474727..91e687e 100644 --- a/src/main/java/im/zhaojun/local/controller/LocalController.java +++ b/src/main/java/im/zhaojun/zfile/controller/LocalController.java @@ -1,8 +1,8 @@ -package im.zhaojun.local.controller; +package im.zhaojun.zfile.controller; -import im.zhaojun.common.util.FileUtil; -import im.zhaojun.common.util.StringUtils; -import im.zhaojun.local.service.LocalServiceImpl; +import im.zhaojun.zfile.util.FileUtil; +import im.zhaojun.zfile.util.StringUtils; +import im.zhaojun.zfile.service.impl.LocalServiceImpl; import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Controller; import org.springframework.util.AntPathMatcher; diff --git a/src/main/java/im/zhaojun/onedrive/common/controller/OneDriveController.java b/src/main/java/im/zhaojun/zfile/controller/OneDriveController.java similarity index 83% rename from src/main/java/im/zhaojun/onedrive/common/controller/OneDriveController.java rename to src/main/java/im/zhaojun/zfile/controller/OneDriveController.java index 1c4aa88..2e15797 100644 --- a/src/main/java/im/zhaojun/onedrive/common/controller/OneDriveController.java +++ b/src/main/java/im/zhaojun/zfile/controller/OneDriveController.java @@ -1,8 +1,8 @@ -package im.zhaojun.onedrive.common.controller; +package im.zhaojun.zfile.controller; -import im.zhaojun.onedrive.china.service.OneDriveChinaServiceImpl; -import im.zhaojun.onedrive.common.model.OneDriveToken; -import im.zhaojun.onedrive.international.service.OneDriveServiceImpl; +import im.zhaojun.zfile.service.impl.OneDriveChinaServiceImpl; +import im.zhaojun.zfile.model.support.OneDriveToken; +import im.zhaojun.zfile.service.impl.OneDriveServiceImpl; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.GetMapping; diff --git a/src/main/java/im/zhaojun/common/controller/PageController.java b/src/main/java/im/zhaojun/zfile/controller/PageController.java similarity index 74% rename from src/main/java/im/zhaojun/common/controller/PageController.java rename to src/main/java/im/zhaojun/zfile/controller/PageController.java index c7c8326..f398650 100644 --- a/src/main/java/im/zhaojun/common/controller/PageController.java +++ b/src/main/java/im/zhaojun/zfile/controller/PageController.java @@ -1,10 +1,11 @@ -package im.zhaojun.common.controller; +package im.zhaojun.zfile.controller; import cn.hutool.core.util.URLUtil; -import im.zhaojun.common.model.dto.FileItemDTO; -import im.zhaojun.common.model.enums.FileTypeEnum; -import im.zhaojun.common.service.AbstractFileService; -import im.zhaojun.common.service.SystemConfigService; +import im.zhaojun.zfile.model.constant.ZFileConstant; +import im.zhaojun.zfile.model.dto.FileItemDTO; +import im.zhaojun.zfile.model.enums.FileTypeEnum; +import im.zhaojun.zfile.service.base.AbstractBaseFileService; +import im.zhaojun.zfile.service.SystemConfigService; import org.springframework.stereotype.Controller; import org.springframework.util.AntPathMatcher; import org.springframework.web.bind.annotation.GetMapping; @@ -26,18 +27,18 @@ public class PageController { private SystemConfigService systemConfigService; @GetMapping("/directlink/**") - public String directlink(final HttpServletRequest request) throws MalformedURLException { + public String directlink(final HttpServletRequest request) { String path = (String) request.getAttribute( HandlerMapping.PATH_WITHIN_HANDLER_MAPPING_ATTRIBUTE); String bestMatchPattern = (String) request.getAttribute(HandlerMapping.BEST_MATCHING_PATTERN_ATTRIBUTE); AntPathMatcher apm = new AntPathMatcher(); String filePath = apm.extractPathWithinPattern(bestMatchPattern, path); - if (filePath.length() > 0 && filePath.charAt(0) != '/') { + if (filePath.length() > 0 && filePath.charAt(0) != ZFileConstant.PATH_SEPARATOR_CHAR) { filePath = "/" + filePath; } - AbstractFileService fileService = systemConfigService.getCurrentFileService(); + AbstractBaseFileService fileService = systemConfigService.getCurrentFileService(); FileItemDTO fileItem = fileService.getFileItem(filePath); String url = fileItem.getUrl(); diff --git a/src/main/java/im/zhaojun/common/aop/FileListCacheAspect.java b/src/main/java/im/zhaojun/zfile/core/FileListCacheAop.java similarity index 75% rename from src/main/java/im/zhaojun/common/aop/FileListCacheAspect.java rename to src/main/java/im/zhaojun/zfile/core/FileListCacheAop.java index 02e6f01..99cff3a 100644 --- a/src/main/java/im/zhaojun/common/aop/FileListCacheAspect.java +++ b/src/main/java/im/zhaojun/zfile/core/FileListCacheAop.java @@ -1,8 +1,8 @@ -package im.zhaojun.common.aop; +package im.zhaojun.zfile.core; -import im.zhaojun.common.cache.ZFileCache; -import im.zhaojun.common.model.dto.FileItemDTO; -import im.zhaojun.common.service.SystemConfigService; +import im.zhaojun.zfile.cache.ZFileCache; +import im.zhaojun.zfile.model.dto.FileItemDTO; +import im.zhaojun.zfile.service.SystemConfigService; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.annotation.Around; import org.aspectj.lang.annotation.Aspect; @@ -14,11 +14,12 @@ import javax.annotation.Resource; import java.util.List; /** - * 操作日志切面. + * @author zhaojun + * 缓存切面类, 用于访问文件夹时, 缓存文件列表内容. */ @Aspect @Component -public class FileListCacheAspect { +public class FileListCacheAop { @Resource private ZFileCache zFileCache; @@ -26,7 +27,7 @@ public class FileListCacheAspect { @Resource private SystemConfigService systemConfigService; - @Pointcut("execution(public * im.zhaojun.common.service.AbstractFileService.fileList(..))") + @Pointcut("execution(public * im.zhaojun.zfile.service.base.AbstractBaseFileService.fileList(..))") public void pointcut() { } diff --git a/src/main/java/im/zhaojun/common/aspect/StorageStrategyInitCheckAspect.java b/src/main/java/im/zhaojun/zfile/core/StorageStrategyInitCheckAop.java similarity index 57% rename from src/main/java/im/zhaojun/common/aspect/StorageStrategyInitCheckAspect.java rename to src/main/java/im/zhaojun/zfile/core/StorageStrategyInitCheckAop.java index 00a349a..212ce42 100644 --- a/src/main/java/im/zhaojun/common/aspect/StorageStrategyInitCheckAspect.java +++ b/src/main/java/im/zhaojun/zfile/core/StorageStrategyInitCheckAop.java @@ -1,9 +1,9 @@ -package im.zhaojun.common.aspect; +package im.zhaojun.zfile.core; -import im.zhaojun.common.exception.StorageStrategyUninitializedException; -import im.zhaojun.common.service.AbstractFileService; -import im.zhaojun.common.service.SystemConfigService; -import im.zhaojun.common.util.SpringContextHolder; +import im.zhaojun.zfile.exception.StorageStrategyUninitializedException; +import im.zhaojun.zfile.service.base.AbstractBaseFileService; +import im.zhaojun.zfile.service.SystemConfigService; +import im.zhaojun.zfile.util.SpringContextHolder; import org.aspectj.lang.annotation.Aspect; import org.aspectj.lang.annotation.Before; import org.springframework.stereotype.Component; @@ -13,12 +13,12 @@ import org.springframework.stereotype.Component; */ @Aspect @Component -public class StorageStrategyInitCheckAspect { +public class StorageStrategyInitCheckAop { - @Before("@annotation(im.zhaojun.common.annotation.CheckStorageStrategyInit)") + @Before("@annotation(im.zhaojun.zfile.model.annotation.CheckStorageStrategyInit)") public void logStart() { SystemConfigService systemConfigService = SpringContextHolder.getBean(SystemConfigService.class); - AbstractFileService currentFileService = systemConfigService.getCurrentFileService(); + AbstractBaseFileService currentFileService = systemConfigService.getCurrentFileService(); if (currentFileService == null) { throw new StorageStrategyUninitializedException("存储策略尚未初始化, 请联系管理员!"); } diff --git a/src/main/java/im/zhaojun/common/exception/GlobleExceptionHandler.java b/src/main/java/im/zhaojun/zfile/exception/GlobleExceptionHandler.java similarity index 96% rename from src/main/java/im/zhaojun/common/exception/GlobleExceptionHandler.java rename to src/main/java/im/zhaojun/zfile/exception/GlobleExceptionHandler.java index a76cad0..055cd4b 100644 --- a/src/main/java/im/zhaojun/common/exception/GlobleExceptionHandler.java +++ b/src/main/java/im/zhaojun/zfile/exception/GlobleExceptionHandler.java @@ -1,6 +1,6 @@ -package im.zhaojun.common.exception; +package im.zhaojun.zfile.exception; -import im.zhaojun.common.model.dto.ResultBean; +import im.zhaojun.zfile.model.dto.ResultBean; import org.apache.catalina.connector.ClientAbortException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/im/zhaojun/common/exception/InitializeException.java b/src/main/java/im/zhaojun/zfile/exception/InitializeException.java similarity index 94% rename from src/main/java/im/zhaojun/common/exception/InitializeException.java rename to src/main/java/im/zhaojun/zfile/exception/InitializeException.java index b3ec55f..383aea3 100644 --- a/src/main/java/im/zhaojun/common/exception/InitializeException.java +++ b/src/main/java/im/zhaojun/zfile/exception/InitializeException.java @@ -1,4 +1,4 @@ -package im.zhaojun.common.exception; +package im.zhaojun.zfile.exception; /** * 对象存储初始化异常 diff --git a/src/main/java/im/zhaojun/common/exception/NotExistFileException.java b/src/main/java/im/zhaojun/zfile/exception/NotExistFileException.java similarity index 94% rename from src/main/java/im/zhaojun/common/exception/NotExistFileException.java rename to src/main/java/im/zhaojun/zfile/exception/NotExistFileException.java index 3dbd1cd..41ef396 100644 --- a/src/main/java/im/zhaojun/common/exception/NotExistFileException.java +++ b/src/main/java/im/zhaojun/zfile/exception/NotExistFileException.java @@ -1,4 +1,4 @@ -package im.zhaojun.common.exception; +package im.zhaojun.zfile.exception; /** * @author zhaojun diff --git a/src/main/java/im/zhaojun/common/exception/SearchDisableException.java b/src/main/java/im/zhaojun/zfile/exception/SearchDisableException.java similarity index 94% rename from src/main/java/im/zhaojun/common/exception/SearchDisableException.java rename to src/main/java/im/zhaojun/zfile/exception/SearchDisableException.java index d5bfcbb..7347561 100644 --- a/src/main/java/im/zhaojun/common/exception/SearchDisableException.java +++ b/src/main/java/im/zhaojun/zfile/exception/SearchDisableException.java @@ -1,4 +1,4 @@ -package im.zhaojun.common.exception; +package im.zhaojun.zfile.exception; /** * @author zhaojun diff --git a/src/main/java/im/zhaojun/common/exception/StorageStrategyUninitializedException.java b/src/main/java/im/zhaojun/zfile/exception/StorageStrategyUninitializedException.java similarity index 95% rename from src/main/java/im/zhaojun/common/exception/StorageStrategyUninitializedException.java rename to src/main/java/im/zhaojun/zfile/exception/StorageStrategyUninitializedException.java index 462d886..d08c1d8 100644 --- a/src/main/java/im/zhaojun/common/exception/StorageStrategyUninitializedException.java +++ b/src/main/java/im/zhaojun/zfile/exception/StorageStrategyUninitializedException.java @@ -1,4 +1,4 @@ -package im.zhaojun.common.exception; +package im.zhaojun.zfile.exception; /** * 存储策略未初始化异常 diff --git a/src/main/java/im/zhaojun/common/exception/UnknownStorageTypeException.java b/src/main/java/im/zhaojun/zfile/exception/UnknownStorageTypeException.java similarity index 95% rename from src/main/java/im/zhaojun/common/exception/UnknownStorageTypeException.java rename to src/main/java/im/zhaojun/zfile/exception/UnknownStorageTypeException.java index b36b399..394b7b0 100644 --- a/src/main/java/im/zhaojun/common/exception/UnknownStorageTypeException.java +++ b/src/main/java/im/zhaojun/zfile/exception/UnknownStorageTypeException.java @@ -1,4 +1,4 @@ -package im.zhaojun.common.exception; +package im.zhaojun.zfile.exception; /** * 未知的存储类型异常 diff --git a/src/main/java/im/zhaojun/common/security/MyCorsFilter.java b/src/main/java/im/zhaojun/zfile/filter/MyCorsFilter.java similarity index 96% rename from src/main/java/im/zhaojun/common/security/MyCorsFilter.java rename to src/main/java/im/zhaojun/zfile/filter/MyCorsFilter.java index 5a3b43c..417d547 100644 --- a/src/main/java/im/zhaojun/common/security/MyCorsFilter.java +++ b/src/main/java/im/zhaojun/zfile/filter/MyCorsFilter.java @@ -1,4 +1,4 @@ -package im.zhaojun.common.security; +package im.zhaojun.zfile.filter; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/src/main/java/im/zhaojun/common/annotation/CheckStorageStrategyInit.java b/src/main/java/im/zhaojun/zfile/model/annotation/CheckStorageStrategyInit.java similarity index 89% rename from src/main/java/im/zhaojun/common/annotation/CheckStorageStrategyInit.java rename to src/main/java/im/zhaojun/zfile/model/annotation/CheckStorageStrategyInit.java index 2c56aec..babd87d 100644 --- a/src/main/java/im/zhaojun/common/annotation/CheckStorageStrategyInit.java +++ b/src/main/java/im/zhaojun/zfile/model/annotation/CheckStorageStrategyInit.java @@ -1,4 +1,4 @@ -package im.zhaojun.common.annotation; +package im.zhaojun.zfile.model.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/main/java/im/zhaojun/common/model/constant/StorageConfigConstant.java b/src/main/java/im/zhaojun/zfile/model/constant/StorageConfigConstant.java similarity index 96% rename from src/main/java/im/zhaojun/common/model/constant/StorageConfigConstant.java rename to src/main/java/im/zhaojun/zfile/model/constant/StorageConfigConstant.java index 485fa64..ae7f7c1 100644 --- a/src/main/java/im/zhaojun/common/model/constant/StorageConfigConstant.java +++ b/src/main/java/im/zhaojun/zfile/model/constant/StorageConfigConstant.java @@ -1,4 +1,4 @@ -package im.zhaojun.common.model.constant; +package im.zhaojun.zfile.model.constant; /** * @author zhaojun diff --git a/src/main/java/im/zhaojun/common/model/constant/SystemConfigConstant.java b/src/main/java/im/zhaojun/zfile/model/constant/SystemConfigConstant.java similarity index 93% rename from src/main/java/im/zhaojun/common/model/constant/SystemConfigConstant.java rename to src/main/java/im/zhaojun/zfile/model/constant/SystemConfigConstant.java index 3912926..332049e 100644 --- a/src/main/java/im/zhaojun/common/model/constant/SystemConfigConstant.java +++ b/src/main/java/im/zhaojun/zfile/model/constant/SystemConfigConstant.java @@ -1,4 +1,4 @@ -package im.zhaojun.common.model.constant; +package im.zhaojun.zfile.model.constant; /** * @author zhaojun diff --git a/src/main/java/im/zhaojun/common/model/constant/ZFileConstant.java b/src/main/java/im/zhaojun/zfile/model/constant/ZFileConstant.java similarity index 86% rename from src/main/java/im/zhaojun/common/model/constant/ZFileConstant.java rename to src/main/java/im/zhaojun/zfile/model/constant/ZFileConstant.java index 34ce43c..c7820ce 100644 --- a/src/main/java/im/zhaojun/common/model/constant/ZFileConstant.java +++ b/src/main/java/im/zhaojun/zfile/model/constant/ZFileConstant.java @@ -1,4 +1,4 @@ -package im.zhaojun.common.model.constant; +package im.zhaojun.zfile.model.constant; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; @@ -14,6 +14,10 @@ public class ZFileConstant { public static final String AUDIO_TMP_PATH = "/.zfile/tmp/audio/"; + public static final Character PATH_SEPARATOR_CHAR = '/'; + + public static final String PATH_SEPARATOR = "/"; + /** * 页面文档文件 */ diff --git a/src/main/java/im/zhaojun/common/model/dto/AudioInfoDTO.java b/src/main/java/im/zhaojun/zfile/model/dto/AudioInfoDTO.java similarity index 96% rename from src/main/java/im/zhaojun/common/model/dto/AudioInfoDTO.java rename to src/main/java/im/zhaojun/zfile/model/dto/AudioInfoDTO.java index d632453..0c750cd 100644 --- a/src/main/java/im/zhaojun/common/model/dto/AudioInfoDTO.java +++ b/src/main/java/im/zhaojun/zfile/model/dto/AudioInfoDTO.java @@ -1,4 +1,4 @@ -package im.zhaojun.common.model.dto; +package im.zhaojun.zfile.model.dto; /** * @author zhaojun diff --git a/src/main/java/im/zhaojun/common/model/dto/CacheConfigDTO.java b/src/main/java/im/zhaojun/zfile/model/dto/CacheConfigDTO.java similarity index 90% rename from src/main/java/im/zhaojun/common/model/dto/CacheConfigDTO.java rename to src/main/java/im/zhaojun/zfile/model/dto/CacheConfigDTO.java index 2463940..12c6fe1 100644 --- a/src/main/java/im/zhaojun/common/model/dto/CacheConfigDTO.java +++ b/src/main/java/im/zhaojun/zfile/model/dto/CacheConfigDTO.java @@ -1,4 +1,4 @@ -package im.zhaojun.common.model.dto; +package im.zhaojun.zfile.model.dto; import lombok.Data; diff --git a/src/main/java/im/zhaojun/common/model/dto/FileItemDTO.java b/src/main/java/im/zhaojun/zfile/model/dto/FileItemDTO.java similarity index 94% rename from src/main/java/im/zhaojun/common/model/dto/FileItemDTO.java rename to src/main/java/im/zhaojun/zfile/model/dto/FileItemDTO.java index b051a89..52c9230 100644 --- a/src/main/java/im/zhaojun/common/model/dto/FileItemDTO.java +++ b/src/main/java/im/zhaojun/zfile/model/dto/FileItemDTO.java @@ -1,6 +1,6 @@ -package im.zhaojun.common.model.dto; +package im.zhaojun.zfile.model.dto; -import im.zhaojun.common.model.enums.FileTypeEnum; +import im.zhaojun.zfile.model.enums.FileTypeEnum; import java.io.Serializable; import java.util.Date; diff --git a/src/main/java/im/zhaojun/common/model/dto/InstallModelDTO.java b/src/main/java/im/zhaojun/zfile/model/dto/InstallModelDTO.java similarity index 95% rename from src/main/java/im/zhaojun/common/model/dto/InstallModelDTO.java rename to src/main/java/im/zhaojun/zfile/model/dto/InstallModelDTO.java index 1b8f60b..1d89be1 100644 --- a/src/main/java/im/zhaojun/common/model/dto/InstallModelDTO.java +++ b/src/main/java/im/zhaojun/zfile/model/dto/InstallModelDTO.java @@ -1,6 +1,6 @@ -package im.zhaojun.common.model.dto; +package im.zhaojun.zfile.model.dto; -import im.zhaojun.common.model.enums.StorageTypeEnum; +import im.zhaojun.zfile.model.enums.StorageTypeEnum; import java.util.Map; diff --git a/src/main/java/im/zhaojun/common/model/dto/ResultBean.java b/src/main/java/im/zhaojun/zfile/model/dto/ResultBean.java similarity index 98% rename from src/main/java/im/zhaojun/common/model/dto/ResultBean.java rename to src/main/java/im/zhaojun/zfile/model/dto/ResultBean.java index f4d9e6a..bc7a497 100644 --- a/src/main/java/im/zhaojun/common/model/dto/ResultBean.java +++ b/src/main/java/im/zhaojun/zfile/model/dto/ResultBean.java @@ -1,4 +1,4 @@ -package im.zhaojun.common.model.dto; +package im.zhaojun.zfile.model.dto; import java.io.Serializable; diff --git a/src/main/java/im/zhaojun/common/model/dto/SiteConfigDTO.java b/src/main/java/im/zhaojun/zfile/model/dto/SiteConfigDTO.java similarity index 91% rename from src/main/java/im/zhaojun/common/model/dto/SiteConfigDTO.java rename to src/main/java/im/zhaojun/zfile/model/dto/SiteConfigDTO.java index 33b8822..c959fc0 100644 --- a/src/main/java/im/zhaojun/common/model/dto/SiteConfigDTO.java +++ b/src/main/java/im/zhaojun/zfile/model/dto/SiteConfigDTO.java @@ -1,4 +1,4 @@ -package im.zhaojun.common.model.dto; +package im.zhaojun.zfile.model.dto; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; diff --git a/src/main/java/im/zhaojun/common/model/dto/StorageStrategyDTO.java b/src/main/java/im/zhaojun/zfile/model/dto/StorageStrategyDTO.java similarity index 54% rename from src/main/java/im/zhaojun/common/model/dto/StorageStrategyDTO.java rename to src/main/java/im/zhaojun/zfile/model/dto/StorageStrategyDTO.java index f2789b4..f9608bd 100644 --- a/src/main/java/im/zhaojun/common/model/dto/StorageStrategyDTO.java +++ b/src/main/java/im/zhaojun/zfile/model/dto/StorageStrategyDTO.java @@ -1,5 +1,7 @@ -package im.zhaojun.common.model.dto; +package im.zhaojun.zfile.model.dto; +import com.alibaba.fastjson.annotation.JSONField; +import com.fasterxml.jackson.annotation.JsonProperty; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; @@ -16,6 +18,7 @@ public class StorageStrategyDTO { private String description; - private boolean available; + @JsonProperty(defaultValue = "false") + private Boolean available; } diff --git a/src/main/java/im/zhaojun/common/model/dto/SystemConfigDTO.java b/src/main/java/im/zhaojun/zfile/model/dto/SystemConfigDTO.java similarity index 86% rename from src/main/java/im/zhaojun/common/model/dto/SystemConfigDTO.java rename to src/main/java/im/zhaojun/zfile/model/dto/SystemConfigDTO.java index 230a968..09308cf 100644 --- a/src/main/java/im/zhaojun/common/model/dto/SystemConfigDTO.java +++ b/src/main/java/im/zhaojun/zfile/model/dto/SystemConfigDTO.java @@ -1,9 +1,9 @@ -package im.zhaojun.common.model.dto; +package im.zhaojun.zfile.model.dto; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import im.zhaojun.common.model.enums.StorageTypeEnum; -import im.zhaojun.common.model.enums.StorageTypeEnumSerializerConvert; +import im.zhaojun.zfile.model.enums.StorageTypeEnum; +import im.zhaojun.zfile.model.enums.StorageTypeEnumSerializerConvert; import lombok.Data; import lombok.ToString; diff --git a/src/main/java/im/zhaojun/common/model/StorageConfig.java b/src/main/java/im/zhaojun/zfile/model/entity/StorageConfig.java similarity index 92% rename from src/main/java/im/zhaojun/common/model/StorageConfig.java rename to src/main/java/im/zhaojun/zfile/model/entity/StorageConfig.java index a4f1789..1504f83 100644 --- a/src/main/java/im/zhaojun/common/model/StorageConfig.java +++ b/src/main/java/im/zhaojun/zfile/model/entity/StorageConfig.java @@ -1,6 +1,6 @@ -package im.zhaojun.common.model; +package im.zhaojun.zfile.model.entity; -import im.zhaojun.common.model.enums.StorageTypeEnum; +import im.zhaojun.zfile.model.enums.StorageTypeEnum; import lombok.Data; import javax.persistence.Column; diff --git a/src/main/java/im/zhaojun/common/model/SystemConfig.java b/src/main/java/im/zhaojun/zfile/model/entity/SystemConfig.java similarity index 96% rename from src/main/java/im/zhaojun/common/model/SystemConfig.java rename to src/main/java/im/zhaojun/zfile/model/entity/SystemConfig.java index 60b0208..a9e6b77 100644 --- a/src/main/java/im/zhaojun/common/model/SystemConfig.java +++ b/src/main/java/im/zhaojun/zfile/model/entity/SystemConfig.java @@ -1,4 +1,4 @@ -package im.zhaojun.common.model; +package im.zhaojun.zfile.model.entity; import lombok.Data; diff --git a/src/main/java/im/zhaojun/common/model/enums/FileTypeEnum.java b/src/main/java/im/zhaojun/zfile/model/enums/FileTypeEnum.java similarity index 90% rename from src/main/java/im/zhaojun/common/model/enums/FileTypeEnum.java rename to src/main/java/im/zhaojun/zfile/model/enums/FileTypeEnum.java index e4ce8ce..4cab814 100644 --- a/src/main/java/im/zhaojun/common/model/enums/FileTypeEnum.java +++ b/src/main/java/im/zhaojun/zfile/model/enums/FileTypeEnum.java @@ -1,4 +1,4 @@ -package im.zhaojun.common.model.enums; +package im.zhaojun.zfile.model.enums; /** * @author zhaojun diff --git a/src/main/java/im/zhaojun/common/model/enums/StorageTypeEnum.java b/src/main/java/im/zhaojun/zfile/model/enums/StorageTypeEnum.java similarity index 97% rename from src/main/java/im/zhaojun/common/model/enums/StorageTypeEnum.java rename to src/main/java/im/zhaojun/zfile/model/enums/StorageTypeEnum.java index 4fb6484..3221609 100644 --- a/src/main/java/im/zhaojun/common/model/enums/StorageTypeEnum.java +++ b/src/main/java/im/zhaojun/zfile/model/enums/StorageTypeEnum.java @@ -1,4 +1,4 @@ -package im.zhaojun.common.model.enums; +package im.zhaojun.zfile.model.enums; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/src/main/java/im/zhaojun/common/model/enums/StorageTypeEnumConvert.java b/src/main/java/im/zhaojun/zfile/model/enums/StorageTypeEnumConvert.java similarity index 92% rename from src/main/java/im/zhaojun/common/model/enums/StorageTypeEnumConvert.java rename to src/main/java/im/zhaojun/zfile/model/enums/StorageTypeEnumConvert.java index cc935bb..cd65b75 100644 --- a/src/main/java/im/zhaojun/common/model/enums/StorageTypeEnumConvert.java +++ b/src/main/java/im/zhaojun/zfile/model/enums/StorageTypeEnumConvert.java @@ -1,4 +1,4 @@ -package im.zhaojun.common.model.enums; +package im.zhaojun.zfile.model.enums; import javax.persistence.AttributeConverter; import javax.persistence.Converter; diff --git a/src/main/java/im/zhaojun/common/model/enums/StorageTypeEnumDeSerializerConvert.java b/src/main/java/im/zhaojun/zfile/model/enums/StorageTypeEnumDeSerializerConvert.java similarity index 89% rename from src/main/java/im/zhaojun/common/model/enums/StorageTypeEnumDeSerializerConvert.java rename to src/main/java/im/zhaojun/zfile/model/enums/StorageTypeEnumDeSerializerConvert.java index 57a00ce..02ce6c7 100644 --- a/src/main/java/im/zhaojun/common/model/enums/StorageTypeEnumDeSerializerConvert.java +++ b/src/main/java/im/zhaojun/zfile/model/enums/StorageTypeEnumDeSerializerConvert.java @@ -1,4 +1,4 @@ -package im.zhaojun.common.model.enums; +package im.zhaojun.zfile.model.enums; import org.springframework.core.convert.converter.Converter; import org.springframework.lang.NonNull; diff --git a/src/main/java/im/zhaojun/common/model/enums/StorageTypeEnumSerializerConvert.java b/src/main/java/im/zhaojun/zfile/model/enums/StorageTypeEnumSerializerConvert.java similarity index 93% rename from src/main/java/im/zhaojun/common/model/enums/StorageTypeEnumSerializerConvert.java rename to src/main/java/im/zhaojun/zfile/model/enums/StorageTypeEnumSerializerConvert.java index 09429bc..35da6fc 100644 --- a/src/main/java/im/zhaojun/common/model/enums/StorageTypeEnumSerializerConvert.java +++ b/src/main/java/im/zhaojun/zfile/model/enums/StorageTypeEnumSerializerConvert.java @@ -1,4 +1,4 @@ -package im.zhaojun.common.model.enums; +package im.zhaojun.zfile.model.enums; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.JsonSerializer; diff --git a/src/main/java/im/zhaojun/common/model/FilePageModel.java b/src/main/java/im/zhaojun/zfile/model/support/FilePageModel.java similarity index 74% rename from src/main/java/im/zhaojun/common/model/FilePageModel.java rename to src/main/java/im/zhaojun/zfile/model/support/FilePageModel.java index 88d9de9..d257d84 100644 --- a/src/main/java/im/zhaojun/common/model/FilePageModel.java +++ b/src/main/java/im/zhaojun/zfile/model/support/FilePageModel.java @@ -1,6 +1,6 @@ -package im.zhaojun.common.model; +package im.zhaojun.zfile.model.support; -import im.zhaojun.common.model.dto.FileItemDTO; +import im.zhaojun.zfile.model.dto.FileItemDTO; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/im/zhaojun/common/model/Jvm.java b/src/main/java/im/zhaojun/zfile/model/support/Jvm.java similarity index 94% rename from src/main/java/im/zhaojun/common/model/Jvm.java rename to src/main/java/im/zhaojun/zfile/model/support/Jvm.java index 74de00f..674d3f1 100644 --- a/src/main/java/im/zhaojun/common/model/Jvm.java +++ b/src/main/java/im/zhaojun/zfile/model/support/Jvm.java @@ -1,4 +1,4 @@ -package im.zhaojun.common.model; +package im.zhaojun.zfile.model.support; import lombok.Data; diff --git a/src/main/java/im/zhaojun/common/model/Mem.java b/src/main/java/im/zhaojun/zfile/model/support/Mem.java similarity index 65% rename from src/main/java/im/zhaojun/common/model/Mem.java rename to src/main/java/im/zhaojun/zfile/model/support/Mem.java index 6c4b7c5..9d4d2cc 100644 --- a/src/main/java/im/zhaojun/common/model/Mem.java +++ b/src/main/java/im/zhaojun/zfile/model/support/Mem.java @@ -1,4 +1,4 @@ -package im.zhaojun.common.model; +package im.zhaojun.zfile.model.support; import com.sun.management.OperatingSystemMXBean; import lombok.Data; @@ -27,11 +27,11 @@ public class Mem { private double free; public Mem() { - OperatingSystemMXBean operatingSystemMXBean = (OperatingSystemMXBean) ManagementFactory.getOperatingSystemMXBean(); + OperatingSystemMXBean osb = (OperatingSystemMXBean) ManagementFactory.getOperatingSystemMXBean(); // 总的物理内存+虚拟内存 - long totalVirtualMemory = operatingSystemMXBean.getTotalSwapSpaceSize(); + long totalVirtualMemory = osb.getTotalSwapSpaceSize(); // 剩余的物理内存 - long freePhysicalMemorySize = operatingSystemMXBean.getFreePhysicalMemorySize(); + long freePhysicalMemorySize = osb.getFreePhysicalMemorySize(); this.total = totalVirtualMemory; this.free = freePhysicalMemorySize; this.used = totalVirtualMemory - freePhysicalMemorySize; diff --git a/src/main/java/im/zhaojun/onedrive/common/model/OneDriveToken.java b/src/main/java/im/zhaojun/zfile/model/support/OneDriveToken.java similarity index 86% rename from src/main/java/im/zhaojun/onedrive/common/model/OneDriveToken.java rename to src/main/java/im/zhaojun/zfile/model/support/OneDriveToken.java index 3699900..f101783 100644 --- a/src/main/java/im/zhaojun/onedrive/common/model/OneDriveToken.java +++ b/src/main/java/im/zhaojun/zfile/model/support/OneDriveToken.java @@ -1,4 +1,4 @@ -package im.zhaojun.onedrive.common.model; +package im.zhaojun.zfile.model.support; import com.alibaba.fastjson.annotation.JSONField; import lombok.Data; diff --git a/src/main/java/im/zhaojun/common/model/Sys.java b/src/main/java/im/zhaojun/zfile/model/support/Sys.java similarity index 96% rename from src/main/java/im/zhaojun/common/model/Sys.java rename to src/main/java/im/zhaojun/zfile/model/support/Sys.java index 6807d95..0ae4de7 100644 --- a/src/main/java/im/zhaojun/common/model/Sys.java +++ b/src/main/java/im/zhaojun/zfile/model/support/Sys.java @@ -1,4 +1,4 @@ -package im.zhaojun.common.model; +package im.zhaojun.zfile.model.support; import cn.hutool.core.date.BetweenFormater; import cn.hutool.core.date.DateUtil; diff --git a/src/main/java/im/zhaojun/common/model/SystemMonitorInfo.java b/src/main/java/im/zhaojun/zfile/model/support/SystemMonitorInfo.java similarity index 72% rename from src/main/java/im/zhaojun/common/model/SystemMonitorInfo.java rename to src/main/java/im/zhaojun/zfile/model/support/SystemMonitorInfo.java index 8d392e4..280fd5b 100644 --- a/src/main/java/im/zhaojun/common/model/SystemMonitorInfo.java +++ b/src/main/java/im/zhaojun/zfile/model/support/SystemMonitorInfo.java @@ -1,5 +1,8 @@ -package im.zhaojun.common.model; +package im.zhaojun.zfile.model.support; +import im.zhaojun.zfile.model.support.Jvm; +import im.zhaojun.zfile.model.support.Mem; +import im.zhaojun.zfile.model.support.Sys; import lombok.Data; import java.io.Serializable; diff --git a/src/main/java/im/zhaojun/common/repository/StorageConfigRepository.java b/src/main/java/im/zhaojun/zfile/repository/StorageConfigRepository.java similarity index 83% rename from src/main/java/im/zhaojun/common/repository/StorageConfigRepository.java rename to src/main/java/im/zhaojun/zfile/repository/StorageConfigRepository.java index e0d4398..3221f1c 100644 --- a/src/main/java/im/zhaojun/common/repository/StorageConfigRepository.java +++ b/src/main/java/im/zhaojun/zfile/repository/StorageConfigRepository.java @@ -1,7 +1,7 @@ -package im.zhaojun.common.repository; +package im.zhaojun.zfile.repository; -import im.zhaojun.common.model.StorageConfig; -import im.zhaojun.common.model.enums.StorageTypeEnum; +import im.zhaojun.zfile.model.entity.StorageConfig; +import im.zhaojun.zfile.model.enums.StorageTypeEnum; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/src/main/java/im/zhaojun/common/repository/SystemConfigRepository.java b/src/main/java/im/zhaojun/zfile/repository/SystemConfigRepository.java similarity index 82% rename from src/main/java/im/zhaojun/common/repository/SystemConfigRepository.java rename to src/main/java/im/zhaojun/zfile/repository/SystemConfigRepository.java index 1a9c68e..8011542 100644 --- a/src/main/java/im/zhaojun/common/repository/SystemConfigRepository.java +++ b/src/main/java/im/zhaojun/zfile/repository/SystemConfigRepository.java @@ -1,6 +1,6 @@ -package im.zhaojun.common.repository; +package im.zhaojun.zfile.repository; -import im.zhaojun.common.model.SystemConfig; +import im.zhaojun.zfile.model.entity.SystemConfig; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/src/main/java/im/zhaojun/common/security/Md5PasswordEncoder.java b/src/main/java/im/zhaojun/zfile/security/Md5PasswordEncoder.java similarity index 93% rename from src/main/java/im/zhaojun/common/security/Md5PasswordEncoder.java rename to src/main/java/im/zhaojun/zfile/security/Md5PasswordEncoder.java index 62727f0..3b1fcf6 100644 --- a/src/main/java/im/zhaojun/common/security/Md5PasswordEncoder.java +++ b/src/main/java/im/zhaojun/zfile/security/Md5PasswordEncoder.java @@ -1,4 +1,4 @@ -package im.zhaojun.common.security; +package im.zhaojun.zfile.security; import cn.hutool.crypto.SecureUtil; import org.springframework.security.crypto.password.PasswordEncoder; diff --git a/src/main/java/im/zhaojun/common/security/MySecurityConfig.java b/src/main/java/im/zhaojun/zfile/security/MySecurityConfig.java similarity index 90% rename from src/main/java/im/zhaojun/common/security/MySecurityConfig.java rename to src/main/java/im/zhaojun/zfile/security/MySecurityConfig.java index 59358af..ac7f2dd 100644 --- a/src/main/java/im/zhaojun/common/security/MySecurityConfig.java +++ b/src/main/java/im/zhaojun/zfile/security/MySecurityConfig.java @@ -1,7 +1,7 @@ -package im.zhaojun.common.security; +package im.zhaojun.zfile.security; import com.fasterxml.jackson.databind.ObjectMapper; -import im.zhaojun.common.model.dto.ResultBean; +import im.zhaojun.zfile.model.dto.ResultBean; import org.springframework.context.annotation.Bean; import org.springframework.http.HttpMethod; import org.springframework.security.authentication.BadCredentialsException; @@ -21,6 +21,7 @@ import java.io.PrintWriter; /** * 自定义 Security 配置类 + * * @author zhaojun */ @EnableWebSecurity @@ -34,7 +35,7 @@ public class MySecurityConfig extends WebSecurityConfigurerAdapter { http // .authenticationProvider(authenticationProvider()) .exceptionHandling() - //未登录时，进行json格式的提示，很喜欢这种写法，不用单独写一个又一个的类 + // 未登录时，进行 json 格式的提示. .authenticationEntryPoint((request, response, authException) -> { response.setContentType("application/json;charset=utf-8"); response.setStatus(HttpServletResponse.SC_UNAUTHORIZED); @@ -48,8 +49,8 @@ public class MySecurityConfig extends WebSecurityConfigurerAdapter { .antMatchers("/").permitAll() .antMatchers("/admin/**").authenticated() .and() - .formLogin() //使用自带的登录 - //登录失败，返回json + .formLogin() // 使用自带的登录 + // 登录失败，返回json .failureHandler((request, response, ex) -> { response.setContentType("application/json;charset=utf-8"); response.setStatus(HttpServletResponse.SC_FORBIDDEN); @@ -64,7 +65,7 @@ public class MySecurityConfig extends WebSecurityConfigurerAdapter { out.flush(); out.close(); }) - //登录成功，返回json + // 登录成功，返回json .successHandler((request, response, authentication) -> { response.setContentType("application/json;charset=utf-8"); PrintWriter out = response.getWriter(); @@ -74,7 +75,7 @@ public class MySecurityConfig extends WebSecurityConfigurerAdapter { }) .and() .exceptionHandling() - //没有权限，返回json + // 没有权限，返回json .accessDeniedHandler((request, response, ex) -> { response.setContentType("application/json;charset=utf-8"); response.setStatus(HttpServletResponse.SC_FORBIDDEN); @@ -85,7 +86,7 @@ public class MySecurityConfig extends WebSecurityConfigurerAdapter { }) .and() .logout() - //退出成功，返回json + // 退出成功，返回 json .logoutSuccessHandler((request, response, authentication) -> { response.setContentType("application/json;charset=utf-8"); PrintWriter out = response.getWriter(); @@ -120,7 +121,7 @@ public class MySecurityConfig extends WebSecurityConfigurerAdapter { @Override public void configure(WebSecurity web) { - //对于在header里面增加token等类似情况，放行所有OPTIONS请求。 + // 对于在 header 里面增加 token 等类似情况，放行所有 OPTIONS 请求。 web.ignoring().antMatchers(HttpMethod.OPTIONS, "/**"); web.httpFirewall(allowUrlEncodedSlashHttpFirewall()); } diff --git a/src/main/java/im/zhaojun/common/security/MyUserDetailsServiceImpl.java b/src/main/java/im/zhaojun/zfile/security/MyUserDetailsServiceImpl.java similarity index 89% rename from src/main/java/im/zhaojun/common/security/MyUserDetailsServiceImpl.java rename to src/main/java/im/zhaojun/zfile/security/MyUserDetailsServiceImpl.java index dacdf77..0febad7 100644 --- a/src/main/java/im/zhaojun/common/security/MyUserDetailsServiceImpl.java +++ b/src/main/java/im/zhaojun/zfile/security/MyUserDetailsServiceImpl.java @@ -1,7 +1,7 @@ -package im.zhaojun.common.security; +package im.zhaojun.zfile.security; -import im.zhaojun.common.model.dto.SystemConfigDTO; -import im.zhaojun.common.service.SystemConfigService; +import im.zhaojun.zfile.model.dto.SystemConfigDTO; +import im.zhaojun.zfile.service.SystemConfigService; import org.springframework.security.core.userdetails.User; import org.springframework.security.core.userdetails.UserDetails; import org.springframework.security.core.userdetails.UserDetailsService; diff --git a/src/main/java/im/zhaojun/common/service/StorageConfigService.java b/src/main/java/im/zhaojun/zfile/service/StorageConfigService.java similarity index 85% rename from src/main/java/im/zhaojun/common/service/StorageConfigService.java rename to src/main/java/im/zhaojun/zfile/service/StorageConfigService.java index 6c836a2..dc29975 100644 --- a/src/main/java/im/zhaojun/common/service/StorageConfigService.java +++ b/src/main/java/im/zhaojun/zfile/service/StorageConfigService.java @@ -1,8 +1,8 @@ -package im.zhaojun.common.service; +package im.zhaojun.zfile.service; -import im.zhaojun.common.model.StorageConfig; -import im.zhaojun.common.model.enums.StorageTypeEnum; -import im.zhaojun.common.repository.StorageConfigRepository; +import im.zhaojun.zfile.model.entity.StorageConfig; +import im.zhaojun.zfile.model.enums.StorageTypeEnum; +import im.zhaojun.zfile.repository.StorageConfigRepository; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/src/main/java/im/zhaojun/common/service/SystemConfigService.java b/src/main/java/im/zhaojun/zfile/service/SystemConfigService.java similarity index 82% rename from src/main/java/im/zhaojun/common/service/SystemConfigService.java rename to src/main/java/im/zhaojun/zfile/service/SystemConfigService.java index 0c4192b..3602d05 100644 --- a/src/main/java/im/zhaojun/common/service/SystemConfigService.java +++ b/src/main/java/im/zhaojun/zfile/service/SystemConfigService.java @@ -1,15 +1,17 @@ -package im.zhaojun.common.service; +package im.zhaojun.zfile.service; import cn.hutool.core.convert.Convert; import cn.hutool.core.util.BooleanUtil; import cn.hutool.crypto.SecureUtil; -import im.zhaojun.common.cache.ZFileCache; -import im.zhaojun.common.config.StorageTypeFactory; -import im.zhaojun.common.model.SystemConfig; -import im.zhaojun.common.model.constant.SystemConfigConstant; -import im.zhaojun.common.model.dto.SystemConfigDTO; -import im.zhaojun.common.model.enums.StorageTypeEnum; -import im.zhaojun.common.repository.SystemConfigRepository; +import im.zhaojun.zfile.cache.ZFileCache; +import im.zhaojun.zfile.config.StorageTypeFactory; +import im.zhaojun.zfile.model.constant.SystemConfigConstant; +import im.zhaojun.zfile.model.dto.SystemConfigDTO; +import im.zhaojun.zfile.model.entity.SystemConfig; +import im.zhaojun.zfile.model.enums.StorageTypeEnum; +import im.zhaojun.zfile.repository.SystemConfigRepository; +import im.zhaojun.zfile.service.base.AbstractBaseFileService; +import im.zhaojun.zfile.service.support.FileCacheService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -25,10 +27,6 @@ import java.util.List; @Service public class SystemConfigService { - public static final String SYSTEM_CONFIG_CACHE_PREFIX = "zfile-config-cache:"; - - public static final String SYSTEM_CONFIG_CACHE_KEY = "1"; - @Resource private ZFileCache zFileCache; @@ -38,7 +36,7 @@ public class SystemConfigService { @Resource private FileCacheService fileCacheService; - private Class systemConfigDTOClass = SystemConfigDTO.class; + private Class systemConfigClazz = SystemConfigDTO.class; public SystemConfigDTO getSystemConfig() { SystemConfigDTO cacheConfig = zFileCache.getConfig(); @@ -53,7 +51,7 @@ public class SystemConfigService { String key = systemConfig.getKey(); try { - Field field = systemConfigDTOClass.getDeclaredField(key); + Field field = systemConfigClazz.getDeclaredField(key); if (field != null) { field.setAccessible(true); String strVal = systemConfig.getValue(); @@ -75,7 +73,7 @@ public class SystemConfigService { public void updateSystemConfig(SystemConfigDTO systemConfigDTO) throws Exception { List systemConfigList = new ArrayList<>(); - Field[] fields = systemConfigDTOClass.getDeclaredFields(); + Field[] fields = systemConfigClazz.getDeclaredFields(); for (Field field : fields) { String key = field.getName(); SystemConfig systemConfig = systemConfigRepository.findByKey(key); @@ -117,7 +115,7 @@ public class SystemConfigService { } - public AbstractFileService getCurrentFileService() { + public AbstractBaseFileService getCurrentFileService() { StorageTypeEnum storageStrategy = getCurrentStorageStrategy(); return StorageTypeFactory.getStorageTypeService(storageStrategy); } diff --git a/src/main/java/im/zhaojun/common/service/SystemService.java b/src/main/java/im/zhaojun/zfile/service/SystemService.java similarity index 81% rename from src/main/java/im/zhaojun/common/service/SystemService.java rename to src/main/java/im/zhaojun/zfile/service/SystemService.java index 89274ac..38da707 100644 --- a/src/main/java/im/zhaojun/common/service/SystemService.java +++ b/src/main/java/im/zhaojun/zfile/service/SystemService.java @@ -1,11 +1,12 @@ -package im.zhaojun.common.service; +package im.zhaojun.zfile.service; -import im.zhaojun.common.model.constant.ZFileConstant; -import im.zhaojun.common.model.dto.FileItemDTO; -import im.zhaojun.common.model.dto.SiteConfigDTO; -import im.zhaojun.common.model.enums.StorageTypeEnum; -import im.zhaojun.common.util.HttpUtil; -import im.zhaojun.common.util.StringUtils; +import im.zhaojun.zfile.model.constant.ZFileConstant; +import im.zhaojun.zfile.model.dto.FileItemDTO; +import im.zhaojun.zfile.model.dto.SiteConfigDTO; +import im.zhaojun.zfile.model.enums.StorageTypeEnum; +import im.zhaojun.zfile.service.base.AbstractBaseFileService; +import im.zhaojun.zfile.util.HttpUtil; +import im.zhaojun.zfile.util.StringUtils; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.web.client.HttpClientErrorException; @@ -32,7 +33,7 @@ public class SystemService { public SiteConfigDTO getConfig(String path) throws Exception { SiteConfigDTO siteConfigDTO = new SiteConfigDTO(); - AbstractFileService fileService = systemConfigService.getCurrentFileService(); + AbstractBaseFileService fileService = systemConfigService.getCurrentFileService(); List fileItemList; diff --git a/src/main/java/im/zhaojun/common/service/AbstractFileService.java b/src/main/java/im/zhaojun/zfile/service/base/AbstractBaseFileService.java similarity index 82% rename from src/main/java/im/zhaojun/common/service/AbstractFileService.java rename to src/main/java/im/zhaojun/zfile/service/base/AbstractBaseFileService.java index 6fe62c4..f914692 100644 --- a/src/main/java/im/zhaojun/common/service/AbstractFileService.java +++ b/src/main/java/im/zhaojun/zfile/service/base/AbstractBaseFileService.java @@ -1,11 +1,14 @@ -package im.zhaojun.common.service; +package im.zhaojun.zfile.service.base; import cn.hutool.core.util.BooleanUtil; -import im.zhaojun.common.cache.ZFileCache; -import im.zhaojun.common.model.constant.ZFileConstant; -import im.zhaojun.common.model.dto.FileItemDTO; -import im.zhaojun.common.model.dto.SystemConfigDTO; -import im.zhaojun.common.model.enums.StorageTypeEnum; +import im.zhaojun.zfile.cache.ZFileCache; +import im.zhaojun.zfile.service.support.FileAsyncCacheService; +import im.zhaojun.zfile.service.support.FileCacheService; +import im.zhaojun.zfile.service.SystemConfigService; +import im.zhaojun.zfile.model.constant.ZFileConstant; +import im.zhaojun.zfile.model.dto.FileItemDTO; +import im.zhaojun.zfile.model.dto.SystemConfigDTO; +import im.zhaojun.zfile.model.enums.StorageTypeEnum; import lombok.extern.slf4j.Slf4j; import org.springframework.aop.framework.AopContext; import org.springframework.beans.factory.annotation.Value; @@ -14,13 +17,12 @@ import javax.annotation.PostConstruct; import javax.annotation.Resource; import java.util.List; import java.util.Objects; -import java.util.Set; /** * @author zhaojun */ @Slf4j -public abstract class AbstractFileService extends FileCacheService implements FileService { +public abstract class AbstractBaseFileService extends FileCacheService implements BaseFileService { private static final String SYSTEM_CONFIG_CACHE_PREFIX = "zfile-cache:"; @@ -134,10 +136,15 @@ public abstract class AbstractFileService extends FileCacheService implements Fi */ public void refreshCache(String key) throws Exception { zFileCache.remove(key); - FileService currentFileService = (FileService) AopContext.currentProxy(); + BaseFileService currentFileService = (BaseFileService) AopContext.currentProxy(); currentFileService.fileList(key); } + /** + * 获取单个文件信息 + * @param path 文件路径 + * @return 单个文件的内容. + */ public abstract FileItemDTO getFileItem(String path); } diff --git a/src/main/java/im/zhaojun/onedrive/common/service/AbstractOneDriveService.java b/src/main/java/im/zhaojun/zfile/service/base/AbstractOneDriveServiceBase.java similarity index 89% rename from src/main/java/im/zhaojun/onedrive/common/service/AbstractOneDriveService.java rename to src/main/java/im/zhaojun/zfile/service/base/AbstractOneDriveServiceBase.java index 90b015b..087ea5a 100644 --- a/src/main/java/im/zhaojun/onedrive/common/service/AbstractOneDriveService.java +++ b/src/main/java/im/zhaojun/zfile/service/base/AbstractOneDriveServiceBase.java @@ -1,4 +1,4 @@ -package im.zhaojun.onedrive.common.service; +package im.zhaojun.zfile.service.base; import cn.hutool.core.util.URLUtil; import cn.hutool.http.HttpRequest; @@ -7,15 +7,15 @@ import cn.hutool.http.HttpUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import im.zhaojun.common.model.StorageConfig; -import im.zhaojun.common.model.constant.StorageConfigConstant; -import im.zhaojun.common.model.dto.FileItemDTO; -import im.zhaojun.common.model.enums.FileTypeEnum; -import im.zhaojun.common.repository.StorageConfigRepository; -import im.zhaojun.common.service.AbstractFileService; -import im.zhaojun.common.service.StorageConfigService; -import im.zhaojun.common.util.StringUtils; -import im.zhaojun.onedrive.common.model.OneDriveToken; +import im.zhaojun.zfile.model.constant.ZFileConstant; +import im.zhaojun.zfile.model.entity.StorageConfig; +import im.zhaojun.zfile.model.constant.StorageConfigConstant; +import im.zhaojun.zfile.model.dto.FileItemDTO; +import im.zhaojun.zfile.model.enums.FileTypeEnum; +import im.zhaojun.zfile.repository.StorageConfigRepository; +import im.zhaojun.zfile.service.StorageConfigService; +import im.zhaojun.zfile.util.StringUtils; +import im.zhaojun.zfile.model.support.OneDriveToken; import lombok.extern.slf4j.Slf4j; import org.springframework.http.ResponseEntity; import org.springframework.web.client.HttpClientErrorException; @@ -31,7 +31,7 @@ import java.util.List; * 2020/1/29 11:54 */ @Slf4j -public abstract class AbstractOneDriveService extends AbstractFileService { +public abstract class AbstractOneDriveServiceBase extends AbstractBaseFileService { protected static final String DRIVER_INFO_URL = "https://{graphEndPoint}/v1.0/me/drives"; @@ -43,6 +43,8 @@ public abstract class AbstractOneDriveService extends AbstractFileService { protected static final String AUTHENTICATE_URL = "https://{authenticateEndPoint}/common/oauth2/v2.0/token"; + private static final String ONE_DRIVE_FILE_FLAG = "file"; + @Resource private RestTemplate oneDriveRestTemplate; @@ -105,7 +107,7 @@ public abstract class AbstractOneDriveService extends AbstractFileService { if (nextLink != null) { nextLink = nextLink.replace("+", "%2B"); requestUrl = URLUtil.decode(nextLink); - }else if ("/".equalsIgnoreCase(fullPath) || "".equalsIgnoreCase(fullPath)) { + }else if (ZFileConstant.PATH_SEPARATOR.equalsIgnoreCase(fullPath) || "".equalsIgnoreCase(fullPath)) { requestUrl = DRIVER_ROOT_URL; } else { requestUrl = DRIVER_ITEMS_URL; @@ -169,7 +171,7 @@ public abstract class AbstractOneDriveService extends AbstractFileService { fileItemDTO.setSize(fileItem.getLong("size")); fileItemDTO.setTime(fileItem.getDate("lastModifiedDateTime")); - if (fileItem.containsKey("file")) { + if (fileItem.containsKey(ONE_DRIVE_FILE_FLAG)) { fileItemDTO.setUrl(fileItem.getString("@microsoft.graph.downloadUrl")); fileItemDTO.setType(FileTypeEnum.FILE); } else { diff --git a/src/main/java/im/zhaojun/common/service/AbstractS3FileService.java b/src/main/java/im/zhaojun/zfile/service/base/AbstractS3BaseFileService.java similarity index 91% rename from src/main/java/im/zhaojun/common/service/AbstractS3FileService.java rename to src/main/java/im/zhaojun/zfile/service/base/AbstractS3BaseFileService.java index 057ca89..4e73495 100644 --- a/src/main/java/im/zhaojun/common/service/AbstractS3FileService.java +++ b/src/main/java/im/zhaojun/zfile/service/base/AbstractS3BaseFileService.java @@ -1,4 +1,4 @@ -package im.zhaojun.common.service; +package im.zhaojun.zfile.service.base; import cn.hutool.core.util.BooleanUtil; import cn.hutool.core.util.URLUtil; @@ -6,10 +6,11 @@ import com.amazonaws.services.s3.AmazonS3; import com.amazonaws.services.s3.model.ListObjectsRequest; import com.amazonaws.services.s3.model.ObjectListing; import com.amazonaws.services.s3.model.S3ObjectSummary; -import im.zhaojun.common.exception.NotExistFileException; -import im.zhaojun.common.model.dto.FileItemDTO; -import im.zhaojun.common.model.enums.FileTypeEnum; -import im.zhaojun.common.util.StringUtils; +import im.zhaojun.zfile.service.StorageConfigService; +import im.zhaojun.zfile.exception.NotExistFileException; +import im.zhaojun.zfile.model.dto.FileItemDTO; +import im.zhaojun.zfile.model.enums.FileTypeEnum; +import im.zhaojun.zfile.util.StringUtils; import javax.annotation.Resource; import java.net.URL; @@ -21,7 +22,7 @@ import java.util.Objects; /** * @author zhaojun */ -public abstract class AbstractS3FileService extends AbstractFileService { +public abstract class AbstractS3BaseFileService extends AbstractBaseFileService { @Resource protected StorageConfigService storageConfigService; diff --git a/src/main/java/im/zhaojun/common/service/FileService.java b/src/main/java/im/zhaojun/zfile/service/base/BaseFileService.java similarity index 80% rename from src/main/java/im/zhaojun/common/service/FileService.java rename to src/main/java/im/zhaojun/zfile/service/base/BaseFileService.java index 8836d2a..1f9b4dd 100644 --- a/src/main/java/im/zhaojun/common/service/FileService.java +++ b/src/main/java/im/zhaojun/zfile/service/base/BaseFileService.java @@ -1,13 +1,13 @@ -package im.zhaojun.common.service; +package im.zhaojun.zfile.service.base; -import im.zhaojun.common.model.dto.FileItemDTO; +import im.zhaojun.zfile.model.dto.FileItemDTO; import java.util.List; /** * @author zhaojun */ -public interface FileService { +public interface BaseFileService { /*** * 获取指定路径下的文件及文件夹 diff --git a/src/main/java/im/zhaojun/aliyun/service/AliyunServiceImpl.java b/src/main/java/im/zhaojun/zfile/service/impl/AliyunServiceImpl.java similarity index 85% rename from src/main/java/im/zhaojun/aliyun/service/AliyunServiceImpl.java rename to src/main/java/im/zhaojun/zfile/service/impl/AliyunServiceImpl.java index 6394157..0426d1a 100644 --- a/src/main/java/im/zhaojun/aliyun/service/AliyunServiceImpl.java +++ b/src/main/java/im/zhaojun/zfile/service/impl/AliyunServiceImpl.java @@ -1,15 +1,15 @@ -package im.zhaojun.aliyun.service; +package im.zhaojun.zfile.service.impl; import cn.hutool.core.convert.Convert; import com.amazonaws.auth.AWSStaticCredentialsProvider; import com.amazonaws.auth.BasicAWSCredentials; import com.amazonaws.client.builder.AwsClientBuilder; import com.amazonaws.services.s3.AmazonS3ClientBuilder; -import im.zhaojun.common.model.StorageConfig; -import im.zhaojun.common.model.constant.StorageConfigConstant; -import im.zhaojun.common.model.enums.StorageTypeEnum; -import im.zhaojun.common.service.AbstractS3FileService; -import im.zhaojun.common.service.FileService; +import im.zhaojun.zfile.model.entity.StorageConfig; +import im.zhaojun.zfile.model.constant.StorageConfigConstant; +import im.zhaojun.zfile.model.enums.StorageTypeEnum; +import im.zhaojun.zfile.service.base.AbstractS3BaseFileService; +import im.zhaojun.zfile.service.base.BaseFileService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; @@ -21,7 +21,7 @@ import java.util.Objects; * @author zhaojun */ @Service -public class AliyunServiceImpl extends AbstractS3FileService implements FileService { +public class AliyunServiceImpl extends AbstractS3BaseFileService implements BaseFileService { private static final Logger log = LoggerFactory.getLogger(AliyunServiceImpl.class); diff --git a/src/main/java/im/zhaojun/ftp/service/FtpServiceImpl.java b/src/main/java/im/zhaojun/zfile/service/impl/FtpServiceImpl.java similarity index 81% rename from src/main/java/im/zhaojun/ftp/service/FtpServiceImpl.java rename to src/main/java/im/zhaojun/zfile/service/impl/FtpServiceImpl.java index a98eee3..6240442 100644 --- a/src/main/java/im/zhaojun/ftp/service/FtpServiceImpl.java +++ b/src/main/java/im/zhaojun/zfile/service/impl/FtpServiceImpl.java @@ -1,16 +1,16 @@ -package im.zhaojun.ftp.service; +package im.zhaojun.zfile.service.impl; import cn.hutool.core.util.URLUtil; import cn.hutool.extra.ftp.Ftp; -import im.zhaojun.common.model.StorageConfig; -import im.zhaojun.common.model.constant.StorageConfigConstant; -import im.zhaojun.common.model.dto.FileItemDTO; -import im.zhaojun.common.model.enums.FileTypeEnum; -import im.zhaojun.common.model.enums.StorageTypeEnum; -import im.zhaojun.common.service.AbstractFileService; -import im.zhaojun.common.service.FileService; -import im.zhaojun.common.service.StorageConfigService; -import im.zhaojun.common.util.StringUtils; +import im.zhaojun.zfile.model.entity.StorageConfig; +import im.zhaojun.zfile.model.constant.StorageConfigConstant; +import im.zhaojun.zfile.model.dto.FileItemDTO; +import im.zhaojun.zfile.model.enums.FileTypeEnum; +import im.zhaojun.zfile.model.enums.StorageTypeEnum; +import im.zhaojun.zfile.service.base.AbstractBaseFileService; +import im.zhaojun.zfile.service.base.BaseFileService; +import im.zhaojun.zfile.service.StorageConfigService; +import im.zhaojun.zfile.util.StringUtils; import org.apache.commons.net.ftp.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -27,7 +27,7 @@ import java.util.Objects; * @author zhaojun */ @Service -public class FtpServiceImpl extends AbstractFileService implements FileService { +public class FtpServiceImpl extends AbstractBaseFileService implements BaseFileService { private static final Logger log = LoggerFactory.getLogger(FtpServiceImpl.class); @@ -56,7 +56,7 @@ public class FtpServiceImpl extends AbstractFileService implements FileService { username = stringStorageConfigMap.get(StorageConfigConstant.USERNAME_KEY).getValue(); password = stringStorageConfigMap.get(StorageConfigConstant.PASSWORD_KEY).getValue(); domain = stringStorageConfigMap.get(StorageConfigConstant.DOMAIN_KEY).getValue(); - super.basePath = stringStorageConfigMap.get(StorageConfigConstant.BASE_PATH).getValue();; + super.basePath = stringStorageConfigMap.get(StorageConfigConstant.BASE_PATH).getValue(); if (Objects.isNull(host) || Objects.isNull(port) || Objects.isNull(username) || Objects.isNull(password)) { isInitialized = false; } else { @@ -128,26 +128,12 @@ public class FtpServiceImpl extends AbstractFileService implements FileService { return fileItemDTO; } - @Override - protected boolean testConnection() { - // FTPClient ftpClient = ftp.getClient(); - // try { - // ftpClient.connect(host, Integer.parseInt(port)); - // return ftpClient.login(username, password); - // } catch (Exception e) { - // e.printStackTrace(); - // return false; - // } - return true; - } - private void ifDisConnectionReConnection() { FTPClient ftpClient = ftp.getClient(); try { // 验证FTP服务器是否登录成功 int replyCode = ftpClient.getReplyCode(); - // ftpClient.reinitialize(); if (!FTPReply.isPositiveCompletion(replyCode)) { System.out.println("断开了连接, 已尝试重新连接."); ftpClient.connect(host, Integer.parseInt(port)); diff --git a/src/main/java/im/zhaojun/huawei/service/HuaweiServiceImpl.java b/src/main/java/im/zhaojun/zfile/service/impl/HuaweiServiceImpl.java similarity index 85% rename from src/main/java/im/zhaojun/huawei/service/HuaweiServiceImpl.java rename to src/main/java/im/zhaojun/zfile/service/impl/HuaweiServiceImpl.java index c2831c3..017ada0 100644 --- a/src/main/java/im/zhaojun/huawei/service/HuaweiServiceImpl.java +++ b/src/main/java/im/zhaojun/zfile/service/impl/HuaweiServiceImpl.java @@ -1,15 +1,15 @@ -package im.zhaojun.huawei.service; +package im.zhaojun.zfile.service.impl; import cn.hutool.core.convert.Convert; import com.amazonaws.auth.AWSStaticCredentialsProvider; import com.amazonaws.auth.BasicAWSCredentials; import com.amazonaws.client.builder.AwsClientBuilder; import com.amazonaws.services.s3.AmazonS3ClientBuilder; -import im.zhaojun.common.model.StorageConfig; -import im.zhaojun.common.model.constant.StorageConfigConstant; -import im.zhaojun.common.model.enums.StorageTypeEnum; -import im.zhaojun.common.service.AbstractS3FileService; -import im.zhaojun.common.service.FileService; +import im.zhaojun.zfile.model.entity.StorageConfig; +import im.zhaojun.zfile.model.constant.StorageConfigConstant; +import im.zhaojun.zfile.model.enums.StorageTypeEnum; +import im.zhaojun.zfile.service.base.AbstractS3BaseFileService; +import im.zhaojun.zfile.service.base.BaseFileService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; @@ -21,7 +21,7 @@ import java.util.Objects; * @author zhaojun */ @Service -public class HuaweiServiceImpl extends AbstractS3FileService implements FileService { +public class HuaweiServiceImpl extends AbstractS3BaseFileService implements BaseFileService { private static final Logger log = LoggerFactory.getLogger(HuaweiServiceImpl.class); diff --git a/src/main/java/im/zhaojun/local/service/LocalServiceImpl.java b/src/main/java/im/zhaojun/zfile/service/impl/LocalServiceImpl.java similarity index 80% rename from src/main/java/im/zhaojun/local/service/LocalServiceImpl.java rename to src/main/java/im/zhaojun/zfile/service/impl/LocalServiceImpl.java index b3d357b..5047bed 100644 --- a/src/main/java/im/zhaojun/local/service/LocalServiceImpl.java +++ b/src/main/java/im/zhaojun/zfile/service/impl/LocalServiceImpl.java @@ -1,18 +1,18 @@ -package im.zhaojun.local.service; +package im.zhaojun.zfile.service.impl; -import im.zhaojun.common.exception.NotExistFileException; -import im.zhaojun.common.model.StorageConfig; -import im.zhaojun.common.model.SystemConfig; -import im.zhaojun.common.model.constant.StorageConfigConstant; -import im.zhaojun.common.model.constant.SystemConfigConstant; -import im.zhaojun.common.model.dto.FileItemDTO; -import im.zhaojun.common.model.enums.FileTypeEnum; -import im.zhaojun.common.model.enums.StorageTypeEnum; -import im.zhaojun.common.repository.SystemConfigRepository; -import im.zhaojun.common.service.AbstractFileService; -import im.zhaojun.common.service.FileService; -import im.zhaojun.common.service.StorageConfigService; -import im.zhaojun.common.util.StringUtils; +import im.zhaojun.zfile.exception.NotExistFileException; +import im.zhaojun.zfile.model.entity.StorageConfig; +import im.zhaojun.zfile.model.entity.SystemConfig; +import im.zhaojun.zfile.model.constant.StorageConfigConstant; +import im.zhaojun.zfile.model.constant.SystemConfigConstant; +import im.zhaojun.zfile.model.dto.FileItemDTO; +import im.zhaojun.zfile.model.enums.FileTypeEnum; +import im.zhaojun.zfile.model.enums.StorageTypeEnum; +import im.zhaojun.zfile.repository.SystemConfigRepository; +import im.zhaojun.zfile.service.base.AbstractBaseFileService; +import im.zhaojun.zfile.service.base.BaseFileService; +import im.zhaojun.zfile.service.StorageConfigService; +import im.zhaojun.zfile.util.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; @@ -29,7 +29,7 @@ import java.util.Objects; * @author zhaojun */ @Service -public class LocalServiceImpl extends AbstractFileService implements FileService { +public class LocalServiceImpl extends AbstractBaseFileService implements BaseFileService { private static final Logger log = LoggerFactory.getLogger(LocalServiceImpl.class); diff --git a/src/main/java/im/zhaojun/minio/MinIOServiceImpl.java b/src/main/java/im/zhaojun/zfile/service/impl/MinIOServiceImpl.java similarity index 85% rename from src/main/java/im/zhaojun/minio/MinIOServiceImpl.java rename to src/main/java/im/zhaojun/zfile/service/impl/MinIOServiceImpl.java index 958f899..73b2fef 100644 --- a/src/main/java/im/zhaojun/minio/MinIOServiceImpl.java +++ b/src/main/java/im/zhaojun/zfile/service/impl/MinIOServiceImpl.java @@ -1,15 +1,15 @@ -package im.zhaojun.minio; +package im.zhaojun.zfile.service.impl; import cn.hutool.core.convert.Convert; import com.amazonaws.auth.AWSStaticCredentialsProvider; import com.amazonaws.auth.BasicAWSCredentials; import com.amazonaws.client.builder.AwsClientBuilder; import com.amazonaws.services.s3.AmazonS3ClientBuilder; -import im.zhaojun.common.model.StorageConfig; -import im.zhaojun.common.model.constant.StorageConfigConstant; -import im.zhaojun.common.model.enums.StorageTypeEnum; -import im.zhaojun.common.service.AbstractS3FileService; -import im.zhaojun.common.service.FileService; +import im.zhaojun.zfile.model.entity.StorageConfig; +import im.zhaojun.zfile.model.constant.StorageConfigConstant; +import im.zhaojun.zfile.model.enums.StorageTypeEnum; +import im.zhaojun.zfile.service.base.AbstractS3BaseFileService; +import im.zhaojun.zfile.service.base.BaseFileService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; @@ -21,7 +21,7 @@ import java.util.Objects; * @author zhaojun */ @Service -public class MinIOServiceImpl extends AbstractS3FileService implements FileService { +public class MinIOServiceImpl extends AbstractS3BaseFileService implements BaseFileService { private static final Logger log = LoggerFactory.getLogger(MinIOServiceImpl.class); diff --git a/src/main/java/im/zhaojun/onedrive/china/service/OneDriveChinaServiceImpl.java b/src/main/java/im/zhaojun/zfile/service/impl/OneDriveChinaServiceImpl.java similarity index 84% rename from src/main/java/im/zhaojun/onedrive/china/service/OneDriveChinaServiceImpl.java rename to src/main/java/im/zhaojun/zfile/service/impl/OneDriveChinaServiceImpl.java index 18a34f3..053c49a 100644 --- a/src/main/java/im/zhaojun/onedrive/china/service/OneDriveChinaServiceImpl.java +++ b/src/main/java/im/zhaojun/zfile/service/impl/OneDriveChinaServiceImpl.java @@ -1,12 +1,12 @@ -package im.zhaojun.onedrive.china.service; +package im.zhaojun.zfile.service.impl; -import im.zhaojun.common.config.GlobalScheduleTask; -import im.zhaojun.common.model.StorageConfig; -import im.zhaojun.common.model.constant.StorageConfigConstant; -import im.zhaojun.common.model.enums.StorageTypeEnum; -import im.zhaojun.common.service.FileService; -import im.zhaojun.common.service.StorageConfigService; -import im.zhaojun.onedrive.common.service.AbstractOneDriveService; +import im.zhaojun.zfile.config.GlobalScheduleTask; +import im.zhaojun.zfile.model.entity.StorageConfig; +import im.zhaojun.zfile.model.constant.StorageConfigConstant; +import im.zhaojun.zfile.model.enums.StorageTypeEnum; +import im.zhaojun.zfile.service.base.BaseFileService; +import im.zhaojun.zfile.service.StorageConfigService; +import im.zhaojun.zfile.service.base.AbstractOneDriveServiceBase; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @@ -20,7 +20,7 @@ import java.util.Map; */ @Service @Slf4j -public class OneDriveChinaServiceImpl extends AbstractOneDriveService implements FileService { +public class OneDriveChinaServiceImpl extends AbstractOneDriveServiceBase implements BaseFileService { @Resource private GlobalScheduleTask globalScheduleTask; diff --git a/src/main/java/im/zhaojun/onedrive/international/service/OneDriveServiceImpl.java b/src/main/java/im/zhaojun/zfile/service/impl/OneDriveServiceImpl.java similarity index 84% rename from src/main/java/im/zhaojun/onedrive/international/service/OneDriveServiceImpl.java rename to src/main/java/im/zhaojun/zfile/service/impl/OneDriveServiceImpl.java index 9e56531..9caa46a 100644 --- a/src/main/java/im/zhaojun/onedrive/international/service/OneDriveServiceImpl.java +++ b/src/main/java/im/zhaojun/zfile/service/impl/OneDriveServiceImpl.java @@ -1,12 +1,12 @@ -package im.zhaojun.onedrive.international.service; +package im.zhaojun.zfile.service.impl; -import im.zhaojun.common.config.GlobalScheduleTask; -import im.zhaojun.common.model.StorageConfig; -import im.zhaojun.common.model.constant.StorageConfigConstant; -import im.zhaojun.common.model.enums.StorageTypeEnum; -import im.zhaojun.common.service.FileService; -import im.zhaojun.common.service.StorageConfigService; -import im.zhaojun.onedrive.common.service.AbstractOneDriveService; +import im.zhaojun.zfile.config.GlobalScheduleTask; +import im.zhaojun.zfile.model.entity.StorageConfig; +import im.zhaojun.zfile.model.constant.StorageConfigConstant; +import im.zhaojun.zfile.model.enums.StorageTypeEnum; +import im.zhaojun.zfile.service.base.BaseFileService; +import im.zhaojun.zfile.service.StorageConfigService; +import im.zhaojun.zfile.service.base.AbstractOneDriveServiceBase; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @@ -20,7 +20,7 @@ import java.util.Map; */ @Service @Slf4j -public class OneDriveServiceImpl extends AbstractOneDriveService implements FileService { +public class OneDriveServiceImpl extends AbstractOneDriveServiceBase implements BaseFileService { @Resource private GlobalScheduleTask globalScheduleTask; diff --git a/src/main/java/im/zhaojun/qiniu/service/QiniuServiceImpl.java b/src/main/java/im/zhaojun/zfile/service/impl/QiniuServiceImpl.java similarity index 85% rename from src/main/java/im/zhaojun/qiniu/service/QiniuServiceImpl.java rename to src/main/java/im/zhaojun/zfile/service/impl/QiniuServiceImpl.java index 54dc9f2..2283b3a 100644 --- a/src/main/java/im/zhaojun/qiniu/service/QiniuServiceImpl.java +++ b/src/main/java/im/zhaojun/zfile/service/impl/QiniuServiceImpl.java @@ -1,15 +1,15 @@ -package im.zhaojun.qiniu.service; +package im.zhaojun.zfile.service.impl; import cn.hutool.core.convert.Convert; import com.amazonaws.auth.AWSStaticCredentialsProvider; import com.amazonaws.auth.BasicAWSCredentials; import com.amazonaws.client.builder.AwsClientBuilder; import com.amazonaws.services.s3.AmazonS3ClientBuilder; -import im.zhaojun.common.model.StorageConfig; -import im.zhaojun.common.model.constant.StorageConfigConstant; -import im.zhaojun.common.model.enums.StorageTypeEnum; -import im.zhaojun.common.service.AbstractS3FileService; -import im.zhaojun.common.service.FileService; +import im.zhaojun.zfile.model.entity.StorageConfig; +import im.zhaojun.zfile.model.constant.StorageConfigConstant; +import im.zhaojun.zfile.model.enums.StorageTypeEnum; +import im.zhaojun.zfile.service.base.AbstractS3BaseFileService; +import im.zhaojun.zfile.service.base.BaseFileService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; @@ -21,7 +21,7 @@ import java.util.Objects; * @author zhaojun */ @Service -public class QiniuServiceImpl extends AbstractS3FileService implements FileService { +public class QiniuServiceImpl extends AbstractS3BaseFileService implements BaseFileService { private static final Logger log = LoggerFactory.getLogger(QiniuServiceImpl.class); diff --git a/src/main/java/im/zhaojun/s3/S3ServiceImpl.java b/src/main/java/im/zhaojun/zfile/service/impl/S3ServiceImpl.java similarity index 86% rename from src/main/java/im/zhaojun/s3/S3ServiceImpl.java rename to src/main/java/im/zhaojun/zfile/service/impl/S3ServiceImpl.java index a98a76b..90c5da0 100644 --- a/src/main/java/im/zhaojun/s3/S3ServiceImpl.java +++ b/src/main/java/im/zhaojun/zfile/service/impl/S3ServiceImpl.java @@ -1,15 +1,15 @@ -package im.zhaojun.s3; +package im.zhaojun.zfile.service.impl; import cn.hutool.core.convert.Convert; import com.amazonaws.auth.AWSStaticCredentialsProvider; import com.amazonaws.auth.BasicAWSCredentials; import com.amazonaws.client.builder.AwsClientBuilder; import com.amazonaws.services.s3.AmazonS3ClientBuilder; -import im.zhaojun.common.model.StorageConfig; -import im.zhaojun.common.model.constant.StorageConfigConstant; -import im.zhaojun.common.model.enums.StorageTypeEnum; -import im.zhaojun.common.service.AbstractS3FileService; -import im.zhaojun.common.service.FileService; +import im.zhaojun.zfile.model.entity.StorageConfig; +import im.zhaojun.zfile.model.constant.StorageConfigConstant; +import im.zhaojun.zfile.model.enums.StorageTypeEnum; +import im.zhaojun.zfile.service.base.AbstractS3BaseFileService; +import im.zhaojun.zfile.service.base.BaseFileService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; @@ -21,7 +21,7 @@ import java.util.Objects; * @author zhaojun */ @Service -public class S3ServiceImpl extends AbstractS3FileService implements FileService { +public class S3ServiceImpl extends AbstractS3BaseFileService implements BaseFileService { private static final Logger log = LoggerFactory.getLogger(S3ServiceImpl.class); diff --git a/src/main/java/im/zhaojun/tencent/TencentServiceImpl.java b/src/main/java/im/zhaojun/zfile/service/impl/TencentServiceImpl.java similarity index 85% rename from src/main/java/im/zhaojun/tencent/TencentServiceImpl.java rename to src/main/java/im/zhaojun/zfile/service/impl/TencentServiceImpl.java index 1d03edc..6c9a4bd 100644 --- a/src/main/java/im/zhaojun/tencent/TencentServiceImpl.java +++ b/src/main/java/im/zhaojun/zfile/service/impl/TencentServiceImpl.java @@ -1,15 +1,15 @@ -package im.zhaojun.tencent; +package im.zhaojun.zfile.service.impl; import cn.hutool.core.convert.Convert; import com.amazonaws.auth.AWSStaticCredentialsProvider; import com.amazonaws.auth.BasicAWSCredentials; import com.amazonaws.client.builder.AwsClientBuilder; import com.amazonaws.services.s3.AmazonS3ClientBuilder; -import im.zhaojun.common.model.StorageConfig; -import im.zhaojun.common.model.constant.StorageConfigConstant; -import im.zhaojun.common.model.enums.StorageTypeEnum; -import im.zhaojun.common.service.AbstractS3FileService; -import im.zhaojun.common.service.FileService; +import im.zhaojun.zfile.model.entity.StorageConfig; +import im.zhaojun.zfile.model.constant.StorageConfigConstant; +import im.zhaojun.zfile.model.enums.StorageTypeEnum; +import im.zhaojun.zfile.service.base.AbstractS3BaseFileService; +import im.zhaojun.zfile.service.base.BaseFileService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; @@ -21,7 +21,7 @@ import java.util.Objects; * @author zhaojun */ @Service -public class TencentServiceImpl extends AbstractS3FileService implements FileService { +public class TencentServiceImpl extends AbstractS3BaseFileService implements BaseFileService { private static final Logger log = LoggerFactory.getLogger(TencentServiceImpl.class); diff --git a/src/main/java/im/zhaojun/ufile/service/UFileServiceImpl.java b/src/main/java/im/zhaojun/zfile/service/impl/UFileServiceImpl.java similarity index 64% rename from src/main/java/im/zhaojun/ufile/service/UFileServiceImpl.java rename to src/main/java/im/zhaojun/zfile/service/impl/UFileServiceImpl.java index b377219..d53df3d 100644 --- a/src/main/java/im/zhaojun/ufile/service/UFileServiceImpl.java +++ b/src/main/java/im/zhaojun/zfile/service/impl/UFileServiceImpl.java @@ -1,7 +1,6 @@ -package im.zhaojun.ufile.service; +package im.zhaojun.zfile.service.impl; -import im.zhaojun.common.model.enums.StorageTypeEnum; -import im.zhaojun.upyun.service.UpYunServiceImpl; +import im.zhaojun.zfile.model.enums.StorageTypeEnum; import org.springframework.stereotype.Service; /** diff --git a/src/main/java/im/zhaojun/upyun/service/UpYunServiceImpl.java b/src/main/java/im/zhaojun/zfile/service/impl/UpYunServiceImpl.java similarity index 86% rename from src/main/java/im/zhaojun/upyun/service/UpYunServiceImpl.java rename to src/main/java/im/zhaojun/zfile/service/impl/UpYunServiceImpl.java index a1354c9..426d9f6 100644 --- a/src/main/java/im/zhaojun/upyun/service/UpYunServiceImpl.java +++ b/src/main/java/im/zhaojun/zfile/service/impl/UpYunServiceImpl.java @@ -1,18 +1,18 @@ -package im.zhaojun.upyun.service; +package im.zhaojun.zfile.service.impl; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.URLUtil; import com.UpYun; -import im.zhaojun.common.exception.NotExistFileException; -import im.zhaojun.common.model.StorageConfig; -import im.zhaojun.common.model.constant.StorageConfigConstant; -import im.zhaojun.common.model.dto.FileItemDTO; -import im.zhaojun.common.model.enums.FileTypeEnum; -import im.zhaojun.common.model.enums.StorageTypeEnum; -import im.zhaojun.common.service.AbstractFileService; -import im.zhaojun.common.service.FileService; -import im.zhaojun.common.service.StorageConfigService; -import im.zhaojun.common.util.StringUtils; +import im.zhaojun.zfile.exception.NotExistFileException; +import im.zhaojun.zfile.model.entity.StorageConfig; +import im.zhaojun.zfile.model.constant.StorageConfigConstant; +import im.zhaojun.zfile.model.dto.FileItemDTO; +import im.zhaojun.zfile.model.enums.FileTypeEnum; +import im.zhaojun.zfile.model.enums.StorageTypeEnum; +import im.zhaojun.zfile.service.base.AbstractBaseFileService; +import im.zhaojun.zfile.service.base.BaseFileService; +import im.zhaojun.zfile.service.StorageConfigService; +import im.zhaojun.zfile.util.StringUtils; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -28,7 +28,7 @@ import java.util.Objects; */ @Service @Slf4j -public class UpYunServiceImpl extends AbstractFileService implements FileService { +public class UpYunServiceImpl extends AbstractBaseFileService implements BaseFileService { private static final String END_MARK = "g2gCZAAEbmV4dGQAA2VvZg"; diff --git a/src/main/java/im/zhaojun/common/service/FileAsyncCacheService.java b/src/main/java/im/zhaojun/zfile/service/support/FileAsyncCacheService.java similarity index 87% rename from src/main/java/im/zhaojun/common/service/FileAsyncCacheService.java rename to src/main/java/im/zhaojun/zfile/service/support/FileAsyncCacheService.java index 95ff330..45d3e98 100644 --- a/src/main/java/im/zhaojun/common/service/FileAsyncCacheService.java +++ b/src/main/java/im/zhaojun/zfile/service/support/FileAsyncCacheService.java @@ -1,11 +1,14 @@ -package im.zhaojun.common.service; +package im.zhaojun.zfile.service.support; -import im.zhaojun.common.cache.ZFileCache; -import im.zhaojun.common.config.StorageTypeFactory; -import im.zhaojun.common.model.dto.FileItemDTO; -import im.zhaojun.common.model.enums.FileTypeEnum; -import im.zhaojun.common.model.enums.StorageTypeEnum; -import im.zhaojun.common.util.StringUtils; +import im.zhaojun.zfile.cache.ZFileCache; +import im.zhaojun.zfile.service.SystemConfigService; +import im.zhaojun.zfile.config.StorageTypeFactory; +import im.zhaojun.zfile.model.dto.FileItemDTO; +import im.zhaojun.zfile.model.enums.FileTypeEnum; +import im.zhaojun.zfile.model.enums.StorageTypeEnum; +import im.zhaojun.zfile.service.base.AbstractBaseFileService; +import im.zhaojun.zfile.service.base.BaseFileService; +import im.zhaojun.zfile.util.StringUtils; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.scheduling.annotation.Async; @@ -61,7 +64,7 @@ public class FileAsyncCacheService { return; } - AbstractFileService fileService = StorageTypeFactory.getStorageTypeService(storageStrategy); + AbstractBaseFileService fileService = StorageTypeFactory.getStorageTypeService(storageStrategy); if (fileService.getIsUnInitialized()) { log.debug("存储策略 {} 未初始化成功, 跳过缓存.", storageStrategy.getDescription()); @@ -73,7 +76,7 @@ public class FileAsyncCacheService { log.info("缓存 {} 所有文件开始", storageStrategy.getDescription()); long startTime = System.currentTimeMillis(); try { - FileService currentFileService = systemConfigService.getCurrentFileService(); + BaseFileService currentFileService = systemConfigService.getCurrentFileService(); List rootFileItems = currentFileService.fileList("/"); ArrayDeque queue = new ArrayDeque<>(rootFileItems); @@ -145,7 +148,7 @@ public class FileAsyncCacheService { } zFileCache.remove(key); - AbstractFileService currentFileService = systemConfigService.getCurrentFileService(); + AbstractBaseFileService currentFileService = systemConfigService.getCurrentFileService(); try { if (Objects.equals(currentStorageStrategy, systemConfigService.getCurrentStorageStrategy())) { currentFileService.fileList(key); diff --git a/src/main/java/im/zhaojun/common/service/FileCacheService.java b/src/main/java/im/zhaojun/zfile/service/support/FileCacheService.java similarity index 85% rename from src/main/java/im/zhaojun/common/service/FileCacheService.java rename to src/main/java/im/zhaojun/zfile/service/support/FileCacheService.java index d7692bb..97bc6d2 100644 --- a/src/main/java/im/zhaojun/common/service/FileCacheService.java +++ b/src/main/java/im/zhaojun/zfile/service/support/FileCacheService.java @@ -1,6 +1,7 @@ -package im.zhaojun.common.service; +package im.zhaojun.zfile.service.support; -import im.zhaojun.common.cache.ZFileCache; +import im.zhaojun.zfile.cache.ZFileCache; +import im.zhaojun.zfile.service.SystemConfigService; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; diff --git a/src/main/java/im/zhaojun/common/service/SystemMonitorService.java b/src/main/java/im/zhaojun/zfile/service/support/SystemMonitorService.java similarity index 68% rename from src/main/java/im/zhaojun/common/service/SystemMonitorService.java rename to src/main/java/im/zhaojun/zfile/service/support/SystemMonitorService.java index f519259..2ace3bd 100644 --- a/src/main/java/im/zhaojun/common/service/SystemMonitorService.java +++ b/src/main/java/im/zhaojun/zfile/service/support/SystemMonitorService.java @@ -1,6 +1,6 @@ -package im.zhaojun.common.service; +package im.zhaojun.zfile.service.support; -import im.zhaojun.common.model.SystemMonitorInfo; +import im.zhaojun.zfile.model.support.SystemMonitorInfo; import org.springframework.stereotype.Service; /** @@ -12,4 +12,5 @@ public class SystemMonitorService { public SystemMonitorInfo systemMonitorInfo() { return new SystemMonitorInfo(); } -} + +} \ No newline at end of file diff --git a/src/main/java/im/zhaojun/common/util/AudioHelper.java b/src/main/java/im/zhaojun/zfile/util/AudioHelper.java similarity index 94% rename from src/main/java/im/zhaojun/common/util/AudioHelper.java rename to src/main/java/im/zhaojun/zfile/util/AudioHelper.java index e88d8b4..a1578af 100644 --- a/src/main/java/im/zhaojun/common/util/AudioHelper.java +++ b/src/main/java/im/zhaojun/zfile/util/AudioHelper.java @@ -1,4 +1,4 @@ -package im.zhaojun.common.util; +package im.zhaojun.zfile.util; import cn.hutool.core.codec.Base64; import cn.hutool.core.io.FileUtil; @@ -10,8 +10,8 @@ import com.mpatric.mp3agic.ID3v2; import com.mpatric.mp3agic.InvalidDataException; import com.mpatric.mp3agic.Mp3File; import com.mpatric.mp3agic.UnsupportedTagException; -import im.zhaojun.common.model.constant.ZFileConstant; -import im.zhaojun.common.model.dto.AudioInfoDTO; +import im.zhaojun.zfile.model.constant.ZFileConstant; +import im.zhaojun.zfile.model.dto.AudioInfoDTO; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/im/zhaojun/common/util/FileComparator.java b/src/main/java/im/zhaojun/zfile/util/FileComparator.java similarity index 91% rename from src/main/java/im/zhaojun/common/util/FileComparator.java rename to src/main/java/im/zhaojun/zfile/util/FileComparator.java index ddc1898..82f1707 100644 --- a/src/main/java/im/zhaojun/common/util/FileComparator.java +++ b/src/main/java/im/zhaojun/zfile/util/FileComparator.java @@ -1,7 +1,7 @@ -package im.zhaojun.common.util; +package im.zhaojun.zfile.util; -import im.zhaojun.common.model.dto.FileItemDTO; -import im.zhaojun.common.model.enums.FileTypeEnum; +import im.zhaojun.zfile.model.dto.FileItemDTO; +import im.zhaojun.zfile.model.enums.FileTypeEnum; import java.util.Comparator; diff --git a/src/main/java/im/zhaojun/common/util/FileUtil.java b/src/main/java/im/zhaojun/zfile/util/FileUtil.java similarity index 98% rename from src/main/java/im/zhaojun/common/util/FileUtil.java rename to src/main/java/im/zhaojun/zfile/util/FileUtil.java index 1061138..9a8686d 100644 --- a/src/main/java/im/zhaojun/common/util/FileUtil.java +++ b/src/main/java/im/zhaojun/zfile/util/FileUtil.java @@ -1,4 +1,4 @@ -package im.zhaojun.common.util; +package im.zhaojun.zfile.util; import cn.hutool.core.util.URLUtil; import org.springframework.core.io.FileSystemResource; diff --git a/src/main/java/im/zhaojun/common/util/HttpUtil.java b/src/main/java/im/zhaojun/zfile/util/HttpUtil.java similarity index 96% rename from src/main/java/im/zhaojun/common/util/HttpUtil.java rename to src/main/java/im/zhaojun/zfile/util/HttpUtil.java index 7cc0a1b..5459dde 100644 --- a/src/main/java/im/zhaojun/common/util/HttpUtil.java +++ b/src/main/java/im/zhaojun/zfile/util/HttpUtil.java @@ -1,4 +1,4 @@ -package im.zhaojun.common.util; +package im.zhaojun.zfile.util; import lombok.extern.slf4j.Slf4j; import org.springframework.web.client.RestClientException; diff --git a/src/main/java/im/zhaojun/common/util/NaturalOrderComparator.java b/src/main/java/im/zhaojun/zfile/util/NaturalOrderComparator.java similarity index 92% rename from src/main/java/im/zhaojun/common/util/NaturalOrderComparator.java rename to src/main/java/im/zhaojun/zfile/util/NaturalOrderComparator.java index ae6bfbb..6215221 100644 --- a/src/main/java/im/zhaojun/common/util/NaturalOrderComparator.java +++ b/src/main/java/im/zhaojun/zfile/util/NaturalOrderComparator.java @@ -1,4 +1,4 @@ -package im.zhaojun.common.util; +package im.zhaojun.zfile.util; /* NaturalOrderComparator.java -- Perform 'natural order' comparisons of strings in Java. Copyright (C) 2003 by Pierre-Luc Paour @@ -25,8 +25,13 @@ package im.zhaojun.common.util; import java.util.Comparator; +/** + * @author zhaojun + */ public class NaturalOrderComparator implements Comparator { + private static final char ZERO_CHAR = '0'; + private int compareRight(String a, String b) { int bias = 0, ia = 0, ib = 0; @@ -61,9 +66,10 @@ public class NaturalOrderComparator implements Comparator { } } + @Override public int compare(String a, String b) { int ia = 0, ib = 0; - int nza = 0, nzb = 0; + int nza, nzb; char ca, cb; while (true) { @@ -74,8 +80,8 @@ public class NaturalOrderComparator implements Comparator { cb = charAt(b, ib); // skip over leading spaces or zeros - while (Character.isSpaceChar(ca) || ca == '0') { - if (ca == '0') { + while (Character.isSpaceChar(ca) || ca == ZERO_CHAR) { + if (ca == ZERO_CHAR) { nza++; } else { // Only count consecutive zeroes @@ -130,11 +136,13 @@ public class NaturalOrderComparator implements Comparator { } private static int compareEqual(String a, String b, int nza, int nzb) { - if (nza - nzb != 0) + if (nza - nzb != 0) { return nza - nzb; + } - if (a.length() == b.length()) + if (a.length() == b.length()) { return a.compareTo(b); + } return a.length() - b.length(); } diff --git a/src/main/java/im/zhaojun/common/util/SpringContextHolder.java b/src/main/java/im/zhaojun/zfile/util/SpringContextHolder.java similarity index 98% rename from src/main/java/im/zhaojun/common/util/SpringContextHolder.java rename to src/main/java/im/zhaojun/zfile/util/SpringContextHolder.java index 3249b39..3f82f73 100644 --- a/src/main/java/im/zhaojun/common/util/SpringContextHolder.java +++ b/src/main/java/im/zhaojun/zfile/util/SpringContextHolder.java @@ -1,4 +1,4 @@ -package im.zhaojun.common.util; +package im.zhaojun.zfile.util; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/im/zhaojun/common/util/StartupListener.java b/src/main/java/im/zhaojun/zfile/util/StartupListener.java similarity index 83% rename from src/main/java/im/zhaojun/common/util/StartupListener.java rename to src/main/java/im/zhaojun/zfile/util/StartupListener.java index 688dae5..eedb40b 100644 --- a/src/main/java/im/zhaojun/common/util/StartupListener.java +++ b/src/main/java/im/zhaojun/zfile/util/StartupListener.java @@ -1,14 +1,10 @@ -package im.zhaojun.common.util; +package im.zhaojun.zfile.util; import cn.hutool.core.net.NetUtil; -import im.zhaojun.common.cache.ZFileCache; -import im.zhaojun.common.exception.InitializeException; -import im.zhaojun.common.service.AbstractFileService; -import im.zhaojun.common.service.FileAsyncCacheService; -import im.zhaojun.common.service.SystemConfigService; -import lombok.SneakyThrows; +import im.zhaojun.zfile.exception.InitializeException; +import im.zhaojun.zfile.service.support.FileAsyncCacheService; +import im.zhaojun.zfile.service.SystemConfigService; import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.event.ApplicationStartedEvent; import org.springframework.context.ApplicationListener; import org.springframework.core.env.Environment; diff --git a/src/main/java/im/zhaojun/common/util/StringUtils.java b/src/main/java/im/zhaojun/zfile/util/StringUtils.java similarity index 98% rename from src/main/java/im/zhaojun/common/util/StringUtils.java rename to src/main/java/im/zhaojun/zfile/util/StringUtils.java index c59595a..074e241 100644 --- a/src/main/java/im/zhaojun/common/util/StringUtils.java +++ b/src/main/java/im/zhaojun/zfile/util/StringUtils.java @@ -1,4 +1,4 @@ -package im.zhaojun.common.util; +package im.zhaojun.zfile.util; import cn.hutool.core.util.ObjectUtil;