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

save

Browse source
This commit is contained in:
ilyin 2024-09-28 21:20:42 +03:00
parent 309850c070
commit 0a667d0903
6 changed files with 53 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

10
config-data-executor/config-examples/block.xml
View file

@ -28,7 +28,7 @@
<JdbcPassword>ervu</JdbcPassword> <JdbcPassword>ervu</JdbcPassword>
<JdbcDriverClassName>org.postgresql.Driver</JdbcDriverClassName> <JdbcDriverClassName>org.postgresql.Driver</JdbcDriverClassName>
<JdbcXaDataSourceClassName>org.postgresql.xa.PGXADataSource</JdbcXaDataSourceClassName> <JdbcXaDataSourceClassName>org.postgresql.xa.PGXADataSource</JdbcXaDataSourceClassName>
<JdbcXaDataSourcePoolSize>15</JdbcXaDataSourcePoolSize> <JdbcXaDataSourcePoolSize>20</JdbcXaDataSourcePoolSize>
<JdbcDatabase>person_registry</JdbcDatabase> <JdbcDatabase>person_registry</JdbcDatabase>
</SqlConnectionParams> </SqlConnectionParams>
</SqlRequest> </SqlRequest>
@ -67,7 +67,7 @@
<JdbcPassword>ervu</JdbcPassword> <JdbcPassword>ervu</JdbcPassword>
<JdbcDriverClassName>org.postgresql.Driver</JdbcDriverClassName> <JdbcDriverClassName>org.postgresql.Driver</JdbcDriverClassName>
<JdbcXaDataSourceClassName>org.postgresql.xa.PGXADataSource</JdbcXaDataSourceClassName> <JdbcXaDataSourceClassName>org.postgresql.xa.PGXADataSource</JdbcXaDataSourceClassName>
<JdbcXaDataSourcePoolSize>15</JdbcXaDataSourcePoolSize> <JdbcXaDataSourcePoolSize>20</JdbcXaDataSourcePoolSize>
<JdbcDatabase>subpoena</JdbcDatabase> <JdbcDatabase>subpoena</JdbcDatabase>
</SqlConnectionParams> </SqlConnectionParams>
</SqlRequest> </SqlRequest>
@ -93,7 +93,7 @@
<JdbcPassword>ervu</JdbcPassword> <JdbcPassword>ervu</JdbcPassword>
<JdbcDriverClassName>org.postgresql.Driver</JdbcDriverClassName> <JdbcDriverClassName>org.postgresql.Driver</JdbcDriverClassName>
<JdbcXaDataSourceClassName>org.postgresql.xa.PGXADataSource</JdbcXaDataSourceClassName> <JdbcXaDataSourceClassName>org.postgresql.xa.PGXADataSource</JdbcXaDataSourceClassName>
<JdbcXaDataSourcePoolSize>15</JdbcXaDataSourcePoolSize> <JdbcXaDataSourcePoolSize>20</JdbcXaDataSourcePoolSize>
<JdbcDatabase>incidents</JdbcDatabase> <JdbcDatabase>incidents</JdbcDatabase>
</SqlConnectionParams> </SqlConnectionParams>
</SqlRequest> </SqlRequest>
@ -120,7 +120,7 @@
<JdbcPassword>ervu</JdbcPassword> <JdbcPassword>ervu</JdbcPassword>
<JdbcDriverClassName>org.postgresql.Driver</JdbcDriverClassName> <JdbcDriverClassName>org.postgresql.Driver</JdbcDriverClassName>
<JdbcXaDataSourceClassName>org.postgresql.xa.PGXADataSource</JdbcXaDataSourceClassName> <JdbcXaDataSourceClassName>org.postgresql.xa.PGXADataSource</JdbcXaDataSourceClassName>
<JdbcXaDataSourcePoolSize>15</JdbcXaDataSourcePoolSize> <JdbcXaDataSourcePoolSize>20</JdbcXaDataSourcePoolSize>
<JdbcDatabase>geps_notifications</JdbcDatabase> <JdbcDatabase>geps_notifications</JdbcDatabase>
</SqlConnectionParams> </SqlConnectionParams>
</SqlRequest> </SqlRequest>
@ -159,7 +159,7 @@
<JdbcPassword>ervu</JdbcPassword> <JdbcPassword>ervu</JdbcPassword>
<JdbcDriverClassName>org.postgresql.Driver</JdbcDriverClassName> <JdbcDriverClassName>org.postgresql.Driver</JdbcDriverClassName>
<JdbcXaDataSourceClassName>org.postgresql.xa.PGXADataSource</JdbcXaDataSourceClassName> <JdbcXaDataSourceClassName>org.postgresql.xa.PGXADataSource</JdbcXaDataSourceClassName>
<JdbcXaDataSourcePoolSize>15</JdbcXaDataSourcePoolSize> <JdbcXaDataSourcePoolSize>20</JdbcXaDataSourcePoolSize>
<JdbcDatabase>journal_dev</JdbcDatabase> <JdbcDatabase>journal_dev</JdbcDatabase>
</SqlConnectionParams> </SqlConnectionParams>
</SqlRequest> </SqlRequest>

