|
@@ -9,7 +9,7 @@ package cn.com.qmth.examcloud.app.controller.version1;
|
|
|
|
|
|
import cn.com.qmth.examcloud.app.model.LoginInfo;
|
|
import cn.com.qmth.examcloud.app.model.LoginInfo;
|
|
import cn.com.qmth.examcloud.app.model.Result;
|
|
import cn.com.qmth.examcloud.app.model.Result;
|
|
-import cn.com.qmth.examcloud.app.model.User;
|
|
|
|
|
|
+import cn.com.qmth.examcloud.app.model.UserInfo;
|
|
import cn.com.qmth.examcloud.app.service.UserAuthService;
|
|
import cn.com.qmth.examcloud.app.service.UserAuthService;
|
|
import io.swagger.annotations.Api;
|
|
import io.swagger.annotations.Api;
|
|
import io.swagger.annotations.ApiOperation;
|
|
import io.swagger.annotations.ApiOperation;
|
|
@@ -35,10 +35,10 @@ public class UserAuthRestController {
|
|
|
|
|
|
@ApiOperation(value = "登录接口")
|
|
@ApiOperation(value = "登录接口")
|
|
@RequestMapping(value = "/user/login", method = {RequestMethod.GET, RequestMethod.POST})
|
|
@RequestMapping(value = "/user/login", method = {RequestMethod.GET, RequestMethod.POST})
|
|
- public Result<User> login(@RequestParam String account, @RequestParam String password, @RequestParam(required = false) String accountType,
|
|
|
|
- @RequestParam(required = false) Long rootOrgId, @RequestParam(required = false) String domain) throws Exception {
|
|
|
|
|
|
+ public Result<UserInfo> login(@RequestParam String account, @RequestParam String password, @RequestParam(required = false) String accountType,
|
|
|
|
+ @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<User> result = userAuthService.login(loginInfo);
|
|
|
|
|
|
+ Result<UserInfo> result = userAuthService.login(loginInfo);
|
|
if (result.isSuccess()) {
|
|
if (result.isSuccess()) {
|
|
//缓存登录信息
|
|
//缓存登录信息
|
|
userAuthService.cacheLoginInfo(loginInfo, result.getData());
|
|
userAuthService.cacheLoginInfo(loginInfo, result.getData());
|