修改

src/Common/Config/CfgCenter.php

@@ -25,14 +25,14 @@ class CfgCenter
 	/**
 	/**
 	 * 读取指定的配置项 - 返回数组格式
 	 * 读取指定的配置项 - 返回数组格式
 	 * (所有配置项，需预先添加到数据库中)
 	 * (所有配置项，需预先添加到数据库中)
-	 *  $cfgdata = CfgCenter::get(CfgCenter::COS);
+	 *  $cfgdata = CfgCenter::getArray(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 get($keyName, $oemId = 1)
+	public static function getArray($keyName, $oemId = 0)
 	{
 	{
 		return self::_get($keyName, $oemId);
 		return self::_get($keyName, $oemId);
 	}
 	}
@@ -46,7 +46,7 @@ class CfgCenter
 	 */
 	 */
 	public static function getByStoreId($keyName, $storeId)
 	public static function getByStoreId($keyName, $storeId)
 	{
 	{
-		$dbConn = self::_dbConnect('seller');
+		$dbConn = self::dbConnect('seller');
 		$result = $dbConn->get("seller", ['oemId'], ['storeId' => $storeId]);
 		$result = $dbConn->get("seller", ['oemId'], ['storeId' => $storeId]);
 		return self::_get($keyName, (int)$result['oemId']);
 		return self::_get($keyName, (int)$result['oemId']);
 	}
 	}
@@ -60,7 +60,7 @@ class CfgCenter
 	 */
 	 */
 	public static function getBySellerId($keyName, $sellerId)
 	public static function getBySellerId($keyName, $sellerId)
 	{
 	{
-		$dbConn = self::_dbConnect('seller');
+		$dbConn = self::dbConnect('seller');
 		$result = $dbConn->get("seller", ['oemId'], ['sellerId' => $sellerId]);
 		$result = $dbConn->get("seller", ['oemId'], ['sellerId' => $sellerId]);
 		return self::_get($keyName, (int)$result['oemId']);
 		return self::_get($keyName, (int)$result['oemId']);
 	}
 	}
@@ -74,7 +74,7 @@ class CfgCenter
 	 */
 	 */
 	public static function getByUnionId($keyName, $unionId)
 	public static function getByUnionId($keyName, $unionId)
 	{
 	{
-		$dbConn = self::_dbConnect('seller');
+		$dbConn = self::dbConnect('seller');
 		$result = $dbConn->get("seller", ['oemId'], ['unionId' => $unionId]);
 		$result = $dbConn->get("seller", ['oemId'], ['unionId' => $unionId]);
 		return self::_get($keyName, (int)$result['oemId']);
 		return self::_get($keyName, (int)$result['oemId']);
 	}
 	}
@@ -88,12 +88,39 @@ class CfgCenter
 	 */
 	 */
 	public static function getCertByStoreId(int $storeId, int $isEntrusted)
 	public static function getCertByStoreId(int $storeId, int $isEntrusted)
 	{
 	{
-		$dbConn = self::_dbConnect('seller');
+		$dbConn = self::dbConnect('seller');
 		$result = $dbConn->get("seller", ['oemId'], ['storeId' => $storeId]);
 		$result = $dbConn->get("seller", ['oemId'], ['storeId' => $storeId]);
 		$oemId = (int)$result['oemId'];
 		$oemId = (int)$result['oemId'];
 
 
 	}
 	}
 
 
+	public static function dbConnect($database='')
+	{
+		if($database == '') {
+			$database = 'config_center';
+		}
+		if (\env('ENVIRONMENT', '') == '') {
+			// 返回线上数据库连接
+			return new \Medoo\Medoo([
+				'database_type' => 'mysql',
+				'database_name' => $database,
+				'server' => '172.21.0.12',
+				'username' => 'configer',
+				'password' => 'Cfgsu#2390f*_',
+				'charset' => 'utf8'
+			]);
+		} else {
+			// 返回测试数据库连接
+			return new \Medoo\Medoo([
+				'database_type' => 'mysql',
+				'database_name' => $database,
+				'server' => '192.168.3.202',
+				'username' => 'hdller',
+				'password' => 'Hdlltest888',
+				'charset' => 'utf8'
+			]);
+		}
+	}
 
 
 	private static function _get($keyName, int $oemId = 1)
 	private static function _get($keyName, int $oemId = 1)
 	{
 	{
@@ -118,7 +145,7 @@ class CfgCenter
 
 
 	private static function _getConfigFromDb($keyName, $oemId)
 	private static function _getConfigFromDb($keyName, $oemId)
 	{
 	{
-		$dbConn = self::_dbConnect('config_center');
+		$dbConn = self::dbConnect();
 		$result = $dbConn->select("config", ['name', 'value'], ['oemId' => $oemId, 'name' => $keyName]);
 		$result = $dbConn->select("config", ['name', 'value'], ['oemId' => $oemId, 'name' => $keyName]);
 		if (!isset($result[0]['value'])) {
 		if (!isset($result[0]['value'])) {
 			return;
 			return;
@@ -130,30 +157,7 @@ class CfgCenter
 		return $valArr;
 		return $valArr;
 	}
 	}
 
 
-	private static function _dbConnect($database)
-	{
-		if (\env('ENVIRONMENT', '') == '') {
-			// 返回线上数据库连接
-			return new \Medoo\Medoo([
-				'database_type' => 'mysql',
-				'database_name' => $database,
-				'server' => '172.21.0.12',
-				'username' => 'configer',
-				'password' => 'Cfgsu#2390f*_',
-				'charset' => 'utf8'
-			]);
-		} else {
-			// 返回测试数据库连接
-			return new \Medoo\Medoo([
-				'database_type' => 'mysql',
-				'database_name' => $database,
-				'server' => '192.168.3.202',
-				'username' => 'hdller',
-				'password' => 'Hdlltest888',
-				'charset' => 'utf8'
-			]);
-		}
-	}
+
 
 
 }
 }
 
 

src/Common/Lib/Xcrypt.php

@@ -8,9 +8,6 @@ use Swoft\Redis\Redis;
 class Xcrypt
 class Xcrypt
 {
 {
 
 
-	const CRYPT = 'cryptKey';
-
-
 	public static function encrypt(string $str, $key = '')
 	public static function encrypt(string $str, $key = '')
 	{
 	{
 		$str = serialize($str);
 		$str = serialize($str);
@@ -42,7 +39,7 @@ class Xcrypt
 	}
 	}
 
 
 	private static function getKey(){
 	private static function getKey(){
-		$key = CfgCenter::get(self::CRYPT);
+		$key = CfgCenter::getArray(CfgCenter::ENCRYPT_KEY);
 		if (empty($key)){
 		if (empty($key)){
 			throw new \Exception('加密密钥获取失败！');
 			throw new \Exception('加密密钥获取失败！');
 		}
 		}