|
|
@@ -42,14 +42,15 @@ public class UserController extends BaseController<User> {
|
|
|
*/
|
|
|
@RequestMapping("/login")
|
|
|
@ResponseBody
|
|
|
- public boolean login(@NotEmpty("name") String name, @NotEmpty("password") String password,
|
|
|
- HttpServletRequest request) {
|
|
|
+ public User login(@NotEmpty("name") String name, @NotEmpty("password") String password,
|
|
|
+ HttpServletRequest request) {
|
|
|
User user = userService.login(name, password);
|
|
|
if (user != null) {
|
|
|
sessionHelper.saveSession(request, user);
|
|
|
- return true;
|
|
|
+ user.setPassword(null);
|
|
|
+ return user;
|
|
|
}
|
|
|
- return false;
|
|
|
+ return null;
|
|
|
}
|
|
|
|
|
|
/**
|