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
This commit is contained in:
kochetkov 2025-01-15 14:35:55 +03:00
commit bea62ab235
138 changed files with 852 additions and 337 deletions

View file

@ -942,7 +942,6 @@
<componentRootId>ae6bbd9c-b3f6-458a-9c19-07e06a4716da</componentRootId>
<name>VB - 1.1.1.1 (в реестре нет информации о сформированных повестках) сценарий</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
<properties>
@ -1276,18 +1275,19 @@
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"e7e75c3f-5840-4475-b052-e8dac1ec12a1","packageName":"component","className":"Text","type":"TS"}</simple>
<simple>{"objectId":"74ed6920-6d22-4349-a08e-a28ccc88f7df","packageName":"ervu.component.container","className":"LoadForm","type":"TS"}</simple>
</value>
</entry>
<entry>
<key>propertyName</key>
<value>
<simple>"valueChangeEvent"</simple>
<simple>"formLoaded"</simple>
</value>
</entry>
</complex>
</value>
</item>
<item id="4fb46080-97ab-48b1-ad9f-a88fa829fdce" removed="true"/>
</value>
</entry>
<entry>
@ -1348,6 +1348,75 @@
</complex>
</value>
</item>
<item id="42fdf2a8-526a-4d88-a6f5-be2f82fd307c" removed="false">
<value>
<complex>
<entry>
<key>_isGroupSelected</key>
<value>
<simple>false</simple>
</value>
</entry>
<entry>
<key>one</key>
<value>
<complex>
<entry>
<key>conditionFirstPart</key>
<value>
<complex>
<entry>
<key>objectValue</key>
<value>
<complex>
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"74ed6920-6d22-4349-a08e-a28ccc88f7df","packageName":"ervu.component.container","className":"LoadForm","type":"TS"}</simple>
</value>
</entry>
<entry>
<key>method</key>
<value>
<simple>"isLoaded"</simple>
</value>
</entry>
</complex>
</value>
</entry>
</complex>
</value>
</entry>
<entry>
<key>conditionSecondPart</key>
<value>
<complex>
<entry>
<key>staticValue</key>
<value>
<implRef type="TS">
<className>boolean</className>
<packageName></packageName>
</implRef>
<simple>true</simple>
</value>
</entry>
</complex>
</value>
</entry>
<entry>
<key>operation</key>
<value>
<simple>"EQUALS"</simple>
</value>
</entry>
</complex>
</value>
</entry>
</complex>
</value>
</item>
<item id="71fce845-b366-4b84-976b-c32568eeca37" removed="true"/>
</value>
</entry>
<entry>
@ -4918,7 +4987,7 @@
<entry>
<key>initialValue</key>
<value>
<simple>"Если в выписке есть ошибки, подайте \u003ca href\u003d\"https://www.gosuslugi.ru/\" target\u003d\"_blank\"\u003eзаявление на исправление на Госуслугах\u003c/a\u003e"</simple>
<simple>"Если в выписке есть ошибки, подайте \u003ca href\u003d\"https://www.gosuslugi.ru/600595/1/form/\" target\u003d\"_blank\"\u003eзаявление на исправление на Госуслугах\u003c/a\u003e"</simple>
</value>
</entry>
<entry>
@ -5166,6 +5235,46 @@
<childrenReordered>false</childrenReordered>
<scripts id="37dff5c8-1599-4984-b107-c44a87b6da2e">
<properties>
<entry>
<key>elseActions</key>
<value>
<item id="3ff77d17-775b-4a5f-bc1c-e25ec5446c7a" removed="false">
<value>
<complex>
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"8ae57bdb-4acb-4f34-9641-9b5031b408d3","packageName":"component.container","className":"VBox","type":"TS"}</simple>
</value>
</entry>
<entry>
<key>method</key>
<value>
<simple>"setVisible"</simple>
</value>
</entry>
<entry>
<key>value</key>
<value>
<complex>
<entry>
<key>staticValue</key>
<value>
<implRef type="TS">
<className>boolean</className>
<packageName></packageName>
</implRef>
<simple>false</simple>
</value>
</entry>
</complex>
</value>
</entry>
</complex>
</value>
</item>
</value>
</entry>
<entry>
<key>eventRefs</key>
<value>
@ -5326,6 +5435,46 @@
<childrenReordered>false</childrenReordered>
<scripts id="37dff5c8-1599-4984-b107-c44a87b6da2e">
<properties>
<entry>
<key>elseActions</key>
<value>
<item id="655094ad-9018-4d93-bf30-c922f8415411" removed="false">
<value>
<complex>
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"988e632f-a306-4cad-8902-5d1e3e214ec4","packageName":"component.container","className":"VBox","type":"TS"}</simple>
</value>
</entry>
<entry>
<key>method</key>
<value>
<simple>"setVisible"</simple>
</value>
</entry>
<entry>
<key>value</key>
<value>
<complex>
<entry>
<key>staticValue</key>
<value>
<implRef type="TS">
<className>boolean</className>
<packageName></packageName>
</implRef>
<simple>false</simple>
</value>
</entry>
</complex>
</value>
</entry>
</complex>
</value>
</item>
</value>
</entry>
<entry>
<key>eventRefs</key>
<value>
@ -5486,6 +5635,46 @@
<childrenReordered>false</childrenReordered>
<scripts id="37dff5c8-1599-4984-b107-c44a87b6da2e">
<properties>
<entry>
<key>elseActions</key>
<value>
<item id="8609879a-4bce-46bc-a3bf-36002b656e22" removed="false">
<value>
<complex>
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"28f8437a-0097-4f98-8977-ea232d846445","packageName":"component.container","className":"VBox","type":"TS"}</simple>
</value>
</entry>
<entry>
<key>method</key>
<value>
<simple>"setVisible"</simple>
</value>
</entry>
<entry>
<key>value</key>
<value>
<complex>
<entry>
<key>staticValue</key>
<value>
<implRef type="TS">
<className>boolean</className>
<packageName></packageName>
</implRef>
<simple>false</simple>
</value>
</entry>
</complex>
</value>
</entry>
</complex>
</value>
</item>
</value>
</entry>
<entry>
<key>eventRefs</key>
<value>
@ -5646,6 +5835,46 @@
<childrenReordered>false</childrenReordered>
<scripts id="37dff5c8-1599-4984-b107-c44a87b6da2e">
<properties>
<entry>
<key>elseActions</key>
<value>
<item id="4dc03df0-db37-40a3-96d7-8ecb7560232d" removed="false">
<value>
<complex>
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"03329250-835d-4bbe-82de-456ca4df2419","packageName":"component.container","className":"VBox","type":"TS"}</simple>
</value>
</entry>
<entry>
<key>method</key>
<value>
<simple>"setVisible"</simple>
</value>
</entry>
<entry>
<key>value</key>
<value>
<complex>
<entry>
<key>staticValue</key>
<value>
<implRef type="TS">
<className>boolean</className>
<packageName></packageName>
</implRef>
<simple>false</simple>
</value>
</entry>
</complex>
</value>
</entry>
</complex>
</value>
</item>
</value>
</entry>
<entry>
<key>eventRefs</key>
<value>
@ -7165,13 +7394,13 @@
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"8ef93ac5-46d8-456e-950f-2d2949d21a53","packageName":"component","className":"Text","type":"TS"}</simple>
<simple>{"objectId":"74ed6920-6d22-4349-a08e-a28ccc88f7df","packageName":"ervu.component.container","className":"LoadForm","type":"TS"}</simple>
</value>
</entry>
<entry>
<key>propertyName</key>
<value>
<simple>"valueChangeEvent"</simple>
<simple>"formLoaded"</simple>
</value>
</entry>
</complex>
@ -7247,6 +7476,74 @@
<value>
<simple>"IS_EMPTY"</simple>
</value>
</entry>
</complex>
</value>
</entry>
</complex>
</value>
</item>
<item id="af4102d7-698c-420e-a7fe-ca9bf69a29a7" removed="false">
<value>
<complex>
<entry>
<key>_isGroupSelected</key>
<value>
<simple>false</simple>
</value>
</entry>
<entry>
<key>one</key>
<value>
<complex>
<entry>
<key>conditionFirstPart</key>
<value>
<complex>
<entry>
<key>objectValue</key>
<value>
<complex>
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"74ed6920-6d22-4349-a08e-a28ccc88f7df","packageName":"ervu.component.container","className":"LoadForm","type":"TS"}</simple>
</value>
</entry>
<entry>
<key>method</key>
<value>
<simple>"isLoaded"</simple>
</value>
</entry>
</complex>
</value>
</entry>
</complex>
</value>
</entry>
<entry>
<key>conditionSecondPart</key>
<value>
<complex>
<entry>
<key>staticValue</key>
<value>
<implRef type="TS">
<className>boolean</className>
<packageName></packageName>
</implRef>
<simple>true</simple>
</value>
</entry>
</complex>
</value>
</entry>
<entry>
<key>operation</key>
<value>
<simple>"EQUALS"</simple>
</value>
</entry>
</complex>
</value>