Skip to content

Commit 144666b

Browse files
author
Ruslan Molchanov
committed
Merge branch 'hotfixes' into 'sprint'
Hotfixes See merge request open-platform/api!20
2 parents 7ff1a42 + 2b717c6 commit 144666b

2 files changed

Lines changed: 5 additions & 7 deletions

File tree

src/main/kotlin/io/openfuture/api/component/ScaffoldCompiler.kt

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,12 @@ package io.openfuture.api.component
22

33
import io.openfuture.api.domain.scaffold.ScaffoldPropertyDto
44
import io.openfuture.api.exception.CompileException
5-
import org.apache.commons.io.FileUtils
5+
import org.apache.commons.io.IOUtils
66
import org.ethereum.solidity.compiler.CompilationResult
77
import org.ethereum.solidity.compiler.CompilationResult.ContractMetadata
88
import org.ethereum.solidity.compiler.SolidityCompiler
99
import org.ethereum.solidity.compiler.SolidityCompiler.Options.*
1010
import org.springframework.stereotype.Component
11-
import java.io.File
1211
import java.nio.charset.Charset
1312

1413
/**
@@ -48,10 +47,9 @@ class ScaffoldCompiler(
4847
RETURN_VARIABLES to properties.joinToString(separator = ",") { "${it.name}" }
4948
)
5049

51-
val templateUri = this::class.java.classLoader.getResource(SCAFFOLD_TEMPLATE_PATH).toURI()
52-
val templateFile = File(templateUri)
53-
val templateContent = FileUtils.readFileToString(templateFile, Charset.defaultCharset())
54-
val preparedTemplate = templateProcessor.getContent(templateContent, parameters)
50+
val resource = javaClass.classLoader.getResource(SCAFFOLD_TEMPLATE_PATH)
51+
val scaffoldContent = IOUtils.toString(resource, Charset.defaultCharset())
52+
val preparedTemplate = templateProcessor.getContent(scaffoldContent, parameters)
5553

5654
return preparedTemplate.toByteArray()
5755
}

src/main/kotlin/io/openfuture/api/controller/base/MainController.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ class MainController {
1616
return "redirect:/"
1717
}
1818

19-
@GetMapping("/", "/scaffold", "/scaffolds")
19+
@GetMapping("/", "/scaffold", "/scaffolds", "/scaffolds/**")
2020
fun frontend() = "frontend"
2121

2222
}

0 commit comments

Comments
 (0)