Browse Source

udpate smart-http to 1.0.11.1106-beta (#5214)

* update dockerfile

* update to 1.0.10-SNAPSHOT

* update to 1.0.10-beta

* fix bug

* update to 1.0.10.1119-beta

* update to 1.0.10.1128-beta

* 还原代码

* update to 1.0.10.1206-beta

* update to 1.0.10.1209-beta

* update to 1.0.10.1214-beta

* 增加缓冲区

* update to 1.0.10-beta

* update to 1.0.10.1231-beta

* update to 1.0.10.0106-beta

* update to 1.0.0107-beta

* update to 1.0.10.0113-beta

* set new pageSize

* update smart-socket to 1.4.0-rc.2

* update to 1.4.0-rc.3

* update smart-socket to 1.4.0-rc.4

* update  to 1.0.10.0221-beta

* update smart-socket to 1.4.0-rc.5

* update maxCompletionHandlersOnStack

* config thread number

* update  to 1.0.10.0324-beta

* update smart-socket to 1.4.0-rc.9

* update smart-socket to 1.4.0-rc.10

* update smart-socket to 1.4.0-rc.11

* update smart-socket to 1.4.0-rc.13

* update smart-socket to 1.4.0

* update smart-socket to 1.4.1-rc.1

* update smart-socket to 1.4.1-rc.2

* update smart-http to 1.0.10.0501-beta

* set thread config

* update smart-socket to 1.4.1

* update smart-socket to 1.4.0-rc.4

* config thead num

* update smart-http to 1.0.10.0623-beta

* update smart-http to 1.0.10.0630-beta

* update smart-socket to 1.4.2.rc-3

* update smart-socket to 1.4.0-rc.5

* update smart-socket to 1.4.0-rc.6

* update smart-socket to 1.4.0-rc.7

* update smart-socket to 1.4.0-rc.8

* update smart-socket to 1.4.3-rc.2

* update smart-socket to 1.4.3-rc.3

* update smart-socket to 1.4.3-rc.4

* update smart-socket to 1.4.3-rc.5

* update smart-socket to 1.4.3-rc.7

* update smart-socket to 1.4.3-rc.8

* update smart-socket to 1.4.3-rc.9

* Revert "update smart-socket to 1.4.3-rc.9"

This reverts commit 931babe

* update smart-socket to 1.4.3-rc.9

* update thread num

* update smart-socket to 1.4.3

* update smart-socket to 1.4.4.rc-1

* update smart-http to 1.0.10.1006-beta

* update smart-socket to 1.4.3

* update smart-socket to 1.4.4.rc-3

* update smart-socket to 1.4.4

* update smart-socket to 1.4.4.rc-5

* update smart-socket to 1.4.4.rc-6

* update smart-socket to 1.4.4.rc-7

* update smart-http to 1.0.10

* update smart-http to 1.0.11.1106-beta
三刀 5 years ago
parent
commit
6ce6e5f38c

+ 1 - 1
frameworks/Java/smart-socket/pom.xml

@@ -9,7 +9,7 @@
     <parent>
     <parent>
         <groupId>org.smartboot.http</groupId>
         <groupId>org.smartboot.http</groupId>
         <artifactId>smart-http-parent</artifactId>
         <artifactId>smart-http-parent</artifactId>
-        <version>1.0.10</version>
+        <version>1.0.11.1106-beta</version>
     </parent>
     </parent>
     <properties>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

+ 6 - 7
frameworks/Java/smart-socket/src/main/java/org/smartboot/http/Bootstrap.java

@@ -11,12 +11,11 @@ package org.smartboot.http;
 import com.jsoniter.output.JsonStream;
 import com.jsoniter.output.JsonStream;
 import com.jsoniter.output.JsonStreamPool;
 import com.jsoniter.output.JsonStreamPool;
 import com.jsoniter.spi.JsonException;
 import com.jsoniter.spi.JsonException;
+import org.smartboot.http.server.Http11Request;
 import org.smartboot.http.server.HttpMessageProcessor;
 import org.smartboot.http.server.HttpMessageProcessor;
-import org.smartboot.http.server.decode.Http11Request;
-import org.smartboot.http.server.decode.HttpRequestProtocol;
+import org.smartboot.http.server.HttpRequestProtocol;
 import org.smartboot.http.server.handle.HttpHandle;
 import org.smartboot.http.server.handle.HttpHandle;
 import org.smartboot.http.server.handle.RouteHandle;
 import org.smartboot.http.server.handle.RouteHandle;
-import org.smartboot.socket.MessageProcessor;
 import org.smartboot.socket.StateMachineEnum;
 import org.smartboot.socket.StateMachineEnum;
 import org.smartboot.socket.extension.plugins.MonitorPlugin;
 import org.smartboot.socket.extension.plugins.MonitorPlugin;
 import org.smartboot.socket.extension.plugins.SocketOptionPlugin;
 import org.smartboot.socket.extension.plugins.SocketOptionPlugin;
@@ -70,15 +69,15 @@ public class Bootstrap {
 //        https(processor);
 //        https(processor);
     }
     }
 
 
-    public static void http(final MessageProcessor<Http11Request> processor) {
-        AbstractMessageProcessor messageProcessor = new AbstractMessageProcessor<Http11Request>() {
+    public static void http(final HttpMessageProcessor processor) {
+        AbstractMessageProcessor<Http11Request> messageProcessor = new AbstractMessageProcessor<Http11Request>() {
             @Override
             @Override
-            public void process0(AioSession<Http11Request> session, Http11Request msg) {
+            public void process0(AioSession session, Http11Request msg) {
                 processor.process(session, msg);
                 processor.process(session, msg);
             }
             }
 
 
             @Override
             @Override
-            public void stateEvent0(AioSession<Http11Request> session, StateMachineEnum stateMachineEnum, Throwable throwable) {
+            public void stateEvent0(AioSession session, StateMachineEnum stateMachineEnum, Throwable throwable) {
                 processor.stateEvent(session, stateMachineEnum, throwable);
                 processor.stateEvent(session, stateMachineEnum, throwable);
             }
             }
         };
         };