Commit 050fbfc11246c8e151f9c793f21ac3bb078bfc08
1 parent
53d547bf
1.2023.03.07更新
Showing
4 changed files
with
4 additions
and
5 deletions
src/main/java/com/bsth/websocket/handler/RealControlSocketHandler.java
| 1 | package com.bsth.websocket.handler; | 1 | package com.bsth.websocket.handler; |
| 2 | 2 | ||
| 3 | import com.alibaba.fastjson.JSONObject; | 3 | import com.alibaba.fastjson.JSONObject; |
| 4 | +import com.bsth.common.Constants; | ||
| 4 | import com.bsth.data.BasicData; | 5 | import com.bsth.data.BasicData; |
| 5 | import com.bsth.data.msg_queue.WebSocketPushQueue; | 6 | import com.bsth.data.msg_queue.WebSocketPushQueue; |
| 6 | import com.google.common.base.Splitter; | 7 | import com.google.common.base.Splitter; |
| @@ -154,7 +155,7 @@ public class RealControlSocketHandler implements WebSocketHandler { | @@ -154,7 +155,7 @@ public class RealControlSocketHandler implements WebSocketHandler { | ||
| 154 | TextMessage message = new TextMessage(msg.getBytes()); | 155 | TextMessage message = new TextMessage(msg.getBytes()); |
| 155 | 156 | ||
| 156 | for(WebSocketSession user : users){ | 157 | for(WebSocketSession user : users){ |
| 157 | - if (user != null && user.getPrincipal() != null && userName.equals(user.getPrincipal().getName())) { | 158 | + if (userName.equals(user.getAttributes().get(Constants.SESSION_USERNAME))) { |
| 158 | WebSocketPushQueue.put(user, message); | 159 | WebSocketPushQueue.put(user, message); |
| 159 | } | 160 | } |
| 160 | } | 161 | } |
src/main/resources/application-cloud.properties
| @@ -55,4 +55,4 @@ cp.ack.url= http://114.80.178.12:8778/prod-api/serverApi/instructionsIssue/confi | @@ -55,4 +55,4 @@ cp.ack.url= http://114.80.178.12:8778/prod-api/serverApi/instructionsIssue/confi | ||
| 55 | ## admin mail | 55 | ## admin mail |
| 56 | admin.mail= 3090342880@qq.com | 56 | admin.mail= 3090342880@qq.com |
| 57 | ## enabled | 57 | ## enabled |
| 58 | -enabled.whiteip= false | ||
| 59 | \ No newline at end of file | 58 | \ No newline at end of file |
| 59 | +enabled.whiteip= true | ||
| 60 | \ No newline at end of file | 60 | \ No newline at end of file |
src/main/resources/static/pages/home.html
| @@ -59,7 +59,7 @@ | @@ -59,7 +59,7 @@ | ||
| 59 | } | 59 | } |
| 60 | </style> | 60 | </style> |
| 61 | <div class="system_change_log"> | 61 | <div class="system_change_log"> |
| 62 | - <h2 style="text-indent: 35px;margin: 10px 0 5px;">2023-03-07 更新说明 Changelog</h2> | 62 | + <h2 style="text-indent: 35px;margin: 10px 0 5px;">2023-03-06 更新说明 Changelog</h2> |
| 63 | <br><br> | 63 | <br><br> |
| 64 | <ul> | 64 | <ul> |
| 65 | <li class="sub_title"><h6>线调</h6></li> | 65 | <li class="sub_title"><h6>线调</h6></li> |
src/main/resources/static/real_control_v2/main.html
| @@ -260,8 +260,6 @@ | @@ -260,8 +260,6 @@ | ||
| 260 | <!-- #### 安全驾驶 end ### --> | 260 | <!-- #### 安全驾驶 end ### --> |
| 261 | 261 | ||
| 262 | <!-- 打电话 --> | 262 | <!-- 打电话 --> |
| 263 | -<script src="http://114.80.178.12:9003/forward/voip/callCenterJs"></script> | ||
| 264 | -<script src="http://114.80.178.12:9003/forward/voip/phonePluginJs"></script> | ||
| 265 | <script src="/real_control_v2/js/safe_driv/call_phone.js" ></script> | 263 | <script src="/real_control_v2/js/safe_driv/call_phone.js" ></script> |
| 266 | 264 | ||
| 267 | <script id="voip_call_info_panel-temp" type="text/html"> | 265 | <script id="voip_call_info_panel-temp" type="text/html"> |