Skip to content
Snippets Groups Projects
Commit bce633cc authored by Administrator's avatar Administrator
Browse files

Merge branch 'dev' into 'master'

-

See merge request aktion/customer-assistant!4
parents 43e1cf54 4e697640
No related branches found
Tags 1.0.2
No related merge requests found
Pipeline #267 failed with stages
......@@ -68,8 +68,8 @@ class Installer
elseif ($mode === 'prod') {
// захватываем управление админкой
// управляющий модуль должен быть один
$hosts['domains']['manage'] = array_merge($hosts['domains']['manage'], ['backend.customer-assistant.com']);
$hosts['domains']['customer-assistant'] = ['customer-assistant.com', 'ca02.bsft.loc'];
$hosts['domains']['manage'] = array_merge($hosts['domains']['manage'], ['backend.customer-assistant.com', 'backend.ca-prod.colibrilab.pro']);
$hosts['domains']['customer-assistant'] = ['customer-assistant.com', 'ca02.bsft.loc', 'ca-prod.colibrilab.pro'];
}
self::_saveConfig($file, $hosts);
......
......@@ -8,6 +8,7 @@ use Colibri\Data\SqlClient\IDataReader;
use Colibri\Data\Storages\Fields\DateTimeField;
use Colibri\Data\Storages\Storages;
use Colibri\Data\Storages\Storage;
use Colibri\IO\FileSystem\Directory;
use Colibri\Utils\Logs\Logger;
use Colibri\Data\Storages\Models\DataTable as BaseModelDataTable;
use App\Modules\CustomerAssistant\Models\KTRUProduct;
......@@ -174,6 +175,10 @@ class KTRUProducts extends BaseModelDataTable
public static function DownloadFromFtp(object $connection, string $path, string $localPath, Logger $logger)
{
if(!Directory::Exists($localPath)) {
Directory::Create($localPath, true);
}
self::CleanUpCache($localPath);
$logger->info('Downloading files');
......
......@@ -7,6 +7,7 @@ use Colibri\Data\DataAccessPoint;
use Colibri\Data\SqlClient\IDataReader;
use Colibri\Data\Storages\Storages;
use Colibri\Data\Storages\Storage;
use Colibri\IO\FileSystem\Directory;
use Colibri\Utils\Debug;
use Colibri\Utils\Logs\Logger;
use Colibri\Data\Storages\Models\DataTable as BaseModelDataTable;
......@@ -229,6 +230,10 @@ class Okpd2Table extends BaseModelDataTable
public static function DownloadFromFtp(object $connection, string $path, string $localPath, Logger $logger)
{
if(!Directory::Exists($localPath)) {
Directory::Create($localPath, true);
}
self::CleanUpCache($localPath);
$logger->info('Downloading files');
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment