Fix1; Refactor:2; Style:1; Docs:1 #20

Merged
FatttSnake merged 5 commits from FatttSnake into dev 2024-04-22 13:51:33 +08:00
Showing only changes of commit fcfd76d60c - Show all commits

View File

@@ -111,16 +111,16 @@ class EditServiceImpl(
}
val originalVersion = originalTool.ver!!
if (originalVersion.split(".").map(String::toLong).joinToString(".") == toolUpgradeParam.ver!!.split(".")
.map(String::toLong).joinToString(".")
) {
val originalVersionNumberList = originalVersion.split(".").map(String::toLong)
val newVersionNumberList = toolUpgradeParam.ver!!.split(".").map(String::toLong)
if (!newVersionNumberList.foldIndexed(false) { index: Int, acc: Boolean, version: Long ->
if (!acc && originalVersionNumberList[index] > version) {
throw IllegalVersionException()
}
if (originalVersionNumberList[index] < version) true else acc
}) {
throw IllegalVersionException()
}
originalVersion.split(".").forEachIndexed { index, s ->
if ((toolUpgradeParam.ver.split(".")[index].toLong() < s.toLong())) {
throw IllegalVersionException()
}
}
val newSource = ToolData().apply { data = originalTool.source!!.data }
val newDist = ToolData().apply { data = "" }
@@ -134,7 +134,7 @@ class EditServiceImpl(
description = originalTool.description
baseId = originalTool.base!!.id
authorId = WebUtil.getLoginUserId()!!
ver = toolUpgradeParam.ver.split(".").map(String::toLong).joinToString(".")
ver = newVersionNumberList.joinToString(".")
keywords = originalTool.keywords
sourceId = newSource.id
distId = newDist.id