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

本地StringUtils 调整成 StrUtils ，取消org.apache.commons.lang3.StringUtils继承关系

Browse Source
This commit is contained in:
shimingxy
2024-07-12 10:38:46 +08:00
parent 5253a1a2d5
commit 5dd0c6dc96
34 changed files with 54 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/access/contorller/SessionController.java
View File

@@ -27,7 +27,7 @@ import org.dromara.maxkey.entity.UserInfo;
import org.dromara.maxkey.persistence.service.HistoryLoginService;
import org.dromara.maxkey.persistence.service.HistorySystemLogsService;
import org.dromara.maxkey.util.DateUtils;
import org.dromara.maxkey.util.StringUtils;
import org.dromara.maxkey.util.StrUtils;
import org.dromara.mybatis.jpa.entity.JpaPageResults;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -89,7 +89,7 @@ public class SessionController {
logger.debug(ids);
boolean isTerminated = false;
try {
for(String sessionId : StringUtils.string2List(ids, ",")) {
for(String sessionId : StrUtils.string2List(ids, ",")) {
logger.trace("terminate session Id {} ",sessionId);
if(currentUser.getSessionId().contains(sessionId)) {
continue;//skip current session

2
maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/contorller/BaseAppContorller.java
View File

@@ -20,12 +20,12 @@
*/
package org.dromara.maxkey.web.apps.contorller;
import org.apache.commons.lang3.StringUtils;
import org.dromara.maxkey.crypto.password.PasswordReciprocal;
import org.dromara.maxkey.entity.apps.Apps;
import org.dromara.maxkey.persistence.service.AppsService;
import org.dromara.maxkey.persistence.service.FileUploadService;
import org.dromara.maxkey.persistence.service.HistorySystemLogsService;
import org.dromara.maxkey.util.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;

1
maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/contorller/OAuth20DetailsController.java
View File

@@ -29,7 +29,6 @@ import org.dromara.maxkey.entity.UserInfo;
import org.dromara.maxkey.entity.apps.Apps;
import org.dromara.maxkey.entity.apps.AppsOAuth20Details;
import org.dromara.maxkey.entity.apps.oauth2.provider.client.BaseClientDetails;
import org.dromara.maxkey.util.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;

5
maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/SynchronizersController.java
View File

@@ -17,6 +17,7 @@
package org.dromara.maxkey.web.config.contorller;
import org.apache.commons.lang3.StringUtils;
import org.dromara.maxkey.authn.annotation.CurrentUser;
import org.dromara.maxkey.crypto.password.PasswordReciprocal;
import org.dromara.maxkey.entity.Connectors;
@@ -25,7 +26,7 @@ import org.dromara.maxkey.entity.Synchronizers;
import org.dromara.maxkey.entity.UserInfo;
import org.dromara.maxkey.persistence.service.SynchronizersService;
import org.dromara.maxkey.synchronizer.ISynchronizerService;
import org.dromara.maxkey.util.StringUtils;
import org.dromara.maxkey.util.StrUtils;
import org.dromara.maxkey.web.WebContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -105,7 +106,7 @@ public class SynchronizersController {
public ResponseEntity<?> synchr(@RequestParam("id") String id) {
logger.debug("-sync ids : {}", id);
List<String> ids = StringUtils.string2List(id, ",");
List<String> ids = StrUtils.string2List(id, ",");
try {
for (String sysId : ids) {
Synchronizers synchronizer = synchronizersService.get(sysId);

2
maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/idm/contorller/GroupMemberController.java
View File

@@ -19,6 +19,7 @@ package org.dromara.maxkey.web.idm.contorller;
import java.util.List;
import org.apache.commons.lang3.StringUtils;
import org.dromara.maxkey.authn.annotation.CurrentUser;
import org.dromara.maxkey.entity.Message;
import org.dromara.maxkey.entity.GroupMember;
@@ -28,7 +29,6 @@ import org.dromara.maxkey.persistence.service.HistorySystemLogsService;
import org.dromara.maxkey.persistence.service.GroupMemberService;
import org.dromara.maxkey.persistence.service.GroupsService;
import org.dromara.maxkey.persistence.service.UserInfoService;
import org.dromara.maxkey.util.StringUtils;
import org.dromara.maxkey.web.WebContext;
import org.dromara.mybatis.jpa.entity.JpaPageResults;
import org.slf4j.Logger;

2
maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/idm/contorller/GroupsController.java
View File

@@ -20,6 +20,7 @@ package org.dromara.maxkey.web.idm.contorller;
import java.util.Arrays;
import java.util.List;
import org.apache.commons.lang3.StringUtils;
import org.dromara.maxkey.authn.annotation.CurrentUser;
import org.dromara.maxkey.constants.ConstsEntryType;
import org.dromara.maxkey.constants.ConstsAct;
@@ -30,7 +31,6 @@ import org.dromara.maxkey.entity.Roles;
import org.dromara.maxkey.entity.UserInfo;
import org.dromara.maxkey.persistence.service.HistorySystemLogsService;
import org.dromara.maxkey.persistence.service.GroupsService;
import org.dromara.maxkey.util.StringUtils;
import org.dromara.mybatis.jpa.entity.JpaPageResults;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

3
maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/idm/contorller/UserInfoController.java
View File

@@ -29,6 +29,7 @@ import java.util.Map;
import java.util.TreeSet;
import java.util.stream.Collectors;
import org.apache.commons.lang3.StringUtils;
import org.apache.poi.ss.usermodel.Row;
import org.apache.poi.ss.usermodel.Sheet;
import org.apache.poi.ss.usermodel.Workbook;
@@ -44,10 +45,8 @@ import org.dromara.maxkey.entity.UserInfo;
import org.dromara.maxkey.persistence.service.FileUploadService;
import org.dromara.maxkey.persistence.service.HistorySystemLogsService;
import org.dromara.maxkey.persistence.service.UserInfoService;
import org.dromara.maxkey.util.DateUtils;
import org.dromara.maxkey.util.ExcelUtils;
import org.dromara.maxkey.util.JsonUtils;
import org.dromara.maxkey.util.StringUtils;
import org.dromara.maxkey.web.WebContext;
import org.dromara.mybatis.jpa.entity.JpaPageResults;
import org.slf4j.Logger;

4
maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/permissions/contorller/GroupPrivilegesController.java
View File

@@ -25,7 +25,7 @@ import org.dromara.maxkey.entity.GroupPrivileges;
import org.dromara.maxkey.entity.UserInfo;
import org.dromara.maxkey.persistence.service.HistorySystemLogsService;
import org.dromara.maxkey.persistence.service.GroupPrivilegesService;
import org.dromara.maxkey.util.StringUtils;
import org.dromara.maxkey.util.StrUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -69,7 +69,7 @@ public class GroupPrivilegesController {
}
//Maybe insert
ArrayList<GroupPrivileges> newGroupPrivilegesList =new ArrayList<GroupPrivileges>();
List<String>resourceIds = StringUtils.string2List(groupPrivileges.getResourceId(), ",");
List<String>resourceIds = StrUtils.string2List(groupPrivileges.getResourceId(), ",");
HashMap<String,String >newPrivilegesMap =new HashMap<String,String >();
for(String resourceId : resourceIds) {
GroupPrivileges newGroupPrivilege=new GroupPrivileges(