From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2
---
utils/src/main/java/org/yeshi/utils/StringUtil.java | 19 ++++++++++++++++++-
1 files changed, 18 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..cdf393d 100644
--- a/utils/src/main/java/org/yeshi/utils/StringUtil.java
+++ b/utils/src/main/java/org/yeshi/utils/StringUtil.java
@@ -1,13 +1,16 @@
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.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 +70,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 +108,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 +237,7 @@
Object retObj = mainMethod.invoke(null, new Object[] { input });
return (String) retObj;
}
+
/**
* BASE64瑙ｅ瘑
--
Gitblit v1.8.0