mirror-fastadminnet/framework
1
0
Fork 0
mirror of https://gitee.com/fastadminnet/framework.git synced 2026-07-07 15:12:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/top-think/framework

Browse Source
This commit is contained in:
尘缘
2016-05-06 16:03:42 +08:00
parent 4e65e7f470 e71a864915
commit 336b0908a6
7 changed files with 35 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
convention.php
View File

@@ -33,6 +33,8 @@ return [
'default_filter' => '', 'default_filter' => '',
// 自动Response输出 // 自动Response输出
'response_auto_output' => true, 'response_auto_output' => true,
// 是否启用控制器类后缀
'use_controller_suffix' => false,
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
// | 模块设置 // | 模块设置

4
library/think/App.php
View File

@@ -227,7 +227,7 @@ class App
// 安全检测 // 安全检测
throw new Exception('illegal controller name:' . CONTROLLER_NAME, 10000); throw new Exception('illegal controller name:' . CONTROLLER_NAME, 10000);
} }
$instance = Loader::controller(CONTROLLER_NAME, '', Config::get('empty_controller')); $instance = Loader::controller(CONTROLLER_NAME, '', Config::get('use_controller_suffix'), Config::get('empty_controller'));
// 获取当前操作名 // 获取当前操作名
$action = ACTION_NAME . Config::get('action_suffix'); $action = ACTION_NAME . Config::get('action_suffix');
@@ -237,7 +237,7 @@ class App
APP_HOOK && Hook::listen('action_begin', $call); APP_HOOK && Hook::listen('action_begin', $call);
if (!preg_match('/^[A-Za-z](\w)*$/', $action)) { if (!preg_match('/^[A-Za-z](\w)*$/', $action)) {
// 非法操作 // 非法操作
throw new Exception('illegal action name :' . ACTION_NAME, 10001); throw new \ReflectionException('illegal action name :' . ACTION_NAME);
} }
// 执行操作方法 // 执行操作方法
$data = self::invokeMethod($call); $data = self::invokeMethod($call);

26
library/think/Loader.php
View File

