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
86bbde7f
Unverified
Commit
86bbde7f
authored
Dec 05, 2018
by
Liang Ding
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
♻
#12580
parent
30044297
Changes
38
Show whitespace changes
Inline
Side-by-side
Showing
38 changed files
with
396 additions
and
398 deletions
+396
-398
src/main/java/org/b3log/solo/api/B3ArticleReceiver.java
src/main/java/org/b3log/solo/api/B3ArticleReceiver.java
+9
-9
src/main/java/org/b3log/solo/api/B3CommentReceiver.java
src/main/java/org/b3log/solo/api/B3CommentReceiver.java
+6
-6
src/main/java/org/b3log/solo/api/MetaWeblogAPI.java
src/main/java/org/b3log/solo/api/MetaWeblogAPI.java
+6
-6
src/main/java/org/b3log/solo/filter/InitCheckFilter.java
src/main/java/org/b3log/solo/filter/InitCheckFilter.java
+6
-6
src/main/java/org/b3log/solo/filter/PermalinkFilter.java
src/main/java/org/b3log/solo/filter/PermalinkFilter.java
+9
-9
src/main/java/org/b3log/solo/processor/ArticleProcessor.java
src/main/java/org/b3log/solo/processor/ArticleProcessor.java
+37
-37
src/main/java/org/b3log/solo/processor/BlogProcessor.java
src/main/java/org/b3log/solo/processor/BlogProcessor.java
+9
-9
src/main/java/org/b3log/solo/processor/CaptchaProcessor.java
src/main/java/org/b3log/solo/processor/CaptchaProcessor.java
+6
-6
src/main/java/org/b3log/solo/processor/CategoryProcessor.java
...main/java/org/b3log/solo/processor/CategoryProcessor.java
+4
-4
src/main/java/org/b3log/solo/processor/CommentProcessor.java
src/main/java/org/b3log/solo/processor/CommentProcessor.java
+9
-9
src/main/java/org/b3log/solo/processor/ErrorProcessor.java
src/main/java/org/b3log/solo/processor/ErrorProcessor.java
+4
-4
src/main/java/org/b3log/solo/processor/FeedProcessor.java
src/main/java/org/b3log/solo/processor/FeedProcessor.java
+6
-6
src/main/java/org/b3log/solo/processor/FileUploadProcessor.java
...in/java/org/b3log/solo/processor/FileUploadProcessor.java
+6
-6
src/main/java/org/b3log/solo/processor/IndexProcessor.java
src/main/java/org/b3log/solo/processor/IndexProcessor.java
+8
-8
src/main/java/org/b3log/solo/processor/InitProcessor.java
src/main/java/org/b3log/solo/processor/InitProcessor.java
+8
-8
src/main/java/org/b3log/solo/processor/KanBanNiangProcessor.java
...n/java/org/b3log/solo/processor/KanBanNiangProcessor.java
+6
-6
src/main/java/org/b3log/solo/processor/LoginProcessor.java
src/main/java/org/b3log/solo/processor/LoginProcessor.java
+19
-19
src/main/java/org/b3log/solo/processor/OAuthGitHubProcessor.java
...n/java/org/b3log/solo/processor/OAuthGitHubProcessor.java
+6
-6
src/main/java/org/b3log/solo/processor/PageProcessor.java
src/main/java/org/b3log/solo/processor/PageProcessor.java
+4
-4
src/main/java/org/b3log/solo/processor/SearchProcessor.java
src/main/java/org/b3log/solo/processor/SearchProcessor.java
+8
-8
src/main/java/org/b3log/solo/processor/SitemapProcessor.java
src/main/java/org/b3log/solo/processor/SitemapProcessor.java
+6
-6
src/main/java/org/b3log/solo/processor/SkinRenderer.java
src/main/java/org/b3log/solo/processor/SkinRenderer.java
+3
-3
src/main/java/org/b3log/solo/processor/TagProcessor.java
src/main/java/org/b3log/solo/processor/TagProcessor.java
+4
-4
src/main/java/org/b3log/solo/processor/UserTemplateProcessor.java
.../java/org/b3log/solo/processor/UserTemplateProcessor.java
+4
-4
src/main/java/org/b3log/solo/processor/console/AdminConsole.java
...n/java/org/b3log/solo/processor/console/AdminConsole.java
+7
-7
src/main/java/org/b3log/solo/processor/console/ArticleConsole.java
...java/org/b3log/solo/processor/console/ArticleConsole.java
+22
-22
src/main/java/org/b3log/solo/processor/console/CategoryConsole.java
...ava/org/b3log/solo/processor/console/CategoryConsole.java
+21
-21
src/main/java/org/b3log/solo/processor/console/CommentConsole.java
...java/org/b3log/solo/processor/console/CommentConsole.java
+18
-18
src/main/java/org/b3log/solo/processor/console/ConsoleAdminAuthAdvice.java
.../b3log/solo/processor/console/ConsoleAdminAuthAdvice.java
+4
-5
src/main/java/org/b3log/solo/processor/console/ConsoleAuthAdvice.java
...a/org/b3log/solo/processor/console/ConsoleAuthAdvice.java
+4
-5
src/main/java/org/b3log/solo/processor/console/ConsoleRenderer.java
...ava/org/b3log/solo/processor/console/ConsoleRenderer.java
+3
-3
src/main/java/org/b3log/solo/processor/console/LinkConsole.java
...in/java/org/b3log/solo/processor/console/LinkConsole.java
+21
-21
src/main/java/org/b3log/solo/processor/console/PageConsole.java
...in/java/org/b3log/solo/processor/console/PageConsole.java
+21
-21
src/main/java/org/b3log/solo/processor/console/PluginConsole.java
.../java/org/b3log/solo/processor/console/PluginConsole.java
+16
-16
src/main/java/org/b3log/solo/processor/console/PreferenceConsole.java
...a/org/b3log/solo/processor/console/PreferenceConsole.java
+24
-24
src/main/java/org/b3log/solo/processor/console/RepairConsole.java
.../java/org/b3log/solo/processor/console/RepairConsole.java
+9
-9
src/main/java/org/b3log/solo/processor/console/TagConsole.java
...ain/java/org/b3log/solo/processor/console/TagConsole.java
+12
-12
src/main/java/org/b3log/solo/processor/console/UserConsole.java
...in/java/org/b3log/solo/processor/console/UserConsole.java
+21
-21
No files found.
src/main/java/org/b3log/solo/api/B3ArticleReceiver.java
View file @
86bbde7f
...
@@ -22,11 +22,11 @@ import org.b3log.latke.ioc.Inject;
...
@@ -22,11 +22,11 @@ import org.b3log.latke.ioc.Inject;
import
org.b3log.latke.logging.Level
;
import
org.b3log.latke.logging.Level
;
import
org.b3log.latke.logging.Logger
;
import
org.b3log.latke.logging.Logger
;
import
org.b3log.latke.service.ServiceException
;
import
org.b3log.latke.service.ServiceException
;
import
org.b3log.latke.servlet.
HTTP
RequestContext
;
import
org.b3log.latke.servlet.RequestContext
;
import
org.b3log.latke.servlet.H
TTPRequest
Method
;
import
org.b3log.latke.servlet.H
ttp
Method
;
import
org.b3log.latke.servlet.annotation.RequestProcessing
;
import
org.b3log.latke.servlet.annotation.RequestProcessing
;
import
org.b3log.latke.servlet.annotation.RequestProcessor
;
import
org.b3log.latke.servlet.annotation.RequestProcessor
;
import
org.b3log.latke.servlet.renderer.J
SON
Renderer
;
import
org.b3log.latke.servlet.renderer.J
son
Renderer
;
import
org.b3log.solo.model.Article
;
import
org.b3log.solo.model.Article
;
import
org.b3log.solo.model.Common
;
import
org.b3log.solo.model.Common
;
import
org.b3log.solo.model.Option
;
import
org.b3log.solo.model.Option
;
...
@@ -100,10 +100,10 @@ public class B3ArticleReceiver {
...
@@ -100,10 +100,10 @@ public class B3ArticleReceiver {
* }
* }
* @throws Exception exception
* @throws Exception exception
*/
*/
@RequestProcessing
(
value
=
"/apis/symphony/article"
,
method
=
H
TTPRequest
Method
.
POST
)
@RequestProcessing
(
value
=
"/apis/symphony/article"
,
method
=
H
ttp
Method
.
POST
)
public
void
addArticle
(
final
HTTP
RequestContext
context
,
final
JSONObject
requestJSONObject
)
public
void
addArticle
(
final
RequestContext
context
,
final
JSONObject
requestJSONObject
)
throws
Exception
{
throws
Exception
{
final
J
SONRenderer
renderer
=
new
JSON
Renderer
();
final
J
sonRenderer
renderer
=
new
Json
Renderer
();
context
.
setRenderer
(
renderer
);
context
.
setRenderer
(
renderer
);
final
JSONObject
ret
=
new
JSONObject
();
final
JSONObject
ret
=
new
JSONObject
();
...
@@ -172,10 +172,10 @@ public class B3ArticleReceiver {
...
@@ -172,10 +172,10 @@ public class B3ArticleReceiver {
* }
* }
* @throws Exception exception
* @throws Exception exception
*/
*/
@RequestProcessing
(
value
=
"/apis/symphony/article"
,
method
=
H
TTPRequest
Method
.
PUT
)
@RequestProcessing
(
value
=
"/apis/symphony/article"
,
method
=
H
ttp
Method
.
PUT
)
public
void
updateArticle
(
final
HTTP
RequestContext
context
,
final
JSONObject
requestJSONObject
)
public
void
updateArticle
(
final
RequestContext
context
,
final
JSONObject
requestJSONObject
)
throws
Exception
{
throws
Exception
{
final
J
SONRenderer
renderer
=
new
JSON
Renderer
();
final
J
sonRenderer
renderer
=
new
Json
Renderer
();
context
.
setRenderer
(
renderer
);
context
.
setRenderer
(
renderer
);
final
JSONObject
ret
=
new
JSONObject
();
final
JSONObject
ret
=
new
JSONObject
();
renderer
.
setJSONObject
(
ret
);
renderer
.
setJSONObject
(
ret
);
...
...
src/main/java/org/b3log/solo/api/B3CommentReceiver.java
View file @
86bbde7f
...
@@ -26,11 +26,11 @@ import org.b3log.latke.ioc.Inject;
...
@@ -26,11 +26,11 @@ import org.b3log.latke.ioc.Inject;
import
org.b3log.latke.logging.Level
;
import
org.b3log.latke.logging.Level
;
import
org.b3log.latke.logging.Logger
;
import
org.b3log.latke.logging.Logger
;
import
org.b3log.latke.repository.Transaction
;
import
org.b3log.latke.repository.Transaction
;
import
org.b3log.latke.servlet.
HTTP
RequestContext
;
import
org.b3log.latke.servlet.RequestContext
;
import
org.b3log.latke.servlet.H
TTPRequest
Method
;
import
org.b3log.latke.servlet.H
ttp
Method
;
import
org.b3log.latke.servlet.annotation.RequestProcessing
;
import
org.b3log.latke.servlet.annotation.RequestProcessing
;
import
org.b3log.latke.servlet.annotation.RequestProcessor
;
import
org.b3log.latke.servlet.annotation.RequestProcessor
;
import
org.b3log.latke.servlet.renderer.J
SON
Renderer
;
import
org.b3log.latke.servlet.renderer.J
son
Renderer
;
import
org.b3log.solo.event.EventTypes
;
import
org.b3log.solo.event.EventTypes
;
import
org.b3log.solo.model.Article
;
import
org.b3log.solo.model.Article
;
import
org.b3log.solo.model.Comment
;
import
org.b3log.solo.model.Comment
;
...
@@ -134,10 +134,10 @@ public class B3CommentReceiver {
...
@@ -134,10 +134,10 @@ public class B3CommentReceiver {
* }
* }
* @throws Exception exception
* @throws Exception exception
*/
*/
@RequestProcessing
(
value
=
"/apis/symphony/comment"
,
method
=
H
TTPRequest
Method
.
PUT
)
@RequestProcessing
(
value
=
"/apis/symphony/comment"
,
method
=
H
ttp
Method
.
PUT
)
public
void
addComment
(
final
HTTP
RequestContext
context
,
final
JSONObject
requestJSONObject
)
public
void
addComment
(
final
RequestContext
context
,
final
JSONObject
requestJSONObject
)
throws
Exception
{
throws
Exception
{
final
J
SONRenderer
renderer
=
new
JSON
Renderer
();
final
J
sonRenderer
renderer
=
new
Json
Renderer
();
context
.
setRenderer
(
renderer
);
context
.
setRenderer
(
renderer
);
final
JSONObject
ret
=
new
JSONObject
();
final
JSONObject
ret
=
new
JSONObject
();
renderer
.
setJSONObject
(
ret
);
renderer
.
setJSONObject
(
ret
);
...
...
src/main/java/org/b3log/solo/api/MetaWeblogAPI.java
View file @
86bbde7f
...
@@ -30,11 +30,11 @@ import org.b3log.latke.logging.Logger;
...
@@ -30,11 +30,11 @@ import org.b3log.latke.logging.Logger;
import
org.b3log.latke.model.User
;
import
org.b3log.latke.model.User
;
import
org.b3log.latke.repository.Transaction
;
import
org.b3log.latke.repository.Transaction
;
import
org.b3log.latke.service.ServiceException
;
import
org.b3log.latke.service.ServiceException
;
import
org.b3log.latke.servlet.
HTTP
RequestContext
;
import
org.b3log.latke.servlet.RequestContext
;
import
org.b3log.latke.servlet.H
TTPRequest
Method
;
import
org.b3log.latke.servlet.H
ttp
Method
;
import
org.b3log.latke.servlet.annotation.RequestProcessing
;
import
org.b3log.latke.servlet.annotation.RequestProcessing
;
import
org.b3log.latke.servlet.annotation.RequestProcessor
;
import
org.b3log.latke.servlet.annotation.RequestProcessor
;
import
org.b3log.latke.servlet.renderer.TextX
ML
Renderer
;
import
org.b3log.latke.servlet.renderer.TextX
ml
Renderer
;
import
org.b3log.solo.model.Article
;
import
org.b3log.solo.model.Article
;
import
org.b3log.solo.model.Option
;
import
org.b3log.solo.model.Option
;
import
org.b3log.solo.model.Tag
;
import
org.b3log.solo.model.Tag
;
...
@@ -195,9 +195,9 @@ public class MetaWeblogAPI {
...
@@ -195,9 +195,9 @@ public class MetaWeblogAPI {
*
*
* @param context the specified http request context
* @param context the specified http request context
*/
*/
@RequestProcessing
(
value
=
"/apis/metaweblog"
,
method
=
H
TTPRequest
Method
.
POST
)
@RequestProcessing
(
value
=
"/apis/metaweblog"
,
method
=
H
ttp
Method
.
POST
)
public
void
metaWeblog
(
final
HTTP
RequestContext
context
)
{
public
void
metaWeblog
(
final
RequestContext
context
)
{
final
TextX
MLRenderer
renderer
=
new
TextXML
Renderer
();
final
TextX
mlRenderer
renderer
=
new
TextXml
Renderer
();
context
.
setRenderer
(
renderer
);
context
.
setRenderer
(
renderer
);
String
responseContent
;
String
responseContent
;
...
...
src/main/java/org/b3log/solo/filter/InitCheckFilter.java
View file @
86bbde7f
...
@@ -24,10 +24,10 @@ import org.b3log.latke.ioc.BeanManager;
...
@@ -24,10 +24,10 @@ import org.b3log.latke.ioc.BeanManager;
import
org.b3log.latke.logging.Level
;
import
org.b3log.latke.logging.Level
;
import
org.b3log.latke.logging.Logger
;
import
org.b3log.latke.logging.Logger
;
import
org.b3log.latke.servlet.DispatcherServlet
;
import
org.b3log.latke.servlet.DispatcherServlet
;
import
org.b3log.latke.servlet.
HTTP
RequestContext
;
import
org.b3log.latke.servlet.RequestContext
;
import
org.b3log.latke.servlet.H
TTPRequest
Method
;
import
org.b3log.latke.servlet.H
ttp
Method
;
import
org.b3log.latke.servlet.HttpControl
;
import
org.b3log.latke.servlet.HttpControl
;
import
org.b3log.latke.servlet.renderer.H
TTP
500Renderer
;
import
org.b3log.latke.servlet.renderer.H
ttp
500Renderer
;
import
org.b3log.solo.service.InitService
;
import
org.b3log.solo.service.InitService
;
import
javax.servlet.*
;
import
javax.servlet.*
;
...
@@ -116,16 +116,16 @@ public final class InitCheckFilter implements Filter {
...
@@ -116,16 +116,16 @@ public final class InitCheckFilter implements Filter {
initReported
=
true
;
initReported
=
true
;
}
}
final
HTTPRequestContext
context
=
new
HTTP
RequestContext
();
final
RequestContext
context
=
new
RequestContext
();
context
.
setRequest
((
HttpServletRequest
)
request
);
context
.
setRequest
((
HttpServletRequest
)
request
);
context
.
setResponse
((
HttpServletResponse
)
response
);
context
.
setResponse
((
HttpServletResponse
)
response
);
request
.
setAttribute
(
Keys
.
HttpRequest
.
REQUEST_URI
,
Latkes
.
getContextPath
()
+
"/init"
);
request
.
setAttribute
(
Keys
.
HttpRequest
.
REQUEST_URI
,
Latkes
.
getContextPath
()
+
"/init"
);
request
.
setAttribute
(
Keys
.
HttpRequest
.
REQUEST_METHOD
,
H
TTPRequest
Method
.
GET
.
name
());
request
.
setAttribute
(
Keys
.
HttpRequest
.
REQUEST_METHOD
,
H
ttp
Method
.
GET
.
name
());
final
HttpControl
httpControl
=
new
HttpControl
(
DispatcherServlet
.
HANDLERS
.
iterator
(),
context
);
final
HttpControl
httpControl
=
new
HttpControl
(
DispatcherServlet
.
HANDLERS
.
iterator
(),
context
);
try
{
try
{
httpControl
.
nextHandler
();
httpControl
.
nextHandler
();
}
catch
(
final
Exception
e
)
{
}
catch
(
final
Exception
e
)
{
context
.
setRenderer
(
new
H
TTP
500Renderer
(
e
));
context
.
setRenderer
(
new
H
ttp
500Renderer
(
e
));
}
}
DispatcherServlet
.
result
(
context
);
DispatcherServlet
.
result
(
context
);
}
}
...
...
src/main/java/org/b3log/solo/filter/PermalinkFilter.java
View file @
86bbde7f
...
@@ -25,10 +25,10 @@ import org.b3log.latke.logging.Level;
...
@@ -25,10 +25,10 @@ import org.b3log.latke.logging.Level;
import
org.b3log.latke.logging.Logger
;
import
org.b3log.latke.logging.Logger
;
import
org.b3log.latke.repository.RepositoryException
;
import
org.b3log.latke.repository.RepositoryException
;
import
org.b3log.latke.servlet.DispatcherServlet
;
import
org.b3log.latke.servlet.DispatcherServlet
;
import
org.b3log.latke.servlet.
HTTP
RequestContext
;
import
org.b3log.latke.servlet.RequestContext
;
import
org.b3log.latke.servlet.H
TTPRequest
Method
;
import
org.b3log.latke.servlet.H
ttp
Method
;
import
org.b3log.latke.servlet.HttpControl
;
import
org.b3log.latke.servlet.HttpControl
;
import
org.b3log.latke.servlet.renderer.H
TTP
500Renderer
;
import
org.b3log.latke.servlet.renderer.H
ttp
500Renderer
;
import
org.b3log.solo.model.Article
;
import
org.b3log.solo.model.Article
;
import
org.b3log.solo.model.Page
;
import
org.b3log.solo.model.Page
;
import
org.b3log.solo.repository.ArticleRepository
;
import
org.b3log.solo.repository.ArticleRepository
;
...
@@ -47,9 +47,9 @@ import java.io.IOException;
...
@@ -47,9 +47,9 @@ import java.io.IOException;
*
*
* @author <a href="http://88250.b3log.org">Liang Ding</a>
* @author <a href="http://88250.b3log.org">Liang Ding</a>
* @version 1.0.1.8, Oct 5, 2018
* @version 1.0.1.8, Oct 5, 2018
* @see org.b3log.solo.processor.ArticleProcessor#showArticle(org.b3log.latke.servlet.
HTTP
RequestContext,
* @see org.b3log.solo.processor.ArticleProcessor#showArticle(org.b3log.latke.servlet.RequestContext,
* javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)
* javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)
* @see org.b3log.solo.processor.PageProcessor#showPage(org.b3log.latke.servlet.
HTTP
RequestContext)
* @see org.b3log.solo.processor.PageProcessor#showPage(org.b3log.latke.servlet.RequestContext)
* @since 0.3.1
* @since 0.3.1
*/
*/
public
final
class
PermalinkFilter
implements
Filter
{
public
final
class
PermalinkFilter
implements
Filter
{
...
@@ -140,11 +140,11 @@ public final class PermalinkFilter implements Filter {
...
@@ -140,11 +140,11 @@ public final class PermalinkFilter implements Filter {
* @param response the specified response
* @param response the specified response
* @param article the specified article
* @param article the specified article
* @param page the specified page
* @param page the specified page
* @see DispatcherServlet#result(
HTTP
RequestContext)
* @see DispatcherServlet#result(RequestContext)
*/
*/
private
void
dispatchToArticleOrPageProcessor
(
final
ServletRequest
request
,
final
ServletResponse
response
,
private
void
dispatchToArticleOrPageProcessor
(
final
ServletRequest
request
,
final
ServletResponse
response
,
final
JSONObject
article
,
final
JSONObject
page
)
{
final
JSONObject
article
,
final
JSONObject
page
)
{
final
HTTPRequestContext
context
=
new
HTTP
RequestContext
();
final
RequestContext
context
=
new
RequestContext
();
context
.
setRequest
((
HttpServletRequest
)
request
);
context
.
setRequest
((
HttpServletRequest
)
request
);
context
.
setResponse
((
HttpServletResponse
)
response
);
context
.
setResponse
((
HttpServletResponse
)
response
);
...
@@ -156,13 +156,13 @@ public final class PermalinkFilter implements Filter {
...
@@ -156,13 +156,13 @@ public final class PermalinkFilter implements Filter {
request
.
setAttribute
(
Keys
.
HttpRequest
.
REQUEST_URI
,
Latkes
.
getContextPath
()
+
"/page"
);
request
.
setAttribute
(
Keys
.
HttpRequest
.
REQUEST_URI
,
Latkes
.
getContextPath
()
+
"/page"
);
}
}
request
.
setAttribute
(
Keys
.
HttpRequest
.
REQUEST_METHOD
,
H
TTPRequest
Method
.
GET
.
name
());
request
.
setAttribute
(
Keys
.
HttpRequest
.
REQUEST_METHOD
,
H
ttp
Method
.
GET
.
name
());
final
HttpControl
httpControl
=
new
HttpControl
(
DispatcherServlet
.
HANDLERS
.
iterator
(),
context
);
final
HttpControl
httpControl
=
new
HttpControl
(
DispatcherServlet
.
HANDLERS
.
iterator
(),
context
);
try
{
try
{
httpControl
.
nextHandler
();
httpControl
.
nextHandler
();
}
catch
(
final
Exception
e
)
{
}
catch
(
final
Exception
e
)
{
context
.
setRenderer
(
new
H
TTP
500Renderer
(
e
));
context
.
setRenderer
(
new
H
ttp
500Renderer
(
e
));
}
}
DispatcherServlet
.
result
(
context
);
DispatcherServlet
.
result
(
context
);
...
...
src/main/java/org/b3log/solo/processor/ArticleProcessor.java
View file @
86bbde7f
...
@@ -30,14 +30,14 @@ import org.b3log.latke.model.Pagination;
...
@@ -30,14 +30,14 @@ import org.b3log.latke.model.Pagination;
import
org.b3log.latke.model.User
;
import
org.b3log.latke.model.User
;
import
org.b3log.latke.service.LangPropsService
;
import
org.b3log.latke.service.LangPropsService
;
import
org.b3log.latke.service.ServiceException
;
import
org.b3log.latke.service.ServiceException
;
import
org.b3log.latke.servlet.
HTTP
RequestContext
;
import
org.b3log.latke.servlet.RequestContext
;
import
org.b3log.latke.servlet.H
TTPRequest
Method
;
import
org.b3log.latke.servlet.H
ttp
Method
;
import
org.b3log.latke.servlet.URIPatternMode
;
import
org.b3log.latke.servlet.URIPatternMode
;
import
org.b3log.latke.servlet.annotation.RequestProcessing
;
import
org.b3log.latke.servlet.annotation.RequestProcessing
;
import
org.b3log.latke.servlet.annotation.RequestProcessor
;
import
org.b3log.latke.servlet.annotation.RequestProcessor
;
import
org.b3log.latke.servlet.renderer.AbstractFreeMarkerRenderer
;
import
org.b3log.latke.servlet.renderer.AbstractFreeMarkerRenderer
;
import
org.b3log.latke.servlet.renderer.J
SON
Renderer
;
import
org.b3log.latke.servlet.renderer.J
son
Renderer
;
import
org.b3log.latke.servlet.renderer.TextH
TML
Renderer
;
import
org.b3log.latke.servlet.renderer.TextH
tml
Renderer
;
import
org.b3log.latke.util.*
;
import
org.b3log.latke.util.*
;
import
org.b3log.solo.SoloServletListener
;
import
org.b3log.solo.SoloServletListener
;
import
org.b3log.solo.event.EventTypes
;
import
org.b3log.solo.event.EventTypes
;
...
@@ -143,8 +143,8 @@ public class ArticleProcessor {
...
@@ -143,8 +143,8 @@ public class ArticleProcessor {
*
*
* @param context the specified context
* @param context the specified context
*/
*/
@RequestProcessing
(
value
=
"/console/article-pwd"
,
method
=
H
TTPRequest
Method
.
GET
)
@RequestProcessing
(
value
=
"/console/article-pwd"
,
method
=
H
ttp
Method
.
GET
)
public
void
showArticlePwdForm
(
final
HTTP
RequestContext
context
)
{
public
void
showArticlePwdForm
(
final
RequestContext
context
)
{
final
HttpServletRequest
request
=
context
.
getRequest
();
final
HttpServletRequest
request
=
context
.
getRequest
();
final
HttpServletResponse
response
=
context
.
getResponse
();
final
HttpServletResponse
response
=
context
.
getResponse
();
final
String
articleId
=
request
.
getParameter
(
"articleId"
);
final
String
articleId
=
request
.
getParameter
(
"articleId"
);
...
@@ -194,8 +194,8 @@ public class ArticleProcessor {
...
@@ -194,8 +194,8 @@ public class ArticleProcessor {
*
*
* @param context the specified context
* @param context the specified context
*/
*/
@RequestProcessing
(
value
=
"/console/article-pwd"
,
method
=
H
TTPRequest
Method
.
POST
)
@RequestProcessing
(
value
=
"/console/article-pwd"
,
method
=
H
ttp
Method
.
POST
)
public
void
onArticlePwdForm
(
final
HTTP
RequestContext
context
)
{
public
void
onArticlePwdForm
(
final
RequestContext
context
)
{
try
{
try
{
final
HttpServletRequest
request
=
context
.
getRequest
();
final
HttpServletRequest
request
=
context
.
getRequest
();
final
HttpServletResponse
response
=
context
.
getResponse
();
final
HttpServletResponse
response
=
context
.
getResponse
();
...
@@ -234,8 +234,8 @@ public class ArticleProcessor {
...
@@ -234,8 +234,8 @@ public class ArticleProcessor {
*
*
* @param context the specified context
* @param context the specified context
*/
*/
@RequestProcessing
(
value
=
"/articles/random"
,
method
=
H
TTPRequest
Method
.
POST
)
@RequestProcessing
(
value
=
"/articles/random"
,
method
=
H
ttp
Method
.
POST
)
public
void
getRandomArticles
(
final
HTTP
RequestContext
context
)
{
public
void
getRandomArticles
(
final
RequestContext
context
)
{
final
JSONObject
jsonObject
=
new
JSONObject
();
final
JSONObject
jsonObject
=
new
JSONObject
();
final
JSONObject
preference
=
preferenceQueryService
.
getPreference
();
final
JSONObject
preference
=
preferenceQueryService
.
getPreference
();
...
@@ -243,7 +243,7 @@ public class ArticleProcessor {
...
@@ -243,7 +243,7 @@ public class ArticleProcessor {
if
(
0
==
displayCnt
)
{
if
(
0
==
displayCnt
)
{
jsonObject
.
put
(
Common
.
RANDOM_ARTICLES
,
new
ArrayList
<
JSONObject
>());
jsonObject
.
put
(
Common
.
RANDOM_ARTICLES
,
new
ArrayList
<
JSONObject
>());
final
J
SONRenderer
renderer
=
new
JSON
Renderer
();
final
J
sonRenderer
renderer
=
new
Json
Renderer
();
context
.
setRenderer
(
renderer
);
context
.
setRenderer
(
renderer
);
renderer
.
setJSONObject
(
jsonObject
);
renderer
.
setJSONObject
(
jsonObject
);
...
@@ -255,7 +255,7 @@ public class ArticleProcessor {
...
@@ -255,7 +255,7 @@ public class ArticleProcessor {
jsonObject
.
put
(
Common
.
RANDOM_ARTICLES
,
randomArticles
);
jsonObject
.
put
(
Common
.
RANDOM_ARTICLES
,
randomArticles
);
final
J
SONRenderer
renderer
=
new
JSON
Renderer
();
final
J
sonRenderer
renderer
=
new
Json
Renderer
();
context
.
setRenderer
(
renderer
);
context
.
setRenderer
(
renderer
);
renderer
.
setJSONObject
(
jsonObject
);
renderer
.
setJSONObject
(
jsonObject
);
...
@@ -267,8 +267,8 @@ public class ArticleProcessor {
...
@@ -267,8 +267,8 @@ public class ArticleProcessor {
*
*
* @param context the specified context
* @param context the specified context
*/
*/
@RequestProcessing
(
value
=
"/article/id/*/relevant/articles"
,
method
=
H
TTPRequest
Method
.
GET
)
@RequestProcessing
(
value
=
"/article/id/*/relevant/articles"
,
method
=
H
ttp
Method
.
GET
)
public
void
getRelevantArticles
(
final
HTTP
RequestContext
context
)
{
public
void
getRelevantArticles
(
final
RequestContext
context
)
{
final
JSONObject
jsonObject
=
new
JSONObject
();
final
JSONObject
jsonObject
=
new
JSONObject
();
final
JSONObject
preference
=
preferenceQueryService
.
getPreference
();
final
JSONObject
preference
=
preferenceQueryService
.
getPreference
();
...
@@ -277,7 +277,7 @@ public class ArticleProcessor {
...
@@ -277,7 +277,7 @@ public class ArticleProcessor {
if
(
0
==
displayCnt
)
{
if
(
0
==
displayCnt
)
{
jsonObject
.
put
(
Common
.
RANDOM_ARTICLES
,
new
ArrayList
<
JSONObject
>());
jsonObject
.
put
(
Common
.
RANDOM_ARTICLES
,
new
ArrayList
<
JSONObject
>());
final
J
SONRenderer
renderer
=
new
JSON
Renderer
();
final
J
sonRenderer
renderer
=
new
Json
Renderer
();
context
.
setRenderer
(
renderer
);
context
.
setRenderer
(
renderer
);
renderer
.
setJSONObject
(
jsonObject
);
renderer
.
setJSONObject
(
jsonObject
);
...
@@ -305,7 +305,7 @@ public class ArticleProcessor {
...
@@ -305,7 +305,7 @@ public class ArticleProcessor {
final
List
<
JSONObject
>
relevantArticles
=
articleQueryService
.
getRelevantArticles
(
article
,
preference
);
final
List
<
JSONObject
>
relevantArticles
=
articleQueryService
.
getRelevantArticles
(
article
,
preference
);
jsonObject
.
put
(
Common
.
RELEVANT_ARTICLES
,
relevantArticles
);
jsonObject
.
put
(
Common
.
RELEVANT_ARTICLES
,
relevantArticles
);
final
J
SONRenderer
renderer
=
new
JSON
Renderer
();
final
J
sonRenderer
renderer
=
new
Json
Renderer
();
context
.
setRenderer
(
renderer
);
context
.
setRenderer
(
renderer
);
renderer
.
setJSONObject
(
jsonObject
);
renderer
.
setJSONObject
(
jsonObject
);
...
@@ -317,15 +317,15 @@ public class ArticleProcessor {
...
@@ -317,15 +317,15 @@ public class ArticleProcessor {
*
*
* @param context the specified context
* @param context the specified context
*/
*/
@RequestProcessing
(
value
=
"/get-article-content"
,
method
=
H
TTPRequest
Method
.
GET
)
@RequestProcessing
(
value
=
"/get-article-content"
,
method
=
H
ttp
Method
.
GET
)
public
void
getArticleContent
(
final
HTTP
RequestContext
context
)
{
public
void
getArticleContent
(
final
RequestContext
context
)
{
final
HttpServletRequest
request
=
context
.
getRequest
();
final
HttpServletRequest
request
=
context
.
getRequest
();
final
String
articleId
=
context
.
param
(
"id"
);
final
String
articleId
=
context
.
param
(
"id"
);
if
(
StringUtils
.
isBlank
(
articleId
))
{
if
(
StringUtils
.
isBlank
(
articleId
))
{
return
;
return
;
}
}
final
TextH
TMLRenderer
renderer
=
new
TextHTML
Renderer
();
final
TextH
tmlRenderer
renderer
=
new
TextHtml
Renderer
();
context
.
setRenderer
(
renderer
);
context
.
setRenderer
(
renderer
);
String
content
;
String
content
;
...
@@ -348,8 +348,8 @@ public class ArticleProcessor {
...
@@ -348,8 +348,8 @@ public class ArticleProcessor {
*
*
* @param context the specified context
* @param context the specified context
*/
*/
@RequestProcessing
(
value
=
"/articles/\\d+"
,
uriPatternsMode
=
URIPatternMode
.
REGEX
,
method
=
H
TTPRequest
Method
.
GET
)
@RequestProcessing
(
value
=
"/articles/\\d+"
,
uriPatternsMode
=
URIPatternMode
.
REGEX
,
method
=
H
ttp
Method
.
GET
)
public
void
getArticlesByPage
(
final
HTTP
RequestContext
context
)
{
public
void
getArticlesByPage
(
final
RequestContext
context
)
{
final
JSONObject
jsonObject
=
new
JSONObject
();
final
JSONObject
jsonObject
=
new
JSONObject
();
final
HttpServletRequest
request
=
context
.
getRequest
();
final
HttpServletRequest
request
=
context
.
getRequest
();
final
int
currentPageNum
=
getArticlesPagedCurrentPageNum
(
request
.
getRequestURI
());
final
int
currentPageNum
=
getArticlesPagedCurrentPageNum
(
request
.
getRequestURI
());
...
@@ -380,7 +380,7 @@ public class ArticleProcessor {
...
@@ -380,7 +380,7 @@ public class ArticleProcessor {
Stopwatchs
.
end
();
Stopwatchs
.
end
();
}
}
final
J
SONRenderer
renderer
=
new
JSON
Renderer
();
final
J
sonRenderer
renderer
=
new
Json
Renderer
();
context
.
setRenderer
(
renderer
);
context
.
setRenderer
(
renderer
);
renderer
.
setJSONObject
(
jsonObject
);
renderer
.
setJSONObject
(
jsonObject
);
}
}
...
@@ -390,8 +390,8 @@ public class ArticleProcessor {
...
@@ -390,8 +390,8 @@ public class ArticleProcessor {
*
*
* @param context the specified context
* @param context the specified context
*/
*/
@RequestProcessing
(
value
=
"/articles/tags/.+/\\d+"
,
uriPatternsMode
=
URIPatternMode
.
REGEX
,
method
=
H
TTPRequest
Method
.
GET
)
@RequestProcessing
(
value
=
"/articles/tags/.+/\\d+"
,
uriPatternsMode
=
URIPatternMode
.
REGEX
,
method
=
H
ttp
Method
.
GET
)
public
void
getTagArticlesByPage
(
final
HTTP
RequestContext
context
)
{
public
void
getTagArticlesByPage
(
final
RequestContext
context
)
{
final
JSONObject
jsonObject
=
new
JSONObject
();
final
JSONObject
jsonObject
=
new
JSONObject
();
final
HttpServletRequest
request
=
context
.
getRequest
();
final
HttpServletRequest
request
=
context
.
getRequest
();
...
@@ -438,7 +438,7 @@ public class ArticleProcessor {
...
@@ -438,7 +438,7 @@ public class ArticleProcessor {
Stopwatchs
.
end
();
Stopwatchs
.
end
();
}
}
final
J
SONRenderer
renderer
=
new
JSON
Renderer
();
final
J
sonRenderer
renderer
=
new
Json
Renderer
();
context
.
setRenderer
(
renderer
);
context
.
setRenderer
(
renderer
);
renderer
.
setJSONObject
(
jsonObject
);
renderer
.
setJSONObject
(
jsonObject
);
}
}
...
@@ -448,8 +448,8 @@ public class ArticleProcessor {
...
@@ -448,8 +448,8 @@ public class ArticleProcessor {
*
*
* @param context the specified context
* @param context the specified context
*/
*/
@RequestProcessing
(
value
=
"/articles/archives/.+/\\d+"
,
uriPatternsMode
=
URIPatternMode
.
REGEX
,
method
=
H
TTPRequest
Method
.
GET
)
@RequestProcessing
(
value
=
"/articles/archives/.+/\\d+"
,
uriPatternsMode
=
URIPatternMode
.
REGEX
,
method
=
H
ttp
Method
.
GET
)
public
void
getArchivesArticlesByPage
(
final
HTTP
RequestContext
context
)
{
public
void
getArchivesArticlesByPage
(
final
RequestContext
context
)
{
final
JSONObject
jsonObject
=
new
JSONObject
();
final
JSONObject
jsonObject
=
new
JSONObject
();
final
HttpServletRequest
request
=
context
.
getRequest
();
final
HttpServletRequest
request
=
context
.
getRequest
();
...
@@ -490,7 +490,7 @@ public class ArticleProcessor {
...
@@ -490,7 +490,7 @@ public class ArticleProcessor {
Stopwatchs
.
end
();
Stopwatchs
.
end
();
}
}
final
J
SONRenderer
renderer
=
new
JSON
Renderer
();
final
J
sonRenderer
renderer
=
new
Json
Renderer
();
context
.
setRenderer
(
renderer
);
context
.
setRenderer
(
renderer
);
renderer
.
setJSONObject
(
jsonObject
);
renderer
.
setJSONObject
(
jsonObject
);
}
}
...
@@ -501,8 +501,8 @@ public class ArticleProcessor {
...
@@ -501,8 +501,8 @@ public class ArticleProcessor {
* @param context the specified context
* @param context the specified context
*/
*/
@RequestProcessing
(
value
=
"/articles/authors/\\d+/\\d+"
,
uriPatternsMode
=
URIPatternMode
.
REGEX
,
@RequestProcessing
(
value
=
"/articles/authors/\\d+/\\d+"
,
uriPatternsMode
=
URIPatternMode
.
REGEX
,
method
=
H
TTPRequest
Method
.
GET
)
method
=
H
ttp
Method
.
GET
)
public
void
getAuthorsArticlesByPage
(
final
HTTP
RequestContext
context
)
{
public
void
getAuthorsArticlesByPage
(
final
RequestContext
context
)
{
final
JSONObject
jsonObject
=
new
JSONObject
();
final
JSONObject
jsonObject
=
new
JSONObject
();
final
HttpServletRequest
request
=
context
.
getRequest
();
final
HttpServletRequest
request
=
context
.
getRequest
();
...
@@ -544,7 +544,7 @@ public class ArticleProcessor {
...
@@ -544,7 +544,7 @@ public class ArticleProcessor {
Stopwatchs
.
end
();
Stopwatchs
.
end
();
}
}
final
J
SONRenderer
renderer
=
new
JSON
Renderer
();
final
J
sonRenderer
renderer
=
new
Json
Renderer
();
context
.
setRenderer
(
renderer
);
context
.
setRenderer
(
renderer
);
renderer
.
setJSONObject
(
jsonObject
);
renderer
.
setJSONObject
(
jsonObject
);
}
}
...
@@ -554,8 +554,8 @@ public class ArticleProcessor {
...
@@ -554,8 +554,8 @@ public class ArticleProcessor {
*
*
* @param context the specified context
* @param context the specified context
*/
*/
@RequestProcessing
(
value
=
"/authors/**"
,
method
=
H
TTPRequest
Method
.
GET
)
@RequestProcessing
(
value
=
"/authors/**"
,
method
=
H
ttp
Method
.
GET
)
public
void
showAuthorArticles
(
final
HTTP
RequestContext
context
)
{
public
void
showAuthorArticles
(
final
RequestContext
context
)
{
final
HttpServletRequest
request
=
context
.
getRequest
();
final
HttpServletRequest
request
=
context
.
getRequest
();
final
AbstractFreeMarkerRenderer
renderer
=
new
SkinRenderer
(
request
);
final
AbstractFreeMarkerRenderer
renderer
=
new
SkinRenderer
(
request
);
context
.
setRenderer
(
renderer
);
context
.
setRenderer
(
renderer
);
...
@@ -629,8 +629,8 @@ public class ArticleProcessor {
...
@@ -629,8 +629,8 @@ public class ArticleProcessor {
*
*
* @param context the specified context
* @param context the specified context
*/
*/
@RequestProcessing
(
value
=
"/archives/**"
,
method
=
H
TTPRequest
Method
.
GET
)
@RequestProcessing
(
value
=
"/archives/**"
,
method
=
H
ttp
Method
.
GET
)
public
void
showArchiveArticles
(
final
HTTP
RequestContext
context
)
{
public
void
showArchiveArticles
(
final
RequestContext
context
)
{
final
HttpServletRequest
request
=
context
.
getRequest
();
final
HttpServletRequest
request
=
context
.
getRequest
();
final
AbstractFreeMarkerRenderer
renderer
=
new
SkinRenderer
(
request
);
final
AbstractFreeMarkerRenderer
renderer
=
new
SkinRenderer
(
request
);
context
.
setRenderer
(
renderer
);
context
.
setRenderer
(
renderer
);
...
@@ -695,8 +695,8 @@ public class ArticleProcessor {
...
@@ -695,8 +695,8 @@ public class ArticleProcessor {
*
*
* @param context the specified context
* @param context the specified context
*/
*/
@RequestProcessing
(
value
=
"/article"
,
method
=
H
TTPRequest
Method
.
GET
)
@RequestProcessing
(
value
=
"/article"
,
method
=
H
ttp
Method
.
GET
)
public
void
showArticle
(
final
HTTP
RequestContext
context
)
{
public
void
showArticle
(
final
RequestContext
context
)
{
// See PermalinkFilter#dispatchToArticleOrPageProcessor()
// See PermalinkFilter#dispatchToArticleOrPageProcessor()
final
JSONObject
article
=
(
JSONObject
)
context
.
attr
(
Article
.
ARTICLE
);
final
JSONObject
article
=
(
JSONObject
)
context
.
attr
(
Article
.
ARTICLE
);
if
(
null
==
article
)
{
if
(
null
==
article
)
{
...
...
src/main/java/org/b3log/solo/processor/BlogProcessor.java
View file @
86bbde7f
...
@@ -24,11 +24,11 @@ import org.b3log.latke.Latkes;
...
@@ -24,11 +24,11 @@ import org.b3log.latke.Latkes;
import
org.b3log.latke.ioc.Inject
;
import
org.b3log.latke.ioc.Inject
;
import
org.b3log.latke.model.Pagination
;
import
org.b3log.latke.model.Pagination
;
import
org.b3log.latke.model.User
;
import
org.b3log.latke.model.User
;
import
org.b3log.latke.servlet.
HTTP
RequestContext
;
import
org.b3log.latke.servlet.RequestContext
;
import
org.b3log.latke.servlet.H
TTPRequest
Method
;
import
org.b3log.latke.servlet.H
ttp
Method
;
import
org.b3log.latke.servlet.annotation.RequestProcessing
;
import
org.b3log.latke.servlet.annotation.RequestProcessing
;
import
org.b3log.latke.servlet.annotation.RequestProcessor
;
import
org.b3log.latke.servlet.annotation.RequestProcessor
;
import
org.b3log.latke.servlet.renderer.J
SON
Renderer
;
import
org.b3log.latke.servlet.renderer.J
son
Renderer
;
import
org.b3log.solo.SoloServletListener
;
import
org.b3log.solo.SoloServletListener
;
import
org.b3log.solo.model.Article
;
import
org.b3log.solo.model.Article
;
import
org.b3log.solo.model.Option
;
import
org.b3log.solo.model.Option
;
...
@@ -102,9 +102,9 @@ public class BlogProcessor {
...
@@ -102,9 +102,9 @@ public class BlogProcessor {
*
*
* @param context the specified context
* @param context the specified context
*/
*/
@RequestProcessing
(
value
=
"/blog/info"
,
method
=
H
TTPRequest
Method
.
GET
)
@RequestProcessing
(
value
=
"/blog/info"
,
method
=
H
ttp
Method
.
GET
)
public
void
getBlogInfo
(
final
HTTP
RequestContext
context
)
{
public
void
getBlogInfo
(
final
RequestContext
context
)
{
final
J
SONRenderer
renderer
=
new
JSON
Renderer
();
final
J
sonRenderer
renderer
=
new
Json
Renderer
();
context
.
setRenderer
(
renderer
);
context
.
setRenderer
(
renderer
);
final
JSONObject
jsonObject
=
new
JSONObject
();
final
JSONObject
jsonObject
=
new
JSONObject
();
renderer
.
setJSONObject
(
jsonObject
);
renderer
.
setJSONObject
(
jsonObject
);
...
@@ -152,8 +152,8 @@ public class BlogProcessor {
...
@@ -152,8 +152,8 @@ public class BlogProcessor {
*
*
* @param context the specified context
* @param context the specified context
*/
*/
@RequestProcessing
(
value
=
"/blog/articles-tags"
,
method
=
H
TTPRequest
Method
.
GET
)
@RequestProcessing
(
value
=
"/blog/articles-tags"
,
method
=
H
ttp
Method
.
GET
)
public
void
getArticlesTags
(
final
HTTP
RequestContext
context
)
{
public
void
getArticlesTags
(
final
RequestContext
context
)
{
final
String
pwd
=
context
.
param
(
"pwd"
);
final
String
pwd
=
context
.
param
(
"pwd"
);
if
(
StringUtils
.
isBlank
(
pwd
))
{
if
(
StringUtils
.
isBlank
(
pwd
))
{
context
.
sendError
(
HttpServletResponse
.
SC_UNAUTHORIZED
);
context
.
sendError
(
HttpServletResponse
.
SC_UNAUTHORIZED
);
...
@@ -193,7 +193,7 @@ public class BlogProcessor {
...
@@ -193,7 +193,7 @@ public class BlogProcessor {
final
JSONObject
result
=
articleQueryService
.
getArticles
(
requestJSONObject
);
final
JSONObject
result
=
articleQueryService
.
getArticles
(
requestJSONObject
);
final
JSONArray
articles
=
result
.
optJSONArray
(
Article
.
ARTICLES
);
final
JSONArray
articles
=
result
.
optJSONArray
(
Article
.
ARTICLES
);
final
J
SONRenderer
renderer
=
new
JSON
Renderer
();
final
J
sonRenderer
renderer
=
new
Json
Renderer
();
context
.
setRenderer
(
renderer
);
context
.
setRenderer
(
renderer
);
final
JSONObject
ret
=
new
JSONObject
();
final
JSONObject
ret
=
new
JSONObject
();
renderer
.
setJSONObject
(
ret
);
renderer
.
setJSONObject
(
ret
);
...
...
src/main/java/org/b3log/solo/processor/CaptchaProcessor.java
View file @
86bbde7f
...
@@ -20,11 +20,11 @@ package org.b3log.solo.processor;
...
@@ -20,11 +20,11 @@ package org.b3log.solo.processor;
import
org.apache.commons.lang.StringUtils
;
import
org.apache.commons.lang.StringUtils
;
import
org.b3log.latke.logging.Level
;
import
org.b3log.latke.logging.Level
;
import
org.b3log.latke.logging.Logger
;
import
org.b3log.latke.logging.Logger
;
import
org.b3log.latke.servlet.
HTTP
RequestContext
;
import
org.b3log.latke.servlet.RequestContext
;
import
org.b3log.latke.servlet.H
TTPRequest
Method
;
import
org.b3log.latke.servlet.H
ttp
Method
;
import
org.b3log.latke.servlet.annotation.RequestProcessing
;
import
org.b3log.latke.servlet.annotation.RequestProcessing
;
import
org.b3log.latke.servlet.annotation.RequestProcessor
;
import
org.b3log.latke.servlet.annotation.RequestProcessor
;
import
org.b3log.latke.servlet.renderer.P
NG
Renderer
;
import
org.b3log.latke.servlet.renderer.P
ng
Renderer
;
import
org.b3log.latke.util.Strings
;
import
org.b3log.latke.util.Strings
;
import
org.patchca.color.GradientColorFactory
;
import
org.patchca.color.GradientColorFactory
;
import
org.patchca.color.RandomColorFactory
;
import
org.patchca.color.RandomColorFactory
;
...
@@ -90,9 +90,9 @@ public class CaptchaProcessor {
...
@@ -90,9 +90,9 @@ public class CaptchaProcessor {
*
*
* @param context the specified context
* @param context the specified context
*/
*/
@RequestProcessing
(
value
=
"/captcha"
,
method
=
H
TTPRequest
Method
.
GET
)
@RequestProcessing
(
value
=
"/captcha"
,
method
=
H
ttp
Method
.
GET
)
public
void
get
(
final
HTTP
RequestContext
context
)
{
public
void
get
(
final
RequestContext
context
)
{
final
P
NGRenderer
renderer
=
new
PNG
Renderer
();
final
P
ngRenderer
renderer
=
new
Png
Renderer
();
context
.
setRenderer
(
renderer
);
context
.
setRenderer
(
renderer
);
try
{
try
{
...
...
src/main/java/org/b3log/solo/processor/CategoryProcessor.java
View file @
86bbde7f
...
@@ -26,8 +26,8 @@ import org.b3log.latke.logging.Logger;
...
@@ -26,8 +26,8 @@ import org.b3log.latke.logging.Logger;
import
org.b3log.latke.model.Pagination
;
import
org.b3log.latke.model.Pagination
;
import
org.b3log.latke.service.LangPropsService
;
import
org.b3log.latke.service.LangPropsService
;
import
org.b3log.latke.service.ServiceException
;
import
org.b3log.latke.service.ServiceException
;
import
org.b3log.latke.servlet.
HTTP
RequestContext
;
import
org.b3log.latke.servlet.RequestContext
;
import
org.b3log.latke.servlet.H
TTPRequest
Method
;
import
org.b3log.latke.servlet.H
ttp
Method
;
import
org.b3log.latke.servlet.annotation.RequestProcessing
;
import
org.b3log.latke.servlet.annotation.RequestProcessing
;
import
org.b3log.latke.servlet.annotation.RequestProcessor
;
import
org.b3log.latke.servlet.annotation.RequestProcessor
;
import
org.b3log.latke.servlet.renderer.AbstractFreeMarkerRenderer
;
import
org.b3log.latke.servlet.renderer.AbstractFreeMarkerRenderer
;
...
@@ -142,8 +142,8 @@ public class CategoryProcessor {
...
@@ -142,8 +142,8 @@ public class CategoryProcessor {
*
*
* @param context the specified context
* @param context the specified context
*/
*/
@RequestProcessing
(
value
=
"/category/**"
,
method
=
H
TTPRequest
Method
.
GET
)
@RequestProcessing
(
value
=
"/category/**"
,
method
=
H
ttp
Method
.
GET
)
public
void
showCategoryArticles
(
final
HTTP
RequestContext
context
)
{
public
void
showCategoryArticles
(
final
RequestContext
context
)
{
final
AbstractFreeMarkerRenderer
renderer
=
new
SkinRenderer
(
context
.
getRequest
());
final
AbstractFreeMarkerRenderer
renderer
=
new
SkinRenderer
(
context
.
getRequest
());
context
.
setRenderer
(
renderer
);
context
.
setRenderer
(
renderer
);
renderer
.
setTemplateName
(
"category-articles.ftl"
);
renderer
.
setTemplateName
(
"category-articles.ftl"
);
...
...
src/main/java/org/b3log/solo/processor/CommentProcessor.java
View file @
86bbde7f
...
@@ -24,11 +24,11 @@ import org.b3log.latke.logging.Level;
...
@@ -24,11 +24,11 @@ import org.b3log.latke.logging.Level;
import
org.b3log.latke.logging.Logger
;
import
org.b3log.latke.logging.Logger
;
import
org.b3log.latke.model.User
;
import
org.b3log.latke.model.User
;
import
org.b3log.latke.service.LangPropsService
;
import
org.b3log.latke.service.LangPropsService
;
import
org.b3log.latke.servlet.
HTTP
RequestContext
;
import
org.b3log.latke.servlet.RequestContext
;
import
org.b3log.latke.servlet.H
TTPRequest
Method
;
import
org.b3log.latke.servlet.H
ttp
Method
;
import
org.b3log.latke.servlet.annotation.RequestProcessing
;
import
org.b3log.latke.servlet.annotation.RequestProcessing
;
import
org.b3log.latke.servlet.annotation.RequestProcessor
;
import
org.b3log.latke.servlet.annotation.RequestProcessor
;
import
org.b3log.latke.servlet.renderer.J
SON
Renderer
;
import
org.b3log.latke.servlet.renderer.J
son
Renderer
;
import
org.b3log.solo.model.*
;
import
org.b3log.solo.model.*
;
import
org.b3log.solo.service.CommentMgmtService
;
import
org.b3log.solo.service.CommentMgmtService
;
import
org.b3log.solo.service.PreferenceQueryService
;
import
org.b3log.solo.service.PreferenceQueryService
;
...
@@ -124,8 +124,8 @@ public class CommentProcessor {
...
@@ -124,8 +124,8 @@ public class CommentProcessor {
*
*
* @param context the specified context
* @param context the specified context
*/
*/
@RequestProcessing
(
value
=
"/page/comments"
,
method
=
H
TTPRequest
Method
.
POST
)
@RequestProcessing
(
value
=
"/page/comments"
,
method
=
H
ttp
Method
.
POST
)
public
void
addPageComment
(
final
HTTP
RequestContext
context
)
{
public
void
addPageComment
(
final
RequestContext
context
)
{
final
HttpServletRequest
httpServletRequest
=
context
.
getRequest
();
final
HttpServletRequest
httpServletRequest
=
context
.
getRequest
();
final
HttpServletResponse
httpServletResponse
=
context
.
getResponse
();
final
HttpServletResponse
httpServletResponse
=
context
.
getResponse
();
final
JSONObject
requestJSONObject
=
context
.
requestJSON
();
final
JSONObject
requestJSONObject
=
context
.
requestJSON
();
...
@@ -134,7 +134,7 @@ public class CommentProcessor {
...
@@ -134,7 +134,7 @@ public class CommentProcessor {
fillCommenter
(
requestJSONObject
,
httpServletRequest
,
httpServletResponse
);
fillCommenter
(
requestJSONObject
,
httpServletRequest
,
httpServletResponse
);
final
JSONObject
jsonObject
=
commentMgmtService
.
checkAddCommentRequest
(
requestJSONObject
);
final
JSONObject
jsonObject
=
commentMgmtService
.
checkAddCommentRequest
(
requestJSONObject
);
final
J
SONRenderer
renderer
=
new
JSON
Renderer
();
final
J
sonRenderer
renderer
=
new
Json
Renderer
();
context
.
setRenderer
(
renderer
);
context
.
setRenderer
(
renderer
);
renderer
.
setJSONObject
(
jsonObject
);
renderer
.
setJSONObject
(
jsonObject
);
...
@@ -227,8 +227,8 @@ public class CommentProcessor {
...
@@ -227,8 +227,8 @@ public class CommentProcessor {
*
*
* @param context the specified context, including a request json object
* @param context the specified context, including a request json object
*/
*/
@RequestProcessing
(
value
=
"/article/comments"
,
method
=
H
TTPRequest
Method
.
POST
)
@RequestProcessing
(
value
=
"/article/comments"
,
method
=
H
ttp
Method
.
POST
)
public
void
addArticleComment
(
final
HTTP
RequestContext
context
)
{
public
void
addArticleComment
(
final
RequestContext
context
)
{
final
HttpServletRequest
httpServletRequest
=
context
.
getRequest
();
final
HttpServletRequest
httpServletRequest
=
context
.
getRequest
();
final
HttpServletResponse
httpServletResponse
=
context
.
getResponse
();
final
HttpServletResponse
httpServletResponse
=
context
.
getResponse
();
final
JSONObject
requestJSONObject
=
context
.
requestJSON
();
final
JSONObject
requestJSONObject
=
context
.
requestJSON
();
...
@@ -237,7 +237,7 @@ public class CommentProcessor {
...
@@ -237,7 +237,7 @@ public class CommentProcessor {
fillCommenter
(
requestJSONObject
,
httpServletRequest
,
httpServletResponse
);
fillCommenter
(
requestJSONObject
,
httpServletRequest
,
httpServletResponse
);
final
JSONObject
jsonObject
=
commentMgmtService
.
checkAddCommentRequest
(
requestJSONObject
);
final
JSONObject
jsonObject
=
commentMgmtService
.
checkAddCommentRequest
(
requestJSONObject
);
final
J
SONRenderer
renderer
=
new
JSON
Renderer
();
final
J
sonRenderer
renderer
=
new
Json
Renderer
();
context
.
setRenderer
(
renderer
);
context
.
setRenderer
(
renderer
);
renderer
.
setJSONObject
(
jsonObject
);
renderer
.
setJSONObject
(
jsonObject
);
...
...
src/main/java/org/b3log/solo/processor/ErrorProcessor.java
View file @
86bbde7f
...
@@ -22,8 +22,8 @@ import org.b3log.latke.ioc.Inject;
...
@@ -22,8 +22,8 @@ import org.b3log.latke.ioc.Inject;
import
org.b3log.latke.logging.Level
;
import
org.b3log.latke.logging.Level
;
import
org.b3log.latke.logging.Logger
;
import
org.b3log.latke.logging.Logger
;
import
org.b3log.latke.service.LangPropsService
;
import
org.b3log.latke.service.LangPropsService
;
import
org.b3log.latke.servlet.
HTTP
RequestContext
;
import
org.b3log.latke.servlet.RequestContext
;
import
org.b3log.latke.servlet.H
TTPRequest
Method
;
import
org.b3log.latke.servlet.H
ttp
Method
;
import
org.b3log.latke.servlet.annotation.RequestProcessing
;
import
org.b3log.latke.servlet.annotation.RequestProcessing
;
import
org.b3log.latke.servlet.annotation.RequestProcessor
;
import
org.b3log.latke.servlet.annotation.RequestProcessor
;
import
org.b3log.latke.servlet.renderer.AbstractFreeMarkerRenderer
;
import
org.b3log.latke.servlet.renderer.AbstractFreeMarkerRenderer
;
...
@@ -83,8 +83,8 @@ public class ErrorProcessor {
...
@@ -83,8 +83,8 @@ public class ErrorProcessor {
* @param context the specified context
* @param context the specified context
* @throws Exception exception
* @throws Exception exception
*/
*/
@RequestProcessing
(
value
=
"/error/{statusCode}"
,
method
=
H
TTPRequest
Method
.
GET
)
@RequestProcessing
(
value
=
"/error/{statusCode}"
,
method
=
H
ttp
Method
.
GET
)
public
void
showErrorPage
(
final
HTTP
RequestContext
context
,
final
String
statusCode
)
{
public
void
showErrorPage
(
final
RequestContext
context
,
final
String
statusCode
)
{
final
HttpServletRequest
request
=
context
.
getRequest
();
final
HttpServletRequest
request
=
context
.
getRequest
();
final
HttpServletResponse
response
=
context
.
getResponse
();
final
HttpServletResponse
response
=
context
.
getResponse
();
if
(
StringUtils
.
equals
(
"GET"
,
request
.
getMethod
()))
{
if
(
StringUtils
.
equals
(
"GET"
,
request
.
getMethod
()))
{
...
...
src/main/java/org/b3log/solo/processor/FeedProcessor.java
View file @
86bbde7f
...
@@ -25,8 +25,8 @@ import org.b3log.latke.logging.Logger;
...
@@ -25,8 +25,8 @@ import org.b3log.latke.logging.Logger;
import
org.b3log.latke.model.User
;
import
org.b3log.latke.model.User
;
import
org.b3log.latke.repository.*
;
import
org.b3log.latke.repository.*
;
import
org.b3log.latke.service.ServiceException
;
import
org.b3log.latke.service.ServiceException
;
import
org.b3log.latke.servlet.
HTTP
RequestContext
;
import
org.b3log.latke.servlet.RequestContext
;
import
org.b3log.latke.servlet.H
TTPRequest
Method
;
import
org.b3log.latke.servlet.H
ttp
Method
;
import
org.b3log.latke.servlet.annotation.RequestProcessing
;
import
org.b3log.latke.servlet.annotation.RequestProcessing
;
import
org.b3log.latke.servlet.annotation.RequestProcessor
;
import
org.b3log.latke.servlet.annotation.RequestProcessor
;
import
org.b3log.latke.servlet.renderer.AtomRenderer
;
import
org.b3log.latke.servlet.renderer.AtomRenderer
;
...
@@ -93,8 +93,8 @@ public class FeedProcessor {
...
@@ -93,8 +93,8 @@ public class FeedProcessor {
*
*
* @param context the specified context
* @param context the specified context
*/
*/
@RequestProcessing
(
value
=
"/atom.xml"
,
method
=
{
H
TTPRequestMethod
.
GET
,
HTTPRequest
Method
.
HEAD
})
@RequestProcessing
(
value
=
"/atom.xml"
,
method
=
{
H
ttpMethod
.
GET
,
Http
Method
.
HEAD
})
public
void
blogArticlesAtom
(
final
HTTP
RequestContext
context
)
{
public
void
blogArticlesAtom
(
final
RequestContext
context
)
{
final
AtomRenderer
renderer
=
new
AtomRenderer
();
final
AtomRenderer
renderer
=
new
AtomRenderer
();
context
.
setRenderer
(
renderer
);
context
.
setRenderer
(
renderer
);
...
@@ -166,8 +166,8 @@ public class FeedProcessor {
...
@@ -166,8 +166,8 @@ public class FeedProcessor {
* @param context the specified context
* @param context the specified context
* @throws Exception exception
* @throws Exception exception
*/
*/
@RequestProcessing
(
value
=
"/rss.xml"
,
method
=
{
H
TTPRequestMethod
.
GET
,
HTTPRequest
Method
.
HEAD
})
@RequestProcessing
(
value
=
"/rss.xml"
,
method
=
{
H
ttpMethod
.
GET
,
Http
Method
.
HEAD
})
public
void
blogArticlesRSS
(
final
HTTP
RequestContext
context
)
{
public
void
blogArticlesRSS
(
final
RequestContext
context
)
{
final
HttpServletResponse
response
=
context
.
getResponse
();
final
HttpServletResponse
response
=
context
.
getResponse
();
final
RssRenderer
renderer
=
new
RssRenderer
();
final
RssRenderer
renderer
=
new
RssRenderer
();
context
.
setRenderer
(
renderer
);
context
.
setRenderer
(
renderer
);
...
...
src/main/java/org/b3log/solo/processor/FileUploadProcessor.java
View file @
86bbde7f
...
@@ -36,8 +36,8 @@ import org.b3log.latke.logging.Level;
...
@@ -36,8 +36,8 @@ import org.b3log.latke.logging.Level;
import
org.b3log.latke.logging.Logger
;
import
org.b3log.latke.logging.Logger
;
import
org.b3log.latke.model.Role
;
import
org.b3log.latke.model.Role
;
import
org.b3log.latke.model.User
;
import
org.b3log.latke.model.User
;
import
org.b3log.latke.servlet.
HTTP
RequestContext
;
import
org.b3log.latke.servlet.RequestContext
;
import
org.b3log.latke.servlet.H
TTPRequest
Method
;
import
org.b3log.latke.servlet.H
ttp
Method
;
import
org.b3log.latke.servlet.annotation.RequestProcessing
;
import
org.b3log.latke.servlet.annotation.RequestProcessing
;
import
org.b3log.latke.servlet.annotation.RequestProcessor
;
import
org.b3log.latke.servlet.annotation.RequestProcessor
;
import
org.b3log.latke.util.URLs
;
import
org.b3log.latke.util.URLs
;
...
@@ -94,8 +94,8 @@ public class FileUploadProcessor {
...
@@ -94,8 +94,8 @@ public class FileUploadProcessor {
*
*
* @param context the specified context
* @param context the specified context
*/
*/
@RequestProcessing
(
value
=
"/upload/*"
,
method
=
H
TTPRequest
Method
.
GET
)
@RequestProcessing
(
value
=
"/upload/*"
,
method
=
H
ttp
Method
.
GET
)
public
void
getFile
(
final
HTTP
RequestContext
context
)
{
public
void
getFile
(
final
RequestContext
context
)
{
if
(
QN_ENABLED
)
{
if
(
QN_ENABLED
)
{
return
;
return
;
}
}
...
@@ -154,8 +154,8 @@ public class FileUploadProcessor {
...
@@ -154,8 +154,8 @@ public class FileUploadProcessor {
*
*
* @param context the specified context
* @param context the specified context
*/
*/
@RequestProcessing
(
value
=
"/upload"
,
method
=
H
TTPRequest
Method
.
POST
)
@RequestProcessing
(
value
=
"/upload"
,
method
=
H
ttp
Method
.
POST
)
public
void
uploadFile
(
final
HTTP
RequestContext
context
)
{
public
void
uploadFile
(
final
RequestContext
context
)
{
context
.
renderJSON
();
context
.
renderJSON
();
final
HttpServletRequest
request
=
context
.
getRequest
();
final
HttpServletRequest
request
=
context
.
getRequest
();
final
HttpServletResponse
response
=
context
.
getResponse
();
final
HttpServletResponse
response
=
context
.
getResponse
();
...
...
src/main/java/org/b3log/solo/processor/IndexProcessor.java
View file @
86bbde7f
...
@@ -26,8 +26,8 @@ import org.b3log.latke.logging.Logger;
...
@@ -26,8 +26,8 @@ import org.b3log.latke.logging.Logger;
import
org.b3log.latke.model.Pagination
;
import
org.b3log.latke.model.Pagination
;
import
org.b3log.latke.service.LangPropsService
;
import
org.b3log.latke.service.LangPropsService
;
import
org.b3log.latke.service.ServiceException
;
import
org.b3log.latke.service.ServiceException
;
import
org.b3log.latke.servlet.
HTTP
RequestContext
;
import
org.b3log.latke.servlet.RequestContext
;
import
org.b3log.latke.servlet.H
TTPRequest
Method
;
import
org.b3log.latke.servlet.H
ttp
Method
;
import
org.b3log.latke.servlet.URIPatternMode
;
import
org.b3log.latke.servlet.URIPatternMode
;
import
org.b3log.latke.servlet.annotation.RequestProcessing
;
import
org.b3log.latke.servlet.annotation.RequestProcessing
;
import
org.b3log.latke.servlet.annotation.RequestProcessor
;
import
org.b3log.latke.servlet.annotation.RequestProcessor
;
...
@@ -94,8 +94,8 @@ public class IndexProcessor {
...
@@ -94,8 +94,8 @@ public class IndexProcessor {
* @param context the specified context
* @param context the specified context
* @throws Exception exception
* @throws Exception exception
*/
*/
@RequestProcessing
(
value
=
{
"/\\d*"
,
""
},
uriPatternsMode
=
URIPatternMode
.
REGEX
,
method
=
H
TTPRequest
Method
.
GET
)
@RequestProcessing
(
value
=
{
"/\\d*"
,
""
},
uriPatternsMode
=
URIPatternMode
.
REGEX
,
method
=
H
ttp
Method
.
GET
)
public
void
showIndex
(
final
HTTP
RequestContext
context
)
{
public
void
showIndex
(
final
RequestContext
context
)
{
final
HttpServletRequest
request
=
context
.
getRequest
();
final
HttpServletRequest
request
=
context
.
getRequest
();
final
HttpServletResponse
response
=
context
.
getResponse
();
final
HttpServletResponse
response
=
context
.
getResponse
();
final
AbstractFreeMarkerRenderer
renderer
=
new
SkinRenderer
(
request
);
final
AbstractFreeMarkerRenderer
renderer
=
new
SkinRenderer
(
request
);
...
@@ -147,8 +147,8 @@ public class IndexProcessor {
...
@@ -147,8 +147,8 @@ public class IndexProcessor {
*
*
* @param context the specified context
* @param context the specified context
*/
*/
@RequestProcessing
(
value
=
"/kill-browser"
,
method
=
H
TTPRequest
Method
.
GET
)
@RequestProcessing
(
value
=
"/kill-browser"
,
method
=
H
ttp
Method
.
GET
)
public
void
showKillBrowser
(
final
HTTP
RequestContext
context
)
{
public
void
showKillBrowser
(
final
RequestContext
context
)
{
final
HttpServletRequest
request
=
context
.
getRequest
();
final
HttpServletRequest
request
=
context
.
getRequest
();
final
HttpServletResponse
response
=
context
.
getResponse
();
final
HttpServletResponse
response
=
context
.
getResponse
();
final
AbstractFreeMarkerRenderer
renderer
=
new
SkinRenderer
(
request
);
final
AbstractFreeMarkerRenderer
renderer
=
new
SkinRenderer
(
request
);
...
@@ -176,8 +176,8 @@ public class IndexProcessor {
...
@@ -176,8 +176,8 @@ public class IndexProcessor {
*
*
* @param context the specified context
* @param context the specified context
*/
*/
@RequestProcessing
(
value
=
"/register"
,
method
=
H
TTPRequest
Method
.
GET
)
@RequestProcessing
(
value
=
"/register"
,
method
=
H
ttp
Method
.
GET
)
public
void
register
(
final
HTTP
RequestContext
context
)
{
public
void
register
(
final
RequestContext
context
)
{
final
HttpServletRequest
request
=
context
.
getRequest
();
final
HttpServletRequest
request
=
context
.
getRequest
();
final
HttpServletResponse
response
=
context
.
getResponse
();
final
HttpServletResponse
response
=
context
.
getResponse
();
final
AbstractFreeMarkerRenderer
renderer
=
new
SkinRenderer
(
request
);
final
AbstractFreeMarkerRenderer
renderer
=
new
SkinRenderer
(
request
);
...
...
src/main/java/org/b3log/solo/processor/InitProcessor.java
View file @
86bbde7f
...
@@ -25,12 +25,12 @@ import org.b3log.latke.logging.Level;
...
@@ -25,12 +25,12 @@ import org.b3log.latke.logging.Level;
import
org.b3log.latke.logging.Logger
;
import
org.b3log.latke.logging.Logger
;
import
org.b3log.latke.model.User
;
import
org.b3log.latke.model.User
;
import
org.b3log.latke.service.LangPropsService
;
import
org.b3log.latke.service.LangPropsService
;
import
org.b3log.latke.servlet.
HTTP
RequestContext
;
import
org.b3log.latke.servlet.RequestContext
;
import
org.b3log.latke.servlet.H
TTPRequest
Method
;
import
org.b3log.latke.servlet.H
ttp
Method
;
import
org.b3log.latke.servlet.annotation.RequestProcessing
;
import
org.b3log.latke.servlet.annotation.RequestProcessing
;
import
org.b3log.latke.servlet.annotation.RequestProcessor
;
import
org.b3log.latke.servlet.annotation.RequestProcessor
;
import
org.b3log.latke.servlet.renderer.AbstractFreeMarkerRenderer
;
import
org.b3log.latke.servlet.renderer.AbstractFreeMarkerRenderer
;
import
org.b3log.latke.servlet.renderer.J
SON
Renderer
;
import
org.b3log.latke.servlet.renderer.J
son
Renderer
;
import
org.b3log.latke.util.Locales
;
import
org.b3log.latke.util.Locales
;
import
org.b3log.latke.util.Strings
;
import
org.b3log.latke.util.Strings
;
import
org.b3log.solo.SoloServletListener
;
import
org.b3log.solo.SoloServletListener
;
...
@@ -93,8 +93,8 @@ public class InitProcessor {
...
@@ -93,8 +93,8 @@ public class InitProcessor {
*
*
* @param context the specified http request context
* @param context the specified http request context
*/
*/
@RequestProcessing
(
value
=
"/init"
,
method
=
H
TTPRequest
Method
.
GET
)
@RequestProcessing
(
value
=
"/init"
,
method
=
H
ttp
Method
.
GET
)
public
void
showInit
(
final
HTTP
RequestContext
context
)
{
public
void
showInit
(
final
RequestContext
context
)
{
if
(
initService
.
isInited
())
{
if
(
initService
.
isInited
())
{
context
.
sendRedirect
(
"/"
);
context
.
sendRedirect
(
"/"
);
...
@@ -132,15 +132,15 @@ public class InitProcessor {
...
@@ -132,15 +132,15 @@ public class InitProcessor {
*
*
* @param context the specified http request context
* @param context the specified http request context
*/
*/
@RequestProcessing
(
value
=
"/init"
,
method
=
H
TTPRequest
Method
.
POST
)
@RequestProcessing
(
value
=
"/init"
,
method
=
H
ttp
Method
.
POST
)
public
void
initSolo
(
final
HTTP
RequestContext
context
)
{
public
void
initSolo
(
final
RequestContext
context
)
{
if
(
initService
.
isInited
())
{
if
(
initService
.
isInited
())
{
context
.
sendRedirect
(
"/"
);
context
.
sendRedirect
(
"/"
);
return
;
return
;
}
}
final
J
SONRenderer
renderer
=
new
JSON
Renderer
();
final
J
sonRenderer
renderer
=
new
Json
Renderer
();
context
.
setRenderer
(
renderer
);
context
.
setRenderer
(
renderer
);
final
JSONObject
ret
=
new
JSONObject
().
put
(
Keys
.
STATUS_CODE
,
false
);
final
JSONObject
ret
=
new
JSONObject
().
put
(
Keys
.
STATUS_CODE
,
false
);
renderer
.
setJSONObject
(
ret
);
renderer
.
setJSONObject
(
ret
);
...
...
src/main/java/org/b3log/solo/processor/KanBanNiangProcessor.java
View file @
86bbde7f
...
@@ -21,11 +21,11 @@ import org.apache.commons.io.IOUtils;
...
@@ -21,11 +21,11 @@ import org.apache.commons.io.IOUtils;
import
org.apache.commons.lang.math.RandomUtils
;
import
org.apache.commons.lang.math.RandomUtils
;
import
org.b3log.latke.logging.Level
;
import
org.b3log.latke.logging.Level
;
import
org.b3log.latke.logging.Logger
;
import
org.b3log.latke.logging.Logger
;
import
org.b3log.latke.servlet.
HTTP
RequestContext
;
import
org.b3log.latke.servlet.RequestContext
;
import
org.b3log.latke.servlet.H
TTPRequest
Method
;
import
org.b3log.latke.servlet.H
ttp
Method
;
import
org.b3log.latke.servlet.annotation.RequestProcessing
;
import
org.b3log.latke.servlet.annotation.RequestProcessing
;
import
org.b3log.latke.servlet.annotation.RequestProcessor
;
import
org.b3log.latke.servlet.annotation.RequestProcessor
;
import
org.b3log.latke.servlet.renderer.J
SON
Renderer
;
import
org.b3log.latke.servlet.renderer.J
son
Renderer
;
import
org.b3log.solo.SoloServletListener
;
import
org.b3log.solo.SoloServletListener
;
import
org.json.JSONObject
;
import
org.json.JSONObject
;
...
@@ -51,9 +51,9 @@ public class KanBanNiangProcessor {
...
@@ -51,9 +51,9 @@ public class KanBanNiangProcessor {
*
*
* @param context the specified http request context
* @param context the specified http request context
*/
*/
@RequestProcessing
(
value
=
"/plugins/kanbanniang/assert/model"
,
method
=
H
TTPRequest
Method
.
GET
)
@RequestProcessing
(
value
=
"/plugins/kanbanniang/assert/model"
,
method
=
H
ttp
Method
.
GET
)
public
void
randomModel
(
final
HTTP
RequestContext
context
)
{
public
void
randomModel
(
final
RequestContext
context
)
{
final
J
SONRenderer
renderer
=
new
JSON
Renderer
();
final
J
sonRenderer
renderer
=
new
Json
Renderer
();
context
.
setRenderer
(
renderer
);
context
.
setRenderer
(
renderer
);
try
{
try
{
final
int
i
=
RandomUtils
.
nextInt
(
MODEL_NAMES
.
length
);
final
int
i
=
RandomUtils
.
nextInt
(
MODEL_NAMES
.
length
);
...
...
src/main/java/org/b3log/solo/processor/LoginProcessor.java
View file @
86bbde7f
...
@@ -31,12 +31,12 @@ import org.b3log.latke.repository.RepositoryException;
...
@@ -31,12 +31,12 @@ import org.b3log.latke.repository.RepositoryException;
import
org.b3log.latke.repository.Transaction
;
import
org.b3log.latke.repository.Transaction
;
import
org.b3log.latke.service.LangPropsService
;
import
org.b3log.latke.service.LangPropsService
;
import
org.b3log.latke.service.ServiceException
;
import
org.b3log.latke.service.ServiceException
;
import
org.b3log.latke.servlet.
HTTP
RequestContext
;
import
org.b3log.latke.servlet.RequestContext
;
import
org.b3log.latke.servlet.H
TTPRequest
Method
;
import
org.b3log.latke.servlet.H
ttp
Method
;
import
org.b3log.latke.servlet.annotation.RequestProcessing
;
import
org.b3log.latke.servlet.annotation.RequestProcessing
;
import
org.b3log.latke.servlet.annotation.RequestProcessor
;
import
org.b3log.latke.servlet.annotation.RequestProcessor
;
import
org.b3log.latke.servlet.renderer.AbstractFreeMarkerRenderer
;
import
org.b3log.latke.servlet.renderer.AbstractFreeMarkerRenderer
;
import
org.b3log.latke.servlet.renderer.J
SON
Renderer
;
import
org.b3log.latke.servlet.renderer.J
son
Renderer
;
import
org.b3log.latke.util.Requests
;
import
org.b3log.latke.util.Requests
;
import
org.b3log.solo.SoloServletListener
;
import
org.b3log.solo.SoloServletListener
;
import
org.b3log.solo.mail.MailService
;
import
org.b3log.solo.mail.MailService
;
...
@@ -131,8 +131,8 @@ public class LoginProcessor {
...
@@ -131,8 +131,8 @@ public class LoginProcessor {
*
*
* @param context the specified context
* @param context the specified context
*/
*/
@RequestProcessing
(
value
=
"/login"
,
method
=
H
TTPRequest
Method
.
GET
)
@RequestProcessing
(
value
=
"/login"
,
method
=
H
ttp
Method
.
GET
)
public
void
showLogin
(
final
HTTP
RequestContext
context
)
{
public
void
showLogin
(
final
RequestContext
context
)
{
final
HttpServletRequest
request
=
context
.
getRequest
();
final
HttpServletRequest
request
=
context
.
getRequest
();
String
destinationURL
=
request
.
getParameter
(
Common
.
GOTO
);
String
destinationURL
=
request
.
getParameter
(
Common
.
GOTO
);
...
@@ -166,11 +166,11 @@ public class LoginProcessor {
...
@@ -166,11 +166,11 @@ public class LoginProcessor {
*
*
* @param context the specified context
* @param context the specified context
*/
*/
@RequestProcessing
(
value
=
"/login"
,
method
=
H
TTPRequest
Method
.
POST
)
@RequestProcessing
(
value
=
"/login"
,
method
=
H
ttp
Method
.
POST
)
public
void
login
(
final
HTTP
RequestContext
context
)
{
public
void
login
(
final
RequestContext
context
)
{
final
HttpServletRequest
request
=
context
.
getRequest
();
final
HttpServletRequest
request
=
context
.
getRequest
();
final
JSONObject
requestJSONObject
=
context
.
requestJSON
();
final
JSONObject
requestJSONObject
=
context
.
requestJSON
();
final
J
SONRenderer
renderer
=
new
JSON
Renderer
();
final
J
sonRenderer
renderer
=
new
Json
Renderer
();
context
.
setRenderer
(
renderer
);
context
.
setRenderer
(
renderer
);
final
JSONObject
jsonObject
=
new
JSONObject
();
final
JSONObject
jsonObject
=
new
JSONObject
();
renderer
.
setJSONObject
(
jsonObject
);
renderer
.
setJSONObject
(
jsonObject
);
...
@@ -217,8 +217,8 @@ public class LoginProcessor {
...
@@ -217,8 +217,8 @@ public class LoginProcessor {
*
*
* @param context the specified context
* @param context the specified context
*/
*/
@RequestProcessing
(
value
=
"/logout"
,
method
=
H
TTPRequest
Method
.
GET
)
@RequestProcessing
(
value
=
"/logout"
,
method
=
H
ttp
Method
.
GET
)
public
void
logout
(
final
HTTP
RequestContext
context
)
{
public
void
logout
(
final
RequestContext
context
)
{
final
HttpServletRequest
httpServletRequest
=
context
.
getRequest
();
final
HttpServletRequest
httpServletRequest
=
context
.
getRequest
();
Solos
.
logout
(
httpServletRequest
,
context
.
getResponse
());
Solos
.
logout
(
httpServletRequest
,
context
.
getResponse
());
...
@@ -236,8 +236,8 @@ public class LoginProcessor {
...
@@ -236,8 +236,8 @@ public class LoginProcessor {
*
*
* @param context the specified context
* @param context the specified context
*/
*/
@RequestProcessing
(
value
=
"/forgot"
,
method
=
H
TTPRequest
Method
.
GET
)
@RequestProcessing
(
value
=
"/forgot"
,
method
=
H
ttp
Method
.
GET
)
public
void
showForgot
(
final
HTTP
RequestContext
context
)
{
public
void
showForgot
(
final
RequestContext
context
)
{
final
HttpServletRequest
request
=
context
.
getRequest
();
final
HttpServletRequest
request
=
context
.
getRequest
();
String
destinationURL
=
request
.
getParameter
(
Common
.
GOTO
);
String
destinationURL
=
request
.
getParameter
(
Common
.
GOTO
);
...
@@ -264,9 +264,9 @@ public class LoginProcessor {
...
@@ -264,9 +264,9 @@ public class LoginProcessor {
*
*
* @param context the specified context
* @param context the specified context
*/
*/
@RequestProcessing
(
value
=
"/forgot"
,
method
=
H
TTPRequest
Method
.
POST
)
@RequestProcessing
(
value
=
"/forgot"
,
method
=
H
ttp
Method
.
POST
)
public
void
forgot
(
final
HTTP
RequestContext
context
)
{
public
void
forgot
(
final
RequestContext
context
)
{
final
J
SONRenderer
renderer
=
new
JSON
Renderer
();
final
J
sonRenderer
renderer
=
new
Json
Renderer
();
context
.
setRenderer
(
renderer
);
context
.
setRenderer
(
renderer
);
final
JSONObject
jsonObject
=
new
JSONObject
();
final
JSONObject
jsonObject
=
new
JSONObject
();
renderer
.
setJSONObject
(
jsonObject
);
renderer
.
setJSONObject
(
jsonObject
);
...
@@ -313,9 +313,9 @@ public class LoginProcessor {
...
@@ -313,9 +313,9 @@ public class LoginProcessor {
*
*
* @param context the specified context
* @param context the specified context
*/
*/
@RequestProcessing
(
value
=
"/reset"
,
method
=
H
TTPRequest
Method
.
POST
)
@RequestProcessing
(
value
=
"/reset"
,
method
=
H
ttp
Method
.
POST
)
public
void
reset
(
final
HTTP
RequestContext
context
)
{
public
void
reset
(
final
RequestContext
context
)
{
final
J
SONRenderer
renderer
=
new
JSON
Renderer
();
final
J
sonRenderer
renderer
=
new
Json
Renderer
();
context
.
setRenderer
(
renderer
);
context
.
setRenderer
(
renderer
);
final
JSONObject
jsonObject
=
new
JSONObject
();
final
JSONObject
jsonObject
=
new
JSONObject
();
...
@@ -413,7 +413,7 @@ public class LoginProcessor {
...
@@ -413,7 +413,7 @@ public class LoginProcessor {
* @param destinationURL the destination URL
* @param destinationURL the destination URL
* @param request for reset password page
* @param request for reset password page
*/
*/
private
void
renderPage
(
final
HTTP
RequestContext
context
,
final
String
pageTemplate
,
final
String
destinationURL
,
private
void
renderPage
(
final
RequestContext
context
,
final
String
pageTemplate
,
final
String
destinationURL
,
final
HttpServletRequest
request
)
{
final
HttpServletRequest
request
)
{
final
AbstractFreeMarkerRenderer
renderer
=
new
SkinRenderer
(
request
);
final
AbstractFreeMarkerRenderer
renderer
=
new
SkinRenderer
(
request
);
renderer
.
setTemplateName
(
pageTemplate
);
renderer
.
setTemplateName
(
pageTemplate
);
...
...
src/main/java/org/b3log/solo/processor/OAuthGitHubProcessor.java
View file @
86bbde7f
...
@@ -28,8 +28,8 @@ import org.b3log.latke.logging.Level;
...
@@ -28,8 +28,8 @@ import org.b3log.latke.logging.Level;
import
org.b3log.latke.logging.Logger
;
import
org.b3log.latke.logging.Logger
;
import
org.b3log.latke.model.Role
;
import
org.b3log.latke.model.Role
;
import
org.b3log.latke.model.User
;
import
org.b3log.latke.model.User
;
import
org.b3log.latke.servlet.
HTTP
RequestContext
;
import
org.b3log.latke.servlet.RequestContext
;
import
org.b3log.latke.servlet.H
TTPRequest
Method
;
import
org.b3log.latke.servlet.H
ttp
Method
;
import
org.b3log.latke.servlet.annotation.RequestProcessing
;
import
org.b3log.latke.servlet.annotation.RequestProcessing
;
import
org.b3log.latke.servlet.annotation.RequestProcessor
;
import
org.b3log.latke.servlet.annotation.RequestProcessor
;
import
org.b3log.latke.util.CollectionUtils
;
import
org.b3log.latke.util.CollectionUtils
;
...
@@ -119,8 +119,8 @@ public class OAuthGitHubProcessor {
...
@@ -119,8 +119,8 @@ public class OAuthGitHubProcessor {
* @param context the specified context
* @param context the specified context
* @throws Exception exception
* @throws Exception exception
*/
*/
@RequestProcessing
(
value
=
"/oauth/github/redirect"
,
method
=
H
TTPRequest
Method
.
GET
)
@RequestProcessing
(
value
=
"/oauth/github/redirect"
,
method
=
H
ttp
Method
.
GET
)
public
void
redirectGitHub
(
final
HTTP
RequestContext
context
)
{
public
void
redirectGitHub
(
final
RequestContext
context
)
{
final
String
state
=
Latkes
.
getServePath
()
+
":::"
+
RandomStringUtils
.
randomAlphanumeric
(
16
);
final
String
state
=
Latkes
.
getServePath
()
+
":::"
+
RandomStringUtils
.
randomAlphanumeric
(
16
);
STATES
.
put
(
state
,
URLs
.
encode
(
state
));
STATES
.
put
(
state
,
URLs
.
encode
(
state
));
...
@@ -135,8 +135,8 @@ public class OAuthGitHubProcessor {
...
@@ -135,8 +135,8 @@ public class OAuthGitHubProcessor {
*
*
* @param context the specified context
* @param context the specified context
*/
*/
@RequestProcessing
(
value
=
"/oauth/github"
,
method
=
H
TTPRequest
Method
.
GET
)
@RequestProcessing
(
value
=
"/oauth/github"
,
method
=
H
ttp
Method
.
GET
)
public
synchronized
void
showGitHubCallback
(
final
HTTP
RequestContext
context
)
{
public
synchronized
void
showGitHubCallback
(
final
RequestContext
context
)
{
final
String
state
=
context
.
param
(
"state"
);
final
String
state
=
context
.
param
(
"state"
);
String
referer
=
STATES
.
get
(
state
);
String
referer
=
STATES
.
get
(
state
);
if
(
StringUtils
.
isBlank
(
referer
))
{
if
(
StringUtils
.
isBlank
(
referer
))
{
...
...
src/main/java/org/b3log/solo/processor/PageProcessor.java
View file @
86bbde7f
...
@@ -22,8 +22,8 @@ import org.b3log.latke.ioc.Inject;
...
@@ -22,8 +22,8 @@ import org.b3log.latke.ioc.Inject;
import
org.b3log.latke.logging.Level
;
import
org.b3log.latke.logging.Level
;
import
org.b3log.latke.logging.Logger
;
import
org.b3log.latke.logging.Logger
;
import
org.b3log.latke.service.LangPropsService
;
import
org.b3log.latke.service.LangPropsService
;
import
org.b3log.latke.servlet.
HTTP
RequestContext
;
import
org.b3log.latke.servlet.RequestContext
;
import
org.b3log.latke.servlet.H
TTPRequest
Method
;
import
org.b3log.latke.servlet.H
ttp
Method
;
import
org.b3log.latke.servlet.annotation.RequestProcessing
;
import
org.b3log.latke.servlet.annotation.RequestProcessing
;
import
org.b3log.latke.servlet.annotation.RequestProcessor
;
import
org.b3log.latke.servlet.annotation.RequestProcessor
;
import
org.b3log.latke.servlet.renderer.AbstractFreeMarkerRenderer
;
import
org.b3log.latke.servlet.renderer.AbstractFreeMarkerRenderer
;
...
@@ -95,8 +95,8 @@ public class PageProcessor {
...
@@ -95,8 +95,8 @@ public class PageProcessor {
*
*
* @param context the specified context
* @param context the specified context
*/
*/
@RequestProcessing
(
value
=
"/page"
,
method
=
H
TTPRequest
Method
.
GET
)
@RequestProcessing
(
value
=
"/page"
,
method
=
H
ttp
Method
.
GET
)
public
void
showPage
(
final
HTTP
RequestContext
context
)
{
public
void
showPage
(
final
RequestContext
context
)
{
final
AbstractFreeMarkerRenderer
renderer
=
new
SkinRenderer
(
context
.
getRequest
());
final
AbstractFreeMarkerRenderer
renderer
=
new
SkinRenderer
(
context
.
getRequest
());
context
.
setRenderer
(
renderer
);
context
.
setRenderer
(
renderer
);
renderer
.
setTemplateName
(
"page.ftl"
);
renderer
.
setTemplateName
(
"page.ftl"
);
...
...
src/main/java/org/b3log/solo/processor/SearchProcessor.java
View file @
86bbde7f
...
@@ -25,12 +25,12 @@ import org.b3log.latke.logging.Level;
...
@@ -25,12 +25,12 @@ import org.b3log.latke.logging.Level;
import
org.b3log.latke.logging.Logger
;
import
org.b3log.latke.logging.Logger
;
import
org.b3log.latke.model.Pagination
;
import
org.b3log.latke.model.Pagination
;
import
org.b3log.latke.service.LangPropsService
;
import
org.b3log.latke.service.LangPropsService
;
import
org.b3log.latke.servlet.
HTTP
RequestContext
;
import
org.b3log.latke.servlet.RequestContext
;
import
org.b3log.latke.servlet.H
TTPRequest
Method
;
import
org.b3log.latke.servlet.H
ttp
Method
;
import
org.b3log.latke.servlet.annotation.RequestProcessing
;
import
org.b3log.latke.servlet.annotation.RequestProcessing
;
import
org.b3log.latke.servlet.annotation.RequestProcessor
;
import
org.b3log.latke.servlet.annotation.RequestProcessor
;
import
org.b3log.latke.servlet.renderer.AbstractFreeMarkerRenderer
;
import
org.b3log.latke.servlet.renderer.AbstractFreeMarkerRenderer
;
import
org.b3log.latke.servlet.renderer.TextX
ML
Renderer
;
import
org.b3log.latke.servlet.renderer.TextX
ml
Renderer
;
import
org.b3log.latke.util.Strings
;
import
org.b3log.latke.util.Strings
;
import
org.b3log.solo.model.Article
;
import
org.b3log.solo.model.Article
;
import
org.b3log.solo.model.Common
;
import
org.b3log.solo.model.Common
;
...
@@ -101,9 +101,9 @@ public class SearchProcessor {
...
@@ -101,9 +101,9 @@ public class SearchProcessor {
*
*
* @param context the specified context
* @param context the specified context
*/
*/
@RequestProcessing
(
value
=
"/opensearch.xml"
,
method
=
H
TTPRequest
Method
.
GET
)
@RequestProcessing
(
value
=
"/opensearch.xml"
,
method
=
H
ttp
Method
.
GET
)
public
void
showOpensearchXML
(
final
HTTP
RequestContext
context
)
{
public
void
showOpensearchXML
(
final
RequestContext
context
)
{
final
TextX
MLRenderer
renderer
=
new
TextXML
Renderer
();
final
TextX
mlRenderer
renderer
=
new
TextXml
Renderer
();
context
.
setRenderer
(
renderer
);
context
.
setRenderer
(
renderer
);
try
{
try
{
...
@@ -125,8 +125,8 @@ public class SearchProcessor {
...
@@ -125,8 +125,8 @@ public class SearchProcessor {
*
*
* @param context the specified context
* @param context the specified context
*/
*/
@RequestProcessing
(
value
=
"/search"
,
method
=
H
TTPRequest
Method
.
GET
)
@RequestProcessing
(
value
=
"/search"
,
method
=
H
ttp
Method
.
GET
)
public
void
search
(
final
HTTP
RequestContext
context
)
{
public
void
search
(
final
RequestContext
context
)
{
final
HttpServletRequest
request
=
context
.
getRequest
();
final
HttpServletRequest
request
=
context
.
getRequest
();
final
AbstractFreeMarkerRenderer
renderer
=
new
SkinRenderer
(
request
);
final
AbstractFreeMarkerRenderer
renderer
=
new
SkinRenderer
(
request
);
context
.
setRenderer
(
renderer
);
context
.
setRenderer
(
renderer
);
...
...
src/main/java/org/b3log/solo/processor/SitemapProcessor.java
View file @
86bbde7f
...
@@ -28,11 +28,11 @@ import org.b3log.latke.repository.FilterOperator;
...
@@ -28,11 +28,11 @@ import org.b3log.latke.repository.FilterOperator;
import
org.b3log.latke.repository.PropertyFilter
;
import
org.b3log.latke.repository.PropertyFilter
;
import
org.b3log.latke.repository.Query
;
import
org.b3log.latke.repository.Query
;
import
org.b3log.latke.repository.SortDirection
;
import
org.b3log.latke.repository.SortDirection
;
import
org.b3log.latke.servlet.
HTTP
RequestContext
;
import
org.b3log.latke.servlet.RequestContext
;
import
org.b3log.latke.servlet.H
TTPRequest
Method
;
import
org.b3log.latke.servlet.H
ttp
Method
;
import
org.b3log.latke.servlet.annotation.RequestProcessing
;
import
org.b3log.latke.servlet.annotation.RequestProcessing
;
import
org.b3log.latke.servlet.annotation.RequestProcessor
;
import
org.b3log.latke.servlet.annotation.RequestProcessor
;
import
org.b3log.latke.servlet.renderer.TextX
ML
Renderer
;
import
org.b3log.latke.servlet.renderer.TextX
ml
Renderer
;
import
org.b3log.latke.util.XMLs
;
import
org.b3log.latke.util.XMLs
;
import
org.b3log.solo.model.ArchiveDate
;
import
org.b3log.solo.model.ArchiveDate
;
import
org.b3log.solo.model.Article
;
import
org.b3log.solo.model.Article
;
...
@@ -101,9 +101,9 @@ public class SitemapProcessor {
...
@@ -101,9 +101,9 @@ public class SitemapProcessor {
*
*
* @param context the specified context
* @param context the specified context
*/
*/
@RequestProcessing
(
value
=
"/sitemap.xml"
,
method
=
H
TTPRequest
Method
.
GET
)
@RequestProcessing
(
value
=
"/sitemap.xml"
,
method
=
H
ttp
Method
.
GET
)
public
void
sitemap
(
final
HTTP
RequestContext
context
)
{
public
void
sitemap
(
final
RequestContext
context
)
{
final
TextX
MLRenderer
renderer
=
new
TextXML
Renderer
();
final
TextX
mlRenderer
renderer
=
new
TextXml
Renderer
();
context
.
setRenderer
(
renderer
);
context
.
setRenderer
(
renderer
);
try
{
try
{
...
...
src/main/java/org/b3log/solo/processor/SkinRenderer.java
View file @
86bbde7f
...
@@ -21,7 +21,7 @@ import freemarker.template.Template;
...
@@ -21,7 +21,7 @@ import freemarker.template.Template;
import
org.apache.commons.lang.StringUtils
;
import
org.apache.commons.lang.StringUtils
;
import
org.apache.commons.lang.time.DateFormatUtils
;
import
org.apache.commons.lang.time.DateFormatUtils
;
import
org.b3log.latke.Keys
;
import
org.b3log.latke.Keys
;
import
org.b3log.latke.servlet.
HTTP
RequestContext
;
import
org.b3log.latke.servlet.RequestContext
;
import
org.b3log.latke.servlet.renderer.AbstractFreeMarkerRenderer
;
import
org.b3log.latke.servlet.renderer.AbstractFreeMarkerRenderer
;
import
org.b3log.solo.util.Skins
;
import
org.b3log.solo.util.Skins
;
...
@@ -104,11 +104,11 @@ public final class SkinRenderer extends AbstractFreeMarkerRenderer {
...
@@ -104,11 +104,11 @@ public final class SkinRenderer extends AbstractFreeMarkerRenderer {
}
}
@Override
@Override
protected
void
beforeRender
(
final
HTTP
RequestContext
context
)
{
protected
void
beforeRender
(
final
RequestContext
context
)
{
}
}
@Override
@Override
protected
void
afterRender
(
final
HTTP
RequestContext
context
)
{
protected
void
afterRender
(
final
RequestContext
context
)
{
}
}
/**
/**
...
...
src/main/java/org/b3log/solo/processor/TagProcessor.java
View file @
86bbde7f
...
@@ -25,8 +25,8 @@ import org.b3log.latke.logging.Level;
...
@@ -25,8 +25,8 @@ import org.b3log.latke.logging.Level;
import
org.b3log.latke.logging.Logger
;
import
org.b3log.latke.logging.Logger
;
import
org.b3log.latke.model.Pagination
;
import
org.b3log.latke.model.Pagination
;
import
org.b3log.latke.service.LangPropsService
;
import
org.b3log.latke.service.LangPropsService
;
import
org.b3log.latke.servlet.
HTTP
RequestContext
;
import
org.b3log.latke.servlet.RequestContext
;
import
org.b3log.latke.servlet.H
TTPRequest
Method
;
import
org.b3log.latke.servlet.H
ttp
Method
;
import
org.b3log.latke.servlet.annotation.RequestProcessing
;
import
org.b3log.latke.servlet.annotation.RequestProcessing
;
import
org.b3log.latke.servlet.annotation.RequestProcessor
;
import
org.b3log.latke.servlet.annotation.RequestProcessor
;
import
org.b3log.latke.servlet.renderer.AbstractFreeMarkerRenderer
;
import
org.b3log.latke.servlet.renderer.AbstractFreeMarkerRenderer
;
...
@@ -109,8 +109,8 @@ public class TagProcessor {
...
@@ -109,8 +109,8 @@ public class TagProcessor {
*
*
* @param context the specified context
* @param context the specified context
*/
*/
@RequestProcessing
(
value
=
"/tags/**"
,
method
=
H
TTPRequest
Method
.
GET
)
@RequestProcessing
(
value
=
"/tags/**"
,
method
=
H
ttp
Method
.
GET
)
public
void
showTagArticles
(
final
HTTP
RequestContext
context
)
{
public
void
showTagArticles
(
final
RequestContext
context
)
{
final
AbstractFreeMarkerRenderer
renderer
=
new
SkinRenderer
(
context
.
getRequest
());
final
AbstractFreeMarkerRenderer
renderer
=
new
SkinRenderer
(
context
.
getRequest
());
context
.
setRenderer
(
renderer
);
context
.
setRenderer
(
renderer
);
renderer
.
setTemplateName
(
"tag-articles.ftl"
);
renderer
.
setTemplateName
(
"tag-articles.ftl"
);
...
...
src/main/java/org/b3log/solo/processor/UserTemplateProcessor.java
View file @
86bbde7f
...
@@ -24,8 +24,8 @@ import org.b3log.latke.ioc.Inject;
...
@@ -24,8 +24,8 @@ import org.b3log.latke.ioc.Inject;
import
org.b3log.latke.logging.Level
;
import
org.b3log.latke.logging.Level
;
import
org.b3log.latke.logging.Logger
;
import
org.b3log.latke.logging.Logger
;
import
org.b3log.latke.service.LangPropsService
;
import
org.b3log.latke.service.LangPropsService
;
import
org.b3log.latke.servlet.
HTTP
RequestContext
;
import
org.b3log.latke.servlet.RequestContext
;
import
org.b3log.latke.servlet.H
TTPRequest
Method
;
import
org.b3log.latke.servlet.H
ttp
Method
;
import
org.b3log.latke.servlet.annotation.RequestProcessing
;
import
org.b3log.latke.servlet.annotation.RequestProcessing
;
import
org.b3log.latke.servlet.annotation.RequestProcessor
;
import
org.b3log.latke.servlet.annotation.RequestProcessor
;
import
org.b3log.latke.servlet.renderer.AbstractFreeMarkerRenderer
;
import
org.b3log.latke.servlet.renderer.AbstractFreeMarkerRenderer
;
...
@@ -89,8 +89,8 @@ public class UserTemplateProcessor {
...
@@ -89,8 +89,8 @@ public class UserTemplateProcessor {
*
*
* @param context the specified context
* @param context the specified context
*/
*/
@RequestProcessing
(
value
=
"/*.html"
,
method
=
H
TTPRequest
Method
.
GET
)
@RequestProcessing
(
value
=
"/*.html"
,
method
=
H
ttp
Method
.
GET
)
public
void
showPage
(
final
HTTP
RequestContext
context
)
{
public
void
showPage
(
final
RequestContext
context
)
{
final
String
requestURI
=
context
.
requestURI
();
final
String
requestURI
=
context
.
requestURI
();
String
templateName
=
StringUtils
.
substringAfterLast
(
requestURI
,
"/"
);
String
templateName
=
StringUtils
.
substringAfterLast
(
requestURI
,
"/"
);
...
...
src/main/java/org/b3log/solo/processor/console/AdminConsole.java
View file @
86bbde7f
...
@@ -35,7 +35,7 @@ import org.b3log.latke.model.User;
...
@@ -35,7 +35,7 @@ import org.b3log.latke.model.User;
import
org.b3log.latke.plugin.ViewLoadEventData
;
import
org.b3log.latke.plugin.ViewLoadEventData
;
import
org.b3log.latke.repository.jdbc.util.Connections
;
import
org.b3log.latke.repository.jdbc.util.Connections
;
import
org.b3log.latke.service.LangPropsService
;
import
org.b3log.latke.service.LangPropsService
;
import
org.b3log.latke.servlet.
HTTP
RequestContext
;
import
org.b3log.latke.servlet.RequestContext
;
import
org.b3log.latke.servlet.annotation.Before
;
import
org.b3log.latke.servlet.annotation.Before
;
import
org.b3log.latke.servlet.renderer.AbstractFreeMarkerRenderer
;
import
org.b3log.latke.servlet.renderer.AbstractFreeMarkerRenderer
;
import
org.b3log.latke.util.Execs
;
import
org.b3log.latke.util.Execs
;
...
@@ -131,7 +131,7 @@ public class AdminConsole {
...
@@ -131,7 +131,7 @@ public class AdminConsole {
* @param context the specified context
* @param context the specified context
*/
*/
@Before
(
adviceClass
=
ConsoleAuthAdvice
.
class
)
@Before
(
adviceClass
=
ConsoleAuthAdvice
.
class
)
public
void
showAdminIndex
(
final
HTTP
RequestContext
context
)
{
public
void
showAdminIndex
(
final
RequestContext
context
)
{
final
HttpServletRequest
request
=
context
.
getRequest
();
final
HttpServletRequest
request
=
context
.
getRequest
();
final
HttpServletResponse
response
=
context
.
getResponse
();
final
HttpServletResponse
response
=
context
.
getResponse
();
final
AbstractFreeMarkerRenderer
renderer
=
new
ConsoleRenderer
();
final
AbstractFreeMarkerRenderer
renderer
=
new
ConsoleRenderer
();
...
@@ -182,7 +182,7 @@ public class AdminConsole {
...
@@ -182,7 +182,7 @@ public class AdminConsole {
*
*
* @param context the specified context
* @param context the specified context
*/
*/
public
void
showAdminFunctions
(
final
HTTP
RequestContext
context
)
{
public
void
showAdminFunctions
(
final
RequestContext
context
)
{
final
HttpServletRequest
request
=
context
.
getRequest
();
final
HttpServletRequest
request
=
context
.
getRequest
();
final
AbstractFreeMarkerRenderer
renderer
=
new
ConsoleRenderer
();
final
AbstractFreeMarkerRenderer
renderer
=
new
ConsoleRenderer
();
context
.
setRenderer
(
renderer
);
context
.
setRenderer
(
renderer
);
...
@@ -210,7 +210,7 @@ public class AdminConsole {
...
@@ -210,7 +210,7 @@ public class AdminConsole {
*
*
* @param context the specified context
* @param context the specified context
*/
*/
public
void
showAdminPreferenceFunction
(
final
HTTP
RequestContext
context
)
{
public
void
showAdminPreferenceFunction
(
final
RequestContext
context
)
{
final
AbstractFreeMarkerRenderer
renderer
=
new
ConsoleRenderer
();
final
AbstractFreeMarkerRenderer
renderer
=
new
ConsoleRenderer
();
context
.
setRenderer
(
renderer
);
context
.
setRenderer
(
renderer
);
final
String
templateName
=
"admin-preference.ftl"
;
final
String
templateName
=
"admin-preference.ftl"
;
...
@@ -247,7 +247,7 @@ public class AdminConsole {
...
@@ -247,7 +247,7 @@ public class AdminConsole {
*
*
* @param context the specified HTTP request context
* @param context the specified HTTP request context
*/
*/
public
void
exportSQL
(
final
HTTP
RequestContext
context
)
{
public
void
exportSQL
(
final
RequestContext
context
)
{
final
HttpServletRequest
request
=
context
.
getRequest
();
final
HttpServletRequest
request
=
context
.
getRequest
();
final
HttpServletResponse
response
=
context
.
getResponse
();
final
HttpServletResponse
response
=
context
.
getResponse
();
...
@@ -365,7 +365,7 @@ public class AdminConsole {
...
@@ -365,7 +365,7 @@ public class AdminConsole {
*
*
* @param context the specified HTTP request context
* @param context the specified HTTP request context
*/
*/
public
void
exportJSON
(
final
HTTP
RequestContext
context
)
{
public
void
exportJSON
(
final
RequestContext
context
)
{
final
HttpServletRequest
request
=
context
.
getRequest
();
final
HttpServletRequest
request
=
context
.
getRequest
();
final
HttpServletResponse
response
=
context
.
getResponse
();
final
HttpServletResponse
response
=
context
.
getResponse
();
if
(!
Solos
.
isAdminLoggedIn
(
request
,
response
))
{
if
(!
Solos
.
isAdminLoggedIn
(
request
,
response
))
{
...
@@ -420,7 +420,7 @@ public class AdminConsole {
...
@@ -420,7 +420,7 @@ public class AdminConsole {
*
*
* @param context the specified HTTP request context
* @param context the specified HTTP request context
*/
*/
public
void
exportHexo
(
final
HTTP
RequestContext
context
)
{
public
void
exportHexo
(
final
RequestContext
context
)
{
final
HttpServletRequest
request
=
context
.
getRequest
();
final
HttpServletRequest
request
=
context
.
getRequest
();
final
HttpServletResponse
response
=
context
.
getResponse
();
final
HttpServletResponse
response
=
context
.
getResponse
();
if
(!
Solos
.
isAdminLoggedIn
(
request
,
response
))
{
if
(!
Solos
.
isAdminLoggedIn
(
request
,
response
))
{
...
...
src/main/java/org/b3log/solo/processor/console/ArticleConsole.java
View file @
86bbde7f
...
@@ -27,9 +27,9 @@ import org.b3log.latke.logging.Level;
...
@@ -27,9 +27,9 @@ import org.b3log.latke.logging.Level;
import
org.b3log.latke.logging.Logger
;
import
org.b3log.latke.logging.Logger
;
import
org.b3log.latke.service.LangPropsService
;
import
org.b3log.latke.service.LangPropsService
;
import
org.b3log.latke.service.ServiceException
;
import
org.b3log.latke.service.ServiceException
;
import
org.b3log.latke.servlet.
HTTP
RequestContext
;
import
org.b3log.latke.servlet.RequestContext
;
import
org.b3log.latke.servlet.annotation.Before
;
import
org.b3log.latke.servlet.annotation.Before
;
import
org.b3log.latke.servlet.renderer.J
SON
Renderer
;
import
org.b3log.latke.servlet.renderer.J
son
Renderer
;
import
org.b3log.latke.util.Requests
;
import
org.b3log.latke.util.Requests
;
import
org.b3log.latke.util.Strings
;
import
org.b3log.latke.util.Strings
;
import
org.b3log.solo.model.Article
;
import
org.b3log.solo.model.Article
;
...
@@ -108,8 +108,8 @@ public class ArticleConsole {
...
@@ -108,8 +108,8 @@ public class ArticleConsole {
*
*
* @param context the specified http request context
* @param context the specified http request context
*/
*/
public
void
getArticleThumbs
(
final
HTTP
RequestContext
context
)
{
public
void
getArticleThumbs
(
final
RequestContext
context
)
{
final
J
SONRenderer
renderer
=
new
JSON
Renderer
();
final
J
sonRenderer
renderer
=
new
Json
Renderer
();
context
.
setRenderer
(
renderer
);
context
.
setRenderer
(
renderer
);
final
JSONObject
result
=
new
JSONObject
();
final
JSONObject
result
=
new
JSONObject
();
renderer
.
setJSONObject
(
result
);
renderer
.
setJSONObject
(
result
);
...
@@ -139,8 +139,8 @@ public class ArticleConsole {
...
@@ -139,8 +139,8 @@ public class ArticleConsole {
*
*
* @param context the specified http request context
* @param context the specified http request context
*/
*/
public
void
markdown2HTML
(
final
HTTP
RequestContext
context
)
{
public
void
markdown2HTML
(
final
RequestContext
context
)
{
final
J
SONRenderer
renderer
=
new
JSON
Renderer
();
final
J
sonRenderer
renderer
=
new
Json
Renderer
();
context
.
setRenderer
(
renderer
);
context
.
setRenderer
(
renderer
);
final
JSONObject
result
=
new
JSONObject
();
final
JSONObject
result
=
new
JSONObject
();
renderer
.
setJSONObject
(
result
);
renderer
.
setJSONObject
(
result
);
...
@@ -195,8 +195,8 @@ public class ArticleConsole {
...
@@ -195,8 +195,8 @@ public class ArticleConsole {
*
*
* @param context the specified http request context
* @param context the specified http request context
*/
*/
public
void
getArticle
(
final
HTTP
RequestContext
context
)
{
public
void
getArticle
(
final
RequestContext
context
)
{
final
J
SONRenderer
renderer
=
new
JSON
Renderer
();
final
J
sonRenderer
renderer
=
new
Json
Renderer
();
context
.
setRenderer
(
renderer
);
context
.
setRenderer
(
renderer
);
try
{
try
{
...
@@ -247,8 +247,8 @@ public class ArticleConsole {
...
@@ -247,8 +247,8 @@ public class ArticleConsole {
*
*
* @param context the specified http request context
* @param context the specified http request context
*/
*/
public
void
getArticles
(
final
HTTP
RequestContext
context
)
{
public
void
getArticles
(
final
RequestContext
context
)
{
final
J
SONRenderer
renderer
=
new
JSON
Renderer
();
final
J
sonRenderer
renderer
=
new
Json
Renderer
();
context
.
setRenderer
(
renderer
);
context
.
setRenderer
(
renderer
);
try
{
try
{
...
@@ -310,8 +310,8 @@ public class ArticleConsole {
...
@@ -310,8 +310,8 @@ public class ArticleConsole {
*
*
* @param context the specified http request context
* @param context the specified http request context
*/
*/
public
void
removeArticle
(
final
HTTP
RequestContext
context
)
{
public
void
removeArticle
(
final
RequestContext
context
)
{
final
J
SONRenderer
renderer
=
new
JSON
Renderer
();
final
J
sonRenderer
renderer
=
new
Json
Renderer
();
context
.
setRenderer
(
renderer
);
context
.
setRenderer
(
renderer
);
final
JSONObject
ret
=
new
JSONObject
();
final
JSONObject
ret
=
new
JSONObject
();
renderer
.
setJSONObject
(
ret
);
renderer
.
setJSONObject
(
ret
);
...
@@ -357,8 +357,8 @@ public class ArticleConsole {
...
@@ -357,8 +357,8 @@ public class ArticleConsole {
*
*
* @param context the specified http request context
* @param context the specified http request context
*/
*/
public
void
cancelPublishArticle
(
final
HTTP
RequestContext
context
)
{
public
void
cancelPublishArticle
(
final
RequestContext
context
)
{
final
J
SONRenderer
renderer
=
new
JSON
Renderer
();
final
J
sonRenderer
renderer
=
new
Json
Renderer
();
context
.
setRenderer
(
renderer
);
context
.
setRenderer
(
renderer
);
final
JSONObject
ret
=
new
JSONObject
();
final
JSONObject
ret
=
new
JSONObject
();
renderer
.
setJSONObject
(
ret
);
renderer
.
setJSONObject
(
ret
);
...
@@ -404,8 +404,8 @@ public class ArticleConsole {
...
@@ -404,8 +404,8 @@ public class ArticleConsole {
*
*
* @param context the specified http request context
* @param context the specified http request context
*/
*/
public
void
cancelTopArticle
(
final
HTTP
RequestContext
context
)
{
public
void
cancelTopArticle
(
final
RequestContext
context
)
{
final
J
SONRenderer
renderer
=
new
JSON
Renderer
();
final
J
sonRenderer
renderer
=
new
Json
Renderer
();
context
.
setRenderer
(
renderer
);
context
.
setRenderer
(
renderer
);
final
JSONObject
ret
=
new
JSONObject
();
final
JSONObject
ret
=
new
JSONObject
();
renderer
.
setJSONObject
(
ret
);
renderer
.
setJSONObject
(
ret
);
...
@@ -448,8 +448,8 @@ public class ArticleConsole {
...
@@ -448,8 +448,8 @@ public class ArticleConsole {
*
*
* @param context the specified http request context
* @param context the specified http request context
*/
*/
public
void
putTopArticle
(
final
HTTP
RequestContext
context
)
{
public
void
putTopArticle
(
final
RequestContext
context
)
{
final
J
SONRenderer
renderer
=
new
JSON
Renderer
();
final
J
sonRenderer
renderer
=
new
Json
Renderer
();
context
.
setRenderer
(
renderer
);
context
.
setRenderer
(
renderer
);
final
JSONObject
ret
=
new
JSONObject
();
final
JSONObject
ret
=
new
JSONObject
();
renderer
.
setJSONObject
(
ret
);
renderer
.
setJSONObject
(
ret
);
...
@@ -511,8 +511,8 @@ public class ArticleConsole {
...
@@ -511,8 +511,8 @@ public class ArticleConsole {
*
*
* @param context the specified http request context
* @param context the specified http request context
*/
*/
public
void
updateArticle
(
final
HTTP
RequestContext
context
)
{
public
void
updateArticle
(
final
RequestContext
context
)
{
final
J
SONRenderer
renderer
=
new
JSON
Renderer
();
final
J
sonRenderer
renderer
=
new
Json
Renderer
();
context
.
setRenderer
(
renderer
);
context
.
setRenderer
(
renderer
);
final
JSONObject
ret
=
new
JSONObject
();
final
JSONObject
ret
=
new
JSONObject
();
...
@@ -579,8 +579,8 @@ public class ArticleConsole {
...
@@ -579,8 +579,8 @@ public class ArticleConsole {
*
*
* @param context the specified http request context
* @param context the specified http request context
*/
*/
public
void
addArticle
(
final
HTTP
RequestContext
context
)
{
public
void
addArticle
(
final
RequestContext
context
)
{
final
J
SONRenderer
renderer
=
new
JSON
Renderer
();
final
J
sonRenderer
renderer
=
new
Json
Renderer
();
context
.
setRenderer
(
renderer
);
context
.
setRenderer
(
renderer
);
final
JSONObject
ret
=
new
JSONObject
();
final
JSONObject
ret
=
new
JSONObject
();
final
HttpServletRequest
request
=
context
.
getRequest
();
final
HttpServletRequest
request
=
context
.
getRequest
();
...
...
src/main/java/org/b3log/solo/processor/console/CategoryConsole.java
View file @
86bbde7f
...
@@ -26,12 +26,12 @@ import org.b3log.latke.logging.Level;
...
@@ -26,12 +26,12 @@ import org.b3log.latke.logging.Level;
import
org.b3log.latke.logging.Logger
;
import
org.b3log.latke.logging.Logger
;
import
org.b3log.latke.service.LangPropsService
;
import
org.b3log.latke.service.LangPropsService
;
import
org.b3log.latke.service.ServiceException
;
import
org.b3log.latke.service.ServiceException
;
import
org.b3log.latke.servlet.
HTTP
RequestContext
;
import
org.b3log.latke.servlet.RequestContext
;
import
org.b3log.latke.servlet.H
TTPRequest
Method
;
import
org.b3log.latke.servlet.H
ttp
Method
;
import
org.b3log.latke.servlet.annotation.Before
;
import
org.b3log.latke.servlet.annotation.Before
;
import
org.b3log.latke.servlet.annotation.RequestProcessing
;
import
org.b3log.latke.servlet.annotation.RequestProcessing
;
import
org.b3log.latke.servlet.annotation.RequestProcessor
;
import
org.b3log.latke.servlet.annotation.RequestProcessor
;
import
org.b3log.latke.servlet.renderer.J
SON
Renderer
;
import
org.b3log.latke.servlet.renderer.J
son
Renderer
;
import
org.b3log.latke.util.Requests
;
import
org.b3log.latke.util.Requests
;
import
org.b3log.latke.util.URLs
;
import
org.b3log.latke.util.URLs
;
import
org.b3log.solo.model.Category
;
import
org.b3log.solo.model.Category
;
...
@@ -113,9 +113,9 @@ public class CategoryConsole {
...
@@ -113,9 +113,9 @@ public class CategoryConsole {
* @param context the specified http request context
* @param context the specified http request context
* @throws Exception exception
* @throws Exception exception
*/
*/
@RequestProcessing
(
value
=
"/console/category/order/"
,
method
=
H
TTPRequest
Method
.
PUT
)
@RequestProcessing
(
value
=
"/console/category/order/"
,
method
=
H
ttp
Method
.
PUT
)
public
void
changeOrder
(
final
HTTP
RequestContext
context
)
{
public
void
changeOrder
(
final
RequestContext
context
)
{
final
J
SONRenderer
renderer
=
new
JSON
Renderer
();
final
J
sonRenderer
renderer
=
new
Json
Renderer
();
context
.
setRenderer
(
renderer
);
context
.
setRenderer
(
renderer
);
final
JSONObject
ret
=
new
JSONObject
();
final
JSONObject
ret
=
new
JSONObject
();
...
@@ -159,9 +159,9 @@ public class CategoryConsole {
...
@@ -159,9 +159,9 @@ public class CategoryConsole {
* @param context the specified http request context
* @param context the specified http request context
* @throws Exception exception
* @throws Exception exception
*/
*/
@RequestProcessing
(
value
=
"/console/category/*"
,
method
=
H
TTPRequest
Method
.
GET
)
@RequestProcessing
(
value
=
"/console/category/*"
,
method
=
H
ttp
Method
.
GET
)
public
void
getCategory
(
final
HTTP
RequestContext
context
)
{
public
void
getCategory
(
final
RequestContext
context
)
{
final
J
SONRenderer
renderer
=
new
JSON
Renderer
();
final
J
sonRenderer
renderer
=
new
Json
Renderer
();
context
.
setRenderer
(
renderer
);
context
.
setRenderer
(
renderer
);
try
{
try
{
final
HttpServletRequest
request
=
context
.
getRequest
();
final
HttpServletRequest
request
=
context
.
getRequest
();
...
@@ -209,9 +209,9 @@ public class CategoryConsole {
...
@@ -209,9 +209,9 @@ public class CategoryConsole {
* @param context the specified http request context
* @param context the specified http request context
* @throws Exception exception
* @throws Exception exception
*/
*/
@RequestProcessing
(
value
=
"/console/category/*"
,
method
=
H
TTPRequest
Method
.
DELETE
)
@RequestProcessing
(
value
=
"/console/category/*"
,
method
=
H
ttp
Method
.
DELETE
)
public
void
removeCategory
(
final
HTTP
RequestContext
context
)
{
public
void
removeCategory
(
final
RequestContext
context
)
{
final
J
SONRenderer
renderer
=
new
JSON
Renderer
();
final
J
sonRenderer
renderer
=
new
Json
Renderer
();
context
.
setRenderer
(
renderer
);
context
.
setRenderer
(
renderer
);
final
JSONObject
jsonObject
=
new
JSONObject
();
final
JSONObject
jsonObject
=
new
JSONObject
();
renderer
.
setJSONObject
(
jsonObject
);
renderer
.
setJSONObject
(
jsonObject
);
...
@@ -256,9 +256,9 @@ public class CategoryConsole {
...
@@ -256,9 +256,9 @@ public class CategoryConsole {
*
*
* @param context the specified http request context
* @param context the specified http request context
*/
*/
@RequestProcessing
(
value
=
"/console/category/"
,
method
=
H
TTPRequest
Method
.
PUT
)
@RequestProcessing
(
value
=
"/console/category/"
,
method
=
H
ttp
Method
.
PUT
)
public
void
updateCategory
(
final
HTTP
RequestContext
context
)
{
public
void
updateCategory
(
final
RequestContext
context
)
{
final
J
SONRenderer
renderer
=
new
JSON
Renderer
();
final
J
sonRenderer
renderer
=
new
Json
Renderer
();
context
.
setRenderer
(
renderer
);
context
.
setRenderer
(
renderer
);
final
JSONObject
ret
=
new
JSONObject
();
final
JSONObject
ret
=
new
JSONObject
();
renderer
.
setJSONObject
(
ret
);
renderer
.
setJSONObject
(
ret
);
...
@@ -390,9 +390,9 @@ public class CategoryConsole {
...
@@ -390,9 +390,9 @@ public class CategoryConsole {
*
*
* @param context the specified http request context
* @param context the specified http request context
*/
*/
@RequestProcessing
(
value
=
"/console/category/"
,
method
=
H
TTPRequest
Method
.
POST
)
@RequestProcessing
(
value
=
"/console/category/"
,
method
=
H
ttp
Method
.
POST
)
public
void
addCategory
(
final
HTTP
RequestContext
context
)
{
public
void
addCategory
(
final
RequestContext
context
)
{
final
J
SONRenderer
renderer
=
new
JSON
Renderer
();
final
J
sonRenderer
renderer
=
new
Json
Renderer
();
context
.
setRenderer
(
renderer
);
context
.
setRenderer
(
renderer
);
final
JSONObject
ret
=
new
JSONObject
();
final
JSONObject
ret
=
new
JSONObject
();
renderer
.
setJSONObject
(
ret
);
renderer
.
setJSONObject
(
ret
);
...
@@ -522,9 +522,9 @@ public class CategoryConsole {
...
@@ -522,9 +522,9 @@ public class CategoryConsole {
*
*
* @param context the specified http request context
* @param context the specified http request context
*/
*/
@RequestProcessing
(
value
=
"/console/categories/*/*/*"
/* Requests.PAGINATION_PATH_PATTERN */
,
method
=
H
TTPRequest
Method
.
GET
)
@RequestProcessing
(
value
=
"/console/categories/*/*/*"
/* Requests.PAGINATION_PATH_PATTERN */
,
method
=
H
ttp
Method
.
GET
)
public
void
getCategories
(
final
HTTP
RequestContext
context
)
{
public
void
getCategories
(
final
RequestContext
context
)
{
final
J
SONRenderer
renderer
=
new
JSON
Renderer
();
final
J
sonRenderer
renderer
=
new
Json
Renderer
();
context
.
setRenderer
(
renderer
);
context
.
setRenderer
(
renderer
);
try
{
try
{
...
...
src/main/java/org/b3log/solo/processor/console/CommentConsole.java
View file @
86bbde7f
...
@@ -23,12 +23,12 @@ import org.b3log.latke.ioc.Inject;
...
@@ -23,12 +23,12 @@ import org.b3log.latke.ioc.Inject;
import
org.b3log.latke.logging.Level
;
import
org.b3log.latke.logging.Level
;
import
org.b3log.latke.logging.Logger
;
import
org.b3log.latke.logging.Logger
;
import
org.b3log.latke.service.LangPropsService
;
import
org.b3log.latke.service.LangPropsService
;
import
org.b3log.latke.servlet.
HTTP
RequestContext
;
import
org.b3log.latke.servlet.RequestContext
;
import
org.b3log.latke.servlet.H
TTPRequest
Method
;
import
org.b3log.latke.servlet.H
ttp
Method
;
import
org.b3log.latke.servlet.annotation.Before
;
import
org.b3log.latke.servlet.annotation.Before
;
import
org.b3log.latke.servlet.annotation.RequestProcessing
;
import
org.b3log.latke.servlet.annotation.RequestProcessing
;
import
org.b3log.latke.servlet.annotation.RequestProcessor
;
import
org.b3log.latke.servlet.annotation.RequestProcessor
;
import
org.b3log.latke.servlet.renderer.J
SON
Renderer
;
import
org.b3log.latke.servlet.renderer.J
son
Renderer
;
import
org.b3log.latke.util.Requests
;
import
org.b3log.latke.util.Requests
;
import
org.b3log.solo.model.Comment
;
import
org.b3log.solo.model.Comment
;
import
org.b3log.solo.service.CommentMgmtService
;
import
org.b3log.solo.service.CommentMgmtService
;
...
@@ -88,9 +88,9 @@ public class CommentConsole {
...
@@ -88,9 +88,9 @@ public class CommentConsole {
*
*
* @param context the specified http request context
* @param context the specified http request context
*/
*/
@RequestProcessing
(
value
=
"/console/page/comment/*"
,
method
=
H
TTPRequest
Method
.
DELETE
)
@RequestProcessing
(
value
=
"/console/page/comment/*"
,
method
=
H
ttp
Method
.
DELETE
)
public
void
removePageComment
(
final
HTTP
RequestContext
context
)
{
public
void
removePageComment
(
final
RequestContext
context
)
{
final
J
SONRenderer
renderer
=
new
JSON
Renderer
();
final
J
sonRenderer
renderer
=
new
Json
Renderer
();
context
.
setRenderer
(
renderer
);
context
.
setRenderer
(
renderer
);
final
JSONObject
ret
=
new
JSONObject
();
final
JSONObject
ret
=
new
JSONObject
();
renderer
.
setJSONObject
(
ret
);
renderer
.
setJSONObject
(
ret
);
...
@@ -134,9 +134,9 @@ public class CommentConsole {
...
@@ -134,9 +134,9 @@ public class CommentConsole {
*
*
* @param context the specified http request context
* @param context the specified http request context
*/
*/
@RequestProcessing
(
value
=
"/console/article/comment/*"
,
method
=
H
TTPRequest
Method
.
DELETE
)
@RequestProcessing
(
value
=
"/console/article/comment/*"
,
method
=
H
ttp
Method
.
DELETE
)
public
void
removeArticleComment
(
final
HTTP
RequestContext
context
)
{
public
void
removeArticleComment
(
final
RequestContext
context
)
{
final
J
SONRenderer
renderer
=
new
JSON
Renderer
();
final
J
sonRenderer
renderer
=
new
Json
Renderer
();
context
.
setRenderer
(
renderer
);
context
.
setRenderer
(
renderer
);
final
JSONObject
ret
=
new
JSONObject
();
final
JSONObject
ret
=
new
JSONObject
();
renderer
.
setJSONObject
(
ret
);
renderer
.
setJSONObject
(
ret
);
...
@@ -199,9 +199,9 @@ public class CommentConsole {
...
@@ -199,9 +199,9 @@ public class CommentConsole {
* @param context the specified http request context
* @param context the specified http request context
*/
*/
@RequestProcessing
(
value
=
"/console/comments/*/*/*"
/* Requests.PAGINATION_PATH_PATTERN */
,
@RequestProcessing
(
value
=
"/console/comments/*/*/*"
/* Requests.PAGINATION_PATH_PATTERN */
,
method
=
H
TTPRequest
Method
.
GET
)
method
=
H
ttp
Method
.
GET
)
public
void
getComments
(
final
HTTP
RequestContext
context
)
{
public
void
getComments
(
final
RequestContext
context
)
{
final
J
SONRenderer
renderer
=
new
JSON
Renderer
();
final
J
sonRenderer
renderer
=
new
Json
Renderer
();
context
.
setRenderer
(
renderer
);
context
.
setRenderer
(
renderer
);
try
{
try
{
...
@@ -248,9 +248,9 @@ public class CommentConsole {
...
@@ -248,9 +248,9 @@ public class CommentConsole {
*
*
* @param context the specified http request context
* @param context the specified http request context
*/
*/
@RequestProcessing
(
value
=
"/console/comments/article/*"
,
method
=
H
TTPRequest
Method
.
GET
)
@RequestProcessing
(
value
=
"/console/comments/article/*"
,
method
=
H
ttp
Method
.
GET
)
public
void
getArticleComments
(
final
HTTP
RequestContext
context
)
{
public
void
getArticleComments
(
final
RequestContext
context
)
{
final
J
SONRenderer
renderer
=
new
JSON
Renderer
();
final
J
sonRenderer
renderer
=
new
Json
Renderer
();
context
.
setRenderer
(
renderer
);
context
.
setRenderer
(
renderer
);
final
JSONObject
ret
=
new
JSONObject
();
final
JSONObject
ret
=
new
JSONObject
();
renderer
.
setJSONObject
(
ret
);
renderer
.
setJSONObject
(
ret
);
...
@@ -297,9 +297,9 @@ public class CommentConsole {
...
@@ -297,9 +297,9 @@ public class CommentConsole {
*
*
* @param context the specified http request context
* @param context the specified http request context
*/
*/
@RequestProcessing
(
value
=
"/console/comments/page/*"
,
method
=
H
TTPRequest
Method
.
GET
)
@RequestProcessing
(
value
=
"/console/comments/page/*"
,
method
=
H
ttp
Method
.
GET
)
public
void
getPageComments
(
final
HTTP
RequestContext
context
)
{
public
void
getPageComments
(
final
RequestContext
context
)
{
final
J
SONRenderer
renderer
=
new
JSON
Renderer
();
final
J
sonRenderer
renderer
=
new
Json
Renderer
();
context
.
setRenderer
(
renderer
);
context
.
setRenderer
(
renderer
);
final
JSONObject
ret
=
new
JSONObject
();
final
JSONObject
ret
=
new
JSONObject
();
renderer
.
setJSONObject
(
ret
);
renderer
.
setJSONObject
(
ret
);
...
...
src/main/java/org/b3log/solo/processor/console/ConsoleAdminAuthAdvice.java
View file @
86bbde7f
...
@@ -19,15 +19,14 @@ package org.b3log.solo.processor.console;
...
@@ -19,15 +19,14 @@ package org.b3log.solo.processor.console;
import
org.b3log.latke.Keys
;
import
org.b3log.latke.Keys
;
import
org.b3log.latke.ioc.Singleton
;
import
org.b3log.latke.ioc.Singleton
;
import
org.b3log.latke.servlet.
HTTP
RequestContext
;
import
org.b3log.latke.servlet.RequestContext
;
import
org.b3log.latke.servlet.advice.
BeforeRequest
ProcessAdvice
;
import
org.b3log.latke.servlet.advice.ProcessAdvice
;
import
org.b3log.latke.servlet.advice.RequestProcessAdviceException
;
import
org.b3log.latke.servlet.advice.RequestProcessAdviceException
;
import
org.b3log.solo.util.Solos
;
import
org.b3log.solo.util.Solos
;
import
org.json.JSONObject
;
import
org.json.JSONObject
;
import
javax.servlet.http.HttpServletRequest
;
import
javax.servlet.http.HttpServletRequest
;
import
javax.servlet.http.HttpServletResponse
;
import
javax.servlet.http.HttpServletResponse
;
import
java.util.Map
;
/**
/**
* The common auth check before advice for admin console.
* The common auth check before advice for admin console.
...
@@ -37,10 +36,10 @@ import java.util.Map;
...
@@ -37,10 +36,10 @@ import java.util.Map;
* @since 2.9.5
* @since 2.9.5
*/
*/
@Singleton
@Singleton
public
class
ConsoleAdminAuthAdvice
extends
BeforeRequest
ProcessAdvice
{
public
class
ConsoleAdminAuthAdvice
extends
ProcessAdvice
{
@Override
@Override
public
void
doAdvice
(
final
HTTPRequestContext
context
,
final
Map
<
String
,
Object
>
args
)
throws
RequestProcessAdviceException
{
public
void
doAdvice
(
final
RequestContext
context
)
throws
RequestProcessAdviceException
{
final
HttpServletRequest
request
=
context
.
getRequest
();
final
HttpServletRequest
request
=
context
.
getRequest
();
final
HttpServletResponse
response
=
context
.
getResponse
();
final
HttpServletResponse
response
=
context
.
getResponse
();
if
(!
Solos
.
isAdminLoggedIn
(
request
,
response
))
{
if
(!
Solos
.
isAdminLoggedIn
(
request
,
response
))
{
...
...
src/main/java/org/b3log/solo/processor/console/ConsoleAuthAdvice.java
View file @
86bbde7f
...
@@ -21,15 +21,14 @@ import org.b3log.latke.Keys;
...
@@ -21,15 +21,14 @@ import org.b3log.latke.Keys;
import
org.b3log.latke.ioc.Singleton
;
import
org.b3log.latke.ioc.Singleton
;
import
org.b3log.latke.model.Role
;
import
org.b3log.latke.model.Role
;
import
org.b3log.latke.model.User
;
import
org.b3log.latke.model.User
;
import
org.b3log.latke.servlet.
HTTP
RequestContext
;
import
org.b3log.latke.servlet.RequestContext
;
import
org.b3log.latke.servlet.advice.
BeforeRequest
ProcessAdvice
;
import
org.b3log.latke.servlet.advice.ProcessAdvice
;
import
org.b3log.latke.servlet.advice.RequestProcessAdviceException
;
import
org.b3log.latke.servlet.advice.RequestProcessAdviceException
;
import
org.b3log.solo.util.Solos
;
import
org.b3log.solo.util.Solos
;
import
org.json.JSONObject
;
import
org.json.JSONObject
;
import
javax.servlet.http.HttpServletRequest
;
import
javax.servlet.http.HttpServletRequest
;
import
javax.servlet.http.HttpServletResponse
;
import
javax.servlet.http.HttpServletResponse
;
import
java.util.Map
;
/**
/**
* The common auth check before advice for admin console.
* The common auth check before advice for admin console.
...
@@ -39,10 +38,10 @@ import java.util.Map;
...
@@ -39,10 +38,10 @@ import java.util.Map;
* @since 2.9.5
* @since 2.9.5
*/
*/
@Singleton
@Singleton
public
class
ConsoleAuthAdvice
extends
BeforeRequest
ProcessAdvice
{
public
class
ConsoleAuthAdvice
extends
ProcessAdvice
{
@Override
@Override
public
void
doAdvice
(
final
HTTPRequestContext
context
,
final
Map
<
String
,
Object
>
args
)
throws
RequestProcessAdviceException
{
public
void
doAdvice
(
final
RequestContext
context
)
throws
RequestProcessAdviceException
{
final
HttpServletRequest
request
=
context
.
getRequest
();
final
HttpServletRequest
request
=
context
.
getRequest
();
final
HttpServletResponse
response
=
context
.
getResponse
();
final
HttpServletResponse
response
=
context
.
getResponse
();
if
(!
Solos
.
isLoggedIn
(
request
,
response
))
{
if
(!
Solos
.
isLoggedIn
(
request
,
response
))
{
...
...
src/main/java/org/b3log/solo/processor/console/ConsoleRenderer.java
View file @
86bbde7f
...
@@ -18,7 +18,7 @@
...
@@ -18,7 +18,7 @@
package
org
.
b3log
.
solo
.
processor
.
console
;
package
org
.
b3log
.
solo
.
processor
.
console
;
import
freemarker.template.Template
;
import
freemarker.template.Template
;
import
org.b3log.latke.servlet.
HTTP
RequestContext
;
import
org.b3log.latke.servlet.RequestContext
;
import
org.b3log.latke.servlet.renderer.AbstractFreeMarkerRenderer
;
import
org.b3log.latke.servlet.renderer.AbstractFreeMarkerRenderer
;
import
org.b3log.solo.util.Skins
;
import
org.b3log.solo.util.Skins
;
...
@@ -37,10 +37,10 @@ public final class ConsoleRenderer extends AbstractFreeMarkerRenderer {
...
@@ -37,10 +37,10 @@ public final class ConsoleRenderer extends AbstractFreeMarkerRenderer {
}
}
@Override
@Override
protected
void
beforeRender
(
final
HTTP
RequestContext
context
)
{
protected
void
beforeRender
(
final
RequestContext
context
)
{
}
}
@Override
@Override
protected
void
afterRender
(
final
HTTP
RequestContext
context
)
{
protected
void
afterRender
(
final
RequestContext
context
)
{
}
}
}
}
src/main/java/org/b3log/solo/processor/console/LinkConsole.java
View file @
86bbde7f
...
@@ -24,12 +24,12 @@ import org.b3log.latke.ioc.Inject;
...
@@ -24,12 +24,12 @@ import org.b3log.latke.ioc.Inject;
import
org.b3log.latke.logging.Level
;
import
org.b3log.latke.logging.Level
;
import
org.b3log.latke.logging.Logger
;
import
org.b3log.latke.logging.Logger
;
import
org.b3log.latke.service.LangPropsService
;
import
org.b3log.latke.service.LangPropsService
;
import
org.b3log.latke.servlet.
HTTP
RequestContext
;
import
org.b3log.latke.servlet.RequestContext
;
import
org.b3log.latke.servlet.H
TTPRequest
Method
;
import
org.b3log.latke.servlet.H
ttp
Method
;
import
org.b3log.latke.servlet.annotation.Before
;
import
org.b3log.latke.servlet.annotation.Before
;
import
org.b3log.latke.servlet.annotation.RequestProcessing
;
import
org.b3log.latke.servlet.annotation.RequestProcessing
;
import
org.b3log.latke.servlet.annotation.RequestProcessor
;
import
org.b3log.latke.servlet.annotation.RequestProcessor
;
import
org.b3log.latke.servlet.renderer.J
SON
Renderer
;
import
org.b3log.latke.servlet.renderer.J
son
Renderer
;
import
org.b3log.latke.util.Requests
;
import
org.b3log.latke.util.Requests
;
import
org.b3log.solo.model.Common
;
import
org.b3log.solo.model.Common
;
import
org.b3log.solo.model.Link
;
import
org.b3log.solo.model.Link
;
...
@@ -88,9 +88,9 @@ public class LinkConsole {
...
@@ -88,9 +88,9 @@ public class LinkConsole {
*
*
* @param context the specified http request context
* @param context the specified http request context
*/
*/
@RequestProcessing
(
value
=
"/console/link/*"
,
method
=
H
TTPRequest
Method
.
DELETE
)
@RequestProcessing
(
value
=
"/console/link/*"
,
method
=
H
ttp
Method
.
DELETE
)
public
void
removeLink
(
final
HTTP
RequestContext
context
)
{
public
void
removeLink
(
final
RequestContext
context
)
{
final
J
SONRenderer
renderer
=
new
JSON
Renderer
();
final
J
sonRenderer
renderer
=
new
Json
Renderer
();
context
.
setRenderer
(
renderer
);
context
.
setRenderer
(
renderer
);
final
JSONObject
jsonObject
=
new
JSONObject
();
final
JSONObject
jsonObject
=
new
JSONObject
();
renderer
.
setJSONObject
(
jsonObject
);
renderer
.
setJSONObject
(
jsonObject
);
...
@@ -138,9 +138,9 @@ public class LinkConsole {
...
@@ -138,9 +138,9 @@ public class LinkConsole {
*
*
* @param context the specified http request context
* @param context the specified http request context
*/
*/
@RequestProcessing
(
value
=
"/console/link/"
,
method
=
H
TTPRequest
Method
.
PUT
)
@RequestProcessing
(
value
=
"/console/link/"
,
method
=
H
ttp
Method
.
PUT
)
public
void
updateLink
(
final
HTTP
RequestContext
context
)
{
public
void
updateLink
(
final
RequestContext
context
)
{
final
J
SONRenderer
renderer
=
new
JSON
Renderer
();
final
J
sonRenderer
renderer
=
new
Json
Renderer
();
context
.
setRenderer
(
renderer
);
context
.
setRenderer
(
renderer
);
final
JSONObject
ret
=
new
JSONObject
();
final
JSONObject
ret
=
new
JSONObject
();
...
@@ -185,9 +185,9 @@ public class LinkConsole {
...
@@ -185,9 +185,9 @@ public class LinkConsole {
*
*
* @param context the specified http request context
* @param context the specified http request context
*/
*/
@RequestProcessing
(
value
=
"/console/link/order/"
,
method
=
H
TTPRequest
Method
.
PUT
)
@RequestProcessing
(
value
=
"/console/link/order/"
,
method
=
H
ttp
Method
.
PUT
)
public
void
changeOrder
(
final
HTTP
RequestContext
context
)
{
public
void
changeOrder
(
final
RequestContext
context
)
{
final
J
SONRenderer
renderer
=
new
JSON
Renderer
();
final
J
sonRenderer
renderer
=
new
Json
Renderer
();
context
.
setRenderer
(
renderer
);
context
.
setRenderer
(
renderer
);
final
JSONObject
ret
=
new
JSONObject
();
final
JSONObject
ret
=
new
JSONObject
();
...
@@ -236,9 +236,9 @@ public class LinkConsole {
...
@@ -236,9 +236,9 @@ public class LinkConsole {
*
*
* @param context the specified http request context
* @param context the specified http request context
*/
*/
@RequestProcessing
(
value
=
"/console/link/"
,
method
=
H
TTPRequest
Method
.
POST
)
@RequestProcessing
(
value
=
"/console/link/"
,
method
=
H
ttp
Method
.
POST
)
public
void
addLink
(
final
HTTP
RequestContext
context
)
{
public
void
addLink
(
final
RequestContext
context
)
{
final
J
SONRenderer
renderer
=
new
JSON
Renderer
();
final
J
sonRenderer
renderer
=
new
Json
Renderer
();
context
.
setRenderer
(
renderer
);
context
.
setRenderer
(
renderer
);
final
JSONObject
ret
=
new
JSONObject
();
final
JSONObject
ret
=
new
JSONObject
();
...
@@ -287,9 +287,9 @@ public class LinkConsole {
...
@@ -287,9 +287,9 @@ public class LinkConsole {
*
*
* @param context the specified http request context
* @param context the specified http request context
*/
*/
@RequestProcessing
(
value
=
"/console/links/*/*/*"
/* Requests.PAGINATION_PATH_PATTERN */
,
method
=
H
TTPRequest
Method
.
GET
)
@RequestProcessing
(
value
=
"/console/links/*/*/*"
/* Requests.PAGINATION_PATH_PATTERN */
,
method
=
H
ttp
Method
.
GET
)
public
void
getLinks
(
final
HTTP
RequestContext
context
)
{
public
void
getLinks
(
final
RequestContext
context
)
{
final
J
SONRenderer
renderer
=
new
JSON
Renderer
();
final
J
sonRenderer
renderer
=
new
Json
Renderer
();
context
.
setRenderer
(
renderer
);
context
.
setRenderer
(
renderer
);
try
{
try
{
...
@@ -336,9 +336,9 @@ public class LinkConsole {
...
@@ -336,9 +336,9 @@ public class LinkConsole {
*
*
* @param context the specified http request context
* @param context the specified http request context
*/
*/
@RequestProcessing
(
value
=
"/console/link/*"
,
method
=
H
TTPRequest
Method
.
GET
)
@RequestProcessing
(
value
=
"/console/link/*"
,
method
=
H
ttp
Method
.
GET
)
public
void
getLink
(
final
HTTP
RequestContext
context
)
{
public
void
getLink
(
final
RequestContext
context
)
{
final
J
SONRenderer
renderer
=
new
JSON
Renderer
();
final
J
sonRenderer
renderer
=
new
Json
Renderer
();
context
.
setRenderer
(
renderer
);
context
.
setRenderer
(
renderer
);
try
{
try
{
...
...
src/main/java/org/b3log/solo/processor/console/PageConsole.java
View file @
86bbde7f
...
@@ -25,12 +25,12 @@ import org.b3log.latke.logging.Level;
...
@@ -25,12 +25,12 @@ import org.b3log.latke.logging.Level;
import
org.b3log.latke.logging.Logger
;
import
org.b3log.latke.logging.Logger
;
import
org.b3log.latke.service.LangPropsService
;
import
org.b3log.latke.service.LangPropsService
;
import
org.b3log.latke.service.ServiceException
;
import
org.b3log.latke.service.ServiceException
;
import
org.b3log.latke.servlet.
HTTP
RequestContext
;
import
org.b3log.latke.servlet.RequestContext
;
import
org.b3log.latke.servlet.H
TTPRequest
Method
;
import
org.b3log.latke.servlet.H
ttp
Method
;
import
org.b3log.latke.servlet.annotation.Before
;
import
org.b3log.latke.servlet.annotation.Before
;
import
org.b3log.latke.servlet.annotation.RequestProcessing
;
import
org.b3log.latke.servlet.annotation.RequestProcessing
;
import
org.b3log.latke.servlet.annotation.RequestProcessor
;
import
org.b3log.latke.servlet.annotation.RequestProcessor
;
import
org.b3log.latke.servlet.renderer.J
SON
Renderer
;
import
org.b3log.latke.servlet.renderer.J
son
Renderer
;
import
org.b3log.latke.util.Requests
;
import
org.b3log.latke.util.Requests
;
import
org.b3log.solo.model.Common
;
import
org.b3log.solo.model.Common
;
import
org.b3log.solo.model.Page
;
import
org.b3log.solo.model.Page
;
...
@@ -115,9 +115,9 @@ public class PageConsole {
...
@@ -115,9 +115,9 @@ public class PageConsole {
*
*
* @param context the specified http request context
* @param context the specified http request context
*/
*/
@RequestProcessing
(
value
=
"/console/page/"
,
method
=
H
TTPRequest
Method
.
PUT
)
@RequestProcessing
(
value
=
"/console/page/"
,
method
=
H
ttp
Method
.
PUT
)
public
void
updatePage
(
final
HTTP
RequestContext
context
)
{
public
void
updatePage
(
final
RequestContext
context
)
{
final
J
SONRenderer
renderer
=
new
JSON
Renderer
();
final
J
sonRenderer
renderer
=
new
Json
Renderer
();
context
.
setRenderer
(
renderer
);
context
.
setRenderer
(
renderer
);
final
JSONObject
ret
=
new
JSONObject
();
final
JSONObject
ret
=
new
JSONObject
();
...
@@ -151,9 +151,9 @@ public class PageConsole {
...
@@ -151,9 +151,9 @@ public class PageConsole {
*
*
* @param context the specified http request context
* @param context the specified http request context
*/
*/
@RequestProcessing
(
value
=
"/console/page/*"
,
method
=
H
TTPRequest
Method
.
DELETE
)
@RequestProcessing
(
value
=
"/console/page/*"
,
method
=
H
ttp
Method
.
DELETE
)
public
void
removePage
(
final
HTTP
RequestContext
context
)
{
public
void
removePage
(
final
RequestContext
context
)
{
final
J
SONRenderer
renderer
=
new
JSON
Renderer
();
final
J
sonRenderer
renderer
=
new
Json
Renderer
();
context
.
setRenderer
(
renderer
);
context
.
setRenderer
(
renderer
);
final
JSONObject
jsonObject
=
new
JSONObject
();
final
JSONObject
jsonObject
=
new
JSONObject
();
renderer
.
setJSONObject
(
jsonObject
);
renderer
.
setJSONObject
(
jsonObject
);
...
@@ -206,9 +206,9 @@ public class PageConsole {
...
@@ -206,9 +206,9 @@ public class PageConsole {
*
*
* @param context the specified http request context
* @param context the specified http request context
*/
*/
@RequestProcessing
(
value
=
"/console/page/"
,
method
=
H
TTPRequest
Method
.
POST
)
@RequestProcessing
(
value
=
"/console/page/"
,
method
=
H
ttp
Method
.
POST
)
public
void
addPage
(
final
HTTP
RequestContext
context
)
{
public
void
addPage
(
final
RequestContext
context
)
{
final
J
SONRenderer
renderer
=
new
JSON
Renderer
();
final
J
sonRenderer
renderer
=
new
Json
Renderer
();
context
.
setRenderer
(
renderer
);
context
.
setRenderer
(
renderer
);
final
JSONObject
ret
=
new
JSONObject
();
final
JSONObject
ret
=
new
JSONObject
();
...
@@ -253,9 +253,9 @@ public class PageConsole {
...
@@ -253,9 +253,9 @@ public class PageConsole {
*
*
* @param context the specified http request context
* @param context the specified http request context
*/
*/
@RequestProcessing
(
value
=
"/console/page/order/"
,
method
=
H
TTPRequest
Method
.
PUT
)
@RequestProcessing
(
value
=
"/console/page/order/"
,
method
=
H
ttp
Method
.
PUT
)
public
void
changeOrder
(
final
HTTP
RequestContext
context
)
{
public
void
changeOrder
(
final
RequestContext
context
)
{
final
J
SONRenderer
renderer
=
new
JSON
Renderer
();
final
J
sonRenderer
renderer
=
new
Json
Renderer
();
context
.
setRenderer
(
renderer
);
context
.
setRenderer
(
renderer
);
final
JSONObject
ret
=
new
JSONObject
();
final
JSONObject
ret
=
new
JSONObject
();
...
@@ -301,9 +301,9 @@ public class PageConsole {
...
@@ -301,9 +301,9 @@ public class PageConsole {
*
*
* @param context the specified http request context
* @param context the specified http request context
*/
*/
@RequestProcessing
(
value
=
"/console/page/*"
,
method
=
H
TTPRequest
Method
.
GET
)
@RequestProcessing
(
value
=
"/console/page/*"
,
method
=
H
ttp
Method
.
GET
)
public
void
getPage
(
final
HTTP
RequestContext
context
)
{
public
void
getPage
(
final
RequestContext
context
)
{
final
J
SONRenderer
renderer
=
new
JSON
Renderer
();
final
J
sonRenderer
renderer
=
new
Json
Renderer
();
context
.
setRenderer
(
renderer
);
context
.
setRenderer
(
renderer
);
try
{
try
{
...
@@ -357,9 +357,9 @@ public class PageConsole {
...
@@ -357,9 +357,9 @@ public class PageConsole {
* @see Requests#PAGINATION_PATH_PATTERN
* @see Requests#PAGINATION_PATH_PATTERN
*/
*/
@RequestProcessing
(
value
=
"/console/pages/*/*/*"
/* Requests.PAGINATION_PATH_PATTERN */
,
@RequestProcessing
(
value
=
"/console/pages/*/*/*"
/* Requests.PAGINATION_PATH_PATTERN */
,
method
=
H
TTPRequest
Method
.
GET
)
method
=
H
ttp
Method
.
GET
)
public
void
getPages
(
final
HTTP
RequestContext
context
)
{
public
void
getPages
(
final
RequestContext
context
)
{
final
J
SONRenderer
renderer
=
new
JSON
Renderer
();
final
J
sonRenderer
renderer
=
new
Json
Renderer
();
context
.
setRenderer
(
renderer
);
context
.
setRenderer
(
renderer
);
try
{
try
{
...
...
src/main/java/org/b3log/solo/processor/console/PluginConsole.java
View file @
86bbde7f
...
@@ -24,12 +24,12 @@ import org.b3log.latke.logging.Level;
...
@@ -24,12 +24,12 @@ import org.b3log.latke.logging.Level;
import
org.b3log.latke.logging.Logger
;
import
org.b3log.latke.logging.Logger
;
import
org.b3log.latke.model.Plugin
;
import
org.b3log.latke.model.Plugin
;
import
org.b3log.latke.service.LangPropsService
;
import
org.b3log.latke.service.LangPropsService
;
import
org.b3log.latke.servlet.
HTTP
RequestContext
;
import
org.b3log.latke.servlet.RequestContext
;
import
org.b3log.latke.servlet.H
TTPRequest
Method
;
import
org.b3log.latke.servlet.H
ttp
Method
;
import
org.b3log.latke.servlet.annotation.Before
;
import
org.b3log.latke.servlet.annotation.Before
;
import
org.b3log.latke.servlet.annotation.RequestProcessing
;
import
org.b3log.latke.servlet.annotation.RequestProcessing
;
import
org.b3log.latke.servlet.annotation.RequestProcessor
;
import
org.b3log.latke.servlet.annotation.RequestProcessor
;
import
org.b3log.latke.servlet.renderer.J
SON
Renderer
;
import
org.b3log.latke.servlet.renderer.J
son
Renderer
;
import
org.b3log.latke.util.Requests
;
import
org.b3log.latke.util.Requests
;
import
org.b3log.solo.service.PluginMgmtService
;
import
org.b3log.solo.service.PluginMgmtService
;
import
org.b3log.solo.service.PluginQueryService
;
import
org.b3log.solo.service.PluginQueryService
;
...
@@ -87,9 +87,9 @@ public class PluginConsole {
...
@@ -87,9 +87,9 @@ public class PluginConsole {
*
*
* @param context the specified http request context
* @param context the specified http request context
*/
*/
@RequestProcessing
(
value
=
"/console/plugin/status/"
,
method
=
H
TTPRequest
Method
.
PUT
)
@RequestProcessing
(
value
=
"/console/plugin/status/"
,
method
=
H
ttp
Method
.
PUT
)
public
void
setPluginStatus
(
final
HTTP
RequestContext
context
)
{
public
void
setPluginStatus
(
final
RequestContext
context
)
{
final
J
SONRenderer
renderer
=
new
JSON
Renderer
();
final
J
sonRenderer
renderer
=
new
Json
Renderer
();
context
.
setRenderer
(
renderer
);
context
.
setRenderer
(
renderer
);
final
JSONObject
requestJSONObject
=
context
.
requestJSON
();
final
JSONObject
requestJSONObject
=
context
.
requestJSON
();
...
@@ -131,9 +131,9 @@ public class PluginConsole {
...
@@ -131,9 +131,9 @@ public class PluginConsole {
* @see Requests#PAGINATION_PATH_PATTERN
* @see Requests#PAGINATION_PATH_PATTERN
*/
*/
@RequestProcessing
(
value
=
"/console/plugins/*/*/*"
/* Requests.PAGINATION_PATH_PATTERN */
,
@RequestProcessing
(
value
=
"/console/plugins/*/*/*"
/* Requests.PAGINATION_PATH_PATTERN */
,
method
=
H
TTPRequest
Method
.
GET
)
method
=
H
ttp
Method
.
GET
)
public
void
getPlugins
(
final
HTTP
RequestContext
context
)
{
public
void
getPlugins
(
final
RequestContext
context
)
{
final
J
SONRenderer
renderer
=
new
JSON
Renderer
();
final
J
sonRenderer
renderer
=
new
Json
Renderer
();
context
.
setRenderer
(
renderer
);
context
.
setRenderer
(
renderer
);
try
{
try
{
...
@@ -159,8 +159,8 @@ public class PluginConsole {
...
@@ -159,8 +159,8 @@ public class PluginConsole {
*
*
* @param context the specified http request context
* @param context the specified http request context
*/
*/
@RequestProcessing
(
value
=
"/console/plugin/toSetting"
,
method
=
H
TTPRequest
Method
.
POST
)
@RequestProcessing
(
value
=
"/console/plugin/toSetting"
,
method
=
H
ttp
Method
.
POST
)
public
void
toSetting
(
final
HTTP
RequestContext
context
)
{
public
void
toSetting
(
final
RequestContext
context
)
{
final
ConsoleRenderer
renderer
=
new
ConsoleRenderer
();
final
ConsoleRenderer
renderer
=
new
ConsoleRenderer
();
context
.
setRenderer
(
renderer
);
context
.
setRenderer
(
renderer
);
renderer
.
setTemplateName
(
"admin-plugin-setting.ftl"
);
renderer
.
setTemplateName
(
"admin-plugin-setting.ftl"
);
...
@@ -177,8 +177,8 @@ public class PluginConsole {
...
@@ -177,8 +177,8 @@ public class PluginConsole {
LOGGER
.
log
(
Level
.
ERROR
,
e
.
getMessage
(),
e
);
LOGGER
.
log
(
Level
.
ERROR
,
e
.
getMessage
(),
e
);
final
JSONObject
jsonObject
=
new
JSONObject
().
put
(
Keys
.
STATUS_CODE
,
false
);
final
JSONObject
jsonObject
=
new
JSONObject
().
put
(
Keys
.
STATUS_CODE
,
false
);
final
J
SONRenderer
jsonRenderer
=
new
JSON
Renderer
();
final
J
sonRenderer
JsonRenderer
=
new
Json
Renderer
();
j
sonRenderer
.
setJSONObject
(
jsonObject
);
J
sonRenderer
.
setJSONObject
(
jsonObject
);
jsonObject
.
put
(
Keys
.
MSG
,
langPropsService
.
get
(
"getFailLabel"
));
jsonObject
.
put
(
Keys
.
MSG
,
langPropsService
.
get
(
"getFailLabel"
));
}
}
}
}
...
@@ -188,9 +188,9 @@ public class PluginConsole {
...
@@ -188,9 +188,9 @@ public class PluginConsole {
*
*
* @param context the specified http request context
* @param context the specified http request context
*/
*/
@RequestProcessing
(
value
=
"/console/plugin/updateSetting"
,
method
=
H
TTPRequest
Method
.
POST
)
@RequestProcessing
(
value
=
"/console/plugin/updateSetting"
,
method
=
H
ttp
Method
.
POST
)
public
void
updateSetting
(
final
HTTP
RequestContext
context
)
{
public
void
updateSetting
(
final
RequestContext
context
)
{
final
J
SONRenderer
renderer
=
new
JSON
Renderer
();
final
J
sonRenderer
renderer
=
new
Json
Renderer
();
context
.
setRenderer
(
renderer
);
context
.
setRenderer
(
renderer
);
final
JSONObject
requestJSONObject
=
context
.
requestJSON
();
final
JSONObject
requestJSONObject
=
context
.
requestJSON
();
...
...
src/main/java/org/b3log/solo/processor/console/PreferenceConsole.java
View file @
86bbde7f
...
@@ -24,12 +24,12 @@ import org.b3log.latke.logging.Level;
...
@@ -24,12 +24,12 @@ import org.b3log.latke.logging.Level;
import
org.b3log.latke.logging.Logger
;
import
org.b3log.latke.logging.Logger
;
import
org.b3log.latke.service.LangPropsService
;
import
org.b3log.latke.service.LangPropsService
;
import
org.b3log.latke.service.ServiceException
;
import
org.b3log.latke.service.ServiceException
;
import
org.b3log.latke.servlet.
HTTP
RequestContext
;
import
org.b3log.latke.servlet.RequestContext
;
import
org.b3log.latke.servlet.H
TTPRequest
Method
;
import
org.b3log.latke.servlet.H
ttp
Method
;
import
org.b3log.latke.servlet.annotation.Before
;
import
org.b3log.latke.servlet.annotation.Before
;
import
org.b3log.latke.servlet.annotation.RequestProcessing
;
import
org.b3log.latke.servlet.annotation.RequestProcessing
;
import
org.b3log.latke.servlet.annotation.RequestProcessor
;
import
org.b3log.latke.servlet.annotation.RequestProcessor
;
import
org.b3log.latke.servlet.renderer.J
SON
Renderer
;
import
org.b3log.latke.servlet.renderer.J
son
Renderer
;
import
org.b3log.solo.model.Option
;
import
org.b3log.solo.model.Option
;
import
org.b3log.solo.model.Sign
;
import
org.b3log.solo.model.Sign
;
import
org.b3log.solo.model.Skin
;
import
org.b3log.solo.model.Skin
;
...
@@ -112,9 +112,9 @@ public class PreferenceConsole {
...
@@ -112,9 +112,9 @@ public class PreferenceConsole {
*
*
* @param context the specified http request context
* @param context the specified http request context
*/
*/
@RequestProcessing
(
value
=
"/console/reply/notification/template"
,
method
=
H
TTPRequest
Method
.
GET
)
@RequestProcessing
(
value
=
"/console/reply/notification/template"
,
method
=
H
ttp
Method
.
GET
)
public
void
getReplyNotificationTemplate
(
final
HTTP
RequestContext
context
)
{
public
void
getReplyNotificationTemplate
(
final
RequestContext
context
)
{
final
J
SONRenderer
renderer
=
new
JSON
Renderer
();
final
J
sonRenderer
renderer
=
new
Json
Renderer
();
context
.
setRenderer
(
renderer
);
context
.
setRenderer
(
renderer
);
try
{
try
{
...
@@ -150,9 +150,9 @@ public class PreferenceConsole {
...
@@ -150,9 +150,9 @@ public class PreferenceConsole {
*
*
* @param context the specified http request context
* @param context the specified http request context
*/
*/
@RequestProcessing
(
value
=
"/console/reply/notification/template"
,
method
=
H
TTPRequest
Method
.
PUT
)
@RequestProcessing
(
value
=
"/console/reply/notification/template"
,
method
=
H
ttp
Method
.
PUT
)
public
void
updateReplyNotificationTemplate
(
final
HTTP
RequestContext
context
)
{
public
void
updateReplyNotificationTemplate
(
final
RequestContext
context
)
{
final
J
SONRenderer
renderer
=
new
JSON
Renderer
();
final
J
sonRenderer
renderer
=
new
Json
Renderer
();
context
.
setRenderer
(
renderer
);
context
.
setRenderer
(
renderer
);
try
{
try
{
...
@@ -190,9 +190,9 @@ public class PreferenceConsole {
...
@@ -190,9 +190,9 @@ public class PreferenceConsole {
*
*
* @param context the specified http request context
* @param context the specified http request context
*/
*/
@RequestProcessing
(
value
=
"/console/signs/"
,
method
=
H
TTPRequest
Method
.
GET
)
@RequestProcessing
(
value
=
"/console/signs/"
,
method
=
H
ttp
Method
.
GET
)
public
void
getSigns
(
final
HTTP
RequestContext
context
)
{
public
void
getSigns
(
final
RequestContext
context
)
{
final
J
SONRenderer
renderer
=
new
JSON
Renderer
();
final
J
sonRenderer
renderer
=
new
Json
Renderer
();
context
.
setRenderer
(
renderer
);
context
.
setRenderer
(
renderer
);
try
{
try
{
...
@@ -271,9 +271,9 @@ public class PreferenceConsole {
...
@@ -271,9 +271,9 @@ public class PreferenceConsole {
*
*
* @param context the specified http request context
* @param context the specified http request context
*/
*/
@RequestProcessing
(
value
=
PREFERENCE_URI_PREFIX
,
method
=
H
TTPRequest
Method
.
GET
)
@RequestProcessing
(
value
=
PREFERENCE_URI_PREFIX
,
method
=
H
ttp
Method
.
GET
)
public
void
getPreference
(
final
HTTP
RequestContext
context
)
{
public
void
getPreference
(
final
RequestContext
context
)
{
final
J
SONRenderer
renderer
=
new
JSON
Renderer
();
final
J
sonRenderer
renderer
=
new
Json
Renderer
();
context
.
setRenderer
(
renderer
);
context
.
setRenderer
(
renderer
);
try
{
try
{
...
@@ -350,9 +350,9 @@ public class PreferenceConsole {
...
@@ -350,9 +350,9 @@ public class PreferenceConsole {
*
*
* @param context the specified http request context
* @param context the specified http request context
*/
*/
@RequestProcessing
(
value
=
PREFERENCE_URI_PREFIX
,
method
=
H
TTPRequest
Method
.
PUT
)
@RequestProcessing
(
value
=
PREFERENCE_URI_PREFIX
,
method
=
H
ttp
Method
.
PUT
)
public
void
updatePreference
(
final
HTTP
RequestContext
context
)
{
public
void
updatePreference
(
final
RequestContext
context
)
{
final
J
SONRenderer
renderer
=
new
JSON
Renderer
();
final
J
sonRenderer
renderer
=
new
Json
Renderer
();
context
.
setRenderer
(
renderer
);
context
.
setRenderer
(
renderer
);
try
{
try
{
...
@@ -400,9 +400,9 @@ public class PreferenceConsole {
...
@@ -400,9 +400,9 @@ public class PreferenceConsole {
*
*
* @param context the specified http request context
* @param context the specified http request context
*/
*/
@RequestProcessing
(
value
=
PREFERENCE_URI_PREFIX
+
"qiniu"
,
method
=
H
TTPRequest
Method
.
GET
)
@RequestProcessing
(
value
=
PREFERENCE_URI_PREFIX
+
"qiniu"
,
method
=
H
ttp
Method
.
GET
)
public
void
getQiniuPreference
(
final
HTTP
RequestContext
context
)
{
public
void
getQiniuPreference
(
final
RequestContext
context
)
{
final
J
SONRenderer
renderer
=
new
JSON
Renderer
();
final
J
sonRenderer
renderer
=
new
Json
Renderer
();
context
.
setRenderer
(
renderer
);
context
.
setRenderer
(
renderer
);
try
{
try
{
...
@@ -443,9 +443,9 @@ public class PreferenceConsole {
...
@@ -443,9 +443,9 @@ public class PreferenceConsole {
*
*
* @param context the specified http request context
* @param context the specified http request context
*/
*/
@RequestProcessing
(
value
=
PREFERENCE_URI_PREFIX
+
"qiniu"
,
method
=
H
TTPRequest
Method
.
PUT
)
@RequestProcessing
(
value
=
PREFERENCE_URI_PREFIX
+
"qiniu"
,
method
=
H
ttp
Method
.
PUT
)
public
void
updateQiniu
(
final
HTTP
RequestContext
context
)
{
public
void
updateQiniu
(
final
RequestContext
context
)
{
final
J
SONRenderer
renderer
=
new
JSON
Renderer
();
final
J
sonRenderer
renderer
=
new
Json
Renderer
();
context
.
setRenderer
(
renderer
);
context
.
setRenderer
(
renderer
);
final
JSONObject
ret
=
new
JSONObject
();
final
JSONObject
ret
=
new
JSONObject
();
renderer
.
setJSONObject
(
ret
);
renderer
.
setJSONObject
(
ret
);
...
...
src/main/java/org/b3log/solo/processor/console/RepairConsole.java
View file @
86bbde7f
...
@@ -23,12 +23,12 @@ import org.b3log.latke.logging.Level;
...
@@ -23,12 +23,12 @@ import org.b3log.latke.logging.Level;
import
org.b3log.latke.logging.Logger
;
import
org.b3log.latke.logging.Logger
;
import
org.b3log.latke.repository.Query
;
import
org.b3log.latke.repository.Query
;
import
org.b3log.latke.repository.annotation.Transactional
;
import
org.b3log.latke.repository.annotation.Transactional
;
import
org.b3log.latke.servlet.
HTTP
RequestContext
;
import
org.b3log.latke.servlet.RequestContext
;
import
org.b3log.latke.servlet.H
TTPRequest
Method
;
import
org.b3log.latke.servlet.H
ttp
Method
;
import
org.b3log.latke.servlet.annotation.Before
;
import
org.b3log.latke.servlet.annotation.Before
;
import
org.b3log.latke.servlet.annotation.RequestProcessing
;
import
org.b3log.latke.servlet.annotation.RequestProcessing
;
import
org.b3log.latke.servlet.annotation.RequestProcessor
;
import
org.b3log.latke.servlet.annotation.RequestProcessor
;
import
org.b3log.latke.servlet.renderer.TextH
TML
Renderer
;
import
org.b3log.latke.servlet.renderer.TextH
tml
Renderer
;
import
org.b3log.solo.mail.MailService
;
import
org.b3log.solo.mail.MailService
;
import
org.b3log.solo.mail.MailServiceFactory
;
import
org.b3log.solo.mail.MailServiceFactory
;
import
org.b3log.solo.model.Article
;
import
org.b3log.solo.model.Article
;
...
@@ -115,9 +115,9 @@ public class RepairConsole {
...
@@ -115,9 +115,9 @@ public class RepairConsole {
*
*
* @param context the specified context
* @param context the specified context
*/
*/
@RequestProcessing
(
value
=
"/fix/restore-signs.do"
,
method
=
H
TTPRequest
Method
.
GET
)
@RequestProcessing
(
value
=
"/fix/restore-signs.do"
,
method
=
H
ttp
Method
.
GET
)
public
void
restoreSigns
(
final
HTTP
RequestContext
context
)
{
public
void
restoreSigns
(
final
RequestContext
context
)
{
final
TextH
TMLRenderer
renderer
=
new
TextHTML
Renderer
();
final
TextH
tmlRenderer
renderer
=
new
TextHtml
Renderer
();
context
.
setRenderer
(
renderer
);
context
.
setRenderer
(
renderer
);
try
{
try
{
...
@@ -153,10 +153,10 @@ public class RepairConsole {
...
@@ -153,10 +153,10 @@ public class RepairConsole {
*
*
* @param context the specified context
* @param context the specified context
*/
*/
@RequestProcessing
(
value
=
"/fix/tag-article-counter-repair.do"
,
method
=
H
TTPRequest
Method
.
GET
)
@RequestProcessing
(
value
=
"/fix/tag-article-counter-repair.do"
,
method
=
H
ttp
Method
.
GET
)
@Transactional
@Transactional
public
void
repairTagArticleCounter
(
final
HTTP
RequestContext
context
)
{
public
void
repairTagArticleCounter
(
final
RequestContext
context
)
{
final
TextH
TMLRenderer
renderer
=
new
TextHTML
Renderer
();
final
TextH
tmlRenderer
renderer
=
new
TextHtml
Renderer
();
context
.
setRenderer
(
renderer
);
context
.
setRenderer
(
renderer
);
try
{
try
{
...
...
src/main/java/org/b3log/solo/processor/console/TagConsole.java
View file @
86bbde7f
...
@@ -22,12 +22,12 @@ import org.b3log.latke.ioc.Inject;
...
@@ -22,12 +22,12 @@ import org.b3log.latke.ioc.Inject;
import
org.b3log.latke.logging.Level
;
import
org.b3log.latke.logging.Level
;
import
org.b3log.latke.logging.Logger
;
import
org.b3log.latke.logging.Logger
;
import
org.b3log.latke.service.LangPropsService
;
import
org.b3log.latke.service.LangPropsService
;
import
org.b3log.latke.servlet.
HTTP
RequestContext
;
import
org.b3log.latke.servlet.RequestContext
;
import
org.b3log.latke.servlet.H
TTPRequest
Method
;
import
org.b3log.latke.servlet.H
ttp
Method
;
import
org.b3log.latke.servlet.annotation.Before
;
import
org.b3log.latke.servlet.annotation.Before
;
import
org.b3log.latke.servlet.annotation.RequestProcessing
;
import
org.b3log.latke.servlet.annotation.RequestProcessing
;
import
org.b3log.latke.servlet.annotation.RequestProcessor
;
import
org.b3log.latke.servlet.annotation.RequestProcessor
;
import
org.b3log.latke.servlet.renderer.J
SON
Renderer
;
import
org.b3log.latke.servlet.renderer.J
son
Renderer
;
import
org.b3log.solo.model.Common
;
import
org.b3log.solo.model.Common
;
import
org.b3log.solo.model.Tag
;
import
org.b3log.solo.model.Tag
;
import
org.b3log.solo.service.TagMgmtService
;
import
org.b3log.solo.service.TagMgmtService
;
...
@@ -89,10 +89,10 @@ public class TagConsole {
...
@@ -89,10 +89,10 @@ public class TagConsole {
*
*
* @param context the specified http request context
* @param context the specified http request context
*/
*/
@RequestProcessing
(
value
=
"/console/tags"
,
method
=
H
TTPRequest
Method
.
GET
)
@RequestProcessing
(
value
=
"/console/tags"
,
method
=
H
ttp
Method
.
GET
)
@Before
(
adviceClass
=
ConsoleAuthAdvice
.
class
)
@Before
(
adviceClass
=
ConsoleAuthAdvice
.
class
)
public
void
getTags
(
final
HTTP
RequestContext
context
)
{
public
void
getTags
(
final
RequestContext
context
)
{
final
J
SONRenderer
renderer
=
new
JSON
Renderer
();
final
J
sonRenderer
renderer
=
new
Json
Renderer
();
context
.
setRenderer
(
renderer
);
context
.
setRenderer
(
renderer
);
final
JSONObject
jsonObject
=
new
JSONObject
();
final
JSONObject
jsonObject
=
new
JSONObject
();
renderer
.
setJSONObject
(
jsonObject
);
renderer
.
setJSONObject
(
jsonObject
);
...
@@ -124,10 +124,10 @@ public class TagConsole {
...
@@ -124,10 +124,10 @@ public class TagConsole {
*
*
* @param context the specified http request context
* @param context the specified http request context
*/
*/
@RequestProcessing
(
value
=
"/console/tag/unused"
,
method
=
H
TTPRequest
Method
.
GET
)
@RequestProcessing
(
value
=
"/console/tag/unused"
,
method
=
H
ttp
Method
.
GET
)
@Before
(
adviceClass
=
ConsoleAdminAuthAdvice
.
class
)
@Before
(
adviceClass
=
ConsoleAdminAuthAdvice
.
class
)
public
void
getUnusedTags
(
final
HTTP
RequestContext
context
)
{
public
void
getUnusedTags
(
final
RequestContext
context
)
{
final
J
SONRenderer
renderer
=
new
JSON
Renderer
();
final
J
sonRenderer
renderer
=
new
Json
Renderer
();
context
.
setRenderer
(
renderer
);
context
.
setRenderer
(
renderer
);
final
JSONObject
jsonObject
=
new
JSONObject
();
final
JSONObject
jsonObject
=
new
JSONObject
();
renderer
.
setJSONObject
(
jsonObject
);
renderer
.
setJSONObject
(
jsonObject
);
...
@@ -168,10 +168,10 @@ public class TagConsole {
...
@@ -168,10 +168,10 @@ public class TagConsole {
*
*
* @param context the specified http request context
* @param context the specified http request context
*/
*/
@RequestProcessing
(
value
=
"/console/tag/unused"
,
method
=
H
TTPRequest
Method
.
DELETE
)
@RequestProcessing
(
value
=
"/console/tag/unused"
,
method
=
H
ttp
Method
.
DELETE
)
@Before
(
adviceClass
=
ConsoleAdminAuthAdvice
.
class
)
@Before
(
adviceClass
=
ConsoleAdminAuthAdvice
.
class
)
public
void
removeUnusedTags
(
final
HTTP
RequestContext
context
)
{
public
void
removeUnusedTags
(
final
RequestContext
context
)
{
final
J
SONRenderer
renderer
=
new
JSON
Renderer
();
final
J
sonRenderer
renderer
=
new
Json
Renderer
();
context
.
setRenderer
(
renderer
);
context
.
setRenderer
(
renderer
);
final
JSONObject
jsonObject
=
new
JSONObject
();
final
JSONObject
jsonObject
=
new
JSONObject
();
renderer
.
setJSONObject
(
jsonObject
);
renderer
.
setJSONObject
(
jsonObject
);
...
...
src/main/java/org/b3log/solo/processor/console/UserConsole.java
View file @
86bbde7f
...
@@ -27,12 +27,12 @@ import org.b3log.latke.model.Role;
...
@@ -27,12 +27,12 @@ import org.b3log.latke.model.Role;
import
org.b3log.latke.model.User
;
import
org.b3log.latke.model.User
;
import
org.b3log.latke.service.LangPropsService
;
import
org.b3log.latke.service.LangPropsService
;
import
org.b3log.latke.service.ServiceException
;
import
org.b3log.latke.service.ServiceException
;
import
org.b3log.latke.servlet.
HTTP
RequestContext
;
import
org.b3log.latke.servlet.RequestContext
;
import
org.b3log.latke.servlet.H
TTPRequest
Method
;
import
org.b3log.latke.servlet.H
ttp
Method
;
import
org.b3log.latke.servlet.annotation.Before
;
import
org.b3log.latke.servlet.annotation.Before
;
import
org.b3log.latke.servlet.annotation.RequestProcessing
;
import
org.b3log.latke.servlet.annotation.RequestProcessing
;
import
org.b3log.latke.servlet.annotation.RequestProcessor
;
import
org.b3log.latke.servlet.annotation.RequestProcessor
;
import
org.b3log.latke.servlet.renderer.J
SON
Renderer
;
import
org.b3log.latke.servlet.renderer.J
son
Renderer
;
import
org.b3log.latke.util.Requests
;
import
org.b3log.latke.util.Requests
;
import
org.b3log.solo.model.Option
;
import
org.b3log.solo.model.Option
;
import
org.b3log.solo.service.PreferenceQueryService
;
import
org.b3log.solo.service.PreferenceQueryService
;
...
@@ -114,10 +114,10 @@ public class UserConsole {
...
@@ -114,10 +114,10 @@ public class UserConsole {
*
*
* @param context the specified http request context
* @param context the specified http request context
*/
*/
@RequestProcessing
(
value
=
"/console/user/"
,
method
=
H
TTPRequest
Method
.
PUT
)
@RequestProcessing
(
value
=
"/console/user/"
,
method
=
H
ttp
Method
.
PUT
)
@Before
(
adviceClass
=
ConsoleAdminAuthAdvice
.
class
)
@Before
(
adviceClass
=
ConsoleAdminAuthAdvice
.
class
)
public
void
updateUser
(
final
HTTP
RequestContext
context
)
{
public
void
updateUser
(
final
RequestContext
context
)
{
final
J
SONRenderer
renderer
=
new
JSON
Renderer
();
final
J
sonRenderer
renderer
=
new
Json
Renderer
();
context
.
setRenderer
(
renderer
);
context
.
setRenderer
(
renderer
);
final
JSONObject
ret
=
new
JSONObject
();
final
JSONObject
ret
=
new
JSONObject
();
...
@@ -166,9 +166,9 @@ public class UserConsole {
...
@@ -166,9 +166,9 @@ public class UserConsole {
*
*
* @param context the specified http request context
* @param context the specified http request context
*/
*/
@RequestProcessing
(
value
=
"/console/user/"
,
method
=
H
TTPRequest
Method
.
POST
)
@RequestProcessing
(
value
=
"/console/user/"
,
method
=
H
ttp
Method
.
POST
)
public
void
addUser
(
final
HTTP
RequestContext
context
)
{
public
void
addUser
(
final
RequestContext
context
)
{
final
J
SONRenderer
renderer
=
new
JSON
Renderer
();
final
J
sonRenderer
renderer
=
new
Json
Renderer
();
context
.
setRenderer
(
renderer
);
context
.
setRenderer
(
renderer
);
final
JSONObject
ret
=
new
JSONObject
();
final
JSONObject
ret
=
new
JSONObject
();
renderer
.
setJSONObject
(
ret
);
renderer
.
setJSONObject
(
ret
);
...
@@ -222,10 +222,10 @@ public class UserConsole {
...
@@ -222,10 +222,10 @@ public class UserConsole {
*
*
* @param context the specified http request context
* @param context the specified http request context
*/
*/
@RequestProcessing
(
value
=
"/console/user/*"
,
method
=
H
TTPRequest
Method
.
DELETE
)
@RequestProcessing
(
value
=
"/console/user/*"
,
method
=
H
ttp
Method
.
DELETE
)
@Before
(
adviceClass
=
ConsoleAdminAuthAdvice
.
class
)
@Before
(
adviceClass
=
ConsoleAdminAuthAdvice
.
class
)
public
void
removeUser
(
final
HTTP
RequestContext
context
)
{
public
void
removeUser
(
final
RequestContext
context
)
{
final
J
SONRenderer
renderer
=
new
JSON
Renderer
();
final
J
sonRenderer
renderer
=
new
Json
Renderer
();
context
.
setRenderer
(
renderer
);
context
.
setRenderer
(
renderer
);
final
JSONObject
jsonObject
=
new
JSONObject
();
final
JSONObject
jsonObject
=
new
JSONObject
();
...
@@ -273,10 +273,10 @@ public class UserConsole {
...
@@ -273,10 +273,10 @@ public class UserConsole {
*
*
* @param context the specified http request context
* @param context the specified http request context
*/
*/
@RequestProcessing
(
value
=
"/console/users/*/*/*"
/* Requests.PAGINATION_PATH_PATTERN */
,
method
=
H
TTPRequest
Method
.
GET
)
@RequestProcessing
(
value
=
"/console/users/*/*/*"
/* Requests.PAGINATION_PATH_PATTERN */
,
method
=
H
ttp
Method
.
GET
)
@Before
(
adviceClass
=
ConsoleAdminAuthAdvice
.
class
)
@Before
(
adviceClass
=
ConsoleAdminAuthAdvice
.
class
)
public
void
getUsers
(
final
HTTP
RequestContext
context
)
{
public
void
getUsers
(
final
RequestContext
context
)
{
final
J
SONRenderer
renderer
=
new
JSON
Renderer
();
final
J
sonRenderer
renderer
=
new
Json
Renderer
();
context
.
setRenderer
(
renderer
);
context
.
setRenderer
(
renderer
);
try
{
try
{
...
@@ -324,10 +324,10 @@ public class UserConsole {
...
@@ -324,10 +324,10 @@ public class UserConsole {
*
*
* @param context the specified http request context
* @param context the specified http request context
*/
*/
@RequestProcessing
(
value
=
"/console/user/*"
,
method
=
H
TTPRequest
Method
.
GET
)
@RequestProcessing
(
value
=
"/console/user/*"
,
method
=
H
ttp
Method
.
GET
)
@Before
(
adviceClass
=
ConsoleAdminAuthAdvice
.
class
)
@Before
(
adviceClass
=
ConsoleAdminAuthAdvice
.
class
)
public
void
getUser
(
final
HTTP
RequestContext
context
)
{
public
void
getUser
(
final
RequestContext
context
)
{
final
J
SONRenderer
renderer
=
new
JSON
Renderer
();
final
J
sonRenderer
renderer
=
new
Json
Renderer
();
context
.
setRenderer
(
renderer
);
context
.
setRenderer
(
renderer
);
final
HttpServletRequest
request
=
context
.
getRequest
();
final
HttpServletRequest
request
=
context
.
getRequest
();
final
String
requestURI
=
request
.
getRequestURI
();
final
String
requestURI
=
request
.
getRequestURI
();
...
@@ -360,10 +360,10 @@ public class UserConsole {
...
@@ -360,10 +360,10 @@ public class UserConsole {
*
*
* @param context the specified http request context
* @param context the specified http request context
*/
*/
@RequestProcessing
(
value
=
"/console/changeRole/*"
,
method
=
H
TTPRequest
Method
.
GET
)
@RequestProcessing
(
value
=
"/console/changeRole/*"
,
method
=
H
ttp
Method
.
GET
)
@Before
(
adviceClass
=
ConsoleAdminAuthAdvice
.
class
)
@Before
(
adviceClass
=
ConsoleAdminAuthAdvice
.
class
)
public
void
changeUserRole
(
final
HTTP
RequestContext
context
)
{
public
void
changeUserRole
(
final
RequestContext
context
)
{
final
J
SONRenderer
renderer
=
new
JSON
Renderer
();
final
J
sonRenderer
renderer
=
new
Json
Renderer
();
context
.
setRenderer
(
renderer
);
context
.
setRenderer
(
renderer
);
final
JSONObject
jsonObject
=
new
JSONObject
();
final
JSONObject
jsonObject
=
new
JSONObject
();
...
...
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