Merge remote-tracking branch 'origin/master'

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/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/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/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'
     ];
     ];
 
 
     /**
     /**

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';

src/Common/Pool/Config/WithdrawCashPoolConfig.php

@@ -23,7 +23,7 @@ class WithdrawCashPoolConfig extends PoolProperties
 
 
     public function __construct()
     public function __construct()
     {
     {
-        $this->uri=explode(',',env('RPC_WITHDRAWCASH_URI','172.21.0.33:8099,172.16.255.12:8099'));
+        $this->uri=explode(',',env('RPC_WITHDRAWCASH_URI','draw-money:8099'));
     }
     }
     protected $name = 'withdrawCash';
     protected $name = 'withdrawCash';
 
 
@@ -81,9 +81,7 @@ class WithdrawCashPoolConfig extends PoolProperties
      *
      *
      * @var array
      * @var array
      */
      */
-    protected $uri = [
-        '192.168.3.12:8002',
-    ];
+    protected $uri = [];
 
 
     /**
     /**
      * whether to user provider(consul/etcd/zookeeper)
      * whether to user provider(consul/etcd/zookeeper)

src/Store/Lib/StoreInterface.php

@@ -63,7 +63,7 @@ interface StoreInterface
      * ['bannerUrl'] => 店铺banner 图片Url
      * ['bannerUrl'] => 店铺banner 图片Url
      * ['templateId'] => 当前使用的个性模板id
      * ['templateId'] => 当前使用的个性模板id
      * ['storeIntro'] => 店铺介绍
      * ['storeIntro'] => 店铺介绍
-     * ['storeHours'] => 店铺营业时间，示例："9-22" 表示从9点到22点
+     * ['storeHours'] => 店铺营业时间，示例："09:00-22:00" 表示从9点到22点
      * ['vipStartTime'] => VIP订购周期，开始时间，整数类型
      * ['vipStartTime'] => VIP订购周期，开始时间，整数类型
      * ['vipEndTime'] => VIP订购周期，结束时间，整数类型
      * ['vipEndTime'] => VIP订购周期，结束时间，整数类型
      * @return int  成功更新的条数
      * @return int  成功更新的条数