diff --git a/src/main/java/com/smart/generator/command/impl/CreateAppCommand.java b/src/main/java/com/smart/generator/command/impl/CreateAppCommand.java index 2dfab403dc96dacdcda4c84c028719cefb3eba4c..c9a5ffe6f9192d36154efd9fab8232af54fd6aff 100644 --- a/src/main/java/com/smart/generator/command/impl/CreateAppCommand.java +++ b/src/main/java/com/smart/generator/command/impl/CreateAppCommand.java @@ -44,8 +44,9 @@ public class CreateAppCommand extends Command { String[] emptyDirs = { "src/main/java", "src/main/resources", - "src/main/webapp/www/page", - "src/main/webapp/www/script", + "src/main/webapp/www/html", + "src/main/webapp/www/css", + "src/main/webapp/www/js", "src/test/java", "src/test/resources/sql", }; @@ -60,6 +61,7 @@ public class CreateAppCommand extends Command { generateConfigFile(); generateLog4jFile(); generateIndexFile(); + generateGlobalJS(); } private void generateMavenFile() { @@ -115,10 +117,19 @@ public class CreateAppCommand extends Command { String pageNameDisplay = StringUtil.toDisplayStyle(appName, "-"); Map dataMap = new HashMap(); - dataMap.put("page_name_c", pageNameDisplay); + dataMap.put("page_name_d", pageNameDisplay); String vmPath = "create-app/index_html.vm"; - String filePath = appPath + "/src/main/webapp/www/page/index.html"; + String filePath = appPath + "/src/main/webapp/www/html/index.html"; + VelocityUtil.mergeTemplateIntoFile(vmPath, dataMap, filePath); + } + + private void generateGlobalJS() { + Map dataMap = new HashMap(); + dataMap.put("app_name", appName); + + String vmPath = "create-app/global.js.vm"; + String filePath = appPath + "/src/main/webapp/www/js/global.js"; VelocityUtil.mergeTemplateIntoFile(vmPath, dataMap, filePath); } } diff --git a/src/main/java/com/smart/generator/command/impl/CreatePageCommand.java b/src/main/java/com/smart/generator/command/impl/CreatePageCommand.java index 1a78beb645eb3169a811aabb0ec104d7272fa490..948d39381243722790faa7b817da93b8c79ed767 100644 --- a/src/main/java/com/smart/generator/command/impl/CreatePageCommand.java +++ b/src/main/java/com/smart/generator/command/impl/CreatePageCommand.java @@ -35,7 +35,7 @@ public class CreatePageCommand extends Command { dataMap.put("page_name_d", pageNameDisplay); String vmPath = "create-page/page_html.vm"; - String filePath = appPath + "/src/main/webapp/www/page/" + pageNameUnderline + ".html"; + String filePath = appPath + "/src/main/webapp/www/html/" + pageNameUnderline + ".html"; VelocityUtil.mergeTemplateIntoFile(vmPath, dataMap, filePath); } }