Commit b259d312 authored by 喻春霖's avatar 喻春霖

fixed

parent 2c0b40a5
...@@ -258,8 +258,8 @@ public class AuthController { ...@@ -258,8 +258,8 @@ public class AuthController {
authLog.setLogType(LogType.logout); authLog.setLogType(LogType.logout);
authLogService.save(authLog); authLogService.save(authLog);
if(StringUtils.isNotEmpty(service)) { if(StringUtils.isNotEmpty(service)) {
//response.sendRedirect(generateLogoutUrl(service, type.name())); response.sendRedirect(generateLogoutUrl(service, type.name()));
response.sendRedirect(service); //response.sendRedirect(service);
} }
return null; return null;
} catch (Exception e) { } catch (Exception e) {
...@@ -483,6 +483,9 @@ public class AuthController { ...@@ -483,6 +483,9 @@ public class AuthController {
//oauthConfig + "/authorize?client_id=testClentId&redirect_uri=http%3a%2f%2f192.168.17.129%3a7774%2fauth%2floginsuccess.do&state=state" //oauthConfig + "/authorize?client_id=testClentId&redirect_uri=http%3a%2f%2f192.168.17.129%3a7774%2fauth%2floginsuccess.do&state=state"
StringBuilder loginUrlBuilder = new StringBuilder(); StringBuilder loginUrlBuilder = new StringBuilder();
OauthConfigItem oauthConfigItem = oauthConfig.getItems().get(oauthType); OauthConfigItem oauthConfigItem = oauthConfig.getItems().get(oauthType);
if (!"dianjiaoguan".equals(oauthConfigItem.getClientId()) && !"edenoperation".equals(oauthConfigItem.getClientId()){
return returnUrl;
}
loginUrlBuilder.append(oauthConfigItem.getOauthUrl()); loginUrlBuilder.append(oauthConfigItem.getOauthUrl());
if (!oauthConfigItem.getOauthUrl().endsWith("/")) { if (!oauthConfigItem.getOauthUrl().endsWith("/")) {
loginUrlBuilder.append("/"); loginUrlBuilder.append("/");
......
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