xudawei 19e232fccb Merge branch 'master' into feature/down_update_add_expire_seconds ... # Conflicts: # oss-client/src/main/java/cn/axzo/oss/client/controller/ServerFileController.java # oss-client/src/main/java/cn/axzo/oss/client/controller/WebFileController.java # oss-http-api/src/main/java/cn/axzo/oss/http/api/ServerFileServiceApi.java # oss-integration/src/main/java/cn/axzo/oss/integration/s3/HuaWeiCloudService.java # oss-integration/src/main/java/cn/axzo/oss/integration/s3/impl/HuaWeiCloudServiceImpl.java # oss-manager-api/src/main/java/cn/axzo/oss/manager/api/FileManager.java # oss-manager/src/main/java/cn/axzo/oss/manager/impl/FileManagerImpl.java # oss-service-api/src/main/java/cn/axzo/oss/service/api/FileService.java # oss-service/src/main/java/cn/axzo/oss/service/impl/FileServiceImpl.java		2024-04-07 11:42:58 +08:00
..
src/main/java/cn/axzo/oss/integration	Merge branch 'master' into feature/down_update_add_expire_seconds	2024-04-07 11:42:58 +08:00
pom.xml	add(req-2080):上传文件到华为云--代码整合	2024-01-15 15:02:03 +08:00