treshenkov/clearing
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/dev' into dev

Browse source
This commit is contained in:
psemenkov 2022-12-07 11:18:32 +03:00
commit 5a0d2c2cb5
5 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/security/handlers/AuthAuditSuccessLoginHandler.java
View file

@ -40,7 +40,7 @@ public class AuthAuditSuccessLoginHandler implements AuthenticationSuccessHandle
.getPreferredUsername(); .getPreferredUsername();
Set<String> roles = details.getRoles(); Set<String> roles = details.getRoles();
if (roles.contains(Admin) || roles.contains(Security) || roles.contains(Superviser)) { if (roles.contains(Admin.getKey()) || roles.contains(Security.getKey()) || roles.contains(Superviser.getKey())) {
String clientIp = request != null ? request.getRemoteAddr() : null; String clientIp = request != null ? request.getRemoteAddr() : null;
String serverIp = request != null ? request.getLocalAddr() : null; String serverIp = request != null ? request.getLocalAddr() : null;
userAutoCreation.sendAuthSuccessEvent(username, roles, clientIp, serverIp); userAutoCreation.sendAuthSuccessEvent(username, roles, clientIp, serverIp);

4
clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/misc/AdmittedDealRegister.java
View file

@ -8,9 +8,9 @@ import java.time.Instant;
import java.time.LocalTime; import java.time.LocalTime;
/** /**
* Счета * Реестр сделок допущенных к клирингу
* <p> * <p>
* DB table: ADMITTED_DEAL * DB table: ADMITTED_DEAL_REGISTER
**/ **/
public class AdmittedDealRegister extends BusinessObject { public class AdmittedDealRegister extends BusinessObject {
private static final long serialVersionUID = ConstSerializable.serialVersionUID; private static final long serialVersionUID = ConstSerializable.serialVersionUID;

2
clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/scheduler/ClearingCalendar.java
View file

@ -8,7 +8,7 @@ import java.time.LocalDate;
/** /**
* Торговые и неторговые дни * Торговые и неторговые дни
* <p> * <p>
* DB table: TRADING_CALENDAR * DB table: CLEARING_CALENDAR
**/ **/
public class ClearingCalendar extends BusinessObject { public class ClearingCalendar extends BusinessObject {
private static final long serialVersionUID = ConstSerializable.serialVersionUID; private static final long serialVersionUID = ConstSerializable.serialVersionUID;

2
clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/scheduler/Launcher.java
View file

@ -6,7 +6,7 @@ import ru.clearing.classes.objects.BusinessObject;
/** /**
* Запуск задачи * Запуск задачи
* <p> * <p>
* DB table: TASK_RUNNER * DB table: LAUNCHER
**/ **/
public class Launcher extends BusinessObject { public class Launcher extends BusinessObject {
private static final long serialVersionUID = ConstSerializable.serialVersionUID; private static final long serialVersionUID = ConstSerializable.serialVersionUID;

4
clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/scheduler/Planner.java
View file

@ -7,9 +7,9 @@ import java.time.LocalDate;
import java.time.LocalTime; import java.time.LocalTime;
/** /**
* Расписание планировщика * Расписание
* <p> * <p>
* DB table: SCHEDULER * DB table: PLANNER
**/ **/
public class Planner extends BusinessObject { public class Planner extends BusinessObject {
private static final long serialVersionUID = ConstSerializable.serialVersionUID; private static final long serialVersionUID = ConstSerializable.serialVersionUID;