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

fixed

parent 90cdcf1d
......@@ -460,6 +460,10 @@ public class AuthController {
// oauth 认证
loginUrlBuilder.append("oauth2.0/authorize?client_id=").append(authSource.getClientId());
loginUrlBuilder.append("&state=state&response_type=code");
}if(Objects.equals(authSource.getAuthType(), 3)){
// oauth 认证
loginUrlBuilder.append("oauth2.0/authorize2?client_id=").append(authSource.getClientId());
loginUrlBuilder.append("&state=state&response_type=code");
}else if(Objects.equals(authSource.getAuthType(), 2)){
// idp 认证
loginUrlBuilder.append("login?client_id=").append(authSource.getClientId());
......
......@@ -9,6 +9,9 @@ public enum OauthType {
dianjiaoguan("dianjiaoguan","电教馆账号认证","oauth"),
edenoperation("edenoperation","数字教材账号认证","oauth"),
operation_genius3("operation_genius3","学习精灵3.0","oauth_genius3"),
qpjy("qpjy","青浦教育","idp"),
xhjy("xhjy","徐汇教育","idp"),
cnjy("cnjy","长宁教育","idp"),
......
......@@ -11,6 +11,7 @@
/*<![CDATA[*/
var dianjiaoguanLoinUrl = [[${dianjiaoguanLoginUrl}]];
var edenoperationLoginUrl = [[${edenoperationLoginUrl}]];
var operation_genius3LoginUrl = [[${operation_genius3LoginUrl}]];
var logId = [[${logId}]];
var loginType = [[${loginType}]];
var ctxPath = /*[[@{/}]]*/ '';
......@@ -40,6 +41,8 @@
window.location.href = baseUrl+ "dianjiaoguan&loginUrl=" + encodeURIComponent(dianjiaoguanLoinUrl)+"&browser="+info.browser+"&device="+info.device+"&os="+info.os+"&version="+info.version;
} else if (idp=="edenoperation") {
window.location.href = baseUrl+ "edenoperation&loginUrl=" + encodeURIComponent(edenoperationLoginUrl)+"&browser="+info.browser+"&device="+info.device+"&os="+info.os+"&version="+info.version;
}else if (idp=="operation_genius3") {
window.location.href = baseUrl+ "operation_genius3&loginUrl=" + encodeURIComponent(operation_genius3LoginUrl)+"&browser="+info.browser+"&device="+info.device+"&os="+info.os+"&version="+info.version;
} else {
window.location.href = baseUrl+idp+"&loginUrl=" + encodeURIComponent(idpList[idp]+"&auth_source="+idp)+"&browser="+info.browser+"&device="+info.device+"&os="+info.os+"&version="+info.version;
}
......
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