Merge branch 'dev' into test

yun-zuoyi
wei.peng 6 years ago
commit 239569aa18

@ -75,7 +75,7 @@ public class AuthController extends CoreBaseController {
LOGGER.info("会员登陆:{}",user); LOGGER.info("会员登陆:{}",user);
AuthUtil.setSessionObject("languageCode",languageCode); AuthUtil.setSessionObject("languageCode",languageCode);
result = new ResultBean(true, "", AuthUtil.getSessionUser()); result = new ResultBean(true, AuthUtil.getSession().getId().toString(), AuthUtil.getSessionUser());
result.setUrl("/"); result.setUrl("/");
} catch (IncorrectCredentialsException e) { } catch (IncorrectCredentialsException e) {
// 密码错误 // 密码错误

Loading…
Cancel
Save