diff --git a/mall-admin/src/main/java/com/macro/mall/config/GlobalCorsConfig.java b/mall-admin/src/main/java/com/macro/mall/config/GlobalCorsConfig.java
index 9b82c11..f07d095 100644
--- a/mall-admin/src/main/java/com/macro/mall/config/GlobalCorsConfig.java
+++ b/mall-admin/src/main/java/com/macro/mall/config/GlobalCorsConfig.java
@@ -8,9 +8,10 @@ import org.springframework.web.filter.CorsFilter;
 
 /**
  * 全局跨域配置
+ * 注意：前端从网关进行调用时不需要配置
  * Created by macro on 2019/7/27.
  */
-@Configuration
+//@Configuration
 public class GlobalCorsConfig {
 
     /**
diff --git a/mall-gateway/src/main/java/com/macro/mall/config/GlobalCorsConfig.java b/mall-gateway/src/main/java/com/macro/mall/config/GlobalCorsConfig.java
new file mode 100644
index 0000000..4514bc5
--- /dev/null
+++ b/mall-gateway/src/main/java/com/macro/mall/config/GlobalCorsConfig.java
@@ -0,0 +1,31 @@
+package com.macro.mall.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.cors.CorsConfiguration;
+import org.springframework.web.cors.reactive.CorsWebFilter;
+import org.springframework.web.cors.reactive.UrlBasedCorsConfigurationSource;
+import org.springframework.web.util.pattern.PathPatternParser;
+
+/**
+ * 全局跨域配置
+ * 注意：前端从网关进行调用时需要配置
+ * Created by macro on 2019/7/27.
+ */
+@Configuration
+public class GlobalCorsConfig {
+
+    @Bean
+    public CorsWebFilter corsFilter() {
+        CorsConfiguration config = new CorsConfiguration();
+        config.addAllowedMethod("*");
+        config.addAllowedOrigin("*");
+        config.addAllowedHeader("*");
+
+        UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource(new PathPatternParser());
+        source.registerCorsConfiguration("/**", config);
+
+        return new CorsWebFilter(source);
+    }
+
+}