-
Notifications
You must be signed in to change notification settings - Fork 34
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop' into 'master'
v7.6 See merge request JuniperBot/Backend!167
- Loading branch information
Showing
80 changed files
with
1,709 additions
and
1,468 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
78 changes: 0 additions & 78 deletions
78
jb-api/src/main/java/ru/juniperbot/api/JuniperApiApplication.java
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,75 @@ | ||
| /* | ||
| * This file is part of JuniperBot. | ||
| * | ||
| * JuniperBot is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
| * the Free Software Foundation, either version 3 of the License, or | ||
| * (at your option) any later version. | ||
| * JuniperBot is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with JuniperBot. If not, see <http://www.gnu.org/licenses/>. | ||
| */ | ||
| package ru.juniperbot.api | ||
|
|
||
| import org.springframework.boot.SpringApplication | ||
| import org.springframework.boot.autoconfigure.SpringBootApplication | ||
| import org.springframework.boot.autoconfigure.security.oauth2.client.servlet.OAuth2ClientAutoConfiguration | ||
| import org.springframework.boot.autoconfigure.security.oauth2.resource.servlet.OAuth2ResourceServerAutoConfiguration | ||
| import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration | ||
| import org.springframework.boot.autoconfigure.security.servlet.SecurityFilterAutoConfiguration | ||
| import org.springframework.boot.autoconfigure.security.servlet.SecurityRequestMatcherProviderAutoConfiguration | ||
| import org.springframework.context.annotation.Bean | ||
| import org.springframework.context.annotation.Import | ||
| import org.springframework.context.annotation.ImportResource | ||
| import org.springframework.web.method.support.HandlerMethodArgumentResolver | ||
| import org.springframework.web.servlet.config.annotation.WebMvcConfigurer | ||
| import ru.juniperbot.api.common.ApiRequestLoggingFilter | ||
| import ru.juniperbot.api.common.AtomFeedArgumentResolver | ||
| import ru.juniperbot.common.configuration.CommonConfiguration | ||
| import ru.juniperbot.common.support.ModuleMessageSource | ||
| import ru.juniperbot.common.support.ModuleMessageSourceImpl | ||
|
|
||
|
|
||
| @Import(CommonConfiguration::class) | ||
| @ImportResource("classpath:security-context.xml") | ||
| @SpringBootApplication(exclude = [ | ||
| SecurityAutoConfiguration::class, | ||
| SecurityFilterAutoConfiguration::class, | ||
| SecurityRequestMatcherProviderAutoConfiguration::class, | ||
| OAuth2ClientAutoConfiguration::class, | ||
| OAuth2ResourceServerAutoConfiguration::class | ||
| ]) | ||
| class JuniperApiApplication : WebMvcConfigurer { | ||
|
|
||
| @Bean | ||
| fun webMessages(): ModuleMessageSource = ModuleMessageSourceImpl("web-jbmessages") | ||
|
|
||
| override fun addArgumentResolvers(argumentResolvers: MutableList<HandlerMethodArgumentResolver>?) { | ||
| argumentResolvers!!.add(AtomFeedArgumentResolver()) | ||
| } | ||
|
|
||
| @Bean | ||
| fun requestLoggingFilter(): ApiRequestLoggingFilter = ApiRequestLoggingFilter().apply { | ||
| this.setBeforeMessagePrefix("Before Request ") | ||
| this.setAfterMessagePrefix("After Request ") | ||
| this.setBeforeMessageSuffix("") | ||
| this.setAfterMessageSuffix("") | ||
| this.setMaxPayloadLength(10000) | ||
| this.setIncludeClientInfo(true) | ||
| this.setIncludeQueryString(true) | ||
| this.setIncludePayload(true) | ||
| } | ||
| } | ||
|
|
||
| object Launcher { | ||
|
|
||
| @JvmStatic | ||
| fun main(args: Array<String>) { | ||
| SpringApplication(JuniperApiApplication::class.java).run(*args) | ||
| } | ||
| } |
Oops, something went wrong.