|
@@ -125,7 +125,8 @@ public class AuthServiceImpl implements AuthService {
|
|
if (AccountType.STUDENT_PHONE.equals(accountTypeEnum)
|
|
if (AccountType.STUDENT_PHONE.equals(accountTypeEnum)
|
|
|| AccountType.STUDENT_IDENTITY_NUMBER.equals(accountTypeEnum)
|
|
|| AccountType.STUDENT_IDENTITY_NUMBER.equals(accountTypeEnum)
|
|
|| AccountType.STUDENT_CODE.equals(accountTypeEnum)) {
|
|
|| AccountType.STUDENT_CODE.equals(accountTypeEnum)) {
|
|
- Boolean stuClientLoginLimit = (Boolean) systemPropertyService.get("STU_CLIENT_LOGIN_LIMIT");
|
|
|
|
|
|
+ Boolean stuClientLoginLimit = (Boolean) systemPropertyService
|
|
|
|
+ .get("STU_CLIENT_LOGIN_LIMIT");
|
|
if (stuClientLoginLimit) {
|
|
if (stuClientLoginLimit) {
|
|
throw new StatusException("001505", "系统维护中... ...");
|
|
throw new StatusException("001505", "系统维护中... ...");
|
|
}
|
|
}
|
|
@@ -177,7 +178,8 @@ public class AuthServiceImpl implements AuthService {
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
- String accessibleRootOrgIds = (String) systemPropertyService.get("ACCESSIBLE_ROOT_ORG_LIST");
|
|
|
|
|
|
+ String accessibleRootOrgIds = (String) systemPropertyService
|
|
|
|
+ .get("ACCESSIBLE_ROOT_ORG_LIST");
|
|
if (StringUtils.isNotBlank(accessibleRootOrgIds)) {
|
|
if (StringUtils.isNotBlank(accessibleRootOrgIds)) {
|
|
accessibleRootOrgIds = "," + accessibleRootOrgIds + ",";
|
|
accessibleRootOrgIds = "," + accessibleRootOrgIds + ",";
|
|
if (!accessibleRootOrgIds.contains("," + rootOrg.getId() + ",")) {
|
|
if (!accessibleRootOrgIds.contains("," + rootOrg.getId() + ",")) {
|
|
@@ -485,7 +487,7 @@ public class AuthServiceImpl implements AuthService {
|
|
private String buildUserKey(User user) {
|
|
private String buildUserKey(User user) {
|
|
Long rootOrgId = user.getRootOrgId();
|
|
Long rootOrgId = user.getRootOrgId();
|
|
UserType userType = user.getUserType();
|
|
UserType userType = user.getUserType();
|
|
- String key = StringUtil.join("U_", userType.getCode(), "_", rootOrgId, "_",
|
|
|
|
|
|
+ String key = StringUtil.join("U_:", userType.getCode(), "_", rootOrgId, "_",
|
|
user.getUserId());
|
|
user.getUserId());
|
|
return key;
|
|
return key;
|
|
}
|
|
}
|