1. pom update

master
陈峰 1 year ago
parent cf7b290bbb
commit 6d9e1c4b25
  1. 2
      framework-core/pom.xml
  2. 2
      framework-orm/pom.xml
  3. 14
      framework-orm/src/main/java/com/unionmed/framework/orm/model/ModelHelper.java
  4. 2
      framework-test/pom.xml
  5. 2
      pom.xml

@ -5,7 +5,7 @@
<parent> <parent>
<groupId>com.unionmed</groupId> <groupId>com.unionmed</groupId>
<artifactId>unionmed-framework</artifactId> <artifactId>unionmed-framework</artifactId>
<version>0.0.4</version> <version>0.0.5</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>unionmed-framework</artifactId> <artifactId>unionmed-framework</artifactId>
<groupId>com.unionmed</groupId> <groupId>com.unionmed</groupId>
<version>0.0.4</version> <version>0.0.5</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

@ -44,7 +44,7 @@ public final class ModelHelper {
table.setId(superTable.getId()); table.setId(superTable.getId());
// field: valid_flag // field: valid_flag
table.setValidFlag(superTable.getValidFlag()); table.setValidFlag(superTable.getValidFlag());
// others field // other fields
columns.addAll(superTable.getOtherFields()); columns.addAll(superTable.getOtherFields());
} }
@ -154,12 +154,18 @@ public final class ModelHelper {
sb.append((char) (first + 32)); sb.append((char) (first + 32));
} }
String suffix = name.substring(name.length() - modelSuffix.length()); String suffix;
if (name.endsWith(modelSuffix)) {
suffix = name.substring(1, name.length() - modelSuffix.length());
} else {
suffix = name.substring(1);
}
if (ObjectUtils.equals(suffix, modelSuffix)) { if (ObjectUtils.equals(suffix, modelSuffix)) {
name = name.substring(1, name.length() - modelSuffix.length()); throw new IllegalArgumentException("illegal table name");
} }
for (char c : name.toCharArray()) { for (char c : suffix.toCharArray()) {
if (c >= 65 && c <= 90) { if (c >= 65 && c <= 90) {
sb.append('_').append((char) (c + 32)); sb.append('_').append((char) (c + 32));
} else { } else {

@ -5,7 +5,7 @@
<parent> <parent>
<groupId>com.unionmed</groupId> <groupId>com.unionmed</groupId>
<artifactId>unionmed-framework</artifactId> <artifactId>unionmed-framework</artifactId>
<version>0.0.4</version> <version>0.0.5</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

@ -9,7 +9,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>com.unionmed</groupId> <groupId>com.unionmed</groupId>
<artifactId>unionmed-framework</artifactId> <artifactId>unionmed-framework</artifactId>
<version>0.0.4</version> <version>0.0.5</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>unionmed-framework</name> <name>unionmed-framework</name>

Loading…
Cancel
Save