From 63d7d733938c8ea2fbb046625f1f70d6c48f8673 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 14 十二月 2019 11:08:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/util/StringUtil.java | 35 ++++++++++++++++++++++++++++++++++-
1 files changed, 34 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/util/StringUtil.java b/fanli/src/main/java/com/yeshi/fanli/util/StringUtil.java
index 3b7a5ee..e576054 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/StringUtil.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/StringUtil.java
@@ -112,7 +112,7 @@
// 锟角凤拷锟角空碉拷锟街凤拷
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;
@@ -303,4 +303,37 @@
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;
+ }
+
+
+ /**
+ * 娣樺彛浠ゆ彁鍙�
+ *
+ * @param str
+ * @return
+ */
+ public static String picUpTaoToken(String str) {
+ String pattern = "(鈧硔1}[A-Za-z0-9]+鈧硔1})|(楼{1}[A-Za-z0-9]+楼{1})|(锟1}[A-Za-z0-9]+锟1})";
+ Pattern r = Pattern.compile(pattern);
+ Matcher m = r.matcher(str);
+ while (m.find()) {
+ String group = m.group(0);
+ if (!StringUtil.isNullOrEmpty(group))
+ return group;
+ }
+ return null;
+ }
}
--
Gitblit v1.8.0