4
config-data-executor/config-examples/removeFromCallList.xml
View file

@ -20,7 +20,7 @@
<JdbcPassword>ervu</JdbcPassword> <JdbcPassword>ervu</JdbcPassword>
<JdbcDriverClassName>org.postgresql.Driver</JdbcDriverClassName> <JdbcDriverClassName>org.postgresql.Driver</JdbcDriverClassName>
<JdbcXaDataSourceClassName>org.postgresql.xa.PGXADataSource</JdbcXaDataSourceClassName> <JdbcXaDataSourceClassName>org.postgresql.xa.PGXADataSource</JdbcXaDataSourceClassName>
<JdbcXaDataSourcePoolSize>15</JdbcXaDataSourcePoolSize> <JdbcXaDataSourcePoolSize>20</JdbcXaDataSourcePoolSize>
<JdbcDatabase>summon-list-registry</JdbcDatabase> <JdbcDatabase>summon-list-registry</JdbcDatabase>
</SqlConnectionParams> </SqlConnectionParams>
</SqlRequest> </SqlRequest>
@ -45,7 +45,7 @@
<JdbcPassword>ervu</JdbcPassword> <JdbcPassword>ervu</JdbcPassword>
<JdbcDriverClassName>org.postgresql.Driver</JdbcDriverClassName> <JdbcDriverClassName>org.postgresql.Driver</JdbcDriverClassName>
<JdbcXaDataSourceClassName>org.postgresql.xa.PGXADataSource</JdbcXaDataSourceClassName> <JdbcXaDataSourceClassName>org.postgresql.xa.PGXADataSource</JdbcXaDataSourceClassName>
<JdbcXaDataSourcePoolSize>15</JdbcXaDataSourcePoolSize> <JdbcXaDataSourcePoolSize>20</JdbcXaDataSourcePoolSize>
<JdbcDatabase>person_registry</JdbcDatabase> <JdbcDatabase>person_registry</JdbcDatabase>
</SqlConnectionParams> </SqlConnectionParams>
</SqlRequest> </SqlRequest>

14
config-data-executor/config-examples/removeFromSystem.xml
View file

