Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
solo
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
solo
Commits
8bd3cb97
Commit
8bd3cb97
authored
May 16, 2016
by
Liang Ding
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix #12107
parent
f27ac24a
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
38 additions
and
44 deletions
+38
-44
pom.xml
pom.xml
+5
-5
src/main/java/org/b3log/solo/util/Markdowns.java
src/main/java/org/b3log/solo/util/Markdowns.java
+20
-26
src/main/resources/latke.properties
src/main/resources/latke.properties
+1
-1
src/main/resources/local.properties
src/main/resources/local.properties
+12
-12
No files found.
pom.xml
View file @
8bd3cb97
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="UTF-8"?>
<!--
<!--
Description: Solo POM.
Description: Solo POM.
Version: 3.1
0.1.19, May 10
, 2016
Version: 3.1
1.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>
...
...
src/main/java/org/b3log/solo/util/Markdowns.java
View file @
8bd3cb97
...
@@ -15,27 +15,24 @@
...
@@ -15,27 +15,24 @@
*/
*/
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
{
/**
/**
* Logger.
* Logger.
*/
*/
...
@@ -43,32 +40,29 @@ public final class Markdowns {
...
@@ -43,32 +40,29 @@ 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
()
{
}
}
}
src/main/resources/latke.properties
View file @
8bd3cb97
...
@@ -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
...
...
src/main/resources/local.properties
View file @
8bd3cb97
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment