Merge branch 'master-LTF' into 'master'

updata LTF config

See merge request !3

src/Common/BaseData.php

@@ -145,9 +145,9 @@ abstract class BaseData
                 unset($signData);
                 unset($signData);
                 break;
                 break;
 			case Config::LTF_PAY:
 			case Config::LTF_PAY:
-				$signData = $this->certainSignData ?? $data;
+				$signData = $data;
 				$values = ArrayUtil::removeKeys($signData, ['sign']);
 				$values = ArrayUtil::removeKeys($signData, ['sign']);
-				if ($this->sign_sort) $values = ArrayUtil::arraySort($values);
+				$values = ArrayUtil::arraySort($values);
 				$signStr = ArrayUtil::createLinkstring($values);
 				$signStr = ArrayUtil::createLinkstring($values);
 				$this->makeSign($signStr);
 				$this->makeSign($signStr);
 				break;
 				break;

src/Common/LTFConfig.php

@@ -53,6 +53,8 @@ final class LTFConfig extends ConfigInterface{
 
 
 	public $privateKey; //私钥
 	public $privateKey; //私钥
 
 
+	public $key; //私钥
+
 	/**
 	/**
 	 * FuConfig constructor.
 	 * FuConfig constructor.
 	 * @param array $config
 	 * @param array $config
@@ -90,6 +92,8 @@ final class LTFConfig extends ConfigInterface{
 
 
 		if (key_exists('channel', $config) && !empty($config['channel'])) $this->payChannel = $config['channel'];
 		if (key_exists('channel', $config) && !empty($config['channel'])) $this->payChannel = $config['channel'];
 
 
+		if (key_exists('key', $config) && !empty($config['key'])) $this->key = $config['key'];
+
 
 
 		if (key_exists('notify_url', $config) && !empty($config['notify_url'])) $this->notifyUrl = $config['notify_url'];
 		if (key_exists('notify_url', $config) && !empty($config['notify_url'])) $this->notifyUrl = $config['notify_url'];