From 3e099977cdc2eaaa249c85b9ec6b8662192d399c Mon Sep 17 00:00:00 2001
From: Ocean <2232761016@qq.com>
Date: Wed, 27 Jul 2022 18:52:44 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-76271=2010.0=E7=89=88=E6=9C=AC=E7=9A=84S?=
 =?UTF-8?q?3=E8=B5=84=E6=BA=90=E4=BB=93=E5=BA=93=E6=8F=92=E4=BB=B6?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8Dhttp=E6=97=A0=E6=B3=95=E8=BF=9E=E6=8E=A5?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin.xml                                                | 3 ++-
 .../fs/s3/repository/core/S3ResourceRepository.java       | 8 ++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/plugin.xml b/plugin.xml
index dc2e95a..9e2e0bc 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -5,12 +5,13 @@
     <main-package>com.fanruan.fs</main-package>
     <active>yes</active>
     <hidden>no</hidden>
-    <version>1.3.2</version>
+    <version>1.3.3</version>
     <env-version>10.0~10.0</env-version>
     <jartime>2021-03-11</jartime>
     <vendor>richie</vendor>
     <description><![CDATA[使用支持S3协议的云存储文件系统作为文件服务器。]]></description>
     <change-notes><![CDATA[
+        [2022-07-25]修复http无法连接，而https和缺省的时候正常<br/>
         [2022-06-30]新增enablePathStyleAccess、signerOverride后台配置<br/>
         [2022-06-14]第三方组件升级。 <br/>
         [2022-03-10]第三方组件升级。 <br/>
diff --git a/src/main/java/com/fanruan/fs/s3/repository/core/S3ResourceRepository.java b/src/main/java/com/fanruan/fs/s3/repository/core/S3ResourceRepository.java
index 0864028..a99b34a 100644
--- a/src/main/java/com/fanruan/fs/s3/repository/core/S3ResourceRepository.java
+++ b/src/main/java/com/fanruan/fs/s3/repository/core/S3ResourceRepository.java
@@ -47,16 +47,16 @@ public class S3ResourceRepository extends BaseResourceRepository {
         BasicAWSCredentials credentials = new BasicAWSCredentials(config.getAccessKeyId(), config.getPassword());
         AmazonS3ClientBuilder amazonS3ClientBuilder = AmazonS3ClientBuilder.standard()
                 .withEndpointConfiguration(new AwsClientBuilder.EndpointConfiguration(config.getEndPoint(), config.getRegion()))
-                .withCredentials(new AWSStaticCredentialsProvider(credentials));
+                .withCredentials(new AWSStaticCredentialsProvider(credentials)).disableChunkedEncoding();
         if (config.isEnablePathStyleAccess()) {
             amazonS3ClientBuilder = amazonS3ClientBuilder.enablePathStyleAccess();
         }
+        ClientConfiguration clientConfiguration = new ClientConfiguration();
         if (StringUtils.isNotEmpty(config.getSignerOverride())) {
-            ClientConfiguration clientConfiguration = new ClientConfiguration();
             clientConfiguration.setSignerOverride(config.getSignerOverride());
-            clientConfiguration.setProtocol(Protocol.HTTP);
-            amazonS3ClientBuilder = amazonS3ClientBuilder.withClientConfiguration(clientConfiguration);
         }
+        clientConfiguration.setProtocol(Protocol.HTTP);
+        amazonS3ClientBuilder = amazonS3ClientBuilder.withClientConfiguration(clientConfiguration);
         this.s3 = amazonS3ClientBuilder.build();
         this.bucket = config.getBucket();
     }