@@ -263,9 +263,10 @@ class Loader
* 实例化（分层）模型 * 实例化（分层）模型
* @param string $name Model名称 * @param string $name Model名称
* @param string $layer 业务层名称 * @param string $layer 业务层名称
* @param bool $appendSuffix 是否添加类名后缀
* @return Object * @return Object
*/ */
public static function model($name = '', $layer = MODEL_LAYER) public static function model($name = '', $layer = MODEL_LAYER, $appendSuffix = false)
{ {
static $_model = []; static $_model = [];
if (isset($_model[$name . $layer])) { if (isset($_model[$name . $layer])) {
@@ -276,7 +277,7 @@ class Loader
} else { } else {
$module = APP_MULTI_MODULE ? MODULE_NAME : ''; $module = APP_MULTI_MODULE ? MODULE_NAME : '';
} }
$class = self::parseClass($module, $layer, $name); $class = self::parseClass($module, $layer, $name, $appendSuffix);
if (class_exists($class)) { if (class_exists($class)) {
$model = new $class(); $model = new $class();
} else { } else {
@@ -295,10 +296,11 @@ class Loader
* 实例化（分层）控制器 格式：[模块名/]控制器名 * 实例化（分层）控制器 格式：[模块名/]控制器名
* @param string $name 资源地址 * @param string $name 资源地址
* @param string $layer 控制层名称 * @param string $layer 控制层名称
* @param bool $appendSuffix 是否添加类名后缀
* @param string $empty 空控制器名称 * @param string $empty 空控制器名称
* @return Object|false * @return Object|false
*/ */
public static function controller($name, $layer = '', $empty = '') public static function controller($name, $layer = '', $appendSuffix = false, $empty = '')
{ {
static $_instance = []; static $_instance = [];
$layer = $layer ?: CONTROLLER_LAYER; $layer = $layer ?: CONTROLLER_LAYER;
@@ -310,12 +312,12 @@ class Loader
} else { } else {
$module = APP_MULTI_MODULE ? MODULE_NAME : ''; $module = APP_MULTI_MODULE ? MODULE_NAME : '';
} }
$class = self::parseClass($module, $layer, $name); $class = self::parseClass($module, $layer, $name, $appendSuffix);
if (class_exists($class)) { if (class_exists($class)) {
$action = new $class; $action = new $class;
$_instance[$name . $layer] = $action; $_instance[$name . $layer] = $action;
return $action; return $action;
} elseif ($empty && class_exists($emptyClass = self::parseClass($module, $layer, $empty))) { } elseif ($empty && class_exists($emptyClass = self::parseClass($module, $layer, $empty, $appendSuffix))) {
return new $emptyClass; return new $emptyClass;
} else { } else {
throw new Exception('class [ ' . $class . ' ] not exists', 10001); throw new Exception('class [ ' . $class . ' ] not exists', 10001);
@@ -326,9 +328,10 @@ class Loader
* 实例化验证类 格式：[模块名/]验证器名 * 实例化验证类 格式：[模块名/]验证器名
* @param string $name 资源地址 * @param string $name 资源地址
* @param string $layer 验证层名称 * @param string $layer 验证层名称
* @param bool $appendSuffix 是否添加类名后缀
* @return Object|false * @return Object|false
*/ */
public static function validate($name = '', $layer = '') public static function validate($name = '', $layer = '', $appendSuffix = false)
{ {
if (empty($name)) { if (empty($name)) {
return new Validate; return new Validate;
@@ -343,7 +346,7 @@ class Loader
} else { } else {
$module = APP_MULTI_MODULE ? MODULE_NAME : ''; $module = APP_MULTI_MODULE ? MODULE_NAME : '';
} }
$class = self::parseClass($module, $layer, $name); $class = self::parseClass($module, $layer, $name, $appendSuffix);
if (class_exists($class)) { if (class_exists($class)) {
$validate = new $class; $validate = new $class;
} else { } else {
@@ -373,14 +376,15 @@ class Loader
* @param string $url 调用地址 * @param string $url 调用地址
* @param string|array $vars 调用参数 支持字符串和数组 * @param string|array $vars 调用参数 支持字符串和数组
* @param string $layer 要调用的控制层名称 * @param string $layer 要调用的控制层名称
* @param bool $appendSuffix 是否添加类名后缀
* @return mixed * @return mixed
*/ */
public static function action($url, $vars = [], $layer = CONTROLLER_LAYER) public static function action($url, $vars = [], $layer = CONTROLLER_LAYER, $appendSuffix = false)
{ {
$info = pathinfo($url); $info = pathinfo($url);
$action = $info['basename']; $action = $info['basename'];
$module = '.' != $info['dirname'] ? $info['dirname'] : CONTROLLER_NAME; $module = '.' != $info['dirname'] ? $info['dirname'] : CONTROLLER_NAME;
$class = self::controller($module, $layer); $class = self::controller($module, $layer, $appendSuffix);
if ($class) { if ($class) {
if (is_scalar($vars)) { if (is_scalar($vars)) {
if (strpos($vars, '=')) { if (strpos($vars, '=')) {
@@ -443,11 +447,11 @@ class Loader
* @param string $name 类名 * @param string $name 类名
* @return string * @return string
*/ */
public static function parseClass($module, $layer, $name) public static function parseClass($module, $layer, $name, $appendSuffix = false)
{ {
$name = str_replace(['/', '.'], '\\', $name); $name = str_replace(['/', '.'], '\\', $name);
$array = explode('\\', $name); $array = explode('\\', $name);
$class = self::parseName(array_pop($array), 1) . (CLASS_APPEND_SUFFIX ? ucfirst($layer) : ''); $class = self::parseName(array_pop($array), 1) . (CLASS_APPEND_SUFFIX || $appendSuffix ? ucfirst($layer) : '');
$path = $array ? implode('\\', $array) . '\\' : ''; $path = $array ? implode('\\', $array) . '\\' : '';
return APP_NAMESPACE . '\\' . (APP_MULTI_MODULE ? $module . '\\' : '') . $layer . '\\' . $path . $class; return APP_NAMESPACE . '\\' . (APP_MULTI_MODULE ? $module . '\\' : '') . $layer . '\\' . $path . $class;
} }

25
library/think/config/driver/ConfigInterface.php
View File

@@ -1,25 +0,0 @@
<?php
// +----------------------------------------------------------------------
// | ThinkPHP [ WE CAN DO IT JUST THINK ]
// +----------------------------------------------------------------------
// | Copyright (c) 2006~2016 http://thinkphp.cn All rights reserved.
// +----------------------------------------------------------------------
// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
// +----------------------------------------------------------------------
// | Author: liu21st <liu21st@gmail.com>
// +----------------------------------------------------------------------
namespace think\config\driver;
interface ConfigInterface
{
/**
* 解析配置
* @access public
* @param mixed $config 配置
* @return mixed
*/
public function parse($config);
}

2
library/think/config/driver/Ini.php
View File

@@ -11,7 +11,7 @@
namespace think\config\driver; namespace think\config\driver;
class Ini implements ConfigInterface class Ini
{ {
public function parse($config) public function parse($config)
{ {

2
library/think/config/driver/Xml.php
View File

@@ -11,7 +11,7 @@
namespace think\config\driver; namespace think\config\driver;
class Xml implements ConfigInterface class Xml
{ {
public function parse($config) public function parse($config)
{ {

24
library/think/db/Query.php
View File

@@ -139,17 +139,21 @@ class Query
$result = $pdo->fetchAll(PDO::FETCH_COLUMN); $result = $pdo->fetchAll(PDO::FETCH_COLUMN);
} else { } else {
$resultSet = $pdo->fetchAll(PDO::FETCH_ASSOC); $resultSet = $pdo->fetchAll(PDO::FETCH_ASSOC);
$fields = array_keys($resultSet[0]); if ($resultSet) {
$count = count($fields); $fields = array_keys($resultSet[0]);
$key1 = array_shift($fields); $count = count($fields);
$key2 = $fields ? array_shift($fields) : ''; $key1 = array_shift($fields);
$key = $key ?: $key1; $key2 = $fields ? array_shift($fields) : '';
foreach ($resultSet as $val) { $key = $key ?: $key1;
if ($count > 2) { foreach ($resultSet as $val) {
$result[$val[$key]] = $val; if ($count > 2) {
} elseif (2 == $count) { $result[$val[$key]] = $val;
$result[$val[$key]] = $val[$key2]; } elseif (2 == $count) {
$result[$val[$key]] = $val[$key2];
}
} }
} else {
$result = [];
} }
} }
if (isset($cache)) { if (isset($cache)) {