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-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/web/comResult/CommandResultDeal.java | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/web/comResult/CommandResultDeal.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/web/comResult/CommandResultDeal.java index 658e68e..d95f452 100644 --- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/web/comResult/CommandResultDeal.java +++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/web/comResult/CommandResultDeal.java @@ -48,7 +48,7 @@ restTemplate.getMessageConverters().set(1,new StringHttpMessageConverter(StandardCharsets.UTF_8)); HttpHeaders headers = new HttpHeaders(); headers.setContentType(MediaType.parseMediaType("application/json;charset=UTF-8")); - headers.set(Constant.UserTokenKeyInHeader, ServerProperties.orgTag); + headers.set(Constant.TokenKeyInHeader, ServerProperties.orgTag); HttpEntity<?> httpEntity = new HttpEntity<>(data, headers); ResponseEntity<WebResponseVo> response = null; try { @@ -78,7 +78,7 @@ restTemplate.getMessageConverters().set(1,new StringHttpMessageConverter(StandardCharsets.UTF_8)); HttpHeaders headers = new HttpHeaders(); headers.setContentType(MediaType.parseMediaType("application/json;charset=UTF-8")); - headers.set(Constant.UserTokenKeyInHeader, ServerProperties.orgTag); + headers.set(Constant.TokenKeyInHeader, ServerProperties.orgTag); HttpEntity<?> httpEntity = new HttpEntity<>(subMsg, headers); ResponseEntity<WebResponseVo> response = null; try { -- Gitblit v1.8.0