Browse Source

代理跳转登录,token过期或者登录不上,则以未登录状态跳转

wangmh 7 years ago
parent
commit
9342c6626f

+ 7 - 1
sso-server/src/main/java/com/uas/sso/controller/LoginController.java

@@ -280,7 +280,7 @@ public class LoginController extends BaseController {
             }
             }
             return loginByUser(userAccount, returnUrl, null, true);
             return loginByUser(userAccount, returnUrl, null, true);
         }
         }
-        return error("验证信息已过期");
+        return success(new ModelMap("returnUrl", HttpUtil.decodeURL(returnUrl)));
     }
     }
 
 
     /**
     /**
@@ -294,6 +294,9 @@ public class LoginController extends BaseController {
     @RequestMapping(value = "/mobile/proxy", method = RequestMethod.POST)
     @RequestMapping(value = "/mobile/proxy", method = RequestMethod.POST)
     public ModelMap loginProxyByToken(String token, String appId, Long spaceUU, String returnUrl, String baseUrl) {
     public ModelMap loginProxyByToken(String token, String appId, Long spaceUU, String returnUrl, String baseUrl) {
         Token tk = tokenService.findOne(token);
         Token tk = tokenService.findOne(token);
+        if (tk == null) {
+            return success(new ModelMap("returnUrl", HttpUtil.decodeURL(returnUrl)));
+        }
         App app = appService.findOne(appId);
         App app = appService.findOne(appId);
         baseUrl = StringUtils.isEmpty(baseUrl) ? app.getLoginUrl() : baseUrl;
         baseUrl = StringUtils.isEmpty(baseUrl) ? app.getLoginUrl() : baseUrl;
         request.getSession().setAttribute("baseUrl", baseUrl);
         request.getSession().setAttribute("baseUrl", baseUrl);
@@ -312,6 +315,9 @@ public class LoginController extends BaseController {
         }
         }
 
 
         UserAccount userAccount = userAccountService.findOneByUserUU(app.getUid(), userUU, spaceUU);
         UserAccount userAccount = userAccountService.findOneByUserUU(app.getUid(), userUU, spaceUU);
+        if (userAccount == null) {
+            return success(new ModelMap("returnUrl", HttpUtil.decodeURL(returnUrl)));
+        }
         return loginByUser(userAccount, returnUrl, null, false);
         return loginByUser(userAccount, returnUrl, null, false);
     }
     }