Merge pull request #4 from mrdaios/feature/render

add new render method

pom.xml

@@ -6,7 +6,7 @@
     <groupId>io.github.mrdaios</groupId>
     <artifactId>templates</artifactId>
     <packaging>pom</packaging>
-    <version>0.0.3</version>
+    <version>0.0.4</version>
 
     <properties>
         <maven.compiler.source>8</maven.compiler.source>

templates-api-freemarker/pom.xml

@@ -6,7 +6,7 @@
     <groupId>io.github.mrdaios</groupId>
     <artifactId>templates-api-freemarker</artifactId>
     <packaging>jar</packaging>
-    <version>0.0.3</version>
+    <version>0.0.4</version>
     <name>templates-api-freemarker</name>
     <description>templates</description>
     <url>https://github.com/mrdaios/templates-maven-plugin</url>
@@ -57,7 +57,7 @@
         <dependency>
             <groupId>io.github.mrdaios</groupId>
             <artifactId>templates-api</artifactId>
-            <version>0.0.3</version>
+            <version>0.0.4</version>
         </dependency>
     </dependencies>
 

templates-api-freemarker/src/main/java/io/github/mrdaios/templates/api/freemarkder/FMBaseTemplateRenderService.java

@@ -32,18 +32,24 @@ public Map<String, TemplateRenderModel> render(Map<String, String> template, URL
         if (globalTemplateData != null) {
             data.put("global", globalTemplateData);
         }
+        return render(template, data);
+    }
+
+    @Override
+    public Map<String, TemplateRenderModel> render(Map<String, String> template, Map templateData) throws TemplateRenderException {
         HashMap<String, TemplateRenderModel> renderModelMap = new HashMap<>();
         template.forEach((filePath, templateContent) -> {
             // 初始化运行环境
             FMRenderContext.getCurrentContext().refreshContext();
-            Map<String, TemplateRenderModel> result = process(filePath, templateContent, data);
+            Map<String, TemplateRenderModel> result = process(filePath, templateContent, templateData);
             if (null != result && result.size() > 0) {
                 renderModelMap.putAll(result);
             }
         });
         return renderModelMap;
     }
 
+
     /**
      * 加载数据
      *

templates-api/pom.xml

@@ -6,7 +6,7 @@
     <groupId>io.github.mrdaios</groupId>
     <artifactId>templates-api</artifactId>
     <packaging>jar</packaging>
-    <version>0.0.3</version>
+    <version>0.0.4</version>
     <name>templates-api</name>
     <description>templates</description>
     <url>https://github.com/mrdaios/templates-maven-plugin</url>

templates-api/src/main/java/io/github/mrdaios/templates/service/TemplateRenderService.java

@@ -12,4 +12,6 @@ public interface TemplateRenderService {
 
     Map<String, TemplateRenderModel> render(Map<String, String> template, URL templateDataPath, Map globalTemplateData) throws TemplateRenderException;
 
+    Map<String, TemplateRenderModel> render(Map<String, String> template, Map templateData) throws TemplateRenderException;
+
 }

templates-freemarker/pom.xml

@@ -6,7 +6,7 @@
     <groupId>io.github.mrdaios</groupId>
     <artifactId>templates-freemarker</artifactId>
     <packaging>jar</packaging>
-    <version>0.0.3</version>
+    <version>0.0.4</version>
     <name>templates-freemarker</name>
     <description>templates</description>
     <url>https://github.com/mrdaios/templates-maven-plugin</url>
@@ -42,7 +42,7 @@
         <dependency>
             <groupId>io.github.mrdaios</groupId>
             <artifactId>templates-api-freemarker</artifactId>
-            <version>0.0.3</version>
+            <version>0.0.4</version>
         </dependency>
     </dependencies>
 

templates-maven-plugin/pom.xml

@@ -6,7 +6,7 @@
     <groupId>io.github.mrdaios</groupId>
     <artifactId>templates-maven-plugin</artifactId>
     <packaging>maven-plugin</packaging>
-    <version>0.0.3</version>
+    <version>0.0.4</version>
     <name>templates-maven-plugin</name>
     <description>templates</description>
     <url>https://github.com/mrdaios/templates-maven-plugin</url>
@@ -69,7 +69,7 @@
         <dependency>
             <groupId>io.github.mrdaios</groupId>
             <artifactId>templates-api</artifactId>
-            <version>0.0.3</version>
+            <version>0.0.4</version>
         </dependency>
     </dependencies>
 

templates-test/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>io.github.mrdaios</groupId>
         <artifactId>templates</artifactId>
-        <version>0.0.3</version>
+        <version>0.0.4</version>
     </parent>
     <artifactId>templates-test</artifactId>
 
@@ -21,12 +21,12 @@
             <plugin>
                 <groupId>io.github.mrdaios</groupId>
                 <artifactId>templates-maven-plugin</artifactId>
-                <version>0.0.3</version>
+                <version>0.0.4</version>
                 <dependencies>
                     <dependency>
                         <groupId>io.github.mrdaios</groupId>
                         <artifactId>templates-freemarker</artifactId>
-                        <version>0.0.3</version>
+                        <version>0.0.4</version>
                     </dependency>
                 </dependencies>
                 <configuration>