From 7d26916eb3412a8489f3efe7303723406fa86a79 Mon Sep 17 00:00:00 2001 From: ddadmin Date: Wed, 12 Feb 2025 10:43:30 +0300 Subject: [PATCH] add cabinet --- .env | 6 +++--- configs/cabinet/entrypoint.sh | 8 ++++---- configs/nginx/conf.d/cabinet.conf | 2 +- configs/php/.env.local | 13 ++++++++++--- 4 files changed, 18 insertions(+), 11 deletions(-) diff --git a/.env b/.env index 5743628..4d8d32d 100755 --- a/.env +++ b/.env @@ -1,9 +1,9 @@ COMPOSE_PROJECT_NAME=teste NETWORK=teste -FRONT_TAG=DD-3615-STORY -DOTDOT_TAG=DD-3615-STORY -LMS_TAG=DD-3615-STORY +FRONT_TAG=develop +DOTDOT_TAG=develop +LMS_TAG=DDB-1655 ADMIN_TAG=master CABINET_TAG=master diff --git a/configs/cabinet/entrypoint.sh b/configs/cabinet/entrypoint.sh index 0577be5..dce9e53 100755 --- a/configs/cabinet/entrypoint.sh +++ b/configs/cabinet/entrypoint.sh @@ -6,14 +6,14 @@ DOMAIN="${DOMAIN:-lmscabinet.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 -e "s|https://dot-dot.ru|${API_URL}|g" $x; - echo "fix double //" - sed -i -e "s|\/\/\"|/|g" $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 a073647..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 testecabinet.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 af591df..f367adf 100644 --- a/configs/php/.env.local +++ b/configs/php/.env.local @@ -1,5 +1,5 @@ CONTAINER_NAME=php -APP_ENV=prod +APP_ENV=dev NotificationBuildServicejSP_KEY=16e93b225c730920ac5741a8d8df788f DADATA_API_TOKEN=c9aa5fdc338a746e23ce91ceb6fdb9e635749833 @@ -149,11 +149,11 @@ 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_API_KONTUR_FOCUS_API_TOKEN=90ac3a27a097dbab7045f2dcc2cd8f9883503610 USER_TRUST_CHECK_BACKEND=true ###< API_KONTUR_FOCUS### -QUEUE_DSN_USER_TRUST=amqp://guest:guest@rabbitmq:5672/%2f/USER_TRUST +QUEUE_DSN_USER_TRUST=amqp://ddadmin:Utahth9aeshahgh3saik@rabbitmq:5672/%2f/USER_TRUST CHROMIUM_BROWSER_SYS_PATH="/usr/bin/chromium-browser" @@ -165,3 +165,10 @@ 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###