fix conflict migration onepercent to tebus table

2023-12-28 13:20:53 +08:00
parent 20b5846341
commit 5a01b10c16
1 changed files with 0 additions and 12 deletions
@@ -21,28 +21,16 @@ class AddOnepercentToTebusTable extends Migration
    public function getActiveDB()
    {
        $config_db = array_keys(config("database.connections"));
-<<<<<<< Updated upstream

        $db_connection = array_filter($config_db, function ($connection) {
            try {
-                if ($connection == 'mysql7') {
-=======
-                
-        $db_connection = array_filter($config_db,function($connection){
-            try{
                if($connection == 'mysql7' || $connection == 'lelong')
->>>>>>> Stashed changes
                    return false;
-                }

                $db = DB::connection($connection)->getPdo();
                return true;
-<<<<<<< Updated upstream
            } catch (\Exception $e) {
-=======
-            } catch(\Exception $e){
                Log::info($connection);
->>>>>>> Stashed changes
                return false;
            }
        });