From 9b1a67881ec59a06578208b55a2dc77712f0131e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BA=A6=E5=BD=93=E8=8B=97=E5=84=BF?= Date: Mon, 15 Apr 2013 16:16:53 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=87=E4=BB=B6=E6=9C=AB=E5=B0=BE=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E6=8D=A2=E8=A1=8C=E7=AC=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Library/Org/README.md | 2 +- Library/Think/App.php | 3 +- Library/Think/Auto.php | 2 +- Library/Think/Behavior/ContentReplace.php | 2 +- Library/Think/Behavior/LocationTemplate.php | 2 +- Library/Think/Behavior/ReadHtmlCache.php | 2 +- Library/Think/Behavior/ShowPageTrace.php | 2 +- Library/Think/Behavior/TokenBuild.php | 2 +- Library/Think/Cache.php | 4 +-- Library/Think/Cache/Driver/Apc.php | 2 +- Library/Think/Cache/Driver/Db.php | 2 +- Library/Think/Cache/Driver/Eaccelerator.php | 2 +- Library/Think/Cache/Driver/File.php | 2 +- Library/Think/Cache/Driver/Memcache.php | 2 +- Library/Think/Cache/Driver/Secache.php | 2 +- Library/Think/Cache/Driver/Simple.php | 2 +- Library/Think/Cache/Driver/Sqlite.php | 2 +- Library/Think/Cache/Driver/Wincache.php | 2 +- Library/Think/Cache/Driver/Xcache.php | 2 +- Library/Think/Config.php | 2 +- Library/Think/Config/Driver/Ini.php | 2 +- Library/Think/Config/Driver/Xml.php | 2 +- Library/Think/Controller.php | 2 +- Library/Think/Controller/Amf.php | 2 +- Library/Think/Controller/Phprpc.php | 2 +- Library/Think/Controller/Rest.php | 2 +- Library/Think/Cookie.php | 2 +- Library/Think/Create.php | 2 +- Library/Think/Crypt.php | 2 +- Library/Think/Db.php | 2 +- Library/Think/Db/Driver.php | 2 +- Library/Think/Db/Driver/Mysql.php | 4 +-- Library/Think/Db/Driver/Oracle.php | 36 ++++++++++----------- Library/Think/Db/Driver/Pgsql.php | 2 +- Library/Think/Db/Driver/Sqlite.php | 2 +- Library/Think/Db/Driver/Sqlsrv.php | 2 +- Library/Think/Db/Lite.php | 2 +- Library/Think/Debug.php | 2 +- Library/Think/Error.php | 2 +- Library/Think/Exception.php | 2 +- Library/Think/Filter.php | 2 +- Library/Think/Image/Driver/Gd.php | 2 +- Library/Think/Image/Driver/Imagick.php | 2 +- Library/Think/Input.php | 2 +- Library/Think/Lang.php | 2 +- Library/Think/Loader.php | 3 +- Library/Think/Log.php | 3 +- Library/Think/Log/Driver/File.php | 2 +- Library/Think/Model.php | 3 +- Library/Think/Model/Lite.php | 3 +- Library/Think/Oauth.php | 3 +- Library/Think/Oauth/Driver.php | 2 +- Library/Think/Oauth/Driver/Baidu.php | 2 +- Library/Think/Oauth/Driver/Diandian.php | 2 +- Library/Think/Oauth/Driver/Douban.php | 2 +- Library/Think/Oauth/Driver/Github.php | 2 +- Library/Think/Oauth/Driver/Google.php | 2 +- Library/Think/Oauth/Driver/Kaixin.php | 2 +- Library/Think/Oauth/Driver/Msn.php | 2 +- Library/Think/Oauth/Driver/Qq.php | 2 +- Library/Think/Oauth/Driver/Renren.php | 2 +- Library/Think/Oauth/Driver/Sina.php | 2 +- Library/Think/Oauth/Driver/Sohu.php | 2 +- Library/Think/Oauth/Driver/T163.php | 2 +- Library/Think/Oauth/Driver/Taobao.php | 2 +- Library/Think/Oauth/Driver/Tencent.php | 2 +- Library/Think/Oauth/Driver/X360.php | 2 +- Library/Think/Parser.php | 2 +- Library/Think/Parser/Driver/Ubb.php | 1 - Library/Think/Route.php | 2 +- Library/Think/Seesion/Driver.php | 2 +- Library/Think/Session.php | 2 +- Library/Think/Tag.php | 3 +- Library/Think/Template.php | 2 +- Library/Think/Template/Driver/File.php | 2 +- Library/Think/Template/TagLib.php | 2 +- Library/Think/Template/TagLib/Cx.php | 3 +- Library/Think/Upload.php | 2 +- Library/Think/Url.php | 2 +- Library/Think/Validate.php | 2 +- Library/Think/View.php | 2 +- Library/Think/View/Driver/Think.php | 2 +- base.php | 2 +- convention.php | 2 +- start.php | 2 +- 85 files changed, 102 insertions(+), 113 deletions(-) diff --git a/Library/Org/README.md b/Library/Org/README.md index be7886b6..6f940733 100644 --- a/Library/Org/README.md +++ b/Library/Org/README.md @@ -1 +1 @@ -Org命名空间目录 \ No newline at end of file +Org命名空间目录 diff --git a/Library/Think/App.php b/Library/Think/App.php index aa84c15f..12bc1d63 100644 --- a/Library/Think/App.php +++ b/Library/Think/App.php @@ -223,5 +223,4 @@ class App { //保证$_REQUEST正常取值 $_REQUEST = array_merge($_POST,$_GET); } - -} \ No newline at end of file +} diff --git a/Library/Think/Auto.php b/Library/Think/Auto.php index 1a56c35c..50de171a 100644 --- a/Library/Think/Auto.php +++ b/Library/Think/Auto.php @@ -56,4 +56,4 @@ class Auto { } return $data; } -} \ No newline at end of file +} diff --git a/Library/Think/Behavior/ContentReplace.php b/Library/Think/Behavior/ContentReplace.php index 33edb2d9..24eeaf4b 100644 --- a/Library/Think/Behavior/ContentReplace.php +++ b/Library/Think/Behavior/ContentReplace.php @@ -62,4 +62,4 @@ class ContentReplace { return $content; } -} \ No newline at end of file +} diff --git a/Library/Think/Behavior/LocationTemplate.php b/Library/Think/Behavior/LocationTemplate.php index db34c674..327553d5 100644 --- a/Library/Think/Behavior/LocationTemplate.php +++ b/Library/Think/Behavior/LocationTemplate.php @@ -45,4 +45,4 @@ class LocationTemplate { $templateFile = MODULE_PATH.'View/'.$template.'.html'; return $templateFile; } -} \ No newline at end of file +} diff --git a/Library/Think/Behavior/ReadHtmlCache.php b/Library/Think/Behavior/ReadHtmlCache.php index b830183f..9027d447 100644 --- a/Library/Think/Behavior/ReadHtmlCache.php +++ b/Library/Think/Behavior/ReadHtmlCache.php @@ -119,4 +119,4 @@ class ReadHtmlCacheBehavior { return !method_exists($class,$action); } -} \ No newline at end of file +} diff --git a/Library/Think/Behavior/ShowPageTrace.php b/Library/Think/Behavior/ShowPageTrace.php index 8bd6e8d4..0fff7677 100644 --- a/Library/Think/Behavior/ShowPageTrace.php +++ b/Library/Think/Behavior/ShowPageTrace.php @@ -87,4 +87,4 @@ class ShowPageTrace { include Config::has('tmpl_trace_file')?Config::get('tmpl_trace_file'):THINK_PATH.'tpl/page_trace.tpl'; return ob_get_clean(); } -} \ No newline at end of file +} diff --git a/Library/Think/Behavior/TokenBuild.php b/Library/Think/Behavior/TokenBuild.php index dfacb1aa..11e71993 100644 --- a/Library/Think/Behavior/TokenBuild.php +++ b/Library/Think/Behavior/TokenBuild.php @@ -58,4 +58,4 @@ class TokenBuildBehavior extends Behavior { $token = ''; return $token; } -} \ No newline at end of file +} diff --git a/Library/Think/Cache.php b/Library/Think/Cache.php index c1e546e1..885f3800 100644 --- a/Library/Think/Cache.php +++ b/Library/Think/Cache.php @@ -12,7 +12,6 @@ namespace Think; class Cache { - /** * 操作句柄 * @var object @@ -36,5 +35,4 @@ class Cache { static public function __callStatic($method, $params){ return call_user_func_array(array(self::$handler, $method), $params); } - -} \ No newline at end of file +} diff --git a/Library/Think/Cache/Driver/Apc.php b/Library/Think/Cache/Driver/Apc.php index a770cef8..aad5bd11 100644 --- a/Library/Think/Cache/Driver/Apc.php +++ b/Library/Think/Cache/Driver/Apc.php @@ -98,4 +98,4 @@ class Apc { public function clear() { return apc_clear_cache(); } -} \ No newline at end of file +} diff --git a/Library/Think/Cache/Driver/Db.php b/Library/Think/Cache/Driver/Db.php index 5a2d66dc..c2a02898 100644 --- a/Library/Think/Cache/Driver/Db.php +++ b/Library/Think/Cache/Driver/Db.php @@ -143,4 +143,4 @@ class Db { return $this->handler->execute('TRUNCATE TABLE `'.$this->options['table'].'`'); } -} \ No newline at end of file +} diff --git a/Library/Think/Cache/Driver/Eaccelerator.php b/Library/Think/Cache/Driver/Eaccelerator.php index 26ebcd8e..a0ec2795 100644 --- a/Library/Think/Cache/Driver/Eaccelerator.php +++ b/Library/Think/Cache/Driver/Eaccelerator.php @@ -98,4 +98,4 @@ class Eaccelerator { public function clear() { return ; } -} \ No newline at end of file +} diff --git a/Library/Think/Cache/Driver/File.php b/Library/Think/Cache/Driver/File.php index 86cacf77..285fb9b1 100644 --- a/Library/Think/Cache/Driver/File.php +++ b/Library/Think/Cache/Driver/File.php @@ -181,4 +181,4 @@ class File { return true; } } -} \ No newline at end of file +} diff --git a/Library/Think/Cache/Driver/Memcache.php b/Library/Think/Cache/Driver/Memcache.php index c715d75a..bd3b0a3f 100644 --- a/Library/Think/Cache/Driver/Memcache.php +++ b/Library/Think/Cache/Driver/Memcache.php @@ -110,4 +110,4 @@ class Memcache { public function clear() { return $this->handler->flush(); } -} \ No newline at end of file +} diff --git a/Library/Think/Cache/Driver/Secache.php b/Library/Think/Cache/Driver/Secache.php index 01bc320b..88d4bec0 100644 --- a/Library/Think/Cache/Driver/Secache.php +++ b/Library/Think/Cache/Driver/Secache.php @@ -719,4 +719,4 @@ class SecacheClient{ trigger_error($errstr,$errno); } -} \ No newline at end of file +} diff --git a/Library/Think/Cache/Driver/Simple.php b/Library/Think/Cache/Driver/Simple.php index 57ce8500..e6231d92 100644 --- a/Library/Think/Cache/Driver/Simple.php +++ b/Library/Think/Cache/Driver/Simple.php @@ -96,4 +96,4 @@ class Simple { $filename = $this->filename('*'); array_map("unlink", glob($filename)); } -} \ No newline at end of file +} diff --git a/Library/Think/Cache/Driver/Sqlite.php b/Library/Think/Cache/Driver/Sqlite.php index 29c1b708..d98da914 100644 --- a/Library/Think/Cache/Driver/Sqlite.php +++ b/Library/Think/Cache/Driver/Sqlite.php @@ -116,4 +116,4 @@ class Sqlite { sqlite_query($this->handler, $sql); return ; } -} \ No newline at end of file +} diff --git a/Library/Think/Cache/Driver/Wincache.php b/Library/Think/Cache/Driver/Wincache.php index 3d98fe13..9b963f75 100644 --- a/Library/Think/Cache/Driver/Wincache.php +++ b/Library/Think/Cache/Driver/Wincache.php @@ -100,4 +100,4 @@ class Wincache { public function clear() { return ; } -} \ No newline at end of file +} diff --git a/Library/Think/Cache/Driver/Xcache.php b/Library/Think/Cache/Driver/Xcache.php index 37e8650a..ce4b37a8 100644 --- a/Library/Think/Cache/Driver/Xcache.php +++ b/Library/Think/Cache/Driver/Xcache.php @@ -103,4 +103,4 @@ class Xcache { public function clear() { return ; } -} \ No newline at end of file +} diff --git a/Library/Think/Config.php b/Library/Think/Config.php index 688a0782..2b428abc 100644 --- a/Library/Think/Config.php +++ b/Library/Think/Config.php @@ -88,4 +88,4 @@ class Config { } return null; // 避免非法参数 } -} \ No newline at end of file +} diff --git a/Library/Think/Config/Driver/Ini.php b/Library/Think/Config/Driver/Ini.php index 8c21e650..398e631a 100644 --- a/Library/Think/Config/Driver/Ini.php +++ b/Library/Think/Config/Driver/Ini.php @@ -19,4 +19,4 @@ class Ini { return parse_ini_string($config,true); } } -} \ No newline at end of file +} diff --git a/Library/Think/Config/Driver/Xml.php b/Library/Think/Config/Driver/Xml.php index 8ce4c39e..e19e3e48 100644 --- a/Library/Think/Config/Driver/Xml.php +++ b/Library/Think/Config/Driver/Xml.php @@ -26,4 +26,4 @@ class Xml { } return $result; } -} \ No newline at end of file +} diff --git a/Library/Think/Controller.php b/Library/Think/Controller.php index a6bd00f4..e8cc412b 100644 --- a/Library/Think/Controller.php +++ b/Library/Think/Controller.php @@ -171,4 +171,4 @@ class Controller { exit ; } } -} \ No newline at end of file +} diff --git a/Library/Think/Controller/Amf.php b/Library/Think/Controller/Amf.php index 329a58c1..b4b9a6e8 100644 --- a/Library/Think/Controller/Amf.php +++ b/Library/Think/Controller/Amf.php @@ -26,4 +26,4 @@ abstract class Amf { return ; } -} \ No newline at end of file +} diff --git a/Library/Think/Controller/Phprpc.php b/Library/Think/Controller/Phprpc.php index b19181d9..f4274e06 100644 --- a/Library/Think/Controller/Phprpc.php +++ b/Library/Think/Controller/Phprpc.php @@ -31,4 +31,4 @@ abstract class Phprpc { echo $server->comment(); } -} \ No newline at end of file +} diff --git a/Library/Think/Controller/Rest.php b/Library/Think/Controller/Rest.php index 6dc28a87..00d07d5c 100644 --- a/Library/Think/Controller/Rest.php +++ b/Library/Think/Controller/Rest.php @@ -212,4 +212,4 @@ abstract class Rest { } return false; } -} \ No newline at end of file +} diff --git a/Library/Think/Cookie.php b/Library/Think/Cookie.php index cbfba6c0..7b679b50 100644 --- a/Library/Think/Cookie.php +++ b/Library/Think/Cookie.php @@ -128,4 +128,4 @@ class Cookie { } return; } -} \ No newline at end of file +} diff --git a/Library/Think/Create.php b/Library/Think/Create.php index 5ccdd2de..9073181e 100644 --- a/Library/Think/Create.php +++ b/Library/Think/Create.php @@ -99,4 +99,4 @@ class Create { file_put_contents(APP_PATH.$module.'/alias.php',"close(); } -} \ No newline at end of file +} diff --git a/Library/Think/Db/Driver/Mysql.php b/Library/Think/Db/Driver/Mysql.php index c6036b2c..150faf09 100644 --- a/Library/Think/Db/Driver/Mysql.php +++ b/Library/Think/Db/Driver/Mysql.php @@ -13,7 +13,7 @@ namespace Think\Db\Driver; use Think\Db\Driver; /** - * PDO数据库驱动 + * mysql数据库驱动 * @category Extend * @package Extend * @subpackage Driver.Db @@ -72,4 +72,4 @@ class Mysql extends Driver{ return $key; } -} \ No newline at end of file +} diff --git a/Library/Think/Db/Driver/Oracle.php b/Library/Think/Db/Driver/Oracle.php index 59c143be..16705f60 100644 --- a/Library/Think/Db/Driver/Oracle.php +++ b/Library/Think/Db/Driver/Oracle.php @@ -113,24 +113,24 @@ class Oracle extends Driver{ /** * 获取最后插入id ,仅适用于采用序列+触发器结合生成ID的方式 * 在config.php中指定 - 'DB_TRIGGER_PREFIX' => 'tr_', - 'DB_SEQUENCE_PREFIX' => 'ts_', + * 'DB_TRIGGER_PREFIX' => 'tr_', + * 'DB_SEQUENCE_PREFIX' => 'ts_', * eg:表 tb_user - 相对tb_user的序列为: - -- Create sequence - create sequence TS_USER - minvalue 1 - maxvalue 999999999999999999999999999 - start with 1 - increment by 1 - nocache; - 相对tb_user,ts_user的触发器为: - create or replace trigger TR_USER - before insert on "TB_USER" - for each row - begin - select "TS_USER".nextval into :NEW.ID from dual; - end; + * 相对tb_user的序列为: + * -- Create sequence + * create sequence TS_USER + * minvalue 1 + * maxvalue 999999999999999999999999999 + * start with 1 + * increment by 1 + * nocache; + * 相对tb_user,ts_user的触发器为: + * create or replace trigger TR_USER + * before insert on "TB_USER" + * for each row + * begin + * select "TS_USER".nextval into :NEW.ID from dual; + * end; * @access public * @return integer */ @@ -169,4 +169,4 @@ class Oracle extends Driver{ if(!$lock) return ''; return ' FOR UPDATE NOWAIT '; } -} \ No newline at end of file +} diff --git a/Library/Think/Db/Driver/Pgsql.php b/Library/Think/Db/Driver/Pgsql.php index fda9b8ea..6bffc13e 100644 --- a/Library/Think/Db/Driver/Pgsql.php +++ b/Library/Think/Db/Driver/Pgsql.php @@ -77,4 +77,4 @@ class Pgsql extends Driver{ return $limitStr; } -} \ No newline at end of file +} diff --git a/Library/Think/Db/Driver/Sqlite.php b/Library/Think/Db/Driver/Sqlite.php index f8860ad7..f1f1899c 100644 --- a/Library/Think/Db/Driver/Sqlite.php +++ b/Library/Think/Db/Driver/Sqlite.php @@ -87,4 +87,4 @@ class Sqlite extends Driver { } return $limitStr; } -} \ No newline at end of file +} diff --git a/Library/Think/Db/Driver/Sqlsrv.php b/Library/Think/Db/Driver/Sqlsrv.php index 450d9fdf..ec7c4da4 100644 --- a/Library/Think/Db/Driver/Sqlsrv.php +++ b/Library/Think/Db/Driver/Sqlsrv.php @@ -128,4 +128,4 @@ class Sqlsrv extends Driver{ return $this->execute($sql); } -} \ No newline at end of file +} diff --git a/Library/Think/Db/Lite.php b/Library/Think/Db/Lite.php index 0747e8b1..7a3a2518 100644 --- a/Library/Think/Db/Lite.php +++ b/Library/Think/Db/Lite.php @@ -408,4 +408,4 @@ class Lite { // 关闭连接 $this->close(); } -} \ No newline at end of file +} diff --git a/Library/Think/Debug.php b/Library/Think/Debug.php index 9be1d72f..340b1627 100644 --- a/Library/Think/Debug.php +++ b/Library/Think/Debug.php @@ -109,4 +109,4 @@ class Debug { }else return $output; } -} \ No newline at end of file +} diff --git a/Library/Think/Error.php b/Library/Think/Error.php index 6adcb88f..9279b997 100644 --- a/Library/Think/Error.php +++ b/Library/Think/Error.php @@ -114,4 +114,4 @@ class Error { include Config::get('exception_tmpl'); exit; } -} \ No newline at end of file +} diff --git a/Library/Think/Exception.php b/Library/Think/Exception.php index a6806adf..3e8529ad 100644 --- a/Library/Think/Exception.php +++ b/Library/Think/Exception.php @@ -13,4 +13,4 @@ namespace Think; class Exception extends \Exception { -} \ No newline at end of file +} diff --git a/Library/Think/Filter.php b/Library/Think/Filter.php index 63a75a8c..6fcda662 100644 --- a/Library/Think/Filter.php +++ b/Library/Think/Filter.php @@ -219,4 +219,4 @@ class Filter { } return $string; } -} \ No newline at end of file +} diff --git a/Library/Think/Image/Driver/Gd.php b/Library/Think/Image/Driver/Gd.php index d9b8290e..3082b4eb 100644 --- a/Library/Think/Image/Driver/Gd.php +++ b/Library/Think/Image/Driver/Gd.php @@ -546,4 +546,4 @@ class Gd{ public function __destruct() { empty($this->im) || imagedestroy($this->im); } -} \ No newline at end of file +} diff --git a/Library/Think/Image/Driver/Imagick.php b/Library/Think/Image/Driver/Imagick.php index 0ddb2440..22ec589a 100644 --- a/Library/Think/Image/Driver/Imagick.php +++ b/Library/Think/Image/Driver/Imagick.php @@ -588,4 +588,4 @@ class Imagick{ public function __destruct() { empty($this->im) || $this->im->destroy(); } -} \ No newline at end of file +} diff --git a/Library/Think/Input.php b/Library/Think/Input.php index 2d55b6b4..b6d14ebc 100644 --- a/Library/Think/Input.php +++ b/Library/Think/Input.php @@ -87,4 +87,4 @@ class Input { $value .= ' '; } } -} \ No newline at end of file +} diff --git a/Library/Think/Lang.php b/Library/Think/Lang.php index b48f443a..d4c17fd8 100644 --- a/Library/Think/Lang.php +++ b/Library/Think/Lang.php @@ -51,4 +51,4 @@ class Lang { $name = strtolower($name); return isset(self::$_lang[$range][$name]) ? self::$_lang[$range][$name] : $name; } -} \ No newline at end of file +} diff --git a/Library/Think/Loader.php b/Library/Think/Loader.php index 83707bf9..fadb0095 100644 --- a/Library/Think/Loader.php +++ b/Library/Think/Loader.php @@ -227,5 +227,4 @@ class Loader { } return $_instance[$identify]; } - -} \ No newline at end of file +} diff --git a/Library/Think/Log.php b/Library/Think/Log.php index f608f7e6..00e5689f 100644 --- a/Library/Think/Log.php +++ b/Library/Think/Log.php @@ -81,5 +81,4 @@ class Log { static public function write($log,$level,$destination='') { self::$storage && self::$storage->write("{$level}: {$log}",$destination); } - -} \ No newline at end of file +} diff --git a/Library/Think/Log/Driver/File.php b/Library/Think/Log/Driver/File.php index 87cfb9c5..1c2e81d3 100644 --- a/Library/Think/Log/Driver/File.php +++ b/Library/Think/Log/Driver/File.php @@ -40,4 +40,4 @@ class File { rename($destination,dirname($destination).'/'.time().'-'.basename($destination)); error_log("[{$now}] ".$_SERVER['REMOTE_ADDR'].' '.$_SERVER['REQUEST_URI']."\r\n{$log}\r\n", 3,$destination); } -} \ No newline at end of file +} diff --git a/Library/Think/Model.php b/Library/Think/Model.php index c0f94acf..2b4756b1 100644 --- a/Library/Think/Model.php +++ b/Library/Think/Model.php @@ -1174,5 +1174,4 @@ class Model { $this->$name = $value; return $this; } - -} \ No newline at end of file +} diff --git a/Library/Think/Model/Lite.php b/Library/Think/Model/Lite.php index 05d57a06..a1e0178a 100644 --- a/Library/Think/Model/Lite.php +++ b/Library/Think/Model/Lite.php @@ -12,7 +12,6 @@ namespace Think\Model; class Lite { - // 当前数据库操作对象 protected $db = null; // 数据库名称 @@ -232,4 +231,4 @@ class Lite { return $this->db->getLastSql($this->name); } -} \ No newline at end of file +} diff --git a/Library/Think/Oauth.php b/Library/Think/Oauth.php index 99d3c8a0..1a42de6c 100644 --- a/Library/Think/Oauth.php +++ b/Library/Think/Oauth.php @@ -68,5 +68,4 @@ class Oauth { static public function call($api,$param='',$method='GET'){ return self::$handler->call($api,$param,$method); } - -} \ No newline at end of file +} diff --git a/Library/Think/Oauth/Driver.php b/Library/Think/Oauth/Driver.php index 764e37fc..fd9948f7 100644 --- a/Library/Think/Oauth/Driver.php +++ b/Library/Think/Oauth/Driver.php @@ -230,4 +230,4 @@ abstract class Driver { * 获取当前授权用户的用户信息 */ abstract public function getOauthInfo(); -} \ No newline at end of file +} diff --git a/Library/Think/Oauth/Driver/Baidu.php b/Library/Think/Oauth/Driver/Baidu.php index 3aaecc62..e4951636 100644 --- a/Library/Think/Oauth/Driver/Baidu.php +++ b/Library/Think/Oauth/Driver/Baidu.php @@ -90,4 +90,4 @@ class Baidu extends Driver{ } } -} \ No newline at end of file +} diff --git a/Library/Think/Oauth/Driver/Diandian.php b/Library/Think/Oauth/Driver/Diandian.php index 8e3da8e4..f949f76d 100644 --- a/Library/Think/Oauth/Driver/Diandian.php +++ b/Library/Think/Oauth/Driver/Diandian.php @@ -90,4 +90,4 @@ class Diandian extends Driver{ } } -} \ No newline at end of file +} diff --git a/Library/Think/Oauth/Driver/Douban.php b/Library/Think/Oauth/Driver/Douban.php index 060490fd..a41e8f95 100644 --- a/Library/Think/Oauth/Driver/Douban.php +++ b/Library/Think/Oauth/Driver/Douban.php @@ -88,4 +88,4 @@ class Douban extends Driver{ } } -} \ No newline at end of file +} diff --git a/Library/Think/Oauth/Driver/Github.php b/Library/Think/Oauth/Driver/Github.php index 6bf762a5..0c142acb 100644 --- a/Library/Think/Oauth/Driver/Github.php +++ b/Library/Think/Oauth/Driver/Github.php @@ -90,4 +90,4 @@ class Github extends Driver{ } } -} \ No newline at end of file +} diff --git a/Library/Think/Oauth/Driver/Google.php b/Library/Think/Oauth/Driver/Google.php index b70eda2a..a0cbe5d3 100644 --- a/Library/Think/Oauth/Driver/Google.php +++ b/Library/Think/Oauth/Driver/Google.php @@ -96,4 +96,4 @@ class Google extends Driver{ } } -} \ No newline at end of file +} diff --git a/Library/Think/Oauth/Driver/Kaixin.php b/Library/Think/Oauth/Driver/Kaixin.php index 332e012f..c51a1aa8 100644 --- a/Library/Think/Oauth/Driver/Kaixin.php +++ b/Library/Think/Oauth/Driver/Kaixin.php @@ -91,4 +91,4 @@ class Kaixin extends Driver{ } } -} \ No newline at end of file +} diff --git a/Library/Think/Oauth/Driver/Msn.php b/Library/Think/Oauth/Driver/Msn.php index 46102629..84db515f 100644 --- a/Library/Think/Oauth/Driver/Msn.php +++ b/Library/Think/Oauth/Driver/Msn.php @@ -97,4 +97,4 @@ class Msn extends Driver{ } } -} \ No newline at end of file +} diff --git a/Library/Think/Oauth/Driver/Qq.php b/Library/Think/Oauth/Driver/Qq.php index a34fb23b..cd682f35 100644 --- a/Library/Think/Oauth/Driver/Qq.php +++ b/Library/Think/Oauth/Driver/Qq.php @@ -99,4 +99,4 @@ class Qq extends Driver{ E("获取腾讯QQ用户信息失败:{$data['msg']}"); } } -} \ No newline at end of file +} diff --git a/Library/Think/Oauth/Driver/Renren.php b/Library/Think/Oauth/Driver/Renren.php index 7e59ae67..5d0776c3 100644 --- a/Library/Think/Oauth/Driver/Renren.php +++ b/Library/Think/Oauth/Driver/Renren.php @@ -113,4 +113,4 @@ class Renren extends Driver{ E("获取人人网用户信息失败:{$data['error_msg']}"); } } -} \ No newline at end of file +} diff --git a/Library/Think/Oauth/Driver/Sina.php b/Library/Think/Oauth/Driver/Sina.php index 86245a6d..2e0404e7 100644 --- a/Library/Think/Oauth/Driver/Sina.php +++ b/Library/Think/Oauth/Driver/Sina.php @@ -90,4 +90,4 @@ class Sina extends Driver{ } } -} \ No newline at end of file +} diff --git a/Library/Think/Oauth/Driver/Sohu.php b/Library/Think/Oauth/Driver/Sohu.php index fd8a569c..f1ffe9eb 100644 --- a/Library/Think/Oauth/Driver/Sohu.php +++ b/Library/Think/Oauth/Driver/Sohu.php @@ -90,4 +90,4 @@ class Sohu extends Driver{ } } -} \ No newline at end of file +} diff --git a/Library/Think/Oauth/Driver/T163.php b/Library/Think/Oauth/Driver/T163.php index 86849f0f..a7aee279 100644 --- a/Library/Think/Oauth/Driver/T163.php +++ b/Library/Think/Oauth/Driver/T163.php @@ -92,4 +92,4 @@ class T163 extends Driver{ } } -} \ No newline at end of file +} diff --git a/Library/Think/Oauth/Driver/Taobao.php b/Library/Think/Oauth/Driver/Taobao.php index 2d0f0d95..c9aa8266 100644 --- a/Library/Think/Oauth/Driver/Taobao.php +++ b/Library/Think/Oauth/Driver/Taobao.php @@ -94,4 +94,4 @@ class Taobao extends Driver{ } } -} \ No newline at end of file +} diff --git a/Library/Think/Oauth/Driver/Tencent.php b/Library/Think/Oauth/Driver/Tencent.php index a59d2372..258d37d5 100644 --- a/Library/Think/Oauth/Driver/Tencent.php +++ b/Library/Think/Oauth/Driver/Tencent.php @@ -95,4 +95,4 @@ class Tencent extends Driver{ } } -} \ No newline at end of file +} diff --git a/Library/Think/Oauth/Driver/X360.php b/Library/Think/Oauth/Driver/X360.php index a2d169a0..38f2d30a 100644 --- a/Library/Think/Oauth/Driver/X360.php +++ b/Library/Think/Oauth/Driver/X360.php @@ -90,4 +90,4 @@ class X360 extends Driver{ } } -} \ No newline at end of file +} diff --git a/Library/Think/Parser.php b/Library/Think/Parser.php index 2701b39b..d7d8d07e 100644 --- a/Library/Think/Parser.php +++ b/Library/Think/Parser.php @@ -29,4 +29,4 @@ class Parser { static public function __callStatic($method, $params){ return self::parse($params[0],$method); } -} \ No newline at end of file +} diff --git a/Library/Think/Parser/Driver/Ubb.php b/Library/Think/Parser/Driver/Ubb.php index 6ff1c1f7..525549ce 100644 --- a/Library/Think/Parser/Driver/Ubb.php +++ b/Library/Think/Parser/Driver/Ubb.php @@ -287,5 +287,4 @@ class Ubb{ return [$addr, $text]; } - } diff --git a/Library/Think/Route.php b/Library/Think/Route.php index 1c5b4b82..aea792ee 100644 --- a/Library/Think/Route.php +++ b/Library/Think/Route.php @@ -423,4 +423,4 @@ class Route { $_GET = array_merge($var,$_GET); } } -} \ No newline at end of file +} diff --git a/Library/Think/Seesion/Driver.php b/Library/Think/Seesion/Driver.php index 51392199..06e0a38e 100644 --- a/Library/Think/Seesion/Driver.php +++ b/Library/Think/Seesion/Driver.php @@ -19,4 +19,4 @@ class Driver extends SessionHandler { $this->config = array_merge($this->config,$config); } -} \ No newline at end of file +} diff --git a/Library/Think/Session.php b/Library/Think/Session.php index ec84d82d..b0bacf3d 100644 --- a/Library/Think/Session.php +++ b/Library/Think/Session.php @@ -157,4 +157,4 @@ class Session { static public function __callStatic($name,$args) { self::operate($name); } -} \ No newline at end of file +} diff --git a/Library/Think/Tag.php b/Library/Think/Tag.php index 1d87f9a1..b412d209 100644 --- a/Library/Think/Tag.php +++ b/Library/Think/Tag.php @@ -81,5 +81,4 @@ class Tag { } return ; } - -} \ No newline at end of file +} diff --git a/Library/Think/Template.php b/Library/Think/Template.php index 70bdb154..3f799366 100644 --- a/Library/Think/Template.php +++ b/Library/Think/Template.php @@ -717,4 +717,4 @@ class Template { return $template; } } -} \ No newline at end of file +} diff --git a/Library/Think/Template/Driver/File.php b/Library/Think/Template/Driver/File.php index 71d052ef..c2091e02 100644 --- a/Library/Think/Template/Driver/File.php +++ b/Library/Think/Template/Driver/File.php @@ -42,4 +42,4 @@ class File { } return true; } -} \ No newline at end of file +} diff --git a/Library/Think/Template/TagLib.php b/Library/Think/Template/TagLib.php index dd747230..1d63e46e 100644 --- a/Library/Think/Template/TagLib.php +++ b/Library/Think/Template/TagLib.php @@ -241,4 +241,4 @@ class TagLib { public function getTags(){ return $this->tags; } -} \ No newline at end of file +} diff --git a/Library/Think/Template/TagLib/Cx.php b/Library/Think/Template/TagLib/Cx.php index b6e13078..d97be139 100644 --- a/Library/Think/Template/TagLib/Cx.php +++ b/Library/Think/Template/TagLib/Cx.php @@ -611,5 +611,4 @@ class Cx extends TagLib { $parseStr .= ''; return $parseStr; } - - } \ No newline at end of file +} diff --git a/Library/Think/Upload.php b/Library/Think/Upload.php index dc9696a8..97e44cf5 100644 --- a/Library/Think/Upload.php +++ b/Library/Think/Upload.php @@ -512,4 +512,4 @@ class Upload { public function getErrorMsg() { return $this->error; } -} \ No newline at end of file +} diff --git a/Library/Think/Url.php b/Library/Think/Url.php index 86776a28..2bb463ae 100644 --- a/Library/Think/Url.php +++ b/Library/Think/Url.php @@ -148,4 +148,4 @@ class Url { } return false; } -} \ No newline at end of file +} diff --git a/Library/Think/Validate.php b/Library/Think/Validate.php index 3e2fc3e1..8c92c3bf 100644 --- a/Library/Think/Validate.php +++ b/Library/Think/Validate.php @@ -186,4 +186,4 @@ class Validate { $rule = $validate[strtolower($rule)]; return preg_match($rule,$value)===1; } -} \ No newline at end of file +} diff --git a/Library/Think/View.php b/Library/Think/View.php index aac8a350..1c5391b1 100644 --- a/Library/Think/View.php +++ b/Library/Think/View.php @@ -225,4 +225,4 @@ class View { // 输出模板文件 echo $content; } -} \ No newline at end of file +} diff --git a/Library/Think/View/Driver/Think.php b/Library/Think/View/Driver/Think.php index 8e4ce284..bf73462d 100644 --- a/Library/Think/View/Driver/Think.php +++ b/Library/Think/View/Driver/Think.php @@ -25,4 +25,4 @@ class Think { $this->template->fetch($template,$data); } } -} \ No newline at end of file +} diff --git a/base.php b/base.php index b046be2a..300932bd 100644 --- a/base.php +++ b/base.php @@ -226,4 +226,4 @@ function parse_name($name, $type=0) { } else { return strtolower(trim(preg_replace("/[A-Z]/", "_\\0", $name), "_")); } -} \ No newline at end of file +} diff --git a/convention.php b/convention.php index 4edb30c8..53f505c1 100644 --- a/convention.php +++ b/convention.php @@ -55,4 +55,4 @@ return [ 'db_rw_separate' => false, // 数据库读写是否分离 主从式有效 'db_master_num' => 1, // 读写分离后 主服务器数量 'db_slave_no' => '', // 指定从服务器序号 -]; \ No newline at end of file +]; diff --git a/start.php b/start.php index 386e9245..f415b7a3 100644 --- a/start.php +++ b/start.php @@ -53,4 +53,4 @@ if(is_file(APP_PATH.'build.php')) { // 自动化创建脚本 Create::build(include APP_PATH.'build.php'); } // 执行应用 -App::run(); \ No newline at end of file +App::run();