Commit 9dc0cb96 authored by Liang Ding's avatar Liang Ding

#12580

parent 6df386d0
...@@ -37,10 +37,7 @@ import org.b3log.latke.util.Strings; ...@@ -37,10 +37,7 @@ import org.b3log.latke.util.Strings;
import org.b3log.solo.event.*; import org.b3log.solo.event.*;
import org.b3log.solo.model.Option; import org.b3log.solo.model.Option;
import org.b3log.solo.model.Skin; import org.b3log.solo.model.Skin;
import org.b3log.solo.processor.console.AdminConsole; import org.b3log.solo.processor.console.*;
import org.b3log.solo.processor.console.ArticleConsole;
import org.b3log.solo.processor.console.CategoryConsole;
import org.b3log.solo.processor.console.CommentConsole;
import org.b3log.solo.repository.OptionRepository; import org.b3log.solo.repository.OptionRepository;
import org.b3log.solo.service.*; import org.b3log.solo.service.*;
import org.b3log.solo.util.Skins; import org.b3log.solo.util.Skins;
...@@ -360,8 +357,13 @@ public final class SoloServletListener extends AbstractServletListener { ...@@ -360,8 +357,13 @@ public final class SoloServletListener extends AbstractServletListener {
DispatcherServlet.get("/console/comments/article/{id}", commentConsole::getArticleComments); DispatcherServlet.get("/console/comments/article/{id}", commentConsole::getArticleComments);
DispatcherServlet.get("/console/comments/page/{id}", commentConsole::getPageComments); DispatcherServlet.get("/console/comments/page/{id}", commentConsole::getPageComments);
final LinkConsole linkConsole = beanManager.getReference(LinkConsole.class);
DispatcherServlet.delete("/console/link/{id}", linkConsole::removeLink);
DispatcherServlet.put("/console/link/", linkConsole::updateLink);
DispatcherServlet.put("/console/link/order/", linkConsole::changeOrder);
DispatcherServlet.post("/console/link/", linkConsole::addLink);
DispatcherServlet.get("/console/links/{page}/{pageSize}/{windowSize}", linkConsole::getLinks);
DispatcherServlet.get("/console/link/{id}", linkConsole::getLink);
DispatcherServlet.mapping(); DispatcherServlet.mapping();
} }
......
...@@ -24,10 +24,8 @@ import org.b3log.latke.ioc.Inject; ...@@ -24,10 +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.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.Common; import org.b3log.solo.model.Common;
...@@ -44,7 +42,7 @@ import javax.servlet.http.HttpServletRequest; ...@@ -44,7 +42,7 @@ import javax.servlet.http.HttpServletRequest;
* Link console request processing. * Link 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.0.1.3, Dec 3, 2018 * @version 1.0.1.4, Dec 11, 2018
* @since 0.4.0 * @since 0.4.0
*/ */
@RequestProcessor @RequestProcessor
...@@ -88,7 +86,6 @@ public class LinkConsole { ...@@ -88,7 +86,6 @@ public class LinkConsole {
* *
* @param context the specified http request context * @param context the specified http request context
*/ */
@RequestProcessing(value = "/console/link/{id}", method = HttpMethod.DELETE)
public void removeLink(final RequestContext context) { public void removeLink(final RequestContext context) {
final JsonRenderer renderer = new JsonRenderer(); final JsonRenderer renderer = new JsonRenderer();
context.setRenderer(renderer); context.setRenderer(renderer);
...@@ -136,11 +133,9 @@ public class LinkConsole { ...@@ -136,11 +133,9 @@ public class LinkConsole {
* *
* @param context the specified http request context * @param context the specified http request context
*/ */
@RequestProcessing(value = "/console/link/", method = HttpMethod.PUT)
public void updateLink(final RequestContext context) { public void updateLink(final RequestContext context) {
final JsonRenderer renderer = new JsonRenderer(); final JsonRenderer renderer = new JsonRenderer();
context.setRenderer(renderer); context.setRenderer(renderer);
final JSONObject ret = new JSONObject(); final JSONObject ret = new JSONObject();
try { try {
...@@ -149,7 +144,6 @@ public class LinkConsole { ...@@ -149,7 +144,6 @@ public class LinkConsole {
ret.put(Keys.STATUS_CODE, true); ret.put(Keys.STATUS_CODE, true);
ret.put(Keys.MSG, langPropsService.get("updateSuccLabel")); ret.put(Keys.MSG, langPropsService.get("updateSuccLabel"));
renderer.setJSONObject(ret); renderer.setJSONObject(ret);
} catch (final Exception e) { } catch (final Exception e) {
LOGGER.log(Level.ERROR, e.getMessage(), e); LOGGER.log(Level.ERROR, e.getMessage(), e);
...@@ -183,7 +177,6 @@ public class LinkConsole { ...@@ -183,7 +177,6 @@ public class LinkConsole {
* *
* @param context the specified http request context * @param context the specified http request context
*/ */
@RequestProcessing(value = "/console/link/order/", method = HttpMethod.PUT)
public void changeOrder(final RequestContext context) { public void changeOrder(final RequestContext context) {
final JsonRenderer renderer = new JsonRenderer(); final JsonRenderer renderer = new JsonRenderer();
context.setRenderer(renderer); context.setRenderer(renderer);
...@@ -234,7 +227,6 @@ public class LinkConsole { ...@@ -234,7 +227,6 @@ public class LinkConsole {
* *
* @param context the specified http request context * @param context the specified http request context
*/ */
@RequestProcessing(value = "/console/link/", method = HttpMethod.POST)
public void addLink(final RequestContext context) { public void addLink(final RequestContext context) {
final JsonRenderer renderer = new JsonRenderer(); final JsonRenderer renderer = new JsonRenderer();
context.setRenderer(renderer); context.setRenderer(renderer);
...@@ -285,7 +277,6 @@ public class LinkConsole { ...@@ -285,7 +277,6 @@ public class LinkConsole {
* *
* @param context the specified http request context * @param context the specified http request context
*/ */
@RequestProcessing(value = "/console/links/{page}/{pageSize}/{windowSize}", method = HttpMethod.GET)
public void getLinks(final RequestContext context) { public void getLinks(final RequestContext context) {
final JsonRenderer renderer = new JsonRenderer(); final JsonRenderer renderer = new JsonRenderer();
context.setRenderer(renderer); context.setRenderer(renderer);
...@@ -334,7 +325,6 @@ public class LinkConsole { ...@@ -334,7 +325,6 @@ public class LinkConsole {
* *
* @param context the specified http request context * @param context the specified http request context
*/ */
@RequestProcessing(value = "/console/link/{id}", method = HttpMethod.GET)
public void getLink(final RequestContext context) { public void getLink(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