diff --git a/modules/core/src/main/resources/templates/modules/gen/config.xml b/modules/core/src/main/resources/templates/modules/gen/config.xml index e2aa1f95..82cfd902 100644 --- a/modules/core/src/main/resources/templates/modules/gen/config.xml +++ b/modules/core/src/main/resources/templates/modules/gen/config.xml @@ -15,34 +15,29 @@ - + - + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - diff --git a/modules/core/src/main/resources/templates/modules/gen/crud/dao.xml b/modules/core/src/main/resources/templates/modules/gen/crud/dao.xml index f9d60b29..da3d9970 100644 --- a/modules/core/src/main/resources/templates/modules/gen/crud/dao.xml +++ b/modules/core/src/main/resources/templates/modules/gen/crud/dao.xml @@ -18,7 +18,7 @@ import ${packageName}.${moduleName}.entity${isNotEmpty(subModuleName)?'.'+subMod * @author ${functionAuthor} * @version ${functionVersion} */ -@MyBatisDao<% if(table.dataSourceName != ''){ %>(dataSourceName="${table.dataSourceName}")<% } %> +@MyBatisDao<% if(isNotBlank(table.dataSourceName)){ %>(dataSourceName="${table.dataSourceName}")<% } %> public interface ${ClassName}Dao extends ${table.isTreeEntity?'Tree':'Crud'}Dao<${ClassName}> { }]]> diff --git a/modules/core/src/main/resources/templates/modules/gen/query/controller.xml b/modules/core/src/main/resources/templates/modules/gen/query/controller.xml new file mode 100644 index 00000000..fc600a92 --- /dev/null +++ b/modules/core/src/main/resources/templates/modules/gen/query/controller.xml @@ -0,0 +1,157 @@ + + \ No newline at end of file diff --git a/modules/core/src/main/resources/templates/modules/gen/query/dao.xml b/modules/core/src/main/resources/templates/modules/gen/query/dao.xml new file mode 100644 index 00000000..7e86b1f4 --- /dev/null +++ b/modules/core/src/main/resources/templates/modules/gen/query/dao.xml @@ -0,0 +1,26 @@ + + \ No newline at end of file diff --git a/modules/core/src/main/resources/templates/modules/gen/query/service.xml b/modules/core/src/main/resources/templates/modules/gen/query/service.xml new file mode 100644 index 00000000..d6b49e69 --- /dev/null +++ b/modules/core/src/main/resources/templates/modules/gen/query/service.xml @@ -0,0 +1,89 @@ + + \ No newline at end of file diff --git a/modules/core/src/main/resources/templates/modules/gen/query/viewForm.xml b/modules/core/src/main/resources/templates/modules/gen/query/viewForm.xml new file mode 100644 index 00000000..cc05d723 --- /dev/null +++ b/modules/core/src/main/resources/templates/modules/gen/query/viewForm.xml @@ -0,0 +1,61 @@ + + \ No newline at end of file diff --git a/modules/core/src/main/resources/templates/modules/gen/query/viewList.xml b/modules/core/src/main/resources/templates/modules/gen/query/viewList.xml new file mode 100644 index 00000000..97bf262b --- /dev/null +++ b/modules/core/src/main/resources/templates/modules/gen/query/viewList.xml @@ -0,0 +1,126 @@ + + \ No newline at end of file