feat: 本次提交更新内容如下

数据同步

Server/thinkphp/library/think/console/command/RouteList.php

@@ -0,0 +1,130 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK IT ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006-2016 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: yunwuxin <448901948@qq.com>
+// +----------------------------------------------------------------------
+namespace think\console\command;
+
+use think\console\Command;
+use think\console\Input;
+use think\console\input\Argument;
+use think\console\input\Option;
+use think\console\Output;
+use think\console\Table;
+use think\Container;
+
+class RouteList extends Command
+{
+    protected $sortBy = [
+        'rule'   => 0,
+        'route'  => 1,
+        'method' => 2,
+        'name'   => 3,
+        'domain' => 4,
+    ];
+
+    protected function configure()
+    {
+        $this->setName('route:list')
+            ->addArgument('style', Argument::OPTIONAL, "the style of the table.", 'default')
+            ->addOption('sort', 's', Option::VALUE_OPTIONAL, 'order by rule name.', 0)
+            ->addOption('more', 'm', Option::VALUE_NONE, 'show route options.')
+            ->setDescription('show route list.');
+    }
+
+    protected function execute(Input $input, Output $output)
+    {
+        $filename = Container::get('app')->getRuntimePath() . 'route_list.php';
+
+        if (is_file($filename)) {
+            unlink($filename);
+        }
+
+        $content = $this->getRouteList();
+        file_put_contents($filename, 'Route List' . PHP_EOL . $content);
+    }
+
+    protected function getRouteList()
+    {
+        Container::get('route')->setTestMode(true);
+        // 路由检测
+        $path = Container::get('app')->getRoutePath();
+
+        $files = is_dir($path) ? scandir($path) : [];
+
+        foreach ($files as $file) {
+            if (strpos($file, '.php')) {
+                $filename = $path . DIRECTORY_SEPARATOR . $file;
+                // 导入路由配置
+                $rules = include $filename;
+
+                if (is_array($rules)) {
+                    Container::get('route')->import($rules);
+                }
+            }
+        }
+
+        if (Container::get('config')->get('route_annotation')) {
+            $suffix = Container::get('config')->get('controller_suffix') || Container::get('config')->get('class_suffix');
+
+            include Container::get('build')->buildRoute($suffix);
+        }
+
+        $table = new Table();
+
+        if ($this->input->hasOption('more')) {
+            $header = ['Rule', 'Route', 'Method', 'Name', 'Domain', 'Option', 'Pattern'];
+        } else {
+            $header = ['Rule', 'Route', 'Method', 'Name', 'Domain'];
+        }
+
+        $table->setHeader($header);
+
+        $routeList = Container::get('route')->getRuleList();
+        $rows      = [];
+
+        foreach ($routeList as $domain => $items) {
+            foreach ($items as $item) {
+                $item['route'] = $item['route'] instanceof \Closure ? '<Closure>' : $item['route'];
+
+                if ($this->input->hasOption('more')) {
+                    $item = [$item['rule'], $item['route'], $item['method'], $item['name'], $domain, json_encode($item['option']), json_encode($item['pattern'])];
+                } else {
+                    $item = [$item['rule'], $item['route'], $item['method'], $item['name'], $domain];
+                }
+
+                $rows[] = $item;
+            }
+        }
+
+        if ($this->input->getOption('sort')) {
+            $sort = $this->input->getOption('sort');
+
+            if (isset($this->sortBy[$sort])) {
+                $sort = $this->sortBy[$sort];
+            }
+
+            uasort($rows, function ($a, $b) use ($sort) {
+                $itemA = isset($a[$sort]) ? $a[$sort] : null;
+                $itemB = isset($b[$sort]) ? $b[$sort] : null;
+
+                return strcasecmp($itemA, $itemB);
+            });
+        }
+
+        $table->setRows($rows);
+
+        if ($this->input->getArgument('style')) {
+            $style = $this->input->getArgument('style');
+            $table->setStyle($style);
+        }
+
+        return $this->table($table);
+    }
+
+}

Server/thinkphp/library/think/console/command/RunServer.php

