升级 1.4.1

mybatis-plus/src/main/java/com/baomidou/mybatisplus/toolkit/StringUtils.java

@@ -17,7 +17,7 @@ package com.baomidou.mybatisplus.toolkit;
 
 /**
  * <p>
- * String工具类
+ * String 工具类
  * </p>
  *
  * @author D.Yang
@@ -25,74 +25,81 @@ package com.baomidou.mybatisplus.toolkit;
  */
 public class StringUtils {
 
-    /**
-     * 判断字符串是否为空
-     *
-     * @param str 需要判断字符串
-     * @return 判断结果
-     */
-    public static boolean isEmpty(String str) {
-        return str == null || "".equals(str.trim());
-    }
+	/**
+	 * 下划线字符
+	 */
+	public static final char UNDERLINE = '_';
 
-    /**
-     * 判断字符串是否不为空
-     *
-     * @param str 需要判断字符串
-     * @return 判断结果
-     */
-    public static boolean isNotEmpty(String str) {
-        return (str != null) && !"".equals(str.trim());
-    }
+	/**
+	 * 判断字符串是否为空
+	 *
+	 * @param str
+	 *            需要判断字符串
+	 * @return 判断结果
+	 */
+	public static boolean isEmpty(String str) {
+		return str == null || "".equals(str.trim());
+	}
 
-    private static final char UNDERLINE = '_';
+	/**
+	 * 判断字符串是否不为空
+	 *
+	 * @param str
+	 *            需要判断字符串
+	 * @return 判断结果
+	 */
+	public static boolean isNotEmpty(String str) {
+		return (str != null) && !"".equals(str.trim());
+	}
 
-    /**
-     * 字符串驼峰转下划线格式
-     *
-     * @param param 需要转换的字符串
-     * @return 转换好的字符串
-     */
-    public static String camelToUnderline(String param) {
-        if (isEmpty(param)) {
-            return "";
-        }
-        int len = param.length();
-        StringBuilder sb = new StringBuilder(len);
-        for (int i = 0; i < len; i++) {
-            char c = param.charAt(i);
-            if (Character.isUpperCase(c)) {
-                sb.append(UNDERLINE);
-                sb.append(Character.toLowerCase(c));
-            } else {
-                sb.append(c);
-            }
-        }
-        return sb.toString();
-    }
+	/**
+	 * <p>
+	 * 字符串驼峰转下划线格式
+	 * </p>
+	 *
+	 * @param param
+	 *            需要转换的字符串
+	 * @return 转换好的字符串
+	 */
+	public static String camelToUnderline(String param) {
+		if (StringUtils.isEmpty(param)) {
+			return "";
+		}
+		int len = param.length();
+		StringBuilder sb = new StringBuilder(len);
+		for (int i = 0; i < len; i++) {
+			char c = param.charAt(i);
+			if (Character.isUpperCase(c) && i > 0) {
+				sb.append(UNDERLINE);
+			}
+			sb.append(Character.toLowerCase(c));
+		}
+		return sb.toString();
+	}
 
-    /**
-     * 字符串下划线转驼峰格式
-     *
-     * @param param 需要转换的字符串
-     * @return 转换好的字符串
-     */
-    public static String underlineToCamel(String param) {
-        if (isEmpty(param)) {
-            return "";
-        }
-        int len = param.length();
-        StringBuilder sb = new StringBuilder(len);
-        for (int i = 0; i < len; i++) {
-            char c = param.charAt(i);
-            if (c == UNDERLINE) {
-                if (++i < len) {
-                    sb.append(Character.toUpperCase(param.charAt(i)));
-                }
-            } else {
-                sb.append(c);
-            }
-        }
-        return sb.toString();
-    }
+	/**
+	 * 字符串下划线转驼峰格式
+	 *
+	 * @param param
+	 *            需要转换的字符串
+	 * @return 转换好的字符串
+	 */
+	public static String underlineToCamel(String param) {
+		if (isEmpty(param)) {
+			return "";
+		}
+		int len = param.length();
+		StringBuilder sb = new StringBuilder(len);
+		for (int i = 0; i < len; i++) {
+			char c = param.charAt(i);
+			if (c == UNDERLINE) {
+				if (++i < len) {
+					sb.append(Character.toUpperCase(param.charAt(i)));
+				}
+			} else {
+				sb.append(c);
+			}
+		}
+		return sb.toString();
+	}
 }

mybatis-plus/src/main/java/com/baomidou/mybatisplus/toolkit/TableInfoHelper.java

@@ -66,7 +66,7 @@ public class TableInfoHelper {
 		if (table != null && table.value() != null && table.value().trim().length() > 0) {
 			tableInfo.setTableName(table.value());
 		} else {
-			tableInfo.setTableName(camelToUnderline(clazz.getSimpleName()));
+			tableInfo.setTableName(StringUtils.camelToUnderline(clazz.getSimpleName()));
 		}
 
 		List<TableFieldInfo> fieldList = new ArrayList<TableFieldInfo>();
@@ -84,7 +84,7 @@ public class TableInfoHelper {
 						tableInfo.setKeyRelated(true);
 					} else if (MybatisConfiguration.DB_COLUMN_UNDERLINE) {
 						/* 开启字段下划线申明 */
-						tableInfo.setKeyColumn(camelToUnderline(field.getName()));
+						tableInfo.setKeyColumn(StringUtils.camelToUnderline(field.getName()));
 					} else {
 						tableInfo.setKeyColumn(field.getName());
 					}
@@ -108,7 +108,7 @@ public class TableInfoHelper {
 			 */
 			if (MybatisConfiguration.DB_COLUMN_UNDERLINE) {
 				/* 开启字段下划线申明 */
-				fieldList.add(new TableFieldInfo(true, camelToUnderline(field.getName()), field.getName()));
+				fieldList.add(new TableFieldInfo(true, StringUtils.camelToUnderline(field.getName()), field.getName()));
 			} else {
 				fieldList.add(new TableFieldInfo(field.getName()));
 			}
@@ -126,24 +126,6 @@ public class TableInfoHelper {
 		return tableInfo;
 	}
 
-	/**
-	 * 驼峰转下划线
-	 */
-	private static String camelToUnderline(String param) {
-		if (StringUtils.isEmpty(param)) {
-			return "";
-		}
-		int len = param.length();
-		StringBuilder sb = new StringBuilder(len);
-		for (int i = 0; i < len; i++) {
-			char c = param.charAt(i);
-			if (Character.isUpperCase(c) && i > 0) {
-				sb.append("_");
-			}
-			sb.append(Character.toLowerCase(c));
-		}
-		return sb.toString();
-	}
 	
 	/**
 	 * 获取该类的所有属性列表