Merge branch 'master' of https://git.oschina.net/liu21st/thinkphp4

library/org/transform/driver/json.php

@@ -13,10 +13,10 @@ namespace think\transform\driver;
 
 class Json{
 	public function encode($data){
-		return json_encode($data);
+		return json_encode($data, JSON_UNESCAPED_UNICODE);
 	}
 
 	public function decode($data, $assoc = true){
 		return json_decode($data, $assoc);
 	}
-}
+}

library/think/controller.php

@@ -11,7 +11,7 @@
 
 namespace think;
 use think\View;
-use think\Transform;
+use org\Transform;
 
 class Controller {
     // 视图类实例

library/think/controller/Rest.php

@@ -110,7 +110,7 @@ abstract class Rest {
         if(empty($data))  return '';
         if('json' == $type) {
             // 返回JSON数据格式到客户端 包含状态信息
-            $data = json_encode($data);
+            $data = json_encode($data, JSON_UNESCAPED_UNICODE);
         }elseif('xml' == $type){
             // 返回xml格式数据
             $data = xml_encode($data);