提交app代码

src/main/java/cn/com/qmth/examcloud/app/controller/UserAuthRestController.java

@@ -37,10 +37,29 @@ public class UserAuthRestController {
     private BaseInfoService baseInfoService;
 
     @ApiOperation(value = "登录接口", notes = "参数accountType值说明：学生身份证号类型=STUDENT_IDENTITY_NUMBER，学生学号类型=STUDENT_CODE，学生手机号类型=STUDENT_PHONE")
-    @RequestMapping(value = {"/user/login","/user/verify"}, 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 String accountType, @RequestParam(required = false) Long rootOrgId,
                                   @RequestParam(required = false) String domain, @RequestHeader String deviceId) throws Exception {
-        LoginInfo loginInfo = new LoginInfo(account, password, accountType, rootOrgId, domain, deviceId);
+        LoginInfo loginInfo = new LoginInfo(account, password, accountType, rootOrgId, domain, deviceId, null);
+        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.setAppToken(userInfo.getToken());
+            userAuthService.cacheLoginInfo(loginInfo, userInfo.getKey());
+            log.info(String.format("key:%s token:%s", userInfo.getKey(), userInfo.getToken()));
+        }
+        return result;
+    }
+    
+    @ApiOperation(value = "验证码接口", notes = "参数accountType值说明：学生身份证号类型=STUDENT_IDENTITY_NUMBER，学生学号类型=STUDENT_CODE，学生手机号类型=STUDENT_PHONE")
+    @RequestMapping(value = "/user/verify", method = {RequestMethod.GET, RequestMethod.POST})
+    public Result<UserInfo> verifyLogin(@RequestParam String account, @RequestParam String smsCode, @RequestParam String accountType, @RequestParam(required = false) Long rootOrgId,
+                                  @RequestParam(required = false) String domain, @RequestHeader String deviceId) throws Exception {
+        LoginInfo loginInfo = new LoginInfo(account, null, accountType, rootOrgId, domain, deviceId, smsCode);
         Result<UserInfo> result = userAuthService.login(loginInfo);
         if (result.isSuccess() && result.getData() != null) {
             //登录成功后缓存Token信息

src/main/java/cn/com/qmth/examcloud/app/model/LoginInfo.java

@@ -30,6 +30,7 @@ public class LoginInfo implements Serializable {
     private String appToken;
     private String deviceId;
     private Date createTime;
+    private String smsCode;
 
     public LoginInfo(String account, String password, String accountType, Long rootOrgId, String domain, String key, String token, String deviceId) {
         this.account = account;
@@ -43,7 +44,7 @@ public class LoginInfo implements Serializable {
         this.createTime = new Date();
     }
 
-    public LoginInfo(String account, String password, String accountType, Long rootOrgId, String domain, String deviceId) {
+    public LoginInfo(String account, String password, String accountType, Long rootOrgId, String domain, String deviceId, String smsCode) {
         this.account = account;
         this.password = password;
         this.accountType = accountType;
@@ -51,6 +52,7 @@ public class LoginInfo implements Serializable {
         this.domain = domain;
         this.deviceId = deviceId;
         this.createTime = new Date();
+        this.smsCode = smsCode;
     }
 
     public LoginInfo() {
@@ -160,4 +162,12 @@ public class LoginInfo implements Serializable {
         this.createTime = createTime;
     }
 
+	public String getSmsCode() {
+		return smsCode;
+	}
+
+	public void setSmsCode(String smsCode) {
+		this.smsCode = smsCode;
+	}
+
 }

src/main/java/cn/com/qmth/examcloud/app/service/impl/UserAuthServiceImpl.java

@@ -58,6 +58,7 @@ public class UserAuthServiceImpl implements UserAuthService {
         params.put("accountType", loginInfo.getAccountType());
         params.put("rootOrgId", loginInfo.getRootOrgId() != null ? loginInfo.getRootOrgId().toString() : "");
         params.put("domain", loginInfo.getDomain());
+        params.put("smsCode", loginInfo.getSmsCode());
         String json = new JsonMapper().toJson(params);
         RequestBody formBody = FormBody.create(MediaType.parse(Constants.CHARSET_JSON_UTF8), json);
         Request request = new Request.Builder()