Merge branch 'ft-oem' into test

src/Common/Config/CfgCenter.php

@@ -7,31 +7,32 @@ use Swoft\App;
 
 
 class CfgCenter
 class CfgCenter
 {
 {
-	const COS            = 'cos';
-	const CLS            = 'cls';
-	const CMQ            = 'cmq';
-	const ENCRYPT_KEY    = 'encrypt_key';
-	const BACKEND_WEAPP  = 'backend_weapp';
-	const FRONTEND_WEAPP = 'frontend_weapp';
-	const ALIYUN_SMS     = 'aliyun_sms';
-	const TENCENT_SMS    = 'tencent_sms';
-	const MP             = 'mp';
-	const PAY            = 'pay';
-	const PAY_YUNMAI     = 'pay_yunmai';
-	const PAY_YUNMAI_ISP = 'pay_yunmai_isp';
-	const PAY_ZHIMEI     = 'pay_zhimei';
+	const COS            = 'cos'; //腾讯云存储
+	const CLS            = 'cls'; //腾讯云日志服务
+	const CMQ            = 'cmq'; //腾讯云cmq订阅消息
+	const ENCRYPT_KEY    = 'encrypt_key'; //数据加密的key
+	const BACKEND_WEAPP  = 'backend_weapp'; //蓝猫小程序配置
+	const FRONTEND_WEAPP = 'frontend_weapp'; //橙猫小程序配置
+	const ALIYUN_SMS     = 'aliyun_sms'; //阿里云短信
+	const TENCENT_SMS    = 'tencent_sms'; //腾讯云短信
+	const MP             = 'mp'; //公众号-用于H5公众号登录和发送公众号通知
+	const PAY            = 'pay'; //默认的支付平台配置
+	const PAY_YUNMAI     = 'pay_yunmai'; //云脉的支付平台配置
+	const PAY_YUNMAI_ISP = 'pay_yunmai_isp'; //云脉的支付服务商配置，用于托管子商户
+	const PAY_ZHIMEI     = 'pay_zhimei'; //致美的支付配置
+	const SELLER_DISTRIBUTION = 'seller_distribution'; //卖家分享配置
 
 
 	/**
 	/**
 	 * 读取指定的配置项 - 返回数组格式
 	 * 读取指定的配置项 - 返回数组格式
 	 * (所有配置项，需预先添加到数据库中)
 	 * (所有配置项，需预先添加到数据库中)
-	 *  $cfgdata = CfgCenter::getArray(CfgCenter::COS);
+	 *  $cfgdata = CfgCenter::get(CfgCenter::COS);
 	 *  var_dump($cfgdata['Weapp']['Region']); // 输出：ap-shanghai
 	 *  var_dump($cfgdata['Weapp']['Region']); // 输出：ap-shanghai
 	 *
 	 *
 	 * @param string $keyName 
 	 * @param string $keyName 
 	 * @param int    $oemId oemId==1表示是活动啦啦
 	 * @param int    $oemId oemId==1表示是活动啦啦
 	 * @return mixed
 	 * @return mixed
 	 */
 	 */
-	public static function getArray($keyName, $oemId = 1)
+	public static function get($keyName, $oemId = 1)
 	{
 	{
 		return self::_get($keyName, $oemId);
 		return self::_get($keyName, $oemId);
 	}
 	}
@@ -50,7 +51,6 @@ class CfgCenter
 		return self::_get($keyName, (int)$result['oemId']);
 		return self::_get($keyName, (int)$result['oemId']);
 	}
 	}
 
 
-
 	/**
 	/**
 	 * 根据sellerId获取所属OEM平台的配置
 	 * 根据sellerId获取所属OEM平台的配置
 	 *
 	 *