Compare commits

...

11 Commits
2.0 ... 2.2

Author SHA1 Message Date
zhaojun1998
3249266cd1 🔖 发布 2.2 版 2020-03-08 11:48:48 +08:00
zhaojun1998
1a6235df73 🔨 重构代码, 去除无效引用。 2020-03-08 11:46:31 +08:00
zhaojun1998
430aee2b7f 🔨 重构代码, 去除无效引用。 2020-03-08 11:43:42 +08:00
zhaojun1998
de2f7e4b80 🔨 重构代码, 优化目录结构 2020-03-08 11:11:12 +08:00
zhaojun1998
6dfcc409ac 更新页面 2020-03-08 11:07:01 +08:00
zhaojun1998
78f795e1cb 🔖 发布 2.1 版 2020-03-07 18:39:33 +08:00
zhaojun1998
c69ee0f356 🐛 修复 S3 协议对象存储, 在私有空间下, 无法下载的 BUG. 2020-03-07 13:10:42 +08:00
zhaojun1998
39475de789 🐛 修复 S3 协议对象存储, 在私有空间下, 无法下载的 BUG. 2020-03-07 13:10:21 +08:00
zhaojun1998
bd71712765 🐛 修复无法刷新单个缓存的 BUG 2020-03-07 13:08:42 +08:00
赵俊
8698686a47 Update application.yml 2020-03-01 14:04:14 +08:00
zhaojun1998
762c67ee37 更新文档 2020-02-29 16:04:19 +08:00
100 changed files with 495 additions and 513 deletions

View File

@@ -40,15 +40,15 @@ apt update
apt install -y openjdk-8-jre-headless unzip
```
> 如为更新程序, 则请先执行 `rm -rf ~/zfile` 清理旧程序. 首次安装请忽略此选项.
> 如为更新程序, 则请先执行 `~/zfile/bin/stop.sh && rm -rf ~/zfile` 清理旧程序. 首次安装请忽略此选项.
下载项目:
```bash
wget -P ~ https://c.jun6.net/ZFILE/zfile-release.war
cd ~
wget https://c.jun6.net/ZFILE/zfile-release.war
mkdir zfile && unzip zfile-release.war -d zfile && rm -rf zfile-release.war
chmod +x ~/zfile/bin/*.sh
chmod +x zfile/bin/*.sh
```
程序的目录结构为:

View File

@@ -12,7 +12,7 @@
<groupId>im.zhaojun</groupId>
<artifactId>zfile</artifactId>
<version>2.0</version>
<version>2.2</version>
<name>zfile</name>
<packaging>war</packaging>
<description>一个在线的文件浏览系统</description>

View File

@@ -1,4 +1,4 @@
package im.zhaojun;
package im.zhaojun.zfile;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;

View File

@@ -1,12 +1,11 @@
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.constant.ZFileConstant;
import im.zhaojun.zfile.model.dto.FileItemDTO;
import im.zhaojun.zfile.model.dto.SystemConfigDTO;
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
@@ -23,9 +22,6 @@ public class ZFileCache {
public Date lastCacheAutoRefreshDate;
@Resource
private SystemConfigService systemConfigService;
public synchronized void put(String key, List<FileItemDTO> value) {
fileCache.put(key, value);
}
@@ -42,11 +38,17 @@ public class ZFileCache {
return fileCache.size();
}
public List<FileItemDTO> find(String key, boolean ignoreCase) {
public List<FileItemDTO> find(String key, boolean ignoreCase, boolean searchContainEncryptedFile) {
List<FileItemDTO> result = new ArrayList<>();
Collection<List<FileItemDTO>> values = fileCache.values();
for (List<FileItemDTO> fileItemList : values) {
// 如果开启了 "搜索包含加密文件" 选项, 则直接返回 true.
if (!searchContainEncryptedFile && isEncryptedFolder(fileItemList)) {
continue;
}
for (FileItemDTO fileItemDTO : fileItemList) {
boolean testResult;
@@ -91,4 +93,20 @@ public class ZFileCache {
public void setLastCacheAutoRefreshDate(Date lastCacheAutoRefreshDate) {
this.lastCacheAutoRefreshDate = lastCacheAutoRefreshDate;
}
/**
* 不是加密文件夹
* @param list 文件夹中的内容
* @return 返回此文件夹是否加密.
*/
private boolean isEncryptedFolder(List<FileItemDTO> list) {
// 遍历文件判断是否包含
for (FileItemDTO fileItemDTO : list) {
if (Objects.equals(ZFileConstant.PASSWORD_FILE_NAME, fileItemDTO.getName())) {
return true;
}
}
return false;
}
}

View File

@@ -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;

View File

