From 6680e68effd9827da5b4473c71da614ae1fc70fc Mon Sep 17 00:00:00 2001
From: yuquan.zhu <zhuyuquan@foreveross.com>
Date: Wed, 25 Mar 2020 10:41:57 +0800
Subject: [PATCH] 跨域
---
src/main/java/cn/timer/api/config/interceptor/RedisSessionInterceptor.java | 18 ++++++++++++++++++
src/main/java/cn/timer/api/config/interceptor/WebSecurityConfig.java | 21 +++++++++++++--------
2 files changed, 31 insertions(+), 8 deletions(-)
diff --git a/src/main/java/cn/timer/api/config/interceptor/RedisSessionInterceptor.java b/src/main/java/cn/timer/api/config/interceptor/RedisSessionInterceptor.java
index 09bb007..83e918e 100644
--- a/src/main/java/cn/timer/api/config/interceptor/RedisSessionInterceptor.java
+++ b/src/main/java/cn/timer/api/config/interceptor/RedisSessionInterceptor.java
@@ -5,6 +5,8 @@ import java.io.IOException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
+
+import org.springframework.stereotype.Component;
import org.springframework.web.servlet.HandlerInterceptor;
import org.springframework.web.servlet.ModelAndView;
@@ -12,12 +14,28 @@ import cn.hutool.json.JSONObject;
import cn.timer.api.utils.ResponseResult;
//拦截登录失效的请求
+@Component
public class RedisSessionInterceptor implements HandlerInterceptor {
@Override
public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler)
throws Exception {
+// response.setHeader("Access-Control-Allow-Origin","http://120.24.24.239:8088");
+//// response.setHeader("Access-Control-Allow-Origin",request.getHeader("Origin"));
+// response.setHeader("Access-Control-Allow-Methods", "*");
+// response.setHeader("Access-Control-Allow-Credentials", "true");
+// response.setHeader("Access-Control-Allow-Headers", "*");
+//
+// System.out.print("request.Origin>"+request.getHeader("Origin"));
+
+// //option预检查，直接通过请求
+// if ("OPTIONS".equals(request.getMethod())){
+// return true;
+// }
+
+
+
/*
* Enumeration<String> names = request.getHeaderNames();
* while(names.hasMoreElements()) { String name = (String)names.nextElement();
diff --git a/src/main/java/cn/timer/api/config/interceptor/WebSecurityConfig.java b/src/main/java/cn/timer/api/config/interceptor/WebSecurityConfig.java
index 9ef81dc..8b5ec32 100644
--- a/src/main/java/cn/timer/api/config/interceptor/WebSecurityConfig.java
+++ b/src/main/java/cn/timer/api/config/interceptor/WebSecurityConfig.java
@@ -80,13 +80,18 @@ public class WebSecurityConfig implements WebMvcConfigurer {
argumentResolvers.add(userMethodArgumentResolver);
}
-// @Override
-// public void addCorsMappings(CorsRegistry registry) {
-// registry.addMapping("/**")
-// .allowedOrigins("*")
-// .allowCredentials(true)
-// .allowedMethods("GET", "POST", "DELETE", "PUT","PATCH")
-// .maxAge(3600);
+// @Override
+// public void addCorsMappings(CorsRegistry registry) {
+//// System.out.println("我是MyWebConfig跨域");
+// //设置允许跨域的路径
+// registry.addMapping("/**")
+// //设置允许跨域请求的域名
+// .allowedOrigins("*")
+// //是否允许证书 不再默认开启
+// .allowCredentials(true)
+// //设置允许的方法
+// .allowedMethods("*")
+// //跨域允许时间
+// .maxAge(3600);
// }
-
}
--
libgit2 0.26.0