dot-dot
/
config_stagingspot
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

updatex

This commit is contained in:
ddadmin 2025-12-07 10:49:36 +03:00
parent 7048212bf8
commit 3fb57b4a67
12 changed files with 47 additions and 191 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.env
View File

@ -1,12 +1,12 @@
COMPOSE_PROJECT_NAME=stagingspot
NETWORK=stagingspot
FRONT_TAG=release141
DOTDOT_TAG=release141
LMS_TAG=release141
FRONT_TAG=develop
DOTDOT_TAG=release145
LMS_TAG=release145
ADMIN_TAG=master
CABINET_TAG=release141
LANDING_TAG=master
CABINET_TAG=release145
LANDING_TAG=release145
MYSQL_PORT=0.0.0.0:33070
MYSQL_ROOT_PASSWORD=root

8
app.sh
View File

@ -86,7 +86,9 @@ init() {
up() {
checkDockerCompose
docker compose up -d
docker compose up -d && docker compose exec nginx nginx -t && docker compose exec nginx nginx -s reload
echo "check global nginx and reload"
docker exec -ti dd-nginx-1 nginx -t && docker exec -ti dd-nginx-1 nginx -s reload
}
down() {
@ -149,7 +151,7 @@ case "$1" in
"tests")
composer tests;;
"console"*)
docker compose exec --user www-data php ./bin/console ${@:2};;
docker compose exec php ./bin/console ${@:2};;
"db")
docker compose exec db mysql -uroot -p${MYSQL_ROOT_PASSWORD};;
"db-create")
@ -165,7 +167,7 @@ case "$1" in
"purge-db"*)
purgeDb;;
"restore-db")
restoredb;;
restoredb;;
"front"*)
case $2 in
*)

8
configs/cabinet/.env
View File

@ -2,11 +2,11 @@ NUXT_HOST=0.0.0.0
NUXT_PORT=3000
NUXT_ENV_DEVALUE_LOG_LEVEL=silent
WS_PROTOCOL=wss
BASE_URL=testecabinet.dot-dot.ru
API_URL=https://teste.dot-dot.ru/
DOMAIN=testecabinet.dot-dot.ru
BASE_URL=stagingcabinet.spottorg.ru
API_URL=https://staging.spottorg.ru
DOMAIN=stagingcabinet.spottorg.ru
APP_HOST=teste.dot-dot.ru
APP_HOST=staginng.spottorg.ru
APP_SCHEME=https
APP_ENVIRONMENT=production
DADATA_API_TOKEN=c9aa5fdc338a746e23ce91ceb6fdb9e635749833

145
configs/php/.env
View File

