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-common/src/main/java/com/dy/common/aop/SsoAspect.java | 46 ++--------------------------------------------
1 files changed, 2 insertions(+), 44 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/aop/SsoAspect.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/aop/SsoAspect.java
index 5180006..ebd9d33 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/aop/SsoAspect.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/aop/SsoAspect.java
@@ -14,10 +14,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.core.annotation.Order;
-import org.springframework.http.*;
import org.springframework.stereotype.Component;
-import org.springframework.web.client.RestTemplate;
-import org.springframework.web.util.UriComponentsBuilder;
import java.lang.reflect.Method;
import java.util.Objects;
@@ -31,15 +28,8 @@
@Value("${pipIrr.global.dev}")
public String isDevStage ;//鏄惁涓哄紑鍙戦樁娈�
- @Value("${pipIrr.sso.checkUrl}")
- public String ssoCheckUrl;
-
- private RestTemplate restTemplate;
-
@Autowired
- public void setRestTemplate(RestTemplate restTemplate){
- this.restTemplate = restTemplate ;
- }
+ private SsoCheck ssoCheck ;
@Pointcut("@annotation(com.dy.common.aop.SsoAop)")
public void ssoPointCut() {
@@ -55,7 +45,7 @@
SsoAop aop = method.getAnnotation(SsoAop.class) ;
if (Objects.nonNull(aop)){
String token = UserTokenContext.get() ;
- Object rObj = this.check(token);
+ Object rObj = this.ssoCheck.check(token);
if(rObj != null){
if(rObj instanceof SsoVo ssoVo){
if(ssoVo.logined){
@@ -90,37 +80,5 @@
}
}
- /**
- * 璋冪敤SSO绯荤粺杩涜楠岃瘉
- * @param token Header涓殑鐢ㄦ埛token
- * @return 杩斿洖瀵硅薄
- */
- private Object check(String token){
- if(!StringUtils.isNullOrEmpty(ssoCheckUrl)){
- String url = UriComponentsBuilder.fromUriString(ssoCheckUrl)
- .queryParam("token", token)
- .build()
- .toUriString();
- HttpHeaders headers = new HttpHeaders();
- headers.setContentType(MediaType.parseMediaType("application/json;charset=UTF-8"));
-
- HttpEntity<?> httpEntity = new HttpEntity<>(headers);
- ResponseEntity<SsoVo> response = null;
- try {
- // 閫氳繃Get鏂瑰紡璋冪敤鎺ュ彛
- response = restTemplate.exchange(url, HttpMethod.GET, httpEntity, SsoVo.class);
- } catch (Exception e) {
- e.printStackTrace();
- return BaseResponseUtils.buildError("鍚庣绯荤粺鍑洪敊锛岃闂崟鐐圭櫥褰曠郴缁熷紓甯�");
- }
- if(response == null){
- return BaseResponseUtils.buildError("鍚庣绯荤粺鍑洪敊锛岃闂崟鐐圭櫥褰曠郴缁熷紓甯�");
- }else{
- return response.getBody();
- }
- }else {
- return BaseResponseUtils.buildError("鍚庣绯荤粺鍑洪敊锛屾湭寰楀埌SsoCheckUrl");
- }
- }
}
--
Gitblit v1.8.0