From 83c4dd24f674b5f2c3d10ab98d04e8562202449b Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 27 十二月 2024 21:31:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
applet/src/main/java/com/jilongda/applet/config/WebSecurityConfig.java | 29 ++++++++++++++---------------
1 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/applet/src/main/java/com/jilongda/applet/config/WebSecurityConfig.java b/applet/src/main/java/com/jilongda/applet/config/WebSecurityConfig.java
index 0eddaed..7f7f94c 100644
--- a/applet/src/main/java/com/jilongda/applet/config/WebSecurityConfig.java
+++ b/applet/src/main/java/com/jilongda/applet/config/WebSecurityConfig.java
@@ -1,5 +1,7 @@
package com.jilongda.applet.config;
+import com.jilongda.applet.security.AuthenticationProvider;
+import com.jilongda.applet.security.SysUserDetailsService;
import com.jilongda.common.basic.Constant;
import com.jilongda.common.cache.CaffineCache;
import com.jilongda.common.redis.RedisAutoTemplate;
@@ -12,7 +14,6 @@
import org.springframework.context.annotation.Configuration;
import org.springframework.http.HttpMethod;
import org.springframework.security.authentication.AuthenticationManager;
-import org.springframework.security.authentication.AuthenticationProvider;
import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
@@ -34,20 +35,18 @@
@EnableWebSecurity
@EnableGlobalMethodSecurity(prePostEnabled = true, securedEnabled = true)
public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
- private final SecurityAuthenticationEntryPoint securityAuthenticationEntryPoint;
- private final RedisAutoTemplate redisAutoTemplate;
- private final CaffineCache<String> accessTokenCache;
- private final CaffineCache<String> refreshTokenCache;
- private final PasswordEncoder passwordEncoder;
-
@Autowired
- public WebSecurityConfig(SecurityAuthenticationEntryPoint securityAuthenticationEntryPoint, RedisAutoTemplate redisAutoTemplate, CaffineCache<String> accessTokenCache, CaffineCache<String> refreshTokenCache, PasswordEncoder passwordEncoder) {
- this.securityAuthenticationEntryPoint = securityAuthenticationEntryPoint;
- this.redisAutoTemplate = redisAutoTemplate;
- this.accessTokenCache = accessTokenCache;
- this.refreshTokenCache = refreshTokenCache;
- this.passwordEncoder = passwordEncoder;
- }
+ private SecurityAuthenticationEntryPoint securityAuthenticationEntryPoint;
+ @Autowired
+ private RedisAutoTemplate redisAutoTemplate;
+ @Autowired
+ private CaffineCache<String> accessTokenCache;
+ @Autowired
+ private CaffineCache<String> refreshTokenCache;
+ @Autowired
+ private PasswordEncoder passwordEncoder;
+ @Autowired
+ private SysUserDetailsService loadUserDetailsService;
/**
@@ -83,7 +82,7 @@
*/
@Override
public void configure(AuthenticationManagerBuilder auth) {
-// auth.authenticationProvider(new AuthenticationProvider());
+ auth.authenticationProvider(new AuthenticationProvider(loadUserDetailsService,passwordEncoder));
}
--
Gitblit v1.7.1