From 49966b1096a537d608d9d890de2022f9b35e9f15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=B7=E5=86=B7?= Date: Wed, 12 Feb 2020 13:26:26 +0800 Subject: [PATCH] =?UTF-8?q?:recycle:=20Refactoring=20code.=20=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...fig.java => MybatisPlusConfiguration.java} | 2 +- .../main/resources/META-INF/spring.factories | 2 +- .../pig4cloud/pigx/codegen/util/GenUtils.java | 23 +++++++++++-------- .../main/resources/mapper/GeneratorMapper.xml | 2 +- .../element/{add-or-update.vue.vm => form.vm} | 0 .../resources/template/element/index.vue.vm | 6 ++--- 6 files changed, 20 insertions(+), 15 deletions(-) rename pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/mybatis/{MybatisPlusConfig.java => MybatisPlusConfiguration.java} (98%) rename pigx-visual/pigx-codegen/src/main/resources/template/element/{add-or-update.vue.vm => form.vm} (100%) diff --git a/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/mybatis/MybatisPlusConfig.java b/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/mybatis/MybatisPlusConfiguration.java similarity index 98% rename from pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/mybatis/MybatisPlusConfig.java rename to pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/mybatis/MybatisPlusConfiguration.java index f57a5e08d..c6c6fbc81 100644 --- a/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/mybatis/MybatisPlusConfig.java +++ b/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/mybatis/MybatisPlusConfiguration.java @@ -44,7 +44,7 @@ import java.util.List; @Configuration @ConditionalOnBean(DataSource.class) @AutoConfigureAfter(DataSourceAutoConfiguration.class) -public class MybatisPlusConfig { +public class MybatisPlusConfiguration { /** * 创建租户维护处理器对象 diff --git a/pigx-common/pigx-common-data/src/main/resources/META-INF/spring.factories b/pigx-common/pigx-common-data/src/main/resources/META-INF/spring.factories index 8bc3f62f8..fd3942d5c 100644 --- a/pigx-common/pigx-common-data/src/main/resources/META-INF/spring.factories +++ b/pigx-common/pigx-common-data/src/main/resources/META-INF/spring.factories @@ -5,5 +5,5 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ com.pig4cloud.pigx.common.data.tenant.PigxTenantConfigProperties,\ com.pig4cloud.pigx.common.data.tenant.TenantContextHolderFilter,\ com.pig4cloud.pigx.common.data.tenant.PigxFeignTenantConfiguration,\ - com.pig4cloud.pigx.common.data.mybatis.MybatisPlusConfig,\ + com.pig4cloud.pigx.common.data.mybatis.MybatisPlusConfiguration,\ com.pig4cloud.pigx.common.data.resolver.WebMvcConfig \ No newline at end of file diff --git a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/util/GenUtils.java b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/util/GenUtils.java index 73e03c9ac..ac7c00cbe 100644 --- a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/util/GenUtils.java +++ b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/util/GenUtils.java @@ -66,7 +66,7 @@ public class GenUtils { private final String MENU_SQL_VM = "menu.sql.vm"; private final String AVUE_INDEX_VUE_VM = "avue/index.vue.vm"; private final String ELE_INDEX_VUE_VM = "element/index.vue.vm"; - private final String ELE_ADD_UPDATE_VUE_VM = "element/add-or-update.vue.vm"; + private final String ELE_ADD_UPDATE_VUE_VM = "element/form.vue.vm"; private final String AVUE_API_JS_VM = "avue/api.js.vm"; private final String AVUE_CRUD_JS_VM = "avue/crud.js.vm"; @@ -89,7 +89,7 @@ public class GenUtils { if (StyleTypeEnum.ELEMENT.getStyle().equals(config.getStyle())) { templates.add("template/element/index.vue.vm"); - templates.add("template/element/add-or-update.vue.vm"); + templates.add("template/element/form.vue.vm"); } else { templates.add("template/avue/index.vue.vm"); templates.add("template/avue/crud.js.vm"); @@ -275,7 +275,9 @@ public class GenUtils { * 获取文件名 */ private String getFileName(String template, String className, String packageName, String moduleName) { - String packagePath = CommonConstants.BACK_END_PROJECT + File.separator + "src" + File.separator + "main" + File.separator + "java" + File.separator; + String packagePath = CommonConstants.BACK_END_PROJECT + File.separator + "src" + + File.separator + "main" + File.separator + "java" + File.separator; + if (StringUtils.isNotBlank(packageName)) { packagePath += packageName.replace(".", File.separator) + File.separator + moduleName + File.separator; } @@ -301,7 +303,8 @@ public class GenUtils { } if (template.contains(MAPPER_XML_VM)) { - return CommonConstants.BACK_END_PROJECT + File.separator + "src" + File.separator + "main" + File.separator + "resources" + File.separator + "mapper" + File.separator + className + "Mapper.xml"; + return CommonConstants.BACK_END_PROJECT + File.separator + "src" + File.separator + "main" + + File.separator + "resources" + File.separator + "mapper" + File.separator + className + "Mapper.xml"; } if (template.contains(MENU_SQL_VM)) { @@ -314,17 +317,19 @@ public class GenUtils { } if (template.contains(AVUE_API_JS_VM)) { - return CommonConstants.FRONT_END_PROJECT + File.separator + "src" + File.separator + "api" + File.separator + className.toLowerCase() + ".js"; + return CommonConstants.FRONT_END_PROJECT + File.separator + "src" + File.separator + "api" + + File.separator + className.toLowerCase() + ".js"; } if (template.contains(AVUE_CRUD_JS_VM)) { - return CommonConstants.FRONT_END_PROJECT + File.separator + "src" + File.separator + "const" + - File.separator + "crud" + File.separator + className.toLowerCase() + ".js"; + return CommonConstants.FRONT_END_PROJECT + File.separator + "src" + File.separator + "const" + + File.separator + "crud" + File.separator + className.toLowerCase() + ".js"; } if (template.contains(ELE_ADD_UPDATE_VUE_VM)) { - return CommonConstants.FRONT_END_PROJECT + File.separator + "src" + File.separator + "views" + - File.separator + moduleName + File.separator + className.toLowerCase() + File.separator + moduleName + "-add-or-update.vue"; + return CommonConstants.FRONT_END_PROJECT + File.separator + "src" + File.separator + "views" + + File.separator + moduleName + File.separator + className.toLowerCase() + + File.separator + moduleName + "-form.vue.vm"; } return null; diff --git a/pigx-visual/pigx-codegen/src/main/resources/mapper/GeneratorMapper.xml b/pigx-visual/pigx-codegen/src/main/resources/mapper/GeneratorMapper.xml index 58c36ecbf..372e0931a 100755 --- a/pigx-visual/pigx-codegen/src/main/resources/mapper/GeneratorMapper.xml +++ b/pigx-visual/pigx-codegen/src/main/resources/mapper/GeneratorMapper.xml @@ -3,7 +3,7 @@