diff --git a/dataease-commons/dataease-common-db/pom.xml b/dataease-commons/dataease-common-db/pom.xml index 3f26f06f36..fbf741a33e 100644 --- a/dataease-commons/dataease-common-db/pom.xml +++ b/dataease-commons/dataease-common-db/pom.xml @@ -60,5 +60,32 @@ + + + + org.mybatis.generator + mybatis-generator-maven-plugin + 1.3.7 + + true + true + + + + mysql + mysql-connector-java + 8.0.16 + + + com.itfsw + mybatis-generator-plugin + 1.3.8 + + + + + + + diff --git a/dataease-commons/dataease-common-db/src/main/java/io/dataease/common/db/CodeGenerator.java b/dataease-commons/dataease-common-db/src/main/java/io/dataease/commons/db/CodeGenerator.java similarity index 99% rename from dataease-commons/dataease-common-db/src/main/java/io/dataease/common/db/CodeGenerator.java rename to dataease-commons/dataease-common-db/src/main/java/io/dataease/commons/db/CodeGenerator.java index 6f3ea699fc..2d35991e68 100644 --- a/dataease-commons/dataease-common-db/src/main/java/io/dataease/common/db/CodeGenerator.java +++ b/dataease-commons/dataease-common-db/src/main/java/io/dataease/commons/db/CodeGenerator.java @@ -1,4 +1,4 @@ -package io.dataease.common.db; +package io.dataease.commons.db; import com.baomidou.mybatisplus.generator.AutoGenerator; diff --git a/dataease-commons/dataease-common-db/src/main/java/io/dataease/common/db/GeneratorApi.java b/dataease-commons/dataease-common-db/src/main/java/io/dataease/commons/db/GeneratorApi.java similarity index 95% rename from dataease-commons/dataease-common-db/src/main/java/io/dataease/common/db/GeneratorApi.java rename to dataease-commons/dataease-common-db/src/main/java/io/dataease/commons/db/GeneratorApi.java index 138854a827..a7fea9a262 100644 --- a/dataease-commons/dataease-common-db/src/main/java/io/dataease/common/db/GeneratorApi.java +++ b/dataease-commons/dataease-common-db/src/main/java/io/dataease/commons/db/GeneratorApi.java @@ -1,4 +1,4 @@ -package io.dataease.common.db; +package io.dataease.commons.db; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; diff --git a/dataease-commons/dataease-common-db/src/main/java/io/dataease/common/db/MybatisPlusConfig.java b/dataease-commons/dataease-common-db/src/main/java/io/dataease/commons/db/MybatisPlusConfig.java similarity index 97% rename from dataease-commons/dataease-common-db/src/main/java/io/dataease/common/db/MybatisPlusConfig.java rename to dataease-commons/dataease-common-db/src/main/java/io/dataease/commons/db/MybatisPlusConfig.java index c5ae10393f..1c0d5c6367 100644 --- a/dataease-commons/dataease-common-db/src/main/java/io/dataease/common/db/MybatisPlusConfig.java +++ b/dataease-commons/dataease-common-db/src/main/java/io/dataease/commons/db/MybatisPlusConfig.java @@ -1,4 +1,4 @@ -package io.dataease.common.db; +package io.dataease.commons.db; import com.baomidou.mybatisplus.annotation.DbType; import com.baomidou.mybatisplus.autoconfigure.ConfigurationCustomizer; diff --git a/dataease-commons/dataease-common-db/src/main/java/io/dataease/common/db/PageUtils.java b/dataease-commons/dataease-common-db/src/main/java/io/dataease/commons/db/PageUtils.java similarity index 94% rename from dataease-commons/dataease-common-db/src/main/java/io/dataease/common/db/PageUtils.java rename to dataease-commons/dataease-common-db/src/main/java/io/dataease/commons/db/PageUtils.java index e11f5566c4..a6c15dae3f 100644 --- a/dataease-commons/dataease-common-db/src/main/java/io/dataease/common/db/PageUtils.java +++ b/dataease-commons/dataease-common-db/src/main/java/io/dataease/commons/db/PageUtils.java @@ -1,4 +1,4 @@ -package io.dataease.common.db; +package io.dataease.commons.db; import com.github.pagehelper.Page; diff --git a/dataease-commons/dataease-common-db/src/main/java/io/dataease/common/db/Pager.java b/dataease-commons/dataease-common-db/src/main/java/io/dataease/commons/db/Pager.java similarity index 88% rename from dataease-commons/dataease-common-db/src/main/java/io/dataease/common/db/Pager.java rename to dataease-commons/dataease-common-db/src/main/java/io/dataease/commons/db/Pager.java index 38fe3f5226..ea006fc1c2 100644 --- a/dataease-commons/dataease-common-db/src/main/java/io/dataease/common/db/Pager.java +++ b/dataease-commons/dataease-common-db/src/main/java/io/dataease/commons/db/Pager.java @@ -1,4 +1,4 @@ -package io.dataease.common.db; +package io.dataease.commons.db; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/dataease-commons/dataease-common-db/src/main/resources/generatorConfig.xml b/dataease-commons/dataease-common-db/src/main/resources/generatorConfig.xml new file mode 100644 index 0000000000..3b21735a74 --- /dev/null +++ b/dataease-commons/dataease-common-db/src/main/resources/generatorConfig.xml @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +