|
@@ -38,7 +38,7 @@ public class UserAuthRestController {
|
|
|
|
|
|
@ApiOperation(value = "登录接口", notes = "参数accountType值说明:普通账号类型=COMMON_LOGIN_NAME,学号类型=STUDENT_CODE,学生手机号类型=STUDENT_PHONE")
|
|
@ApiOperation(value = "登录接口", notes = "参数accountType值说明:普通账号类型=COMMON_LOGIN_NAME,学号类型=STUDENT_CODE,学生手机号类型=STUDENT_PHONE")
|
|
@RequestMapping(value = "/user/login", method = {RequestMethod.GET, RequestMethod.POST})
|
|
@RequestMapping(value = "/user/login", method = {RequestMethod.GET, RequestMethod.POST})
|
|
- public Result<UserInfo> login(@RequestParam String account, @RequestParam String password, @RequestParam(required = false) String accountType,
|
|
|
|
|
|
+ public Result<UserInfo> login(@RequestParam String account, @RequestParam String password, @RequestParam String accountType,
|
|
@RequestParam(required = false) Long rootOrgId, @RequestParam(required = false) String domain) throws Exception {
|
|
@RequestParam(required = false) Long rootOrgId, @RequestParam(required = false) String domain) throws Exception {
|
|
LoginInfo loginInfo = new LoginInfo(account, password, accountType, rootOrgId, domain);
|
|
LoginInfo loginInfo = new LoginInfo(account, password, accountType, rootOrgId, domain);
|
|
Result<UserInfo> result = userAuthService.login(loginInfo);
|
|
Result<UserInfo> result = userAuthService.login(loginInfo);
|