Merge branch 'master' of D:\phpStudy\PHPTutorial\WWW\hdll-vip\vendor\hdll\services with conflicts.

src/Common/Pool/Config/PayPoolConfig.php

@@ -21,12 +21,6 @@ use Swoft\Pool\PoolProperties;
  */
  */
 class PayPoolConfig extends PoolProperties
 class PayPoolConfig extends PoolProperties
 {
 {
-    public function __construct()
-    {
-        // 区别本地和线上的RPC服务地址
-        $this->uri = explode(',', env('RPC_RESERVATION_URI', 'pay:8099'));
-    }
-
     /**
     /**
      * the name of pool
      * the name of pool
      *
      *
@@ -67,7 +61,7 @@ class PayPoolConfig extends PoolProperties
      * the time of connect timeout
      * the time of connect timeout
      *
      *
      */
      */
-    protected $timeout = 5;
+    protected $timeout = 50;
 
 
     /**
     /**
      * the addresses of connection
      * the addresses of connection
@@ -81,7 +75,7 @@ class PayPoolConfig extends PoolProperties
      *
      *
      */
      */
     protected $uri = [
     protected $uri = [
-        "pay:8099",
+        "192.168.3.100:8102",
     ];
     ];
 
 
     /**
     /**

src/Common/Pool/Config/SellerPoolConfig.php

@@ -24,7 +24,7 @@ class SellerPoolConfig extends PoolProperties
 	public function __construct()
 	public function __construct()
 	{
 	{
 		// 区别本地和线上的RPC服务地址
 		// 区别本地和线上的RPC服务地址
-		$this->uri = explode(',', env('RPC_SELLER_URI', 'seller:8099'));
+//		$this->uri = explode(',', env('RPC_SELLER_URI', '172.21.0.10:8099,172.16.255.196:8099'));
 	}
 	}
 
 
     protected $name = 'seller';
     protected $name = 'seller';
@@ -84,8 +84,7 @@ class SellerPoolConfig extends PoolProperties
      * @var array
      * @var array
      */
      */
     protected $uri = [
     protected $uri = [
-        "172.21.0.46:8099",
-//        "seller:8099"
+        '192.168.3.39:8099'
     ];
     ];
 
 
     /**
     /**