micord/ervu-eks
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

update platform to 6

Browse source
This commit is contained in:
kochetkov 2025-11-20 09:42:30 +03:00
parent 149cf54016
commit 45b3d05ad0
159 changed files with 474 additions and 463 deletions
Download patch file Download diff file Expand all files Collapse all files

23
backend/pom.xml
View file

@ -35,15 +35,6 @@
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-commons</artifactId>
</dependency>
<dependency>
<groupId>io.jsonwebtoken</groupId>
<artifactId>jjwt-api</artifactId>
</dependency>
<dependency>
<groupId>io.jsonwebtoken</groupId>
<artifactId>jjwt-impl</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>ru.cg.webbpm.packages.base</groupId>
<artifactId>backend</artifactId>
@ -154,6 +145,10 @@
<groupId>ru.cg.webbpm.modules.jndi</groupId>
<artifactId>jndi-inject</artifactId>
</dependency>
<dependency>
<groupId>com.sun.mail</groupId>
<artifactId>jakarta.mail</artifactId>
</dependency>
<dependency>
<groupId>ru.cg.webbpm.modules</groupId>
<artifactId>standard-annotations</artifactId>
@ -215,11 +210,15 @@
<artifactId>postgresql</artifactId>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
</dependency>
<dependency>
<groupId>me.snowdrop</groupId>
<groupId>org.apache.httpcomponents.client5</groupId>
<artifactId>httpclient5</artifactId>
</dependency>
<dependency>
<groupId>dev.snowdrop</groupId>
<artifactId>narayana-spring-boot-starter</artifactId>
</dependency>
<dependency>

22
backend/src/main/java/ru/micord/ervu/eks/App.java
View file

@ -1,14 +1,18 @@
package ru.micord.ervu.eks;
import javax.sql.DataSource;
import org.apache.http.client.config.RequestConfig;
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.client.HttpClients;
import net.javacrumbs.shedlock.core.LockProvider;
import net.javacrumbs.shedlock.provider.jdbctemplate.JdbcTemplateLockProvider;
import net.javacrumbs.shedlock.spring.annotation.EnableSchedulerLock;
import org.apache.hc.client5.http.config.RequestConfig;
import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
import org.apache.hc.client5.http.impl.classic.HttpClients;
import org.apache.hc.core5.util.Timeout;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.elasticsearch.ElasticsearchClientAutoConfiguration;
import org.springframework.boot.autoconfigure.elasticsearch.ElasticsearchRestClientAutoConfiguration;
import org.springframework.boot.autoconfigure.freemarker.FreeMarkerAutoConfiguration;
import org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration;
import org.springframework.boot.autoconfigure.transaction.TransactionAutoConfiguration;
import org.springframework.context.annotation.Bean;
@ -17,9 +21,9 @@ import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.EnableAspectJAutoProxy;
import org.springframework.context.support.PropertySourcesPlaceholderConfigurer;
import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
import org.springframework.scheduling.annotation.EnableScheduling;
import org.springframework.web.client.RestTemplate;
import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
import ru.cg.webbpm.modules.webkit.DispatcherConfig;
@Configuration
@ -35,7 +39,6 @@ import ru.cg.webbpm.modules.webkit.DispatcherConfig;
"gen",
"ru.cg",
"ru.micord",
"com.example.ervu_eks_5"
})
@EnableAspectJAutoProxy(proxyTargetClass = true)
@EnableScheduling()
@ -43,6 +46,9 @@ import ru.cg.webbpm.modules.webkit.DispatcherConfig;
@SpringBootApplication(exclude = {
HibernateJpaAutoConfiguration.class,
TransactionAutoConfiguration.class,
ElasticsearchClientAutoConfiguration.class,// cause of gar
ElasticsearchRestClientAutoConfiguration.class,// cause of gar
FreeMarkerAutoConfiguration.class, //cause of xdocreport
})
public class App extends DispatcherConfig {
@ -68,9 +74,9 @@ public class App extends DispatcherConfig {
@Bean
public RestTemplate restTemplate() {
RequestConfig requestConfig = RequestConfig.custom()
.setSocketTimeout(socketTimeout * 1000)
.setConnectionRequestTimeout(connectionTimeout * 1000)
.setConnectTimeout(connectionTimeout * 1000)
.setResponseTimeout(Timeout.ofSeconds(socketTimeout))
.setConnectionRequestTimeout(Timeout.ofSeconds(connectionTimeout))
.setConnectTimeout(Timeout.ofSeconds(connectionTimeout))
.build();
CloseableHttpClient httpClient = HttpClients.custom()