1、原SsoAop进行登录验证有鉴权，现改为只验证登录，不做鉴权，相应SsoCtrl中增加只鉴权的方法 2、优化通信中间件代码、common模块中协议代码、

liurunyu

2023-12-21 c8b52a0878fc2848a8ce362b0ab976983df43476

 pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/aop/SsoAspect.java

@@ -4,7 +4,7 @@
import com.dy.common.multiDataSource.DataSourceContext;
import com.dy.common.webFilter.UserTokenContext;
import com.dy.common.webUtil.BaseResponseUtils;
import com.mysql.jdbc.StringUtils;
import com.mysql.cj.util.StringUtils;
import lombok.extern.slf4j.Slf4j;
import org.aspectj.lang.ProceedingJoinPoint;
import org.aspectj.lang.annotation.Around;
@@ -31,8 +31,11 @@
@Component
public class SsoAspect {

    @Value("${pipIrr.global.dev}")
    public String isDevStage ;//是否为开发阶段

    @Value("${pipIrr.sso.checkUrl}")
    public String SsoCheckUrl ;
    public String ssoCheckUrl;

    private RestTemplate restTemplate;

@@ -42,66 +45,63 @@
    }

    @Pointcut("@annotation(com.dy.common.aop.SsoAop)")
    public void dyPointCut() {
    public void ssoPointCut() {
    }

    @Around("dyPointCut()")
    @Around("ssoPointCut()")
    public Object execute(ProceedingJoinPoint point) throws Throwable {
        MethodSignature signature = (MethodSignature) point.getSignature();
        Method method = signature.getMethod();
        SsoAop aop = method.getAnnotation(SsoAop.class) ;
        if (Objects.nonNull(aop)){
            String token = UserTokenContext.get() ;
            String power = aop.power() ;
            String[] allPower = aop.ifAllPower() ;
            String[] anyPower = aop.ifAnyPower() ;
            Object rObj = this.check(token, power, allPower, anyPower);
            if(rObj != null){
                if(rObj instanceof SsoVo ssoVo){
                    if(ssoVo.logined){
                        if(ssoVo.hasPower){
                            if(!StringUtils.isNullOrEmpty(ssoVo.dataSourceName)){
                                DataSourceContext.set(ssoVo.dataSourceName);
                                return point.proceed();
        if(isDevStage != null && !isDevStage.trim().equals("") && isDevStage.trim().equalsIgnoreCase("true")){
            return point.proceed();
        }else{
            MethodSignature signature = (MethodSignature) point.getSignature();
            Method method = signature.getMethod();
            SsoAop aop = method.getAnnotation(SsoAop.class) ;
            if (Objects.nonNull(aop)){
                String token = UserTokenContext.get() ;
                Object rObj = this.check(token);
                if(rObj != null){
                    if(rObj instanceof SsoVo ssoVo){
                        if(ssoVo.logined){
                            if(ssoVo.hasPower){
                                if(!StringUtils.isNullOrEmpty(ssoVo.dataSourceName)){
                                    DataSourceContext.set(ssoVo.dataSourceName);
                                    Object obj = point.proceed();
                                    DataSourceContext.remove();
                                    return obj ;
                                }else{
                                    //无数据源
                                    return BaseResponseUtils.buildError("后端系统出错，未得到当前登录用户所属机构标签（数据源名）") ;
                                }
                            }else{
                                //无数据源
                                return BaseResponseUtils.buildError("后端系统出错，未得到当前登录用户所属机构标签（数据源名）") ;
                                //无权限
                                return BaseResponseUtils.buildNoPower() ;
                            }
                        }else{
                            //无权限
                            return BaseResponseUtils.buildNoPower() ;
                            //未登录
                            return BaseResponseUtils.buildToLogin() ;
                        }
                    }else{
                        //未登录
                        return BaseResponseUtils.buildToLogin() ;
                        return rObj ;
                    }
                }else{
                    return rObj ;
                    return BaseResponseUtils.buildError("后端系统出错，check方法返回null") ;
                }
            }else{
                return BaseResponseUtils.buildError("后端系统出错，check方法返回null") ;
                //已经进入注解处理了，还得不到注解，这种情况是不可能的。
                return BaseResponseUtils.buildError("后端系统出错，DyAop注解为null") ;
            }
        }else{
            //已经进入注解处理了，还得不到注解，这种情况是不可能的。
            return BaseResponseUtils.buildError("后端系统出错，DyAop注解为null") ;
        }
    }

    /**
     * 调用SSO系统进行验证
     * @param token Header中的用户token
     * @param power 一个权限
     * @param allPower 多个权限
     * @param anyPower 多个权限
     * @return 返回对象
     */
    private Object check(String token, String power, String[] allPower, String[] anyPower){
        if(!StringUtils.isNullOrEmpty(SsoCheckUrl)){
            String url = UriComponentsBuilder.fromUriString(SsoCheckUrl)
    private Object check(String token){
        if(!StringUtils.isNullOrEmpty(ssoCheckUrl)){
            String url = UriComponentsBuilder.fromUriString(ssoCheckUrl)
                    .queryParam("token", token)
                    .queryParam("power", power)
                    .queryParam("allPower", (Object) allPower)
                    .queryParam("anyPower", (Object) anyPower)
                    .build()
                    .toUriString();
            // 由于获取student接口咱们设置了basicauth，所以需要在请求时配置