From 5dc8cd481ec4f522db2d37ee4f04825d00923ddd Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Wed, 18 May 2016 11:27:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E4=B8=80=E4=BA=9B=E6=97=A0?=
 =?UTF-8?q?=E7=94=A8=E7=9A=84=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 convention.php | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/convention.php b/convention.php
index 10fa3218..d13b730c 100644
--- a/convention.php
+++ b/convention.php
@@ -15,12 +15,8 @@ return [
     'extra_file_list'        => [THINK_PATH . 'helper' . EXT],
     // 默认输出类型
     'default_return_type'    => 'html',
-    // 默认语言
-    'default_lang'           => 'zh-cn',
-    // response是否返回方式
-    'response_return'        => false,
-    // 默认AJAX 数据返回格式,可选JSON XML ...
-    'default_ajax_return'    => 'JSON',
+    // 默认AJAX 数据返回格式,可选json xml ...
+    'default_ajax_return'    => 'json',
     // 默认JSONP格式返回的处理方法
     'default_jsonp_handler'  => 'jsonpReturn',
     // 默认JSONP处理方法
@@ -31,6 +27,8 @@ return [
     'lang_switch_on'         => false,
     // 默认全局过滤方法 用逗号分隔多个
     'default_filter'         => '',
+    // 默认语言
+    'default_lang'           => 'zh-cn',
     // 是否启用控制器类后缀
     'use_controller_suffix'  => false,