From 48467b88cea91a2f21c2429af67609ac6072536c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=91=E6=9E=97?= <as2252258@163.com>
Date: Fri, 18 Aug 2023 17:40:46 +0800
Subject: [PATCH] Default Changelist

---
 composer.json       | 1 -
 wchat/qq/Redhat.php | 6 +++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/composer.json b/composer.json
index 5a8f22e..6b26c99 100644
--- a/composer.json
+++ b/composer.json
@@ -21,7 +21,6 @@
   },
   "require": {
     "php": ">= 8.0",
-    "game-worker/kiri-client": "dev-master",
     "game-worker/kiri-container": "~v1.9",
     "psr/container": "*"
   },
diff --git a/wchat/qq/Redhat.php b/wchat/qq/Redhat.php
index 7de34e0..e4b7901 100644
--- a/wchat/qq/Redhat.php
+++ b/wchat/qq/Redhat.php
@@ -392,13 +392,13 @@ class Redhat extends SmallProgram
 	 * @return mixed
 	 * 构建请求参数
 	 */
-	private function generate(): array
+	public function generate(): array
 	{
 		$requestParam = [];
 		$requestParam['charset'] = $this->getCharset();
-		$requestParam['nonce_str'] = $this->getNonceStr();
+		$requestParam['nonce_str'] = Help::random(30);
 		$requestParam['mch_billno'] = $this->getMchBillno();
-		$requestParam['mch_id'] = $this->getMchId();
+		$requestParam['mch_id'] = $this->config->getMchId();
 		$requestParam['mch_name'] = $this->getMchName();
 		$requestParam['qqappid'] = $this->getQqappid();
 		$requestParam['re_openid'] = $this->getReOpenid();