From 41b3b17d78096361f4294f11d6a975954403acae Mon Sep 17 00:00:00 2001
From: dutsc <1020018707@qq.com>
Date: Fri, 11 Aug 2023 16:16:15 +0800
Subject: [PATCH] test

---
 mobile/source/helpers/dalianpay/library/Crypt.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mobile/source/helpers/dalianpay/library/Crypt.php b/mobile/source/helpers/dalianpay/library/Crypt.php
index 5c9dedd..4236150 100644
--- a/mobile/source/helpers/dalianpay/library/Crypt.php
+++ b/mobile/source/helpers/dalianpay/library/Crypt.php
@@ -210,12 +210,12 @@ class Crypt
 		// 解密结果编码转换（JAVA处理后的中文一般为GBK编码）
 		// echo "\r\n";
 		// var_dump($decrypted_data);
-		$charset = mb_detect_encoding($decrypted_data); // 这个东西有点问题  解析出来是false 先不用了
+		$charset = mb_detect_encoding($decrypted_data); 
 		echo "\r\n";
 		var_dump($charset);
 		echo "\r\n";
 
-		$decrypted_data = mb_convert_encoding($decrypted_data, 'UTF-8', 'GBK');
+		$decrypted_data = mb_convert_encoding($decrypted_data, 'UTF-8', $charset);
 		// echo "\r\n";
 		// var_dump($decrypted_data);
 		return $decrypted_data;