Merge branch 'master' of http://git.2b3.cn/tencent/services

src/Common/Pool/Config/AuthPoolConfig.php

@@ -21,6 +21,14 @@ use Swoft\Pool\PoolProperties;
  */
  */
 class AuthPoolConfig extends PoolProperties
 class AuthPoolConfig extends PoolProperties
 {
 {
+
+    public function __construct()
+    {
+        // 区别本地和线上的RPC服务地址
+        $this->uri = explode(',', env('RPC_RESERVATION_URI', 'auth:8099'));
+    }
+
+
     /**
     /**
      * the name of pool
      * the name of pool
      *
      *

src/Common/Pool/Config/BuyerPoolConfig.php

@@ -21,6 +21,13 @@ use Swoft\Pool\PoolProperties;
  */
  */
 class BuyerPoolConfig extends PoolProperties
 class BuyerPoolConfig extends PoolProperties
 {
 {
+
+    public function __construct()
+    {
+        // 区别本地和线上的RPC服务地址
+        $this->uri = explode(',', env('RPC_RESERVATION_URI', 'buyer:8099'));
+    }
+
     /**
     /**
      * the name of pool
      * the name of pool
      *
      *
@@ -75,8 +82,7 @@ class BuyerPoolConfig extends PoolProperties
      *
      *
      */
      */
     protected $uri = [
     protected $uri = [
-        "172.21.0.12:8099",
-        "172.16.255.33:8099"
+        "buyer:8099",
     ];
     ];
 
 
     /**
     /**

src/Common/Pool/Config/GoodsPoolConfig.php

@@ -23,7 +23,8 @@ class GoodsPoolConfig extends PoolProperties
 	public function __construct()
 	public function __construct()
 	{
 	{
 		// 区别本地和线上的RPC服务地址
 		// 区别本地和线上的RPC服务地址
-		$this->uri = explode(',', env('RPC_GOODS_URI', '172.21.0.47:8099,172.16.255.235:8099'));
+//		$this->uri = explode(',', env('RPC_GOODS_URI', '172.21.0.47:8099,172.16.255.235:8099'));
+		$this->uri = explode(',', env('RPC_GOODS_URI', 'goods:8099'));
 	}
 	}
 
 
 
 

src/Common/Pool/Config/GroupBookingPoolConfig.php

@@ -23,7 +23,8 @@ class GroupBookingPoolConfig extends PoolProperties
 	public function __construct()
 	public function __construct()
 	{
 	{
 		// 区别本地和线上的RPC服务地址
 		// 区别本地和线上的RPC服务地址
-		$this->uri = explode(',', env('RPC_GROUPBOOKING_URI', '172.21.0.38:8099,172.16.255.27:8099'));
+//		$this->uri = explode(',', env('RPC_GROUPBOOKING_URI', '172.21.0.38:8099,172.16.255.27:8099'));
+		$this->uri = explode(',', env('RPC_GROUPBOOKING_URI', 'group-booking:8099'));
 	}
 	}
 
 
     protected $name = 'groupBooking';
     protected $name = 'groupBooking';

src/Common/Pool/Config/OrderPoolConfig.php

@@ -19,6 +19,12 @@ use Swoft\Pool\PoolProperties;
  */
  */
 class OrderPoolConfig extends PoolProperties
 class OrderPoolConfig extends PoolProperties
 {
 {
+    public function __construct()
+    {
+        // 区别本地和线上的RPC服务地址
+        $this->uri = explode(',', env('RPC_RESERVATION_URI', 'order:8099'));
+    }
+
 
 
     protected $name = 'order';
     protected $name = 'order';
 
 
@@ -77,8 +83,7 @@ class OrderPoolConfig extends PoolProperties
      * @var array
      * @var array
      */
      */
     protected $uri = [
     protected $uri = [
-        '172.21.0.20:8099',
-        '172.16.255.2:8099',
+        'order:8099',
     ];
     ];
 
 
     /**
     /**

src/Common/Pool/Config/PayPoolConfig.php

@@ -21,6 +21,12 @@ 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
      *
      *
@@ -75,8 +81,7 @@ class PayPoolConfig extends PoolProperties
      *
      *
      */
      */
     protected $uri = [
     protected $uri = [
-        "172.21.0.39:8099",
-        "172.16.255.167:8099"
+        "pay:8099",
     ];
     ];
 
 
     /**
     /**

src/Common/Pool/Config/ReservationPoolConfig.php

@@ -23,7 +23,7 @@ class ReservationPoolConfig extends PoolProperties
     public function __construct()
     public function __construct()
     {
     {
         // 区别本地和线上的RPC服务地址
         // 区别本地和线上的RPC服务地址
-        $this->uri = explode(',', env('RPC_RESERVATION_URI', '172.21.0.11:8099,172.16.255.6:8099'));
+        $this->uri = explode(',', env('RPC_RESERVATION_URI', 'reservation:8099'));
     }
     }
 
 
     protected $name = 'reservation';
     protected $name = 'reservation';

src/Common/Pool/Config/SchedulePoolConfig.php

@@ -23,7 +23,7 @@ class SchedulePoolConfig extends PoolProperties
     public function __construct()
     public function __construct()
     {
     {
         // 区别本地和线上的RPC服务地址
         // 区别本地和线上的RPC服务地址
-        $this->uri = explode(',', env('RPC_SCHEDULE_URI', '172.21.0.23:8099,172.16.255.197:8099'));
+        $this->uri = explode(',', env('RPC_SCHEDULE_URI', 'schedule:8099'));
     }
     }
 
 
     protected $name = 'schedule';
     protected $name = 'schedule';

src/Common/Pool/Config/SellerDistributionPoolConfig.php

@@ -24,7 +24,8 @@ class SellerDistributionPoolConfig extends PoolProperties
 	public function __construct()
 	public function __construct()
 	{
 	{
 		// 区别本地和线上的RPC服务地址
 		// 区别本地和线上的RPC服务地址
-		$this->uri = explode(',', env('RPC_SELLER_DISTRIBUTION_URI', '172.21.0.17:8099,172.16.255.34:8099'));
+		$this->uri = explode(',', env('RPC_SELLER_DISTRIBUTION_URI', 'seller-distribution:8099'));
+//		$this->uri = explode(',', env('RPC_SELLER_DISTRIBUTION_URI', '172.21.0.17:8099,172.16.255.34:8099'));
 	}
 	}
 
 
     protected $name = 'sellerDistribution';
     protected $name = 'sellerDistribution';

src/Common/Pool/Config/StorePoolConfig.php

@@ -23,7 +23,7 @@ class StorePoolConfig extends PoolProperties
     public function __construct()
     public function __construct()
     {
     {
         // 区别本地和线上的RPC服务地址
         // 区别本地和线上的RPC服务地址
-        $this->uri = explode(',', env('RPC_STORE_URI', '172.21.0.44:8099,172.16.255.190:8099'));
+        $this->uri = explode(',', env('RPC_STORE_URI', 'store:8099'));
     }
     }
 
 
     protected $name = 'storeId';
     protected $name = 'storeId';

src/Common/Pool/Config/VipPoolConfig.php

@@ -24,7 +24,8 @@ class VipPoolConfig extends PoolProperties
 	public function __construct()
 	public function __construct()
 	{
 	{
 		// 区别本地和线上的RPC服务地址
 		// 区别本地和线上的RPC服务地址
-		$this->uri = explode(',', env('RPC_VIP_URI', '172.21.0.10:8099,172.16.255.196:8099'));
+//		$this->uri = explode(',', env('RPC_VIP_URI', '172.21.0.10:8099,172.16.255.196:8099'));
+		$this->uri = explode(',', env('RPC_VIP_URI', 'vip:8099'));
 	}
 	}
 
 
     protected $name = 'seller';
     protected $name = 'seller';