瀏覽代碼

[ci fw-only Java/t-io] Tio 3.1.6 (#3980)

* [ci fw-only java/t-io] update t-io to 3.1.6

* [ci fw-only Java/t-io] recommit to trigger ci on t-io
Green Luo 7 年之前
父節點
當前提交
3c015180fa

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

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

+ 8 - 50
frameworks/Java/t-io/pom.xml

@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>org.t-io</groupId>
 		<artifactId>tio-http-parent</artifactId>
-		<version>3.1.3.v20180720-RELEASE</version>
+		<version>3.1.6.v20180808-RELEASE</version>
 	</parent>
 
 	<properties>
@@ -21,62 +21,19 @@
 		<dependency>
 			<groupId>org.t-io</groupId>
 			<artifactId>tio-http-server</artifactId>
-			<!-- 因为没用集群,所以可以把redisson依赖的netty全部排除掉 -->
-			<exclusions>
-				<exclusion>
-					<groupId>io.netty</groupId>
-					<artifactId>netty-common</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>io.netty</groupId>
-					<artifactId>netty-buffer</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>io.netty</groupId>
-					<artifactId>netty-resolver-dns</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>io.netty</groupId>
-					<artifactId>netty-codec</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>io.netty</groupId>
-					<artifactId>netty-handler</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>io.netty</groupId>
-					<artifactId>netty-transport</artifactId>
-				</exclusion>
-			</exclusions>
 		</dependency>
 		
 		<!-- slf4j-logback绑定 -->
 		<dependency>
 			<groupId>ch.qos.logback</groupId>
 			<artifactId>logback-classic</artifactId>
+			<exclusions>
+				<exclusion>
+					<groupId>com.sun.mail</groupId>
+					<artifactId>javax.mail</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
-		<dependency>
-			<groupId>ch.qos.logback</groupId>
-			<artifactId>logback-access</artifactId>
-		</dependency>
-
-
-		<!-- redirect apache commons logging -->
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>jcl-over-slf4j</artifactId>
-		</dependency>
-		<!-- redirect jdk util logging -->
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>jul-to-slf4j</artifactId>
-		</dependency>
-		<!-- redirect log4j -->
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>log4j-over-slf4j</artifactId>
-		</dependency>
-
 	</dependencies>
 
 	<build>
@@ -136,3 +93,4 @@
 	</build>
 
 </project>
+

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

@@ -23,8 +23,6 @@ public class TestController {
 		
 	@RequestPath(value = "json")
 	public HttpResponse json(HttpRequest request) throws Exception {
-		request.channelContext.groupContext.setUseQueueSend(false);
-		
 		//更高性能的写法
 		HttpResponse ret = new HttpResponse(request);
 		ret.setBody(Json.toJson(new Message(HELLO_WORLD)).getBytes());
@@ -37,8 +35,6 @@ public class TestController {
 
 	@RequestPath(value = "plaintext")
 	public HttpResponse plaintext(HttpRequest request) throws Exception {
-		request.channelContext.groupContext.setUseQueueSend(true);
-		
 		//更高性能的写法
 		HttpResponse ret = new HttpResponse(request);
 		ret.setBody(HELLO_WORLD_BYTES);

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

@@ -34,7 +34,6 @@ public class HttpServerInit {
 		requestHandler = new DefaultHttpRequestHandler(httpConfig, routes);
 		httpServerStarter = new HttpServerStarter(httpConfig, requestHandler);
 		serverGroupContext = httpServerStarter.getServerGroupContext();
-//		serverGroupContext.setUseQueueDecode(true);
 		serverGroupContext.statOn = false;
 		httpServerStarter.start();
 	}