From 2e6bb454f42a28f719e40abeeeb87e12b4efa93f Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 16 三月 2020 09:58:40 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
---
ruoyi/src/main/java/com/ruoyi/project/tool/gen/util/GenUtils.java | 40 ++++++++++++++++++++++------------------
1 files changed, 22 insertions(+), 18 deletions(-)
diff --git a/ruoyi/src/main/java/com/ruoyi/project/tool/gen/util/GenUtils.java b/ruoyi/src/main/java/com/ruoyi/project/tool/gen/util/GenUtils.java
index 9098f7c..4068643 100644
--- a/ruoyi/src/main/java/com/ruoyi/project/tool/gen/util/GenUtils.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/tool/gen/util/GenUtils.java
@@ -166,10 +166,30 @@
if (autoRemovePre && StringUtils.isNotEmpty(tablePrefix))
{
String[] searchList = StringUtils.split(tablePrefix, ",");
- String[] replacementList = emptyList(searchList.length);
- tableName = StringUtils.replaceEach(tableName, searchList, replacementList);
+ tableName = replaceFirst(tableName, searchList);
}
return StringUtils.convertToCamelCase(tableName);
+ }
+
+ /**
+ * 鎵归噺鏇挎崲鍓嶇紑
+ *
+ * @param replacementm 鏇挎崲鍊�
+ * @param searchList 鏇挎崲鍒楄〃
+ * @return
+ */
+ public static String replaceFirst(String replacementm, String[] searchList)
+ {
+ String text = replacementm;
+ for (String searchString : searchList)
+ {
+ if (replacementm.startsWith(searchString))
+ {
+ text = replacementm.replaceFirst(searchString, "");
+ break;
+ }
+ }
+ return text;
}
/**
@@ -218,21 +238,5 @@
{
return 0;
}
- }
-
- /**
- * 鑾峰彇绌烘暟缁勫垪琛�
- *
- * @param length 闀垮害
- * @return 鏁扮粍淇℃伅
- */
- public static String[] emptyList(int length)
- {
- String[] values = new String[length];
- for (int i = 0; i < length; i++)
- {
- values[i] = StringUtils.EMPTY;
- }
- return values;
}
}
\ No newline at end of file
--
Gitblit v1.9.3