Merge remote-tracking branch 'origin/update/5.0' into develop

This commit is contained in:
kochetkov 2025-11-13 13:01:27 +03:00
commit bf7e8a3d75
641 changed files with 23725 additions and 56013 deletions

16
.gitignore vendored
View file

@ -50,20 +50,24 @@ resources/src/main/generated-resources*/
resources/src/main/resources/database/database_structure.xml
frontend/build*/
frontend/.nx*/
frontend/tmp*/
frontend/.angular*/
frontend/build_dev*/
frontend/.angular*/
frontend/dist*/
frontend/node_modules*/
frontend/src/ts/**/*.js
frontend/src/ts/**/*.js.map
frontend/src/ts/**/*.ngsummary.json
frontend/src/ts/aot*/
frontend/src/ts/page.routing.ts
frontend/tsconfig.base.json
frontend/modules/generated*/
frontend/src/ts/generated*/
frontend/modules/shared/src/lib/generated/
npm-debug.log
.eslintignore
#Sublime project files
*.sublime-project
*.sublime-workspace
CLAUDE.md
config/*.ear
config/output/

View file

@ -1,7 +1,11 @@
#Files for Webbpm-Studio to ignore
frontend/build/
frontend/.angular/
frontend/.nx/
frontend/build_dev/
frontend/dist/
frontend/tmp/
frontend/modules/generated/
frontend/node_modules/
frontend/src/ts/page.routing.ts
frontend/src/ts/generated-sources/
@ -18,7 +22,6 @@ resources/target/
test/
extensions/
config/
target/
themes/

45
Dockerfile Normal file
View file

@ -0,0 +1,45 @@
ARG BUILDER_IMAGE=nexus.ervu.rt-sk.ru/ervu-base/node:20.9-alpine-git
ARG RUNTIME_IMAGE=nexus.ervu.rt-sk.ru/ervu-base/ervu/jdk:17.0.13-alpine-3.21
FROM $BUILDER_IMAGE AS builder
ARG MVN_FLAGS="-T4C -Pprod --batch-mode --no-transfer-progress"
RUN echo "https://dl-cdn.alpinelinux.org/alpine/v3.18/main" >> /etc/apk/repositories \
&& echo "https://dl-cdn.alpinelinux.org/alpine/v3.18/community" >> /etc/apk/repositories \
&& apk --update --no-cache add maven openjdk17-jdk
ENV LANG=ru_RU.UTF-8
ENV LANGUAGE=ru_RU.UTF-8
ENV LC_ALL=ru_RU.UTF-8
WORKDIR /app
COPY . .
RUN mkdir -p /root/.m2 \
# && cp config/settings.xml /root/.m2/settings.xml \
&& mvn clean ${MVN_FLAGS} \
&& mvn package ${MVN_FLAGS}
RUN cd config-data-executor \
&& mvn clean package ${MVN_FLAGS}
FROM $RUNTIME_IMAGE
RUN rm -f /etc/apk/repositories \
&& echo "https://dl-cdn.alpinelinux.org/alpine/v3.21/main" >> /etc/apk/repositories \
&& apk --update --no-cache add nginx
ENV BACKEND_URL=http://localhost:8080
ENV CONFIG_DATA_EXECUTOR_URL=http://localhost:8080/api
COPY config/nginx.conf /etc/nginx/nginx.conf
COPY --from=builder /app/frontend/dist /usr/share/nginx/html
COPY --from=builder /app/backend/target/*.jar /home/app/backend.jar
COPY --from=builder /app/config-data-executor/target/*.jar /home/app/cde.jar
EXPOSE 80
ENTRYPOINT ["java", "-jar", "/home/app/backend.jar"]

View file

@ -34,7 +34,7 @@ CREATE DATABASE "<your-project-db>"
OWNER = "<your-project-main-role>";
```
ВНИМАНИЕ: в общем случае, отдельную БД для безопасности создавать не нужно. В конфигурации источника данных security-ds в файле standalone.xml в качестве имени базы данных используйте базу данных приложения.
ВНИМАНИЕ: в общем случае, отдельную БД для безопасности создавать не нужно. В конфигурации источника данных security-ds в файле конфигурации в качестве имени базы данных используйте базу данных приложения.
Предоставление необходимых прав для роли &lt;your-project-security-role&gt;

View file

@ -9,8 +9,32 @@
</parent>
<groupId>ru.micord.ervu.eks</groupId>
<artifactId>backend</artifactId>
<packaging>war</packaging>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-undertow</artifactId>
</dependency>
<dependency>
<groupId>io.undertow</groupId>
<artifactId>undertow-core</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-actuator</artifactId>
</dependency>
<dependency>
<groupId>io.micrometer</groupId>
<artifactId>micrometer-registry-prometheus</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-commons</artifactId>
</dependency>
<dependency>
<groupId>io.jsonwebtoken</groupId>
<artifactId>jjwt-api</artifactId>
@ -34,18 +58,17 @@
<artifactId>reporting-jasper-fonts</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.ocpsoft.prettytime</groupId>
<artifactId>prettytime</artifactId>
</dependency>
<dependency>
<groupId>org.jooq</groupId>
<artifactId>jooq</artifactId>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
@ -123,10 +146,6 @@
<groupId>ru.cg.webbpm.modules.database</groupId>
<artifactId>database-impl</artifactId>
</dependency>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
</dependency>
<dependency>
<groupId>ru.cg.webbpm.modules.jndi</groupId>
<artifactId>jndi-beans</artifactId>
@ -199,6 +218,14 @@
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
</dependency>
<dependency>
<groupId>me.snowdrop</groupId>
<artifactId>narayana-spring-boot-starter</artifactId>
</dependency>
<dependency>
<groupId>io.agroal</groupId>
<artifactId>agroal-spring-boot-starter</artifactId>
</dependency>
</dependencies>
<build>
<finalName>${project.artifactId}</finalName>
@ -230,6 +257,21 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<version>2.7.18</version>
<executions>
<execution>
<goals>
<goal>repackage</goal>
</goals>
</execution>
</executions>
<configuration>
<mainClass>ru.micord.ervu.eks.App</mainClass>
</configuration>
</plugin>
</plugins>
</build>
<profiles>

View file

@ -1,31 +0,0 @@
import javax.servlet.ServletContext;
import javax.servlet.ServletException;
import org.springframework.web.servlet.support.AbstractAnnotationConfigDispatcherServletInitializer;
import org.springframework.web.util.IntrospectorCleanupListener;
/**
* This initializer creates root context and registers dispatcher servlet
* Spring scans for initializers automatically
*/
public class WebAppInitializer extends AbstractAnnotationConfigDispatcherServletInitializer {
public void onStartup(ServletContext servletContext) throws ServletException {
super.onStartup(servletContext);
servletContext.addListener(new IntrospectorCleanupListener());
}
protected String[] getServletMappings() {
return new String[]{"/"};
}
@Override
protected Class<?>[] getRootConfigClasses() {
return new Class[]{AppConfig.class};
}
@Override
protected Class<?>[] getServletConfigClasses() {
return new Class[0];
}
}

View file

