update confi

configs/firebase-fcm-dotdot-key.json

@@ -0,0 +1,13 @@
+{
+  "type": "service_account",
+  "project_id": "t-t-logistics",
+  "private_key_id": "d43ca447a200d75f02886d06689212e27f0fd823",
+  "private_key": "-----BEGIN PRIVATE KEY-----\nMIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCeqg8yH6kQp+eL\nJqjrwkgDHyw6xnKUqjidAV7C259tZD6BXzxcqzaqKc3DdCWyB8Eu0EpTfBsp6M+6\n3KACXXZ++Pd3bgzp3KOFRV16eDLr/xkvGUlMIKwb3saDjnPSdvrU0TqwCURQ+PEi\nPm6s4UTZ/bPp/h62q/oTxB3bQVwoOUcCljPynjAYUG49OXVbUW1yCMbgo1QUIXbU\n/b7mcNwjNyUnUX3mTjarjEVislqkO0j5XB06Hdnnb0z7OED0nJSV6ZRA0933Y4hL\nS+JFer1IuQGP3B8NpMdmOdCDpZPb4odcgt2Zw4gwqEV3iCE7OmXJtAQq/Nmd3luh\n6Sls4FVPAgMBAAECggEAPimZl4VA+0YVWPbWErxE83gon4R1itpgIN9TDZv3S+gM\n9ynlX9cyrRuAwtWEGUqhfOJdZHUIvXQ5wtfClvqgPOH1LqT+yTdJF6NUGvHx3XVO\nHB5XkcxxMeAnvY43wZsc7flleWfADMtjygtU2EXP8GpOLVyDEwWxDkJ1ghwK67Ta\ndpQWWbSnqo1alEWdELJ8y39xJrB/JSnFGc2sstfD5tx4fJ+1jI0ZvnCz3G1d42Rr\nnLaHfRoGSt5TddyvqejAXOhtL/Rhnki1XKhrl9/v1d25kUFPc+dK8z4yUXpWAHWs\nQfhPkRCaEYdTy9wbQ3T2tRATamuxYdGRGPVh47BSHQKBgQDeVHtk1MZVW0mohTCm\n+dto4QPGe0CVomQ1M6DGLv8fLpCTCpb2vdeftVjWXghZrWWaYBK3nZcyTP5+ii/g\nDW94TFWzB3a0M+tE1BGwc8Y9fifGqgcTeIxDbZzrDjmhOlebSvygX4uclmplPznl\ncaRpva3W6XJYGnCqMJf/XSaRTQKBgQC2sVHSA9X58Wy3ZTrbtTC1xGDx/2yGvoAw\n8w5pSj2w8f6wXvBV32uGWdf74s7XLS3g4I/y9nUGAJRJfzbBMwaAzjGHGX5UC6kp\nNJ5ZCfyRFOJ2hllIcsksj96RyDATry4fTc210XwXHHauz4tsqSfP6JomWggh6fj6\nTf4oq3zzCwKBgD1doiVlmUysArux74jXBBmBqhIZqOzkQrZwhprNE/veVWdQj/SQ\n17gsTNX2ZGWkN5wRknj91WK73667o5U7AB57K1hb4gbBIdoAktVaT0hfzsjF22gj\naMufsKUsavm2acHiQ7JcTOOunLVPa0KKSHArO5VLIBVzTs+a1AlXA7MtAoGAGRaw\nzc6JDBIDhAv60UFIty2IwrL5DGgM4qv+RqdTYYFaII5pIuHTuleMOaMkFJi3vDIa\nkpsV5wUdWBqIQm/nbLjkRFFT7+bKDEaVmFSuwp3Dm9NHX5Oj3OLFBfAf6hQcmV/t\n6BIkoGfgRJFr7Dgup3ah9LJYe4/OCVG8nYkvV5ECgYBFfQlhYv24M4RHQ/EbOIJY\nmZgZzcGz7nA0AWS8zeSoTizAtPwnoPElOs/+drJ+CKaAnfr8+BZ1spP2I8Sj6l9g\nXeDBlZvX7Q1baz6vdQr1KscjmWnHUbaDCrGWK+95umAVpyrabopynQt7T0GrBWKz\n+nixrt/C57fjiE2OHM8big==\n-----END PRIVATE KEY-----\n",
+  "client_email": "firebase-push-auth-dd@t-t-logistics.iam.gserviceaccount.com",
+  "client_id": "117030561604837789287",
+  "auth_uri": "https://accounts.google.com/o/oauth2/auth",
+  "token_uri": "https://oauth2.googleapis.com/token",
+  "auth_provider_x509_cert_url": "https://www.googleapis.com/oauth2/v1/certs",
+  "client_x509_cert_url": "https://www.googleapis.com/robot/v1/metadata/x509/firebase-push-auth-dd%40t-t-logistics.iam.gserviceaccount.com",
+  "universe_domain": "googleapis.com"
+}

