|
|
@@ -197,7 +197,9 @@ public class SecurityController {
|
|
|
*/
|
|
|
@RequestMapping(value = "/login/other")
|
|
|
@ResponseBody
|
|
|
- public ModelMap afterCrossLogin(HttpServletRequest request, HttpServletResponse response, String uid, long time , String data) {
|
|
|
+ public String afterCrossLogin(HttpServletRequest request, HttpServletResponse response, String uid, long time , String data) {
|
|
|
+ String callback =request.getParameter("jsoncallback");
|
|
|
+ response.setContentType("text/html;charset=UTF-8");
|
|
|
if (uid != null && data != null) {
|
|
|
SSOToken tk = new SSOToken();
|
|
|
tk.setUid(uid);
|
|
|
@@ -211,9 +213,10 @@ public class SecurityController {
|
|
|
SystemSession.setUser(user);
|
|
|
log(request, user);
|
|
|
}
|
|
|
- return new ModelMap("success", 1);
|
|
|
+
|
|
|
+ return "successCallback({success:'1'})";
|
|
|
}
|
|
|
- return new ModelMap("success", 0);
|
|
|
+ return "successCallback({success:'0'})";
|
|
|
}
|
|
|
|
|
|
/**
|