Skip to content

Commit

Permalink
Merge pull request otale#93 from dongm2ez/hotfix/otale#90
Browse files Browse the repository at this point in the history
🦄 Hotfix/otale#90
  • Loading branch information
hellokaton authored Mar 3, 2017
2 parents d629ed7 + 392cdfb commit 1b08ede
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 6 deletions.
5 changes: 5 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,11 @@
<artifactId>commonmark</artifactId>
<version>0.8.0</version>
</dependency>
<dependency>
<groupId>com.atlassian.commonmark</groupId>
<artifactId>commonmark-ext-gfm-tables</artifactId>
<version>0.8.0</version>
</dependency>
<!--web容器-->
<dependency>
<groupId>com.bladejava</groupId>
Expand Down
13 changes: 7 additions & 6 deletions src/main/java/com/tale/utils/TaleUtils.java
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
import com.tale.init.TaleConst;
import com.tale.model.Contents;
import com.tale.model.Users;
import org.commonmark.Extension;
import org.commonmark.ext.gfm.tables.TablesExtension;
import org.commonmark.node.Node;
import org.commonmark.parser.Parser;
import org.commonmark.renderer.html.HtmlRenderer;
Expand All @@ -27,6 +29,7 @@
import java.io.OutputStream;
import java.text.Normalizer;
import java.util.*;
import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;

Expand All @@ -42,11 +45,6 @@ public class TaleUtils {
*/
private static final int one_month = 30 * 24 * 60 * 60;

/**
* markdown解析器
*/
private static Parser parser = Parser.builder().build();

private static Random r = new Random();

/**
Expand Down Expand Up @@ -147,8 +145,11 @@ public static String mdToHtml(String markdown) {
if (StringKit.isBlank(markdown)) {
return "";
}

List<Extension> extensions = Arrays.asList(TablesExtension.create());
Parser parser = Parser.builder().extensions(extensions).build();
Node document = parser.parse(markdown);
HtmlRenderer renderer = HtmlRenderer.builder().build();
HtmlRenderer renderer = HtmlRenderer.builder().extensions(extensions).build();
String content = renderer.render(document);
content = Commons.emoji(content);

Expand Down

0 comments on commit 1b08ede

Please sign in to comment.