From 71628c2d04571c3a8637ba3b8366d52fd16a373e Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Thu, 10 Dec 2015 13:36:20 +0800
Subject: [PATCH] =?UTF-8?q?=E6=83=AF=E4=BE=8B=E9=85=8D=E7=BD=AE=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 convention.php | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/convention.php b/convention.php
index 73ec395b..22429e0c 100644
--- a/convention.php
+++ b/convention.php
@@ -13,8 +13,6 @@ return [
     'default_return_type'   => 'html',
     // 默认语言
     'default_lang'          => 'zh-cn',
-    // 是否使用session
-    'use_session'           => true,
     // response输出终止执行
     'response_exit'         => true,
     // 默认AJAX 数据返回格式,可选JSON XML ...
@@ -72,10 +70,6 @@ return [
     // URL模块映射
     'url_module_map'        => [],
 
-    // 默认输出类型
-    'default_return_type'   => 'html',
-    // 默认语言
-    'default_lang'          => 'zh-cn',
     // +----------------------------------------------------------------------
     // | 视图及模板设置
     // +----------------------------------------------------------------------
@@ -117,13 +111,13 @@ return [
         'prefix' => '',
         'expire' => 0,
     ],
-    // 是否使用session
-    'use_session'           => true,
 
     // +----------------------------------------------------------------------
     // | 会话设置
     // +----------------------------------------------------------------------
 
+    // 是否使用session
+    'use_session'           => true,
     'session'               => [
         'id'         => '',
         'prefix'     => 'think',