Browse Source

update smart-http to 1.0.10 (#5209)

* 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
三刀 5 years ago
parent
commit
ac92c7935b

+ 23 - 7
frameworks/Java/smart-socket/pom.xml

@@ -9,29 +9,45 @@
     <parent>
         <groupId>org.smartboot.http</groupId>
         <artifactId>smart-http-parent</artifactId>
-        <version>1.0.10.1006-beta</version>
+        <version>1.0.10</version>
     </parent>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>11</maven.compiler.source>
         <maven.compiler.target>11</maven.compiler.target>
-        <commons.lang.version>2.6</commons.lang.version>
+        <log4j.version>2.11.0</log4j.version>
     </properties>
     <dependencies>
         <dependency>
             <groupId>org.smartboot.http</groupId>
             <artifactId>smart-http-server</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.smartboot.socket</groupId>
-            <artifactId>aio-pro</artifactId>
-            <version>1.4.4.rc-7</version>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>org.smartboot.socket</groupId>-->
+            <!--<artifactId>aio-pro</artifactId>-->
+            <!--<version>1.4.5.rc-1</version>-->
+        <!--</dependency>-->
         <dependency>
             <groupId>com.jsoniter</groupId>
             <artifactId>jsoniter</artifactId>
             <version>0.9.23</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-slf4j-impl</artifactId>
+            <version>${log4j.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-api</artifactId>
+            <version>${log4j.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-core</artifactId>
+            <version>${log4j.version}</version>
+        </dependency>
     </dependencies>
     <repositories>
         <repository>

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

@@ -15,6 +15,7 @@ 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.handle.HttpHandle;
+import org.smartboot.http.server.handle.RouteHandle;
 import org.smartboot.socket.MessageProcessor;
 import org.smartboot.socket.StateMachineEnum;
 import org.smartboot.socket.extension.plugins.MonitorPlugin;
@@ -32,19 +33,18 @@ public class Bootstrap {
         System.setProperty("smart-socket.server.pageSize", (8 * 1024 * 1024) + "");
 //        System.setProperty("smart-socket.bufferPool.pageNum", 16 + "");
         System.setProperty("smart-socket.session.writeChunkSize", (1024 * 4) + "");
-//        System.setProperty("sun.nio.ch.maxCompletionHandlersOnStack","24");
-        HttpMessageProcessor processor = new HttpMessageProcessor(System.getProperty("webapps.dir", "./"));
-        processor.route("/plaintext", new HttpHandle() {
+//        System.setProperty("sun.nio.ch.maxCompletionHandlersOnStack", "4");
+        RouteHandle routeHandle = new RouteHandle(System.getProperty("webapps.dir", "./"));
+        routeHandle.route("/plaintext", new HttpHandle() {
 
 
             @Override
             public void doHandle(HttpRequest request, HttpResponse response) throws IOException {
                 response.setContentLength(body.length);
                 response.setContentType("text/plain; charset=UTF-8");
-                response.getOutputStream().write(body);
+                response.write(body);
             }
-        });
-        processor.route("/json", new HttpHandle() {
+        }).route("/json", new HttpHandle() {
 
             @Override
             public void doHandle(HttpRequest request, HttpResponse response) throws IOException {
@@ -64,6 +64,8 @@ public class Bootstrap {
                 }
             }
         });
+        HttpMessageProcessor processor = new HttpMessageProcessor();
+        processor.pipeline(routeHandle);
         http(processor);
 //        https(processor);
     }
@@ -86,7 +88,7 @@ public class Bootstrap {
         AioQuickServer<Http11Request> server = new AioQuickServer<>(8080, new HttpRequestProtocol(), messageProcessor);
         server.setReadBufferSize(1024 * 4);
         int cpuNum = Runtime.getRuntime().availableProcessors();
-        server.setThreadNum(cpuNum + 2);
+        server.setThreadNum((cpuNum >> 1) + cpuNum);
         try {
             server.start();
         } catch (IOException e) {