diff --git a/.env b/.env index 7d2cb08..f88c401 100644 --- a/.env +++ b/.env @@ -1,58 +1,12 @@ COMPOSE_PROJECT_NAME=testc NETWORK=testc -FRONT_TAG=DD-3906-STORY -DOTDOT_TAG=DD-3906-STORY -LMS_TAG=develop -DASHBORD_TAG=master -ADMIN_TAG=DD-3928 +DOTDOT_TAG=develop +LMS_TAG=DDB-2074 +ADMIN_TAG=master CABINET_TAG=master - -#FRONT_TAG=master -#DOTDOT_TAG=master -#LMS_TAG=master -#DASHBORD_TAG=master -#ADMIN_TAG=master -#CABINET_TAG=master - -#FRONT_TAG=DDB-1572 -#DOTDOT_TAG=DDB-1572 -#LMS_TAG=master -#DASHBORD_TAG=master -#ADMIN_TAG=master -#CABINET_TAG=master - -#FRONT_TAG=DD-3786-STORY -#DOTDOT_TAG=DD-3786-STORY -#LMS_TAG=DD-3786 -#DASHBORD_TAG=master -#ADMIN_TAG=master -#CABINET_TAG=master - -#FRONT_TAG=develop -#DOTDOT_TAG=develop -#LMS_TAG=develop -#DASHBORD_TAG=master -#ADMIN_TAG=master -#CABINET_TAG=master - -#FRONT_TAG=DD-3786-STORY -#DOTDOT_TAG=DD-3786-STORY -#LMS_TAG=DD-3786 -#ADMIN_TAG=master -#CABINET_TAG=master - -#FRONT_TAG=DD-3880 -#DOTDOT_TAG=DD-3880 -#LMS_TAG=master -#DASHBORD_TAG=master -#ADMIN_TAG=master - -#FRONT_TAG=DD-3806-STORY -#DOTDOT_TAG=DD-3806-STORY -#LMS_TAG=master -#DASHBORD_TAG=master -#ADMIN_TAG=master +LANDINGTTL_TAG=master +SIGNER_TAG=master MYSQL_PORT=0.0.0.0:33063 MYSQL_ROOT_PASSWORD=root diff --git a/app.sh b/app.sh index 86c2dea..6ba601e 100755 --- a/app.sh +++ b/app.sh @@ -1,8 +1,8 @@ DIRECTORY=`dirname $0` -MYSQL_ROOT_PASSWORD=$(grep MYSQL_ROOT_PASSWORD $DIRECTORY"/.env" | xargs) -MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD#*=} - +#MYSQL_ROOT_PASSWORD=$(grep MYSQL_ROOT_PASSWORD $DIRECTORY"/.env" | xargs) +#MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD#*=} +source $DIRECTORY"/.env" help() { echo "run $0 [COMMAND] " echo ' @@ -48,7 +48,7 @@ log() { ## restore last backup from s3 storage restoredb() { log "run restore database" - sudo rclone copy --verbose selectel:backup_db/dot/dot.$(date +%a).sql.gz backups/ + sudo rclone copy --verbose selectel:backup_db/dot/prod/dot.$(date +%a).sql.gz backups/ zcat backups/dot.$(date +%a).sql.gz | docker compose exec -T db mysql -uroot -p${MYSQL_ROOT_PASSWORD} dot } @@ -169,7 +169,7 @@ case "$1" in "front"*) case $2 in *) - docker compose exec nuxt ${@:2};; + docker compose exec landing-ttl ${@:2};; esac;; *) help diff --git a/configs/centrifugo/config.json b/configs/centrifugo/config.json new file mode 100644 index 0000000..86f9d5d --- /dev/null +++ b/configs/centrifugo/config.json @@ -0,0 +1,16 @@ +{ + "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": [ + "http://dot-dot.local", + "https://dot-dot.ru", + "https://lms.dot-dot.ru", + "https://demo.dot-dot.ru", + "https://demo.spottorg.ru" + ], + "allow_subscribe_for_client": true, + "allow_user_limited_channels": true +} \ No newline at end of file diff --git a/configs/landing-ttl/config.php b/configs/landing-ttl/config.php new file mode 100644 index 0000000..d5dc989 --- /dev/null +++ b/configs/landing-ttl/config.php @@ -0,0 +1,27 @@ + 'smtp.mail.ru', + 'smtp_port' => 465, + 'smtp_user' => 'no_reply@dot-dot.ru', + 'smtp_pass' => 'NRTk7rXhesHQpi3YWB92', + + 'subject' => 'Заявка ТТЛ', + + 'sender' => [ + 'email' => 'no-reply@dot-dot.ru', + 'name' => 'Точка-Точка логистика' + ], + + 'recipients' => [ // Получателей может быть несколько + 0 => [ + 'email' => 'at@dot-dot.ru', + 'name' => 'Менеджер' + ] + ], + + 'dadata_suggest_url' => 'https://suggestions.dadata.ru/suggestions/api/4_1/rs/suggest/address', + 'dadata_suggest_count' => 3, + 'dadata_auth_token' => 'c9aa5fdc338a746e23ce91ceb6fdb9e635749833', + 'dadata_auth_secret' => '1ea37a4d310e7a6ac64211ffe5686363f04d4e68' +]; diff --git a/configs/nginx/conf.d/admin.conf b/configs/nginx/conf.d/admin.conf index 720ca8a..d577771 100644 --- a/configs/nginx/conf.d/admin.conf +++ b/configs/nginx/conf.d/admin.conf @@ -8,8 +8,8 @@ server { listen 443 ssl ; server_name testcadmin.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; @@ -27,4 +27,5 @@ server { proxy_buffering off; proxy_cache off; } + } diff --git a/configs/nginx/conf.d/cabinet.conf b/configs/nginx/conf.d/cabinet.conf index 40ad346..cca9f4e 100644 --- a/configs/nginx/conf.d/cabinet.conf +++ b/configs/nginx/conf.d/cabinet.conf @@ -1,12 +1,14 @@ server { listen 443 ssl ; - server_name testacabinet.dot-dot.ru; + server_name testccabinet.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 +20,95 @@ server { proxy_buffering off; proxy_cache off; } + + 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 /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; + } } diff --git a/configs/nginx/conf.d/default.conf b/configs/nginx/conf.d/default.conf index f24512b..9e27870 100755 --- a/configs/nginx/conf.d/default.conf +++ b/configs/nginx/conf.d/default.conf @@ -8,8 +8,8 @@ server { listen 443 ssl ; server_name testc.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'; @@ -41,10 +41,6 @@ server { rewrite ^(.*)$ /index.php/$1 last; } - # location /storybook { - # alias /application/nuxt/storybook-static; - # } - location /logout { try_files $uri @rewriteapp; } @@ -92,6 +88,11 @@ server { # expires 6M; } + location /css { + proxy_pass http://static; + } + + location ~ ^/index\.php(/|$) { if ($request_method = 'OPTIONS') { add_header 'Access-Control-Allow-Origin' $http_origin; diff --git a/configs/nginx/conf.d/lms.conf b/configs/nginx/conf.d/lms.conf index dd62a43..5b295f3 100755 --- a/configs/nginx/conf.d/lms.conf +++ b/configs/nginx/conf.d/lms.conf @@ -8,8 +8,8 @@ server { listen 443 ssl; server_name testclms.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; @@ -43,9 +43,7 @@ server { rewrite ^(.*)$ /index.php/$1 last; } - # location /storybook { - # alias /application/nuxt/storybook-static; - # } + location /logout { try_files $uri @rewriteapp; diff --git a/configs/nginx/conf.d/rabbitmq.conf b/configs/nginx/conf.d/rabbitmq.conf index ec22cd8..81e0900 100755 --- a/configs/nginx/conf.d/rabbitmq.conf +++ b/configs/nginx/conf.d/rabbitmq.conf @@ -11,8 +11,8 @@ server { access_log /var/log/nginx/rabbitmq_access.log json; error_log /var/log/nginx/rabbitmq_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; diff --git a/configs/nginx/conf.d/ws.conf b/configs/nginx/conf.d/ws.conf new file mode 100644 index 0000000..fdd66fc --- /dev/null +++ b/configs/nginx/conf.d/ws.conf @@ -0,0 +1,44 @@ +server { + listen 80; + server_name testcws.dot-dot.ru; + return 301 https://$server_name$request_uri; +} + +upstream centrifugo { + server centrifugo:8000; +} + +server { + listen 443 ssl; + server_name testcws.dot-dot.ru; + + access_log /var/log/nginx/testcws.dot-dot.ru_access.log json; + error_log /var/log/nginx/testcws.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; + } +} diff --git a/configs/nuxt/.env b/configs/nuxt/.env deleted file mode 100755 index 625eec3..0000000 --- a/configs/nuxt/.env +++ /dev/null @@ -1,13 +0,0 @@ -NUXT_HOST=0.0.0.0 -NUXT_PORT=3000 -NUXT_ENV_DEVALUE_LOG_LEVEL=silent -WS_PROTOCOL=wss -BASE_URL=testc.dot-dot.ru -API_URL=https://testc.dot-dot.ru/ -DOMAIN=testc.dot-dot.ru - -APP_HOST=testc.dot-dot.ru -APP_SCHEME=https -APP_ENVIRONMENT=production -DADATA_API_TOKEN=c9aa5fdc338a746e23ce91ceb6fdb9e635749833 -YANDEX_METRIKA_ID=50156956 diff --git a/configs/nuxt/entrypoint.sh b/configs/nuxt/entrypoint.sh deleted file mode 100755 index a1dc972..0000000 --- a/configs/nuxt/entrypoint.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh - -DOMAIN="${DOMAIN:-dot-dot.ru}" - -for x in $(grep -lrw "dot-dot.ru" .nuxt/);do - echo "replace dot-dot.ru to https://${DOMAIN} in $x" - sed -i -e "s/dot-dot.ru/${DOMAIN}/g" $x; -done - -"$@" diff --git a/configs/php/.env b/configs/php/.env index 16a829c..5ca206d 100755 --- a/configs/php/.env +++ b/configs/php/.env @@ -142,3 +142,27 @@ PROSTOR_SMS_PASSWORD=secret ACCOUNTING_AUDIT_URL=https://crm.dot-dot.ru ACCOUNTING_AUDIT_LOGIN=secret ACCOUNTING_AUDIT_PASSWORD=secret + +###> KONTUR_DIADOC### +SIGNER_DOCS_API_URL=https://testdsigner.dot-dot.ru +SIGNER_DOCS_API_TOKEN=secret +###< KONTUR_DIADOC### + +PLATFORM_NAME=СПОТТОРГ + +###> CENTRIFUGA### +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' +###< CENTRIFUGA### + +#> MOVIZOR# DD-4184 +MOVIZOR_API_URL=https://movizor.ru/api\_2 +MOVIZOR_PROJECT=secret +MOVIZOR_API_KEY=secret +#< MOVIZOR# + +###> 2GIS### TD-562 +TWOGIS_API_URL=secret +TWOGIS_API_KEY=secret +###< 2GIS### diff --git a/configs/php/.env.local b/configs/php/.env.local index 99b9574..c3e31f4 100755 --- a/configs/php/.env.local +++ b/configs/php/.env.local @@ -1,6 +1,6 @@ CONTAINER_NAME=php -#APP_ENV=dev -APP_ENV=prod +APP_ENV=dev +#APP_ENV=prod NotificationBuildServicejSP_KEY=16e93b225c730920ac5741a8d8df788f DADATA_API_TOKEN=c9aa5fdc338a746e23ce91ceb6fdb9e635749833 @@ -37,7 +37,8 @@ VOICIA_CALL_ID=1949 ###< voicia ### ###> ml_calculator ### -ML_CALCULATOR_URL=https://ml.dot-dot.ru/v2/classification/order/relevance +#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 ### @@ -46,7 +47,8 @@ COMAGIC_KEY=j769gveux0brdq7wb6insegwtczvz7nsqmuntkqv ###< comagic ### ###> carrier_scoring ### -ML_CARRIER_SCORING=https://ml.dot-dot.ru/v2/classification/carrier/scoring +###ML_CARRIER_SCORING=https://ml.dot-dot.ru/v2/classification/carrier/scoring TD-547 +ML_CARRIER_SCORING=https://ml.dot-dot.ru/v4/classification/carrier/scoring ###< carrier_scoring ### ###> direction_scoring ### @@ -139,6 +141,7 @@ 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_WS_ORDER_STATE_UPDATE=amqp://ddadmin:Utahth9aeshahgh3saik@rabbitmq:5672/%2f/WS_ORDER_STATE_UPDATE CRYPTOPRO_PATH='/opt/cprocsp/bin/amd64/cryptcp -sign -dn '"ООО ""ТОЧКА-ТОЧКА ЛОГИСТИКА"""' -der' SIGNED_DOC_PATH="/application/var/documents/signeddocs" @@ -164,7 +167,78 @@ OTK_API_TOKEN="Q5vBE9jusg38Rk7wHt2bzycT4K6pePFZ" ACCOUNTING_AUDIT_LOGIN=ReportServis ACCOUNTING_AUDIT_PASSWORD=fE7mubiv -ML_CARRIER_SCORING=https://ml.dot-dot.ru/v3/classification/carrier/scoring +###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 -ML_CALCULATOR_SPOT_URL=https://ml.dot-dot.ru/v1/price_calculator/spot +###ML_CALCULATOR_SPOT_URL=https://ml.dot-dot.ru/v1/price_calculator/spot TD-547 +ML_CALCULATOR_SPOT_URL=https://ml.dot-dot.ru/v2/price_calculator/spot + +###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://testcsigner.dot-dot.ru +SIGNER_DOCS_API_TOKEN=secret +SIGNER_URL=https://testcsigner.dot-dot.ru +SIGNER_API_TOKEN='siofdhgt2349875t3iqhf1h2g*^&^%&^GHJGJCxgf' +###< KONTUR_DIADOC### + +###DDB-1726 + +ATISU_APIKEY=ec1bfb0b532d4f02976d9280cda0f627 + +APP_LMS_HOST=testclms.dot-dot.ru +APP_CARGO_CARRIER_HOST=testccabinet.dot-dot.ru + +###TD-491 +TENANT=dot + +###TD-480 +#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 + +QUEUE_DSN_NOTICE=amqp://ddadmin:Utahth9aeshahgh3saik@rabbitmq:5672/%2f/NOTICE +QUEUE_DSN_SELECT_DIRECTION_PUSH=amqp://ddadmin:Utahth9aeshahgh3saik@rabbitmq:5672/%2f/SELECT_DIRECTION_PUSH + +###> MOVIZOR### DD-4184 off_on_test_workspaces +MOVIZOR_API_URL=https://movizor.ru/api_2 +MOVIZOR_PROJECT=dotdotcorp +MOVIZOR_API_KEY=51b72575938f16da14275483 +###< MOVIZOR### + +### +SYNC_HOST_LIST='{"1bcf26e8-e53a-4960-9cc7-d212685f033f":"magnit", "d61013fb-fb8c-4a45-b14d-369ffad35b93":"5ka"}' +SYNC_HOST_TYPE=master +SYNC_HOST_MASTER_URL='' +SYNC_HOST_MASTER_SECRET='' +SYNC_HOST_SYNC_ITEM_PART_LIMIT=100 +### + +#> UNISENDER# +UNISENDER_API_URL=https://api.unisender.com/ru +UNISENDER_API_KEY=6x8r8aauy8noqwubbfiqgt13wucrjaomz913jtwy +UNISENDER_SENDER_NAME=Точка-точка +#< UNISENDER# + +### +ACTIVE_MAILER=mailer +### + +#> CITIPOINT# DDB-2066 +CITYPOINT_API_URL=https://api.citypoint.ru +CITYPOINT_API_KEY=PLwrkW+c1UQ8fX5SNdor12DmEKIT8kyQqnWW3wdv +CITYPOINT_USER_ID=135 +CITYPOINT_USER_NAME=dot-dot +CITYPOINT_PASSWORD=HFfAtZG1Dr1A +#< CITIPOINT# + +#> 2GIS# TD-562 +TWO_GIS_API_URL=https://routing.api.2gis.com +TWO_GIS_API_KEY=3e211c66-d8fa-4be6-90ae-e0ce72ef5bca +#< 2GIS# diff --git a/configs/php/.env.local.save b/configs/php/.env.local.save new file mode 100755 index 0000000..c774092 --- /dev/null +++ b/configs/php/.env.local.save @@ -0,0 +1,198 @@ +CONTAINER_NAME=php +APP_ENV=dev +#APP_ENV=prod +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=testc.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_CALL_ID=1949 +###< 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 ### + +###> 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 ### + +###> 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://1127a3ada375b040486c3ab0d86cbcab@sentry.dot-dot.ru/5" +SENTRY_SERVER_NAME=testc +SENTRY_SERVER_USER_NAME=tachkov +###< 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 +QUEUE_DSN_WS_ORDER_STATE_UPDATE=amqp://ddadmin:Utahth9aeshahgh3saik@rabbitmq:5672/%2f/WS_ORDER_STATE_UPDATE + +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://guest:guest@rabbitmq:5672/%2f/USER_TRUST + +CHROMIUM_BROWSER_SYS_PATH="/usr/bin/chromium-browser" + +### DD-3326 check_carrier&drivers in OTK 2_Step ### +OTK_API_END_POINT_URL="https://test-api.otk.su" +OTK_API_TOKEN="Q5vBE9jusg38Rk7wHt2bzycT4K6pePFZ" +### DD-3326 check_carrier&drivers in OTK 2_Step ### + +ACCOUNTING_AUDIT_LOGIN=ReportServis +ACCOUNTING_AUDIT_PASSWORD=fE7mubiv + +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 + +ML_CALCULATOR_SPOT_URL=https://ml.dot-dot.ru/v1/price_calculator/spot + +###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://testcsigner.dot-dot.ru +SIGNER_DOCS_API_TOKEN=secret +SIGNER_URL=https://testcsigner.dot-dot.ru +SIGNER_API_TOKEN='siofdhgt2349875t3iqhf1h2g*^&^%&^GHJGJCxgf' +###< KONTUR_DIADOC### + +###DDB-1726 + +ATISU_APIKEY=ec1bfb0b532d4f02976d9280cda0f627 + +APP_LMS_HOST=testclms.dot-dot.ru +APP_CARGO_CARRIER_HOST=testccabinet.dot-dot.ru + +###TD-491 +tenant='dot' diff --git a/docker-compose.yml b/docker-compose.yml index 233e073..d2d7e24 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -12,6 +12,7 @@ volumes: x-defaults-php: &defaults-php image: registry.dot-dot.ru/dot-dot:${DOTDOT_TAG} restart: unless-stopped + user: www-data volumes: - ./configs/php/.env:/application/.env - ./configs/php/.env.local:/application/.env.local @@ -69,7 +70,6 @@ services: <<: *defaults-php php: - # TODO: Денис должен переделать и добавить command: ./bin/console app:auction:reload <<: *defaults-php @@ -80,6 +80,17 @@ services: carrier-offers: <<: *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 @@ -95,19 +106,6 @@ services: networks: - dd - nuxt: - image: registry.dot-dot.ru/front:${FRONT_TAG} - restart: unless-stopped - command: npm run start - volumes: - - ./configs/nuxt/.env:/app/.env - - ./configs/nuxt/entrypoint.sh:/entrypoint.sh - env_file: - - ./configs/nuxt/.env - entrypoint: /entrypoint.sh - networks: - - dd - lms: image: registry.dot-dot.ru/lms:${LMS_TAG} restart: unless-stopped @@ -128,7 +126,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: @@ -142,12 +140,11 @@ 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 depends_on: - - nuxt - php - static networks: @@ -221,3 +218,25 @@ 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' + volumes: + - ./configs/landing-ttl/config.php:/application/backend/config.php + restart: unless-stopped + networks: + - dd