去除敏感信息

biz/merchant/services/MerchantService.php

@@ -56,16 +56,18 @@ class MerchantService extends BaseService
 		return $defaultShopId;
 	}
 	
-	//商家基本信息，去除敏感信息 shish 2019.12.8
-	public static function getInfo($merchant, $extend)
+	//商家基本信息，$sensitive true 除敏感信息 shish 2019.12.8
+	public static function getInfo($merchant, $extend, $sensitive = true)
 	{
-		$delete = ['miniAppId', 'miniAppSecret', 'wxAppId', 'wxAppSecret', 'openAppId', 'wxToken', 'wxJsApiTicket', 'wxAccessToken', 'wxRefreshToken'];
-		foreach ($delete as $del) {
-			unset($merchant[$del]);
-		}
-		$deleteExtend = ['miniAppId', 'miniAccessToken', 'miniRefreshToken', 'wxPayKey', 'wxPayMerchantId', 'wxAppId'];
-		foreach ($deleteExtend as $delExtend) {
-			unset($extend[$delExtend]);
+		if ($sensitive) {
+			$delete = ['miniAppId', 'miniAppSecret', 'wxAppId', 'wxAppSecret', 'openAppId', 'wxToken', 'wxJsApiTicket', 'wxAccessToken', 'wxRefreshToken'];
+			foreach ($delete as $del) {
+				unset($merchant[$del]);
+			}
+			$deleteExtend = ['miniAppId', 'miniAccessToken', 'miniRefreshToken', 'wxPayKey', 'wxPayMerchantId', 'wxAppId'];
+			foreach ($deleteExtend as $delExtend) {
+				unset($extend[$delExtend]);
+			}
 		}
 		$merchant['extend'] = $extend;
 		return $merchant;