diff --git a/.gitignore b/.gitignore index 7f13568..d8ee441 100644 --- a/.gitignore +++ b/.gitignore @@ -5,4 +5,6 @@ /.idea/ /target/ ChenSheng.iml -springWebsockeForTomcatLog.iml \ No newline at end of file +springWebsockeForTomcatLog.iml +/WebRoot/WEB-INF/lib/ +/WebRoot/WEB-INF/classes/ \ No newline at end of file diff --git a/.myhibernatedata b/.myhibernatedata index ff2cd5e..1632df2 100644 --- a/.myhibernatedata +++ b/.myhibernatedata @@ -19,7 +19,7 @@ sessionFactoryId=sessionFactory basePersistenceClass= genAnnotations=false reSettingsFile= -configFile=/ChenSheng/src/applicationContext.xml +configFile=/springWebsockeForTomcatLog-master/src/applicationContext.xml # springWebsockeForTomcatLog createConfigFile=false addLibs2Classpath=true baseDaoClass= diff --git a/.mymetadata b/.mymetadata index 7f8369a..dd43e08 100644 --- a/.mymetadata +++ b/.mymetadata @@ -3,7 +3,7 @@ type="WEB" name="spirngWebsocket" id="myeclipse.1457944315708" - context-root="/ChenSheng" + context-root="/springWebsockeForTomcatLog-master" # springWebsockeForTomcatLog j2ee-spec="5.0" archive="spirngWebsocket.war"> diff --git a/WebRoot/META-INF/MANIFEST.MF b/WebRoot/META-INF/MANIFEST.MF index 254272e..ce03608 100644 --- a/WebRoot/META-INF/MANIFEST.MF +++ b/WebRoot/META-INF/MANIFEST.MF @@ -1,3 +1,5 @@ Manifest-Version: 1.0 -Class-Path: +Created-By: IntelliJ IDEA +Built-By: Vivim +Build-Jdk: 1.8.0_131 diff --git a/pom.xml b/pom.xml index a5b788c..c10bfd0 100644 --- a/pom.xml +++ b/pom.xml @@ -1,7 +1,7 @@ 4.0.0 - ChenSheng - ChenSheng + springWebsockeForTomcatLog + springWebsockeForTomcatLog 0.0.1-SNAPSHOT war @@ -252,17 +252,17 @@ org.springframework spring-oxm - 3.0.1.RELEASE-A + 3.0.5.RELEASE org.springframework spring-webmvc-portlet - 3.0.1.RELEASE-A + 3.0.5.RELEASE org.springframework spring-struts - 3.0.1.RELEASE-A + 3.0.5.RELEASE org.hibernate diff --git a/src/com/he/websocket/WebsocketHandler.java b/src/com/he/websocket/WebsocketHandler.java index 849aea3..3ae0191 100644 --- a/src/com/he/websocket/WebsocketHandler.java +++ b/src/com/he/websocket/WebsocketHandler.java @@ -40,6 +40,7 @@ public class WebsocketHandler extends TextWebSocketHandler { /** * 建立连接后 */ + @Override public void afterConnectionEstablished(WebSocketSession session) { try { String uid = (String) session.getAttributes().get("uid"); @@ -75,10 +76,12 @@ public class WebsocketHandler extends TextWebSocketHandler { /** * 消息处理,在客户端通过Websocket API发送的消息会经过这里,然后进行相应的处理 */ + @Override public void handleMessage(WebSocketSession session, WebSocketMessage message) { try { - if (message.getPayloadLength() == 0) + if (message.getPayloadLength() == 0) { return; + } Message msg = new Gson().fromJson(message.getPayload().toString(), Message.class); msg.setDate(new Date()); sendMessageToUser(msg.getTo(), new TextMessage(new GsonBuilder().setDateFormat("yyyy-MM-dd HH:mm:ss").create().toJson(msg))); @@ -98,6 +101,7 @@ public class WebsocketHandler extends TextWebSocketHandler { /** * 消息传输错误处理 */ + @Override public void handleTransportError(WebSocketSession session, Throwable exception) { try { if (session.isOpen()) { @@ -128,6 +132,7 @@ public class WebsocketHandler extends TextWebSocketHandler { /** * 关闭连接后 */ + @Override public void afterConnectionClosed(WebSocketSession session, CloseStatus closeStatus) { try { LOG.warn("Websocket:" + session.getId() + "已经关闭"); @@ -153,6 +158,7 @@ public class WebsocketHandler extends TextWebSocketHandler { } + @Override public boolean supportsPartialMessages() { return false; } diff --git a/src/log4j.properties b/src/log4j.properties index 6aa8201..9aa86aa 100644 --- a/src/log4j.properties +++ b/src/log4j.properties @@ -12,5 +12,5 @@ log4j.appender.logfile.Threshold = WARN log4j.appender.logfile.append=true log4j.appender.logfile.MaxFileSize=1024KB log4j.appender.logfile.MaxBackupIndex=50 -log4j.appender.logfile.File = C:/log/project.log +log4j.appender.logfile.File = ./project.log