From e0283ec9383441195e55c4c35ee9f0c1c469a1a0 Mon Sep 17 00:00:00 2001 From: augushong Date: Wed, 9 Oct 2019 19:02:45 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E6=96=B0=E6=A1=86=E6=9E=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- LICENSE.txt | 41 +++++++++++++------ README.md | 95 ++++++++++++++++--------------------------- TP_LICENSE.txt | 32 --------------- composer.lock | 18 ++++---- config/app.php | 23 +++-------- config/cache.php | 9 ---- config/console.php | 10 ----- config/cookie.php | 10 ----- config/database.php | 19 +++------ config/filesystem.php | 10 ++++- config/lang.php | 10 ----- config/log.php | 9 ---- config/middleware.php | 8 ++++ config/route.php | 12 +----- config/session.php | 18 +++----- config/trace.php | 12 +----- config/view.php | 23 +++++------ public/index.php | 2 +- public/router.php | 2 +- think | 11 +---- 20 files changed, 121 insertions(+), 253 deletions(-) delete mode 100644 TP_LICENSE.txt create mode 100644 config/middleware.php diff --git a/LICENSE.txt b/LICENSE.txt index 08029ee..574a39c 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,15 +1,32 @@ -Copyright (c) [2019] [临沂奥宏网络科技有限公司] -[ulthon_admin] is licensed under the Mulan PSL v1. -You can use this software according to the terms and conditions of the Mulan PSL v1. -You may obtain a copy of Mulan PSL v1 at: - http://license.coscl.org.cn/MulanPSL -THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR -PURPOSE. -See the Mulan PSL v1 for more details. -Mulan Permissive Software License，Version 1 +ThinkPHP遵循Apache2开源协议发布，并提供免费使用。 +版权所有Copyright © 2006-2016 by ThinkPHP (http://thinkphp.cn) +All rights reserved。 +ThinkPHP® 商标和著作权所有者为上海顶想信息科技有限公司。 -Mulan Permissive Software License，Version 1 (Mulan PSL v1) +Apache Licence是著名的非盈利开源组织Apache采用的协议。 +该协议和BSD类似，鼓励代码共享和尊重原作者的著作权， +允许代码修改，再作为开源或商业软件发布。需要满足 +的条件： +1． 需要给代码的用户一份Apache Licence ； +2． 如果你修改了代码，需要在被修改的文件中说明； +3． 在延伸的代码中（修改和有源代码衍生的代码中）需要 +带有原来代码中的协议，商标，专利声明和其他原来作者规 +定需要包含的说明； +4． 如果再发布的产品中包含一个Notice文件，则在Notice文 +件中需要带有本协议内容。你可以在Notice中增加自己的 +许可，但不可以表现为对Apache Licence构成更改。 +具体的协议参考：http://www.apache.org/licenses/LICENSE-2.0 -August 2019 http://license.coscl.org.cn/MulanPSL \ No newline at end of file +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS +FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN +ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +POSSIBILITY OF SUCH DAMAGE. diff --git a/README.md b/README.md index 031f594..34e0e3e 100644 --- a/README.md +++ b/README.md @@ -1,77 +1,52 @@ +ThinkPHP 6.0 +=============== -# ulthon_admin +> 运行环境要求PHP7.1+。 -## 奥宏后台管理小模板 +## 主要新特性 +* 采用`PHP7`强类型（严格模式） +* 支持更多的`PSR`规范 +* 原生多应用支持 +* 更强大和易用的查询 +* 全新的事件系统 +* 模型事件和数据库事件统一纳入事件系统 +* 模板引擎分离出核心 +* 内部功能中间件化 +* SESSION/Cookie机制改进 +* 对Swoole以及协程支持改进 +* 对IDE更加友好 +* 统一和精简大量用法 -### 使用ThinkPHP6快速开始一个有管理后台的项目 +## 安装 -#### 介绍 +~~~ +composer create-project topthink/think tp 6.0.*-dev +~~~ -这不是一个完整的后台解决方案或产品,没有过多的功能和开发规则. +如果需要更新框架使用 +~~~ +composer update topthink/framework +~~~ -基于thinkphp6的系统后台管理模板,仅实现通用的基本的功能,基于ThinkPHP6,Layui,Jquery,支持各类数据库. +## 文档 +[完全开发手册](https://www.kancloud.cn/manual/thinkphp6_0/content) -本项目的定位是实现几个基本的功能,节约您的一些开发时间,没有过多的开发限制. +## 参与开发 -比如每个后台都要有账号的登录/编辑,这种小的功能,几乎每次做项目时都要做,花时间又没有什么成就感,您可以使用本模板,节省这部分时间. +请参阅 [ThinkPHP 核心框架包](https://github.com/top-think/framework)。 -类似的功能还有服务器信息/系统配置等. +## 版权信息 -实现功能的同时没有制定更多的开发规则,您完全可以把本项目的代码修按照您的意愿改掉. +ThinkPHP遵循Apache2开源协议发布，并提供免费使用。 -#### 最新演示 +本项目包含的第三方源码和二进制文件之版权信息另行标注。 -[在线演示](http://ulthon-admin.ulthon.com/admin) +版权所有Copyright © 2006-2019 by ThinkPHP (http://thinkphp.cn) -账号: admin 密码: 123456 +All rights reserved。 +ThinkPHP® 商标和著作权所有者为上海顶想信息科技有限公司。 -#### 功能 - -- 服务器信息(0.2h,已完成) -- 系统配置(0.5h,已完成) -- 管理员管理(开发中) -- 账户管理(0.5h,已完成) -- 用户管理(开发中) -- 权限管理(开发中) -- 文件管理(2h已完成) -- 后台日志 - - -### 开发注意 - -#### 后台页面仅仅使用了`TP`的模板包含特性 - - -#### 支持所有(`TP6`支持的)类型数据库 - -填写正确的数据库连接配置, - -执行`php think migrate:run`安装数据库 - -执行`php think seed:run`初始化数据 - -#### 使用了配置全局中间件 - - -在这个中间件里把数据库的配置信息设置到项目中. - -中间件: `\app\\middleware\ConfigInit` - -#### 文件上传 - -经过这个类上传的文件会保存到`public`下, - -`TP`原本配置会保存到`public/storage`下,本项目修改了配置,直接保存到`public`下. - -类:`\app\api\controller\Files::save()` - -## 版权协议 - -`木兰协议` - -## 开发维护 - -[临沂奥宏网络科技有限公司](http://ulthon.com) \ No newline at end of file +更多细节参阅 [LICENSE.txt](LICENSE.txt) diff --git a/TP_LICENSE.txt b/TP_LICENSE.txt deleted file mode 100644 index 574a39c..0000000 --- a/TP_LICENSE.txt +++ /dev/null @@ -1,32 +0,0 @@ - -ThinkPHP遵循Apache2开源协议发布，并提供免费使用。 -版权所有Copyright © 2006-2016 by ThinkPHP (http://thinkphp.cn) -All rights reserved。 -ThinkPHP® 商标和著作权所有者为上海顶想信息科技有限公司。 - -Apache Licence是著名的非盈利开源组织Apache采用的协议。 -该协议和BSD类似，鼓励代码共享和尊重原作者的著作权， -允许代码修改，再作为开源或商业软件发布。需要满足 -的条件： -1． 需要给代码的用户一份Apache Licence ； -2． 如果你修改了代码，需要在被修改的文件中说明； -3． 在延伸的代码中（修改和有源代码衍生的代码中）需要 -带有原来代码中的协议，商标，专利声明和其他原来作者规 -定需要包含的说明； -4． 如果再发布的产品中包含一个Notice文件，则在Notice文 -件中需要带有本协议内容。你可以在Notice中增加自己的 -许可，但不可以表现为对Apache Licence构成更改。 -具体的协议参考：http://www.apache.org/licenses/LICENSE-2.0 - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN -ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -POSSIBILITY OF SUCH DAMAGE. diff --git a/composer.lock b/composer.lock index c0493aa..d030ee5 100644 --- a/composer.lock +++ b/composer.lock @@ -436,12 +436,12 @@ "source": { "type": "git", "url": "https://github.com/top-think/framework.git", - "reference": "768f12f01daa0bd96ef4ad8771d80fb6fec137c8" + "reference": "cb8817c29981c2f735ee352a9432f22d6765839e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/top-think/framework/zipball/768f12f01daa0bd96ef4ad8771d80fb6fec137c8", - "reference": "768f12f01daa0bd96ef4ad8771d80fb6fec137c8", + "url": "https://api.github.com/repos/top-think/framework/zipball/cb8817c29981c2f735ee352a9432f22d6765839e", + "reference": "cb8817c29981c2f735ee352a9432f22d6765839e", "shasum": "", "mirrors": [ { @@ -496,7 +496,7 @@ "orm", "thinkphp" ], - "time": "2019-10-08T14:53:51+00:00" + "time": "2019-10-09T07:30:48+00:00" }, { "name": "topthink/think-captcha", @@ -656,16 +656,16 @@ }, { "name": "topthink/think-multi-app", - "version": "v1.0.5", + "version": "v1.0.6", "source": { "type": "git", "url": "https://github.com/top-think/think-multi-app.git", - "reference": "27bb12fa049e8479a453c75087ef9ad1bda6d730" + "reference": "e652d444d771589279c1a4a993d2b74cdc07b180" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/top-think/think-multi-app/zipball/27bb12fa049e8479a453c75087ef9ad1bda6d730", - "reference": "27bb12fa049e8479a453c75087ef9ad1bda6d730", + "url": "https://api.github.com/repos/top-think/think-multi-app/zipball/e652d444d771589279c1a4a993d2b74cdc07b180", + "reference": "e652d444d771589279c1a4a993d2b74cdc07b180", "shasum": "", "mirrors": [ { @@ -702,7 +702,7 @@ } ], "description": "thinkphp6 multi app support", - "time": "2019-10-08T02:20:35+00:00" + "time": "2019-10-09T07:32:11+00:00" }, { "name": "topthink/think-orm", diff --git a/config/app.php b/config/app.php index f780890..3bba167 100644 --- a/config/app.php +++ b/config/app.php @@ -1,14 +1,4 @@ -// +---------------------------------------------------------------------- - // +---------------------------------------------------------------------- // | 应用设置 // +---------------------------------------------------------------------- @@ -24,18 +14,17 @@ return [ 'with_route' => true, // 是否启用事件 'with_event' => true, - // 自动多应用模式 - 'auto_multi_app' => true, + // 默认应用 + 'default_app' => 'index', + // 默认时区 + 'default_timezone' => 'Asia/Shanghai', + // 应用映射（自动多应用模式有效） 'app_map' => [], // 域名绑定（自动多应用模式有效） 'domain_bind' => [], // 禁止URL访问的应用列表（自动多应用模式有效） 'deny_app_list' => [], - // 默认应用 - 'default_app' => 'index', - // 默认时区 - 'default_timezone' => 'Asia/Shanghai', // 异常页面的模板文件 'exception_tmpl' => app()->getThinkPath() . 'tpl/think_exception.tpl', @@ -43,5 +32,5 @@ return [ // 错误显示信息,非调试模式有效 'error_message' => '页面错误！请稍后再试～', // 显示错误信息 - 'show_error_msg' => true, + 'show_error_msg' => false, ]; diff --git a/config/cache.php b/config/cache.php index dc54123..dd492df 100644 --- a/config/cache.php +++ b/config/cache.php @@ -1,13 +1,4 @@ -// +---------------------------------------------------------------------- use think\facade\Env; // +---------------------------------------------------------------------- diff --git a/config/console.php b/config/console.php index 27b516e..a818a98 100644 --- a/config/console.php +++ b/config/console.php @@ -1,14 +1,4 @@ -// +---------------------------------------------------------------------- - // +---------------------------------------------------------------------- // | 控制台配置 // +---------------------------------------------------------------------- diff --git a/config/cookie.php b/config/cookie.php index bbc5819..f728024 100644 --- a/config/cookie.php +++ b/config/cookie.php @@ -1,14 +1,4 @@ -// +---------------------------------------------------------------------- - // +---------------------------------------------------------------------- // | Cookie设置 // +---------------------------------------------------------------------- diff --git a/config/database.php b/config/database.php index 30c694d..5b667dc 100644 --- a/config/database.php +++ b/config/database.php @@ -1,14 +1,4 @@ -// +---------------------------------------------------------------------- - use think\facade\Env; return [ @@ -46,9 +36,8 @@ return [ // 数据库编码默认采用utf8 'charset' => Env::get('database.charset', 'utf8'), // 数据库表前缀 - 'prefix' => Env::get('database.prefix', 'ul_'), - // 数据库调试模式 - 'debug' => Env::get('database.debug', true), + 'prefix' => Env::get('database.prefix', ''), + // 数据库部署方式:0 集中式(单一服务器),1 分布式(主从服务器) 'deploy' => 0, // 数据库读写是否分离 主从式有效 @@ -61,6 +50,10 @@ return [ 'fields_strict' => true, // 是否需要断线重连 'break_reconnect' => false, + // 监听SQL + 'trigger_sql' => true, + // 开启字段缓存 + 'fields_cache' => false, // 字段缓存路径 'schema_cache_path' => app()->getRuntimePath() . 'schema' . DIRECTORY_SEPARATOR, ], diff --git a/config/filesystem.php b/config/filesystem.php index 87fceb0..c851aed 100644 --- a/config/filesystem.php +++ b/config/filesystem.php @@ -3,16 +3,22 @@ use think\facade\Env; return [ + // 默认磁盘 'default' => Env::get('filesystem.driver', 'local'), + // 磁盘列表 'disks' => [ 'local' => [ 'type' => 'local', 'root' => app()->getRuntimePath() . 'storage', ], 'public' => [ + // 磁盘类型 'type' => 'local', - 'root' => app()->getRootPath() . 'public/', - 'url' => '/', + // 磁盘路径 + 'root' => app()->getRootPath() . 'public/storage', + // 磁盘路径对应的外部URL路径 + 'url' => '/storage', + // 可见性 'visibility' => 'public', ], // 更多的磁盘配置信息 diff --git a/config/lang.php b/config/lang.php index 7659eaa..33232bd 100644 --- a/config/lang.php +++ b/config/lang.php @@ -1,14 +1,4 @@ -// +---------------------------------------------------------------------- - // +---------------------------------------------------------------------- // | 多语言设置 // +---------------------------------------------------------------------- diff --git a/config/log.php b/config/log.php index 493234a..5f7afcb 100644 --- a/config/log.php +++ b/config/log.php @@ -1,13 +1,4 @@ -// +---------------------------------------------------------------------- use think\facade\Env; // +---------------------------------------------------------------------- diff --git a/config/middleware.php b/config/middleware.php new file mode 100644 index 0000000..7e1972f --- /dev/null +++ b/config/middleware.php @@ -0,0 +1,8 @@ + [], + // 优先级设置，此数组中的中间件会按照数组中的顺序优先执行 + 'priority' => [], +]; diff --git a/config/route.php b/config/route.php index 0b0e592..288c8f1 100644 --- a/config/route.php +++ b/config/route.php @@ -1,16 +1,6 @@ -// +---------------------------------------------------------------------- - -// +---------------------------------------------------------------------- -// | 应用设置 +// | 路由设置 // +---------------------------------------------------------------------- return [ diff --git a/config/session.php b/config/session.php index 7a2527a..c1ef6e1 100644 --- a/config/session.php +++ b/config/session.php @@ -1,27 +1,19 @@ -// +---------------------------------------------------------------------- - // +---------------------------------------------------------------------- // | 会话设置 // +---------------------------------------------------------------------- return [ // session name - 'name' => '', + 'name' => 'PHPSESSID', // SESSION_ID的提交变量,解决flash上传跨域 'var_session_id' => '', - // 驱动方式 支持file redis memcache memcached + // 驱动方式 支持file cache 'type' => 'file', + // 存储连接标识 当type使用cache的时候有效 + 'store' => null, // 过期时间 - 'expire' => 0, + 'expire' => 1440, // 前缀 'prefix' => '', ]; diff --git a/config/trace.php b/config/trace.php index e268f3a..fad2392 100644 --- a/config/trace.php +++ b/config/trace.php @@ -1,19 +1,9 @@ -// +---------------------------------------------------------------------- - // +---------------------------------------------------------------------- // | Trace设置 开启调试模式后有效 // +---------------------------------------------------------------------- return [ - // 内置Html 支持扩展 + // 内置Html和Console两种方式 支持扩展 'type' => 'Html', // 读取的日志通道名 'channel' => '', diff --git a/config/view.php b/config/view.php index 8dbecc3..01259a0 100644 --- a/config/view.php +++ b/config/view.php @@ -3,26 +3,23 @@ // | 模板设置 // +---------------------------------------------------------------------- - return [ // 模板引擎类型使用Think - 'type' => 'Think', + 'type' => 'Think', // 默认模板渲染规则 1 解析为小写+下划线 2 全部转换小写 3 保持操作方法 - 'auto_rule' => 1, - // 模板基础路径 - 'view_base' => root_path().'view/', - // 模板路径 - 'view_path' => '', + 'auto_rule' => 1, + // 模板目录名 + 'view_dir_name' => 'view', // 模板后缀 - 'view_suffix' => 'html', + 'view_suffix' => 'html', // 模板文件名分隔符 - 'view_depr' => DIRECTORY_SEPARATOR, + 'view_depr' => DIRECTORY_SEPARATOR, // 模板引擎普通标签开始标记 - 'tpl_begin' => '{', + 'tpl_begin' => '{', // 模板引擎普通标签结束标记 - 'tpl_end' => '}', + 'tpl_end' => '}', // 标签库标签开始标记 - 'taglib_begin' => '{', + 'taglib_begin' => '{', // 标签库标签结束标记 - 'taglib_end' => '}', + 'taglib_end' => '}', ]; diff --git a/public/index.php b/public/index.php index e67b8d6..e3c0fe9 100644 --- a/public/index.php +++ b/public/index.php @@ -2,7 +2,7 @@ // +---------------------------------------------------------------------- // | ThinkPHP [ WE CAN DO IT JUST THINK ] // +---------------------------------------------------------------------- -// | Copyright (c) 2006-2018 http://thinkphp.cn All rights reserved. +// | Copyright (c) 2006-2019 http://thinkphp.cn All rights reserved. // +---------------------------------------------------------------------- // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 ) // +---------------------------------------------------------------------- diff --git a/public/router.php b/public/router.php index 4f916b4..ac7b3c8 100644 --- a/public/router.php +++ b/public/router.php @@ -2,7 +2,7 @@ // +---------------------------------------------------------------------- // | ThinkPHP [ WE CAN DO IT JUST THINK ] // +---------------------------------------------------------------------- -// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved. +// | Copyright (c) 2006~2019 http://thinkphp.cn All rights reserved. // +---------------------------------------------------------------------- // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 ) // +---------------------------------------------------------------------- diff --git a/think b/think index b7e9aa4..2429d22 100644 --- a/think +++ b/think @@ -1,17 +1,8 @@ #!/usr/bin/env php -// +---------------------------------------------------------------------- - namespace think; +// 命令行入口文件 // 加载基础文件 require __DIR__ . '/vendor/autoload.php';