diff --git a/docker_compose/credit_tracker_config.env b/docker_compose/credit_tracker_config.env index eb46ca0..8413838 100644 --- a/docker_compose/credit_tracker_config.env +++ b/docker_compose/credit_tracker_config.env @@ -7,7 +7,8 @@ JMX_MONITORING_PORT=11002 JMX_HOSTNAME= #volumes -REPORT_DIR=/opt/credit_tracker_docker/reports +REPORT_MAIN_DIR=/opt/credit_tracker_docker/main/reports +REPORT_MONITOR_DIR=/opt/credit_tracker_docker/monitor/reports LOGS_DIR=/opt/credit_tracker_docker/logs JSON_LOGS_DIR=/opt/credit_tracker_docker/logs/json ACCESS_LOGS_DIR=/opt/credit_tracker_docker/logs/access diff --git a/docker_compose/docker-compose.yml b/docker_compose/docker-compose.yml index b7130ef..82ca800 100644 --- a/docker_compose/docker-compose.yml +++ b/docker_compose/docker-compose.yml @@ -6,7 +6,7 @@ services: volumes: - ${LOGS_DIR}:/opt/app/logs/app - ${JSON_LOGS_DIR}:/opt/app/logs/json - - ${REPORT_DIR}:/opt/app/reports + - ${REPORT_MAIN_DIR}:/opt/app/reports - ${ACCESS_LOGS_DIR}:/opt/app/logs/access ports: - "${HOST_PORT}:${SERVER_PORT}" @@ -93,6 +93,7 @@ services: container_name: credit-tracker-monitoring restart: always volumes: + - ${REPORT_MONITOR_DIR}:/opt/app/reports - ${LOGS_DIR}:/opt/app/logs/app - ${JSON_LOGS_DIR}:/opt/app/logs/json environment: diff --git a/src/main/resources/mybatis/mapper/signal/PhonesMapMapper.xml b/src/main/resources/mybatis/mapper/signal/PhonesMapMapper.xml index 9553dcf..41a06e5 100644 --- a/src/main/resources/mybatis/mapper/signal/PhonesMapMapper.xml +++ b/src/main/resources/mybatis/mapper/signal/PhonesMapMapper.xml @@ -107,6 +107,7 @@ birth_dt, now() FROM src + order by phone ON CONFLICT (phone) DO UPDATE SET fid = EXCLUDED.fid, phone = EXCLUDED.phone,