From d5c6b061c125574d1f7d4915884ccd2872fb6ca7 Mon Sep 17 00:00:00 2001 From: fomichev Date: Wed, 16 Jul 2025 10:41:08 +0300 Subject: [PATCH] =?utf8?q?=D0=9D=D0=B0=D1=81=D1=82=D1=80=D0=BE=D0=B9=D0=BA?= =?utf8?q?=D0=B8=20=D1=80=D0=B5=D0=B1=D0=B1=D0=B8=D1=82=20=D0=B2=20=D0=BF?= =?utf8?q?=D0=B5=D1=80=D0=B5=D0=BC=D0=B5=D0=BD=D0=BD=D1=83=D1=8E=20=D0=BE?= =?utf8?q?=D0=BA=D1=80=D1=83=D0=B6=D0=B5=D0=BD=D0=B8=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- erp24/.env.example | 3 ++- erp24/api2/config/api2.config.php | 3 +-- erp24/config/console.php | 3 +-- erp24/config/dev.console.config.php | 3 +-- erp24/config/params.php | 1 + erp24/config/prod.console.config.php | 3 +-- erp24/config/web.php | 3 +-- erp24/media/config/media.config.php | 3 +-- 8 files changed, 9 insertions(+), 13 deletions(-) diff --git a/erp24/.env.example b/erp24/.env.example index 971b06b0..5e391bb0 100644 --- a/erp24/.env.example +++ b/erp24/.env.example @@ -1,2 +1,3 @@ APP_ENV=development -SERVER_NAME=local-fomichev \ No newline at end of file +SERVER_NAME=local-fomichev +RABBIT_HOST=rabbitmq-yii_erp24 \ No newline at end of file diff --git a/erp24/api2/config/api2.config.php b/erp24/api2/config/api2.config.php index fce0ee6c..6733839b 100644 --- a/erp24/api2/config/api2.config.php +++ b/erp24/api2/config/api2.config.php @@ -64,8 +64,7 @@ return [ ], 'queue' => [ 'class' => Queue::class, - //'dsn' => 'amqp://admin:3qqHK2MRgGgxUdVT61@rabbitmq-yii_erp24:5672', - 'dsn' => 'amqp://admin:3qqHK2MRgGgxUdVT61@localhost:5672', + 'dsn' => 'amqp://admin:3qqHK2MRgGgxUdVT61@' . Yii::$app->params['RABBIT_HOST'] . ':5672', 'queueName' => 'telegram-queue', 'as log' => \yii\queue\LogBehavior::class, 'ttr' => 300, // Время для выполнения задания diff --git a/erp24/config/console.php b/erp24/config/console.php index abb400af..41cd21a3 100755 --- a/erp24/config/console.php +++ b/erp24/config/console.php @@ -42,8 +42,7 @@ $config = [ // ], 'queue' => [ 'class' => Queue::class, - // 'dsn' => 'amqp://admin:3qqHK2MRgGgxUdVT61@rabbitmq-yii_erp24:5672', - 'dsn' => 'amqp://admin:3qqHK2MRgGgxUdVT61@localhost:5672', + 'dsn' => 'amqp://admin:3qqHK2MRgGgxUdVT61@' . Yii::$app->params['RABBIT_HOST'] . ':5672', 'queueName' => 'telegram-queue', 'as log' => \yii\queue\LogBehavior::class, 'ttr' => 300, // Время для выполнения задания diff --git a/erp24/config/dev.console.config.php b/erp24/config/dev.console.config.php index c9407f84..be54e1cc 100755 --- a/erp24/config/dev.console.config.php +++ b/erp24/config/dev.console.config.php @@ -63,8 +63,7 @@ return [ ], 'queue' => [ 'class' => Queue::class, - // 'dsn' => 'amqp://admin:3qqHK2MRgGgxUdVT61@rabbitmq-yii_erp24:5672', - 'dsn' => 'amqp://admin:3qqHK2MRgGgxUdVT61@localhost:5672', + 'dsn' => 'amqp://admin:3qqHK2MRgGgxUdVT61@' . Yii::$app->params['RABBIT_HOST'] . ':5672', 'queueName' => 'telegram-queue', 'as log' => \yii\queue\LogBehavior::class, 'ttr' => 300, // Время для выполнения задания diff --git a/erp24/config/params.php b/erp24/config/params.php index 8efe83b3..8c95f87b 100644 --- a/erp24/config/params.php +++ b/erp24/config/params.php @@ -16,4 +16,5 @@ return [ ], 'SWITCH_USER_COOKIE_PASSWORD' => '123pass@WORD', 'YANDEX_MARKET_API_KEY' => 'ACMA:r3sa2VyjkgcO0aOxGoyAWuGH15g5mWAqXRMuylVA:a0bccb7e', + 'RABBIT_HOST' => getenv('RABBIT_HOST') ?: 'localhost', ]; diff --git a/erp24/config/prod.console.config.php b/erp24/config/prod.console.config.php index e9d1babf..9b65a350 100755 --- a/erp24/config/prod.console.config.php +++ b/erp24/config/prod.console.config.php @@ -62,8 +62,7 @@ return [ ], 'queue' => [ 'class' => Queue::class, - // 'dsn' => 'amqp://admin:3qqHK2MRgGgxUdVT61@rabbitmq-yii_erp24:5672', - 'dsn' => 'amqp://admin:3qqHK2MRgGgxUdVT61@localhost:5672', + 'dsn' => 'amqp://admin:3qqHK2MRgGgxUdVT61@' . Yii::$app->params['RABBIT_HOST'] . ':5672', 'queueName' => 'telegram-queue', 'as log' => \yii\queue\LogBehavior::class, 'ttr' => 300, // Время для выполнения задания diff --git a/erp24/config/web.php b/erp24/config/web.php index 874a787c..86d50abd 100644 --- a/erp24/config/web.php +++ b/erp24/config/web.php @@ -42,8 +42,7 @@ $config = [ ], 'queue' => [ 'class' => Queue::class, - // 'dsn' => 'amqp://admin:3qqHK2MRgGgxUdVT61@rabbitmq-yii_erp24:5672', - 'dsn' => 'amqp://admin:3qqHK2MRgGgxUdVT61@localhost:5672', + 'dsn' => 'amqp://admin:3qqHK2MRgGgxUdVT61@' . Yii::$app->params['RABBIT_HOST'] . ':5672', 'queueName' => 'telegram-queue', 'as log' => \yii\queue\LogBehavior::class, 'ttr' => 300, // Время для выполнения задания diff --git a/erp24/media/config/media.config.php b/erp24/media/config/media.config.php index f49f217a..bf13a724 100644 --- a/erp24/media/config/media.config.php +++ b/erp24/media/config/media.config.php @@ -25,8 +25,7 @@ return [ ], 'queue' => [ 'class' => Queue::class, - //'dsn' => 'amqp://admin:3qqHK2MRgGgxUdVT61@rabbitmq-yii_erp24:5672', - 'dsn' => 'amqp://admin:3qqHK2MRgGgxUdVT61@localhost:5672', + 'dsn' => 'amqp://admin:3qqHK2MRgGgxUdVT61@' . Yii::$app->params['RABBIT_HOST'] . ':5672', 'queueName' => 'telegram-queue', 'as log' => \yii\queue\LogBehavior::class, 'ttr' => 300, // Время для выполнения задания -- 2.39.5