From b0011bf328d4f3037419b0e1cde08ca1d469b51d Mon Sep 17 00:00:00 2001 From: flystar32 Date: Wed, 26 Sep 2018 10:52:47 +0800 Subject: [PATCH] rename alibaba storage to alicloud storage --- Roadmap-zh.md | 2 +- pom.xml | 4 +++- spring-cloud-alibaba-dependencies/pom.xml | 4 ++-- .../storage-example/pom.xml | 4 ++-- .../storage-example/readme-zh.md | 4 ++-- .../storage-example/readme.md | 4 ++-- .../alibaba/nacos/NacosDiscoveryClient.java | 6 ++++-- .../pom.xml | 4 ++-- .../alibaba/storage/OSSApplicationListener.java | 0 .../alibaba/storage/OSSAutoConfiguration.java | 0 .../cloud/alibaba/storage/OSSConstants.java | 0 .../cloud/alibaba/storage/OSSProperties.java | 0 .../alibaba/storage/endpoint/OSSEndpoint.java | 0 .../endpoint/OSSEndpointAutoConfiguration.java | 0 .../resource/OSSStorageProtocolResolver.java | 0 .../storage/resource/OSSStorageResource.java | 0 .../src/main/resources/META-INF/spring.factories | 0 .../storage/test/OSSAutoConfigurationTests.java | 0 .../OSSMultiClientAutoConfigurationTests.java | 0 spring-cloud-starter-alibaba/pom.xml | 1 - spring-cloud-starter-alicloud/pom.xml | 16 ++++++++++++++++ .../pom.xml | 8 ++++---- 22 files changed, 38 insertions(+), 19 deletions(-) rename {spring-cloud-alibaba-storage => spring-cloud-alicloud-storage}/pom.xml (94%) rename {spring-cloud-alibaba-storage => spring-cloud-alicloud-storage}/src/main/java/org/springframework/cloud/alibaba/storage/OSSApplicationListener.java (100%) rename {spring-cloud-alibaba-storage => spring-cloud-alicloud-storage}/src/main/java/org/springframework/cloud/alibaba/storage/OSSAutoConfiguration.java (100%) rename {spring-cloud-alibaba-storage => spring-cloud-alicloud-storage}/src/main/java/org/springframework/cloud/alibaba/storage/OSSConstants.java (100%) rename {spring-cloud-alibaba-storage => spring-cloud-alicloud-storage}/src/main/java/org/springframework/cloud/alibaba/storage/OSSProperties.java (100%) rename {spring-cloud-alibaba-storage => spring-cloud-alicloud-storage}/src/main/java/org/springframework/cloud/alibaba/storage/endpoint/OSSEndpoint.java (100%) rename {spring-cloud-alibaba-storage => spring-cloud-alicloud-storage}/src/main/java/org/springframework/cloud/alibaba/storage/endpoint/OSSEndpointAutoConfiguration.java (100%) rename {spring-cloud-alibaba-storage => spring-cloud-alicloud-storage}/src/main/java/org/springframework/cloud/alibaba/storage/resource/OSSStorageProtocolResolver.java (100%) rename {spring-cloud-alibaba-storage => spring-cloud-alicloud-storage}/src/main/java/org/springframework/cloud/alibaba/storage/resource/OSSStorageResource.java (100%) rename {spring-cloud-alibaba-storage => spring-cloud-alicloud-storage}/src/main/resources/META-INF/spring.factories (100%) rename {spring-cloud-alibaba-storage => spring-cloud-alicloud-storage}/src/test/java/org/springframework/cloud/alibaba/storage/test/OSSAutoConfigurationTests.java (100%) rename {spring-cloud-alibaba-storage => spring-cloud-alicloud-storage}/src/test/java/org/springframework/cloud/alibaba/storage/test/OSSMultiClientAutoConfigurationTests.java (100%) create mode 100644 spring-cloud-starter-alicloud/pom.xml rename {spring-cloud-starter-alibaba/spring-cloud-starter-alibaba-storage => spring-cloud-starter-alicloud/spring-cloud-starter-alicloud-storage}/pom.xml (72%) diff --git a/Roadmap-zh.md b/Roadmap-zh.md index 53ac35f2..2fc24448 100644 --- a/Roadmap-zh.md +++ b/Roadmap-zh.md @@ -15,7 +15,7 @@ Spring Cloud Alibaba 致力于提供分布式应用服务开发的一站式解 **Nacos** 阿里巴巴开源产品，一个更易于构建云原生应用的动态服务发现、配置管理和服务管理平台。 -**Aliyun OSS** +**AliCloud OSS** 阿里云对象存储服务（Object Storage Service，简称 OSS），是阿里云提供的海量、安全、低成本、高可靠的云存储服务。您可以在任何应用、任何时间、任何地点存储和访问任意类型的数据。 ## 即将加入的组件 diff --git a/pom.xml b/pom.xml index b5e447e0..f0f49e1d 100644 --- a/pom.xml +++ b/pom.xml @@ -74,12 +74,14 @@ spring-cloud-alibaba-dependencies spring-cloud-alibaba-sentinel - spring-cloud-alibaba-storage + spring-cloud-alibaba-nacos-config spring-cloud-alibaba-nacos-discovery spring-cloud-alibaba-examples spring-cloud-alibaba-test spring-cloud-starter-alibaba + spring-cloud-starter-alicloud + spring-cloud-alicloud-storage diff --git a/spring-cloud-alibaba-dependencies/pom.xml b/spring-cloud-alibaba-dependencies/pom.xml index 0610dbe0..3f32646a 100644 --- a/spring-cloud-alibaba-dependencies/pom.xml +++ b/spring-cloud-alibaba-dependencies/pom.xml @@ -97,7 +97,7 @@ org.springframework.cloud - spring-cloud-alibaba-storage + spring-cloud-alicloud-storage ${project.version} @@ -119,7 +119,7 @@ org.springframework.cloud - spring-cloud-starter-alibaba-storage + spring-cloud-starter-alicloud-storage ${project.version} diff --git a/spring-cloud-alibaba-examples/storage-example/pom.xml b/spring-cloud-alibaba-examples/storage-example/pom.xml index 98065cf4..c42de657 100644 --- a/spring-cloud-alibaba-examples/storage-example/pom.xml +++ b/spring-cloud-alibaba-examples/storage-example/pom.xml @@ -12,7 +12,7 @@ storage-example jar - Example demonstrating how to use storage + Example demonstrating how to use alicloud storage @@ -22,7 +22,7 @@ org.springframework.cloud - spring-cloud-starter-alibaba-storage + spring-cloud-starter-alicloud-storage diff --git a/spring-cloud-alibaba-examples/storage-example/readme-zh.md b/spring-cloud-alibaba-examples/storage-example/readme-zh.md index 40652e79..e287c761 100644 --- a/spring-cloud-alibaba-examples/storage-example/readme-zh.md +++ b/spring-cloud-alibaba-examples/storage-example/readme-zh.md @@ -13,11 +13,11 @@ **注意：本节只是为了便于您理解接入方式，本示例代码中已经完成接入工作，您只需修改 accessKeyId、secretAccessKey、region 即可。** -1. 修改 pom.xml 文件，引入 alibaba-storage starter。 +1. 修改 pom.xml 文件，引入 alicloud-storage starter。 org.springframework.cloud - spring-cloud-starter-alibaba-storage + spring-cloud-starter-alicloud-storage 2. 在配置文件中配置 OSS 服务对应的 accessKeyId、secretAccessKey 和 region。 diff --git a/spring-cloud-alibaba-examples/storage-example/readme.md b/spring-cloud-alibaba-examples/storage-example/readme.md index 45fa51b9..394ad207 100644 --- a/spring-cloud-alibaba-examples/storage-example/readme.md +++ b/spring-cloud-alibaba-examples/storage-example/readme.md @@ -13,11 +13,11 @@ If your applications are Spring Cloud applications and you need to use Alibaba C Before we start the demo, let's learn how to connect OSS to a Spring Cloud application. **Note: This section is to show you how to connect to oss. The actual configurations have been completed in the following example, and you only need to specify your accessKeyId, secretAccessKey and region.** -1. Add dependency spring-cloud-starter-alibaba-storage in the pom.xml file in your Spring Cloud project. +1. Add dependency spring-cloud-starter-alicloud-storage in the pom.xml file in your Spring Cloud project. org.springframework.cloud - spring-cloud-starter-alibaba-storage + spring-cloud-starter-alicloud-storage 2. Configure accessKeyId, secretAccessKey and region in application.properties. diff --git a/spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/NacosDiscoveryClient.java b/spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/NacosDiscoveryClient.java index 5706a4fc..d32a6b0d 100644 --- a/spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/NacosDiscoveryClient.java +++ b/spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/NacosDiscoveryClient.java @@ -50,7 +50,7 @@ public class NacosDiscoveryClient implements DiscoveryClient { public List getInstances(String serviceId) { try { NamingService namingService = nacosRegistration.getNacosNamingService(); - List instances = namingService.selectInstances(serviceId, true); + List instances = namingService.getAllInstances(serviceId); return hostToServiceInstanceList(instances, serviceId); } catch (Exception e) { @@ -79,7 +79,9 @@ public class NacosDiscoveryClient implements DiscoveryClient { List instances, String serviceId) { List result = new ArrayList(instances.size()); for (Instance instance : instances) { - result.add(hostToServiceInstance(instance, serviceId)); + if(instance.isHealthy()) { + result.add(hostToServiceInstance(instance, serviceId)); + } } return result; } diff --git a/spring-cloud-alibaba-storage/pom.xml b/spring-cloud-alicloud-storage/pom.xml similarity index 94% rename from spring-cloud-alibaba-storage/pom.xml rename to spring-cloud-alicloud-storage/pom.xml index 29bb54ae..8a7ede08 100644 --- a/spring-cloud-alibaba-storage/pom.xml +++ b/spring-cloud-alicloud-storage/pom.xml @@ -10,8 +10,8 @@ 4.0.0 org.springframework.cloud - spring-cloud-alibaba-storage - Spring Cloud Alibaba Storage Autoconfigure + spring-cloud-alicloud-storage + Spring Cloud Alibaba Cloud Storage diff --git a/spring-cloud-alibaba-storage/src/main/java/org/springframework/cloud/alibaba/storage/OSSApplicationListener.java b/spring-cloud-alicloud-storage/src/main/java/org/springframework/cloud/alibaba/storage/OSSApplicationListener.java similarity index 100% rename from spring-cloud-alibaba-storage/src/main/java/org/springframework/cloud/alibaba/storage/OSSApplicationListener.java rename to spring-cloud-alicloud-storage/src/main/java/org/springframework/cloud/alibaba/storage/OSSApplicationListener.java diff --git a/spring-cloud-alibaba-storage/src/main/java/org/springframework/cloud/alibaba/storage/OSSAutoConfiguration.java b/spring-cloud-alicloud-storage/src/main/java/org/springframework/cloud/alibaba/storage/OSSAutoConfiguration.java similarity index 100% rename from spring-cloud-alibaba-storage/src/main/java/org/springframework/cloud/alibaba/storage/OSSAutoConfiguration.java rename to spring-cloud-alicloud-storage/src/main/java/org/springframework/cloud/alibaba/storage/OSSAutoConfiguration.java diff --git a/spring-cloud-alibaba-storage/src/main/java/org/springframework/cloud/alibaba/storage/OSSConstants.java b/spring-cloud-alicloud-storage/src/main/java/org/springframework/cloud/alibaba/storage/OSSConstants.java similarity index 100% rename from spring-cloud-alibaba-storage/src/main/java/org/springframework/cloud/alibaba/storage/OSSConstants.java rename to spring-cloud-alicloud-storage/src/main/java/org/springframework/cloud/alibaba/storage/OSSConstants.java diff --git a/spring-cloud-alibaba-storage/src/main/java/org/springframework/cloud/alibaba/storage/OSSProperties.java b/spring-cloud-alicloud-storage/src/main/java/org/springframework/cloud/alibaba/storage/OSSProperties.java similarity index 100% rename from spring-cloud-alibaba-storage/src/main/java/org/springframework/cloud/alibaba/storage/OSSProperties.java rename to spring-cloud-alicloud-storage/src/main/java/org/springframework/cloud/alibaba/storage/OSSProperties.java diff --git a/spring-cloud-alibaba-storage/src/main/java/org/springframework/cloud/alibaba/storage/endpoint/OSSEndpoint.java b/spring-cloud-alicloud-storage/src/main/java/org/springframework/cloud/alibaba/storage/endpoint/OSSEndpoint.java similarity index 100% rename from spring-cloud-alibaba-storage/src/main/java/org/springframework/cloud/alibaba/storage/endpoint/OSSEndpoint.java rename to spring-cloud-alicloud-storage/src/main/java/org/springframework/cloud/alibaba/storage/endpoint/OSSEndpoint.java diff --git a/spring-cloud-alibaba-storage/src/main/java/org/springframework/cloud/alibaba/storage/endpoint/OSSEndpointAutoConfiguration.java b/spring-cloud-alicloud-storage/src/main/java/org/springframework/cloud/alibaba/storage/endpoint/OSSEndpointAutoConfiguration.java similarity index 100% rename from spring-cloud-alibaba-storage/src/main/java/org/springframework/cloud/alibaba/storage/endpoint/OSSEndpointAutoConfiguration.java rename to spring-cloud-alicloud-storage/src/main/java/org/springframework/cloud/alibaba/storage/endpoint/OSSEndpointAutoConfiguration.java diff --git a/spring-cloud-alibaba-storage/src/main/java/org/springframework/cloud/alibaba/storage/resource/OSSStorageProtocolResolver.java b/spring-cloud-alicloud-storage/src/main/java/org/springframework/cloud/alibaba/storage/resource/OSSStorageProtocolResolver.java similarity index 100% rename from spring-cloud-alibaba-storage/src/main/java/org/springframework/cloud/alibaba/storage/resource/OSSStorageProtocolResolver.java rename to spring-cloud-alicloud-storage/src/main/java/org/springframework/cloud/alibaba/storage/resource/OSSStorageProtocolResolver.java diff --git a/spring-cloud-alibaba-storage/src/main/java/org/springframework/cloud/alibaba/storage/resource/OSSStorageResource.java b/spring-cloud-alicloud-storage/src/main/java/org/springframework/cloud/alibaba/storage/resource/OSSStorageResource.java similarity index 100% rename from spring-cloud-alibaba-storage/src/main/java/org/springframework/cloud/alibaba/storage/resource/OSSStorageResource.java rename to spring-cloud-alicloud-storage/src/main/java/org/springframework/cloud/alibaba/storage/resource/OSSStorageResource.java diff --git a/spring-cloud-alibaba-storage/src/main/resources/META-INF/spring.factories b/spring-cloud-alicloud-storage/src/main/resources/META-INF/spring.factories similarity index 100% rename from spring-cloud-alibaba-storage/src/main/resources/META-INF/spring.factories rename to spring-cloud-alicloud-storage/src/main/resources/META-INF/spring.factories diff --git a/spring-cloud-alibaba-storage/src/test/java/org/springframework/cloud/alibaba/storage/test/OSSAutoConfigurationTests.java b/spring-cloud-alicloud-storage/src/test/java/org/springframework/cloud/alibaba/storage/test/OSSAutoConfigurationTests.java similarity index 100% rename from spring-cloud-alibaba-storage/src/test/java/org/springframework/cloud/alibaba/storage/test/OSSAutoConfigurationTests.java rename to spring-cloud-alicloud-storage/src/test/java/org/springframework/cloud/alibaba/storage/test/OSSAutoConfigurationTests.java diff --git a/spring-cloud-alibaba-storage/src/test/java/org/springframework/cloud/alibaba/storage/test/OSSMultiClientAutoConfigurationTests.java b/spring-cloud-alicloud-storage/src/test/java/org/springframework/cloud/alibaba/storage/test/OSSMultiClientAutoConfigurationTests.java similarity index 100% rename from spring-cloud-alibaba-storage/src/test/java/org/springframework/cloud/alibaba/storage/test/OSSMultiClientAutoConfigurationTests.java rename to spring-cloud-alicloud-storage/src/test/java/org/springframework/cloud/alibaba/storage/test/OSSMultiClientAutoConfigurationTests.java diff --git a/spring-cloud-starter-alibaba/pom.xml b/spring-cloud-starter-alibaba/pom.xml index a5d8e35f..877646ae 100644 --- a/spring-cloud-starter-alibaba/pom.xml +++ b/spring-cloud-starter-alibaba/pom.xml @@ -14,6 +14,5 @@ spring-cloud-starter-alibaba-nacos-config spring-cloud-starter-alibaba-nacos-discovery spring-cloud-starter-alibaba-sentinel - spring-cloud-starter-alibaba-storage \ No newline at end of file diff --git a/spring-cloud-starter-alicloud/pom.xml b/spring-cloud-starter-alicloud/pom.xml new file mode 100644 index 00000000..49968741 --- /dev/null +++ b/spring-cloud-starter-alicloud/pom.xml @@ -0,0 +1,16 @@ + + 4.0.0 + + org.springframework.cloud + spring-cloud-alibaba + 0.2.0.BUILD-SNAPSHOT + + spring-cloud-starter-alicloud + pom + Spring Cloud Alibaba Cloud Starters + Spring Cloud Alibaba Cloud Starters + + spring-cloud-starter-alicloud-storage + + \ No newline at end of file diff --git a/spring-cloud-starter-alibaba/spring-cloud-starter-alibaba-storage/pom.xml b/spring-cloud-starter-alicloud/spring-cloud-starter-alicloud-storage/pom.xml similarity index 72% rename from spring-cloud-starter-alibaba/spring-cloud-starter-alibaba-storage/pom.xml rename to spring-cloud-starter-alicloud/spring-cloud-starter-alicloud-storage/pom.xml index bea93264..6e7a3178 100644 --- a/spring-cloud-starter-alibaba/spring-cloud-starter-alibaba-storage/pom.xml +++ b/spring-cloud-starter-alicloud/spring-cloud-starter-alicloud-storage/pom.xml @@ -4,16 +4,16 @@ org.springframework.cloud - spring-cloud-starter-alibaba + spring-cloud-starter-alicloud 0.2.0.BUILD-SNAPSHOT - spring-cloud-starter-alibaba-storage - Spring Cloud Starter Alibaba Storage + spring-cloud-starter-alicloud-storage + Spring Cloud Starter Alibaba Cloud Storage org.springframework.cloud - spring-cloud-alibaba-storage + spring-cloud-alicloud-storage com.aliyun.oss