|
@@ -38,8 +38,8 @@ public class UserLoginController extends BaseController {
|
|
|
|
|
|
|
|
@RequestMapping(value = "/login", method = RequestMethod.GET)
|
|
@RequestMapping(value = "/login", method = RequestMethod.GET)
|
|
|
@ResponseBody
|
|
@ResponseBody
|
|
|
- public Result login() {
|
|
|
|
|
- Result res = new Result();
|
|
|
|
|
|
|
+ public Result<T> login() {
|
|
|
|
|
+ Result<T> res = new Result<>();
|
|
|
TokenManager.logout();
|
|
TokenManager.logout();
|
|
|
return res;
|
|
return res;
|
|
|
}
|
|
}
|
|
@@ -47,11 +47,7 @@ public class UserLoginController extends BaseController {
|
|
|
/**
|
|
/**
|
|
|
* 用户登录
|
|
* 用户登录
|
|
|
*
|
|
*
|
|
|
- * @param user
|
|
|
|
|
- * @param remember
|
|
|
|
|
- * @param request
|
|
|
|
|
- * @return
|
|
|
|
|
- */
|
|
|
|
|
|
|
+ */
|
|
|
@RequestMapping(value = "/signin", method = RequestMethod.POST)
|
|
@RequestMapping(value = "/signin", method = RequestMethod.POST)
|
|
|
@ResponseBody
|
|
@ResponseBody
|
|
|
public Result signin(User user, Boolean remember, HttpServletRequest request) {
|
|
public Result signin(User user, Boolean remember, HttpServletRequest request) {
|
|
@@ -70,10 +66,7 @@ public class UserLoginController extends BaseController {
|
|
|
/**
|
|
/**
|
|
|
* 用户登录
|
|
* 用户登录
|
|
|
*
|
|
*
|
|
|
- * @param user
|
|
|
|
|
- * @param remember
|
|
|
|
|
- * @return
|
|
|
|
|
- */
|
|
|
|
|
|
|
+ */
|
|
|
@RequestMapping(value = "/mlogin", method = RequestMethod.POST)
|
|
@RequestMapping(value = "/mlogin", method = RequestMethod.POST)
|
|
|
@ResponseBody
|
|
@ResponseBody
|
|
|
public Result mLogin(User user, Boolean remember) {
|
|
public Result mLogin(User user, Boolean remember) {
|