commit.

src/main/java/cn/com/qmth/examcloud/app/controller/v1/SystemRestController.java

@@ -9,13 +9,11 @@ package cn.com.qmth.examcloud.app.controller.v1;
 
 import cn.com.qmth.examcloud.app.model.Result;
 import cn.com.qmth.examcloud.app.service.NetExamService;
+import cn.com.qmth.examcloud.app.service.SmsService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestHeader;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 /**
  * 系统服务相关接口
@@ -28,6 +26,8 @@ import org.springframework.web.bind.annotation.RestController;
 public class SystemRestController {
     @Autowired
     private NetExamService netExamService;
+    @Autowired
+    private SmsService smsService;
 
     @ApiOperation(value = "获取服务器当前时间接口")
     @RequestMapping(value = "/system/currentTime", method = {RequestMethod.GET, RequestMethod.POST})
@@ -35,4 +35,16 @@ public class SystemRestController {
         return netExamService.getCurrentTime(key, token);
     }
 
+    @ApiOperation(value = "获取短信验证码接口")
+    @RequestMapping(value = "/send/sms/code", method = {RequestMethod.GET, RequestMethod.POST})
+    public Result sendSmsCode(@RequestHeader String key, @RequestHeader String token, @RequestParam String phone) throws Exception {
+        return smsService.sendSmsCode(key, token, phone);
+    }
+
+    @ApiOperation(value = "校验短信验证码接口")
+    @RequestMapping(value = "/check/sms/code", method = {RequestMethod.GET, RequestMethod.POST})
+    public Result checkSmsCode(@RequestHeader String key, @RequestHeader String token, @RequestParam String phone, @RequestParam String code) throws Exception {
+        return smsService.checkSmsCode(key, token, phone, code);
+    }
+
 }

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

@@ -8,7 +8,6 @@
 package cn.com.qmth.examcloud.app.controller.v1;
 
 import cn.com.qmth.examcloud.app.model.Result;
-import cn.com.qmth.examcloud.app.service.SmsService;
 import cn.com.qmth.examcloud.app.service.UserAuthService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -26,8 +25,6 @@ import org.springframework.web.bind.annotation.*;
 public class UserAuthRestController {
     @Autowired
     private UserAuthService userAuthService;
-    @Autowired
-    private SmsService smsService;
 
     @ApiOperation(value = "登录接口")
     @RequestMapping(value = "/user/login", method = {RequestMethod.GET, RequestMethod.POST})
@@ -53,16 +50,16 @@ public class UserAuthRestController {
         return userAuthService.updatePassword(key, token, userId, password);
     }
 
-    @ApiOperation(value = "获取短信验证码接口")
-    @RequestMapping(value = "/send/sms/code", method = {RequestMethod.GET, RequestMethod.POST})
-    public Result sendSmsCode(@RequestHeader String key, @RequestHeader String token, @RequestParam String phone) throws Exception {
-        return smsService.sendSmsCode(key, token, phone);
+    @ApiOperation(value = "手机号登录接口", hidden = true)
+    @RequestMapping(value = "/user/login/by/phone", method = {RequestMethod.GET, RequestMethod.POST})
+    public Result loginByPhone(@RequestParam String phone, @RequestParam String password) throws Exception {
+        return userAuthService.loginByPhone(phone, password);
     }
 
-    @ApiOperation(value = "校验短信验证码接口")
-    @RequestMapping(value = "/check/sms/code", method = {RequestMethod.GET, RequestMethod.POST})
-    public Result checkSmsCode(@RequestHeader String key, @RequestHeader String token, @RequestParam String phone, @RequestParam String code) throws Exception {
-        return smsService.checkSmsCode(key, token, phone, code);
+    @ApiOperation(value = "保存用户绑定的手机号接口", hidden = true)
+    @RequestMapping(value = "/user/binding/phone", method = {RequestMethod.GET, RequestMethod.POST})
+    public Result userBindingPhone(@RequestHeader String key, @RequestHeader String token, @RequestParam Long userId, @RequestParam String phone, @RequestParam String code) throws Exception {
+        return userAuthService.userBindingPhone(key, token, userId, phone, code);
     }
 
 }

src/main/java/cn/com/qmth/examcloud/app/service/DeviceRecordService.java

@@ -47,46 +47,46 @@ public class DeviceRecordService {
                 public Predicate toPredicate(Root<DeviceRecord> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
                     List<Predicate> predicates = new ArrayList<>();
                     if (StringUtils.isNotBlank(params.getSystem())) {
-                        predicates.add(builder.equal(root.get("system"), params.getSystem()));
+                        predicates.add(builder.equal(root.get("system"), params.getSystem().trim()));
                     }
                     if (StringUtils.isNotBlank(params.getDeviceId())) {
-                        predicates.add(builder.equal(root.get("deviceId"), params.getDeviceId()));
+                        predicates.add(builder.equal(root.get("deviceId"), params.getDeviceId().trim()));
                     }
                     if (StringUtils.isNotBlank(params.getNetType())) {
-                        predicates.add(builder.equal(root.get("netType"), params.getNetType()));
+                        predicates.add(builder.equal(root.get("netType"), params.getNetType().trim()));
                     }
                     if (StringUtils.isNotBlank(params.getBrand())) {
-                        predicates.add(builder.equal(root.get("brand"), params.getBrand()));
+                        predicates.add(builder.equal(root.get("brand"), params.getBrand().trim()));
                     }
                     if (StringUtils.isNotBlank(params.getModel())) {
-                        predicates.add(builder.equal(root.get("model"), params.getModel()));
+                        predicates.add(builder.equal(root.get("model"), params.getModel().trim()));
                     }
                     if (StringUtils.isNotBlank(params.getSysVersion())) {
-                        predicates.add(builder.equal(root.get("sysVersion"), params.getSysVersion()));
+                        predicates.add(builder.equal(root.get("sysVersion"), params.getSysVersion().trim()));
                     }
                     if (StringUtils.isNotBlank(params.getAppVersion())) {
-                        predicates.add(builder.equal(root.get("appVersion"), params.getAppVersion()));
+                        predicates.add(builder.equal(root.get("appVersion"), params.getAppVersion().trim()));
                     }
                     if (StringUtils.isNotBlank(params.getAppCode())) {
-                        predicates.add(builder.equal(root.get("appCode"), params.getAppCode()));
+                        predicates.add(builder.equal(root.get("appCode"), params.getAppCode().trim()));
                     }
                     if (StringUtils.isNotBlank(params.getPatchCode())) {
-                        predicates.add(builder.equal(root.get("patchCode"), params.getPatchCode()));
+                        predicates.add(builder.equal(root.get("patchCode"), params.getPatchCode().trim()));
                     }
                     if (StringUtils.isNotBlank(params.getAccount())) {
-                        predicates.add(builder.equal(root.get("account"), params.getAccount()));
+                        predicates.add(builder.equal(root.get("account"), params.getAccount().trim()));
                     }
                     if (StringUtils.isNotBlank(params.getLoginKey())) {
-                        predicates.add(builder.equal(root.get("loginKey"), params.getLoginKey()));
+                        predicates.add(builder.equal(root.get("loginKey"), params.getLoginKey().trim()));
                     }
                     if (StringUtils.isNotBlank(params.getLoginToken())) {
-                        predicates.add(builder.equal(root.get("loginToken"), params.getLoginToken()));
+                        predicates.add(builder.equal(root.get("loginToken"), params.getLoginToken().trim()));
                     }
                     if (StringUtils.isNotBlank(params.getUrl())) {
-                        predicates.add(builder.like(root.get("url"), "%" + params.getUrl() + "%"));
+                        predicates.add(builder.like(root.get("url"), "%" + params.getUrl().trim() + "%"));
                     }
                     if (StringUtils.isNotBlank(params.getIp())) {
-                        predicates.add(builder.equal(root.get("ip"), params.getIp()));
+                        predicates.add(builder.equal(root.get("ip"), params.getIp().trim()));
                     }
                     return builder.and(predicates.toArray(new Predicate[predicates.size()]));
                 }

src/main/java/cn/com/qmth/examcloud/app/service/UserAuthService.java

@@ -80,6 +80,7 @@ public class UserAuthService {
                 .add(PARAM_KEY, key)
                 .add(PARAM_TOKEN, token)
                 .build();
+        //todo 待补充'头像、手机号、年级'字段
         return HttpUtils.doPost(requestUrl, formBody, key, token);
     }
 
@@ -93,4 +94,14 @@ public class UserAuthService {
         return HttpUtils.doPut(requestUrl, formBody, key, token);
     }
 
+    public Result userBindingPhone(String key, String token, Long userId, String phone, String code) {
+        //todo
+        return new Result().error();
+    }
+
+    public Result loginByPhone(String phone, String password) {
+        //todo
+        return new Result().error();
+    }
+
 }