Merge remote-tracking branch 'origin/ft-oem' into ft-oem

src/Common/Entity/User.php

@@ -37,6 +37,11 @@ class User
         return $this->getValue('id');
         return $this->getValue('id');
     }
     }
 
 
+    public function getOemId()
+    {
+        return $this->getValue('oemId');
+    }
+
     public function setTestFlag()
     public function setTestFlag()
     {
     {
         $this->setValue('testFlag', TestEnum::TEST_STORE_ID);
         $this->setValue('testFlag', TestEnum::TEST_STORE_ID);

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('加密密钥获取失败！');
 		}
 		}