Merge pull request #1 from top-think/master

update

Author: admpub

.gitignore

@@ -1,3 +1,4 @@
 .idea
 composer.lock
 *.log
+thinkphp

.travis.yml

@@ -0,0 +1,42 @@
+sudo: false
+
+language: php
+
+branches:
+  only:
+    - stable
+
+cache:
+  directories:
+    - $HOME/.composer/cache
+
+before_install:
+  - composer self-update
+
+install:
+  - composer install --no-dev --no-interaction --ignore-platform-reqs
+  - zip -r --exclude='*.git*' --exclude='*.zip' --exclude='*.travis.yml' ThinkPHP_Core.zip .
+  - composer require --update-no-dev --no-interaction "topthink/think-image:^1.0"
+  - composer require --update-no-dev --no-interaction "topthink/think-migration:^1.0"
+  - composer require --update-no-dev --no-interaction "topthink/think-captcha:^1.0"
+  - composer require --update-no-dev --no-interaction "topthink/think-mongo:^1.0"
+  - composer require --update-no-dev --no-interaction "topthink/think-worker:^1.0"
+  - composer require --update-no-dev --no-interaction "topthink/think-helper:^1.0"
+  - composer require --update-no-dev --no-interaction "topthink/think-queue:^1.0"
+  - composer require --update-no-dev --no-interaction "topthink/think-angular:^1.0"
+  - composer require --dev --update-no-dev --no-interaction "topthink/think-testing:^1.0"
+  - zip -r --exclude='*.git*' --exclude='*.zip' --exclude='*.travis.yml' ThinkPHP_Full.zip .
+
+script:
+  - php think unit
+
+deploy:
+  provider: releases
+  api_key:
+    secure: TSF6bnl2JYN72UQOORAJYL+CqIryP2gHVKt6grfveQ7d9rleAEoxlq6PWxbvTI4jZ5nrPpUcBUpWIJHNgVcs+bzLFtyh5THaLqm39uCgBbrW7M8rI26L8sBh/6nsdtGgdeQrO/cLu31QoTzbwuz1WfAVoCdCkOSZeXyT/CclH99qV6RYyQYqaD2wpRjrhA5O4fSsEkiPVuk0GaOogFlrQHx+C+lHnf6pa1KxEoN1A0UxxVfGX6K4y5g4WQDO5zT4bLeubkWOXK0G51XSvACDOZVIyLdjApaOFTwamPcD3S1tfvuxRWWvsCD5ljFvb2kSmx5BIBNwN80MzuBmrGIC27XLGOxyMerwKxB6DskNUO9PflKHDPI61DRq0FTy1fv70SFMSiAtUv9aJRT41NQh9iJJ0vC8dl+xcxrWIjU1GG6+l/ZcRqVx9V1VuGQsLKndGhja7SQ+X1slHl76fRq223sMOql7MFCd0vvvxVQ2V39CcFKao/LB1aPH3VhODDEyxwx6aXoTznvC/QPepgWsHOWQzKj9ftsgDbsNiyFlXL4cu8DWUty6rQy8zT2b4O8b1xjcwSUCsy+auEjBamzQkMJFNlZAIUrukL/NbUhQU37TAbwsFyz7X0E/u/VMle/nBCNAzgkMwAUjiHM6FqrKKBRWFbPrSIixjfjkCnrMEPw=
+  file:
+    - ThinkPHP_Core.zip
+    - ThinkPHP_Full.zip
+  skip_cleanup: true
+  on:
+    tags: true

application/command.php

@@ -9,4 +9,4 @@
 // | Author: yunwuxin <448901948@qq.com>
 // +----------------------------------------------------------------------
 
-return [];
+return [];

application/config.php

@@ -90,6 +90,8 @@
     'url_param_type'         => 0,
     // 是否开启路由
     'url_route_on'           => true,
+    // 路由使用完整匹配
+    'route_complete_match'   => false,
     // 路由配置文件（支持配置多个）
     'route_config_file'      => ['route'],
     // 是否强制使用路由
@@ -104,6 +106,14 @@
     'url_controller_layer'   => 'controller',
     // 表单请求类型伪装变量
     'var_method'             => '_method',
+    // 表单ajax伪装变量
+    'var_ajax'               => '_ajax',
+    // 表单pjax伪装变量
+    'var_pjax'               => '_pjax',
+    // 是否开启请求缓存 true自动缓存 支持设置请求缓存规则
+    'request_cache'          => false,
+    // 请求缓存有效期
+    'request_cache_expire'   => null,
 
     // +----------------------------------------------------------------------
     // | 模板设置

application/database.php

@@ -11,41 +11,43 @@
 
 return [
     // 数据库类型
-    'type'           => 'mysql',
+    'type'            => 'mysql',
     // 服务器地址
-    'hostname'       => '127.0.0.1',
+    'hostname'        => '127.0.0.1',
     // 数据库名
-    'database'       => '',
+    'database'        => '',
     // 用户名
-    'username'       => 'root',
+    'username'        => 'root',
     // 密码
-    'password'       => '',
+    'password'        => '',
     // 端口
-    'hostport'       => '',
+    'hostport'        => '',
     // 连接dsn
-    'dsn'            => '',
+    'dsn'             => '',
     // 数据库连接参数
-    'params'         => [],
+    'params'          => [],
     // 数据库编码默认采用utf8
-    'charset'        => 'utf8',
+    'charset'         => 'utf8',
     // 数据库表前缀
-    'prefix'         => '',
+    'prefix'          => '',
     // 数据库调试模式
-    'debug'          => true,
+    '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,
-    // 数据集返回类型 array 数组 collection Collection对象
-    'resultset_type' => 'array',
-    // 是否自动写入时间戳字段
-    'auto_timestamp' => false,
+    'fields_strict'   => true,
+    // 数据集返回类型
+    'resultset_type'  => 'array',
+    // 自动写入时间戳字段
+    'auto_timestamp'  => false,
+    // 时间字段取出后的默认时间格式
+    'datetime_format' => 'Y-m-d H:i:s',
     // 是否需要进行SQL性能分析
-    'sql_explain'    => false,
+    'sql_explain'     => false,
 ];