[GitHub] [servicecomb-java-chassis] liubao68 merged pull request #1565: [SCB-1755]add JavaBeans Activation Framework implicitly
liubao68 merged pull request #1565: [SCB-1755]add JavaBeans Activation Framework implicitly URL: https://github.com/apache/servicecomb-java-chassis/pull/1565 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-java-chassis] branch master updated: [SCB-1755]add JavaBeans Activation Framework implicitly (#1565)
This is an automated email from the ASF dual-hosted git repository. liubao pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/servicecomb-java-chassis.git The following commit(s) were added to refs/heads/master by this push: new d49c6a8 [SCB-1755]add JavaBeans Activation Framework implicitly (#1565) d49c6a8 is described below commit d49c6a85716c8b179e88ca9be2937b1b23e87234 Author: bao liu AuthorDate: Wed Feb 12 08:56:31 2020 +0800 [SCB-1755]add JavaBeans Activation Framework implicitly (#1565) --- dependencies/default/pom.xml | 7 ++- distribution/src/release/LICENSE | 7 +++ distribution/src/release/licenses/LICENSE-edl-v10 | 12 foundations/foundation-common/pom.xml | 4 parents/default/pom.xml | 2 +- 5 files changed, 30 insertions(+), 2 deletions(-) diff --git a/dependencies/default/pom.xml b/dependencies/default/pom.xml index a2e3db4..15539c0 100644 --- a/dependencies/default/pom.xml +++ b/dependencies/default/pom.xml @@ -97,6 +97,7 @@ 1.0.0 0.12.25 4.0.3 +1.2.1 1.7.26 1.24 0.83.0 @@ -665,7 +666,11 @@ jakarta.servlet-api ${servlet-api.version} - + +com.sun.activation +jakarta.activation +${activation.version} + javax.annotation javax.annotation-api diff --git a/distribution/src/release/LICENSE b/distribution/src/release/LICENSE index 34521f3..66f2187 100644 --- a/distribution/src/release/LICENSE +++ b/distribution/src/release/LICENSE @@ -272,6 +272,13 @@ You can find a copy of the License at licenses/LICENSE-epl-v10 This product bundles libraries which are licensed under the +Eclipse Distribution License v1.0 +You can find a copy of the License at licenses/LICENSE-edl-v10 + +* Jakarta Activation (com.sun.activation:jakarta.activation:1.2.1 - http://www.aspectj.org) + + +This product bundles libraries which are licensed under the Eclipse Public License v2.0. You can find a copy of the License at licenses/LICENSE-epl-v20 diff --git a/distribution/src/release/licenses/LICENSE-edl-v10 b/distribution/src/release/licenses/LICENSE-edl-v10 new file mode 100644 index 000..a4a267e --- /dev/null +++ b/distribution/src/release/licenses/LICENSE-edl-v10 @@ -0,0 +1,12 @@ +Eclipse Distribution License - v 1.0 + +Copyright (c) 2007, Eclipse Foundation, Inc. and its licensors. + +All rights reserved. + +Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: + +Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. +Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. +Neither the name of the Eclipse Foundation, Inc. nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFI [...] \ No newline at end of file diff --git a/foundations/foundation-common/pom.xml b/foundations/foundation-common/pom.xml index 75bbc34..ba12a8a 100644 --- a/foundations/foundation-common/pom.xml +++ b/foundations/foundation-common/pom.xml @@ -28,6 +28,10 @@ + com.sun.activation + jakarta.activation + + com.fasterxml.jackson.dataformat jackson-dataformat-xml diff --git a/parents/default/pom.xml b/parents/default/pom.xml index fd67ffc..25c4820 100644 --- a/parents/default/pom.xml +++ b/parents/default/pom.xml @@ -24,7 +24,7 @@ org.apache.servicecomb java-chassis-dependencies 2.0.0-SNAPSHOT -../../java-chassis-dependencies/default +../../dependencies/default java-chassis-parent
[GitHub] [servicecomb-java-chassis] liubao68 commented on issue #1518: [SCB-1711] support kie
liubao68 commented on issue #1518: [SCB-1711] support kie URL: https://github.com/apache/servicecomb-java-chassis/pull/1518#issuecomment-584955432 retrigger CI 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-java-chassis] branch master updated: [SCB-1763] upgrade netty and tcnative (#1567)
This is an automated email from the ASF dual-hosted git repository. liubao pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/servicecomb-java-chassis.git The following commit(s) were added to refs/heads/master by this push: new 5384666 [SCB-1763] upgrade netty and tcnative (#1567) 5384666 is described below commit 53846661b77f82dc421397e89a7682ab365035ed Author: Wayne AuthorDate: Wed Feb 12 08:55:49 2020 +0800 [SCB-1763] upgrade netty and tcnative (#1567) * update netty version to 4.1.45.Final and related tcnative version * update netty and tcnative version in release LICENSE * remove unused dependencies from LICENSE --- dependencies/default/pom.xml | 4 ++-- distribution/src/release/LICENSE | 28 +--- 2 files changed, 15 insertions(+), 17 deletions(-) diff --git a/dependencies/default/pom.xml b/dependencies/default/pom.xml index ce9da32..a2e3db4 100644 --- a/dependencies/default/pom.xml +++ b/dependencies/default/pom.xml @@ -84,7 +84,7 @@ 3.10.4 5.3.2.Final 0.3.0 -4.1.43.Final +4.1.45.Final 3.14.2 1.6.2 0.6.0 @@ -107,7 +107,7 @@ 4.2 1.5.22 1.3.3 -2.0.26.Final +2.0.28.Final 0.10 2.6.0 3.8.3 diff --git a/distribution/src/release/LICENSE b/distribution/src/release/LICENSE index fa12414..34521f3 100644 --- a/distribution/src/release/LICENSE +++ b/distribution/src/release/LICENSE @@ -519,21 +519,19 @@ For details, see their respective project links. * nailgun-server (com.martiansoftware:nailgun-server:0.9.1 - http://martiansoftware.com/nailgun) * netflix-commons-util (com.netflix.netflix-commons:netflix-commons-util:0.1.1 - https://github.com/Netflix/netflix-commons) * netflix-statistics (com.netflix.netflix-commons:netflix-statistics:0.1.1 - https://github.com/Netflix/netflix-commons) -* Netty/Buffer (io.netty:netty-buffer:4.1.43.Final - http://netty.io/netty-buffer/) -* Netty/Codec/DNS (io.netty:netty-codec-dns:4.1.43.Final - http://netty.io/netty-codec-dns/) -* Netty/Codec/HTTP (io.netty:netty-codec-http:4.1.43.Final - http://netty.io/netty-codec-http/) -* Netty/Codec/HTTP2 (io.netty:netty-codec-http2:4.1.43.Final - http://netty.io/netty-codec-http2/) -* Netty/Codec/Socks (io.netty:netty-codec-socks:4.1.43.Final - http://netty.io/netty-codec-socks/) -* Netty/Codec (io.netty:netty-codec:4.1.43.Final - http://netty.io/netty-codec/) -* Netty/Common (io.netty:netty-common:4.1.43.Final - http://netty.io/netty-common/) -* Netty/Handler/Proxy (io.netty:netty-handler-proxy:4.1.43.Final - http://netty.io/netty-handler-proxy/) -* Netty/Handler (io.netty:netty-handler:4.1.43.Final - http://netty.io/netty-handler/) -* Netty/Resolver/DNS (io.netty:netty-resolver-dns:4.1.43.Final - http://netty.io/netty-resolver-dns/) -* Netty/Resolver (io.netty:netty-resolver:4.1.43.Final - http://netty.io/netty-resolver/) -* Netty/TomcatNative [BoringSSL - Static] (io.netty:netty-tcnative-boringssl-static:2.0.26.Final - https://github.com/netty/netty-tcnative/netty-tcnative-boringssl-static/) -* Netty/Transport/Native/Epoll (io.netty:netty-transport-native-epoll:4.1.36.Final - http://netty.io/netty-transport-native-epoll/) -* Netty/Transport/Native/Unix/Common (io.netty:netty-transport-native-unix-common:4.1.36.Final - http://netty.io/netty-transport-native-unix-common/) -* Netty/Transport (io.netty:netty-transport:4.1.43.Final - http://netty.io/netty-transport/) +* Netty/Buffer (io.netty:netty-buffer:4.1.45.Final - http://netty.io/netty-buffer/) +* Netty/Codec/DNS (io.netty:netty-codec-dns:4.1.45.Final - http://netty.io/netty-codec-dns/) +* Netty/Codec/HTTP (io.netty:netty-codec-http:4.1.45.Final - http://netty.io/netty-codec-http/) +* Netty/Codec/HTTP2 (io.netty:netty-codec-http2:4.1.45.Final - http://netty.io/netty-codec-http2/) +* Netty/Codec/Socks (io.netty:netty-codec-socks:4.1.45.Final - http://netty.io/netty-codec-socks/) +* Netty/Codec (io.netty:netty-codec:4.1.45.Final - http://netty.io/netty-codec/) +* Netty/Common (io.netty:netty-common:4.1.45.Final - http://netty.io/netty-common/) +* Netty/Handler/Proxy (io.netty:netty-handler-proxy:4.1.45.Final - http://netty.io/netty-handler-proxy/) +* Netty/Handler (io.netty:netty-handler:4.1.45.Final - http://netty.io/netty-handler/) +* Netty/Resolver/DNS (io.netty:netty-resolver-dns:4.1.45.Final - http://netty.io/netty-resolver-dns/) +* Netty/Resolver (io.netty:netty-resolver:4.1.45.Final - http://netty.io/netty-resolver/) +* Netty/TomcatNative [BoringSSL - Static] (io.netty:netty-tcnative-boringssl-static:2.0.28.Final - https://github.com/netty/netty-tcnative/netty-tcnative-boringssl-static/) +* Netty/Transport (io.netty:netty-transport:4.1.45.Final - http://netty.io/netty-transport/) * nio-multipart-parser (org.synchronoss.cloud:nio-multipart-parser:1.1.0 - https://github.com/synchronoss/nio-multipart/nio-multipart-parser) * Objenesis
[GitHub] [servicecomb-java-chassis] liubao68 merged pull request #1567: [SCB-1763] upgrade netty and tcnative
liubao68 merged pull request #1567: [SCB-1763] upgrade netty and tcnative URL: https://github.com/apache/servicecomb-java-chassis/pull/1567 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-docs] liubao68 merged pull request #128: fix image link problem
liubao68 merged pull request #128: fix image link problem URL: https://github.com/apache/servicecomb-docs/pull/128 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-docs] branch master updated: fix image link problem
This is an automated email from the ASF dual-hosted git repository. liubao pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/servicecomb-docs.git The following commit(s) were added to refs/heads/master by this push: new 4451d33 fix image link problem 4451d33 is described below commit 4451d337638fb2f0600fcabe45e3bccfc55478d4 Author: liubao AuthorDate: Wed Feb 12 10:22:22 2020 +0800 fix image link problem --- java-chassis-reference/en_US/docs/build-provider/thread-pool.md | 2 +- java-chassis-reference/en_US/docs/edge/by-servicecomb-sdk.md | 8 java-chassis-reference/en_US/docs/general-development/metrics.md | 2 +- .../en_US/docs/general-development/multienvironment.md| 8 java-chassis-reference/en_US/docs/general-development/reactive.md | 8 .../en_US/docs/general-development/thread-model.md| 4 ++-- .../en_US/docs/references-handlers/loadbalance.md | 2 +- java-chassis-reference/en_US/docs/start/architecture.md | 2 +- java-chassis-reference/en_US/docs/transports/verticle-count.md| 2 +- .../using-java-chassis-in-spring-boot.md | 4 ++-- java-chassis-reference/en_US/mkdocs.yml | 1 + java-chassis-reference/zh_CN/docs/build-provider/thread-pool.md | 2 +- java-chassis-reference/zh_CN/docs/edge/by-servicecomb-sdk.md | 8 .../zh_CN/docs/general-development/local-develop-test.md | 4 ++-- java-chassis-reference/zh_CN/docs/general-development/metrics.md | 2 +- .../zh_CN/docs/general-development/multienvironment.md| 8 java-chassis-reference/zh_CN/docs/general-development/reactive.md | 8 .../zh_CN/docs/general-development/thread-model.md| 4 ++-- .../zh_CN/docs/references-handlers/loadbalance.md | 2 +- java-chassis-reference/zh_CN/docs/start/architecture.md | 2 +- java-chassis-reference/zh_CN/docs/transports/verticle-count.md| 2 +- .../using-java-chassis-in-spring-boot.md | 4 ++-- java-chassis-reference/zh_CN/mkdocs.yml | 1 + 23 files changed, 46 insertions(+), 44 deletions(-) diff --git a/java-chassis-reference/en_US/docs/build-provider/thread-pool.md b/java-chassis-reference/en_US/docs/build-provider/thread-pool.md index 2bf4d50..8506e70 100644 --- a/java-chassis-reference/en_US/docs/build-provider/thread-pool.md +++ b/java-chassis-reference/en_US/docs/build-provider/thread-pool.md @@ -27,7 +27,7 @@ If the business has special requirements, you can specify to use a custom global ## ServiceComb built-in thread pool In a general thread pool, all threads share a task queue. In this case, all network threads need to apply for the same queue to join the queue. All threads in the thread pool need to grab the task from the same queue. Throughput scenarios, which can lead to competitive conflicts and create performance bottlenecks Therefore, in order to improve performance, ServiceComb's built-in thread pool is actually a wrapper of real thread pools, allowing multiple sets of thread pools to be configured inside, and each network thread is bound to a set of thread pools to reduce contention conflicts. -![](/assets/producer-default-executor.png) +![](../assets/producer-default-executor.png) * Before version 1.2.0 diff --git a/java-chassis-reference/en_US/docs/edge/by-servicecomb-sdk.md b/java-chassis-reference/en_US/docs/edge/by-servicecomb-sdk.md index b849ac6..30ebcae 100644 --- a/java-chassis-reference/en_US/docs/edge/by-servicecomb-sdk.md +++ b/java-chassis-reference/en_US/docs/edge/by-servicecomb-sdk.md @@ -58,7 +58,7 @@ servicecomb: The workflow of the Edge Service is as follows, the blue background part is executed in the Eventloop thread, and the yellow background part: * If working in reactive mode, execute directly in the Eventloop thread * If working in thread pool mode, execute in the thread pool thread -![](/assets/workFlow.png) +![](../assets/workFlow.png) ## Custom routing rules The core job of using the Edge Service is to configure routing rules. The rules are different, and the rules are different. @@ -139,7 +139,7 @@ Through the Edge Service workflow, you can see that the Edge Service features ca ## Deployment example -![](/assets/deployment.png) +![](../assets/deployment.png) ## Operating mode @@ -157,7 +157,7 @@ The Edge Service works by default in the high-performance reactive mode. This mo The underlying Edge Service is based on netty's vertx. The above constraint is netty's reactive mode constraint. -![](/assets/reactive.png) +![](../assets/reactive.png) ### Thread Pool @@ -173,7 +173,7 @@ servicecomb: Here servicecomb.executor.groupThreadPool is the beanId of the spring bean corresponding to the default thread pool built into ServiceComb; the service can customize its thread
[GitHub] [servicecomb-java-chassis] liubao68 commented on issue #1555: [SCB-1643] add a slution to integrate with huaweicloud
liubao68 commented on issue #1555: [SCB-1643] add a slution to integrate with huaweicloud URL: https://github.com/apache/servicecomb-java-chassis/pull/1555#issuecomment-585072060 > > @WillemJiang I check the meaning of 'optional' in maven, this can not fullfil the purpose of the PR. By adding this, I want users include the file without notice to run across local and cloud. If 'optional' is defined, users still need to add this dependency in their pom. This is quite like not have this PR. > > 'optional' means it's not used by default, I'm not talking about the maven optional scope, I'm talking about if the user want to write the application to run with Huawei Cloud , he can add the dependency pom, but when we do the Apache release, we don't include this dependency pom by default. ```solution-basic``` is optional to users, they may not use this pom. The purpose of adding this pom is for easier of deploy. Or users will always be noticed to include the dependency and configure repositories. 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-docs] liubao68 opened a new pull request #129: [SCB-1764]add porter appliation to docs and fix known problems
liubao68 opened a new pull request #129: [SCB-1764]add porter appliation to docs and fix known problems URL: https://github.com/apache/servicecomb-docs/pull/129 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-kie] GuoYL123 commented on a change in pull request #90: #79 record polling history
GuoYL123 commented on a change in pull request #90: #79 record polling history URL: https://github.com/apache/servicecomb-kie/pull/90#discussion_r378062463 ## File path: server/resource/v1/kv_resource.go ## @@ -189,6 +200,37 @@ func returnData(rctx *restful.Context, domain interface{}, project string, label } } +//RecordPollingDetail to record data after get or list +func RecordPollingDetail(context *restful.Context, revStr, wait, domain, project string, labels map[string]string, limit, offset int64, insId string) { + Wg.Add(1) + data := {} + data.ID = insId + domain Review comment: done 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] WillemJiang commented on issue #1555: [SCB-1643] add a slution to integrate with huaweicloud
WillemJiang commented on issue #1555: [SCB-1643] add a slution to integrate with huaweicloud URL: https://github.com/apache/servicecomb-java-chassis/pull/1555#issuecomment-585070548 > @WillemJiang I check the meaning of 'optional' in maven, this can not fullfil the purpose of the PR. By adding this, I want users include the file without notice to run across local and cloud. If 'optional' is defined, users still need to add this dependency in their pom. This is quite like not have this PR. 'optional' means it's not used by default, I'm not talking about the maven optional scope, I'm talking about if the user want to write the application to run with Huawei Cloud , he can add the dependency pom, but when we do the Apache release, we don't include this dependency pom by default. 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] liubao68 commented on a change in pull request #1561: [SCB-1748] support colon in path value
liubao68 commented on a change in pull request #1561: [SCB-1748] support colon in path value URL: https://github.com/apache/servicecomb-java-chassis/pull/1561#discussion_r377999033 ## File path: foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/http/HttpUtils.java ## @@ -94,6 +97,14 @@ public static String encodePathParam(String pathParam) { return UrlEscapers.urlPathSegmentEscaper().escape(pathParam); } + public static String decodePathParam(String pathParam) throws UnsupportedEncodingException { +String res = uriDecodePath(pathParam); +if (StringUtils.isEmpty(res)) { + return URLDecoder.decode(pathParam, "UTF-8"); +} +return res; + } + public static String uriDecodePath(String path) { if (path == null) { Review comment: This function seems not correct. According to the java docs, URL(path) will not parse the path, users should use ```new URI(null, null, path, null);``` to parse the parse 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] GuoYL123 commented on a change in pull request #1561: [SCB-1748] support colon in path value
GuoYL123 commented on a change in pull request #1561: [SCB-1748] support colon in path value URL: https://github.com/apache/servicecomb-java-chassis/pull/1561#discussion_r378034428 ## File path: foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/http/HttpUtils.java ## @@ -94,6 +97,14 @@ public static String encodePathParam(String pathParam) { return UrlEscapers.urlPathSegmentEscaper().escape(pathParam); } + public static String decodePathParam(String pathParam) throws UnsupportedEncodingException { +String res = uriDecodePath(pathParam); +if (StringUtils.isEmpty(res)) { + return URLDecoder.decode(pathParam, "UTF-8"); Review comment: `URLDecoder.decode(pathParam, "UTF-8") `can not handle the '+' . there is a ut show that : org.apache.servicecomb.common.rest.codec.param.TestPathProcessor#testGetPlus. 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-docs] liubao68 opened a new pull request #130: fix link error of md files
liubao68 opened a new pull request #130: fix link error of md files URL: https://github.com/apache/servicecomb-docs/pull/130 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-kie] tianxiaoliang commented on a change in pull request #90: #79 record polling history
tianxiaoliang commented on a change in pull request #90: #79 record polling history URL: https://github.com/apache/servicecomb-kie/pull/90#discussion_r378055513 ## File path: server/resource/v1/kv_resource.go ## @@ -189,6 +200,37 @@ func returnData(rctx *restful.Context, domain interface{}, project string, label } } +//RecordPollingDetail to record data after get or list +func RecordPollingDetail(context *restful.Context, revStr, wait, domain, project string, labels map[string]string, limit, offset int64, insId string) { + Wg.Add(1) + data := {} + data.ID = insId + domain Review comment: insId + domain只是数据库里的unique id, 不用拼在一起,id就是服务端生成的uuid,增加个字段session id来代替这个insId 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] liubao68 commented on issue #1555: [SCB-1643] add a slution to integrate with huaweicloud
liubao68 commented on issue #1555: [SCB-1643] add a slution to integrate with huaweicloud URL: https://github.com/apache/servicecomb-java-chassis/pull/1555#issuecomment-585065271 @WillemJiang I check the meaning of 'optional' in maven, this can not fullfil the purpose of the PR. By adding this, I want users include the file without notice to run across local and cloud. If 'optional' is defined, users still need to add this dependency in their pom. This is quite like not have this PR. 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-docs] liubao68 opened a new pull request #128: fix image link problem
liubao68 opened a new pull request #128: fix image link problem URL: https://github.com/apache/servicecomb-docs/pull/128 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-docs] liubao68 merged pull request #129: [SCB-1764]add porter appliation to docs and fix known problems
liubao68 merged pull request #129: [SCB-1764]add porter appliation to docs and fix known problems URL: https://github.com/apache/servicecomb-docs/pull/129 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-kie] GuoYL123 commented on a change in pull request #90: #79 record polling history
GuoYL123 commented on a change in pull request #90: #79 record polling history URL: https://github.com/apache/servicecomb-kie/pull/90#discussion_r378060521 ## File path: server/service/mongo/record/polling_detail_dao.go ## @@ -0,0 +1,34 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You 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 record + +import ( + "context" + "github.com/apache/servicecomb-kie/pkg/model" + "github.com/apache/servicecomb-kie/server/service/mongo/session" +) + +//CreateRecord to create a record +func CreateRecord(ctx context.Context, detail *model.PollingDetail) (*model.PollingDetail, error) { Review comment: 改成了 CreateOrUpdateRecord 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-kie] GuoYL123 commented on a change in pull request #90: #79 record polling history
GuoYL123 commented on a change in pull request #90: #79 record polling history URL: https://github.com/apache/servicecomb-kie/pull/90#discussion_r378060330 ## File path: server/resource/v1/common.go ## @@ -232,3 +233,20 @@ func queryAndResponse(rctx *restful.Context, openlogging.Error(err.Error()) } } + +//ClientIP try to get ip from http header +func ClientIP(r *http.Request) string { Review comment: done 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] liubao68 commented on a change in pull request #1561: [SCB-1748] support colon in path value
liubao68 commented on a change in pull request #1561: [SCB-1748] support colon in path value URL: https://github.com/apache/servicecomb-java-chassis/pull/1561#discussion_r377997205 ## File path: common/common-rest/src/main/java/org/apache/servicecomb/common/rest/codec/param/PathProcessorCreator.java ## @@ -17,7 +17,9 @@ package org.apache.servicecomb.common.rest.codec.param; +import java.io.UnsupportedEncodingException; import java.lang.reflect.Type; +import java.net.URLDecoder; Review comment: remove unused import 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-docs] branch master updated: [SCB-1764]add porter appliation to docs and fix known problems
This is an automated email from the ASF dual-hosted git repository. liubao pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/servicecomb-docs.git The following commit(s) were added to refs/heads/master by this push: new 5dd9c27 [SCB-1764]add porter appliation to docs and fix known problems 5dd9c27 is described below commit 5dd9c27e12c328c3e500b54fb0504139f87afae5 Author: liubao AuthorDate: Wed Feb 12 11:29:11 2020 +0800 [SCB-1764]add porter appliation to docs and fix known problems --- .gitignore | 8 +- .../docs/general-development/local-develop-test.md | 4 +- .../en_US/docs/general-development/metrics.md | 2 +- .../docs/featured-topics/application-porter.md | 35 .../application-porter/authentication.md | 226 + .../featured-topics/application-porter/design.md | 24 +++ .../application-porter/file-service.md | 80 .../application-porter/gateway-service.md | 147 ++ .../featured-topics/application-porter/https.md| 36 .../application-porter/microservices.png | Bin 0 -> 30451 bytes .../application-porter/porter-website.md | 109 ++ .../application-porter/user-service.md | 146 + .../application-porter/user-story.md | 6 + .../application-porter/usercase.png| Bin 0 -> 16992 bytes .../docs/general-development/local-develop-test.md | 4 +- .../zh_CN/docs/general-development/metrics.md | 4 +- java-chassis-reference/zh_CN/mkdocs.yml| 1 + 17 files changed, 825 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 1a05e5d..1d48d9c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,8 @@ /.idea -/target \ No newline at end of file +/target + +# IntelliJ, based on http://devnet.jetbrains.net/docs/DOC-1186 +.idea/ +*.iml +*.ipr +*.iws \ No newline at end of file diff --git a/java-chassis-reference/en_US/docs/general-development/local-develop-test.md b/java-chassis-reference/en_US/docs/general-development/local-develop-test.md index c0346b9..dcf5c6a 100644 --- a/java-chassis-reference/en_US/docs/general-development/local-develop-test.md +++ b/java-chassis-reference/en_US/docs/general-development/local-develop-test.md @@ -3,9 +3,9 @@ This section describes how developers can locally develop and commission consumer and provider applications. Both service providers and consumers need to connect to the remote service center. Two methods of building Local ServiceCenter for local microservice commissioning are as follows: -* Starting [Local Service Center](#section2945986191314)。 +* Starting [Local Service Center](#starting-local-servicecenter). -* Starting Local Service Center [Mock mechanism](#section960893593759)。 +* Starting Local Service Center [Mock mechanism](#mock-mechanism-start-service-center). ### Local debugging by setting up environmental information diff --git a/java-chassis-reference/en_US/docs/general-development/metrics.md b/java-chassis-reference/en_US/docs/general-development/metrics.md index d54a409..b846991 100644 --- a/java-chassis-reference/en_US/docs/general-development/metrics.md +++ b/java-chassis-reference/en_US/docs/general-development/metrics.md @@ -49,7 +49,7 @@ _Note: Please change the version field to the actual version number; if the vers ### 3. Slow call detection After slow call detection is enabled, if there is a slow call, the corresponding log will be output immediately: ``` -2019-04-02 23:01:09,103[WARN][pool-7-thread-74][5ca37935c00ff2c7-350076] - slow(40 ms) invocation, CONSUMER highway perf1.impl.syncQuery +2019-04-02 23:01:09,103\[WARN]\[pool-7-thread-74]\[5ca37935c00ff2c7-350076] - slow(40 ms) invocation, CONSUMER highway perf1.impl.syncQuery http method: GET url: /v1/syncQuery/{id}/ server : highway://192.168.0.152:7070?login=true diff --git a/java-chassis-reference/zh_CN/docs/featured-topics/application-porter.md b/java-chassis-reference/zh_CN/docs/featured-topics/application-porter.md new file mode 100644 index 000..a6ee34b --- /dev/null +++ b/java-chassis-reference/zh_CN/docs/featured-topics/application-porter.md @@ -0,0 +1,35 @@ +# 示例项目:porter + +示例项目包含如下章节: + + * [User Story](application-porter/user-story.md) + * [设计微服务](application-porter/design.md) + * [开发界面\(porter-website\)](application-porter/porter-website.md) + * [开发文件上传功能\(file-service\)](application-porter/file-service.md) + * [开发网关\(gateway-service\)](application-porter/gateway-service.md) + * [使用MyBatis访问数据库\(user-service\)](application-porter/user-service.md) + * [进行认证和鉴权设计](application-porter/authentication.md) + * [网关HTTPS安全配置](application-porter/https.md) + +示例项目的出发点是帮助开发者开发一个完整的微服务应用。通过一个典型的应用场景,展现一个微服务应用需要解决那些问题,在不同的章节里面,会详细解释解决解决这些问题的技术原理和实现过程。 + +这个应用场景,是通过收集了一些用户的真实业务场景提取出来的。具体包括: + +1. 一个推荐的微服务设计方案; + +2. 认证鉴权; +
[GitHub] [servicecomb-java-chassis] GuoYL123 commented on a change in pull request #1561: [SCB-1748] support colon in path value
GuoYL123 commented on a change in pull request #1561: [SCB-1748] support colon in path value URL: https://github.com/apache/servicecomb-java-chassis/pull/1561#discussion_r378035068 ## File path: foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/http/HttpUtils.java ## @@ -94,6 +97,14 @@ public static String encodePathParam(String pathParam) { return UrlEscapers.urlPathSegmentEscaper().escape(pathParam); } + public static String decodePathParam(String pathParam) throws UnsupportedEncodingException { +String res = uriDecodePath(pathParam); +if (StringUtils.isEmpty(res)) { + return URLDecoder.decode(pathParam, "UTF-8"); +} +return res; + } + public static String uriDecodePath(String path) { if (path == null) { Review comment: use `new URI(null, null, path, null);` will cause ut failed: org.apache.servicecomb.common.rest.codec.param.TestPathProcessor#testGetSpaceEncoded `new URI(null, null, path, null);` can not convert '%20' to ' ' 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] GuoYL123 commented on a change in pull request #1561: [SCB-1748] support colon in path value
GuoYL123 commented on a change in pull request #1561: [SCB-1748] support colon in path value URL: https://github.com/apache/servicecomb-java-chassis/pull/1561#discussion_r378035293 ## File path: common/common-rest/src/main/java/org/apache/servicecomb/common/rest/codec/param/PathProcessorCreator.java ## @@ -17,7 +17,9 @@ package org.apache.servicecomb.common.rest.codec.param; +import java.io.UnsupportedEncodingException; import java.lang.reflect.Type; +import java.net.URLDecoder; Review comment: done 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-kie] tianxiaoliang commented on a change in pull request #90: #79 record polling history
tianxiaoliang commented on a change in pull request #90: #79 record polling history URL: https://github.com/apache/servicecomb-kie/pull/90#discussion_r377981474 ## File path: server/resource/v1/common.go ## @@ -232,3 +233,20 @@ func queryAndResponse(rctx *restful.Context, openlogging.Error(err.Error()) } } + +//ClientIP try to get ip from http header +func ClientIP(r *http.Request) string { Review comment: 这个放到pkg包下,属于通用lib 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-kie] tianxiaoliang commented on a change in pull request #90: #79 record polling history
tianxiaoliang commented on a change in pull request #90: #79 record polling history URL: https://github.com/apache/servicecomb-kie/pull/90#discussion_r377981851 ## File path: server/resource/v1/kv_resource.go ## @@ -130,9 +137,11 @@ func (r *KVResource) List(rctx *restful.Context) { returnData(rctx, domain, project, labels, limit, offset) } +// func returnData(rctx *restful.Context, domain interface{}, project string, labels map[string]string, limit, offset int64) { revStr := rctx.ReadQueryParameter(common.QueryParamRev) wait := rctx.ReadQueryParameter(common.QueryParamWait) + go RecordPollingDetail(rctx, revStr, wait, domain.(string), project, labels, limit, offset) Review comment: 不能够这么搞,应该在handler里根据url和method判断是polling动作就进分支记录polling信息 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-kie] tianxiaoliang commented on a change in pull request #90: #79 record polling history
tianxiaoliang commented on a change in pull request #90: #79 record polling history URL: https://github.com/apache/servicecomb-kie/pull/90#discussion_r377982142 ## File path: server/service/mongo/record/polling_detail_dao.go ## @@ -0,0 +1,34 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You 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 record + +import ( + "context" + "github.com/apache/servicecomb-kie/pkg/model" + "github.com/apache/servicecomb-kie/server/service/mongo/session" +) + +//CreateRecord to create a record +func CreateRecord(ctx context.Context, detail *model.PollingDetail) (*model.PollingDetail, error) { Review comment: polling 应当有update和create2个方法 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] liubao68 closed pull request #1518: [SCB-1711] support kie
liubao68 closed pull request #1518: [SCB-1711] support kie URL: https://github.com/apache/servicecomb-java-chassis/pull/1518 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] GuoYL123 opened a new pull request #1518: [SCB-1711] support kie
GuoYL123 opened a new pull request #1518: [SCB-1711] support kie URL: https://github.com/apache/servicecomb-java-chassis/pull/1518 (cherry picked from commit 833af5050ca3e26e75b327b499b0f9534f55d8b6) Follow this checklist to help us incorporate your contribution quickly and easily: - [ ] Make sure there is a [JIRA issue](https://issues.apache.org/jira/browse/SCB) filed for the change (usually before you start working on it). Trivial changes like typos do not require a JIRA issue. Your pull request should address just this issue, without pulling in other changes. - [ ] Each commit in the pull request should have a meaningful subject line and body. - [ ] Format the pull request title like `[SCB-XXX] Fixes bug in ApproximateQuantiles`, where you replace `SCB-XXX` with the appropriate JIRA issue. - [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Run `mvn clean install -Pit` to make sure basic checks pass. A more thorough check will be performed on your pull request automatically. - [ ] If this contribution is large, please file an Apache [Individual Contributor License Agreement](https://www.apache.org/licenses/icla.pdf). --- 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] coveralls edited a comment on issue #1518: [SCB-1711] support kie
coveralls edited a comment on issue #1518: [SCB-1711] support kie URL: https://github.com/apache/servicecomb-java-chassis/pull/1518#issuecomment-572986333 [![Coverage Status](https://coveralls.io/builds/28673589/badge)](https://coveralls.io/builds/28673589) Coverage decreased (-0.3%) to 84.953% when pulling **2791e3caf4a7c5d088826e4abf6a6d926f04bebf on GuoYL123:master** into **d49c6a85716c8b179e88ca9be2937b1b23e87234 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-java-chassis] liubao68 commented on issue #1561: [SCB-1748] support colon in path value
liubao68 commented on issue #1561: [SCB-1748] support colon in path value URL: https://github.com/apache/servicecomb-java-chassis/pull/1561#issuecomment-585060007 I think the current modification is not correct, need more analyse. For reference, you can look at ```org.springframework.web.util.UriUtils``` and This test case seems not correct ``` @Test public void uriDecode_failed() { expectedException.expect(IllegalArgumentException.class); expectedException .expectMessage(Matchers.is("uriDecode failed, path=\":\".")); expectedException.expectCause(Matchers.instanceOf(URISyntaxException.class)); HttpUtils.uriDecodePath(":"); } ``` 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] liubao68 commented on a change in pull request #1561: [SCB-1748] support colon in path value
liubao68 commented on a change in pull request #1561: [SCB-1748] support colon in path value URL: https://github.com/apache/servicecomb-java-chassis/pull/1561#discussion_r377998726 ## File path: foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/http/HttpUtils.java ## @@ -94,6 +97,14 @@ public static String encodePathParam(String pathParam) { return UrlEscapers.urlPathSegmentEscaper().escape(pathParam); } + public static String decodePathParam(String pathParam) throws UnsupportedEncodingException { +String res = uriDecodePath(pathParam); +if (StringUtils.isEmpty(res)) { + return URLDecoder.decode(pathParam, "UTF-8"); Review comment: Is ``` URLDecoder.decode(pathParam, "UTF-8");``` is enough? I think it is enough to use URLEncoder and URLDecoder to encode/decode path segments, and use URI to encode/decode path. 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-kie] tianxiaoliang opened a new issue #92: 分页功能需要在body里返回total size作为前台渲染依据
tianxiaoliang opened a new issue #92: 分页功能需要在body里返回total size作为前台渲染依据 URL: https://github.com/apache/servicecomb-kie/issues/92 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] liubao68 merged pull request #1518: [SCB-1711] support kie
liubao68 merged pull request #1518: [SCB-1711] support kie URL: https://github.com/apache/servicecomb-java-chassis/pull/1518 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-java-chassis] branch master updated: [SCB-1711] support kie (#1518)
This is an automated email from the ASF dual-hosted git repository. liubao pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/servicecomb-java-chassis.git The following commit(s) were added to refs/heads/master by this push: new ca69cee [SCB-1711] support kie (#1518) ca69cee is described below commit ca69ceeec7a6eae824ad749dba15e8a6b9389ba3 Author: GuoYL <53255576+guoyl...@users.noreply.github.com> AuthorDate: Wed Feb 12 11:46:28 2020 +0800 [SCB-1711] support kie (#1518) * [SCB-1711] support kie (cherry picked from commit 833af5050ca3e26e75b327b499b0f9534f55d8b6) (cherry picked from commit cb19774f1ee1ac900c3d0be6c21b841a1758da0a) * [SCB-1711] optimization code --- coverage-reports/pom.xml | 4 + dependencies/default/pom.xml | 5 + distribution/pom.xml | 4 + .../config-kie}/pom.xml| 33 ++-- .../sources/KieConfigurationSourceImpl.java| 131 + .../config/kie/client/ConnFailEvent.java | 35 .../config/kie/client/ConnSuccEvent.java | 22 +++ .../servicecomb/config/kie/client/KieClient.java | 165 + .../servicecomb/config/kie/client/KieConfig.java | 98 ++ .../servicecomb/config/kie/client/KieUtil.java | 148 +++ .../servicecomb/config/kie/client/KieWatcher.java | 86 + .../servicecomb/config/kie/model/KVBody.java | 65 +++ .../apache/servicecomb/config/kie/model/KVDoc.java | 118 .../servicecomb/config/kie/model/KVResponse.java | 73 .../config/kie/model/LabelDocResponse.java | 46 + .../servicecomb/config/kie/model/ValueType.java| 37 ...comb.config.spi.ConfigCenterConfigurationSource | 18 ++ .../config/kie/client/TestKieClient.java | 205 + .../config/kie/client/TestKieConfig.java | 46 + .../config/kie/client/TestKieWatcher.java | 54 ++ .../kie/sources/TestKieConfigurationSource.java| 96 ++ .../src/test/resources/microservice.yaml | 56 ++ dynamic-config/pom.xml | 1 + handlers/handler-router/pom.xml| 1 + 24 files changed, 1528 insertions(+), 19 deletions(-) diff --git a/coverage-reports/pom.xml b/coverage-reports/pom.xml index 1103359..30a9100 100644 --- a/coverage-reports/pom.xml +++ b/coverage-reports/pom.xml @@ -184,6 +184,10 @@ org.apache.servicecomb + config-kie + + + org.apache.servicecomb edge-core diff --git a/dependencies/default/pom.xml b/dependencies/default/pom.xml index 15539c0..56c7903 100644 --- a/dependencies/default/pom.xml +++ b/dependencies/default/pom.xml @@ -1077,6 +1077,11 @@ org.apache.servicecomb +config-kie +${project.version} + + +org.apache.servicecomb deployment ${project.version} diff --git a/distribution/pom.xml b/distribution/pom.xml index 4f97aee..47afed4 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -61,6 +61,10 @@ org.apache.servicecomb config-cc + + org.apache.servicecomb + config-kie + diff --git a/handlers/handler-router/pom.xml b/dynamic-config/config-kie/pom.xml similarity index 69% copy from handlers/handler-router/pom.xml copy to dynamic-config/config-kie/pom.xml index f5b02d1..4aa67e5 100644 --- a/handlers/handler-router/pom.xml +++ b/dynamic-config/config-kie/pom.xml @@ -1,4 +1,5 @@ +
[GitHub] [servicecomb-java-chassis] liubao68 commented on issue #1555: [SCB-1643] add a slution to integrate with huaweicloud
liubao68 commented on issue #1555: [SCB-1643] add a slution to integrate with huaweicloud URL: https://github.com/apache/servicecomb-java-chassis/pull/1555#issuecomment-585013732 Users use it without notice. By adding this, samples provided in servicecomb-samples can run both in local and cloud 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-docs] branch master updated: fix link error of md files
This is an automated email from the ASF dual-hosted git repository. liubao pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/servicecomb-docs.git The following commit(s) were added to refs/heads/master by this push: new 46861d9 fix link error of md files 46861d9 is described below commit 46861d96abba4c67314c4000e28744b92639d5e7 Author: liubao AuthorDate: Wed Feb 12 12:01:24 2020 +0800 fix link error of md files --- .../en_US/docs/build-consumer/circuit-breaker.md | 2 +- .../en_US/docs/build-consumer/using-resttemplate.md | 2 +- java-chassis-reference/en_US/docs/build-consumer/with-contract.md | 2 +- java-chassis-reference/en_US/docs/build-provider/springmvc.md | 2 +- java-chassis-reference/en_US/docs/edge/zuul.md| 2 +- .../en_US/docs/general-development/thread-model.md| 6 +++--- .../en_US/docs/references-handlers/loadbalance.md | 2 +- java-chassis-reference/en_US/docs/transports/highway-rpc.md | 8 java-chassis-reference/en_US/docs/transports/rest-over-vertx.md | 8 .../zh_CN/docs/build-consumer/circuit-breaker.md | 2 +- java-chassis-reference/zh_CN/docs/build-consumer/with-contract.md | 2 +- java-chassis-reference/zh_CN/docs/build-provider/springmvc.md | 2 +- java-chassis-reference/zh_CN/docs/edge/zuul.md| 2 +- .../zh_CN/docs/general-development/thread-model.md| 6 +++--- .../zh_CN/docs/references-handlers/loadbalance.md | 2 +- java-chassis-reference/zh_CN/docs/transports/highway-rpc.md | 8 java-chassis-reference/zh_CN/docs/transports/rest-over-vertx.md | 8 17 files changed, 33 insertions(+), 33 deletions(-) diff --git a/java-chassis-reference/en_US/docs/build-consumer/circuit-breaker.md b/java-chassis-reference/en_US/docs/build-consumer/circuit-breaker.md index 543e140..4cdbd9f 100644 --- a/java-chassis-reference/en_US/docs/build-consumer/circuit-breaker.md +++ b/java-chassis-reference/en_US/docs/build-consumer/circuit-breaker.md @@ -5,4 +5,4 @@ Circuit brake policy can configure ServiceComb fallback capability, you can conf ### Configuration -Circuit break is part of fallback policy when a service request is abnormal, relevant concept such as isolation and fault tolerance please refer to [fallback policy](/build-provider/configuration/downgrade-strategy.md)。 +Circuit break is part of fallback policy when a service request is abnormal, relevant concept such as isolation and fault tolerance please refer to [fallback policy](../build-provider/configuration/downgrade-strategy.md)。 diff --git a/java-chassis-reference/en_US/docs/build-consumer/using-resttemplate.md b/java-chassis-reference/en_US/docs/build-consumer/using-resttemplate.md index 4a2e34a..514dc2a 100644 --- a/java-chassis-reference/en_US/docs/build-consumer/using-resttemplate.md +++ b/java-chassis-reference/en_US/docs/build-consumer/using-resttemplate.md @@ -68,7 +68,7 @@ public class JaxrsConsumerMain { ``` > NOTE: > -> - The URL should be in format: `cse//microserviceName/path?querystring`. Taking the provider example from [Develop micro service with SpringMVC](/java-chassis-reference/en_US/build-provider/springmvc.md), the micro service's name is `springmvc`, the basePath is `/springmvchello`, then the microserviceName in the URL is `springmvc`, the path to call sayhi is `springmvchello/sayhi`, so the URL for sayhi in the sample is `cse://springmvc/springmvchello/sayhi?name=Java Chassis`, below is t [...] +> - The URL should be in format: `cse//microserviceName/path?querystring`. Taking the provider example from [Develop micro service with SpringMVC](../build-provider/springmvc.md), the micro service's name is `springmvc`, the basePath is `/springmvchello`, then the microserviceName in the URL is `springmvc`, the path to call sayhi is `springmvchello/sayhi`, so the URL for sayhi in the sample is `cse://springmvc/springmvchello/sayhi?name=Java Chassis`, below is the code for the provider: ```java @RestSchema(schemaId = "springmvcHello") diff --git a/java-chassis-reference/en_US/docs/build-consumer/with-contract.md b/java-chassis-reference/en_US/docs/build-consumer/with-contract.md index 54d077a..d861341 100644 --- a/java-chassis-reference/en_US/docs/build-consumer/with-contract.md +++ b/java-chassis-reference/en_US/docs/build-consumer/with-contract.md @@ -32,7 +32,7 @@ servicecomb: ### Manually Configure Contracts -When providers' contracts are obtained from off-line, they should be put into the specific directory of the consumer project. The directory is the one mentioned in the configuration description [Service Contract](/java-chassis-reference/en_US/build-provider/define-contract.md). +When providers' contracts are obtained from off-line, they should be put into the specific directory of the consumer project. The directory
[GitHub] [servicecomb-docs] liubao68 merged pull request #130: fix link error of md files
liubao68 merged pull request #130: fix link error of md files URL: https://github.com/apache/servicecomb-docs/pull/130 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-docs] branch master updated: fix some links errors
This is an automated email from the ASF dual-hosted git repository. liubao pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/servicecomb-docs.git The following commit(s) were added to refs/heads/master by this push: new 3810a04 fix some links errors 3810a04 is described below commit 3810a042d80d2df5153b4e63e106894d0c44ba5d Author: liubao AuthorDate: Wed Feb 12 13:00:22 2020 +0800 fix some links errors --- .../en_US/docs/assets/sc-meta.png | Bin 0 -> 9109 bytes .../definition/isolate-relationship.md | 54 + java-chassis-reference/en_US/docs/edge/zuul.md | 2 +- .../en_US/docs/general-development/thread-model.md | 1 + .../zh_CN/docs/assets/sc-meta.png | Bin 0 -> 9109 bytes .../definition/isolate-relationship.md | 54 + java-chassis-reference/zh_CN/docs/edge/zuul.md | 2 +- .../zh_CN/docs/general-development/thread-model.md | 1 + 8 files changed, 112 insertions(+), 2 deletions(-) diff --git a/java-chassis-reference/en_US/docs/assets/sc-meta.png b/java-chassis-reference/en_US/docs/assets/sc-meta.png new file mode 100644 index 000..d8ffa84 Binary files /dev/null and b/java-chassis-reference/en_US/docs/assets/sc-meta.png differ diff --git a/java-chassis-reference/en_US/docs/build-provider/definition/isolate-relationship.md b/java-chassis-reference/en_US/docs/build-provider/definition/isolate-relationship.md new file mode 100644 index 000..14d25b8 --- /dev/null +++ b/java-chassis-reference/en_US/docs/build-provider/definition/isolate-relationship.md @@ -0,0 +1,54 @@ +## 场景描述 + +进行服务发现的时候,开发者需要了解本微服务能够发现那些其他服务的实例。ServiceComb提供了分层次的实例隔离。 + +# 微服务实例分层管理 + +要了解实例间的隔离层次,首先需要了解ServiceComb定义的一个体系完备的微服务系统结构: + +![](../../assets/sc-meta.png) + +在微服务系统结构中,顶层是“项目”,在项目下分为多个租户,租户中包含多个应用,而每个应用由包含多个环境,即测试和生产环境可以分开。在某个特定应用的特定环境中,包含多个微服务,而一个微服务又可以同时存在多个版本。以上,是所有静态元数据的范畴,某个特定服务的特定版本则包含多个在运行时注册上来的微服务实例,因为服务实例的信息在运行时随着系统的伸缩、故障等原因是动态变化的,所以服务实例的路由信息又为动态数据。通过分层管理微服务的这些数据,也就自然而然的实现了实例之间的逻辑隔离。 + +# 隔离层次说明 + +ServiceComb支持自定义分层配置,满足用户的实例分层管理需求,以下是具体配置说明。 + +* 应用ID + +通过APPLICATIOIN\_ID来定义,缺省值为default。微服务在发现实例的时候,缺省只能够被相同APPLICATIOIN\_ID下的消费者发现。 + +* Domain名称 + +通过cse.config.client.domainName来定义,缺省值为default。作为微服务提供者,用于表明自身所属租户信息。微服务在发现实例的时候,只能被相同租户下的消费者发现。 + +* 数据中心信息 + +数据中心包括3个属性:cse.datacenter.name, cse.datacenter.region, cse.datacenter.availableZone。数据中心信息不提供隔离能力,微服务可以发现其他数据中心的实例。但是可以通过启用实例亲和性,来优先往指定的区域或者Zone发消息: + +``` +cse: + loadbalance: +serverListFilters: zoneaware +serverListFilter: + zoneaware: +className: org.apache.servicecomb.loadbalance.filter.ZoneAwareServerListFilterExt +``` + +这样配置后,客户端在路由的时候,会优先将请求转发到zone/region都相同的实例,然后是region相同,但zone不相同的实例,都不相同的时候,则按照路由规则选择一个。亲和性不是逻辑隔离,只要实例之间网络是联通的,那么都有可能访问到;如果网络不通,则会访问失败。 + +* 环境信息 + +在yaml文件里通过service\_description.environment来配置,同时支持通过环境变量SERVICECOMB\_ENV配置,仅支持以下枚举值 development,testing,acceptance,production,缺省值为""\(空\)。微服务在发现实例的时候,缺省只能够被相同environment下的消费者发现。 + +``` +service_description: + environment: production +``` + + + +# 与华为公有云概念的对应关系 + +华为公有云有类似的概念,应用、租户、Project、Cluster等,在实际应用的时候,可以分别对应到ServiceComb的应用、租户、Domain、Zone等信息。比如在公有云上如果Cluster共享Project,那么就可以通过zone来对应Cluster,实现集群之间的亲和性访问。 + diff --git a/java-chassis-reference/en_US/docs/edge/zuul.md b/java-chassis-reference/en_US/docs/edge/zuul.md index 04731b0..d7c8ed7 100644 --- a/java-chassis-reference/en_US/docs/edge/zuul.md +++ b/java-chassis-reference/en_US/docs/edge/zuul.md @@ -29,7 +29,7 @@ Zuul is the API Gateway, which is to establish a Zuul Proxy application. All the ## Precautions -The demos such as ZuulProxy and ZuulServer described in this section are based on SpringBoot and ServiceComb frameworks. For details, please refer to [using java chassis in Spring Boot] (using-java-chassis-in-spring-boot.md). +The demos such as ZuulProxy and ZuulServer described in this section are based on SpringBoot and ServiceComb frameworks. For details, please refer to [using java chassis in Spring Boot] (../using-java-chassis-in-spring-boot/using-java-chassis-in-spring-boot.md). ## Launching Zuul Proxy diff --git a/java-chassis-reference/en_US/docs/general-development/thread-model.md b/java-chassis-reference/en_US/docs/general-development/thread-model.md index 0b79bc5..129a4e7 100644 --- a/java-chassis-reference/en_US/docs/general-development/thread-model.md +++ b/java-chassis-reference/en_US/docs/general-development/thread-model.md @@ -9,6 +9,7 @@ ![](../assets/reactive-thread-model.png) Thread related configuration: + * [REST over Vertx](../build-provider/protocol/rest-over-vertx.md) * [Highway](../build-provider/protocol/highway-rpc.md) * [Server business thread pool in synchronous mode](../build-provider/thread-pool.md) diff --git a/java-chassis-reference/zh_CN/docs/assets/sc-meta.png b/java-chassis-reference/zh_CN/docs/assets/sc-meta.png new file mode 100644 index 000..d8ffa84 Binary files
[GitHub] [servicecomb-docs] liubao68 merged pull request #131: fix some links errors
liubao68 merged pull request #131: fix some links errors URL: https://github.com/apache/servicecomb-docs/pull/131 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-docs] liubao68 opened a new pull request #131: fix some links errors
liubao68 opened a new pull request #131: fix some links errors URL: https://github.com/apache/servicecomb-docs/pull/131 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] GuoYL123 edited a comment on issue #1518: [SCB-1711] support kie
GuoYL123 edited a comment on issue #1518: [SCB-1711] support kie URL: https://github.com/apache/servicecomb-java-chassis/pull/1518#issuecomment-584515205 I defined version in ./dependencies/default/pom.xml. But CI still failed ,it tell me version is missing. 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-kie] tianxiaoliang commented on a change in pull request #91: #78 #80 add status and create/update time
tianxiaoliang commented on a change in pull request #91: #78 #80 add status and create/update time URL: https://github.com/apache/servicecomb-kie/pull/91#discussion_r377531176 ## File path: server/resource/v1/common.go ## @@ -200,8 +198,19 @@ func checkPagination(limitStr, offsetStr string) (int64, int64, error) { } return limit, offset, err } + +func checkStatus(status string) (string, error) { + var err error + if status != "" { + if status != common.Enabled && status != common.Disabled { + return "", err Review comment: 这个err没有定义 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-kie] tianxiaoliang commented on a change in pull request #91: #78 #80 add status and create/update time
tianxiaoliang commented on a change in pull request #91: #78 #80 add status and create/update time URL: https://github.com/apache/servicecomb-kie/pull/91#discussion_r377529814 ## File path: pkg/common/common.go ## @@ -46,9 +46,11 @@ const ( ContentTypeYaml = "text/yaml" ) -//const for server/resource/v1 +//const of server const ( PatternExact= "exact" + Enabled = "enabled" Review comment: 加个前缀Status 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-docs] chenxingwei-wayne opened a new pull request #126: [SCB-1473] Add the description about the config item of max request body size
chenxingwei-wayne opened a new pull request #126: [SCB-1473] Add the description about the config item of max request body size URL: https://github.com/apache/servicecomb-docs/pull/126 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-docs] liubao68 merged pull request #125: [SCB-1762] change gitbook to mkdoc
liubao68 merged pull request #125: [SCB-1762] change gitbook to mkdoc URL: https://github.com/apache/servicecomb-docs/pull/125 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-docs] liubao68 opened a new pull request #125: [SCB-1762] change gitbook to mkdoc
liubao68 opened a new pull request #125: [SCB-1762] change gitbook to mkdoc URL: https://github.com/apache/servicecomb-docs/pull/125 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-kie] GuoYL123 opened a new pull request #91: #78 #80 add status and create/update time
GuoYL123 opened a new pull request #91: #78 #80 add status and create/update time URL: https://github.com/apache/servicecomb-kie/pull/91 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] liubao68 commented on issue #1518: [SCB-1711] support kie
liubao68 commented on issue #1518: [SCB-1711] support kie URL: https://github.com/apache/servicecomb-java-chassis/pull/1518#issuecomment-584553002 retrigger CI 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] GuoYL123 opened a new pull request #1518: [SCB-1711] support kie
GuoYL123 opened a new pull request #1518: [SCB-1711] support kie URL: https://github.com/apache/servicecomb-java-chassis/pull/1518 (cherry picked from commit 833af5050ca3e26e75b327b499b0f9534f55d8b6) Follow this checklist to help us incorporate your contribution quickly and easily: - [ ] Make sure there is a [JIRA issue](https://issues.apache.org/jira/browse/SCB) filed for the change (usually before you start working on it). Trivial changes like typos do not require a JIRA issue. Your pull request should address just this issue, without pulling in other changes. - [ ] Each commit in the pull request should have a meaningful subject line and body. - [ ] Format the pull request title like `[SCB-XXX] Fixes bug in ApproximateQuantiles`, where you replace `SCB-XXX` with the appropriate JIRA issue. - [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Run `mvn clean install -Pit` to make sure basic checks pass. A more thorough check will be performed on your pull request automatically. - [ ] If this contribution is large, please file an Apache [Individual Contributor License Agreement](https://www.apache.org/licenses/icla.pdf). --- 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] liubao68 closed pull request #1518: [SCB-1711] support kie
liubao68 closed pull request #1518: [SCB-1711] support kie URL: https://github.com/apache/servicecomb-java-chassis/pull/1518 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] liubao68 commented on issue #1569: query about the thirdParty service rest schema
liubao68 commented on issue #1569: query about the thirdParty service rest schema URL: https://github.com/apache/servicecomb-java-chassis/issues/1569#issuecomment-584607210 a service can register itself, not registered by others. 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] liubao68 commented on a change in pull request #1567: Netty shouldn't allow the invalid fold: https://github.com/netty/netty/issues/9866 Fix netty issues by updatin
liubao68 commented on a change in pull request #1567: Netty shouldn't allow the invalid fold: https://github.com/netty/netty/issues/9866 Fix netty issues by updating netty version to 4.1.45.Final and related tcnative version URL: https://github.com/apache/servicecomb-java-chassis/pull/1567#discussion_r377599215 ## File path: distribution/src/release/LICENSE ## @@ -519,21 +519,21 @@ For details, see their respective project links. * nailgun-server (com.martiansoftware:nailgun-server:0.9.1 - http://martiansoftware.com/nailgun) * netflix-commons-util (com.netflix.netflix-commons:netflix-commons-util:0.1.1 - https://github.com/Netflix/netflix-commons) * netflix-statistics (com.netflix.netflix-commons:netflix-statistics:0.1.1 - https://github.com/Netflix/netflix-commons) -* Netty/Buffer (io.netty:netty-buffer:4.1.43.Final - http://netty.io/netty-buffer/) -* Netty/Codec/DNS (io.netty:netty-codec-dns:4.1.43.Final - http://netty.io/netty-codec-dns/) -* Netty/Codec/HTTP (io.netty:netty-codec-http:4.1.43.Final - http://netty.io/netty-codec-http/) -* Netty/Codec/HTTP2 (io.netty:netty-codec-http2:4.1.43.Final - http://netty.io/netty-codec-http2/) -* Netty/Codec/Socks (io.netty:netty-codec-socks:4.1.43.Final - http://netty.io/netty-codec-socks/) -* Netty/Codec (io.netty:netty-codec:4.1.43.Final - http://netty.io/netty-codec/) -* Netty/Common (io.netty:netty-common:4.1.43.Final - http://netty.io/netty-common/) -* Netty/Handler/Proxy (io.netty:netty-handler-proxy:4.1.43.Final - http://netty.io/netty-handler-proxy/) -* Netty/Handler (io.netty:netty-handler:4.1.43.Final - http://netty.io/netty-handler/) -* Netty/Resolver/DNS (io.netty:netty-resolver-dns:4.1.43.Final - http://netty.io/netty-resolver-dns/) -* Netty/Resolver (io.netty:netty-resolver:4.1.43.Final - http://netty.io/netty-resolver/) -* Netty/TomcatNative [BoringSSL - Static] (io.netty:netty-tcnative-boringssl-static:2.0.26.Final - https://github.com/netty/netty-tcnative/netty-tcnative-boringssl-static/) +* Netty/Buffer (io.netty:netty-buffer:4.1.45.Final - http://netty.io/netty-buffer/) +* Netty/Codec/DNS (io.netty:netty-codec-dns:4.1.45.Final - http://netty.io/netty-codec-dns/) +* Netty/Codec/HTTP (io.netty:netty-codec-http:4.1.45.Final - http://netty.io/netty-codec-http/) +* Netty/Codec/HTTP2 (io.netty:netty-codec-http2:4.1.45.Final - http://netty.io/netty-codec-http2/) +* Netty/Codec/Socks (io.netty:netty-codec-socks:4.1.45.Final - http://netty.io/netty-codec-socks/) +* Netty/Codec (io.netty:netty-codec:4.1.45.Final - http://netty.io/netty-codec/) +* Netty/Common (io.netty:netty-common:4.1.45.Final - http://netty.io/netty-common/) +* Netty/Handler/Proxy (io.netty:netty-handler-proxy:4.1.45.Final - http://netty.io/netty-handler-proxy/) +* Netty/Handler (io.netty:netty-handler:4.1.45.Final - http://netty.io/netty-handler/) +* Netty/Resolver/DNS (io.netty:netty-resolver-dns:4.1.45.Final - http://netty.io/netty-resolver-dns/) +* Netty/Resolver (io.netty:netty-resolver:4.1.45.Final - http://netty.io/netty-resolver/) +* Netty/TomcatNative [BoringSSL - Static] (io.netty:netty-tcnative-boringssl-static:2.0.28.Final - https://github.com/netty/netty-tcnative/netty-tcnative-boringssl-static/) * Netty/Transport/Native/Epoll (io.netty:netty-transport-native-epoll:4.1.36.Final - http://netty.io/netty-transport-native-epoll/) * Netty/Transport/Native/Unix/Common (io.netty:netty-transport-native-unix-common:4.1.36.Final - http://netty.io/netty-transport-native-unix-common/) Review comment: Please check if these two dependencies is used. If not used, delete it. 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-docs] liubao68 commented on issue #126: [SCB-1473] Add the description about the config item of max request body size
liubao68 commented on issue #126: [SCB-1473] Add the description about the config item of max request body size URL: https://github.com/apache/servicecomb-docs/pull/126#issuecomment-584615413 document structure is changed, please resolve the confilicts. @chenxingwei-wayne 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-docs] liubao68 opened a new pull request #127: fix compile problem
liubao68 opened a new pull request #127: fix compile problem URL: https://github.com/apache/servicecomb-docs/pull/127 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-docs] liubao68 merged pull request #127: fix compile problem
liubao68 merged pull request #127: fix compile problem URL: https://github.com/apache/servicecomb-docs/pull/127 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-docs] branch master updated: fix compile problem (#127)
This is an automated email from the ASF dual-hosted git repository. liubao pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/servicecomb-docs.git The following commit(s) were added to refs/heads/master by this push: new d660c58 fix compile problem (#127) d660c58 is described below commit d660c581ce6762196a31491ad41ccc46afe717f4 Author: bao liu AuthorDate: Tue Feb 11 20:46:27 2020 +0800 fix compile problem (#127) --- scripts/travis.sh | 9 ++--- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/scripts/travis.sh b/scripts/travis.sh index 6bf1042..41e1a64 100644 --- a/scripts/travis.sh +++ b/scripts/travis.sh @@ -33,18 +33,13 @@ if [ "$1" == "script" ]; then git clone --depth=10 --branch=master https://$PUSH_TARGET_URL servicecomb-java-chassis-doc if [ "$TRAVIS_BRANCH" == "master" ]; then -mkdir servicecomb-java-chassis-doc/temp -cp -r servicecomb-java-chassis-doc/docs/java-chassis/1.x servicecomb-java-chassis-doc/temp -ls -l servicecomb-java-chassis-doc/temp -ls -l servicecomb-java-chassis-doc/temp/1.x -rm -r servicecomb-java-chassis-doc/docs/java-chassis/* +rm -r servicecomb-java-chassis-doc/docs/java-chassis/zh_CN/* +rm -r servicecomb-java-chassis-doc/docs/java-chassis/en_US/* rm -r servicecomb-java-chassis-doc/docs/saga/* rm -r servicecomb-java-chassis-doc/docs/service-center/* cp -r docs/ servicecomb-java-chassis-doc/ -cp -r servicecomb-java-chassis-doc/temp/1.x servicecomb-java-chassis-doc/docs/java-chassis ls -l servicecomb-java-chassis-doc/docs/java-chassis ls -l servicecomb-java-chassis-doc/docs/java-chassis/1.x -rm -r servicecomb-java-chassis-doc/temp else exit 1 fi
[GitHub] [servicecomb-kie] tianxiaoliang merged pull request #91: #78 #80 add status and create/update time
tianxiaoliang merged pull request #91: #78 #80 add status and create/update time URL: https://github.com/apache/servicecomb-kie/pull/91 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: #78 #80 add status and create/update time (#91)
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 9489010 #78 #80 add status and create/update time (#91) 9489010 is described below commit 94890104f9d0702517d3de9d991d2e1589dfc9ba Author: GuoYL <53255576+guoyl...@users.noreply.github.com> AuthorDate: Tue Feb 11 21:45:07 2020 +0800 #78 #80 add status and create/update time (#91) * add status and create/update time * modify as comment --- deployments/db.js | 11 ++- go.sum| 3 +++ pkg/common/common.go | 4 +++- pkg/model/db_schema.go| 3 +++ server/resource/v1/common.go | 17 ++--- server/resource/v1/kv_resource.go | 31 --- server/service/mongo/kv/kv_dao.go | 7 +++ server/service/options.go | 8 8 files changed, 72 insertions(+), 12 deletions(-) diff --git a/deployments/db.js b/deployments/db.js index ef6e407..1fa2520 100644 --- a/deployments/db.js +++ b/deployments/db.js @@ -42,7 +42,16 @@ db.createCollection( "kv", { }, labels: { bsonType: "object" -} +}, +create_time: { +bsonType: "string", +}, +update_time: { +bsonType: "string", +}, +status: { +bsonType: "string", +}, } } } } ); diff --git a/go.sum b/go.sum index 7880f67..96a71c3 100644 --- a/go.sum +++ b/go.sum @@ -178,8 +178,10 @@ github.com/klauspost/compress v1.9.5/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= +github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/markbates/oncer v0.0.0-20181203154359-bf2de49a0be2/go.mod h1:Ld9puTsIW75CHf65OeIOkyKbteujpZVXDpWK6YGZbxE= @@ -368,6 +370,7 @@ google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRn google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4= diff --git a/pkg/common/common.go b/pkg/common/common.go index 7d5a4e1..a6bd6bb 100644 --- a/pkg/common/common.go +++ b/pkg/common/common.go @@ -46,9 +46,11 @@ const ( ContentTypeYaml = "text/yaml" ) -//const for server/resource/v1 +//const of server const ( PatternExact= "exact" + StatusEnabled = "enabled" + StatusDisabled = "disabled" MsgDomainMustNotBeEmpty = "domain must not be empty" MsgIllegalLabels= "label value can not be empty, " + "label can not be duplicated, please check query parameters" diff --git a/pkg/model/db_schema.go b/pkg/model/db_schema.go index 19922f4..950e0cd 100644 --- a/pkg/model/db_schema.go +++ b/pkg/model/db_schema.go @@ -38,6 +38,9 @@ type KVDoc struct { CreateRevision int64 `json:"create_revision,omitempty" bson:"create_revision," yaml:"create_revision,omitempty"` UpdateRevision int64 `json:"update_revision,omitempty" bson:"update_revision," yaml:"update_revision,omitempty"` Projectstring `json:"project,omitempty" yaml:"project,omitempty"` + Status string `json:"status,omitempty" yaml:"status,omitempty"` + CreatTime string `json:"create_time,omitempty" yaml:"create_time,omitempty"` + UpdateTime string
[GitHub] [servicecomb-java-chassis] chenxingwei-wayne commented on a change in pull request #1567: [SCB-1763] upgrade netty and tcnative
chenxingwei-wayne commented on a change in pull request #1567: [SCB-1763] upgrade netty and tcnative URL: https://github.com/apache/servicecomb-java-chassis/pull/1567#discussion_r377720564 ## File path: distribution/src/release/LICENSE ## @@ -519,21 +519,21 @@ For details, see their respective project links. * nailgun-server (com.martiansoftware:nailgun-server:0.9.1 - http://martiansoftware.com/nailgun) * netflix-commons-util (com.netflix.netflix-commons:netflix-commons-util:0.1.1 - https://github.com/Netflix/netflix-commons) * netflix-statistics (com.netflix.netflix-commons:netflix-statistics:0.1.1 - https://github.com/Netflix/netflix-commons) -* Netty/Buffer (io.netty:netty-buffer:4.1.43.Final - http://netty.io/netty-buffer/) -* Netty/Codec/DNS (io.netty:netty-codec-dns:4.1.43.Final - http://netty.io/netty-codec-dns/) -* Netty/Codec/HTTP (io.netty:netty-codec-http:4.1.43.Final - http://netty.io/netty-codec-http/) -* Netty/Codec/HTTP2 (io.netty:netty-codec-http2:4.1.43.Final - http://netty.io/netty-codec-http2/) -* Netty/Codec/Socks (io.netty:netty-codec-socks:4.1.43.Final - http://netty.io/netty-codec-socks/) -* Netty/Codec (io.netty:netty-codec:4.1.43.Final - http://netty.io/netty-codec/) -* Netty/Common (io.netty:netty-common:4.1.43.Final - http://netty.io/netty-common/) -* Netty/Handler/Proxy (io.netty:netty-handler-proxy:4.1.43.Final - http://netty.io/netty-handler-proxy/) -* Netty/Handler (io.netty:netty-handler:4.1.43.Final - http://netty.io/netty-handler/) -* Netty/Resolver/DNS (io.netty:netty-resolver-dns:4.1.43.Final - http://netty.io/netty-resolver-dns/) -* Netty/Resolver (io.netty:netty-resolver:4.1.43.Final - http://netty.io/netty-resolver/) -* Netty/TomcatNative [BoringSSL - Static] (io.netty:netty-tcnative-boringssl-static:2.0.26.Final - https://github.com/netty/netty-tcnative/netty-tcnative-boringssl-static/) +* Netty/Buffer (io.netty:netty-buffer:4.1.45.Final - http://netty.io/netty-buffer/) +* Netty/Codec/DNS (io.netty:netty-codec-dns:4.1.45.Final - http://netty.io/netty-codec-dns/) +* Netty/Codec/HTTP (io.netty:netty-codec-http:4.1.45.Final - http://netty.io/netty-codec-http/) +* Netty/Codec/HTTP2 (io.netty:netty-codec-http2:4.1.45.Final - http://netty.io/netty-codec-http2/) +* Netty/Codec/Socks (io.netty:netty-codec-socks:4.1.45.Final - http://netty.io/netty-codec-socks/) +* Netty/Codec (io.netty:netty-codec:4.1.45.Final - http://netty.io/netty-codec/) +* Netty/Common (io.netty:netty-common:4.1.45.Final - http://netty.io/netty-common/) +* Netty/Handler/Proxy (io.netty:netty-handler-proxy:4.1.45.Final - http://netty.io/netty-handler-proxy/) +* Netty/Handler (io.netty:netty-handler:4.1.45.Final - http://netty.io/netty-handler/) +* Netty/Resolver/DNS (io.netty:netty-resolver-dns:4.1.45.Final - http://netty.io/netty-resolver-dns/) +* Netty/Resolver (io.netty:netty-resolver:4.1.45.Final - http://netty.io/netty-resolver/) +* Netty/TomcatNative [BoringSSL - Static] (io.netty:netty-tcnative-boringssl-static:2.0.28.Final - https://github.com/netty/netty-tcnative/netty-tcnative-boringssl-static/) * Netty/Transport/Native/Epoll (io.netty:netty-transport-native-epoll:4.1.36.Final - http://netty.io/netty-transport-native-epoll/) * Netty/Transport/Native/Unix/Common (io.netty:netty-transport-native-unix-common:4.1.36.Final - http://netty.io/netty-transport-native-unix-common/) Review comment: netty-transport-native-epoll exists in our pom file, but it was excluded by exclusion tag, so we can say we don't use it. netty-transport-native-unix-common we don't use it. 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