@@ -0,0 +1,53 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2015 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: Slince <taosikai@yeah.net>
+// +----------------------------------------------------------------------
+namespace think\console\command;
+
+use think\console\Command;
+use think\console\Input;
+use think\console\input\Option;
+use think\console\Output;
+use think\facade\App;
+
+class RunServer extends Command
+{
+    public function configure()
+    {
+        $this->setName('run')
+            ->addOption('host', 'H', Option::VALUE_OPTIONAL,
+                'The host to server the application on', '127.0.0.1')
+            ->addOption('port', 'p', Option::VALUE_OPTIONAL,
+                'The port to server the application on', 8000)
+            ->addOption('root', 'r', Option::VALUE_OPTIONAL,
+                'The document root of the application', App::getRootPath() . 'public')
+            ->setDescription('PHP Built-in Server for ThinkPHP');
+    }
+
+    public function execute(Input $input, Output $output)
+    {
+        $host = $input->getOption('host');
+        $port = $input->getOption('port');
+        $root = $input->getOption('root');
+
+        $command = sprintf(
+            'php -S %s:%d -t %s %s',
+            $host,
+            $port,
+            escapeshellarg($root),
+            escapeshellarg($root . DIRECTORY_SEPARATOR . 'router.php')
+        );
+
+        $output->writeln(sprintf('ThinkPHP Development server is started On <http://%s:%s/>', $host, $port));
+        $output->writeln(sprintf('You can exit with <info>`CTRL-C`</info>'));
+        $output->writeln(sprintf('Document root is: %s', $root));
+        passthru($command);
+    }
+
+}

Server/thinkphp/library/think/console/command/Version.php

@@ -0,0 +1,31 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK IT ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006-2016 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: liu21st <liu21st@gmail.com>
+// +----------------------------------------------------------------------
+namespace think\console\command;
+
+use think\console\Command;
+use think\console\Input;
+use think\console\Output;
+use think\facade\App;
+
+class Version extends Command
+{
+    protected function configure()
+    {
+        // 指令配置
+        $this->setName('version')
+            ->setDescription('show thinkphp framework version');
+    }
+
+    protected function execute(Input $input, Output $output)
+    {
+        $output->writeln('v' . App::version());
+    }
+}

Server/thinkphp/library/think/console/command/make/Command.php

@@ -0,0 +1,56 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2016 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: 刘志淳 <chun@engineer.com>
+// +----------------------------------------------------------------------
+
+namespace think\console\command\make;
+
+use think\console\command\Make;
+use think\console\input\Argument;
+use think\facade\App;
+
+class Command extends Make
+{
+    protected $type = "Command";
+
+    protected function configure()
+    {
+        parent::configure();
+        $this->setName('make:command')
+            ->addArgument('commandName', Argument::OPTIONAL, "The name of the command")
+            ->setDescription('Create a new command class');
+    }
+
+    protected function buildClass($name)
+    {
+        $commandName = $this->input->getArgument('commandName') ?: strtolower(basename($name));
+        $namespace   = trim(implode('\\', array_slice(explode('\\', $name), 0, -1)), '\\');
+
+        $class = str_replace($namespace . '\\', '', $name);
+        $stub  = file_get_contents($this->getStub());
+
+        return str_replace(['{%commandName%}', '{%className%}', '{%namespace%}', '{%app_namespace%}'], [
+            $commandName,
+            $class,
+            $namespace,
+            App::getNamespace(),
+        ], $stub);
+    }
+
+    protected function getStub()
+    {
+        return __DIR__ . DIRECTORY_SEPARATOR . 'stubs' . DIRECTORY_SEPARATOR . 'command.stub';
+    }
+
+    protected function getNamespace($appNamespace, $module)
+    {
+        return $appNamespace . '\\command';
+    }
+
+}

Server/thinkphp/library/think/console/command/make/Middleware.php

@@ -0,0 +1,36 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2016 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: 刘志淳 <chun@engineer.com>
+// +----------------------------------------------------------------------
+
+namespace think\console\command\make;
+
+use think\console\command\Make;
+
+class Middleware extends Make
+{
+    protected $type = "Middleware";
+
+    protected function configure()
+    {
+        parent::configure();
+        $this->setName('make:middleware')
+            ->setDescription('Create a new middleware class');
+    }
+
+    protected function getStub()
+    {
+        return __DIR__ . DIRECTORY_SEPARATOR . 'stubs' . DIRECTORY_SEPARATOR . 'middleware.stub';
+    }
+
+    protected function getNamespace($appNamespace, $module)
+    {
+        return parent::getNamespace($appNamespace, 'http') . '\middleware';
+    }
+}

Server/thinkphp/library/think/console/command/make/Validate.php

@@ -0,0 +1,39 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2016 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: 刘志淳 <chun@engineer.com>
+// +----------------------------------------------------------------------
+
+namespace think\console\command\make;
+
+use think\console\command\Make;
+
+class Validate extends Make
+{
+    protected $type = "Validate";
+
+    protected function configure()
+    {
+        parent::configure();
+        $this->setName('make:validate')
+            ->setDescription('Create a validate class');
+    }
+
+    protected function getStub()
+    {
+        $stubPath = __DIR__ . DIRECTORY_SEPARATOR . 'stubs' . DIRECTORY_SEPARATOR;
+
+        return $stubPath . 'validate.stub';
+    }
+
+    protected function getNamespace($appNamespace, $module)
+    {
+        return parent::getNamespace($appNamespace, $module) . '\validate';
+    }
+
+}

Server/thinkphp/library/think/console/command/make/stubs/command.stub

@@ -0,0 +1,24 @@
+<?php
+
+namespace {%namespace%};
+
+use think\console\Command;
+use think\console\Input;
+use think\console\Output;
+
+class {%className%} extends Command
+{
+    protected function configure()
+    {
+        // 指令配置
+        $this->setName('{%commandName%}');
+        // 设置参数
+        
+    }
+
+    protected function execute(Input $input, Output $output)
+    {
+    	// 指令输出
+    	$output->writeln('{%commandName%}');
+    }
+}

Server/thinkphp/library/think/console/command/make/stubs/controller.api.stub

@@ -0,0 +1,64 @@
+<?php
+
+namespace {%namespace%};
+
+use think\Controller;
+use think\Request;
+
+class {%className%} extends Controller
+{
+    /**
+     * 显示资源列表
+     *
+     * @return \think\Response
+     */
+    public function index{%actionSuffix%}()
+    {
+        //
+    }
+
+    /**
+     * 保存新建的资源
+     *
+     * @param  \think\Request  $request
+     * @return \think\Response
+     */
+    public function save{%actionSuffix%}(Request $request)
+    {
+        //
+    }
+
+    /**
+     * 显示指定的资源
+     *
+     * @param  int  $id
+     * @return \think\Response
+     */
+    public function read{%actionSuffix%}($id)
+    {
+        //
+    }
+
+    /**
+     * 保存更新的资源
+     *
+     * @param  \think\Request  $request
+     * @param  int  $id
+     * @return \think\Response
+     */
+    public function update{%actionSuffix%}(Request $request, $id)
+    {
+        //
+    }
+
+    /**
+     * 删除指定资源
+     *
+     * @param  int  $id
+     * @return \think\Response
+     */
+    public function delete{%actionSuffix%}($id)
+    {
+        //
+    }
+}

Server/thinkphp/library/think/console/command/make/stubs/middleware.stub

@@ -0,0 +1,10 @@
+<?php
+
+namespace {%namespace%};
+
+class {%className%}
+{
+    public function handle($request, \Closure $next)
+    {
+    }
+}

Server/thinkphp/library/think/console/command/make/stubs/validate.stub

@@ -0,0 +1,24 @@
+<?php
+
+namespace {%namespace%};
+
+use think\Validate;
+
+class {%className%} extends Validate
+{
+    /**
+     * 定义验证规则
+     * 格式：'字段名'	=>	['规则1','规则2'...]
+     *
+     * @var array
+     */	
+	protected $rule = [];
+    
+    /**
+     * 定义错误信息
+     * 格式：'字段名.规则名'	=>	'错误信息'
+     *
+     * @var array
+     */	
+    protected $message = [];
+}