@ -1,32 +1,27 @@
import net.javacrumbs.shedlock.core.LockProvider;
import net.javacrumbs.shedlock.provider.jdbctemplate.JdbcTemplateLockProvider;
import net.javacrumbs.shedlock.spring.ScheduledLockConfiguration;
import net.javacrumbs.shedlock.spring.ScheduledLockConfigurationBuilder;
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 org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.beans.factory.annotation.Value;
import net.javacrumbs.shedlock.core.LockProvider;
import net.javacrumbs.shedlock.provider.jdbctemplate.JdbcTemplateLockProvider;
import net.javacrumbs.shedlock.spring.annotation.EnableSchedulerLock;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration;
import org.springframework.boot.autoconfigure.transaction.TransactionAutoConfiguration;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.ComponentScan;
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.scheduling.concurrent.ThreadPoolTaskScheduler;
import org.springframework.web.client.RestTemplate;
import org.springframework.web.servlet.config.annotation.EnableWebMvc;
import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
import ru.cg.webbpm.modules.webkit.DispatcherConfig;
import javax.sql.DataSource;
import java.time.Duration;
/**
* Root application context
* This context imports XML configs from all the other jars, and is created by {@link WebAppInitializer}
* NB: modules are excluded from component scan since spring-context.xml sometimes holds important parameters and / or annotations
* @author krylov
*/
@Configuration
@ComponentScan(basePackages = {
"service",
@ -39,37 +34,34 @@ import java.time.Duration;
"component.addresses",
"gen",
"ru.cg",
"ru.micord"
"ru.micord",
"com.example.ervu_eks_5"
})
@EnableAspectJAutoProxy(proxyTargetClass = true)
@EnableWebMvc
@EnableScheduling
public class AppConfig {
@EnableScheduling()
@EnableSchedulerLock(defaultLockAtMostFor = "PT4H")
@SpringBootApplication(exclude = {
HibernateJpaAutoConfiguration.class,
TransactionAutoConfiguration.class,
})
public class App extends DispatcherConfig {
@Value("${config.data.executor.socket.timeout:10}")
private int socketTimeout;
@Value("${config.data.executor.connection.timeout:10}")
private int connectionTimeout;
public static void main(String[] args) {
SpringApplication.run(App.class, args);
}
@Bean
public PropertySourcesPlaceholderConfigurer propertySourcesPlaceholderConfigurer(){
public PropertySourcesPlaceholderConfigurer propertySourcesPlaceholderConfigurer() {
return new PropertySourcesPlaceholderConfigurer();
}
@Bean
public ScheduledLockConfiguration taskScheduler(LockProvider lockProvider) {
ThreadPoolTaskScheduler scheduler = new ThreadPoolTaskScheduler();
scheduler.setPoolSize(12);
scheduler.initialize();
return ScheduledLockConfigurationBuilder
.withLockProvider(lockProvider)
.withTaskScheduler(scheduler)
.withDefaultLockAtMostFor(Duration.ofHours(4))
.build();
}
@Bean
public LockProvider lockProvider(@Qualifier("datasource") DataSource dataSource) {
public LockProvider lockProvider(DataSource dataSource) {
return new JdbcTemplateLockProvider(dataSource);
}

View file

@ -1,14 +0,0 @@
<jboss-deployment-structure>
<deployment>
<exclusions>
<module name="com.fasterxml.jackson.core.jackson-core" />
<module name="com.fasterxml.jackson.core.jackson-databind" />
<module name="com.fasterxml.jackson.core.jackson-annotations" />
<module name="com.fasterxml.jackson.dataformat.jackson-dataformat-yaml" />
<module name="com.fasterxml.jackson.datatype.jackson-datatype-jdk8" />
<module name="com.fasterxml.jackson.datatype.jackson-datatype-jsr310" />
<module name="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider" />
<module name="org.jboss.resteasy.resteasy-jackson2-provider" />
</exclusions>
</deployment>
</jboss-deployment-structure>

View file

@ -3,23 +3,33 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>ru.micord.ervu</groupId>
<artifactId>eks</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
<groupId>ru.micord.ervu.eks</groupId>
<artifactId>config-data-executor</artifactId>
<packaging>war</packaging>
<version>1.0.0-SNAPSHOT</version>
<properties>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<spring-boot.version>2.7.18</spring-boot.version>
</properties>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-bom</artifactId>
<version>1.12.770</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.3.33</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
@ -50,6 +60,42 @@
<version>3.23.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.atomikos</groupId>
<artifactId>transactions-jta</artifactId>
<version>6.0.0</version>
</dependency>
<dependency>
<groupId>com.atomikos</groupId>
<artifactId>transactions-jdbc</artifactId>
<version>6.0.0</version>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.18.34</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.arangodb</groupId>
<artifactId>arangodb-java-driver</artifactId>
<version>7.7.1</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
<version>${spring-boot.version}</version>
</dependency>
<dependency>
<groupId>javax.transaction</groupId>
<artifactId>javax.transaction-api</artifactId>
<version>1.3</version>
</dependency>
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
<version>42.7.7</version>
</dependency>
</dependencies>
</dependencyManagement>
@ -125,14 +171,16 @@
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-s3</artifactId>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>ru.cg.webbpm.modules.core</groupId>
<artifactId>core-runtime-api</artifactId>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
<version>4.0.2</version>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
<version>4.0.5</version>
<scope>compile</scope>
</dependency>
</dependencies>
<repositories>
@ -145,14 +193,6 @@
<build>
<finalName>${project.artifactId}</finalName>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>3.1.0</version>
<configuration>
<failOnMissingWebXml>false</failOnMissingWebXml>
</configuration>
</plugin>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>

View file

@ -1,8 +0,0 @@
package org.micord;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
@SpringBootApplication
public class SpringBootTomcatApplication extends SpringBootServletInitializer {
}

View file

@ -1,7 +1,5 @@
# Описание параметров конфигурации сервера приложений
Файл /standalone/configuration/standalone.xml
## Общие
- `webbpm.security.login.case_sensitive`. Default value = true. Параметр отвечающий за чувствительность к регистру при обработке логина пользователя.
@ -12,6 +10,15 @@
- development - в этом режиме используется соединение к БД проекта, заданное в Studio.
- production - в этом режиме используется соединение к БД проекта, заданное с помощью jndi имени.
## Модуль BPMN
```bpmn.enable``` - по умолчанию true, отвечает за создание бинов использующих модуль bpmn (при флаге false можно убрать зависимости модуля, смотри **docs/ru/developer-guide/Отключение_bpmn_модуля.md**)
Пример:
```xml
<property name="bpmn.enable" value="false"/>
```
## jBPM
- `com.arjuna.ats.arjuna.allowMultipleLastResources`
@ -94,7 +101,7 @@
Проверить успешность авторизации principal-а можно командой `kinit -t -i http.keytab %principal%`.
В
случае успешной авторизации команда `klist` в качестве default principal которым проводилась авторизация.
После этого в standalone.xml поправить параметр `app.service-principal` на principal, которым успешно авторизовались. principal имеет формат: `HTTP/%hostname%@%REALM%`
После этого поправить параметр `app.service-principal` на principal, которым успешно авторизовались. principal имеет формат: `HTTP/%hostname%@%REALM%`
Пример конфигурации:
@ -191,7 +198,7 @@
... 69 more
```
необходимо проверить правильность указанного в standalone.xml principal-а.
необходимо проверить правильность указанного principal-а.
### Комбинации нескольких способов аутентификации
@ -328,13 +335,13 @@
<jndi-resource name="java:comp/env/webbpm/testResource" type="bpmn.handler.common.SmtpConfiguration">{"host":"host","port":1234,"login":"user","password":"password","from":"email_from","senderName":"sender_name","isSecured":true}</jndi-resource>
```
Почтовый сервер - зарегистрированный актуальный почтовый адрес. В поле password нужно указывать не пароль для входа в почту, а создать пароль для приложений в учетке почты и указать его.
2. Для включения регистрации добавьте в *standalone.xml* свойство
2. Для включения регистрации добавьте свойство
```
<property name="registration.enabled" value="true"/>
registration.enabled=true"
```
3. Также в *standalone.xml* укажите ресурс для отправки писем для подтверждения регистрации (из п.1)
3. Укажите ресурс для отправки писем для подтверждения регистрации (из п.1)
```
<property name="mail.jndi.resource.name" value="java:comp/env/webbpm/testResource"/>
mail.jndi.resource.name=java:comp/env/webbpm/testResource
```
4. При необходимости, отредактируйте шаблон письма для подтверждения регистрации
(resources/src/main/resources/mail/confirmation.html)
@ -483,8 +490,6 @@ public class Main {
## Настройка логов
Все настройки делаются в файле `standalone.xml`, если не указано иначе.
### Общие настройки
Платформа Web-bpm использует корневую категорию логирования `ru.cg.webbpm`, рекомендуется выставлять ее в уровень `info`. todo check prod config
@ -686,7 +691,6 @@ JBPM использует 3 корневых категории логирова
- `dev_mode` - настройка задающая dev_mode для просмотра логов (true/false). При отсутствие оставляет значение при сборке
- `guard.confirm_exit` - выводить или нет диалог подтверждения, если обнаружены несохраненные данные в форме. Значение по умолчанию - false.
- `password.pattern` - Регулярное выражение для валидации пароля.
- `password_pattern_error` - Сообщение об ошибке валидации.
- `show.client.errors` - отвечает за отображение ошибок javascript-a пользователю (должна использоваться только в тестовых контурах) по умолчанию выключена
- 'available_task.single_fetch' - Отвечает за количество запросов available_task при завершении процесса. true - одиночный запрос, false/не указано - 10 запросов(старая реализация).
@ -701,19 +705,30 @@ JBPM использует 3 корневых категории логирова
### Esmart
- `electronic_sign.esmart_extension_url` - url для создания расширенной подписи. Подробная информация по ссылке [http://demo.esmart.ru](http://demo.esmart.ru)
- `electronic_sign.tsp_address` - адрес сервера службы штампов времени
- `electronic_sign.esmart_plugin.tsp_address` - url для создания расширенной подписи. Подробная информация по ссылке [http://demo.esmart.ru](http://demo.esmart.ru)
- `electronic_sign.cades_plugin.tsp_address` - адрес сервера службы штампов времени
Пример:
```text
"electronic_sign.esmart_extension_url": "http://dsig.ibsdemo.ru/ibs_dsig/ibs_dSig.asmx"
"electronic_sign.esmart_plugin.tsp_address": " http://dsig.rubydemo.ru/ibs_dsig/ibs_dSig.asmx"
```
## Способ аутентификации
- `auth_method` - способ аутентификации. Может принимать одно значение из списка: form, kerberos, cert_over_db, cert_over_ldap
## Url проекта
- `backend.url` - задает url для проека. Если параметра нет, то берется дефолтные:
```
window.location.protocol + '//' + window.location.hostname + ':' + window.location.port + '/backend'
```
Пример:
```
http://10.10.31.80:8080/
```
## Таймер очистки закешированных значений фильтров
- `filter_cleanup_interval_hours` - время жизни закешированного значения фильтра в часах. По умолчанию - 720 часов,

1
config/.env Normal file
View file

@ -0,0 +1 @@
IMAGE=eks-app:latest

View file

@ -1,43 +0,0 @@
FROM quay.io/wildfly/wildfly:26.1.3.Final-jdk17
USER root
ARG POSTGRES_DRIVER_VERSION=42.7.3
RUN yum-config-manager --disable base --disable extras --disable updates \
&& yum-config-manager --enable C7.8.2003-base --enable C7.8.2003-extras --enable C7.8.2003-updates \
&& yum -y --disableplugin=fastestmirror install sudo \
&& chown -R jboss: /opt/jboss/
USER jboss
WORKDIR $JBOSS_HOME
ENV JAVA_ARGS=-Xmx3g
RUN echo 'JAVA_OPTS="$JAVA_OPTS -agentlib:jdwp=transport=dt_socket,address=*:8787,server=y,suspend=n"' >> bin/standalone.conf && \
echo 'JAVA_OPTS="$JAVA_OPTS -XX:MaxMetaspaceSize=1g"' >> bin/standalone.conf && \
echo 'JAVA_OPTS="$JAVA_OPTS -XX:+UseStringDeduplication -XX:+ParallelRefProcEnabled -XX:+ExplicitGCInvokesConcurrent"' >> bin/standalone.conf && \
echo 'JAVA_OPTS="$JAVA_OPTS -XX:+UnlockDiagnosticVMOptions -XX:G1SummarizeRSetStatsPeriod=1"' >> bin/standalone.conf && \
echo 'JAVA_OPTS="$JAVA_OPTS -Dfile.encoding=UTF-8"' >> bin/standalone.conf && \
echo 'JAVA_OPTS="$JAVA_OPTS -XX:-OmitStackTraceInFastThrow"' >> bin/standalone.conf && \
echo 'JAVA_OPTS="$JAVA_OPTS -Dorg.jboss.logmanager.nocolor=true"' >> bin/standalone.conf && \
echo 'JAVA_OPTS="$JAVA_OPTS $JAVA_ARGS"' >> bin/standalone.conf
### Locale support ru_RU ###
USER root
RUN localedef -i ru_RU -f UTF-8 ru_RU.UTF-8
RUN echo "LANG=\"ru_RU.UTF-8\"" > /etc/locale.conf
USER jboss
ENV LANG ru_RU.UTF-8
ENV LANGUAGE ru_RU.UTF-8
ENV LC_ALL ru_RU.UTF-8
### Locale Support END ###
COPY --chown=jboss entrypoint.sh .
COPY --chown=jboss patches patches
RUN (cd patches && wget https://repo.micord.ru/repository/libs-releases-local/org/jboss/ironjacamar/ironjacamar-core-impl/1.5.3.Final/ironjacamar-core-impl-1.5.3.Final.jar)
RUN (cd patches/system && wget https://repo1.maven.org/maven2/org/postgresql/postgresql/$POSTGRES_DRIVER_VERSION/postgresql-$POSTGRES_DRIVER_VERSION.jar -O postgresql-driver.jar)
RUN chmod -R +x patches && \
chmod +x entrypoint.sh && \
./entrypoint.sh && \
rm -rf patches
ENV SERVER_START=true
COPY --chown=jboss *.ear $JBOSS_HOME/standalone/deployments/
COPY --chown=jboss *.war $JBOSS_HOME/standalone/deployments/

View file

@ -1,58 +0,0 @@
FROM maven:3-openjdk-17-slim AS builder
RUN apt update \
&& apt upgrade -y \
&& curl -fsSL https://deb.nodesource.com/setup_14.x | bash - \
&& apt install -y git nodejs \
&& rm -rf /var/lib/apt/lists/*
WORKDIR /app
COPY ../ .
RUN mvn clean \
&& mvn package -T4C \
&& cd config-data-executor \
&& mvn clean \
&& mvn package -T4C
FROM quay.io/wildfly/wildfly:26.1.3.Final-jdk17
USER root
ARG POSTGRES_DRIVER_VERSION=42.7.3
RUN yum-config-manager --disable base --disable extras --disable updates \
&& yum-config-manager --enable C7.8.2003-base --enable C7.8.2003-extras --enable C7.8.2003-updates \
&& yum -y --disableplugin=fastestmirror install sudo \
&& chown -R jboss: /opt/jboss/
USER jboss
WORKDIR $JBOSS_HOME
ENV JAVA_ARGS=-Xmx3g
RUN echo 'JAVA_OPTS="$JAVA_OPTS -agentlib:jdwp=transport=dt_socket,address=*:8787,server=y,suspend=n"' >> bin/standalone.conf && \
echo 'JAVA_OPTS="$JAVA_OPTS -XX:MaxMetaspaceSize=1g"' >> bin/standalone.conf && \
echo 'JAVA_OPTS="$JAVA_OPTS -XX:+UseStringDeduplication -XX:+ParallelRefProcEnabled -XX:+ExplicitGCInvokesConcurrent"' >> bin/standalone.conf && \
echo 'JAVA_OPTS="$JAVA_OPTS -XX:+UnlockDiagnosticVMOptions -XX:G1SummarizeRSetStatsPeriod=1"' >> bin/standalone.conf && \
echo 'JAVA_OPTS="$JAVA_OPTS -Dfile.encoding=UTF-8"' >> bin/standalone.conf && \
echo 'JAVA_OPTS="$JAVA_OPTS -XX:-OmitStackTraceInFastThrow"' >> bin/standalone.conf && \
echo 'JAVA_OPTS="$JAVA_OPTS -Dorg.jboss.logmanager.nocolor=true"' >> bin/standalone.conf && \
echo 'JAVA_OPTS="$JAVA_OPTS $JAVA_ARGS"' >> bin/standalone.conf
### Locale support ru_RU ###
USER root
RUN localedef -i ru_RU -f UTF-8 ru_RU.UTF-8
RUN echo "LANG=\"ru_RU.UTF-8\"" > /etc/locale.conf
USER jboss
ENV LANG ru_RU.UTF-8
ENV LANGUAGE ru_RU.UTF-8
ENV LC_ALL ru_RU.UTF-8
### Locale Support END ###
COPY --chown=jboss config/entrypoint.sh .
COPY --chown=jboss config/patches patches
RUN (cd patches && wget https://repo.micord.ru/repository/libs-releases-local/org/jboss/ironjacamar/ironjacamar-core-impl/1.5.3.Final/ironjacamar-core-impl-1.5.3.Final.jar)
RUN (cd patches/system && wget https://repo1.maven.org/maven2/org/postgresql/postgresql/$POSTGRES_DRIVER_VERSION/postgresql-$POSTGRES_DRIVER_VERSION.jar -O postgresql-driver.jar)
RUN chmod -R +x patches && \
chmod +x entrypoint.sh && \
./entrypoint.sh && \
rm -rf patches
ENV SERVER_START=true
COPY --from=builder --chown=jboss /app/distribution/target/*.ear $JBOSS_HOME/standalone/deployments/
COPY --from=builder --chown=jboss /app/config-data-executor/target/*.war $JBOSS_HOME/standalone/deployments/

18
config/Dockerfile.tc Normal file
View file

@ -0,0 +1,18 @@
ARG RUNTIME_IMAGE=reg.gitlab.micord.ru/common/base/alt/alt-p11-jre17:latest
FROM $RUNTIME_IMAGE
RUN apt-get update \
&& apt-get -y install nginx
ENV BACKEND_URL=http://localhost:8080
ENV CONFIG_DATA_EXECUTOR_URL=http://localhost:8080/api
COPY nginx.conf /etc/nginx/nginx.conf
COPY dist /usr/share/nginx/html
COPY backend.jar /home/app/backend.jar
COPY config-data-executor.jar /home/app/cde.jar
EXPOSE 80
ENTRYPOINT ["java", "-jar", "/home/app/backend.jar"]

1
config/NODEJS_version Normal file
View file

@ -0,0 +1 @@
v20

88
config/application.yaml Normal file
View file

@ -0,0 +1,88 @@
config:
data:
executor:
socket:
timeout: 10
connection:
timeout: 10
url: http://localhost:8080/api
webbpm:
mode: development
security:
token:
secret:
key: de2c9de3-0de5-47c1-a8de-0fad6f93873b-com.example-ervu_eks_5-17_10_2025_13:18
server:
servlet:
context-path: /ervu-eks
bpmn:
enable: false
gar:
enable: false
fias:
enable: false
spring:
mvc:
servlet:
loadOnStartup: 1
jackson:
serialization:
write-dates-as-timestamps: false
write-enums-using-to-string: true
deserialization:
read-enums-using-to-string: true
task:
scheduling:
pool:
size: 12
datasource:
person:
url: jdbc:postgresql://127.0.0.1:5432/person_registry
username: ${SPRING_DATASOURCE_PERSON_USERNAME}
password: ${SPRING_DATASOURCE_PERSON_PASSWORD}
driverClassName: org.postgresql.Driver
dbBeanPackage: com.example.ervu_eks_5.db_beans.person
sqlDialect: POSTGRES
default: false
manually: true
schemas:
- public
security:
url: jdbc:postgresql://127.0.0.1:5432/ervu_eks
username: ${SPRING_DATASOURCE_SECURITY_USERNAME}
password: ${SPRING_DATASOURCE_SECURITY_PASSWORD}
driverClassName: org.postgresql.Driver
dbBeanPackage: com.example.ervu_eks_5.db_beans.security
sqlDialect: POSTGRES
maxSize: 7
metricsEnabled: true
default: true
manually: true
schemas:
- security
monitoring:
white:
ip:
list: 127.0.0.1, 0:0:0:0:0:0:0:1
management:
endpoints:
web:
exposure:
include: info,health,metrics,prometheus
metrics:
export:
prometheus:
enabled: true
logging:
level:
root: INFO
org:
jooq:
tools: DEBUG
ru:
cg:
webbpm:
modules:
database:
impl:
analytics: DEBUG

View file

@ -1,20 +0,0 @@
# App datasource
DB_APP_NAME=ervu_eks
DB_APP_HOST=db
DB_APP_PORT=5432
DB_APP_USERNAME=ervu_eks
DB_APP_PASSWORD=ervu_eks
# Security datasource
DB_SEC_NAME=ervu_eks
DB_SEC_HOST=db
DB_SEC_PORT=5432
DB_SEC_USERNAME=ervu_eks_sec
DB_SEC_PASSWORD=ervu_eks_sec
# Person datasource
DB_PERSON_NAME=person_registry
DB_PERSON_HOST=10.10.31.118
DB_PERSON_PORT=5432
DB_PERSON_USERNAME=ervu
DB_PERSON_PASSWORD=ervu

View file

@ -1,31 +0,0 @@
version: "3"
services:
db:
image: postgres:15-bullseye
volumes:
- ./initdb.d:/docker-entrypoint-initdb.d
- db-data:/var/lib/postgresql/data
command:
- "--max_prepared_transactions=100"
ports:
- "127.0.0.1:5432:5432"
environment:
- POSTGRES_PASSWORD=supersecretpassword
- TZ="Europe/Moscow"
webbpm-app:
image: ervu-eks:latest
depends_on:
- db
ports:
- "127.0.0.1:9990:9990"
- "127.0.0.1:8080:8080"
volumes:
- ./cde-xml:/cde-xml
environment:
- TZ="Europe/Moscow"
env_file:
- db.env
volumes:
db-data:

View file

@ -0,0 +1,34 @@
#version: "3"
services:
eks-backend:
build:
dockerfile: Dockerfile.tc
entrypoint: ["java", "-jar", "/home/app/backend.jar"]
environment:
- TZ="Europe/Moscow"
- CONFIG_DATA_EXECUTOR_URL=http://eks-cde:8080/api
env_file:
- tc.env
eks-frontend:
build:
dockerfile: Dockerfile.tc
depends_on:
- eks-backend
ports:
- "80"
entrypoint: ["nginx", "-g", "daemon off;"]
environment:
- TZ="Europe/Moscow"
eks-cde:
build:
dockerfile: Dockerfile.tc
entrypoint: ["java", "-jar", "/home/app/cde.jar"]
volumes:
- ./cde-xml:/cde-xml
environment:
- CONFIGDIRECTORY=/cde-xml
volumes:
db-data:

View file

@ -1,14 +1,45 @@
version: "3"
services:
webbpm-app:
build:
context: .
dockerfile: Dockerfile
db:
image: postgres:15-bullseye
volumes:
- ./initdb.d:/docker-entrypoint-initdb.d
- db-data:/var/lib/postgresql/data
command:
- "--max_prepared_transactions=100"
ports:
- "127.0.0.1:5432:5432"
environment:
- POSTGRES_PASSWORD=supersecretpassword
- TZ="Europe/Moscow"
eks-backend:
image: ${IMAGE:-eks-app:latest}
depends_on:
- db
entrypoint: ["java", "-jar", "/home/app/backend.jar"]
environment:
- TZ="Europe/Moscow"
- CONFIG_DATA_EXECUTOR_URL=http://eks-cde:8080/api
env_file:
- eks.env
eks-frontend:
image: ${IMAGE:-eks-app:latest}
depends_on:
- eks-backend
ports:
- "127.0.0.1:8080:80"
entrypoint: ["nginx", "-g", "daemon off;"]
environment:
- TZ="Europe/Moscow"
eks-cde:
image: ${IMAGE:-eks-app:latest}
entrypoint: ["java", "-jar", "/home/app/cde.jar"]
volumes:
- ./cde-xml:/cde-xml
ports:
- 8080
- 8787
- 9990
env_file:
- micord.env
environment:
- CONFIGDIRECTORY=/cde-xml
volumes:
db-data:

41
config/eks.env Normal file
View file

@ -0,0 +1,41 @@
CONFIG_DATA_EXECUTOR_SOCKET_TIMEOUT=10
CONFIG_DATA_EXECUTOR_CONNECTION_TIMEOUT=10
CONFIG_DATA_EXECUTOR_URL=http://localhost:8080/api
WEBBPM_MODE=development
WEBBPM_SECURITY_TOKEN_SECRET_KEY=de2c9de3-0de5-47c1-a8de-0fad6f93873b-com.example-ervu_eks_5-17_10_2025_13:18
SERVER_SERVLET_CONTEXT_PATH=/ervu-eks
BPMN_ENABLE=false
GAR_ENABLE=false
FIAS_ENABLE=false
SPRING_MVC_SERVLET_LOADONSTARTUP=1
SPRING_JACKSON_SERIALIZATION_WRITEDATESASTIMESTAMPS=false
SPRING_JACKSON_SERIALIZATION_WRITEENUMSUSINGTOSTRING=true
SPRING_JACKSON_DESERIALIZATION_READENUMSUSINGTOSTRING=true
SPRING_TASK_SCHEDULING_POOL_SIZE=12
SPRING_DATASOURCE_PERSON_URL=jdbc:postgresql://10.10.31.118:5432/person_registry
SPRING_DATASOURCE_PERSON_USERNAME=ervu
SPRING_DATASOURCE_PERSON_PASSWORD=ervu
SPRING_DATASOURCE_PERSON_DRIVERCLASSNAME=org.postgresql.Driver
SPRING_DATASOURCE_PERSON_DBBEANPACKAGE=com.example.ervu_eks_5.db_beans.person
SPRING_DATASOURCE_PERSON_SQLDIALECT=POSTGRES
SPRING_DATASOURCE_PERSON_DEFAULT=false
SPRING_DATASOURCE_PERSON_MANUALLY=true
SPRING_DATASOURCE_SECURITY_URL=jdbc:postgresql://db:5432/ervu_eks
SPRING_DATASOURCE_SECURITY_USERNAME=ervu_eks_sec
SPRING_DATASOURCE_SECURITY_PASSWORD=ervu_eks_sec
SPRING_DATASOURCE_SECURITY_DRIVERCLASSNAME=org.postgresql.Driver
SPRING_DATASOURCE_SECURITY_DBBEANPACKAGE=com.example.ervu_eks_5.db_beans.security
SPRING_DATASOURCE_SECURITY_SQLDIALECT=POSTGRES
SPRING_DATASOURCE_SECURITY_MAXSIZE=7
SPRING_DATASOURCE_SECURITY_METRICSENABLED=true
SPRING_DATASOURCE_SECURITY_DEFAULT=true
SPRING_DATASOURCE_SECURITY_MANUALLY=true
MONITORING_WHITE_IP_LIST=127.0.0.1, 0:0:0:0:0:0:0:1
MANAGEMENT_ENDPOINTS_WEB_EXPOSURE_INCLUDE=info,health,metrics,prometheus
MANAGEMENT_METRICS_EXPORT_PROMETHEUS_ENABLED=true
LOGGING_LEVEL_ROOT=INFO
LOGGING_LEVEL_ORG_JOOQ_TOOLS=DEBUG
LOGGING_LEVEL_RU_CG_WEBBPM_MODULES_DATABASE_IMPL_ANALYTICS=DEBUG

View file

@ -1,48 +0,0 @@
#! /bin/bash
set -e
function wait_for_server() {
until `$JBOSS_HOME/bin/jboss-cli.sh -c ":read-attribute(name=server-state)" 2> /dev/null | grep -q running`; do
echo "Retry ..."
done
}
echo "dump environment variables to env.properties file"
printenv > env.properties
echo "starting JBoss"
nohup $JBOSS_HOME/bin/standalone.sh --admin-only 1>&2 2>/dev/null &
# running system patches
wait_for_server
$JBOSS_HOME/bin/jboss-cli.sh --connect --file="./patches/system/init.cli" --properties=env.properties
$JBOSS_HOME/bin/jboss-cli.sh --connect --file="./patches/system/add-postgresql-driver.cli" --properties=env.properties
bash "./patches/system/add-demo-user.sh"
# running project patches
find ./patches/ -type f -name '*.cli' -not -path './patches/system/*' -print0 |
while IFS= read -r -d '' f; do
wait_for_server
echo "running $f"
$JBOSS_HOME/bin/jboss-cli.sh --connect --file="$f" --properties=env.properties
done;
find ./patches/ -type f -name '*.sh' -not -path './patches/system/*' -print0 |
while IFS= read -r -d '' f; do
wait_for_server
echo "running $f"
bash "$f"
done
echo "stopping JBoss"
wait_for_server
$JBOSS_HOME/bin/jboss-cli.sh --connect --command=:shutdown
if ! [[ -z $SERVER_START ]]; then
echo "starting JBoss in standalone"
sleep 10 # without this occurs error "address already in use"
/opt/jboss/wildfly/bin/standalone.sh -c standalone.xml -b 0.0.0.0 -bmanagement 0.0.0.0
else
echo "cleaning up JBoss logs"
rm -rf $JBOSS_HOME/standalone/log
fi

View file

@ -1,22 +0,0 @@
TZ=Europe/Moscow
# App datasource
DB_APP_USERNAME=ervu_eks
DB_APP_PASSWORD=ervu_eks
DB_APP_HOST=10.10.31.118
DB_APP_PORT=5432
DB_APP_NAME=ervu_eks
# Security datasource
DB_SEC_USERNAME=ervu_eks_sec
DB_SEC_PASSWORD=ervu_eks_sec
DB_SEC_HOST=10.10.31.118
DB_SEC_PORT=5432
DB_SEC_NAME=ervu_eks
# Person datasource
DB_PERSON_USERNAME=ervu
DB_PERSON_PASSWORD=ervu
DB_PERSON_HOST=10.10.31.118
DB_PERSON_PORT=5432
DB_PERSON_NAME=person_registry

88
config/nginx.conf Normal file
View file

@ -0,0 +1,88 @@
include /etc/nginx/modules-enabled.d/*.conf;
worker_processes 10;
error_log /var/log/nginx/error.log;
events {
worker_connections 1024;
}
include /etc/nginx/conf-enabled.d/*.conf;
http {
include /etc/nginx/mime.types;
default_type application/octet-stream;
sendfile on;
gzip on;
gzip_types text/plain text/css text/xml application/x-javascript application/atom+xml;
log_format nginx_main
'$remote_addr - $remote_user [$time_local] $request '
'"$status" $body_bytes_sent "$http_referer" '
'"$http_user_agent" "$http_x_forwarded_for" '
'"$request_filename" "$gzip_ratio" $upstream_response_time server: $host : $document_root $fastcgi_script_name ';
server {
listen 80 default;
access_log /var/log/nginx/access.log nginx_main;
error_log /var/log/nginx/error.log error;
root /usr/share/nginx/html;
charset utf-8;
client_max_body_size 32m;
gzip on;
gzip_disable "msie6";
gzip_vary on;
gzip_proxied any;
gzip_comp_level 6;
gzip_buffers 16 8k;
gzip_http_version 1.1;
gzip_min_length 256;
gzip_types
application/atom+xml
application/geo+json
application/javascript
application/x-javascript
application/json
application/ld+json
application/manifest+json
application/rdf+xml
application/rss+xml
application/xhtml+xml
application/xml
font/eot
font/otf
font/ttf
image/svg+xml
text/css
text/javascript
text/plain
text/xml;
location ~* \.(?:jpg|jpeg|gif|png|ico|cur|gz|svg|svgz|mp4|mp3|ogg|ogv|webm|htc|woff2|woff|ttf)$ {
expires 1M;
access_log off;
add_header Cache-Control "max-age=2629746, public";
}
location /ervu-eks/ {
proxy_pass http://eks-backend:8080/ervu-eks/;
proxy_set_header Accept application/json;
add_header Content-Type application/json;
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
}
location = /health {
access_log off;
add_header 'Content-Type' 'application/json';
return 200 '{"status":"UP"}';
}
}
}

View file

@ -1,3 +0,0 @@
/subsystem=logging/logger=org.jooq.tools:add()
/subsystem=logging/logger=org.jooq.tools:write-attribute(name=level, value=DEBUG)
/subsystem=logging/logger=org.jooq.tools:add-handler(name=CONSOLE)

View file

@ -1,68 +0,0 @@
xa-data-source add \
--name=AppDS \
--enabled=true \
--driver-name=postgresql \
--jndi-name=java:/webbpm/AppDS \
--user-name=${env.DB_APP_USERNAME:app_user} \
--password=${env.DB_APP_PASSWORD:apppassword} \
--use-ccm=true \
--valid-connection-checker-class-name=org.jboss.jca.adapters.jdbc.extensions.postgres.PostgreSQLValidConnectionChecker \
--validate-on-match=false \
--background-validation=true \
--background-validation-millis=5000 \
--exception-sorter-class-name=org.jboss.jca.adapters.jdbc.extensions.postgres.PostgreSQLExceptionSorter \
--statistics-enabled=true \
--max-pool-size=50 \
--query-timeout=300 \
--xa-datasource-properties=ServerName=${env.DB_APP_HOST:db},PortNumber=${env.DB_APP_PORT:5432},DatabaseName=${env.DB_APP_NAME:app}
xa-data-source add \
--name=SECURITYDS \
--enabled=true \
--driver-name=postgresql \
--jndi-name=java:/webbpm/security-ds \
--user-name=${env.DB_SEC_USERNAME:security_user} \
--password=${env.DB_SEC_PASSWORD:secpassword} \
--max-pool-size=70 \
--valid-connection-checker-class-name=org.jboss.jca.adapters.jdbc.extensions.postgres.PostgreSQLValidConnectionChecker \
--validate-on-match=false \
--background-validation=true \
--background-validation-millis=5000 \
--exception-sorter-class-name=org.jboss.jca.adapters.jdbc.extensions.postgres.PostgreSQLExceptionSorter \
--statistics-enabled=true \
--query-timeout=300 \
--xa-datasource-properties=ServerName=${env.DB_SEC_HOST:db},PortNumber=${env.DB_SEC_PORT:5432},DatabaseName=${env.DB_SEC_NAME:app}
data-source add \
--name=PERSONDS \
--enabled=true \
--driver-name=postgresql \
--connection-url=jdbc:postgresql://${env.DB_PERSON_HOST:db}:${env.DB_PERSON_PORT:5432}/${env.DB_PERSON_NAME:person_registry} \
--jndi-name=java:/webbpm/personRegistryDS \
--user-name=${env.DB_PERSON_USERNAME:ervu} \
--password=${env.DB_PERSON_PASSWORD:ervu} \
--valid-connection-checker-class-name=org.jboss.jca.adapters.jdbc.extensions.postgres.PostgreSQLValidConnectionChecker \
--validate-on-match=false \
--background-validation=true \
--background-validation-millis=5000 \
--exception-sorter-class-name=org.jboss.jca.adapters.jdbc.extensions.postgres.PostgreSQLExceptionSorter \
--statistics-enabled=true \
--query-timeout=300 \
--max-pool-size=10
/system-property=ldap.mapping.login.param:add(value=${env.WEBBPM_LDAP_LOGIN_ATTR:uid})
/system-property=ldap.mapping.org.code.param:add(value=${env.WEBBPM_LDAP_ORGANIZATION_ATTR:ou})
/system-property=jboss.as.management.blocking.timeout:add(value=900)
/subsystem=undertow/server=default-server/http-listener=default/:write-attribute(name=record-request-start-time,value=true)
/subsystem=undertow/server=default-server/host=default-host/setting=access-log:add(pattern=%h %t "%r" %s %b %D)
/system-property=webbpm.cache.hazelcast.hosts:add(value="127.0.0.1")
/system-property=webbpm.cache.hazelcast.outbound_port_definitions:add(value="5801-5820")
/system-property=webbpm.security.session.active.count:add(value="20")
/system-property=security.password.regex:add(value="^((?=(.*\\d){1,})(?=.*[a-zа-яё])(?=.*[A-ZА-ЯЁ]).{8,})$")
/system-property=gar.enable:add(value=false)
/system-property=fias.enable:add(value=false)
/system-property=bpmn.enable:add(value=false)
/system-property=config.data.executor.url:add(value="http://localhost:8080/config-data-executor/api")
/system-property=config.data.executor.socket.timeout:add(value="10")
/system-property=config.data.executor.connection.timeout:add(value="10")
/system-property=configDirectory:add(value="/cde-xml")

View file

@ -1 +0,0 @@
$JBOSS_HOME/bin/add-user.sh demo@example.com demo

View file

@ -1,5 +0,0 @@
/subsystem=datasources/jdbc-driver=postgresql:add( \
driver-name="postgresql", \
driver-module-name="org.postgresql", \
driver-xa-datasource-class-name="org.postgresql.xa.PGXADataSource" \
)

View file

@ -1,14 +0,0 @@
/system-property=webbpm.mode:add(value=production)
/system-property=authentication.method:add(value=form)
/subsystem=undertow/configuration=filter/gzip=gzipFilter:add()
/subsystem=undertow/server=default-server/host=default-host/\
filter-ref=gzipFilter:add(predicate="exists('%{o,Content-Type}') and regex(pattern='(?:application/javascript|text/css|text/html|text/xml|application/json)(;.*)?', value=%{o,Content-Type}, full-match=true)")
/subsystem=undertow/configuration=filter/response-header=vary-header:add(header-name="Vary", header-value="Accept-Encoding")
/subsystem=undertow/server=default-server/host=default-host/filter-ref=vary-header:add()
/subsystem=undertow/server=default-server/http-listener=default/:write-attribute(name=max-post-size,value=${env.MAX_POST_SIZE:104857600})
data-source remove --name=ExampleDS
/subsystem=ee/service=default-bindings:remove
/system-property=jboss.bind.address.management:add(value=0.0.0.0)
/system-property=jboss.bind.address:add(value=0.0.0.0)
module add --name=org.postgresql --resources=./patches/system/postgresql-driver.jar --dependencies=javax.api,javax.transaction.api
shutdown --restart

19
config/settings.xml Normal file
View file

@ -0,0 +1,19 @@
<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
https://maven.apache.org/xsd/settings-1.0.0.xsd">
<mirrors>
<mirror>
<id>rtsk-ext</id>
<name>rtsk ext</name>
<url>https://nexus.ervu.rt-sk.ru/repository/micord-maven/</url>
<mirrorOf>micord</mirrorOf>
</mirror>
<mirror>
<id>central</id>
<name>Central mirror</name>
<url>https://nexus.ervu.rt-sk.ru/repository/maven-public/</url>
<mirrorOf>*</mirrorOf>
</mirror>
</mirrors>
</settings>

View file

@ -1,590 +0,0 @@
<?xml version="1.0" ?>
<server xmlns="urn:jboss:domain:19.0">
<extensions>
<extension module="org.jboss.as.clustering.infinispan"/>
<extension module="org.jboss.as.connector"/>
<extension module="org.jboss.as.deployment-scanner"/>
<extension module="org.jboss.as.ee"/>
<extension module="org.jboss.as.ejb3"/>
<extension module="org.jboss.as.jaxrs"/>
<extension module="org.jboss.as.jdr"/>
<extension module="org.jboss.as.jmx"/>
<extension module="org.jboss.as.jpa"/>
<extension module="org.jboss.as.jsf"/>
<extension module="org.jboss.as.logging"/>
<extension module="org.jboss.as.mail"/>
<extension module="org.jboss.as.naming"/>
<extension module="org.jboss.as.pojo"/>
<extension module="org.jboss.as.remoting"/>
<extension module="org.jboss.as.sar"/>
<extension module="org.jboss.as.transactions"/>
<extension module="org.jboss.as.webservices"/>
<extension module="org.jboss.as.weld"/>
<extension module="org.wildfly.extension.batch.jberet"/>
<extension module="org.wildfly.extension.bean-validation"/>
<extension module="org.wildfly.extension.clustering.web"/>
<extension module="org.wildfly.extension.core-management"/>
<extension module="org.wildfly.extension.discovery"/>
<extension module="org.wildfly.extension.ee-security"/>
<extension module="org.wildfly.extension.elytron"/>
<extension module="org.wildfly.extension.elytron-oidc-client"/>
<extension module="org.wildfly.extension.health"/>
<extension module="org.wildfly.extension.io"/>
<extension module="org.wildfly.extension.metrics"/>
<extension module="org.wildfly.extension.microprofile.config-smallrye"/>
<extension module="org.wildfly.extension.microprofile.jwt-smallrye"/>
<extension module="org.wildfly.extension.microprofile.opentracing-smallrye"/>
<extension module="org.wildfly.extension.request-controller"/>
<extension module="org.wildfly.extension.security.manager"/>
<extension module="org.wildfly.extension.undertow"/>
</extensions>
<system-properties>
<property name="webbpm.mode" value="production"/>
<property name="authentication.method" value="form"/>
<property name="jboss.bind.address.management" value="0.0.0.0"/>
<property name="jboss.bind.address" value="0.0.0.0"/>
<property name="ldap.mapping.login.param" value="${env.WEBBPM_LDAP_LOGIN_ATTR:uid}"/>
<property name="ldap.mapping.org.code.param" value="${env.WEBBPM_LDAP_ORGANIZATION_ATTR:ou}"/>
<property name="jboss.as.management.blocking.timeout" value="900"/>
<property name="webbpm.cache.hazelcast.hosts" value="127.0.0.1"/>
<property name="webbpm.cache.hazelcast.outbound_port_definitions" value="5801-5820"/>
<property name="webbpm.security.session.active.count" value="20"/>
<property name="security.password.regex" value="^((?=(.*\d){1,})(?=.*[a-zа-яё])(?=.*[A-ZА-ЯЁ]).{8,})$"/>
<property name="gar.enable" value="false"/>
<property name="fias.enable" value="false"/>
<property name="bpmn.enable" value="false"/>
<property name="com.arjuna.ats.arjuna.allowMultipleLastResources" value="true"/>
<property name="config.data.executor.url" value="http://localhost:8080/config-data-executor/api"/>
<property name="config.data.executor.socket.timeout" value="10"/>
<property name="config.data.executor.connection.timeout" value="10"/>
<property name="configDirectory" value="C:\work\ervu-eks\config-data-executor\config-examples"/>
</system-properties>
<management>
<audit-log>
<formatters>
<json-formatter name="json-formatter"/>
</formatters>
<handlers>
<file-handler name="file" formatter="json-formatter" path="audit-log.log" relative-to="jboss.server.data.dir"/>
</handlers>
<logger log-boot="true" log-read-only="false" enabled="false">
<handlers>
<handler name="file"/>
</handlers>
</logger>
</audit-log>
<management-interfaces>
<http-interface http-authentication-factory="management-http-authentication">
<http-upgrade enabled="true" sasl-authentication-factory="management-sasl-authentication"/>
<socket-binding http="management-http"/>
</http-interface>
</management-interfaces>
<access-control provider="simple">
<role-mapping>
<role name="SuperUser">
<include>
<user name="$local"/>
</include>
</role>
</role-mapping>
</access-control>
</management>
<profile>
<subsystem xmlns="urn:jboss:domain:logging:8.0">
<console-handler name="CONSOLE">
<level name="INFO"/>
<formatter>
<named-formatter name="COLOR-PATTERN"/>
</formatter>
</console-handler>
<periodic-rotating-file-handler name="FILE" autoflush="true">
<formatter>
<named-formatter name="PATTERN"/>
</formatter>
<file relative-to="jboss.server.log.dir" path="server.log"/>
<suffix value=".yyyy-MM-dd"/>
<append value="true"/>
</periodic-rotating-file-handler>
<logger category="com.arjuna">
<level name="WARN"/>
</logger>
<logger category="io.jaegertracing.Configuration">
<level name="WARN"/>
</logger>
<logger category="org.jboss.as.config">
<level name="DEBUG"/>
</logger>
<logger category="sun.rmi">
<level name="WARN"/>
</logger>
<logger category="org.jooq.tools">
<level name="DEBUG"/>
<handlers>
<handler name="CONSOLE"/>
</handlers>
</logger>
<root-logger>
<level name="INFO"/>
<handlers>
<handler name="CONSOLE"/>
<handler name="FILE"/>
</handlers>
</root-logger>
<formatter name="PATTERN">
<pattern-formatter pattern="%d{yyyy-MM-dd HH:mm:ss,SSS} %-5p [%c] (%t) %s%e%n"/>
</formatter>
<formatter name="COLOR-PATTERN">
<pattern-formatter pattern="%K{level}%d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%e%n"/>
</formatter>
</subsystem>
<subsystem xmlns="urn:jboss:domain:batch-jberet:3.0">
<default-job-repository name="in-memory"/>
<default-thread-pool name="batch"/>
<job-repository name="in-memory">
<in-memory/>
</job-repository>
<thread-pool name="batch">
<max-threads count="10"/>
<keepalive-time time="30" unit="seconds"/>
</thread-pool>
</subsystem>
<subsystem xmlns="urn:jboss:domain:bean-validation:1.0"/>
<subsystem xmlns="urn:jboss:domain:core-management:1.0"/>
<subsystem xmlns="urn:jboss:domain:datasources:7.0">
<datasources>
<xa-datasource jndi-name="java:/webbpm/AppDS" pool-name="AppDS" enabled="true" use-java-context="true">
<xa-datasource-property name="ServerName">10.10.31.118</xa-datasource-property>
<xa-datasource-property name="PortNumber">5432</xa-datasource-property>
<xa-datasource-property name="DatabaseName">ervu_eks</xa-datasource-property>
<driver>postgresql</driver>
<security>
<user-name>ervu_eks</user-name>
<password>ervu_eks</password>
</security>
<validation>
<valid-connection-checker class-name="org.jboss.jca.adapters.jdbc.extensions.postgres.PostgreSQLValidConnectionChecker" />
<validate-on-match>false</validate-on-match>
<background-validation>true</background-validation>
<background-validation-millis>5000</background-validation-millis>
<exception-sorter class-name="org.jboss.jca.adapters.jdbc.extensions.postgres.PostgreSQLExceptionSorter" />
</validation>
</xa-datasource>
<xa-datasource jndi-name="java:/webbpm/security-ds" pool-name="SECURITYDS" enabled="true" use-java-context="true">
<xa-datasource-property name="ServerName">10.10.31.118</xa-datasource-property>
<xa-datasource-property name="PortNumber">5432</xa-datasource-property>
<xa-datasource-property name="DatabaseName">ervu_eks</xa-datasource-property>
<driver>postgresql</driver>
<security>
<user-name>ervu_eks_sec</user-name>
<password>ervu_eks_sec</password>
</security>
<validation>
<valid-connection-checker class-name="org.jboss.jca.adapters.jdbc.extensions.postgres.PostgreSQLValidConnectionChecker" />
<validate-on-match>false</validate-on-match>
<background-validation>true</background-validation>
<background-validation-millis>5000</background-validation-millis>
<exception-sorter class-name="org.jboss.jca.adapters.jdbc.extensions.postgres.PostgreSQLExceptionSorter" />
</validation>
</xa-datasource>
<!-- -->
<datasource jndi-name="java:/webbpm/personRegistryDS" pool-name="personRegistryDS" enabled="true" use-java-context="true">
<connection-url>jdbc:postgresql://10.10.31.118:5432/person_registry</connection-url>
<driver>postgresql</driver>
<security>
<user-name>ervu</user-name>
<password>ervu</password>
</security>
<validation>
<valid-connection-checker class-name="org.jboss.jca.adapters.jdbc.extensions.postgres.PostgreSQLValidConnectionChecker"/>
<validate-on-match>false</validate-on-match>
<background-validation>true</background-validation>
<background-validation-millis>5000</background-validation-millis>
<exception-sorter class-name="org.jboss.jca.adapters.jdbc.extensions.postgres.PostgreSQLExceptionSorter"/>
</validation>
<timeout>
<query-timeout>300</query-timeout>
</timeout>
</datasource>
<drivers>
<driver name="h2" module="com.h2database.h2">
<xa-datasource-class>org.h2.jdbcx.JdbcDataSource</xa-datasource-class>
</driver>
<driver name="postgresql" module="org.postgresql">
<xa-datasource-class>org.postgresql.xa.PGXADataSource</xa-datasource-class>
</driver>
</drivers>
</datasources>
</subsystem>
<subsystem xmlns="urn:jboss:domain:deployment-scanner:2.0">
<deployment-scanner path="deployments" relative-to="jboss.server.base.dir" scan-interval="5000" runtime-failure-causes-rollback="${jboss.deployment.scanner.rollback.on.failure:false}"/>
</subsystem>
<subsystem xmlns="urn:jboss:domain:discovery:1.0"/>
<subsystem xmlns="urn:jboss:domain:distributable-web:2.0" default-session-management="default" default-single-sign-on-management="default">
<infinispan-session-management name="default" cache-container="web" granularity="SESSION">
<local-affinity/>
</infinispan-session-management>
<infinispan-single-sign-on-management name="default" cache-container="web" cache="sso"/>
<local-routing/>
</subsystem>
<subsystem xmlns="urn:jboss:domain:ee:6.0">
<spec-descriptor-property-replacement>false</spec-descriptor-property-replacement>
<concurrent>
<context-services>
<context-service name="default" jndi-name="java:jboss/ee/concurrency/context/default" use-transaction-setup-provider="true"/>
</context-services>
<managed-thread-factories>
<managed-thread-factory name="default" jndi-name="java:jboss/ee/concurrency/factory/default" context-service="default"/>
</managed-thread-factories>
<managed-executor-services>
<managed-executor-service name="default" jndi-name="java:jboss/ee/concurrency/executor/default" context-service="default" hung-task-termination-period="0" hung-task-threshold="60000" keepalive-time="5000"/>
</managed-executor-services>
<managed-scheduled-executor-services>
<managed-scheduled-executor-service name="default" jndi-name="java:jboss/ee/concurrency/scheduler/default" context-service="default" hung-task-termination-period="0" hung-task-threshold="60000" keepalive-time="3000"/>
</managed-scheduled-executor-services>
</concurrent>
</subsystem>
<subsystem xmlns="urn:jboss:domain:ee-security:1.0"/>
<subsystem xmlns="urn:jboss:domain:ejb3:9.0">
<session-bean>
<stateless>
<bean-instance-pool-ref pool-name="slsb-strict-max-pool"/>
</stateless>
<stateful default-access-timeout="5000" cache-ref="simple" passivation-disabled-cache-ref="simple"/>
<singleton default-access-timeout="5000"/>
</session-bean>
<pools>
<bean-instance-pools>
<strict-max-pool name="mdb-strict-max-pool" derive-size="from-cpu-count" instance-acquisition-timeout="5" instance-acquisition-timeout-unit="MINUTES"/>
<strict-max-pool name="slsb-strict-max-pool" derive-size="from-worker-pools" instance-acquisition-timeout="5" instance-acquisition-timeout-unit="MINUTES"/>
</bean-instance-pools>
</pools>
<caches>
<cache name="simple"/>
<cache name="distributable" passivation-store-ref="infinispan" aliases="passivating clustered"/>
</caches>
<passivation-stores>
<passivation-store name="infinispan" cache-container="ejb" max-size="10000"/>
</passivation-stores>
<async thread-pool-name="default"/>
<timer-service thread-pool-name="default" default-data-store="default-file-store">
<data-stores>
<file-data-store name="default-file-store" path="timer-service-data" relative-to="jboss.server.data.dir"/>
</data-stores>
</timer-service>
<remote cluster="ejb" connectors="http-remoting-connector" thread-pool-name="default">
<channel-creation-options>
<option name="MAX_OUTBOUND_MESSAGES" value="1234" type="remoting"/>
</channel-creation-options>
</remote>
<thread-pools>
<thread-pool name="default">
<max-threads count="10"/>
<keepalive-time time="60" unit="seconds"/>
</thread-pool>
</thread-pools>
<default-security-domain value="other"/>
<application-security-domains>
<application-security-domain name="other" security-domain="ApplicationDomain"/>
</application-security-domains>
<default-missing-method-permissions-deny-access value="true"/>
<statistics enabled="${wildfly.ejb3.statistics-enabled:${wildfly.statistics-enabled:false}}"/>
<log-system-exceptions value="true"/>
</subsystem>
<subsystem xmlns="urn:wildfly:elytron:15.1" final-providers="combined-providers" disallowed-providers="OracleUcrypto">
<providers>
<aggregate-providers name="combined-providers">
<providers name="elytron"/>
<providers name="openssl"/>
</aggregate-providers>
<provider-loader name="elytron" module="org.wildfly.security.elytron"/>
<provider-loader name="openssl" module="org.wildfly.openssl"/>
</providers>
<audit-logging>
<file-audit-log name="local-audit" path="audit.log" relative-to="jboss.server.log.dir" format="JSON"/>
</audit-logging>
<security-domains>
<security-domain name="ManagementDomain" default-realm="ManagementRealm" permission-mapper="default-permission-mapper">
<realm name="ManagementRealm" role-decoder="groups-to-roles"/>
<realm name="local" role-mapper="super-user-mapper"/>
</security-domain>
<security-domain name="ApplicationDomain" default-realm="ApplicationRealm" permission-mapper="default-permission-mapper">
<realm name="ApplicationRealm" role-decoder="groups-to-roles"/>
<realm name="local"/>
</security-domain>
</security-domains>
<security-realms>
<identity-realm name="local" identity="$local"/>
<properties-realm name="ApplicationRealm">
<users-properties path="application-users.properties" relative-to="jboss.server.config.dir" digest-realm-name="ApplicationRealm"/>
<groups-properties path="application-roles.properties" relative-to="jboss.server.config.dir"/>
</properties-realm>
<properties-realm name="ManagementRealm">
<users-properties path="mgmt-users.properties" relative-to="jboss.server.config.dir" digest-realm-name="ManagementRealm"/>
<groups-properties path="mgmt-groups.properties" relative-to="jboss.server.config.dir"/>
</properties-realm>
</security-realms>
<mappers>
<simple-permission-mapper name="default-permission-mapper" mapping-mode="first">
<permission-mapping>
<principal name="anonymous"/>
<permission-set name="default-permissions"/>
</permission-mapping>
<permission-mapping match-all="true">
<permission-set name="login-permission"/>
<permission-set name="default-permissions"/>
</permission-mapping>
</simple-permission-mapper>
<constant-realm-mapper name="local" realm-name="local"/>
<simple-role-decoder name="groups-to-roles" attribute="groups"/>
<constant-role-mapper name="super-user-mapper">
<role name="SuperUser"/>
</constant-role-mapper>
</mappers>
<permission-sets>
<permission-set name="login-permission">
<permission class-name="org.wildfly.security.auth.permission.LoginPermission"/>
</permission-set>
<permission-set name="default-permissions">
<permission class-name="org.wildfly.extension.batch.jberet.deployment.BatchPermission" module="org.wildfly.extension.batch.jberet" target-name="*"/>
<permission class-name="org.wildfly.transaction.client.RemoteTransactionPermission" module="org.wildfly.transaction.client"/>
<permission class-name="org.jboss.ejb.client.RemoteEJBPermission" module="org.jboss.ejb-client"/>
</permission-set>
</permission-sets>
<http>
<http-authentication-factory name="management-http-authentication" security-domain="ManagementDomain" http-server-mechanism-factory="global">
<mechanism-configuration>
<mechanism mechanism-name="DIGEST">
<mechanism-realm realm-name="ManagementRealm"/>
</mechanism>
</mechanism-configuration>
</http-authentication-factory>
<http-authentication-factory name="application-http-authentication" security-domain="ApplicationDomain" http-server-mechanism-factory="global">
<mechanism-configuration>
<mechanism mechanism-name="BASIC">
<mechanism-realm realm-name="ApplicationRealm"/>
</mechanism>
</mechanism-configuration>
</http-authentication-factory>
<provider-http-server-mechanism-factory name="global"/>
</http>
<sasl>
<sasl-authentication-factory name="management-sasl-authentication" sasl-server-factory="configured" security-domain="ManagementDomain">
<mechanism-configuration>
<mechanism mechanism-name="JBOSS-LOCAL-USER" realm-mapper="local"/>
<mechanism mechanism-name="DIGEST-MD5">
<mechanism-realm realm-name="ManagementRealm"/>
</mechanism>
</mechanism-configuration>
</sasl-authentication-factory>
<sasl-authentication-factory name="application-sasl-authentication" sasl-server-factory="configured" security-domain="ApplicationDomain">
<mechanism-configuration>
<mechanism mechanism-name="JBOSS-LOCAL-USER" realm-mapper="local"/>
<mechanism mechanism-name="DIGEST-MD5">
<mechanism-realm realm-name="ApplicationRealm"/>
</mechanism>
</mechanism-configuration>
</sasl-authentication-factory>
<configurable-sasl-server-factory name="configured" sasl-server-factory="elytron">
<properties>
<property name="wildfly.sasl.local-user.default-user" value="$local"/>
<property name="wildfly.sasl.local-user.challenge-path" value="${jboss.server.temp.dir}/auth"/>
</properties>
</configurable-sasl-server-factory>
<mechanism-provider-filtering-sasl-server-factory name="elytron" sasl-server-factory="global">
<filters>
<filter provider-name="WildFlyElytron"/>
</filters>
</mechanism-provider-filtering-sasl-server-factory>
<provider-sasl-server-factory name="global"/>
</sasl>
<tls>
<key-stores>
<key-store name="applicationKS">
<credential-reference clear-text="password"/>
<implementation type="JKS"/>
<file path="application.keystore" relative-to="jboss.server.config.dir"/>
</key-store>
</key-stores>
<key-managers>
<key-manager name="applicationKM" key-store="applicationKS" generate-self-signed-certificate-host="localhost">
<credential-reference clear-text="password"/>
</key-manager>
</key-managers>
<server-ssl-contexts>
<server-ssl-context name="applicationSSC" key-manager="applicationKM"/>
</server-ssl-contexts>
</tls>
</subsystem>
<subsystem xmlns="urn:wildfly:elytron-oidc-client:1.0"/>
<subsystem xmlns="urn:wildfly:health:1.0" security-enabled="false"/>
<subsystem xmlns="urn:jboss:domain:infinispan:13.0">
<cache-container name="ejb" default-cache="passivation" marshaller="PROTOSTREAM" aliases="sfsb" modules="org.wildfly.clustering.ejb.infinispan">
<local-cache name="passivation">
<expiration interval="0"/>
<file-store passivation="true" purge="false"/>
</local-cache>
</cache-container>
<cache-container name="web" default-cache="passivation" marshaller="PROTOSTREAM" modules="org.wildfly.clustering.web.infinispan">
<local-cache name="passivation">
<expiration interval="0"/>
<file-store passivation="true" purge="false"/>
</local-cache>
<local-cache name="sso">
<expiration interval="0"/>
</local-cache>
</cache-container>
<cache-container name="server" default-cache="default" marshaller="PROTOSTREAM" modules="org.wildfly.clustering.server">
<local-cache name="default">
<expiration interval="0"/>
</local-cache>
</cache-container>
<cache-container name="hibernate" marshaller="JBOSS" modules="org.infinispan.hibernate-cache">
<local-cache name="entity">
<heap-memory size="10000"/>
<expiration max-idle="100000"/>
</local-cache>
<local-cache name="local-query">
<heap-memory size="10000"/>
<expiration max-idle="100000"/>
</local-cache>
<local-cache name="timestamps">
<expiration interval="0"/>
</local-cache>
<local-cache name="pending-puts">
<expiration max-idle="60000"/>
</local-cache>
</cache-container>
</subsystem>
<subsystem xmlns="urn:jboss:domain:io:3.0">
<worker name="default"/>
<buffer-pool name="default"/>
</subsystem>
<subsystem xmlns="urn:jboss:domain:jaxrs:2.0"/>
<subsystem xmlns="urn:jboss:domain:jca:5.0">
<archive-validation enabled="true" fail-on-error="true" fail-on-warn="false"/>
<bean-validation enabled="true"/>
<default-workmanager>
<short-running-threads>
<core-threads count="50"/>
<queue-length count="50"/>
<max-threads count="50"/>
<keepalive-time time="10" unit="seconds"/>
</short-running-threads>
<long-running-threads>
<core-threads count="50"/>
<queue-length count="50"/>
<max-threads count="50"/>
<keepalive-time time="10" unit="seconds"/>
</long-running-threads>
</default-workmanager>
<cached-connection-manager/>
</subsystem>
<subsystem xmlns="urn:jboss:domain:jdr:1.0"/>
<subsystem xmlns="urn:jboss:domain:jmx:1.3">
<expose-resolved-model/>
<expose-expression-model/>
<remoting-connector/>
</subsystem>
<subsystem xmlns="urn:jboss:domain:jpa:1.1">
<jpa default-extended-persistence-inheritance="DEEP"/>
</subsystem>
<subsystem xmlns="urn:jboss:domain:jsf:1.1"/>
<subsystem xmlns="urn:jboss:domain:mail:4.0">
<mail-session name="default" jndi-name="java:jboss/mail/Default">
<smtp-server outbound-socket-binding-ref="mail-smtp"/>
</mail-session>
</subsystem>
<subsystem xmlns="urn:wildfly:metrics:1.0" security-enabled="false" exposed-subsystems="*" prefix="${wildfly.metrics.prefix:wildfly}"/>
<subsystem xmlns="urn:wildfly:microprofile-config-smallrye:2.0"/>
<subsystem xmlns="urn:wildfly:microprofile-jwt-smallrye:1.0"/>
<subsystem xmlns="urn:wildfly:microprofile-opentracing-smallrye:3.0" default-tracer="jaeger">
<jaeger-tracer name="jaeger">
<sampler-configuration sampler-type="const" sampler-param="1.0"/>
</jaeger-tracer>
</subsystem>
<subsystem xmlns="urn:jboss:domain:naming:2.0">
<remote-naming/>
</subsystem>
<subsystem xmlns="urn:jboss:domain:pojo:1.0"/>
<subsystem xmlns="urn:jboss:domain:remoting:4.0">
<http-connector name="http-remoting-connector" connector-ref="default" sasl-authentication-factory="application-sasl-authentication"/>
</subsystem>
<subsystem xmlns="urn:jboss:domain:request-controller:1.0"/>
<subsystem xmlns="urn:jboss:domain:resource-adapters:6.1"/>
<subsystem xmlns="urn:jboss:domain:sar:1.0"/>
<subsystem xmlns="urn:jboss:domain:security-manager:1.0">
<deployment-permissions>
<maximum-set>
<permission class="java.security.AllPermission"/>
</maximum-set>
</deployment-permissions>
</subsystem>
<subsystem xmlns="urn:jboss:domain:transactions:6.0">
<core-environment node-identifier="${jboss.tx.node.id:1}">
<process-id>
<uuid/>
</process-id>
</core-environment>
<recovery-environment socket-binding="txn-recovery-environment" status-socket-binding="txn-status-manager"/>
<coordinator-environment statistics-enabled="${wildfly.transactions.statistics-enabled:${wildfly.statistics-enabled:false}}"/>
<object-store path="tx-object-store" relative-to="jboss.server.data.dir"/>
</subsystem>
<subsystem xmlns="urn:jboss:domain:undertow:12.0" default-server="default-server" default-virtual-host="default-host" default-servlet-container="default" default-security-domain="other" statistics-enabled="${wildfly.undertow.statistics-enabled:${wildfly.statistics-enabled:false}}">
<buffer-cache name="default"/>
<server name="default-server">
<http-listener name="default" socket-binding="http" max-post-size="${env.MAX_POST_SIZE:104857600}" record-request-start-time="true" redirect-socket="https" enable-http2="true"/>
<https-listener name="https" socket-binding="https" ssl-context="applicationSSC" enable-http2="true"/>
<host name="default-host" alias="localhost">
<location name="/" handler="welcome-content"/>
<filter-ref name="cache-control" predicate="path-suffix['.bpmn'] or path-suffix['.bpmn2']"/>
<http-invoker http-authentication-factory="application-http-authentication"/>
</host>
</server>
<servlet-container name="default">
<jsp-config/>
<websockets/>
</servlet-container>
<handlers>
<file name="welcome-content" path="${jboss.home.dir}/welcome-content"/>
</handlers>
<filters>
<response-header name="cache-control" header-name="Cache-Control" header-value="no-store"/>
</filters>
<application-security-domains>
<application-security-domain name="other" security-domain="ApplicationDomain"/>
</application-security-domains>
</subsystem>
<subsystem xmlns="urn:jboss:domain:webservices:2.0" statistics-enabled="${wildfly.webservices.statistics-enabled:${wildfly.statistics-enabled:false}}">
<wsdl-host>${jboss.bind.address:127.0.0.1}</wsdl-host>
<endpoint-config name="Standard-Endpoint-Config"/>
<endpoint-config name="Recording-Endpoint-Config">
<pre-handler-chain name="recording-handlers" protocol-bindings="##SOAP11_HTTP ##SOAP11_HTTP_MTOM ##SOAP12_HTTP ##SOAP12_HTTP_MTOM">
<handler name="RecordingHandler" class="org.jboss.ws.common.invocation.RecordingServerHandler"/>
</pre-handler-chain>
</endpoint-config>
<client-config name="Standard-Client-Config"/>
</subsystem>
<subsystem xmlns="urn:jboss:domain:weld:4.0"/>
</profile>
<interfaces>
<interface name="management">
<inet-address value="${jboss.bind.address.management:0.0.0.0}"/>
</interface>
<interface name="public">
<inet-address value="${jboss.bind.address:0.0.0.0}"/>
</interface>
</interfaces>
<socket-binding-group name="standard-sockets" default-interface="public" port-offset="${jboss.socket.binding.port-offset:0}">
<socket-binding name="ajp" port="${jboss.ajp.port:8009}"/>
<socket-binding name="http" port="${jboss.http.port:8080}"/>
<socket-binding name="https" port="${jboss.https.port:8443}"/>
<socket-binding name="management-http" interface="management" port="${jboss.management.http.port:9990}"/>
<socket-binding name="management-https" interface="management" port="${jboss.management.https.port:9993}"/>
<socket-binding name="txn-recovery-environment" port="4712"/>
<socket-binding name="txn-status-manager" port="4713"/>
<outbound-socket-binding name="mail-smtp">
<remote-destination host="${jboss.mail.server.host:localhost}" port="${jboss.mail.server.port:25}"/>
</outbound-socket-binding>
</socket-binding-group>
</server>

View file

@ -1,66 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>ru.micord.ervu</groupId>
<artifactId>eks</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
<groupId>ru.micord.ervu.eks</groupId>
<artifactId>distribution</artifactId>
<packaging>ear</packaging>
<properties>
<backendContext>/backend</backendContext>
</properties>
<dependencies>
<dependency>
<groupId>ru.micord.ervu.eks</groupId>
<artifactId>backend</artifactId>
<type>war</type>
</dependency>
<dependency>
<groupId>ru.micord.ervu.eks</groupId>
<artifactId>frontend</artifactId>
<type>war</type>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-ear-plugin</artifactId>
<version>3.2.0</version>
<configuration>
<modules>
<webModule>
<groupId>ru.micord.ervu.eks</groupId>
<artifactId>frontend</artifactId>
<contextRoot>/</contextRoot>
<bundleFileName>frontend.war</bundleFileName>
</webModule>
<webModule>
<groupId>ru.micord.ervu.eks</groupId>
<artifactId>backend</artifactId>
<contextRoot>${backendContext}</contextRoot>
<bundleFileName>backend.war</bundleFileName>
</webModule>
</modules>
</configuration>
</plugin>
</plugins>
<finalName>${project.parent.artifactId}</finalName>
</build>
<profiles>
<profile>
<id>enable-version-in-url</id>
<properties>
<backendContext>/backend-${project.version}</backendContext>
</properties>
</profile>
</profiles>
</project>

View file

@ -1,14 +0,0 @@
<jboss-deployment-structure>
<sub-deployment name="backend.war">
<exclusions>
<module name="com.fasterxml.jackson.core.jackson-core" />
<module name="com.fasterxml.jackson.core.jackson-databind" />
<module name="com.fasterxml.jackson.core.jackson-annotations" />
<module name="com.fasterxml.jackson.dataformat.jackson-dataformat-yaml" />
<module name="com.fasterxml.jackson.datatype.jackson-datatype-jdk8" />
<module name="com.fasterxml.jackson.datatype.jackson-datatype-jsr310" />
<module name="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider" />
<module name="org.jboss.resteasy.resteasy-jackson2-provider" />
</exclusions>
</sub-deployment>
</jboss-deployment-structure>

12
frontend/.gitignore vendored Normal file
View file

@ -0,0 +1,12 @@
# frameworks dirs
.angular
.nx
# compiled output
dist
tmp
out-tsc
# generated by webbpm
tsconfig.base.json
src/ts/page.routing.ts

3
frontend/.nxignore Normal file
View file

@ -0,0 +1,3 @@
!modules/generated/
!tsconfig.base.json
!src/ts/page.routing.ts

6
frontend/.prettierignore Normal file
View file

@ -0,0 +1,6 @@
# Add files here to ignore them from prettier formatting
/dist
/coverage
/.nx/cache
/.nx/workspace-data
.angular

3
frontend/.prettierrc Normal file
View file

@ -0,0 +1,3 @@
{
"singleQuote": true
}

View file

@ -1,71 +0,0 @@
{
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
"version": 1,
"newProjectRoot": "projects",
"projects": {
"webbpm-frontend": {
"root": "",
"sourceRoot": "src",
"projectType": "application",
"architect": {
"build": {
"builder": "@angular-devkit/build-angular:browser",
"options": {
"outputPath": "dist",
"index": "src/index.html",
"main": "src/ts/main.ts",
"tsConfig": "src/tsconfig.json",
"polyfills": "src/ts/polyfills.ts",
"assets": [
"src/resources"
],
"styles": [
],
"scripts": [
"node_modules/jquery/dist/jquery.min.js",
"node_modules/moment/min/moment-with-locales.js",
"node_modules/moment-timezone/builds/moment-timezone-with-data.min.js",
"node_modules/eonasdan-bootstrap-datetimepicker/build/js/bootstrap-datetimepicker.min.js",
"node_modules/selectize/dist/js/standalone/selectize.min.js",
"node_modules/downloadjs/download.min.js"
]
},
"configurations": {
"production": {
"optimization": true,
"outputHashing": "all",
"sourceMap": false,
"extractCss": true,
"namedChunks": false,
"aot": true,
"extractLicenses": true,
"vendorChunk": false,
"buildOptimizer": true
}
}
},
"serve": {
"builder": "@angular-devkit/build-angular:dev-server",
"options": {
"browserTarget": "webbpm-frontend:build"
},
"configurations": {}
},
"extract-i18n": {
"builder": "@angular-devkit/build-angular:extract-i18n",
"options": {
"browserTarget": "webbpm-frontend:build"
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": [],
"exclude": []
}
}
}
}
},
"defaultProject": "webbpm-frontend"
}

View file

@ -0,0 +1,42 @@
import nx from '@nx/eslint-plugin';
export default [
...nx.configs['flat/base'],
...nx.configs['flat/typescript'],
...nx.configs['flat/javascript'],
{
ignores: ['**/dist'],
},
{
files: ['**/*.ts', '**/*.tsx', '**/*.js', '**/*.jsx'],
rules: {
'@nx/enforce-module-boundaries': [
'error',
{
enforceBuildableLibDependency: true,
allow: ['^.*/eslint(\\.base)?\\.config\\.[cm]?js$'],
depConstraints: [
{
sourceTag: '*',
onlyDependOnLibsWithTags: ['*'],
},
],
},
],
},
},
{
files: [
'**/*.ts',
'**/*.tsx',
'**/*.cts',
'**/*.mts',
'**/*.js',
'**/*.jsx',
'**/*.cjs',
'**/*.mjs',
],
// Override or add rules here
rules: {},
},
];

View file

@ -3,21 +3,12 @@
<head>
<title>ervu-eks</title>
<meta http-equiv="content-type" content="text/html; charset=UTF-8">
<link rel="icon" type="image/png" href="src/resources/img/logo.png"/>
<link rel="stylesheet" href="src/resources/css/style.css"/>
<script src="node_modules/core-js/client/shim.min.js"></script>
<script src="node_modules/zone.js/dist/zone.js"></script>
<script src="node_modules/reflect-metadata/Reflect.js"></script>
<script src="node_modules/systemjs/dist/system.src.js"></script>
<script src="systemjs.config.js"></script>
<script>
System.import('webbpm').catch(function (err) {
console.error(err);
});
</script>
<meta name="viewport" content="width=device-width, initial-scale=1"/>
<link rel="icon" type="image/png" href="resources/img/logo.png"/>
</head>
<body webbpm class="webbpm ervu-eks">
<body class="webbpm ervu-eks">
<app-root>
<div class="progress"></div>
</app-root>
</body>
</html>

View file

@ -1,11 +0,0 @@
<!DOCTYPE html>
<html>
<head>
<title>ervu-eks</title>
<meta http-equiv="content-type" content="text/html; charset=UTF-8">
<link rel="icon" type="image/png" href="src/resources/img/logo.png"/>
</head>
<body webbpm class="webbpm ervu-eks">
<div class="progress"></div>
</body>
</html>

View file

@ -0,0 +1,7 @@
{
"$schema": "../../node_modules/ng-packagr/ng-package.schema.json",
"dest": "../../dist/modules/shared",
"lib": {
"entryFile": "src/index.ts"
}
}

View file

@ -0,0 +1,12 @@
{
"name": "shared",
"version": "0.0.1",
"scripts": {
"generate-barrels": "npx barrelsby -D -d src -n index.ts -i src -e \"\\.spec\\.ts$\" \"\\.d\\.ts$\""
},
"peerDependencies": {
"@angular/common": "19.2.7",
"@angular/core": "19.2.7"
},
"sideEffects": false
}

View file

@ -0,0 +1,29 @@
{
"name": "shared",
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"sourceRoot": "modules/shared/src",
"prefix": "lib",
"projectType": "library",
"tags": [],
"targets": {
"build": {
"executor": "@nx/angular:ng-packagr-lite",
"outputs": ["{workspaceRoot}/dist/{projectRoot}"],
"options": {
"project": "modules/shared/ng-package.json"
},
"configurations": {
"production": {
"tsConfig": "modules/shared/tsconfig.lib.prod.json"
},
"development": {
"tsConfig": "modules/shared/tsconfig.lib.json"
}
},
"defaultConfiguration": "production"
},
"lint": {
"executor": "@nx/eslint:lint"
}
}
}

View file

@ -0,0 +1,13 @@
/**
* @file Automatically generated by barrelsby.
*/
export * from "./lib/shared.module";
export * from "./lib/component/app-progress-indication.component";
export * from "./lib/component/ConfigExecuteBtn";
export * from "./lib/component/ExportDataBtn";
export * from "./lib/generated/dto/ConfigExecuteRequest";
export * from "./lib/generated/dto/ExportDataRequest";
export * from "./lib/generated/rpc/ConfigExecutorRpcService";
export * from "./lib/generated/rpc/ExportDataRpcService";
export * from "./lib/service/app-progress-indication.service";

View file

@ -14,10 +14,10 @@ import {ConfigExecuteRequest} from "../generated/dto/ConfigExecuteRequest";
* @author: a.petrov
*/
@Component({
moduleId: module.id,
selector: 'config-execute-button-component',
templateUrl: './../../../src/resources/template/app/component/ConfigExecuteBtn.html',
changeDetection: ChangeDetectionStrategy.OnPush
templateUrl: './ConfigExecuteBtn.html',
changeDetection: ChangeDetectionStrategy.OnPush,
standalone: false
})
export class ConfigExecuteBtn extends AbstractButton {

View file

@ -17,10 +17,10 @@ import {ExportDataRequest} from "../generated/dto/ExportDataRequest";
* @author: kochetkov
*/
@Component({
moduleId: module.id,
selector: 'export-data-button-component',
templateUrl: './../../../src/resources/template/app/component/ConfigExecuteBtn.html',
changeDetection: ChangeDetectionStrategy.OnPush
templateUrl: './ConfigExecuteBtn.html',
changeDetection: ChangeDetectionStrategy.OnPush,
standalone: false
})
export class ExportDataBtn extends AbstractButton {

View file

@ -0,0 +1,11 @@
import {ChangeDetectionStrategy, Component} from "@angular/core";
@Component({
changeDetection: ChangeDetectionStrategy.OnPush,
selector: 'progress-indication-dialog-content',
templateUrl: './progress-indication.html',
standalone: false
})
export class AppProgressIndicationComponent {
}

View file

@ -2,7 +2,7 @@ import {Injectable} from "@angular/core";
import {AppProgressIndicationComponent} from "../component/app-progress-indication.component";
import {NgbModal, NgbModalOptions, NgbModalRef} from "@ng-bootstrap/ng-bootstrap";
@Injectable()
@Injectable({providedIn: 'root'})
export class AppProgressIndicationService {
private static readonly EVENT_INTERCEPTOR = (event) => {
@ -68,7 +68,7 @@ export class AppProgressIndicationService {
}
private saveFocus() {
this.focused = $(':focus');
this.focused = document.querySelector(':focus');
}
private restoreFocus() {
@ -79,17 +79,14 @@ export class AppProgressIndicationService {
}
private disableEvents() {
let body = $('body');
body.keydown(AppProgressIndicationService.EVENT_INTERCEPTOR);
body.keyup(AppProgressIndicationService.EVENT_INTERCEPTOR);
body.contextmenu(AppProgressIndicationService.EVENT_INTERCEPTOR)
document.body.addEventListener('keydown', AppProgressIndicationService.EVENT_INTERCEPTOR);
document.body.addEventListener('keyup', AppProgressIndicationService.EVENT_INTERCEPTOR);
document.body.addEventListener('contextmenu', AppProgressIndicationService.EVENT_INTERCEPTOR);
}
private enableEvents() {
let body = $('body');
body.off('keydown', AppProgressIndicationService.EVENT_INTERCEPTOR);
body.off('keyup', AppProgressIndicationService.EVENT_INTERCEPTOR);
body.off('contextmenu', AppProgressIndicationService.EVENT_INTERCEPTOR);
document.body.removeEventListener('keydown', AppProgressIndicationService.EVENT_INTERCEPTOR);
document.body.removeEventListener('keyup', AppProgressIndicationService.EVENT_INTERCEPTOR);
document.body.removeEventListener('contextmenu', AppProgressIndicationService.EVENT_INTERCEPTOR);
}
}

View file

@ -0,0 +1,55 @@
import {NgModule} from "@angular/core";
import {NgbModule} from "@ng-bootstrap/ng-bootstrap";
import {
BpmnModule,
ComponentsModule,
ProgressIndicationService,
SecurityModule
} from "@webbpm/base-package";
import {CommonModule} from "@angular/common";
import {FormsModule} from "@angular/forms";
import {AgGridModule} from "ag-grid-angular";
import {RouterModule} from "@angular/router";
import {NgxIntlTelInputModule} from "ngx-intl-tel-input";
import {AppProgressIndicationComponent} from "./component/app-progress-indication.component";
import {AppProgressIndicationService} from "./service/app-progress-indication.service";
import {ConfigExecuteBtn} from "./component/ConfigExecuteBtn";
import {ExportDataBtn} from "./component/ExportDataBtn";
@NgModule({
imports: [
CommonModule,
FormsModule,
BpmnModule,
NgbModule,
SecurityModule,
ComponentsModule,
RouterModule,
NgxIntlTelInputModule,
AgGridModule
],
declarations: [
AppProgressIndicationComponent,
ConfigExecuteBtn,
ExportDataBtn
],
exports: [
AppProgressIndicationComponent,
ConfigExecuteBtn,
ExportDataBtn,
CommonModule,
FormsModule,
BpmnModule,
NgbModule,
SecurityModule,
ComponentsModule,
RouterModule,
NgxIntlTelInputModule,
AgGridModule
],
providers: [
{provide: ProgressIndicationService, useClass: AppProgressIndicationService}
],
})
export class SharedModule {
}

View file

@ -0,0 +1,29 @@
{
"compilerOptions": {
"target": "es2022",
"useDefineForClassFields": false,
"forceConsistentCasingInFileNames": true,
"strict": false,
"noImplicitOverride": false,
"noImplicitAny": false,
"noPropertyAccessFromIndexSignature": true,
"noImplicitReturns": false,
"noFallthroughCasesInSwitch": true,
"strictPropertyInitialization": false
},
"files": [],
"include": [],
"references": [
{
"path": "./tsconfig.lib.json"
}
],
"extends": "../../tsconfig.base.json",
"angularCompilerOptions": {
"enableI18nLegacyMessageIdFormat": false,
"strictPropertyInitialization": false,
"strictInjectionParameters": true,
"strictInputAccessModifiers": true,
"strictTemplates": false
}
}

View file

@ -0,0 +1,12 @@
{
"extends": "./tsconfig.json",
"compilerOptions": {
"outDir": "../../dist/out-tsc",
"declaration": true,
"declarationMap": true,
"inlineSources": true,
"types": []
},
"exclude": ["src/**/*.spec.ts", "jest.config.ts", "src/**/*.test.ts"],
"include": ["src/**/*.ts"]
}

View file

@ -0,0 +1,7 @@
{
"extends": "./tsconfig.lib.json",
"compilerOptions": {
"declarationMap": false
},
"angularCompilerOptions": {}
}

46
frontend/nx.json Normal file
View file

@ -0,0 +1,46 @@
{
"$schema": "./node_modules/nx/schemas/nx-schema.json",
"targetDefaults": {
"build": {
"cache": true,
"dependsOn": ["^build"],
"inputs": ["production", "^production"]
},
"@nx/angular:ng-packagr-lite": {
"cache": true,
"dependsOn": ["^build"],
"inputs": ["production", "^production"]
},
"@nx/eslint:lint": {
"cache": true,
"inputs": [
"default",
"{workspaceRoot}/.eslintrc.json",
"{workspaceRoot}/.eslintignore",
"{workspaceRoot}/eslint.config.cjs"
]
}
},
"defaultBase": "develop",
"parallel": 10,
"namedInputs": {
"sharedGlobals": [],
"default": ["{projectRoot}/**/*", "sharedGlobals"],
"production": [
"default",
"!{projectRoot}/.eslintrc.json",
"!{projectRoot}/eslint.config.cjs",
"!{projectRoot}/eslint.config.mjs"
]
},
"generators": {
"@nx/angular:library": {
"linter": "eslint",
"unitTestRunner": "none",
"strict": false
},
"@nx/angular:component": {
"style": "css"
}
}
}

24731
frontend/package-lock.json generated

File diff suppressed because it is too large Load diff

View file

@ -2,99 +2,97 @@
"name": "ervu-eks",
"version": "1.0.0",
"scripts": {
"cleanup": "npm run cleanup-ngc && node ./node_modules/rimraf/bin ./build ./dist",
"cleanup-ngc": "node ./node_modules/rimraf/bin ./src/ts/**/*.js ./src/ts/**/*.json ./src/ts/page.routing.ts",
"cleanup-and-ngc": "npm run cleanup && npm run ngc",
"ngc": "node --max-old-space-size=14336 ./node_modules/@angular/compiler-cli/src/main -p tsconfig.aot.json",
"build-webpack": "node --max-old-space-size=14336 ./node_modules/webpack/bin/webpack --config webpack.aot.config.js --progress --profile",
"cleanup": "rimraf ./build ./build_dev ./dist ./tmp ./.angular ./.nx",
"save-ts-metadata": "node save.ts.metadata.js",
"tsc": "node ./node_modules/typescript/bin/tsc",
"tsc-watch": "node ./node_modules/typescript/bin/tsc --watch",
"ts-watch": "node node_modules/cross-env/dist/bin/cross-env.js TSC_NONPOLLING_WATCHER=true npm run tsc-watch",
"ts": "npm install && npm run tsc",
"compile": "npm run ts-watch",
"install-compile": "npm install && npm run ts-watch"
"serve": "nx serve --configuration development",
"build": "nx build --verbose --skip-nx-cache",
"build-dev": "nx build --verbose --configuration development",
"postinstall": "npm run generate-barrels --prefix modules/shared"
},
"dependencies": {
"@angular/animations": "7.2.15",
"@angular/common": "7.2.15",
"@angular/compiler": "7.2.15",
"@angular/core": "7.2.15",
"@angular/forms": "7.2.15",
"@angular/http": "7.2.15",
"@angular/platform-browser": "7.2.15",
"@angular/platform-browser-dynamic": "7.2.15",
"@angular/router": "7.2.15",
"@ng-bootstrap/ng-bootstrap": "4.2.2-micord.1",
"@webbpm/base-package": "3.192.8",
"ag-grid-angular": "29.0.0-micord.4",
"ag-grid-community": "29.0.0-micord.4",
"angular-calendar": "0.28.28",
"autonumeric": "4.5.10-cg",
"bootstrap": "4.3.1",
"bootstrap-icons": "1.10.3",
"cadesplugin_api": "2.0.4-micord.1",
"chart.js": "3.8.0-cg.1",
"chartjs-adapter-moment": "1.0.0",
"core-js": "2.4.1",
"date-fns": "2.29.3",
"downloadjs": "1.4.8",
"eonasdan-bootstrap-datetimepicker": "4.17.47-micord.5",
"esmarttokenjs": "2.2.1-cg",
"@angular/animations": "19.2.7",
"@angular/common": "19.2.7",
"@angular/compiler": "19.2.7",
"@angular/core": "19.2.7",
"@angular/forms": "19.2.7",
"@angular/platform-browser": "19.2.7",
"@angular/platform-browser-dynamic": "19.2.7",
"@angular/router": "19.2.7",
"@ng-bootstrap/ng-bootstrap": "18.0.0",
"@popperjs/core": "2.11.8",
"@webbpm/base-package": "5.8.2",
"ag-grid-angular": "29.0.0-micord.3334",
"ag-grid-community": "29.0.0-micord.3334",
"angular-calendar": "0.31.1",
"autonumeric": "4.10.8",
"barrelsby": "2.8.1",
"bootstrap": "5.3.3",
"bootstrap-icons": "1.10.5",
"cadesplugin_api": "2.1.1-micord.2222",
"chart.js": "4.5.0",
"chartjs-adapter-moment": "1.0.1",
"core-js": "3.31.0",
"date-fns": "2.30.0",
"eonasdan-bootstrap-datetimepicker": "4.17.47-micord.6",
"esmarttokenjs": "2.2.1-micord.3",
"font-awesome": "4.7.0",
"google-libphonenumber": "3.0.9",
"inputmask": "5.0.5-cg.2",
"google-libphonenumber": "3.2.40",
"inputmask": "5.0.10-beta.37",
"intl-tel-input": "17.0.21",
"jquery": "3.7.1",
"js-year-calendar": "1.0.0-cg.2",
"jsgantt-improved": "2.0.10-cg",
"jsgantt-improved": "2.0.9-cg.1",
"moment": "2.30.1",
"moment-timezone": "0.5.46",
"ngx-cookie": "3.0.1",
"ngx-international-phone-number": "1.0.6",
"ngx-toastr": "10.2.0-cg",
"popper.js": "1.14.7",
"reflect-metadata": "0.1.13",
"rxjs": "6.4.0",
"rxjs-compat": "6.4.0",
"selectize": "0.12.4-cg.11",
"systemjs": "0.21.4",
"systemjs-plugin-babel": "0.0.25",
"tslib": "1.9.3",
"zone.js": "0.11.8"
"ngx-cookie": "6.0.1",
"ngx-intl-tel-input": "3.3.0-micord.2",
"ngx-toastr": "19.0.0",
"rxjs": "7.8.1",
"selectize": "0.12.4-cg.15",
"tslib": "2.6.2",
"zone.js": "0.15.0"
},
"devDependencies": {
"@angular-devkit/build-optimizer": "0.13.9",
"@angular-devkit/core": "7.3.9",
"@angular/cli": "7.3.9",
"@angular/compiler-cli": "7.2.15",
"@angular/platform-server": "7.2.15",
"@babel/core": "7.18.10",
"@babel/preset-env": "7.18.10",
"@types/bootstrap": "3.3.39",
"@types/eslint": "7.2.5",
"@types/jquery": "3.5.5",
"@types/node": "7.0.5",
"@types/selectize": "0.12.33",
"ajv": "8.8.2",
"angular-router-loader": "0.8.5",
"angular2-template-loader": "0.6.2",
"babel-loader": "9.1.2",
"codelyzer": "5.2.1",
"copy-webpack-plugin": "5.0.3",
"cross-env": "5.2.1",
"css-loader": "6.11.0",
"@angular-devkit/build-angular": "19.2.7",
"@angular-devkit/core": "19.2.7",
"@angular-devkit/schematics": "19.2.7",
"@angular-eslint/eslint-plugin": "19.3.0",
"@angular-eslint/eslint-plugin-template": "19.3.0",
"@angular-eslint/template-parser": "19.3.0",
"@angular/compiler-cli": "19.2.7",
"@angular/localize": "19.2.7",
"@angular/platform-server": "19.2.7",
"@eslint/js": "^9.8.0",
"@nx/angular": "21.0.3",
"@nx/eslint": "21.0.3",
"@nx/eslint-plugin": "21.0.3",
"@nx/js": "21.0.3",
"@nx/module-federation": "21.0.3",
"@nx/workspace": "21.0.3",
"@schematics/angular": "19.2.7",
"@swc-node/register": "1.9.2",
"@swc/core": "1.5.29",
"@swc/helpers": "0.5.15",
"@types/bootstrap": "5.2.10",
"@types/jquery": "3.5.16",
"@types/node": "22.17.0",
"@types/selectize": "0.12.35",
"@typescript-eslint/utils": "^8.19.0",
"angular-eslint": "19.3.0",
"autoprefixer": "^10.4.0",
"del": "2.2.2",
"file-loader": "6.2.0",
"html-webpack-plugin": "5.6.0",
"mini-css-extract-plugin": "2.9.1",
"mkdirp": "3.0.1",
"raw-loader": "4.0.2",
"style-loader": "3.3.4",
"terser-webpack-plugin": "5.3.10",
"tslint": "5.13.1",
"typescript": "3.2.4",
"typescript-parser": "2.6.1-cg.2",
"webpack": "5.90.1",
"webpack-cli": "5.0.2"
"eslint": "^9.8.0",
"eslint-config-prettier": "10.0.0",
"jsonc-eslint-parser": "^2.1.0",
"ng-extract-i18n-merge": "2.15.1",
"ng-packagr": "19.2.0",
"nx": "21.0.3",
"postcss": "^8.4.5",
"postcss-url": "~10.1.3",
"prettier": "^2.6.2",
"rimraf": "6.0.1",
"typescript": "5.8.2",
"typescript-eslint": "^8.19.0",
"typescript-parser": "2.6.1-micord-angular.19"
}
}

View file

@ -11,8 +11,25 @@
<artifactId>frontend</artifactId>
<packaging>war</packaging>
<properties>
<enable.version.in.url>false</enable.version.in.url>
</properties>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
<configuration>
<filesets>
<fileset>
<directory>${basedir}/.nx</directory>
<directory>${basedir}/.angular</directory>
<directory>${basedir}/tmp</directory>
<directory>${basedir}/dist</directory>
</fileset>
</filesets>
</configuration>
</plugin>
<plugin>
<groupId>com.google.code.maven-replacer-plugin</groupId>
<artifactId>replacer</artifactId>
@ -28,10 +45,7 @@
</executions>
<configuration>
<includes>
<include>${basedir}/src/resources/app-config.json</include>
<include>${basedir}/dist/src/resources/app-config.json</include>
<include>${basedir}/src/resources/app.version</include>
<include>${basedir}/dist/src/resources/app.version</include>
</includes>
<replacements>
<replacement>
@ -63,27 +77,34 @@
<copyWebResources>false</copyWebResources>
<webResources>
<resource>
<directory>${basedir}</directory>
<includes>
<include>src/resources/**/*</include>
<include>build_dev/**/*</include>
<include>node_modules/**/*</include>
<include>index.html</include>
<include>systemjs.config.js</include>
</includes>
<directory>${basedir}/build_dev</directory>
</resource>
</webResources>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<executions>
<execution>
<id>frontend build</id>
<goals>
<goal>exec</goal>
</goals>
<phase>prepare-package</phase>
<configuration>
<executable>npm</executable>
<arguments>
<argument>run</argument>
<argument>build-dev</argument>
</arguments>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>compile-ts</id>
<activation>
<activeByDefault>false</activeByDefault>
</activation>
</profile>
<profile>
<id>prod</id>
<build>
@ -100,6 +121,26 @@
</webResources>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<executions>
<execution>
<id>frontend build</id>
<goals>
<goal>exec</goal>
</goals>
<phase>prepare-package</phase>
<configuration>
<executable>npm</executable>
<arguments>
<argument>run</argument>
<argument>build</argument>
</arguments>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>

View file

@ -1,23 +0,0 @@
<!DOCTYPE html>
<html>
<head>
<title>Web BPM</title>
<meta http-equiv="content-type" content="text/html; charset=UTF-8">
<link rel="icon" type="image/png" href="src/resources/img/logo.png"/>
<link rel="stylesheet" href="src/resources/css/style.css"/>
<script src="node_modules/core-js/client/shim.min.js"></script>
<script src="node_modules/zone.js/dist/zone.js"></script>
<script src="node_modules/reflect-metadata/Reflect.js"></script>
<script src="node_modules/systemjs/dist/system.src.js"></script>
<script src="systemjs.preview.config.js"></script>
<script>
System.import('preview').catch(function (err) {
console.error(err);
});
</script>
</head>
<body preview-container id="webbpm-angular-application-container ervu-eks" class="webbpm">
<div class="progress"></div>
</body>
</html>

123
frontend/project.json Normal file
View file

@ -0,0 +1,123 @@
{
"$schema": "node_modules/nx/schemas/project-schema.json",
"projectType": "application",
"name": "ervu-eks",
"i18n": {
"sourceLocale": "ru",
"locales": {
"en": "src/resources/locale/messages.en.xlf"
}
},
"sourceRoot": "./src",
"tags": [],
"targets": {
"build": {
"executor": "@nx/angular:webpack-browser",
"outputs": ["{options.outputPath}"],
"options": {
"preserveSymlinks": true,
"main": "src/ts/main.ts",
"index": "index.html",
"polyfills": ["zone.js", "@angular/localize/init"],
"tsConfig": "tsconfig.json",
"assets": [
"src/resources"
],
"resourcesOutputPath": "./resources",
"styles": [
"src/resources/css/style.css"
],
"scripts": [
"node_modules/jquery/dist/jquery.min.js",
"node_modules/moment/min/moment-with-locales.js",
"node_modules/moment-timezone/builds/moment-timezone-with-data.min.js",
"node_modules/selectize/dist/js/selectize.min.js",
"node_modules/eonasdan-bootstrap-datetimepicker/build/js/bootstrap-datetimepicker.min.js",
"node_modules/esmarttokenjs/esmarttoken.js",
"node_modules/js-year-calendar/dist/js-year-calendar.js"
],
"i18nMissingTranslation": "warning"
},
"configurations": {
"production": {
"outputPath": "dist",
"fileReplacements": [
{
"replace": "src/ts/modules/preview/preview.routes.ts",
"with": "src/ts/modules/preview/preview.routes.prod.ts"
},
{
"replace": "src/ts/modules/webbpm/handler/global-error.handler.ts",
"with": "src/ts/modules/webbpm/handler/global-error.handler.prod.ts"
},
{
"replace": "src/ts/modules/webbpm/interceptor/default-interceptors.ts",
"with": "src/ts/modules/webbpm/interceptor/default-interceptors.prod.ts"
},
{
"replace": "src/ts/environments/environment.ts",
"with": "src/ts/environments/environment.prod.ts"
}
],
"budgets": [
{
"type": "initial",
"maximumWarning": "500kb",
"maximumError": "10mb"
},
{
"type": "anyComponentStyle",
"maximumWarning": "2kb",
"maximumError": "4kb"
}
],
"outputHashing": "all",
},
"development": {
"outputPath": "build_dev",
"buildOptimizer": false,
"optimization": false,
"vendorChunk": true,
"extractLicenses": false,
"sourceMap": true,
"outputHashing": "none"
},
"ru": {
"localize": ["ru"]
},
"en": {
"localize": ["en"]
}
},
"defaultConfiguration": "production"
},
"serve": {
"executor": "@nx/angular:dev-server",
"configurations": {
"production": {
"buildTarget": "ervu-eks:build:production"
},
"development": {
"buildTarget": "ervu-eks:build:development"
}
},
"defaultConfiguration": "development"
},
"extract-i18n": {
"executor": "ng-extract-i18n-merge:ng-extract-i18n-merge",
"options": {
"buildTarget": "ervu-eks:build",
"outputPath": "src/resources/locale",
"format": "xliff2",
"targetFiles": ["messages.en.xlf"]
}
},
"serve-static": {
"executor": "@nx/web:file-server",
"options": {
"buildTarget": "ervu-eks:build:development",
"spa": true
}
}
}
}

View file

@ -6,7 +6,7 @@ var ts = require("typescript");
var parser = new tsp.TypescriptParser();
var excludedDirs = [
'generated-sources'
path.resolve(__dirname, "modules", "generated")
];
var walkFileTree = function (dir, action) {
@ -15,14 +15,14 @@ var walkFileTree = function (dir, action) {
}
fs.readdirSync(dir).forEach(function (file) {
var path = dir + "/" + file;
var stat = fs.statSync(path);
var filePath = dir + path.sep + file;
var stat = fs.statSync(filePath);
var extension = ".ts";
if (stat && stat.isDirectory() && excludedDirs.indexOf(file) === -1) {
walkFileTree(path, action);
if (stat && stat.isDirectory() && excludedDirs.indexOf(filePath) === -1) {
walkFileTree(filePath, action);
}
else if (path.indexOf(extension, path.length - extension.length) !== -1) {
action(null, path);
else if (filePath.indexOf(extension, filePath.length - extension.length) !== -1) {
action(null, filePath);
}
});
};
@ -30,28 +30,57 @@ var walkFileTree = function (dir, action) {
var dateInLong = Date.now();
var arr = [];
var basePath = path.resolve(__dirname, "src/ts/");
walkFileTree(basePath, function (err, file) {
function parseTsMeta(file,childModule) {
var content = fs.readFileSync(file).toString();
var jsonStructure = parser.parseTypescript(ts.createSourceFile(
file,
content,
ts.ScriptTarget.Latest,
true,
ts.ScriptKind.TS
file,
content,
ts.ScriptTarget.Latest,
true,
ts.ScriptKind.TS
),
'/');
jsonStructure['packageName'] = path.relative(path.resolve(__dirname, "src/ts/"),jsonStructure['filePath']);
if (childModule) {
let moduleRelativePath = path.relative(path.resolve(__dirname, "modules"), file);
let pathElements = moduleRelativePath.split(path.sep);
jsonStructure['moduleName'] = pathElements.shift();
pathElements.shift(); //remove src folder
pathElements.shift(); //remove lib folder
jsonStructure['packageName'] = pathElements.join(path.sep);
}else {
jsonStructure['packageName'] = path.relative(path.resolve(__dirname, "src", "ts"), jsonStructure['filePath']);
}
jsonStructure['imports'].forEach( function (val) {
if (val.libraryName.startsWith(".")) {
val['libraryName'] = path.resolve(path.dirname(jsonStructure['filePath']), val['libraryName']);
val['libraryName'] = path.relative(path.resolve(__dirname, "src/ts/"), val['libraryName']);
if (childModule) {
// let subPath = "modules" + path.sep + jsonStructure['moduleName'] + path.sep + "src" + path.sep + "lib";
val['libraryName'] = path.relative(path.resolve(__dirname, "modules", jsonStructure['moduleName'], "src", "lib"), val['libraryName']);
}
else {
val['libraryName'] = path.relative(path.resolve(__dirname, "src", "ts"), val['libraryName']);
}
val['libraryName'] = path.dirname(val['libraryName']).split(path.sep).join(".");
}
});
delete jsonStructure['filePath'];
jsonStructure['packageName'] = path.dirname(jsonStructure['packageName']).split(path.sep).join( ".");
arr.push(jsonStructure);
}
var basePath = path.resolve(__dirname, "src", "ts");
walkFileTree(basePath, function (err, file) {
parseTsMeta(file, false);
});
walkFileTree(path.resolve(__dirname, "modules"), function (err, file) {
parseTsMeta(file,true);
});
var cache = [];

View file

@ -1,10 +1,12 @@
{
"electronic_sign.esmart_extension_url": "",
"electronic_sign.tsp_address": "",
"filter_cleanup_interval_hours": 720,
"filter_cleanup_check_period_minutes": 30,
"version": "%project.version%",
"electronic_sign.esmart_plugin.tsp_address": "",
"electronic_sign.cades_plugin.tsp_address": "",
"filter_cleanup_interval_hours": 720.0,
"filter_cleanup_check_period_minutes": 30.0,
"auth_method": "form",
"enable.version.in.url": "false",
"enable.version.in.url": "%enable.version.in.url%",
"backend.context": "/ervu-eks",
"guard.confirm_exit": false,
"message_service_error_timeout": "",
"message_service_warning_timeout": "",
@ -13,8 +15,6 @@
"jivo_chat_widget_api_url": "https://code.jivo.ru/widget/{ID}",
"jivo_chat_widget_enabled": false,
"password_pattern": "^((?=(.*\\d){1,})(?=.*[a-zа-яё])(?=.*[A-ZА-ЯЁ]).{8,})$",
"password_pattern_error": "Пароль должен содержать заглавные или прописные буквы и как минимум 1 цифру",
"show.client.errors": false,
"available_task.single_fetch": true,
"unknown.error.msg": "Произошла неизвестная ошибка, обратитесь в службу технической поддержки!"
"available_task.single_fetch": true
}

View file

@ -1 +0,0 @@
1.0.0-SNAPSHOT

View file

@ -0,0 +1,92 @@
/*----------------- Buttons ---------------- */
.webbpm .btn {
font-size: var(--size-text-primary);
font-family: 'SegoeSB';
padding: 6px 14px;
margin-bottom: 0;
border-radius: 20px;
}
.webbpm .btn:focus,
.webbpm .btn:active:focus {
box-shadow: none !important;
}
.webbpm .btn-main {
border-color: transparent !important;
background: transparent !important;
}
.webbpm .btn-main > * > .btn,
.webbpm .btn-primary {
color: var(--white) !important;
border-color: var(--color-link);
background: var(--color-link);
box-shadow: 0px 0px 6px 2px rgb(77 72 91 / 6%);
}
.webbpm .btn-main > * > .btn:not(:disabled):not(.disabled):hover,
.webbpm .btn-main > * > .btn:not(:disabled):not(.disabled):active,
.webbpm .btn-primary:hover,
.webbpm .btn-primary:active {
border-color: #1b84d2;
background: #1b84d2;
}
.webbpm .btn-main > * > .btn:not(:disabled):not(.disabled):focus,
.webbpm .btn-primary:focus {
border-color: var(--color-link-hover);
background: var(--color-link-hover);
box-shadow: none;
}
.webbpm .btn-secondary,
.webbpm .btn-default {
color: var(--color-text-primary);
border: 1px solid var(--border-light);
background: var(--white);
box-shadow: 0px 0px 6px 2px rgb(77 72 91 / 6%);
}
.webbpm .btn-secondary:not(:disabled):not(.disabled):hover,
.webbpm .btn-secondary:not(:disabled):not(.disabled):active,
.webbpm .btn-default:not(:disabled):not(.disabled):hover,
.webbpm .btn-default:not(:disabled):not(.disabled):active {
color: var(--color-link);
border-color: var(--border-light);
background-color: var(--white);
}
.webbpm .btn-secondary:not(:disabled):not(.disabled):focus,
.webbpm .btn-default:not(:disabled):not(.disabled):focus {
border-color: var(--border-light);
background-color: var(--white);
box-shadow: none;
}
.webbpm .btn.disabled,
.webbpm .btn:disabled {
color: #666;
border-color: #f3f3f3;
background-color: #f3f3f3;
box-shadow: none;
}
.webbpm .btn.btn-primary.disabled,
.webbpm .btn.btn-primary:disabled,
.webbpm .btn-main .btn.disabled,
.webbpm .btn-main .btn:disabled {
color: rgba(255, 255, 255, 0.8) !important;
border-color: var(--color-link);
background-color: var(--color-link);
box-shadow: none;
}
.webbpm ag-grid-angular .state-btn-edit,
.webbpm ag-grid-angular .state-btn-delete {
color: var(--color-link) !important;
border: 0;
background: transparent;
box-shadow: none;
}
.webbpm button.close {
outline: none;
}
/*---------------- end - Buttons -------------- */

View file

@ -1,48 +1,39 @@
@charset "utf-8";
.webbpm div[id="page"],
.webbpm div[id="page"] > div,
.webbpm div[id="page"] > div > div {
.webbpm .container-inside > div,
.webbpm .container-inside > div > div {
display: flex;
flex-direction: column;
height: 100%;
}
.webbpm [id="page"] > div > div > [page-object]:first-child {
padding-top: 15px;
}
.webbpm [id="page"] > div > div > [page-object] {
.webbpm .container-inside > div > div {
display: inherit;
margin-bottom: 10px;
padding: 0 40px;
}
.webbpm #dashboard {
padding: 15px 40px 0 40px;
margin-bottom: var(--indent-small);
padding: var(--indent-base) var(--w-screen) 0 var(--w-screen);
}
.webbpm .title {
font-size: 24px;
font-size: var(--size-text-title);
font-family: 'SegoeSB';
padding: 10px 0 0 0;
padding: var(--indent-small) 0 0 0;
}
.webbpm .sub-header {
color: var(--white);
font-weight: normal;
padding: 0 20px;
margin-top: 10px;
padding: 0 var(--indent-xbase);
margin-top: var(--indent-small);
border-radius: 20px;
background: var(--bg-secondary);
& > .form-group {
padding: 10px 0;
padding: var(--indent-small) 0;
margin-bottom: 0;
}
& > div > div:last-of-type {
font-size: 18px;
font-size: var(--size-text-header);
padding: 0;
}
}
@ -50,7 +41,8 @@
.webbpm .form-signup input.ng-invalid.ng-touched,
.webbpm .form-signup input.ng-invalid.ng-touched ~ .input-group-append > .input-group-text,
.webbpm .form-signup input.ng-invalid.ng-dirty,
.webbpm .form-signup input.ng-invalid.ng-dirty ~ .input-group-append > .input-group-text {
.webbpm .form-signup input.ng-invalid.ng-dirty ~ .input-group-append > .input-group-text,
.webbpm .form-signup ngx-intl-tel-input.ng-invalid.ng-dirty.ng-touched .iti {
border-color: var(--color-link) !important;
}
@ -70,7 +62,7 @@
.webbpm .multi.plugin-remove_button .selectize-input {
color: var(--color-text-primary);
font-size: var(--size-text-primary);
min-height: 38px;
min-height: var(--h-input);
padding: 6px 8px;
border: 1px solid var(--border-light);
border-radius: 8px;
@ -95,53 +87,42 @@
color: var(--color-link);
}
.webbpm .input-group input[name="password"],
.webbpm .input-group input[name="confirmPassword"],
.webbpm .date input[type="text"] {
.webbpm .input-group :is(input[name="password"], input[name="confirmPassword"], input[type="text"]) {
border-right: 0 ;
border-top-right-radius: 0;
border-bottom-right-radius: 0 ;
}
border-bottom-right-radius: 0;
.webbpm .input-group input[name="password"] ~ .input-group-append > .input-group-text,
.webbpm .input-group input[name="confirmPassword"] ~ .input-group-append > .input-group-text,
.webbpm .date input ~ .input-group-addon {
color: var(--color-text-primary);
border-color: var(--border-light);
border-radius: 8px;
border-top-left-radius: 0;
border-bottom-left-radius: 0;
background-color: transparent;
}
.webbpm .input-group input[name="password"] ~ .input-group-append > .input-group-text,
.webbpm .input-group input[name="confirmPassword"] ~ .input-group-append > .input-group-text,
.webbpm .date input ~ .input-group-addon {
color: var(--color-text-primary);
border-color: var(--border-light);
border-radius: 8px;
border-top-left-radius: 0;
border-bottom-left-radius: 0;
background-color: transparent;
}
.webbpm international-phone-number .input-group-addon.flagInput {
border: 0;
background-color: transparent;
.btn {
border: 1px solid var(--border-light);
border-right: 0;
border-radius: 10px;
border-top-right-radius: 0;
border-bottom-right-radius: 0;
& ~ :is(.input-group-append, .input-group-addon) {
display: flex;
align-items: center;
}
}
& ~ input {
border-right: 1px solid var(--border-light);
border-radius: 10px;
border-top-left-radius: 0;
border-bottom-left-radius: 0;
.webbpm .input-group input[name="password"] ~ .input-group-append > .input-group-text,
.webbpm .input-group input[name="confirmPassword"] ~ .input-group-append > .input-group-text,
.webbpm .date input ~ .input-group-addon {
color: var(--color-text-primary);
min-height: var(--h-input);
border-color: var(--border-light);
border-radius: 8px;
border-top-left-radius: 0;
border-bottom-left-radius: 0;
background-color: transparent;
}
.webbpm ngx-intl-tel-input .iti {
width: 100%;
border: 1px solid var(--border-light);
border-radius: 8px;
.iti__flag-container {
button, & ~ input {
border: 0;
background-color: transparent;
}
&:hover button.iti__selected-flag {
background-color: transparent;
}
}
}
@ -161,13 +142,15 @@
background-color: transparent;
}
.webbpm .form-group > label,
.webbpm .form-group > div {
display: inline-block;
vertical-align: top;
.webbpm .form-group {
margin-bottom: var(--indent-base);
& > :is(label, div) {
display: inline-block;
vertical-align: top;
}
}
.webbpm .width-full .form-group > label,
.webbpm .width-full .form-group > div {
.webbpm .width-full .form-group > :is(label, div) {
display: table-cell;
}
@ -185,7 +168,7 @@
}
.webbpm .selectize-control.form-control {
min-height: 38px;
min-height: var(--h-input);
}
.webbpm .selectize-control.single .selectize-input > .item {
@ -205,8 +188,8 @@
}
.webbpm drop-down-button .dropdown-menu.show .btn {
padding-top: 4px;
padding-bottom: 4px;
padding-top: var(--indent-xmini);
padding-bottom: var(--indent-xmini);
border: 0;
box-shadow: none;
}
@ -220,105 +203,12 @@
background-color: #f0f7fd;
}
/*----------------- Button ---------------- */
.webbpm .btn {
font-size: var(--size-text-primary);
font-family: 'SegoeSB';
padding: 6px 14px;
margin-bottom: 0;
border-radius: 20px;
}
.webbpm .btn:focus,
.webbpm .btn:active:focus {
box-shadow: none !important;
}
.webbpm .btn-main {
border-color: transparent !important;
background: transparent !important;
}
.webbpm .btn-main > * > .btn,
.webbpm .btn-primary {
color: var(--white) !important;
border-color: var(--color-link);
background: var(--color-link);
box-shadow: 0px 0px 6px 2px rgb(77 72 91 / 6%);
}
.webbpm .btn-main > * > .btn:not(:disabled):not(.disabled):hover,
.webbpm .btn-main > * > .btn:not(:disabled):not(.disabled):active,
.webbpm .btn-primary:hover,
.webbpm .btn-primary:active {
border-color: #1b84d2;
background: #1b84d2;
}
.webbpm .btn-main > * > .btn:not(:disabled):not(.disabled):focus,
.webbpm .btn-primary:focus {
border-color: #1b84d2;
background: #1b84d2;
box-shadow: none;
}
.webbpm .btn-secondary,
.webbpm .btn-default {
color: var(--color-text-primary);
border: 1px solid var(--border-light);
background: var(--white);
box-shadow: 0px 0px 6px 2px rgb(77 72 91 / 6%);
}
.webbpm .btn-secondary:not(:disabled):not(.disabled):hover,
.webbpm .btn-secondary:not(:disabled):not(.disabled):active,
.webbpm .btn-default:not(:disabled):not(.disabled):hover,
.webbpm .btn-default:not(:disabled):not(.disabled):active {
color: var(--color-link);
border-color: var(--border-light);
background-color: var(--white);
}
.webbpm .btn-secondary:not(:disabled):not(.disabled):focus,
.webbpm .btn-default:not(:disabled):not(.disabled):focus {
border-color: var(--border-light);
background-color: var(--white);
box-shadow: none;
}
.webbpm .btn.disabled,
.webbpm .btn:disabled {
color: #666;
border-color: #f3f3f3;
background-color: #f3f3f3;
box-shadow: none;
}
.webbpm .btn.btn-primary.disabled,
.webbpm .btn.btn-primary:disabled,
.webbpm .btn-main .btn.disabled,
.webbpm .btn-main .btn:disabled {
color: rgba(255, 255, 255, 0.8) !important;
border-color: var(--color-link);
background-color: var(--color-link);
box-shadow: none;
}
.webbpm ag-grid-angular .state-btn-edit,
.webbpm ag-grid-angular .state-btn-delete {
color: var(--color-link) !important;
border: 0;
background: transparent;
box-shadow: none;
}
.webbpm button.close {
outline: none;
}
/*---------------- end - Button -------------- */
/*----------------- Bread-crumb -------------- */
.webbpm bread-crumb {
display: flex;
flex-direction: column;
max-width: 800px;
margin-top: 20px;
margin-top: var(var(--indent-xbase));
.status_bar {
position: relative;
@ -329,7 +219,7 @@
.crumb-element {
color: var(--white);
font-size: var(--size-text-secondary);
padding: 4px 15px;
padding: var(--indent-xmini) var(--indent-base);
background-color: var(--bg-secondary);
border-radius: 20px;
z-index: 1;
@ -376,12 +266,16 @@
}
.webbpm .container-inside > div > div > grid,
.webbpm .container-inside > div > div > grid-v2-with-project-defined-sidebar{
.webbpm .container-inside > div > div > grid-v2-with-project-defined-sidebar {
height: auto !important;
flex: 1 1 auto;
overflow: hidden;
}
.webbpm .grid-full-height {
flex: 1 1 auto;
}
.webbpm ag-grid-angular .ag-body-viewport,
.webbpm ag-grid-angular .ag-row-odd,
.webbpm ag-grid-angular .ag-row-even {
@ -1161,6 +1055,16 @@
margin-right: 6px;
}
.webbpm ag-grid-angular .ag-combobox-filter > select,
.webbpm ag-grid-angular .ag-combobox-floating-filter > select {
font-size: var(--size-text-secondary);
min-height: auto;
padding: 0;
border: 0;
background-color: transparent;
outline: transparent;
}
.webbpm .modal-content {
border: 0;
border-radius: 15px;
@ -1237,22 +1141,22 @@
.webbpm collapsible-panel:not(.grid-setting-panel):not(.column-states-panel):not(.filter-states-panel) .card-header,
.webbpm .fieldset > legend {
font-family: 'SegoeSB';
font-size: 18px;
padding: 15px 20px;
font-size: var(--size-text-header);
padding: var(--indent-base) var(--indent-xbase);
border: 0;
background: transparent;
}
.webbpm collapsible-panel:not(.grid-setting-panel):not(.column-states-panel):not(.filter-states-panel) .card-header .font-bold {
margin-top: 10px;
margin-top: var(--indent-small);
}
.webbpm collapsible-panel:not(.grid-setting-panel):not(.column-states-panel):not(.filter-states-panel) .card-block {
padding: 0 20px 15px 20px;
padding: 0 var(--indent-xbase) var(--indent-base) var(--indent-xbase);
}
.webbpm .fieldset > .legend + div {
padding: 55px 20px 15px 20px;
padding: 55px var(--indent-xbase) var(--indent-base) var(--indent-xbase);
}
.webbpm collapsible-panel:not(.grid-setting-panel):not(.column-states-panel):not(.filter-states-panel) .card i {
@ -1279,12 +1183,12 @@
.webbpm [id^="user-management-"],
.webbpm #process-instance-list,
.webbpm #process-instance {
padding: 0 40px;
padding: 0 var(--w-screen);
}
.webbpm [id^="user-management-"] > vbox > div > *:not(.title),
.webbpm #process-instance-list > vbox > div > *:not(.title) {
margin-bottom: 20px;
margin-bottom: var(--indent-xbase);
}
.webbpm [id^="user-management-"] .card label,
@ -1303,7 +1207,7 @@
}
.webbpm #process-instance-list static-column-grid {
margin-top: 20px;
margin-top: var(--indent-xbase);
}
.webbpm #process-instance-list .radio-block .radio-content {
@ -1317,7 +1221,7 @@
}
.webbpm #process-instance bpmn-back-button {
margin: 20px 0;
margin: var(--indent-xbase) 0;
}
/*----------- end Admin-pages ------------- */
@ -1331,7 +1235,7 @@
.webbpm .calendar .month-container {
float: none;
height: max-content;
margin-bottom: 20px;
margin-bottom: var(--indent-xbase);
}
.webbpm .calendar .month .day {
@ -1355,10 +1259,9 @@
.webbpm .date .bootstrap-datetimepicker-widget {
color: var(--color-text-primary);
width: min-content;
padding: 10px;
padding: var(--indent-small);
margin: 0;
border: 1px solid var(--border-light);
border-radius: 10px;
background-color: var(--white);
box-shadow: 0 8px 12px rgb(77 72 91 / 5%), 0 6px 10px rgb(77 72 91 / 0%);
@ -1397,7 +1300,7 @@
.webbpm .btn-group-viewdate.btn-group .btn {
width: 38px;
height: 38px;
border-radius: 19px;
border-radius: 20px;
cursor: pointer;
}
@ -1414,18 +1317,18 @@
}
.webbpm .btn-group-viewperiod.btn-group .btn.active:hover,
.webbpm .btn-group-viewperiod.btn-group .btn.active:active {
border-color: #1b84d2 !important;
background: #1b84d2 !important;
border-color: var(--color-link-hover) !important;
background: var(--color-link-hover) !important;
}
.webbpm .btn-group-viewperiod.btn-group .btn.active:focus {
border-color: #1b84d2 !important;
background: #1b84d2 !important;
border-color: var(--color-link-hover) !important;
background: var(--color-link-hover) !important;
box-shadow: none;
}
.webbpm .btn-group-viewdate.btn-group .btn + .btn,
.webbpm .btn-group-viewperiod.btn-group .btn + .btn {
margin-left: 10px;
margin-left: var(--indent-small);
}
.webbpm .cal-week-view .cal-header.cal-weekend span {

View file

@ -1,9 +0,0 @@
.webbpm.ervu-eks .container-inside > div > div > [page-object]:first-child {
padding-top: 15px;
}
.webbpm.ervu-eks .container-inside > div > div > [page-object] {
display: inherit;
margin-bottom: 10px;
padding: 0 40px;
}

View file

@ -21,11 +21,12 @@
.webbpm a {
color: var(--color-link);
text-decoration: none;
&:hover,
&:focus,
&:active {
color: var(--color-link-hover);
text-decoration: none;
}
}
@ -38,7 +39,7 @@ body.webbpm {
}
.webbpm .container {
padding: 70px 0 0;
padding: var(--h-header) 0 0;
}
body.webbpm [id="page"],
@ -56,7 +57,7 @@ body.webbpm [id="page"],
display: flex;
flex-direction: row;
align-items: center;
margin-left: 40px;
margin-left: var(--w-screen);
.logo a {
background: url('../../../src/resources/img/logo-full.png') no-repeat 0 50%;
@ -67,9 +68,9 @@ body.webbpm [id="page"],
display: flex;
flex-direction: row;
margin-left: auto;
margin-right: 40px;
margin-right: var(--w-screen);
& > * {
margin-right: 20px;
margin-right: var(--indent-xbase);
&:last-child {
margin-right: 0;
}
@ -102,14 +103,14 @@ body.webbpm [id="page"],
display: flex;
flex-direction: column;
color: var(--black);
padding: 4px 20px;
padding: var(--indent-xmini) var(--indent-xbase);
background: transparent;
cursor: default;
& > * {
display: flex;
padding-bottom: 10px;
margin: 0 0 10px 0;
padding-bottom: var(--indent-small);
margin: 0 0 var(--indent-small) 0;
border-bottom: 1px solid #f1f5f9;
&:last-child {
margin-bottom: 0;
@ -134,7 +135,7 @@ body.webbpm [id="page"],
font-family: 'Segoe';
width: 100%;
height: auto;
min-height: 70px;
min-height: var(--h-header);
border-bottom: 1px solid var(--bg-light);
background: var(--white);
box-shadow: 0px 15px 20px 0px rgb(0 0 0 / 4%);
@ -146,7 +147,7 @@ body.webbpm [id="page"],
}
.dropdown-menu.show {
top: 69px !important;
top: calc(var(--h-header) - 1px) !important;
right: 0px !important;
left: auto !important;
transform: none !important;
@ -157,13 +158,13 @@ body.webbpm [id="page"],
box-shadow: 0 8px 12px rgb(77 72 91 / 5%), 0 6px 10px rgb(77 72 91 / 0%);
.dropdown-menu-inner {
max-height: calc(100vh - 140px);
max-height: calc(100vh - var(--h-header)*2);
overflow-y: auto;
}
}
:is(process, admin-menu) .dropdown-menu.show {
top: 49px !important;
:is(process, admin-menu) .dropdown.show {
position: static;
}
.logout .dropdown-menu.show {
@ -176,7 +177,7 @@ body.webbpm [id="page"],
}
.webbpm .dropdown-item {
padding: 4px 20px;
padding: var(--indent-xmini) var(--indent-xbase);
&:hover,
&:focus,
&:active {
@ -191,7 +192,7 @@ body.webbpm [id="page"],
font-size: var(--size-text-secondary);
left: 0;
right: 0;
padding: 15px 40px;
padding: var(--indent-base) var(--w-screen);
border-top: 1px solid var(--border-light);
a {
color: var(--color-text-primary);
@ -203,7 +204,7 @@ body.webbpm [id="page"],
/*-------------- Menu tasks -------------- */
.webbpm .task-list-tree-panel {
padding: 0 40px;
padding: 0 var(--w-screen);
.task-list-filter {
font-family: 'Segoe';
box-shadow: none;
@ -225,7 +226,7 @@ body.webbpm [id="page"],
}
.webbpm .task-list-workplace {
padding: 20px 40px 0 40px;
padding: 20px var(--w-screen) 0 var(--w-screen);
}
.webbpm .task-tbl :is(.tr.task-ontime, .tr.task-overdue) > .td.task::before {

View file

@ -8,8 +8,24 @@
--bg-secondary: #4c5969;
--border-light: #e3e6ed;
--size-text-title: 24px;
--size-text-subtitle: 20px;
--size-text-header: 18px;
--size-text-primary: 16px;
--size-text-secondary: 14px;
--size-text-small: 12px;
--indent-medium: 24px;
--indent-xbase: 20px;
--indent-base: 16px;
--indent-small: 12px;
--indent-mini: 8px;
--indent-xmini: 4px;
--h-input: 38px;
--h-header: 70px;
--h-footer: 50px;
--w-screen: 40px;
}
* {
@ -23,7 +39,7 @@
box-sizing: border-box;
}
body.webbpm .form-signin label {
.webbpm .form-signin label {
width: 160px;
margin-right: 0;
}
@ -36,7 +52,7 @@ body.webbpm .form-signin label {
background: url("../img/progress.gif") no-repeat 0 0;
}
.webbpm > .progress {
.webbpm .progress {
top: 50%;
left: 50%;
margin-top: -30px;
@ -72,18 +88,15 @@ body.webbpm .form-signin label {
list-style: none;
}
.webbpm :is(h1, h2, h3) {
.webbpm :is(h1, h2) {
margin: 0;
font-weight: normal;
}
.webbpm h1 {
font-size: 2.33em;
font-size: var(--size-text-title);
}
.webbpm h2 {
font-size: 2em;
}
.webbpm h3 {
font-size: 1.5em;
font-size: var(--size-text-subtitle);
}
.webbpm .table {
@ -99,13 +112,13 @@ body.webbpm .form-signin label {
}
/*-- layout --*/
html, body.webbpm {
html, .webbpm, .webbpm app-root {
width: 100%;
height: 100%;
display: block;
}
body.webbpm {
.webbpm {
background-color: #f9f9fa;
font-family: Arial;
font-size: var(--size-text-secondary);
@ -124,12 +137,12 @@ body.webbpm {
max-width: 100%;
height: auto;
margin: 0;
padding: 67px 0 0;
padding: var(--h-header) 0 0;
position: absolute;
top: 0px;
left: 0;
right: 0;
bottom: 50px;
bottom: var(--h-footer);
border: 0;
overflow: hidden;
@ -151,17 +164,17 @@ body.webbpm {
.webbpm footer {
position: absolute;
color: var(--black);
font-size: 12px;
font-size: var(--size-text-small);
bottom: 0;
left: 15px;
right: 15px;
height: 50px;
padding: 15px 0;
left: var(--indent-base);
right: var(--indent-base);
height: var(--h-footer);
padding: var(--indent-base) 0;
border-top: 1px solid #c1c1c1;
background: transparent;
span + span {
padding-left: 20px;
padding-left: var(--indent-medium);
}
}
/*--------- TOP MENU ----------*/
@ -172,7 +185,7 @@ body.webbpm {
a {
width: 200px;
height: 67px;
height: var(--h-header);
position: absolute;
background: url("../img/logo.png") no-repeat 0 0;
}
@ -181,40 +194,37 @@ body.webbpm {
.webbpm .header {
position: absolute;
color: var(--white);
font-family: Corbel;
font-size: var(--size-text-secondary);
top: 0;
left: 0;
right: 0;
height: 67px;
min-height: 67px;
height: var(--h-header);
min-height: var(--h-header);
line-height: normal;
border: 0;
padding: 0;
background: #b9c0ca;
z-index: 997;
.nav .nav-link {
.nav-link {
color: var(--white);
float: none;
display: block;
line-height: 60px;
padding: 0 15px 0 60px;
text-shadow: none;
cursor: pointer;
}
.nav .nav-link:hover {
.nav-link:hover {
text-decoration: none;
}
}
.webbpm .dropdown-menu {
background-color: #eee;
background-color: var(--bg-light);
}
.webbpm .nav .nav-item .dropdown-menu:after {
border-bottom: 6px solid #eee;
border-bottom: 6px solid var(--bg-light);
}
.webbpm .inner {
@ -234,30 +244,6 @@ body.webbpm {
}
/*--------- end - TOP MENU ----------*/
.webbpm .user-department,
.webbpm .user-info {
color: #5a6473;
}
.webbpm .user-info > * {
display: inline-block;
margin-left: 5px;
}
.webbpm [log-out] {
max-width: 40%;
margin-right: 15px;
}
.webbpm .content {
padding: 0 20px;
}
.webbpm .inner {
min-height: 100%;
height: 100%;
overflow-y : scroll;
}
/*--------------task-list------------------*/
.task-list {
@ -282,7 +268,7 @@ body.webbpm {
.task-list-tree-panel .task-list-filter {
position: relative;
margin-top: 15px;
margin-top: var(--indent-base);
z-index: 10;
}
@ -416,7 +402,7 @@ body.webbpm {
/*--------------Окно сообщения об ошибке--------------*/
.webbpm #toast-container {
font-size: 12px;
font-size: var(--size-text-small);
bottom: auto;
overflow-y: auto;
overflow-x: hidden;
@ -581,7 +567,6 @@ body.webbpm {
}
.webbpm .task-list-tree-panel .task-list-filter {
font-family: Corbel;
margin: 0;
box-shadow: 0px 4px 10px -5px rgba(40, 40, 40, 0.3);
@ -700,7 +685,7 @@ body.webbpm {
}
.webbpm .form-signin input {
width: 240px;
width: auto;
font-size: var(--size-text-secondary);
display: inline-block;
}
@ -713,6 +698,12 @@ body.webbpm {
.webbpm :is(.form-signin, .form-signup) .row {
display: flex;
margin: 0 0 20px;
& > :is(div, label, ngx-intl-tel-input), &.registration > * {
width: auto;
padding-left: 0;
padding-right: 0;
}
}
.webbpm .registration-link,
@ -747,13 +738,6 @@ body.webbpm {
width: 220px;
}
.webbpm .form-signup .row international-phone-number .flagInput .btn {
border-left: 1px solid #c6cdd3;
}
.webbpm .form-signup .row international-phone-number .flagInput ~ input {
border-left: none;
}
.webbpm .form-signin .has-error .help-block {
padding-left: 125px;
font-size: var(--size-text-secondary);
@ -843,4 +827,3 @@ body.webbpm {
background-image: url('./../img/country-flags.jpg') !important;
}
/*-------------- end Поле телефона ------------ */

View file

@ -1,11 +1,14 @@
@import "../../../node_modules/angular-calendar/css/angular-calendar.css";
@import "../../../node_modules/ngx-toastr/toastr.css";
@import "../../../node_modules/bootstrap/dist/css/bootstrap-grid.css";
@import "../../../node_modules/bootstrap/dist/css/bootstrap-reboot.css";
@import "../../../node_modules/bootstrap/dist/css/bootstrap.css";
@import "../../../node_modules/bootstrap-icons/font/bootstrap-icons.css";
@import "../../../node_modules/font-awesome/css/font-awesome.css";
@import "../../../node_modules/@webbpm/base-package/css/style.css";
@import "../../../node_modules/intl-tel-input/build/css/intlTelInput.css";
@import "structure.css";
@import "inbox-app.css";
@import "components-app.css";
@import "components-eks.css";
@import "buttons.css";

View file

@ -1,4 +0,0 @@
<div class="error_message">
<div class="error_title">403</div>
<div class="error_body">Доступ запрещен</div>
</div>

View file

@ -1 +0,0 @@
<span id="version-footer">Версия: {{applicationVersion}}</span>

View file

@ -1,51 +0,0 @@
<div class="form-signin">
<form #formComponent="ngForm">
<div class="alert alert-success" [hidden]="!confirmationSent">На ваш почтовый адрес было
отправлено письмо. Подтвердите почту, чтобы войти в систему
</div>
<div class="alert alert-danger" [hidden]="!errorMessage">{{errorMessage}}</div>
<h2>Вход</h2>
<div class="row registration">
<span>Еще нет аккаунта?</span><a href="#/registration">Зарегистрироваться</a>
</div>
<div class="row">
<label>Пользователь</label>
<div class="input-group">
<input type="text" name="username" class="form-control" placeholder="Пользователь" required autofocus
[(ngModel)]="username" maxlength="100">
</div>
</div>
<div class="row">
<label>Пароль</label>
<div class="input-group">
<input
[type]="passwordType ? 'text' : 'password'"
name="password"
class="form-control field-password-view"
placeholder="" required
[(ngModel)]="password"
maxlength="100"
>
<div class="input-group-append">
<span class="input-group-text">
<i
(click)="togglePasswordType()"
class="fa"
[ngClass]="{
'fa-eye': passwordType,
'fa-eye-slash': !passwordType
}"
></i>
</span>
</div>
</div>
</div>
<div class="login-btn-box">
<!--<esia-login-button></esia-login-button>-->
<button type="submit" class="btn btn-primary" (click)="formComponent.form.valid && login()">Войти</button>
<div class="password"><a href="#/reset-password">Забыли пароль?</a></div>
</div>
</form>
</div>

View file

@ -1 +0,0 @@
<router-outlet></router-outlet>

View file

@ -1 +0,0 @@
<div #pageContent></div>

View file

@ -0,0 +1,3 @@
export const environment = {
mode: "production",
};

View file

@ -0,0 +1,3 @@
export const environment = {
mode: "development",
};

View file

@ -1,8 +0,0 @@
import "../../src/resources/css/style.css";
import {platformBrowser} from '@angular/platform-browser';
import {enableProdMode} from "@angular/core";
import {WebbpmModuleNgFactory} from "./modules/webbpm/webbpm.module.ngfactory";
window['dev_mode'] = false;
enableProdMode();
platformBrowser().bootstrapModuleFactory(WebbpmModuleNgFactory);

View file

@ -1,7 +1,20 @@
import {platformBrowserDynamic} from "@angular/platform-browser-dynamic";
/// <reference types="@angular/localize" />
import {enableProdMode} from "@angular/core";
import {WebbpmModule} from "./modules/webbpm/webbpm.module";
import {environment} from "./environments/environment";
import {bootstrapApplication} from "@angular/platform-browser";
import {WebbpmComponent} from "./modules/webbpm/component/webbpm.component";
import {appConfig} from "./modules/webbpm/app.config";
import "@angular/localize/init";
window['dev_mode'] = true;
enableProdMode();
platformBrowserDynamic().bootstrapModule(WebbpmModule);
// import "cadesplugin_api";
let isProduction: boolean = environment.mode === "production";
if (isProduction) {
enableProdMode();
}
window['dev_mode'] = !isProduction;
bootstrapApplication(WebbpmComponent, appConfig)
.catch((err) => console.error(err));

View file

@ -1,47 +0,0 @@
import {NgModule} from "@angular/core";
import {RouterModule, Routes} from "@angular/router";
import {AccessDeniedComponent} from "./component/access-denied.component";
import {LoginComponent} from "./component/login.component";
import {AuthenticationGuard, ConfirmExitGuard, SignedInGuard} from "@webbpm/base-package";
import {RegisterComponent} from "./component/register.component";
import {ConfirmUserEmailComponent} from "./component/confirm-user-email.component";
import {ResetPasswordComponent} from "./component/reset-password.component";
import {NewPasswordComponent} from "./component/new-password.component";
const appRoutes: Routes = [
{
path: 'login',
component: LoginComponent,
canActivate: [SignedInGuard]
},
{
path: 'access-denied',
component: AccessDeniedComponent,
canActivate: [AuthenticationGuard, ConfirmExitGuard]
},
{
path: 'registration',
component: RegisterComponent,
canActivate: [SignedInGuard]
},
{
path: 'confirm',
component: ConfirmUserEmailComponent
},
{
path: 'reset-password',
component: ResetPasswordComponent
},
{
path: 'new-password',
component: NewPasswordComponent
},
];
@NgModule({
imports: [RouterModule.forChild(appRoutes)],
exports: [RouterModule]
})
export class AppRoutingModule {
}

View file

@ -1,76 +0,0 @@
import {forwardRef, NgModule} from "@angular/core";
import {NgbModule} from "@ng-bootstrap/ng-bootstrap";
import {CommonModule, registerLocaleData} from "@angular/common";
import localeRu from '@angular/common/locales/ru';
import {FormsModule} from "@angular/forms";
import {AgGridModule} from "ag-grid-angular";
import {
BpmnModule,
ComponentsModule,
CoreModule,
ProgressIndicationService,
SecurityModule
} from "@webbpm/base-package";
import {AdminMenuComponent} from "./component/admin-menu.component";
import {AppHeaderComponent} from "./component/app-header.component";
import {AppFooterComponent} from "./component/app-footer.component";
import {LogOutComponent} from "./component/logout.component";
import {LoginComponent} from "./component/login.component";
import {AccessDeniedComponent} from "./component/access-denied.component";
import {ApplicationVersionComponent} from "./component/application-version.component";
import {RouterModule} from "@angular/router";
import {RegisterComponent} from "./component/register.component";
import {ConfirmUserEmailComponent} from "./component/confirm-user-email.component";
import {InternationalPhoneNumberModule} from "ngx-international-phone-number";
import {ResetPasswordComponent} from "./component/reset-password.component";
import {NewPasswordComponent} from "./component/new-password.component";
import {AppProgressIndicationComponent} from "./component/app-progress-indication.component";
import {AppProgressIndicationService} from "./service/app-progress-indication.service";
import {ConfigExecuteBtn} from "../../ervu/ConfigExecuteBtn";
import {ExportDataBtn} from "../../ervu/ExportDataBtn";
registerLocaleData(localeRu);
export const DIRECTIVES = [
forwardRef(() => AppHeaderComponent),
forwardRef(() => AppFooterComponent),
forwardRef(() => AdminMenuComponent),
forwardRef(() => ApplicationVersionComponent),
forwardRef(() => LogOutComponent),
forwardRef(() => LoginComponent),
forwardRef(() => AccessDeniedComponent),
forwardRef(() => RegisterComponent),
forwardRef(() => ConfirmUserEmailComponent),
forwardRef(() => ResetPasswordComponent),
forwardRef(() => NewPasswordComponent),
forwardRef(() => AppProgressIndicationComponent),
forwardRef(() => ConfigExecuteBtn),
forwardRef(() => ExportDataBtn)
];
@NgModule({
imports: [
CommonModule,
FormsModule,
CoreModule,
NgbModule,
BpmnModule,
SecurityModule,
ComponentsModule,
AgGridModule,
RouterModule,
InternationalPhoneNumberModule
],
declarations: [
DIRECTIVES
],
exports: [
DIRECTIVES
],
providers: [
{ provide: ProgressIndicationService, useClass: AppProgressIndicationService }
],
bootstrap: [],
entryComponents: [AppProgressIndicationComponent]
})
export class AppModule {
}

View file

@ -1,11 +0,0 @@
import {ChangeDetectionStrategy, Component} from "@angular/core";
@Component({
moduleId: module.id,
selector: "access-denied",
templateUrl: "../../../../../src/resources/template/app/component/access_denied.html",
changeDetection: ChangeDetectionStrategy.OnPush
})
export class AccessDeniedComponent {
}

View file

@ -1,9 +0,0 @@
import {Component} from "@angular/core";
@Component({
moduleId: module.id,
selector: "app-footer",
templateUrl: "../../../../../src/resources/template/app/component/app_footer.html"
})
export class AppFooterComponent {
}

View file

@ -1,20 +0,0 @@
import {ChangeDetectionStrategy, Component} from "@angular/core";
import {Router} from "@angular/router";
import {UserService, Session} from "@webbpm/base-package";
import {Observable} from "rxjs";
@Component({
moduleId: module.id,
selector: "app-header",
templateUrl: "../../../../../src/resources/template/app/component/app_header.html",
changeDetection: ChangeDetectionStrategy.OnPush
})
export class AppHeaderComponent {
public currentSession: Observable<Session>;
constructor(protected userService: UserService,
protected router: Router) {
this.currentSession = this.userService.getCurrentSession();
}
}

View file

@ -1,11 +0,0 @@
import {ChangeDetectionStrategy, Component} from "@angular/core";
@Component({
moduleId: module.id,
changeDetection: ChangeDetectionStrategy.OnPush,
selector: 'progress-indication-dialog-content',
templateUrl: '../../../../../src/resources/template/app/component/progress-indication.html'
})
export class AppProgressIndicationComponent {
}

View file

@ -1,51 +0,0 @@
import {ActivatedRoute, Router} from "@angular/router";
import {ChangeDetectionStrategy, ChangeDetectorRef, Component, Input} from "@angular/core";
import {Session, UserService} from "@webbpm/base-package";
import {Observable} from "rxjs";
enum VerificationStatus {
VERIFYING = "VERIFYING",
VERIFIED = "VERIFIED",
FAILED = "FAILED"
}
@Component({
moduleId: module.id,
selector: "confirm",
changeDetection: ChangeDetectionStrategy.OnPush,
templateUrl: "../../../../../src/resources/template/app/component/confirm-user-email.html"
})
export class ConfirmUserEmailComponent {
public verificationStatus = VerificationStatus.VERIFYING;
public currentSession: Observable<Session>;
@Input()
public errorMessage: string;
constructor(private router: Router, private userService: UserService,
private route: ActivatedRoute, private cd: ChangeDetectorRef) {
this.currentSession = this.userService.getCurrentSession();
}
ngOnInit() {
const link: string = this.route.snapshot.queryParamMap.get("link");
// remove link from url to prevent http referer leakage
this.router.navigate([], { relativeTo: this.route, replaceUrl: true });
this.userService.confirm(
link,
(reason) => {
this.verificationStatus = VerificationStatus.FAILED;
if (reason.status === 404) {
this.errorMessage = 'Ссылка недействительна. Требуется повторная регистрация.';
}
else {
this.errorMessage = 'Произошла ошибка, обратитесь в службу технической поддержки!';
}
this.cd.markForCheck();
})
.then(() => {
this.verificationStatus = VerificationStatus.VERIFIED;
this.cd.markForCheck();
});
}
}

View file

@ -1,79 +0,0 @@
import {ActivatedRoute, Router} from "@angular/router";
import {Component, Input} from "@angular/core";
import {Session, UserPasswordResetRequestDto, UserService} from "@webbpm/base-package";
import {Observable} from "rxjs";
@Component({
moduleId: module.id,
selector: "newPassword",
templateUrl: "../../../../../src/resources/template/app/component/new_password.html"
})
export class NewPasswordComponent {
public currentSession: Observable<Session>;
private token: string;
@Input()
public password: string;
public passwordType: boolean;
@Input()
public confirmPassword: string;
public confirmPasswordType: boolean;
@Input()
public errorMessage: string;
constructor(private router: Router, private userService: UserService,
private route: ActivatedRoute) {
this.currentSession = this.userService.getCurrentSession();
}
ngOnInit() {
this.token = this.route.snapshot.queryParamMap.get("token");
this.router.navigate([], {relativeTo: this.route, replaceUrl: true});
if (this.token == undefined || this.token === '') {
this.errorMessage = 'Ссылка недействительна. Требуется повторить восстановление пароля.';
return;
}
}
public changePassword(): void {
let dto: UserPasswordResetRequestDto = new UserPasswordResetRequestDto();
dto.password = this.password;
dto.passwordConfirm = this.confirmPassword;
this.userService.changePassword(dto, this.token)
.then(() => this.router.navigateByUrl("/"),
() => {
this.errorMessage =
'Произошла неизвестная ошибка, обратитесь в службу технической поддержки!';
});
}
togglePasswordType(): void {
this.passwordType = !this.passwordType;
}
toggleConfirmPasswordType(): void {
this.confirmPasswordType = !this.confirmPasswordType;
}
validPasswords(): boolean {
if (this.password === undefined || this.confirmPassword === undefined) {
return false;
}
let eq = this.password === this.confirmPassword;
if (!eq) {
this.errorMessage = 'Введенные пароли не совпадают. Убедитесь, что данные, ' +
'введенные в поле "Подтверждение пароля", совпадают с теми, ' +
'которые указаны в поле "Пароль".';
}
else {
this.errorMessage = '';
}
return eq;
}
}

View file

@ -1,71 +0,0 @@
import {Component, Input, ViewChild} from "@angular/core";
import {AppConfigService, UserDto, UserService} from "@webbpm/base-package";
import {Router} from "@angular/router";
import {PhoneNumberComponent} from "ngx-international-phone-number";
@Component({
moduleId: module.id,
selector: "register",
templateUrl: "../../../../../src/resources/template/app/component/register.html"
})
export class RegisterComponent {
public passwordPattern: string;
public passwordPatternErrorMessage: string;
public errorMessage: string;
@Input()
public username: string;
@Input()
public email: string;
@ViewChild(PhoneNumberComponent)
public phone: PhoneNumberComponent;
public phoneNumber: string;
public phoneIsTouched: boolean = false;
@Input()
public password: string;
public fieldType: boolean;
@Input()
public consent: string;
constructor(private router: Router, private userService: UserService,private appConfigService: AppConfigService) {
this.passwordPattern = appConfigService.getParamValue("password_pattern");
this.passwordPatternErrorMessage = appConfigService.getParamValue("password_pattern_error");
}
public register(): void {
let user: UserDto = new UserDto();
user.username = this.username;
user.email = this.email;
user.name = this.username;
user.phone = this.phone.value;
user.password = this.password;
this.userService.register(user)
.then(() => this.router.navigateByUrl("/login?confirmationSent=true"),
(reason: any) => {
if (reason.status === 409) {
this.errorMessage = 'Пользователь с данным почтовым адресом уже существует';
}
else {
this.errorMessage = 'Произошла неизвестная ошибка, обратитесь в службу технической поддержки!';
}
});
}
toggleFieldType(): void {
this.fieldType = !this.fieldType;
}
phoneHasOnlyDialCode(): boolean {
return this.phone.phoneNumber.trim() === this.phone.getSelectedCountryDialCode().trim()
}
phoneInputFocusOut(): void {
this.phoneIsTouched = true;
}
}

View file

@ -1,9 +0,0 @@
import {Component} from "@angular/core";
@Component({
moduleId: module.id,
selector: "[preview-container]",
templateUrl: "../../../../../src/resources/template/preview/preview_container.html"
})
export class PreviewContainerComponent {
}

View file

@ -1,9 +0,0 @@
import {Component} from "@angular/core";
@Component({
moduleId: module.id,
selector: "[preview]",
templateUrl: "../../../../../src/resources/template/preview/preview.html"
})
export class PreviewComponent {
}

View file

@ -1,20 +0,0 @@
import {NgModule} from "@angular/core";
import {RouterModule, Routes} from "@angular/router";
import {PreviewComponent} from "./component/preview.component";
import {DYNAMIC_ROUTING} from "../../page.routing";
const previewRoutes: Routes = [
{
path: 'preview',
component: PreviewComponent,
children: DYNAMIC_ROUTING,
}
];
@NgModule({
imports: [RouterModule.forRoot(previewRoutes, {useHash: true})],
exports: [RouterModule]
})
export class PreviewRoutingModule {
}

View file

@ -1,7 +0,0 @@
import {platformBrowserDynamic} from "@angular/platform-browser-dynamic";
import {enableProdMode} from "@angular/core";
import {PreviewModule} from "./preview.module";
window['dev_mode'] = true;
enableProdMode();
platformBrowserDynamic().bootstrapModule(PreviewModule);

View file

@ -1,51 +0,0 @@
import {NgModule, NgZone} from "@angular/core";
import {FormsModule} from "@angular/forms";
import {BrowserModule} from "@angular/platform-browser";
import {AgGridModule} from "ag-grid-angular";
import {PreviewComponent} from "./component/preview.component";
import {PreviewRoutingModule} from "./preview-routing.module";
import {PreviewContainerComponent} from "./component/preview-container.component";
import {NgbModule} from "@ng-bootstrap/ng-bootstrap";
import {ToastNoAnimationModule} from "ngx-toastr";
import {AppModule} from "../app/app.module";
import {ComponentsModule, CoreModule, SecurityModule} from "@webbpm/base-package";
import {HTTP_INTERCEPTORS} from "@angular/common/http";
import {HttpPreviewInterceptor} from "./service/http-preview-interceptor.service";
export const HTTP_INTERCEPTOR_PROVIDERS = [
{ provide: HTTP_INTERCEPTORS, useClass: HttpPreviewInterceptor, multi: true }
];
let IMPORTS = [
BrowserModule,
FormsModule,
NgbModule,
ToastNoAnimationModule.forRoot(),
AgGridModule,
CoreModule,
ComponentsModule,
AppModule,
SecurityModule,
PreviewRoutingModule
];
@NgModule({
imports: IMPORTS,
declarations: [
PreviewContainerComponent,
PreviewComponent
],
exports: [],
providers: [
HTTP_INTERCEPTOR_PROVIDERS
],
bootstrap: [
PreviewContainerComponent
]
})
export class PreviewModule {
constructor(zone: NgZone) {
window['zoneImpl'] = zone;
}
}

View file

@ -0,0 +1,4 @@
import {Routes} from '@angular/router';
export const previewRoutes: Routes = [
];

View file

@ -0,0 +1,9 @@
import {Routes} from '@angular/router';
import {DYNAMIC_ROUTING} from "../../page.routing";
export const previewRoutes: Routes = [
{
path: '',
children: DYNAMIC_ROUTING
}
];

View file

@ -1,16 +0,0 @@
import {Injectable} from "@angular/core";
import {HttpEvent, HttpHandler, HttpInterceptor, HttpRequest} from "@angular/common/http";
import {EMPTY, Observable} from "rxjs";
import {catchError} from "rxjs/operators";
@Injectable()
export class HttpPreviewInterceptor implements HttpInterceptor {
intercept(req: HttpRequest<any>, next: HttpHandler): Observable<HttpEvent<any>> {
return next.handle(req).pipe(catchError(() => {
return EMPTY;
}
));
}
}

View file

@ -0,0 +1,70 @@
import {
ApplicationConfig,
ErrorHandler,
importProvidersFrom,
inject,
provideAppInitializer,
provideZoneChangeDetection
} from '@angular/core';
import {provideRouter, withHashLocation, withRouterConfig} from '@angular/router';
import {
AppConfigService,
ProcessInstanceParamsProvider,
TaskParamsProvider,
} from "@webbpm/base-package";
import {appRoutes} from './app.routes';
import {SharedModule} from "shared";
import {provideAnimations} from "@angular/platform-browser/animations";
import {GlobalErrorHandler} from "./handler/global-error.handler";
import {DEFAULT_HTTP_INTERCEPTOR_PROVIDERS} from "./interceptor/default-interceptors";
import {
HttpClient,
provideHttpClient,
withInterceptorsFromDi,
withXsrfConfiguration
} from "@angular/common/http";
import {provideToastr} from "ngx-toastr";
import {TokenConstants} from "./security/TokenConstants";
import {lastValueFrom} from "rxjs";
import {environment} from "../../environments/environment";
export const appConfig: ApplicationConfig = {
providers: [
provideAnimations(),
provideToastr({
preventDuplicates: true,
positionClass: 'toast-top-right'
}),
provideHttpClient(
withInterceptorsFromDi(),
withXsrfConfiguration(
{
cookieName: TokenConstants.CSRF_TOKEN_NAME,
headerName: TokenConstants.CSRF_HEADER_NAME
}),
),
importProvidersFrom(SharedModule),
provideAppInitializer(() => {
let httpClient = inject(HttpClient);
let appConfigService = inject(AppConfigService);
return appConfigService.load()
.then(() => lastValueFrom(httpClient.get<any>("version"))
.catch(reason => {
if (environment.mode == "development") {
console.error("Can't get backend version:" + reason);
}
else {
return Promise.reject(reason);
}
}));
}),
TaskParamsProvider,
ProcessInstanceParamsProvider,
{provide: ErrorHandler, useClass: GlobalErrorHandler},
DEFAULT_HTTP_INTERCEPTOR_PROVIDERS,
provideZoneChangeDetection({eventCoalescing: true}),
provideRouter(appRoutes,
withHashLocation(),
withRouterConfig({onSameUrlNavigation: "reload"})),
],
};

View file

@ -0,0 +1,142 @@
import {Route} from '@angular/router';
import {
AuthenticationGuard,
ConfirmExitGuard,
SignedInGuard,
} from "@webbpm/base-package";
import {LoginComponent} from "./component/login.component";
import {AccessDeniedComponent} from "./component/access-denied.component";
import {RegisterComponent} from "./component/register.component";
import {ConfirmUserEmailComponent} from "./component/confirm-user-email.component";
import {ResetPasswordComponent} from "./component/reset-password.component";
import {NewPasswordComponent} from "./component/new-password.component";
import {previewRoutes} from "../preview/preview.routes";
export const appRoutes: Route[] = [
{
path: '',
loadComponent: () => import('page-main').then(
m => m.PagemainComponent),
canActivate: [AuthenticationGuard],
pathMatch: 'full',
},
{
path: 'webbpm-preview',
children: previewRoutes,
},
{
path: 'login',
component: LoginComponent,
canActivate: [SignedInGuard]
},
{
path: 'access-denied',
component: AccessDeniedComponent,
canActivate: [AuthenticationGuard, ConfirmExitGuard]
},
{
path: 'registration',
component: RegisterComponent,
canActivate: [SignedInGuard]
},
{
path: 'confirm',
component: ConfirmUserEmailComponent
},
{
path: 'reset-password',
component: ResetPasswordComponent
},
{
path: 'new-password',
component: NewPasswordComponent
},
{
path: 'user-management',
canActivate: [AuthenticationGuard],
children: [
{
path: 'users',
loadComponent: () => import('page-user-management-users').then(
m => m.PageusermanagementusersComponent),
canActivate: [ConfirmExitGuard]
},
{
path: 'users/new',
loadComponent: () => import('page-user-management-user-create').then(
m => m.PageusermanagementusercreateComponent),
canActivate: [ConfirmExitGuard]
},
{
path: 'users/:id',
loadComponent: () => import('page-user-management-user-edit').then(
m => m.PageusermanagementusereditComponent),
canActivate: [ConfirmExitGuard]
},
{
path: 'org-units',
loadComponent: () => import('page-user-management-org-units').then(
m => m.PageusermanagementorgunitsComponent),
canActivate: [ConfirmExitGuard]
},
{
path: 'org-units/new',
loadComponent: () => import('page-user-management-org-unit').then(
m => m.PageusermanagementorgunitComponent),
canActivate: [ConfirmExitGuard]
},
{
path: 'org-units/:id',
loadComponent: () => import('page-user-management-org-unit').then(
m => m.PageusermanagementorgunitComponent),
canActivate: [ConfirmExitGuard]
},
{
path: 'roles',
loadComponent: () => import('page-user-management-roles').then(
m => m.PageusermanagementrolesComponent),
canActivate: [ConfirmExitGuard]
},
{
path: 'roles/new',
loadComponent: () => import('page-user-management-role').then(
m => m.PageusermanagementroleComponent),
canActivate: [ConfirmExitGuard]
},
{
path: 'roles/:id',
loadComponent: () => import('page-user-management-role').then(
m => m.PageusermanagementroleComponent),
canActivate: [ConfirmExitGuard]
},
{
path: 'groups',
loadComponent: () => import('page-user-management-groups').then(
m => m.PageusermanagementgroupsComponent),
canActivate: [ConfirmExitGuard]
},
{
path: 'groups/new',
loadComponent: () => import('page-user-management-group-create').then(
m => m.PageusermanagementgroupcreateComponent),
canActivate: [ConfirmExitGuard]
},
{
path: 'groups/:id',
loadComponent: () => import('page-user-management-group-edit').then(
m => m.PageusermanagementgroupeditComponent),
canActivate: [ConfirmExitGuard]
},
{
path: 'authorities',
loadComponent: () => import('page-user-management-authorities').then(
m => m.PageusermanagementauthoritiesComponent),
canActivate: [ConfirmExitGuard]
}
]
},
{
path: '**',
redirectTo: '',
}
];

View file

@ -0,0 +1,10 @@
import {ChangeDetectionStrategy, Component} from "@angular/core";
@Component({
selector: "access-denied",
templateUrl: "./access_denied.html",
changeDetection: ChangeDetectionStrategy.OnPush
})
export class AccessDeniedComponent {
}

Some files were not shown because too many files have changed in this diff Show more