@ -36,7 +36,7 @@
<JdbcPassword>ervu</JdbcPassword> <JdbcPassword>ervu</JdbcPassword>
<JdbcDriverClassName>org.postgresql.Driver</JdbcDriverClassName> <JdbcDriverClassName>org.postgresql.Driver</JdbcDriverClassName>
<JdbcXaDataSourceClassName>org.postgresql.xa.PGXADataSource</JdbcXaDataSourceClassName> <JdbcXaDataSourceClassName>org.postgresql.xa.PGXADataSource</JdbcXaDataSourceClassName>
<JdbcXaDataSourcePoolSize>15</JdbcXaDataSourcePoolSize> <JdbcXaDataSourcePoolSize>20</JdbcXaDataSourcePoolSize>
<JdbcDatabase>subpoena</JdbcDatabase> <JdbcDatabase>subpoena</JdbcDatabase>
</SqlConnectionParams> </SqlConnectionParams>
</SqlRequest> </SqlRequest>
@ -65,7 +65,7 @@
<JdbcPassword>ervu</JdbcPassword> <JdbcPassword>ervu</JdbcPassword>
<JdbcDriverClassName>org.postgresql.Driver</JdbcDriverClassName> <JdbcDriverClassName>org.postgresql.Driver</JdbcDriverClassName>
<JdbcXaDataSourceClassName>org.postgresql.xa.PGXADataSource</JdbcXaDataSourceClassName> <JdbcXaDataSourceClassName>org.postgresql.xa.PGXADataSource</JdbcXaDataSourceClassName>
<JdbcXaDataSourcePoolSize>15</JdbcXaDataSourcePoolSize> <JdbcXaDataSourcePoolSize>20</JdbcXaDataSourcePoolSize>
<JdbcDatabase>decision-document-service</JdbcDatabase> <JdbcDatabase>decision-document-service</JdbcDatabase>
</SqlConnectionParams> </SqlConnectionParams>
</SqlRequest> </SqlRequest>
@ -105,7 +105,7 @@
<JdbcPassword>ervu</JdbcPassword> <JdbcPassword>ervu</JdbcPassword>
<JdbcDriverClassName>org.postgresql.Driver</JdbcDriverClassName> <JdbcDriverClassName>org.postgresql.Driver</JdbcDriverClassName>
<JdbcXaDataSourceClassName>org.postgresql.xa.PGXADataSource</JdbcXaDataSourceClassName> <JdbcXaDataSourceClassName>org.postgresql.xa.PGXADataSource</JdbcXaDataSourceClassName>
<JdbcXaDataSourcePoolSize>15</JdbcXaDataSourcePoolSize> <JdbcXaDataSourcePoolSize>20</JdbcXaDataSourcePoolSize>
<JdbcDatabase>journal_dev</JdbcDatabase> <JdbcDatabase>journal_dev</JdbcDatabase>
</SqlConnectionParams> </SqlConnectionParams>
</SqlRequest> </SqlRequest>
@ -133,7 +133,7 @@
<JdbcPassword>ervu</JdbcPassword> <JdbcPassword>ervu</JdbcPassword>
<JdbcDriverClassName>org.postgresql.Driver</JdbcDriverClassName> <JdbcDriverClassName>org.postgresql.Driver</JdbcDriverClassName>
<JdbcXaDataSourceClassName>org.postgresql.xa.PGXADataSource</JdbcXaDataSourceClassName> <JdbcXaDataSourceClassName>org.postgresql.xa.PGXADataSource</JdbcXaDataSourceClassName>
<JdbcXaDataSourcePoolSize>15</JdbcXaDataSourcePoolSize> <JdbcXaDataSourcePoolSize>20</JdbcXaDataSourcePoolSize>
<JdbcDatabase>geps_notifications</JdbcDatabase> <JdbcDatabase>geps_notifications</JdbcDatabase>
</SqlConnectionParams> </SqlConnectionParams>
</SqlRequest> </SqlRequest>
@ -165,7 +165,7 @@
<JdbcPassword>ervu</JdbcPassword> <JdbcPassword>ervu</JdbcPassword>
<JdbcDriverClassName>org.postgresql.Driver</JdbcDriverClassName> <JdbcDriverClassName>org.postgresql.Driver</JdbcDriverClassName>
<JdbcXaDataSourceClassName>org.postgresql.xa.PGXADataSource</JdbcXaDataSourceClassName> <JdbcXaDataSourceClassName>org.postgresql.xa.PGXADataSource</JdbcXaDataSourceClassName>
<JdbcXaDataSourcePoolSize>15</JdbcXaDataSourcePoolSize> <JdbcXaDataSourcePoolSize>20</JdbcXaDataSourcePoolSize>
<JdbcDatabase>incidents</JdbcDatabase> <JdbcDatabase>incidents</JdbcDatabase>
</SqlConnectionParams> </SqlConnectionParams>
</SqlRequest> </SqlRequest>
@ -208,7 +208,7 @@
<JdbcPassword>ervu</JdbcPassword> <JdbcPassword>ervu</JdbcPassword>
<JdbcDriverClassName>org.postgresql.Driver</JdbcDriverClassName> <JdbcDriverClassName>org.postgresql.Driver</JdbcDriverClassName>
<JdbcXaDataSourceClassName>org.postgresql.xa.PGXADataSource</JdbcXaDataSourceClassName> <JdbcXaDataSourceClassName>org.postgresql.xa.PGXADataSource</JdbcXaDataSourceClassName>
<JdbcXaDataSourcePoolSize>15</JdbcXaDataSourcePoolSize> <JdbcXaDataSourcePoolSize>20</JdbcXaDataSourcePoolSize>
<JdbcDatabase>person_registry</JdbcDatabase> <JdbcDatabase>person_registry</JdbcDatabase>
</SqlConnectionParams> </SqlConnectionParams>
</SqlRequest> </SqlRequest>
@ -237,7 +237,7 @@
<JdbcPassword>ervu</JdbcPassword> <JdbcPassword>ervu</JdbcPassword>
<JdbcDriverClassName>org.postgresql.Driver</JdbcDriverClassName> <JdbcDriverClassName>org.postgresql.Driver</JdbcDriverClassName>
<JdbcXaDataSourceClassName>org.postgresql.xa.PGXADataSource</JdbcXaDataSourceClassName> <JdbcXaDataSourceClassName>org.postgresql.xa.PGXADataSource</JdbcXaDataSourceClassName>
<JdbcXaDataSourcePoolSize>15</JdbcXaDataSourcePoolSize> <JdbcXaDataSourcePoolSize>20</JdbcXaDataSourcePoolSize>
<JdbcDatabase>appeal-document-service</JdbcDatabase> <JdbcDatabase>appeal-document-service</JdbcDatabase>
</SqlConnectionParams> </SqlConnectionParams>
</SqlRequest> </SqlRequest>

