github
/
halo
mirror of https://github.com/halo-dev/halo
1
0
Fork 0
Code Issues Releases Wiki Activity

Change router from /admin/api to /api/admin

pull/146/head
johnniang 2019-04-16 23:39:57 +08:00
parent c2bcfd59fc
commit 8517f98ee4
15 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/run/halo/app/config/HaloConfiguration.java
View File

@ -76,7 +76,7 @@ public class HaloConfiguration {
corsFilter.setOrder(Ordered.HIGHEST_PRECEDENCE + 10); corsFilter.setOrder(Ordered.HIGHEST_PRECEDENCE + 10);
corsFilter.setFilter(new CorsFilter()); corsFilter.setFilter(new CorsFilter());
corsFilter.addUrlPatterns("/api/*", "/admin/api/*"); corsFilter.addUrlPatterns("/api/*");
return corsFilter; return corsFilter;
} }
@ -92,7 +92,7 @@ public class HaloConfiguration {
logFilter.setOrder(Ordered.HIGHEST_PRECEDENCE + 9); logFilter.setOrder(Ordered.HIGHEST_PRECEDENCE + 9);
logFilter.setFilter(new LogFilter()); logFilter.setFilter(new LogFilter());
logFilter.addUrlPatterns("/api/*", "/admin/*"); logFilter.addUrlPatterns("/api/*");
return logFilter; return logFilter;
} }
@ -127,15 +127,15 @@ public class HaloConfiguration {
failureHandler.setObjectMapper(objectMapper); failureHandler.setObjectMapper(objectMapper);
// Config the admin filter // Config the admin filter
adminAuthenticationFilter.addExcludeUrlPatterns("/admin/api/login"); adminAuthenticationFilter.addExcludeUrlPatterns("/api/admin/login");
adminAuthenticationFilter.addTryAuthUrlMethodPattern("/admin/api/comments", HttpMethod.POST.name()); adminAuthenticationFilter.addTryAuthUrlMethodPattern("/api/admin/comments", HttpMethod.POST.name());
adminAuthenticationFilter.addTryAuthUrlMethodPattern("/api/comments", HttpMethod.POST.name()); adminAuthenticationFilter.addTryAuthUrlMethodPattern("/api/comments", HttpMethod.POST.name());
adminAuthenticationFilter.setFailureHandler( adminAuthenticationFilter.setFailureHandler(
failureHandler); failureHandler);
FilterRegistrationBean<AdminAuthenticationFilter> authenticationFilter = new FilterRegistrationBean<>(); FilterRegistrationBean<AdminAuthenticationFilter> authenticationFilter = new FilterRegistrationBean<>();
authenticationFilter.setFilter(adminAuthenticationFilter); authenticationFilter.setFilter(adminAuthenticationFilter);
authenticationFilter.addUrlPatterns("/admin/*", "/api/comments"); authenticationFilter.addUrlPatterns("/api/admin/*", "/api/comments");
authenticationFilter.setOrder(1); authenticationFilter.setOrder(1);
return authenticationFilter; return authenticationFilter;
} }

4
src/main/java/run/halo/app/config/SwaggerConfiguration.java
View File

