From 8517f98ee4d3e781b39ed19de0fe229538d091fd Mon Sep 17 00:00:00 2001 From: johnniang Date: Tue, 16 Apr 2019 23:39:57 +0800 Subject: [PATCH] Change router from /admin/api to /api/admin --- .../java/run/halo/app/config/HaloConfiguration.java | 10 +++++----- .../java/run/halo/app/config/SwaggerConfiguration.java | 4 ++-- .../app/web/controller/admin/api/AdminController.java | 2 +- .../web/controller/admin/api/AttachmentController.java | 2 +- .../web/controller/admin/api/CategoryController.java | 2 +- .../web/controller/admin/api/CommentController.java | 2 +- .../web/controller/admin/api/GalleryController.java | 2 +- .../app/web/controller/admin/api/LinkController.java | 2 +- .../app/web/controller/admin/api/LogController.java | 2 +- .../app/web/controller/admin/api/MenuController.java | 2 +- .../app/web/controller/admin/api/OptionController.java | 2 +- .../app/web/controller/admin/api/PostController.java | 2 +- .../app/web/controller/admin/api/TagController.java | 2 +- .../app/web/controller/admin/api/ThemeController.java | 2 +- .../app/web/controller/admin/api/UserController.java | 2 +- 15 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/main/java/run/halo/app/config/HaloConfiguration.java b/src/main/java/run/halo/app/config/HaloConfiguration.java index a00bcadc2..305ade484 100644 --- a/src/main/java/run/halo/app/config/HaloConfiguration.java +++ b/src/main/java/run/halo/app/config/HaloConfiguration.java @@ -76,7 +76,7 @@ public class HaloConfiguration { corsFilter.setOrder(Ordered.HIGHEST_PRECEDENCE + 10); corsFilter.setFilter(new CorsFilter()); - corsFilter.addUrlPatterns("/api/*", "/admin/api/*"); + corsFilter.addUrlPatterns("/api/*"); return corsFilter; } @@ -92,7 +92,7 @@ public class HaloConfiguration { logFilter.setOrder(Ordered.HIGHEST_PRECEDENCE + 9); logFilter.setFilter(new LogFilter()); - logFilter.addUrlPatterns("/api/*", "/admin/*"); + logFilter.addUrlPatterns("/api/*"); return logFilter; } @@ -127,15 +127,15 @@ public class HaloConfiguration { failureHandler.setObjectMapper(objectMapper); // Config the admin filter - adminAuthenticationFilter.addExcludeUrlPatterns("/admin/api/login"); - adminAuthenticationFilter.addTryAuthUrlMethodPattern("/admin/api/comments", HttpMethod.POST.name()); + adminAuthenticationFilter.addExcludeUrlPatterns("/api/admin/login"); + adminAuthenticationFilter.addTryAuthUrlMethodPattern("/api/admin/comments", HttpMethod.POST.name()); adminAuthenticationFilter.addTryAuthUrlMethodPattern("/api/comments", HttpMethod.POST.name()); adminAuthenticationFilter.setFailureHandler( failureHandler); FilterRegistrationBean authenticationFilter = new FilterRegistrationBean<>(); authenticationFilter.setFilter(adminAuthenticationFilter); - authenticationFilter.addUrlPatterns("/admin/*", "/api/comments"); + authenticationFilter.addUrlPatterns("/api/admin/*", "/api/comments"); authenticationFilter.setOrder(1); return authenticationFilter; } diff --git a/src/main/java/run/halo/app/config/SwaggerConfiguration.java b/src/main/java/run/halo/app/config/SwaggerConfiguration.java index 55c7b2cc5..453a9e6f5 100644 --- a/src/main/java/run/halo/app/config/SwaggerConfiguration.java +++ b/src/main/java/run/halo/app/config/SwaggerConfiguration.java @@ -75,7 +75,7 @@ public class SwaggerConfiguration { // TODO Build with different security configuration return buildApiDocket("run.halo.app.admin", "run.halo.app.web.controller.admin", - "/admin/api/**") + "/api/admin/**") .enable(!haloProperties.getDocDisabled()); } @@ -121,7 +121,7 @@ public class SwaggerConfiguration { private SecurityContext securityContext() { return SecurityContext.builder() .securityReferences(defaultAuth()) - .forPaths(PathSelectors.regex("/admin/api/.*")) + .forPaths(PathSelectors.regex("/api/admin/.*")) .build(); } diff --git a/src/main/java/run/halo/app/web/controller/admin/api/AdminController.java b/src/main/java/run/halo/app/web/controller/admin/api/AdminController.java index 9dbd3ac33..94023305a 100644 --- a/src/main/java/run/halo/app/web/controller/admin/api/AdminController.java +++ b/src/main/java/run/halo/app/web/controller/admin/api/AdminController.java @@ -25,7 +25,7 @@ import javax.validation.Valid; */ @Slf4j @RestController -@RequestMapping("/admin/api") +@RequestMapping("/api/admin") public class AdminController { private final PostService postService; diff --git a/src/main/java/run/halo/app/web/controller/admin/api/AttachmentController.java b/src/main/java/run/halo/app/web/controller/admin/api/AttachmentController.java index 8cc260485..4e8b8485d 100644 --- a/src/main/java/run/halo/app/web/controller/admin/api/AttachmentController.java +++ b/src/main/java/run/halo/app/web/controller/admin/api/AttachmentController.java @@ -23,7 +23,7 @@ import static org.springframework.data.domain.Sort.Direction.DESC; * @date 3/21/19 */ @RestController -@RequestMapping("/admin/api/attachments") +@RequestMapping("/api/admin/attachments") public class AttachmentController { private final AttachmentService attachmentService; diff --git a/src/main/java/run/halo/app/web/controller/admin/api/CategoryController.java b/src/main/java/run/halo/app/web/controller/admin/api/CategoryController.java index 06a13504c..809ad82a9 100644 --- a/src/main/java/run/halo/app/web/controller/admin/api/CategoryController.java +++ b/src/main/java/run/halo/app/web/controller/admin/api/CategoryController.java @@ -22,7 +22,7 @@ import static org.springframework.data.domain.Sort.Direction.ASC; * @date 3/21/19 */ @RestController -@RequestMapping("/admin/api/categories") +@RequestMapping("/api/admin/categories") public class CategoryController { private final CategoryService categoryService; diff --git a/src/main/java/run/halo/app/web/controller/admin/api/CommentController.java b/src/main/java/run/halo/app/web/controller/admin/api/CommentController.java index 289309ade..92f3d5d47 100644 --- a/src/main/java/run/halo/app/web/controller/admin/api/CommentController.java +++ b/src/main/java/run/halo/app/web/controller/admin/api/CommentController.java @@ -40,7 +40,7 @@ import static org.springframework.data.domain.Sort.Direction.DESC; * @date 3/19/19 */ @RestController -@RequestMapping("/admin/api/comments") +@RequestMapping("/api/admin/comments") public class CommentController { private final CommentService commentService; diff --git a/src/main/java/run/halo/app/web/controller/admin/api/GalleryController.java b/src/main/java/run/halo/app/web/controller/admin/api/GalleryController.java index 233d9a4ce..697d1f1de 100644 --- a/src/main/java/run/halo/app/web/controller/admin/api/GalleryController.java +++ b/src/main/java/run/halo/app/web/controller/admin/api/GalleryController.java @@ -18,7 +18,7 @@ import java.util.List; * @date : 2019/3/21 */ @RestController -@RequestMapping("/admin/api/galleries") +@RequestMapping("/api/admin/galleries") public class GalleryController { private final GalleryService galleryService; diff --git a/src/main/java/run/halo/app/web/controller/admin/api/LinkController.java b/src/main/java/run/halo/app/web/controller/admin/api/LinkController.java index 9e0fe9a31..156992c86 100644 --- a/src/main/java/run/halo/app/web/controller/admin/api/LinkController.java +++ b/src/main/java/run/halo/app/web/controller/admin/api/LinkController.java @@ -19,7 +19,7 @@ import java.util.List; * @date : 2019/3/21 */ @RestController -@RequestMapping("/admin/api/links") +@RequestMapping("/api/admin/links") public class LinkController { private final LinkService linkService; diff --git a/src/main/java/run/halo/app/web/controller/admin/api/LogController.java b/src/main/java/run/halo/app/web/controller/admin/api/LogController.java index a4d99b331..e015f0713 100644 --- a/src/main/java/run/halo/app/web/controller/admin/api/LogController.java +++ b/src/main/java/run/halo/app/web/controller/admin/api/LogController.java @@ -19,7 +19,7 @@ import java.util.List; * @date 3/19/19 */ @RestController -@RequestMapping("/admin/api/logs") +@RequestMapping("/api/admin/logs") public class LogController { private final LogService logService; diff --git a/src/main/java/run/halo/app/web/controller/admin/api/MenuController.java b/src/main/java/run/halo/app/web/controller/admin/api/MenuController.java index bf2de97f8..c53d98a42 100644 --- a/src/main/java/run/halo/app/web/controller/admin/api/MenuController.java +++ b/src/main/java/run/halo/app/web/controller/admin/api/MenuController.java @@ -23,7 +23,7 @@ import static org.springframework.data.domain.Sort.Direction.DESC; * @date 4/3/19 */ @RestController -@RequestMapping("/admin/api/menus") +@RequestMapping("/api/admin/menus") public class MenuController { private final MenuService menuService; diff --git a/src/main/java/run/halo/app/web/controller/admin/api/OptionController.java b/src/main/java/run/halo/app/web/controller/admin/api/OptionController.java index 8d96dd316..ce6d1474d 100644 --- a/src/main/java/run/halo/app/web/controller/admin/api/OptionController.java +++ b/src/main/java/run/halo/app/web/controller/admin/api/OptionController.java @@ -17,7 +17,7 @@ import java.util.Map; * @date 3/20/19 */ @RestController -@RequestMapping("/admin/api/options") +@RequestMapping("/api/admin/options") public class OptionController { private final OptionService optionService; diff --git a/src/main/java/run/halo/app/web/controller/admin/api/PostController.java b/src/main/java/run/halo/app/web/controller/admin/api/PostController.java index 2f1ca30dd..8473045b4 100644 --- a/src/main/java/run/halo/app/web/controller/admin/api/PostController.java +++ b/src/main/java/run/halo/app/web/controller/admin/api/PostController.java @@ -27,7 +27,7 @@ import static org.springframework.data.domain.Sort.Direction.DESC; * @date 3/19/19 */ @RestController -@RequestMapping("/admin/api/posts") +@RequestMapping("/api/admin/posts") public class PostController { private final PostService postService; diff --git a/src/main/java/run/halo/app/web/controller/admin/api/TagController.java b/src/main/java/run/halo/app/web/controller/admin/api/TagController.java index 830f03e05..4e04582f6 100644 --- a/src/main/java/run/halo/app/web/controller/admin/api/TagController.java +++ b/src/main/java/run/halo/app/web/controller/admin/api/TagController.java @@ -27,7 +27,7 @@ import java.util.List; */ @Slf4j @RestController -@RequestMapping("/admin/api/tags") +@RequestMapping("/api/admin/tags") public class TagController { private final TagService tagService; diff --git a/src/main/java/run/halo/app/web/controller/admin/api/ThemeController.java b/src/main/java/run/halo/app/web/controller/admin/api/ThemeController.java index f226ca9cd..9c060e055 100644 --- a/src/main/java/run/halo/app/web/controller/admin/api/ThemeController.java +++ b/src/main/java/run/halo/app/web/controller/admin/api/ThemeController.java @@ -20,7 +20,7 @@ import java.util.Map; * @date : 2019/3/20 */ @RestController -@RequestMapping("/admin/api/themes") +@RequestMapping("/api/admin/themes") public class ThemeController { private final ThemeService themeService; diff --git a/src/main/java/run/halo/app/web/controller/admin/api/UserController.java b/src/main/java/run/halo/app/web/controller/admin/api/UserController.java index 13f5e3f04..c3c7ce48b 100644 --- a/src/main/java/run/halo/app/web/controller/admin/api/UserController.java +++ b/src/main/java/run/halo/app/web/controller/admin/api/UserController.java @@ -20,7 +20,7 @@ import javax.validation.Valid; * @date 3/19/19 */ @RestController -@RequestMapping("/admin/api/users") +@RequestMapping("/api/admin/users") public class UserController { private final UserService userService;