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

更新配置加载方式、修改traits、修改装饰器模式实现的中间件的作用、新增Redis部分功能

This commit is contained in:
TOP糯米 2019-08-25 00:00:28 +08:00
parent 4a5bdaee26
commit 278843d6ba
41 changed files with 419 additions and 420 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
application/home/config/config.php
View File

@ -1,35 +1,9 @@
<?php
return [
'register' => [
// 'Twig' => \top\library\template\driver\Twig::class,
// 'Smarty' => \top\library\template\driver\Smarty::class,
'Top' => \top\library\template\driver\Top::class,
],
'middleware' => [],
'session' => [
'open' => true,
'prefix' => 'home',
],
'db' => [
'driver' => 'MySQLi',
'host' => '127.0.0.1',
'user' => '',
'passwd' => '',
'dbname' => '',
'prefix' => '',
'charset' => 'utf8'
'port' => 3306
],
'view' => [
'engine' => 'Top',
'tagLib' => [
\app\home\taglib\Extend::class
],
'ext' => 'html',
'dir' => APP_PATH . 'home/view/',
'cacheDir' => './runtime/cache/application/home/',
'compileDir' => './runtime/compile/application/home/',
'left' => '<',
'right' => '>',
'cacheTime' => 5
'middleware' => [
\app\home\middleware\Test::class
],
];

2
application/home/config/tags.php
View File

@ -1,2 +0,0 @@
<?php
return [];

7
application/home/controller/Index.php
View File

@ -2,11 +2,10 @@
namespace app\home\controller;
use top\blocks\Json;
use top\library\cache\Redis;
class Index extends Common
class Index
{
use Json;
public function index()
{
@ -20,7 +19,7 @@ class Index extends Common
public function testPage()
{
// return $this->fetch();
// return $this->view();
return [];
}
}

19
application/home/middleware/Test.php Normal file
View File

@ -0,0 +1,19 @@
<?php
namespace app\home\middleware;
use top\middleware\ifs\MiddlewareIfs;
class Test implements MiddlewareIfs
{
public function before()
{
return true;
}
public function after($data)
{
}
}

11
application/home/taglib/Extend.php
View File

@ -5,7 +5,8 @@ namespace app\home\taglib;
class Extend
{
public $tags = [
'say' => ['attr' => 'what', 'close' => 0]
'say' => ['attr' => 'what', 'close' => 0],
'lists' => ['attr' => 'name', 'close' => 1]
];
public function _say($tag)
@ -13,4 +14,12 @@ class Extend
return '<?php echo \'' . $tag['what'] . '\'; ?>';
}
public function _lists($tag, $content)
{
$parse = "<?php echo '{$tag['name']} start'; ?>";
$parse .= $content;
$parse .= "<?php echo '{$tag['name']} end'; ?>";
return $parse;
}
}

12
application/home/view/Index/index.html
View File

@ -2,8 +2,6 @@
<block name="body">
BODY
<assign name="b" value="1" />
{$b}
<raw>
<volist name="b" id="vo">
<if condition="$a == 1">
@ -16,4 +14,14 @@
{:date('Y-m-d H:i:s', time())}
<include file="Base/a" />
<say what="你好" />
cut
<lists name="one">
content
<lists name="two">
content
<lists name="three">
content
</lists>
</lists>
</lists>
</block>

13
application/route.php
View File

@ -1,16 +1,17 @@
<?php
// 自定义路由示例
return [
'auth' => [
'login' => [
null,
'home/auth/login'
'home/example/login'
],
'intention-detail' => [
'example-detail' => [
'[id]',
'home/intention/detail'
'home/example/detail'
],
'permission' => [
'example' => [
'[:type]',
'home/permission/index'
'home/example/index'
],
];

40
framework/config/config.php Normal file
View File

@ -0,0 +1,40 @@
<?php
// 默认配置
return [
'register' => [
'Top' => \top\library\template\driver\Top::class,
],
'middleware' => [],
'session' => [
'open' => true,
'prefix' => '',
],
'db' => [
'driver' => 'MySQLi',
'host' => '127.0.0.1',
'user' => '',
'passwd' => '',
'dbname' => '',
'prefix' => '',
'charset' => 'utf8'
],
'redis' => [
'host' => '127.0.0.1',
'port' => 6379,
'auth' => '',
],
'view' => [
'engine' => 'Top',
'tagLib' => [
\app\home\taglib\Extend::class
],
'ext' => 'html',
'dir' => '',
'cacheDir' => '',
'compileDir' => '',
'left' => '<',
'right' => '>',
'cacheTime' => 5
],
];

9
framework/create/create.php
View File

@ -55,7 +55,6 @@ class Create
{
$configPath = $this->projectPath . 'config/';
$configFile = $configPath . 'config.php';
$tagsFile = $configPath . 'tags.php';
if (!is_dir($configPath)) {
mkdir($configPath, 0777, true);
}
@ -67,12 +66,6 @@ class Create
exit('error -2');
}
}
if (!file_exists($tagsFile)) {
$content = file_get_contents($this->dir . 'tpl/config/tags.tpl');
if (!file_put_contents($configPath . 'tags.php', $content)) {
exit('error -3');
}
}
return true;
}
@ -130,7 +123,7 @@ class Create
{
$file = $this->projectPath . '../route.php';
if (!file_exists($file)) {
if (!file_put_contents($file, "<?php \r\nreturn [];")) {
if (!file_put_contents($file, file_get_contents($this->dir . 'route.tpl'))) {
exit('-8');
}
}

29
framework/create/tpl/config/config.tpl
View File

@ -1,31 +1,4 @@
<?php
return [
'register' => [
'Twig' => \top\library\template\driver\Twig::class,
// 'Smarty' => \top\library\template\driver\Smarty::class,
// 'Top' => \top\library\template\driver\Top::class,
],
'decorator' => [],
'session' => [
'open' => true,
'prefix' => '{name}',
],
'db' => [
'driver' => 'MySQLi',
'host' => '',
'user' => '',
'passwd' => '',
'dbname' => '',
'charset' => 'utf8'
],
'view' => [
'engine' => 'Twig',
'ext' => 'html',
'dir' => '../application/{name}/view/',
'cacheDir' => './runtime/cache/application/{name}/',
'compileDir' => './runtime/compile/application/{name}/',
'left' => '{',
'right' => '}',
'cacheTime' => 5
],
];

2
framework/create/tpl/config/tags.tpl
View File

@ -1,2 +0,0 @@
<?php
return [];

5
framework/create/tpl/controller/index.tpl
View File

@ -2,16 +2,15 @@
namespace app\{name}\controller;
use top\library\Controller;
use app\{name}\model\Demo;
class Index extends Controller
{
public function index()
{
$model = new Demo();
$model = model(\app\{name}\model\Demo::class);
return [
'data' => $model->get(1)
'hello' => $model->get()
];
}
}

4
framework/create/tpl/index.tpl
View File

@ -18,6 +18,10 @@ require '../framework/Framework.php';
// Framework::appNameSpace('app');
// 可使用常量APP_NS取得该值
// session保存目录，缺省值：./runtime/session/
// Framework::sessionPath('./runtime/session/');
// 可使用常量SESSION_PATH取得该值
// 框架目录，缺省值：Framework.php的绝对路径
// Framework::frameworkPath('../framework');
// 可使用常量FRAMEWORK_PATH取得该值

4
framework/create/tpl/model/demo.tpl
View File

@ -10,8 +10,8 @@ class Demo extends Model
protected $pk = '';
protected $map = [];
public function get($id)
public function get()
{
return $id;
return 'Hello';
}
}

17
framework/create/tpl/route.tpl Normal file
View File

@ -0,0 +1,17 @@
<?php
// 自定义路由示例
return [
'login' => [
null,
'home/example/login'
],
'example-detail' => [
'[id]',
'home/example/detail'
],
'example' => [
'[:type]',
'home/example/index'
],
];

14
framework/create/tpl/view/index.tpl
View File

@ -1 +1,13 @@
{{ data }}
<!doctype html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport"
content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
<meta http-equiv="X-UA-Compatible" content="ie=edge">
<title>Document</title>
</head>
<body>
{$hello}
</body>
</html>

32
framework/library/Config.php
View File

@ -3,6 +3,7 @@
namespace top\library;
use top\library\http\Request;
use top\traits\Instance;
/**
* 配置类
@ -11,28 +12,19 @@ use top\library\http\Request;
class Config
{
use Instance;
// 已加载的文件
private static $files;
private static $instance;
// 保存配置的变量
private $config = [];
private function __construct()
{
}
private function __clone()
{
}
public static function instance()
{
if (!self::$instance) {
self::$instance = new self();
}
return self::$instance;
// 加载默认配置文件
$configFile = FRAMEWORK_PATH . 'config/config.php';
$this->config = require $configFile;
}
/**
@ -59,14 +51,20 @@ class Config
*/
public function get($name = '')
{
// 加载文件
// 加载用户配置文件
$module = Request::instance()->module();
$file = APP_PATH . $module . '/config/config.php';
if (!isset(self::$files[$file])) {
if (file_exists($file)) {
$config = require $file;
// 与原有的配置项合并
$this->config = array_merge($this->config, $config);
// 合并配置项
foreach ($config as $key => $value) {
if (array_key_exists($key, $this->config)) {
$this->config[$key] = array_merge($this->config[$key], $config[$key]);
} else {
$this->config[$key] = $value;
}
}
self::$files[$file] = true;
}
}

4
framework/library/Controller.php
View File

@ -60,7 +60,7 @@ abstract class Controller
* @param bool $cache
* @return mixed
*/
protected function fetch($file = '', $param = [], $cache = false)
protected function view($file = '', $param = [], $cache = false)
{
return Register::get('View')->fetch($file, $param, $cache);
}
@ -89,7 +89,7 @@ abstract class Controller
$viewConfig = Register::get('Config')->get('view');
$tipsTemplate = $viewConfig['dir'] . 'tips.' . $viewConfig['ext'];
(!file_exists($tipsTemplate)) && file_put_contents($tipsTemplate, '');
return $this->fetch('tips', [
return $this->view('tips', [
'message' => $message,
'url' => $url,
'sec' => $sec

11
framework/library/Database.php
View File

@ -52,8 +52,6 @@ class Database
// 关联
private $on = [];
private $data = null;
/**
* Database constructor.
* @param $table
@ -68,10 +66,6 @@ class Database
$this->setDriver($driver, $this->config);
}
private function __clone()
{
}
/**
* 指定数据库驱动
*
@ -425,4 +419,9 @@ class Database
}
return $this->pk;
}
private function __clone()
{
}
}

53
framework/library/Model.php
View File

@ -54,7 +54,16 @@ class Model
$table = get_table_name(get_called_class());
$this->table = $table;
}
$this->db = Database::table($this->table, $this->pk);
// $this->getDb() = Database::table($this->table, $this->pk);
}
/**
* 获取Database实例
* @return mixed
*/
private function getDb()
{
return Database::table($this->table, $this->pk);
}
/**
@ -64,7 +73,7 @@ class Model
*/
public function effect($effect)
{
$this->db->effect($effect);
$this->getDb()->effect($effect);
return $this;
}
@ -75,7 +84,7 @@ class Model
*/
public function distinct($field)
{
$this->db->distinct($field);
$this->getDb()->distinct($field);
return $this;
}
@ -86,7 +95,7 @@ class Model
*/
public function field($field)
{
$this->db->field($field);
$this->getDb()->field($field);
return $this;
}
@ -97,7 +106,7 @@ class Model
public function where()
{
call_user_func_array([
$this->db,
$this->getDb(),
'where'
], func_get_args());
return $this;
@ -110,7 +119,7 @@ class Model
public function order()
{
call_user_func_array([
$this->db,
$this->getDb(),
'order'
], func_get_args());
return $this;
@ -123,7 +132,7 @@ class Model
public function limit()
{
call_user_func_array([
$this->db,
$this->getDb(),
'limit'
], func_get_args());
return $this;
@ -138,7 +147,7 @@ class Model
*/
public function join($type, $table, $name)
{
$this->db->join($type, $table, $name);
$this->getDb()->join($type, $table, $name);
return $this;
}
@ -149,7 +158,7 @@ class Model
*/
public function on($on)
{
$this->db->on($on);
$this->getDb()->on($on);
return $this;
}
@ -166,7 +175,7 @@ class Model
// 此处取消了数据验证，在$this->>data()方法中验证，减少一次数据库查询
// 入库时最后的数据处理
$data = $this->inHandle($data);
return $this->db->insert($data);
return $this->getDb()->insert($data);
}
return false;
}
@ -178,7 +187,7 @@ class Model
*/
public function delete($param = false)
{
return $this->db->delete($param);
return $this->getDb()->delete($param);
}
/**
@ -195,7 +204,7 @@ class Model
// 此处取消了数据验证，在$this->data()方法中验证，减少一次数据库查询
// 入库时最后的数据处理
$data = $this->inHandle($data);
return $this->db->update($data, $param);
return $this->getDb()->update($data, $param);
}
return false;
}
@ -208,7 +217,7 @@ class Model
*/
public function find($param = false, $notRaw = true)
{
$result = $this->db->find($param);
$result = $this->getDb()->find($param);
if ($notRaw) {
if (is_array($result)) {
$result = $this->outHandle($result);
@ -225,7 +234,7 @@ class Model
*/
public function select($param = false, $notRaw = true)
{
$result = $this->db->select($param);
$result = $this->getDb()->select($param);
if ($notRaw) {
if (is_array($result)) {
$result = $this->outHandle($result);
@ -241,7 +250,7 @@ class Model
*/
public function count($param = '')
{
return $this->db->common($param, 'count');
return $this->getDb()->common($param, 'count');
}
/**
@ -251,7 +260,7 @@ class Model
*/
public function avg($param = '')
{
return $this->db->common($param, 'avg');
return $this->getDb()->common($param, 'avg');
}
/**
@ -261,7 +270,7 @@ class Model
*/
public function max($param = '')
{
return $this->db->common($param, 'max');
return $this->getDb()->common($param, 'max');
}
/**
@ -271,7 +280,7 @@ class Model
*/
public function min($param = '')
{
return $this->db->common($param, 'min');
return $this->getDb()->common($param, 'min');
}
/**
@ -281,7 +290,7 @@ class Model
*/
public function sum($param = '')
{
return $this->db->common($param, 'sum');
return $this->getDb()->common($param, 'sum');
}
/**
@ -291,7 +300,7 @@ class Model
*/
public function query($query)
{
return $this->db->query($query);
return $this->getDb()->query($query);
}
/**
@ -301,7 +310,7 @@ class Model
*/
public function _sql()
{
return $this->db->_sql();
return $this->getDb()->_sql();
}
/**
@ -513,7 +522,7 @@ class Model
*/
public function tableDesc($table)
{
return $this->db->tableDesc($table);
return $this->getDb()->tableDesc($table);
}
/**

23
framework/library/Template.php
View File

@ -3,6 +3,7 @@
namespace top\library;
use top\library\template\ifs\TemplateIfs;
use top\traits\Instance;
/**
* 模板类
@ -11,12 +12,11 @@ use top\library\template\ifs\TemplateIfs;
class Template
{
use Instance;
// 操作的具体实现
private $template;
// 当前类的实例
private static $instance;
private $param = [];
/**
@ -27,23 +27,6 @@ class Template
$this->template = $template->run();
}
private function __clone()
{
}
/**
* 获取实例
* @param TemplateIfs $template
* @return \top\library\Template
*/
public static function instance($template)
{
if (!self::$instance) {
self::$instance = new self($template);
}
return self::$instance;
}
/**
* 是否开启页面静态缓存
* @param $status

21
framework/library/View.php
View File

@ -2,6 +2,8 @@
namespace top\library;
use top\traits\Instance;
/**
* 基础视图类
* @author topnuomi 2018年11月22日
@ -9,7 +11,7 @@ namespace top\library;
class View
{
private static $instance;
use Instance;
// 用户的配置
private $config = [];
@ -17,19 +19,6 @@ class View
// 视图类实例
private $template;
/**
* 获取实例
* @return View
* @throws \Exception
*/
public static function instance()
{
if (!self::$instance) {
self::$instance = new self();
}
return self::$instance;
}
/**
* View constructor.
* @throws \Exception
@ -41,10 +30,6 @@ class View
$this->template = Template::instance($driver);
}
private function __clone()
{
}
/**
* 传递参数
* @param $name

24
framework/library/cache/File.php vendored
View File

@ -3,35 +3,21 @@
namespace top\library\cache;
use top\library\cache\ifs\CacheIfs;
use top\traits\Instance;
class File implements CacheIfs
{
private static $instance;
public static function instance()
{
if (!self::$instance) {
self::$instance = new self();
}
return self::$instance;
}
private function __construct()
{
}
private function __clone()
{
}
use Instance;
/**
* 设置缓存
* @param string $name
* @param string $value
* @param bool $timeout
* @return bool
*/
public function set($name = '', $value = '')
public function set($name = '', $value = '', $timeout = 0)
{
// TODO Auto-generated method stub
$dirArray = explode('/', $name);
@ -58,7 +44,7 @@ class File implements CacheIfs
* 删除缓存
* @param string $name
*/
public function _unset($name = '')
public function remove($name = '')
{
}

77
framework/library/cache/Redis.php vendored Normal file
View File

@ -0,0 +1,77 @@
<?php
namespace top\library\cache;
use top\library\cache\ifs\CacheIfs;
use top\library\Config;
use top\traits\Instance;
class Redis implements CacheIfs
{
use Instance;
private $config = [];
private $redis = null;
private function __construct()
{
$config = Config::instance()->get('redis');
$this->redis = new \Redis();
$this->redis->connect($config['host'], $config['port']);
if ($config['auth']) {
$this->redis->auth($config['auth']);
}
}
/**
* 设置缓存
* @param string $name
* @param string $value
* @return bool
*/
public function set($name = '', $value = '', $timeout = 0)
{
if (is_array($value) || is_object($value)) {
$value = json_encode($value);
}
return $this->redis->set($name, $value, $timeout);
}
/**
* 获取缓存的值
* @param string $name
* @return bool|mixed|string
*/
public function get($name = '')
{
$value = $this->redis->get($name);
$jsonDecode = json_decode($value);
if (is_null($jsonDecode)) {
return $value;
} else {
return $jsonDecode;
}
}
/**
* 删除缓存
* @param string $name
* @return int
*/
public function remove($name = '')
{
return $this->redis->del($name);
}
/**
* 判断缓存是否设置
* @param $name
* @return bool
*/
public function exists($name)
{
return $this->redis->exists($name);
}
}

4
framework/library/cache/ifs/CacheIfs.php vendored
View File

@ -5,9 +5,9 @@ namespace top\library\cache\ifs;
interface CacheIfs
{
public function set($name = '', $value = '');
public function set($name = '', $value = '', $timeout = 0);
public function get($name = '');
public function _unset($name = '');
public function remove($name = '');
}

21
framework/library/database/driver/MySQLi.php
View File

@ -4,36 +4,21 @@ namespace top\library\database\driver;
use top\library\database\ifs\DatabaseIfs;
use top\library\exception\DatabaseException;
use top\traits\Instance;
/**
* Mysqli数据库驱动
* MySQLi数据库驱动
* @author topnuomi 2018年11月20日
*/
class MySQLi implements DatabaseIfs
{
private static $instance;
use Instance;
private $link;
private $sql;
public static function instance()
{
if (!self::$instance) {
self::$instance = new self();
}
return self::$instance;
}
private function __construct()
{
}
private function __clone()
{
}
/**
* 连接数据库
* @param array $config

104
framework/library/http/Request.php
View File

@ -9,6 +9,7 @@ use top\library\route\driver\Command;
use top\library\route\driver\Pathinfo;
use top\library\Router;
use top\middleware\View;
use top\traits\Instance;
/**
* 请求类
@ -17,11 +18,7 @@ use top\middleware\View;
class Request
{
/**
* 当前实例
* @var null
*/
private static $instance = null;
use Instance;
/**
* 保存$_SERVER变量
@ -71,26 +68,11 @@ class Request
*/
private $except = [];
/**
* @return null|Request
*/
public static function instance()
{
if (!self::$instance) {
self::$instance = new self();
}
return self::$instance;
}
private function __construct()
{
$this->server = (!empty($_SERVER)) ? $_SERVER : [];
}
private function __clone()
{
}
/**
* 当前请求方式
* @return mixed|string
@ -334,8 +316,13 @@ class Request
private function beforeRoute()
{
foreach ($this->middleware as $middleware) {
$middleware->before();
$returnData = $middleware->before();
if ($returnData !== true) {
return $returnData;
}
unset($returnData);
}
return true;
}
/**
@ -386,6 +373,15 @@ class Request
// 实例化路由，并执行对应方法
$routeDriver = $this->routeDriver($type);
$this->router = (new Router($routeDriver, $defaultModule))->handler();
$userMiddleware = Register::get('Config')->get('middleware');
$systemMiddleware = [Init::class, View::class];
$middleware = array_merge($systemMiddleware, $userMiddleware);
foreach ($middleware as $key => $value) {
$this->middleware(new $value());
}
$data = $this->runAction();
return $data;
}
@ -397,47 +393,43 @@ class Request
*/
private function runAction()
{
$userMiddleware = Register::get('Config')->get('middleware');
$systemMiddleware = [Init::class, View::class];
$middlewareData = $this->beforeRoute();
$middleware = array_merge($systemMiddleware, $userMiddleware);
foreach ($middleware as $key => $value) {
$this->middleware(new $value());
}
if ($middlewareData === true) {
$ctrl = $this->router->class;
$method = $this->router->method;
$params = $this->router->params;
$this->beforeRoute();
$ctrl = $this->router->class;
$method = $this->router->method;
$params = $this->router->params;
$data = null;
$object = new $ctrl();
$reflectionClass = new \ReflectionClass($ctrl);
if ($reflectionClass->hasMethod('_init')) {
$data = $object->_init();
}
if ($data === null || $data === '') {
// 前置方法
$beforeReturnData = null;
$beforeMethod = 'before_' . $method;
if ($reflectionClass->hasMethod($beforeMethod)) {
$beforeReturnData = $object->{$beforeMethod}();
$data = null;
$object = new $ctrl();
$reflectionClass = new \ReflectionClass($ctrl);
if ($reflectionClass->hasMethod('_init')) {
$data = $object->_init();
}
if ($beforeReturnData === null || $beforeReturnData === '') {
$reflectionMethod = new \ReflectionMethod($ctrl, $method);
$data = $reflectionMethod->invokeArgs($object, $params);
// 后置方法
$afterMethod = 'after_' . $method;
if ($reflectionClass->hasMethod($afterMethod)) {
$object->{$afterMethod}();
if ($data === null || $data === '') {
// 前置方法
$beforeReturnData = null;
$beforeMethod = 'before_' . $method;
if ($reflectionClass->hasMethod($beforeMethod)) {
$beforeReturnData = $object->{$beforeMethod}();
}
if ($beforeReturnData === null || $beforeReturnData === '') {
$reflectionMethod = new \ReflectionMethod($ctrl, $method);
$data = $reflectionMethod->invokeArgs($object, $params);
// 后置方法
$afterMethod = 'after_' . $method;
if ($reflectionClass->hasMethod($afterMethod)) {
$object->{$afterMethod}();
}
} else {
$data = $beforeReturnData;
}
} else {
$data = $beforeReturnData;
}
} else {
$data = $middlewareData;
}
$this->afterRoute($data);

27
framework/library/http/Response.php
View File

@ -3,6 +3,7 @@
namespace top\library\http;
use top\library\http\response\ResponseData;
use top\traits\Instance;
/**
* 响应类
@ -12,11 +13,7 @@ use top\library\http\response\ResponseData;
class Response
{
/**
* 当前类实例
* @var null
*/
private static $instance = null;
use Instance;
/**
* 响应内容
@ -30,26 +27,6 @@ class Response
*/
private $header = [];
private function __construct()
{
}
private function __clone()
{
}
/**
* 获取当前类单例
* @return null|Response
*/
public static function instance()
{
if (!self::$instance) {
self::$instance = new self();
}
return self::$instance;
}
/**
* 设置Header
* @param array $header

2
framework/library/http/response/ResponseData.php
View File

@ -2,8 +2,8 @@
namespace top\library\http\response;
use top\blocks\Json;
use top\library\Register;
use top\traits\Json;
/**
* 处理响应数据

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

@ -4,38 +4,27 @@ namespace top\library\template\driver;
use top\library\Register;
use top\library\template\ifs\TemplateIfs;
use top\traits\Instance;
class Smarty implements TemplateIfs
{
private static $instance;
use Instance;
private $config = [];
private $smarty;
private function __construct()
{
}
private function __clone()
{
}
public static function instance()
{
if (!self::$instance) {
self::$instance = new self();
}
return self::$instance;
}
public function run()
{
$this->config = Register::get('Config')->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->smarty = new \Smarty();
(isset($this->config['cacheDir'])) && $this->smarty->setCacheDir($this->config['cacheDir']);
(isset($this->config['compileDir'])) && $this->smarty->setCompileDir($this->config['compileDir']);
$this->smarty->setCacheDir($this->config['cacheDir']);
$this->smarty->setCompileDir($this->config['compileDir']);
return $this;
}
@ -51,7 +40,7 @@ class Smarty implements TemplateIfs
foreach ($params as $k => $v) {
$this->smarty->assign($k, $v);
}
$templateFile = $this->config['dir'] . $file . '.' . $this->config['ext'];
$templateFile = $this->config['dir'] . $file . '.' . ltrim($this->config['ext'], '.');
return $this->smarty->fetch($templateFile);
}
}

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

@ -5,14 +5,12 @@ namespace top\library\template\driver;
use top\library\Register;
use top\library\template\driver\tags\Engine;
use top\library\template\ifs\TemplateIfs;
use top\traits\Instance;
class Top implements TemplateIfs
{
/**
* @var null 当前实例
*/
private static $instance = null;
use Instance;
/**
* @var null 模板引擎实现
@ -29,30 +27,14 @@ class Top implements TemplateIfs
*/
private $cache = false;
/**
* 构造方法
* Top constructor.
*/
private function __construct()
{
}
/**
* 外部获取当前类实例
* @return null|Top
*/
public static function instance()
{
if (!self::$instance) {
self::$instance = new self();
}
return self::$instance;
}
public function run()
{
$this->engine = Engine::instance();
$this->config = Register::get('Config')->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->engine = Engine::instance($this->config);
return $this;
}
@ -98,7 +80,6 @@ class Top implements TemplateIfs
*/
private function cacheFile($filename, $params)
{
if (isset($_SERVER['REQUEST_URI'])) {
$fileIdent = md5($_SERVER['REQUEST_URI']);
} else {

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

@ -4,35 +4,24 @@ namespace top\library\template\driver;
use top\library\Register;
use top\library\template\ifs\TemplateIfs;
use top\traits\Instance;
use Twig\Environment;
use Twig\Loader\FilesystemLoader;
class Twig implements TemplateIfs
{
private static $instance;
use Instance;
private $config = [];
private function __construct()
{
}
private function __clone()
{
}
public static function instance()
{
if (!self::$instance) {
self::$instance = new self();
}
return self::$instance;
}
public function run()
{
$this->config = Register::get('Config')->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 . '/';
return $this;
}
@ -51,7 +40,7 @@ class Twig implements TemplateIfs
'auto_reload' => true,
'debug' => DEBUG
]);
$templateFile = '@base/' . $file . '.' . $this->config['ext'];
$templateFile = '@base/' . $file . '.' . ltrim($this->config['ext'], '.');
return $template->render($templateFile, $params);
}
}

43
framework/library/template/driver/tags/Engine.php
View File

@ -3,6 +3,7 @@
namespace top\library\template\driver\tags;
use top\library\Register;
use top\traits\Instance;
/**
* 模板标签库（支持模板继承）
@ -11,10 +12,8 @@ use top\library\Register;
*/
class Engine
{
/**
* @var null 单一实例
*/
private static $instance = null;
use Instance;
/**
* @var string 左定界符
@ -60,11 +59,11 @@ class Engine
/**
* 构造方法
* Engine constructor.
* @throws \Exception
* @param array $config
*/
private function __construct()
private function __construct($config = [])
{
$this->config = Register::get('Config')->get('view');
$this->config = $config;
if (isset($this->config['left']) && $this->config['left']) {
$this->left = $this->config['left'];
}
@ -73,18 +72,6 @@ class Engine
}
}
/**
* 获取类单一实例
* @return null|Engine
*/
public static function instance()
{
if (!self::$instance) {
self::$instance = new self();
}
return self::$instance;
}
/**
* 处理模板继承
* @param $template
@ -98,7 +85,7 @@ class Engine
$blockPattern = '/' . $this->left . 'block.*?name=[\'"](.*?)[\'"]' . $this->right;
$blockPattern .= '([\s\S]*?)' . $this->left . '\/block' . $this->right . '/is';
// 获得被继承的模板内容
$file = $this->config['dir'] . $matches[1] . '.html';
$file = $this->config['dir'] . $matches[1] . '.' . ltrim($this->config['ext'], '.');
$extendFileContent = null;
if (file_exists($file)) {
$extendFileContent = file_get_contents($file);
@ -148,7 +135,7 @@ class Engine
$pattern = '/' . $this->left . 'include.*?file=[\'"](.*?)[\'"].*?\/' . $this->right . '/is';
$template = preg_replace_callback($pattern, function ($result) {
$string = null;
$file = $this->config['dir'] . $result[1] . '.html';
$file = $this->config['dir'] . $result[1] . '.' . ltrim($this->config['ext'], '.');
if (file_exists($file)) {
$string = file_get_contents($file);
}
@ -363,8 +350,8 @@ class Engine
$this->left, $this->right,
'{', '}'
], [
'<RAW!--', '--RAW>',
'<RAW!--', '--RAW>'
'<!RAW--', '--RAW>',
'<!PARAM--', '--PARAM>'
], $matches[1]);
}, $template);
return $template;
@ -378,8 +365,8 @@ class Engine
public function returnRaw($template)
{
$template = str_replace([
'<RAW!--', '--RAW>',
'<RAW!--', '--RAW>'
'<!RAW--', '--RAW>',
'<!PARAM--', '--PARAM>'
], [
$this->left, $this->right,
'{', '}'
@ -443,6 +430,12 @@ class Engine
return $parse;
}
private function _assign($tag)
{
$parse = '<?php $' . $tag['name'] . ' = ' . (is_numeric($tag['value']) ? $tag['value'] : '\'' . $tag['value'] . '\'') . '; ?>';
return $parse;
}
/**
* 获取编译后的内容
* @param $template

18
framework/middleware/Init.php
View File

@ -21,6 +21,15 @@ class Init implements MiddlewareIfs
*/
public function before()
{
// 加载系统函数库
require FRAMEWORK_PATH . 'library/functions/functions.php';
// 加载用户函数库
$funcFile = APP_PATH . request()->module() . '/functions.php';
if (file_exists($funcFile)) {
require $funcFile;
}
$sessionConfig = Register::get('Config')->get('session');
if (!empty($sessionConfig) && $sessionConfig['open'] === true) {
session_save_path(SESSION_PATH);
@ -55,14 +64,7 @@ class Init implements MiddlewareIfs
return View::instance();
});
// 加载系统函数库
require FRAMEWORK_PATH . 'library/functions/functions.php';
// 加载用户函数库
$funcFile = APP_PATH . request()->module() . '/functions.php';
if (file_exists($funcFile)) {
require $funcFile;
}
return true;
}
/**

4
framework/middleware/View.php
View File

@ -22,10 +22,10 @@ class View implements MiddlewareIfs
$filename = $config['cacheDir'] . $fileIdent;
$cache = Register::get('FileCache');
if ($cache->check($filename, $config['cacheTime'])) {
echo Response::instance()->dispatch(file_get_contents($filename));
exit;
return Response::instance()->dispatch(file_get_contents($filename));
}
}
return true;
}
public function after($data)

27
framework/traits/Instance.php Normal file
View File

@ -0,0 +1,27 @@
<?php
namespace top\traits;
trait Instance
{
private static $instance;
public static function instance($param = null)
{
if (!self::$instance) {
self::$instance = new self($param);
}
return self::$instance;
}
private function __construct()
{
}
private function __clone()
{
// TODO: Implement __clone() method.
}
}

2
framework/blocks/Json.php → framework/traits/Json.php
View File

@ -1,6 +1,6 @@
<?php
namespace top\blocks;
namespace top\traits;
trait Json {

2
public/index.php
View File

@ -7,7 +7,7 @@ require '../framework/Framework.php';
// 可能你会使用到下面这些配置
// 调试模式，缺省值：false
// Framework::debug(true);
Framework::debug(true);
// 可使用常量DEBUG取得该值
// 项目目录，缺省值：./application/

24
public/runtime/cache/application/home/6666cd76f96956469e7be39d750cc7d9 vendored
View File

@ -1,24 +0,0 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title>Title</title>
</head>
<body>
父级模板
BODY
1
<volist name="b" id="vo">
<if condition="$a == 1">
{$a}
<else condition="$a == 2" />
{$b}
</if>
</volist>
2019-07-28 16:22:50 a.html
b.html
你好
</body>
</html>

9
public/runtime/compile/application/home/8b6903ea105d9a35bb03114244786eb8.php
View File

@ -8,7 +8,6 @@
父级模板
BODY
<?php $b = 1; echo ($b); ?>
<volist name="b" id="vo">
<if condition="$a == 1">
@ -22,6 +21,14 @@
a.html
b.html
<?php echo '你好'; ?>
cut
<?php echo 'one start'; ?>
content
<?php echo 'two start'; ?>
content
<?php echo 'three start'; ?>
content
<?php echo 'three end'; echo 'two end'; echo 'one end'; ?>
</body>
</html>

0
public/runtime/session/sess_an31i19gctv7qc8ehmhm25qihh Normal file
View File