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

3
maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/jwt/AuthJwtService.java
View File

@@ -20,10 +20,11 @@ package org.dromara.maxkey.authn.jwt;
import java.text.ParseException;
import java.util.Date;
import org.apache.commons.lang3.StringUtils;
import org.dromara.maxkey.authn.SignPrincipal;
import org.dromara.maxkey.crypto.jwt.HMAC512Service;
import org.dromara.maxkey.entity.UserInfo;
import org.dromara.maxkey.util.StringUtils;
import org.dromara.maxkey.util.StrUtils;
import org.dromara.maxkey.web.WebContext;
import org.joda.time.DateTime;
import org.slf4j.Logger;

3
maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/web/AuthTokenRefreshPoint.java
View File

@@ -17,13 +17,14 @@
package org.dromara.maxkey.authn.web;
import org.apache.commons.lang3.StringUtils;
import org.dromara.maxkey.authn.jwt.AuthJwt;
import org.dromara.maxkey.authn.jwt.AuthRefreshTokenService;
import org.dromara.maxkey.authn.jwt.AuthTokenService;
import org.dromara.maxkey.authn.session.Session;
import org.dromara.maxkey.authn.session.SessionManager;
import org.dromara.maxkey.entity.Message;
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;

3
maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/support/wsfederation/HttpWsFederationEntryPoint.java
View File

@@ -18,12 +18,13 @@
package org.dromara.maxkey.authn.support.wsfederation;
import org.apache.commons.lang3.StringUtils;
import org.dromara.maxkey.authn.LoginCredential;
import org.dromara.maxkey.authn.provider.AbstractAuthenticationProvider;
import org.dromara.maxkey.authn.web.AuthorizationUtils;
import org.dromara.maxkey.configuration.ApplicationConfig;
import org.dromara.maxkey.constants.ConstsLoginType;
import org.dromara.maxkey.util.StringUtils;
import org.dromara.maxkey.util.StrUtils;
import org.opensaml.saml1.core.impl.AssertionImpl;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

3
maxkey-common/src/main/java/org/dromara/maxkey/crypto/ReciprocalUtils.java
View File

