Merge branch 'master' into test

UPGRADE_2.x.md

+# 2.0.35
+- 增加rpc接口
+
+# 2.0.34
+- 会员卡接口
+
 # 2.0.33
 # 2.0.33
 - 添加返回小微商户信息的rpc接口
 - 添加返回小微商户信息的rpc接口
 
 

src/Common/Config/CfgCenter.php

@@ -69,7 +69,7 @@ class CfgCenter
                 } else {
                 } else {
                     $val = $res[1];
                     $val = $res[1];
                 }
                 }
-                $redis->set("CONFIG_CENTER:".$res[0], $val);
+                $redis->set("CONFIG_CENTER:".$res[0], $val, 3600);
                 return $res[1];
                 return $res[1];
             }
             }
         }
         }

src/Store/Lib/StoreInterface.php

@@ -22,6 +22,7 @@ use Swoft\Core\ResultInterface;
  * @method ResultInterface deferGetStoreBySellerId(int $sellerId)
  * @method ResultInterface deferGetStoreBySellerId(int $sellerId)
  * @method ResultInterface deferGetListBySellerIds(array $sellerIds, array $fields = [])
  * @method ResultInterface deferGetListBySellerIds(array $sellerIds, array $fields = [])
  * @method ResultInterface deferGetListByStoreIds(array $storeIds, array $fields = [])
  * @method ResultInterface deferGetListByStoreIds(array $storeIds, array $fields = [])
+ * @method ResultInterface deferGetListByLastMonth()
  * @method ResultInterface deferGetStoreByMobile(int $mobile, array $fields = [])
  * @method ResultInterface deferGetStoreByMobile(int $mobile, array $fields = [])
  * @method ResultInterface deferUpdateStore(int $storeId, array $data)
  * @method ResultInterface deferUpdateStore(int $storeId, array $data)
  * @method ResultInterface deferAddVipTime(int $storeId, int $days)
  * @method ResultInterface deferAddVipTime(int $storeId, int $days)
@@ -92,6 +93,13 @@ interface StoreInterface
     public function getListByStoreIds(array $storeIds, array $fields = []);
     public function getListByStoreIds(array $storeIds, array $fields = []);
 
 
     /**
     /**
+     * 获取最近一个月登录的店铺列表
+     *
+     * @return array
+     */
+    public function getListByLastMonth();
+
+    /**
      * 根据注册手机号获取店铺信息
      * 根据注册手机号获取店铺信息
      *
      *
      * @param integer $mobile
      * @param integer $mobile