del congtu

src/Common/Pool/Config/TimeLimitBuyPoolConfig.php

@@ -22,16 +22,11 @@ class TimeLimitBuyPoolConfig extends PoolProperties
     public function __construct()
     public function __construct()
     {
     {
         // 区别本地和线上的RPC服务地址
         // 区别本地和线上的RPC服务地址
-<<<<<<< HEAD
+
         $this->uri = explode(',', env('RPC_TIMELIMITBUY_URI', 'timelistbuy:8099'));
         $this->uri = explode(',', env('RPC_TIMELIMITBUY_URI', 'timelistbuy:8099'));
     }
     }
     protected $name = 'timelimitname';
     protected $name = 'timelimitname';
-=======
-        $this->uri = explode(',', env('RPC_TIMELIMITBUY_URI', 'timelimitbuy:8099'));
 
 
-    }
-    protected $name = 'bargain';
->>>>>>> 67d11e9d1c40be5b86a0d76e64c27c95b7f7be07
 
 
     /**
     /**
      * Minimum active number of connections
      * Minimum active number of connections

src/StateLess/Lib/StatelessInterface.php

@@ -13,9 +13,10 @@ interface StatelessInterface
 {
 {
 
 
     /**
     /**
+     * 判断formtoken  是否有效
      * @param $formtoken
      * @param $formtoken
      * @param $store_id
      * @param $store_id
-     * @return bool
+     * @return bool   // true  or  false
      */
      */
     public function checktoken(string $formtoken,int $store_id);
     public function checktoken(string $formtoken,int $store_id);
 }
 }
\ No newline at end of file