topnuomi
/
TOP-framework
mirror of https://gitee.com/topnuomi/TOP-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

修改部分注释

This commit is contained in:
TOP糯米 2020-06-13 20:59:08 +08:00
parent 24907af8e3
commit 4a246c738a
13 changed files with 93 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
framework/config/config.php
View File

@ -1,15 +1,13 @@
<?php
// 默认配置
return [
'default_controller' => 'Index',
'default_method' => 'index',
'compel_route' => false,
'complete_parameter' => true,
'error_pages' => [
404 => '.' . DS . '404.html',
],
'register' => [
'Top' => \top\library\template\driver\Top::class,
404 => './404.html',
],
'middleware' => [
\top\middleware\Action::class,
@ -38,9 +36,9 @@ return [
'engine' => 'Top',
'tagLib' => [],
'ext' => 'html',
'dir' => '',
'cacheDir' => '',
'compileDir' => '',
'dir' => APP_PATH . BIND_MODULE . '/view/',
'cacheDir' => './runtime/cache/application/' . BIND_MODULE . '/',
'compileDir' => './runtime/compile/application/' . BIND_MODULE . '/',
'left' => '<',
'right' => '>',
'cacheTime' => 5

2
framework/extend/JWT.php
View File

@ -33,7 +33,7 @@ class JWT
public function __construct()
{
$this->config = Config::instance()->get('jwt');
$this->config = \config('jwt');
if (isset($this->config['key'])) {
$this->key = $this->config['key'];
} else {

95
framework/library/Application.php
View File

@ -6,6 +6,7 @@ use top\library\error\BaseError;
use top\library\exception\BaseException;
use top\library\http\Request;
use top\library\http\Response;
use top\library\template\driver\Top;
/**
* Class Application
@ -62,22 +63,12 @@ class Application
(is_file($funcFile)) && require $funcFile;
// session目录
$sessionConfig = Config::instance()->get('session');
$sessionConfig = config('session');
if (!empty($sessionConfig) && $sessionConfig['open'] === true) {
session_save_path(SESSION_PATH);
session_start();
}
// 配置文件中注册的类
$initRegister = Config::instance()->get('register');
if (!empty($initRegister)) {
foreach ($initRegister as $key => $value) {
Register::set($key, function () use ($value) {
return $value::instance();
});
}
}
// 初始化路由实例
$router = Router::instance(Request::instance());
@ -128,47 +119,85 @@ class Application
/**
* 获取一个类实例
* @param $className
* @param $parameters
* @return mixed
* @throws \ReflectionException
*/
public static function getInstance($className)
public static function getInstance($className, $parameters = [])
{
$classRef = self::getReflectionClass($className);
$isInstantiable = $classRef->isInstantiable();
if (!$isInstantiable) { // 不可被实例化
if ($classRef->hasMethod('instance')) {
$instance = $classRef->getMethod('instance');
$reflectionClass = self::getReflectionClass($className);
$isInstantiable = $reflectionClass->isInstantiable();
// 获取构造方法(__construct或instance)
if (!$isInstantiable) {
if ($reflectionClass->hasMethod('instance')) {
$constructor = $reflectionClass->getMethod('instance');
} else throw new \Exception('不可实例化的类：' . $className);
} else {
$instance = $classRef->getConstructor();
$constructor = $reflectionClass->getConstructor();
}
if (!is_null($instance)) {
$instanceParams = $instance->getParameters();
if (empty($instanceParams)) { // 构造函数没有参数直接返回当前类实例
// 没有构造方法或者构造方法没有参数则直接返回实例
if (!is_null($constructor)) {
$constructorParameters = $constructor->getParameters();
if (empty($constructorParameters)) {
if (!$isInstantiable) return $className::instance();
return new $className;
}
} else { // 没有构造方法直接返回实例
} else {
if (!$isInstantiable) return $className::instance();
return new $className;
}
// 构造函数存在参数则去递归实例化类
$actualParams = [];
foreach ($instanceParams as $param) {
$actualClass = $param->getClass();
if (!is_null($actualClass)) { // 参数是一个类
$actualParams[$param->name] = self::getInstance($actualClass->name);
$actualParameters = [];
foreach ($constructorParameters as $constructorParameter) {
$actualClass = $constructorParameter->getClass();
// 参数是一个类实例则递归获取实例，不是类实例则检查是否有默认值或用户传入参数
if (!is_null($actualClass)) {
$actualParameters[$constructorParameter->name] = Application::getInstance($actualClass->name);
} else {
try {
$value = isset($parameters[$constructorParameter->name])
? $parameters[$constructorParameter->name]
: $constructorParameter->getDefaultValue();
} catch (\ReflectionException $exception) {
$value = null;
}
$actualParameters[$constructorParameter->name] = $value;
}
}
if ($isInstantiable) {
return $classRef->newInstanceArgs($actualParams);
return $reflectionClass->newInstanceArgs($actualParameters);
} else {
$reflectionMethod = new \ReflectionMethod($className, 'instance');
return $reflectionMethod->invokeArgs(null, $actualParams);
$reflectionMethod = Application::getReflectionMethod($className, 'instance');
return $reflectionMethod->invokeArgs(null, $actualParameters);
}
}
/**
* 调用一个类方法
* @param $className
* @param $method
* @param array $parameters
* @return mixed
*/
public static function callMethod($className, $method, $parameters = [])
{
$instance = Application::getInstance($className);
$reflectionMethod = Application::getReflectionMethod($className, $method);
$invokeParams = [];
foreach ($reflectionMethod->getParameters() as $parameter) {
$className = $parameter->getClass();
if (!is_null($className)) {
$invokeParams[$parameter->name] = Application::getInstance($className->name);
} else {
if (isset($parameters[$parameter->name])) {
$invokeParams[$parameter->name] = $parameters[$parameter->name];
} else {
$invokeParams[$parameter->name] = null;
}
}
}
// 返回执行结果
return $reflectionMethod->invokeArgs($instance, $invokeParams);
}
}

4
framework/library/Controller.php
View File

@ -123,10 +123,10 @@ abstract class Controller
*/
protected function tips($message, $url = '', $sec = 3)
{
if (request()->isAjax()) {
if (request()->is('ajax')) {
return $this->json($message, '', 'tips', ['url' => $url, 'sec' => $sec]);
} else {
$viewConfig = Config::instance()->get('view');
$viewConfig = config('view');
$tipsTemplate = $viewConfig['dir'] . 'tips.' . $viewConfig['ext'];
(!file_exists($tipsTemplate)) && file_put_contents($tipsTemplate, '');
return view('tips', [

2
framework/library/Database.php
View File

@ -94,7 +94,7 @@ class Database
private function __construct($table, $pk, $prefix)
{
// 获取配置
$this->config = Config::instance()->get('db');
$this->config = config('db');
// 当前操作表名
$this->table = $this->getTableName($prefix, $table);
// 当前操作表主键

28
framework/library/Router.php
View File

@ -24,7 +24,7 @@ class Router
/**
* 请求类
* @var null
* @var Request
*/
private $request = null;
@ -248,28 +248,10 @@ class Router
} else throw $exception;
}
// 将执行应用打包为一个$application
$application = function () {
// 执行控制器方法
$object = Application::getInstance($this->controllerFullName);
$reflectionMethod = Application::getReflectionMethod($this->controllerFullName, $this->method);
$invokeParams = [];
foreach ($reflectionMethod->getParameters() as $parameter) {
$className = $parameter->getClass();
if (!is_null($className)) {
$invokeParams[$parameter->name] = Application::getInstance($className->name);
} else {
if (isset($this->params[$parameter->name])) {
$invokeParams[$parameter->name] = $this->params[$parameter->name];
}
}
}
return $reflectionMethod->invokeArgs($object, $invokeParams);
};
// 路由中间件处理application
return $this->middleware($application);
// 路由中间件处理
return $this->middleware(function () {
return Application::callMethod($this->controllerFullName, $this->method, $this->params);
});
}
/**

9
framework/library/View.php
View File

@ -25,9 +25,12 @@ class View
*/
private function __construct()
{
$this->config = Config::instance()->get('view');
$driver = Register::get($this->config['engine']);
$this->template = Template::instance($driver);
$this->config = config('view');
$className = '\\top\\library\\template\\driver\\' . $this->config['engine'];
if (!class_exists($className)) {
throw new Exception('不存在的模板引擎：' . $className);
}
$this->template = Template::instance($className::instance());
}
/**

2
framework/library/cache/driver/Redis.php vendored
View File

@ -34,7 +34,7 @@ class Redis implements CacheIfs
*/
private function __construct()
{
$config = Config::instance()->get('redis');
$config = \config('redis');
$this->redis = new \Redis();
try {
$this->redis->connect($config['host'], $config['port']);

11
framework/library/functions/functions.php
View File

@ -4,12 +4,13 @@
* 获取/设置配置
* @param $key
* @param string $value
* @return mixed
* @return array|bool|mixed
*/
function config($key, $value = '__NULL__VALUE__')
{
if ($value != '__NULL__VALUE__') {
return \top\library\Config::instance()->set($key, $value);
\top\library\Config::instance()->set($key, $value);
return true;
} else {
return \top\library\Config::instance()->get($key);
}
@ -17,7 +18,7 @@ function config($key, $value = '__NULL__VALUE__')
/**
* 请求类
* @return \top\traits\Instance
* @return \top\library\http\Request
*/
function request()
{
@ -26,7 +27,7 @@ function request()
/**
* 响应类
* @return \top\traits\Instance
* @return \top\library\http\Response
*/
function response()
{
@ -168,7 +169,7 @@ function redirect($url)
*/
function session($name, $value = '')
{
$config = \top\library\Config::instance()->get('session');
$config = config('session');
if (empty($config) || !$config['prefix']) {
$prefix = request()->module();
} else {

7
framework/library/template/driver/Smarty.php
View File

@ -2,7 +2,6 @@
namespace top\library\template\driver;
use top\library\Config;
use top\library\template\ifs\TemplateIfs;
use top\traits\Instance;
@ -17,11 +16,7 @@ class Smarty implements TemplateIfs
public function run()
{
$this->config = Config::instance()->get('view');
$module = request()->module();
(!$this->config['dir']) && $this->config['dir'] = APP_PATH . 'home/view/';
(!$this->config['cacheDir']) && $this->config['cacheDir'] = './runtime/cache/application/' . $module . '/';
(!$this->config['compileDir']) && $this->config['compileDir'] = './runtime/compile/application/' . $module . '/';
$this->config = \config('view');
$this->smarty = new \Smarty();
$this->smarty->setCacheDir($this->config['cacheDir']);
$this->smarty->setCompileDir($this->config['compileDir']);

7
framework/library/template/driver/Top.php
View File

@ -3,7 +3,6 @@
namespace top\library\template\driver;
use top\library\cache\driver\File;
use top\library\Config;
use top\library\template\driver\engine\Engine;
use top\library\template\ifs\TemplateIfs;
use top\traits\Instance;
@ -30,11 +29,7 @@ class Top implements TemplateIfs
public function run()
{
$this->config = Config::instance()->get('view');
$module = request()->module();
(!$this->config['dir']) && $this->config['dir'] = APP_PATH . $module . '/view/';
(!$this->config['cacheDir']) && $this->config['cacheDir'] = './runtime/cache/application/' . $module . '/';
(!$this->config['compileDir']) && $this->config['compileDir'] = './runtime/compile/application/' . $module . '/';
$this->config = \config('view');
$this->engine = Engine::instance($this->config);
return $this;
}

7
framework/library/template/driver/Twig.php
View File

@ -2,7 +2,6 @@
namespace top\library\template\driver;
use top\library\Config;
use top\library\template\ifs\TemplateIfs;
use top\traits\Instance;
use Twig\Environment;
@ -17,11 +16,7 @@ class Twig implements TemplateIfs
public function run()
{
$this->config = Config::instance()->get('view');
$module = request()->module();
(!$this->config['dir']) && $this->config['dir'] = APP_PATH . 'home/view/';
(!$this->config['cacheDir']) && $this->config['cacheDir'] = './runtime/cache/application/' . $module . '/';
(!$this->config['compileDir']) && $this->config['compileDir'] = './runtime/compile/application/' . $module . '/';
$this->config = \config('view');
return $this;
}

3
framework/middleware/View.php
View File

@ -3,7 +3,6 @@
namespace top\middleware;
use top\library\cache\driver\File;
use top\library\Config;
use top\library\http\Request;
use top\library\http\Response;
use top\middleware\ifs\MiddlewareIfs;
@ -21,7 +20,7 @@ class View implements MiddlewareIfs
// 非调试模式则直接返回静态缓存
if (!DEBUG) {
$ident = view_cache_ident();
$config = Config::instance()->get('view');
$config = \config('view');
(!$config['cacheDir']) && $config['cacheDir'] = './runtime/cache/application/' . request()->module() . '/';
$cache = File::instance($config['cacheDir']);
if ($cache->exists($ident)) return Response::instance()->send($cache->get($ident));