diff --git a/src/main/scala/lc/core/captchaProviders.scala b/src/main/scala/lc/core/captchaProviders.scala index d23f888..559b5a4 100644 --- a/src/main/scala/lc/core/captchaProviders.scala +++ b/src/main/scala/lc/core/captchaProviders.scala @@ -56,7 +56,7 @@ object CaptchaProviders { def getProvider(param: Parameters): ChallengeProvider = { val providerConfig = filterProviderByParam(param).toList - if (providerConfig.length == 0) throw new NoSuchElementException(ErrorMessageEnum.NO_CAPTCHA.toString) + if (providerConfig.length == 0) throw new NoSuchElementException(ErrorMessageEnum.NO_CAPTCHA.toString) val randomIndex = getNextRandomInt(providerConfig.length) val providerIndex = providerConfig(randomIndex)._1 val selectedProvider = providers(providerIndex) diff --git a/src/main/scala/lc/core/config.scala b/src/main/scala/lc/core/config.scala index 09dbc20..acfe001 100644 --- a/src/main/scala/lc/core/config.scala +++ b/src/main/scala/lc/core/config.scala @@ -65,42 +65,42 @@ object Config { } private def getDefaultConfig(): String = { - val defaultConfigMap = + val defaultConfigMap = (AttributesEnum.RANDOM_SEED.toString -> 20) ~ - (AttributesEnum.PORT.toString -> 8888) ~ - (AttributesEnum.CAPTCHA_EXPIRY_TIME_LIMIT.toString -> 5) ~ - (AttributesEnum.THROTTLE.toString -> 10) ~ - (AttributesEnum.THREAD_DELAY.toString -> 2) ~ - ("captchas" -> List( - ( - (AttributesEnum.NAME.toString -> "FilterChallenge") ~ - (ParametersEnum.ALLOWEDLEVELS.toString -> List("medium", "hard")) ~ - (ParametersEnum.ALLOWEDMEDIA.toString -> List("image/png")) ~ - (ParametersEnum.ALLOWEDINPUTTYPE.toString -> List("text")) ~ - (AttributesEnum.CONFIG.toString -> JObject()) - ), - ( - (AttributesEnum.NAME.toString -> "GifCaptcha") ~ - (ParametersEnum.ALLOWEDLEVELS.toString -> List("hard")) ~ - (ParametersEnum.ALLOWEDMEDIA.toString -> List("image/gif")) ~ - (ParametersEnum.ALLOWEDINPUTTYPE.toString -> List("text")) ~ - (AttributesEnum.CONFIG.toString -> JObject()) - ), - ( - (AttributesEnum.NAME.toString -> "ShadowTextCaptcha") ~ - (ParametersEnum.ALLOWEDLEVELS.toString -> List("easy")) ~ - (ParametersEnum.ALLOWEDMEDIA.toString -> List("image/png")) ~ - (ParametersEnum.ALLOWEDINPUTTYPE.toString -> List("text")) ~ - (AttributesEnum.CONFIG.toString -> JObject()) - ), - ( - (AttributesEnum.NAME.toString -> "RainDropsCaptcha") ~ - (ParametersEnum.ALLOWEDLEVELS.toString -> List("easy", "medium")) ~ - (ParametersEnum.ALLOWEDMEDIA.toString -> List("image/gif")) ~ - (ParametersEnum.ALLOWEDINPUTTYPE.toString -> List("text")) ~ - (AttributesEnum.CONFIG.toString -> JObject()) - ) - )) + (AttributesEnum.PORT.toString -> 8888) ~ + (AttributesEnum.CAPTCHA_EXPIRY_TIME_LIMIT.toString -> 5) ~ + (AttributesEnum.THROTTLE.toString -> 10) ~ + (AttributesEnum.THREAD_DELAY.toString -> 2) ~ + ("captchas" -> List( + ( + (AttributesEnum.NAME.toString -> "FilterChallenge") ~ + (ParametersEnum.ALLOWEDLEVELS.toString -> List("medium", "hard")) ~ + (ParametersEnum.ALLOWEDMEDIA.toString -> List("image/png")) ~ + (ParametersEnum.ALLOWEDINPUTTYPE.toString -> List("text")) ~ + (AttributesEnum.CONFIG.toString -> JObject()) + ), + ( + (AttributesEnum.NAME.toString -> "GifCaptcha") ~ + (ParametersEnum.ALLOWEDLEVELS.toString -> List("hard")) ~ + (ParametersEnum.ALLOWEDMEDIA.toString -> List("image/gif")) ~ + (ParametersEnum.ALLOWEDINPUTTYPE.toString -> List("text")) ~ + (AttributesEnum.CONFIG.toString -> JObject()) + ), + ( + (AttributesEnum.NAME.toString -> "ShadowTextCaptcha") ~ + (ParametersEnum.ALLOWEDLEVELS.toString -> List("easy")) ~ + (ParametersEnum.ALLOWEDMEDIA.toString -> List("image/png")) ~ + (ParametersEnum.ALLOWEDINPUTTYPE.toString -> List("text")) ~ + (AttributesEnum.CONFIG.toString -> JObject()) + ), + ( + (AttributesEnum.NAME.toString -> "RainDropsCaptcha") ~ + (ParametersEnum.ALLOWEDLEVELS.toString -> List("easy", "medium")) ~ + (ParametersEnum.ALLOWEDMEDIA.toString -> List("image/gif")) ~ + (ParametersEnum.ALLOWEDINPUTTYPE.toString -> List("text")) ~ + (AttributesEnum.CONFIG.toString -> JObject()) + ) + )) pretty(render(defaultConfigMap)) }