hanwenjie преди 4 години
родител
ревизия
08d0a8540e

+ 23 - 7
code/sapparent/sapcms/src/main/java/org/fouram/WebConfigurer.java

@@ -1,7 +1,12 @@
 package org.fouram;
 
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.core.annotation.Order;
+import org.springframework.web.cors.CorsConfiguration;
+import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
+import org.springframework.web.filter.CorsFilter;
 import org.springframework.web.servlet.config.annotation.CorsRegistry;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
@@ -29,14 +34,25 @@ public class WebConfigurer extends WebMvcConfigurationSupport {
 
 	/**
 	 * 添加跨域请求支持
-	 * 
-	 * @param registry
+	 *
+	 * @param
 	 */
-	@Override
-	public void addCorsMappings(CorsRegistry registry) {
+
+	@Bean
+	@Order(100)
+	public CorsFilter corsFilter() {
+		CorsConfiguration config = new CorsConfiguration();
 		log.warn("开启跨域支持");
-		registry.addMapping("/**").allowedOrigins("*").allowedHeaders("*")
-				.allowedMethods("POST", "GET", "PUT", "OPTIONS", "DELETE").maxAge(3600).allowCredentials(true);
-		super.addCorsMappings(registry);
+		config.addAllowedOrigin("*");
+		config.addAllowedMethod("*");
+		config.addAllowedHeader("*");
+		config.setAllowCredentials(true);
+
+		config.setMaxAge(3600L);
+
+		UrlBasedCorsConfigurationSource configSource = new UrlBasedCorsConfigurationSource();
+		configSource.registerCorsConfiguration("/**", config);
+
+		return new CorsFilter(configSource);
 	}
 }

+ 7 - 7
code/sapparent/sapservice/src/main/java/org/fouram/core/filter/CorsFilter.java

@@ -25,12 +25,12 @@ public class CorsFilter implements Filter {
 	@Override
 	public void doFilter(ServletRequest req, ServletResponse res,
 			FilterChain chain) throws IOException, ServletException {
-		HttpServletResponse response = (HttpServletResponse) res;
-		response.setHeader("Access-Control-Allow-Origin", "*");
-		response.setHeader("Access-Control-Allow-Methods",
-				"POST, GET, OPTIONS, DELETE");
-		response.setHeader("Access-Control-Max-Age", "3600");
-		response.setHeader("Access-Control-Allow-Headers", "x-requested-with");
-		chain.doFilter(req, res);
+//		HttpServletResponse response = (HttpServletResponse) res;
+//		response.setHeader("Access-Control-Allow-Origin", "*");
+//		response.setHeader("Access-Control-Allow-Methods",
+//				"POST, GET, OPTIONS, DELETE");
+//		response.setHeader("Access-Control-Max-Age", "3600");
+//		response.setHeader("Access-Control-Allow-Headers", "x-requested-with");
+//		chain.doFilter(req, res);
 	}
 }

+ 7 - 7
code/sapparent/sapservice/src/main/resources/env/develop/jdbc.properties

@@ -1,9 +1,9 @@
-#jdbc_url=jdbc:mysql://118.25.182.250:3306/cmc_sap?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&failOverReadOnly=false
+jdbc_url=jdbc:mysql://118.25.182.250:3306/cmc_sap?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&failOverReadOnly=false
+jdbc_driverClassName=com.mysql.jdbc.Driver
+jdbc_username=cmc
+jdbc_password=123456
+
+#jdbc_url=jdbc:mysql://localhost:3306/sap?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&failOverReadOnly=false
 #jdbc_driverClassName=com.mysql.jdbc.Driver
-#jdbc_username=cmc
+#jdbc_username=root
 #jdbc_password=123456
-
-jdbc_url=jdbc:mysql://localhost:3306/sap?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&failOverReadOnly=false
-jdbc_driverClassName=com.mysql.jdbc.Driver
-jdbc_username=root
-jdbc_password=123456