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/21 08:23:35 UTC

[GitHub] liubao68 closed pull request #35: modify table Regular expression

liubao68 closed pull request #35: modify table Regular expression
URL: https://github.com/apache/incubator-servicecomb-docs/pull/35
 
 
   

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/build-provider/definition/service-definition.md b/java-chassis-reference/en_US/build-provider/definition/service-definition.md
index 82da8b3..c7108f6 100644
--- a/java-chassis-reference/en_US/build-provider/definition/service-definition.md
+++ b/java-chassis-reference/en_US/build-provider/definition/service-definition.md
@@ -15,7 +15,7 @@
 | 配置项 | 默认值 | 取值范围 | 是否必选 | 含义 | 注意 |
 | :--- | :--- | :--- | :--- | :--- | :--- |
 | APPLICATION\_ID | - | - | 是 | 应用名 | - |
-| service\_description.name | - | - | 是 | 微服务名 | 应确保app内部唯一。微服务名支持数字、大小写字母和"-"、"\_"、"."三个特殊字符,但是不能以特殊字符作为首尾字符,命名规范为:^\[a-zA-Z0-9\]+$\|^\[a-zA-Z0-9\]\[a-zA-Z0-9\_-.\]\*\[a-zA-Z0-9\]$。 |
+| service\_description.name | - | - | 是 | 微服务名 | 应确保app内部唯一。微服务名支持数字、大小写字母和"-"、"\_"、"."三个特殊字符,但是不能以特殊字符作为首尾字符,命名规范为:^\[a-zA-Z0-9\]+$&#124;^\[a-zA-Z0-9\]\[a-zA-Z0-9\_-.\]\*\[a-zA-Z0-9\]$。 |
 | service\_description.version | - | - | 是 | 微服务版本号 | - |
 | service\_description.description | - | - | 否 | 微服务描述 |  |
 | service\_description.properties | - | - | 否 | 微服务元数据配置(通过microservice.yaml文件进行配置) | - |
diff --git a/java-chassis-reference/zh_CN/build-provider/definition/service-definition.md b/java-chassis-reference/zh_CN/build-provider/definition/service-definition.md
index 82da8b3..c7108f6 100644
--- a/java-chassis-reference/zh_CN/build-provider/definition/service-definition.md
+++ b/java-chassis-reference/zh_CN/build-provider/definition/service-definition.md
@@ -15,7 +15,7 @@
 | 配置项 | 默认值 | 取值范围 | 是否必选 | 含义 | 注意 |
 | :--- | :--- | :--- | :--- | :--- | :--- |
 | APPLICATION\_ID | - | - | 是 | 应用名 | - |
-| service\_description.name | - | - | 是 | 微服务名 | 应确保app内部唯一。微服务名支持数字、大小写字母和"-"、"\_"、"."三个特殊字符,但是不能以特殊字符作为首尾字符,命名规范为:^\[a-zA-Z0-9\]+$\|^\[a-zA-Z0-9\]\[a-zA-Z0-9\_-.\]\*\[a-zA-Z0-9\]$。 |
+| service\_description.name | - | - | 是 | 微服务名 | 应确保app内部唯一。微服务名支持数字、大小写字母和"-"、"\_"、"."三个特殊字符,但是不能以特殊字符作为首尾字符,命名规范为:^\[a-zA-Z0-9\]+$&#124;^\[a-zA-Z0-9\]\[a-zA-Z0-9\_-.\]\*\[a-zA-Z0-9\]$。 |
 | service\_description.version | - | - | 是 | 微服务版本号 | - |
 | service\_description.description | - | - | 否 | 微服务描述 |  |
 | service\_description.properties | - | - | 否 | 微服务元数据配置(通过microservice.yaml文件进行配置) | - |


 

----------------------------------------------------------------
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