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

fix(异常处理): 存储源不存在时进行提示，修复后提示存储源不存在

Browse Source
This commit is contained in:
zhaojun
2022-07-11 14:56:27 +08:00
parent bda654a012
commit 9dffaaee25
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/im/zhaojun/zfile/home/controller/FileController.java
View File

@@ -1 +1 @@
package im.zhaojun.zfile.home.controller;
package im.zhaojun.zfile.home.controller;

7
src/main/java/im/zhaojun/zfile/home/controller/SiteController.java
View File

@@ -10,6 +10,7 @@ import im.zhaojun.zfile.admin.service.ReadmeConfigService;
import im.zhaojun.zfile.admin.service.StorageSourceService;
import im.zhaojun.zfile.admin.service.SystemConfigService;
import im.zhaojun.zfile.common.config.ZFileProperties;
import im.zhaojun.zfile.common.exception.InvalidStorageSourceException;
import im.zhaojun.zfile.common.util.AjaxJson;
import im.zhaojun.zfile.home.convert.StorageSourceConvert;
import im.zhaojun.zfile.home.model.dto.SystemConfigDTO;
@@ -81,6 +82,10 @@ public class SiteController {
String path = fileListConfigRequest.getPath();
StorageSource storageSource = storageSourceService.findByStorageKey(storageKey);
if (storageSource == null) {
throw new InvalidStorageSourceException("存储源不存在");
}
StorageSourceConfigResult storageSourceConfigResult = storageSourceConvert.entityToConfigResult(storageSource);
// 获取是否允许文件操作
@@ -90,7 +95,7 @@ public class SiteController {
Integer storageId = storageSource.getId();
// 获取指定目录 readme 文件
ReadmeConfig readmeByPath = readmeConfigService.findReadmeByPath(storageId, path);
ReadmeConfig readmeByPath = readmeConfigService.findReadmeByPath(storageId, "");
if (ObjectUtil.isNotNull(readmeByPath)) {
String readmeText = readmeByPath.getReadmeText();