diff --git a/.env b/.env index a6b4bbf..9f15aad 100644 --- a/.env +++ b/.env @@ -1,9 +1,9 @@ COMPOSE_PROJECT_NAME=testb NETWORK=testb -FRONT_TAG=DD-3776-STORY -DOTDOT_TAG=DD-3776-STORY -LMS_TAG=DD-3776-STORY +FRONT_TAG=develop +DOTDOT_TAG=DD-3615-STORY +LMS_TAG=DD-3615-STORY ADMIN_TAG=master CABINET_TAG=master diff --git a/configs/cabinet/entrypoint.sh b/configs/cabinet/entrypoint.sh index bc2988a..dce9e53 100755 --- a/configs/cabinet/entrypoint.sh +++ b/configs/cabinet/entrypoint.sh @@ -1,10 +1,19 @@ #!/bin/sh DOMAIN="${DOMAIN:-lmscabinet.dot-dot.ru}" +# API_URL='"API_URL": "https://dot-dot.ru/"' +# d='https://dot-dot.ru/' for x in $(grep -lrw "lmscabinet.dot-dot.ru" .nuxt/);do echo "replace lmscabinet.dot-dot.ru to https://${DOMAIN} in $x" - sed -i -e "s/lmscabinet.dot-dot.ru/${DOMAIN}/g" $x; + sed -i "s|lmscabinet.dot-dot.ru|${DOMAIN}|g" $x; +done + +for x in $(grep -lrw "https://dot-dot.ru" .nuxt/);do + echo "replace https://dot-dot.ru to ${API_URL} in $x" + sed -i "s|https://dot-dot.ru|${API_URL}|g" $x; + # echo "fix double //"; + # sed -i "s|\/\/\|/|g" $x; done "$@" diff --git a/configs/nginx/conf.d/cabinet.conf b/configs/nginx/conf.d/cabinet.conf index 7f7dd5f..40ad346 100644 --- a/configs/nginx/conf.d/cabinet.conf +++ b/configs/nginx/conf.d/cabinet.conf @@ -1,6 +1,6 @@ server { listen 443 ssl ; - server_name testbcabinet.dot-dot.ru; + server_name testacabinet.dot-dot.ru; ssl_certificate /etc/nginx/ssl/dot2024.crt; ssl_certificate_key /etc/nginx/ssl/dot2024.key; diff --git a/configs/php/.env.local b/configs/php/.env.local index b0c2c9e..5e51dd6 100755 --- a/configs/php/.env.local +++ b/configs/php/.env.local @@ -166,3 +166,12 @@ 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### + +PLATFORM_NAME=СПОТТОРГ