Merge branch '6.0' of https://github.com/top-think/think into 6.0

top-think · Jul 24, 2019 · 16a0d5b · 16a0d5b
2 parents 1ed6131 + 2f8c1eb
commit 16a0d5b
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 4 deletions.
diff --git a/composer.json b/composer.json
@@ -18,6 +18,7 @@
     "require": {
         "php": ">=7.1.0",
         "topthink/framework": "6.0.*-dev",
+        "topthink/think-orm": "2.0.*-dev",
         "topthink/think-view": "^1.0"
     },
     "require-dev": {

diff --git a/config/console.php b/config/console.php
@@ -13,8 +13,6 @@
 // | 控制台配置
 // +----------------------------------------------------------------------
 return [
-    // 执行用户（Windows下无效）
-    'user'     => null,
     // 指令定义
     'commands' => [
     ],

diff --git a/config/route.php b/config/route.php
@@ -42,8 +42,6 @@
     'controller_suffix'     => false,
     // 默认的路由变量规则
     'default_route_pattern' => '[\w\.]+',
-    // 是否自动转换URL中的控制器和操作名
-    'url_convert'           => true,
     // 是否开启请求缓存 true自动缓存 支持设置请求缓存规则
     'request_cache'         => false,
     // 请求缓存有效期