|
@@ -48,8 +48,8 @@ public class OpenAccountController {
|
|
private MarkGroupService groupService;
|
|
private MarkGroupService groupService;
|
|
|
|
|
|
@RequestMapping(value = "/marker/login", method = RequestMethod.POST)
|
|
@RequestMapping(value = "/marker/login", method = RequestMethod.POST)
|
|
- public String markerLogin(HttpServletRequest request, RedirectAttributes redirect, @RequestParam String account,
|
|
|
|
- @RequestParam String returnUrl) {
|
|
|
|
|
|
+ public String markerLogin(HttpServletRequest request, RedirectAttributes redirect, @RequestParam String time,
|
|
|
|
+ @RequestParam String authorization, @RequestParam String account, @RequestParam String returnUrl) {
|
|
// 请求参数验证
|
|
// 请求参数验证
|
|
account = StringUtils.trimToEmpty(account);
|
|
account = StringUtils.trimToEmpty(account);
|
|
returnUrl = StringUtils.trimToEmpty(returnUrl);
|
|
returnUrl = StringUtils.trimToEmpty(returnUrl);
|
|
@@ -61,7 +61,7 @@ public class OpenAccountController {
|
|
}
|
|
}
|
|
// 签名验证,获取访问学校
|
|
// 签名验证,获取访问学校
|
|
School school = null;
|
|
School school = null;
|
|
- SignatureInfo info = authorizationService.buildSignature(request);
|
|
|
|
|
|
+ SignatureInfo info = authorizationService.buildSignature(request, time, authorization);
|
|
if (info != null && info.getType() == SignatureType.SECRET) {
|
|
if (info != null && info.getType() == SignatureType.SECRET) {
|
|
school = schoolService.findByAccessKey(info.getInvoker());
|
|
school = schoolService.findByAccessKey(info.getInvoker());
|
|
}
|
|
}
|