diff --git a/src/main/java/run/halo/app/controller/admin/api/RecoveryController.java b/src/main/java/run/halo/app/controller/admin/api/RecoveryController.java
index a9bd90e16..ebb831477 100644
--- a/src/main/java/run/halo/app/controller/admin/api/RecoveryController.java
+++ b/src/main/java/run/halo/app/controller/admin/api/RecoveryController.java
@@ -40,7 +40,7 @@ public class RecoveryController {
@ApiParam("This file content type should be json")
@RequestPart("file") MultipartFile file) {
if (optionService.getByPropertyOrDefault(PrimaryProperties.IS_INSTALLED, Boolean.class, false)) {
- throw new BadRequestException("不能在博客初始化完成之后迁移数据");
+ throw new BadRequestException("无法在博客初始化完成之后迁移数据");
}
recoveryService.migrateFromV0_4_3(file);
diff --git a/src/main/java/run/halo/app/model/dto/base/OutputConverter.java b/src/main/java/run/halo/app/model/dto/base/OutputConverter.java
index 8f2d31d81..72038fb79 100644
--- a/src/main/java/run/halo/app/model/dto/base/OutputConverter.java
+++ b/src/main/java/run/halo/app/model/dto/base/OutputConverter.java
@@ -10,7 +10,7 @@ import static run.halo.app.utils.BeanUtils.updateProperties;
* The implementation type must be equal to DTO type
*
* @param the implementation class type
- * @param doamin type
+ * @param domain type
* @author johnniang
*/
public interface OutputConverter, DOMAIN> {
diff --git a/src/main/java/run/halo/app/service/impl/AdminServiceImpl.java b/src/main/java/run/halo/app/service/impl/AdminServiceImpl.java
index 6f6a9a481..c21ea412c 100644
--- a/src/main/java/run/halo/app/service/impl/AdminServiceImpl.java
+++ b/src/main/java/run/halo/app/service/impl/AdminServiceImpl.java
@@ -135,7 +135,7 @@ public class AdminServiceImpl implements AdminService {
userService.getByEmailOfNonNull(username) : userService.getByUsernameOfNonNull(username);
} catch (NotFoundException e) {
log.error("Failed to find user by name: " + username, e);
- eventPublisher.publishEvent(new LogEvent(this, "", LogType.LOGIN_FAILED, loginParam.getUsername()));
+ eventPublisher.publishEvent(new LogEvent(this, loginParam.getUsername(), LogType.LOGIN_FAILED, loginParam.getUsername()));
throw new BadRequestException(mismatchTip);
}
@@ -144,7 +144,7 @@ public class AdminServiceImpl implements AdminService {
if (!userService.passwordMatch(user, loginParam.getPassword())) {
// If the password is mismatch
- eventPublisher.publishEvent(new LogEvent(this, "", LogType.LOGIN_FAILED, loginParam.getUsername()));
+ eventPublisher.publishEvent(new LogEvent(this, loginParam.getUsername(), LogType.LOGIN_FAILED, loginParam.getUsername()));
throw new BadRequestException(mismatchTip);
}
diff --git a/src/main/java/run/halo/app/service/impl/RecoveryServiceImpl.java b/src/main/java/run/halo/app/service/impl/RecoveryServiceImpl.java
index bc748ad76..7199f55b0 100644
--- a/src/main/java/run/halo/app/service/impl/RecoveryServiceImpl.java
+++ b/src/main/java/run/halo/app/service/impl/RecoveryServiceImpl.java
@@ -218,6 +218,10 @@ public class RecoveryServiceImpl implements RecoveryService {
// Handle comments
List baseComments = handleComment(commentsObject, createdPost.getId());
+ // TODO Handle categories
+
+ // TODO Handle tags
+
List postComments = baseComments.stream()
.map(baseComment -> BeanUtils.transformFrom(baseComment, PostComment.class))
.collect(Collectors.toList());