renun/zfile
1
0
Fork 0
mirror of https://github.com/zfile-dev/zfile.git synced 2025-04-19 05:34:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

✨ 优化代码结构

Browse Source
This commit is contained in:
zhaojun1998
2020-01-20 21:35:20 +08:00
parent dcc4cb19ad
commit f6163c7e19
5 changed files with 2 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/im/zhaojun/common/controller/FileController.java
View File

@@ -10,10 +10,8 @@ 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.StorageConfigService;
import im.zhaojun.common.service.SystemConfigService;
import im.zhaojun.common.service.SystemService;
import im.zhaojun.common.util.AudioHelper;
import im.zhaojun.common.util.FileComparator;
import im.zhaojun.common.util.HttpUtil;
import im.zhaojun.common.util.StringUtils;
@@ -40,9 +38,6 @@ public class FileController {
@Resource
private SystemConfigService systemConfigService;
@Resource
private StorageConfigService storageConfigService;
@Resource
private FileAsyncCacheService fileAsyncCacheService;

4
src/main/java/im/zhaojun/common/controller/InstallController.java
View File

@@ -6,7 +6,6 @@ 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.FileAsyncCacheService;
import im.zhaojun.common.service.StorageConfigService;
import im.zhaojun.common.service.SystemConfigService;
import org.springframework.web.bind.annotation.GetMapping;
@@ -33,9 +32,6 @@ public class InstallController {
@Resource
private AdminController adminController;
@Resource
private FileAsyncCacheService fileAsyncCacheService;
@GetMapping("/is-installed")
public ResultBean isInstall() {
if (systemConfigService.getCurrentStorageStrategy() == null) {

4
src/main/java/im/zhaojun/common/model/dto/CacheConfigDTO.java
View File

@@ -10,8 +10,8 @@ import java.util.Set;
*/
@Data
public class CacheConfigDTO {
private boolean enableCache;
private boolean cacheFinish;
private Boolean enableCache;
private Boolean cacheFinish;
private Set<String> cacheKeys;
private Integer cacheDirectoryCount;
private Integer cacheFileCount;

2
src/main/java/im/zhaojun/common/service/FileAsyncCacheService.java
View File

@@ -73,8 +73,6 @@ public class FileAsyncCacheService {
log.info("缓存 {} 所有文件开始", storageStrategy.getDescription());
long startTime = System.currentTimeMillis();
try {
String path = "/";
FileService currentFileService = systemConfigService.getCurrentFileService();
List<FileItemDTO> rootFileItems = currentFileService.fileList("/");
ArrayDeque<FileItemDTO> queue = new ArrayDeque<>(rootFileItems);

5
src/main/java/im/zhaojun/common/service/SystemConfigService.java
View File

@@ -37,9 +37,6 @@ public class SystemConfigService {
@Resource
private SystemConfigRepository systemConfigRepository;
@Resource
private FileAsyncCacheService fileAsyncCacheService;
@Resource
private FileCacheService fileCacheService;
@@ -101,8 +98,6 @@ public class SystemConfigService {
systemConfigRepository.saveAll(systemConfigList);
AbstractFileService currentFileService = getCurrentFileService();
if (!oldEnableCache && curEnableCache) {
log.debug("检测到开启了缓存, 开启预热缓存");
fileCacheService.enableCache();