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

fix: category authentication redirect url. (#1264)

pull/1267/head
Ryan Wang 2021-02-08 19:22:20 +08:00 committed by GitHub
parent d509305998
commit f567b94f91
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/run/halo/app/controller/content/ContentContentController.java
View File

@ -23,8 +23,8 @@ import run.halo.app.controller.content.model.SheetModel;
import run.halo.app.controller.content.model.TagModel; import run.halo.app.controller.content.model.TagModel;
import run.halo.app.exception.NotFoundException; import run.halo.app.exception.NotFoundException;
import run.halo.app.exception.UnsupportedException; import run.halo.app.exception.UnsupportedException;
import run.halo.app.model.dto.CategoryDTO;
import run.halo.app.model.dto.post.BasePostMinimalDTO; import run.halo.app.model.dto.post.BasePostMinimalDTO;
import run.halo.app.model.entity.Category;
import run.halo.app.model.entity.Post; import run.halo.app.model.entity.Post;
import run.halo.app.model.entity.Sheet; import run.halo.app.model.entity.Sheet;
import run.halo.app.model.enums.EncryptTypeEnum; import run.halo.app.model.enums.EncryptTypeEnum;
@ -236,7 +236,7 @@ public class ContentContentController {
throw new NotFoundException("Not Found"); throw new NotFoundException("Not Found");
} }
@PostMapping(value = "archives/{type}/{slug:.*}/password") @PostMapping(value = "content/{type}/{slug:.*}/authentication")
@CacheLock(traceRequest = true, expired = 2) @CacheLock(traceRequest = true, expired = 2)
public String password(@PathVariable("type") String type, public String password(@PathVariable("type") String type,
@PathVariable("slug") String slug, @PathVariable("slug") String slug,
@ -276,7 +276,8 @@ public class ContentContentController {
} }
private String doAuthenticationCategory(String slug, String password) { private String doAuthenticationCategory(String slug, String password) {
Category category = categoryService.getBySlugOfNonNull(slug, true); CategoryDTO
category = categoryService.convertTo(categoryService.getBySlugOfNonNull(slug, true));
authenticationService.categoryAuthentication(category.getId(), password); authenticationService.categoryAuthentication(category.getId(), password);
@ -286,7 +287,7 @@ public class ContentContentController {
redirectUrl.append(optionService.getBlogBaseUrl()); redirectUrl.append(optionService.getBlogBaseUrl());
} }
redirectUrl.append(optionService.getCategoriesPrefix()).append(slug); redirectUrl.append(category.getFullPath());
return redirectUrl.toString(); return redirectUrl.toString();
} }

2
src/main/resources/templates/common/template/post_password.ftl
View File

@ -152,7 +152,7 @@
</head> </head>
<body> <body>
<div class="container"> <div class="container">
<form method="post" action="${blog_url!}/archives/${type!}/${slug!}/password"> <form method="post" action="${blog_url!}/content/${type!}/${slug!}/authentication">
<div class="password-input"> <div class="password-input">
<input type="password" name="password" placeholder="请输入访问密码"> <input type="password" name="password" placeholder="请输入访问密码">
<span class="bottom"></span> <span class="bottom"></span>