diff --git a/README-zh.md b/README-zh.md index 55f3a77..242a5e8 100644 --- a/README-zh.md +++ b/README-zh.md @@ -61,9 +61,7 @@ QQ群:680016987 或者 ### 使用 -* mapper继承MPJBaseMapper (必选) -* service继承MPJBaseService (可选) -* serviceImpl继承MPJBaseServiceImpl (可选) +* mapper继承MPJBaseMapper ### Lambda形式用法（MPJLambdaWrapper） diff --git a/README.md b/README.md index 7f041d1..ff51108 100644 --- a/README.md +++ b/README.md @@ -61,9 +61,7 @@ QQ群:680016987 或者 ### 使用 -* mapper继承MPJBaseMapper (必选) -* service继承MPJBaseService (可选) -* serviceImpl继承MPJBaseServiceImpl (可选) +* mapper继承MPJBaseMapper ### Lambda形式用法（MPJLambdaWrapper） diff --git a/mybatis-plus-join-processor/pom.xml b/plugin/mybatis-plus-join-processor/pom.xml similarity index 97% rename from mybatis-plus-join-processor/pom.xml rename to plugin/mybatis-plus-join-processor/pom.xml index 2869f36..ff41d7b 100644 --- a/mybatis-plus-join-processor/pom.xml +++ b/plugin/mybatis-plus-join-processor/pom.xml @@ -7,6 +7,7 @@ com.github.yulichang mybatis-plus-join-root ${revision} + ../../pom.xml mybatis-plus-join-processor diff --git a/mybatis-plus-join-processor/src/main/java/com/github/yulichang/processor/EntityProcessor.java b/plugin/mybatis-plus-join-processor/src/main/java/com/github/yulichang/processor/EntityProcessor.java similarity index 100% rename from mybatis-plus-join-processor/src/main/java/com/github/yulichang/processor/EntityProcessor.java rename to plugin/mybatis-plus-join-processor/src/main/java/com/github/yulichang/processor/EntityProcessor.java diff --git a/mybatis-plus-join-processor/src/main/java/com/github/yulichang/processor/matedata/FieldInfo.java b/plugin/mybatis-plus-join-processor/src/main/java/com/github/yulichang/processor/matedata/FieldInfo.java similarity index 100% rename from mybatis-plus-join-processor/src/main/java/com/github/yulichang/processor/matedata/FieldInfo.java rename to plugin/mybatis-plus-join-processor/src/main/java/com/github/yulichang/processor/matedata/FieldInfo.java diff --git a/mybatis-plus-join-processor/src/main/java/com/github/yulichang/processor/matedata/TableInfo.java b/plugin/mybatis-plus-join-processor/src/main/java/com/github/yulichang/processor/matedata/TableInfo.java similarity index 100% rename from mybatis-plus-join-processor/src/main/java/com/github/yulichang/processor/matedata/TableInfo.java rename to plugin/mybatis-plus-join-processor/src/main/java/com/github/yulichang/processor/matedata/TableInfo.java diff --git a/mybatis-plus-join-processor/src/main/java/com/github/yulichang/processor/utils/StringUtil.java b/plugin/mybatis-plus-join-processor/src/main/java/com/github/yulichang/processor/utils/StringUtil.java similarity index 100% rename from mybatis-plus-join-processor/src/main/java/com/github/yulichang/processor/utils/StringUtil.java rename to plugin/mybatis-plus-join-processor/src/main/java/com/github/yulichang/processor/utils/StringUtil.java diff --git a/mybatis-plus-join-processor/src/main/resources/META-INF/services/javax.annotation.processing.Processor b/plugin/mybatis-plus-join-processor/src/main/resources/META-INF/services/javax.annotation.processing.Processor similarity index 100% rename from mybatis-plus-join-processor/src/main/resources/META-INF/services/javax.annotation.processing.Processor rename to plugin/mybatis-plus-join-processor/src/main/resources/META-INF/services/javax.annotation.processing.Processor diff --git a/mybatis-plus-join-solon-plugin/README.md b/plugin/mybatis-plus-join-solon-plugin/README.md similarity index 100% rename from mybatis-plus-join-solon-plugin/README.md rename to plugin/mybatis-plus-join-solon-plugin/README.md diff --git a/mybatis-plus-join-solon-plugin/pom.xml b/plugin/mybatis-plus-join-solon-plugin/pom.xml similarity index 97% rename from mybatis-plus-join-solon-plugin/pom.xml rename to plugin/mybatis-plus-join-solon-plugin/pom.xml index a23e44e..f73b49b 100644 --- a/mybatis-plus-join-solon-plugin/pom.xml +++ b/plugin/mybatis-plus-join-solon-plugin/pom.xml @@ -7,6 +7,7 @@ com.github.yulichang mybatis-plus-join-root ${revision} + ../../pom.xml mybatis-plus-join-solon-plugin diff --git a/mybatis-plus-join-solon-plugin/src/main/java/com/github/yulichang/mybatisplusjoin/solon/plugin/XPluginImpl.java b/plugin/mybatis-plus-join-solon-plugin/src/main/java/com/github/yulichang/mybatisplusjoin/solon/plugin/XPluginImpl.java similarity index 100% rename from mybatis-plus-join-solon-plugin/src/main/java/com/github/yulichang/mybatisplusjoin/solon/plugin/XPluginImpl.java rename to plugin/mybatis-plus-join-solon-plugin/src/main/java/com/github/yulichang/mybatisplusjoin/solon/plugin/XPluginImpl.java diff --git a/mybatis-plus-join-solon-plugin/src/main/java/com/github/yulichang/mybatisplusjoin/solon/plugin/base/MPJBaseService.java b/plugin/mybatis-plus-join-solon-plugin/src/main/java/com/github/yulichang/mybatisplusjoin/solon/plugin/base/MPJBaseService.java similarity index 100% rename from mybatis-plus-join-solon-plugin/src/main/java/com/github/yulichang/mybatisplusjoin/solon/plugin/base/MPJBaseService.java rename to plugin/mybatis-plus-join-solon-plugin/src/main/java/com/github/yulichang/mybatisplusjoin/solon/plugin/base/MPJBaseService.java diff --git a/mybatis-plus-join-solon-plugin/src/main/java/com/github/yulichang/mybatisplusjoin/solon/plugin/base/MPJBaseServiceImpl.java b/plugin/mybatis-plus-join-solon-plugin/src/main/java/com/github/yulichang/mybatisplusjoin/solon/plugin/base/MPJBaseServiceImpl.java similarity index 100% rename from mybatis-plus-join-solon-plugin/src/main/java/com/github/yulichang/mybatisplusjoin/solon/plugin/base/MPJBaseServiceImpl.java rename to plugin/mybatis-plus-join-solon-plugin/src/main/java/com/github/yulichang/mybatisplusjoin/solon/plugin/base/MPJBaseServiceImpl.java diff --git a/mybatis-plus-join-solon-plugin/src/main/java/com/github/yulichang/mybatisplusjoin/solon/plugin/base/MPJDeepService.java b/plugin/mybatis-plus-join-solon-plugin/src/main/java/com/github/yulichang/mybatisplusjoin/solon/plugin/base/MPJDeepService.java similarity index 100% rename from mybatis-plus-join-solon-plugin/src/main/java/com/github/yulichang/mybatisplusjoin/solon/plugin/base/MPJDeepService.java rename to plugin/mybatis-plus-join-solon-plugin/src/main/java/com/github/yulichang/mybatisplusjoin/solon/plugin/base/MPJDeepService.java diff --git a/mybatis-plus-join-solon-plugin/src/main/java/com/github/yulichang/mybatisplusjoin/solon/plugin/base/MPJRelationService.java b/plugin/mybatis-plus-join-solon-plugin/src/main/java/com/github/yulichang/mybatisplusjoin/solon/plugin/base/MPJRelationService.java similarity index 100% rename from mybatis-plus-join-solon-plugin/src/main/java/com/github/yulichang/mybatisplusjoin/solon/plugin/base/MPJRelationService.java rename to plugin/mybatis-plus-join-solon-plugin/src/main/java/com/github/yulichang/mybatisplusjoin/solon/plugin/base/MPJRelationService.java diff --git a/mybatis-plus-join-solon-plugin/src/main/resources/META-INF/solon/mybatis-plus-join-solon-plugin.properties b/plugin/mybatis-plus-join-solon-plugin/src/main/resources/META-INF/solon/mybatis-plus-join-solon-plugin.properties similarity index 100% rename from mybatis-plus-join-solon-plugin/src/main/resources/META-INF/solon/mybatis-plus-join-solon-plugin.properties rename to plugin/mybatis-plus-join-solon-plugin/src/main/resources/META-INF/solon/mybatis-plus-join-solon-plugin.properties diff --git a/pom.xml b/pom.xml index adc4c33..08c7118 100644 --- a/pom.xml +++ b/pom.xml @@ -35,8 +35,10 @@ mybatis-plus-join-core mybatis-plus-join-annotation mybatis-plus-join-extension - mybatis-plus-join-solon-plugin - mybatis-plus-join-processor + + plugin/mybatis-plus-join-solon-plugin + plugin/mybatis-plus-join-processor + mybatis-plus-join-test