Commit graph

100 commits

Author SHA1 Message Date
Zaripov Emil
64f13bf0c9 обновил ссылку для проверки сертификата на ЕКБ 2025-04-12 17:14:44 +03:00
Eduard Tihomirov
937c10aeee add marker ver 2025-04-11 15:15:59 +03:00
Eduard Tihomirov
198f01641f Merge branch 'master' into develop 2025-03-21 11:54:46 +03:00
Eduard Tihomirov
21d1a17b65 fix 2025-03-17 11:07:00 +03:00
Eduard Tihomirov
4037880396 SUPPORT-8965: Fix 2025-03-13 16:14:21 +03:00
gulnaz
7feb5149a8 Merge branch 'develop' into feature/SUPPORT-8749_fix_config
# Conflicts:
#	config/micord.env
2025-03-04 10:28:26 +03:00
Eduard Tihomirov
af5f590249 Merge branch 'feature/SUPPORT-8942_fix' into develop 2025-02-27 10:58:30 +03:00
Eduard Tihomirov
13ad0a4748 SUPPORT-8965: Fix 2025-02-27 10:46:58 +03:00
Eduard Tihomirov
4dd664ee53 Merge branch 'feature/SUPPORT-8942_fix' into hotfix/1.9.9 2025-02-26 16:57:51 +03:00
Eduard Tihomirov
dd88953f8d SUPPORT-8942: Fix 2025-02-26 14:10:05 +03:00
Eduard Tihomirov
f7c234bd50 SUPPORT-8942: Fix 2025-02-26 12:44:07 +03:00
gulnaz
46282d6283 Merge remote-tracking branch 'origin/master' into develop
# Conflicts:
#	backend/pom.xml
#	backend/src/main/java/ru/micord/ervu/controller/ExtractController.java
#	backend/src/main/java/ru/micord/ervu/kafka/service/impl/BaseReplyingKafkaService.java
#	backend/src/main/java/ru/micord/ervu/security/esia/service/EsiaAuthService.java
#	config/standalone/dev/standalone.xml
#	distribution/pom.xml
#	frontend/pom.xml
#	pom.xml
#	resources/pom.xml
2025-02-24 17:28:43 +03:00
gulnaz
8c5450c27d SUPPORT-8934: add default value for extract type header 2025-02-20 12:22:39 +03:00
gulnaz
e790011d1d SUPPORT-8934: add default value for extract type header 2025-02-20 11:54:52 +03:00
gulnaz
8a354074f9 SUPPORT-8934: handle empty extract case for existing recruit 2025-02-20 11:51:02 +03:00
gulnaz
8230ed7894 SUPPORT-8934: handle empty extract case for existing recruit 2025-02-20 11:36:29 +03:00
gulnaz
0069dcfa5a Merge branch 'master' into develop
# Conflicts:
#	backend/pom.xml
#	backend/src/main/java/ru/micord/ervu/kafka/service/impl/BaseReplyingKafkaService.java
#	backend/src/main/java/ru/micord/ervu/security/esia/service/EsiaAuthService.java
#	backend/src/main/java/ru/micord/ervu/security/esia/service/EsiaPersonalDataService.java
#	backend/src/main/java/ru/micord/ervu/security/webbpm/jwt/service/JwtTokenService.java
#	config/local.env
#	distribution/pom.xml
#	frontend/pom.xml
#	pom.xml
#	resources/pom.xml
2025-02-17 12:58:14 +03:00
Халтобин Евгений
d551088192 updated nginx image 2025-02-17 08:59:42 +03:00
adel.ka
b5591f1198 Merge remote-tracking branch 'origin/hotfix/1.9.5' into test_audit
# Conflicts:
#	backend/src/main/java/ru/micord/ervu/controller/ExtractController.java
#	backend/src/main/java/ru/micord/ervu/security/esia/service/EsiaAuthService.java
2025-02-03 14:25:47 +03:00
Eduard Tihomirov
39a1f753e3 Merge remote-tracking branch 'origin/master' into develop
# Conflicts:
#	backend/pom.xml
#	backend/src/main/java/ru/micord/ervu/security/esia/service/EsiaAuthService.java
#	distribution/pom.xml
#	frontend/pom.xml
#	pom.xml
#	resources/pom.xml
2025-02-03 14:05:34 +03:00
gulnaz
f57847eeea Merge branch 'feature/SUPPORT-8817_1_9_5_adding_extract_request_with_empty_ervu_id' into hotfix/1.9.4
# Conflicts:
#	resources/src/main/resources/business-model/LK RP FL/screen-form-fl.page
2025-01-31 11:23:48 +03:00
Eduard Tihomirov
0ecf88e51f Merge branch 'feature/SUPPORT-8783_landing' into hotfix/1.9.8 2025-01-30 16:07:54 +03:00
Eduard Tihomirov
a5895ecc73 Merge branch 'feature/SUPPORT-8783_landing' into hotfix/1.9.8 2025-01-30 15:27:12 +03:00
Eduard Tihomirov
90e23ccb9f SUPPORT-8783: Fix 2025-01-30 15:21:23 +03:00
gulnaz
e9f429243c SUPPORT-8749: fix config.md 2025-01-29 18:29:07 +03:00
adel.kalimullin
9bcc2d8586 SUPPORT-8706: add audit 2025-01-29 15:36:07 +03:00
gulnaz
d86de5bf2a SUPPORT-8749: rename some kafka env vars 2025-01-29 10:54:29 +03:00
Emir Suleimanov
ae0f27aa55 SUPPORT-8884: add time process the requests for access.log 2025-01-27 15:14:00 +03:00
Eduard Tihomirov
c7e5c11d26 Merge branch 'feature/SUPPORT-8783_landing' into hotfix/1.9.8
# Conflicts:
#	config/nginx.conf
2025-01-27 13:42:09 +03:00
Eduard Tihomirov
d6542f36f2 SUPPORT-8783: Fix 2025-01-27 12:20:49 +03:00
Pavel Zilke
1dfa9a8ac0 DEVOPS-1898 2025-01-24 14:27:25 +03:00
Pavel Zilke
f1c5c1e47e DEVOPS-1898 2025-01-24 13:56:17 +03:00
Рауф Латыпов
0b29dea6a2 SUPPORT-8817: fix for review (1) 2025-01-16 13:24:22 +03:00
kochetkov
bea62ab235 Merge branch 'hotfix/1.9.5' into develop
# Conflicts:
#	backend/pom.xml
#	backend/src/main/java/ru/micord/ervu/security/esia/service/EsiaAuthService.java
#	config/nginx.conf
#	distribution/pom.xml
#	frontend/pom.xml
#	pom.xml
#	resources/pom.xml
2025-01-15 14:35:55 +03:00
Халтобин Евгений
c8d7ce8b0f off server tokens 2025-01-15 13:07:19 +03:00
Рауф Латыпов
db390aa089 SUPPORT-8817: add extract request with empty ervu id 2025-01-14 22:59:37 +03:00
kochetkov
09916af2c4 some nginx conf from rtsk sources 2025-01-14 10:01:17 +03:00
kochetkov
df562fe38f add patched server.xml from ul 2025-01-13 12:18:36 +03:00
Eduard Tihomirov
90ec38852f Merge remote-tracking branch 'origin/master' into develop
# Conflicts:
#	backend/pom.xml
#	backend/src/main/java/ru/micord/ervu/controller/ErvuDataController.java
#	backend/src/main/java/ru/micord/ervu/security/esia/config/EsiaConfig.java
#	backend/src/main/java/ru/micord/ervu/security/esia/service/EsiaAuthService.java
#	backend/src/main/java/ru/micord/ervu/security/esia/token/EsiaTokensStore.java
#	backend/src/main/java/ru/micord/ervu/security/webbpm/jwt/service/JwtTokenService.java
#	config/nginx.conf
#	distribution/pom.xml
#	frontend/pom.xml
#	pom.xml
#	resources/pom.xml
2025-01-10 13:15:15 +03:00
kochetkov
2d2a07bb0c SUPPORT-8830 fix logout 2024-12-27 13:05:33 +03:00
Халтобин Евгений
65872ef7da DEVOPS-1892: added cache settings 2024-12-24 14:28:30 +03:00
Халтобин Евгений
1b98944498 DEVOPS-1892: added cache settings
moved from angie to nginx
2024-12-23 10:18:03 +03:00
Халтобин Евгений
b8c78bfe68 DEVOPS-1892: added cache settings
moved from angie to nginx
2024-12-23 10:17:03 +03:00
Халтобин Евгений
532822c60f updated 2024-12-18 21:12:39 +03:00
Халтобин Евгений
76aba32d64 added docker compose 2024-12-05 09:04:17 +03:00
Eduard Tihomirov
c4e5bab8b6 fix marker verify
(cherry picked from commit f46ddfc623589bdadcafabfce77a18d8d4f569f0)
2024-11-26 16:20:10 +03:00
Eduard Tihomirov
b6072d9bf4 Merge branch 'develop' into feature/SUPPORT-8593_marker_verify 2024-11-26 16:19:56 +03:00
Zaripov Emil
cd60dded99 set DB_APP_NAME=ervu_lkrp_fl 2024-11-08 15:16:33 +03:00
gulnaz
5808a3e10a SUPPORT-8664: fix NPE, config and kafka template bean name 2024-10-31 13:53:44 +03:00
Eduard Tihomirov
bb29b09aee Merge branch 'master' into feature/SUPPORT-8593_marker_verify
# Conflicts:
#	backend/src/main/java/ru/micord/ervu/security/esia/service/EsiaAuthService.java
#	backend/src/main/java/ru/micord/ervu/security/esia/service/EsiaPersonalDataService.java
#	backend/src/main/java/ru/micord/ervu/security/esia/service/PersonalDataService.java
#	config/standalone/dev/standalone.xml
2024-10-25 15:12:11 +03:00