|
@@ -1,5 +1,7 @@
|
|
package cn.com.qmth.stmms.open.controller;
|
|
package cn.com.qmth.stmms.open.controller;
|
|
|
|
|
|
|
|
+import java.util.Date;
|
|
|
|
+
|
|
import cn.com.qmth.stmms.biz.school.model.School;
|
|
import cn.com.qmth.stmms.biz.school.model.School;
|
|
import cn.com.qmth.stmms.biz.school.service.SchoolService;
|
|
import cn.com.qmth.stmms.biz.school.service.SchoolService;
|
|
import cn.com.qmth.stmms.biz.user.model.User;
|
|
import cn.com.qmth.stmms.biz.user.model.User;
|
|
@@ -11,7 +13,9 @@ import cn.com.qmth.stmms.common.session.model.StmmsSession;
|
|
import cn.com.qmth.stmms.common.session.service.SessionService;
|
|
import cn.com.qmth.stmms.common.session.service.SessionService;
|
|
import cn.com.qmth.stmms.common.signature.SignatureInfo;
|
|
import cn.com.qmth.stmms.common.signature.SignatureInfo;
|
|
import cn.com.qmth.stmms.common.signature.SignatureType;
|
|
import cn.com.qmth.stmms.common.signature.SignatureType;
|
|
|
|
+import cn.com.qmth.stmms.common.utils.RequestIPUtil;
|
|
import cn.com.qmth.stmms.common.utils.RequestUtils;
|
|
import cn.com.qmth.stmms.common.utils.RequestUtils;
|
|
|
|
+
|
|
import org.apache.commons.lang3.StringUtils;
|
|
import org.apache.commons.lang3.StringUtils;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.stereotype.Controller;
|
|
import org.springframework.stereotype.Controller;
|
|
@@ -82,6 +86,9 @@ public class OpenUserController {
|
|
if (user.getRole() != Role.MARKER) {
|
|
if (user.getRole() != Role.MARKER) {
|
|
return errorRedirect(redirect, returnUrl, "第三方账号没有评卷权限");
|
|
return errorRedirect(redirect, returnUrl, "第三方账号没有评卷权限");
|
|
}
|
|
}
|
|
|
|
+ user.setLastLoginTime(new Date());
|
|
|
|
+ user.setLastLoginIp(RequestIPUtil.getIpAddress(request));
|
|
|
|
+ user = userService.save(user);
|
|
// 保存第三方账号到session
|
|
// 保存第三方账号到session
|
|
StmmsSession session = RequestUtils.getSession(request);
|
|
StmmsSession session = RequestUtils.getSession(request);
|
|
WebUser wu = new WebUser(user);
|
|
WebUser wu = new WebUser(user);
|
|
@@ -152,6 +159,9 @@ public class OpenUserController {
|
|
if (user.getRole() != Role.SUBJECT_HEADER) {
|
|
if (user.getRole() != Role.SUBJECT_HEADER) {
|
|
return errorRedirect(redirect, returnUrl, "第三方账号没有科组长权限");
|
|
return errorRedirect(redirect, returnUrl, "第三方账号没有科组长权限");
|
|
}
|
|
}
|
|
|
|
+ user.setLastLoginTime(new Date());
|
|
|
|
+ user.setLastLoginIp(RequestIPUtil.getIpAddress(request));
|
|
|
|
+ user = userService.save(user);
|
|
// 保存第三方账号到session
|
|
// 保存第三方账号到session
|
|
StmmsSession session = RequestUtils.getSession(request);
|
|
StmmsSession session = RequestUtils.getSession(request);
|
|
WebUser wu = new WebUser(user);
|
|
WebUser wu = new WebUser(user);
|