From f0afb2b17f2f6e13925ffe1b6fd8c8ae724aec0e Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期四, 13 三月 2025 10:46:24 +0800
Subject: [PATCH] 分支合并冲突解决
---
ruoyi-common/src/main/java/com/ruoyi/common/utils/FileSaveUtil.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/FileSaveUtil.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/FileSaveUtil.java
index da4ca5f..d92c183 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/FileSaveUtil.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/FileSaveUtil.java
@@ -1,6 +1,7 @@
package com.ruoyi.common.utils;
import com.alibaba.excel.util.IoUtils;
+import com.ruoyi.common.exception.base.BaseException;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
@@ -69,7 +70,7 @@
suffix = originalFilename.substring(originalFilename.lastIndexOf("."));
// 濡傛灉鍚庣紑鍚嶄笉閫氳繃鎶涘嚭寮傚父
if (!isFileAllowed(suffix)){
- throw new RuntimeException(suffix);
+ throw new BaseException("涓嶆敮鎸佽鏂囦欢绫诲瀷涓婁紶");
}
}
// 鍚嶇О鎷兼帴
--
Gitblit v1.9.3