configs/nginx/conf.d/default.conf

@@ -13,6 +13,8 @@ server {
 
     root /application/public;
 
+    client_max_body_size 10m;
+
     location / {
         proxy_pass http://nuxt:3000;
         proxy_http_version 1.1;
@@ -33,7 +35,7 @@ server {
         proxy_set_header Upgrade $http_upgrade;
         proxy_set_header Connection $connection_upgrade;
         proxy_set_header Host $host;
-        proxy_pass http://php:8080/;
+        proxy_pass http://ws:8080/;
     }
 
     location @rewriteapp {

configs/nginx/conf.d/demolms.dot-dot.ru.conf

@@ -1,12 +1,12 @@
 server {
     listen 80;
-    server_name demolms.dot-dot.ru;
+    server_name demolms.dot-dot.ru demo.dot-dot.ru;
     return 301 https://$server_name$request_uri;
 }
 
 server {
     listen 443 ssl;
-    server_name demolms.dot-dot.ru;
+    server_name demolms.dot-dot.ru demo.dot-dot.ru;
 
     ssl_certificate /etc/nginx/ssl/dot2023.crt;
     ssl_certificate_key /etc/nginx/ssl/dot2023.key;

configs/nginx/conf.d/lms.dot-dot.ru.conf

@@ -13,6 +13,9 @@ server {
 
     root /application/public;
 
+
+    client_max_body_size 10m;
+
     location / {
         proxy_pass http://lms:3000;
         proxy_http_version 1.1;

configs/nuxt/entrypoint.sh

@@ -39,6 +39,7 @@ done
 for x in $(grep -lr WS_PROTOCOL .nuxt/);do
     sed -i -e "s#\"WS_PROTOCOL\":\"ws\"#\"WS_PROTOCOL\":\"${WS_PROTOCOL}\"#g" $x
     sed -i -e "s#WS_PROTOCOL:\"ws\"#\"WS_PROTOCOL\":\"${WS_PROTOCOL}\"#g" $x
+    sed -i -e "s#\"WS_PROTOCOL\": \"ws\"#\"WS_PROTOCOL\": \"${WS_PROTOCOL}\"#g" $x
 done
 
 for x in $(grep -lr dot-dot.local .nuxt/);do

configs/php/.env.local

@@ -54,7 +54,7 @@ THREESELLER_PASSWORD=Logistika01
 NUXT_BASE_URL=dot-dot.ru
 
 ATISU_API_TOKEN_OLD=a9698671a68441c7b3959e43995d1506
-ATISU_API_TOKEN=25d7e2857f7f4b65a408d7664899aed7
+ATISU_API_TOKEN=46b599c3ab7f4574b560f48ea005d9f3
 
 ###> google/apiclient ###
 ANALITIC_GOOGLE_CLIENT_ID=672035500859-32f85hchubthu9givkdtgkqhvjg00c8e.apps.googleusercontent.com
@@ -163,7 +163,7 @@ YTRACKER_ORGANISATION_ID=355207
 
 SMARTCAPTCHA_SERVER_KEY=ysc2_GLQZ8QPaFh0eXqZ5KaRMuRRZOX7qNNMy7P9Mq82V6c4e7b81
 
-ML_REGULAR_DIRECTION_RELEVANCE_CARRIERS_URL=https://ml.dot-dot.ru/v1/schedule/carrier/scoring
+ML_REGULAR_DIRECTION_RELEVANCE_CARRIERS_URL=https://ml.dot-dot.ru/v2/schedule/carrier/scoring
 
 ML_UNCERTAIN_DIRECTIONS_URL=https://ml.dot-dot.ru/v1/classification/direction/uncertain
 
@@ -172,3 +172,9 @@ SENTRY_DSN="https://eedc2e8b1310ec9b04c2b0da8490dc01@sentry.dot-dot.ru/3"
 SENTRY_SERVER_NAME=prod
 SENTRY_SERVER_USER_NAME=admin
 ###< sentry/sentry-symfony ###
+
+ML_CALCULATOR_TRADE_ONLY_URL=https://ml.dot-dot.ru/v1/tender/price
+
+ML_REGULAR_DIRECTION_HISTORY_ORDER_URL=https://ml.dot-dot.ru/v1/schedule/transport/orders
+
+QUEUE_DSN_OC_CARRIER_OFFERS=amqp://ddadmin:Utahth9aeshahgh3saik@rabbitmq:5672/%2f/OC_CARRIER_OFFERS

configs/php/.env.local.save

@@ -0,0 +1,180 @@
+APP_ENV=prod
+
+DATABASE_URL=mysql://root:ahwaireiNeebeeW9keiZ@db:3306/dot?serverVersion=mariadb-10.3.25
+
+DOCUMENT_ROOT=/application
+APP_HOST=dot-dot.ru
+APP_SCHEME=https
+TEST_HOST=https://dot-dot.ru
+
+MAILER_DSN_YANDEX=smtp://no_reply@dot-dot.ru:gqwaofmeyvxefrqk@smtp.yandex.ru:587
+MAILER_DSN=smtp://no_reply@dot-dot.ru:NRTk7rXhesHQpi3YWB92@smtp.mail.ru:465
+
+SP_KEY=16e93b225c730920ac5741a8d8df788f
+SP_TEST=false
+
+SBERBANK_LOGIN=dot-dot_1-api
+SBERBANK_PASSWORD=kepwir-2gocfi-Mudpet
+SBERBANK_TESTMODE=false
+
+DEFAULT_EMAIL=no_reply@dot-dot.ru
+ADMIN_EMAIL=orders@dot-dot.ru
+ACCOUNTANT_EMAIL=ksg@dot-dot.ru
+SALES_EMAIL=sale.ftl@dot-dot.ru
+LOGIST_EMAIL=nd@dot-dot.ru
+LEAD_EMAIL=lead.hunter@dot-dot.ru
+
+APP_SEND_REAL_SMS=true
+SMSC_LOGIN=Dot-Dot
+SMSC_PASS=OY4loBiCYTHjMoadyfru
+
+DADATA_API_TOKEN=c9aa5fdc338a746e23ce91ceb6fdb9e635749833
+DADATA_API_SECRET=1ea37a4d310e7a6ac64211ffe5686363f04d4e68
+
+ROISTAT_API_KEY=c63a71dd721df7f1b1d7b5803a84ccc7
+ROISTAT_PROJECT_ID=154928
+
+UNISENDER_API_KEY=6ugo1c6yqfux9wrs8pbaom3izz9pc9huetqbdo9y
+
+GTD_ACCESS_TOKEN=5fgNQ_gZ95OmyOLl7nKJhtJ4LcWVQNbl
+
+FNS_ACCESS_TOKEN=a5639b93fe4e7c9a3f1dd85537e066d36439c352
+
+GOOGLE_MAPS_ACCESS_KEY=AIzaSyCLqawvvNm0Oj1Nt8yaQ-CdvQ1190oPaug
+
+GRAFANA_ADMIN_PASSWORD=uyt>bE8AZ2ctthyx
+GRAFANA_API_URL=https://grafana.dev.dot-dot.ru
+GRAFANA_PUBLIC_URL=https://grafana.dev.dot-dot.ru
+
+YANDEX_MAPS_ACCESS_KEY=f706092a-d705-4665-a16a-0811bd2a2c89
+
+THREESELLER_USERNAME=tk@dot-dot.ru
+THREESELLER_PASSWORD=Logistika01
+
+NUXT_BASE_URL=dot-dot.ru
+
+ATISU_API_TOKEN_OLD=a9698671a68441c7b3959e43995d1506
+ATISU_API_TOKEN=46b599c3ab7f4574b560f48ea005d9f3
+
+###> google/apiclient ###
+ANALITIC_GOOGLE_CLIENT_ID=672035500859-32f85hchubthu9givkdtgkqhvjg00c8e.apps.googleusercontent.com
+ANALITIC_GOOGLE_CLIENT_SECRET=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
+ANALITIC_GOOGLE_CLIENT_REDIRECT_URI=https://dot-dot.ru/admin/analitic/google-callback
+###< google/apiclient ###
+
+###> telegramm ###
+TELEGRAM_BOT_TOKEN=5807192360:AAHSUZcWeY1bC7aqdmcYXOfb1CYyK0xx0Cc
+TELEGRAM_CHAT_ID=-875661421
+TELEGRAM_CHAT_BOT_ACCESS_TOKEN=88c53d63aa87b39e1c27c8db2764e5b7
+###< telegramm ###
+
+VOICIA_API_KEY=7589ed2721e50e299eb3baf2e3100a6b
+
+###> voicia ###
+VOICIA_CALL_ID=8788
+###< voicia ###
+
+###> ml_calculator ###
+ML_CALCULATOR_URL=https://ml.dot-dot.ru/v2/classification/order/relevance
+###< ml_calculator ###
+
+UAT_1C_API_URL=http://1c.nwtlk.ru/UAT/hs
+UAT_1C_USER=ТТ_Запросы
+UAT_1C_PASSWORD=9421354
+
+###> carrier_scoring ###
+ML_CARRIER_SCORING=https://ml.dot-dot.ru/v2/classification/carrier/scoring
+###< carrier_scoring ###
+
+###> direction_scoring ###
+ML_DIRECTION_SCORING_URL=https://ml.dot-dot.ru/v3/classification/direction/confidence
+###< direction_scoring ###
+
+###< Vozovoz ###
+VOZOVOZ_API_KEY=5Thue256i0n5jXpB8vQfzng0VNJKGDar7ol5x0iD
+VOZOVOZ_API_URL=https://vozovoz.ru/
+###> Vozovoz ###
+
+###< Pek ###
+PECOM_API_LOGIN=TochkaTochka
+PECOM_API_PASSWORD=EB77132653DD37BCD4EF591968F504CFB04BDFC4
+PECOM_API_URL=https://kabinet.pecom.ru/
+###> Pek ###
+
+###< TkKit ###
+TKKIT_API_TOKEN=FKIICpqz25v10RuFcNorHACFdhEtkQK8
+TKKIT_API_URL=https://capi.tk-kit.com/
+###> TkKit ###
+
+###> Baikal ###
+BAIKAL_API_KEY=NjJiZjdiMjU0N2Y4ZTk5OTY3OTY3OGUxM2VjZjA3N2M6
+BAIKAL_API_URL=https://api.baikalsr.ru/v2
+BAIKAL_API_PARTNER_GUID=PROVERKA
+###< Baikal ###
+
+###> DelovieLinii ###
+DELLIN_API_KEY=BE38996C-F722-4691-BCF3-640B76DAB18B
+DELLIN_API_URL=https://api.dellin.ru/
+DELLIN_PASSWORD=Logistika01
+DELLIN_LOGIN=km@dot-dot.ru
+###< DelovieLinii ###
+
+###> JelDorEksp ###
+JDE_API_USER=2252131242955194
+JDE_API_TOKEN=159687460352596660
+###< JelDorEksp ###
+
+###> Nordweel ###
+NORDWHEEL_API_URL=https://nordw.ru/
+###< Nordweel ###
+
+###> SKIF ###
+SKIF_API_URL=http://api.skif-cargo.ru/integrations/ws/orders.1cws
+SKIF_API_LOGIN=DotDotAPI
+SKIF_API_PASSWORD=H*GYU#7g8YG*#!
+###< SKIF ###
+
+###> DPD ###
+DPD_CLIENT_NUMBER=1001066989
+DPD_CLIENT_KEY=8D52BF0F4D272FA91AF7B8EFC64C74EA31B89C4D
+###< DPD ###
+
+
+ACCOUNTING_AUDIT_URL="https://crm.dot-dot.ru/TTLBuhreport/hs/TT/reconciliationreport"
+
+PAPA_FINANCE_API_URL=https://prod.papafinance.ru/api/ttn
+PAPA_FINANCE_PASSWORD='4sw$!cN#2j$tvcm2'  
+PAPA_FINANCE_LOGIN=tochka-tochka-logistika
+
+ML_REGULAR_DIRECTION_URL=https://ml.dot-dot.ru/v2/schedule/transport
+
+###> SP_V3 ###
+SP_V3_KEY=16e93b225c730920ac5741a8d8df788f
+SP_V3_URL=https://spasskievorota.ru/services/work/cargo_3.php
+###< SP_V3 ###
+
+ML_DIRECTION_RECALCULATE_URL=https://ml.dot-dot.ru/v2/schedule/calculate
+ML_REGULAR_DIRECTION_CHAIN_URL=https://ml.dot-dot.ru/v1/schedule/chains
+
+###> YandexTracker ###
+YTRACKER_API_TOKEN="y0_AgAEA7qkKFmeAAjF8AAAAADXovQd6htdkt7LTDW_sNHCz7qV9zdVHaQ"
+YTRACKER_ORGANISATION_ID=355207
+###< YandexTracker ###
+
+SMARTCAPTCHA_SERVER_KEY=ysc2_GLQZ8QPaFh0eXqZ5KaRMuRRZOX7qNNMy7P9Mq82V6c4e7b81
+
+ML_REGULAR_DIRECTION_RELEVANCE_CARRIERS_URL=https://ml.dot-dot.ru/v2/schedule/carrier/scoring
+
+ML_UNCERTAIN_DIRECTIONS_URL=https://ml.dot-dot.ru/v1/classification/direction/uncertain
+
+###> sentry/sentry-symfony ###
+SENTRY_DSN="https://eedc2e8b1310ec9b04c2b0da8490dc01@sentry.dot-dot.ru/3"
+SENTRY_SERVER_NAME=prod
+SENTRY_SERVER_USER_NAME=admin
+###< sentry/sentry-symfony ###
+
+ML_CALCULATOR_TRADE_ONLY_URL=https://ml.dot-dot.ru/v1/tender/price
+
+ML_REGULAR_DIRECTION_HISTORY_ORDER_URL=https://ml.dot-dot.ru/v1/schedule/transport/orders
+
+QUEUE_DSN_OC_CARRIER_OFFERS=amqp://ddadmin:Utahth9aeshahgh3saik@rabbitmq:4369/%2f/OC_CARRIER_OFFERS

docker-compose.yml

@@ -54,6 +54,53 @@ services:
       - ./configs/php/.env.local:/application/.env.local
       - ./configs/php/zz-docker.conf:/usr/local/etc/php-fpm.d/zz-docker.conf
       - php_var_volume:/application/var
+      - ./configs/php/firebase-fcm-dotdot-key.json:/application/config/firebase-fcm-dotdot-key.json
+    depends_on:
+      - db
+    networks:
+      - dd
+
+  carrier-offers:
+    image: registry.dot-dot.ru/dot-dot:${DOTDOT_TAG}
+    command: ./bin/console messenger:consume CarrierOffers
+    restart: unless-stopped
+    volumes:
+      - ./configs/php/.env:/application/.env
+      - ./configs/php/.env.local:/application/.env.local
+      - ./configs/php/zz-docker.conf:/usr/local/etc/php-fpm.d/zz-docker.conf
+      - php_var_volume:/application/var
+      - ./configs/php/firebase-fcm-dotdot-key.json:/application/config/firebase-fcm-dotdot-key.json
+    depends_on:
+      - db
+      - rabbitmq
+    networks:
+      - dd
+
+  auction:
+    image: registry.dot-dot.ru/dot-dot:${DOTDOT_TAG}
+    command: sh -c 'while true; do echo run; ./bin/console app:auction:process; sleep 60;done'
+    restart: unless-stopped
+    volumes:
+      - ./configs/php/.env:/application/.env
+      - ./configs/php/.env.local:/application/.env.local
+      - ./configs/php/zz-docker.conf:/usr/local/etc/php-fpm.d/zz-docker.conf
+      - php_var_volume:/application/var
+      - ./configs/php/firebase-fcm-dotdot-key.json:/application/config/firebase-fcm-dotdot-key.json
+    depends_on:
+      - db
+    networks:
+      - dd
+
+  ws:
+    image: registry.dot-dot.ru/dot-dot:${DOTDOT_TAG}
+    command: ./bin/console app:auction:reload
+    restart: unless-stopped
+    volumes:
+      - ./configs/php/.env:/application/.env
+      - ./configs/php/.env.local:/application/.env.local
+      - ./configs/php/zz-docker.conf:/usr/local/etc/php-fpm.d/zz-docker.conf
+      - php_var_volume:/application/var
+      - ./configs/php/firebase-fcm-dotdot-key.json:/application/config/firebase-fcm-dotdot-key.json
     depends_on:
       - db
     networks: