You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicecomb.apache.org by GitBox <gi...@apache.org> on 2018/08/27 09:59:04 UTC

[GitHub] liubao68 closed pull request #49: Catelog dir translation

liubao68 closed pull request #49: Catelog dir translation
URL: https://github.com/apache/incubator-servicecomb-docs/pull/49
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/java-chassis-reference/en_US/catalog/build-consumer.md b/java-chassis-reference/en_US/catalog/build-consumer.md
index 278ee24..15b0916 100644
--- a/java-chassis-reference/en_US/catalog/build-consumer.md
+++ b/java-chassis-reference/en_US/catalog/build-consumer.md
@@ -1,27 +1,26 @@
-## 使用RestTemplate开发服务消费者
-RestTemplate是Spring提供的RESTful访问接口,ServiceComb提供该接口的实现类用于服务的调用。
+## Using RestTemplate to develop service consumers
+RestTemplate is a RESTful access interface provided by Spring. ServiceComb provides an implementation class for this interface for service calls.
 
-## 使用AsynRestTemplate开发服务消费者
-AsyncRestTemplate 开发方式允许用户异步的进行服务调用。具体的业务流程和 restTemplate 类似,只是这里以异步的形式进行服务的调用。
+## Using AsynRestTemplate to develop service consumers
+The AsyncRestTemplate development method allows users to make service calls asynchronously. The specific business process is similar to restTemplate, except that the service is called asynchronously.
 
-## 使用透明RPC方式开发服务消费者
+## Using a transparent RPC approach to develop service consumers
 
-透明RPC开发模式允许用户通过简单的java interface像本地调用一样进行服务调用。
+The transparent RPC development model allows users to make service calls like a local call through a simple java interface.
 
-## 使用服务契约
-当服务消费者调用服务提供者的服务时,需要注册服务契约。消费者有两种方式获取提供者的服务契约,一种是从服务的提供方离线获取契约文件,手工配置到项目中;另一种是从服务中心自动下载契约。
+## Using a service contract
+When a service consumer invokes a service provider's service, a service contract needs to be registered. Consumers have two ways to obtain the provider's service contract. One is to obtain the contract file offline from the provider of the service and manually configure it into the project; the other is to automatically download the contract from the service center.
 
-## 调用控制
+## Call Control
 
-### 实例级故障隔离
-实例级故障隔离功能允许在微服务的部分实例调用失败时,停止向故障实例发送请求,从而达到隔离故障实例的功能。
+### Instance level fault isolation
+The instance-level fault isolation feature allows the ability to isolate a failed instance by stopping the sending of a request to the failed instance when a partial instance call to the microservice fails.
 
-### 熔断策略
-熔断策略是对ServiceComb熔断功能的设置,用户通过配置熔断策略可以指定在何种条件下ServiceComb框架将终止发送请求。
+### Fuse strategy
+The fuse strategy is the setting of the ServiceComb fuse function. The user can specify the conditions under which the ServiceComb framework will terminate the send request by configuring the fuse policy.
 
-### 限流策略
-用户在consumer端使用限流策略,可以限制发往指定微服务的请求的频率。
-
-### 故障注入
-用户在consumer端使用故障注入,可以设置发往指定微服务的请求的时延和错误及其触发概率。
+### Current limiting strategy
+The user uses the traffic limiting policy on the consumer side to limit the frequency of requests sent to the specified microservice.
 
+### Fault injection
+The user uses fault injection on the consumer side to set the delay and error of the request to the specified microservice and its trigger probability.
\ No newline at end of file
diff --git a/java-chassis-reference/en_US/catalog/build-provider.md b/java-chassis-reference/en_US/catalog/build-provider.md
index 21118ef..8ecabf9 100644
--- a/java-chassis-reference/en_US/catalog/build-provider.md
+++ b/java-chassis-reference/en_US/catalog/build-provider.md
@@ -1,47 +1,46 @@
-## [服务定义](/build-provider/definition/service-definition.html)
-• 服务定义信息是微服务的身份标识,它定义了服务从属于哪个应用,以及名字和版本。服务定义信息中也可以有扩展信息,用于定义服务的属性元数据。
- 
+## [Service Definition] (/build-provider/definition/service-definition.html)
+• Service definition information is the identity of the microservice, which defines which application the service belongs to, as well as the name and version. The service definition information may also have extension information for defining attribute metadata of the service.
+ 
 
-## [定义服务契约](/build-provider/define-contract.html) 
-• 服务契约,指基于OpenAPI规范的微服务接口契约,是服务端与消费端对于接口的定义。java chassis提供了两种方式定义契约:code first和contract first。
+## [Defining Service Contracts] (/build-provider/define-contract.html)
+• Service contract, which refers to the micro-service interface contract based on the OpenAPI specification, which is the definition of the interface between the server and the consumer. The java chassis provides two ways to define contracts: code first and contract first.
 
 
-## [使用隐式契约](/build-provider/code-first.html)  
-• 降级策略是当服务请求异常时,微服务所采用的异常处理策略。
+## [Use implicit contract] (/build-provider/code-first.html)
+• The downgrade strategy is the exception handling strategy used by the microservice when the service request is abnormal.
 
 
-## [使用 Swagger 注解](/build-provider/swagger-annotation.html)
-• Swagger提供了一套注解用于描述接口契约,用户使用注解,可以在代码中增加对于契约的描述信息。ServiceComb支持其中的部分注解。
+## [Using Swagger Annotations] (/build-provider/swagger-annotation.html)
+• Swagger provides a set of annotations to describe the interface contract. Users can use annotations to add descriptions of contracts to the code. ServiceComb supports some of these annotations.
 
 
-## [用SpringMVC 开发微服务](/build-provider/springmvc.html)
-• ServiceComb支持SpringMVC注解,允许使用SpringMVC风格开发微服务。建议参照着项目 SpringMVC进行详细阅读。
+## [Developing microservices with SpringMVC] (/build-provider/springmvc.html)
+• ServiceComb supports SpringMVC annotations, allowing the development of microservices using SpringMVC style. It is recommended to read the project in detail with reference to the project SpringMVC.
 
-## [用JAX-RS开发微服务](/build-provider/jaxrs.html)
-• ServiceComb支持开发者使用JAX-RS注解,使用JAX-RS模式开发服务。
+## [Developing microservices with JAX-RS] (/build-provider/jaxrs.html)
+• ServiceComb supports developers using JAX-RS annotations to develop services using JAX-RS patterns.
 
-## [使用 Swagger 注解](/build-provider/swagger-annotation.html)
-• Swagger提供了一套注解用于描述接口契约,用户使用注解,可以在代码中增加对于契约的描述信息。ServiceComb支持其中的部分注解。
+## [Using Swagger Annotations] (/build-provider/swagger-annotation.html)
+• Swagger provides a set of annotations to describe the interface contract. Users can use annotations to add descriptions of contracts to the code. ServiceComb supports some of these annotations.
 
-## [使用 Swagger 注解](/build-provider/swagger-annotation.html)
-• Swagger提供了一套注解用于描述接口契约,用户使用注解,可以在代码中增加对于契约的描述信息。ServiceComb支持其中的部分注解。
+## [Using Swagger Annotations] (/build-provider/swagger-annotation.html)
+• Swagger provides a set of annotations to describe the interface contract. Users can use annotations to add descriptions of contracts to the code. ServiceComb supports some of these annotations.
 
-## [用透明RPC开发微服务](/build-provider/transparent-rpc.html)
-• 透明RPC开发模式是一种基于接口和接口实现的开发模式,服务的开发者不需要使用Spring MVC和JAX-RS注解。
+## [Developing microservices with transparent RPC] (/build-provider/transparent-rpc.html)
+• The transparent RPC development model is a development model based on interfaces and interfaces. Service developers do not need to use Spring MVC and JAX-RS annotations.
 
-## [接口定义和数据类型](/build-provider/swagger-annotation.html)
-• ServiceComb-Java-Chassis建议接口定义遵循一个简单的原则:接口定义即接口使用说明,不用通过查看代码实现,就能识别如何调用这个接口。可以看出,这个原则站在使用者这边,以更容易被使用作为参考。ServiceComb会根据接口定义生成接口契约,符合这个原则的接口,生成的契约也是用户容易阅读的。
+## [interface definition and data type] (/build-provider/swagger-annotation.html)
+• ServiceComb-Java-Chassis suggests that the interface definition follows a simple principle: the interface definition is the interface usage specification, and you can identify how to call this interface without looking at the code implementation. It can be seen that this principle stands on the user side and is easier to use as a reference. ServiceComb will generate interface contracts based on interface definitions, interfaces that conform to this principle, and the generated contracts are also easy for users to read.
 
