From 9d5f48d1bf0fb160ee9cc3dbf1c4c4d07fd6aa94 Mon Sep 17 00:00:00 2001
From: shenqicheng <1317225796@qq.com>
Date: Sun, 18 Sep 2022 23:12:50 +0800
Subject: [PATCH] =?UTF-8?q?:bookmark:=20=E5=8F=91=E5=B8=831.1.2=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                                 | 4 ++--
 gradle.properties                                         | 2 +-
 .../com/opcooc/storage/holder/ClientDriverHolder.java     | 6 +++---
 .../storage/provider/AbstractClientDriverProvider.java    | 6 +-----
 .../autoconfigure/DynamicStorageAutoConfiguration.java    | 8 --------
 5 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/README.md b/README.md
index 6c8ddb7..6f57d83 100644
--- a/README.md
+++ b/README.md
@@ -67,12 +67,12 @@
             <dependency>
               <groupId>com.opcooc</groupId>
               <artifactId>opcooc-storage-spring-boot-starter</artifactId>
-              <version>1.1.1</version>
+              <version>1.1.2</version>
             </dependency>
         ```
     -   Gradle
         ```groovy
-        implementation 'com.opcooc:opcooc-storage-spring-boot-starter:1.1.1'
+        implementation 'com.opcooc:opcooc-storage-spring-boot-starter:1.1.2'
         ```
 
 ## 添加配置，在 `application.yml` 中添加配置信息
diff --git a/gradle.properties b/gradle.properties
index bae2572..ed7f943 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,7 +2,7 @@
 encoding=UTF-8
 
 #project version
-opcoocVersion=1.1.1
+opcoocVersion=1.1.2
 
 sonatypeUsername=*
 sonatypePassword=*
diff --git a/src/main/java/com/opcooc/storage/holder/ClientDriverHolder.java b/src/main/java/com/opcooc/storage/holder/ClientDriverHolder.java
index a2892fb..7b1927d 100644
--- a/src/main/java/com/opcooc/storage/holder/ClientDriverHolder.java
+++ b/src/main/java/com/opcooc/storage/holder/ClientDriverHolder.java
@@ -34,7 +34,7 @@
 @Setter
 public class ClientDriverHolder {
 
-    public ClientDriver getClientDriver(ClientDriverProperty property) {
+    public static ClientDriver getClientDriver(ClientDriverProperty property) {
 
         if (property.getCustomClient() != null) {
             //实例化自定义 ClientDriver
@@ -54,7 +54,7 @@ public ClientDriver getClientDriver(ClientDriverProperty property) {
         return getDefaultS3ClientDriver(property);
     }
 
-    public ClientDriver getCustomizeClientDriver(ClientDriverProperty property) {
+    public static ClientDriver getCustomizeClientDriver(ClientDriverProperty property) {
         // 校验配置合法性
         property.preCheck();
         Client client = StorageUtil.instantiateClass(property.getCustomClient(), property);
@@ -63,7 +63,7 @@ public ClientDriver getCustomizeClientDriver(ClientDriverProperty property) {
         return driver;
     }
 
-    public ClientDriver getDefaultS3ClientDriver(ClientDriverProperty property) {
+    public static ClientDriver getDefaultS3ClientDriver(ClientDriverProperty property) {
         // 校验配置合法性
         property.preCheck();
         S3Client client = new S3Client(property);
diff --git a/src/main/java/com/opcooc/storage/provider/AbstractClientDriverProvider.java b/src/main/java/com/opcooc/storage/provider/AbstractClientDriverProvider.java
index 50df562..e23bdb2 100644
--- a/src/main/java/com/opcooc/storage/provider/AbstractClientDriverProvider.java
+++ b/src/main/java/com/opcooc/storage/provider/AbstractClientDriverProvider.java
@@ -18,7 +18,6 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.ObjectUtils;
 
 import com.opcooc.storage.drivers.ClientDriver;
@@ -33,16 +32,13 @@
  */
 public abstract class AbstractClientDriverProvider implements ClientDriverProvider {
 
-    @Autowired
-    private ClientDriverHolder clientDriverHolder;
-
     protected Map<String, ClientDriver> createClientDriverMap(Map<String, ClientDriverProperty> clientDriverMap) {
 
         Map<String, ClientDriver> map = new HashMap<>(clientDriverMap.size() * 2);
         for (Map.Entry<String, ClientDriverProperty> item : clientDriverMap.entrySet()) {
             ClientDriverProperty clientDriverProperty = item.getValue();
             String driverName = clientDriverProperty.getDriver();
-            ClientDriver driver = clientDriverHolder.getClientDriver(clientDriverProperty);
+            ClientDriver driver = ClientDriverHolder.getClientDriver(clientDriverProperty);
             if (ObjectUtils.isEmpty(driverName)) {
                 driverName = item.getKey();
             }
diff --git a/src/main/java/com/opcooc/storage/spring/boot/autoconfigure/DynamicStorageAutoConfiguration.java b/src/main/java/com/opcooc/storage/spring/boot/autoconfigure/DynamicStorageAutoConfiguration.java
index 0939750..2fd230b 100644
--- a/src/main/java/com/opcooc/storage/spring/boot/autoconfigure/DynamicStorageAutoConfiguration.java
+++ b/src/main/java/com/opcooc/storage/spring/boot/autoconfigure/DynamicStorageAutoConfiguration.java
@@ -31,7 +31,6 @@
 import com.opcooc.storage.aop.DynamicClientAnnotationInterceptor;
 import com.opcooc.storage.drivers.ClientDriver;
 import com.opcooc.storage.drivers.DynamicRoutingClientDriver;
-import com.opcooc.storage.holder.ClientDriverHolder;
 import com.opcooc.storage.processor.OsHeaderProcessor;
 import com.opcooc.storage.processor.OsProcessor;
 import com.opcooc.storage.processor.OsSessionProcessor;
@@ -41,7 +40,6 @@
 import com.opcooc.storage.support.ObjectConverter;
 
 import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
 
 /**
  * 自动IOC注入类
@@ -63,12 +61,6 @@ public YmlClientDriverProvider ymlClientDriverProvider() {
         return new YmlClientDriverProvider(properties.getDriver());
     }
 
-    @Bean
-    @ConditionalOnMissingBean
-    public ClientDriverHolder clientDriverHolder() {
-        return new ClientDriverHolder();
-    }
-
     @Bean
     @ConditionalOnMissingBean
     public ClientDriver clientDriver() {