From cc7f57619fd09f68582b748a3580402717b84c50 Mon Sep 17 00:00:00 2001
From: david-PC\david <kimi42345@gmail.com>
Date: 星期二, 12 六月 2018 15:27:15 +0800
Subject: [PATCH] 停止跟踪项目文件

---
 source/my/frame/src/frame/util/Util.java |   25 ++++++++++++++++++++++---
 1 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/source/my/frame/src/frame/util/Util.java b/source/my/frame/src/frame/util/Util.java
index 1ce487a..951e5ca 100644
--- a/source/my/frame/src/frame/util/Util.java
+++ b/source/my/frame/src/frame/util/Util.java
@@ -194,7 +194,7 @@
 		return false;
 	}
 
-	public static boolean stringToBoolean(String value) {
+	public static boolean StringToBoolean(String value) {
 		if (value != null) {
 			value = value.toLowerCase();
 
@@ -218,7 +218,7 @@
 			return false;
 	}
 
-	public static int stringToInt(String value, int defaultValue) {
+	public static int StringToInt(String value, int defaultValue) {
 		if (value != null) {
 			try {
 				Double doubleValue = Double.valueOf(value);
@@ -232,7 +232,7 @@
 			return defaultValue;
 	}
 
-	public static BigDecimal stringToBigDecimal(String value, BigDecimal defaultValue) {
+	public static BigDecimal StringToBigDecimal(String value, BigDecimal defaultValue) {
 		if (value == null) {
 			return defaultValue;
 		}
@@ -545,4 +545,23 @@
 		return calendar.get(Calendar.MONTH) + 1;
 	}
 
+	public static String joinPath(String parent, String path) {
+		if (isEmptyStr(parent)) {
+			return path;
+		}
+		
+		parent = parent.replace("\\", "/");
+		path = path.replace("\\", "/");
+		
+		if ('/' == parent.charAt(parent.length() - 1)) {
+			parent = parent.substring(0, parent.length() - 1);
+		}
+		
+		if ('/' == path.charAt(0)) {
+			path = path.substring(1);
+		}
+		
+		return parent + "/" + path;
+	}
+
 }

--
Gitblit v1.8.0