Commit 8bd3cb97 authored by Liang Ding's avatar Liang Ding

Fix #12107

parent f27ac24a
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- <!--
Description: Solo POM. Description: Solo POM.
Version: 3.10.1.19, May 10, 2016 Version: 3.11.1.19, May 16, 2016
Author: <a href="http://88250.b3log.org">Liang Ding</a> Author: <a href="http://88250.b3log.org">Liang Ding</a>
Author: <a href="http://www.annpeter.cn">Ann Peter</a> Author: <a href="http://www.annpeter.cn">Ann Peter</a>
--> -->
...@@ -112,7 +112,7 @@ ...@@ -112,7 +112,7 @@
<slf4j.version>1.7.5</slf4j.version> <slf4j.version>1.7.5</slf4j.version>
<jsoup.version>1.9.1</jsoup.version> <jsoup.version>1.9.1</jsoup.version>
<markdownpapers-core.version>1.4.2</markdownpapers-core.version> <pegdown.version>1.6.0</pegdown.version>
<qiniu.version>7.0.4.1</qiniu.version> <qiniu.version>7.0.4.1</qiniu.version>
<jetty.version>9.2.13.v20150730</jetty.version> <jetty.version>9.2.13.v20150730</jetty.version>
<commons-cli.version>1.3.1</commons-cli.version> <commons-cli.version>1.3.1</commons-cli.version>
...@@ -182,9 +182,9 @@ ...@@ -182,9 +182,9 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.tautua.markdownpapers</groupId> <groupId>org.pegdown</groupId>
<artifactId>markdownpapers-core</artifactId> <artifactId>pegdown</artifactId>
<version>${markdownpapers-core.version}</version> <version>${pegdown.version}</version>
</dependency> </dependency>
<dependency> <dependency>
......
...@@ -15,23 +15,20 @@ ...@@ -15,23 +15,20 @@
*/ */
package org.b3log.solo.util; package org.b3log.solo.util;
import org.apache.commons.lang.StringUtils;
import java.io.StringReader;
import java.io.StringWriter;
import org.b3log.latke.logging.Level;
import org.b3log.latke.logging.Logger; import org.b3log.latke.logging.Logger;
import org.b3log.latke.util.Strings; import org.b3log.latke.util.Strings;
import org.tautua.markdownpapers.Markdown; import org.pegdown.Extensions;
import org.tautua.markdownpapers.parser.ParseException; import org.pegdown.PegDownProcessor;
/** /**
* <a href="http://en.wikipedia.org/wiki/Markdown">Markdown</a> utilities. * <a href="http://en.wikipedia.org/wiki/Markdown">Markdown</a> utilities.
* *
* <p>Uses the <a href="http://markdown.tautua.org/">MarkdownPapers</a> as the converter.</p> * <p>
* Uses the <a href="http://markdown.tautua.org/">MarkdownPapers</a> as the converter.</p>
* *
* @author <a href="http://88250.b3log.org">Liang Ding</a> * @author <a href="http://88250.b3log.org">Liang Ding</a>
* @version 1.0.0.1, Feb 8, 2013 * @version 2.0.0.1, May 16, 2016
* @since 0.4.5 * @since 0.4.5
*/ */
public final class Markdowns { public final class Markdowns {
...@@ -45,30 +42,27 @@ public final class Markdowns { ...@@ -45,30 +42,27 @@ public final class Markdowns {
* Converts the specified markdown text to HTML. * Converts the specified markdown text to HTML.
* *
* @param markdownText the specified markdown text * @param markdownText the specified markdown text
* @return converted HTML, returns {@code null} if the specified markdown text is "" or {@code null}, returns "Markdown error" if * @return converted HTML, returns {@code null} if the specified markdown text is "" or {@code null}, returns
* exception * "Markdown error" if exception
*/ */
public static String toHTML(final String markdownText) { public static String toHTML(final String markdownText) {
if (Strings.isEmptyOrNull(markdownText)) { if (Strings.isEmptyOrNull(markdownText)) {
return null; return "";
} }
final StringWriter writer = new StringWriter(); final PegDownProcessor pegDownProcessor = new PegDownProcessor(Extensions.ALL, 5000);
final Markdown markdown = new Markdown(); String ret = pegDownProcessor.markdownToHtml(markdownText);
try { if (!StringUtils.startsWith(ret, "<p>")) {
markdown.transform(new StringReader(markdownText), writer); ret = "<p>" + ret + "</p>";
} catch (final ParseException e) {
LOGGER.log(Level.ERROR, "Markdown error", e);
return "Markdown error";
} }
return writer.toString(); return ret;
} }
/** /**
* Private constructor. * Private constructor.
*/ */
private Markdowns() {} private Markdowns() {
}
} }
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
# Browser visit protocol # Browser visit protocol
serverScheme=http serverScheme=http
# Browser visit domain name # Browser visit domain name
serverHost=192.168.20.8 serverHost=localhost
# Browser visit port, 80 as usual, THIS IS NOT SERVER LISTEN PORT! # Browser visit port, 80 as usual, THIS IS NOT SERVER LISTEN PORT!
serverPort=8080 serverPort=8080
......
...@@ -21,20 +21,20 @@ ...@@ -21,20 +21,20 @@
# #
#### H2 runtime #### #### H2 runtime ####
#runtimeDatabase=H2 runtimeDatabase=H2
#jdbc.username=root
#jdbc.password=
#jdbc.driver=org.h2.Driver
#jdbc.URL=jdbc:h2:~/b3log_solo_h2/db
#jdbc.pool=h2
#### MySQL runtime ####
runtimeDatabase=MYSQL
jdbc.username=root jdbc.username=root
jdbc.password= jdbc.password=
jdbc.driver=com.mysql.jdbc.Driver jdbc.driver=org.h2.Driver
jdbc.URL=jdbc:mysql://localhost:3306/b3log?useUnicode=yes&characterEncoding=utf8 jdbc.URL=jdbc:h2:~/b3log_solo_h2/db
jdbc.pool=druid jdbc.pool=h2
#### MySQL runtime ####
#runtimeDatabase=MYSQL
#jdbc.username=root
#jdbc.password=
#jdbc.driver=com.mysql.jdbc.Driver
#jdbc.URL=jdbc:mysql://localhost:3306/b3log?useUnicode=yes&characterEncoding=utf8
#jdbc.pool=druid
# The minConnCnt MUST larger or equal to 3 # The minConnCnt MUST larger or equal to 3
jdbc.minConnCnt=5 jdbc.minConnCnt=5
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment