|
@@ -142,7 +142,7 @@ public class LoginController extends BaseController {
|
|
|
//获取当前登录账号信息
|
|
|
UserDO currUser = ShiroUtils.getUser();
|
|
|
|
|
|
- if(logoutRedirectUrl.contains("http")){
|
|
|
+ if(ObjectUtils.isEmpty(logoutRedirectUrl)){
|
|
|
//返回第三方退出登录接口
|
|
|
//回调地址示例:https://testmicrosrv.scca.com.cn:9668/session/end?client_id=f104472f-02f4-6ab6-f6dc&access_token=HRMpcEUueorxSGQccNolRB2vkpaxnWHGvQonRtnoKEr3Z7KQthcUFz8jdaSD&logout_redirect_uri=http://124.70.58.209:19087/login
|
|
|
String logoutRedirectBackUrl = permAuthPrefix + "/session/end" +
|
|
@@ -152,7 +152,7 @@ public class LoginController extends BaseController {
|
|
|
logger.error("logoutRedirectBackUrl==============="+logoutRedirectBackUrl);
|
|
|
return "redirect:" + logoutRedirectBackUrl;
|
|
|
}else {
|
|
|
- return "redirect:" + logoutRedirectUrl;
|
|
|
+ return loginUrl;
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -240,7 +240,7 @@ public class LoginController extends BaseController {
|
|
|
e.printStackTrace();
|
|
|
}
|
|
|
|
|
|
- if(logoutRedirectUrl.contains("http")){
|
|
|
+ if(ObjectUtils.isEmpty(logoutRedirectUrl)){
|
|
|
//返回第三方退出登录接口
|
|
|
//回调地址示例:https://testmicrosrv.scca.com.cn:9668/session/end?client_id=f104472f-02f4-6ab6-f6dc&access_token=HRMpcEUueorxSGQccNolRB2vkpaxnWHGvQonRtnoKEr3Z7KQthcUFz8jdaSD&logout_redirect_uri=http://124.70.58.209:19087/login
|
|
|
String logoutRedirectBackUrl = permAuthPrefix + "/session/end" +
|
|
@@ -250,7 +250,7 @@ public class LoginController extends BaseController {
|
|
|
logger.error("logoutRedirectBackUrl==============="+logoutRedirectBackUrl);
|
|
|
return "redirect:" + logoutRedirectBackUrl;
|
|
|
}else {
|
|
|
- return "redirect:" + logoutRedirectUrl;
|
|
|
+ return "redirect:" + loginUrl;
|
|
|
}
|
|
|
|
|
|
}
|