-## [服务监听地址和发布地址](/build-provider/listen-address-and-publish-address.html)
-•在JavaChassis中,服务的监听地址和发布地址是两个独立的概念,可以独立配置:
+## [Service Listening Address and Publishing Address] (/build-provider/listen-address-and-publish-address.html)
+• In JavaChassis, the listening and publishing addresses of the service are two separate concepts that can be configured independently:
 
-	监听地址:指微服务实例启动时监听的地址。该配置项决定了可以通过哪些IP访问此服务。
-	发布地址:指微服务实例注册到服务中心的地址。其他的微服务实例会通过服务中心获取此实例的信息,根据发布地址访问此服务实例,所以该配置项决定了其他服务实际上会使用哪个IP访问此服务。
+Listening address: refers to the address that the microservice instance listens to when it starts. This configuration item determines which IPs can be accessed by this IP.
+Publish address: refers to the address where the microservice instance is registered to the service center. Other microservice instances will obtain information about this instance through the service center and access the service instance based on the publication address, so this configuration item determines which IP other services actually use to access the service.
 
-## [服务配置](/build-provider/service-configuration.html)
-
-• [负载均衡策略](/build-provider/configuration/lb-strategy.html)  
-• [限流策略](/build-provider/configuration/ratelimite-strategy.html)  
-• [降级策略](/build-provider/configuration/downgrade-strategy.html)  
-• [参数教研](/build-provider/configuration/parameter-validator.html)  
+## [Service Configuration](/build-provider/service-configuration.html)
 
+• [Load Balancing Policy] (/build-provider/configuration/lb-strategy.html)
+• [Limiting Policy] (/build-provider/configuration/ratelimite-strategy.html)
+• [Downgrade Strategy] (/build-provider/configuration/downgrade-strategy.html)
+• [Parameters and Research] (/build-provider/configuration/parameter-validator.html)
\ No newline at end of file
diff --git a/java-chassis-reference/en_US/catalog/general-develop.md b/java-chassis-reference/en_US/catalog/general-develop.md
index 4c95230..ed109dd 100644
--- a/java-chassis-reference/en_US/catalog/general-develop.md
+++ b/java-chassis-reference/en_US/catalog/general-develop.md
@@ -1,81 +1,81 @@
-## 访问服务中心  
-系统通过服务中心实现服务之间的发现。服务启动过程中,会向服务中心进行注册。在调用其他服务的时候,会从服务中心查询其他服务的实例信息,比如访问地址、使用的协议以及其他参数。服务中心支持使用PULL和PUSH两种模式通知实例变化。
+## Access Service Center
+The system realizes the discovery between services through the service center. During the service startup process, the service center is registered. When calling other services, the service center will query the instance information of other services, such as the access address, the protocol used, and other parameters. The service center supports the use of PULL and PUSH modes to notify instance changes.
 
 
-## 使用动态配置
-ServiceComb提供了分层次的配置机制。按照优先级,分为:
-• 配置中心(动态配置)
-• Java System Property(-D参数)
-• 环境变量
-• 配置文件,microservice.yaml。microservice.yaml文件从classpath扫描,可以允许存在很多份。通过servicecomb-config-order指定优先级。
+## Using dynamic configuration
+ServiceComb provides a hierarchical configuration mechanism. According to the priority, it is divided into:
+• Configuration Center (dynamic configuration)
+• Java System Property (-D parameter)
+• Environmental variables
+• Configuration file, microservice.yaml. The microservice.yaml file is scanned from the classpath and can be allowed to exist in many copies. Specify the priority by servicecomb-config-order.
 
-## 应用性能监控
- 一、Metrics介绍  
- 二、统计项汇总  
- 三、使用方法  
+## Application Performance Monitoring
+ 1. The introduction of Metrics
+ 2. The summary of statistical items
+ 3. The usage
 
 
-## 微服务调用链  
-微服务架构解决了很多单体应用带来的问题,但同时也需要我们付出额外的代价。由于网络的不稳定性带来的请求处理延迟就是代价之一。  
+## Micro Service Call Chain
+The microservices architecture solves the problems of many single applications, but it also requires us to pay extra. Request processing latency due to network instability is one of the costs.
 
-在单体应用中,所有模块都在同一个进程中运行,所以并没有模块间互通的问题。但微服务架构中,服务间通过网络沟通,因此我们不得不处理和网络有关的 问题,例如:延迟、超时、网络分区等。  
+In a single application, all modules run in the same process, so there is no inter-module interworking problem. However, in the micro-service architecture, services communicate through the network, so we have to deal with network-related issues such as delays, timeouts, network partitions, and so on.
 
-另外,随着业务的扩展服务增多,我们很难洞察数据如何在蛛网般复杂的服务结构中流转。我们如何才能有效的监控网络延迟并且可视化服务中的数据流转呢?  
+In addition, as the business expands its services, it is difficult to see how data flows through a spider-like complex service structure. How can we effectively monitor network latency and visualize data flow in services?
 
-分布式调用链追踪用于有效地监控微服务的网络延时并可视化微服务中的数据流转。  
+Distributed call chain tracking is used to effectively monitor network latency for microservices and visualize data flow in microservices.
 
-## 自定义调用链打点
-分布式调用链追踪提供了服务间调用的时序信息,但服务内部的链路调用信息对开发者同样重要,如果能将两者合二为一,就能提供更完整的调用链,更容易定位错误和潜在性能问题。
-  
-## 本地开发和测试  
-本小节介绍如何在开发者本地进行消费者/提供者应用的开发调试。开发服务提供者请参考3 开发服务提供者章节,开发服务消费者请参考4 开发服务消费者。服务提供者和消费提供者均需要连接到在远程的服务中心,为了本地微服务的开发和调试,本小节介绍了两种搭建本地服务中心的方法进行本地微服务调试:  
+## Custom call chain management
+Distributed call chain tracking provides timing information for calls between services, but the link call information inside the service is equally important to the developer. If you can combine the two into one, you can provide a more complete call chain, which is easier to locate. Errors and potential performance issues.
+  
+## Local development and testing
+This section describes how to develop and debug consumer/provider applications locally on the developer side. For development service providers, please refer to the section 3 Development Service Providers. For development service consumers, please refer to 4 Development Service Consumers. Both the service provider and the consumer provider need to connect to the remote service center. For the development and debugging of local microservices, this section describes two ways to set up a local service center for local microservices debugging:
 
 
-## Http Filter 
-某些场景中,业务使用http而不是https,作为网络传输通道,此时为了防止被伪造或篡改请求,需要提供consumer、producer之间对http码流的签名功能。
+## Http Filter
+In some scenarios, the service uses http instead of https as the network transmission channel. In order to prevent the falsification or tampering request, the signature function of the http code stream between the consumer and the producer needs to be provided.
 
- 
-## 文件上传  
-文件上传,当前支持在vertx rest通道和servlet rest中使用。  
-文件上传使用标准的http form格式,可与浏览器的上传直接对接。  
+ 
+## File Upload 
+File upload, currently supported in vertx rest channel and servlet rest.
+File uploads use the standard http form format, which interfaces directly with the browser's upload.
 
-## 文件下载  
-文件下载,当前在vertx rest通道和servlet rest中可用。
+## Download Document 
+File downloads are currently available in the vertx rest channel and servlet rest.
 
 
 ## Reactive
-简单同步模式、嵌套同步调用、纯Reactive机制、混合Reactive机制之间的对比及说明。
+Comparison and description between simple synchronization mode, nested synchronous call, pure Reactive mechanism, and hybrid Reactive mechanism.
 
 
-## DNS自定义配置
-用户使用域名连接华为公有云或者三方系统时,需要使用到域名解析系统。在不同的系统、不同的框架使用的域名解析机制都可能不太一样。所以我们有必要提供一个统一的配置入口,以便开发运维人员可以自定义DNS解析机制,而不完全受制于系统配置。  
+## DNS Custom Configuration
+When a user uses a domain name to connect to a Huawei public cloud or a three-party system, you need to use the domain name resolution system. The domain name resolution mechanisms used in different systems and different frameworks may be different. Therefore, it is necessary to provide a unified configuration entry so that development and operation personnel can customize the DNS resolution mechanism without being completely subject to system configuration.
 
-## 代理设置
-作为一名开发者,在公司开发环境,可能是通过公司代理网络接入到因特网。如果调试服务时还必须依赖网上资源,比如直接连接华为共有云服务中心,那么就必须配置代理。
+## Proxy settings
+As a developer, in a company development environment, it is possible to access the Internet through a corporate agent network. If you must also rely on online resources when debugging services, such as directly connecting to Huawei's shared cloud service center, you must configure the agent.
 
 
-## 框架上报版本号
-为方便治理,使用ServiceComb进行开发,会将当前使用的ServiceComb版本号上报至服务中心,并且支持其他框架集成ServiceComb时上报其他框架的版本号。
+## Frame report version number
+In order to facilitate the management, using ServiceComb for development, the currently used ServiceComb version number will be reported to the service center, and the version number of other frameworks will be reported when other frameworks integrate ServiceComb.
 
-## 跨应用调用
-应用是微服务实例隔离层次中的一层,一个应用包含多个微服务。默认情况下,只允许同应用的微服务实例相互调用。
+## Cross-application call
+An application is a layer in the microservice instance isolation hierarchy, and an application contains multiple microservices. By default, only microservice instances of the same application are allowed to call each other.
 
 
-## 定制序列化和反序列化方法
-由于HTTP协议的非安全性,在网络中传输的数据能轻易被各种抓包工具监听。在实际应用中,业务对应用或服务间传输的敏感数据有较高的安全要求,这类数据需要特别的加密保护(业务不同对算法要求不同),这样即使内容被截获,也可以保护其中的敏感数据不被轻易获取。
+## Custom Serialization and Deserialization Methods
+Due to the non-security of the HTTP protocol, data transmitted over the network can be easily monitored by various packet capture tools. In practical applications, services have high security requirements for sensitive data transmitted between applications or services. Such data requires special encryption protection (different services have different algorithm requirements), so that even if the content is intercepted, it can protect Sensitive data is not easily obtained.
 
 
-## 使用Context传递控制消息
-ServiceComb提供了Context在微服务之间传递数据。Context是key/value对,只能够使用String类型的数据。由于Context会序列化为json格式并通过HTTP Header传递,因此也不支持ASCII之外的字符,其他字符需要开发者先自行编码再传递。Context在一次请求中,会在请求链上传递,不需要重新设置。access log的trace id等功能都基于这个特性实现的。
+## Using Context to pass control messages
+ServiceComb provides a Context to pass data between microservices. Context is a key/value pair and can only use data of type String. Since the Context is serialized into the json format and passed through the HTTP header, characters other than ASCII are not supported. Other characters require the developer to encode and pass the code. The Context is passed on the request chain in a single request and does not need to be reset. Functions such as the trace id of the access log are implemented based on this feature.
 
 
-## 返回值序列化扩展
-当前REST通道返回值支持application/json和text/plain两种格式,支持开发人员扩展和重写,服务提供者通过produces声明可提供序列化能力,服务消费者通过请求的Accept头指明返回值序列化方式,默认返回application/json格式的数据。
+## return value serialization extension
+The current REST channel return value supports both application/json and text/plain formats, supports developer extensions and rewrites, service providers provide serialization capabilities through producer declarations, and service consumers specify return value serialization through the request's Accept header. By default, the data in application/json format is returned.
 
 
-## CORS机制
-跨域资源共享(CORS, Cross-Origin Resource Sharing)允许Web服务器进行跨域访问控制,使浏览器可以更安全地进行跨域数据传输。
+## CORS mechanism
+Cross-Origin Resource Sharing (CORS) allows Web servers to perform cross-domain access control, enabling browsers to more securely transfer data across domains.
 
 
-## 获取熔断与实例隔离告警事件信息
-在微服务运行期间熔断或实例隔离状态发生变化时,需要监听到相关事件,获取相关信息并进行处理
+## Obtaining the fuse and instance isolation alarm event information
+When the microservice is running or the instance isolation status changes, you need to listen to related events, get relevant information and process it.
\ No newline at end of file
diff --git a/java-chassis-reference/en_US/catalog/security.md b/java-chassis-reference/en_US/catalog/security.md
index de45733..4b71cba 100644
--- a/java-chassis-reference/en_US/catalog/security.md
+++ b/java-chassis-reference/en_US/catalog/security.md
@@ -1,5 +1,5 @@
-##使用TLS通信  
-用户通过简单的配置即可启用TLS通信,以保障数据的传输安全。  
+##Using TLS communication
+Users can enable TLS communication through simple configuration to ensure data transmission security.
 
