diff --git a/cloud-common-plugin-dynamic/pom.xml b/cloud-common-plugin-dynamic/pom.xml new file mode 100644 index 0000000..6119490 --- /dev/null +++ b/cloud-common-plugin-dynamic/pom.xml @@ -0,0 +1,41 @@ + + + + cm-cloud + com.cm + 1.0.1-SNAPSHOT + + 4.0.0 + + cloud-common-plugin-dynamic + 动态公共插件,包含动态表单,数据库等 + 1.0.1-SNAPSHOT + + + + com.cm + cloud-common + 1.0.1-SNAPSHOT + + + org.springframework.security.oauth.boot + spring-security-oauth2-autoconfigure + + + + + + com.cm + cloud-common-plugin-dictionary + 1.0.1-SNAPSHOT + + + + org.springframework.security.oauth.boot + spring-security-oauth2-autoconfigure + ${spring-boot.oauth.autoconfigure.version} + + + \ No newline at end of file diff --git a/cloud-common-plugin/src/main/java/com/cm/common/plugin/controller/apis/database/DatabaseController.java b/cloud-common-plugin-dynamic/src/main/java/com/cm/common/plugin/controller/apis/database/DatabaseController.java similarity index 100% rename from cloud-common-plugin/src/main/java/com/cm/common/plugin/controller/apis/database/DatabaseController.java rename to cloud-common-plugin-dynamic/src/main/java/com/cm/common/plugin/controller/apis/database/DatabaseController.java diff --git a/cloud-common-plugin/src/main/java/com/cm/common/plugin/controller/apis/database/table/TableController.java b/cloud-common-plugin-dynamic/src/main/java/com/cm/common/plugin/controller/apis/database/table/TableController.java similarity index 100% rename from cloud-common-plugin/src/main/java/com/cm/common/plugin/controller/apis/database/table/TableController.java rename to cloud-common-plugin-dynamic/src/main/java/com/cm/common/plugin/controller/apis/database/table/TableController.java diff --git a/cloud-common-plugin/src/main/java/com/cm/common/plugin/controller/apis/dynamic/DynamicDataController.java b/cloud-common-plugin-dynamic/src/main/java/com/cm/common/plugin/controller/apis/dynamic/DynamicDataController.java similarity index 96% rename from cloud-common-plugin/src/main/java/com/cm/common/plugin/controller/apis/dynamic/DynamicDataController.java rename to cloud-common-plugin-dynamic/src/main/java/com/cm/common/plugin/controller/apis/dynamic/DynamicDataController.java index 6ab69f6..c5a9737 100644 --- a/cloud-common-plugin/src/main/java/com/cm/common/plugin/controller/apis/dynamic/DynamicDataController.java +++ b/cloud-common-plugin-dynamic/src/main/java/com/cm/common/plugin/controller/apis/dynamic/DynamicDataController.java @@ -2,10 +2,7 @@ package com.cm.common.plugin.controller.apis.dynamic; import com.cm.common.base.AbstractController; import com.cm.common.constants.ISystemConstant; -import com.cm.common.plugin.pojo.dtos.dynamic.DynamicFormFormShowFieldDTO; -import com.cm.common.plugin.pojo.dtos.dynamic.DynamicFormListShowFieldDTO; import com.cm.common.plugin.service.dynamic.IDynamicDataService; -import com.cm.common.plugin.service.dynamic.IDynamicFormService; import com.cm.common.pojo.ListPage; import com.cm.common.result.ErrorResult; import com.cm.common.result.SuccessResult; diff --git a/cloud-common-plugin/src/main/java/com/cm/common/plugin/controller/apis/dynamic/DynamicFormController.java b/cloud-common-plugin-dynamic/src/main/java/com/cm/common/plugin/controller/apis/dynamic/DynamicFormController.java similarity index 100% rename from cloud-common-plugin/src/main/java/com/cm/common/plugin/controller/apis/dynamic/DynamicFormController.java rename to cloud-common-plugin-dynamic/src/main/java/com/cm/common/plugin/controller/apis/dynamic/DynamicFormController.java diff --git a/cloud-common-plugin/src/main/java/com/cm/common/plugin/controller/apis/dynamic/config/DynamicConfigTableController.java b/cloud-common-plugin-dynamic/src/main/java/com/cm/common/plugin/controller/apis/dynamic/config/DynamicConfigTableController.java similarity index 100% rename from cloud-common-plugin/src/main/java/com/cm/common/plugin/controller/apis/dynamic/config/DynamicConfigTableController.java rename to cloud-common-plugin-dynamic/src/main/java/com/cm/common/plugin/controller/apis/dynamic/config/DynamicConfigTableController.java diff --git a/cloud-common-plugin/src/main/java/com/cm/common/plugin/controller/apis/dynamic/config/form/DynamicConfigFormController.java b/cloud-common-plugin-dynamic/src/main/java/com/cm/common/plugin/controller/apis/dynamic/config/form/DynamicConfigFormController.java similarity index 100% rename from cloud-common-plugin/src/main/java/com/cm/common/plugin/controller/apis/dynamic/config/form/DynamicConfigFormController.java rename to cloud-common-plugin-dynamic/src/main/java/com/cm/common/plugin/controller/apis/dynamic/config/form/DynamicConfigFormController.java diff --git a/cloud-common-plugin/src/main/java/com/cm/common/plugin/controller/routes/dynamic/DynamicFormRouteController.java b/cloud-common-plugin-dynamic/src/main/java/com/cm/common/plugin/controller/routes/dynamic/DynamicFormRouteController.java similarity index 97% rename from cloud-common-plugin/src/main/java/com/cm/common/plugin/controller/routes/dynamic/DynamicFormRouteController.java rename to cloud-common-plugin-dynamic/src/main/java/com/cm/common/plugin/controller/routes/dynamic/DynamicFormRouteController.java index 2960e54..3abca9d 100644 --- a/cloud-common-plugin/src/main/java/com/cm/common/plugin/controller/routes/dynamic/DynamicFormRouteController.java +++ b/cloud-common-plugin-dynamic/src/main/java/com/cm/common/plugin/controller/routes/dynamic/DynamicFormRouteController.java @@ -6,7 +6,10 @@ import com.cm.common.plugin.enums.dynamic.FieldTypeEnum; import com.cm.common.plugin.pojo.dtos.dynamic.DynamicFormFormShowFieldDTO; import com.cm.common.plugin.service.datadictionary.IDataDictionaryService; import com.cm.common.plugin.service.dynamic.IDynamicFormService; -import io.swagger.annotations.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; diff --git a/cloud-common-plugin/src/main/java/com/cm/common/plugin/controller/routes/dynamic/config/DynamicConfigTableRouteController.java b/cloud-common-plugin-dynamic/src/main/java/com/cm/common/plugin/controller/routes/dynamic/config/DynamicConfigTableRouteController.java similarity index 97% rename from cloud-common-plugin/src/main/java/com/cm/common/plugin/controller/routes/dynamic/config/DynamicConfigTableRouteController.java rename to cloud-common-plugin-dynamic/src/main/java/com/cm/common/plugin/controller/routes/dynamic/config/DynamicConfigTableRouteController.java index 524eedf..a1d351f 100644 --- a/cloud-common-plugin/src/main/java/com/cm/common/plugin/controller/routes/dynamic/config/DynamicConfigTableRouteController.java +++ b/cloud-common-plugin-dynamic/src/main/java/com/cm/common/plugin/controller/routes/dynamic/config/DynamicConfigTableRouteController.java @@ -1,7 +1,6 @@ package com.cm.common.plugin.controller.routes.dynamic.config; import com.cm.common.constants.ISystemConstant; -import com.sun.org.apache.bcel.internal.generic.RETURN; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; diff --git a/cloud-common-plugin/src/main/java/com/cm/common/plugin/controller/routes/dynamic/config/form/DynamicConfigFormRouteController.java b/cloud-common-plugin-dynamic/src/main/java/com/cm/common/plugin/controller/routes/dynamic/config/form/DynamicConfigFormRouteController.java similarity index 100% rename from cloud-common-plugin/src/main/java/com/cm/common/plugin/controller/routes/dynamic/config/form/DynamicConfigFormRouteController.java rename to cloud-common-plugin-dynamic/src/main/java/com/cm/common/plugin/controller/routes/dynamic/config/form/DynamicConfigFormRouteController.java diff --git a/cloud-common-plugin/src/main/java/com/cm/common/plugin/dao/database/table/ITableDao.java b/cloud-common-plugin-dynamic/src/main/java/com/cm/common/plugin/dao/database/table/ITableDao.java similarity index 100% rename from cloud-common-plugin/src/main/java/com/cm/common/plugin/dao/database/table/ITableDao.java rename to cloud-common-plugin-dynamic/src/main/java/com/cm/common/plugin/dao/database/table/ITableDao.java diff --git a/cloud-common-plugin/src/main/java/com/cm/common/plugin/dao/database/table/impl/TableDaoImpl.java b/cloud-common-plugin-dynamic/src/main/java/com/cm/common/plugin/dao/database/table/impl/TableDaoImpl.java similarity index 100% rename from cloud-common-plugin/src/main/java/com/cm/common/plugin/dao/database/table/impl/TableDaoImpl.java rename to cloud-common-plugin-dynamic/src/main/java/com/cm/common/plugin/dao/database/table/impl/TableDaoImpl.java diff --git a/cloud-common-plugin/src/main/java/com/cm/common/plugin/dao/dynamic/IDynamicDataDao.java b/cloud-common-plugin-dynamic/src/main/java/com/cm/common/plugin/dao/dynamic/IDynamicDataDao.java similarity index 95% rename from cloud-common-plugin/src/main/java/com/cm/common/plugin/dao/dynamic/IDynamicDataDao.java rename to cloud-common-plugin-dynamic/src/main/java/com/cm/common/plugin/dao/dynamic/IDynamicDataDao.java index 9380e5b..a95e2e0 100644 --- a/cloud-common-plugin/src/main/java/com/cm/common/plugin/dao/dynamic/IDynamicDataDao.java +++ b/cloud-common-plugin-dynamic/src/main/java/com/cm/common/plugin/dao/dynamic/IDynamicDataDao.java @@ -4,8 +4,6 @@ import com.cm.common.exception.RemoveException; import com.cm.common.exception.SaveException; import com.cm.common.exception.SearchException; import com.cm.common.exception.UpdateException; -import com.cm.common.result.SuccessResult; -import net.sf.jsqlparser.statement.update.Update; import org.springframework.stereotype.Repository; import java.util.List; diff --git a/cloud-common-plugin/src/main/java/com/cm/common/plugin/dao/dynamic/IDynamicFormDao.java b/cloud-common-plugin-dynamic/src/main/java/com/cm/common/plugin/dao/dynamic/IDynamicFormDao.java similarity index 100% rename from cloud-common-plugin/src/main/java/com/cm/common/plugin/dao/dynamic/IDynamicFormDao.java rename to cloud-common-plugin-dynamic/src/main/java/com/cm/common/plugin/dao/dynamic/IDynamicFormDao.java diff --git a/cloud-common-plugin/src/main/java/com/cm/common/plugin/dao/dynamic/IDynamicTableDao.java b/cloud-common-plugin-dynamic/src/main/java/com/cm/common/plugin/dao/dynamic/IDynamicTableDao.java similarity index 98% rename from cloud-common-plugin/src/main/java/com/cm/common/plugin/dao/dynamic/IDynamicTableDao.java rename to cloud-common-plugin-dynamic/src/main/java/com/cm/common/plugin/dao/dynamic/IDynamicTableDao.java index c24b8e9..428a589 100644 --- a/cloud-common-plugin/src/main/java/com/cm/common/plugin/dao/dynamic/IDynamicTableDao.java +++ b/cloud-common-plugin-dynamic/src/main/java/com/cm/common/plugin/dao/dynamic/IDynamicTableDao.java @@ -8,7 +8,6 @@ import com.cm.common.plugin.pojo.dtos.database.table.TableDTO; import org.springframework.stereotype.Repository; import java.util.List; -import java.util.Map; /** * When you feel like quitting. Think about why you started diff --git a/cloud-common-plugin/src/main/java/com/cm/common/plugin/dao/dynamic/config/IDynamicConfigTableDao.java b/cloud-common-plugin-dynamic/src/main/java/com/cm/common/plugin/dao/dynamic/config/IDynamicConfigTableDao.java similarity index 100% rename from cloud-common-plugin/src/main/java/com/cm/common/plugin/dao/dynamic/config/IDynamicConfigTableDao.java rename to cloud-common-plugin-dynamic/src/main/java/com/cm/common/plugin/dao/dynamic/config/IDynamicConfigTableDao.java diff --git a/cloud-common-plugin/src/main/java/com/cm/common/plugin/dao/dynamic/config/form/IDynamicConfigFormDao.java b/cloud-common-plugin-dynamic/src/main/java/com/cm/common/plugin/dao/dynamic/config/form/IDynamicConfigFormDao.java similarity index 100% rename from cloud-common-plugin/src/main/java/com/cm/common/plugin/dao/dynamic/config/form/IDynamicConfigFormDao.java rename to cloud-common-plugin-dynamic/src/main/java/com/cm/common/plugin/dao/dynamic/config/form/IDynamicConfigFormDao.java diff --git a/cloud-common-plugin/src/main/java/com/cm/common/plugin/enums/database/table/ColumnDataTypeEnum.java b/cloud-common-plugin-dynamic/src/main/java/com/cm/common/plugin/enums/database/table/ColumnDataTypeEnum.java similarity index 100% rename from cloud-common-plugin/src/main/java/com/cm/common/plugin/enums/database/table/ColumnDataTypeEnum.java rename to cloud-common-plugin-dynamic/src/main/java/com/cm/common/plugin/enums/database/table/ColumnDataTypeEnum.java diff --git a/cloud-common-plugin/src/main/java/com/cm/common/plugin/enums/database/table/ColumnIsNullableEnum.java b/cloud-common-plugin-dynamic/src/main/java/com/cm/common/plugin/enums/database/table/ColumnIsNullableEnum.java similarity index 100% rename from cloud-common-plugin/src/main/java/com/cm/common/plugin/enums/database/table/ColumnIsNullableEnum.java rename to cloud-common-plugin-dynamic/src/main/java/com/cm/common/plugin/enums/database/table/ColumnIsNullableEnum.java diff --git a/cloud-common-plugin/src/main/java/com/cm/common/plugin/enums/dynamic/FieldRequireTypeEnum.java b/cloud-common-plugin-dynamic/src/main/java/com/cm/common/plugin/enums/dynamic/FieldRequireTypeEnum.java similarity index 100% rename from cloud-common-plugin/src/main/java/com/cm/common/plugin/enums/dynamic/FieldRequireTypeEnum.java rename to cloud-common-plugin-dynamic/src/main/java/com/cm/common/plugin/enums/dynamic/FieldRequireTypeEnum.java diff --git a/cloud-common-plugin/src/main/java/com/cm/common/plugin/enums/dynamic/FieldTypeEnum.java b/cloud-common-plugin-dynamic/src/main/java/com/cm/common/plugin/enums/dynamic/FieldTypeEnum.java similarity index 100% rename from cloud-common-plugin/src/main/java/com/cm/common/plugin/enums/dynamic/FieldTypeEnum.java rename to cloud-common-plugin-dynamic/src/main/java/com/cm/common/plugin/enums/dynamic/FieldTypeEnum.java diff --git a/cloud-common-plugin/src/main/java/com/cm/common/plugin/pojo/dtos/database/table/TableColumnDTO.java b/cloud-common-plugin-dynamic/src/main/java/com/cm/common/plugin/pojo/dtos/database/table/TableColumnDTO.java similarity index 100% rename from cloud-common-plugin/src/main/java/com/cm/common/plugin/pojo/dtos/database/table/TableColumnDTO.java rename to cloud-common-plugin-dynamic/src/main/java/com/cm/common/plugin/pojo/dtos/database/table/TableColumnDTO.java diff --git a/cloud-common-plugin/src/main/java/com/cm/common/plugin/pojo/dtos/database/table/TableDTO.java b/cloud-common-plugin-dynamic/src/main/java/com/cm/common/plugin/pojo/dtos/database/table/TableDTO.java similarity index 100% rename from cloud-common-plugin/src/main/java/com/cm/common/plugin/pojo/dtos/database/table/TableDTO.java rename to cloud-common-plugin-dynamic/src/main/java/com/cm/common/plugin/pojo/dtos/database/table/TableDTO.java diff --git a/cloud-common-plugin/src/main/java/com/cm/common/plugin/pojo/dtos/dynamic/DynamicFormDTO.java b/cloud-common-plugin-dynamic/src/main/java/com/cm/common/plugin/pojo/dtos/dynamic/DynamicFormDTO.java similarity index 100% rename from cloud-common-plugin/src/main/java/com/cm/common/plugin/pojo/dtos/dynamic/DynamicFormDTO.java rename to cloud-common-plugin-dynamic/src/main/java/com/cm/common/plugin/pojo/dtos/dynamic/DynamicFormDTO.java diff --git a/cloud-common-plugin/src/main/java/com/cm/common/plugin/pojo/dtos/dynamic/DynamicFormFormShowFieldDTO.java b/cloud-common-plugin-dynamic/src/main/java/com/cm/common/plugin/pojo/dtos/dynamic/DynamicFormFormShowFieldDTO.java similarity index 100% rename from cloud-common-plugin/src/main/java/com/cm/common/plugin/pojo/dtos/dynamic/DynamicFormFormShowFieldDTO.java rename to cloud-common-plugin-dynamic/src/main/java/com/cm/common/plugin/pojo/dtos/dynamic/DynamicFormFormShowFieldDTO.java diff --git a/cloud-common-plugin/src/main/java/com/cm/common/plugin/pojo/dtos/dynamic/DynamicFormListShowFieldDTO.java b/cloud-common-plugin-dynamic/src/main/java/com/cm/common/plugin/pojo/dtos/dynamic/DynamicFormListShowFieldDTO.java similarity index 97% rename from cloud-common-plugin/src/main/java/com/cm/common/plugin/pojo/dtos/dynamic/DynamicFormListShowFieldDTO.java rename to cloud-common-plugin-dynamic/src/main/java/com/cm/common/plugin/pojo/dtos/dynamic/DynamicFormListShowFieldDTO.java index 0aa8e22..7c9df17 100644 --- a/cloud-common-plugin/src/main/java/com/cm/common/plugin/pojo/dtos/dynamic/DynamicFormListShowFieldDTO.java +++ b/cloud-common-plugin-dynamic/src/main/java/com/cm/common/plugin/pojo/dtos/dynamic/DynamicFormListShowFieldDTO.java @@ -1,6 +1,5 @@ package com.cm.common.plugin.pojo.dtos.dynamic; -import com.cm.common.annotation.CheckEmptyAnnotation; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/cloud-common-plugin/src/main/java/com/cm/common/plugin/pojo/dtos/dynamic/config/DynamicConfigTableDTO.java b/cloud-common-plugin-dynamic/src/main/java/com/cm/common/plugin/pojo/dtos/dynamic/config/DynamicConfigTableDTO.java similarity index 100% rename from cloud-common-plugin/src/main/java/com/cm/common/plugin/pojo/dtos/dynamic/config/DynamicConfigTableDTO.java rename to cloud-common-plugin-dynamic/src/main/java/com/cm/common/plugin/pojo/dtos/dynamic/config/DynamicConfigTableDTO.java diff --git a/cloud-common-plugin/src/main/java/com/cm/common/plugin/pojo/dtos/dynamic/config/form/DynamicConfigFormDTO.java b/cloud-common-plugin-dynamic/src/main/java/com/cm/common/plugin/pojo/dtos/dynamic/config/form/DynamicConfigFormDTO.java similarity index 98% rename from cloud-common-plugin/src/main/java/com/cm/common/plugin/pojo/dtos/dynamic/config/form/DynamicConfigFormDTO.java rename to cloud-common-plugin-dynamic/src/main/java/com/cm/common/plugin/pojo/dtos/dynamic/config/form/DynamicConfigFormDTO.java index 94f6c15..6a772cd 100644 --- a/cloud-common-plugin/src/main/java/com/cm/common/plugin/pojo/dtos/dynamic/config/form/DynamicConfigFormDTO.java +++ b/cloud-common-plugin-dynamic/src/main/java/com/cm/common/plugin/pojo/dtos/dynamic/config/form/DynamicConfigFormDTO.java @@ -1,7 +1,5 @@ package com.cm.common.plugin.pojo.dtos.dynamic.config.form; -import com.cm.common.annotation.CheckEmptyAnnotation; -import com.cm.common.annotation.CheckNumberAnnotation; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/cloud-common-plugin/src/main/java/com/cm/common/plugin/pojo/vos/database/DatabaseVO.java b/cloud-common-plugin-dynamic/src/main/java/com/cm/common/plugin/pojo/vos/database/DatabaseVO.java similarity index 100% rename from cloud-common-plugin/src/main/java/com/cm/common/plugin/pojo/vos/database/DatabaseVO.java rename to cloud-common-plugin-dynamic/src/main/java/com/cm/common/plugin/pojo/vos/database/DatabaseVO.java diff --git a/cloud-common-plugin/src/main/java/com/cm/common/plugin/pojo/vos/database/table/TableColumnVO.java b/cloud-common-plugin-dynamic/src/main/java/com/cm/common/plugin/pojo/vos/database/table/TableColumnVO.java similarity index 93% rename from cloud-common-plugin/src/main/java/com/cm/common/plugin/pojo/vos/database/table/TableColumnVO.java rename to cloud-common-plugin-dynamic/src/main/java/com/cm/common/plugin/pojo/vos/database/table/TableColumnVO.java index b08114e..ffc9614 100644 --- a/cloud-common-plugin/src/main/java/com/cm/common/plugin/pojo/vos/database/table/TableColumnVO.java +++ b/cloud-common-plugin-dynamic/src/main/java/com/cm/common/plugin/pojo/vos/database/table/TableColumnVO.java @@ -1,11 +1,7 @@ package com.cm.common.plugin.pojo.vos.database.table; -import com.cm.common.annotation.CheckBooleanAnnotation; import com.cm.common.annotation.CheckEmptyAnnotation; -import com.cm.common.annotation.CheckNullAnnotation; import com.cm.common.annotation.CheckNumberAnnotation; -import com.cm.common.plugin.enums.database.table.ColumnDataTypeEnum; -import com.cm.common.plugin.enums.database.table.ColumnIsNullableEnum; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/cloud-common-plugin/src/main/java/com/cm/common/plugin/pojo/vos/database/table/TableOldColumnVO.java b/cloud-common-plugin-dynamic/src/main/java/com/cm/common/plugin/pojo/vos/database/table/TableOldColumnVO.java similarity index 100% rename from cloud-common-plugin/src/main/java/com/cm/common/plugin/pojo/vos/database/table/TableOldColumnVO.java rename to cloud-common-plugin-dynamic/src/main/java/com/cm/common/plugin/pojo/vos/database/table/TableOldColumnVO.java diff --git a/cloud-common-plugin/src/main/java/com/cm/common/plugin/pojo/vos/database/table/TableVO.java b/cloud-common-plugin-dynamic/src/main/java/com/cm/common/plugin/pojo/vos/database/table/TableVO.java similarity index 92% rename from cloud-common-plugin/src/main/java/com/cm/common/plugin/pojo/vos/database/table/TableVO.java rename to cloud-common-plugin-dynamic/src/main/java/com/cm/common/plugin/pojo/vos/database/table/TableVO.java index 9e19270..3a5acb4 100644 --- a/cloud-common-plugin/src/main/java/com/cm/common/plugin/pojo/vos/database/table/TableVO.java +++ b/cloud-common-plugin-dynamic/src/main/java/com/cm/common/plugin/pojo/vos/database/table/TableVO.java @@ -1,9 +1,7 @@ package com.cm.common.plugin.pojo.vos.database.table; -import com.cm.common.annotation.CheckBooleanAnnotation; import com.cm.common.annotation.CheckListAnnotation; import com.cm.common.annotation.CheckNullAnnotation; -import com.cm.common.annotation.CheckNumberAnnotation; import java.util.List; diff --git a/cloud-common-plugin/src/main/java/com/cm/common/plugin/pojo/vos/dynamic/DynamicFormFieldVO.java b/cloud-common-plugin-dynamic/src/main/java/com/cm/common/plugin/pojo/vos/dynamic/DynamicFormFieldVO.java similarity index 100% rename from cloud-common-plugin/src/main/java/com/cm/common/plugin/pojo/vos/dynamic/DynamicFormFieldVO.java rename to cloud-common-plugin-dynamic/src/main/java/com/cm/common/plugin/pojo/vos/dynamic/DynamicFormFieldVO.java diff --git a/cloud-common-plugin/src/main/java/com/cm/common/plugin/pojo/vos/dynamic/DynamicFormVO.java b/cloud-common-plugin-dynamic/src/main/java/com/cm/common/plugin/pojo/vos/dynamic/DynamicFormVO.java similarity index 100% rename from cloud-common-plugin/src/main/java/com/cm/common/plugin/pojo/vos/dynamic/DynamicFormVO.java rename to cloud-common-plugin-dynamic/src/main/java/com/cm/common/plugin/pojo/vos/dynamic/DynamicFormVO.java diff --git a/cloud-common-plugin/src/main/java/com/cm/common/plugin/pojo/vos/dynamic/config/DynamicConfigTableVO.java b/cloud-common-plugin-dynamic/src/main/java/com/cm/common/plugin/pojo/vos/dynamic/config/DynamicConfigTableVO.java similarity index 100% rename from cloud-common-plugin/src/main/java/com/cm/common/plugin/pojo/vos/dynamic/config/DynamicConfigTableVO.java rename to cloud-common-plugin-dynamic/src/main/java/com/cm/common/plugin/pojo/vos/dynamic/config/DynamicConfigTableVO.java diff --git a/cloud-common-plugin/src/main/java/com/cm/common/plugin/pojo/vos/dynamic/config/form/DynamicConfigFormVO.java b/cloud-common-plugin-dynamic/src/main/java/com/cm/common/plugin/pojo/vos/dynamic/config/form/DynamicConfigFormVO.java similarity index 100% rename from cloud-common-plugin/src/main/java/com/cm/common/plugin/pojo/vos/dynamic/config/form/DynamicConfigFormVO.java rename to cloud-common-plugin-dynamic/src/main/java/com/cm/common/plugin/pojo/vos/dynamic/config/form/DynamicConfigFormVO.java diff --git a/cloud-common-plugin/src/main/java/com/cm/common/plugin/pojo/vos/dynamic/config/form/FieldShowVO.java b/cloud-common-plugin-dynamic/src/main/java/com/cm/common/plugin/pojo/vos/dynamic/config/form/FieldShowVO.java similarity index 100% rename from cloud-common-plugin/src/main/java/com/cm/common/plugin/pojo/vos/dynamic/config/form/FieldShowVO.java rename to cloud-common-plugin-dynamic/src/main/java/com/cm/common/plugin/pojo/vos/dynamic/config/form/FieldShowVO.java diff --git a/cloud-common-plugin/src/main/java/com/cm/common/plugin/service/database/IDatabaseService.java b/cloud-common-plugin-dynamic/src/main/java/com/cm/common/plugin/service/database/IDatabaseService.java similarity index 96% rename from cloud-common-plugin/src/main/java/com/cm/common/plugin/service/database/IDatabaseService.java rename to cloud-common-plugin-dynamic/src/main/java/com/cm/common/plugin/service/database/IDatabaseService.java index 0311f1a..5c83d91 100644 --- a/cloud-common-plugin/src/main/java/com/cm/common/plugin/service/database/IDatabaseService.java +++ b/cloud-common-plugin-dynamic/src/main/java/com/cm/common/plugin/service/database/IDatabaseService.java @@ -3,7 +3,6 @@ package com.cm.common.plugin.service.database; import com.cm.common.exception.RemoveException; import com.cm.common.exception.SaveException; import com.cm.common.exception.SearchException; -import com.cm.common.plugin.pojo.vos.database.DatabaseVO; import com.cm.common.result.SuccessResult; import java.util.Map; diff --git a/cloud-common-plugin/src/main/java/com/cm/common/plugin/service/database/impl/DatabaseServiceImpl.java b/cloud-common-plugin-dynamic/src/main/java/com/cm/common/plugin/service/database/impl/DatabaseServiceImpl.java similarity index 95% rename from cloud-common-plugin/src/main/java/com/cm/common/plugin/service/database/impl/DatabaseServiceImpl.java rename to cloud-common-plugin-dynamic/src/main/java/com/cm/common/plugin/service/database/impl/DatabaseServiceImpl.java index ec19b23..7bc48ee 100644 --- a/cloud-common-plugin/src/main/java/com/cm/common/plugin/service/database/impl/DatabaseServiceImpl.java +++ b/cloud-common-plugin-dynamic/src/main/java/com/cm/common/plugin/service/database/impl/DatabaseServiceImpl.java @@ -4,20 +4,15 @@ import com.cm.common.base.AbstractService; import com.cm.common.exception.RemoveException; import com.cm.common.exception.SaveException; import com.cm.common.exception.SearchException; -import com.cm.common.plugin.pojo.vos.database.DatabaseVO; import com.cm.common.plugin.service.database.IDatabaseService; import com.cm.common.result.SuccessResult; -import com.cm.common.result.SuccessResultData; -import com.cm.common.utils.jdbc.JdbcUtil; import org.apache.commons.lang3.StringUtils; import org.springframework.jdbc.datasource.DriverManagerDataSource; import org.springframework.stereotype.Service; import javax.servlet.http.HttpSession; import java.sql.Connection; -import java.sql.PreparedStatement; import java.sql.SQLException; -import java.util.List; import java.util.Map; /** diff --git a/cloud-common-plugin/src/main/java/com/cm/common/plugin/service/database/table/ITableService.java b/cloud-common-plugin-dynamic/src/main/java/com/cm/common/plugin/service/database/table/ITableService.java similarity index 100% rename from cloud-common-plugin/src/main/java/com/cm/common/plugin/service/database/table/ITableService.java rename to cloud-common-plugin-dynamic/src/main/java/com/cm/common/plugin/service/database/table/ITableService.java diff --git a/cloud-common-plugin/src/main/java/com/cm/common/plugin/service/database/table/impl/TableServiceImpl.java b/cloud-common-plugin-dynamic/src/main/java/com/cm/common/plugin/service/database/table/impl/TableServiceImpl.java similarity index 100% rename from cloud-common-plugin/src/main/java/com/cm/common/plugin/service/database/table/impl/TableServiceImpl.java rename to cloud-common-plugin-dynamic/src/main/java/com/cm/common/plugin/service/database/table/impl/TableServiceImpl.java diff --git a/cloud-common-plugin/src/main/java/com/cm/common/plugin/service/dynamic/IDynamicDataService.java b/cloud-common-plugin-dynamic/src/main/java/com/cm/common/plugin/service/dynamic/IDynamicDataService.java similarity index 97% rename from cloud-common-plugin/src/main/java/com/cm/common/plugin/service/dynamic/IDynamicDataService.java rename to cloud-common-plugin-dynamic/src/main/java/com/cm/common/plugin/service/dynamic/IDynamicDataService.java index a8d0dc0..f8f7b7e 100644 --- a/cloud-common-plugin/src/main/java/com/cm/common/plugin/service/dynamic/IDynamicDataService.java +++ b/cloud-common-plugin-dynamic/src/main/java/com/cm/common/plugin/service/dynamic/IDynamicDataService.java @@ -4,7 +4,6 @@ import com.cm.common.exception.RemoveException; import com.cm.common.exception.SaveException; import com.cm.common.exception.SearchException; import com.cm.common.exception.UpdateException; -import com.cm.common.plugin.pojo.dtos.dynamic.DynamicFormListShowFieldDTO; import com.cm.common.pojo.ListPage; import com.cm.common.result.SuccessResult; import com.cm.common.result.SuccessResultList; diff --git a/cloud-common-plugin/src/main/java/com/cm/common/plugin/service/dynamic/IDynamicFormService.java b/cloud-common-plugin-dynamic/src/main/java/com/cm/common/plugin/service/dynamic/IDynamicFormService.java similarity index 100% rename from cloud-common-plugin/src/main/java/com/cm/common/plugin/service/dynamic/IDynamicFormService.java rename to cloud-common-plugin-dynamic/src/main/java/com/cm/common/plugin/service/dynamic/IDynamicFormService.java diff --git a/cloud-common-plugin/src/main/java/com/cm/common/plugin/service/dynamic/IDynamicTableService.java b/cloud-common-plugin-dynamic/src/main/java/com/cm/common/plugin/service/dynamic/IDynamicTableService.java similarity index 98% rename from cloud-common-plugin/src/main/java/com/cm/common/plugin/service/dynamic/IDynamicTableService.java rename to cloud-common-plugin-dynamic/src/main/java/com/cm/common/plugin/service/dynamic/IDynamicTableService.java index 839e80f..84e8173 100644 --- a/cloud-common-plugin/src/main/java/com/cm/common/plugin/service/dynamic/IDynamicTableService.java +++ b/cloud-common-plugin-dynamic/src/main/java/com/cm/common/plugin/service/dynamic/IDynamicTableService.java @@ -10,7 +10,6 @@ import com.cm.common.plugin.pojo.vos.database.table.TableColumnVO; import com.cm.common.plugin.pojo.vos.database.table.TableVO; import java.util.List; -import java.util.Map; /** * When you feel like quitting. Think about why you started diff --git a/cloud-common-plugin/src/main/java/com/cm/common/plugin/service/dynamic/config/IDynamicConfigTableService.java b/cloud-common-plugin-dynamic/src/main/java/com/cm/common/plugin/service/dynamic/config/IDynamicConfigTableService.java similarity index 98% rename from cloud-common-plugin/src/main/java/com/cm/common/plugin/service/dynamic/config/IDynamicConfigTableService.java rename to cloud-common-plugin-dynamic/src/main/java/com/cm/common/plugin/service/dynamic/config/IDynamicConfigTableService.java index 8cda226..3807dfb 100644 --- a/cloud-common-plugin/src/main/java/com/cm/common/plugin/service/dynamic/config/IDynamicConfigTableService.java +++ b/cloud-common-plugin-dynamic/src/main/java/com/cm/common/plugin/service/dynamic/config/IDynamicConfigTableService.java @@ -1,7 +1,6 @@ package com.cm.common.plugin.service.dynamic.config; import com.cm.common.exception.RemoveException; -import com.cm.common.exception.SaveException; import com.cm.common.exception.SearchException; import com.cm.common.exception.UpdateException; import com.cm.common.plugin.pojo.dtos.dynamic.config.DynamicConfigTableDTO; diff --git a/cloud-common-plugin/src/main/java/com/cm/common/plugin/service/dynamic/config/form/IDynamicConfigFormService.java b/cloud-common-plugin-dynamic/src/main/java/com/cm/common/plugin/service/dynamic/config/form/IDynamicConfigFormService.java similarity index 94% rename from cloud-common-plugin/src/main/java/com/cm/common/plugin/service/dynamic/config/form/IDynamicConfigFormService.java rename to cloud-common-plugin-dynamic/src/main/java/com/cm/common/plugin/service/dynamic/config/form/IDynamicConfigFormService.java index d9c024b..0a55851 100644 --- a/cloud-common-plugin/src/main/java/com/cm/common/plugin/service/dynamic/config/form/IDynamicConfigFormService.java +++ b/cloud-common-plugin-dynamic/src/main/java/com/cm/common/plugin/service/dynamic/config/form/IDynamicConfigFormService.java @@ -3,9 +3,7 @@ package com.cm.common.plugin.service.dynamic.config.form; import com.cm.common.exception.RemoveException; import com.cm.common.exception.SearchException; import com.cm.common.exception.UpdateException; -import com.cm.common.plugin.pojo.dtos.dynamic.config.DynamicConfigTableDTO; import com.cm.common.plugin.pojo.dtos.dynamic.config.form.DynamicConfigFormDTO; -import com.cm.common.plugin.pojo.vos.dynamic.config.DynamicConfigTableVO; import com.cm.common.plugin.pojo.vos.dynamic.config.form.DynamicConfigFormVO; import com.cm.common.plugin.pojo.vos.dynamic.config.form.FieldShowVO; import com.cm.common.pojo.ListPage; diff --git a/cloud-common-plugin/src/main/java/com/cm/common/plugin/service/dynamic/config/form/impl/DynamicConfigFormServiceImpl.java b/cloud-common-plugin-dynamic/src/main/java/com/cm/common/plugin/service/dynamic/config/form/impl/DynamicConfigFormServiceImpl.java similarity index 100% rename from cloud-common-plugin/src/main/java/com/cm/common/plugin/service/dynamic/config/form/impl/DynamicConfigFormServiceImpl.java rename to cloud-common-plugin-dynamic/src/main/java/com/cm/common/plugin/service/dynamic/config/form/impl/DynamicConfigFormServiceImpl.java diff --git a/cloud-common-plugin/src/main/java/com/cm/common/plugin/service/dynamic/config/impl/DynamicConfigTableServiceImpl.java b/cloud-common-plugin-dynamic/src/main/java/com/cm/common/plugin/service/dynamic/config/impl/DynamicConfigTableServiceImpl.java similarity index 100% rename from cloud-common-plugin/src/main/java/com/cm/common/plugin/service/dynamic/config/impl/DynamicConfigTableServiceImpl.java rename to cloud-common-plugin-dynamic/src/main/java/com/cm/common/plugin/service/dynamic/config/impl/DynamicConfigTableServiceImpl.java diff --git a/cloud-common-plugin/src/main/java/com/cm/common/plugin/service/dynamic/impl/DynamicDataServiceImpl.java b/cloud-common-plugin-dynamic/src/main/java/com/cm/common/plugin/service/dynamic/impl/DynamicDataServiceImpl.java similarity index 100% rename from cloud-common-plugin/src/main/java/com/cm/common/plugin/service/dynamic/impl/DynamicDataServiceImpl.java rename to cloud-common-plugin-dynamic/src/main/java/com/cm/common/plugin/service/dynamic/impl/DynamicDataServiceImpl.java diff --git a/cloud-common-plugin/src/main/java/com/cm/common/plugin/service/dynamic/impl/DynamicFormServiceImpl.java b/cloud-common-plugin-dynamic/src/main/java/com/cm/common/plugin/service/dynamic/impl/DynamicFormServiceImpl.java similarity index 99% rename from cloud-common-plugin/src/main/java/com/cm/common/plugin/service/dynamic/impl/DynamicFormServiceImpl.java rename to cloud-common-plugin-dynamic/src/main/java/com/cm/common/plugin/service/dynamic/impl/DynamicFormServiceImpl.java index d42d4e3..0e0f37c 100644 --- a/cloud-common-plugin/src/main/java/com/cm/common/plugin/service/dynamic/impl/DynamicFormServiceImpl.java +++ b/cloud-common-plugin-dynamic/src/main/java/com/cm/common/plugin/service/dynamic/impl/DynamicFormServiceImpl.java @@ -20,7 +20,6 @@ import com.cm.common.utils.WStringUtil; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import sun.tools.jconsole.JConsole; import java.util.*; diff --git a/cloud-common-plugin/src/main/java/com/cm/common/plugin/service/dynamic/impl/DynamicTableServiceImpl.java b/cloud-common-plugin-dynamic/src/main/java/com/cm/common/plugin/service/dynamic/impl/DynamicTableServiceImpl.java similarity index 98% rename from cloud-common-plugin/src/main/java/com/cm/common/plugin/service/dynamic/impl/DynamicTableServiceImpl.java rename to cloud-common-plugin-dynamic/src/main/java/com/cm/common/plugin/service/dynamic/impl/DynamicTableServiceImpl.java index 86c4fae..8560588 100644 --- a/cloud-common-plugin/src/main/java/com/cm/common/plugin/service/dynamic/impl/DynamicTableServiceImpl.java +++ b/cloud-common-plugin-dynamic/src/main/java/com/cm/common/plugin/service/dynamic/impl/DynamicTableServiceImpl.java @@ -16,11 +16,9 @@ import com.cm.common.plugin.service.dynamic.IDynamicTableService; import com.cm.common.utils.WStringUtil; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import java.util.List; -import java.util.Map; /** * When you feel like quitting. Think about why you started diff --git a/cloud-common-plugin/src/main/resources/mybatis/mapper/dynamic/config/dynamicconfigtable-mapper.xml b/cloud-common-plugin-dynamic/src/main/resources/mybatis/mapper/dynamic/config/dynamicconfigtable-mapper.xml similarity index 100% rename from cloud-common-plugin/src/main/resources/mybatis/mapper/dynamic/config/dynamicconfigtable-mapper.xml rename to cloud-common-plugin-dynamic/src/main/resources/mybatis/mapper/dynamic/config/dynamicconfigtable-mapper.xml diff --git a/cloud-common-plugin/src/main/resources/mybatis/mapper/dynamic/config/form/dynamicconfigform-mapper.xml b/cloud-common-plugin-dynamic/src/main/resources/mybatis/mapper/dynamic/config/form/dynamicconfigform-mapper.xml similarity index 100% rename from cloud-common-plugin/src/main/resources/mybatis/mapper/dynamic/config/form/dynamicconfigform-mapper.xml rename to cloud-common-plugin-dynamic/src/main/resources/mybatis/mapper/dynamic/config/form/dynamicconfigform-mapper.xml diff --git a/cloud-common-plugin/src/main/resources/mybatis/mapper/dynamic/dynamicdata-mapper.xml b/cloud-common-plugin-dynamic/src/main/resources/mybatis/mapper/dynamic/dynamicdata-mapper.xml similarity index 100% rename from cloud-common-plugin/src/main/resources/mybatis/mapper/dynamic/dynamicdata-mapper.xml rename to cloud-common-plugin-dynamic/src/main/resources/mybatis/mapper/dynamic/dynamicdata-mapper.xml diff --git a/cloud-common-plugin/src/main/resources/mybatis/mapper/dynamic/dynamicform-mapper.xml b/cloud-common-plugin-dynamic/src/main/resources/mybatis/mapper/dynamic/dynamicform-mapper.xml similarity index 100% rename from cloud-common-plugin/src/main/resources/mybatis/mapper/dynamic/dynamicform-mapper.xml rename to cloud-common-plugin-dynamic/src/main/resources/mybatis/mapper/dynamic/dynamicform-mapper.xml diff --git a/cloud-common-plugin/src/main/resources/mybatis/mapper/dynamic/dynamictable-mapper.xml b/cloud-common-plugin-dynamic/src/main/resources/mybatis/mapper/dynamic/dynamictable-mapper.xml similarity index 100% rename from cloud-common-plugin/src/main/resources/mybatis/mapper/dynamic/dynamictable-mapper.xml rename to cloud-common-plugin-dynamic/src/main/resources/mybatis/mapper/dynamic/dynamictable-mapper.xml diff --git a/cloud-common-plugin/src/main/resources/templates/dynamic/config/form/list.html b/cloud-common-plugin-dynamic/src/main/resources/templates/dynamic/config/form/list.html similarity index 100% rename from cloud-common-plugin/src/main/resources/templates/dynamic/config/form/list.html rename to cloud-common-plugin-dynamic/src/main/resources/templates/dynamic/config/form/list.html diff --git a/cloud-common-plugin/src/main/resources/templates/dynamic/config/form/save.html b/cloud-common-plugin-dynamic/src/main/resources/templates/dynamic/config/form/save.html similarity index 100% rename from cloud-common-plugin/src/main/resources/templates/dynamic/config/form/save.html rename to cloud-common-plugin-dynamic/src/main/resources/templates/dynamic/config/form/save.html diff --git a/cloud-common-plugin/src/main/resources/templates/dynamic/config/form/update.html b/cloud-common-plugin-dynamic/src/main/resources/templates/dynamic/config/form/update.html similarity index 100% rename from cloud-common-plugin/src/main/resources/templates/dynamic/config/form/update.html rename to cloud-common-plugin-dynamic/src/main/resources/templates/dynamic/config/form/update.html diff --git a/cloud-common-plugin/src/main/resources/templates/dynamic/config/list.html b/cloud-common-plugin-dynamic/src/main/resources/templates/dynamic/config/list.html similarity index 100% rename from cloud-common-plugin/src/main/resources/templates/dynamic/config/list.html rename to cloud-common-plugin-dynamic/src/main/resources/templates/dynamic/config/list.html diff --git a/cloud-common-plugin/src/main/resources/templates/dynamic/config/save.html b/cloud-common-plugin-dynamic/src/main/resources/templates/dynamic/config/save.html similarity index 100% rename from cloud-common-plugin/src/main/resources/templates/dynamic/config/save.html rename to cloud-common-plugin-dynamic/src/main/resources/templates/dynamic/config/save.html diff --git a/cloud-common-plugin/src/main/resources/templates/dynamic/config/update.html b/cloud-common-plugin-dynamic/src/main/resources/templates/dynamic/config/update.html similarity index 100% rename from cloud-common-plugin/src/main/resources/templates/dynamic/config/update.html rename to cloud-common-plugin-dynamic/src/main/resources/templates/dynamic/config/update.html diff --git a/cloud-common-plugin/src/main/resources/templates/dynamic/form/listdynamicform.html b/cloud-common-plugin-dynamic/src/main/resources/templates/dynamic/form/listdynamicform.html similarity index 100% rename from cloud-common-plugin/src/main/resources/templates/dynamic/form/listdynamicform.html rename to cloud-common-plugin-dynamic/src/main/resources/templates/dynamic/form/listdynamicform.html diff --git a/cloud-common-plugin/src/main/resources/templates/dynamic/form/savedynamicform.html b/cloud-common-plugin-dynamic/src/main/resources/templates/dynamic/form/savedynamicform.html similarity index 100% rename from cloud-common-plugin/src/main/resources/templates/dynamic/form/savedynamicform.html rename to cloud-common-plugin-dynamic/src/main/resources/templates/dynamic/form/savedynamicform.html diff --git a/cloud-common-plugin/src/main/resources/templates/dynamic/form/updatedynamicform.html b/cloud-common-plugin-dynamic/src/main/resources/templates/dynamic/form/updatedynamicform.html similarity index 100% rename from cloud-common-plugin/src/main/resources/templates/dynamic/form/updatedynamicform.html rename to cloud-common-plugin-dynamic/src/main/resources/templates/dynamic/form/updatedynamicform.html diff --git a/cloud-common-plugin/src/main/resources/templates/dynamic/form/updatedynamicjoinform.html b/cloud-common-plugin-dynamic/src/main/resources/templates/dynamic/form/updatedynamicjoinform.html similarity index 100% rename from cloud-common-plugin/src/main/resources/templates/dynamic/form/updatedynamicjoinform.html rename to cloud-common-plugin-dynamic/src/main/resources/templates/dynamic/form/updatedynamicjoinform.html