Browse Source

[ci fw-only Java/t-io] update tio-mvc to 3.1.1 (#3921)

Green Luo 7 years ago
parent
commit
f06b9ebb5e

+ 1 - 1
frameworks/Java/t-io/README.md

@@ -10,7 +10,7 @@ These implementations use the t-io's controller.
 
 
 
 
 ## Versions
 ## Versions
-3.1.0.v20180705-RELEASE (https://gitee.com/tywo45/t-io)
+3.1.1.v20180712-RELEASE (https://gitee.com/tywo45/t-io)
 
 
 ## Test URLs
 ## Test URLs
 
 

+ 1 - 1
frameworks/Java/t-io/pom.xml

@@ -8,7 +8,7 @@
 	<parent>
 	<parent>
 		<groupId>org.t-io</groupId>
 		<groupId>org.t-io</groupId>
 		<artifactId>tio-http-parent</artifactId>
 		<artifactId>tio-http-parent</artifactId>
-		<version>3.1.0.v20180705-RELEASE</version>
+		<version>3.1.1.v20180712-RELEASE</version>
 	</parent>
 	</parent>
 
 
 	<properties>
 	<properties>

+ 22 - 5
frameworks/Java/t-io/src/main/java/org/tio/http/server/benchmark/controller/TestController.java

@@ -1,11 +1,12 @@
 package org.tio.http.server.benchmark.controller;
 package org.tio.http.server.benchmark.controller;
 
 
+import org.tio.http.common.HeaderName;
+import org.tio.http.common.HeaderValue;
 import org.tio.http.common.HttpRequest;
 import org.tio.http.common.HttpRequest;
 import org.tio.http.common.HttpResponse;
 import org.tio.http.common.HttpResponse;
-import org.tio.http.common.MimeType;
 import org.tio.http.server.annotation.RequestPath;
 import org.tio.http.server.annotation.RequestPath;
 import org.tio.http.server.benchmark.model.Message;
 import org.tio.http.server.benchmark.model.Message;
-import org.tio.http.server.util.Resps;
+import org.tio.utils.json.Json;
 
 
 /**
 /**
  * ab -k -n1000000 -c10 http://127.0.0.1:8080/json
  * ab -k -n1000000 -c10 http://127.0.0.1:8080/json
@@ -19,16 +20,32 @@ public class TestController {
 	private static final String HELLO_WORLD = "Hello, World!";
 	private static final String HELLO_WORLD = "Hello, World!";
 	
 	
 	private static final byte[] HELLO_WORLD_BYTES = HELLO_WORLD.getBytes();
 	private static final byte[] HELLO_WORLD_BYTES = HELLO_WORLD.getBytes();
-	
+		
 	@RequestPath(value = "json")
 	@RequestPath(value = "json")
 	public HttpResponse json(HttpRequest request) throws Exception {
 	public HttpResponse json(HttpRequest request) throws Exception {
 		request.channelContext.groupContext.setUseQueueSend(false);
 		request.channelContext.groupContext.setUseQueueSend(false);
-		return Resps.json(request, new Message(HELLO_WORLD));
+		
+		//更高性能的写法
+		HttpResponse ret = new HttpResponse(request);
+		ret.setBody(Json.toJson(new Message(HELLO_WORLD)).getBytes());
+		ret.addHeader(HeaderName.Content_Type, HeaderValue.Content_Type.TEXT_PLAIN_JSON);
+		return ret;
+		
+		//简便写法
+//		return Resps.json(request, new Message(HELLO_WORLD));
 	}
 	}
 
 
 	@RequestPath(value = "plaintext")
 	@RequestPath(value = "plaintext")
 	public HttpResponse plaintext(HttpRequest request) throws Exception {
 	public HttpResponse plaintext(HttpRequest request) throws Exception {
 		request.channelContext.groupContext.setUseQueueSend(true);
 		request.channelContext.groupContext.setUseQueueSend(true);
-		return Resps.bytesWithContentType(request, HELLO_WORLD_BYTES, MimeType.TEXT_PLAIN_TXT.getType());
+		
+		//更高性能的写法
+		HttpResponse ret = new HttpResponse(request);
+		ret.setBody(HELLO_WORLD_BYTES);
+		ret.addHeader(HeaderName.Content_Type, HeaderValue.Content_Type.TEXT_PLAIN_TXT);
+		return ret;
+		
+		//简便写法
+//		return Resps.bytesWithContentType(request, HELLO_WORLD_BYTES, MimeType.TEXT_PLAIN_TXT.getType());
 	}
 	}
 }
 }

+ 4 - 1
frameworks/Java/t-io/src/main/java/org/tio/http/server/benchmark/init/HttpServerInit.java

@@ -25,6 +25,8 @@ public class HttpServerInit {
 		httpConfig = new HttpConfig(8080, null, null, null);
 		httpConfig = new HttpConfig(8080, null, null, null);
 		httpConfig.setUseSession(false);
 		httpConfig.setUseSession(false);
 		httpConfig.setWelcomeFile(null);
 		httpConfig.setWelcomeFile(null);
+		httpConfig.setCheckHost(false);
+		httpConfig.setCompatible1_0(false);
 
 
 		String[] scanPackages = new String[] { TestController.class.getPackage().getName() };
 		String[] scanPackages = new String[] { TestController.class.getPackage().getName() };
 		Routes routes = new Routes(scanPackages);
 		Routes routes = new Routes(scanPackages);
@@ -32,7 +34,8 @@ public class HttpServerInit {
 		requestHandler = new DefaultHttpRequestHandler(httpConfig, routes);
 		requestHandler = new DefaultHttpRequestHandler(httpConfig, routes);
 		httpServerStarter = new HttpServerStarter(httpConfig, requestHandler);
 		httpServerStarter = new HttpServerStarter(httpConfig, requestHandler);
 		serverGroupContext = httpServerStarter.getServerGroupContext();
 		serverGroupContext = httpServerStarter.getServerGroupContext();
-		serverGroupContext.setUseQueueDecode(true);
+//		serverGroupContext.setUseQueueDecode(true);
+		serverGroupContext.statOn = false;
 		httpServerStarter.start();
 		httpServerStarter.start();
 	}
 	}
 }
 }