From dfc5030fb5afe6052f9e426af347fa340f968324 Mon Sep 17 00:00:00 2001 From: SanLi <2689170096@qq.com> Date: Wed, 1 Jul 2020 10:08:23 +0800 Subject: [PATCH] =?UTF-8?q?:recycle:=20=E9=87=8D=E6=9E=84=E7=94=9F?= =?UTF-8?q?=E6=88=90=E6=8E=A5=E5=8F=A3=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/smallbun/screw/core/engine/TemplateEngine.java | 6 +++--- .../core/engine/freemark/FreemarkerTemplateEngine.java | 8 ++++---- .../core/engine/velocity/VelocityTemplateEngine.java | 8 ++++---- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/screw-core/src/main/java/cn/smallbun/screw/core/engine/TemplateEngine.java b/screw-core/src/main/java/cn/smallbun/screw/core/engine/TemplateEngine.java index 188b707..270a0ed 100644 --- a/screw-core/src/main/java/cn/smallbun/screw/core/engine/TemplateEngine.java +++ b/screw-core/src/main/java/cn/smallbun/screw/core/engine/TemplateEngine.java @@ -18,7 +18,7 @@ package cn.smallbun.screw.core.engine; import cn.smallbun.screw.core.exception.ProduceException; -import cn.smallbun.screw.core.metadata.model.DatabaseModel; +import cn.smallbun.screw.core.metadata.model.DataModel; import java.io.Serializable; @@ -32,10 +32,10 @@ public interface TemplateEngine extends Serializable { /** * 生成文档 * - * @param info {@link DatabaseModel} + * @param info {@link DataModel} * @param docName {@link String} * @throws ProduceException ProduceException */ - void produce(DatabaseModel info, String docName) throws ProduceException; + void produce(DataModel info, String docName) throws ProduceException; } diff --git a/screw-core/src/main/java/cn/smallbun/screw/core/engine/freemark/FreemarkerTemplateEngine.java b/screw-core/src/main/java/cn/smallbun/screw/core/engine/freemark/FreemarkerTemplateEngine.java index 2c43b78..6458128 100644 --- a/screw-core/src/main/java/cn/smallbun/screw/core/engine/freemark/FreemarkerTemplateEngine.java +++ b/screw-core/src/main/java/cn/smallbun/screw/core/engine/freemark/FreemarkerTemplateEngine.java @@ -20,7 +20,7 @@ package cn.smallbun.screw.core.engine.freemark; import cn.smallbun.screw.core.engine.AbstractTemplateEngine; import cn.smallbun.screw.core.engine.EngineConfig; import cn.smallbun.screw.core.exception.ProduceException; -import cn.smallbun.screw.core.metadata.model.DatabaseModel; +import cn.smallbun.screw.core.metadata.model.DataModel; import cn.smallbun.screw.core.util.Assert; import cn.smallbun.screw.core.util.ExceptionUtils; import cn.smallbun.screw.core.util.FileUtils; @@ -84,12 +84,12 @@ public class FreemarkerTemplateEngine extends AbstractTemplateEngine { /** * 生成文档 * - * @param info {@link DatabaseModel} + * @param info {@link DataModel} * @throws ProduceException ProduceException */ @Override - public void produce(DatabaseModel info, String docName) throws ProduceException { - Assert.notNull(info, "DatabaseModel can not be empty!"); + public void produce(DataModel info, String docName) throws ProduceException { + Assert.notNull(info, "DataModel can not be empty!"); String path = getEngineConfig().getCustomTemplate(); try { Template template; diff --git a/screw-core/src/main/java/cn/smallbun/screw/core/engine/velocity/VelocityTemplateEngine.java b/screw-core/src/main/java/cn/smallbun/screw/core/engine/velocity/VelocityTemplateEngine.java index f0fa70b..0690503 100644 --- a/screw-core/src/main/java/cn/smallbun/screw/core/engine/velocity/VelocityTemplateEngine.java +++ b/screw-core/src/main/java/cn/smallbun/screw/core/engine/velocity/VelocityTemplateEngine.java @@ -20,7 +20,7 @@ package cn.smallbun.screw.core.engine.velocity; import cn.smallbun.screw.core.engine.AbstractTemplateEngine; import cn.smallbun.screw.core.engine.EngineConfig; import cn.smallbun.screw.core.exception.ProduceException; -import cn.smallbun.screw.core.metadata.model.DatabaseModel; +import cn.smallbun.screw.core.metadata.model.DataModel; import cn.smallbun.screw.core.util.Assert; import cn.smallbun.screw.core.util.ExceptionUtils; import cn.smallbun.screw.core.util.StringUtils; @@ -83,12 +83,12 @@ public class VelocityTemplateEngine extends AbstractTemplateEngine { /** * 生成文档 * - * @param info {@link DatabaseModel} + * @param info {@link DataModel} * @throws ProduceException ProduceException */ @Override - public void produce(DatabaseModel info, String docName) throws ProduceException { - Assert.notNull(info, "DatabaseModel can not be empty!"); + public void produce(DataModel info, String docName) throws ProduceException { + Assert.notNull(info, "DataModel can not be empty!"); Template template; try { // get template path