update

Author: allwefantasy

release.sh

@@ -1,3 +1,3 @@
-mvn clean deploy -DskipTests -Prelease-sign-artifacts -Pscala-2.12
+mvn clean deploy -DskipTests -Prelease-sign-artifacts -Pscala-2.11
 #https://oss.sonatype.org/#stagingRepositories
 #mvn versions:set -DnewVersion={version}

serviceframework-jetty-9-server/src/main/java/net/csdn/http/server/JettyServer.java

@@ -15,28 +15,24 @@
  * Created by allwefantasy on 29/6/2017.
  */
 public class JettyServer {
-    public Server createServer(String host, int port,
-                               int minThreads, int maxThreads,
-                               String staticDir,
-                               String templateDir,
-                               boolean staticEnable,
-                               boolean classPathEnable, boolean sessionEanble, AbstractHandler abstractHandler) {
-        QueuedThreadPool threadPool = new QueuedThreadPool();
-        threadPool.setMinThreads(minThreads);
-        threadPool.setMaxThreads(maxThreads);
-
-        Server server = new Server(threadPool);
 
+    public ServerConnector createConnector(Server server, String host, int port) {
         HttpConfiguration httpConfig = new HttpConfiguration();
 
         ServerConnector connector = new ServerConnector(server,
                 new HttpConnectionFactory(httpConfig));
 
-
         connector.setPort(port);
         connector.setHost(host);
+        return connector;
+    }
 
-        server.addConnector(connector);
+    public Server connfigureServer(Server server, String staticDir,
+                                   String templateDir,
+                                   boolean staticEnable,
+                                   boolean classPathEnable,
+                                   boolean sessionEanble,
+                                   AbstractHandler abstractHandler) {
 
         HandlerList handlers = new HandlerList();
 
@@ -72,4 +68,14 @@ public Server createServer(String host, int port,
         server.setHandler(handlers);
         return server;
     }
+
+    public Server createServer(int minThreads, int maxThreads) {
+        QueuedThreadPool threadPool = new QueuedThreadPool();
+        threadPool.setMinThreads(minThreads);
+        threadPool.setMaxThreads(maxThreads);
+        Server server = new Server(threadPool);
+        return server;
+
+
+    }
 }

serviceframework-web/src/main/java/net/csdn/bootstrap/loader/impl/ControllerLoader.java

@@ -70,7 +70,7 @@ public Class loaded(DataInputStream classFile) {
 
         enhancer.enhanceThisClass2(controllers);
         for (String item : WowCollections.split2(settings.get("application.controller.default",
-                "net.csdn.api.controller.SystemInfoController,net.csdn.api.controller.APIDescController,"
+                "net.csdn.api.controller.SystemInfoController,net.csdn.api.controller.APIDescController"
         ), ",")) {
             try {
                 moduleList.add(bindAction(Class.forName(item)));

serviceframework-web/src/main/java/net/csdn/modules/http/HttpServer.java

@@ -22,6 +22,7 @@
 import net.csdn.modules.http.support.HttpHolder;
 import org.eclipse.jetty.server.Request;
 import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.server.ServerConnector;
 import org.eclipse.jetty.server.handler.AbstractHandler;
 
 import javax.servlet.ServletException;
@@ -79,10 +80,16 @@ public HttpServer(Settings settings, RestController restController, API api) {
         disableMysql = settings.getAsBoolean(ServiceFramwork.mode + ".datasources.mysql.disable", false);
         JettyServer jettyServer = new JettyServer();
         httpPort = settings.getAsInt("http.port", generateHttpPort());
-        server = jettyServer.createServer(settings.get("http.host", ""),
-                httpPort,
-                settings.getAsInt("http.threads.min", 100),
-                settings.getAsInt("http.threads.max", 1000),
+
+        server = jettyServer.createServer(settings.getAsInt("http.threads.min", 100),
+                settings.getAsInt("http.threads.max", 1000));
+        ServerConnector connector = jettyServer.createConnector(server, settings.get("http.host", ""), httpPort);
+        connector.setIdleTimeout(settings.getAsInt("http.server.idleTimeout", 30000));
+
+        server.addConnector(connector);
+
+
+        jettyServer.connfigureServer(server,
                 settings.get("serviceframework.static.loader.classpath.dir", "assets"),
                 environment.templateDirFile().getPath(),
                 settings.getAsBoolean("application.static.enable", false), settings.getAsBoolean("serviceframework.static.loader.classpath.enable", false),