|
@@ -237,7 +237,6 @@ public class KmtExerciseSysServiceImpl implements KmtExerciseSysService {
|
|
public ResponseEntity accountLogin(String loginName, String password) {
|
|
public ResponseEntity accountLogin(String loginName, String password) {
|
|
ResponseEntity responseEntity = new ResponseEntity();
|
|
ResponseEntity responseEntity = new ResponseEntity();
|
|
String sysEnv = (String) SystemResourceLocator.getValue("SYS_ENV");
|
|
String sysEnv = (String) SystemResourceLocator.getValue("SYS_ENV");
|
|
- String code;
|
|
|
|
if ("1".equals(sysEnv) && adminService.loginLocking(loginName, "KMT_SYS")) {
|
|
if ("1".equals(sysEnv) && adminService.loginLocking(loginName, "KMT_SYS")) {
|
|
return responseEntity.failure("您的账号已被锁定,请30分钟后重试");
|
|
return responseEntity.failure("您的账号已被锁定,请30分钟后重试");
|
|
}
|
|
}
|
|
@@ -259,6 +258,11 @@ public class KmtExerciseSysServiceImpl implements KmtExerciseSysService {
|
|
if (StringUtil.isNotBlank(loginUser.getUnionid())){
|
|
if (StringUtil.isNotBlank(loginUser.getUnionid())){
|
|
data.put("binded", 1);
|
|
data.put("binded", 1);
|
|
}
|
|
}
|
|
|
|
+ //测试环境无须绑定
|
|
|
|
+ if ("2".equals(sysEnv)){
|
|
|
|
+ data.put("binded", 1);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
|
|
responseEntity.success(data, "登录成功");
|
|
responseEntity.success(data, "登录成功");
|
|
tokenManager.clearPasswordWrongRecord(loginName);
|
|
tokenManager.clearPasswordWrongRecord(loginName);
|