系统合并

zhuo

2025-04-23 234b0ac195934b34c06045b2d2ef0f10e239dd8e

 ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java

@@ -48,7 +48,7 @@
     */
    @Autowired
    @Qualifier("UserDetailsByOpenIdServiceImpl")
    private UserDetailsService userDetailsServiceByOpenId;
    private UserDetailsService userDetailsServiceBySSO;

    /**
     * 认证失败处理类
@@ -91,11 +91,11 @@
        daoAuthenticationProvider.setPasswordEncoder(bCryptPasswordEncoder());

        // sso登陆鉴权 Provider
        SsoCodeAuthenticationProvider wxCodeAuthenticationProvider = new SsoCodeAuthenticationProvider();
        wxCodeAuthenticationProvider.setUserDetailsService(userDetailsServiceByOpenId);
        SsoCodeAuthenticationProvider ssoCodeAuthenticationProvider = new SsoCodeAuthenticationProvider();
        ssoCodeAuthenticationProvider.setUserDetailsService(userDetailsServiceBySSO);
        List<AuthenticationProvider> providers = new ArrayList<>();

        providers.add(wxCodeAuthenticationProvider);
        providers.add(ssoCodeAuthenticationProvider);
        providers.add(daoAuthenticationProvider);

        return new ProviderManager(providers);