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

Merge remote-tracking branch 'origin/hotfix/1.9.5' into feature/SUPPORT-8848_fix_error_handler

Browse source
This commit is contained in:
Eduard Tihomirov 2025-02-06 09:40:12 +03:00
commit 7b180ad6b6
4 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
backend/src/main/java/ru/micord/ervu/security/esia/config/EsiaConfig.java
View file

@ -32,10 +32,10 @@ public class EsiaConfig {
@Value("${esia.client.cert.hash}") @Value("${esia.client.cert.hash}")
private String clientCertHash; private String clientCertHash;
@Value("${esia.request.timeout:60}") @Value("${request.timeout:20}")
private long requestTimeout; private long requestTimeout;
@Value("${esia.connection.timeout:30}") @Value("${connection.timeout:10}")
private long connectionTimeout; private long connectionTimeout;
@Value("${esia.logout.url:idp/ext/Logout}") @Value("${esia.logout.url:idp/ext/Logout}")

2
backend/src/main/java/ru/micord/ervu/security/esia/service/EsiaAuthService.java
View file

@ -337,6 +337,7 @@ public class EsiaAuthService {
.uri(URI.create(esiaConfig.getSignUrl())) .uri(URI.create(esiaConfig.getSignUrl()))
.header("Content-Type", "text/plain") .header("Content-Type", "text/plain")
.POST(HttpRequest.BodyPublishers.ofString(requestBody, StandardCharsets.UTF_8)) .POST(HttpRequest.BodyPublishers.ofString(requestBody, StandardCharsets.UTF_8))
.timeout(Duration.ofSeconds(esiaConfig.getRequestTimeout()))
.build(); .build();
HttpResponse<String> response = HttpClient.newBuilder() HttpResponse<String> response = HttpClient.newBuilder()
.connectTimeout(Duration.ofSeconds(esiaConfig.getConnectionTimeout())) .connectTimeout(Duration.ofSeconds(esiaConfig.getConnectionTimeout()))
@ -461,6 +462,7 @@ public class EsiaAuthService {
.uri(URI.create(esiaConfig.getSignVerifyUrl())) .uri(URI.create(esiaConfig.getSignVerifyUrl()))
.header("Content-Type", "text/plain") .header("Content-Type", "text/plain")
.POST(HttpRequest.BodyPublishers.ofString(accessToken, StandardCharsets.UTF_8)) .POST(HttpRequest.BodyPublishers.ofString(accessToken, StandardCharsets.UTF_8))
.timeout(Duration.ofSeconds(esiaConfig.getRequestTimeout()))
.build(); .build();
return HttpClient.newBuilder() return HttpClient.newBuilder()
.connectTimeout(Duration.ofSeconds(esiaConfig.getConnectionTimeout())) .connectTimeout(Duration.ofSeconds(esiaConfig.getConnectionTimeout()))

2
frontend/src/resources/template/app/component/app_header.html
View file

@ -1,7 +1,7 @@
<nav class="header" id="webbpm-header" [ngClass]="{'header-landing': isLanding}"> <nav class="header" id="webbpm-header" [ngClass]="{'header-landing': isLanding}">
<div *ngIf="isLanding"> <div *ngIf="isLanding">
<div class="header-logo"></div> <div class="header-logo"></div>
<div class="header-title">Реестр повесток юридических лиц</div> <div class="header-title">Реестр повесток физических лиц</div>
</div> </div>
<div *ngIf="!isLanding" class="header-logo"> <div *ngIf="!isLanding" class="header-logo">
<div class="logo"><a routerLink="/"></a></div> <div class="logo"><a routerLink="/"></a></div>

2
frontend/src/ts/ervu/component/button/ExtractLoadService.ts
View file

@ -26,7 +26,9 @@ export class ExtractLoadService extends Behavior {
super.initialize(); super.initialize();
this.button = this.getScript(AbstractButton); this.button = this.getScript(AbstractButton);
this.httpClient = this.injector.get(HttpClient); this.httpClient = this.injector.get(HttpClient);
this.errorEvent.subscribe(() => console.log("error event occurred", this.errorEvent));
this.onClickFunction = () => { this.onClickFunction = () => {
console.log("click event occurred");
this.httpClient.get('extract/' + this.formatRegistry, { this.httpClient.get('extract/' + this.formatRegistry, {
responseType: 'blob', responseType: 'blob',
observe: 'response' observe: 'response'