|
@@ -8,6 +8,7 @@
|
|
|
package cn.com.qmth.examcloud.app.controller;
|
|
|
|
|
|
import cn.com.qmth.examcloud.app.model.LoginInfo;
|
|
|
+import cn.com.qmth.examcloud.app.model.LoginType;
|
|
|
import cn.com.qmth.examcloud.app.model.Result;
|
|
|
import cn.com.qmth.examcloud.app.model.UserInfo;
|
|
|
import cn.com.qmth.examcloud.app.service.BaseInfoService;
|
|
@@ -62,14 +63,14 @@ public class UserAuthRestController {
|
|
|
@RequestMapping(value = "/user/verify", method = {RequestMethod.GET, RequestMethod.POST})
|
|
|
public Result<UserInfo> verifyLogin(@RequestParam String account, @RequestParam String smsCode, @RequestParam(required = false) Long rootOrgId,
|
|
|
@RequestParam(required = false) String domain, @RequestHeader String deviceId) throws Exception {
|
|
|
- LoginInfo loginInfo = new LoginInfo(account, null, "STUDENT_PHONE", rootOrgId, domain, deviceId, smsCode);
|
|
|
+ LoginInfo loginInfo = new LoginInfo(account, null, LoginType.STUDENT_PHONE.name(), rootOrgId, domain, deviceId, smsCode);
|
|
|
Result<UserInfo> result = userAuthService.login(loginInfo);
|
|
|
if (result.isSuccess() && result.getData() != null) {
|
|
|
//登录成功后缓存Token信息
|
|
|
UserInfo userInfo = result.getData();
|
|
|
loginInfo.setUserName(userInfo.getDisplayName());
|
|
|
- loginInfo.setKey(userInfo.getKey());
|
|
|
loginInfo.setToken(userInfo.getToken());
|
|
|
+ loginInfo.setKey(userInfo.getKey());
|
|
|
loginInfo.setAppToken(userInfo.getToken());
|
|
|
userAuthService.cacheLoginInfo(loginInfo, userInfo.getKey());
|
|
|
log.info(String.format("key:%s token:%s", userInfo.getKey(), userInfo.getToken()));
|