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
84fce193
Unverified
Commit
84fce193
authored
May 18, 2018
by
Liang Ding
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
🐛
Fix #12448
parent
bda144a3
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
6 deletions
+8
-6
src/main/java/org/b3log/solo/model/feed/rss/Item.java
src/main/java/org/b3log/solo/model/feed/rss/Item.java
+2
-2
src/main/java/org/b3log/solo/processor/FeedProcessor.java
src/main/java/org/b3log/solo/processor/FeedProcessor.java
+6
-3
src/main/java/org/b3log/solo/processor/SitemapProcessor.java
src/main/java/org/b3log/solo/processor/SitemapProcessor.java
+0
-1
No files found.
src/main/java/org/b3log/solo/model/feed/rss/Item.java
View file @
84fce193
...
@@ -27,7 +27,7 @@ import java.util.Set;
...
@@ -27,7 +27,7 @@ import java.util.Set;
* Item.
* Item.
*
*
* @author <a href="http://88250.b3log.org">Liang Ding</a>
* @author <a href="http://88250.b3log.org">Liang Ding</a>
* @version 1.1.
1.0, Mar 10
, 2018
* @version 1.1.
2.0, May 18
, 2018
* @since 0.3.1
* @since 0.3.1
*/
*/
public
final
class
Item
{
public
final
class
Item
{
...
@@ -269,7 +269,7 @@ public final class Item {
...
@@ -269,7 +269,7 @@ public final class Item {
stringBuilder
.
append
(
END_GUID_ELEMENT
);
stringBuilder
.
append
(
END_GUID_ELEMENT
);
for
(
final
Category
category
:
categories
)
{
for
(
final
Category
category
:
categories
)
{
stringBuilder
.
append
(
category
.
toString
(
));
stringBuilder
.
append
(
StringEscapeUtils
.
escapeXml
(
category
.
toString
()
));
}
}
stringBuilder
.
append
(
START_PUB_DATE_ELEMENT
);
stringBuilder
.
append
(
START_PUB_DATE_ELEMENT
);
...
...
src/main/java/org/b3log/solo/processor/FeedProcessor.java
View file @
84fce193
...
@@ -45,6 +45,7 @@ import org.b3log.solo.repository.TagRepository;
...
@@ -45,6 +45,7 @@ import org.b3log.solo.repository.TagRepository;
import
org.b3log.solo.service.ArticleQueryService
;
import
org.b3log.solo.service.ArticleQueryService
;
import
org.b3log.solo.service.PreferenceQueryService
;
import
org.b3log.solo.service.PreferenceQueryService
;
import
org.b3log.solo.service.UserQueryService
;
import
org.b3log.solo.service.UserQueryService
;
import
org.b3log.solo.util.Emotions
;
import
org.json.JSONArray
;
import
org.json.JSONArray
;
import
org.json.JSONObject
;
import
org.json.JSONObject
;
...
@@ -61,7 +62,7 @@ import java.util.List;
...
@@ -61,7 +62,7 @@ import java.util.List;
* @author <a href="http://88250.b3log.org">Liang Ding</a>
* @author <a href="http://88250.b3log.org">Liang Ding</a>
* @author <a href="https://github.com/feroozkhanchintu">feroozkhanchintu</a>
* @author <a href="https://github.com/feroozkhanchintu">feroozkhanchintu</a>
* @author <a href="https://github.com/nanolikeyou">nanolikeyou</a>
* @author <a href="https://github.com/nanolikeyou">nanolikeyou</a>
* @version 1.1.
0.8, Oct 21, 2017
* @version 1.1.
1.0, May 18, 2018
* @since 0.3.1
* @since 0.3.1
*/
*/
@RequestProcessor
@RequestProcessor
...
@@ -405,11 +406,13 @@ public class FeedProcessor {
...
@@ -405,11 +406,13 @@ public class FeedProcessor {
throws
org
.
json
.
JSONException
,
org
.
b3log
.
latke
.
service
.
ServiceException
{
throws
org
.
json
.
JSONException
,
org
.
b3log
.
latke
.
service
.
ServiceException
{
final
JSONObject
article
=
articles
.
getJSONObject
(
i
);
final
JSONObject
article
=
articles
.
getJSONObject
(
i
);
final
Item
ret
=
new
Item
();
final
Item
ret
=
new
Item
();
final
String
title
=
article
.
getString
(
Article
.
ARTICLE_TITLE
);
String
title
=
article
.
getString
(
Article
.
ARTICLE_TITLE
);
title
=
Emotions
.
toAliases
(
title
);
ret
.
setTitle
(
title
);
ret
.
setTitle
(
title
);
final
String
description
=
isFullContent
String
description
=
isFullContent
?
article
.
getString
(
Article
.
ARTICLE_CONTENT
)
?
article
.
getString
(
Article
.
ARTICLE_CONTENT
)
:
article
.
optString
(
Article
.
ARTICLE_ABSTRACT
);
:
article
.
optString
(
Article
.
ARTICLE_ABSTRACT
);
description
=
Emotions
.
toAliases
(
description
);
ret
.
setDescription
(
description
);
ret
.
setDescription
(
description
);
final
Date
pubDate
=
(
Date
)
article
.
get
(
Article
.
ARTICLE_UPDATE_DATE
);
final
Date
pubDate
=
(
Date
)
article
.
get
(
Article
.
ARTICLE_UPDATE_DATE
);
ret
.
setPubDate
(
pubDate
);
ret
.
setPubDate
(
pubDate
);
...
...
src/main/java/org/b3log/solo/processor/SitemapProcessor.java
View file @
84fce193
...
@@ -119,7 +119,6 @@ public class SitemapProcessor {
...
@@ -119,7 +119,6 @@ public class SitemapProcessor {
String
content
=
sitemap
.
toString
();
String
content
=
sitemap
.
toString
();
content
=
XMLs
.
format
(
content
);
content
=
XMLs
.
format
(
content
);
LOGGER
.
log
(
Level
.
INFO
,
"Generated sitemap"
);
LOGGER
.
log
(
Level
.
INFO
,
"Generated sitemap"
);
LOGGER
.
info
(
content
);
renderer
.
setContent
(
content
);
renderer
.
setContent
(
content
);
}
catch
(
final
Exception
e
)
{
}
catch
(
final
Exception
e
)
{
LOGGER
.
log
(
Level
.
ERROR
,
"Get blog article feed error"
,
e
);
LOGGER
.
log
(
Level
.
ERROR
,
"Get blog article feed error"
,
e
);
...
...
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