Merge branch 'fix/websocket_heartTimeout' into 'wrdp'

websocket心跳时间改为30秒

See merge request o2oa/o2oa!2644

o2web/source/o2_core/o2/xDesktop/WebSocket.js

@@ -14,7 +14,7 @@ MWF.xDesktop.WebSocket = new Class({
 
         this.reConnect = true;
         this.checking = false;
-        this.heartTimeout = 60000;
+        this.heartTimeout = 30000;
         this.checkingTimeout = 4000;
         this.heartMsg = "heartbeat";
         this.maxErrorCount = 10;