diff --git a/src/main/kotlin/com/company/commitet_jm/service/git/GitServiceImpl.kt b/src/main/kotlin/com/company/commitet_jm/service/git/GitServiceImpl.kt index 90299f1..1ff25ed 100644 --- a/src/main/kotlin/com/company/commitet_jm/service/git/GitServiceImpl.kt +++ b/src/main/kotlin/com/company/commitet_jm/service/git/GitServiceImpl.kt @@ -218,7 +218,7 @@ class GitServiceImpl( } else if (statusOutput.output.isBlank()) { log.info("Нет изменений для коммита в ветке $newBranch") // Обновляем статус коммита как завершенного, даже если нет изменений - commitInfo.urlBranch = "${commitInfo.project!!.urlRepo}/tree/$newBranch" + commitInfo.urlBranch = "${commitInfo.project!!.urlRepo}/src/branch/$newBranch" commitInfo.setStatus(StatusSheduler.COMPLETE) dataManager.save(commitInfo) return diff --git a/src/main/kotlin/com/company/commitet_jm/service/ones/OneRunner.kt b/src/main/kotlin/com/company/commitet_jm/service/ones/OneRunner.kt index eee3e12..c69db62 100644 --- a/src/main/kotlin/com/company/commitet_jm/service/ones/OneRunner.kt +++ b/src/main/kotlin/com/company/commitet_jm/service/ones/OneRunner.kt @@ -38,14 +38,14 @@ class OneRunner(private val dataManager: DataManager } // Формат времени для имени лог-файла val timeStamp = SimpleDateFormat("yyyy-MM-dd_HH-mm-ss").format(Date()) - val logFileName = "OneLog${File.separator}out_$timeStamp.log" + val logFileName = ".${File.separator}OneLog${File.separator}out_$timeStamp.log" val res = shellExecutor.executeCommand(listOf( pathPlatform(pathInstall, version), "DESIGNER", "/DisableStartupDialogs", "/DumpExternalDataProcessorOrReportToFiles", - "\"${targetDir.path}\"", + "\"${targetDir.path}${File.separator}\"", "\"${inputFile.path}\"", "/Out", logFileName