diff --git a/framework-core/pom.xml b/framework-core/pom.xml index 6fa215b..c8e67c4 100644 --- a/framework-core/pom.xml +++ b/framework-core/pom.xml @@ -5,7 +5,7 @@ com.unionmed unionmed-framework - 0.0.1 + 0.0.2 4.0.0 @@ -21,11 +21,6 @@ - com.mchange - c3p0 - - - cn.hutool hutool-all @@ -35,31 +30,15 @@ com.alibaba fastjson - - com.alibaba - druid - - - com.alibaba - druid-spring-boot-starter - org.springframework.boot - spring-boot-starter-web - - - org.springframework.boot spring-boot-starter-data-jpa org.springframework.boot - spring-boot-starter-jdbc - - - org.springframework.batch - spring-batch-infrastructure + spring-boot-starter-web org.springframework.boot @@ -68,38 +47,12 @@ true - - com.oracle - ojdbc14 - - - - - - - - io.minio minio - - - org.mybatis.spring.boot - mybatis-spring-boot-starter - - - - com.github.pagehelper - pagehelper-spring-boot-starter - - - com.baomidou - mybatis-plus-annotation - - org.projectlombok lombok @@ -133,12 +86,6 @@ - - - - - - com.github.isrsal spring-mvc-logger diff --git a/framework-orm/pom.xml b/framework-orm/pom.xml new file mode 100644 index 0000000..8477125 --- /dev/null +++ b/framework-orm/pom.xml @@ -0,0 +1,95 @@ + + + + unionmed-framework + com.unionmed + 0.0.2 + + + 4.0.0 + com.unionmed + framework-orm + framework-orm + + + 8 + 8 + UTF-8 + + + + + com.unionmed + framework-core + + + + com.mchange + c3p0 + + + + + com.alibaba + druid + + + com.alibaba + druid-spring-boot-starter + + + + + org.springframework.boot + spring-boot-starter-data-jpa + + + org.springframework.boot + spring-boot-starter-jdbc + + + org.springframework.batch + spring-batch-infrastructure + + + + com.oracle + ojdbc14 + + + + + org.mybatis.spring.boot + mybatis-spring-boot-starter + + + + com.github.pagehelper + pagehelper-spring-boot-starter + + + com.baomidou + mybatis-plus-annotation + + + + + ${project.name}-${project.parent.version} + + + + src/main/resources + true + + + src/main/java + + **/*.xml + + true + + + + \ No newline at end of file diff --git a/framework-core/src/main/java/com/unionmed/framework/mybatis/MybatisConfiguration.java b/framework-orm/src/main/java/com/unionmed/framework/mybatis/MybatisConfiguration.java similarity index 100% rename from framework-core/src/main/java/com/unionmed/framework/mybatis/MybatisConfiguration.java rename to framework-orm/src/main/java/com/unionmed/framework/mybatis/MybatisConfiguration.java diff --git a/framework-core/src/main/java/com/unionmed/framework/orm/SimpleOrm.java b/framework-orm/src/main/java/com/unionmed/framework/orm/SimpleOrm.java similarity index 100% rename from framework-core/src/main/java/com/unionmed/framework/orm/SimpleOrm.java rename to framework-orm/src/main/java/com/unionmed/framework/orm/SimpleOrm.java diff --git a/framework-core/src/main/java/com/unionmed/framework/orm/SimpleOrmImpl.java b/framework-orm/src/main/java/com/unionmed/framework/orm/SimpleOrmImpl.java similarity index 100% rename from framework-core/src/main/java/com/unionmed/framework/orm/SimpleOrmImpl.java rename to framework-orm/src/main/java/com/unionmed/framework/orm/SimpleOrmImpl.java diff --git a/framework-core/src/main/java/com/unionmed/framework/orm/annotation/ValidColumn.java b/framework-orm/src/main/java/com/unionmed/framework/orm/annotation/ValidColumn.java similarity index 100% rename from framework-core/src/main/java/com/unionmed/framework/orm/annotation/ValidColumn.java rename to framework-orm/src/main/java/com/unionmed/framework/orm/annotation/ValidColumn.java diff --git a/framework-core/src/main/java/com/unionmed/framework/orm/dao/SimpleDao.java b/framework-orm/src/main/java/com/unionmed/framework/orm/dao/SimpleDao.java similarity index 100% rename from framework-core/src/main/java/com/unionmed/framework/orm/dao/SimpleDao.java rename to framework-orm/src/main/java/com/unionmed/framework/orm/dao/SimpleDao.java diff --git a/framework-core/src/main/java/com/unionmed/framework/orm/dao/xml/SimpleDao.xml b/framework-orm/src/main/java/com/unionmed/framework/orm/dao/xml/SimpleDao.xml similarity index 100% rename from framework-core/src/main/java/com/unionmed/framework/orm/dao/xml/SimpleDao.xml rename to framework-orm/src/main/java/com/unionmed/framework/orm/dao/xml/SimpleDao.xml diff --git a/framework-core/src/main/java/com/unionmed/framework/orm/model/Model.java b/framework-orm/src/main/java/com/unionmed/framework/orm/model/Model.java similarity index 100% rename from framework-core/src/main/java/com/unionmed/framework/orm/model/Model.java rename to framework-orm/src/main/java/com/unionmed/framework/orm/model/Model.java diff --git a/framework-core/src/main/java/com/unionmed/framework/orm/model/ModelHelper.java b/framework-orm/src/main/java/com/unionmed/framework/orm/model/ModelHelper.java similarity index 100% rename from framework-core/src/main/java/com/unionmed/framework/orm/model/ModelHelper.java rename to framework-orm/src/main/java/com/unionmed/framework/orm/model/ModelHelper.java diff --git a/framework-core/src/main/java/com/unionmed/framework/orm/model/ModelTable.java b/framework-orm/src/main/java/com/unionmed/framework/orm/model/ModelTable.java similarity index 100% rename from framework-core/src/main/java/com/unionmed/framework/orm/model/ModelTable.java rename to framework-orm/src/main/java/com/unionmed/framework/orm/model/ModelTable.java diff --git a/framework-core/src/main/java/com/unionmed/framework/orm/model/ModelTableColumn.java b/framework-orm/src/main/java/com/unionmed/framework/orm/model/ModelTableColumn.java similarity index 100% rename from framework-core/src/main/java/com/unionmed/framework/orm/model/ModelTableColumn.java rename to framework-orm/src/main/java/com/unionmed/framework/orm/model/ModelTableColumn.java diff --git a/framework-core/src/main/java/com/unionmed/framework/orm/model/ModelTableColumnValid.java b/framework-orm/src/main/java/com/unionmed/framework/orm/model/ModelTableColumnValid.java similarity index 100% rename from framework-core/src/main/java/com/unionmed/framework/orm/model/ModelTableColumnValid.java rename to framework-orm/src/main/java/com/unionmed/framework/orm/model/ModelTableColumnValid.java diff --git a/framework-core/src/main/java/com/unionmed/framework/orm/model/RecordModel.java b/framework-orm/src/main/java/com/unionmed/framework/orm/model/RecordModel.java similarity index 100% rename from framework-core/src/main/java/com/unionmed/framework/orm/model/RecordModel.java rename to framework-orm/src/main/java/com/unionmed/framework/orm/model/RecordModel.java diff --git a/framework-core/src/main/java/com/unionmed/framework/orm/model/ValidFlag.java b/framework-orm/src/main/java/com/unionmed/framework/orm/model/ValidFlag.java similarity index 100% rename from framework-core/src/main/java/com/unionmed/framework/orm/model/ValidFlag.java rename to framework-orm/src/main/java/com/unionmed/framework/orm/model/ValidFlag.java diff --git a/framework-core/src/main/java/com/unionmed/framework/orm/statement/InsertSql.java b/framework-orm/src/main/java/com/unionmed/framework/orm/statement/InsertSql.java similarity index 100% rename from framework-core/src/main/java/com/unionmed/framework/orm/statement/InsertSql.java rename to framework-orm/src/main/java/com/unionmed/framework/orm/statement/InsertSql.java diff --git a/framework-core/src/main/java/com/unionmed/framework/orm/statement/SelectSql.java b/framework-orm/src/main/java/com/unionmed/framework/orm/statement/SelectSql.java similarity index 100% rename from framework-core/src/main/java/com/unionmed/framework/orm/statement/SelectSql.java rename to framework-orm/src/main/java/com/unionmed/framework/orm/statement/SelectSql.java diff --git a/framework-core/src/main/java/com/unionmed/framework/orm/statement/TableSql.java b/framework-orm/src/main/java/com/unionmed/framework/orm/statement/TableSql.java similarity index 100% rename from framework-core/src/main/java/com/unionmed/framework/orm/statement/TableSql.java rename to framework-orm/src/main/java/com/unionmed/framework/orm/statement/TableSql.java diff --git a/framework-core/src/main/java/com/unionmed/framework/orm/statement/TableSqlHelper.java b/framework-orm/src/main/java/com/unionmed/framework/orm/statement/TableSqlHelper.java similarity index 100% rename from framework-core/src/main/java/com/unionmed/framework/orm/statement/TableSqlHelper.java rename to framework-orm/src/main/java/com/unionmed/framework/orm/statement/TableSqlHelper.java diff --git a/framework-core/src/main/java/com/unionmed/framework/orm/statement/UpdateSql.java b/framework-orm/src/main/java/com/unionmed/framework/orm/statement/UpdateSql.java similarity index 100% rename from framework-core/src/main/java/com/unionmed/framework/orm/statement/UpdateSql.java rename to framework-orm/src/main/java/com/unionmed/framework/orm/statement/UpdateSql.java diff --git a/framework-test/pom.xml b/framework-test/pom.xml index 5220f45..e299fa4 100644 --- a/framework-test/pom.xml +++ b/framework-test/pom.xml @@ -5,7 +5,7 @@ com.unionmed unionmed-framework - 0.0.1 + 0.0.2 4.0.0 diff --git a/pom.xml b/pom.xml index d16cb18..a58b10c 100644 --- a/pom.xml +++ b/pom.xml @@ -9,13 +9,14 @@ 4.0.0 com.unionmed unionmed-framework - 0.0.1 + 0.0.2 pom unionmed-framework framework-core framework-test + framework-orm