From ce613787f69d518d8ae42d59e2438ca92b4be4c6 Mon Sep 17 00:00:00 2001 From: LamGC Date: Wed, 4 May 2022 23:05:49 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=AD=A3=E6=96=B9=E6=B3=95?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E4=BD=BF=E7=94=A8=E9=94=99=E8=AF=AF=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit MavenRepositoryConfig 的 toRemoteRepository 方法使用了参数默认值, 可能会导致意外使用常量的情况, 故移除 MavenRepositoryConfig.toRemoteRepository 的参数默认值. Pull Request #6 --- scalabot-app/src/main/kotlin/AppConfigs.kt | 2 +- scalabot-app/src/main/kotlin/AppMain.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scalabot-app/src/main/kotlin/AppConfigs.kt b/scalabot-app/src/main/kotlin/AppConfigs.kt index acaa715..dbac67b 100644 --- a/scalabot-app/src/main/kotlin/AppConfigs.kt +++ b/scalabot-app/src/main/kotlin/AppConfigs.kt @@ -106,7 +106,7 @@ internal data class MavenRepositoryConfig( val authentication: Authentication? = null ) { - fun toRemoteRepository(proxyConfig: ProxyConfig = Const.config.proxy): RemoteRepository { + fun toRemoteRepository(proxyConfig: ProxyConfig): RemoteRepository { val builder = RemoteRepository.Builder(null, checkRepositoryLayout(layout), url.toString()) if (proxy != null) { builder.setProxy(proxy) diff --git a/scalabot-app/src/main/kotlin/AppMain.kt b/scalabot-app/src/main/kotlin/AppMain.kt index c36f4a8..0423f1e 100644 --- a/scalabot-app/src/main/kotlin/AppMain.kt +++ b/scalabot-app/src/main/kotlin/AppMain.kt @@ -123,7 +123,7 @@ internal class Launcher(private val config: AppConfig = Const.config) : AutoClos val account = botConfig.account val remoteRepositories = config.mavenRepositories - .map(MavenRepositoryConfig::toRemoteRepository) + .map { it.toRemoteRepository(config.proxy) } .toMutableList().apply { if (this.none { it.url == MavenRepositoryExtensionFinder.MAVEN_CENTRAL_URL