-## 使用RSA认证  
-用户通过简单的配置即可启用服务间RSA认证,以保障服务接口的安全性。详细介绍参考公钥认证  
\ No newline at end of file
+## Use RSA certification
+Users can enable RSA authentication between services through simple configuration to ensure the security of the service interface. Detailed reference to public key authentication
\ No newline at end of file
diff --git a/java-chassis-reference/en_US/catalog/service-package-run.md b/java-chassis-reference/en_US/catalog/service-package-run.md
index e4191a1..52574c0 100644
--- a/java-chassis-reference/en_US/catalog/service-package-run.md
+++ b/java-chassis-reference/en_US/catalog/service-package-run.md
@@ -1,6 +1,5 @@
-## 以standalone模式打包
-一个Standalone的容器,以简单的Main加载Spring启动,因为服务通常不需要Tomcat/JBoss等Web容器的特性,没必要用Web容器去加载服务。微框架提供了standalone部署运行模式,服务容器只是一个简单的Main方法,并加载一个简单的Spring容器,用于暴露服务。
-
-## 以WEB容器模式打包
-如果需要将该微服务加载到web容器中启动运行时,需要新建一个servlet工程包装一下,该servlet工程,根据需要,可以不写或写少量的引导代码即可。
+## Packaged in standalone mode
+A Standalone container that loads Spring with a simple Main method, because the service usually does not require the properties of a Web container such as Tomcat/JBoss, and there is no need to use the Web container to load the service. The microframework provides a standalone deployment run mode. The service container is just a simple Main method and loads a simple Spring container to expose the service.
 
+## Packaged in WEB container mode
+If you need to load the microservice into the web container to start the runtime, you need to create a new servlet project wrapper. The servlet project, if necessary, can not write or write a small amount of boot code.
\ No newline at end of file
diff --git a/java-chassis-reference/en_US/catalog/start.md b/java-chassis-reference/en_US/catalog/start.md
index 8d5fba1..bc21d1c 100644
--- a/java-chassis-reference/en_US/catalog/start.md
+++ b/java-chassis-reference/en_US/catalog/start.md
@@ -1,15 +1,14 @@
-### [术语表](/start/terminology.html)
- 
+### [Glossary](/start/terminology.html)
 
-### [微服务系统架构](/start/architecture.html) 
+### [Micro Service System Architecture](/start/architecture.html)
 
-### [安装本地开发环境](/build-provider/definition/service-definition.html)
-• 服务定义信息是微服务的身份标识,它定义了服务从属于哪个应用,以及名字和版本。服务定义信息中也可以有扩展信息,用于定义服务的属性元数据。
- 
+### [Install local development environment](/build-provider/definition/service-definition.html)
+• Service definition information is the identity of the microservice, which defines which application the service belongs to, as well as the name and version. The service definition information may also have extensive information for defining attribute metadata of the service.
+ 
 
-### [开发第一个微服务](/start/first-sample.html) 
+### [Developing the first microservice](/start/first-sample.html)
 
-开发者可以通过两种方式快速构建一个项目:  
+Developers can quickly build a project in two ways:
 
-• 下载samples项目。建议把整个项目都下载下来,按照例子 SpringMVC 或者 JAX RS进行初始化配置。  
-• 使用archetypes生成项目  
\ No newline at end of file
+• Download the samples project. It is recommended to download the entire project and initialize it according to the example SpringMVC or JAX RS.
+• Generate projects with archetypes
\ No newline at end of file


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services