diff --git a/src/main/java/com/smallchill/core/beetl/BeetlMaker.java b/src/main/java/com/smallchill/core/beetl/BeetlMaker.java index 83c67048..908443f8 100644 --- a/src/main/java/com/smallchill/core/beetl/BeetlMaker.java +++ b/src/main/java/com/smallchill/core/beetl/BeetlMaker.java @@ -26,31 +26,31 @@ import com.smallchill.core.toolbox.kit.FileKit; /** * Beetl静态化生成工具类 */ -public abstract class BeetlMaker { +public class BeetlMaker { /** - * 生成静态html + * 生成文件 * - * @param ftlPath 模板路径 + * @param tlPath 模板路径 * @param paras 参数 - * @param htmlPath html文件保存路径 + * @param filePath 文件保存路径 */ - public static void makeHtml(String tlPath, Map paras, String htmlPath) { - makeHtml(tlPath, paras, htmlPath, CharsetKit.UTF_8); + public static void makeFile(String tlPath, Map paras, String filePath) { + makeFile(tlPath, paras, filePath, CharsetKit.UTF_8); } /** - * 生成静态html + * 生成文件 * - * @param ftlPath 模板路径 + * @param tlPath 模板路径 * @param paras 参数 - * @param htmlPath html文件保存路径 + * @param filePath 文件保存路径 * @param charsetName 编码 */ - public static void makeHtml(String tlPath, Map paras, String htmlPath, String charsetName) { + public static void makeFile(String tlPath, Map paras, String filePath, String charsetName) { PrintWriter pw = null; try { - pw = new PrintWriter(new OutputStreamWriter(new FileOutputStream(htmlPath), charsetName)); + pw = new PrintWriter(new OutputStreamWriter(new FileOutputStream(filePath), charsetName)); BeetlTemplate.buildTo(FileKit.readString(tlPath, charsetName), paras, pw); } catch (Exception e) { e.printStackTrace(); diff --git a/src/main/java/com/smallchill/system/controller/GenerateController.java b/src/main/java/com/smallchill/system/controller/GenerateController.java index c0cebf8f..a13b45ad 100644 --- a/src/main/java/com/smallchill/system/controller/GenerateController.java +++ b/src/main/java/com/smallchill/system/controller/GenerateController.java @@ -180,20 +180,20 @@ public class GenerateController extends CurdController { ps.set("pkName", pkName); //java - BeetlMaker.makeHtml(controllerTemplatePath, ps, controllerPath); - BeetlMaker.makeHtml(serviceTemplatePath, ps, servicePath); - BeetlMaker.makeHtml(serviceimplTemplatePath, ps, serviceimplPath); + BeetlMaker.makeFile(controllerTemplatePath, ps, controllerPath); + BeetlMaker.makeFile(serviceTemplatePath, ps, servicePath); + BeetlMaker.makeFile(serviceimplTemplatePath, ps, serviceimplPath); setParasAttr(tableName, ps); - BeetlMaker.makeHtml(modelTemplatePath, ps, modelPath); + BeetlMaker.makeFile(modelTemplatePath, ps, modelPath); //resources - BeetlMaker.makeHtml(sqlTemplatePath, ps, sqlPath); + BeetlMaker.makeFile(sqlTemplatePath, ps, sqlPath); //webapp - BeetlMaker.makeHtml(indexTemplatePath, ps, indexPath); - BeetlMaker.makeHtml(addTemplatePath, ps, addPath); - BeetlMaker.makeHtml(editTemplatePath, ps, editPath); - BeetlMaker.makeHtml(viewTemplatePath, ps, viewPath); + BeetlMaker.makeFile(indexTemplatePath, ps, indexPath); + BeetlMaker.makeFile(addTemplatePath, ps, addPath); + BeetlMaker.makeFile(editTemplatePath, ps, editPath); + BeetlMaker.makeFile(viewTemplatePath, ps, viewPath); }