diff --git a/app/middleware.php b/app/middleware.php
index fd9101a4..83bed6dd 100644
--- a/app/middleware.php
+++ b/app/middleware.php
@@ -8,5 +8,5 @@ return [
// Session初始化
\think\middleware\SessionInit::class,
// 页面Trace调试
- \think\middleware\TraceDebug::class,
+ // \think\middleware\TraceDebug::class,
];
diff --git a/composer.lock b/composer.lock
index 4d4d9add..b56bed1c 100644
--- a/composer.lock
+++ b/composer.lock
@@ -436,12 +436,12 @@
"source": {
"type": "git",
"url": "https://github.com/top-think/framework.git",
- "reference": "a38ebc73724c2da464b1fcee651f970dcc7a85f4"
+ "reference": "1838d0951f36b2b44745352329f38c0c39db85a6"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/top-think/framework/zipball/a38ebc73724c2da464b1fcee651f970dcc7a85f4",
- "reference": "a38ebc73724c2da464b1fcee651f970dcc7a85f4",
+ "url": "https://api.github.com/repos/top-think/framework/zipball/1838d0951f36b2b44745352329f38c0c39db85a6",
+ "reference": "1838d0951f36b2b44745352329f38c0c39db85a6",
"shasum": "",
"mirrors": [
{
@@ -496,7 +496,7 @@
"orm",
"thinkphp"
],
- "time": "2019-08-01T10:58:36+00:00"
+ "time": "2019-08-08T14:13:15+00:00"
},
{
"name": "topthink/think-helper",
@@ -545,16 +545,16 @@
},
{
"name": "topthink/think-orm",
- "version": "v2.0.21",
+ "version": "v2.0.22",
"source": {
"type": "git",
"url": "https://github.com/top-think/think-orm.git",
- "reference": "ea0240aa04d1085576064e7164ac563838f0f79c"
+ "reference": "a81fe59d094f32650747e874388d31d6f81259b4"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/top-think/think-orm/zipball/ea0240aa04d1085576064e7164ac563838f0f79c",
- "reference": "ea0240aa04d1085576064e7164ac563838f0f79c",
+ "url": "https://api.github.com/repos/top-think/think-orm/zipball/a81fe59d094f32650747e874388d31d6f81259b4",
+ "reference": "a81fe59d094f32650747e874388d31d6f81259b4",
"shasum": "",
"mirrors": [
{
@@ -591,7 +591,7 @@
"database",
"orm"
],
- "time": "2019-08-02T03:54:20+00:00"
+ "time": "2019-08-06T03:58:01+00:00"
},
{
"name": "topthink/think-template",
@@ -690,16 +690,16 @@
"packages-dev": [
{
"name": "symfony/polyfill-mbstring",
- "version": "v1.11.0",
+ "version": "v1.12.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-mbstring.git",
- "reference": "fe5e94c604826c35a32fa832f35bd036b6799609"
+ "reference": "b42a2f66e8f1b15ccf25652c3424265923eb4f17"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/fe5e94c604826c35a32fa832f35bd036b6799609",
- "reference": "fe5e94c604826c35a32fa832f35bd036b6799609",
+ "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/b42a2f66e8f1b15ccf25652c3424265923eb4f17",
+ "reference": "b42a2f66e8f1b15ccf25652c3424265923eb4f17",
"shasum": "",
"mirrors": [
{
@@ -717,7 +717,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.11-dev"
+ "dev-master": "1.12-dev"
}
},
"autoload": {
@@ -751,20 +751,20 @@
"portable",
"shim"
],
- "time": "2019-02-06T07:57:58+00:00"
+ "time": "2019-08-06T08:03:45+00:00"
},
{
"name": "symfony/polyfill-php72",
- "version": "v1.11.0",
+ "version": "v1.12.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php72.git",
- "reference": "ab50dcf166d5f577978419edd37aa2bb8eabce0c"
+ "reference": "04ce3335667451138df4307d6a9b61565560199e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/ab50dcf166d5f577978419edd37aa2bb8eabce0c",
- "reference": "ab50dcf166d5f577978419edd37aa2bb8eabce0c",
+ "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/04ce3335667451138df4307d6a9b61565560199e",
+ "reference": "04ce3335667451138df4307d6a9b61565560199e",
"shasum": "",
"mirrors": [
{
@@ -779,7 +779,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.11-dev"
+ "dev-master": "1.12-dev"
}
},
"autoload": {
@@ -812,7 +812,7 @@
"portable",
"shim"
],
- "time": "2019-02-06T07:57:58+00:00"
+ "time": "2019-08-06T08:03:45+00:00"
},
{
"name": "symfony/var-dumper",
diff --git a/config/console.php b/config/console.php
index cf6b4ec8..27b516ec 100644
--- a/config/console.php
+++ b/config/console.php
@@ -13,8 +13,6 @@
// | 控制台配置
// +----------------------------------------------------------------------
return [
- // 执行用户（Windows下无效）
- 'user' => null,
// 指令定义
'commands' => [
],
diff --git a/config/database.php b/config/database.php
index a9a01e80..d53f9526 100644
--- a/config/database.php
+++ b/config/database.php
@@ -30,39 +30,39 @@ return [
'connections' => [
'mysql' => [
// 数据库类型
- 'type' => Env::get('database.type', 'mysql'),
+ 'type' => Env::get('database.type', 'mysql'),
// 服务器地址
- 'hostname' => Env::get('database.hostname', '127.0.0.1'),
+ 'hostname' => Env::get('database.hostname', '127.0.0.1'),
// 数据库名
- 'database' => Env::get('database.database', ''),
+ 'database' => Env::get('database.database', ''),
// 用户名
- 'username' => Env::get('database.username', 'root'),
+ 'username' => Env::get('database.username', 'root'),
// 密码
- 'password' => Env::get('database.password', ''),
+ 'password' => Env::get('database.password', ''),
// 端口
- 'hostport' => Env::get('database.hostport', '3306'),
+ 'hostport' => Env::get('database.hostport', '3306'),
// 数据库连接参数
- 'params' => [],
+ 'params' => [],
// 数据库编码默认采用utf8
- 'charset' => Env::get('database.charset', 'utf8'),
+ 'charset' => Env::get('database.charset', 'utf8'),
// 数据库表前缀
- 'prefix' => Env::get('database.prefix', ''),
+ 'prefix' => Env::get('database.prefix', ''),
// 数据库调试模式
- 'debug' => Env::get('database.debug', true),
+ 'debug' => Env::get('database.debug', true),
// 数据库部署方式:0 集中式(单一服务器),1 分布式(主从服务器)
- 'deploy' => 0,
+ 'deploy' => 0,
// 数据库读写是否分离 主从式有效
- 'rw_separate' => false,
+ 'rw_separate' => false,
// 读写分离后 主服务器数量
- 'master_num' => 1,
+ 'master_num' => 1,
// 指定从服务器序号
- 'slave_no' => '',
+ 'slave_no' => '',
// 是否严格检查字段是否存在
- 'fields_strict' => true,
- // 是否需要进行SQL性能分析
- 'sql_explain' => false,
+ 'fields_strict' => true,
// 是否需要断线重连
- 'break_reconnect' => false,
+ 'break_reconnect' => false,
+ // 字段缓存路径
+ 'schema_cache_path' => app()->getRuntimePath() . 'schema' . DIRECTORY_SEPARATOR,
],
// 更多的数据库配置信息
diff --git a/config/log.php b/config/log.php
index 1f8d3301..493234a8 100644
--- a/config/log.php
+++ b/config/log.php
@@ -31,7 +31,7 @@ return [
// 日志记录方式
'type' => 'File',
// 日志保存目录
- 'path' => app()->getRuntimePath() . 'log',
+ 'path' => '',
// 单文件日志写入
'single' => false,
// 独立日志级别
diff --git a/config/route.php b/config/route.php
index 36686a6f..0b0e592b 100644
--- a/config/route.php
+++ b/config/route.php
@@ -42,8 +42,6 @@ return [
'controller_suffix' => false,
// 默认的路由变量规则
'default_route_pattern' => '[\w\.]+',
- // 是否自动转换URL中的控制器和操作名
- 'url_convert' => true,
// 是否开启请求缓存 true自动缓存 支持设置请求缓存规则
'request_cache' => false,
// 请求缓存有效期
diff --git a/config/template.php b/config/template.php
index 51a42117..56c70710 100644
--- a/config/template.php
+++ b/config/template.php
@@ -16,6 +16,7 @@ return [
'view_suffix' => 'html',
// 模板文件名分隔符
'view_depr' => DIRECTORY_SEPARATOR,
+ 'tpl_cache' => false, // 是否开启模板编译缓存,设为false则每次都会重新编译
// 模板引擎普通标签开始标记
'tpl_begin' => '{',
// 模板引擎普通标签结束标记
diff --git a/config/trace.php b/config/trace.php
index 0e52f492..e268f3a6 100644
--- a/config/trace.php
+++ b/config/trace.php
@@ -14,7 +14,7 @@
// +----------------------------------------------------------------------
return [
// 内置Html 支持扩展
- 'type' => 'Console',
+ 'type' => 'Html',
// 读取的日志通道名
'channel' => '',
];
diff --git a/view/admin/index/login.html b/view/admin/index/login.html
index 7e906ab6..c3770a71 100644
--- a/view/admin/index/login.html
+++ b/view/admin/index/login.html
@@ -2,6 +2,8 @@
+
+
SentCMS后台管理系统-后台登录