diff --git a/base.php b/base.php index 2e793cd1..90ed498b 100644 --- a/base.php +++ b/base.php @@ -12,20 +12,21 @@ // 版本信息 define('THINK_VERSION', '5.0beta'); // 系统常量 -defined('THINK_PATH') or define('THINK_PATH', dirname(__FILE__) . '/'); -defined('LIB_PATH') or define('LIB_PATH', THINK_PATH . 'library/'); -defined('MODE_PATH') or define('MODE_PATH', THINK_PATH . 'mode/'); // 系统应用模式目录 -defined('TRAIT_PATH') or define('TRAIT_PATH', THINK_PATH . 'traits/'); -defined('CORE_PATH') or define('CORE_PATH', LIB_PATH . 'think/'); -defined('ORG_PATH') or define('ORG_PATH', LIB_PATH . 'org/'); -defined('APP_PATH') or define('APP_PATH', dirname($_SERVER['SCRIPT_FILENAME']) . '/'); +defined('DS') or define('DS', DIRECTORY_SEPARATOR); +defined('THINK_PATH') or define('THINK_PATH', dirname(__FILE__).DS); +defined('LIB_PATH') or define('LIB_PATH', THINK_PATH.'library'.DS); +defined('MODE_PATH') or define('MODE_PATH', THINK_PATH.'mode'.DS); // 系统应用模式目录 +defined('TRAIT_PATH') or define('TRAIT_PATH', THINK_PATH.'traits'.DS); +defined('CORE_PATH') or define('CORE_PATH', LIB_PATH.'think'.DS); +defined('ORG_PATH') or define('ORG_PATH', LIB_PATH . 'org'.DS); +defined('APP_PATH') or define('APP_PATH', dirname($_SERVER['SCRIPT_FILENAME']).DS); defined('COMMON_MODULE') or define('COMMON_MODULE', 'common'); -defined('RUNTIME_PATH') or define('RUNTIME_PATH', realpath(APP_PATH) . '/runtime/'); -defined('DATA_PATH') or define('DATA_PATH', RUNTIME_PATH . 'data/'); -defined('LOG_PATH') or define('LOG_PATH', RUNTIME_PATH . 'log/'); -defined('CACHE_PATH') or define('CACHE_PATH', RUNTIME_PATH . 'cache/'); -defined('TEMP_PATH') or define('TEMP_PATH', RUNTIME_PATH . 'temp/'); -defined('VENDOR_PATH') or define('VENDOR_PATH', THINK_PATH . 'vendor/'); +defined('RUNTIME_PATH') or define('RUNTIME_PATH', realpath(APP_PATH).DS.'runtime'.DS); +defined('DATA_PATH') or define('DATA_PATH', RUNTIME_PATH.'data'.DS); +defined('LOG_PATH') or define('LOG_PATH', RUNTIME_PATH.'log'.DS); +defined('CACHE_PATH') or define('CACHE_PATH', RUNTIME_PATH.'cache'.DS); +defined('TEMP_PATH') or define('TEMP_PATH', RUNTIME_PATH.'temp'.DS); +defined('VENDOR_PATH') or define('VENDOR_PATH', THINK_PATH.'vendor'.DS); defined('EXT') or define('EXT', '.php'); defined('MODEL_LAYER') or define('MODEL_LAYER', 'model'); defined('VIEW_LAYER') or define('VIEW_LAYER', 'view'); @@ -240,10 +241,10 @@ function session($name, $value = '') return think\Session::get($name); } elseif (is_null($value)) { // 删除session - think\Session::delete($name); + return think\Session::delete($name); } else { // 设置session - think\Session::set($name, $value); + return think\Session::set($name, $value); } } @@ -263,7 +264,7 @@ function cookie($name, $value = '') return think\Cookie::delete($name); } else { // 设置session - think\Cookie::set($name, $value); + return think\Cookie::set($name, $value); } }