From 75ddcd47f40f705c32c3e15a5cbf9ba53463b941 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E4=BF=8A?= <873019219@qq.com>
Date: Sat, 10 Apr 2021 20:21:19 +0800
Subject: [PATCH] =?UTF-8?q?:zip:=20=E4=BC=98=E5=8C=96=E5=AD=98=E5=82=A8?=
 =?UTF-8?q?=E5=99=A8=E4=BF=9D=E5=AD=98=E9=80=BB=E8=BE=91=EF=BC=8C=E9=98=B2?=
 =?UTF-8?q?=E6=AD=A2=E6=96=B0=E5=A2=9E=E5=8A=A0=E7=9A=84=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E6=97=A0=E6=B3=95=E6=AD=A3=E5=B8=B8=E4=BF=9D=E5=AD=98=E7=9A=84?=
 =?UTF-8?q?=20BUG=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../zfile/service/DriveConfigService.java      | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

diff --git a/src/main/java/im/zhaojun/zfile/service/DriveConfigService.java b/src/main/java/im/zhaojun/zfile/service/DriveConfigService.java
index b6d8c8b..5524b65 100644
--- a/src/main/java/im/zhaojun/zfile/service/DriveConfigService.java
+++ b/src/main/java/im/zhaojun/zfile/service/DriveConfigService.java
@@ -192,22 +192,8 @@ public class DriveConfigService {
 
         AbstractBaseFileService storageTypeService = StorageTypeContext.getStorageTypeService(storageType);
 
-        List<StorageConfig> storageConfigList;
-        if (updateFlag) {
-            storageConfigList = storageConfigRepository.findByDriveId(driveConfigDTO.getId());
-            // 如果从数据库获取到的数据不为空, 则校验数据是否和当前存储类型一直, 如不一直则进行矫正.
-            if (CollectionUtil.isNotEmpty(storageConfigList)) {
-                StorageConfig storageConfig = storageConfigList.get(0);
-                StorageTypeEnum type = storageConfig.getType();
-
-                if (!Objects.equals(type, storageType)) {
-                    storageConfigRepository.deleteByDriveId(driveConfigDTO.getId());
-                    storageConfigList = storageTypeService.storageStrategyConfigList();
-                }
-            }
-        } else {
-            storageConfigList = storageTypeService.storageStrategyConfigList();
-        }
+        List<StorageConfig> storageConfigList = storageTypeService.storageStrategyConfigList();
+        storageConfigRepository.deleteByDriveId(driveConfigDTO.getId());
 
         for (StorageConfig storageConfig : storageConfigList) {
             String key = storageConfig.getKey();