From a7a3ecb1c056ef2d6a2c6ec741ec166424e39733 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E5=8B=87?= <huangyong.java@gmail.com>
Date: Wed, 13 Nov 2013 15:22:51 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90B=E3=80=91=E4=BF=AE=E5=A4=8D=E4=BA=86?=
 =?UTF-8?q?=E5=9B=A0=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7=E8=80=8C=E5=AF=BC?=
 =?UTF-8?q?=E8=87=B4=20Smart=20SDK=20=E4=B8=AD=E4=BA=A7=E7=94=9F=E7=9A=84?=
 =?UTF-8?q?=20Bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../command/impl/CreateAppCommand.java        | 19 +++++++++++++++----
 .../command/impl/CreatePageCommand.java       |  2 +-
 2 files changed, 16 insertions(+), 5 deletions(-)

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 2dfab40..c9a5ffe 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<String, Object> dataMap = new HashMap<String, Object>();
-        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<String, Object> dataMap = new HashMap<String, Object>();
+        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 1a78beb..948d393 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);
     }
 }
-- 
GitLab