Commit edf13f96 by 吴迪

跨域问题

parent 7f80ba58
...@@ -9,7 +9,6 @@ ...@@ -9,7 +9,6 @@
package io.office.modules.sys.oauth2; package io.office.modules.sys.oauth2;
import com.google.gson.Gson; import com.google.gson.Gson;
import io.office.common.utils.HttpContextUtils;
import io.office.common.utils.R; import io.office.common.utils.R;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.apache.http.HttpStatus; import org.apache.http.HttpStatus;
...@@ -63,7 +62,7 @@ public class OAuth2Filter extends AuthenticatingFilter { ...@@ -63,7 +62,7 @@ public class OAuth2Filter extends AuthenticatingFilter {
if (StringUtils.isBlank(token)) { if (StringUtils.isBlank(token)) {
HttpServletResponse httpResponse = (HttpServletResponse) response; HttpServletResponse httpResponse = (HttpServletResponse) response;
httpResponse.setHeader("Access-Control-Allow-Credentials", "true"); httpResponse.setHeader("Access-Control-Allow-Credentials", "true");
httpResponse.setHeader("Access-Control-Allow-Origin", HttpContextUtils.getOrigin()); httpResponse.setHeader("Access-Control-Allow-Origin", "*");
String json = new Gson().toJson(R.error(HttpStatus.SC_UNAUTHORIZED, "invalid token")); String json = new Gson().toJson(R.error(HttpStatus.SC_UNAUTHORIZED, "invalid token"));
...@@ -80,7 +79,7 @@ public class OAuth2Filter extends AuthenticatingFilter { ...@@ -80,7 +79,7 @@ public class OAuth2Filter extends AuthenticatingFilter {
HttpServletResponse httpResponse = (HttpServletResponse) response; HttpServletResponse httpResponse = (HttpServletResponse) response;
httpResponse.setContentType("application/json;charset=utf-8"); httpResponse.setContentType("application/json;charset=utf-8");
httpResponse.setHeader("Access-Control-Allow-Credentials", "true"); httpResponse.setHeader("Access-Control-Allow-Credentials", "true");
httpResponse.setHeader("Access-Control-Allow-Origin", HttpContextUtils.getOrigin()); httpResponse.setHeader("Access-Control-Allow-Origin", "*");
try { try {
//处理登录失败的异常 //处理登录失败的异常
Throwable throwable = e.getCause() == null ? e : e.getCause(); Throwable throwable = e.getCause() == null ? e : e.getCause();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment