Commit 94dc0fe8 authored by 李良停's avatar 李良停

llt

parent a8aeac39
.class
.classpath
.project
.settings
/.idea/
*.jar
*.war
*.ear
*.iml
.idea_modules/
out/
build/
logs/
classes/
target/
.DS_Store
MANIFEST.MF
overlays/
...@@ -111,7 +111,7 @@ public class AuthController { ...@@ -111,7 +111,7 @@ public class AuthController {
String loginType = CookiesUtil.getCookie(request, COOKIE_LOGIN_TYPE); String loginType = CookiesUtil.getCookie(request, COOKIE_LOGIN_TYPE);
if(null != loginType) { if(null != loginType) {
mv.addObject("loginType", loginType); mv.addObject("loginType", loginType);
CookiesUtil.delCookie(response, null, null, COOKIE_LOGIN_TYPE, loginType); CookiesUtil.delCookie(response, null, "/", COOKIE_LOGIN_TYPE, loginType);
} }
return mv; return mv;
} }
...@@ -127,7 +127,7 @@ public class AuthController { ...@@ -127,7 +127,7 @@ public class AuthController {
AuthLog authLog = authLogService.getById(authLogId); AuthLog authLog = authLogService.getById(authLogId);
authLog.setIdp(idp); authLog.setIdp(idp);
authLogService.save(authLog); authLogService.save(authLog);
CookiesUtil.delCookie(response, null, null, COOKIE_LOG_ID, authLogId); CookiesUtil.delCookie(response, null, "/", COOKIE_LOG_ID, authLogId);
} }
response.sendRedirect(loginUrl); response.sendRedirect(loginUrl);
return null; return null;
...@@ -179,6 +179,29 @@ public class AuthController { ...@@ -179,6 +179,29 @@ public class AuthController {
authUserInfo.setRealName(toUtf8(request.getAttribute("cn"))); authUserInfo.setRealName(toUtf8(request.getAttribute("cn")));
authUserInfo.setId(toUtf8(request.getAttribute("uid"))); authUserInfo.setId(toUtf8(request.getAttribute("uid")));
clientDataInfo.setAuthUserInfo(authUserInfo); clientDataInfo.setAuthUserInfo(authUserInfo);
Map<String, Object> map = new HashMap<String, Object>();
String atrStr = (String) request.getAttribute("Shib-Identity-Provider");
map.put("Shib-Identity-Provider", atrStr);
map.put("uid", toUtf8(request.getAttribute("uid")));
map.put("cn", toUtf8(request.getAttribute("cn")));
map.put("domainName", toUtf8(request.getAttribute("domainName")));
map.put("typeOf", toUtf8(request.getAttribute("typeOf")));
map.put("eduID", toUtf8(request.getAttribute("eduID")));
map.put("shEduPersonUserId", toUtf8(request.getAttribute("shEduPersonUserId")));
map.put("shEduPersonDateOfBirth", toUtf8(request.getAttribute("shEduPersonDateOfBirth")));
map.put("shEduPersonGender", toUtf8(request.getAttribute("shEduPersonGender")));
map.put("shEduPersonHomeOrganization", toUtf8(request.getAttribute("shEduPersonHomeOrganization")));
map.put("shEduPersonHomeOrganizationType", toUtf8(request.getAttribute("shEduPersonHomeOrganizationType")));
map.put("shEduPersonDepartment", toUtf8(request.getAttribute("shEduPersonDepartment")));
map.put("shEduPersonMajor", toUtf8(request.getAttribute("shEduPersonMajor")));
map.put("shEduPersonMatriculationDate", toUtf8(request.getAttribute("shEduPersonMatriculationDate")));
map.put("shEduPersionStageOfStudy", toUtf8(request.getAttribute("shEduPersionStageOfStudy")));
map.put("shEduPersonGrade", toUtf8(request.getAttribute("shEduPersonGrade")));
map.put("shEduPersonClass", toUtf8(request.getAttribute("shEduPersonClass")));
map.put("shEduPersonSchool", toUtf8(request.getAttribute("shEduPersonSchool")));
map.put("shEduId", toUtf8(request.getAttribute("shEduId")));
System.out.println(JSON.toJSONString(map));
return clientDataInfo; return clientDataInfo;
} }
private String toUtf8(Object ob){ private String toUtf8(Object ob){
......
#Generated by Apache Maven #Generated by Apache Maven
#Wed Aug 05 10:52:47 CST 2020 #Wed Aug 05 16:41:37 CST 2020
version=1.0-SNAPSHOT version=1.0-SNAPSHOT
groupId=com.chineseall.authcenter groupId=com.chineseall.authcenter
artifactId=sh-authcenter-agent artifactId=sh-authcenter-agent
#Generated by Apache Maven #Generated by Apache Maven
#Wed Aug 05 10:52:41 CST 2020 #Wed Aug 05 16:41:31 CST 2020
version=1.0-SNAPSHOT version=1.0-SNAPSHOT
groupId=com.chineseall.authcenter groupId=com.chineseall.authcenter
artifactId=sh-authcenter-log artifactId=sh-authcenter-log
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