From 1f0e742710af7917ecde23a761acd7c28ea3dd53 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Wed, 20 Jul 2022 09:39:58 +0800
Subject: [PATCH] Excel注解支持backgroundColor属性设置背景色
---
ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java
index bde1987..f8a39d3 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java
@@ -257,8 +257,8 @@
}
/**
- * 获取名称
- * 例如: /profile/upload/2022/04/16/ruoyi.png, 返回: ruoyi.png
+ * 获取文件名称 /profile/upload/2022/04/16/ruoyi.png -- ruoyi.png
+ *
* @param fileName 路径名称
* @return 没有文件路径的名称
*/
@@ -275,13 +275,15 @@
}
/**
- * 获取名称
- * 例如: /profile/upload/2022/04/16/ruoyi.png, 返回: ruoyi
+ * 获取不带后缀文件名称 /profile/upload/2022/04/16/ruoyi.png -- ruoyi
+ *
* @param fileName 路径名称
- * @return 没有文件路径的名称
+ * @return 没有文件路径和后缀的名称
*/
- public static String getNameNotSuffix(String fileName) {
- if (fileName == null) {
+ public static String getNameNotSuffix(String fileName)
+ {
+ if (fileName == null)
+ {
return null;
}
String baseName = FilenameUtils.getBaseName(fileName);
--
Gitblit v1.9.2