Browse Source

update to 4.0.10 (#4465)

* update to 4.0.10

* add java command parameter

* Update VoovanTFB.java
hely ho 6 years ago
parent
commit
ec097414fc

+ 1 - 1
frameworks/Java/voovan/pom.xml

@@ -17,7 +17,7 @@
         <dependency>
         <dependency>
             <groupId>org.voovan</groupId>
             <groupId>org.voovan</groupId>
             <artifactId>voovan-framework</artifactId>
             <artifactId>voovan-framework</artifactId>
-            <version>4.0.6.3</version>
+            <version>4.0.10</version>
         </dependency>
         </dependency>
     </dependencies>
     </dependencies>
     <build>
     <build>

+ 40 - 34
frameworks/Java/voovan/src/main/java/org/voovan/VoovanTFB.java

@@ -11,40 +11,46 @@ import org.voovan.tools.TObject;
 import org.voovan.tools.json.JSON;
 import org.voovan.tools.json.JSON;
 import org.voovan.tools.log.Logger;
 import org.voovan.tools.log.Logger;
 
 
+import java.util.Map;
+
 
 
 public class VoovanTFB {
 public class VoovanTFB {
-    private static final byte[] HELLO_WORLD = "Hello, World!".getBytes();
-
-    public static void main(String[] args) {
-        WebServerConfig webServerConfig = WebContext.getWebServerConfig();
-	webServerConfig.setGzip(false);
-	webServerConfig.setAccessLog(false);
-	webServerConfig.setKeepAliveTimeout(20000);
-	webServerConfig.setHost("0.0.0.0");
-	webServerConfig.setPort(8080);
-	webServerConfig.setCache(true);
-	webServerConfig.getModuleonfigs().clear();
-	webServerConfig.getRouterConfigs().clear();
-        WebServer webServer = WebServer.newInstance(webServerConfig);
-        Logger.setEnable(false);
-
-        //性能测试路由
-        webServer.get("/plaintext", new HttpRouter() {
-            public void process(HttpRequest req, HttpResponse resp) throws Exception {
-                resp.header().put(HttpStatic.CONTENT_TYPE_STRING, "text/plain");
-                resp.header().remove(HttpStatic.CONNECTION_STRING);
-                resp.write(HELLO_WORLD);
-            }
-        });
-
-        //性能测试路由
-        webServer.get("/json", new HttpRouter() {
-            public void process(HttpRequest req, HttpResponse resp) throws Exception {
-                resp.header().put("Content-Type", "application/json");
-                resp.write(JSON.toJSON(TObject.asMap("message", "Hello, World!")));
-            }
-        });
-
-        webServer.serve();
-    }
+	private static final byte[] HELLO_WORLD = "Hello, World!".getBytes();
+	private static final Map MAP = TObject.asMap("message", "Hello, World!");
+
+
+	public static void main(String[] args) {
+
+		WebServerConfig webServerConfig = WebContext.getWebServerConfig();
+		webServerConfig.setGzip(false);
+		webServerConfig.setAccessLog(false);
+		webServerConfig.setKeepAliveTimeout(1000);
+		webServerConfig.setHost("0.0.0.0");
+		webServerConfig.setPort(8080);
+		webServerConfig.setHotSwapInterval(0);
+		webServerConfig.setCache(true);
+		webServerConfig.getModuleonfigs().clear();
+		webServerConfig.getRouterConfigs().clear();
+		WebServer webServer = WebServer.newInstance(webServerConfig);
+		Logger.setEnable(false);
+
+		//性能测试请求;
+		webServer.get("/plaintext", new HttpRouter() {
+			public void process(HttpRequest req, HttpResponse resp) throws Exception {
+				resp.header().put(HttpStatic.CONTENT_TYPE_STRING, "text/plain");
+				resp.header().remove(HttpStatic.CONNECTION_STRING);
+				resp.write(HELLO_WORLD);
+			}
+		});
+		//性能测试请求
+		webServer.get("/json", new HttpRouter() {
+			public void process(HttpRequest req, HttpResponse resp) throws Exception {
+				resp.header().put("Content-Type", "application/json");
+				resp.write(JSON.toJSON(MAP));
+			}
+		});
+
+
+		webServer.syncServe();
+	}
 }
 }

+ 1 - 1
frameworks/Java/voovan/voovan.dockerfile

@@ -9,4 +9,4 @@ FROM openjdk:8-jdk-slim
 WORKDIR /voovan
 WORKDIR /voovan
 COPY --from=maven /voovan/target/voovan-bench-0.1-jar-with-dependencies.jar app.jar
 COPY --from=maven /voovan/target/voovan-bench-0.1-jar-with-dependencies.jar app.jar
 COPY --from=maven /voovan/config/framework.properties config/framework.properties
 COPY --from=maven /voovan/config/framework.properties config/framework.properties
-CMD ["java", "-server", "-XX:+UseParallelGC", "-XX:+UseNUMA", "-cp", "./config:voovan.jar:app.jar", "org.voovan.VoovanTFB"]
+CMD ["java", "-server", "-XX:-RestrictContended", "-XX:+UseParallelGC", "-XX:+UseNUMA", "-cp", "./config:voovan.jar:app.jar", "org.voovan.VoovanTFB"]