" + result; - } -} diff --git a/spring-cloud-alibaba-examples/ans-example/ans-consumer-feign-example/src/main/resources/application.properties b/spring-cloud-alibaba-examples/ans-example/ans-consumer-feign-example/src/main/resources/application.properties deleted file mode 100644 index ac697b88..00000000 --- a/spring-cloud-alibaba-examples/ans-example/ans-consumer-feign-example/src/main/resources/application.properties +++ /dev/null @@ -1,5 +0,0 @@ -spring.application.name=feign-consumer -server.port=18083 -# The following configuration can be omitted. -spring.cloud.alicloud.ans.server-list=127.0.0.1 -spring.cloud.alicloud.ans.server-port=8080 \ No newline at end of file diff --git a/spring-cloud-alibaba-examples/ans-example/ans-consumer-ribbon-example/pom.xml b/spring-cloud-alibaba-examples/ans-example/ans-consumer-ribbon-example/pom.xml deleted file mode 100644 index df401da4..00000000 --- a/spring-cloud-alibaba-examples/ans-example/ans-consumer-ribbon-example/pom.xml +++ /dev/null @@ -1,28 +0,0 @@ - -
" + result; - } -} diff --git a/spring-cloud-alibaba-examples/ans-example/ans-consumer-ribbon-example/src/main/resources/application.properties b/spring-cloud-alibaba-examples/ans-example/ans-consumer-ribbon-example/src/main/resources/application.properties deleted file mode 100644 index 33a7e5aa..00000000 --- a/spring-cloud-alibaba-examples/ans-example/ans-consumer-ribbon-example/src/main/resources/application.properties +++ /dev/null @@ -1,5 +0,0 @@ -spring.application.name=ribbon-consumer -server.port=18082 -# The following configuration can be omitted. -spring.cloud.alicloud.ans.server-list=127.0.0.1 -spring.cloud.alicloud.ans.server-port=8080 \ No newline at end of file diff --git a/spring-cloud-alibaba-examples/ans-example/ans-provider-example/readme-zh.md b/spring-cloud-alibaba-examples/ans-example/ans-provider-example/readme-zh.md deleted file mode 100644 index 82b15874..00000000 --- a/spring-cloud-alibaba-examples/ans-example/ans-provider-example/readme-zh.md +++ /dev/null @@ -1,35 +0,0 @@ -# ANS Provider Example - -## 项目说明 - -本项目展示了，在Spring Cloud规范下，如何以最简单且免费的方式，发布一个服务。 - -## 示例 - -### 准备工作 - -ANS支持直接使用免费的轻量版配置中心，进行开发和调试工作。本示例也是基于轻量版配置中心的，因此我们需要首先安装和启动轻量版配置中心。 - -1. [下载轻量版配置中心](https://edas-public.oss-cn-hangzhou.aliyuncs.com/install_package/LCC/2018-11-01/edas-lite-configcenter.tar.gz?file=edas-lite-configcenter.tar.gz) - -2. 解压 edas-lite-configcenter.tar.gz ，然后执行以下命令。 - - cd edas-config-center && sh startup.sh - -出现以下内容说明轻量版配置中心启动成功。 - - Edas-config-center has been started successfully. - You can see more details in logs/config-center.log. - - -### 启动应用 - -直接运行main class，即`ProviderApplication`。 - -### 查看效果 - -进入页面 http://127.0.0.1:8080，在左侧"服务列表"页面中，可以看到一条名为`ans-provider`的服务。 - - -如果您对 Spring Cloud ANS Starter 有任何建议或想法，欢迎提交 issue 中或者通过其他社区渠道向我们反馈。 - diff --git a/spring-cloud-alibaba-examples/ans-example/ans-provider-example/src/main/java/com/alibaba/cloud/examples/EchoController.java b/spring-cloud-alibaba-examples/ans-example/ans-provider-example/src/main/java/com/alibaba/cloud/examples/EchoController.java deleted file mode 100644 index 1430df9e..00000000 --- a/spring-cloud-alibaba-examples/ans-example/ans-provider-example/src/main/java/com/alibaba/cloud/examples/EchoController.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright (C) 2018 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.alibaba.cloud.examples; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RestController; - -/** - * @author xiaolongzuo - */ -@RestController -public class EchoController { - - private static final Logger LOGGER = LoggerFactory.getLogger(EchoController.class); - - @RequestMapping(value = "/echo/{str}", method = RequestMethod.GET, produces = "application/json") - public String echo(@PathVariable String str) { - LOGGER.info("-----------收到消费者请求-----------"); - LOGGER.info("收到消费者传递的参数：" + str); - String result = "Nice to meet you, too."; - LOGGER.info("提供者返回结果：" + result); - return result; - } -} diff --git a/spring-cloud-alibaba-examples/ans-example/ans-provider-example/src/main/resources/application.properties b/spring-cloud-alibaba-examples/ans-example/ans-provider-example/src/main/resources/application.properties deleted file mode 100644 index e5f6cdef..00000000 --- a/spring-cloud-alibaba-examples/ans-example/ans-provider-example/src/main/resources/application.properties +++ /dev/null @@ -1,4 +0,0 @@ -spring.application.name=ans-provider -server.port=18081 -spring.cloud.alicloud.ans.server-list=127.0.0.1 -spring.cloud.alicloud.ans.server-port=8080 \ No newline at end of file diff --git a/spring-cloud-alibaba-examples/nacos-example/nacos-config-example/src/main/java/com/alibaba/cloud/examples/Application.java b/spring-cloud-alibaba-examples/nacos-example/nacos-config-example/src/main/java/com/alibaba/cloud/examples/Application.java index b94cf48e..ce693054 100644 --- a/spring-cloud-alibaba-examples/nacos-example/nacos-config-example/src/main/java/com/alibaba/cloud/examples/Application.java +++ b/spring-cloud-alibaba-examples/nacos-example/nacos-config-example/src/main/java/com/alibaba/cloud/examples/Application.java @@ -1,11 +1,28 @@ +/* + * Copyright 2013-2018 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package com.alibaba.cloud.examples; import java.io.IOException; import java.io.StringReader; +import java.util.Map; import java.util.Properties; import java.util.concurrent.Executor; -import com.alibaba.cloud.nacos.NacosConfigProperties; +import com.alibaba.cloud.nacos.NacosConfigManager; import com.alibaba.nacos.api.config.listener.Listener; import org.springframework.beans.factory.annotation.Autowired; @@ -14,7 +31,9 @@ import org.springframework.boot.ApplicationArguments; import org.springframework.boot.ApplicationRunner; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.cloud.context.config.annotation.RefreshScope; +import org.springframework.context.annotation.Bean; import org.springframework.stereotype.Component; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -24,9 +43,57 @@ import org.springframework.web.bind.annotation.RestController; */ @SpringBootApplication public class Application { + public static void main(String[] args) { SpringApplication.run(Application.class, args); } + + @Bean + public UserConfig userConfig() { + return new UserConfig(); + } + +} + +@ConfigurationProperties(prefix = "user") +class UserConfig { + + private int age; + + private String name; + + private Map
以 Resource 的形式读取文件
- -OSS Starter 支持以 Resource 的形式得到文件对象。如果只需读取少量文件，您可以使用这种方式。 - -**使用方法：** - -只需配置 OSS 协议对应的 Resource 即可： - - @Value("oss://spring-cloud-alibaba/oss-test") - private Resource file; - - // 文件内容的读取 - StreamUtils.copyToString(file.getInputStream(), Charset.forName(CharEncoding.UTF_8)) - -## 关闭 OSSClient 服务 -如果您不再需要 OSS 服务，您也无需手动关闭 OSSClient。在 ApplicationContext close 的时候，OSS Starter 会在 `OSSApplicationListener` 中调用所有 OSSClient 的 shutdown 方法。 - - -如果您对 Spring Cloud OSS Starter 有任何建议或想法，欢迎提交 issue 中或者通过其他社区渠道向我们反馈。 - diff --git a/spring-cloud-alibaba-examples/oss-example/readme.md b/spring-cloud-alibaba-examples/oss-example/readme.md deleted file mode 100644 index 76e7f899..00000000 --- a/spring-cloud-alibaba-examples/oss-example/readme.md +++ /dev/null @@ -1,150 +0,0 @@ -# OSS Example -## Introduction - -If your applications are Spring Cloud applications and you need to use Alibaba Cloud's OSS service for file storage (for example, storing commodity image for your e-commerce business), you can use OSS starter. This topic provides an example to illustrate how to use OSS starter to implement object storage for Spring Cloud applications. - -[Alibaba Cloud Object Storage Service (OSS)](https://www.alibabacloud.com/product/oss) is an encrypted, secure, cost-effective, and easy-to-use object storage service that enables you to store, back up, and archive large amounts of data in the cloud. - - -## Demo - -### Connect to OSS - -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 accessKey, secretKey and endpoint.** - -1. Add dependency spring-cloud-starter-alicloud-oss in the pom.xml file in your Spring Cloud project. - -Read file using resource mode
- -OSS Starter supports getting file objects by `Spring Resource`. Simply configure OSS protocol of the resource： - - @Value("oss://spring-cloud-alibaba/oss-test") - private Resource file; - - // read file content - StreamUtils.copyToString(file.getInputStream(), Charset.forName(CharEncoding.UTF_8)) - -## Stop OSSClient service -You do not need to manually shut down OSSClient. OSS Starter calls all OSSClient shutdown methods in the `OSSApplicationListener` during ApplicationContext close. - -If you have any feedback or suggestions for Spring Cloud OSS Starter, please don't hesitate to tell us by submitting github issues or via other community channels. - diff --git a/spring-cloud-alibaba-examples/oss-example/src/main/java/com/alibaba/cloud/examples/OssApplication.java b/spring-cloud-alibaba-examples/oss-example/src/main/java/com/alibaba/cloud/examples/OssApplication.java deleted file mode 100644 index 3c2205c7..00000000 --- a/spring-cloud-alibaba-examples/oss-example/src/main/java/com/alibaba/cloud/examples/OssApplication.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.alibaba.cloud.examples; - -import java.net.URISyntaxException; - -import com.aliyun.oss.OSS; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.ApplicationArguments; -import org.springframework.boot.ApplicationRunner; -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.context.annotation.Bean; - -/** - * OSS Application - * - * @author Jim - */ -@SpringBootApplication -public class OssApplication { - - public static final String BUCKET_NAME = "spring-cloud-alibaba"; - - public static void main(String[] args) throws URISyntaxException { - SpringApplication.run(OssApplication.class, args); - } - - @Bean - public AppRunner appRunner() { - return new AppRunner(); - } - - class AppRunner implements ApplicationRunner { - @Autowired - private OSS ossClient; - - @Override - public void run(ApplicationArguments args) throws Exception { - try { - if (!ossClient.doesBucketExist(BUCKET_NAME)) { - ossClient.createBucket(BUCKET_NAME); - } - } - catch (Exception e) { - System.err.println("oss handle bucket error: " + e.getMessage()); - System.exit(-1); - } - } - } - -} diff --git a/spring-cloud-alibaba-examples/oss-example/src/main/java/com/alibaba/cloud/examples/OssController.java b/spring-cloud-alibaba-examples/oss-example/src/main/java/com/alibaba/cloud/examples/OssController.java deleted file mode 100644 index 9628f950..00000000 --- a/spring-cloud-alibaba-examples/oss-example/src/main/java/com/alibaba/cloud/examples/OssController.java +++ /dev/null @@ -1,108 +0,0 @@ -/* - * Copyright 2013-2018 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.alibaba.cloud.examples; - -import java.io.InputStream; -import java.io.OutputStream; -import java.nio.charset.Charset; - -import com.aliyun.oss.OSS; -import com.aliyun.oss.common.utils.IOUtils; -import com.aliyun.oss.model.OSSObject; -import org.apache.commons.codec.CharEncoding; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.core.io.Resource; -import org.springframework.core.io.WritableResource; -import org.springframework.util.StreamUtils; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - * OSS Controller. - * - * @author Jim - */ -@RestController -public class OssController { - - @Autowired - private OSS ossClient; - - @Value("classpath:/oss-test.json") - private Resource localFile; - - @Value("oss://" + OssApplication.BUCKET_NAME + "/oss-test.json") - private Resource remoteFile; - - @GetMapping("/upload") - public String upload() { - try { - ossClient.putObject(OssApplication.BUCKET_NAME, "oss-test.json", this - .getClass().getClassLoader().getResourceAsStream("oss-test.json")); - } - catch (Exception e) { - e.printStackTrace(); - return "upload fail: " + e.getMessage(); - } - return "upload success"; - } - - @GetMapping("/file-resource") - public String fileResource() { - try { - return "get file resource success. content: " + StreamUtils.copyToString( - remoteFile.getInputStream(), Charset.forName(CharEncoding.UTF_8)); - } - catch (Exception e) { - e.printStackTrace(); - return "get resource fail: " + e.getMessage(); - } - } - - @GetMapping("/download") - public String download() { - try { - OSSObject ossObject = ossClient.getObject(OssApplication.BUCKET_NAME, - "oss-test.json"); - return "download success, content: " + IOUtils - .readStreamAsString(ossObject.getObjectContent(), CharEncoding.UTF_8); - } - catch (Exception e) { - e.printStackTrace(); - return "download fail: " + e.getMessage(); - } - } - - @GetMapping("/upload2") - public String uploadWithOutputStream() { - try { - try (OutputStream outputStream = ((WritableResource) this.remoteFile) - .getOutputStream(); - InputStream inputStream = localFile.getInputStream()) { - StreamUtils.copy(inputStream, outputStream); - } - } - catch (Exception ex) { - ex.printStackTrace(); - return "upload with outputStream failed"; - } - return "upload success"; - } - -} diff --git a/spring-cloud-alibaba-examples/oss-example/src/main/resources/application.properties b/spring-cloud-alibaba-examples/oss-example/src/main/resources/application.properties deleted file mode 100644 index 59c650d3..00000000 --- a/spring-cloud-alibaba-examples/oss-example/src/main/resources/application.properties +++ /dev/null @@ -1,6 +0,0 @@ -spring.application.name=oss-example -server.port=18084 -spring.cloud.alicloud.access-key=AK -spring.cloud.alicloud.secret-key=SK -spring.cloud.alicloud.oss.endpoint=***.aliyuncs.com -management.endpoints.web.exposure.include=* diff --git a/spring-cloud-alibaba-examples/oss-example/src/main/resources/oss-test.json b/spring-cloud-alibaba-examples/oss-example/src/main/resources/oss-test.json deleted file mode 100644 index 68682f46..00000000 --- a/spring-cloud-alibaba-examples/oss-example/src/main/resources/oss-test.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "name": "oss-test" -} \ No newline at end of file diff --git a/spring-cloud-alibaba-examples/pom.xml b/spring-cloud-alibaba-examples/pom.xml index f108f01c..427b7f72 100644 --- a/spring-cloud-alibaba-examples/pom.xml +++ b/spring-cloud-alibaba-examples/pom.xml @@ -8,8 +8,8 @@
+ * sentinel 降级处理
+ */
+public class EchoServiceFallback implements EchoService {
+
+ private Throwable throwable;
+
+ EchoServiceFallback(Throwable throwable) {
+ this.throwable = throwable;
+ }
+
+ /**
+ * 调用服务提供方的输出接口.
+ * @param str 用户输入
+ * @return
+ */
+ @Override
+ public String echo(String str) {
+ return "consumer-fallback-default-str" + throwable.getMessage();
+ }
+
+}
diff --git a/spring-cloud-alibaba-examples/rocketmq-example/rocketmq-produce-example/src/main/java/com/alibaba/cloud/examples/MyPartitionSelectorStrategy.java b/spring-cloud-alibaba-examples/sentinel-example/sentinel-feign-example/sentinel-feign-consumer-example/src/main/java/com/alibaba/cloud/examples/fallback/EchoServiceFallbackFactory.java
similarity index 55%
rename from spring-cloud-alibaba-examples/rocketmq-example/rocketmq-produce-example/src/main/java/com/alibaba/cloud/examples/MyPartitionSelectorStrategy.java
rename to spring-cloud-alibaba-examples/sentinel-example/sentinel-feign-example/sentinel-feign-consumer-example/src/main/java/com/alibaba/cloud/examples/fallback/EchoServiceFallbackFactory.java
index fdf202e7..94366678 100644
--- a/spring-cloud-alibaba-examples/rocketmq-example/rocketmq-produce-example/src/main/java/com/alibaba/cloud/examples/MyPartitionSelectorStrategy.java
+++ b/spring-cloud-alibaba-examples/sentinel-example/sentinel-feign-example/sentinel-feign-consumer-example/src/main/java/com/alibaba/cloud/examples/fallback/EchoServiceFallbackFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2018 the original author or authors.
+ * Copyright 2013-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -14,18 +14,22 @@
* limitations under the License.
*/
-package com.alibaba.cloud.examples;
+package com.alibaba.cloud.examples.fallback;
-import org.springframework.cloud.stream.binder.PartitionSelectorStrategy;
+import feign.hystrix.FallbackFactory;
+
+import org.springframework.stereotype.Component;
/**
- * @author Jim
+ * @author lengleng
+ * @date 2019-08-01
*/
-public class MyPartitionSelectorStrategy implements PartitionSelectorStrategy {
+@Component
+public class EchoServiceFallbackFactory implements FallbackFactory
+ * example feign client
+ */
+@FeignClient(name = "service-provider",
+ fallbackFactory = EchoServiceFallbackFactory.class)
+public interface EchoService {
+
+ /**
+ * 调用服务提供方的输出接口.
+ * @param str 用户输入
+ * @return echo result
+ */
+ @GetMapping("/echo/{str}")
+ String echo(@PathVariable("str") String str);
+
+}
diff --git a/spring-cloud-alibaba-examples/sentinel-example/sentinel-feign-example/sentinel-feign-consumer-example/src/main/resources/application.yml b/spring-cloud-alibaba-examples/sentinel-example/sentinel-feign-example/sentinel-feign-consumer-example/src/main/resources/application.yml
new file mode 100644
index 00000000..219c38d0
--- /dev/null
+++ b/spring-cloud-alibaba-examples/sentinel-example/sentinel-feign-example/sentinel-feign-consumer-example/src/main/resources/application.yml
@@ -0,0 +1,20 @@
+server:
+ port: 18087
+
+spring:
+ application:
+ name: service-consumer
+ cloud:
+ nacos:
+ discovery:
+ server-addr: 127.0.0.1:8848
+
+feign:
+ sentinel:
+ enabled: true
+
+management:
+ endpoints:
+ web:
+ exposure:
+ include: '*'
diff --git a/spring-cloud-alibaba-examples/oss-example/pom.xml b/spring-cloud-alibaba-examples/sentinel-example/sentinel-feign-example/sentinel-feign-provider-example/pom.xml
similarity index 84%
rename from spring-cloud-alibaba-examples/oss-example/pom.xml
rename to spring-cloud-alibaba-examples/sentinel-example/sentinel-feign-example/sentinel-feign-provider-example/pom.xml
index 97b73c7f..240fabc6 100644
--- a/spring-cloud-alibaba-examples/oss-example/pom.xml
+++ b/spring-cloud-alibaba-examples/sentinel-example/sentinel-feign-example/sentinel-feign-provider-example/pom.xml
@@ -6,13 +6,14 @@