diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/web/ModuleController.java b/modules/core/src/main/java/com/jeesite/modules/sys/web/ModuleController.java index e425dc60..866c4402 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/web/ModuleController.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/web/ModuleController.java @@ -40,13 +40,13 @@ import java.util.stream.Collectors; */ @Controller @RequestMapping(value = "${adminPath}/sys/module") -@ConditionalOnProperty(name="web.core.enabled", havingValue="true", matchIfMissing=true) +@ConditionalOnProperty(name={"config.enabled","web.core.enabled"}, havingValue="true", matchIfMissing=true) @ApiIgnore public class ModuleController extends BaseController { @Autowired private ModuleService moduleService; - + /** * 获取数据 * @param moduleCode @@ -56,7 +56,7 @@ public class ModuleController extends BaseController { public Module get(String moduleCode, boolean isNewRecord) { return moduleService.get(moduleCode, isNewRecord); } - + /** * 查询列表 * @param module @@ -70,7 +70,7 @@ public class ModuleController extends BaseController { model.addAttribute("module", module); return "modules/sys/moduleList"; } - + /** * 查询列表 * @param module @@ -83,7 +83,7 @@ public class ModuleController extends BaseController { @ResponseBody public Page listData(Module module, HttpServletRequest request, HttpServletResponse response) { module.setPage(new Page<>(request, response)); - Page page = moduleService.findPage(module); + Page page = moduleService.findPage(module); return page; } 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 5779b539..3f165220 100644 --- a/modules/core/src/main/resources/templates/modules/gen/config.xml +++ b/modules/core/src/main/resources/templates/modules/gen/config.xml @@ -293,5 +293,13 @@ + + + + + + + + \ No newline at end of file diff --git a/modules/core/src/main/resources/templates/modules/gen/module_vue/README.md.xml b/modules/core/src/main/resources/templates/modules/gen/module_vue/README.md.xml new file mode 100644 index 00000000..e81ff207 --- /dev/null +++ b/modules/core/src/main/resources/templates/modules/gen/module_vue/README.md.xml @@ -0,0 +1,35 @@ + + + \ No newline at end of file diff --git a/modules/core/src/main/resources/templates/modules/gen/module_vue/api/api.xml b/modules/core/src/main/resources/templates/modules/gen/module_vue/api/api.xml new file mode 100644 index 00000000..4831145d --- /dev/null +++ b/modules/core/src/main/resources/templates/modules/gen/module_vue/api/api.xml @@ -0,0 +1,12 @@ + + + \ No newline at end of file diff --git a/modules/core/src/main/resources/templates/modules/gen/module_vue/index.ts.xml b/modules/core/src/main/resources/templates/modules/gen/module_vue/index.ts.xml new file mode 100644 index 00000000..167ebd0e --- /dev/null +++ b/modules/core/src/main/resources/templates/modules/gen/module_vue/index.ts.xml @@ -0,0 +1,12 @@ + + + \ No newline at end of file diff --git a/modules/core/src/main/resources/templates/modules/gen/module_vue/package.json.xml b/modules/core/src/main/resources/templates/modules/gen/module_vue/package.json.xml new file mode 100644 index 00000000..7a020d29 --- /dev/null +++ b/modules/core/src/main/resources/templates/modules/gen/module_vue/package.json.xml @@ -0,0 +1,42 @@ + + + \ No newline at end of file diff --git a/modules/core/src/main/resources/templates/modules/gen/module_vue/tsconfig.json.xml b/modules/core/src/main/resources/templates/modules/gen/module_vue/tsconfig.json.xml new file mode 100644 index 00000000..1de6b97d --- /dev/null +++ b/modules/core/src/main/resources/templates/modules/gen/module_vue/tsconfig.json.xml @@ -0,0 +1,32 @@ + + + \ No newline at end of file diff --git a/modules/core/src/main/resources/templates/modules/gen/module_vue/views/views.xml b/modules/core/src/main/resources/templates/modules/gen/module_vue/views/views.xml new file mode 100644 index 00000000..78eb76bb --- /dev/null +++ b/modules/core/src/main/resources/templates/modules/gen/module_vue/views/views.xml @@ -0,0 +1,12 @@ + + + \ No newline at end of file