Merge pull request #788 from swoftcloud/master

Add composer
swoft-cloud · Jul 8, 2019 · ff5da5a · ff5da5a
2 parents 88b8b4c + 8705612
commit ff5da5a
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 21 deletions.
diff --git a/app/Http/Controller/ValidatorController.php b/app/Http/Controller/ValidatorController.php
@@ -33,7 +33,7 @@ function validateAll(Request $request): array
      * Verify only the type field in the TestValidator validator
      *
      * @RequestMapping()
-     * @Validate(validator="TestValidator",fields={"type"})
+     * @Validate(validator="TestValidator", fields={"type"})
      *
      * @param Request $request
      *
@@ -48,7 +48,7 @@ function validateType(Request $request): array
      * Verify only the password field in the TestValidator validator
      *
      * @RequestMapping()
-     * @Validate(validator="TestValidator",fields={"password"})
+     * @Validate(validator="TestValidator", fields={"password"})
      *
      * @param Request $request
      *

diff --git a/app/bean.php b/app/bean.php
@@ -45,13 +45,13 @@
     ],
     'db'             => [
         'class'    => Database::class,
-        'dsn'      => 'mysql:dbname=test;host=172.17.0.3',
+        'dsn'      => 'mysql:dbname=test;host=192.168.4.11',
         'username' => 'root',
         'password' => 'swoft123456',
     ],
     'db2'            => [
         'class'      => Database::class,
-        'dsn'        => 'mysql:dbname=test2;host=172.17.0.3',
+        'dsn'        => 'mysql:dbname=test2;host=192.168.4.11',
         'username'   => 'root',
         'password'   => 'swoft123456',
         'dbSelector' => bean(DbSelector::class)
@@ -62,7 +62,7 @@
     ],
     'db3'            => [
         'class'    => Database::class,
-        'dsn'      => 'mysql:dbname=test2;host=172.17.0.3',
+        'dsn'      => 'mysql:dbname=test2;host=192.168.4.11',
         'username' => 'root',
         'password' => 'swoft123456'
     ],
@@ -112,12 +112,5 @@
     ],
     'cliRouter'      => [
         // 'disabledGroups' => ['demo', 'test'],
-    ],
-    'apollo'         => [
-        'host'    => '192.168.4.11',
-        'timeout' => -1
-    ],
-    'consul'         => [
-        'host' => '192.168.4.11'
     ]
 ];
diff --git a/bin/test.php b/bin/test.php
diff --git a/composer.json b/composer.json
@@ -23,7 +23,13 @@
     "swoft/http-server": "~2.0.0",
     "swoft/rpc-client": "~2.0.0",
     "swoft/rpc-server": "~2.0.0",
-    "swoft/websocket-server": "~2.0.0"
+    "swoft/websocket-server": "~2.0.0",
+    "swoft/tcp": "~2.0.0",
+    "swoft/tcp-server": "~2.0.0",
+    "swoft/apollo": "~2.0.0",
+    "swoft/consul": "~2.0.0",
+    "swoft/limiter": "~2.0.0",
+    "swoft/breaker": "~2.0.0"
   },
   "require-dev": {
     "swoft/swoole-ide-helper": "dev-master",