diff --git a/admin/foundation/JsonResponseFormatter.php b/admin/foundation/JsonResponseFormatter.php index ef3fe7a..99c42b1 100644 --- a/admin/foundation/JsonResponseFormatter.php +++ b/admin/foundation/JsonResponseFormatter.php @@ -26,9 +26,7 @@ class JsonResponseFormatter extends \yii\web\JsonResponseFormatter if (empty($data)) { $data = []; } else { - if (array_key_exists('list', $data)) { - $data['list'] = self::aseEncode($data['list']); - } + $data = self::aseEncode($data); } $result['data'] = $data; $result['msg'] = $msg; @@ -41,11 +39,14 @@ class JsonResponseFormatter extends \yii\web\JsonResponseFormatter // return $data; if (is_array($data)) { foreach ($data as $key => &$value) { + if (is_object($value)) { + $value = $value->toArray(); + } if (is_array($value)) { $value = self::aseEncode($value); // 递归处理子数组 } else { if (in_array($key, \Yii::$app->params['aseList'])) { - if (is_string($key)) { + if (is_string($value)) { $value = ase_encode($value); // 加密指定键值 } }