update

2025-09-17 13:25:27 +03:00 · 2025-09-17 13:25:27 +03:00 · 63e49dec1d
parent abf31d356b
commit 63e49dec1d
16 changed files with 556 additions and 39 deletions
--- a/.env
+++ b/.env
@ -1,13 +1,15 @@
 COMPOSE_PROJECT_NAME=staging
 NETWORK=staging

-FRONT_TAG=release124
-DOTDOT_TAG=release124
-LMS_TAG=release124
+FRONT_TAG=develop
+DOTDOT_TAG=DDB-2032
+LMS_TAG=master
 DASHBORD_TAG=master
-SIGNER_TAG=TD-322
+SIGNER_TAG=master
 ADMIN_TAG=master
 CABINET_TAG=master
+LANDINGTTL_TAG=DDB-2012
+CVIEW_TAG=master

 MYSQL_PORT=0.0.0.0:33067
 MYSQL_ROOT_PASSWORD=root
--- a/.env.swp
+++ b/.env.swp
--- a/configs/1cview/.env.local
+++ b/configs/1cview/.env.local
@ -0,0 +1,2 @@
+AUTH_API_TOKEN="noin3seep7paiFe2ahbu"
+DATABASE_URL="postgresql://ddadmin:1NcSyXq9Ha1@@1c.dot-dot.ru:5433/TTL_BUH?serverVersion=16&charset=utf8"
--- a/configs/centrifugo/config.json
+++ b/configs/centrifugo/config.json
@ -0,0 +1,13 @@
+{
+    "token_hmac_secret_key": "6085d43b-f55b-4387-9dff-3c9abf385dc8",
+    "admin_password": "bc24acd1-b885-4108-b3cf-971dffca6934",
+    "admin_secret": "ca0a7656-f589-42e6-9e49-98dd3c5beb46",
+    "api_key": "aa7443fb-e623-4363-91ac-ef25908b1403",
+    "admin": true,
+    "allowed_origins": [
+	"https://staginglms.dot-dot.ru",
+ 	"https://stagingcabinet.dot-dot.ru"
+    ],
+    "allow_subscribe_for_client": true,
+    "allow_user_limited_channels": true
+}
--- a/configs/nginx/conf.d/1c-view.conf
+++ b/configs/nginx/conf.d/1c-view.conf
@ -0,0 +1,64 @@
+server {
+    listen 80;
+    server_name staging1c-view.dot-dot.ru;
+    return 301 https://$server_name$request_uri;
+}
+
+server {
+    listen 443 ssl ;
+    server_name staging1c-view.dot-dot.ru;
+
+    ssl_certificate /etc/nginx/ssl/dot-dot.crt;
+    ssl_certificate_key /etc/nginx/ssl/dot-dot.key;
+
+    root /application/public;
+
+    index index.php;
+
+    client_max_body_size 30m;
+    client_body_buffer_size 30M;
+
+    # location / {
+    #     access_log /var/log/nginx/staging1c-view_access.log json;
+    #     error_log /var/log/nginx/staging1c-view_error.log;
+    #     proxy_pass http://1c-view;
+    #     proxy_http_version 1.1;
+    #     proxy_set_header Upgrade $http_upgrade;
+    #     proxy_set_header Connection 'upgrade';
+    #     proxy_set_header Host $host;
+    #     proxy_cache_bypass $http_upgrade;
+    #     chunked_transfer_encoding off;
+    #     proxy_buffering off;
+    #     proxy_cache off;
+    # }
+
+
+    location @rewriteapp {
+        rewrite ^(.*)$ /index.php/$1 last;
+    }
+
+    location ~ ^/index\.php(/|$) {
+        if ($request_method = 'OPTIONS') {
+            add_header 'Access-Control-Allow-Origin' $http_origin;
+            add_header 'Access-Control-Allow-Credentials' 'true';
+            add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS, DELETE';
+            add_header 'Access-Control-Allow-Headers' 'DNT,X-CustomHeader,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,X-Expeditor-Domain,Authorization';
+            add_header 'Access-Control-Max-Age' 1728000;
+            add_header 'Content-Type' 'text/plain charset=UTF-8';
+            add_header 'Content-Length' 0;
+            return 204;
+        }
+
+        #add_header 'Access-Control-Allow-Origin' $http_origin;
+        add_header 'Access-Control-Allow-Origin' *;
+        add_header 'Access-Control-Allow-Credentials' 'true';
+        add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS, DELETE';
+        add_header 'Access-Control-Allow-Headers' 'DNT,X-CustomHeader,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,X-Expeditor-Domain,Authorization';
+
+        fastcgi_pass 1c-view:9000;
+        fastcgi_split_path_info ^(.+\.php)(/.*)$;
+        include fastcgi_params;
+        fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
+    }
+
+}
--- a/configs/nginx/conf.d/admin.conf
+++ b/configs/nginx/conf.d/admin.conf
@ -8,8 +8,8 @@ server {
    listen 443 ssl ;
    server_name stagingadmin.dot-dot.ru;

-    ssl_certificate /etc/nginx/ssl/dot2024.crt;
-    ssl_certificate_key /etc/nginx/ssl/dot2024.key;
+    ssl_certificate /etc/nginx/ssl/dot-dot.crt;
+    ssl_certificate_key /etc/nginx/ssl/dot-dot.key;

    client_max_body_size 10m;

--- a/configs/nginx/conf.d/cabinet.conf
+++ b/configs/nginx/conf.d/cabinet.conf
@ -1,12 +1,17 @@
 server {
    listen 443 ssl ;
-    server_name testacabinet.dot-dot.ru;
+    server_name stagingcabinet.dot-dot.ru;

-    ssl_certificate /etc/nginx/ssl/dot2024.crt;
-    ssl_certificate_key /etc/nginx/ssl/dot2024.key;
+    ssl_certificate /etc/nginx/ssl/dot-dot.crt;
+    ssl_certificate_key /etc/nginx/ssl/dot-dot.key;

    client_max_body_size 10m;

+
+    root /application/public;
+
+
+
    location / {
        proxy_pass http://cabinet:3000;
        proxy_http_version 1.1;
@ -18,4 +23,109 @@ server {
        proxy_buffering off;
        proxy_cache off;
    }
+
+
+      location /connection/websocket {
+        proxy_http_version 1.1;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection "Upgrade";
+        proxy_pass http://centrifugo;
+     }
+
+    location /socket.io/auctionreload {
+        access_log /var/log/nginx/ws_access.log json;
+        error_log /var/log/nginx/ws_error.log;
+
+        proxy_http_version 1.1;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection $connection_upgrade;
+        proxy_set_header Host $host;
+        proxy_pass http://php:8080/;
+    }
+
+
+    location @rewriteapp {
+        rewrite ^(.*)$ /index.php/$1 last;
+    }
+
+    # location /storybook {
+    #     alias /application/nuxt/storybook-static;
+    # }
+
+    location /logout {
+        try_files $uri @rewriteapp;
+    }
+
+    location /api {
+        rewrite ^(.*)$ /index.php/$1 last;
+    }
+
+    location /clockwork {
+        rewrite ^(.*)$ /index.php/$1 last;
+    }
+
+    location /__clockwork {
+        rewrite ^(.*)$ /index.php/$1 last;
+    }
+
+    location /pdf {
+        rewrite ^(.*)$ /index.php/$1 last;
+    }
+
+    location /1c {
+        rewrite ^(.*)$ /index.php/$1 last;
+    }
+
+    location /socket {
+        try_files $uri @rewriteapp;
+    }
+
+    location /admin {
+        try_files $uri @rewriteapp;
+    }
+
+    location ~* \/admin\/.*(js|jpg|png|css|woff|woff2)$ {
+        proxy_pass http://static;
+    }
+
+    location /media {
+        try_files $uri @rewriteapp;
+    }
+
+    location /img {
+        proxy_pass http://static;
+        # alias /application/public/img;
+        # try_files $uri /index.php$request_uri;
+        # expires 6M;
+    }
+
+    location /robots.txt {
+        proxy_pass http://static;
+    }
+
+    location ~ ^/index\.php(/|$) {
+        if ($request_method = 'OPTIONS') {
+            add_header 'Access-Control-Allow-Origin' $http_origin;
+            add_header 'Access-Control-Allow-Credentials' 'true';
+            add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS, DELETE';
+            add_header 'Access-Control-Allow-Headers' 'DNT,X-CustomHeader,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,X-Expeditor-Domain,Authorization';
+            add_header 'Access-Control-Max-Age' 1728000;
+            add_header 'Content-Type' 'text/plain charset=UTF-8';
+            add_header 'Content-Length' 0;
+            return 204;
+        }
+
+        #add_header 'Access-Control-Allow-Origin' $http_origin;
+        add_header 'Access-Control-Allow-Origin' *;
+        add_header 'Access-Control-Allow-Credentials' 'true';
+        add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS, DELETE';
+        add_header 'Access-Control-Allow-Headers' 'DNT,X-CustomHeader,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,X-Expeditor-Domain,Authorization';
+
+        fastcgi_pass backend:9001;
+        fastcgi_split_path_info ^(.+\.php)(/.*)$;
+        include fastcgi_params;
+        fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
+    }
+
+
 }
--- a/configs/nginx/conf.d/default.conf
+++ b/configs/nginx/conf.d/default.conf
@ -8,8 +8,8 @@ server {
    listen 443 ssl ;
    server_name staging.dot-dot.ru;

-    ssl_certificate /etc/nginx/ssl/dot2024.crt;
-    ssl_certificate_key /etc/nginx/ssl/dot2024.key;
+    ssl_certificate /etc/nginx/ssl/dot-dot.crt;
+    ssl_certificate_key /etc/nginx/ssl/dot-dot.key;


    root /application/public;
@ -18,7 +18,7 @@ server {
    client_body_buffer_size 30M;

    location / {
-        proxy_pass http://nuxt:3000;
+        proxy_pass http://landing-ttl;
        proxy_http_version 1.1;
        proxy_set_header Upgrade $http_upgrade;
        proxy_set_header Connection 'upgrade';
@ -92,23 +92,27 @@ server {
        # expires 6M;
    }

+    location /css {
+        proxy_pass http://static;
+    }
+
    location ~ ^/index\.php(/|$) {
-        if ($request_method = 'OPTIONS') {
-            add_header 'Access-Control-Allow-Origin' $http_origin;
-            add_header 'Access-Control-Allow-Credentials' 'true';
-            add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS, DELETE';
-            add_header 'Access-Control-Allow-Headers' 'DNT,X-CustomHeader,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,X-Expeditor-Domain,Authorization';
-            add_header 'Access-Control-Max-Age' 1728000;
-            add_header 'Content-Type' 'text/plain charset=UTF-8';
-            add_header 'Content-Length' 0;
+      
+	if ($request_method = 'OPTIONS') {
+            add_header 'Access-Control-Allow-Origin' $http_origin always;
+            add_header 'Access-Control-Allow-Credentials' 'true' always;
+            add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS, DELETE' always;
+            add_header 'Access-Control-Allow-Headers' 'DNT,X-CustomHeader,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,X-Expeditor-Domain,Authorization' always;
+            add_header 'Access-Control-Max-Age' 1728000 always;
+            add_header 'Content-Type' 'text/plain charset=UTF-8' always;
+            add_header 'Content-Length' 0 always;
            return 204;
        }

-        #add_header 'Access-Control-Allow-Origin' $http_origin;
-        add_header 'Access-Control-Allow-Origin' *;
-        add_header 'Access-Control-Allow-Credentials' 'true';
-        add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS, DELETE';
-        add_header 'Access-Control-Allow-Headers' 'DNT,X-CustomHeader,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,X-Expeditor-Domain,Authorization';
+        add_header 'Access-Control-Allow-Origin' $http_origin always;
+        add_header 'Access-Control-Allow-Credentials' 'true' always;
+        add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS, DELETE' always;
+        add_header 'Access-Control-Allow-Headers' 'DNT,X-CustomHeader,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,X-Expeditor-Domain,Authorization' always;

        fastcgi_pass backend:9001;
        fastcgi_split_path_info ^(.+\.php)(/.*)$;
--- a/configs/nginx/conf.d/lms.conf
+++ b/configs/nginx/conf.d/lms.conf
@ -8,8 +8,8 @@ server {
    listen 443 ssl ;
    server_name staginglms.dot-dot.ru;

-    ssl_certificate /etc/nginx/ssl/dot2024.crt;
-    ssl_certificate_key /etc/nginx/ssl/dot2024.key;
+    ssl_certificate /etc/nginx/ssl/dot-dot.crt;
+    ssl_certificate_key /etc/nginx/ssl/dot-dot.key;

    root /application/public;

@ -98,6 +98,13 @@ server {
        proxy_pass http://static;
    }

+    location /connection/websocket {
+        proxy_http_version 1.1;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection "Upgrade";
+        proxy_pass http://centrifugo;
+    }
+
    location ~ ^/index\.php(/|$) {
        if ($request_method = 'OPTIONS') {
            add_header 'Access-Control-Allow-Origin' $http_origin;
--- a/configs/nginx/conf.d/rabbitmq.conf
+++ b/configs/nginx/conf.d/rabbitmq.conf
@ -11,8 +11,8 @@ server {
    access_log /var/log/nginx/rabbitmqstaging.dot-dot.ru_access.log json;
    error_log /var/log/nginx/rabbitmqstaging.dot-dot.ru_error.log;

-    ssl_certificate /etc/nginx/ssl/dot2024.crt;
-    ssl_certificate_key /etc/nginx/ssl/dot2024.key;
+    ssl_certificate /etc/nginx/ssl/dot-dot.crt;
+    ssl_certificate_key /etc/nginx/ssl/dot-dot.key;

    proxy_buffer_size 128k;
    proxy_buffers 4 128k;
--- a/configs/nginx/conf.d/signer.conf
+++ b/configs/nginx/conf.d/signer.conf
@ -1,9 +1,18 @@
 server {
    listen 80;
    server_name stagingsigner.dot-dot.ru;
+    return 301 https://$server_name$request_uri;
+}
+
+server {
+    listen 443 ssl ;
+    server_name stagingsigner.dot-dot.ru;
+
+    ssl_certificate /etc/nginx/ssl/dot-dot.crt;
+    ssl_certificate_key /etc/nginx/ssl/dot-dot.key;

    location / {
-        proxy_pass http://signer:8000;
+        proxy_pass http://signer:80;
        proxy_http_version 1.1;
        proxy_set_header Upgrade $http_upgrade;
        proxy_set_header Connection 'upgrade';
--- a/configs/nginx/conf.d/ws.conf
+++ b/configs/nginx/conf.d/ws.conf
@ -0,0 +1,44 @@
+server {
+    listen 80;
+    server_name stagingws.dot-dot.ru;
+    return 301 https://$server_name$request_uri;
+}
+
+upstream centrifugo {
+    server centrifugo:8000;
+}
+
+server {
+    listen 443 ssl;
+    server_name stagingws.dot-dot.ru;
+
+    access_log /var/log/nginx/ws.dot-dot.ru_access.log json;
+    error_log /var/log/nginx/ws.dot-dot.ru_error.log;
+
+    ssl_certificate /etc/nginx/ssl/dot-dot.crt;
+    ssl_certificate_key /etc/nginx/ssl/dot-dot.key;
+
+    location / {
+        proxy_pass_header Server;
+        proxy_set_header Host $http_host;
+        proxy_redirect off;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_pass http://centrifugo;
+    }
+    location /socket {
+        proxy_buffering off;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_http_version 1.1;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection $connection_upgrade;
+        proxy_pass http://centrifugo;
+    }
+    location /connection {
+        proxy_buffering off;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_http_version 1.1;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection $connection_upgrade;
+        proxy_pass http://centrifugo;
+    }
+}
--- a/configs/php/.env
+++ b/configs/php/.env
@ -52,7 +52,11 @@ FNS_ACCESS_TOKEN=secret
 GOOGLE_MAPS_ACCESS_KEY=secret
 GOOGLE_MAPS_BASE_URL=https://maps.google.com

-ML_CALCULATOR_URL=https://ml.dot-dot.ru/v2/classification/order/relevance
+###> ml_calculator ### DD-4160
+#ML_CALCULATOR_URL=https://ml.dot-dot.ru/v2/classification/order/relevance
+ML_CALCULATOR_URL=https://ml.dot-dot.ru/v1/price_calculator/spot
+###< ml_calculator ###
+

 ML_REGULAR_DIRECTION_URL=https://ml.dot-dot.ru/v2/schedule/transport
 ML_REGULAR_DIRECTION_CHAIN_URL=https://ml.dot-dot.ru/v1/schedule/chains
@ -143,3 +147,7 @@ PROSTOR_SMS_PASSWORD=secret
 ACCOUNTING_AUDIT_URL=https://crm.dot-dot.ru
 ACCOUNTING_AUDIT_LOGIN=secret
 ACCOUNTING_AUDIT_PASSWORD=secret
+
+APP_LMS_HOST=staginglms.dot-dot.ru
+APP_CARGO_CARRIER_HOST=stagingcabinet.dot-dot.ru
+PLATFORM_NAME=СПОТТОРГ
--- a/configs/php/.env.local
+++ b/configs/php/.env.local
@ -36,10 +36,12 @@ VOICIA_API_KEY=7589ed2721e50e299eb3baf2e3100a6b
 VOICIA_CALL_ID=8788
 ###< voicia ###

-###> ml_calculator ###
-ML_CALCULATOR_URL=https://ml.dot-dot.ru/v2/classification/order/relevance
+###> ml_calculator ### DD-4160
+#ML_CALCULATOR_URL=https://ml.dot-dot.ru/v2/classification/order/relevance
+ML_CALCULATOR_URL=https://ml.dot-dot.ru/v1/price_calculator/spot
 ###< ml_calculator ###

+
 ###> comagic ###
 COMAGIC_URL=https://dataapi.comagic.ru/v2.0
 COMAGIC_KEY=j769gveux0brdq7wb6insegwtczvz7nsqmuntkqv
@ -135,6 +137,11 @@ ML_REGULAR_DIRECTION_HISTORY_ORDER_URL=https://ml.dot-dot.ru/v1/schedule/transpo
 #QUEUE_DSN_STATISTIC_EXPORT=amqp://guest:guest@rabbitmq:5672/%2f/STATISTIC_EXPORT
 QUEUE_DSN_OC_CARRIER_OFFERS=amqp://ddadmin:Utahth9aeshahgh3saik@rabbitmq:5672/%2f/OC_CARRIER_OFFERS
 QUEUE_DSN_STATISTIC_EXPORT=amqp://ddadmin:Utahth9aeshahgh3saik@rabbitmq:5672/%2f/STATISTIC_EXPORT
+QUEUE_DSN_ORDER_IMPORT=amqp://ddadmin:Utahth9aeshahgh3saik@rabbitmq:5672/%2f/ORDER_IMPORT
+QUEUE_DSN_WS_ORDER_STATE_UPDATE=amqp://ddadmin:Utahth9aeshahgh3saik@rabbitmq:5672/%2f/WS_ORDER_STATE_UPDATE
+QUEUE_DSN_NOTICE=amqp://ddadmin:Utahth9aeshahgh3saik@rabbitmq:5672/%2f/NOTICE
+QUEUE_DSN_SELECT_DIRECTION_PUSH=amqp://ddadmin:Utahth9aeshahgh3saik@rabbitmq:5672/%2f/SELECT_DIRECTION_PUSH
+

 CRYPTOPRO_PATH='/opt/cprocsp/bin/amd64/cryptcp -sign -dn '"ООО ""ТОЧКА-ТОЧКА ЛОГИСТИКА"""' -der'
 SIGNED_DOC_PATH="/application/var/documents/signeddocs"
@ -173,3 +180,29 @@ QUEUE_DSN_RELEVANT_CARRIER_EXPORT=amqp://ddadmin:Utahth9aeshahgh3saik@rabbitmq:5


 FNS_ACCESS_TOKEN=a5639b93fe4e7c9a3f1dd85537e066d36439c352
+
+###DD-3816###
+###> KONTUR_DIADOC###
+API_KONTUR_DIADOC_END_POINT_URL=https://diadoc-api.kontur.ru
+API_KONTUR_DIADOC_API_TOKEN=API-3701ccdb-7bdf-4f29-bbe0-3a0278eee913
+API_KONTUR_DIADOC_LOGIN=LOGIN
+API_KONTUR_DIADOC_PASSWORD=PASSWORD
+API_KONTUR_DIADOC_SELF_BOX_ID='322d597d-964d-48a8-baa5-2380161826f8'
+###< KONTUR_DIADOC###
+
+###> KONTUR_DIADOC###
+SIGNER_DOCS_API_URL=https://stagingsigner.dot-dot.ru
+SIGNER_DOCS_API_TOKEN='siofdhgt2349875t3iqhf1h2g*^&^%&^GHJGJCxgf'
+###< KONTUR_DIADOC###
+
+CENTRIFUGAL_API_ENDPOINT_URL=http://centrifugo:8000/api
+CENTRIFUGAL_API_KEY='aa7443fb-e623-4363-91ac-ef25908b1403'
+CENTRIFUGAL_TOKEN_HMAC_SECRET_KEY='6085d43b-f55b-4387-9dff-3c9abf385dc8'
+
+BUH_DOT_DOT_EMAIL=no_reply@dot-dot.ru
+RECONCILIATION_ACTS=amqp://ddadmin:Utahth9aeshahgh3saik@rabbitmq:5672/%2f/RECONCILIATION_ACTS
+
+TENANT=dot
+
+ACCOUNTING_ADAPTER_SERVICE_URL="https://staging1c-view.dot-dot.ru"
+ACCOUNTING_ADAPTER_SERVICE_SECRET="noin3seep7paiFe2ahbu"
--- a/configs/php/.env.local.save
+++ b/configs/php/.env.local.save
@ -0,0 +1,175 @@
+CONTAINER_NAME=php
+APP_ENV=dev
+NotificationBuildServicejSP_KEY=16e93b225c730920ac5741a8d8df788f
+
+DADATA_API_TOKEN=c9aa5fdc338a746e23ce91ceb6fdb9e635749833
+DADATA_API_SECRET=1ea37a4d310e7a6ac64211ffe5686363f04d4e68
+
+ROISTAT_API_KEY=c63a71dd721df7f1b1d7b5803a84ccc7
+ROISTAT_PROJECT_ID=166751
+
+UNISENDER_API_KEY=6ugo1c6yqfux9wrs8pbaom3izz9pc9huetqbdo9y
+
+GTD_ACCESS_TOKEN=cznMwszlx-5X_F7uQbg-uaPFhqmBP28z
+
+FNS_ACCESS_TOKEN=a5639b93fe4e7c9a3f1dd85537e066d36439c352
+
+GOOGLE_MAPS_ACCESS_KEY=AIzaSyBCPl2LcpRvplzLUNVMVLhA3b7k46lTCTg
+
+NUXT_BASE_URL=staging.dot-dot.ru
+
+ATISU_API_TOKEN=46b599c3ab7f4574b560f48ea005d9f3
+
+###> google/apiclient ###
+ANALITIC_GOOGLE_CLIENT_ID=672035500859-n6cq8lb393rs5f7q46pnjrc6u9hjiomg.apps.googleusercontent.com
+ANALITIC_GOOGLE_CLIENT_SECRET=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
+ANALITIC_GOOGLE_CLIENT_REDIRECT_URI=http://dot-dot.local/admin/analitic/google-callback
+###< google/apiclient ###
+
+###> telegramm ###
+TELEGRAM_BOT_TOKEN=5807192360:AAHSUZcWeY1bC7aqdmcYXOfb1CYyK0xx0Cc
+TELEGRAM_CHAT_ID=-875661421
+###< telegramm ###
+
+###> voicia ###
+VOICIA_API_KEY=7589ed2721e50e299eb3baf2e3100a6b
+VOICIA_CALL_ID=8788
+###< voicia ###
+
+###> ml_calculator ###
+ML_CALCULATOR_URL=https://ml.dot-dot.ru/v2/classification/order/relevance
+###< ml_calculator ###
+
+###> comagic ###
+COMAGIC_URL=https://dataapi.comagic.ru/v2.0
+COMAGIC_KEY=j769gveux0brdq7wb6insegwtczvz7nsqmuntkqv
+###< comagic ###
+
+###> direction_scoring ###
+ML_DIRECTION_SCORING_URL=https://ml.dot-dot.ru/v3/classification/direction/confidence
+###< direction_scoring ###
+	
+###> direction_recalculate ###
+ML_DIRECTION_RECALCULATE_URL=https://ml.dot-dot.ru/v2/schedule/calculate
+###< direction_recalculate ###
+
+###< 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 ###
+
+PAPA_FINANCE_LOGIN=DotDotAPI
+PAPA_FINANCE_PASSWORD=DotDotAPI
+PAPA_FINANCE_API_URL=DotDotAPI
+###> SOVKOMTEST###
+SOVKOM_API_KEY=AAk6UcV88xCCC26654rM
+SOVKOM_API_URL=https://testout.sovcomins.ru
+###< SOVKOMTEST###
+
+ML_REGULAR_DIRECTION_RELEVANCE_CARRIERS_URL=https://ml.dot-dot.ru/v2/schedule/carrier/scoring
+
+ML_REGULAR_DIRECTION_URL=https://ml.dot-dot.ru/v2/schedule/transport
+
+###> YandexTracker ###
+YTRACKER_API_TOKEN="y0_AgAEA7qkKFmeAAjF8AAAAADXovQd6htdkt7LTDW_sNHCz7qV9zdVHaQ"
+YTRACKER_ORGANISATION_ID=355207
+###< YandexTracker ###
+
+SMARTCAPTCHA_SERVER_KEY=ysc2_GLQZ8QPaFh0eXqZ5KaRMuRRZOX7qNNMy7P9Mq82V6c4e7b81
+
+###> sentry/sentry-symfony ###
+SENTRY_DSN="https://69bb249adbab80b23cf043b276a27fde@sentry.dot-dot.ru/4"
+SENTRY_SERVER_NAME=pre-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://guest:guest@rabbitmq:5672/%2f/OC_CARRIER_OFFERS
+#QUEUE_DSN_STATISTIC_EXPORT=amqp://guest:guest@rabbitmq:5672/%2f/STATISTIC_EXPORT
+QUEUE_DSN_OC_CARRIER_OFFERS=amqp://ddadmin:Utahth9aeshahgh3saik@rabbitmq:5672/%2f/OC_CARRIER_OFFERS
+QUEUE_DSN_STATISTIC_EXPORT=amqp://ddadmin:Utahth9aeshahgh3saik@rabbitmq:5672/%2f/STATISTIC_EXPORT
+
+CRYPTOPRO_PATH='/opt/cprocsp/bin/amd64/cryptcp -sign -dn '"ООО ""ТОЧКА-ТОЧКА ЛОГИСТИКА"""' -der'
+SIGNED_DOC_PATH="/application/var/documents/signeddocs"
+ABSOLUTE_SIGNED_DOC_PATH="/home/ddadmin/demolms/signeddocs"
+CHROMIUM_BROWSER_SYS_PATH="/usr/bin/chromium-browser"
+
+###> API_KONTUR_FOCUS### 
+USER_TRUST_API_KONTUR_FOCUS_END_POINT_URL=https://focus-api.kontur.ru/
+USER_TRUST_API_KONTUR_FOCUS_API_TOKEN=3208d29d15c507395db770d0e65f3711e40374df
+USER_TRUST_CHECK_BACKEND=true
+###< API_KONTUR_FOCUS###
+QUEUE_DSN_USER_TRUST=amqp://ddadmin:Utahth9aeshahgh3saik@rabbitmq:5672/%2f/USER_TRUST
+
+
+PROSTOR_SMS_LOGIN=ap142656
+PROSTOR_SMS_PASSWORD=808350
+
+###> OTK ###
+OTK_API_END_POINT_URL="https://test-api.otk.su"
+OTK_API_TOKEN="Q5vBE9jusg38Rk7wHt2bzycT4K6pePFZ"
+###< OTK ###
+
+SIGNER_URL=https://stagingsigner.dot-dot.ru
+SIGNER_API_TOKEN='siofdhgt2349875t3iqhf1h2g*^&^%&^GHJGJCxgf'
+
+ACCOUNTING_AUDIT_LOGIN=ReportServis
+ACCOUNTING_AUDIT_PASSWORD=fE7mubiv
+
+
+ML_CALCULATOR_SPOT_URL=https://ml.dot-dot.ru/v1/price_calculator/spot
+
+###DD-3705###
+ML_CARRIER_SCORING=https://ml.dot-dot.ru/v3/classification/carrier/scoring 
+QUEUE_DSN_RELEVANT_CARRIER_EXPORT=amqp://ddadmin:Utahth9aeshahgh3saik@rabbitmq:5672/%2f/RELEVANT_CARRIER_EXPORT
+###DD-3705###
+
+
+FNS_ACCESS_TOKEN=a5639b93fe4e7c9a3f1dd85537e066d36439c352
--- a/docker-compose.yml
+++ b/docker-compose.yml
@ -70,7 +70,6 @@ services:
    <<: *defaults-php

  php:
-    # TODO: Денис должен переделать и добавить 
    command: ./bin/console app:auction:reload
    <<: *defaults-php

@ -82,9 +81,21 @@ services:
    <<: *defaults-php
    command: ./bin/console messenger:consume CarrierOffers

+  order-import:
+    <<: *defaults-php
+    command: ./bin/console messenger:consume OrderImport
+
+  reconciliation-act:
+    <<: *defaults-php
+    command: ./bin/console messenger:consume ReconciliationAct
+
+  ws-order-state-update:
+    <<: *defaults-php
+    command: ./bin/console messenger:consume WSOrderStateUpdate
+
  user-trust:
    <<: *defaults-php
-    command: ./bin/console messenger:consume UserTrust
+    command: sh -c 'while true; do echo run; ./bin/console messenger:consume UserTrust; sleep 60;done'

  auction:
    <<: *defaults-php
@ -119,6 +130,11 @@ services:
    env_file:
      - ./configs/lms/.env
    entrypoint: /entrypoint.sh
+    extra_hosts:
+      - "sentry.dot-dot.ru:192.168.100.111"
+      - "stagingsigner.dot-dot.ru:192.168.100.110"
+      - "staging.dot-dot.ru:192.168.100.110"
+      - "staginglms.dot-dot.ru:192.168.100.110"
    networks:
      - dd

@ -129,7 +145,7 @@ services:
    volumes:
      - ./configs/admin/default:/etc/nginx/sites-enabled/default
      - ./configs/admin/.env:/application/.env
-      - ./configs/nginx/ssl:/etc/nginx/ssl
+      - /home/ddadmin/dotdot/configs/nginx/ssl:/etc/nginx/ssl
    depends_on:
      - db
    networks:
@ -143,7 +159,7 @@ services:
      - ./configs/nginx/conf.d:/etc/nginx/conf.d
      - ./configs/nginx/nginx.conf:/etc/nginx/nginx.conf
      - ./configs/nginx/www:/var/www
-      - ./configs/nginx/ssl:/etc/nginx/ssl
+      - /home/ddadmin/dotdot/configs/nginx/ssl:/etc/nginx/ssl
      - ./configs/nginx/other:/etc/nginx/other
      - certbot_volume:/etc/letsencrypt
      - nginx_log_volume:/var/log/nginx
@ -191,7 +207,7 @@ services:

  signer:
    image: registry.dot-dot.ru/signer:${SIGNER_TAG}
-    command: "frankenphp php-server -l 0.0.0.0:8000 -r ./public"
+    command: bash -c 'php-fpm8.3 -R; nginx'
    restart: unless-stopped
    privileged: true
    volumes:
@ -204,9 +220,10 @@ services:
      - ./configs/signer/.env.local
      - ./configs/signer/.env
    extra_hosts:
+      - "sentry.dot-dot.ru:192.168.100.111"
+      - "stagingsigner.dot-dot.ru:192.168.100.110"
      - "staging.dot-dot.ru:192.168.100.110"
      - "staginglms.dot-dot.ru:192.168.100.110"
-      - "stagingsigner.dot-dot.ru:192.168.100.110"
    networks:
      - dd

@ -222,3 +239,32 @@ services:
    entrypoint: /entrypoint.sh
    networks:
      - dd
+
+  centrifugo:
+    image: centrifugo/centrifugo:v5
+    volumes:
+      - ./configs/centrifugo/config.json:/centrifugo/config.json
+    command: centrifugo -c config.json
+    ulimits:
+      nofile:
+        soft: 65535
+        hard: 65535
+    restart: unless-stopped
+    networks:
+      - dd
+
+  landing-ttl:
+    image: registry.dot-dot.ru/landing-ttl:${LANDINGTTL_TAG}
+    command: sh -c 'nginx; php-fpm'
+    restart: unless-stopped
+    networks:
+      - dd
+
+  1c-view:
+    image: registry.dot-dot.ru/1c_view:${CVIEW_TAG}
+    command: sh -c 'php-fpm'
+    volumes:
+      - ./configs/1cview/.env.local:/application/.env.local
+    restart: unless-stopped
+    networks:
+      - dd