Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
solo-1
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-1
Commits
f87d51f0
Unverified
Commit
f87d51f0
authored
Feb 10, 2019
by
Liang Ding
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
🎨
#12645
parent
c7078528
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
45 additions
and
38 deletions
+45
-38
src/main/java/org/b3log/solo/SoloServletListener.java
src/main/java/org/b3log/solo/SoloServletListener.java
+0
-1
src/main/java/org/b3log/solo/processor/ArticleProcessor.java
src/main/java/org/b3log/solo/processor/ArticleProcessor.java
+45
-0
src/main/java/org/b3log/solo/processor/console/ArticleConsole.java
...java/org/b3log/solo/processor/console/ArticleConsole.java
+0
-37
No files found.
src/main/java/org/b3log/solo/SoloServletListener.java
View file @
f87d51f0
...
...
@@ -332,7 +332,6 @@ public final class SoloServletListener extends AbstractServletListener {
final
ArticleConsole
articleConsole
=
beanManager
.
getReference
(
ArticleConsole
.
class
);
DispatcherServlet
.
get
(
"/console/article/push2rhy"
,
articleConsole:
:
pushArticleToCommunity
);
DispatcherServlet
.
get
(
"/console/thumbs"
,
articleConsole:
:
getArticleThumbs
);
DispatcherServlet
.
post
(
"/console/markdown/2html"
,
articleConsole:
:
markdown2HTML
);
DispatcherServlet
.
get
(
"/console/article/{id}"
,
articleConsole:
:
getArticle
);
DispatcherServlet
.
get
(
"/console/articles/status/{status}/{page}/{pageSize}/{windowSize}"
,
articleConsole:
:
getArticles
);
DispatcherServlet
.
delete
(
"/console/article/{id}"
,
articleConsole:
:
removeArticle
);
...
...
src/main/java/org/b3log/solo/processor/ArticleProcessor.java
View file @
f87d51f0
...
...
@@ -43,6 +43,8 @@ import org.b3log.solo.event.EventTypes;
import
org.b3log.solo.model.*
;
import
org.b3log.solo.processor.console.ConsoleRenderer
;
import
org.b3log.solo.service.*
;
import
org.b3log.solo.util.Emotions
;
import
org.b3log.solo.util.Markdowns
;
import
org.b3log.solo.util.Skins
;
import
org.b3log.solo.util.Solos
;
import
org.json.JSONObject
;
...
...
@@ -135,6 +137,49 @@ public class ArticleProcessor {
@Inject
private
EventManager
eventManager
;
/**
* Markdowns.
* <p>
* Renders the response with a json object, for example,
* <pre>
* {
* "html": ""
* }
* </pre>
* </p>
*
* @param context the specified http request context
*/
@RequestProcessing
(
value
=
"/console/markdown/2html"
,
method
=
HttpMethod
.
POST
)
public
void
markdown2HTML
(
final
RequestContext
context
)
{
final
JSONObject
result
=
Solos
.
newSucc
();
context
.
renderJSON
(
result
);
final
String
markdownText
=
context
.
requestJSON
().
optString
(
"markdownText"
);
if
(
StringUtils
.
isBlank
(
markdownText
))
{
result
.
put
(
Common
.
DATA
,
""
);
return
;
}
if
(!
Solos
.
isLoggedIn
(
context
))
{
result
.
put
(
Keys
.
CODE
,
-
1
);
result
.
put
(
Keys
.
MSG
,
langPropsService
.
get
(
"getFailLabel"
));
return
;
}
try
{
String
html
=
Emotions
.
convert
(
markdownText
);
html
=
Markdowns
.
toHTML
(
html
);
result
.
put
(
Common
.
DATA
,
html
);
}
catch
(
final
Exception
e
)
{
LOGGER
.
log
(
Level
.
ERROR
,
e
.
getMessage
(),
e
);
result
.
put
(
Keys
.
CODE
,
-
1
);
result
.
put
(
Keys
.
MSG
,
langPropsService
.
get
(
"getFailLabel"
));
}
}
/**
* Shows the article view password form.
*
...
...
src/main/java/org/b3log/solo/processor/console/ArticleConsole.java
View file @
f87d51f0
...
...
@@ -36,9 +36,7 @@ import org.b3log.solo.model.Common;
import
org.b3log.solo.service.ArticleMgmtService
;
import
org.b3log.solo.service.ArticleQueryService
;
import
org.b3log.solo.service.UserQueryService
;
import
org.b3log.solo.util.Emotions
;
import
org.b3log.solo.util.Images
;
import
org.b3log.solo.util.Markdowns
;
import
org.b3log.solo.util.Solos
;
import
org.json.JSONArray
;
import
org.json.JSONObject
;
...
...
@@ -151,41 +149,6 @@ public class ArticleConsole {
result
.
put
(
"data"
,
urls
.
stream
().
map
(
url
->
Images
.
imageSize
(
url
,
width
,
height
)).
collect
(
Collectors
.
toList
()));
}
/**
* Markdowns.
* <p>
* Renders the response with a json object, for example,
* <pre>
* {
* "html": ""
* }
* </pre>
* </p>
*
* @param context the specified http request context
*/
public
void
markdown2HTML
(
final
RequestContext
context
)
{
final
JSONObject
result
=
Solos
.
newSucc
();
context
.
renderJSON
(
result
);
final
String
markdownText
=
context
.
requestJSON
().
optString
(
"markdownText"
);
if
(
StringUtils
.
isBlank
(
markdownText
))
{
result
.
put
(
Common
.
DATA
,
""
);
return
;
}
try
{
String
html
=
Emotions
.
convert
(
markdownText
);
html
=
Markdowns
.
toHTML
(
html
);
result
.
put
(
Common
.
DATA
,
html
);
}
catch
(
final
Exception
e
)
{
LOGGER
.
log
(
Level
.
ERROR
,
e
.
getMessage
(),
e
);
context
.
renderJSONValue
(
Keys
.
CODE
,
-
1
);
context
.
renderJSONValue
(
Keys
.
MSG
,
langPropsService
.
get
(
"getFailLabel"
));
}
}
/**
* Gets an article by the specified request json object.
* <p>
...
...
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