LiRuochen_WorkFlow/MaxKey
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

jdk 17

Browse Source
This commit is contained in:
MaxKey
2023-08-15 11:58:38 +08:00
parent 7ebf4a57f3
commit d2500690e2
255 changed files with 1092 additions and 1031 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/dromara/maxkey/web/apis/identity/scim/ScimGroupController.java
View File

@@ -23,7 +23,6 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
import org.apache.mybatis.jpa.persistence.JpaPageResults;
import org.dromara.maxkey.entity.Roles;
import org.dromara.maxkey.entity.UserInfo;
import org.dromara.maxkey.persistence.service.RoleMemberService;
@@ -35,6 +34,7 @@ import org.dromara.maxkey.web.apis.identity.scim.resources.ScimMemberRef;
import org.dromara.maxkey.web.apis.identity.scim.resources.ScimMeta;
import org.dromara.maxkey.web.apis.identity.scim.resources.ScimParameters;
import org.dromara.maxkey.web.apis.identity.scim.resources.ScimSearchResult;
import org.dromara.mybatis.jpa.entity.JpaPageResults;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -119,7 +119,7 @@ public class ScimGroupController {
queryModel.setPageSize(requestParameters.getCount());
queryModel.calculate(requestParameters.getStartIndex());
JpaPageResults<Roles> orgResults = rolesService.queryPageResults(queryModel);
JpaPageResults<Roles> orgResults = rolesService.fetchPageResults(queryModel);
List<ScimGroup> resultList = new ArrayList<ScimGroup>();
for(Roles group : orgResults.getRows()) {
resultList.add(role2ScimGroup(group));

4
maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/dromara/maxkey/web/apis/identity/scim/ScimOrganizationController.java
View File

@@ -21,7 +21,6 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import org.apache.mybatis.jpa.persistence.JpaPageResults;
import org.dromara.maxkey.entity.Organizations;
import org.dromara.maxkey.persistence.service.OrganizationsService;
import org.dromara.maxkey.util.DateUtils;
@@ -30,6 +29,7 @@ import org.dromara.maxkey.web.apis.identity.scim.resources.ScimMeta;
import org.dromara.maxkey.web.apis.identity.scim.resources.ScimOrganization;
import org.dromara.maxkey.web.apis.identity.scim.resources.ScimParameters;
import org.dromara.maxkey.web.apis.identity.scim.resources.ScimSearchResult;
import org.dromara.mybatis.jpa.entity.JpaPageResults;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -112,7 +112,7 @@ public class ScimOrganizationController {
queryModel.setPageSize(requestParameters.getCount());
queryModel.calculate(requestParameters.getStartIndex());
JpaPageResults<Organizations> orgResults = organizationsService.queryPageResults(queryModel);
JpaPageResults<Organizations> orgResults = organizationsService.fetchPageResults(queryModel);
List<ScimOrganization> resultList = new ArrayList<ScimOrganization>();
for(Organizations org : orgResults.getRows()) {
resultList.add(org2ScimOrg(org));

4
maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/dromara/maxkey/web/apis/identity/scim/ScimUserController.java
View File

@@ -20,7 +20,6 @@ package org.dromara.maxkey.web.apis.identity.scim;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import org.apache.mybatis.jpa.persistence.JpaPageResults;
import org.dromara.maxkey.constants.ConstsStatus;
import org.dromara.maxkey.entity.Roles;
import org.dromara.maxkey.entity.UserInfo;
@@ -38,6 +37,7 @@ import org.dromara.maxkey.web.apis.identity.scim.resources.ScimSearchResult;
import org.dromara.maxkey.web.apis.identity.scim.resources.ScimUser;
import org.dromara.maxkey.web.apis.identity.scim.resources.ScimUserEmail;
import org.dromara.maxkey.web.apis.identity.scim.resources.ScimUserPhoneNumber;
import org.dromara.mybatis.jpa.entity.JpaPageResults;
import org.dromara.maxkey.web.apis.identity.scim.resources.ScimOrganizationEmail.UserEmailType;
import org.dromara.maxkey.web.apis.identity.scim.resources.ScimOrganizationPhoneNumber.UserPhoneNumberType;
import org.slf4j.Logger;
@@ -124,7 +124,7 @@ public class ScimUserController {
queryModel.setPageSize(requestParameters.getCount());
queryModel.calculate(requestParameters.getStartIndex());
JpaPageResults<UserInfo> orgResults = userInfoService.queryPageResults(queryModel);
JpaPageResults<UserInfo> orgResults = userInfoService.fetchPageResults(queryModel);
List<ScimUser> resultList = new ArrayList<ScimUser>();
for(UserInfo user : orgResults.getRows()) {
resultList.add(userInfo2ScimUser(user));