diff --git a/modules/ibizlab-template/ibizlab-template-apivo/src/main/resources/templ/{{projectName}}-api/src/main/java/{{packageName}}/api/{{apps}}/dict/{{dicts}}Dict.java.hbs b/modules/ibizlab-template/ibizlab-template-apivo/src/main/resources/templ/{{projectName}}-api/src/main/java/{{packageName}}/api/{{apps}}/dict/{{dicts}}Dict.java.hbs index 24e61e8edbec7215074d487a1c0d1a8011b4f6a0..ba1bb34344878ff805bc2729da3fb43be6ae089a 100644 --- a/modules/ibizlab-template/ibizlab-template-apivo/src/main/resources/templ/{{projectName}}-api/src/main/java/{{packageName}}/api/{{apps}}/dict/{{dicts}}Dict.java.hbs +++ b/modules/ibizlab-template/ibizlab-template-apivo/src/main/resources/templ/{{projectName}}-api/src/main/java/{{packageName}}/api/{{apps}}/dict/{{dicts}}Dict.java.hbs @@ -60,7 +60,7 @@ public class {{pascalCase dict.codeName}}Dict { if(tag==null) return null; for (ENUM item : values()) - if (item.getValue().equals(tag){{#eq dict.valueType "Integer"}}||item.getValue().toString().equals(tag){{/eq}}) + if (tag.toString().equals(item.getValue(){{#eq dict.valueType "Integer"}}.toString(){{/eq}})) return item; ENUM ret =null; for (ENUM item : values()) diff --git a/modules/ibizlab-template/ibizlab-template-ibizboot/src/main/resources/templ/pom.xml.hbs b/modules/ibizlab-template/ibizlab-template-ibizboot/src/main/resources/templ/pom.xml.hbs index fa27a209341537c3d1ab39a2960aa032a5c2a24a..a271019b5aa22f45ed4d36060a4635fc69030188 100644 --- a/modules/ibizlab-template/ibizlab-template-ibizboot/src/main/resources/templ/pom.xml.hbs +++ b/modules/ibizlab-template/ibizlab-template-ibizboot/src/main/resources/templ/pom.xml.hbs @@ -114,6 +114,35 @@ <generateBackupPoms>false</generateBackupPoms> </configuration> </plugin> + <plugin> + <groupId>cn.ibizlab</groupId> + <artifactId>ibizlab-generator-plugin</artifactId> + <version>1.0-SNAPSHOT</version> + <configuration> + <output> + ${basedir}/ + </output> + <inputSpec> + ${basedir}/{{system.modelFolder}} + </inputSpec> + <templateDirs> + ${basedir}/{{projectName}}-provider/src/main/resources/templ + </templateDirs> + <packageName> + ${project.groupId} + </packageName> + <name> + ${project.artifactId} + </name> + </configuration> + <dependencies> + <dependency> + <groupId>cn.ibizlab</groupId> + <artifactId>ibizlab-template-ibizboot</artifactId> + <version>1.0-SNAPSHOT</version> + </dependency> + </dependencies> + </plugin> </plugins> </build> </project> diff --git a/modules/ibizlab-template/ibizlab-template-ibizedge/src/main/resources/templ/pom.xml.hbs b/modules/ibizlab-template/ibizlab-template-ibizedge/src/main/resources/templ/pom.xml.hbs index 7fc5395aa5d3a7174344c967a6a6c1792fdf4a1b..8e167312b9dcd361c46d0f0d8baf510858122a0a 100644 --- a/modules/ibizlab-template/ibizlab-template-ibizedge/src/main/resources/templ/pom.xml.hbs +++ b/modules/ibizlab-template/ibizlab-template-ibizedge/src/main/resources/templ/pom.xml.hbs @@ -113,6 +113,35 @@ <generateBackupPoms>false</generateBackupPoms> </configuration> </plugin> + <plugin> + <groupId>cn.ibizlab</groupId> + <artifactId>ibizlab-generator-plugin</artifactId> + <version>1.0-SNAPSHOT</version> + <configuration> + <output> + ${basedir}/ + </output> + <inputSpec> + ${basedir}/{{system.modelFolder}} + </inputSpec> + <templateDirs> + ${basedir}/{{projectName}}-boot/src/main/resources/templ + </templateDirs> + <packageName> + ${project.groupId} + </packageName> + <name> + ${project.artifactId} + </name> + </configuration> + <dependencies> + <dependency> + <groupId>cn.ibizlab</groupId> + <artifactId>ibizlab-template-ibizedge</artifactId> + <version>1.0-SNAPSHOT</version> + </dependency> + </dependencies> + </plugin> </plugins> </build>