From ba72cf44eff6ade1e5370b4e7ead6a329f61f080 Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Thu, 10 Dec 2015 13:31:12 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B7=AF=E5=BE=84=E7=94=A8DS=E5=B8=B8=E9=87=8F?=
 =?UTF-8?q?=E8=A7=84=E8=8C=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 library/think/app.php             |  8 ++++----
 library/think/create.php          | 24 ++++++++++++------------
 library/think/loader.php          | 10 +++++-----
 library/think/log/driver/file.php |  2 +-
 4 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/library/think/app.php b/library/think/app.php
index 9c596aed..562fcb06 100644
--- a/library/think/app.php
+++ b/library/think/app.php
@@ -130,7 +130,7 @@ class App
     // 操作绑定到类：模块\controller\控制器\操作类
     private static function bindActionClass($emptyController)
     {
-        if (is_dir(MODULE_PATH . CONTROLLER_LAYER . '/' . str_replace('.', '/', CONTROLLER_NAME))) {
+        if (is_dir(MODULE_PATH . CONTROLLER_LAYER . DS . str_replace('.', DS, CONTROLLER_NAME))) {
             $namespace = MODULE_NAME . '\\' . CONTROLLER_LAYER . '\\' . str_replace('.', '\\', CONTROLLER_NAME) . '\\';
         } else {
             // 空控制器
@@ -181,7 +181,7 @@ class App
     private static function initModule($module, &$config)
     {
         // 定位模块目录
-        $module = COMMON_MODULE == $module ? '' : $module . '/';
+        $module = COMMON_MODULE == $module ? '' : $module . DS;
 
         // 加载初始化文件
         if (is_file(APP_PATH . $module . 'init' . EXT)) {
@@ -324,8 +324,8 @@ class App
         // 模块初始化
         if (MODULE_NAME && !in_array(MODULE_NAME, $config['deny_module_list']) && is_dir(APP_PATH . MODULE_NAME)) {
             Hook::listen('app_begin');
-            define('MODULE_PATH', APP_PATH . MODULE_NAME . '/');
-            define('VIEW_PATH', MODULE_PATH . VIEW_LAYER . '/');
+            define('MODULE_PATH', APP_PATH . MODULE_NAME . DS);
+            define('VIEW_PATH', MODULE_PATH . VIEW_LAYER . DS);
 
             // 初始化模块
             self::initModule(MODULE_NAME, $config);
diff --git a/library/think/create.php b/library/think/create.php
index 03c3ea00..7ab505be 100644
--- a/library/think/create.php
+++ b/library/think/create.php
@@ -79,7 +79,7 @@ class Create
 
         // 创建子目录和文件
         foreach ($list as $path => $file) {
-            $modulePath = APP_PATH . $module . '/';
+            $modulePath = APP_PATH . $module . DS;
             if ('__dir__' == $path) {
                 // 生成子目录
                 foreach ($file as $dir) {
@@ -98,7 +98,7 @@ class Create
             } else {
                 // 生成相关MVC文件
                 foreach ($file as $val) {
-                    $filename = $modulePath . $path . '/' . Loader::parseName($val) . EXT;
+                    $filename = $modulePath . $path . DS . Loader::parseName($val) . EXT;
                     switch ($path) {
                         case CONTROLLER_LAYER: // 控制器
                             $content = "<?php\nnamespace {$module}\\{$path};\n\nclass {$val} {\n\n}";
@@ -107,7 +107,7 @@ class Create
                             $content = "<?php\nnamespace {$module}\\{$path};\n\nclass {$val} extends \Think\Model{\n\n}";
                             break;
                         case VIEW_LAYER: // 视图
-                            $filename = $modulePath . $path . '/' . Loader::parseName($val) . '.html';
+                            $filename = $modulePath . $path . DS . Loader::parseName($val) . '.html';
                             if (!is_dir(dirname($filename))) {
                                 // 创建目录
                                 mkdir(dirname($filename), 0777, true);
@@ -130,12 +130,12 @@ class Create
     // 创建欢迎页面
     protected static function buildHello($module)
     {
-        $filename = APP_PATH . $module . '/' . CONTROLLER_LAYER . '/' . Config::get('default_module') . EXT;
+        $filename = APP_PATH . $module . DS . CONTROLLER_LAYER . DS . Config::get('default_module') . EXT;
         if (!is_file($filename)) {
             $content = file_get_contents(THINK_PATH . 'tpl/default_index.tpl');
             $content = str_replace('{$module}', $module, $content);
-            if (!is_dir(APP_PATH . $module . '/' . CONTROLLER_LAYER)) {
-                mkdir(APP_PATH . $module . '/' . CONTROLLER_LAYER);
+            if (!is_dir(APP_PATH . $module . DS . CONTROLLER_LAYER)) {
+                mkdir(APP_PATH . $module . DS . CONTROLLER_LAYER);
             }
             file_put_contents($filename, $content);
         }
@@ -144,14 +144,14 @@ class Create
     // 创建模块公共文件
     protected static function buildCommon($module)
     {
-        if (!is_file(APP_PATH . $module . '/common.php')) {
-            file_put_contents(APP_PATH . $module . '/common.php', "<?php\n");
+        if (!is_file(APP_PATH . $module . DS.'common.php')) {
+            file_put_contents(APP_PATH . $module . DS.'common.php', "<?php\n");
         }
-        if (!is_file(APP_PATH . $module . '/config.php')) {
-            file_put_contents(APP_PATH . $module . '/config.php', "<?php\nreturn [\n\n];");
+        if (!is_file(APP_PATH . $module . DS.'config.php')) {
+            file_put_contents(APP_PATH . $module . DS.'config.php', "<?php\nreturn [\n\n];");
         }
-        if (!is_file(APP_PATH . $module . '/alias.php')) {
-            file_put_contents(APP_PATH . $module . '/alias.php', "<?php\nreturn [\n\n];");
+        if (!is_file(APP_PATH . $module . DS.'alias.php')) {
+            file_put_contents(APP_PATH . $module . DS.'alias.php', "<?php\nreturn [\n\n];");
         }
     }
 }
diff --git a/library/think/loader.php b/library/think/loader.php
index a4abe594..dfc4b138 100644
--- a/library/think/loader.php
+++ b/library/think/loader.php
@@ -29,7 +29,7 @@ class Loader
             $name = strtolower(strstr($class, '\\', true));
             if (isset(self::$namespace[$name])) {
                 // 注册的命名空间
-                $path = dirname(self::$namespace[$name]) . '/';
+                $path = dirname(self::$namespace[$name]) . DS;
             } elseif (in_array($name, ['think', 'org', 'behavior', 'com']) || is_dir(LIB_PATH . $name)) {
                 // Library目录下面的命名空间自动定位
                 $path = LIB_PATH;
@@ -37,7 +37,7 @@ class Loader
                 // 项目命名空间
                 $path = APP_PATH;
             }
-            $filename = $path . str_replace('\\', '/', str_replace('\\_', '\\', strtolower(trim(preg_replace("/[A-Z]/", "_\\0", $class), "_")))) . EXT;
+            $filename = $path . str_replace('\\', DS, str_replace('\\_', '\\', strtolower(trim(preg_replace("/[A-Z]/", "_\\0", $class), "_")))) . EXT;
             if (is_file($filename)) {
                 include $filename;
             }
@@ -97,11 +97,11 @@ class Loader
             } else {
                 // 加载其他项目应用类库
                 $class   = substr_replace($class, '', 0, strlen($class_strut[0]) + 1);
-                $baseUrl = APP_PATH . $class_strut[0] . '/';
+                $baseUrl = APP_PATH . $class_strut[0] . DS;
             }
         }
-        if (substr($baseUrl, -1) != '/') {
-            $baseUrl .= '/';
+        if (substr($baseUrl, -1) != DS) {
+            $baseUrl .= DS;
         }
         // 如果类存在 则导入类库文件
         $filename = $baseUrl . $class . $ext;
diff --git a/library/think/log/driver/file.php b/library/think/log/driver/file.php
index 5037d4bf..a3f49d24 100644
--- a/library/think/log/driver/file.php
+++ b/library/think/log/driver/file.php
@@ -42,7 +42,7 @@ class File
 
         //检测日志文件大小，超过配置大小则备份日志文件重新生成
         if (is_file($destination) && floor($this->config['file_size']) <= filesize($destination)) {
-            rename($destination, dirname($destination) . '/' . time() . '-' . basename($destination));
+            rename($destination, dirname($destination) . DS . time() . '-' . basename($destination));
         }
 
         error_log("[{$now}] {$_SERVER['SERVER_ADDR']} {$_SERVER['REMOTE_ADDR']} {$_SERVER['REQUEST_URI']}\r\n{$log}\r\n", 3, $destination);