You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicecomb.apache.org by li...@apache.org on 2018/06/11 08:29:13 UTC
[incubator-servicecomb-java-chassis] 04/04: [SCB-203] change demo
to test features over servlet
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/incubator-servicecomb-java-chassis.git
commit 1203f6c06caefaa61a81b829adfcd42243c912e6
Author: wujimin <wu...@huawei.com>
AuthorDate: Thu Jun 7 16:52:52 2018 +0800
[SCB-203] change demo to test features over servlet
---
demo/demo-server-servlet/pom.xml | 2 +-
.../demo-server-servlet/src/main/resources/microservice.yaml | 5 +++++
demo/demo-server-servlet/src/main/webapp/WEB-INF/web.xml | 1 -
.../apache/servicecomb/demo/signature/ServerSignature.java | 5 +++--
.../apache/servicecomb/demo/signature/SignatureUtils.java | 11 ++++++++---
.../demo/springmvc/server/CodeFirstSpringmvc.java | 12 +++---------
demo/perf/src/main/resources/microservice.yaml | 2 +-
7 files changed, 21 insertions(+), 17 deletions(-)
diff --git a/demo/demo-server-servlet/pom.xml b/demo/demo-server-servlet/pom.xml
index 4c5292b..7ee9e8e 100644
--- a/demo/demo-server-servlet/pom.xml
+++ b/demo/demo-server-servlet/pom.xml
@@ -33,7 +33,7 @@
<dependencies>
<dependency>
<groupId>org.apache.servicecomb.demo</groupId>
- <artifactId>pojo-server</artifactId>
+ <artifactId>springmvc-server</artifactId>
</dependency>
</dependencies>
diff --git a/demo/demo-server-servlet/src/main/resources/microservice.yaml b/demo/demo-server-servlet/src/main/resources/microservice.yaml
index cbcc322..469a68e 100644
--- a/demo/demo-server-servlet/src/main/resources/microservice.yaml
+++ b/demo/demo-server-servlet/src/main/resources/microservice.yaml
@@ -15,7 +15,12 @@
## limitations under the License.
## ---------------------------------------------------------------------------
+cse-config-order: 100
+
servicecomb:
rest:
servlet:
urlPattern: /rest/*
+ address: 0.0.0.0:8080?sslEnabled=false
+ highway:
+ address: 0.0.0.0:7070?sslEnabled=false
diff --git a/demo/demo-server-servlet/src/main/webapp/WEB-INF/web.xml b/demo/demo-server-servlet/src/main/webapp/WEB-INF/web.xml
index 0cddbc2..cb2b22e 100644
--- a/demo/demo-server-servlet/src/main/webapp/WEB-INF/web.xml
+++ b/demo/demo-server-servlet/src/main/webapp/WEB-INF/web.xml
@@ -24,7 +24,6 @@
<param-name>contextConfigLocation</param-name>
<param-value>
classpath*:META-INF/spring/*.bean.xml
- classpath*:app-config.xml
</param-value>
</context-param>
diff --git a/demo/demo-signature/src/main/java/org/apache/servicecomb/demo/signature/ServerSignature.java b/demo/demo-signature/src/main/java/org/apache/servicecomb/demo/signature/ServerSignature.java
index 8ee4ab4..3554061 100644
--- a/demo/demo-signature/src/main/java/org/apache/servicecomb/demo/signature/ServerSignature.java
+++ b/demo/demo-signature/src/main/java/org/apache/servicecomb/demo/signature/ServerSignature.java
@@ -50,8 +50,9 @@ public class ServerSignature implements HttpServerFilter {
String clientSignature = requestEx.getHeader("signature");
LOGGER.info("check request signature, client: {}, server: {}.", clientSignature, signature);
if (!signature.equals(clientSignature)) {
- LOGGER.error("check request signature failed");
- return Response.create(Status.UNAUTHORIZED, "check request signature failed");
+ LOGGER.error("check request signature failed: {}", invocation.getInvocationQualifiedName());
+ return Response
+ .create(Status.UNAUTHORIZED, "check request signature failed: " + invocation.getInvocationQualifiedName());
}
return null;
diff --git a/demo/demo-signature/src/main/java/org/apache/servicecomb/demo/signature/SignatureUtils.java b/demo/demo-signature/src/main/java/org/apache/servicecomb/demo/signature/SignatureUtils.java
index 1435d20..33e485b 100644
--- a/demo/demo-signature/src/main/java/org/apache/servicecomb/demo/signature/SignatureUtils.java
+++ b/demo/demo-signature/src/main/java/org/apache/servicecomb/demo/signature/SignatureUtils.java
@@ -22,6 +22,9 @@ import java.util.Arrays;
import java.util.Comparator;
import java.util.List;
+import javax.ws.rs.core.MediaType;
+
+import org.apache.commons.lang.StringUtils;
import org.apache.servicecomb.foundation.vertx.http.HttpServletRequestEx;
import org.apache.servicecomb.foundation.vertx.http.HttpServletResponseEx;
@@ -55,9 +58,11 @@ public class SignatureUtils {
}
}
- byte[] bytes = requestEx.getBodyBytes();
- if (bytes != null) {
- hasher.putBytes(bytes, 0, requestEx.getBodyBytesLength());
+ if (!StringUtils.startsWithIgnoreCase(requestEx.getContentType(), MediaType.APPLICATION_FORM_URLENCODED)) {
+ byte[] bytes = requestEx.getBodyBytes();
+ if (bytes != null) {
+ hasher.putBytes(bytes, 0, requestEx.getBodyBytesLength());
+ }
}
return hasher.hash().toString();
diff --git a/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/server/CodeFirstSpringmvc.java b/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/server/CodeFirstSpringmvc.java
index 8cae971..8d96d9c 100644
--- a/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/server/CodeFirstSpringmvc.java
+++ b/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/server/CodeFirstSpringmvc.java
@@ -115,10 +115,10 @@ public class CodeFirstSpringmvc {
@RequestMapping(path = "/responseEntity", method = RequestMethod.POST)
public ResponseEntity<Date> responseEntity(InvocationContext c1, @RequestAttribute("date") Date date) {
HttpHeaders headers = new HttpHeaders();
- headers.add("h1", "h1v " + c1.getContext().get(Const.SRC_MICROSERVICE).toString());
+ headers.add("h1", "h1v " + c1.getContext().get(Const.SRC_MICROSERVICE));
InvocationContext c2 = ContextUtils.getInvocationContext();
- headers.add("h2", "h2v " + c2.getContext().get(Const.SRC_MICROSERVICE).toString());
+ headers.add("h2", "h2v " + c2.getContext().get(Const.SRC_MICROSERVICE));
return new ResponseEntity<>(date, headers, HttpStatus.ACCEPTED);
}
@@ -127,13 +127,7 @@ public class CodeFirstSpringmvc {
@ResponseHeader(name = "h2", response = String.class)})
@RequestMapping(path = "/responseEntity", method = RequestMethod.PATCH)
public ResponseEntity<Date> responseEntityPATCH(InvocationContext c1, @RequestAttribute("date") Date date) {
- HttpHeaders headers = new HttpHeaders();
- headers.add("h1", "h1v " + c1.getContext().get(Const.SRC_MICROSERVICE).toString());
-
- InvocationContext c2 = ContextUtils.getInvocationContext();
- headers.add("h2", "h2v " + c2.getContext().get(Const.SRC_MICROSERVICE).toString());
-
- return new ResponseEntity<>(date, headers, HttpStatus.ACCEPTED);
+ return responseEntity(c1, date);
}
@ApiResponse(code = 200, response = User.class, message = "")
diff --git a/demo/perf/src/main/resources/microservice.yaml b/demo/perf/src/main/resources/microservice.yaml
index 254a85b..ffa9c23 100644
--- a/demo/perf/src/main/resources/microservice.yaml
+++ b/demo/perf/src/main/resources/microservice.yaml
@@ -41,7 +41,7 @@ servicecomb:
transport: rest
metrics:
window_time: 1000
-servicecomb.metrics.publisher.defaultLog.enabled: true
+ publisher.defaultLog.enabled: true
sync-count: 10
async-count: 20
--
To stop receiving notification emails like this one, please contact
liubao@apache.org.