Merge remote-tracking branch 'origin/dev' into dev
This commit is contained in:
commit
5a0d2c2cb5
5 changed files with 7 additions and 7 deletions
|
|
@ -40,7 +40,7 @@ public class AuthAuditSuccessLoginHandler implements AuthenticationSuccessHandle
|
|||
.getPreferredUsername();
|
||||
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 serverIp = request != null ? request.getLocalAddr() : null;
|
||||
userAutoCreation.sendAuthSuccessEvent(username, roles, clientIp, serverIp);
|
||||
|
|
|
|||
|
|
@ -8,9 +8,9 @@ import java.time.Instant;
|
|||
import java.time.LocalTime;
|
||||
|
||||
/**
|
||||
* Счета
|
||||
* Реестр сделок допущенных к клирингу
|
||||
* <p>
|
||||
* DB table: ADMITTED_DEAL
|
||||
* DB table: ADMITTED_DEAL_REGISTER
|
||||
**/
|
||||
public class AdmittedDealRegister extends BusinessObject {
|
||||
private static final long serialVersionUID = ConstSerializable.serialVersionUID;
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ import java.time.LocalDate;
|
|||
/**
|
||||
* Торговые и неторговые дни
|
||||
* <p>
|
||||
* DB table: TRADING_CALENDAR
|
||||
* DB table: CLEARING_CALENDAR
|
||||
**/
|
||||
public class ClearingCalendar extends BusinessObject {
|
||||
private static final long serialVersionUID = ConstSerializable.serialVersionUID;
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ import ru.clearing.classes.objects.BusinessObject;
|
|||
/**
|
||||
* Запуск задачи
|
||||
* <p>
|
||||
* DB table: TASK_RUNNER
|
||||
* DB table: LAUNCHER
|
||||
**/
|
||||
public class Launcher extends BusinessObject {
|
||||
private static final long serialVersionUID = ConstSerializable.serialVersionUID;
|
||||
|
|
|
|||
|
|
@ -7,9 +7,9 @@ import java.time.LocalDate;
|
|||
import java.time.LocalTime;
|
||||
|
||||
/**
|
||||
* Расписание планировщика
|
||||
* Расписание
|
||||
* <p>
|
||||
* DB table: SCHEDULER
|
||||
* DB table: PLANNER
|
||||
**/
|
||||
public class Planner extends BusinessObject {
|
||||
private static final long serialVersionUID = ConstSerializable.serialVersionUID;
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue