diff --git a/src/main/java/run/halo/app/config/HaloConfiguration.java b/src/main/java/run/halo/app/config/HaloConfiguration.java index 9b5be4d5b..49f4bff22 100644 --- a/src/main/java/run/halo/app/config/HaloConfiguration.java +++ b/src/main/java/run/halo/app/config/HaloConfiguration.java @@ -151,6 +151,7 @@ public class HaloConfiguration { "/api/admin/refresh/*", "/api/admin/installations", "/api/admin/recoveries/migrations/*", + "/api/admin/migrations/*", "/api/admin/is_installed", "/api/admin/password/code", "/api/admin/password/reset" diff --git a/src/main/java/run/halo/app/controller/admin/api/InstallController.java b/src/main/java/run/halo/app/controller/admin/api/InstallController.java index 2ad1661ba..b2aea0d35 100644 --- a/src/main/java/run/halo/app/controller/admin/api/InstallController.java +++ b/src/main/java/run/halo/app/controller/admin/api/InstallController.java @@ -179,7 +179,7 @@ public class InstallController { @Nullable private Category createDefaultCategoryIfAbsent() { long categoryCount = categoryService.count(); - if (categoryCount == 0) { + if (categoryCount > 0) { return null; } diff --git a/src/main/java/run/halo/app/controller/admin/api/MigrateController.java b/src/main/java/run/halo/app/controller/admin/api/MigrateController.java index 98a9323ac..0fd622846 100644 --- a/src/main/java/run/halo/app/controller/admin/api/MigrateController.java +++ b/src/main/java/run/halo/app/controller/admin/api/MigrateController.java @@ -16,7 +16,7 @@ import run.halo.app.service.MigrateService; * @date 2019-10-29 */ @RestController -@RequestMapping("/api/admin/migrates") +@RequestMapping("/api/admin/migrations") public class MigrateController { private final MigrateService migrateService; diff --git a/src/main/java/run/halo/app/handler/migrate/MigrateHandlers.java b/src/main/java/run/halo/app/handler/migrate/MigrateHandlers.java index cbce9832d..e7ac60f11 100644 --- a/src/main/java/run/halo/app/handler/migrate/MigrateHandlers.java +++ b/src/main/java/run/halo/app/handler/migrate/MigrateHandlers.java @@ -42,6 +42,7 @@ public class MigrateHandlers { for (MigrateHandler migrateHandler : migrateHandlers) { if (migrateHandler.supportType(migrateType)) { migrateHandler.migrate(file); + return; } }