From 7fe1faf9151017bba94ef9d698d19720f4ce82e4 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Fri, 9 Jun 2023 19:59:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E4=B8=80=E4=BA=9B=E5=B8=B8=E9=87=8F?=
 =?UTF-8?q?=EF=BC=8C=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jeesite/common/lang/DateUtils.java    |  8 ++--
 .../com/jeesite/common/lang/StringUtils.java  | 46 ++++++++++---------
 2 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/common/src/main/java/com/jeesite/common/lang/DateUtils.java b/common/src/main/java/com/jeesite/common/lang/DateUtils.java
index 89aa0288..0605dd75 100644
--- a/common/src/main/java/com/jeesite/common/lang/DateUtils.java
+++ b/common/src/main/java/com/jeesite/common/lang/DateUtils.java
@@ -4,14 +4,13 @@
  */
 package com.jeesite.common.lang;
 
+import org.apache.commons.lang3.time.FastDateFormat;
+
 import java.lang.management.ManagementFactory;
 import java.text.ParseException;
 import java.util.Calendar;
 import java.util.Date;
 
-import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.time.FastDateFormat;
-
 /**
  * 日期工具类, 继承org.apache.commons.lang.time.DateUtils类
  * @author ThinkGem
@@ -272,7 +271,6 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
 	
 	/**
 	 * 获取服务器启动时间
-	 * @param date
 	 * @return
 	 */
 	public static Date getServerStartDate(){
@@ -305,7 +303,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
 	public static Date[] parseDateBetweenString(String dateString){
 		Date beginDate = null; Date endDate = null;
 		if (StringUtils.isNotBlank(dateString)){
-			String[] ss = StringUtils.split(dateString, "~");
+			String[] ss = StringUtils.split(dateString, StringUtils.TILDE);
 			if (ss != null && ss.length == 2){
 				String begin = StringUtils.trim(ss[0]);
 				String end = StringUtils.trim(ss[1]);
diff --git a/common/src/main/java/com/jeesite/common/lang/StringUtils.java b/common/src/main/java/com/jeesite/common/lang/StringUtils.java
index 2cb9460c..00a195aa 100644
--- a/common/src/main/java/com/jeesite/common/lang/StringUtils.java
+++ b/common/src/main/java/com/jeesite/common/lang/StringUtils.java
@@ -8,6 +8,7 @@ import com.jeesite.common.codec.EncodeUtils;
 import com.jeesite.common.collect.ListUtils;
 
 import java.io.UnsupportedEncodingException;
+import java.nio.charset.StandardCharsets;
 import java.util.List;
 import java.util.Random;
 import java.util.regex.Matcher;
@@ -19,9 +20,21 @@ import java.util.regex.Pattern;
  * @version 2018-1-6
  */
 public class StringUtils extends org.apache.commons.lang3.StringUtils {
-	
-    private static final char SEPARATOR = '_';
-    
+
+	public static final String COMMA = ",";
+	public static final String COLON = ":";
+	public static final String TILDE = "~";
+	public static final String UNDERLINE = "_";
+
+	/**
+	 * 分隔字符串（默认逗号分隔）
+	 * @param str
+	 * @return
+	 */
+	public static String[] split(final String str) {
+		return split(str, COMMA);
+	}
+
     /**
      * 转换为字节数组
      * @param str
@@ -29,28 +42,20 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils {
      */
     public static byte[] getBytes(String str){
     	if (str != null){
-    		try {
-				return str.getBytes(EncodeUtils.UTF_8);
-			} catch (UnsupportedEncodingException e) {
-				return null;
-			}
-    	}else{
+			return str.getBytes(StandardCharsets.UTF_8);
+		}else{
     		return null;
     	}
     }
     
     /**
      * 转换为字节数组
-     * @param str
+     * @param bytes
      * @return
      */
     public static String toString(byte[] bytes){
-    	try {
-			return new String(bytes, EncodeUtils.UTF_8);
-		} catch (UnsupportedEncodingException e) {
-			return EMPTY;
-		}
-    }
+		return new String(bytes, StandardCharsets.UTF_8);
+	}
     
     /**
      * 是否包含字符串
@@ -260,8 +265,7 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils {
         boolean upperCase = false;
         for (int i = 0; i < s.length(); i++) {
             char c = s.charAt(i);
-
-            if (c == SEPARATOR) {
+            if (c == UNDERLINE.charAt(0)) {
                 upperCase = i != 1; // 不允许第二个字符是大写
             } else if (upperCase) {
                 sb.append(Character.toUpperCase(c));
@@ -309,7 +313,7 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils {
             }
             if ((i > 0) && Character.isUpperCase(c)) {
                 if (!upperCase || !nextUpperCase) {
-                    sb.append(SEPARATOR);
+                    sb.append(UNDERLINE);
                 }
                 upperCase = true;
             } else {
@@ -362,7 +366,7 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils {
 	 * @return
 	 */
 	public static String getRandomNum(int count) {
-		char[] codeSeq = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9' };
+		char[] codeSeq = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9'};
 		Random random = new Random();
 		StringBuilder s = new StringBuilder();
 		for (int i = 0; i < count; i++) {
@@ -384,7 +388,7 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils {
 	 */
 	public static String getTreeNodeName(String isShowCode, String code, String name) {
 		if ("true".equals(isShowCode) || "1".equals(isShowCode)) {
-			return "(" + code + ") " + StringUtils.replace(name, " ", "");
+			return "(" + code + ") " + StringUtils.replace(name, SPACE, EMPTY);
 		} else if ("2".equals(isShowCode)) {
 			return name/*StringUtils.replace(name, " ", "")*/ + " (" + code + ")";
 		} else {