diff --git a/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/exception/FileException.java b/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/exception/FileException.java
index d2b105f49..aabcaf17a 100644
--- a/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/exception/FileException.java
+++ b/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/exception/FileException.java
@@ -1,5 +1,6 @@
package cn.stylefeng.roses.kernel.file.exception;
+import cn.hutool.core.util.StrUtil;
import cn.stylefeng.roses.kernel.file.constants.FileConstants;
import cn.stylefeng.roses.kernel.rule.exception.AbstractExceptionEnum;
import cn.stylefeng.roses.kernel.rule.exception.base.ServiceException;
@@ -12,16 +13,12 @@ import cn.stylefeng.roses.kernel.rule.exception.base.ServiceException;
*/
public class FileException extends ServiceException {
- public FileException(String errorCode, String userTip) {
- super(FileConstants.FILE_MODULE_NAME, errorCode, userTip);
- }
-
public FileException(AbstractExceptionEnum exception) {
super(FileConstants.FILE_MODULE_NAME, exception);
}
- public FileException(AbstractExceptionEnum exception, String userTip) {
- super(FileConstants.FILE_MODULE_NAME, exception.getErrorCode(), userTip);
+ public FileException(AbstractExceptionEnum exception, Object... params) {
+ super(FileConstants.FILE_MODULE_NAME, exception.getErrorCode(), StrUtil.format(exception.getUserTip(), params));
}
}
diff --git a/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/util/DownloadUtil.java b/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/util/DownloadUtil.java
index b4e50b210..58151eb13 100644
--- a/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/util/DownloadUtil.java
+++ b/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/util/DownloadUtil.java
@@ -3,7 +3,6 @@ package cn.stylefeng.roses.kernel.file.util;
import cn.hutool.core.io.FileUtil;
import cn.hutool.core.io.IoUtil;
import cn.hutool.core.util.CharsetUtil;
-import cn.hutool.core.util.StrUtil;
import cn.hutool.core.util.URLUtil;
import cn.stylefeng.roses.kernel.file.exception.FileException;
import cn.stylefeng.roses.kernel.file.exception.enums.FileExceptionEnum;
@@ -43,8 +42,7 @@ public class DownloadUtil {
response.setContentType("application/octet-stream;charset=UTF-8");
IoUtil.write(response.getOutputStream(), true, fileBytes);
} catch (IOException e) {
- String userTip = StrUtil.format(FileExceptionEnum.DOWNLOAD_FILE_ERROR.getUserTip(), e.getMessage());
- throw new FileException(FileExceptionEnum.DOWNLOAD_FILE_ERROR, userTip);
+ throw new FileException(FileExceptionEnum.DOWNLOAD_FILE_ERROR, e.getMessage());
}
}
@@ -66,8 +64,7 @@ public class DownloadUtil {
try {
fileName = URLEncoder.encode(file.getName(), CharsetUtil.UTF_8);
} catch (UnsupportedEncodingException e) {
- String userTip = StrUtil.format(FileExceptionEnum.DOWNLOAD_FILE_ERROR.getUserTip(), e.getMessage());
- throw new FileException(FileExceptionEnum.DOWNLOAD_FILE_ERROR, userTip);
+ throw new FileException(FileExceptionEnum.DOWNLOAD_FILE_ERROR, e.getMessage());
}
//下载文件
@@ -91,8 +88,7 @@ public class DownloadUtil {
// 输出字节流
IoUtil.write(outputStream, true, fileBytes);
} catch (IOException e) {
- String userTip = StrUtil.format(FileExceptionEnum.WRITE_BYTES_ERROR.getUserTip(), e.getMessage());
- throw new FileException(FileExceptionEnum.WRITE_BYTES_ERROR, userTip);
+ throw new FileException(FileExceptionEnum.WRITE_BYTES_ERROR, e.getMessage());
}
}
diff --git a/kernel-d-file/file-business/src/main/java/cn/stylefeng/roses/kernel/file/modular/controller/SysFileInfoController.java b/kernel-d-file/file-business/src/main/java/cn/stylefeng/roses/kernel/file/modular/controller/SysFileInfoController.java
index dabcef0ed..35a25c489 100644
--- a/kernel-d-file/file-business/src/main/java/cn/stylefeng/roses/kernel/file/modular/controller/SysFileInfoController.java
+++ b/kernel-d-file/file-business/src/main/java/cn/stylefeng/roses/kernel/file/modular/controller/SysFileInfoController.java
@@ -37,8 +37,6 @@ import static cn.stylefeng.roses.kernel.file.constants.FileConstants.*;
* 1.合同文件场景:文件必须保持原样,合同内容升级不影响已签署合同,业务需要关联文件ID
* 文件升级不会对之前的数据造成影响
* 2.UI文件场景:文件升级后业务所有关联的文件全部升级,业务需要关联文件CODE
- *
- * 可能你今天上线,昨天很丑的banner图变好看了~
*
* @author majianguo
* @date 2020/12/27 13:39
@@ -62,7 +60,6 @@ public class SysFileInfoController {
return new SuccessResponseData(fileUploadInfoResult);
}
-
/**
* 富文本tinymce上传文件
* 需要返回格式
@@ -257,4 +254,4 @@ public class SysFileInfoController {
return new SuccessResponseData(sysFileInfoService.detail(sysFileInfoRequest));
}
-}
\ No newline at end of file
+}
diff --git a/kernel-d-file/file-business/src/main/java/cn/stylefeng/roses/kernel/file/modular/factory/FileInfoFactory.java b/kernel-d-file/file-business/src/main/java/cn/stylefeng/roses/kernel/file/modular/factory/FileInfoFactory.java
index fc1b58116..e60211f69 100644
--- a/kernel-d-file/file-business/src/main/java/cn/stylefeng/roses/kernel/file/modular/factory/FileInfoFactory.java
+++ b/kernel-d-file/file-business/src/main/java/cn/stylefeng/roses/kernel/file/modular/factory/FileInfoFactory.java
@@ -61,8 +61,7 @@ public class FileInfoFactory {
bytes = file.getBytes();
fileOperatorApi.storageFile(DEFAULT_BUCKET_NAME, finalFileName, bytes);
} catch (IOException e) {
- String userTip = StrUtil.format(FileExceptionEnum.ERROR_FILE.getUserTip(), e.getMessage());
- throw new FileException(FileExceptionEnum.ERROR_FILE, userTip);
+ throw new FileException(FileExceptionEnum.ERROR_FILE, e.getMessage());
}
// 计算文件大小kb
diff --git a/kernel-d-file/file-business/src/main/java/cn/stylefeng/roses/kernel/file/modular/service/impl/SysFileInfoServiceImpl.java b/kernel-d-file/file-business/src/main/java/cn/stylefeng/roses/kernel/file/modular/service/impl/SysFileInfoServiceImpl.java
index b0feb7edb..be71d7f13 100644
--- a/kernel-d-file/file-business/src/main/java/cn/stylefeng/roses/kernel/file/modular/service/impl/SysFileInfoServiceImpl.java
+++ b/kernel-d-file/file-business/src/main/java/cn/stylefeng/roses/kernel/file/modular/service/impl/SysFileInfoServiceImpl.java
@@ -205,8 +205,7 @@ public class SysFileInfoServiceImpl extends ServiceImpl