Commit 08a85e23c265c61df032c63159aa957e82e4be25
1 parent
1a56e2de
update...
Showing
3 changed files
with
5 additions
and
3 deletions
src/main/java/com/bsth/data/msg_queue/WebSocketPushQueue.java
| @@ -36,6 +36,7 @@ public class WebSocketPushQueue implements CommandLineRunner { | @@ -36,6 +36,7 @@ public class WebSocketPushQueue implements CommandLineRunner { | ||
| 36 | qd.setMessage(msg); | 36 | qd.setMessage(msg); |
| 37 | qd.setSession(session); | 37 | qd.setSession(session); |
| 38 | 38 | ||
| 39 | + | ||
| 39 | log.info("put、[" + session.getAttributes().get(Constants.SESSION_USERNAME) + "] 、" + msg.getPayload()); | 40 | log.info("put、[" + session.getAttributes().get(Constants.SESSION_USERNAME) + "] 、" + msg.getPayload()); |
| 40 | linkedList.add(qd); | 41 | linkedList.add(qd); |
| 41 | } | 42 | } |
| @@ -70,7 +71,7 @@ public class WebSocketPushQueue implements CommandLineRunner { | @@ -70,7 +71,7 @@ public class WebSocketPushQueue implements CommandLineRunner { | ||
| 70 | sleepFlag = false; | 71 | sleepFlag = false; |
| 71 | session = qd.getSession(); | 72 | session = qd.getSession(); |
| 72 | if (session.isOpen()) { | 73 | if (session.isOpen()) { |
| 73 | - log.info("push start、[" + session.getAttributes().get(Constants.SESSION_USERNAME) + "] 、" + qd.getMessage().getPayload()); | 74 | + log.info("push start、"+session.getRemoteAddress().getHostString()+"[" + session.getAttributes().get(Constants.SESSION_USERNAME) + "] 、" + qd.getMessage().getPayload()); |
| 74 | session.sendMessage(qd.getMessage()); | 75 | session.sendMessage(qd.getMessage()); |
| 75 | log.info("push end.."); | 76 | log.info("push end.."); |
| 76 | } | 77 | } |
src/main/resources/logback.xml
| @@ -195,7 +195,7 @@ | @@ -195,7 +195,7 @@ | ||
| 195 | </rollingPolicy> | 195 | </rollingPolicy> |
| 196 | 196 | ||
| 197 | <layout class="ch.qos.logback.classic.PatternLayout"> | 197 | <layout class="ch.qos.logback.classic.PatternLayout"> |
| 198 | - <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%file:%line] %-5level -%msg%n | 198 | + <pattern>%d{MM-dd HH:mm:ss.SSS} %-5level -%msg%n |
| 199 | </pattern> | 199 | </pattern> |
| 200 | </layout> | 200 | </layout> |
| 201 | </appender> | 201 | </appender> |
| @@ -215,7 +215,7 @@ | @@ -215,7 +215,7 @@ | ||
| 215 | </rollingPolicy> | 215 | </rollingPolicy> |
| 216 | 216 | ||
| 217 | <layout class="ch.qos.logback.classic.PatternLayout"> | 217 | <layout class="ch.qos.logback.classic.PatternLayout"> |
| 218 | - <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%file:%line] %-5level -%msg%n | 218 | + <pattern>%d{MM-dd HH:mm:ss.SSS} %-5level -%msg%n |
| 219 | </pattern> | 219 | </pattern> |
| 220 | </layout> | 220 | </layout> |
| 221 | </appender> | 221 | </appender> |
src/main/resources/static/real_control_v2/mapmonitor/fragments/playback_v2/main.html
| @@ -754,6 +754,7 @@ | @@ -754,6 +754,7 @@ | ||
| 754 | //中心点和缩放级别 | 754 | //中心点和缩放级别 |
| 755 | map.centerAndZoom(new BMap.Point(gb_map_consts.center_point.lng, gb_map_consts.center_point.lat), 16); | 755 | map.centerAndZoom(new BMap.Point(gb_map_consts.center_point.lng, gb_map_consts.center_point.lat), 16); |
| 756 | map.enableScrollWheelZoom(); | 756 | map.enableScrollWheelZoom(); |
| 757 | + //map.setMapStyle({style:'grayscale'}); | ||
| 757 | }; | 758 | }; |
| 758 | 759 | ||
| 759 | var storage = window.localStorage; | 760 | var storage = window.localStorage; |