@ -1,145 +0,0 @@
APP_SECRET=c35a0abba25a5396d74ec17fca238d9a
CONTAINER_NAME=php
LOCK_DSN=flock
PHP_SOCKET_PORT=8080
DATABASE_URL_DOT=mysql://root:root@db:3306/dot?serverVersion=mariadb-10.3.25
DATABASE_URL_DOT_STATISTIC=mysql://root:root@db:3306/dot_statistic?serverVersion=mariadb-10.3.25
DOCUMENT_ROOT=/application
APP_HOST=teste.dot-dot.ru
APP_SCHEME=https
MAILER_DSN=null://null
WKHTMLTOPDF_PATH="xvfb-run /usr/bin/wkhtmltopdf --enable-local-file-access"
SP_WSDL=http://91.208.205.54:84/orawsv/XMLWEB/
SP_LOGIN=xmlweb
SP_PASSWORD=xmlweb
SP_KEY=secret
SP_TEST=true
SP_V3_URL=https://spasskievorota.ru/services/test/cargo_3.php
SP_V3_KEY=secret
DEFAULT_EMAIL=no_reply@dot-dot.ru
ADMIN_EMAIL=change.this@dot-dot.ru
ACCOUNTANT_EMAIL=noreplay@dot-dot.ru
SALES_EMAIL=sale.ftl@dot-dot.ru
LOGIST_EMAIL=nd@dot-dot.ru
LEAD_EMAIL=change.this@dot-dot.ru
VOSTOK_EMAIL=vostok@dot-dot.ru
SMSC_LOGIN=secret
SMSC_PASS=secret
DADATA_API_TOKEN=secret
DADATA_API_SECRET=secret
UNISENDER_API_KEY=secret
VOICIA_API_KEY=7589ed2721e50e299eb3baf2e3100a6b
VOICIA_API_URL=https://app.voicia.ru
UAT_1C_API_URL=http://1c.nwtlk.ru/UATtest/hs
UAT_1C_USER=secret
UAT_1C_PASSWORD=secret
FNS_ACCESS_TOKEN=secret
GOOGLE_MAPS_ACCESS_KEY=secret
GOOGLE_MAPS_BASE_URL=https://maps.google.com
ML_CALCULATOR_URL=https://calc.dev.dot-dot.ru/v1/calculate
ML_REGULAR_DIRECTION_URL=https://calc.dev.dot-dot.ru/v2/schedule/transport
ML_REGULAR_DIRECTION_CHAIN_URL=https://calc.dev.dot-dot.ru/v1/schedule/chains
ML_REGULAR_DIRECTION_RELEVANCE_CARRIERS_URL=https://calc.dev.dot-dot.ru/v1/schedule/carrier/scoring
ML_REGULAR_DIRECTION_CHAIN_RELEVANCE_CARRIERS_URL=https://calc.dev.dot-dot.ru/v1/schedule/chains/carrier/scoring
ML_UNCERTAIN_DIRECTIONS_URL=https://calc.dev.dot-dot.ru/v1/classification/direction/uncertain
YANDEX_MAPS_ACCESS_KEY=secret
YANDEX_MAPS_BASE_URL=https://api.routing.yandex.net
GRAFANA_ADMIN_PASSWORD=admin
GRAFANA_API_URL=http://grafana:3000
GRAFANA_PUBLIC_URL=http://grafana.dot-dot.local
THREESELLER_USERNAME=savrickijj@rambler.ru
THREESELLER_PASSWORD=123123
ATISU_CLIENT_ID=f26841019e0243418395d44ed7430f2a
ATISU_APIKEY=cf6e8c5975f04047a4e39004e2ce07f3
###> google/apiclient ###
ANALITIC_GOOGLE_CLIENT_ID=secret
ANALITIC_GOOGLE_CLIENT_SECRET=secret
ANALITIC_GOOGLE_CLIENT_REDIRECT_URI=http://localhost/admin/analitic/google-callback
###< google/apiclient ###
###> telegramm ###
TELEGRAM_URL=https://api.telegram.org/
TELEGRAM_BOT_TOKEN=secret
TELEGRAM_CHAT_ID=secret
###< telegramm ###
DEFAULT_SLUG=dotdot
###> voicia ###
VOICIA_CALL_ID=secret
###< voicia ###
###> openssl_encrypt parameters ###
OPENSSL_CIPHER=aes-128-gcm
OPENSSL_PASS_PHRASE=secret
OPENSSL_IV=secret
###> openssl_encrypt parameters ###
TKKIT_API_TOKEN=secret
TKKIT_API_URL=https://capi.tk-kit.com
###> BAIKAL###
BAIKAL_API_KEY=secret
###< BAIKAL###
TELEGRAM_CHAT_BOT_ACCESS_TOKEN=secret
###> NORDWHEEL###
NORDWHEEL_API_URL=https://nordw.ru
###< NORDWHEEL###
JDE_API_URL=https://api.jde.ru
###> SKIF###
SKIF_API_URL=sekret
SKIF_API_LOGIN=sekret
SKIF_API_PASSWORD=sekret
###< SKIF###
###> DPD ###
DPD_PATH=https://ws.dpd.ru/services/
DPD_CLIENT_NUMBER=secret
DPD_CLIENT_KEY=secret
###< DPD###
###> SOVKOM###
SOVKOM_API_KEY=secret
SOVKOM_API_URL=secret
###< SOVKOM###
MAGIC_API_URL=https://magic-trans.ru/
MAGIC_API_URL=https://magic-trans.ru/
SMS_PROVIDER=prostor-sms
PROSTOR_SMS_END_POINT_URL=http://api.prostor-sms.ru
PROSTOR_SMS_LOGIN=secret
PROSTOR_SMS_PASSWORD=secret
ACCOUNTING_AUDIT_URL=https://1c.dot-dot.ru
ACCOUNTING_AUDIT_LOGIN=secret
ACCOUNTING_AUDIT_PASSWORD=secret

43
configs/php/.env.local
View File

