From 2ba431be9c12a79783e0f9ef249292b7fa95f2a1 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 25 一月 2021 19:13:58 +0800
Subject: [PATCH] 拼多多备案调整

---
 utils/src/main/java/org/yeshi/utils/StringUtil.java |   47 ++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 46 insertions(+), 1 deletions(-)

diff --git a/utils/src/main/java/org/yeshi/utils/StringUtil.java b/utils/src/main/java/org/yeshi/utils/StringUtil.java
index 0fa0f35..9ea938c 100644
--- a/utils/src/main/java/org/yeshi/utils/StringUtil.java
+++ b/utils/src/main/java/org/yeshi/utils/StringUtil.java
@@ -1,13 +1,17 @@
 package org.yeshi.utils;
 
+import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.lang.reflect.Method;
+import java.security.InvalidKeyException;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
+import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import org.apache.commons.codec.binary.Base64;
+import org.yeshi.utils.encrypt.HmacUtils;
 
 import sun.misc.BASE64Encoder;
 
@@ -67,7 +71,7 @@
 	 * @return
 	 */
 	public static boolean isNullOrEmpty(String text) {
-		if (text == null || text.length() == 0 || text.equalsIgnoreCase("null")) {
+		if (text == null || text.trim().length() == 0 || text.equalsIgnoreCase("null")) {
 			return true;
 		}
 		return false;
@@ -105,6 +109,19 @@
 			// LogUtil.i("result: " + buf.toString().substring(8,
 			// 24));// 16位锟侥硷拷锟斤拷
 		} catch (NoSuchAlgorithmException e) {
+			e.printStackTrace();
+		}
+		return null;
+	}
+
+	public static String MD5Hmac(String st, String key) {
+		try {
+			return HmacUtils.byte2hex(HmacUtils.encryptHMAC(st, key));
+		} catch (InvalidKeyException e) {
+			e.printStackTrace();
+		} catch (NoSuchAlgorithmException e) {
+			e.printStackTrace();
+		} catch (IOException e) {
 			e.printStackTrace();
 		}
 		return null;
@@ -221,6 +238,7 @@
 		Object retObj = mainMethod.invoke(null, new Object[] { input });
 		return (String) retObj;
 	}
+	
 
 	/**
 	 * BASE64瑙e瘑
@@ -282,4 +300,31 @@
 		return lArr;
 	}
 
+	public static String concat(List list, String sperator) {
+		if (list == null)
+			return null;
+		String str = "";
+		for (Object obj : list) {
+			str += obj + sperator;
+		}
+		if (str.endsWith(sperator))
+			str = str.substring(0, str.length() - sperator.length());
+		return str;
+	}
+
+	public static String concat(Object[] array, String sperator) {
+		if (array == null)
+			return null;
+
+		String str = "";
+		for (int i = 0; i < array.length; i++) {
+			str += array[i] + sperator;
+		}
+
+		if (str.endsWith(sperator))
+			str = str.substring(0, str.length() - sperator.length());
+		return str;
+	}
+
+
 }

--
Gitblit v1.8.0