Merge pull request #1360 from sakuraovq/master

swoft-cloud · Sep 13, 2020 · c8f3bf1 · c8f3bf1
2 parents e1c93e4 + c394361
commit c8f3bf1
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/app/Migration/User.php b/app/Migration/User.php
@@ -18,7 +18,7 @@
  *
  * @since 2.0
  *
- * @Migration(20190630164222)
+ * @Migration(time=20190630164222, pool="db.pool,db1.pool")
  */
 class User extends BaseMigration
 {

diff --git a/app/bean.php b/app/bean.php
@@ -84,6 +84,7 @@
         'dsn'      => 'mysql:dbname=test2;host=127.0.0.1',
         'username' => 'root',
         'password' => 'swoft123456',
+        'charset'  => 'utf8mb4',
         //        'dbSelector' => bean(DbSelector::class)
     ],
     'db2.pool'           => [
@@ -94,7 +95,8 @@
         'class'    => Database::class,
         'dsn'      => 'mysql:dbname=test2;host=127.0.0.1',
         'username' => 'root',
-        'password' => 'swoft123456'
+        'password' => 'swoft123456',
+        'charset'  => 'utf8mb4',
     ],
     'db3.pool'           => [
         'class'    => Pool::class,

diff --git a/bin/swoft b/bin/swoft