Merge: Complete merge of remote changes, including user's requested additions.
This commit completes the merge process, incorporating remote changes that conflicted with local modifications. It also stages and commits all remaining modified and untracked files as per the user's instruction to 'upload everything without exception'.
This commit is contained in:
@@ -14,11 +14,11 @@ class DatabaseConnection {
|
||||
|
||||
private function __construct() {
|
||||
$this->config = [
|
||||
'host' => $_ENV['DB_HOST'] ?? 'localhost',
|
||||
'port' => $_ENV['DB_PORT'] ?? '3306',
|
||||
'name' => $_ENV['DB_NAME'] ?? 'bot',
|
||||
'user' => $_ENV['DB_USER'] ?? 'nickpons666',
|
||||
'pass' => $_ENV['DB_PASS'] ?? 'MiPo6425@@',
|
||||
'host' => DB_HOST,
|
||||
'port' => DB_PORT,
|
||||
'name' => DB_NAME,
|
||||
'user' => DB_USER,
|
||||
'pass' => DB_PASS,
|
||||
'charset' => 'utf8mb4',
|
||||
'timeout' => 30, // Tiempo de espera de conexión en segundos
|
||||
'reconnect_attempts' => 3, // Número de intentos de reconexión
|
||||
|
||||
Reference in New Issue
Block a user