@ -75,7 +75,7 @@ public class SwaggerConfiguration {
// TODO Build with different security configuration // TODO Build with different security configuration
return buildApiDocket("run.halo.app.admin", return buildApiDocket("run.halo.app.admin",
"run.halo.app.web.controller.admin", "run.halo.app.web.controller.admin",
"/admin/api/**") "/api/admin/**")
.enable(!haloProperties.getDocDisabled()); .enable(!haloProperties.getDocDisabled());
} }
@ -121,7 +121,7 @@ public class SwaggerConfiguration {
private SecurityContext securityContext() { private SecurityContext securityContext() {
return SecurityContext.builder() return SecurityContext.builder()
.securityReferences(defaultAuth()) .securityReferences(defaultAuth())
.forPaths(PathSelectors.regex("/admin/api/.*")) .forPaths(PathSelectors.regex("/api/admin/.*"))
.build(); .build();
} }

2
src/main/java/run/halo/app/web/controller/admin/api/AdminController.java
View File

@ -25,7 +25,7 @@ import javax.validation.Valid;
*/ */
@Slf4j @Slf4j
@RestController @RestController
@RequestMapping("/admin/api") @RequestMapping("/api/admin")
public class AdminController { public class AdminController {
private final PostService postService; private final PostService postService;

2
src/main/java/run/halo/app/web/controller/admin/api/AttachmentController.java
View File

@ -23,7 +23,7 @@ import static org.springframework.data.domain.Sort.Direction.DESC;
* @date 3/21/19 * @date 3/21/19
*/ */
@RestController @RestController
@RequestMapping("/admin/api/attachments") @RequestMapping("/api/admin/attachments")
public class AttachmentController { public class AttachmentController {
private final AttachmentService attachmentService; private final AttachmentService attachmentService;

2
src/main/java/run/halo/app/web/controller/admin/api/CategoryController.java
View File

@ -22,7 +22,7 @@ import static org.springframework.data.domain.Sort.Direction.ASC;
* @date 3/21/19 * @date 3/21/19
*/ */
@RestController @RestController
@RequestMapping("/admin/api/categories") @RequestMapping("/api/admin/categories")
public class CategoryController { public class CategoryController {
private final CategoryService categoryService; private final CategoryService categoryService;

2
src/main/java/run/halo/app/web/controller/admin/api/CommentController.java
View File

@ -40,7 +40,7 @@ import static org.springframework.data.domain.Sort.Direction.DESC;
* @date 3/19/19 * @date 3/19/19
*/ */
@RestController @RestController
@RequestMapping("/admin/api/comments") @RequestMapping("/api/admin/comments")
public class CommentController { public class CommentController {
private final CommentService commentService; private final CommentService commentService;

2
src/main/java/run/halo/app/web/controller/admin/api/GalleryController.java
View File

@ -18,7 +18,7 @@ import java.util.List;
* @date : 2019/3/21 * @date : 2019/3/21
*/ */
@RestController @RestController
@RequestMapping("/admin/api/galleries") @RequestMapping("/api/admin/galleries")
public class GalleryController { public class GalleryController {
private final GalleryService galleryService; private final GalleryService galleryService;

2
src/main/java/run/halo/app/web/controller/admin/api/LinkController.java
View File

@ -19,7 +19,7 @@ import java.util.List;
* @date : 2019/3/21 * @date : 2019/3/21
*/ */
@RestController @RestController
@RequestMapping("/admin/api/links") @RequestMapping("/api/admin/links")
public class LinkController { public class LinkController {
private final LinkService linkService; private final LinkService linkService;

2
src/main/java/run/halo/app/web/controller/admin/api/LogController.java
View File

@ -19,7 +19,7 @@ import java.util.List;
* @date 3/19/19 * @date 3/19/19
*/ */
@RestController @RestController
@RequestMapping("/admin/api/logs") @RequestMapping("/api/admin/logs")
public class LogController { public class LogController {
private final LogService logService; private final LogService logService;

2
src/main/java/run/halo/app/web/controller/admin/api/MenuController.java
View File

@ -23,7 +23,7 @@ import static org.springframework.data.domain.Sort.Direction.DESC;
* @date 4/3/19 * @date 4/3/19
*/ */
@RestController @RestController
@RequestMapping("/admin/api/menus") @RequestMapping("/api/admin/menus")
public class MenuController { public class MenuController {
private final MenuService menuService; private final MenuService menuService;

2
src/main/java/run/halo/app/web/controller/admin/api/OptionController.java
View File

@ -17,7 +17,7 @@ import java.util.Map;
* @date 3/20/19 * @date 3/20/19
*/ */
@RestController @RestController
@RequestMapping("/admin/api/options") @RequestMapping("/api/admin/options")
public class OptionController { public class OptionController {
private final OptionService optionService; private final OptionService optionService;

2
src/main/java/run/halo/app/web/controller/admin/api/PostController.java
View File

@ -27,7 +27,7 @@ import static org.springframework.data.domain.Sort.Direction.DESC;
* @date 3/19/19 * @date 3/19/19
*/ */
@RestController @RestController
@RequestMapping("/admin/api/posts") @RequestMapping("/api/admin/posts")
public class PostController { public class PostController {
private final PostService postService; private final PostService postService;

2
src/main/java/run/halo/app/web/controller/admin/api/TagController.java
View File

@ -27,7 +27,7 @@ import java.util.List;
*/ */
@Slf4j @Slf4j
@RestController @RestController
@RequestMapping("/admin/api/tags") @RequestMapping("/api/admin/tags")
public class TagController { public class TagController {
private final TagService tagService; private final TagService tagService;

2
src/main/java/run/halo/app/web/controller/admin/api/ThemeController.java
View File

@ -20,7 +20,7 @@ import java.util.Map;
* @date : 2019/3/20 * @date : 2019/3/20
*/ */
@RestController @RestController
@RequestMapping("/admin/api/themes") @RequestMapping("/api/admin/themes")
public class ThemeController { public class ThemeController {
private final ThemeService themeService; private final ThemeService themeService;

2
src/main/java/run/halo/app/web/controller/admin/api/UserController.java
View File

@ -20,7 +20,7 @@ import javax.validation.Valid;
* @date 3/19/19 * @date 3/19/19
*/ */
@RestController @RestController
@RequestMapping("/admin/api/users") @RequestMapping("/api/admin/users")
public class UserController { public class UserController {
private final UserService userService; private final UserService userService;