as2252258/kiri-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

modify

Browse Source
This commit is contained in:
as2252258@163.com
2021-07-11 04:18:08 +08:00
parent 9fae1ed0e1
commit b688ec789e
1 changed files with 28 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Database/DatabasesProviders.php
+28 -34
View File
@@ -47,24 +47,9 @@ class DatabasesProviders extends Providers
public function get($name): Connection
{
$application = Snowflake::app();
if ($application->has('databases.' . $name)) {
return $application->get('databases.' . $name);
if (!$application->has('databases.' . $name)) {
$application->set('databases.' . $name, $this->_settings($this->getConfig($name)));
}
$config = $this->getConfig($name);
$max = Config::get('databases.pool.max', 30);
$application->set('databases.' . $name, [
'class' => Connection::class,
'id' => $config['id'],
'cds' => $config['cds'],
'username' => $config['username'],
'password' => $config['password'],
'tablePrefix' => $config['tablePrefix'],
'maxNumber' => $max,
'database' => $config['database'],
'charset' => $config['charset'] ?? 'utf8mb4',
'slaveConfig' => $config['slaveConfig']
]);
return $application->get('databases.' . $name);
}
@@ -79,30 +64,39 @@ class DatabasesProviders extends Providers
if (empty($databases)) {
return;
}
$max = Config::get('databases.pool', ['max' => 10, 'min' => 10]);
$application = Snowflake::app();
foreach ($databases as $name => $database) {
/** @var Connection $connection */
$connection = $application->set('databases.' . $name, [
'class' => Connection::class,
'id' => $database['id'],
'cds' => $database['cds'],
'username' => $database['username'],
'password' => $database['password'],
'tablePrefix' => $database['tablePrefix'],
'database' => $database['database'],
'maxNumber' => $max['max'],
'minNumber' => $max['min'],
'charset' => $database['charset'] ?? 'utf8mb4',
'slaveConfig' => $database['slaveConfig']
]);
$connection->fill();
$application->set('databases.' . $name, $this->_settings($database));
$application->get('databases.' . $name)->fill();
}
}
/**
* @param $database
* @return array
* @throws \Snowflake\Exception\ConfigException
*/
private function _settings($database)
{
$max = Config::get('databases.pool.max', 30);
return [
'class' => Connection::class,
'id' => $database['id'],
'cds' => $database['cds'],
'username' => $database['username'],
'password' => $database['password'],
'tablePrefix' => $database['tablePrefix'],
'database' => $database['database'],
'maxNumber' => $max['max'],
'minNumber' => $max['min'],
'charset' => $database['charset'] ?? 'utf8mb4',
'slaveConfig' => $database['slaveConfig']
];
}
/**
* @param $name
* @return mixed