feat: 同步下新环境
This commit is contained in:
@@ -11,6 +11,7 @@
|
||||
|
||||
namespace think\response;
|
||||
|
||||
use think\Request;
|
||||
use think\Response;
|
||||
|
||||
class Jsonp extends Response
|
||||
@@ -27,7 +28,7 @@ class Jsonp extends Response
|
||||
/**
|
||||
* 处理数据
|
||||
* @access protected
|
||||
* @param mixed $data 要处理的数据
|
||||
* @param mixed $data 要处理的数据
|
||||
* @return mixed
|
||||
* @throws \Exception
|
||||
*/
|
||||
@@ -35,17 +36,16 @@ class Jsonp extends Response
|
||||
{
|
||||
try {
|
||||
// 返回JSON数据格式到客户端 包含状态信息 [当url_common_param为false时是无法获取到$_GET的数据的,故使用Request来获取<xiaobo.sun@qq.com>]
|
||||
$var_jsonp_handler = $this->app['request']->param($this->options['var_jsonp_handler'], "");
|
||||
$var_jsonp_handler = Request::instance()->param($this->options['var_jsonp_handler'], "");
|
||||
$handler = !empty($var_jsonp_handler) ? $var_jsonp_handler : $this->options['default_jsonp_handler'];
|
||||
|
||||
$data = json_encode($data, $this->options['json_encode_param']);
|
||||
|
||||
if (false === $data) {
|
||||
if ($data === false) {
|
||||
throw new \InvalidArgumentException(json_last_error_msg());
|
||||
}
|
||||
|
||||
$data = $handler . '(' . $data . ');';
|
||||
|
||||
return $data;
|
||||
} catch (\Exception $e) {
|
||||
if ($e->getPrevious()) {
|
||||
|
||||
Reference in New Issue
Block a user