diff --git a/test/org/redkale/test/websocket/ChatWebSocketServlet.java b/test/org/redkale/test/websocket/ChatWebSocketServlet.java index ff5410646..0114fe890 100644 --- a/test/org/redkale/test/websocket/ChatWebSocketServlet.java +++ b/test/org/redkale/test/websocket/ChatWebSocketServlet.java @@ -9,12 +9,8 @@ import org.redkale.net.http.WebServlet; import org.redkale.net.http.WebSocketServlet; import org.redkale.net.http.WebSocket; import java.io.*; -import static java.lang.Thread.sleep; -import java.text.*; import java.util.concurrent.atomic.*; -import static java.lang.Thread.sleep; -import static java.lang.Thread.sleep; -import static java.lang.Thread.sleep; +import org.redkale.util.Utility; /** * @@ -33,8 +29,6 @@ public class ChatWebSocketServlet extends WebSocketServlet { debug = "true".equalsIgnoreCase(System.getProperty("debug", "false")); Thread t = new Thread() { - private final DateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - { setName("Debug-ChatWebSocket-ShowCount-Thread"); } @@ -47,7 +41,7 @@ public class ChatWebSocketServlet extends WebSocketServlet { } catch (Exception e) { return; } - System.out.println(format.format(new java.util.Date()) + ": 消息总数: " + counter.get() + ",间隔消息数: " + icounter.getAndSet(0)); + System.out.println(Utility.now() + ": 消息总数: " + counter.get() + ",间隔消息数: " + icounter.getAndSet(0)); } } }; diff --git a/test/org/redkale/test/websocket/VideoWebSocketServlet.java b/test/org/redkale/test/websocket/VideoWebSocketServlet.java index 92920d060..47b55d6e7 100644 --- a/test/org/redkale/test/websocket/VideoWebSocketServlet.java +++ b/test/org/redkale/test/websocket/VideoWebSocketServlet.java @@ -113,17 +113,13 @@ public class VideoWebSocketServlet extends WebSocketServlet { public static void main(String[] args) throws Throwable { CountDownLatch cdl = new CountDownLatch(1); - AnyValue.DefaultAnyValue config = new AnyValue.DefaultAnyValue(); - config.addValue("threads", System.getProperty("threads")); - config.addValue("bufferPoolSize", System.getProperty("bufferPoolSize")); - config.addValue("responsePoolSize", System.getProperty("responsePoolSize")); - config.addValue("host", System.getProperty("host", "0.0.0.0")); - config.addValue("port", System.getProperty("port", "8070")); - config.addValue("root", System.getProperty("root", "./root3/")); - AnyValue.DefaultAnyValue resConf = new AnyValue.DefaultAnyValue(); - resConf.setValue("cacheMaxLength", "200M"); - resConf.setValue("cacheMaxItemLength", "10M"); - config.setValue("ResourceServlet", resConf); + AnyValue.DefaultAnyValue config = AnyValue.create() + .addValue("threads", System.getProperty("threads")) + .addValue("bufferPoolSize", System.getProperty("bufferPoolSize")) + .addValue("responsePoolSize", System.getProperty("responsePoolSize")) + .addValue("host", System.getProperty("host", "0.0.0.0")) + .addValue("port", System.getProperty("port", "8070")) + .addValue("root", System.getProperty("root", "./root3/")); HttpServer server = new HttpServer(); server.addHttpServlet("/pipes", new VideoWebSocketServlet(), "/listen/*"); server.init(config);