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-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>();