Merge pull request #227 from otale/develop

🐫 fix #217 and remove @QueryParam
otale · Sep 6, 2017 · f3c3d30 · f3c3d30
2 parents ab5ccec + 8ffd659
commit f3c3d30
Show file tree

Hide file tree

Showing 11 changed files with 77 additions and 77 deletions.
diff --git a/src/main/java/com/tale/controller/IndexController.java b/src/main/java/com/tale/controller/IndexController.java
@@ -55,7 +55,7 @@ public class IndexController extends BaseController {
      * @return
      */
     @GetRoute
-    public String index(Request request, @QueryParam(defaultValue = "12") int limit) {
+    public String index(Request request, @Param(defaultValue = "12") int limit) {
         return this.index(request, 1, limit);
     }
 
@@ -93,7 +93,7 @@ public String page(@PathParam String cid, Request request) {
      * @return
      */
     @GetRoute(value = {"page/:page", "page/:page.html"})
-    public String index(Request request, @PathParam int page, @QueryParam(defaultValue = "12") int limit) {
+    public String index(Request request, @PathParam int page, @Param(defaultValue = "12") int limit) {
 
         page = page < 0 || page > TaleConst.MAX_PAGE ? 1 : page;
         Take take = new Take(Contents.class).eq("type", Types.ARTICLE).eq("status", Types.PUBLISH).page(page, limit, "created desc");
@@ -147,13 +147,13 @@ private void updateArticleHit(Integer cid, Integer chits) {
      * @return
      */
     @GetRoute(value = {"category/:keyword", "category/:keyword.html"})
-    public String categories(Request request, @PathParam String keyword, @QueryParam(defaultValue = "12") int limit) {
+    public String categories(Request request, @PathParam String keyword, @Param(defaultValue = "12") int limit) {
         return this.categories(request, keyword, 1, limit);
     }
 
     @GetRoute(value = {"category/:keyword/:page", "category/:keyword/:page.html"})
     public String categories(Request request, @PathParam String keyword,
-                             @PathParam int page, @QueryParam(defaultValue = "12") int limit) {
+                             @PathParam int page, @Param(defaultValue = "12") int limit) {
         page = page < 0 || page > TaleConst.MAX_PAGE ? 1 : page;
         MetaDto metaDto = metasService.getMeta(Types.CATEGORY, keyword);
         if (null == metaDto) {
@@ -179,7 +179,7 @@ public String categories(Request request, @PathParam String keyword,
      * @return
      */
     @GetRoute(value = {"tag/:name", "tag/:name.html"})
-    public String tags(Request request, @PathParam String name, @QueryParam(defaultValue = "12") int limit) {
+    public String tags(Request request, @PathParam String name, @Param(defaultValue = "12") int limit) {
         return this.tags(request, name, 1, limit);
     }
 
@@ -193,7 +193,7 @@ public String tags(Request request, @PathParam String name, @QueryParam(defaultV
      * @return
      */
     @GetRoute(value = {"tag/:name/:page", "tag/:name/:page.html"})
-    public String tags(Request request, @PathParam String name, @PathParam int page, @QueryParam(defaultValue = "12") int limit) {
+    public String tags(Request request, @PathParam String name, @PathParam int page, @Param(defaultValue = "12") int limit) {
 
         page = page < 0 || page > TaleConst.MAX_PAGE ? 1 : page;
         MetaDto metaDto = metasService.getMeta(Types.TAG, name);
@@ -219,18 +219,18 @@ public String tags(Request request, @PathParam String name, @PathParam int page,
      * @return
      */
     @GetRoute(value = {"search/:keyword", "search/:keyword.html"})
-    public String search(Request request, @PathParam String keyword, @QueryParam(defaultValue = "12") int limit) {
+    public String search(Request request, @PathParam String keyword, @Param(defaultValue = "12") int limit) {
         return this.search(request, keyword, 1, limit);
     }
 
     @GetRoute(value = {"search", "search.html"})
-    public String search(Request request, @QueryParam(defaultValue = "12") int limit) {
+    public String search(Request request, @Param(defaultValue = "12") int limit) {
         String keyword = request.query("s").orElse("");
         return this.search(request, keyword, 1, limit);
     }
 
     @GetRoute(value = {"search/:keyword/:page", "search/:keyword/:page.html"})
-    public String search(Request request, @PathParam String keyword, @PathParam int page, @QueryParam(defaultValue = "12") int limit) {
+    public String search(Request request, @PathParam String keyword, @PathParam int page, @Param(defaultValue = "12") int limit) {
 
         page = page < 0 || page > TaleConst.MAX_PAGE ? 1 : page;
         Take take = new Take(Contents.class).eq("type", Types.ARTICLE).eq("status", Types.PUBLISH)

diff --git a/src/main/java/com/tale/controller/InstallController.java b/src/main/java/com/tale/controller/InstallController.java
@@ -5,8 +5,8 @@
 import com.blade.ioc.annotation.Inject;
 import com.blade.kit.StringKit;
 import com.blade.mvc.annotation.JSON;
+import com.blade.mvc.annotation.Param;
 import com.blade.mvc.annotation.Path;
-import com.blade.mvc.annotation.QueryParam;
 import com.blade.mvc.annotation.Route;
 import com.blade.mvc.http.HttpMethod;
 import com.blade.mvc.http.Request;
@@ -53,9 +53,9 @@ public String index(Request request) {
 
     @Route(value = "/", method = HttpMethod.POST)
     @JSON
-    public RestResponse doInstall(@QueryParam String site_title, @QueryParam String site_url,
-                                  @QueryParam String admin_user, @QueryParam String admin_email,
-                                  @QueryParam String admin_pwd) {
+    public RestResponse doInstall(@Param String site_title, @Param String site_url,
+                                  @Param String admin_user, @Param String admin_email,
+                                  @Param String admin_pwd) {
         if (Files.exists(Paths.get(AttachController.CLASSPATH + "install.lock"))
                 && TaleConst.OPTIONS.getInt("allow_install", 0) != 1) {
             return RestResponse.fail("请勿重复安装");

diff --git a/src/main/java/com/tale/controller/admin/ArticleController.java b/src/main/java/com/tale/controller/admin/ArticleController.java
@@ -8,10 +8,10 @@
 import com.blade.mvc.http.Request;
 import com.blade.mvc.ui.RestResponse;
 import com.tale.controller.BaseController;
-import com.tale.model.dto.LogActions;
-import com.tale.model.dto.Types;
 import com.tale.exception.TipException;
 import com.tale.extension.Commons;
+import com.tale.model.dto.LogActions;
+import com.tale.model.dto.Types;
 import com.tale.model.entity.Contents;
 import com.tale.model.entity.Metas;
 import com.tale.model.entity.Users;
@@ -51,8 +51,8 @@ public class ArticleController extends BaseController {
      * @return
      */
     @GetRoute(value = "")
-    public String index(@QueryParam(defaultValue = "1") int page,
-                        @QueryParam(defaultValue = "15") int limit, Request request) {
+    public String index(@Param(defaultValue = "1") int page,
+                        @Param(defaultValue = "15") int limit, Request request) {
 
         Paginator<Contents> contentsPaginator = contentsService.getArticles(new Take(Contents.class).eq("type", Types.ARTICLE).page(page, limit, "created desc"));
         request.attribute("articles", contentsPaginator);
@@ -105,11 +105,11 @@ public String editArticle(@PathParam String cid, Request request) {
      */
     @PostRoute(value = "publish")
     @JSON
-    public RestResponse publishArticle(@QueryParam String title, @QueryParam String content,
-                                       @QueryParam String tags, @QueryParam String categories,
-                                       @QueryParam String status, @QueryParam String slug,
-                                       @QueryParam String fmt_type, @QueryParam String thumb_img,
-                                       @QueryParam Boolean allow_comment, @QueryParam Boolean allow_ping, @QueryParam Boolean allow_feed) {
+    public RestResponse publishArticle(@Param String title, @Param String content,
+                                       @Param String tags, @Param String categories,
+                                       @Param String status, @Param String slug,
+                                       @Param String fmt_type, @Param String thumb_img,
+                                       @Param Boolean allow_comment, @Param Boolean allow_ping, @Param Boolean allow_feed) {
 
         Users users = this.user();
 
@@ -169,12 +169,12 @@ public RestResponse publishArticle(@QueryParam String title, @QueryParam String
      */
     @PostRoute(value = "modify")
     @JSON
-    public RestResponse modifyArticle(@QueryParam Integer cid, @QueryParam String title,
-                                      @QueryParam String content,@QueryParam String fmt_type,
-                                      @QueryParam String tags, @QueryParam String categories,
-                                      @QueryParam String status, @QueryParam String slug,
-                                      @QueryParam String thumb_img,
-                                      @QueryParam Boolean allow_comment, @QueryParam Boolean allow_ping, @QueryParam Boolean allow_feed) {
+    public RestResponse modifyArticle(@Param Integer cid, @Param String title,
+                                      @Param String content,@Param String fmt_type,
+                                      @Param String tags, @Param String categories,
+                                      @Param String status, @Param String slug,
+                                      @Param String thumb_img,
+                                      @Param Boolean allow_comment, @Param Boolean allow_ping, @Param Boolean allow_feed) {
 
         Users users = this.user();
         Contents contents = new Contents();
@@ -220,7 +220,7 @@ public RestResponse modifyArticle(@QueryParam Integer cid, @QueryParam String ti
      */
     @Route(value = "delete")
     @JSON
-    public RestResponse delete(@QueryParam int cid, Request request) {
+    public RestResponse delete(@Param int cid, Request request) {
         try {
             contentsService.delete(cid);
             siteService.cleanCache(Types.C_STATISTICS);

diff --git a/src/main/java/com/tale/controller/admin/AuthController.java b/src/main/java/com/tale/controller/admin/AuthController.java
@@ -4,18 +4,18 @@
 import com.blade.kit.DateKit;
 import com.blade.kit.StringKit;
 import com.blade.mvc.annotation.JSON;
+import com.blade.mvc.annotation.Param;
 import com.blade.mvc.annotation.Path;
-import com.blade.mvc.annotation.QueryParam;
 import com.blade.mvc.annotation.Route;
 import com.blade.mvc.http.HttpMethod;
 import com.blade.mvc.http.Request;
 import com.blade.mvc.http.Response;
 import com.blade.mvc.http.Session;
 import com.blade.mvc.ui.RestResponse;
 import com.tale.controller.BaseController;
-import com.tale.model.dto.LogActions;
 import com.tale.exception.TipException;
 import com.tale.init.TaleConst;
+import com.tale.model.dto.LogActions;
 import com.tale.model.entity.Users;
 import com.tale.service.LogService;
 import com.tale.service.UsersService;
@@ -47,9 +47,9 @@ public String login(Response response) {
 
     @Route(value = "login", method = HttpMethod.POST)
     @JSON
-    public RestResponse doLogin(@QueryParam String username,
-                                @QueryParam String password,
-                                @QueryParam String remeber_me,
+    public RestResponse doLogin(@Param String username,
+                                @Param String password,
+                                @Param String remeber_me,
                                 Request request,
                                 Session session, Response response) {
 

diff --git a/src/main/java/com/tale/controller/admin/CategoryController.java b/src/main/java/com/tale/controller/admin/CategoryController.java
@@ -1,18 +1,15 @@
 package com.tale.controller.admin;
 
 import com.blade.ioc.annotation.Inject;
-import com.blade.mvc.annotation.JSON;
-import com.blade.mvc.annotation.Path;
-import com.blade.mvc.annotation.QueryParam;
-import com.blade.mvc.annotation.Route;
+import com.blade.mvc.annotation.*;
 import com.blade.mvc.http.HttpMethod;
 import com.blade.mvc.http.Request;
 import com.blade.mvc.ui.RestResponse;
 import com.tale.controller.BaseController;
-import com.tale.model.dto.MetaDto;
-import com.tale.model.dto.Types;
 import com.tale.exception.TipException;
 import com.tale.init.TaleConst;
+import com.tale.model.dto.MetaDto;
+import com.tale.model.dto.Types;
 import com.tale.service.MetasService;
 import com.tale.service.SiteService;
 import lombok.extern.slf4j.Slf4j;
@@ -45,7 +42,7 @@ public String index(Request request) {
 
     @Route(value = "save", method = HttpMethod.POST)
     @JSON
-    public RestResponse saveCategory(@QueryParam String cname, @QueryParam Integer mid) {
+    public RestResponse saveCategory(@Param String cname, @Param Integer mid) {
         try {
             metasService.saveMeta(Types.CATEGORY, cname, mid);
             siteService.cleanCache(Types.C_STATISTICS);
@@ -63,7 +60,7 @@ public RestResponse saveCategory(@QueryParam String cname, @QueryParam Integer m
 
     @Route(value = "delete")
     @JSON
-    public RestResponse delete(@QueryParam int mid) {
+    public RestResponse delete(@Param int mid) {
         try {
             metasService.delete(mid);
             siteService.cleanCache(Types.C_STATISTICS);

diff --git a/src/main/java/com/tale/controller/admin/CommentController.java b/src/main/java/com/tale/controller/admin/CommentController.java
@@ -8,8 +8,8 @@
 import com.blade.mvc.http.Request;
 import com.blade.mvc.ui.RestResponse;
 import com.tale.controller.BaseController;
-import com.tale.model.dto.Types;
 import com.tale.exception.TipException;
+import com.tale.model.dto.Types;
 import com.tale.model.entity.Comments;
 import com.tale.model.entity.Users;
 import com.tale.service.CommentsService;
@@ -34,8 +34,8 @@ public class CommentController extends BaseController {
     private SiteService siteService;
 
     @GetRoute(value = "")
-    public String index(@QueryParam(defaultValue = "1") int page,
-                        @QueryParam(defaultValue = "15") int limit, Request request) {
+    public String index(@Param(defaultValue = "1") int page,
+                        @Param(defaultValue = "15") int limit, Request request) {
         Users users = this.user();
         Paginator<Comments> commentsPaginator = commentsService.getComments(new Take(Comments.class).notEq("author_id", users.getUid()).page(page, limit, "coid desc"));
         request.attribute("comments", commentsPaginator);
@@ -49,7 +49,7 @@ public String index(@QueryParam(defaultValue = "1") int page,
      */
     @PostRoute(value = "delete")
     @JSON
-    public RestResponse delete(@QueryParam Integer coid) {
+    public RestResponse delete(@Param Integer coid) {
         try {
             Comments comments = commentsService.byId(coid);
             if(null == comments){
@@ -71,7 +71,7 @@ public RestResponse delete(@QueryParam Integer coid) {
 
     @PostRoute(value = "status")
     @JSON
-    public RestResponse delete(@QueryParam Integer coid, @QueryParam String status) {
+    public RestResponse delete(@Param Integer coid, @Param String status) {
         try {
             Comments comments = new Comments();
             comments.setCoid(coid);
@@ -92,7 +92,7 @@ public RestResponse delete(@QueryParam Integer coid, @QueryParam String status)
 
     @PostRoute(value = "")
     @JSON
-    public RestResponse reply(@QueryParam Integer coid, @QueryParam String content, Request request) {
+    public RestResponse reply(@Param Integer coid, @Param String content, Request request) {
         if(null == coid || StringKit.isBlank(content)){
             return RestResponse.fail("请输入完整后评论");
         }

diff --git a/src/main/java/com/tale/controller/admin/IndexController.java b/src/main/java/com/tale/controller/admin/IndexController.java
@@ -6,20 +6,20 @@
 import com.blade.kit.JsonKit;
 import com.blade.kit.StringKit;
 import com.blade.mvc.annotation.JSON;
+import com.blade.mvc.annotation.Param;
 import com.blade.mvc.annotation.Path;
-import com.blade.mvc.annotation.QueryParam;
 import com.blade.mvc.annotation.Route;
 import com.blade.mvc.http.HttpMethod;
 import com.blade.mvc.http.Request;
 import com.blade.mvc.ui.RestResponse;
 import com.tale.controller.BaseController;
+import com.tale.exception.TipException;
+import com.tale.extension.Commons;
+import com.tale.init.TaleConst;
 import com.tale.model.dto.BackResponse;
 import com.tale.model.dto.LogActions;
 import com.tale.model.dto.Statistics;
 import com.tale.model.dto.Types;
-import com.tale.exception.TipException;
-import com.tale.extension.Commons;
-import com.tale.init.TaleConst;
 import com.tale.model.entity.Comments;
 import com.tale.model.entity.Contents;
 import com.tale.model.entity.Logs;
@@ -90,7 +90,7 @@ public String setting(Request request) {
      */
     @Route(value = "setting", method = HttpMethod.POST)
     @JSON
-    public RestResponse saveSetting(@QueryParam String site_theme, Request request) {
+    public RestResponse saveSetting(@Param String site_theme, Request request) {
         try {
             Map<String, List<String>> querys = request.parameters();
             optionsService.saveOptions(querys);
@@ -124,7 +124,7 @@ public String profile() {
      */
     @Route(value = "profile", method = HttpMethod.POST)
     @JSON
-    public RestResponse saveProfile(@QueryParam String screen_name, @QueryParam String email, Request request) {
+    public RestResponse saveProfile(@Param String screen_name, @Param String email, Request request) {
         Users users = this.user();
         if (StringKit.isNotBlank(screen_name) && StringKit.isNotBlank(email)) {
             Users temp = new Users();
@@ -142,7 +142,7 @@ public RestResponse saveProfile(@QueryParam String screen_name, @QueryParam Stri
      */
     @Route(value = "password", method = HttpMethod.POST)
     @JSON
-    public RestResponse upPwd(@QueryParam String old_password, @QueryParam String password, Request request) {
+    public RestResponse upPwd(@Param String old_password, @Param String password, Request request) {
         Users users = this.user();
         if (StringKit.isBlank(old_password) || StringKit.isBlank(password)) {
             return RestResponse.fail("请确认信息输入完整");
@@ -180,7 +180,7 @@ public RestResponse upPwd(@QueryParam String old_password, @QueryParam String pa
      */
     @Route(value = "backup", method = HttpMethod.POST)
     @JSON
-    public RestResponse backup(@QueryParam String bk_type, @QueryParam String bk_path,
+    public RestResponse backup(@Param String bk_type, @Param String bk_path,
                                Request request) {
         if (StringKit.isBlank(bk_type)) {
             return RestResponse.fail("请确认信息输入完整");
@@ -207,9 +207,9 @@ public RestResponse backup(@QueryParam String bk_type, @QueryParam String bk_pat
      */
     @Route(value = "advanced", method = HttpMethod.POST)
     @JSON
-    public RestResponse doAdvanced(@QueryParam String cache_key, @QueryParam String block_ips,
-                                   @QueryParam String plugin_name, @QueryParam String rewrite_url,
-                                   @QueryParam String allow_install){
+    public RestResponse doAdvanced(@Param String cache_key, @Param String block_ips,
+                                   @Param String plugin_name, @Param String rewrite_url,
+                                   @Param String allow_install){
         // 清除缓存
         if(StringKit.isNotBlank(cache_key)){
             if(cache_key.equals("*")){
@@ -252,7 +252,7 @@ public RestResponse doAdvanced(@QueryParam String cache_key, @QueryParam String
      * @return
      */
     @Route(value = "reload", method = HttpMethod.GET)
-    public void reload(@QueryParam(defaultValue = "0") int sleep, Request request) {
+    public void reload(@Param(defaultValue = "0") int sleep, Request request) {
         if(sleep < 0 || sleep > 999){
             sleep = 10;
         }