Skip to content

Commit ff5da5a

Browse files
authored
Merge pull request #788 from swoftcloud/master
Add composer
2 parents 88b8b4c + 8705612 commit ff5da5a

File tree

4 files changed

+12
-21
lines changed

4 files changed

+12
-21
lines changed

app/Http/Controller/ValidatorController.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ function validateAll(Request $request): array
3333
* Verify only the type field in the TestValidator validator
3434
*
3535
* @RequestMapping()
36-
* @Validate(validator="TestValidator",fields={"type"})
36+
* @Validate(validator="TestValidator", fields={"type"})
3737
*
3838
* @param Request $request
3939
*
@@ -48,7 +48,7 @@ function validateType(Request $request): array
4848
* Verify only the password field in the TestValidator validator
4949
*
5050
* @RequestMapping()
51-
* @Validate(validator="TestValidator",fields={"password"})
51+
* @Validate(validator="TestValidator", fields={"password"})
5252
*
5353
* @param Request $request
5454
*

app/bean.php

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,13 @@
4545
],
4646
'db' => [
4747
'class' => Database::class,
48-
'dsn' => 'mysql:dbname=test;host=172.17.0.3',
48+
'dsn' => 'mysql:dbname=test;host=192.168.4.11',
4949
'username' => 'root',
5050
'password' => 'swoft123456',
5151
],
5252
'db2' => [
5353
'class' => Database::class,
54-
'dsn' => 'mysql:dbname=test2;host=172.17.0.3',
54+
'dsn' => 'mysql:dbname=test2;host=192.168.4.11',
5555
'username' => 'root',
5656
'password' => 'swoft123456',
5757
'dbSelector' => bean(DbSelector::class)
@@ -62,7 +62,7 @@
6262
],
6363
'db3' => [
6464
'class' => Database::class,
65-
'dsn' => 'mysql:dbname=test2;host=172.17.0.3',
65+
'dsn' => 'mysql:dbname=test2;host=192.168.4.11',
6666
'username' => 'root',
6767
'password' => 'swoft123456'
6868
],
@@ -112,12 +112,5 @@
112112
],
113113
'cliRouter' => [
114114
// 'disabledGroups' => ['demo', 'test'],
115-
],
116-
'apollo' => [
117-
'host' => '192.168.4.11',
118-
'timeout' => -1
119-
],
120-
'consul' => [
121-
'host' => '192.168.4.11'
122115
]
123116
];

bin/test.php

Lines changed: 0 additions & 8 deletions
This file was deleted.

composer.json

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,13 @@
2323
"swoft/http-server": "~2.0.0",
2424
"swoft/rpc-client": "~2.0.0",
2525
"swoft/rpc-server": "~2.0.0",
26-
"swoft/websocket-server": "~2.0.0"
26+
"swoft/websocket-server": "~2.0.0",
27+
"swoft/tcp": "~2.0.0",
28+
"swoft/tcp-server": "~2.0.0",
29+
"swoft/apollo": "~2.0.0",
30+
"swoft/consul": "~2.0.0",
31+
"swoft/limiter": "~2.0.0",
32+
"swoft/breaker": "~2.0.0"
2733
},
2834
"require-dev": {
2935
"swoft/swoole-ide-helper": "dev-master",

0 commit comments

Comments
 (0)