2
config-data-executor/config-examples/unblock.xml
View file

@ -24,7 +24,7 @@
<JdbcPassword>ervu</JdbcPassword> <JdbcPassword>ervu</JdbcPassword>
<JdbcDriverClassName>org.postgresql.Driver</JdbcDriverClassName> <JdbcDriverClassName>org.postgresql.Driver</JdbcDriverClassName>
<JdbcXaDataSourceClassName>org.postgresql.xa.PGXADataSource</JdbcXaDataSourceClassName> <JdbcXaDataSourceClassName>org.postgresql.xa.PGXADataSource</JdbcXaDataSourceClassName>
<JdbcXaDataSourcePoolSize>15</JdbcXaDataSourcePoolSize> <JdbcXaDataSourcePoolSize>20</JdbcXaDataSourcePoolSize>
<JdbcDatabase>person_registry</JdbcDatabase> <JdbcDatabase>person_registry</JdbcDatabase>
</SqlConnectionParams> </SqlConnectionParams>
</SqlRequest> </SqlRequest>

73
config-data-executor/src/main/java/org/micord/service/RequestService.java
View file

@ -147,56 +147,59 @@ public class RequestService {
} }
} }
private Map<String, Object> buildSqlQuery(SqlRequest request, List<String> ids) { private Map<String, Object> buildSqlQuery(SqlRequest request, List<String> ids) {
Map<String, Object> resultMap = new HashMap<>(); Map<String, Object> resultMap = new HashMap<>();
String endpointArguments = ids.stream() String endpointArguments;
.map(id -> "'" + id.trim() + "'")
.collect(Collectors.joining(", "));
String requestURL = request.getRequestURL(); String requestURL = request.getRequestURL();
if (requestURL.contains(":=")) { if (requestURL.contains(":=")) {
endpointArguments = "'{" + endpointArguments + "}'"; endpointArguments = "'{" + ids.stream()
} else { .map(String::trim)
endpointArguments = "(" + endpointArguments + ")"; .collect(Collectors.joining(", ")) + "}'";
} } else {
endpointArguments = "(" + ids.stream()
.map(s -> "'" + s.trim() + "'")
.collect(Collectors.joining(", ")) + ")";
}
if (request.getRequestArguments() != null && !request.getRequestArguments().isEmpty()) { if (request.getRequestArguments() != null && !request.getRequestArguments().isEmpty()) {
for (RequestArgument argument : request.getRequestArguments()) { for (RequestArgument argument : request.getRequestArguments()) {
if (argument.getRequestArgumentConnectionParams() != null) { if (argument.getRequestArgumentConnectionParams() != null) {
try (Connection connection = DatabaseConnection.getConnection( try (Connection connection = DatabaseConnection.getConnection(
argument.getRequestArgumentConnectionParams())) { argument.getRequestArgumentConnectionParams())) {
String query = argument.getRequestArgumentURL(); String query = argument.getRequestArgumentURL();
List<String> result = fetchFileListFromDatabaseSQL(connection, query); List<String> result = fetchFileListFromDatabaseSQL(connection, query);
resultMap.put("ids", result); resultMap.put("ids", result);
if (result != null && !result.isEmpty()) { if (result != null && !result.isEmpty()) {
String resultSet = "(" + result.stream() String resultSet = "(" + result.stream()
.map(s -> "'" + s.trim() + "'") .map(s -> "'" + s.trim() + "'")
.collect(Collectors.joining(", ")) + ")"; .collect(Collectors.joining(", ")) + ")";
requestURL = requestURL.replace("${" + argument.getRequestArgumentName() + "}", resultSet); requestURL = requestURL.replace("${" + argument.getRequestArgumentName() + "}", resultSet);
}
} }
catch (SQLException e) {
logger.error("Failed to execute query for RequestArgument", e); }
} catch (SQLException e) {
logger.error("Failed to execute query for RequestArgument", e);
} }
} }
} }
resultMap.put("requestURL", requestURL
.replace("${DB}", request.getSqlConnectionParams().getJdbcDatabase())
.replace("${endpointArguments}", endpointArguments));
return resultMap;
} }
resultMap.put("requestURL", requestURL
.replace("${DB}", request.getSqlConnectionParams().getJdbcDatabase())
.replace("${endpointArguments}", endpointArguments));
return resultMap;
}
private boolean executeSqlQuery(Connection connection, String query) throws SQLException { private boolean executeSqlQuery(Connection connection, String query) throws SQLException {
try (PreparedStatement stmt = connection.prepareStatement(query)) { try (PreparedStatement stmt = connection.prepareStatement(query)) {
return stmt.execute(); return stmt.execute();

1
resources/src/main/resources/business-model/main.page
View file

@ -48,7 +48,6 @@
<componentRootId>15508c49-88e3-4143-a398-cbfaedc4a59f</componentRootId> <componentRootId>15508c49-88e3-4143-a398-cbfaedc4a59f</componentRootId>
<name>Tab container</name> <name>Tab container</name>
<container>true</container> <container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered> <childrenReordered>false</childrenReordered>
<scripts id="1c20b23e-f269-42ff-aa6f-ec2e7ff152cf"/> <scripts id="1c20b23e-f269-42ff-aa6f-ec2e7ff152cf"/>
<scripts id="aba9b3cf-fe50-4149-84cd-ff7b6ed4e99d"> <scripts id="aba9b3cf-fe50-4149-84cd-ff7b6ed4e99d">