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
d53f194c
Unverified
Commit
d53f194c
authored
May 10, 2020
by
Liang Ding
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
🎨
Format code
parent
c665ffbd
Changes
42
Show whitespace changes
Inline
Side-by-side
Showing
42 changed files
with
9 additions
and
109 deletions
+9
-109
src/main/java/org/b3log/solo/Server.java
src/main/java/org/b3log/solo/Server.java
+1
-3
src/main/java/org/b3log/solo/event/B3ArticleSender.java
src/main/java/org/b3log/solo/event/B3ArticleSender.java
+0
-3
src/main/java/org/b3log/solo/model/atom/Entry.java
src/main/java/org/b3log/solo/model/atom/Entry.java
+1
-1
src/main/java/org/b3log/solo/model/atom/Feed.java
src/main/java/org/b3log/solo/model/atom/Feed.java
+1
-1
src/main/java/org/b3log/solo/model/rss/Channel.java
src/main/java/org/b3log/solo/model/rss/Channel.java
+1
-1
src/main/java/org/b3log/solo/model/rss/Item.java
src/main/java/org/b3log/solo/model/rss/Item.java
+1
-1
src/main/java/org/b3log/solo/model/sitemap/Sitemap.java
src/main/java/org/b3log/solo/model/sitemap/Sitemap.java
+1
-1
src/main/java/org/b3log/solo/plugin/ToCPlugin.java
src/main/java/org/b3log/solo/plugin/ToCPlugin.java
+1
-1
src/main/java/org/b3log/solo/processor/ArticleProcessor.java
src/main/java/org/b3log/solo/processor/ArticleProcessor.java
+0
-16
src/main/java/org/b3log/solo/processor/B3Receiver.java
src/main/java/org/b3log/solo/processor/B3Receiver.java
+0
-5
src/main/java/org/b3log/solo/processor/BeforeRequestHandler.java
...n/java/org/b3log/solo/processor/BeforeRequestHandler.java
+0
-1
src/main/java/org/b3log/solo/processor/CategoryProcessor.java
...main/java/org/b3log/solo/processor/CategoryProcessor.java
+0
-3
src/main/java/org/b3log/solo/processor/CommentProcessor.java
src/main/java/org/b3log/solo/processor/CommentProcessor.java
+0
-1
src/main/java/org/b3log/solo/processor/FeedProcessor.java
src/main/java/org/b3log/solo/processor/FeedProcessor.java
+0
-1
src/main/java/org/b3log/solo/processor/FetchUploadProcessor.java
...n/java/org/b3log/solo/processor/FetchUploadProcessor.java
+0
-3
src/main/java/org/b3log/solo/processor/IndexProcessor.java
src/main/java/org/b3log/solo/processor/IndexProcessor.java
+0
-1
src/main/java/org/b3log/solo/processor/InitCheckHandler.java
src/main/java/org/b3log/solo/processor/InitCheckHandler.java
+0
-3
src/main/java/org/b3log/solo/processor/OAuthProcessor.java
src/main/java/org/b3log/solo/processor/OAuthProcessor.java
+0
-5
src/main/java/org/b3log/solo/processor/PermalinkHandler.java
src/main/java/org/b3log/solo/processor/PermalinkHandler.java
+0
-7
src/main/java/org/b3log/solo/processor/StaticMidware.java
src/main/java/org/b3log/solo/processor/StaticMidware.java
+0
-1
src/main/java/org/b3log/solo/processor/TagProcessor.java
src/main/java/org/b3log/solo/processor/TagProcessor.java
+0
-2
src/main/java/org/b3log/solo/processor/UserTemplateProcessor.java
.../java/org/b3log/solo/processor/UserTemplateProcessor.java
+0
-2
src/main/java/org/b3log/solo/processor/console/AdminConsole.java
...n/java/org/b3log/solo/processor/console/AdminConsole.java
+0
-6
src/main/java/org/b3log/solo/processor/console/ArticleConsole.java
...java/org/b3log/solo/processor/console/ArticleConsole.java
+0
-6
src/main/java/org/b3log/solo/processor/console/CategoryConsole.java
...ava/org/b3log/solo/processor/console/CategoryConsole.java
+0
-11
src/main/java/org/b3log/solo/processor/console/CommentConsole.java
...java/org/b3log/solo/processor/console/CommentConsole.java
+0
-1
src/main/java/org/b3log/solo/processor/console/ConsoleAdminAuthMidware.java
...b3log/solo/processor/console/ConsoleAdminAuthMidware.java
+0
-1
src/main/java/org/b3log/solo/processor/console/ConsoleAuthMidware.java
.../org/b3log/solo/processor/console/ConsoleAuthMidware.java
+0
-1
src/main/java/org/b3log/solo/processor/console/LinkConsole.java
...in/java/org/b3log/solo/processor/console/LinkConsole.java
+0
-1
src/main/java/org/b3log/solo/processor/console/PageConsole.java
...in/java/org/b3log/solo/processor/console/PageConsole.java
+0
-1
src/main/java/org/b3log/solo/processor/console/PreferenceConsole.java
...a/org/b3log/solo/processor/console/PreferenceConsole.java
+0
-1
src/main/java/org/b3log/solo/processor/console/SkinConsole.java
...in/java/org/b3log/solo/processor/console/SkinConsole.java
+0
-2
src/main/java/org/b3log/solo/processor/console/StaticSiteConsole.java
...a/org/b3log/solo/processor/console/StaticSiteConsole.java
+0
-2
src/main/java/org/b3log/solo/processor/console/UserConsole.java
...in/java/org/b3log/solo/processor/console/UserConsole.java
+0
-1
src/main/java/org/b3log/solo/service/ArticleMgmtService.java
src/main/java/org/b3log/solo/service/ArticleMgmtService.java
+0
-1
src/main/java/org/b3log/solo/service/CategoryMgmtService.java
...main/java/org/b3log/solo/service/CategoryMgmtService.java
+0
-1
src/main/java/org/b3log/solo/service/CommentQueryService.java
...main/java/org/b3log/solo/service/CommentQueryService.java
+0
-1
src/main/java/org/b3log/solo/service/ExportService.java
src/main/java/org/b3log/solo/service/ExportService.java
+0
-2
src/main/java/org/b3log/solo/service/UpgradeService.java
src/main/java/org/b3log/solo/service/UpgradeService.java
+0
-1
src/main/java/org/b3log/solo/service/UserMgmtService.java
src/main/java/org/b3log/solo/service/UserMgmtService.java
+0
-2
src/main/java/org/b3log/solo/util/Markdowns.java
src/main/java/org/b3log/solo/util/Markdowns.java
+0
-1
src/main/java/org/b3log/solo/util/Statics.java
src/main/java/org/b3log/solo/util/Statics.java
+2
-3
No files found.
src/main/java/org/b3log/solo/Server.java
View file @
d53f194c
...
...
@@ -85,7 +85,7 @@ public final class Server extends BaseServer {
public
static
class
TailStringWriter
extends
StringWriter
{
private
AtomicInteger
count
=
new
AtomicInteger
();
private
final
AtomicInteger
count
=
new
AtomicInteger
();
@Override
public
void
flush
()
{
...
...
@@ -153,13 +153,11 @@ public final class Server extends BaseServer {
commandLine
=
commandLineParser
.
parse
(
options
,
args
);
}
catch
(
final
ParseException
e
)
{
helpFormatter
.
printHelp
(
cmdSyntax
,
header
,
options
,
footer
,
true
);
return
;
}
if
(
commandLine
.
hasOption
(
"h"
))
{
helpFormatter
.
printHelp
(
cmdSyntax
,
header
,
options
,
footer
,
true
);
return
;
}
...
...
src/main/java/org/b3log/solo/event/B3ArticleSender.java
View file @
d53f194c
...
...
@@ -73,19 +73,16 @@ public class B3ArticleSender extends AbstractEventListener<JSONObject> {
final
String
title
=
originalArticle
.
getString
(
Article
.
ARTICLE_TITLE
);
if
(
Article
.
ARTICLE_STATUS_C_PUBLISHED
!=
originalArticle
.
optInt
(
Article
.
ARTICLE_STATUS
))
{
LOGGER
.
log
(
Level
.
INFO
,
"Ignored push a draft [title={}] to Rhy"
,
title
);
return
;
}
if
(
StringUtils
.
isNotBlank
(
originalArticle
.
optString
(
Article
.
ARTICLE_VIEW_PWD
)))
{
LOGGER
.
log
(
Level
.
INFO
,
"Article [title={}] is a password article, ignored push to Rhy"
,
title
);
return
;
}
if
(!
originalArticle
.
optBoolean
(
Common
.
POST_TO_COMMUNITY
))
{
LOGGER
.
log
(
Level
.
INFO
,
"Article [title={}] push flag [postToCommunity] is [false], ignored push to Rhy"
,
title
);
return
;
}
...
...
src/main/java/org/b3log/solo/model/atom/Entry.java
View file @
d53f194c
...
...
@@ -153,7 +153,7 @@ public final class Entry {
/**
* Categories.
*/
private
Set
<
Category
>
categories
=
new
HashSet
<
Category
>();
private
final
Set
<
Category
>
categories
=
new
HashSet
<
Category
>();
/**
* Gets the URI.
...
...
src/main/java/org/b3log/solo/model/atom/Feed.java
View file @
d53f194c
...
...
@@ -157,7 +157,7 @@ public final class Feed {
/**
* Entries.
*/
private
List
<
Entry
>
entries
=
new
ArrayList
<>();
private
final
List
<
Entry
>
entries
=
new
ArrayList
<>();
/**
* Gets the id.
...
...
src/main/java/org/b3log/solo/model/rss/Channel.java
View file @
d53f194c
...
...
@@ -153,7 +153,7 @@ public final class Channel {
/**
* Items.
*/
private
List
<
Item
>
items
=
new
ArrayList
<>();
private
final
List
<
Item
>
items
=
new
ArrayList
<>();
/**
* Gets the atom link.
...
...
src/main/java/org/b3log/solo/model/rss/Item.java
View file @
d53f194c
...
...
@@ -71,7 +71,7 @@ public final class Item {
/**
* Categories.
*/
private
Set
<
Category
>
categories
=
new
HashSet
<>();
private
final
Set
<
Category
>
categories
=
new
HashSet
<>();
/**
* Start guid element.
...
...
src/main/java/org/b3log/solo/model/sitemap/Sitemap.java
View file @
d53f194c
...
...
@@ -49,7 +49,7 @@ public final class Sitemap {
/**
* URLs.
*/
private
List
<
URL
>
urls
=
new
ArrayList
<>();
private
final
List
<
URL
>
urls
=
new
ArrayList
<>();
/**
* Adds the specified url.
...
...
src/main/java/org/b3log/solo/plugin/ToCPlugin.java
View file @
d53f194c
...
...
@@ -41,7 +41,7 @@ import java.util.Map;
*/
public
class
ToCPlugin
extends
NotInteractivePlugin
{
private
ToCEventHandler
handler
=
new
ToCEventHandler
();
private
final
ToCEventHandler
handler
=
new
ToCEventHandler
();
@Override
public
void
changeStatus
()
{
...
...
src/main/java/org/b3log/solo/processor/ArticleProcessor.java
View file @
d53f194c
...
...
@@ -143,14 +143,12 @@ public class ArticleProcessor {
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
;
}
...
...
@@ -173,14 +171,12 @@ public class ArticleProcessor {
final
String
articleId
=
context
.
param
(
"articleId"
);
if
(
StringUtils
.
isBlank
(
articleId
))
{
context
.
sendError
(
404
);
return
;
}
final
JSONObject
article
=
articleQueryService
.
getArticleById
(
articleId
);
if
(
null
==
article
)
{
context
.
sendError
(
404
);
return
;
}
...
...
@@ -238,7 +234,6 @@ public class ArticleProcessor {
}
context
.
sendRedirect
(
Latkes
.
getServePath
()
+
article
.
getString
(
Article
.
ARTICLE_PERMALINK
));
return
;
}
...
...
@@ -266,7 +261,6 @@ public class ArticleProcessor {
final
JsonRenderer
renderer
=
new
JsonRenderer
();
context
.
setRenderer
(
renderer
);
renderer
.
setJSONObject
(
jsonObject
);
return
;
}
...
...
@@ -299,7 +293,6 @@ public class ArticleProcessor {
final
JsonRenderer
renderer
=
new
JsonRenderer
();
context
.
setRenderer
(
renderer
);
renderer
.
setJSONObject
(
jsonObject
);
return
;
}
...
...
@@ -308,14 +301,12 @@ public class ArticleProcessor {
final
String
articleId
=
context
.
pathVar
(
"id"
);
if
(
StringUtils
.
isBlank
(
articleId
))
{
context
.
sendError
(
404
);
return
;
}
final
JSONObject
article
=
articleQueryService
.
getArticleById
(
articleId
);
if
(
null
==
article
)
{
context
.
sendError
(
404
);
return
;
}
...
...
@@ -524,7 +515,6 @@ public class ArticleProcessor {
final
JSONObject
authorRet
=
userQueryService
.
getUser
(
authorId
);
if
(
null
==
authorRet
)
{
context
.
sendError
(
404
);
return
;
}
...
...
@@ -568,7 +558,6 @@ public class ArticleProcessor {
final
JSONObject
preference
=
optionQueryService
.
getPreference
();
if
(
null
==
preference
)
{
context
.
sendError
(
404
);
return
;
}
...
...
@@ -578,14 +567,12 @@ public class ArticleProcessor {
final
JSONObject
result
=
userQueryService
.
getUser
(
authorId
);
if
(
null
==
result
)
{
context
.
sendError
(
404
);
return
;
}
final
JSONObject
articlesResult
=
articleQueryService
.
getArticlesByAuthorId
(
authorId
,
currentPageNum
,
pageSize
);
if
(
null
==
articlesResult
)
{
context
.
sendError
(
404
);
return
;
}
...
...
@@ -626,7 +613,6 @@ public class ArticleProcessor {
if
(
null
==
result
)
{
LOGGER
.
log
(
Level
.
DEBUG
,
"Can not find articles for the specified archive date[string={}]"
,
archiveDateString
);
context
.
sendError
(
404
);
return
;
}
...
...
@@ -642,7 +628,6 @@ public class ArticleProcessor {
final
List
<
JSONObject
>
articles
=
articleQueryService
.
getArticlesByArchiveDate
(
archiveDateId
,
currentPageNum
,
pageSize
);
if
(
articles
.
isEmpty
())
{
context
.
sendError
(
404
);
return
;
}
...
...
@@ -671,7 +656,6 @@ public class ArticleProcessor {
final
JSONObject
article
=
(
JSONObject
)
context
.
attr
(
Article
.
ARTICLE
);
if
(
null
==
article
)
{
context
.
sendError
(
404
);
return
;
}
...
...
src/main/java/org/b3log/solo/processor/B3Receiver.java
View file @
d53f194c
...
...
@@ -139,7 +139,6 @@ public class B3Receiver {
final
String
msg
=
"Not found client"
;
ret
.
put
(
Keys
.
MSG
,
msg
);
LOGGER
.
log
(
Level
.
WARN
,
msg
);
return
;
}
...
...
@@ -151,7 +150,6 @@ public class B3Receiver {
final
String
msg
=
"Not found user ["
+
articleAuthorName
+
"]"
;
ret
.
put
(
Keys
.
MSG
,
msg
);
LOGGER
.
log
(
Level
.
WARN
,
msg
);
return
;
}
...
...
@@ -162,7 +160,6 @@ public class B3Receiver {
final
String
msg
=
"Wrong key"
;
ret
.
put
(
Keys
.
MSG
,
msg
);
LOGGER
.
log
(
Level
.
WARN
,
msg
);
return
;
}
...
...
@@ -172,7 +169,6 @@ public class B3Receiver {
final
String
msg
=
"Not found article"
;
ret
.
put
(
Keys
.
MSG
,
msg
);
LOGGER
.
log
(
Level
.
WARN
,
msg
);
return
;
}
...
...
@@ -197,7 +193,6 @@ public class B3Receiver {
final
JSONObject
addRequest
=
new
JSONObject
().
put
(
Article
.
ARTICLE
,
article
);
articleMgmtService
.
addArticle
(
addRequest
);
LOGGER
.
log
(
Level
.
INFO
,
"Added an article ["
+
title
+
"] via Sym"
);
return
;
}
...
...
src/main/java/org/b3log/solo/processor/BeforeRequestHandler.java
View file @
d53f194c
...
...
@@ -36,7 +36,6 @@ public class BeforeRequestHandler implements Handler {
context
.
setHeader
(
"Retry-After"
,
"600"
);
context
.
sendString
(
"Too Many Requests"
);
context
.
abort
();
return
;
}
...
...
src/main/java/org/b3log/solo/processor/CategoryProcessor.java
View file @
d53f194c
...
...
@@ -106,7 +106,6 @@ public class CategoryProcessor {
final
JSONObject
category
=
categoryQueryService
.
getByURI
(
categoryURI
);
if
(
null
==
category
)
{
context
.
sendError
(
404
);
return
;
}
...
...
@@ -155,7 +154,6 @@ public class CategoryProcessor {
final
JSONObject
category
=
categoryQueryService
.
getByURI
(
categoryURI
);
if
(
null
==
category
)
{
context
.
sendError
(
404
);
return
;
}
...
...
@@ -171,7 +169,6 @@ public class CategoryProcessor {
final
int
pageCount
=
result
.
optJSONObject
(
Pagination
.
PAGINATION
).
optInt
(
Pagination
.
PAGINATION_PAGE_COUNT
);
if
(
0
==
pageCount
)
{
context
.
sendError
(
404
);
return
;
}
...
...
src/main/java/org/b3log/solo/processor/CommentProcessor.java
View file @
d53f194c
...
...
@@ -136,7 +136,6 @@ public class CommentProcessor {
if
(!
Solos
.
isLoggedIn
(
context
))
{
jsonObject
.
put
(
Keys
.
STATUS_CODE
,
false
);
jsonObject
.
put
(
Keys
.
MSG
,
"Need login"
);
return
;
}
...
...
src/main/java/org/b3log/solo/processor/FeedProcessor.java
View file @
d53f194c
...
...
@@ -167,7 +167,6 @@ public class FeedProcessor {
final
JSONObject
preference
=
optionQueryService
.
getPreference
();
if
(
null
==
preference
)
{
context
.
sendError
(
404
);
return
;
}
...
...
src/main/java/org/b3log/solo/processor/FetchUploadProcessor.java
View file @
d53f194c
...
...
@@ -72,7 +72,6 @@ public class FetchUploadProcessor {
final
String
msg
=
"Gets upload token failed"
;
LOGGER
.
log
(
Level
.
ERROR
,
msg
);
result
.
put
(
Keys
.
MSG
,
msg
);
return
;
}
...
...
@@ -93,7 +92,6 @@ public class FetchUploadProcessor {
}
catch
(
final
Exception
e
)
{
LOGGER
.
log
(
Level
.
ERROR
,
"Fetch file [url="
+
originalURL
+
"] failed"
,
e
);
result
.
put
(
Keys
.
MSG
,
"Fetch file [url="
+
originalURL
+
"] failed"
);
return
;
}
...
...
@@ -124,7 +122,6 @@ public class FetchUploadProcessor {
final
String
msg
=
"Upload file to community OSS [url="
+
originalURL
+
"] failed"
;
LOGGER
.
log
(
Level
.
ERROR
,
msg
,
e
);
result
.
put
(
Keys
.
MSG
,
msg
);
return
;
}
...
...
src/main/java/org/b3log/solo/processor/IndexProcessor.java
View file @
d53f194c
...
...
@@ -126,7 +126,6 @@ public class IndexProcessor {
public
void
showStart
(
final
RequestContext
context
)
{
if
(
initService
.
isInited
()
&&
null
!=
Solos
.
getCurrentUser
(
context
))
{
context
.
sendRedirect
(
Latkes
.
getServePath
());
return
;
}
...
...
src/main/java/org/b3log/solo/processor/InitCheckHandler.java
View file @
d53f194c
...
...
@@ -50,7 +50,6 @@ public class InitCheckHandler implements Handler {
// 禁止直接获取 robots.txt https://github.com/b3log/solo/issues/12543
if
(
requestURI
.
startsWith
(
"/robots.txt"
)
&&
!
isSpiderBot
)
{
context
.
sendError
(
403
);
return
;
}
...
...
@@ -58,14 +57,12 @@ public class InitCheckHandler implements Handler {
final
InitService
initService
=
beanManager
.
getReference
(
InitService
.
class
);
if
(
initService
.
isInited
())
{
context
.
handle
();
return
;
}
if
(
StringUtils
.
startsWith
(
requestURI
,
Latkes
.
getContextPath
()
+
"/login/"
))
{
// Do initialization
context
.
handle
();
return
;
}
...
...
src/main/java/org/b3log/solo/processor/OAuthProcessor.java
View file @
d53f194c
...
...
@@ -124,7 +124,6 @@ public class OAuthProcessor {
final
String
referer
=
STATES
.
get
(
state
);
if
(
null
==
referer
)
{
context
.
sendError
(
400
);
return
;
}
STATES
.
remove
(
state
);
...
...
@@ -158,7 +157,6 @@ public class OAuthProcessor {
}
catch
(
final
Exception
e
)
{
LOGGER
.
log
(
Level
.
ERROR
,
"Registers via oauth failed"
,
e
);
context
.
sendError
(
500
);
return
;
}
}
else
{
...
...
@@ -169,7 +167,6 @@ public class OAuthProcessor {
}
catch
(
final
Exception
e
)
{
LOGGER
.
log
(
Level
.
ERROR
,
"Updates user GitHub id failed"
,
e
);
context
.
sendError
(
500
);
return
;
}
}
...
...
@@ -182,7 +179,6 @@ public class OAuthProcessor {
}
catch
(
final
Exception
e
)
{
LOGGER
.
log
(
Level
.
ERROR
,
"Updates user name failed"
,
e
);
context
.
sendError
(
500
);
return
;
}
}
...
...
@@ -191,7 +187,6 @@ public class OAuthProcessor {
if
(
null
==
user
)
{
LOGGER
.
log
(
Level
.
WARN
,
"Can't get user by name ["
+
userName
+
"]"
);
context
.
sendError
(
404
);
return
;
}
...
...
src/main/java/org/b3log/solo/processor/PermalinkHandler.java
View file @
d53f194c
...
...
@@ -59,7 +59,6 @@ public class PermalinkHandler implements Handler {
final
InitService
initService
=
beanManager
.
getReference
(
InitService
.
class
);
if
(!
initService
.
isInited
())
{
context
.
handle
();
return
;
}
...
...
@@ -69,7 +68,6 @@ public class PermalinkHandler implements Handler {
if
(
PermalinkQueryService
.
invalidPermalinkFormat
(
permalink
))
{
LOGGER
.
log
(
Level
.
DEBUG
,
"Skip permalink handling request [URI={}]"
,
permalink
);
context
.
handle
();
return
;
}
...
...
@@ -78,13 +76,11 @@ public class PermalinkHandler implements Handler {
if
(
null
==
article
)
{
LOGGER
.
log
(
Level
.
DEBUG
,
"Not found article with permalink [{}]"
,
permalink
);
context
.
handle
();
return
;
}
}
catch
(
final
RepositoryException
e
)
{
LOGGER
.
log
(
Level
.
ERROR
,
"Processes article permalink handler failed"
,
e
);
context
.
sendError
(
404
);
return
;
}
...
...
@@ -92,11 +88,9 @@ public class PermalinkHandler implements Handler {
if
(
Solos
.
needViewPwd
(
context
,
article
))
{
try
{
context
.
sendRedirect
(
Latkes
.
getServePath
()
+
"/console/article-pwd?articleId="
+
article
.
optString
(
Keys
.
OBJECT_ID
));
return
;
}
catch
(
final
Exception
e
)
{
context
.
sendError
(
404
);
return
;
}
}
...
...
@@ -106,7 +100,6 @@ public class PermalinkHandler implements Handler {
final
boolean
allowVisitDraftViaPermalink
=
preference
.
getBoolean
(
Option
.
ID_C_ALLOW_VISIT_DRAFT_VIA_PERMALINK
);
if
(
Article
.
ARTICLE_STATUS_C_PUBLISHED
!=
article
.
optInt
(
Article
.
ARTICLE_STATUS
)
&&
!
allowVisitDraftViaPermalink
)
{
context
.
sendError
(
404
);
return
;
}
...
...
src/main/java/org/b3log/solo/processor/StaticMidware.java
View file @
d53f194c
...
...
@@ -36,7 +36,6 @@ public class StaticMidware {
final
String
html
=
Statics
.
get
(
context
);
if
(
null
==
html
)
{
context
.
handle
();
return
;
}
...
...
src/main/java/org/b3log/solo/processor/TagProcessor.java
View file @
d53f194c
...
...
@@ -101,7 +101,6 @@ public class TagProcessor {
final
JSONObject
result
=
tagQueryService
.
getTagByTitle
(
tagTitle
);
if
(
null
==
result
)
{
context
.
sendError
(
404
);
return
;
}
...
...
@@ -116,7 +115,6 @@ public class TagProcessor {
final
JSONObject
tagArticleResult
=
articleQueryService
.
getArticlesByTag
(
tagId
,
currentPageNum
,
pageSize
);
if
(
null
==
tagArticleResult
)
{
context
.
sendError
(
404
);
return
;
}
...
...
src/main/java/org/b3log/solo/processor/UserTemplateProcessor.java
View file @
d53f194c
...
...
@@ -93,7 +93,6 @@ public class UserTemplateProcessor {
}
catch
(
final
Exception
e
)
{
LOGGER
.
log
(
Level
.
ERROR
,
"Renders CHANGE_LOGS failed"
,
e
);
}
return
;
}
...
...
@@ -107,7 +106,6 @@ public class UserTemplateProcessor {
final
Template
template
=
Skins
.
getSkinTemplate
(
context
,
templateName
);
if
(
null
==
template
)
{
context
.
sendError
(
404
);
return
;
}
...
...
src/main/java/org/b3log/solo/processor/console/AdminConsole.java
View file @
d53f194c
...
...
@@ -230,7 +230,6 @@ public class AdminConsole {
if
(!
Solos
.
isAdminLoggedIn
(
context
))
{
context
.
sendError
(
401
);
return
;
}
...
...
@@ -243,7 +242,6 @@ public class AdminConsole {
final
byte
[]
zipData
=
exportService
.
exportSQL
();
if
(
null
==
zipData
)
{
context
.
sendError
(
500
);
return
;
}
...
...
@@ -263,7 +261,6 @@ public class AdminConsole {
final
Response
response
=
context
.
getResponse
();
if
(!
Solos
.
isAdminLoggedIn
(
context
))
{
context
.
sendError
(
401
);
return
;
}
...
...
@@ -297,7 +294,6 @@ public class AdminConsole {
}
catch
(
final
Exception
e
)
{
LOGGER
.
log
(
Level
.
ERROR
,
"Export failed"
,
e
);
context
.
renderJSON
().
renderMsg
(
"Export failed, please check log"
);
return
;
}
}
...
...
@@ -311,7 +307,6 @@ public class AdminConsole {
final
Response
response
=
context
.
getResponse
();
if
(!
Solos
.
isAdminLoggedIn
(
context
))
{
context
.
sendError
(
401
);
return
;
}
...
...
@@ -363,7 +358,6 @@ public class AdminConsole {
}
catch
(
final
Exception
e
)
{
LOGGER
.
log
(
Level
.
ERROR
,
"Export failed"
,
e
);
context
.
renderJSON
().
renderMsg
(
"Export failed, please check log"
);
return
;
}
}
...
...
src/main/java/org/b3log/solo/processor/console/ArticleConsole.java
View file @
d53f194c
...
...
@@ -180,7 +180,6 @@ public class ArticleConsole {
renderer
.
setJSONObject
(
ret
);
ret
.
put
(
Keys
.
STATUS_CODE
,
false
);
ret
.
put
(
Keys
.
MSG
,
langPropsService
.
get
(
"forbiddenLabel"
));
return
;
}
...
...
@@ -298,7 +297,6 @@ public class ArticleConsole {
if
(!
articleQueryService
.
canAccessArticle
(
articleId
,
currentUser
))
{
ret
.
put
(
Keys
.
STATUS_CODE
,
false
);
ret
.
put
(
Keys
.
MSG
,
langPropsService
.
get
(
"forbiddenLabel"
));
return
;
}
...
...
@@ -342,7 +340,6 @@ public class ArticleConsole {
if
(!
articleQueryService
.
canAccessArticle
(
articleId
,
currentUser
))
{
ret
.
put
(
Keys
.
STATUS_CODE
,
false
);
ret
.
put
(
Keys
.
MSG
,
langPropsService
.
get
(
"forbiddenLabel"
));
return
;
}
...
...
@@ -382,7 +379,6 @@ public class ArticleConsole {
if
(!
Solos
.
isAdminLoggedIn
(
context
))
{
ret
.
put
(
Keys
.
MSG
,
langPropsService
.
get
(
"forbiddenLabel"
));
ret
.
put
(
Keys
.
STATUS_CODE
,
false
);
return
;
}
...
...
@@ -423,7 +419,6 @@ public class ArticleConsole {
if
(!
Solos
.
isAdminLoggedIn
(
context
))
{
ret
.
put
(
Keys
.
MSG
,
langPropsService
.
get
(
"forbiddenLabel"
));
ret
.
put
(
Keys
.
STATUS_CODE
,
false
);
return
;
}
...
...
@@ -490,7 +485,6 @@ public class ArticleConsole {
if
(!
articleQueryService
.
canAccessArticle
(
articleId
,
currentUser
))
{
ret
.
put
(
Keys
.
MSG
,
langPropsService
.
get
(
"forbiddenLabel"
));
ret
.
put
(
Keys
.
STATUS_CODE
,
false
);
return
;
}
...
...
src/main/java/org/b3log/solo/processor/console/CategoryConsole.java
View file @
d53f194c
...
...
@@ -156,7 +156,6 @@ public class CategoryConsole {
final
JSONObject
result
=
categoryQueryService
.
getCategory
(
categoryId
);
if
(
null
==
result
)
{
renderer
.
setJSONObject
(
new
JSONObject
().
put
(
Keys
.
STATUS_CODE
,
false
));
return
;
}
...
...
@@ -273,7 +272,6 @@ public class CategoryConsole {
final
JSONObject
jsonObject
=
new
JSONObject
().
put
(
Keys
.
STATUS_CODE
,
false
);
renderer
.
setJSONObject
(
jsonObject
);
jsonObject
.
put
(
Keys
.
MSG
,
addArticleWithTagFirstLabel
);
return
;
}
...
...
@@ -292,7 +290,6 @@ public class CategoryConsole {
final
JSONObject
jsonObject
=
new
JSONObject
().
put
(
Keys
.
STATUS_CODE
,
false
);
renderer
.
setJSONObject
(
jsonObject
);
jsonObject
.
put
(
Keys
.
MSG
,
langPropsService
.
get
(
"duplicatedCategoryLabel"
));
return
;
}
...
...
@@ -301,7 +298,6 @@ public class CategoryConsole {
final
JSONObject
jsonObject
=
new
JSONObject
().
put
(
Keys
.
STATUS_CODE
,
false
);
renderer
.
setJSONObject
(
jsonObject
);
jsonObject
.
put
(
Keys
.
MSG
,
langPropsService
.
get
(
"categoryURIMustBeASCIILabel"
));
return
;
}
...
...
@@ -310,14 +306,12 @@ public class CategoryConsole {
final
JSONObject
jsonObject
=
new
JSONObject
().
put
(
Keys
.
STATUS_CODE
,
false
);
renderer
.
setJSONObject
(
jsonObject
);
jsonObject
.
put
(
Keys
.
MSG
,
langPropsService
.
get
(
"duplicatedCategoryURILabel"
));
return
;
}
if
(
255
<=
StringUtils
.
length
(
uri
))
{
final
JSONObject
jsonObject
=
new
JSONObject
().
put
(
Keys
.
STATUS_CODE
,
false
);
renderer
.
setJSONObject
(
jsonObject
);
jsonObject
.
put
(
Keys
.
MSG
,
langPropsService
.
get
(
"categoryURITooLongLabel"
));
return
;
}
...
...
@@ -409,7 +403,6 @@ public class CategoryConsole {
final
JSONObject
jsonObject
=
new
JSONObject
().
put
(
Keys
.
STATUS_CODE
,
false
);
renderer
.
setJSONObject
(
jsonObject
);
jsonObject
.
put
(
Keys
.
MSG
,
addArticleWithTagFirstLabel
);
return
;
}
...
...
@@ -427,7 +420,6 @@ public class CategoryConsole {
final
JSONObject
jsonObject
=
new
JSONObject
().
put
(
Keys
.
STATUS_CODE
,
false
);
renderer
.
setJSONObject
(
jsonObject
);
jsonObject
.
put
(
Keys
.
MSG
,
langPropsService
.
get
(
"duplicatedCategoryLabel"
));
return
;
}
...
...
@@ -436,7 +428,6 @@ public class CategoryConsole {
final
JSONObject
jsonObject
=
new
JSONObject
().
put
(
Keys
.
STATUS_CODE
,
false
);
renderer
.
setJSONObject
(
jsonObject
);
jsonObject
.
put
(
Keys
.
MSG
,
langPropsService
.
get
(
"categoryURIMustBeASCIILabel"
));
return
;
}
mayExist
=
categoryQueryService
.
getByURI
(
uri
);
...
...
@@ -444,14 +435,12 @@ public class CategoryConsole {
final
JSONObject
jsonObject
=
new
JSONObject
().
put
(
Keys
.
STATUS_CODE
,
false
);
renderer
.
setJSONObject
(
jsonObject
);
jsonObject
.
put
(
Keys
.
MSG
,
langPropsService
.
get
(
"duplicatedCategoryURILabel"
));
return
;
}
if
(
255
<=
StringUtils
.
length
(
uri
))
{
final
JSONObject
jsonObject
=
new
JSONObject
().
put
(
Keys
.
STATUS_CODE
,
false
);
renderer
.
setJSONObject
(
jsonObject
);
jsonObject
.
put
(
Keys
.
MSG
,
langPropsService
.
get
(
"categoryURITooLongLabel"
));
return
;
}
...
...
src/main/java/org/b3log/solo/processor/console/CommentConsole.java
View file @
d53f194c
...
...
@@ -88,7 +88,6 @@ public class CommentConsole {
if
(!
commentQueryService
.
canAccessComment
(
commentId
,
currentUser
))
{
ret
.
put
(
Keys
.
STATUS_CODE
,
false
);
ret
.
put
(
Keys
.
MSG
,
langPropsService
.
get
(
"forbiddenLabel"
));
return
;
}
...
...
src/main/java/org/b3log/solo/processor/console/ConsoleAdminAuthMidware.java
View file @
d53f194c
...
...
@@ -29,7 +29,6 @@ public class ConsoleAdminAuthMidware {
if
(!
Solos
.
isAdminLoggedIn
(
context
))
{
context
.
sendError
(
401
);
context
.
abort
();
return
;
}
...
...
src/main/java/org/b3log/solo/processor/console/ConsoleAuthMidware.java
View file @
d53f194c
...
...
@@ -33,7 +33,6 @@ public class ConsoleAuthMidware {
if
(
null
==
currentUser
)
{
context
.
sendError
(
401
);
context
.
abort
();
return
;
}
...
...
src/main/java/org/b3log/solo/processor/console/LinkConsole.java
View file @
d53f194c
...
...
@@ -323,7 +323,6 @@ public class LinkConsole {
final
JSONObject
result
=
linkQueryService
.
getLink
(
linkId
);
if
(
null
==
result
)
{
renderer
.
setJSONObject
(
new
JSONObject
().
put
(
Keys
.
STATUS_CODE
,
false
));
return
;
}
...
...
src/main/java/org/b3log/solo/processor/console/PageConsole.java
View file @
d53f194c
...
...
@@ -283,7 +283,6 @@ public class PageConsole {
final
JSONObject
result
=
pageQueryService
.
getPage
(
pageId
);
if
(
null
==
result
)
{
renderer
.
setJSONObject
(
new
JSONObject
().
put
(
Keys
.
STATUS_CODE
,
false
));
return
;
}
...
...
src/main/java/org/b3log/solo/processor/console/PreferenceConsole.java
View file @
d53f194c
...
...
@@ -181,7 +181,6 @@ public class PreferenceConsole {
final
JSONObject
preference
=
optionQueryService
.
getPreference
();
if
(
null
==
preference
)
{
renderer
.
setJSONObject
(
new
JSONObject
().
put
(
Keys
.
STATUS_CODE
,
false
));
return
;
}
...
...
src/main/java/org/b3log/solo/processor/console/SkinConsole.java
View file @
d53f194c
...
...
@@ -93,7 +93,6 @@ public class SkinConsole {
final
JSONObject
skin
=
optionQueryService
.
getSkin
();
if
(
null
==
skin
)
{
renderer
.
setJSONObject
(
new
JSONObject
().
put
(
Keys
.
STATUS_CODE
,
false
));
return
;
}
...
...
@@ -104,7 +103,6 @@ public class SkinConsole {
final
String
name
=
Latkes
.
getSkinName
(
dirName
);
if
(
null
==
name
)
{
LOGGER
.
log
(
Level
.
WARN
,
"The directory [{}] does not contain any skin, ignored it"
,
dirName
);
continue
;
}
...
...
src/main/java/org/b3log/solo/processor/console/StaticSiteConsole.java
View file @
d53f194c
...
...
@@ -83,14 +83,12 @@ public class StaticSiteConsole {
if
(!
Strings
.
isURL
(
url
))
{
context
.
renderJSON
(-
1
);
context
.
renderMsg
(
"Invalid site URL"
);
return
;
}
if
(
Latkes
.
isInJar
())
{
context
.
renderJSON
(-
1
);
context
.
renderMsg
(
"Do not support this feature while running in Jar"
);
return
;
}
...
...
src/main/java/org/b3log/solo/processor/console/UserConsole.java
View file @
d53f194c
...
...
@@ -229,7 +229,6 @@ public class UserConsole {
final
JSONObject
jsonObject
=
new
JSONObject
().
put
(
Keys
.
STATUS_CODE
,
false
);
renderer
.
setJSONObject
(
jsonObject
);
jsonObject
.
put
(
Keys
.
MSG
,
langPropsService
.
get
(
"getFailLabel"
));
return
;
}
...
...
src/main/java/org/b3log/solo/service/ArticleMgmtService.java
View file @
d53f194c
...
...
@@ -219,7 +219,6 @@ public class ArticleMgmtService {
optionMgmtService
.
addOrUpdateOption
(
githubReposOpt
);
}
catch
(
final
Exception
e
)
{
LOGGER
.
log
(
Level
.
ERROR
,
"Updates github repos option failed"
,
e
);
return
;
}
...
...
src/main/java/org/b3log/solo/service/CategoryMgmtService.java
View file @
d53f194c
...
...
@@ -83,7 +83,6 @@ public class CategoryMgmtService {
}
LOGGER
.
log
(
Level
.
WARN
,
"Cant not find the target category of source category [order={}]"
,
srcCategoryOrder
);
return
;
}
...
...
src/main/java/org/b3log/solo/service/CommentQueryService.java
View file @
d53f194c
...
...
@@ -171,7 +171,6 @@ public class CommentQueryService {
final
String
commentId
=
comment
.
optString
(
Keys
.
OBJECT_ID
);
commentRepository
.
remove
(
commentId
);
transaction
.
commit
();
continue
;
}
...
...
src/main/java/org/b3log/solo/service/ExportService.java
View file @
d53f194c
...
...
@@ -456,11 +456,9 @@ public class ExportService {
if
(
StringUtils
.
isNotBlank
(
article
.
optString
(
Article
.
ARTICLE_VIEW_PWD
)))
{
passwords
.
add
(
one
);
continue
;
}
else
if
(
Article
.
ARTICLE_STATUS_C_PUBLISHED
==
article
.
optInt
(
Article
.
ARTICLE_STATUS
))
{
posts
.
add
(
one
);
continue
;
}
else
{
drafts
.
add
(
one
);
...
...
src/main/java/org/b3log/solo/service/UpgradeService.java
View file @
d53f194c
...
...
@@ -98,7 +98,6 @@ public class UpgradeService {
V380_390
.
perform
();
case
"3.9.0"
:
V390_400
.
perform
();
break
;
default
:
LOGGER
.
log
(
Level
.
ERROR
,
"Please upgrade to v3.0.0 first"
);
...
...
src/main/java/org/b3log/solo/service/UserMgmtService.java
View file @
d53f194c
...
...
@@ -131,7 +131,6 @@ public class UserMgmtService {
usite
=
result
.
optJSONObject
(
Common
.
DATA
);
}
catch
(
final
Exception
e
)
{
LOGGER
.
log
(
Level
.
ERROR
,
"Gets usite failed"
,
e
);
return
;
}
...
...
@@ -146,7 +145,6 @@ public class UserMgmtService {
optionMgmtService
.
addOrUpdateOption
(
usiteOpt
);
}
catch
(
final
Exception
e
)
{
LOGGER
.
log
(
Level
.
ERROR
,
"Updates usite option failed"
,
e
);
return
;
}
}
...
...
src/main/java/org/b3log/solo/util/Markdowns.java
View file @
d53f194c
...
...
@@ -249,7 +249,6 @@ public final class Markdowns {
for
(
final
Thread
thread
:
threads
)
{
if
(
thread
.
getId
()
==
threadId
[
0
])
{
thread
.
stop
();
break
;
}
}
...
...
src/main/java/org/b3log/solo/util/Statics.java
View file @
d53f194c
...
...
@@ -18,7 +18,6 @@ import org.apache.logging.log4j.Level;
import
org.apache.logging.log4j.LogManager
;
import
org.apache.logging.log4j.Logger
;
import
org.b3log.latke.http.RequestContext
;
import
org.b3log.solo.model.Option
;
import
org.b3log.solo.processor.SkinRenderer
;
import
java.io.ByteArrayInputStream
;
...
...
@@ -46,12 +45,12 @@ public final class Statics {
/**
* Logger.
*/
private
static
Logger
LOGGER
=
LogManager
.
getLogger
(
Statics
.
class
);
private
static
final
Logger
LOGGER
=
LogManager
.
getLogger
(
Statics
.
class
);
/**
* Generated page expire time.
*/
private
static
long
EXPIRED
=
TimeUnit
.
HOURS
.
toMillis
(
6
);
private
static
final
long
EXPIRED
=
TimeUnit
.
HOURS
.
toMillis
(
6
);
private
static
File
DIR
;
...
...
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