|
|
@@ -59,21 +59,24 @@ public class SecurityController {
|
|
|
@RequestMapping(value = "/logout", method = RequestMethod.GET, headers = "Accept=application/json")
|
|
|
@ResponseStatus(value = HttpStatus.OK)
|
|
|
@ResponseBody
|
|
|
- public ModelMap logout(HttpServletRequest request, HttpServletResponse response, HttpSession session, String returnUrl)
|
|
|
+ public String logout(HttpServletRequest request, HttpServletResponse response, HttpSession session, String returnUrl)
|
|
|
throws IOException {
|
|
|
+ String callback =request.getParameter("jsoncallback");
|
|
|
+ response.setContentType("text/html;charset=UTF-8");
|
|
|
session.invalidate();
|
|
|
SSOHelper.clearLogin(request, response);
|
|
|
SystemSession.clear();
|
|
|
if (StringUtils.isEmpty(returnUrl)) {
|
|
|
returnUrl = request.getHeader("Referer");
|
|
|
}
|
|
|
+ return "successCallback({success:'1'})";
|
|
|
/*boolean cross = SSOHelper.isCrossDomain(request);
|
|
|
if (cross) {
|
|
|
request.getSession().setAttribute(SSOConfig.SSOReferer, returnUrl);
|
|
|
// 跨域情况,需要再次询问账户中心
|
|
|
returnUrl = request.getContextPath() + "/logout/proxy";
|
|
|
}*/
|
|
|
- return new ModelMap("content", returnUrl);
|
|
|
+ //return new ModelMap("content", returnUrl);
|
|
|
}
|
|
|
|
|
|
/**
|