feat:oem

src/Common/Config/CfgCenter.php

 <?php
+
 namespace Hdll\Services\Common\Config;
+
 use Swoft\Redis\Redis;
 use Swoft\App;
 
@@ -20,10 +22,10 @@ class CfgCenter
 	 * @param string $default 默认返回值
 	 * @return mixed
 	 */
-    public static function get($keyStr, $default='')
+	public static function get($keyStr, $default = '')
 	{
 		$data = self::_get($keyStr);
-        if($data == '') {
+		if ($data == '') {
 			return $default;
 		}
 		return $data;
@@ -43,71 +45,71 @@ class CfgCenter
 	 * @param string $default 默认返回值
 	 * @return mixed
 	 */
-    public static function getArray($keyStr, $default='')
+	public static function getArray($keyStr, $default = '')
 	{
 		$data = self::_get($keyStr);
-        if($data == '') {
+		if ($data == '') {
 			return $default;
 		}
-        if(is_object($data)) {
+		if (is_object($data)) {
 			return json_decode(json_encode($data), true);
 		}
 		return $data;
 	}
 
-    private static function _get($keyStr)
+	private static function _get($keyStr, $oemId = 0)
 	{
 		$keyArr = self::parseKeyStr($keyStr);
 		$rkey = implode(":", $keyArr);
 		$redis = App::getBean(Redis::class);
-        $data = $redis->get("CONFIG_CENTER:".$rkey);
-        if($data === null) {
-            $res = self::dbFetch($keyStr);
-            if($res) {
-                if(is_object($res[1])) {
+		$data = $redis->get("CONFIG_CENTER:" . $rkey);
+		if ($data === null) {
+			$res = self::dbFetch($keyStr, $oemId);
+			if ($res) {
+				if (is_object($res[1])) {
 					$val = json_encode($res[1]);
 				} else {
 					$val = $res[1];
 				}
-                $redis->set("CONFIG_CENTER:".$res[0], $val, 3600);
+				$redis->set("CONFIG_CENTER:" . $res[0], $val, 3600);
 				return $res[1];
 			}
 		}
 		$obj = json_decode($data);
-        if($obj && is_object($obj)) {
+		if ($obj && is_object($obj)) {
 			return $obj;
 		}
 		return $data;
 	}
 
-    protected static function dbFetch($keyStr)
+	protected static function dbFetch($keyStr, $oemId)
 	{
 		$keyArr = self::parseKeyStr($keyStr);
 		$name = array_shift($keyArr);
 		$dbConn = self::dbConnect();
-        $result = $dbConn->select("config", ['name','value'], ['name'=>$name]);
-        if(!isset($result[0]['value'])) {
+		$result = $dbConn->select("config", ['name', 'value'], ['name' => $name, 'oemId' => $oemId]);
+		if (!isset($result[0]['value'])) {
 			return;
 		}
 		$valObj = json_decode($result[0]['value']);
-        if(!is_object($valObj)) {
+		if (!is_object($valObj)) {
 			return [$name, $result[0]['value']];
 		}
 		$keys = '';
-        foreach($keyArr as $key) {
-            if(!isset($valObj->$key)) {
+		foreach ($keyArr as $key) {
+			if (!isset($valObj->$key)) {
 				return;
 			}
-            $keys .= $key.':';
+			$keys .= $key . ':';
 			$valObj = $valObj->$key;
 		}
-        $rkey = $name.':'.trim($keys,':');
-        return [trim($rkey,':'), $valObj];
+		$rkey = $name . ':' . trim($keys, ':');
+		return [trim($rkey, ':'), $valObj];
 	}
 
 	public static function dbConnect()
 	{
-        if(\env('ENVIRONMENT', '') == '') {
+		if (\env('ENVIRONMENT', '') == '') {
 			// 返回线上数据库连接
 			return new \Medoo\Medoo([
 				'database_type' => 'mysql',
@@ -117,7 +119,7 @@ class CfgCenter
 				'password' => 'Cfgsu#2390f*_',
 				'charset' => 'utf8'
 			]);
-        } elseif(\env('ENVIRONMENT', '') == 'pre') {
+		} elseif (\env('ENVIRONMENT', '') == 'pre') {
 			// 返回测试数据库连接
 			return new \Medoo\Medoo([
 				'database_type' => 'mysql',
@@ -143,15 +145,15 @@ class CfgCenter
 	protected static function parseKeyStr($keyStr)
 	{
 		$keyArr = explode(">", trim($keyStr, '>'));
-        foreach($keyArr as $k => $v) {
+		foreach ($keyArr as $k => $v) {
 			$v = trim($v);
-            if($v == "") {
+			if ($v == "") {
 				unset($keyArr[$k]);
 			} else {
 				$keyArr[$k] = $v;
 			}
 		}
-        if(empty($keyArr)) {
+		if (empty($keyArr)) {
 			throw new \Exception("[CfgCenter]未指定合法的Key");
 		}
 		return $keyArr;