新oa待办跳转到待办页面bug修复5
This commit is contained in:
parent
554be3d22e
commit
22da7ad78c
|
@ -18,6 +18,7 @@ import java.util.Base64;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
*
|
||||||
**/
|
**/
|
||||||
public class SSOPluginLogin implements ThirdSSOAuthHandler {
|
public class SSOPluginLogin implements ThirdSSOAuthHandler {
|
||||||
private final static Log logger = LogFactory.getLog(SSOPluginLogin.class);
|
private final static Log logger = LogFactory.getLog(SSOPluginLogin.class);
|
||||||
|
@ -118,6 +119,11 @@ public class SSOPluginLogin implements ThirdSSOAuthHandler {
|
||||||
//获取返回的授权码
|
//获取返回的授权码
|
||||||
String code = httpServletRequest.getParameter("code");
|
String code = httpServletRequest.getParameter("code");
|
||||||
logger.info(String.format("getTrdSSOAuth→授权码code:%s", code));
|
logger.info(String.format("getTrdSSOAuth→授权码code:%s", code));
|
||||||
|
if (StringUtils.isEmpty(code)) {
|
||||||
|
logger.error("getTrdSSOAuth→授权码code为空");
|
||||||
|
result.setSucess(false);
|
||||||
|
return result;
|
||||||
|
}
|
||||||
//调用EOSS获取token接口
|
//调用EOSS获取token接口
|
||||||
String access_token = AuthService.accessToken(code, ip, client, secret);
|
String access_token = AuthService.accessToken(code, ip, client, secret);
|
||||||
logger.info(String.format("accessToken返回数据:%s", access_token));
|
logger.info(String.format("accessToken返回数据:%s", access_token));
|
||||||
|
@ -148,11 +154,7 @@ public class SSOPluginLogin implements ThirdSSOAuthHandler {
|
||||||
}
|
}
|
||||||
//二次重定向进入
|
//二次重定向进入
|
||||||
result.setUserType(UserProperType.UserName);
|
result.setUserType(UserProperType.UserName);
|
||||||
if (StringUtils.isEmpty(code)) {
|
if (StringUtils.isNotEmpty(code) && user != null) {
|
||||||
logger.error("getTrdSSOAuth→授权码code为空");
|
|
||||||
result.setSucess(false);
|
|
||||||
return result;
|
|
||||||
} else if (StringUtils.isNotEmpty(code) && user != null) {
|
|
||||||
//当前返回类型手机,用户名,email,工号
|
//当前返回类型手机,用户名,email,工号
|
||||||
result.setUserType(UserProperType.UserName);
|
result.setUserType(UserProperType.UserName);
|
||||||
result.setUser(user);
|
result.setUser(user);
|
||||||
|
|
Loading…
Reference in New Issue