@ -2,6 +2,10 @@ CONTAINER_NAME=php
APP_ENV=dev
NotificationBuildServicejSP_KEY=16e93b225c730920ac5741a8d8df788f
APP_HOST=staging.spottorg.ru
APP_LMS_HOST=staginglms.spottorg.ru
APP_CARGO_CARRIER_HOST=stagingcabinet.spottorg.ru
DADATA_API_TOKEN=c9aa5fdc338a746e23ce91ceb6fdb9e635749833
DADATA_API_SECRET=1ea37a4d310e7a6ac64211ffe5686363f04d4e68
@ -35,26 +39,12 @@ TELEGRAM_CHAT_ID=-875661421
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
@ -113,9 +103,6 @@ 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"
@ -130,9 +117,6 @@ SENTRY_SERVER_NAME=testE
SENTRY_SERVER_USER_NAME=kurilenko
###< 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
@ -142,7 +126,7 @@ QUEUE_DSN_ORDER_IMPORT=amqp://ddadmin:Utahth9aeshahgh3saik@rabbitmq:5672/%2f/ORD
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
QUEUE_DSN_SYNC_AUCTIONS=amqp://ddadmin:Utahth9aeshahgh3saik@rabbitmq:5672/%2f/SYNC_AUCTIONS
CRYPTOPRO_PATH='/opt/cprocsp/bin/amd64/cryptcp -sign -dn '"ООО ""ТОЧКА-ТОЧКА ЛОГИСТИКА"""' -der'
SIGNED_DOC_PATH="/application/var/documents/signeddocs"
@ -159,7 +143,6 @@ USER_TRUST_CHECK_BACKEND=true
QUEUE_DSN_USER_TRUST=amqp://ddadmin:Utahth9aeshahgh3saik@rabbitmq:5672/%2f/USER_TRUST
ML_CALCULATOR_URL=https://ml.dot-dot.ru/v1/price_calculator/spot
CHROMIUM_BROWSER_SYS_PATH="/usr/bin/chromium-browser"
### DD-3326 check_carrier&drivers in OTK 2_Step ###
@ -170,10 +153,8 @@ OTK_API_TOKEN="Q5vBE9jusg38Rk7wHt2bzycT4K6pePFZ"
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###
@ -191,6 +172,8 @@ SIGNER_URL=https://testesigner.dot-dot.ru
SIGNER_API_TOKEN=secret
QUEUE_DSN_AUCTION_CARRIER_VERIFICATION=amqp://ddadmin:Utahth9aeshahgh3saik@rabbitmq:5672/%2f/AUCTION_CARRIER_VERIFICATION
QUEUE_DSN_SYNC_CHANGE_DATA=amqp://ddadmin:Utahth9aeshahgh3saik@rabbitmq:5672/%2f/CHANGE_DATA
BUH_DOT_DOT_EMAIL=no_reply@dot-dot.ru
RECONCILIATION_ACTS=amqp://ddadmin:Utahth9aeshahgh3saik@rabbitmq:5672/%2f/RECONCILIATION_ACT
@ -204,18 +187,18 @@ TENANT=dot
###> PLATFORN_NAME###
###> PLATFORM_NAME=TESTE
APP_LMS_HOST=staging.spottorg.ru
APP_CARGO_CARRIER_HOST=stagingcabinet.spottorg.ru
APP_SCHEME=https
###< PLATFORM_NAME###
UNISENDER_API_URL=https://api.unisender.ru
UNISENDER_API_KEY=6x8r8aauy8noqwubbfiqgt13wucrjaomz913jtwy
UNISENDER_SENDER_NAME=Точка-точка
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_LIST='{}'
SYNC_HOST_TYPE=slave
SYNC_HOST_MASTER_URL=https://staging.dot-dot.ru
SYNC_HOST_MASTER_SECRET=514ac16a-3ff8-4c88-b4e9-725ee345fb0d
SYNC_HOST_SYNC_ITEM_PART_LIMIT=100
QUEUE_DSN_SYNC_CARRIERS=amqp://ddadmin:Utahth9aeshahgh3saik@rabbitmq:5672/%2f/QUEUE_DSN_SYNC_CARRIERS

0
configs/php/pdf_result/26b8759931a00e98c5ce5d6d00acc40d.pdf Normal file → Executable file
View File

BIN
configs/php/pdf_result/2ece3390ba7caaa8c637d62531682045.pdf Normal file
View File

Binary file not shown.

0
configs/php/pdf_result/6cba1d1ba22aadf7788adace396b1231.pdf Normal file → Executable file
View File

0
configs/php/pdf_result/923f9023cbdaeb0dc7deeadb5eb3b81a.pdf Normal file → Executable file
View File

0
configs/php/pdf_result/b87ab9ccf9c73df3af64f3592e47751a.pdf Normal file → Executable file
View File

0
configs/php/pdf_result/f4ba23cae508d51f7271a9eab711297e.pdf Normal file → Executable file
View File

24
docker-compose.yml
View File

@ -14,7 +14,6 @@ x-defaults-php: &defaults-php
restart: unless-stopped
user: www-data
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
- ./configs/php/pdf_result:/application/var/tmp/pdf_result
@ -27,8 +26,9 @@ x-defaults-php: &defaults-php
- rabbitmq
extra_hosts:
- "sentry.dot-dot.ru:192.168.100.111"
- "testesigner.dot-dot.ru:192.168.100.110"
- "staging.dot-dot.ru:192.168.100.110"
- "staging.spottorg.ru:192.168.100.110"
- "testesigner.dot-dot.ru:192.168.100.110"
- "staginglms.spottorg.ru:192.168.100.110"
networks:
- dd
@ -85,11 +85,27 @@ services:
user-trust:
<<: *defaults-php
command: sh -c 'while true; do echo run; ./bin/console messenger:consume UserTrust; sleep 60;done'
command: sh -c 'while true; do echo run; ./bin/console messenger:consume UserTrust; sleep 10;done'
auction:
<<: *defaults-php
command: sh -c 'while true; do echo run; ./bin/console app:auction:process; sleep 60;done'
command: sh -c 'while true; do echo run; ./bin/console app:auction:process; sleep 10;done'
sync-auctions:
<<: *defaults-php
command: ./bin/console messenger:consume SyncAuctions
sync-carriers:
<<: *defaults-php
command: ./bin/console messenger:consume SyncCarriers
sync-change-data:
<<: *defaults-php
command: ./bin/console messenger:consume SyncChangeData
relevant-carrier-export:
<<: *defaults-php
command: ./bin/console messenger:consume RelevantCarrierExport
static:
image: registry.dot-dot.ru/dot-dot-static:${DOTDOT_TAG}