slhaf/Partner
1
0
Fork 0
mirror of https://github.com/slhaf/Partner.git synced 2026-05-12 16:53:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(partnerctl): align Partner-Core jar path to resources/partner-core.jar across init/control

Browse Source
This commit is contained in:
slhafzjw
2026-05-09 13:38:51 +08:00
parent 79dcda082f
commit d72b34acfd
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
PartnerCtl/src/main/java/work/slhaf/partner/ctl/commands/InitCommand.kt
View File

@@ -39,7 +39,7 @@ class InitCommand : Runnable {
* - 手动构建 * - 手动构建
* 1) 检查所需工具链: java、javac、mvn、git * 1) 检查所需工具链: java、javac、mvn、git
* 2) 拉取 git 仓库至临时目录 * 2) 拉取 git 仓库至临时目录
* 3) 构建、并移动至 $PARTNER_HOME/resource/partner-core.jar * 3) 构建、并移动至 $PARTNER_HOME/resources/partner-core.jar
* 3. gateway 配置 -> $PARTNER_HOME/config/gateway.json: * 3. gateway 配置 -> $PARTNER_HOME/config/gateway.json:
* - WebSocket Gateway * - WebSocket Gateway
* - OneBot Gateway * - OneBot Gateway
@@ -65,7 +65,7 @@ class InitCommand : Runnable {
home = choosePartnerHome(prompt) home = choosePartnerHome(prompt)
Files.createDirectories(home) Files.createDirectories(home)
Files.createDirectories(home.resolve("resource")) Files.createDirectories(home.resolve("resources"))
Files.createDirectories(home.resolve("config")) Files.createDirectories(home.resolve("config"))
prompt.success(text("init.home.success", home)) prompt.success(text("init.home.success", home))
@@ -325,7 +325,7 @@ class InitCommand : Runnable {
return 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)) { if (!Files.exists(partnerJar)) {
throw CommandInterrupted("Partner runtime jar does not exist: $partnerJar") throw CommandInterrupted("Partner runtime jar does not exist: $partnerJar")
} }

2
PartnerCtl/src/main/java/work/slhaf/partner/ctl/commands/control/PartnerRuntime.kt
View File

@@ -17,7 +17,7 @@ fun resolvePartnerHome(): Path {
} }
fun resolvePartnerJar(home: Path): 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 { fun resolvePidFile(home: Path): Path {

2
PartnerCtl/src/main/java/work/slhaf/partner/ctl/commands/init/install.kt
View File

@@ -22,7 +22,7 @@ fun buildFromSource(home: Path, prompt: Prompt) {
buildCommand = listOf("mvn", "-pl", "Partner-Core", "-am", "package", "-DskipTests=true"), buildCommand = listOf("mvn", "-pl", "Partner-Core", "-am", "package", "-DskipTests=true"),
artifactDirectory = Paths.get("Partner-Core", "target"), artifactDirectory = Paths.get("Partner-Core", "target"),
artifactSelector = ::findLargestJar, artifactSelector = ::findLargestJar,
installRelativePath = Paths.get("resource", "partner-core.jar"), installRelativePath = Paths.get("resources", "partner-core.jar"),
), ),
) )
} }