1
0
mirror of https://gitee.com/mirrors/Spring-Cloud-Alibaba.git synced 2021-06-26 13:25:11 +08:00

fix NacosDiscoveryClienet getInstance method, only healthy instancerename alibaba storage to alicloud storage

This commit is contained in:
flystar32 2018-09-26 11:07:39 +08:00
parent bfa8f24cc8
commit 2b953bae69
20 changed files with 36 additions and 29 deletions

View File

@ -73,12 +73,14 @@
<modules> <modules>
<module>spring-cloud-alibaba-dependencies</module> <module>spring-cloud-alibaba-dependencies</module>
<module>spring-cloud-alibaba-sentinel</module> <module>spring-cloud-alibaba-sentinel</module>
<module>spring-cloud-alibaba-storage</module>
<module>spring-cloud-alibaba-nacos-config</module> <module>spring-cloud-alibaba-nacos-config</module>
<module>spring-cloud-alibaba-nacos-discovery</module> <module>spring-cloud-alibaba-nacos-discovery</module>
<module>spring-cloud-alibaba-examples</module> <module>spring-cloud-alibaba-examples</module>
<module>spring-cloud-alibaba-test</module> <module>spring-cloud-alibaba-test</module>
<module>spring-cloud-starter-alibaba</module> <module>spring-cloud-starter-alibaba</module>
<module>spring-cloud-starter-alicloud</module>
<module>spring-cloud-alicloud-storage</module>
</modules> </modules>
<dependencyManagement> <dependencyManagement>

View File

@ -98,7 +98,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-alibaba-storage</artifactId> <artifactId>spring-cloud-alicloud-storage</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
@ -120,7 +120,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-alibaba-storage</artifactId> <artifactId>spring-cloud-starter-alicloud-storage</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>

View File

@ -12,7 +12,7 @@
<artifactId>storage-example</artifactId> <artifactId>storage-example</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<description>Example demonstrating how to use storage</description> <description>Example demonstrating how to use alibab cloud storage</description>
<dependencies> <dependencies>
@ -22,7 +22,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-alibaba-storage</artifactId> <artifactId>spring-cloud-starter-alicloud-storage</artifactId>
</dependency> </dependency>
<dependency> <dependency>

View File

@ -17,7 +17,7 @@
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-alibaba-storage</artifactId> <artifactId>spring-cloud-starter-alicloud-storage</artifactId>
</dependency> </dependency>
2. 在配置文件中配置 OSS 服务对应的 accessKeyId、secretAccessKey 和 region。 2. 在配置文件中配置 OSS 服务对应的 accessKeyId、secretAccessKey 和 region。

View File

@ -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. 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.** **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.
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-alibaba-storage</artifactId> <artifactId>spring-cloud-starter-alicloud-storage</artifactId>
</dependency> </dependency>
2. Configure accessKeyId, secretAccessKey and region in application.properties. 2. Configure accessKeyId, secretAccessKey and region in application.properties.

View File

@ -10,8 +10,8 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-alibaba-storage</artifactId> <artifactId>spring-cloud-alicloud-storage</artifactId>
<name>Spring Cloud Alibaba Storage Autoconfigure</name> <name>Spring Cloud Alibaba Cloud Storage Autoconfigure</name>
<dependencies> <dependencies>

View File

@ -17,21 +17,6 @@
<module>spring-cloud-starter-alibaba-nacos-config</module> <module>spring-cloud-starter-alibaba-nacos-config</module>
<module>spring-cloud-starter-alibaba-nacos-discovery</module> <module>spring-cloud-starter-alibaba-nacos-discovery</module>
<module>spring-cloud-starter-alibaba-sentinel</module> <module>spring-cloud-starter-alibaba-sentinel</module>
<module>spring-cloud-starter-alibaba-storage</module>
</modules> </modules>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<version>${maven-deploy-plugin.version}</version>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
</plugins>
</build>
</project> </project>

View File

@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-alibaba</artifactId>
<version>0.1.0.BUILD-SNAPSHOT</version>
</parent>
<artifactId>spring-cloud-starter-alicloud</artifactId>
<packaging>pom</packaging>
<name>Spring Cloud Alibaba Cloud Starters</name>
<description>Spring Cloud Alibaba Cloud Starters</description>
<modules>
<module>spring-cloud-starter-alicloud-storage</module>
</modules>
</project>

View File

@ -4,16 +4,16 @@
<parent> <parent>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-alibaba</artifactId> <artifactId>spring-cloud-starter-alicloud</artifactId>
<version>0.1.0.BUILD-SNAPSHOT</version> <version>0.1.0.BUILD-SNAPSHOT</version>
</parent> </parent>
<artifactId>spring-cloud-starter-alibaba-storage</artifactId> <artifactId>spring-cloud-starter-alicloud-storage</artifactId>
<name>Spring Cloud Starter Alibaba Storage</name> <name>Spring Cloud Starter Alibaba Cloud Storage</name>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-alibaba-storage</artifactId> <artifactId>spring-cloud-alicloud-storage</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.aliyun.oss</groupId> <groupId>com.aliyun.oss</groupId>