|
@@ -99,12 +99,13 @@ public class UserController {
|
|
|
if(StringUtils.isBlank(username) || StringUtils.isBlank(password)){
|
|
|
return Result.error("用户名/密码不能为空");
|
|
|
}
|
|
|
- if(StringUtils.isBlank(captcha)){
|
|
|
+ //读卡机器手动输入验证码不方便,注释掉
|
|
|
+ /*if(StringUtils.isBlank(captcha)){
|
|
|
return Result.error("验证码不能为空");
|
|
|
- }
|
|
|
- if(StringUtils.isBlank(captchaCode) || captchaTimeout == null || captchaTimeout < System.currentTimeMillis() || !captchaCode.equalsIgnoreCase(captcha)){
|
|
|
+ }*/
|
|
|
+ /* if(StringUtils.isBlank(captchaCode) || captchaTimeout == null || captchaTimeout < System.currentTimeMillis() || !captchaCode.equalsIgnoreCase(captcha)){
|
|
|
return Result.error("验证码错误");
|
|
|
- }
|
|
|
+ }*/
|
|
|
|
|
|
User user = jdbcService.findOne(User.class,new String[]{
|
|
|
"userCode"
|