From eb2d3ef0e4fa144d5a76823709a1ab2bc27a2ae9 Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期二, 22 七月 2025 17:42:34 +0800 Subject: [PATCH] 1、通信中间件去除上报消息测试类(去除注解) ; 2、remote模块,webSocket模块修改完善,增加机构orgTag控制; 3、从SSO模块获取当前用户信息部分进行集成完善,以供其他部分共享应用。 --- pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/msCenter/CenterMsReceiveCtrl.java | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/msCenter/CenterMsReceiveCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/msCenter/CenterMsReceiveCtrl.java index 0678465..a40d3ff 100644 --- a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/msCenter/CenterMsReceiveCtrl.java +++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/msCenter/CenterMsReceiveCtrl.java @@ -46,8 +46,8 @@ @PostMapping(path = "receive", consumes = MediaType.APPLICATION_JSON_VALUE) public BaseResponse<Boolean> receive(@RequestBody List<JSONObject> list, HttpServletRequest req, HttpServletResponse rep) { //閫氫俊涓棿浠朵紶杩囨潵鐨勬満鏋則ag锛屼互鐢ㄤ簬鏌ユ壘鏁版嵁婧� - String token = req.getHeader(Constant.UserTokenKeyInHeader); - DataSourceContext.set(token); + String orgTag = req.getHeader(Constant.TokenKeyInHeader); + DataSourceContext.set(orgTag); if(list != null && list.size() > 0){ for (JSONObject jo : list) { @@ -69,7 +69,7 @@ } } } - sendByWebSocket(list) ; + sendByWebSocket(orgTag, list) ; } return null ; } @@ -78,12 +78,12 @@ * 閫氳繃websocket鎶婃秷鎭帹閫佸嚭鍘伙紝褰撳墠鎺ユ敹鏂规槸鍓嶇鐨勫ぇ灞忓睍绀烘ā鍧� * @param list */ - private void sendByWebSocket(List<JSONObject> list){ + private void sendByWebSocket(String orgTag, List<JSONObject> list){ WebSocketMessage vo = new WebSocketMessage() ; vo.type = WebSocketMessage.TYPE_JSON ; vo.content = list ; try { - WebSocketServer.sendMessage2AllClient(JSON.toJSONString(vo)); + WebSocketServer.sendMessage2AllClient(orgTag, JSON.toJSONString(vo)); }catch (Exception e){ log.error("鎺ㄩ�佹秷鎭け璐�", e) ; } -- Gitblit v1.8.0