Merge pull request #104 from 1171736840/dev

Release 1.0.2
dromara · Aug 9, 2023 · 44d7192 · 44d7192
2 parents 9a7d054 + eabe3e8
commit 44d7192
Show file tree

Hide file tree

Showing 11 changed files with 20 additions and 10 deletions.
diff --git a/README.md b/README.md
@@ -32,6 +32,8 @@ Amazon S3、GoogleCloud Storage、金山云 KS3、美团云 MSS、京东云 OSS
 
 后续即将支持 Samba、NFS
 
+`1.0.2` 修复了华为云 OBS 未加载的问题，查看 [更新记录](https://spring-file-storage.xuyanwu.cn/#/更新记录?id=102)
+<br />
 `1.0.1` 修复了 MultipartFile 无法正确获取文件名等问题，查看 [更新记录](https://spring-file-storage.xuyanwu.cn/#/更新记录?id=101)
 <br />
 `1.0.0` 包含了大量功能更新与问题修复，例如解决了内存占用过大问题，支持大文件上传、  [脱离 SpringBoot 单独使用](https://spring-file-storage.xuyanwu.cn/#/脱离SpringBoot单独使用) 等，AmazonS3 和 GoogleCloudStorage 存储平台配置名称与之前版本不兼容，查看 [更新记录](https://spring-file-storage.xuyanwu.cn/#/更新记录?id=100)

diff --git a/docs/README.md b/docs/README.md
@@ -32,6 +32,8 @@ Amazon S3、GoogleCloud Storage、金山云 KS3、美团云 MSS、京东云 OSS
 
 后续即将支持 Samba、NFS
 
+`1.0.2` 修复了华为云 OBS 未加载的问题，查看 [更新记录](更新记录?id=102)
+<br />
 `1.0.1` 修复了 MultipartFile 无法正确获取文件名等问题，查看 [更新记录](更新记录?id=101)
 <br />
 `1.0.0` 包含了大量功能更新与问题修复，例如解决了内存占用过大问题，支持大文件上传、 [脱离 SpringBoot 单独使用](脱离SpringBoot单独使用) 等，AmazonS3 和 GoogleCloudStorage 存储平台配置名称与之前版本不兼容，查看 [更新记录](更新记录?id=100)

diff --git a/docs/_navbar.md b/docs/_navbar.md
@@ -1,4 +1,5 @@
-* 文档版本 1.0.1
+* 文档版本 1.0.2
+  * [1.0.2](https://spring-file-storage.xuyanwu.cn/1.0.2/)
   * [1.0.1](https://spring-file-storage.xuyanwu.cn/1.0.1/)
   * [1.0.0](https://spring-file-storage.xuyanwu.cn/1.0.0/)
   * [0.7.0](https://spring-file-storage.xuyanwu.cn/0.7.0/)

diff --git a/docs/快速入门.md b/docs/快速入门.md
@@ -8,7 +8,7 @@
 <dependency>
     <groupId>cn.xuyanwu</groupId>
     <artifactId>spring-file-storage</artifactId>
-    <version>1.0.1</version>
+    <version>1.0.2</version>
 </dependency>
 ```  
 

diff --git a/docs/更新记录.md b/docs/更新记录.md
@@ -1,5 +1,9 @@
 # 更新记录
 
+## 1.0.2
+2023-08-08
+- 修复了华为云 OBS 未加载的问题
+
 ## 1.0.1
 2023-08-08
 - 修复了 MultipartFileWrapperAdapter 无法正确获取文件名的问题

diff --git a/docs/脱离SpringBoot单独使用.md b/docs/脱离SpringBoot单独使用.md
@@ -8,7 +8,7 @@
 <dependency>
     <groupId>cn.xuyanwu</groupId>
     <artifactId>file-storage-core</artifactId>
-    <version>1.0.1</version>
+    <version>1.0.2</version>
 </dependency>
 ```
 

diff --git a/file-storage-core/pom.xml b/file-storage-core/pom.xml
@@ -5,12 +5,12 @@
     <parent>
         <artifactId>spring-file-storage-parent</artifactId>
         <groupId>cn.xuyanwu</groupId>
-        <version>1.0.1</version>
+        <version>1.0.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>file-storage-core</artifactId>
-    <version>1.0.1</version>
+    <version>1.0.2</version>
 
     <properties>
         <maven.compiler.source>8</maven.compiler.source>

diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
     <groupId>cn.xuyanwu</groupId>
     <artifactId>spring-file-storage-parent</artifactId>
     <packaging>pom</packaging>
-    <version>1.0.1</version>
+    <version>1.0.2</version>
 
     <name>spring-file-storage-parent</name>
     <description>A File Storage Service</description>
@@ -63,7 +63,7 @@
             <dependency>
                 <groupId>cn.xuyanwu</groupId>
                 <artifactId>file-storage-core</artifactId>
-                <version>1.0.1</version>
+                <version>1.0.2</version>
             </dependency>
             <!-- Apache commons-pool2 -->
             <dependency>

diff --git a/spring-file-storage-test/pom.xml b/spring-file-storage-test/pom.xml
@@ -12,7 +12,7 @@
 
     <groupId>cn.xuyanwu</groupId>
     <artifactId>spring-file-storage-test</artifactId>
-    <version>1.0.1</version>
+    <version>1.0.2</version>
     <name>spring-file-storage-test</name>
     <description>spring-file-storage 的测试和演示模块</description>
 
@@ -145,7 +145,7 @@
         <dependency>
             <groupId>cn.xuyanwu</groupId>
             <artifactId>spring-file-storage</artifactId>
-            <version>1.0.1</version>
+            <version>1.0.2</version>
         </dependency>
 
         <dependency>

diff --git a/spring-file-storage/pom.xml b/spring-file-storage/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>spring-file-storage-parent</artifactId>
         <groupId>cn.xuyanwu</groupId>
-        <version>1.0.1</version>
+        <version>1.0.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/...rage/src/main/java/cn/xuyanwu/spring/file/storage/spring/SpringFileStorageProperties.java b/...rage/src/main/java/cn/xuyanwu/spring/file/storage/spring/SpringFileStorageProperties.java
@@ -118,6 +118,7 @@ public FileStorageProperties toFileStorageProperties() {
         properties.setThumbnailSuffix(thumbnailSuffix);
         properties.setLocal(local.stream().filter(SpringLocalConfig::getEnableStorage).collect(Collectors.toList()));
         properties.setLocalPlus(localPlus.stream().filter(SpringLocalPlusConfig::getEnableStorage).collect(Collectors.toList()));
+        properties.setHuaweiObs(huaweiObs.stream().filter(SpringHuaweiObsConfig::getEnableStorage).collect(Collectors.toList()));
         properties.setAliyunOss(aliyunOss.stream().filter(SpringAliyunOssConfig::getEnableStorage).collect(Collectors.toList()));
         properties.setQiniuKodo(qiniuKodo.stream().filter(SpringQiniuKodoConfig::getEnableStorage).collect(Collectors.toList()));
         properties.setTencentCos(tencentCos.stream().filter(SpringTencentCosConfig::getEnableStorage).collect(Collectors.toList()));