From 92e2e25c1929e19cba0c4bfbeea0c127928665a2 Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Sun, 27 Dec 2015 22:21:05 +0800
Subject: [PATCH] =?UTF-8?q?sae=E6=A8=A1=E5=BC=8F=E5=AE=9A=E4=B9=89?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E8=A7=84=E8=8C=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mode/sae.php | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/mode/sae.php b/mode/sae.php
index 3ca00794..01577ca5 100644
--- a/mode/sae.php
+++ b/mode/sae.php
@@ -12,11 +12,9 @@
 /**
  * ThinkPHP SAE应用模式定义文件
  */
-
-$convention_config = include THINK_PATH . 'convention' . EXT;
 return [
     // 配置文件
-    'config' => array_merge($convention_config,[
+    'config' => array_merge(include THINK_PATH . 'convention' . EXT, [
         /* 数据库设置 */
         'database'         => [
             // 数据库类型
@@ -49,26 +47,24 @@ return [
             // 指定从服务器序号
             'slave_no'    => '',
         ],
-        'log'                   => [
+        'log'              => [
             'type' => 'Sae',
         ],
-        'cache'                 => [
+        'cache'            => [
             'type'   => 'Sae',
             'path'   => CACHE_PATH,
             'prefix' => '',
             'expire' => 0,
         ],
         'file_upload_type' => 'Sae',
-        'template' => [
-            'compile_type'     => 'Sae',
+        'template'         => [
+            'compile_type' => 'Sae',
         ],
         'compile_type'     => 'Sae',
     ]),
 
     // 别名定义
     'alias'  => [
-
-
         'think\App'                  => CORE_PATH . 'app' . EXT,
         'think\Cache'                => CORE_PATH . 'cache' . EXT,
         'think\Config'               => CORE_PATH . 'config' . EXT,
@@ -95,11 +91,9 @@ return [
         'think\template\driver\File' => CORE_PATH . 'template' . DS . 'driver' . DS . 'file' . EXT,
         'think\log\driver\File'      => CORE_PATH . 'log' . DS . 'driver' . DS . 'file' . EXT,
         'think\cache\driver\File'    => CORE_PATH . 'cache' . DS . 'driver' . DS . 'file' . EXT,
-        'think\Slog'                 => CORE_PATH . 'slog'.EXT,
-
-        'think\log\driver\Sae'      => CORE_PATH . 'log' . DS . 'driver' . DS . 'sae' . EXT,
-        'think\cache\driver\Sae'    => CORE_PATH . 'cache' . DS . 'driver' . DS . 'sae' . EXT,
-        'think\template\driver\Sae' => CORE_PATH . 'template' . DS . 'driver' . DS . 'sae' . EXT,
+        'think\log\driver\Sae'       => CORE_PATH . 'log' . DS . 'driver' . DS . 'sae' . EXT,
+        'think\cache\driver\Sae'     => CORE_PATH . 'cache' . DS . 'driver' . DS . 'sae' . EXT,
+        'think\template\driver\Sae'  => CORE_PATH . 'template' . DS . 'driver' . DS . 'sae' . EXT,
     ],
 
 ];