From d72b34acfd8c73b12a7f961b7f3c9bac5faed184 Mon Sep 17 00:00:00 2001 From: slhafzjw Date: Sat, 9 May 2026 13:38:51 +0800 Subject: [PATCH] fix(partnerctl): align Partner-Core jar path to `resources/partner-core.jar` across init/control --- .../java/work/slhaf/partner/ctl/commands/InitCommand.kt | 6 +++--- .../slhaf/partner/ctl/commands/control/PartnerRuntime.kt | 2 +- .../java/work/slhaf/partner/ctl/commands/init/install.kt | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/PartnerCtl/src/main/java/work/slhaf/partner/ctl/commands/InitCommand.kt b/PartnerCtl/src/main/java/work/slhaf/partner/ctl/commands/InitCommand.kt index 3abbf920..91969dd0 100644 --- a/PartnerCtl/src/main/java/work/slhaf/partner/ctl/commands/InitCommand.kt +++ b/PartnerCtl/src/main/java/work/slhaf/partner/ctl/commands/InitCommand.kt @@ -39,7 +39,7 @@ class InitCommand : Runnable { * - 手动构建 * 1) 检查所需工具链: java、javac、mvn、git * 2) 拉取 git 仓库至临时目录 - * 3) 构建、并移动至 $PARTNER_HOME/resource/partner-core.jar + * 3) 构建、并移动至 $PARTNER_HOME/resources/partner-core.jar * 3. gateway 配置 -> $PARTNER_HOME/config/gateway.json: * - WebSocket Gateway * - OneBot Gateway @@ -65,7 +65,7 @@ class InitCommand : Runnable { home = choosePartnerHome(prompt) Files.createDirectories(home) - Files.createDirectories(home.resolve("resource")) + Files.createDirectories(home.resolve("resources")) Files.createDirectories(home.resolve("config")) prompt.success(text("init.home.success", home)) @@ -325,7 +325,7 @@ class InitCommand : Runnable { return } - val partnerJar = home.resolve("resource").resolve("partner-core.jar").toAbsolutePath().normalize() + val partnerJar = home.resolve("resources").resolve("partner-core.jar").toAbsolutePath().normalize() if (!Files.exists(partnerJar)) { throw CommandInterrupted("Partner runtime jar does not exist: $partnerJar") } diff --git a/PartnerCtl/src/main/java/work/slhaf/partner/ctl/commands/control/PartnerRuntime.kt b/PartnerCtl/src/main/java/work/slhaf/partner/ctl/commands/control/PartnerRuntime.kt index e6351862..92a764e6 100644 --- a/PartnerCtl/src/main/java/work/slhaf/partner/ctl/commands/control/PartnerRuntime.kt +++ b/PartnerCtl/src/main/java/work/slhaf/partner/ctl/commands/control/PartnerRuntime.kt @@ -17,7 +17,7 @@ fun resolvePartnerHome(): Path { } fun resolvePartnerJar(home: Path): Path { - return home.resolve("resource").resolve("partner-core.jar").toAbsolutePath().normalize() + return home.resolve("resources").resolve("partner-core.jar").toAbsolutePath().normalize() } fun resolvePidFile(home: Path): Path { diff --git a/PartnerCtl/src/main/java/work/slhaf/partner/ctl/commands/init/install.kt b/PartnerCtl/src/main/java/work/slhaf/partner/ctl/commands/init/install.kt index 02ff38f3..75aa6764 100644 --- a/PartnerCtl/src/main/java/work/slhaf/partner/ctl/commands/init/install.kt +++ b/PartnerCtl/src/main/java/work/slhaf/partner/ctl/commands/init/install.kt @@ -22,7 +22,7 @@ fun buildFromSource(home: Path, prompt: Prompt) { buildCommand = listOf("mvn", "-pl", "Partner-Core", "-am", "package", "-DskipTests=true"), artifactDirectory = Paths.get("Partner-Core", "target"), artifactSelector = ::findLargestJar, - installRelativePath = Paths.get("resource", "partner-core.jar"), + installRelativePath = Paths.get("resources", "partner-core.jar"), ), ) }