diff --git a/src/main/java/run/halo/app/controller/admin/api/BackupController.java b/src/main/java/run/halo/app/controller/admin/api/BackupController.java new file mode 100644 index 0000000000000000000000000000000000000000..21b178712817640e8742034a071ffd49fab80239 --- /dev/null +++ b/src/main/java/run/halo/app/controller/admin/api/BackupController.java @@ -0,0 +1,22 @@ +package run.halo.app.controller.admin.api; + +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import run.halo.app.service.BackupService; + +/** + * Backup controller + * + * @author johnniang + * @date 19-4-26 + */ +@RestController +@RequestMapping("/api/admin/backups") +public class BackupController { + + private final BackupService backupService; + + public BackupController(BackupService backupService) { + this.backupService = backupService; + } +} 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 new file mode 100644 index 0000000000000000000000000000000000000000..a7af13d5f7c5c0df5ee32a71ad6f4ae8bf5abeb1 --- /dev/null +++ b/src/main/java/run/halo/app/controller/admin/api/RecoveryController.java @@ -0,0 +1,22 @@ +package run.halo.app.controller.admin.api; + +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import run.halo.app.service.RecoveryService; + +/** + * Recovery controller + * + * @author johnniang + * @date 19-4-26 + */ +@RestController +@RequestMapping("/api/admin/recoveries") +public class RecoveryController { + + private final RecoveryService recoveryService; + + public RecoveryController(RecoveryService recoveryService) { + this.recoveryService = recoveryService; + } +} diff --git a/src/main/java/run/halo/app/controller/core/CommonController.java b/src/main/java/run/halo/app/controller/core/CommonController.java index 43d6729fe7307f2dd17e6db73df8a442260ed00a..bdb1616c4582f24356ddc4abe6f2bb44153ba449 100644 --- a/src/main/java/run/halo/app/controller/core/CommonController.java +++ b/src/main/java/run/halo/app/controller/core/CommonController.java @@ -35,15 +35,10 @@ public class CommonController implements ErrorController { private final ThemeService themeService; - private final OptionService optionService; - - public CommonController(ThemeService themeService, - OptionService optionService) { + public CommonController(ThemeService themeService) { this.themeService = themeService; - this.optionService = optionService; } - /** * Handle error * @@ -109,7 +104,7 @@ public class CommonController implements ErrorController { * @return String */ @GetMapping(value = "/404") - public String contentNotFround() throws FileNotFoundException { + public String contentNotFround() { if (!themeService.isTemplateExist(NOT_FROUND_TEMPLATE)) { return "common/error/404"; } diff --git a/src/main/java/run/halo/app/event/post/PostVisitEventListener.java b/src/main/java/run/halo/app/event/post/PostVisitEventListener.java index b37b15c149feaab9e662e58e69c320bea8972414..622adb7cfde7b84622cc6b41b8488695b7fcd42e 100644 --- a/src/main/java/run/halo/app/event/post/PostVisitEventListener.java +++ b/src/main/java/run/halo/app/event/post/PostVisitEventListener.java @@ -1,6 +1,5 @@ package run.halo.app.event.post; -import lombok.extern.slf4j.Slf4j; import org.springframework.context.event.EventListener; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Component; @@ -12,7 +11,6 @@ import run.halo.app.service.PostService; * @author johnniang * @date 19-4-22 */ -@Slf4j @Component public class PostVisitEventListener extends AbstractVisitEventListener { diff --git a/src/main/java/run/halo/app/event/post/SheetVisitEventListener.java b/src/main/java/run/halo/app/event/post/SheetVisitEventListener.java index 384622997d9904263f67dd6074aa756316009976..2b6440cc5628551fe4e83c338bacdbcb5b76b077 100644 --- a/src/main/java/run/halo/app/event/post/SheetVisitEventListener.java +++ b/src/main/java/run/halo/app/event/post/SheetVisitEventListener.java @@ -2,6 +2,7 @@ package run.halo.app.event.post; import org.springframework.context.event.EventListener; import org.springframework.scheduling.annotation.Async; +import org.springframework.stereotype.Component; import run.halo.app.service.SheetService; /** @@ -10,6 +11,7 @@ import run.halo.app.service.SheetService; * @author johnniang * @date 19-4-24 */ +@Component public class SheetVisitEventListener extends AbstractVisitEventListener { protected SheetVisitEventListener(SheetService sheetService) { diff --git a/src/main/java/run/halo/app/service/BackupService.java b/src/main/java/run/halo/app/service/BackupService.java new file mode 100644 index 0000000000000000000000000000000000000000..fe25e70afc74388368ad53bac0eda6824d65c8aa --- /dev/null +++ b/src/main/java/run/halo/app/service/BackupService.java @@ -0,0 +1,10 @@ +package run.halo.app.service; + +/** + * Backup service interface. + * + * @author johnniang + * @date 19-4-26 + */ +public interface BackupService { +} diff --git a/src/main/java/run/halo/app/service/RecoveryService.java b/src/main/java/run/halo/app/service/RecoveryService.java new file mode 100644 index 0000000000000000000000000000000000000000..1a70c017f66078bb4207c5909a32550c8494e9fa --- /dev/null +++ b/src/main/java/run/halo/app/service/RecoveryService.java @@ -0,0 +1,11 @@ +package run.halo.app.service; + +/** + * Recovery service interface. + * + * @author johnniang + * @date 19-4-26 + */ +public interface RecoveryService { + +} diff --git a/src/main/java/run/halo/app/service/impl/BackupServiceImpl.java b/src/main/java/run/halo/app/service/impl/BackupServiceImpl.java new file mode 100644 index 0000000000000000000000000000000000000000..5e800df1a258ed8a84a2a50eece5af8452b126ff --- /dev/null +++ b/src/main/java/run/halo/app/service/impl/BackupServiceImpl.java @@ -0,0 +1,15 @@ +package run.halo.app.service.impl; + +import org.springframework.stereotype.Service; +import run.halo.app.service.BackupService; + +/** + * Backup service implementation. + * + * @author johnniang + * @date 19-4-26 + */ +@Service +public class BackupServiceImpl implements BackupService { + +} diff --git a/src/main/java/run/halo/app/service/impl/RecoveryServiceImpl.java b/src/main/java/run/halo/app/service/impl/RecoveryServiceImpl.java new file mode 100644 index 0000000000000000000000000000000000000000..ff0fcdf7b70bdae9f9295972482368d25c1a19f1 --- /dev/null +++ b/src/main/java/run/halo/app/service/impl/RecoveryServiceImpl.java @@ -0,0 +1,15 @@ +package run.halo.app.service.impl; + +import org.springframework.stereotype.Service; +import run.halo.app.service.RecoveryService; + +/** + * Recovery service implementation. + * + * @author johnniang + * @date 19-4-26 + */ +@Service +public class RecoveryServiceImpl implements RecoveryService { + +}