| 
					
				 | 
			
			
				@@ -22,18 +22,17 @@ import com.jjt.framework.security.handle.LogoutSuccessHandlerImpl; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 /** 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  * spring security配置 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				- *  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ * 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  * @author ruoyi 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  */ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 @EnableGlobalMethodSecurity(prePostEnabled = true, securedEnabled = true) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-public class SecurityConfig extends WebSecurityConfigurerAdapter 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-{ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+public class SecurityConfig extends WebSecurityConfigurerAdapter { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     /** 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				      * 自定义用户认证逻辑 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				      */ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     @Autowired 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     private UserDetailsService userDetailsService; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-     
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     /** 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				      * 认证失败处理类 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				      */ 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -51,7 +50,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				      */ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     @Autowired 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     private JwtAuthenticationTokenFilter authenticationTokenFilter; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-     
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     /** 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				      * 跨域过滤器 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				      */ 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -72,8 +71,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				      */ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     @Bean 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     @Override 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    public AuthenticationManager authenticationManagerBean() throws Exception 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    public AuthenticationManager authenticationManagerBean() throws Exception { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         return super.authenticationManagerBean(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -93,8 +91,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				      * authenticated       |   用户登录后可访问 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				      */ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     @Override 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    protected void configure(HttpSecurity httpSecurity) throws Exception 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    protected void configure(HttpSecurity httpSecurity) throws Exception { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         // 注解标记允许匿名访问的url 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         ExpressionUrlAuthorizationConfigurer<HttpSecurity>.ExpressionInterceptUrlRegistry registry = httpSecurity.authorizeRequests(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         permitAllUrl.getUrls().forEach(url -> registry.antMatchers(url).permitAll()); 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -112,6 +109,8 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 .authorizeRequests() 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 // 对于登录login 注册register 验证码captchaImage 允许匿名访问 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 .antMatchers("/login", "/register", "/captchaImage").permitAll() 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                // 增加API接口允许匿名访问 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                .antMatchers("/api/**").permitAll() 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 // 静态资源,可匿名访问 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll() 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 .antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**").permitAll() 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -132,8 +131,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				      * 强散列哈希加密实现 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				      */ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     @Bean 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    public BCryptPasswordEncoder bCryptPasswordEncoder() 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    public BCryptPasswordEncoder bCryptPasswordEncoder() { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         return new BCryptPasswordEncoder(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -141,8 +139,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				      * 身份认证接口 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				      */ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     @Override 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    protected void configure(AuthenticationManagerBuilder auth) throws Exception 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    protected void configure(AuthenticationManagerBuilder auth) throws Exception { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         auth.userDetailsService(userDetailsService).passwordEncoder(bCryptPasswordEncoder()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 } 
			 |