Merge remote-tracking branch 'origin/dev' into dev

疯狂的狮子Li

2021-11-21 b9b1ec8f4163bab66cf22bba784bf48b72167e76

Merge remote-tracking branch 'origin/dev' into dev

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

@@ -20,7 +20,6 @@
 * @author Lion Li
 */
@Configuration
@ConditionalOnProperty(value = "xss.enabled", havingValue = "true")
public class FilterConfig {

    @Autowired
@@ -28,6 +27,7 @@

    @SuppressWarnings({"rawtypes", "unchecked"})
    @Bean
    @ConditionalOnProperty(value = "xss.enabled", havingValue = "true")
    public FilterRegistrationBean xssFilterRegistration() {
        FilterRegistrationBean registration = new FilterRegistrationBean();
        registration.setDispatcherTypes(DispatcherType.REQUEST);