Commit graph

51 commits

Author SHA1 Message Date
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
Халтобин Евгений
080be303bd fix 2024-10-24 10:16:24 +03:00
Eduard Tihomirov
4a57d604db Merge remote-tracking branch 'origin/release/1.8' into feature/SUPPORT-8579_access_marker
# Conflicts:
#	backend/src/main/java/ru/micord/ervu/security/esia/controller/EsiaController.java
#	backend/src/main/java/ru/micord/ervu/security/webbpm/jwt/service/JwtTokenService.java
2024-10-23 12:06:24 +03:00
gulnaz
641b2617b3 move changes to release 2024-10-19 12:38:32 +03:00
Халтобин Евгений
4b9c618eb2 fixed kafka parameter 2024-10-19 08:44:26 +03:00
Eduard Tihomirov
d5082c3ce2 SUPPORT-8579: Fix 2024-10-03 16:28:43 +03:00
Pavel Zilke
005af5a9e6 delete unused env variables 2024-09-27 10:41:48 +03:00
Халтобин Евгений
ee4d64bc71 added props 2024-09-25 15:07:45 +03:00
Халтобин Евгений
c31af0f366 added ERVU_KAFKA_SECURITY_PROTOCOL 2024-09-25 14:48:40 +03:00
Халтобин Евгений
86045c5e3e sync 2024-09-25 13:42:18 +03:00
Халтобин Евгений
add1e6b61c Merge branch 'develop' into feature/WEBBPMNEXT-9175_migrate_to_tomcat 2024-09-25 12:33:16 +03:00
gulnaz
7e890469e6 change esia certificate hash param name; remove some props from webbpm.properties 2024-09-23 11:35:16 +03:00
gulnaz
6b757c805c SUPPORT-8413: add topic properties 2024-09-20 15:47:06 +03:00
gulnaz
5030679eb9 Merge branch 'release/1.0.0' into feature/SUPPORT-8412-8413_new_request_format
# Conflicts:
#	backend/src/main/java/ru/micord/ervu/kafka/ReplyingKafkaConfig.java
#	config/patches/default.cli
#	config/standalone/dev/standalone.xml
#	frontend/src/ts/modules/app/app.module.ts
#	pom.xml
#	resources/src/main/resources/business-model/LK RP FL/mydata.page
#	resources/src/main/resources/business-model/LK RP FL/screen-form-fl.page
2024-09-20 10:51:43 +03:00
gulnaz
2382841891 SUPPORT-8553: fix properties; add micord.env 2024-09-19 12:21:28 +03:00
Халтобин Евгений
a3765ff7e7 restored standalone.xml 2024-09-16 10:39:12 +03:00
Халтобин Евгений
d1b7bc8daa updated docker 2024-09-16 10:14:19 +03:00
Eduard Tihomirov
59233df325 Merge branch 'feature/SUPPORT-8427_new' into feature/SUPPORT-8474_id_ervu
# Conflicts:
#	backend/src/main/java/ru/micord/ervu/security/esia/service/EsiaAuthService.java
2024-09-13 10:41:36 +03:00
Eduard Tihomirov
56b166e9a6 SUPPORT-8427: Fix 2024-09-12 16:41:20 +03:00
Eduard Tihomirov
679ddea997 SUPPORT-8474: Fix 2024-09-12 15:34:26 +03:00
Eduard Tihomirov
3c0b7bc0e8 SUPPORT-8474: Fix 2024-09-12 15:11:08 +03:00
Eduard Tihomirov
8c85539124 SUPPORT-8427: Fix 2024-09-12 14:51:39 +03:00
gulnaz
fef88756e6 SUPPORT-8413: move classes to another package; remove redundant scripts 2024-09-11 15:30:58 +03:00
gulnaz
95cc5d21d8 Merge branch 'develop' into feature/SUPPORT-8412-8413_new_request_format
# Conflicts:
#	backend/src/main/java/ervu_lkrp_fl/ervu_lkrp_fl/controller/ProfileController.java
#	config/patches/default.cli
#	frontend/src/ts/modules/app/app.module.ts
#	frontend/src/ts/modules/app/component/app-header.component.ts
#	frontend/src/ts/modules/app/service/app-jivo-chat.service.ts
#	resources/src/main/resources/business-model/LK RP FL/restriction.page
2024-09-10 10:59:50 +03:00
Eduard Tihomirov
9168a8a023 SUPPORT-8474: Fix 2024-09-09 10:34:37 +03:00
Eduard Tihomirov
704ea8d376 SUPPORT-8427: Fix 2024-09-06 13:52:55 +03:00
Eduard Tihomirov
4e5355566d SUPPORT-8427: Fix 2024-09-06 10:28:56 +03:00
Eduard Tihomirov
e67d0fde94 SUPPORT-8427: Fix 2024-09-05 14:44:21 +03:00
Eduard Tihomirov
60464b29c5 SUPPORT-8427: Add security and logout 2024-09-05 13:30:45 +03:00
Eduard Tihomirov
bcb73f198a SUPPORT-8427: Fix 2024-09-04 11:45:04 +03:00
kochetkov
0a3e80e070 Merge branch 'update/3.178' into feature/WEBBPMNEXT-9188_fixes
# Conflicts:
#	frontend/package-lock.json
#	frontend/package.json
#	packages/ru.cg.webbpm.packages.base.resources/.flattened-pom.xml
#	packages/ru.cg.webbpm.packages.base.resources/META-INF/components/docs/component/grids/NavigateOnGridCellOrRow.html
#	packages/ru.cg.webbpm.packages.base.resources/META-INF/package-descriptor.xml
#	packages/ru.cg.webbpm.packages.base.resources/component/buttons/Button.component
#	packages/ru.cg.webbpm.packages.base.resources/component/buttons/CancelButton.component
#	packages/ru.cg.webbpm.packages.base.resources/component/buttons/ClearFilterButton.component
#	packages/ru.cg.webbpm.packages.base.resources/component/buttons/DeleteButton.component
#	packages/ru.cg.webbpm.packages.base.resources/component/buttons/DownloadButton.component
#	packages/ru.cg.webbpm.packages.base.resources/component/buttons/ErrorButton.component
#	packages/ru.cg.webbpm.packages.base.resources/component/buttons/ExecProcessButton.component
#	packages/ru.cg.webbpm.packages.base.resources/component/buttons/ExecuteSqlButton.component
#	packages/ru.cg.webbpm.packages.base.resources/component/buttons/FilterButton.component
#	packages/ru.cg.webbpm.packages.base.resources/component/buttons/NavigationButton.component
#	packages/ru.cg.webbpm.packages.base.resources/component/buttons/SaveButton.component
#	packages/ru.cg.webbpm.packages.base.resources/component/buttons/SelectButton.component
#	packages/ru.cg.webbpm.packages.base.resources/component/buttons/SignButton.component
#	packages/ru.cg.webbpm.packages.base.resources/component/buttons/StartProcessButton.component
#	packages/ru.cg.webbpm.packages.base.resources/component/buttons/reporting/EntityGraphReportingButton.component
#	packages/ru.cg.webbpm.packages.base.resources/component/buttons/reporting/FormReportingButton.component
#	packages/ru.cg.webbpm.packages.base.resources/component/containers/CollapsiblePanel.component
#	packages/ru.cg.webbpm.packages.base.resources/component/containers/Dialog.component
#	packages/ru.cg.webbpm.packages.base.resources/component/containers/DropDown.component
#	packages/ru.cg.webbpm.packages.base.resources/component/containers/FieldSet.component
#	packages/ru.cg.webbpm.packages.base.resources/component/containers/FilterGroup.component
#	packages/ru.cg.webbpm.packages.base.resources/component/containers/Form.component
#	packages/ru.cg.webbpm.packages.base.resources/component/containers/HBox.component
#	packages/ru.cg.webbpm.packages.base.resources/component/containers/TabContainer.component
#	packages/ru.cg.webbpm.packages.base.resources/component/containers/TabItem.component
#	packages/ru.cg.webbpm.packages.base.resources/component/containers/VBox.component
#	packages/ru.cg.webbpm.packages.base.resources/component/containers/Window.component
#	packages/ru.cg.webbpm.packages.base.resources/component/editable-grids/EditableGrid.component
#	packages/ru.cg.webbpm.packages.base.resources/component/editable-grids/columns/AutocompleteGridColumn.component
#	packages/ru.cg.webbpm.packages.base.resources/component/editable-grids/columns/CheckBoxGridColumn.component
#	packages/ru.cg.webbpm.packages.base.resources/component/editable-grids/columns/ComboBoxGridColumn.component
#	packages/ru.cg.webbpm.packages.base.resources/component/editable-grids/columns/DateTimePickerGridColumn.component
#	packages/ru.cg.webbpm.packages.base.resources/component/editable-grids/columns/MoneyFieldGridColumn.component
#	packages/ru.cg.webbpm.packages.base.resources/component/editable-grids/columns/NumberFieldGridColumn.component
#	packages/ru.cg.webbpm.packages.base.resources/component/editable-grids/columns/OneToManyGridColumn.component
#	packages/ru.cg.webbpm.packages.base.resources/component/editable-grids/columns/OneToManyGridColumnV2.component
#	packages/ru.cg.webbpm.packages.base.resources/component/editable-grids/columns/ReadonlyClientGridColumn.component
#	packages/ru.cg.webbpm.packages.base.resources/component/editable-grids/columns/ReadonlyServerGridColumn.component
#	packages/ru.cg.webbpm.packages.base.resources/component/editable-grids/columns/StaticComboBoxGridColumn.component
#	packages/ru.cg.webbpm.packages.base.resources/component/editable-grids/columns/TextAreaGridColumn.component
#	packages/ru.cg.webbpm.packages.base.resources/component/editable-grids/columns/TextFieldGridColumn.component
#	packages/ru.cg.webbpm.packages.base.resources/component/editable-grids/columns/TimePickerGridColumn.component
#	packages/ru.cg.webbpm.packages.base.resources/component/fields/Address.component
#	packages/ru.cg.webbpm.packages.base.resources/component/fields/Autocomplete.component
#	packages/ru.cg.webbpm.packages.base.resources/component/fields/CheckBox.component
#	packages/ru.cg.webbpm.packages.base.resources/component/fields/ComboBox.component
#	packages/ru.cg.webbpm.packages.base.resources/component/fields/DateTimePicker.component
#	packages/ru.cg.webbpm.packages.base.resources/component/fields/EditableOneToMany.component
#	packages/ru.cg.webbpm.packages.base.resources/component/fields/FilePreview.component
#	packages/ru.cg.webbpm.packages.base.resources/component/fields/FileUpload.component
#	packages/ru.cg.webbpm.packages.base.resources/component/fields/ManyToMany.component
#	packages/ru.cg.webbpm.packages.base.resources/component/fields/ManyToManyField.component
#	packages/ru.cg.webbpm.packages.base.resources/component/fields/MoneyField.component
#	packages/ru.cg.webbpm.packages.base.resources/component/fields/NumberField.component
#	packages/ru.cg.webbpm.packages.base.resources/component/fields/OneToMany.component
#	packages/ru.cg.webbpm.packages.base.resources/component/fields/OneToManyV2.component
#	packages/ru.cg.webbpm.packages.base.resources/component/fields/RadioButton.component
#	packages/ru.cg.webbpm.packages.base.resources/component/fields/SignVerification.component
#	packages/ru.cg.webbpm.packages.base.resources/component/fields/StaticComboBox.component
#	packages/ru.cg.webbpm.packages.base.resources/component/fields/StaticRadioButton.component
#	packages/ru.cg.webbpm.packages.base.resources/component/fields/Text.component
#	packages/ru.cg.webbpm.packages.base.resources/component/fields/TextArea.component
#	packages/ru.cg.webbpm.packages.base.resources/component/fields/TextField.component
#	packages/ru.cg.webbpm.packages.base.resources/component/fields/TimePicker.component
#	packages/ru.cg.webbpm.packages.base.resources/component/fields/TreeField.component
#	packages/ru.cg.webbpm.packages.base.resources/component/fields/editableonetomany/EditableGrid.component
#	packages/ru.cg.webbpm.packages.base.resources/component/fields/editableonetomany/Form.component
#	packages/ru.cg.webbpm.packages.base.resources/component/fields/fileupload/FileUploadField.component
#	packages/ru.cg.webbpm.packages.base.resources/component/fields/filters/FilterAddress.component
#	packages/ru.cg.webbpm.packages.base.resources/component/fields/filters/FilterAutocomplete.component
#	packages/ru.cg.webbpm.packages.base.resources/component/fields/filters/FilterBoolean.component
#	packages/ru.cg.webbpm.packages.base.resources/component/fields/filters/FilterCheckBox.component
#	packages/ru.cg.webbpm.packages.base.resources/component/fields/filters/FilterComboBox.component
#	packages/ru.cg.webbpm.packages.base.resources/component/fields/filters/FilterDateTimePicker.component
#	packages/ru.cg.webbpm.packages.base.resources/component/fields/filters/FilterNumberField.component
#	packages/ru.cg.webbpm.packages.base.resources/component/fields/filters/FilterRadioButton.component
#	packages/ru.cg.webbpm.packages.base.resources/component/fields/filters/FilterStaticComboBox.component
#	packages/ru.cg.webbpm.packages.base.resources/component/fields/filters/FilterTextArea.component
#	packages/ru.cg.webbpm.packages.base.resources/component/fields/filters/FilterTextField.component
#	packages/ru.cg.webbpm.packages.base.resources/component/fields/treefield/LinkField.component
#	packages/ru.cg.webbpm.packages.base.resources/component/fields/treefield/MultiValueField.component
#	packages/ru.cg.webbpm.packages.base.resources/component/grids/Grid.component
#	packages/ru.cg.webbpm.packages.base.resources/component/grids/GridV2.component
#	packages/ru.cg.webbpm.packages.base.resources/component/grids/GridV2Column.component
#	packages/ru.cg.webbpm.packages.base.resources/component/grids/GridV2Group.component
#	packages/ru.cg.webbpm.packages.base.resources/component/grids/PagingGrid.component
#	packages/ru.cg.webbpm.packages.base.resources/component/grids/TreeGrid.component
#	packages/ru.cg.webbpm.packages.base.resources/component/uncategorized/ActionController.component
#	packages/ru.cg.webbpm.packages.base.resources/component/uncategorized/Calendar.component
#	packages/ru.cg.webbpm.packages.base.resources/component/uncategorized/Chart.component
#	packages/ru.cg.webbpm.packages.base.resources/component/uncategorized/ChartV2.component
#	packages/ru.cg.webbpm.packages.base.resources/component/uncategorized/EventCalendar.component
#	packages/ru.cg.webbpm.packages.base.resources/component/uncategorized/GanttChart.component
#	packages/ru.cg.webbpm.packages.base.resources/component/uncategorized/HyperLink.component
#	packages/ru.cg.webbpm.packages.base.resources/component/uncategorized/IFrame.component
#	packages/ru.cg.webbpm.packages.base.resources/component/uncategorized/InnerHtml.component
#	packages/ru.cg.webbpm.packages.base.resources/component/uncategorized/MenuGroup.component
#	packages/ru.cg.webbpm.packages.base.resources/component/uncategorized/MenuItem.component
#	packages/ru.cg.webbpm.packages.base.resources/component/uncategorized/ValidationController.component
#	packages/ru.cg.webbpm.packages.base.resources/converters/converters.jar
#	packages/ru.cg.webbpm.packages.base.resources/metadata/java.metadata
#	packages/ru.cg.webbpm.packages.base.resources/metadata/typescript.metadata.json
#	packages/ru.cg.webbpm.packages.base.resources/process-instance/ProcessInstance.component
#	packages/ru.cg.webbpm.packages.base.resources/process-instance/ProcessInstanceDiagram.component
#	packages/ru.cg.webbpm.packages.base.resources/process-instance/ProcessInstanceList.component
#	packages/ru.cg.webbpm.packages.base.resources/user-management/Groups.component
#	packages/ru.cg.webbpm.packages.base.resources/user-management/GroupsCreate.component
#	packages/ru.cg.webbpm.packages.base.resources/user-management/GroupsEdit.component
#	packages/ru.cg.webbpm.packages.base.resources/user-management/OrganizationEdit.component
#	packages/ru.cg.webbpm.packages.base.resources/user-management/Organizations.component
#	packages/ru.cg.webbpm.packages.base.resources/user-management/Roles.component
#	packages/ru.cg.webbpm.packages.base.resources/user-management/RolesEdit.component
#	packages/ru.cg.webbpm.packages.base.resources/user-management/SecurityFeatures.component
#	packages/ru.cg.webbpm.packages.base.resources/user-management/StaticRouteNavigationButton.component
#	packages/ru.cg.webbpm.packages.base.resources/user-management/StaticRouteSelectButton.component
#	packages/ru.cg.webbpm.packages.base.resources/user-management/UserForm.component
#	packages/ru.cg.webbpm.packages.base.resources/user-management/Users.component
#	packages/ru.cg.webbpm.packages.base.resources/user-management/UsersCreate.component
#	packages/ru.cg.webbpm.packages.base.resources/user-management/UsersEdit.component
#	pom.xml
#	resources/src/main/resources/TextWithDialogLinks.component
#	resources/src/main/resources/business-model/LK RP FL/mydata.page
#	resources/src/main/resources/business-model/LK RP FL/restriction.page
#	resources/src/main/resources/business-model/LK RP FL/screen-form-fl.page
#	resources/src/main/resources/business-model/LK RP FL/subpoena.page
#	resources/src/main/resources/business-model/Процессы/process-instance-list.page
#	resources/src/main/resources/business-model/Процессы/process-instance.page
#	resources/src/main/resources/business-model/Управление пользователями/Группы редактирование.page
#	resources/src/main/resources/business-model/Управление пользователями/Группы создание.page
#	resources/src/main/resources/business-model/Управление пользователями/Группы.page
#	resources/src/main/resources/business-model/Управление пользователями/Организации.page
#	resources/src/main/resources/business-model/Управление пользователями/Организация редактирование(создание).page
#	resources/src/main/resources/business-model/Управление пользователями/Пользователи редактирование.page
#	resources/src/main/resources/business-model/Управление пользователями/Пользователи создание.page
#	resources/src/main/resources/business-model/Управление пользователями/Пользователи.page
#	resources/src/main/resources/business-model/Управление пользователями/Роли редактирование (создание).page
#	resources/src/main/resources/business-model/Управление пользователями/Роли.page
#	resources/src/main/resources/business-model/Управление пользователями/Функции безопасности.page
#	resources/src/main/resources/overrides/0f470331-dfb0-4f10-b748-c9a7f33d31d9.component.override
#	resources/src/main/resources/overrides/0f8d0a8b-8014-4367-8ff3-7f049c284978.component.override
#	resources/src/main/resources/overrides/16071adb-3bdf-4c33-b29b-886876016415.component.override
#	resources/src/main/resources/overrides/38c2de2f-c5dd-413e-babf-ce54cb4e5279.component.override
#	resources/src/main/resources/overrides/4e314e88-02d6-4b0e-b7a7-15a36bdeb682.component.override
#	resources/src/main/resources/overrides/57537dbd-c468-4c2d-99df-924b5ba018d6.component.override
#	resources/src/main/resources/overrides/5cc0e63d-f697-47a8-a9dc-3170f1a99721.component.override
#	resources/src/main/resources/overrides/5f9c58f8-9ee1-4df3-b93c-e48534e798db.component.override
#	resources/src/main/resources/overrides/67605d63-1081-423b-b6b5-727ecfce2ca1.component.override
#	resources/src/main/resources/overrides/76e91ef4-d2ef-4662-96ad-84c0dae0ecff.component.override
#	resources/src/main/resources/overrides/7a57e082-99e3-4453-a2df-d5ffafa2c019.component.override
#	resources/src/main/resources/overrides/8e1d9023-42c0-4960-9c59-02f4f0c2e4dd.component.override
#	resources/src/main/resources/overrides/a4d442cf-72a8-431e-815a-490959083787.component.override
#	resources/src/main/resources/overrides/c4b48815-f449-48fe-9ae0-dec9b6f4c53c.component.override
#	resources/src/main/resources/overrides/ca7390f1-1891-4161-b8ae-ef66de5776b7.component.override
#	resources/src/main/resources/overrides/ed47cfae-64da-4360-8f61-1087179ad78b.component.override
#	resources/src/main/resources/overrides/fe225a1a-1c03-485e-a069-18b92ab4f7f7.component.override
2024-09-03 15:09:28 +03:00
gulnaz
11883a72ad SUPPORT-8412: add rpc for extract button; fix standalone 2024-08-18 23:25:57 +03:00
gulnaz
9c1ea9fd2a SUPPORT-8413: fix request topic 2024-08-15 14:57:36 +03:00
gulnaz
716c6f8c3a SUPPORT-8413: add kafka config and producer; add ervu data controller; add new properties to standalone 2024-08-15 13:21:45 +03:00
Pavel Zilke
bd0a73fd4a DEVOPS-1775 Dockerfile refactoring 2024-08-12 16:58:37 +03:00
Pavel Zilke
ed2a9494ed Merge branch 'feature/DEVOPS-1756_frontend_nginx' into feature/9188_8427 2024-08-09 11:42:05 +03:00
Pavel Zilke
ba6aa8ebb8 Merge branch 'feature/DEVOPS-1756_frontend_nginx' into develop 2024-08-09 11:41:35 +03:00
Халтобин Евгений
a6f6f9681c Merge remote-tracking branch 'origin/feature/SUPPORT-8427' into feature/WEBBPMNEXT-9188_fixes 2024-08-02 12:56:01 +03:00
Халтобин Евгений
2c77859253 added Dockerfile for tomcat 2024-08-02 11:52:36 +03:00
kochetkov
060ac6e454 WEBBPMNEXT-9188 change group id and arifact id 2024-08-01 16:07:31 +03:00
kochetkov
dad7dd931e WEBBPMNEXT-9188 fix 2024-07-31 16:19:38 +03:00
kochetkov
58a14101f8 WEBBPMNEXT-9188 fix 2024-07-25 16:43:23 +03:00
Булат Хайруллин
afaba75ab0 standalone.xml 2024-07-18 16:38:43 +03:00
Pavel Zilke
de35c65124 DEVOPS-1756 frontend nginx 2024-07-16 10:41:20 +03:00
Pavel Zilke
b9aca44188 DEVOPS-1747 fix docker 2024-07-04 15:12:42 +03:00
Pavel Zilke
edc55e7f6b DEVOPS-1747 docker, fix centos repo 2024-07-01 18:12:31 +03:00
Булат Хайруллин
cb03625cd6 переключил бд на 119 сервер бд для докера 2024-06-20 17:31:56 +03:00
Булат Хайруллин
f1197494b7 правки для докера 2024-06-17 12:15:39 +03:00
Булат Хайруллин
cc341d707a настройка докера 2024-06-13 16:45:59 +03:00