bug fixed

wisenergy-common/src/main/java/cn/wisenergy/common/config/cors/CORSFilter.java

-package cn.wisenergy.common.config.cors;
-
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.cors.CorsConfiguration;
-import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
-import org.springframework.web.filter.CorsFilter;
-
-/**
- * 跨域过滤器设置
- *
- * @author wyy
- * @date 2019-09-04 14:31
- */
-@Configuration
-public class CORSFilter {
-
-    /**
-     * 前置跨域设置【过滤器方式先于拦截器生效】
-     *
-     * @return
-     */
-    @Bean
-    public CorsFilter corsFilter() {
-        CorsConfiguration config = new CorsConfiguration();
-        config.addAllowedOrigin("*");
-        config.setAllowCredentials(true);
-        config.addAllowedMethod("*");
-        config.addAllowedHeader("*");
-        UrlBasedCorsConfigurationSource configSource = new UrlBasedCorsConfigurationSource();
-        configSource.registerCorsConfiguration("/**", config);
-        return new CorsFilter(configSource);
-    }
-
-}
+//package cn.wisenergy.common.config.cors;
+//
+//import org.springframework.context.annotation.Bean;
+//import org.springframework.context.annotation.Configuration;
+//import org.springframework.web.cors.CorsConfiguration;
+//import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
+//import org.springframework.web.filter.CorsFilter;
+//
+///**
+// * 跨域过滤器设置
+// *
+// * @author wyy
+// * @date 2019-09-04 14:31
+// */
+//@Configuration
+//public class CORSFilter {
+//
+//    /**
+//     * 前置跨域设置【过滤器方式先于拦截器生效】
+//     *
+//     * @return
+//     */
+//    @Bean
+//    public CorsFilter corsFilter() {
+//        CorsConfiguration config = new CorsConfiguration();
+//        config.addAllowedOrigin("*");
+//        config.setAllowCredentials(true);
+//        config.addAllowedMethod("*");
+//        config.addAllowedHeader("*");
+//        UrlBasedCorsConfigurationSource configSource = new UrlBasedCorsConfigurationSource();
+//        configSource.registerCorsConfiguration("/**", config);
+//        return new CorsFilter(configSource);
+//    }
+//
+//}

wisenergy-web-admin/src/main/java/cn/wisenergy/web/config/GlobalCorsConfig.java

@@ -20,16 +20,15 @@ public class GlobalCorsConfig {
     public CorsFilter corsFilter() {
         //1.添加CORS配置信息
         CorsConfiguration config = new CorsConfiguration();
-        //1) 允许通过的域,不要写*，否则cookie就无法使用了
+        //2) 允许通过的域,不要写*，否则cookie就无法使用了
         if (corsUrlList != null && corsUrlList.length() > 1) {
             config.setAllowedOrigins(Arrays.asList(StringUtils.split(corsUrlList, ",")));
+            config.setAllowCredentials(true);
         } else {
+            config.setAllowCredentials(false);
             config.addAllowedOrigin("*");
         }
 
-        //2) 是否发送Cookie信息
-
-        config.setAllowCredentials(true);
         //3) 允许的请求方式
         config.addAllowedMethod("OPTIONS");
         config.addAllowedMethod("GET");

wisenergy-web-admin/src/main/java/cn/wisenergy/web/config/MvcConfiguration.java

@@ -45,22 +45,6 @@ public class MvcConfiguration extends WebMvcConfigurationSupport {
     @Value("${uploadFile.location}")
     private String location;
 
-    /**
-     * 后置跨域支持【当出现跨域请求,此处会放在拦截器最后执行，CORS失效】
-     *
-     * @param registry
-     */
-    @Override
-    public void addCorsMappings(CorsRegistry registry) {
-        registry.addMapping("/**")
-                .allowedOriginPatterns("*")
-                .allowedHeaders("*")
-                .allowedMethods("*")
-                .allowCredentials(true)
-                .maxAge(3600);
-    }
-
-
     /**
      * 配置消息转换器：Ali开源的fastJson
      *

wisenergy-web-admin/src/main/java/cn/wisenergy/web/shiro/ShiroConfig.java → wisenergy-web-admin/src/main/java/cn/wisenergy/web/config/ShiroConfig.java

-package cn.wisenergy.web.shiro;
+package cn.wisenergy.web.config;
 
 import cn.wisenergy.web.shiro.filter.AuthRealm;
 import cn.wisenergy.web.shiro.filter.JwtFilter;