@@ -28,10 +28,11 @@ import javax.crypto.Cipher;
import javax.crypto.SecretKey;
import javax.crypto.spec.SecretKeySpec;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.logging.LogFactory;
import org.dromara.maxkey.util.Instance;
import org.dromara.maxkey.util.StringGenerator;
import org.dromara.maxkey.util.StringUtils;
import org.dromara.maxkey.util.StrUtils;
/**
* Reciprocal cipher or Symmetric-key algorithm

9
maxkey-common/src/main/java/org/dromara/maxkey/util/AuthorizationHeaderUtils.java
View File

@@ -17,6 +17,7 @@
package org.dromara.maxkey.util;
import org.apache.commons.lang3.StringUtils;
import org.dromara.maxkey.crypto.Base64Utils;
import jakarta.servlet.http.HttpServletRequest;
@@ -88,13 +89,7 @@ public class AuthorizationHeaderUtils {
}
static boolean isBearer(String bearer) {
if (bearer.toLowerCase().startsWith(AuthorizationHeader.Credential.BEARER.toLowerCase())) {
return true;
} else {
return false;
}
return (bearer.toLowerCase().startsWith(AuthorizationHeader.Credential.BEARER.toLowerCase()));
}
}

1
maxkey-common/src/main/java/org/dromara/maxkey/util/PathUtils.java
View File

@@ -19,6 +19,7 @@ package org.dromara.maxkey.util;
import java.nio.file.Paths;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

10
maxkey-common/src/main/java/org/dromara/maxkey/util/StringUtils.java → maxkey-common/src/main/java/org/dromara/maxkey/util/StrUtils.java
View File

@@ -27,7 +27,9 @@ import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
public final class StringUtils extends org.apache.commons.lang3.StringUtils {
import org.apache.commons.lang3.StringUtils;
public final class StrUtils {
/*
* 获取指定UTF-8模式字节长度的字符串
@@ -165,7 +167,7 @@ public final class StringUtils extends org.apache.commons.lang3.StringUtils {
* @return
*/
public static Boolean containsPartOrAll(String string, String string2) {
if (isNotEmpty(string) && isNotEmpty(string2)) {
if (StringUtils.isNotEmpty(string) && StringUtils.isNotEmpty(string2)) {
return Pattern.compile("[" + string + "]").matcher(string2).find();
}
return false;
@@ -287,7 +289,7 @@ public final class StringUtils extends org.apache.commons.lang3.StringUtils {
List<String> idList = new ArrayList<String>();
List<String> nameList = new ArrayList<String>();
if (StringUtils.isNotEmpty(proValue)) {
List<String> list = StringUtils.string2List(proValue, ",");
List<String> list = StrUtils.string2List(proValue, ",");
for (String str : list) {
idList.add(str.split("\\,")[0]);
nameList.add(str.split("\\,")[1]);
@@ -410,7 +412,7 @@ public final class StringUtils extends org.apache.commons.lang3.StringUtils {
* }else{ pinyin += nameChar[i]; } } return pinyin; }
*/
public static Map<String, String> aduserName2Map(String activeDirectoryUserName) {
if (isEmpty(activeDirectoryUserName)) {
if (StringUtils.isEmpty(activeDirectoryUserName)) {
return null;
}
Map<String, String> map = new HashMap<String, String>();

4
maxkey-core/src/main/java/org/dromara/maxkey/entity/UserInfo.java
View File

@@ -31,8 +31,10 @@ import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.Id;
import jakarta.persistence.Table;
import org.apache.commons.lang3.StringUtils;
import org.dromara.maxkey.crypto.Base64Utils;
import org.dromara.maxkey.util.StringUtils;
import org.dromara.maxkey.util.StrUtils;
/**
* .

3
maxkey-core/src/main/java/org/dromara/maxkey/persistence/repository/LoginRepository.java
View File

@@ -25,11 +25,12 @@ import java.util.Date;
import java.util.List;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.dromara.maxkey.constants.ConstsRoles;
import org.dromara.maxkey.constants.ConstsStatus;
import org.dromara.maxkey.entity.Groups;
import org.dromara.maxkey.entity.UserInfo;
import org.dromara.maxkey.util.StringUtils;
import org.dromara.maxkey.util.StrUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.jdbc.core.JdbcTemplate;

2
maxkey-core/src/main/java/org/dromara/maxkey/persistence/repository/PasswordPolicyValidator.java
View File

@@ -20,13 +20,13 @@ package org.dromara.maxkey.persistence.repository;
import java.sql.Types;
import java.util.Date;
import org.apache.commons.lang3.StringUtils;
import org.dromara.maxkey.constants.ConstsPasswordSetType;
import org.dromara.maxkey.constants.ConstsStatus;
import org.dromara.maxkey.crypto.password.PasswordGen;
import org.dromara.maxkey.entity.ChangePassword;
import org.dromara.maxkey.entity.PasswordPolicy;
import org.dromara.maxkey.entity.UserInfo;
import org.dromara.maxkey.util.StringUtils;
import org.dromara.maxkey.web.WebConstants;
import org.dromara.maxkey.web.WebContext;
import org.joda.time.DateTime;

2
maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/AccountsService.java
View File

@@ -19,6 +19,7 @@ package org.dromara.maxkey.persistence.service;
import java.util.List;
import org.apache.commons.lang3.StringUtils;
import org.dromara.maxkey.constants.ConstsStatus;
import org.dromara.maxkey.crypto.password.PasswordReciprocal;
import org.dromara.maxkey.entity.Accounts;
@@ -29,7 +30,6 @@ import org.dromara.maxkey.persistence.mapper.AccountsMapper;
import org.dromara.maxkey.provision.ProvisionAction;
import org.dromara.maxkey.provision.ProvisionService;
import org.dromara.maxkey.provision.ProvisionTopic;
import org.dromara.maxkey.util.StringUtils;
import org.dromara.mybatis.jpa.JpaService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Repository;

5
maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/GroupsService.java
View File

@@ -23,12 +23,13 @@ import java.time.LocalDateTime;
import java.time.LocalTime;
import java.util.List;
import org.apache.commons.lang3.StringUtils;
import org.dromara.maxkey.constants.ConstsStatus;
import org.dromara.maxkey.entity.Groups;
import org.dromara.maxkey.entity.Institutions;
import org.dromara.maxkey.entity.Roles;
import org.dromara.maxkey.persistence.mapper.GroupsMapper;
import org.dromara.maxkey.util.StringUtils;
import org.dromara.maxkey.util.StrUtils;
import org.dromara.mybatis.jpa.JpaService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -120,7 +121,7 @@ public class GroupsService extends JpaService<Groups> implements Serializable {
String filters = dynamicGroup.getFilters();
if(StringUtils.isNotBlank(filters)) {
if(StringUtils.filtersSQLInjection(filters.toLowerCase())) {
if(StrUtils.filtersSQLInjection(filters.toLowerCase())) {
_logger.info("filters include SQL Injection Attack Risk.");
return;
}

3
maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/UserInfoService.java
View File

@@ -21,6 +21,7 @@ package org.dromara.maxkey.persistence.service;
import java.sql.Types;
import java.util.Date;
import org.apache.commons.lang3.StringUtils;
import org.dromara.maxkey.constants.ConstsStatus;
import org.dromara.maxkey.crypto.password.PasswordReciprocal;
import org.dromara.maxkey.entity.Accounts;
@@ -31,8 +32,6 @@ import org.dromara.maxkey.persistence.repository.PasswordPolicyValidator;
import org.dromara.maxkey.provision.ProvisionAction;
import org.dromara.maxkey.provision.ProvisionService;
import org.dromara.maxkey.provision.ProvisionTopic;
import org.dromara.maxkey.util.DateUtils;
import org.dromara.maxkey.util.StringUtils;
import org.dromara.maxkey.web.WebContext;
import org.dromara.mybatis.jpa.JpaService;
import org.slf4j.Logger;

2
maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/dromara/maxkey/authz/endpoint/AuthorizeCredentialEndpoint.java
View File

@@ -20,6 +20,7 @@
*/
package org.dromara.maxkey.authz.endpoint;
import org.apache.commons.lang3.StringUtils;
import org.dromara.maxkey.authn.annotation.CurrentUser;
import org.dromara.maxkey.constants.ConstsStatus;
import org.dromara.maxkey.crypto.password.PasswordReciprocal;
@@ -27,7 +28,6 @@ import org.dromara.maxkey.entity.Accounts;
import org.dromara.maxkey.entity.Message;
import org.dromara.maxkey.entity.UserInfo;
import org.dromara.maxkey.entity.apps.Apps;
import org.dromara.maxkey.util.StringUtils;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.ResponseBody;

2
maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/Cas20AuthorizeEndpoint.java
View File

@@ -23,6 +23,7 @@ package org.dromara.maxkey.authz.cas.endpoint;
import java.lang.reflect.InvocationTargetException;
import org.apache.commons.beanutils.BeanUtils;
import org.apache.commons.lang3.StringUtils;
import org.dromara.maxkey.authn.SignPrincipal;
import org.dromara.maxkey.authz.cas.endpoint.response.ProxyServiceResponseBuilder;
import org.dromara.maxkey.authz.cas.endpoint.response.ServiceResponseBuilder;
@@ -34,7 +35,6 @@ import org.dromara.maxkey.authz.cas.endpoint.ticket.Ticket;
import org.dromara.maxkey.authz.endpoint.adapter.AbstractAuthorizeAdapter;
import org.dromara.maxkey.constants.ConstsBoolean;
import org.dromara.maxkey.util.Instance;
import org.dromara.maxkey.util.StringUtils;
import org.dromara.maxkey.web.HttpResponseConstants;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

2
maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/Cas30AuthorizeEndpoint.java
View File

@@ -23,6 +23,7 @@ package org.dromara.maxkey.authz.cas.endpoint;
import java.lang.reflect.InvocationTargetException;
import org.apache.commons.beanutils.BeanUtils;
import org.apache.commons.lang3.StringUtils;
import org.dromara.maxkey.authn.SignPrincipal;
import org.dromara.maxkey.authz.cas.endpoint.response.ProxyServiceResponseBuilder;
import org.dromara.maxkey.authz.cas.endpoint.response.ServiceResponseBuilder;
@@ -34,7 +35,6 @@ import org.dromara.maxkey.authz.cas.endpoint.ticket.Ticket;
import org.dromara.maxkey.authz.endpoint.adapter.AbstractAuthorizeAdapter;
import org.dromara.maxkey.constants.ConstsBoolean;
import org.dromara.maxkey.util.Instance;
import org.dromara.maxkey.util.StringUtils;
import org.dromara.maxkey.web.HttpResponseConstants;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

2
maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/CasRestV1Endpoint.java
View File

@@ -21,6 +21,7 @@
package org.dromara.maxkey.authz.cas.endpoint;
import org.apache.commons.lang3.StringUtils;
import org.dromara.maxkey.authn.LoginCredential;
import org.dromara.maxkey.authn.provider.AbstractAuthenticationProvider;
import org.dromara.maxkey.authn.web.AuthorizationUtils;
@@ -28,7 +29,6 @@ import org.dromara.maxkey.authz.cas.endpoint.ticket.CasConstants;
import org.dromara.maxkey.authz.cas.endpoint.ticket.ServiceTicketImpl;
import org.dromara.maxkey.authz.cas.endpoint.ticket.TicketGrantingTicketImpl;
import org.dromara.maxkey.entity.apps.AppsCasDetails;
import org.dromara.maxkey.util.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;

2
maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/approval/endpoint/OAuth20AccessConfirmationEndpoint.java
View File

@@ -37,7 +37,7 @@ import org.dromara.maxkey.entity.apps.Apps;
import org.dromara.maxkey.entity.apps.oauth2.provider.ClientDetails;
import org.dromara.maxkey.persistence.cache.MomentaryService;
import org.dromara.maxkey.persistence.service.AppsService;
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;

2
maxkey-synchronizers/maxkey-synchronizer-jdbc/src/main/java/org/dromara/maxkey/synchronizer/jdbc/JdbcUsersService.java
View File

@@ -18,6 +18,7 @@
package org.dromara.maxkey.synchronizer.jdbc;
import org.apache.commons.beanutils.PropertyUtils;
import org.apache.commons.lang3.StringUtils;
import org.dromara.maxkey.constants.ConstsStatus;
import org.dromara.maxkey.entity.DbTableMetaData;
import org.dromara.maxkey.entity.HistorySynchronizer;
@@ -25,7 +26,6 @@ import org.dromara.maxkey.entity.UserInfo;
import org.dromara.maxkey.synchronizer.AbstractSynchronizerService;
import org.dromara.maxkey.synchronizer.ISynchronizerService;
import org.dromara.maxkey.util.JdbcUtils;
import org.dromara.maxkey.util.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service;

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

@@ -28,7 +28,7 @@ import org.dromara.maxkey.entity.UserInfo;
import org.dromara.maxkey.persistence.service.GroupMemberService;
import org.dromara.maxkey.persistence.service.GroupsService;
import org.dromara.maxkey.util.DateUtils;
import org.dromara.maxkey.util.StringUtils;
import org.dromara.maxkey.util.StrUtils;
import org.dromara.maxkey.web.apis.identity.scim.resources.ScimGroup;
import org.dromara.maxkey.web.apis.identity.scim.resources.ScimMemberRef;
import org.dromara.maxkey.web.apis.identity.scim.resources.ScimMeta;

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

@@ -21,10 +21,9 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import org.apache.commons.lang3.StringUtils;
import org.dromara.maxkey.entity.Organizations;
import org.dromara.maxkey.persistence.service.OrganizationsService;
import org.dromara.maxkey.util.DateUtils;
import org.dromara.maxkey.util.StringUtils;
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;

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

@@ -20,13 +20,13 @@ package org.dromara.maxkey.web.apis.identity.scim;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import org.apache.commons.lang3.StringUtils;
import org.dromara.maxkey.constants.ConstsStatus;
import org.dromara.maxkey.entity.Groups;
import org.dromara.maxkey.entity.UserInfo;
import org.dromara.maxkey.persistence.service.GroupsService;
import org.dromara.maxkey.persistence.service.UserInfoService;
import org.dromara.maxkey.util.DateUtils;
import org.dromara.maxkey.util.StringUtils;
import org.dromara.maxkey.web.apis.identity.scim.resources.ScimEnterprise;
import org.dromara.maxkey.web.apis.identity.scim.resources.ScimFormattedName;
import org.dromara.maxkey.web.apis.identity.scim.resources.ScimGroupRef;

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

@@ -26,7 +26,7 @@ import org.dromara.maxkey.entity.Message;
import org.dromara.maxkey.entity.UserInfo;
import org.dromara.maxkey.persistence.service.HistoryLoginService;
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;
@@ -84,7 +84,7 @@ public class LoginSessionController {
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-maxkey/src/main/java/org/dromara/maxkey/web/contorller/ProfileController.java
View File

@@ -17,12 +17,12 @@
package org.dromara.maxkey.web.contorller;
import org.apache.commons.lang3.StringUtils;
import org.dromara.maxkey.authn.annotation.CurrentUser;
import org.dromara.maxkey.entity.Message;
import org.dromara.maxkey.entity.UserInfo;
import org.dromara.maxkey.persistence.service.FileUploadService;
import org.dromara.maxkey.persistence.service.UserInfoService;
import org.dromara.maxkey.util.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;

3
maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/RegisterController.java
View File

@@ -20,7 +20,7 @@ package org.dromara.maxkey.web.contorller;
import java.io.IOException;
import java.util.regex.Pattern;
import org.apache.commons.lang3.StringUtils;
import org.dromara.maxkey.authn.jwt.AuthTokenService;
import org.dromara.maxkey.configuration.ApplicationConfig;
import org.dromara.maxkey.constants.ConstsStatus;
@@ -30,7 +30,6 @@ import org.dromara.maxkey.entity.UserInfo;
import org.dromara.maxkey.password.onetimepwd.AbstractOtpAuthn;
import org.dromara.maxkey.password.sms.SmsOtpAuthnService;
import org.dromara.maxkey.persistence.service.UserInfoService;
import org.dromara.maxkey.util.StringUtils;
import org.dromara.maxkey.web.WebContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

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(

2
maxkey-webs/maxkey-web-openapi/src/main/java/org/dromara/maxkey/web/interceptor/RestApiPermissionAdapter.java
View File

@@ -19,12 +19,12 @@ package org.dromara.maxkey.web.interceptor;
import java.util.concurrent.ConcurrentHashMap;
import org.apache.commons.lang3.StringUtils;
import org.dromara.maxkey.authn.web.AuthorizationUtils;
import org.dromara.maxkey.authz.oauth2.provider.OAuth2Authentication;
import org.dromara.maxkey.authz.oauth2.provider.token.DefaultTokenServices;
import org.dromara.maxkey.util.AuthorizationHeader;
import org.dromara.maxkey.util.AuthorizationHeaderUtils;
import org.dromara.maxkey.util.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;