diff --git a/common/generator-code/src/main/java/cn/bunny/utils/DbInfoUtil.java b/common/generator-code/src/main/java/cn/bunny/utils/DbInfoUtil.java index d5663ed..2616b2a 100644 --- a/common/generator-code/src/main/java/cn/bunny/utils/DbInfoUtil.java +++ b/common/generator-code/src/main/java/cn/bunny/utils/DbInfoUtil.java @@ -17,7 +17,7 @@ import java.util.Set; @Component public class DbInfoUtil { - + @Autowired private DataSource dataSource; @@ -35,7 +35,7 @@ public class DbInfoUtil { ResultSet pkResultSet = metaData.getPrimaryKeys(null, null, tableName); while (pkResultSet.next()) { - primaryKeys.add(pkResultSet.getString("COLUMN_NAME" ).toLowerCase()); + primaryKeys.add(pkResultSet.getString("COLUMN_NAME").toLowerCase()); } return primaryKeys; @@ -45,12 +45,12 @@ public class DbInfoUtil { public List getAllTableInfo() throws SQLException { try (Connection connection = dataSource.getConnection()) { DatabaseMetaData metaData = connection.getMetaData(); - ResultSet tables = metaData.getTables(null, null, "%" , new String[]{"TABLE"}); + ResultSet tables = metaData.getTables(null, null, "%", new String[]{"TABLE"}); List list = new ArrayList<>(); while (tables.next()) { - String tableName = tables.getString("TABLE_NAME" ); + String tableName = tables.getString("TABLE_NAME"); TableMetaData tableMetaData = tableInfo(tableName); list.add(tableMetaData); } @@ -67,7 +67,7 @@ public class DbInfoUtil { * @throws SQLException SQLException */ public TableMetaData tableInfo(String tableName) throws SQLException { - TableMetaData tableMetaData = null; + TableMetaData tableMetaData; try (Connection connection = dataSource.getConnection()) { DatabaseMetaData metaData = connection.getMetaData(); @@ -75,15 +75,15 @@ public class DbInfoUtil { // 获取表的注释信息 if (tables.next()) { - String remarks = tables.getString("REMARKS" ); - String tableCat = tables.getString("TABLE_CAT" ); - String tableSchem = tables.getString("TABLE_SCHEM" ); - String tableType = tables.getString("TABLE_TYPE" ); - String typeCat = tables.getString("TYPE_CAT" ); - String typeSchem = tables.getString("TYPE_SCHEM" ); - String typeName = tables.getString("TYPE_NAME" ); - String selfReferencingColName = tables.getString("SELF_REFERENCING_COL_NAME" ); - String refGeneration = tables.getString("REF_GENERATION" ); + String remarks = tables.getString("REMARKS"); + String tableCat = tables.getString("TABLE_CAT"); + String tableSchem = tables.getString("TABLE_SCHEM"); + String tableType = tables.getString("TABLE_TYPE"); + String typeCat = tables.getString("TYPE_CAT"); + String typeSchem = tables.getString("TYPE_SCHEM"); + String typeName = tables.getString("TYPE_NAME"); + String selfReferencingColName = tables.getString("SELF_REFERENCING_COL_NAME"); + String refGeneration = tables.getString("REF_GENERATION"); tableMetaData = TableMetaData.builder() .tableName(tableName) @@ -98,7 +98,7 @@ public class DbInfoUtil { .refGeneration(refGeneration) .build(); } else { - throw new RuntimeException("数据表不存在" ); + throw new RuntimeException("数据表不存在"); } return tableMetaData; @@ -122,13 +122,13 @@ public class DbInfoUtil { try (ResultSet columnsRs = metaData.getColumns(null, null, tableName, null)) { while (columnsRs.next()) { ColumnMetaData column = new ColumnMetaData(); - String columnName = columnsRs.getString("COLUMN_NAME" ); + String columnName = columnsRs.getString("COLUMN_NAME"); column.setColumnName(columnName); column.setFieldName(ConvertUtil.convertToFieldName(column.getColumnName())); - column.setJdbcType(columnsRs.getString("TYPE_NAME" )); + column.setJdbcType(columnsRs.getString("TYPE_NAME")); column.setJavaType(ConvertUtil.convertToJavaType(column.getJdbcType())); - column.setComment(columnsRs.getString("REMARKS" )); + column.setComment(columnsRs.getString("REMARKS")); // 确保 primaryKeyColumns 不为空 if (!primaryKeyColumns.isEmpty()) { diff --git a/common/common-generator/pom.xml b/common/generator-v1/pom.xml similarity index 96% rename from common/common-generator/pom.xml rename to common/generator-v1/pom.xml index 37851e7..ad2eed6 100644 --- a/common/common-generator/pom.xml +++ b/common/generator-v1/pom.xml @@ -7,7 +7,7 @@ 0.0.1-SNAPSHOT - common-generator + generator-v1 jar common-utils diff --git a/common/common-generator/src/main/java/cn/bunny/common/generator/entity/BaseField.java b/common/generator-v1/src/main/java/cn/bunny/common/generator/entity/BaseField.java similarity index 100% rename from common/common-generator/src/main/java/cn/bunny/common/generator/entity/BaseField.java rename to common/generator-v1/src/main/java/cn/bunny/common/generator/entity/BaseField.java diff --git a/common/common-generator/src/main/java/cn/bunny/common/generator/entity/BaseResultMap.java b/common/generator-v1/src/main/java/cn/bunny/common/generator/entity/BaseResultMap.java similarity index 100% rename from common/common-generator/src/main/java/cn/bunny/common/generator/entity/BaseResultMap.java rename to common/generator-v1/src/main/java/cn/bunny/common/generator/entity/BaseResultMap.java diff --git a/common/common-generator/src/main/java/cn/bunny/common/generator/entity/ColumnsField.java b/common/generator-v1/src/main/java/cn/bunny/common/generator/entity/ColumnsField.java similarity index 100% rename from common/common-generator/src/main/java/cn/bunny/common/generator/entity/ColumnsField.java rename to common/generator-v1/src/main/java/cn/bunny/common/generator/entity/ColumnsField.java diff --git a/common/common-generator/src/main/java/cn/bunny/common/generator/entity/StoreTypeField.java b/common/generator-v1/src/main/java/cn/bunny/common/generator/entity/StoreTypeField.java similarity index 100% rename from common/common-generator/src/main/java/cn/bunny/common/generator/entity/StoreTypeField.java rename to common/generator-v1/src/main/java/cn/bunny/common/generator/entity/StoreTypeField.java diff --git a/common/common-generator/src/main/java/cn/bunny/common/generator/generator/AdminCodeGenerator.java b/common/generator-v1/src/main/java/cn/bunny/common/generator/generator/AdminCodeGenerator.java similarity index 100% rename from common/common-generator/src/main/java/cn/bunny/common/generator/generator/AdminCodeGenerator.java rename to common/generator-v1/src/main/java/cn/bunny/common/generator/generator/AdminCodeGenerator.java diff --git a/common/common-generator/src/main/java/cn/bunny/common/generator/generator/I18nCodeGenerator.java b/common/generator-v1/src/main/java/cn/bunny/common/generator/generator/I18nCodeGenerator.java similarity index 100% rename from common/common-generator/src/main/java/cn/bunny/common/generator/generator/I18nCodeGenerator.java rename to common/generator-v1/src/main/java/cn/bunny/common/generator/generator/I18nCodeGenerator.java diff --git a/common/common-generator/src/main/java/cn/bunny/common/generator/generator/WebGeneratorCode.java b/common/generator-v1/src/main/java/cn/bunny/common/generator/generator/WebGeneratorCode.java similarity index 100% rename from common/common-generator/src/main/java/cn/bunny/common/generator/generator/WebGeneratorCode.java rename to common/generator-v1/src/main/java/cn/bunny/common/generator/generator/WebGeneratorCode.java diff --git a/common/common-generator/src/main/java/cn/bunny/common/generator/utils/GeneratorCodeUtils.java b/common/generator-v1/src/main/java/cn/bunny/common/generator/utils/GeneratorCodeUtils.java similarity index 100% rename from common/common-generator/src/main/java/cn/bunny/common/generator/utils/GeneratorCodeUtils.java rename to common/generator-v1/src/main/java/cn/bunny/common/generator/utils/GeneratorCodeUtils.java diff --git a/common/common-generator/src/main/resources/vms/server/controller.vm b/common/generator-v1/src/main/resources/vms/server/controller.vm similarity index 100% rename from common/common-generator/src/main/resources/vms/server/controller.vm rename to common/generator-v1/src/main/resources/vms/server/controller.vm diff --git a/common/common-generator/src/main/resources/vms/server/mapper.vm b/common/generator-v1/src/main/resources/vms/server/mapper.vm similarity index 100% rename from common/common-generator/src/main/resources/vms/server/mapper.vm rename to common/generator-v1/src/main/resources/vms/server/mapper.vm diff --git a/common/common-generator/src/main/resources/vms/server/resourceMapper.vm b/common/generator-v1/src/main/resources/vms/server/resourceMapper.vm similarity index 100% rename from common/common-generator/src/main/resources/vms/server/resourceMapper.vm rename to common/generator-v1/src/main/resources/vms/server/resourceMapper.vm diff --git a/common/common-generator/src/main/resources/vms/server/service.vm b/common/generator-v1/src/main/resources/vms/server/service.vm similarity index 100% rename from common/common-generator/src/main/resources/vms/server/service.vm rename to common/generator-v1/src/main/resources/vms/server/service.vm diff --git a/common/common-generator/src/main/resources/vms/server/serviceImpl.vm b/common/generator-v1/src/main/resources/vms/server/serviceImpl.vm similarity index 100% rename from common/common-generator/src/main/resources/vms/server/serviceImpl.vm rename to common/generator-v1/src/main/resources/vms/server/serviceImpl.vm diff --git a/common/common-generator/src/main/resources/vms/web/api.vm b/common/generator-v1/src/main/resources/vms/web/api.vm similarity index 100% rename from common/common-generator/src/main/resources/vms/web/api.vm rename to common/generator-v1/src/main/resources/vms/web/api.vm diff --git a/common/common-generator/src/main/resources/vms/web/columns.vm b/common/generator-v1/src/main/resources/vms/web/columns.vm similarity index 100% rename from common/common-generator/src/main/resources/vms/web/columns.vm rename to common/generator-v1/src/main/resources/vms/web/columns.vm diff --git a/common/common-generator/src/main/resources/vms/web/dialog.vm b/common/generator-v1/src/main/resources/vms/web/dialog.vm similarity index 100% rename from common/common-generator/src/main/resources/vms/web/dialog.vm rename to common/generator-v1/src/main/resources/vms/web/dialog.vm diff --git a/common/common-generator/src/main/resources/vms/web/hook.vm b/common/generator-v1/src/main/resources/vms/web/hook.vm similarity index 100% rename from common/common-generator/src/main/resources/vms/web/hook.vm rename to common/generator-v1/src/main/resources/vms/web/hook.vm diff --git a/common/common-generator/src/main/resources/vms/web/index.vm b/common/generator-v1/src/main/resources/vms/web/index.vm similarity index 100% rename from common/common-generator/src/main/resources/vms/web/index.vm rename to common/generator-v1/src/main/resources/vms/web/index.vm diff --git a/common/common-generator/src/main/resources/vms/web/store.vm b/common/generator-v1/src/main/resources/vms/web/store.vm similarity index 100% rename from common/common-generator/src/main/resources/vms/web/store.vm rename to common/generator-v1/src/main/resources/vms/web/store.vm diff --git a/common/common-generator/src/main/resources/vms/web/types.vm b/common/generator-v1/src/main/resources/vms/web/types.vm similarity index 100% rename from common/common-generator/src/main/resources/vms/web/types.vm rename to common/generator-v1/src/main/resources/vms/web/types.vm diff --git a/common/pom.xml b/common/pom.xml index ed72780..daf7a31 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -13,7 +13,7 @@ https://maven.apache.org - common-generator + generator-v1