From 7e7db2fa55a9a3af46d4fd8ede0dee147f101d64 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 09 五月 2020 21:41:27 +0800
Subject: [PATCH] 2.1需求

---
 fanli/src/main/java/com/yeshi/fanli/util/StringUtil.java |   45 ++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 40 insertions(+), 5 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 1be1f69..b9e02cf 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/StringUtil.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/StringUtil.java
@@ -4,6 +4,7 @@
 import java.lang.reflect.Method;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
+import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -11,6 +12,7 @@
 
 import org.apache.commons.codec.binary.Base64;
 
+import net.sf.json.JSONObject;
 import sun.misc.BASE64Encoder;
 
 public class StringUtil {
@@ -39,7 +41,7 @@
 	// 鏄惁涓虹數璇濆彿鐮�
 	public static boolean isMobile(String mobile) {
 
-		String regex = "^((13[0-9])|(17[0-9])|(15[^4,\\D])|(18[0-9])|(19[0-9])|(16[0-9]))\\d{8}$";
+		String regex = "^((13[0-9])|(14[0-9])|(17[0-9])|(15[^4,\\D])|(18[0-9])|(19[0-9])|(16[0-9]))\\d{8}$";
 		Pattern p = Pattern.compile(regex);
 		Matcher m = p.matcher(mobile);
 
@@ -91,7 +93,7 @@
 		}
 		return code;
 	}
-	
+
 	public static String getVerifyCode(int count) {
 		String sts = "0123456789";
 		String code = "";
@@ -101,8 +103,6 @@
 		}
 		return code;
 	}
-	
-	
 
 	// 锟斤拷取锟斤拷锟脚凤拷锟酵的革拷式
 	public static String getMessageStyle(String code) {
@@ -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;
@@ -283,4 +283,39 @@
 		return lArr;
 	}
 
+	public static boolean isJson(String content) {
+		try {
+			JSONObject.fromObject(content);
+			return true;
+		} catch (Exception e) {
+			return false;
+		}
+	}
+
+	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