|
@@ -95,13 +95,15 @@ public class AuthenticationController {
|
|
|
@ResponseBody
|
|
@ResponseBody
|
|
|
public ModelAndView loginBySms(@RequestParam("phone") String phone,
|
|
public ModelAndView loginBySms(@RequestParam("phone") String phone,
|
|
|
@RequestParam("code") String code,
|
|
@RequestParam("code") String code,
|
|
|
- @RequestParam("sessionId") String sessionId,
|
|
|
|
|
@RequestParam(value = "remember", required = false, defaultValue = "false") boolean remember,
|
|
@RequestParam(value = "remember", required = false, defaultValue = "false") boolean remember,
|
|
|
@RequestParam(value = "requireToken", required = false, defaultValue = "false") boolean requireToken,
|
|
@RequestParam(value = "requireToken", required = false, defaultValue = "false") boolean requireToken,
|
|
|
HttpServletRequest request,
|
|
HttpServletRequest request,
|
|
|
HttpServletResponse response) {
|
|
HttpServletResponse response) {
|
|
|
|
|
+
|
|
|
|
|
+ String rand = (String) request.getSession(true).getAttribute("aliMsgCode");
|
|
|
|
|
+
|
|
|
ModelAndView result = new ModelAndView(new MappingJackson2JsonView());
|
|
ModelAndView result = new ModelAndView(new MappingJackson2JsonView());
|
|
|
- PhoneCodeToken phoneCodeToken = new PhoneCodeToken(phone, code, sessionId);
|
|
|
|
|
|
|
+ PhoneCodeToken phoneCodeToken = new PhoneCodeToken(phone, code, rand);
|
|
|
Map<String, Object> map = login(phoneCodeToken, remember, requireToken, 3, request, response);
|
|
Map<String, Object> map = login(phoneCodeToken, remember, requireToken, 3, request, response);
|
|
|
result.addAllObjects(map);
|
|
result.addAllObjects(map);
|
|
|
return result;
|
|
return result;
|