From 245937e773fa056872c2f70f10a5f1588c31ec61 Mon Sep 17 00:00:00 2001
From: zhaojun1998 <root@zhaojun.im>
Date: Fri, 24 Jan 2020 18:37:58 +0800
Subject: [PATCH] =?UTF-8?q?:sparkles:=20=E6=90=9C=E7=B4=A2=E5=BF=BD?=
 =?UTF-8?q?=E7=95=A5=E5=A4=A7=E5=B0=8F=E5=86=99=E6=94=AF=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/service/AbstractFileService.java      | 16 ++++++++++++++--
 .../common/service/SystemConfigService.java      |  7 ++++++-
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/src/main/java/im/zhaojun/common/service/AbstractFileService.java b/src/main/java/im/zhaojun/common/service/AbstractFileService.java
index e453483..847fe07 100644
--- a/src/main/java/im/zhaojun/common/service/AbstractFileService.java
+++ b/src/main/java/im/zhaojun/common/service/AbstractFileService.java
@@ -1,5 +1,6 @@
 package im.zhaojun.common.service;
 
+import cn.hutool.core.util.StrUtil;
 import com.alicp.jetcache.Cache;
 import com.alicp.jetcache.RefreshPolicy;
 import com.alicp.jetcache.anno.CacheRefresh;
@@ -123,9 +124,20 @@ public abstract class AbstractFileService extends FileCacheService implements Fi
     public List<FileItemDTO> search(String name) throws Exception {
         List<FileItemDTO> result = new ArrayList<>();
 
+        boolean searchIgnoreCase = systemConfigService.getSearchIgnoreCase();
+
         List<FileItemDTO> fileItemList = selectAllFileList();
         for (FileItemDTO fileItemDTO : fileItemList) {
-            if (fileItemDTO.getName().contains(name)) {
+
+            boolean testResult;
+
+            if (searchIgnoreCase) {
+                testResult = StrUtil.containsIgnoreCase(fileItemDTO.getName(), name);
+            } else {
+                testResult = fileItemDTO.getName().contains(name);
+            }
+
+            if (testResult) {
                 result.add(fileItemDTO);
             }
         }
@@ -137,7 +149,7 @@ public abstract class AbstractFileService extends FileCacheService implements Fi
      * 查询所有文件, 仅去缓存中查询.
      * @return              所有文件
      */
-    public List<FileItemDTO> selectAllFileList() throws Exception {
+    public List<FileItemDTO> selectAllFileList() {
         List<FileItemDTO> result = new ArrayList<>();
         boolean enableCache = systemConfigService.getEnableCache();
         if (!enableCache) {
diff --git a/src/main/java/im/zhaojun/common/service/SystemConfigService.java b/src/main/java/im/zhaojun/common/service/SystemConfigService.java
index ad12b3f..c7e1025 100644
--- a/src/main/java/im/zhaojun/common/service/SystemConfigService.java
+++ b/src/main/java/im/zhaojun/common/service/SystemConfigService.java
@@ -144,10 +144,15 @@ public class SystemConfigService {
         return systemConfigDTO.getStorageStrategy();
     }
 
-
     public boolean getEnableCache() {
         SystemConfigDTO systemConfigDTO = getSystemConfig();
         return ObjectUtil.defaultIfNull(systemConfigDTO.getEnableCache(), false);
     }
 
+    public boolean getSearchIgnoreCase() {
+        SystemConfigDTO systemConfigDTO = getSystemConfig();
+        return ObjectUtil.defaultIfNull(systemConfigDTO.getSearchIgnoreCase(), false);
+    }
+
+
 }
\ No newline at end of file