Commit 71e64a63 authored by Liang Ding's avatar Liang Ding

#12580

parent 96ff0c21
...@@ -373,12 +373,21 @@ public final class SoloServletListener extends AbstractServletListener { ...@@ -373,12 +373,21 @@ public final class SoloServletListener extends AbstractServletListener {
DispatcherServlet.get("/console/page/{id}", pageConsole::getPage); DispatcherServlet.get("/console/page/{id}", pageConsole::getPage);
DispatcherServlet.get("/console/pages/{page}/{pageSize}/{windowSize}", pageConsole::getPages); DispatcherServlet.get("/console/pages/{page}/{pageSize}/{windowSize}", pageConsole::getPages);
final PluginConsole pluginConsole =beanManager.getReference(PluginConsole.class); final PluginConsole pluginConsole = beanManager.getReference(PluginConsole.class);
DispatcherServlet.put("/console/plugin/status/", pluginConsole::setPluginStatus); DispatcherServlet.put("/console/plugin/status/", pluginConsole::setPluginStatus);
DispatcherServlet.get("/console/plugins/{page}/{pageSize}/{windowSize}", pluginConsole::getPlugins); DispatcherServlet.get("/console/plugins/{page}/{pageSize}/{windowSize}", pluginConsole::getPlugins);
DispatcherServlet.post("/console/plugin/toSetting", pluginConsole::toSetting); DispatcherServlet.post("/console/plugin/toSetting", pluginConsole::toSetting);
DispatcherServlet.post("/console/plugin/updateSetting", pluginConsole::updateSetting); DispatcherServlet.post("/console/plugin/updateSetting", pluginConsole::updateSetting);
final PreferenceConsole preferenceConsole = beanManager.getReference(PreferenceConsole.class);
DispatcherServlet.get("/console/reply/notification/template", preferenceConsole::getReplyNotificationTemplate);
DispatcherServlet.put("/console/reply/notification/template", preferenceConsole::updateReplyNotificationTemplate);
DispatcherServlet.get("/console/signs/", preferenceConsole::getSigns);
DispatcherServlet.get("/console/preference/", preferenceConsole::getPreference);
DispatcherServlet.put("/console/preference/", preferenceConsole::updatePreference);
DispatcherServlet.get("/console/preference/qiniu", preferenceConsole::getQiniuPreference);
DispatcherServlet.put("/console/preference/qiniu", preferenceConsole::updateQiniu);
DispatcherServlet.mapping(); DispatcherServlet.mapping();
} }
......
...@@ -24,10 +24,8 @@ import org.b3log.latke.logging.Level; ...@@ -24,10 +24,8 @@ 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.HttpMethod;
import org.b3log.latke.servlet.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.annotation.RequestProcessing;
import org.b3log.latke.servlet.annotation.RequestProcessor; import org.b3log.latke.servlet.annotation.RequestProcessor;
import org.b3log.latke.servlet.renderer.JsonRenderer; import org.b3log.latke.servlet.renderer.JsonRenderer;
import org.b3log.solo.model.Option; import org.b3log.solo.model.Option;
...@@ -48,7 +46,7 @@ import java.util.Arrays; ...@@ -48,7 +46,7 @@ import java.util.Arrays;
* Preference console request processing. * Preference console request processing.
* *
* @author <a href="http://88250.b3log.org">Liang Ding</a> * @author <a href="http://88250.b3log.org">Liang Ding</a>
* @version 1.2.0.16, Dec 10, 2018 * @version 1.2.0.17, Dec 11, 2018
* @since 0.4.0 * @since 0.4.0
*/ */
@RequestProcessor @RequestProcessor
...@@ -60,11 +58,6 @@ public class PreferenceConsole { ...@@ -60,11 +58,6 @@ public class PreferenceConsole {
*/ */
private static final Logger LOGGER = Logger.getLogger(PreferenceConsole.class); private static final Logger LOGGER = Logger.getLogger(PreferenceConsole.class);
/**
* Preference URI prefix.
*/
private static final String PREFERENCE_URI_PREFIX = "/console/preference/";
/** /**
* Preference query service. * Preference query service.
*/ */
...@@ -112,7 +105,6 @@ public class PreferenceConsole { ...@@ -112,7 +105,6 @@ public class PreferenceConsole {
* *
* @param context the specified http request context * @param context the specified http request context
*/ */
@RequestProcessing(value = "/console/reply/notification/template", method = HttpMethod.GET)
public void getReplyNotificationTemplate(final RequestContext context) { public void getReplyNotificationTemplate(final RequestContext context) {
final JsonRenderer renderer = new JsonRenderer(); final JsonRenderer renderer = new JsonRenderer();
context.setRenderer(renderer); context.setRenderer(renderer);
...@@ -150,7 +142,6 @@ public class PreferenceConsole { ...@@ -150,7 +142,6 @@ public class PreferenceConsole {
* *
* @param context the specified http request context * @param context the specified http request context
*/ */
@RequestProcessing(value = "/console/reply/notification/template", method = HttpMethod.PUT)
public void updateReplyNotificationTemplate(final RequestContext context) { public void updateReplyNotificationTemplate(final RequestContext context) {
final JsonRenderer renderer = new JsonRenderer(); final JsonRenderer renderer = new JsonRenderer();
context.setRenderer(renderer); context.setRenderer(renderer);
...@@ -190,7 +181,6 @@ public class PreferenceConsole { ...@@ -190,7 +181,6 @@ public class PreferenceConsole {
* *
* @param context the specified http request context * @param context the specified http request context
*/ */
@RequestProcessing(value = "/console/signs/", method = HttpMethod.GET)
public void getSigns(final RequestContext context) { public void getSigns(final RequestContext context) {
final JsonRenderer renderer = new JsonRenderer(); final JsonRenderer renderer = new JsonRenderer();
context.setRenderer(renderer); context.setRenderer(renderer);
...@@ -272,7 +262,6 @@ public class PreferenceConsole { ...@@ -272,7 +262,6 @@ public class PreferenceConsole {
* *
* @param context the specified http request context * @param context the specified http request context
*/ */
@RequestProcessing(value = PREFERENCE_URI_PREFIX, method = HttpMethod.GET)
public void getPreference(final RequestContext context) { public void getPreference(final RequestContext context) {
final JsonRenderer renderer = new JsonRenderer(); final JsonRenderer renderer = new JsonRenderer();
context.setRenderer(renderer); context.setRenderer(renderer);
...@@ -352,7 +341,6 @@ public class PreferenceConsole { ...@@ -352,7 +341,6 @@ public class PreferenceConsole {
* *
* @param context the specified http request context * @param context the specified http request context
*/ */
@RequestProcessing(value = PREFERENCE_URI_PREFIX, method = HttpMethod.PUT)
public void updatePreference(final RequestContext context) { public void updatePreference(final RequestContext context) {
final JsonRenderer renderer = new JsonRenderer(); final JsonRenderer renderer = new JsonRenderer();
context.setRenderer(renderer); context.setRenderer(renderer);
...@@ -402,7 +390,6 @@ public class PreferenceConsole { ...@@ -402,7 +390,6 @@ public class PreferenceConsole {
* *
* @param context the specified http request context * @param context the specified http request context
*/ */
@RequestProcessing(value = PREFERENCE_URI_PREFIX + "qiniu", method = HttpMethod.GET)
public void getQiniuPreference(final RequestContext context) { public void getQiniuPreference(final RequestContext context) {
final JsonRenderer renderer = new JsonRenderer(); final JsonRenderer renderer = new JsonRenderer();
context.setRenderer(renderer); context.setRenderer(renderer);
...@@ -445,7 +432,6 @@ public class PreferenceConsole { ...@@ -445,7 +432,6 @@ public class PreferenceConsole {
* *
* @param context the specified http request context * @param context the specified http request context
*/ */
@RequestProcessing(value = PREFERENCE_URI_PREFIX + "qiniu", method = HttpMethod.PUT)
public void updateQiniu(final RequestContext context) { public void updateQiniu(final RequestContext context) {
final JsonRenderer renderer = new JsonRenderer(); final JsonRenderer renderer = new JsonRenderer();
context.setRenderer(renderer); context.setRenderer(renderer);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment