Skip to content

Commit c8f3bf1

Browse files
authored
Merge pull request #1360 from sakuraovq/master
2 parents e1c93e4 + c394361 commit c8f3bf1

File tree

3 files changed

+4
-2
lines changed

3 files changed

+4
-2
lines changed

app/Migration/User.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
*
1919
* @since 2.0
2020
*
21-
* @Migration(20190630164222)
21+
* @Migration(time=20190630164222, pool="db.pool,db1.pool")
2222
*/
2323
class User extends BaseMigration
2424
{

app/bean.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@
8484
'dsn' => 'mysql:dbname=test2;host=127.0.0.1',
8585
'username' => 'root',
8686
'password' => 'swoft123456',
87+
'charset' => 'utf8mb4',
8788
// 'dbSelector' => bean(DbSelector::class)
8889
],
8990
'db2.pool' => [
@@ -94,7 +95,8 @@
9495
'class' => Database::class,
9596
'dsn' => 'mysql:dbname=test2;host=127.0.0.1',
9697
'username' => 'root',
97-
'password' => 'swoft123456'
98+
'password' => 'swoft123456',
99+
'charset' => 'utf8mb4',
98100
],
99101
'db3.pool' => [
100102
'class' => Pool::class,

bin/swoft

100644100755
File mode changed.

0 commit comments

Comments
 (0)