From f67aa8b146f0fa901ce4ae183be511d8615cde77 Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期四, 17 四月 2025 14:49:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_ztzb' into dev_ztzb
---
ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
index f4a7045..13b3568 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
+++ b/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);
--
Gitblit v1.9.3