[servicecomb-website] branch asf-site updated (d2bcfe0 -> 0e98afc)
This is an automated email from the ASF dual-hosted git repository.
ningjiang pushed a change to branch asf-site
in repository https://gitbox.apache.org/repos/asf/servicecomb-website.git.
from d2bcfe0 Publish the website
add a526f18 Add ServiceComb introduction
add a8b61c6 Fix bugs about descriptions and spellings
new 66cce29 Merge branch 'master' into asf-site
new 0e98afc Publish the website
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
_data/navigation.yml | 4 +
_docs/cn/introduction/introduction.md | 112 ++
_docs/introduction/introduction.md | 126 +++
assets/images/docs/servicecomb/servicecomb.jpg | Bin 0 -> 337179 bytes
.../assets/images/docs/servicecomb/servicecomb.jpg | Bin 0 -> 337179 bytes
content/cn/docs/getting-started/index.html | 11 +
.../syncer/quick-start => introduction}/index.html | 223 +++
.../docs/products/java-chassis/advance/index.html | 11 +
.../cn/docs/products/java-chassis/bmi/index.html | 11 +
.../java-chassis/distributed-tracing/index.html| 11 +
.../products/java-chassis/flow-control/index.html | 11 +
.../products/java-chassis/load-balance/index.html | 11 +
.../products/java-chassis/quick-start/index.html | 11 +
.../java-chassis/service-management/index.html | 11 +
content/cn/docs/products/mesher/advance/index.html | 11 +
.../products/mesher/distributed-tracing/index.html | 11 +
.../docs/products/mesher/flow-control/index.html | 11 +
.../docs/products/mesher/load-balance/index.html | 11 +
.../cn/docs/products/mesher/quick-start/index.html | 11 +
.../products/mesher/service-management/index.html | 11 +
.../docs/products/pack/dataconsistency/index.html | 11 +
.../products/service-center/install/index.html | 11 +
.../registration-discovery/index.html | 11 +
.../syncer/multi-servicecenters/index.html | 11 +
.../cn/docs/products/syncer/quick-start/index.html | 11 +
.../docs/products/toolkit/oas-validator/index.html | 11 +
.../docs/products/toolkit/quick-start/index.html | 11 +
content/docs/getting-started/index.html| 11 +
.../syncer/quick-start => introduction}/index.html | 236 -
.../docs/products/java-chassis/advance/index.html | 11 +
content/docs/products/java-chassis/bmi/index.html | 11 +
.../java-chassis/distributed-tracing/index.html| 11 +
.../products/java-chassis/flow-control/index.html | 11 +
.../products/java-chassis/load-balance/index.html | 11 +
.../products/java-chassis/quick-start/index.html | 11 +
.../java-chassis/service-management/index.html | 11 +
content/docs/products/mesher/advance/index.html| 11 +
.../products/mesher/distributed-tracing/index.html | 11 +
.../docs/products/mesher/flow-control/index.html | 11 +
.../docs/products/mesher/load-balance/index.html | 11 +
.../docs/products/mesher/quick-start/index.html| 11 +
.../products/mesher/service-management/index.html | 11 +
.../docs/products/pack/dataconsistency/index.html | 11 +
.../products/service-center/install/index.html | 11 +
.../registration-discovery/index.html | 11 +
.../syncer/multi-servicecenters/index.html | 11 +
.../docs/products/syncer/quick-start/index.html| 11 +
.../docs/products/toolkit/oas-validator/index.html | 11 +
.../docs/products/toolkit/quick-start/index.html | 11 +
content/feed.xml | 2 +-
content/sitemap.xml| 216 ++-
51 files changed, 1079 insertions(+), 302 deletions(-)
create mode 100644 _docs/cn/introduction/introduction.md
create mode 100644 _docs/introduction/introduction.md
create mode 100644 assets/images/docs/servicecomb/servicecomb.jpg
create mode 100644 content/assets/images/docs/servicecomb/servicecomb.jpg
copy content/cn/docs/{products/syncer/quick-start => introduction}/index.html
(56%)
copy content/docs/{products/syncer/quick-start => introduction}/index.html
(52%)
[servicecomb-website] 01/02: Merge branch 'master' into asf-site
This is an automated email from the ASF dual-hosted git repository. ningjiang pushed a commit to branch asf-site in repository https://gitbox.apache.org/repos/asf/servicecomb-website.git commit 66cce298741826f25c6b2a9c6b1f609f2deee7ef Merge: d2bcfe0 a8b61c6 Author: Willem Jiang AuthorDate: Sun Dec 29 15:17:50 2019 +0800 Merge branch 'master' into asf-site _data/navigation.yml | 4 + _docs/cn/introduction/introduction.md | 112 ++ _docs/introduction/introduction.md | 126 + assets/images/docs/servicecomb/servicecomb.jpg | Bin 0 -> 337179 bytes 4 files changed, 242 insertions(+)
[servicecomb-website] 02/02: Publish the website
This is an automated email from the ASF dual-hosted git repository. ningjiang pushed a commit to branch asf-site in repository https://gitbox.apache.org/repos/asf/servicecomb-website.git commit 0e98afce988d53ebf68ae8bc33c73407235450f8 Author: Willem Jiang AuthorDate: Sun Dec 29 15:19:41 2019 +0800 Publish the website --- .../assets/images/docs/servicecomb/servicecomb.jpg | Bin 0 -> 337179 bytes content/cn/docs/getting-started/index.html | 11 + .../syncer/quick-start => introduction}/index.html | 223 +++ .../docs/products/java-chassis/advance/index.html | 11 + .../cn/docs/products/java-chassis/bmi/index.html | 11 + .../java-chassis/distributed-tracing/index.html| 11 + .../products/java-chassis/flow-control/index.html | 11 + .../products/java-chassis/load-balance/index.html | 11 + .../products/java-chassis/quick-start/index.html | 11 + .../java-chassis/service-management/index.html | 11 + content/cn/docs/products/mesher/advance/index.html | 11 + .../products/mesher/distributed-tracing/index.html | 11 + .../docs/products/mesher/flow-control/index.html | 11 + .../docs/products/mesher/load-balance/index.html | 11 + .../cn/docs/products/mesher/quick-start/index.html | 11 + .../products/mesher/service-management/index.html | 11 + .../docs/products/pack/dataconsistency/index.html | 11 + .../products/service-center/install/index.html | 11 + .../registration-discovery/index.html | 11 + .../syncer/multi-servicecenters/index.html | 11 + .../cn/docs/products/syncer/quick-start/index.html | 11 + .../docs/products/toolkit/oas-validator/index.html | 11 + .../docs/products/toolkit/quick-start/index.html | 11 + content/docs/getting-started/index.html| 11 + .../syncer/quick-start => introduction}/index.html | 236 - .../docs/products/java-chassis/advance/index.html | 11 + content/docs/products/java-chassis/bmi/index.html | 11 + .../java-chassis/distributed-tracing/index.html| 11 + .../products/java-chassis/flow-control/index.html | 11 + .../products/java-chassis/load-balance/index.html | 11 + .../products/java-chassis/quick-start/index.html | 11 + .../java-chassis/service-management/index.html | 11 + content/docs/products/mesher/advance/index.html| 11 + .../products/mesher/distributed-tracing/index.html | 11 + .../docs/products/mesher/flow-control/index.html | 11 + .../docs/products/mesher/load-balance/index.html | 11 + .../docs/products/mesher/quick-start/index.html| 11 + .../products/mesher/service-management/index.html | 11 + .../docs/products/pack/dataconsistency/index.html | 11 + .../products/service-center/install/index.html | 11 + .../registration-discovery/index.html | 11 + .../syncer/multi-servicecenters/index.html | 11 + .../docs/products/syncer/quick-start/index.html| 11 + .../docs/products/toolkit/oas-validator/index.html | 11 + .../docs/products/toolkit/quick-start/index.html | 11 + content/feed.xml | 2 +- content/sitemap.xml| 216 ++- 47 files changed, 837 insertions(+), 302 deletions(-) diff --git a/content/assets/images/docs/servicecomb/servicecomb.jpg b/content/assets/images/docs/servicecomb/servicecomb.jpg new file mode 100644 index 000..877a977 Binary files /dev/null and b/content/assets/images/docs/servicecomb/servicecomb.jpg differ diff --git a/content/cn/docs/getting-started/index.html b/content/cn/docs/getting-started/index.html index 8b8d524..6f7c453 100644 --- a/content/cn/docs/getting-started/index.html +++ b/content/cn/docs/getting-started/index.html @@ -297,6 +297,17 @@ + + + + 项目介绍 + + + + + + + Service Center diff --git a/content/cn/docs/products/syncer/quick-start/index.html b/content/cn/docs/introduction/index.html similarity index 56% copy from content/cn/docs/products/syncer/quick-start/index.html copy to content/cn/docs/introduction/index.html index 16d9747..d4fe5b4 100644 --- a/content/cn/docs/products/syncer/quick-start/index.html +++ b/content/cn/docs/introduction/index.html @@ -19,12 +19,12 @@ -Syncer 快速入门 - Apache ServiceComb +项目介绍 - Apache ServiceComb - + @@ -33,21 +33,21 @@ - + - https://github.com/pages/apache/incubator-servicecomb-website/cn/docs/products/syncer/quick-start/;> - https://github.com/pages/apache/incubator-servicecomb-website/cn/docs/products/syncer/quick-start/;> + https://github.com/pages/apache/incubator-servicecomb-website/cn/docs/introduction/;> + https://github.com/pages/apache/incubator-servicecomb-website/cn/docs/introduction/;> - + - - + + @@ -249,7 +249,7 @@ -English +
[servicecomb-website] 01/02: Add ServiceComb introduction
This is an automated email from the ASF dual-hosted git repository.
ningjiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-website.git
commit a526f189119535e6ec22d49615693d0851b8dbc5
Author: chinx
AuthorDate: Tue Dec 24 14:22:30 2019 +0800
Add ServiceComb introduction
---
_data/navigation.yml | 4 +
_docs/cn/introduction/introduction.md | 112 ++
_docs/introduction/introduction.md | 126 +
assets/images/docs/servicecomb/servicecomb.jpg | Bin 0 -> 337179 bytes
4 files changed, 242 insertions(+)
diff --git a/_data/navigation.yml b/_data/navigation.yml
index 04a69e7..28fcc55 100755
--- a/_data/navigation.yml
+++ b/_data/navigation.yml
@@ -37,6 +37,8 @@ t:
docs:
- title: "Getting Started"
url: /docs/getting-started/
+ - title: "Introduction"
+url: /docs/introduction/
- title: "Service Center"
children:
- title: "Install"
@@ -226,6 +228,8 @@ t:
docs:
- title: "入门指南"
url: /cn/docs/getting-started/
+ - title: "项目介绍"
+url: /cn/docs/introduction/
- title: "Service Center"
children:
- title: "环境安装"
diff --git a/_docs/cn/introduction/introduction.md
b/_docs/cn/introduction/introduction.md
new file mode 100644
index 000..2d57ddd
--- /dev/null
+++ b/_docs/cn/introduction/introduction.md
@@ -0,0 +1,112 @@
+---
+title: "项目介绍"
+lang: cn
+ref: introduction
+permalink: /cn/docs/introduction/
+excerpt: "ServiceComb项目介绍"
+last_modified_at: 2019-11-12T00:50:43-55:00
+---
+
+{% include toc %}
+
+## Apache ServiceComb
+
+Apache ServiceCom 是全球首个 Apache
微服务顶级项目，它提供了融合开源生态的一站式微服务开源解决方案，致力于帮助企业、用户和开发者将应用轻松微服务化上云，实现对微服务应用的高效运维管理。
+
+### ServiceComb架构
+
+ServiceComb作为一个微服务解决方案，其包含多个产品，通过不同产品的组合，可以轻松应对微服务化的不同场景，为用户微服务化上云提供便利。
+
+
+
+### 服务中心（Service Center）:
+
+Service Center
是一个服务注册中心，和其他注册中心一样，其主要作用在于解决服务的注册与发现，即动态路由的问题；同时为了更好的解决跨团队协作的问题，其增加了对契约（基于OpenAPI规范）服务的支持，与契约工具（[Tookit](aaa)）以及Java
微服务开发框架（[Java Chassis](bbb)）配合使用，可以使服务之间的通讯接口变得透明，从而使用户专注于业务开发。
+
+了解更多：[用户手册](/cn/docs/products/service-center/install/)
+
+### 配置中心（Kie）
+
+Kie 是一个语义型的分布式系统配置中心，其专为云原生的分布式系统设计，旨在为用户提供动态配置下发的能力，同时将 key
的规则由传统的拼接型（a.b.timeout=10s）重新设计为通俗易懂的语义型（timeout(service=a,version=b)=10s），方便运维人员理解数据和入口，管理复杂的分布式系统配置。
+
+了解更多：[用户手册](http://servicecomb.apache.org/docs/kie/0.1.0/index.html)
+
+### 分布式事务（Pack）
+
+Pack 是用于微服务应用程序的数据最终一致性解决方案。其有以下特性：
+
+- 高可用性。协调器是无状态的，因此可以具有多个实例。
+- 高可靠性。所有交易事件都永久存储在数据库中。
+- 高性能。事务事件通过gRPC报告给协调器，事务负载由Kyro序列化/反序列化。
+- 低入侵。您需要做的就是添加2-3个注释和相应的补偿方法。
+- 易于部署。所有组件均可通过docker启动。
+- 支持正向（重试）和反向（补偿）恢复。
+- 易于扩展基于Pack的其他协调协议，现在我们可以直接使用Saga和TCC支持。
+
+了解更多：[用户手册](https://docs.servicecomb.io/saga/zh_CN/)
+
+### Java 微服务开发框架（Java Chassis）
+
+Java Chassis 是基于Java的微服务开发框架，除提供服务注册发现、REST和高性能RPC通信、服务治理的常见功能外，其还具备以下五方面的特点：
+
+-
分层解耦：整个框架分为编程模型、运行模型、通信模型，业务层只关心编程模型和契约定义，而运行模型、通信模型对业务透明。这样通过对统一契约的加持，可以做到在通信模型变化的时候，代码可以零改动，只需通过简单的配置即可，同时各个层都可分别扩展。
+-
内置API-First支持：框架内部使用OpenAPI（Swagger）作为统一的契约描述方式，微服务开发时需使用契约描述的接口进行通信。对于不习惯先进行契约开发的用户，同时提供Code-First的开发模式，先写接口代码，微服务在启动时框架会自动生成契约并保存在服务管理中心。
+- 多种开发方式：ServiceComb支持用户以SpringMVC、JAX-RS或透明RPC的方式开发微服务，可以进一步降低使用和学习的门槛。
+- 开放性：支持Spring Boot和Spring Cloud，可以在Spring Boot上使用ServiceComb的组件，和其他Spring
Cloud的相关组件一起工作。
+- 高性能：整个框架内部全部采用reactive方式实现，内部处理全程无阻塞点，大幅提升处理性能。同时对外提供同步的开发接口，方便上层业务逻辑地开发。
+
+了解更多：[快速入门](/cn/docs/products/java-chassis/quick-start/)
[用户手册](https://docs.servicecomb.io/java-chassis/en_US/index.html)
+
+### 多语言运行环境 （Mesher）
+
+Mesher 是 Apache servicecomb 的服务网格项目，它支持任意运行环境中的任意开发语言的应用快速接入ServiceComb
微服务体系。Mesher使用 go 语言基于 go-chassis
开源框架实现，以插件的形式支持负载均衡、流量控制、调用链追踪、熔断降级、服务治理、动态配置管理等微服务能力。Mesher目前支持sidecar和edgeservice两种运行模式。支持服务间使用http、grpc协议通信，有良好的可扩展性，用户可自行扩展自己的协议。Mesher以调用链的形式处理请求，可以根据配置自由裁剪处理函数。在控制面Mesher天然能够接入apache
servicecomb微服务体系。并对当前主流的service-mesh具有兼容性，支持kubernetes，可接入Istio。
+
+了解更多：[快速入门](/cn/docs/products/mesher/quick-start/)
[用户手册](http://servicecomb.apache.org/docs/mesher/1.6.3/index.html)
+
+### 认证鉴权框架（Fence）
+
+Apache ServiceComb-fence 总体思路是结合 OAuth 2 和 OpenID Connect
协议，提供满足用户多样性认证鉴权的需求。重点是保证系统内部的认证鉴权（包括使用第三方的认证能力）。OAuth 2 和 OpenID connect
协议最早是为“给第三方提供认证能力”而设计的，Apache ServiceComb-fence
在方案设计上和能力开放方面，符合协议的标准。协议设计是为生态构建型企业而生，Apache ServiceComb-fence
则是将这些能力更好的应用到生态参与型企业，帮助参与生态，也为未来构建生态。
+
+了解更多：[用户手册](https://github.com/apache/servicecomb-fence/blob/master/README_ZH.md)
+
+### 一键式微服务开发工具（Toolkit）
+
+Apache ServiceComb Toolkit
是基于契约的微服务开发工具套件。提供契约、代码、文档相互转换及校验的能力，帮助用户一键式快速构建基于流行微服务框架和流行编程模型的微服务工程，降低微服务入门成本，使用户聚焦业务开发，提升遗留系统重构、开发效率。
+
+特性：
+
+- 遗留应用提取契约文件
+
+ 在基于SpringMVC/POJO/JAX-RS模型开发的应用中，一键提取符合OpenAPI规范的服务契约文件。
+
+- 契约文件生成微服务工程
+
+
输入符合OpenAPI规范的服务契约，一键生成以ServiceComb/SpringCloud/Swagger为底座，以及以SpringMVC/POJO/JAX-RS或SpringBoot为开发模型的微服务项目。
+
+- 契约与代码一致性校验
+
+ 校验应用的实际实现（如数据和服务API）是否与样本服务契约描述一致。
+
+- 契约的风格校验和兼容性校验
+
+ 风格校验检查契约是否符合[OAS
[GitHub] [servicecomb-website] WillemJiang merged pull request #237: Add ServiceComb introduction
WillemJiang merged pull request #237: Add ServiceComb introduction URL: https://github.com/apache/servicecomb-website/pull/237 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[servicecomb-website] 02/02: Fix bugs about descriptions and spellings
This is an automated email from the ASF dual-hosted git repository. ningjiang pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/servicecomb-website.git commit a8b61c6049899bfab4548715961f5585b4d8ef5b Author: chinx AuthorDate: Sat Dec 28 15:55:59 2019 +0800 Fix bugs about descriptions and spellings --- _docs/cn/introduction/introduction.md | 2 +- _docs/introduction/introduction.md| 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/_docs/cn/introduction/introduction.md b/_docs/cn/introduction/introduction.md index 2d57ddd..a479761 100644 --- a/_docs/cn/introduction/introduction.md +++ b/_docs/cn/introduction/introduction.md @@ -11,7 +11,7 @@ last_modified_at: 2019-11-12T00:50:43-55:00 ## Apache ServiceComb -Apache ServiceCom 是全球首个 Apache 微服务顶级项目，它提供了融合开源生态的一站式微服务开源解决方案，致力于帮助企业、用户和开发者将应用轻松微服务化上云，实现对微服务应用的高效运维管理。 +Apache ServiceComb 提供了融合开源生态的一站式微服务开源解决方案，致力于帮助企业、用户和开发者将应用轻松微服务化上云，实现对微服务应用的高效运维管理。 ### ServiceComb架构 diff --git a/_docs/introduction/introduction.md b/_docs/introduction/introduction.md index 9631a62..03f01d4 100644 --- a/_docs/introduction/introduction.md +++ b/_docs/introduction/introduction.md @@ -11,7 +11,7 @@ last_modified_at: 2019-11-12T00:50:43-55:00 ## Apache ServiceComb -Apache ServiceCom is the first Apache microservices top-level project in the word. It provides a complete open-source microservices solution that integrates the open-source ecosystem. Committed to helping enterprises, users, and developers to microservice applications to the cloud easily, to achieve efficient operation and maintenance management of microservice applications. +Apache ServiceComb provides a complete open-source microservices solution that integrates the open-source ecosystem. Committed to helping enterprises, users, and developers to microservice applications to the cloud easily, to achieve efficient operation and maintenance management of microservice applications. ### ServiceComb Architecture
[servicecomb-website] branch master updated (053ef85 -> a8b61c6)
This is an automated email from the ASF dual-hosted git repository. ningjiang pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/servicecomb-website.git. from 053ef85 Update zhanglei info new a526f18 Add ServiceComb introduction new a8b61c6 Fix bugs about descriptions and spellings The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: _data/navigation.yml | 4 + _docs/cn/introduction/introduction.md | 112 ++ _docs/introduction/introduction.md | 126 + assets/images/docs/servicecomb/servicecomb.jpg | Bin 0 -> 337179 bytes 4 files changed, 242 insertions(+) create mode 100644 _docs/cn/introduction/introduction.md create mode 100644 _docs/introduction/introduction.md create mode 100644 assets/images/docs/servicecomb/servicecomb.jpg
[GitHub] [servicecomb-pack] WillemJiang commented on a change in pull request #626: [SCB-1695] Add attribute mode to @Compensable annotation
WillemJiang commented on a change in pull request #626: [SCB-1695] Add
attribute mode to @Compensable annotation
URL: https://github.com/apache/servicecomb-pack/pull/626#discussion_r361831284
##
File path:
omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/RecoveryPolicyFactory.java
##
@@ -17,17 +17,19 @@
package org.apache.servicecomb.pack.omega.transaction;
+import
org.apache.servicecomb.pack.omega.transaction.annotations.CompensableMode;
+
public class RecoveryPolicyFactory {
private static final RecoveryPolicy DEFAULT_RECOVERY = new DefaultRecovery();
private static final RecoveryPolicy FORWARD_RECOVERY = new ForwardRecovery();
/**
- * If retries == 0, use the default recovery to execute only once.
- * If retries > 0, it will use the forward recovery and retry the given
times at most.
- * If retries == -1, it will use the forward recovery and retry forever
until interrupted.
+ * If mode is reverse, it will use the reverse recovery
+ * If mode is forward, it will use the forward recovery
+ * If mode is combine, it will use the first forward then reverse
*/
- static RecoveryPolicy getRecoveryPolicy(int retries) {
-return retries != 0 ? FORWARD_RECOVERY : DEFAULT_RECOVERY;
+ static RecoveryPolicy getRecoveryPolicy(CompensableMode mode) {
Review comment:
I doubt if we already implement the combine mode.
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
[GitHub] [servicecomb-pack] WillemJiang merged pull request #624: SCB-1690 omega-transport-resttemplate does not use RestTemplateBuilder
WillemJiang merged pull request #624: SCB-1690 omega-transport-resttemplate does not use RestTemplateBuilder URL: https://github.com/apache/servicecomb-pack/pull/624 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[servicecomb-pack] branch master updated: SCB-1690 omega-transport-resttemplate does not use RestTemplateBuilder
This is an automated email from the ASF dual-hosted git repository.
ningjiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-pack.git
The following commit(s) were added to refs/heads/master by this push:
new 40d6e07 SCB-1690 omega-transport-resttemplate does not use
RestTemplateBuilder
40d6e07 is described below
commit 40d6e0742ce4daa9a69ef1bf14e51dcc711d0f64
Author: Daniel Qian
AuthorDate: Fri Dec 27 11:34:41 2019 +0800
SCB-1690 omega-transport-resttemplate does not use RestTemplateBuilder
---
.../omega-transport-resttemplate/pom.xml | 4
.../transport/resttemplate/RestTemplateConfig.java| 19 ---
2 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/omega/omega-transport/omega-transport-resttemplate/pom.xml
b/omega/omega-transport/omega-transport-resttemplate/pom.xml
index 70f04e4..9bdc6da 100644
--- a/omega/omega-transport/omega-transport-resttemplate/pom.xml
+++ b/omega/omega-transport/omega-transport-resttemplate/pom.xml
@@ -40,6 +40,10 @@
spring-web
+ org.springframework.boot
+ spring-boot
+
+
org.springframework
spring-webmvc
diff --git
a/omega/omega-transport/omega-transport-resttemplate/src/main/java/org/apache/servicecomb/pack/omega/transport/resttemplate/RestTemplateConfig.java
b/omega/omega-transport/omega-transport-resttemplate/src/main/java/org/apache/servicecomb/pack/omega/transport/resttemplate/RestTemplateConfig.java
index 73a4437..4d83ab3 100644
---
a/omega/omega-transport/omega-transport-resttemplate/src/main/java/org/apache/servicecomb/pack/omega/transport/resttemplate/RestTemplateConfig.java
+++
b/omega/omega-transport/omega-transport-resttemplate/src/main/java/org/apache/servicecomb/pack/omega/transport/resttemplate/RestTemplateConfig.java
@@ -18,25 +18,22 @@
package org.apache.servicecomb.pack.omega.transport.resttemplate;
-import java.util.List;
-
+import org.apache.servicecomb.pack.omega.context.OmegaContext;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.web.client.RestTemplateBuilder;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
-import org.springframework.http.client.ClientHttpRequestInterceptor;
import org.springframework.web.client.RestTemplate;
-import org.apache.servicecomb.pack.omega.context.OmegaContext;
-
@Configuration
public class RestTemplateConfig {
@Bean(name = "omegaRestTemplate")
- public RestTemplate omegaRestTemplate(@Autowired(required=false)
OmegaContext context) {
-RestTemplate template = new RestTemplate();
-List interceptors =
template.getInterceptors();
-interceptors.add(new TransactionClientHttpRequestInterceptor(context));
-template.setInterceptors(interceptors);
-return template;
+ public RestTemplate omegaRestTemplate(@Autowired(required = false)
OmegaContext context,
+ RestTemplateBuilder restTemplateBuilder) {
+return restTemplateBuilder
+.additionalInterceptors(new
TransactionClientHttpRequestInterceptor(context))
+.build();
}
+
}
[GitHub] [servicecomb-pack] coveralls commented on issue #626: [SCB-1695] Add attribute mode to @Compensable annotation
coveralls commented on issue #626: [SCB-1695] Add attribute mode to @Compensable annotation URL: https://github.com/apache/servicecomb-pack/pull/626#issuecomment-569432607 [](https://coveralls.io/builds/27826806) Coverage decreased (-0.02%) to 80.912% when pulling **ed95e05f6c82f5f6b7a11d2eb6b732c1b0f48501 on coolbeevip:SCB-1695** into **b9fb63435650099ee5a55f3bd785d8f2c33a410a on apache:master**. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [servicecomb-pack] coolbeevip opened a new pull request #626: [SCB-1695] Add attribute mode to @Compensable annotation
coolbeevip opened a new pull request #626: [SCB-1695] Add attribute mode to @Compensable annotation URL: https://github.com/apache/servicecomb-pack/pull/626 Add attribute `mode` to the @Compensable annotation, which contains three options: - forward - reverse (default) - combine (first forward then reverse) This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [servicecomb-java-chassis] zhangchi02 opened a new issue #1501: SpringBoot+CSE开发的微服务，通过配置文件获取配置有问题
zhangchi02 opened a new issue #1501: SpringBoot+CSE开发的微服务，通过配置文件获取配置有问题
URL: https://github.com/apache/servicecomb-java-chassis/issues/1501
1. 在microservice.yaml中配置CSE_SERVERURI:
https://172.16.2.236:30103,https://172.16.2.47:30103，并用${CSE_SERVERURI}取值，只获取到第一个地址
经过debug发现是org.apache.commons.configuration.AbstractConfiguration#resolveContainerStore方法只取了第一个值
2. 在application.yaml中配置CSE_SERVERURI:
https://172.16.2.236:30103,https://172.16.2.47:30103，在microservice.yaml中用${CSE_SERVERURI}取值，取到两个地址拼接的字符串.
这样就导致解析uri获取host的时候报错
ERROR 9024 --- [ntloop-thread-0] io.vertx.core.impl.ContextImpl :
Unhandled exception
java.lang.IllegalArgumentException: Illegal uri:
[https://172.16.2.236:30103,https://172.16.2.47:30103]
at
org.apache.servicecomb.foundation.common.net.NetUtils.parseIpPort(NetUtils.java:170)
~[foundation-common-1.2.0.B011.jar:1.2.0.B011]
at
org.apache.servicecomb.foundation.common.net.NetUtils.parseIpPort(NetUtils.java:156)
~[foundation-common-1.2.0.B011.jar:1.2.0.B011]
at
org.apache.servicecomb.foundation.common.net.NetUtils.parseIpPortFromURI(NetUtils.java:198)
~[foundation-common-1.2.0.B011.jar:1.2.0.B011]
at
org.apache.servicecomb.config.client.ConfigCenterClient$ConfigRefresh.lambda$refreshConfig$14(ConfigCenterClient.java:379)
~[config-cc-1.2.0.B011.jar:1.2.0.B011]
at
org.apache.servicecomb.foundation.vertx.client.http.HttpClientWithContext.lambda$runOnContext$0(HttpClientWithContext.java:43)
~[foundation-vertx-1.2.0.B011.jar:1.2.0.B011]
at io.vertx.core.impl.ContextImpl.executeTask(ContextImpl.java:320)
~[vertx-core-3.6.3.jar:3.6.3]
at
io.vertx.core.impl.EventLoopContext.lambda$executeAsync$0(EventLoopContext.java:38)
[vertx-core-3.6.3.jar:3.6.3]
at
io.netty.util.concurrent.AbstractEventExecutor.safeExecute$$$capture(AbstractEventExecutor.java:163)
~[netty-common-4.1.42.Final.jar:4.1.42.Final]
at
io.netty.util.concurrent.AbstractEventExecutor.safeExecute(AbstractEventExecutor.java)
~[netty-common-4.1.42.Final.jar:4.1.42.Final]
at
io.netty.util.concurrent.SingleThreadEventExecutor.runAllTasks(SingleThreadEventExecutor.java:510)
~[netty-common-4.1.42.Final.jar:4.1.42.Final]
at io.netty.channel.nio.NioEventLoop.run(NioEventLoop.java:518)
~[netty-transport-4.1.42.Final.jar:4.1.42.Final]
at
io.netty.util.concurrent.SingleThreadEventExecutor$6.run(SingleThreadEventExecutor.java:1044)
~[netty-common-4.1.42.Final.jar:4.1.42.Final]
at
io.netty.util.internal.ThreadExecutorMap$2.run(ThreadExecutorMap.java:74)
~[netty-common-4.1.42.Final.jar:4.1.42.Final]
at
io.netty.util.concurrent.FastThreadLocalRunnable.run(FastThreadLocalRunnable.java:30)
~[netty-common-4.1.42.Final.jar:4.1.42.Final]
at java.lang.Thread.run(Thread.java:748) ~[na:1.8.0_144]
经过debug后发现是在org.apache.servicecomb.config.ConfigurationSpringInitializer#setEnvironment该处设置的值，而从application.yaml取值是spring的逻辑，这样ServiceComb拿到的就是一个长字符串并直接使用了，这就导致了上述报错。
3. 直接在microservice.yaml文件中配置
https://172.16.2.236:30103,https://172.16.2.47:30103，可以正常取值
4. 通过Java System
Property设置参数-Dcse.config.client.serverUri=https://127.0.0.1:30103,https://127.0.0.1:30103也是没有问题的
5.
通过环境变量配置PAAS_CSE_CC_ENDPOINT=https://127.0.0.3:30103,https://127.0.0.4:30103，不会走org.apache.servicecomb.deployment.DefaultDeploymentProvider#getSystemBootStrapInfo方法，结果也是正常的
想问一下，1,2两种情况下，该怎么处理？
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
[servicecomb-kie] branch master updated: SCB-1549 peer to peer event notification (#58)
This is an automated email from the ASF dual-hosted git repository.
tianxiaoliang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-kie.git
The following commit(s) were added to refs/heads/master by this push:
new f97a85e SCB-1549 peer to peer event notification (#58)
f97a85e is described below
commit f97a85e927d0d14894b6db33710778e2effbc075
Author: Shawn
AuthorDate: Sat Dec 28 17:09:33 2019 +0800
SCB-1549 peer to peer event notification (#58)
---
.travis.yml| 5 +-
client/adaptor/kie_client.go | 21 +-
client/adaptor/kie_client_test.go | 68 +++---
client/client.go | 14 +-
client/client_test.go | 12 +-
cmd/kieserver/main.go | 35 +--
go.mod | 18 +-
go.sum | 257 ++---
pkg/common/common.go | 3 +-
pkg/model/kv.go| 2 +-
server/config/config.go| 9 +-
server/config/config_test.go | 3 +-
server/config/struct.go| 7 +
server/pubsub/bus.go | 126 ++
.../{config/config_test.go => pubsub/bus_test.go} | 56 +++--
server/pubsub/event_handler.go | 63 +
.../v1/v1_suite_test.go => pubsub/options.go} | 20 +-
server/pubsub/struct.go| 117 ++
.../v1/v1_suite_test.go => pubsub/struct_test.go} | 41 +++-
server/resource/v1/common.go | 71 +-
server/resource/v1/doc_struct.go | 11 +-
server/resource/v1/kv_resource.go | 161 +++--
server/resource/v1/kv_resource_test.go | 27 ++-
server/resource/v1/v1_suite_test.go| 1 +
server/service/mongo/kv/kv_dao.go | 8 +-
server/service/mongo/kv/kv_service.go | 9 +-
26 files changed, 894 insertions(+), 271 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index a425a01..f9147ae 100755
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,7 +16,7 @@
language: go
sudo: required
go:
- - 1.11
+ - 1.13
install: true
before_script:
@@ -43,7 +43,7 @@ jobs:
- bash scripts/travis/goConstChecker.sh
- stage: GoLint Checker
script:
-- go get -u github.com/golang/lint/golint
+- go get -u golang.org/x/lint
- bash scripts/travis/goLintChecker.sh
- stage: GoCyclo Checker
script:
@@ -51,6 +51,7 @@ jobs:
- bash scripts/travis/goCycloChecker.sh
- stage: Unit Test
script:
+- export GOPROXY=https://goproxy.io
- GO111MODULE=on go mod download
- GO111MODULE=on go mod vendor
- bash scripts/travis/start_deps.sh
diff --git a/client/adaptor/kie_client.go b/client/adaptor/kie_client.go
index a640e8a..03b7ea2 100644
--- a/client/adaptor/kie_client.go
+++ b/client/adaptor/kie_client.go
@@ -20,17 +20,16 @@ package adaptor
import (
"context"
"errors"
-
"github.com/apache/servicecomb-kie/client"
"github.com/apache/servicecomb-kie/pkg/model"
- "github.com/go-chassis/go-chassis-config"
+ "github.com/go-chassis/go-archaius/source/remote"
"github.com/go-mesh/openlogging"
)
// Client contains the implementation of Client
type Client struct {
KieClient *client.Client
- opts config.Options
+ opts remote.Options
}
const (
@@ -39,7 +38,7 @@ const (
)
// NewClient init the necessary objects needed for seamless communication to
Kie Server
-func NewClient(options config.Options) (config.Client, error) {
+func NewClient(options remote.Options) (remote.Client, error) {
kieClient := {
opts: options,
}
@@ -85,12 +84,10 @@ func (c *Client) PullConfig(key, contentType string, labels
map[string]string) (
openlogging.GetLogger().Error("Error in Querying the Response
from Kie: " + err.Error())
return nil, err
}
- for _, doc := range configurationsValue {
- for _, kvDoc := range doc.Data {
- if key == kvDoc.Key {
- openlogging.GetLogger().Debugf("The Key Value
of : ", kvDoc.Value)
- return doc, nil
- }
+ for _, kvDoc := range configurationsValue.Data {
+ if key == kvDoc.Key {
+ openlogging.GetLogger().Debugf("The Key Value of : ",
kvDoc.Value)
+ return kvDoc, nil
}
}
return nil, errors.New("can not find value")
@@ -136,10 +133,10 @@ func (c *Client) Watch(f func(map[string]interface{}),
errHandler
[GitHub] [servicecomb-kie] tianxiaoliang merged pull request #58: SCB-1549 peer to peer event notification
tianxiaoliang merged pull request #58: SCB-1549 peer to peer event notification URL: https://github.com/apache/servicecomb-kie/pull/58 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [servicecomb-website] ChinX edited a comment on issue #237: Add ServiceComb introduction
ChinX edited a comment on issue #237: Add ServiceComb introduction URL: https://github.com/apache/servicecomb-website/pull/237#issuecomment-569397141 > Please clean up the introduction document. > BTW, we already have a brief introduction of the ServiceComb sub projects [here](https://servicecomb.apache.org/developers/) @WillemJiang Our existing introductions are too simple about sub-projects, and describe features too few. And I think they can be put together with the docs. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [servicecomb-website] ChinX commented on issue #237: Add ServiceComb introduction
ChinX commented on issue #237: Add ServiceComb introduction URL: https://github.com/apache/servicecomb-website/pull/237#issuecomment-569397141 > Please clean up the introduction document. > BTW, we already have a brief introduction of the ServiceComb sub projects [here](https://servicecomb.apache.org/developers/) @WillemJiang Our existing introductions are too simple about sub-projects, and describes the features of each project too few. And I think they can be put together with the docs. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [servicecomb-website] ChinX commented on a change in pull request #237: Add ServiceComb introduction
ChinX commented on a change in pull request #237: Add ServiceComb introduction
URL:
https://github.com/apache/servicecomb-website/pull/237#discussion_r361782882
##
File path: _docs/cn/introduction/introduction.md
##
@@ -0,0 +1,112 @@
+---
+title: "项目介绍"
+lang: cn
+ref: introduction
+permalink: /cn/docs/introduction/
+excerpt: "ServiceComb项目介绍"
+last_modified_at: 2019-11-12T00:50:43-55:00
+---
+
+{% include toc %}
+
+## Apache ServiceComb
+
+Apache ServiceCom 是全球首个 Apache
微服务顶级项目，它提供了融合开源生态的一站式微服务开源解决方案，致力于帮助企业、用户和开发者将应用轻松微服务化上云，实现对微服务应用的高效运维管理。
Review comment:
Modified, please review again，THX！
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