@@ -1,7 +1,5 @@
package im.zhaojun.common.config;
package im.zhaojun.zfile.config;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpRequest;
import org.springframework.http.client.ClientHttpRequestExecution;
@@ -9,17 +7,16 @@ import org.springframework.http.client.ClientHttpRequestInterceptor;
import org.springframework.http.client.ClientHttpResponse;
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);
@Override
public ClientHttpResponse intercept(HttpRequest request, byte[] body, ClientHttpRequestExecution execution)
throws IOException {
URI uri = request.getURI();
ClientHttpResponse response = execution.execute(request, body);
HttpHeaders headers = response.getHeaders();
headers.put("Content-Type", Collections.singletonList("application/text"));

View File

@@ -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;

View File

@@ -1,12 +1,10 @@
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.model.enums.StorageTypeEnum;
import im.zhaojun.zfile.service.SystemConfigService;
import im.zhaojun.zfile.service.base.AbstractBaseFileService;
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;
@@ -24,12 +22,6 @@ import java.util.Objects;
@Slf4j
public class GlobalScheduleTask {
@Resource
private ZFileCache zFileCache;
@Resource
private StorageConfigService storageConfigService;
@Resource
private OneDriveServiceImpl oneDriveServiceImpl;
@@ -48,7 +40,7 @@ public class GlobalScheduleTask {
try {
log.debug("尝试调用 OneDrive 自动刷新 AccessToken 定时任务");
AbstractFileService currentFileService = systemConfigService.getCurrentFileService();
AbstractBaseFileService currentFileService = systemConfigService.getCurrentFileService();
if (!(currentFileService instanceof OneDriveServiceImpl
|| currentFileService instanceof OneDriveChinaServiceImpl)) {

View File

@@ -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;

View File

@@ -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<String, AbstractFileService> storageTypeEnumFileServiceMap;
private static Map<String, AbstractBaseFileService> 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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -1,29 +1,32 @@
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.dto.ResultBean;
import im.zhaojun.zfile.model.dto.StorageStrategyDTO;
import im.zhaojun.zfile.model.dto.SystemConfigDTO;
import im.zhaojun.zfile.model.entity.StorageConfig;
import im.zhaojun.zfile.model.enums.StorageTypeEnum;
import im.zhaojun.zfile.model.support.SystemMonitorInfo;
import im.zhaojun.zfile.service.StorageConfigService;
import im.zhaojun.zfile.service.SystemConfigService;
import im.zhaojun.zfile.service.base.AbstractBaseFileService;
import im.zhaojun.zfile.service.support.FileAsyncCacheService;
import im.zhaojun.zfile.util.FileUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
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.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import java.io.File;
import java.util.*;
import java.util.concurrent.ScheduledExecutorService;
/**
* 后台管理
@@ -44,8 +47,6 @@ public class AdminController {
@Resource
private FileAsyncCacheService fileAsyncCacheService;
private ScheduledExecutorService scheduledExecutorService;
/**
* 获取系统配置
*/
@@ -105,7 +106,7 @@ public class AdminController {
List<StorageStrategyDTO> 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 +119,9 @@ public class AdminController {
* @param storageStrategyConfig 保存表单值
* @param storageStrategy 所属策略
* @return 操作结果
* @throws Exception 表单解析出错异常
*/
@PostMapping("/storage-strategy")
public ResultBean save(@RequestParam Map<String, String> storageStrategyConfig, StorageTypeEnum storageStrategy) throws Exception {
public ResultBean save(@RequestParam Map<String, String> storageStrategyConfig, StorageTypeEnum storageStrategy) {
// 保存设置.
List<StorageConfig> storageConfigList = storageConfigService.selectStorageConfigByType(storageStrategy);
for (StorageConfig storageConfig : storageConfigList) {
@@ -132,7 +132,7 @@ public class AdminController {
storageConfigService.updateStorageConfig(storageConfigList);
// 获取当前修改的存储策略 Service, 尝试调用初始化.
AbstractFileService updateStorageStrategyService = StorageTypeFactory.getStorageTypeService(storageStrategy);
AbstractBaseFileService updateStorageStrategyService = StorageTypeFactory.getStorageTypeService(storageStrategy);
updateStorageStrategyService.init();
// 如果修改的为当前启用的缓存, 则重新进行缓存.
@@ -142,7 +142,7 @@ public class AdminController {
log.debug("检测到更新了当前启用的存储策略 {}, 已清理缓存.", currentStorageStrategy);
}
AbstractFileService fileService = systemConfigService.getCurrentFileService();
AbstractBaseFileService fileService = systemConfigService.getCurrentFileService();
fileService.clearFileCache();
fileAsyncCacheService.cacheGlobalFile();
}
@@ -170,7 +170,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());

View File

@@ -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.SystemConfigService;
import im.zhaojun.zfile.service.base.AbstractBaseFileService;
import im.zhaojun.zfile.service.support.FileAsyncCacheService;
import im.zhaojun.zfile.service.support.FileCacheService;
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,6 @@ public class CacheController {
@GetMapping("/config")
public ResultBean cacheConfig() {
AbstractFileService fileService = systemConfigService.getCurrentFileService();
CacheConfigDTO cacheConfigDTO = new CacheConfigDTO();
cacheConfigDTO.setEnableCache(systemConfigService.getEnableCache());
cacheConfigDTO.setCacheFinish(fileAsyncCacheService.isCacheFinish());
@@ -58,21 +56,22 @@ public class CacheController {
return ResultBean.success(cacheConfigDTO);
}
/*
@PostMapping("/refresh")
public ResultBean refreshCache(String key) throws Exception {
AbstractFileService fileService = systemConfigService.getCurrentFileService();
AbstractBaseFileService fileService = systemConfigService.getCurrentFileService();
fileService.refreshCache(key);
return ResultBean.success();
}
/*
@PostMapping("/clear")
public ResultBean clearCache(String key) {
AbstractFileService fileService = systemConfigService.getCurrentFileService();
fileService.clearFileCache();
return ResultBean.success();
}
*/
@PostMapping("/all")
public ResultBean cacheAll() {
@@ -81,4 +80,5 @@ public class CacheController {
fileAsyncCacheService.cacheGlobalFile();
return ResultBean.success();
}
*/
}

View File

@@ -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;

View File

@@ -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<FileItemDTO> 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));
}
}

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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.SystemConfigService;
import im.zhaojun.zfile.service.base.AbstractBaseFileService;
import org.springframework.stereotype.Controller;
import org.springframework.util.AntPathMatcher;
import org.springframework.web.bind.annotation.GetMapping;
@@ -12,7 +13,6 @@ import org.springframework.web.servlet.HandlerMapping;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.net.MalformedURLException;
import java.util.Objects;
/**
@@ -26,18 +26,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();

View File

@@ -1,12 +1,11 @@
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;
import org.aspectj.lang.annotation.Pointcut;
import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils;
@@ -14,11 +13,12 @@ import javax.annotation.Resource;
import java.util.List;
/**
* 操作日志切面.
* @author zhaojun
* 缓存切面类, 用于访问文件夹时, 缓存文件列表内容.
*/
@Aspect
@Component
public class FileListCacheAspect {
public class FileListCacheAop {
@Resource
private ZFileCache zFileCache;
@@ -26,11 +26,7 @@ public class FileListCacheAspect {
@Resource
private SystemConfigService systemConfigService;
@Pointcut("execution(public * im.zhaojun.common.service.AbstractFileService.fileList(..))")
public void pointcut() {
}
@Around(value = "pointcut()")
@Around(value = "execution(public * im.zhaojun.zfile.service.base.AbstractBaseFileService.fileList(..))")
public Object around(ProceedingJoinPoint point) throws Throwable {
List<FileItemDTO> result;

View File

@@ -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("存储策略尚未初始化, 请联系管理员!");
}

View File

@@ -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;

View File

@@ -1,4 +1,4 @@
package im.zhaojun.common.exception;
package im.zhaojun.zfile.exception;
/**
* 对象存储初始化异常

View File

@@ -1,4 +1,4 @@
package im.zhaojun.common.exception;
package im.zhaojun.zfile.exception;
/**
* @author zhaojun

View File

@@ -1,4 +1,4 @@
package im.zhaojun.common.exception;
package im.zhaojun.zfile.exception;
/**
* @author zhaojun

View File

@@ -1,4 +1,4 @@
package im.zhaojun.common.exception;
package im.zhaojun.zfile.exception;
/**
* 存储策略未初始化异常

View File

@@ -1,4 +1,4 @@
package im.zhaojun.common.exception;
package im.zhaojun.zfile.exception;
/**
* 未知的存储类型异常

View File

@@ -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;

View File

@@ -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;

View File

@@ -1,4 +1,4 @@
package im.zhaojun.common.model.constant;
package im.zhaojun.zfile.model.constant;
/**
* @author zhaojun

View File

@@ -1,4 +1,4 @@
package im.zhaojun.common.model.constant;
package im.zhaojun.zfile.model.constant;
/**
* @author zhaojun

View File

@@ -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 = "/";
/**
* 页面文档文件
*/

View File

@@ -1,4 +1,4 @@
package im.zhaojun.common.model.dto;
package im.zhaojun.zfile.model.dto;
/**
* @author zhaojun

View File

@@ -1,4 +1,4 @@
package im.zhaojun.common.model.dto;
package im.zhaojun.zfile.model.dto;
import lombok.Data;

View File

@@ -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;

View File

@@ -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;

View File

@@ -1,4 +1,4 @@
package im.zhaojun.common.model.dto;
package im.zhaojun.zfile.model.dto;
import java.io.Serializable;
@@ -23,8 +23,6 @@ public class ResultBean implements Serializable {
private Object data;
private int total;
private ResultBean() {
super();
}

View File

@@ -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;

View File

@@ -1,5 +1,6 @@
package im.zhaojun.common.model.dto;
package im.zhaojun.zfile.model.dto;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
@@ -16,6 +17,7 @@ public class StorageStrategyDTO {
private String description;
private boolean available;
@JsonProperty(defaultValue = "false")
private Boolean available;
}

View File

@@ -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;

View File

@@ -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;

View File

@@ -1,4 +1,4 @@
package im.zhaojun.common.model;
package im.zhaojun.zfile.model.entity;
import lombok.Data;

View File

@@ -1,4 +1,4 @@
package im.zhaojun.common.model.enums;
package im.zhaojun.zfile.model.enums;
/**
* @author zhaojun

View File

@@ -1,4 +1,4 @@
package im.zhaojun.common.model.enums;
package im.zhaojun.zfile.model.enums;
import com.fasterxml.jackson.annotation.JsonFormat;

View File

@@ -1,4 +1,4 @@
package im.zhaojun.common.model.enums;
package im.zhaojun.zfile.model.enums;
import javax.persistence.AttributeConverter;
import javax.persistence.Converter;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -1,4 +1,4 @@
package im.zhaojun.common.model;
package im.zhaojun.zfile.model.support;
import lombok.Data;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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());
}

View File

@@ -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;

View File

@@ -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;

View File

@@ -1,15 +1,16 @@
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 lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@@ -25,20 +26,13 @@ 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;
@Resource
private SystemConfigRepository systemConfigRepository;
@Resource
private FileCacheService fileCacheService;
private Class<SystemConfigDTO> systemConfigDTOClass = SystemConfigDTO.class;
private Class<SystemConfigDTO> systemConfigClazz = SystemConfigDTO.class;
public SystemConfigDTO getSystemConfig() {
SystemConfigDTO cacheConfig = zFileCache.getConfig();
@@ -53,7 +47,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 +69,7 @@ public class SystemConfigService {
public void updateSystemConfig(SystemConfigDTO systemConfigDTO) throws Exception {
List<SystemConfig> 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 +111,7 @@ public class SystemConfigService {
}
public AbstractFileService getCurrentFileService() {
public AbstractBaseFileService getCurrentFileService() {
StorageTypeEnum storageStrategy = getCurrentStorageStrategy();
return StorageTypeFactory.getStorageTypeService(storageStrategy);
}

View File

@@ -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<FileItemDTO> fileItemList;

View File

@@ -1,11 +1,13 @@
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.model.dto.FileItemDTO;
import im.zhaojun.zfile.model.dto.SystemConfigDTO;
import im.zhaojun.zfile.model.enums.StorageTypeEnum;
import im.zhaojun.zfile.service.SystemConfigService;
import im.zhaojun.zfile.service.support.FileAsyncCacheService;
import im.zhaojun.zfile.service.support.FileCacheService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.aop.framework.AopContext;
import org.springframework.beans.factory.annotation.Value;
@@ -13,16 +15,12 @@ import org.springframework.beans.factory.annotation.Value;
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 {
private static final String SYSTEM_CONFIG_CACHE_PREFIX = "zfile-cache:";
public abstract class AbstractBaseFileService extends FileCacheService implements BaseFileService {
@Value("${zfile.cache.timeout}")
protected Long timeout;
@@ -104,29 +102,11 @@ public abstract class AbstractFileService extends FileCacheService implements Fi
* @return 包含该文件名的所有文件或文件夹
*/
public List<FileItemDTO> search(String name) {
boolean searchIgnoreCase = systemConfigService.getSearchIgnoreCase();
return zFileCache.find(name, searchIgnoreCase);
}
/**
* 不是加密文件夹
* @param list 文件夹中的内容
* @return 返回此文件夹是否加密.
*/
private boolean isNotEncryptedFolder(List<FileItemDTO> list) {
// 如果开启了 "搜索包含加密文件" 选项, 则直接返回 true.
SystemConfigDTO systemConfig = systemConfigService.getSystemConfig();
if (BooleanUtil.isFalse(systemConfig.getSearchContainEncryptedFile())) {
return true;
}
// 遍历文件判断是否包含
for (FileItemDTO fileItemDTO : list) {
if (Objects.equals(ZFileConstant.PASSWORD_FILE_NAME, fileItemDTO.getName())) {
return false;
}
}
return true;
boolean searchIgnoreCase = BooleanUtil.isTrue(systemConfig.getSearchIgnoreCase());
boolean searchContainEncryptedFile = BooleanUtil.isTrue(systemConfig.getSearchContainEncryptedFile());
return zFileCache.find(name, searchIgnoreCase, searchContainEncryptedFile);
}
/**
@@ -134,10 +114,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);
}

View File

@@ -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 {

View File

@@ -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;

View File

@@ -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 {
/***
* 获取指定路径下的文件及文件夹

View File

@@ -1,14 +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;
@@ -20,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);
@@ -36,6 +37,7 @@ public class AliyunServiceImpl extends AbstractS3FileService implements FileServ
super.domain = stringStorageConfigMap.get(StorageConfigConstant.DOMAIN_KEY).getValue();
super.basePath = stringStorageConfigMap.get(StorageConfigConstant.BASE_PATH).getValue();
super.bucketName = stringStorageConfigMap.get(StorageConfigConstant.BUCKET_NAME_KEY).getValue();
super.isPrivate = Convert.toBool(stringStorageConfigMap.get(StorageConfigConstant.IS_PRIVATE).getValue(), true);
if (Objects.isNull(accessKey) || Objects.isNull(secretKey) || Objects.isNull(endPoint) || Objects.isNull(bucketName)) {
log.debug("初始化存储策略 [{}] 失败: 参数不完整", getStorageTypeEnum().getDescription());

View File

@@ -1,17 +1,19 @@
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 org.apache.commons.net.ftp.*;
import im.zhaojun.zfile.model.constant.StorageConfigConstant;
import im.zhaojun.zfile.model.dto.FileItemDTO;
import im.zhaojun.zfile.model.entity.StorageConfig;
import im.zhaojun.zfile.model.enums.FileTypeEnum;
import im.zhaojun.zfile.model.enums.StorageTypeEnum;
import im.zhaojun.zfile.service.StorageConfigService;
import im.zhaojun.zfile.service.base.AbstractBaseFileService;
import im.zhaojun.zfile.service.base.BaseFileService;
import im.zhaojun.zfile.util.StringUtils;
import org.apache.commons.net.ftp.FTP;
import org.apache.commons.net.ftp.FTPClientConfig;
import org.apache.commons.net.ftp.FTPFile;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service;
@@ -27,7 +29,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 +58,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 {
@@ -127,34 +129,4 @@ public class FtpServiceImpl extends AbstractFileService implements FileService {
fileItemDTO.setUrl(getDownloadUrl(path));
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));
ftpClient.login(username, password);
}
} catch (Exception e) {
e.printStackTrace();
}
}
}
}

View File

@@ -1,14 +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;
@@ -20,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);
@@ -36,6 +37,7 @@ public class HuaweiServiceImpl extends AbstractS3FileService implements FileServ
bucketName = stringStorageConfigMap.get(StorageConfigConstant.BUCKET_NAME_KEY).getValue();
domain = stringStorageConfigMap.get(StorageConfigConstant.DOMAIN_KEY).getValue();
basePath = stringStorageConfigMap.get(StorageConfigConstant.BASE_PATH).getValue();
isPrivate = Convert.toBool(stringStorageConfigMap.get(StorageConfigConstant.IS_PRIVATE).getValue(), true);
if (Objects.isNull(accessKey) || Objects.isNull(secretKey) || Objects.isNull(endPoint) || Objects.isNull(bucketName)) {
log.debug("初始化存储策略 [{}] 失败: 参数不完整", getStorageTypeEnum().getDescription());

View File

@@ -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);

View File

@@ -1,14 +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;
@@ -20,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);
@@ -34,6 +35,7 @@ public class MinIOServiceImpl extends AbstractS3FileService implements FileServi
String endPoint = stringStorageConfigMap.get(StorageConfigConstant.ENDPOINT_KEY).getValue();
bucketName = stringStorageConfigMap.get(StorageConfigConstant.BUCKET_NAME_KEY).getValue();
basePath = stringStorageConfigMap.get(StorageConfigConstant.BASE_PATH).getValue();
isPrivate = Convert.toBool(stringStorageConfigMap.get(StorageConfigConstant.IS_PRIVATE).getValue(), true);
if (Objects.isNull(accessKey) || Objects.isNull(secretKey) || Objects.isNull(endPoint) || Objects.isNull(bucketName)) {
log.debug("初始化存储策略 [{}] 失败: 参数不完整", getStorageTypeEnum().getDescription());

View File

@@ -1,12 +1,11 @@
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.model.constant.StorageConfigConstant;
import im.zhaojun.zfile.model.entity.StorageConfig;
import im.zhaojun.zfile.model.enums.StorageTypeEnum;
import im.zhaojun.zfile.service.StorageConfigService;
import im.zhaojun.zfile.service.base.AbstractOneDriveServiceBase;
import im.zhaojun.zfile.service.base.BaseFileService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
@@ -20,10 +19,7 @@ import java.util.Map;
*/
@Service
@Slf4j
public class OneDriveChinaServiceImpl extends AbstractOneDriveService implements FileService {
@Resource
private GlobalScheduleTask globalScheduleTask;
public class OneDriveChinaServiceImpl extends AbstractOneDriveServiceBase implements BaseFileService {
@Resource
private StorageConfigService storageConfigService;

View File

@@ -1,12 +1,11 @@
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.model.constant.StorageConfigConstant;
import im.zhaojun.zfile.model.entity.StorageConfig;
import im.zhaojun.zfile.model.enums.StorageTypeEnum;
import im.zhaojun.zfile.service.StorageConfigService;
import im.zhaojun.zfile.service.base.AbstractOneDriveServiceBase;
import im.zhaojun.zfile.service.base.BaseFileService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
@@ -20,10 +19,7 @@ import java.util.Map;
*/
@Service
@Slf4j
public class OneDriveServiceImpl extends AbstractOneDriveService implements FileService {
@Resource
private GlobalScheduleTask globalScheduleTask;
public class OneDriveServiceImpl extends AbstractOneDriveServiceBase implements BaseFileService {
@Resource
private StorageConfigService storageConfigService;

View File

@@ -1,14 +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;
@@ -20,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);
@@ -36,6 +37,7 @@ public class QiniuServiceImpl extends AbstractS3FileService implements FileServi
bucketName = stringStorageConfigMap.get(StorageConfigConstant.BUCKET_NAME_KEY).getValue();
domain = stringStorageConfigMap.get(StorageConfigConstant.DOMAIN_KEY).getValue();
basePath = stringStorageConfigMap.get(StorageConfigConstant.BASE_PATH).getValue();
isPrivate = Convert.toBool(stringStorageConfigMap.get(StorageConfigConstant.IS_PRIVATE).getValue(), true);
if (Objects.isNull(accessKey) || Objects.isNull(secretKey) || Objects.isNull(endPoint) || Objects.isNull(bucketName)) {
log.debug("初始化存储策略 [{}] 失败: 参数不完整", getStorageTypeEnum().getDescription());

View File

@@ -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);

View File

@@ -1,14 +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;
@@ -20,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);
@@ -35,6 +36,7 @@ public class TencentServiceImpl extends AbstractS3FileService implements FileSer
bucketName = stringStorageConfigMap.get(StorageConfigConstant.BUCKET_NAME_KEY).getValue();
domain = stringStorageConfigMap.get(StorageConfigConstant.DOMAIN_KEY).getValue();
basePath = stringStorageConfigMap.get(StorageConfigConstant.BASE_PATH).getValue();
isPrivate = Convert.toBool(stringStorageConfigMap.get(StorageConfigConstant.IS_PRIVATE).getValue(), true);
if (Objects.isNull(secretId) || Objects.isNull(secretKey) || Objects.isNull(endPoint) || Objects.isNull(bucketName)) {
log.debug("初始化存储策略 [{}] 失败: 参数不完整", getStorageTypeEnum().getDescription());

View File

@@ -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;
/**

View File

@@ -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";

View File

@@ -1,18 +1,26 @@
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.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.SystemConfigService;
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;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.*;
import java.util.ArrayDeque;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Objects;
import java.util.Set;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
@@ -61,19 +69,17 @@ public class FileAsyncCacheService {
return;
}
AbstractFileService fileService = StorageTypeFactory.getStorageTypeService(storageStrategy);
AbstractBaseFileService fileService = StorageTypeFactory.getStorageTypeService(storageStrategy);
if (fileService.getIsUnInitialized()) {
log.debug("存储策略 {} 未初始化成功, 跳过缓存.", storageStrategy.getDescription());
return;
}
Integer cacheDirectoryCount = 0;
log.info("缓存 {} 所有文件开始", storageStrategy.getDescription());
long startTime = System.currentTimeMillis();
try {
FileService currentFileService = systemConfigService.getCurrentFileService();
BaseFileService currentFileService = systemConfigService.getCurrentFileService();
List<FileItemDTO> rootFileItems = currentFileService.fileList("/");
ArrayDeque<FileItemDTO> queue = new ArrayDeque<>(rootFileItems);
@@ -145,7 +151,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);

View File

@@ -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;

View File

@@ -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();
}
}
}

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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 <natorder@paour.com>
@@ -25,8 +25,13 @@ package im.zhaojun.common.util;
import java.util.Comparator;
/**
* @author zhaojun
*/
public class NaturalOrderComparator implements Comparator<String> {
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<String> {
}
}
@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<String> {
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<String> {
}
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();
}

View File

@@ -1,4 +1,4 @@
package im.zhaojun.common.util;
package im.zhaojun.zfile.util;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

View File

@@ -1,14 +1,9 @@
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 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;
@@ -16,7 +11,7 @@ import org.springframework.lang.NonNull;
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
import java.util.*;
import java.util.LinkedHashSet;
/**
* 项目启动监听器, 当项目启动时, 遍历当前对象存储的所有内容, 添加到缓存中.
@@ -32,9 +27,6 @@ public class StartupListener implements ApplicationListener<ApplicationStartedEv
@Resource
private Environment environment;
@Resource
private SystemConfigService systemConfigService;
@Override
public void onApplicationEvent(@NonNull ApplicationStartedEvent event) {
printStartInfo();

View File

@@ -1,4 +1,4 @@
package im.zhaojun.common.util;
package im.zhaojun.zfile.util;
import cn.hutool.core.util.ObjectUtil;

View File

@@ -1,5 +1,5 @@
server:
port: 8081
port: 8080
servlet:
context-path: ''
tomcat:
@@ -30,9 +30,9 @@ spring:
# MySQL 配置
# driver-class-name: com.mysql.jdbc.Driver
# url: jdbc:mysql://127.0.0.1:3306/zfile?characterEncoding=utf8&serverTimezone=Asia/Shanghai&useSSL=false
# username: root
# password: 123456
# url: jdbc:mysql://127.0.0.1:3306/zfile?characterEncoding=utf8&serverTimezone=Asia/Shanghai&useSSL=false
# username: root
# password: 123456
jackson:
date-format: yyyy-MM-dd HH:mm
time-zone: GMT+8
@@ -47,14 +47,14 @@ spring:
chain:
gzipped: true
profiles:
active: dev
active: prod
zfile:
cache:
auto-refresh:
enable: true # 是否开启自动刷新缓存.
delay: 60000 # 启动项目后多久开始自动刷新缓存, 推荐与 interval 一致, 因为项目启动时会缓存所有文件. 单位为秒.
interval: 60000 # 任务间隔时间, 也就是每多长时间会自动刷新缓存一次. 单位为秒.
enable: true # 是否开启自动刷新缓存.
delay: 1800 # 启动项目后多久开始自动刷新缓存, 推荐与 interval 一致, 因为项目启动时会缓存所有文件.
interval: 1800 # 任务间隔时间, 也就是每多长时间会自动刷新缓存一次.
timeout: 1800
constant:
readme: readme.md
@@ -68,4 +68,4 @@ zfile:
clientId: 4a72d927-1907-488d-9eb2-1b465c53c1c5
clientSecret: Y9CEA=82da5n-y_]KAWAgLH3?R9xf7Uw
redirectUri: https://zfile.jun6.net/onedrive/china-callback
scope: offline_access User.Read Files.ReadWrite.All
scope: offline_access User.Read Files.ReadWrite.All

View File

@@ -77,3 +77,10 @@ INSERT INTO STORAGE_CONFIG (`ID`, `k`, `TITLE`, `TYPE`) VALUES (57, 'username',
INSERT INTO STORAGE_CONFIG (`ID`, `k`, `TITLE`, `TYPE`) VALUES (58, 'password', '操作员密码', 'ufile');
INSERT INTO STORAGE_CONFIG (`ID`, `k`, `TITLE`, `TYPE`) VALUES (59, 'domain', '加速域名', 'ufile');
INSERT INTO STORAGE_CONFIG (`ID`, `k`, `TITLE`, `TYPE`) VALUES (60, 'base-path', '基路径', 'ufile');
INSERT INTO STORAGE_CONFIG (`ID`, `k`, `TITLE`, `TYPE`) VALUES (61, 'isPrivate', '是否是私有空间', 'tencent');
INSERT INTO STORAGE_CONFIG (`ID`, `k`, `TITLE`, `TYPE`) VALUES (62, 'isPrivate', '是否是私有空间', 'aliyun');
INSERT INTO STORAGE_CONFIG (`ID`, `k`, `TITLE`, `TYPE`) VALUES (63, 'isPrivate', '是否是私有空间', 'huawei');
INSERT INTO STORAGE_CONFIG (`ID`, `k`, `TITLE`, `TYPE`) VALUES (64, 'isPrivate', '是否是私有空间', 'minio');
INSERT INTO STORAGE_CONFIG (`ID`, `k`, `TITLE`, `TYPE`) VALUES (65, 'isPrivate', '是否是私有空间', 'qiniu');

View File

@@ -1 +0,0 @@
.box-card[data-v-680e1b46]{padding-top:30px;padding-right:30px;margin:15vh auto;height:65vh;overflow-y:auto}.el-select[data-v-680e1b46]{width:100%}

View File

@@ -0,0 +1 @@
.box-card[data-v-7d75c59c]{padding-top:30px;padding-right:30px;margin:10vh auto;height:75vh;overflow-y:auto}.el-select[data-v-7d75c59c]{width:100%}.zfile-word-aux[data-v-7d75c59c]{margin-left:20px;color:#aaa}

View File

@@ -1 +1 @@
.zfile-header[data-v-38be2320]{height:48px;line-height:48px!important;background:#fafafa;border-bottom:1px solid rgba(0,0,0,.05);padding-left:30px}.zfile-header .el-breadcrumb[data-v-38be2320],.zfile-header .el-input[data-v-38be2320]{line-height:48px}@media only screen and (max-width:767px){.hidden-xs-only{display:none!important}}@media only screen and (min-width:768px){.hidden-sm-and-up{display:none!important}}@media only screen and (min-width:768px) and (max-width:991px){.hidden-sm-only{display:none!important}}@media only screen and (max-width:991px){.hidden-sm-and-down{display:none!important}}@media only screen and (min-width:992px){.hidden-md-and-up{display:none!important}}@media only screen and (min-width:992px) and (max-width:1199px){.hidden-md-only{display:none!important}}@media only screen and (max-width:1199px){.hidden-md-and-down{display:none!important}}@media only screen and (min-width:1200px){.hidden-lg-and-up{display:none!important}}@media only screen and (min-width:1200px) and (max-width:1919px){.hidden-lg-only{display:none!important}}@media only screen and (max-width:1919px){.hidden-lg-and-down{display:none!important}}@media only screen and (min-width:1920px){.hidden-xl-only{display:none!important}}#List[data-v-089e9388]{overflow:hidden}.el-table[data-v-089e9388]{margin:20px 0 0 20px;padding-right:30px;overflow-y:hidden}.el-table[data-v-089e9388]:before{height:0}.el-table svg[data-v-089e9388]{font-size:18px;margin-right:15px}#ListTable[data-v-089e9388] .table-header-left{margin-left:38px}#ListTable[data-v-089e9388] tr{cursor:pointer}.el-scrollbar[data-v-089e9388] .el-scrollbar__wrap{overflow-x:hidden!important}#videoDialog[data-v-089e9388] .el-dialog__body{padding:10px 0 0 0}#List[data-v-089e9388] .el-dialog__header{text-align:center;margin-bottom:-10px;padding:5px 0 5px 0}#videoDialog[data-v-089e9388] .el-dialog__headerbtn{top:10px}#textDialog[data-v-089e9388] .el-dialog{margin-bottom:0}.v-contextmenu-item[data-v-089e9388] label{margin-left:10px}@media screen and (max-device-width:1920px){#videoDialog[data-v-089e9388] .el-dialog{margin-top:5vh!important;width:70%!important}}@media screen and (max-device-width:769px){#videoDialog[data-v-089e9388] .el-dialog{margin-top:10vh!important;width:90%!important}}.operator-btn[data-v-089e9388]{color:#1e9fff;margin-right:20px;font-size:16px}#app{font-family:Helvetica Neue,Helvetica,PingFang SC,Hiragino Sans GB,Microsoft YaHei,"\5FAE\8F6F\96C5\9ED1",Arial,sans-serif;font-size:16px;line-height:1.5;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;color:#2c3e50;overflow-x:hidden}body{margin:unset}.icon,body{overflow:hidden}.icon{width:1em;height:1em;vertical-align:-.15em;fill:currentColor}::-webkit-scrollbar{width:6px;height:8px;background:rgba(144,147,153,.3)}::-webkit-scrollbar-button:vertical{display:none}::-webkit-scrollbar-corner,::-webkit-scrollbar-track{background-color:#e2e2e2}::-webkit-scrollbar-thumb{border-radius:8px;background-color:#a6a6a6}::-webkit-scrollbar-thumb:vertical:hover{background-color:#7f7f7f}::-webkit-scrollbar-thumb:vertical:active{background-color:rgba(0,0,0,.38)}.center-box-card{width:1100px;margin:0 auto}.markdown-body{height:300px;overflow-y:auto;padding:0!important;min-width:100%!important}.alert{background-color:#f4f4f5;color:#909399;font-size:12px;margin:0 0 0;width:100%;padding:10px 16px;-webkit-box-sizing:border-box;box-sizing:border-box;border-radius:4px;position:relative;overflow:hidden;opacity:1;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-transition:opacity .2s;transition:opacity .2s}
.zfile-header[data-v-69b2489f]{height:48px;line-height:48px!important;background:#fafafa;border-bottom:1px solid rgba(0,0,0,.05);padding-left:30px}.zfile-header .el-breadcrumb[data-v-69b2489f],.zfile-header .el-input[data-v-69b2489f]{line-height:48px}@media only screen and (max-width:767px){.hidden-xs-only{display:none!important}}@media only screen and (min-width:768px){.hidden-sm-and-up{display:none!important}}@media only screen and (min-width:768px) and (max-width:991px){.hidden-sm-only{display:none!important}}@media only screen and (max-width:991px){.hidden-sm-and-down{display:none!important}}@media only screen and (min-width:992px){.hidden-md-and-up{display:none!important}}@media only screen and (min-width:992px) and (max-width:1199px){.hidden-md-only{display:none!important}}@media only screen and (max-width:1199px){.hidden-md-and-down{display:none!important}}@media only screen and (min-width:1200px){.hidden-lg-and-up{display:none!important}}@media only screen and (min-width:1200px) and (max-width:1919px){.hidden-lg-only{display:none!important}}@media only screen and (max-width:1919px){.hidden-lg-and-down{display:none!important}}@media only screen and (min-width:1920px){.hidden-xl-only{display:none!important}}#List[data-v-360f2068]{overflow:hidden}.el-table[data-v-360f2068]{margin:20px 0 0 20px;padding-right:30px;overflow-y:hidden}.el-table[data-v-360f2068]:before{height:0}.el-table svg[data-v-360f2068]{font-size:18px;margin-right:15px}#ListTable[data-v-360f2068] .table-header-left{margin-left:38px}#ListTable[data-v-360f2068] tr{cursor:pointer}.el-scrollbar[data-v-360f2068] .el-scrollbar__wrap{overflow-x:hidden!important}#videoDialog[data-v-360f2068] .el-dialog__body{padding:10px 0 0 0}#List[data-v-360f2068] .el-dialog__header{text-align:center;margin-bottom:-10px;padding:5px 0 5px 0}#videoDialog[data-v-360f2068] .el-dialog__headerbtn{top:10px}#textDialog[data-v-360f2068] .el-dialog{margin-bottom:0}.v-contextmenu-item[data-v-360f2068] label{margin-left:10px}@media screen and (max-device-width:1920px){#videoDialog[data-v-360f2068] .el-dialog{margin-top:5vh!important;width:70%!important}}@media screen and (max-device-width:769px){#videoDialog[data-v-360f2068] .el-dialog{margin-top:10vh!important;width:90%!important}}.operator-btn[data-v-360f2068]{color:#1e9fff;margin-right:20px;font-size:16px}#app{font-family:Helvetica Neue,Helvetica,PingFang SC,Hiragino Sans GB,Microsoft YaHei,"\5FAE\8F6F\96C5\9ED1",Arial,sans-serif;font-size:16px;line-height:1.5;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;color:#2c3e50;overflow-x:hidden}body{margin:unset}.icon,body{overflow:hidden}.icon{width:1em;height:1em;vertical-align:-.15em;fill:currentColor}::-webkit-scrollbar{width:6px;height:8px;background:rgba(144,147,153,.3)}::-webkit-scrollbar-button:vertical{display:none}::-webkit-scrollbar-corner,::-webkit-scrollbar-track{background-color:#e2e2e2}::-webkit-scrollbar-thumb{border-radius:8px;background-color:#a6a6a6}::-webkit-scrollbar-thumb:vertical:hover{background-color:#7f7f7f}::-webkit-scrollbar-thumb:vertical:active{background-color:rgba(0,0,0,.38)}.center-box-card{width:1100px;margin:0 auto}.markdown-body{height:300px;overflow-y:auto;padding:0!important;min-width:100%!important}.alert{background-color:#f4f4f5;color:#909399;font-size:12px;margin:0 0 0;width:100%;padding:10px 16px;-webkit-box-sizing:border-box;box-sizing:border-box;border-radius:4px;position:relative;overflow:hidden;opacity:1;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-transition:opacity .2s;transition:opacity .2s}

View File

@@ -1 +1 @@
<!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=/favicon.ico><title></title><link href=/css/chunk-049ad60c.8d1c3f59.css rel=prefetch><link href=/css/chunk-06f6e882.4c106b9d.css rel=prefetch><link href=/css/chunk-09797b6e.0e88456f.css rel=prefetch><link href=/css/chunk-0b11d68a.2bc89311.css rel=prefetch><link href=/css/chunk-1f0cfb2a.773f5ef1.css rel=prefetch><link href=/css/chunk-227db9c4.091f6ac0.css rel=prefetch><link href=/css/chunk-28547ac9.d30178ad.css rel=prefetch><link href=/css/chunk-361b31cc.434c5719.css rel=prefetch><link href=/css/chunk-50da9024.6d697acf.css rel=prefetch><link href=/css/chunk-548ba676.5c3079db.css rel=prefetch><link href=/css/chunk-5a048f62.71936c2b.css rel=prefetch><link href=/css/chunk-6b263e10.bc5fc5af.css rel=prefetch><link href=/css/chunk-718902cb.e55a2dd9.css rel=prefetch><link href=/css/chunk-be932168.c1550f52.css rel=prefetch><link href=/css/chunk-d1e104d6.ecae5695.css rel=prefetch><link href=/js/chunk-049ad60c.0b1b3166.js rel=prefetch><link href=/js/chunk-06f6e882.fc195f68.js rel=prefetch><link href=/js/chunk-09797b6e.7b1e5e16.js rel=prefetch><link href=/js/chunk-0b11d68a.d20d6721.js rel=prefetch><link href=/js/chunk-1f0cfb2a.05b8606a.js rel=prefetch><link href=/js/chunk-227db9c4.0342e2c8.js rel=prefetch><link href=/js/chunk-28547ac9.89bfa8e0.js rel=prefetch><link href=/js/chunk-2d0a43df.0bb25464.js rel=prefetch><link href=/js/chunk-2d0e57ec.56324ec2.js rel=prefetch><link href=/js/chunk-361b31cc.ec6b72b5.js rel=prefetch><link href=/js/chunk-50da9024.60ccc699.js rel=prefetch><link href=/js/chunk-548ba676.7767e226.js rel=prefetch><link href=/js/chunk-5a048f62.c7a85d91.js rel=prefetch><link href=/js/chunk-6b263e10.fe00e76b.js rel=prefetch><link href=/js/chunk-718902cb.4d2eda07.js rel=prefetch><link href=/js/chunk-be932168.8a978c33.js rel=prefetch><link href=/js/chunk-d1e104d6.5ae45d97.js rel=prefetch><link href=/css/app.34f4cf05.css rel=preload as=style><link href=/css/chunk-vendors.4a45e43f.css rel=preload as=style><link href=/js/app.5605baab.js rel=preload as=script><link href=/js/chunk-vendors.b5ddaa46.js rel=preload as=script><link href=/css/chunk-vendors.4a45e43f.css rel=stylesheet><link href=/css/app.34f4cf05.css rel=stylesheet></head><body><noscript><strong>We're sorry but zfile doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=/js/chunk-vendors.b5ddaa46.js></script><script src=/js/app.5605baab.js></script></body></html>
<!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=/favicon.ico><title></title><link href=/css/chunk-049ad60c.8d1c3f59.css rel=prefetch><link href=/css/chunk-06f6e882.4c106b9d.css rel=prefetch><link href=/css/chunk-09797b6e.0e88456f.css rel=prefetch><link href=/css/chunk-0b11d68a.2bc89311.css rel=prefetch><link href=/css/chunk-1f0cfb2a.773f5ef1.css rel=prefetch><link href=/css/chunk-227db9c4.091f6ac0.css rel=prefetch><link href=/css/chunk-28547ac9.d30178ad.css rel=prefetch><link href=/css/chunk-361b31cc.434c5719.css rel=prefetch><link href=/css/chunk-548ba676.5c3079db.css rel=prefetch><link href=/css/chunk-5a048f62.71936c2b.css rel=prefetch><link href=/css/chunk-6b263e10.bc5fc5af.css rel=prefetch><link href=/css/chunk-718902cb.e55a2dd9.css rel=prefetch><link href=/css/chunk-c5bf65e6.accc08d6.css rel=prefetch><link href=/css/chunk-d1e104d6.ecae5695.css rel=prefetch><link href=/css/chunk-faa8fca8.bb4fd588.css rel=prefetch><link href=/js/chunk-049ad60c.0b1b3166.js rel=prefetch><link href=/js/chunk-06f6e882.fc195f68.js rel=prefetch><link href=/js/chunk-09797b6e.7b1e5e16.js rel=prefetch><link href=/js/chunk-0b11d68a.d20d6721.js rel=prefetch><link href=/js/chunk-1f0cfb2a.05b8606a.js rel=prefetch><link href=/js/chunk-227db9c4.0342e2c8.js rel=prefetch><link href=/js/chunk-28547ac9.89bfa8e0.js rel=prefetch><link href=/js/chunk-2d0a43df.0bb25464.js rel=prefetch><link href=/js/chunk-2d0e57ec.56324ec2.js rel=prefetch><link href=/js/chunk-361b31cc.ec6b72b5.js rel=prefetch><link href=/js/chunk-548ba676.7767e226.js rel=prefetch><link href=/js/chunk-5a048f62.c7a85d91.js rel=prefetch><link href=/js/chunk-6b263e10.fe00e76b.js rel=prefetch><link href=/js/chunk-718902cb.4d2eda07.js rel=prefetch><link href=/js/chunk-c5bf65e6.bbf03f50.js rel=prefetch><link href=/js/chunk-d1e104d6.5ae45d97.js rel=prefetch><link href=/js/chunk-faa8fca8.429fb078.js rel=prefetch><link href=/css/app.34f4cf05.css rel=preload as=style><link href=/css/chunk-vendors.4a45e43f.css rel=preload as=style><link href=/js/app.a82d704b.js rel=preload as=script><link href=/js/chunk-vendors.b5ddaa46.js rel=preload as=script><link href=/css/chunk-vendors.4a45e43f.css rel=stylesheet><link href=/css/app.34f4cf05.css rel=stylesheet></head><body><noscript><strong>We're sorry but zfile doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=/js/chunk-vendors.b5ddaa46.js></script><script src=/js/app.a82d704b.js></script></body></html>

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long