从测试站拉的

application/admin/controller/Command.php

@@ -0,0 +1,236 @@
+<?php
+
+namespace app\admin\controller;
+
+use app\common\controller\Backend;
+use think\Config;
+use think\console\Input;
+use think\Db;
+use think\Exception;
+
+/**
+ * 在线命令管理
+ *
+ * @icon fa fa-circle-o
+ */
+class Command extends Backend
+{
+
+    /**
+     * Command模型对象
+     */
+    protected $model = null;
+    protected $noNeedRight = ['get_controller_list', 'get_field_list'];
+
+    public function _initialize()
+    {
+        parent::_initialize();
+        $this->model = model('Command');
+        $this->view->assign("statusList", $this->model->getStatusList());
+    }
+
+    /**
+     * 添加
+     */
+    public function add()
+    {
+
+        $tableList = [];
+        $list = \think\Db::query("SHOW TABLES");
+        foreach ($list as $key => $row) {
+            $tableList[reset($row)] = reset($row);
+        }
+
+        $this->view->assign("tableList", $tableList);
+        return $this->view->fetch();
+    }
+
+    /**
+     * 获取字段列表
+     * @internal
+     */
+    public function get_field_list()
+    {
+        $dbname = Config::get('database.database');
+        $prefix = Config::get('database.prefix');
+        $table = $this->request->request('table');
+        //从数据库中获取表字段信息
+        $sql = "SELECT * FROM `information_schema`.`columns` "
+            . "WHERE TABLE_SCHEMA = ? AND table_name = ? "
+            . "ORDER BY ORDINAL_POSITION";
+        //加载主表的列
+        $columnList = Db::query($sql, [$dbname, $table]);
+        $fieldlist = [];
+        foreach ($columnList as $index => $item) {
+            $fieldlist[] = $item['COLUMN_NAME'];
+        }
+        $this->success("", null, ['fieldlist' => $fieldlist]);
+    }
+
+    /**
+     * 获取控制器列表
+     * @internal
+     */
+    public function get_controller_list()
+    {
+        //搜索关键词,客户端输入以空格分开,这里接收为数组
+        $word = (array)$this->request->request("q_word/a");
+        $word = implode('', $word);
+
+        $adminPath = dirname(__DIR__) . DS;
+        $controllerDir = $adminPath . 'controller' . DS;
+        $files = new \RecursiveIteratorIterator(
+            new \RecursiveDirectoryIterator($controllerDir), \RecursiveIteratorIterator::LEAVES_ONLY
+        );
+        $list = [];
+        foreach ($files as $name => $file) {
+            if (!$file->isDir()) {
+                $filePath = $file->getRealPath();
+                $name = str_replace($controllerDir, '', $filePath);
+                $name = str_replace(DS, "/", $name);
+                if (!preg_match("/(.*)\.php\$/", $name)) {
+                    continue;
+                }
+                if (!$word || stripos($name, $word) !== false) {
+                    $list[] = ['id' => $name, 'name' => $name];
+                }
+            }
+        }
+        $pageNumber = $this->request->request("pageNumber");
+        $pageSize = $this->request->request("pageSize");
+        return json(['list' => array_slice($list, ($pageNumber - 1) * $pageSize, $pageSize), 'total' => count($list)]);
+    }
+
+    /**
+     * 详情
+     */
+    public function detail($ids)
+    {
+        $row = $this->model->get($ids);
+        if (!$row) {
+            $this->error(__('No Results were found'));
+        }
+        $this->view->assign("row", $row);
+        return $this->view->fetch();
+    }
+
+    /**
+     * 执行
+     */
+    public function execute($ids)
+    {
+        $row = $this->model->get($ids);
+        if (!$row) {
+            $this->error(__('No Results were found'));
+        }
+        $result = $this->doexecute($row['type'], json_decode($row['params'], true));
+        $this->success("", null, ['result' => $result]);
+    }
+
+    /**
+     * 执行命令
+     */
+    public function command($action = '')
+    {
+        $commandtype = $this->request->request("commandtype");
+        $params = $this->request->request();
+        $allowfields = [
+            'crud' => 'table,controller,model,fields,force,local,delete,menu',
+            'menu' => 'controller,delete',
+            'min'  => 'module,resource,optimize',
+            'api'  => 'url,module,output,template,force,title,author,class,language',
+        ];
+        $argv = [];
+        $allowfields = isset($allowfields[$commandtype]) ? explode(',', $allowfields[$commandtype]) : [];
+        $allowfields = array_filter(array_intersect_key($params, array_flip($allowfields)));
+        if (isset($params['local']) && !$params['local']) {
+            $allowfields['local'] = $params['local'];
+        } else {
+            unset($allowfields['local']);
+        }
+        foreach ($allowfields as $key => $param) {
+            $argv[] = "--{$key}=" . (is_array($param) ? implode(',', $param) : $param);
+        }
+        if ($commandtype == 'crud') {
+            $extend = 'setcheckboxsuffix,enumradiosuffix,imagefield,filefield,intdatesuffix,switchsuffix,citysuffix,selectpagesuffix,selectpagessuffix,ignorefields,sortfield,editorsuffix,headingfilterfield';
+            $extendArr = explode(',', $extend);
+            foreach ($params as $index => $item) {
+                if (in_array($index, $extendArr)) {
+                    foreach (explode(',', $item) as $key => $value) {
+                        if ($value) {
+                            $argv[] = "--{$index}={$value}";
+                        }
+                    }
+                }
+            }
+            $isrelation = (int)$this->request->request('isrelation');
+            if ($isrelation && isset($params['relation'])) {
+                foreach ($params['relation'] as $index => $relation) {
+                    foreach ($relation as $key => $value) {
+                        $argv[] = "--{$key}=" . (is_array($value) ? implode(',', $value) : $value);
+                    }
+                }
+            }
+        } else {
+            if ($commandtype == 'menu') {
+                if (isset($params['allcontroller']) && $params['allcontroller']) {
+                    $argv[] = "--controller=all-controller";
+                } else {
+                    foreach (explode(',', $params['controllerfile']) as $index => $param) {
+                        if ($param) {
+                            $argv[] = "--controller=" . substr($param, 0, -4);
+                        }
+                    }
+                }
+            } else {
+                if ($commandtype == 'min') {
+
+                } else {
+                    if ($commandtype == 'api') {
+
+                    } else {
+
+                    }
+                }
+            }
+        }
+        if ($action == 'execute') {
+            $result = $this->doexecute($commandtype, $argv);
+            $this->success("", null, ['result' => $result]);
+        } else {
+            $this->success("", null, ['command' => "php think {$commandtype} " . implode(' ', $argv)]);
+        }
+
+        return;
+    }
+
+    protected function doexecute($commandtype, $argv)
+    {
+        $commandName = "\\app\\admin\\command\\" . ucfirst($commandtype);
+        $input = new Input($argv);
+        $output = new \addons\command\library\Output();
+        $command = new $commandName($commandtype);
+        $data = [
+            'type'        => $commandtype,
+            'params'      => json_encode($argv),
+            'command'     => "php think {$commandtype} " . implode(' ', $argv),
+            'executetime' => time(),
+        ];
+        $this->model->save($data);
+        try {
+            $command->run($input, $output);
+            $result = implode("\n", $output->getMessage());
+            $this->model->status = 'successed';
+        } catch (Exception $e) {
+            $result = implode("\n", $output->getMessage()) . "\n";
+            $result .= $e->getMessage();
+            $this->model->status = 'failured';
+        }
+        $result = trim($result);
+        $this->model->content = $result;
+        $this->model->save();
+        return $result;
+    }
+
+
+}

application/admin/controller/unishop/Product.php

@@ -126,7 +126,6 @@ class Product extends Backend
                 ->select();
 
             $list = collection($list)->toArray();
-
             $result = array("total" => $total, "rows" => $list);
             return json($result);
         }

application/admin/lang/zh-cn/command.php

@@ -0,0 +1,16 @@
+<?php
+
+return [
+    'Id'            => 'ID',
+    'Type'          => '类型',
+    'Params'        => '参数',
+    'Command'       => '命令',
+    'Content'       => '返回结果',
+    'Executetime'   => '执行时间',
+    'Createtime'    => '创建时间',
+    'Updatetime'    => '更新时间',
+    'Execute again' => '再次执行',
+    'Successed'     => '成功',
+    'Failured'      => '失败',
+    'Status'        => '状态'
+];

application/admin/model/Command.php

@@ -0,0 +1,59 @@
+<?php
+
+namespace app\admin\model;
+
+use think\Model;
+
+class Command extends Model
+{
+    // 表名
+    protected $name = 'command';
+
+    // 自动写入时间戳字段
+    protected $autoWriteTimestamp = 'int';
+
+    // 定义时间戳字段名
+    protected $createTime = 'createtime';
+    protected $updateTime = 'updatetime';
+
+    // 追加属性
+    protected $append = [
+        'executetime_text',
+        'type_text',
+        'status_text'
+    ];
+
+
+    public function getStatusList()
+    {
+        return ['successed' => __('Successed'), 'failured' => __('Failured')];
+    }
+
+
+    public function getExecutetimeTextAttr($value, $data)
+    {
+        $value = $value ? $value : $data['executetime'];
+        return is_numeric($value) ? date("Y-m-d H:i:s", $value) : $value;
+    }
+
+    public function getTypeTextAttr($value, $data)
+    {
+        $value = $value ? $value : $data['type'];
+        $list = ['crud' => '一键生成CRUD', 'menu' => '一键生成菜单', 'min' => '一键压缩打包', 'api' => '一键生成文档'];
+        return isset($list[$value]) ? $list[$value] : '';
+    }
+
+    public function getStatusTextAttr($value, $data)
+    {
+        $value = $value ? $value : $data['status'];
+        $list = $this->getStatusList();
+        return isset($list[$value]) ? $list[$value] : '';
+    }
+
+    protected function setExecutetimeAttr($value)
+    {
+        return $value && !is_numeric($value) ? strtotime($value) : $value;
+    }
+
+
+}

application/admin/validate/Command.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace app\admin\validate;
+
+use think\Validate;
+
+class Command extends Validate
+{
+    /**
+     * 验证规则
+     */
+    protected $rule = [
+    ];
+    /**
+     * 提示消息
+     */
+    protected $message = [
+    ];
+    /**
+     * 验证场景
+     */
+    protected $scene = [
+        'add'  => [],
+        'edit' => [],
+    ];
+
+}

application/admin/view/command/add.html

@@ -0,0 +1,400 @@
+<style>
+    .relation-item {margin-top:10px;}
+    legend {padding-bottom:5px;font-size:14px;font-weight:600;}
+    label {font-weight:normal;}
+    .form-control{padding:6px 8px;}
+    #extend-zone .col-xs-2 {margin-top:10px;padding-right:0;}
+    #extend-zone .col-xs-2:nth-child(6n+0) {padding-right:15px;}
+</style>
+<div class="panel panel-default panel-intro">
+    <div class="panel-heading">
+        <ul class="nav nav-tabs">
+            <li class="active"><a href="#crud" data-toggle="tab">{:__('一键生成CRUD')}</a></li>
+            <li><a href="#menu" data-toggle="tab">{:__('一键生成菜单')}</a></li>
+            <li><a href="#min" data-toggle="tab">{:__('一键压缩打包')}</a></li>
+            <li><a href="#api" data-toggle="tab">{:__('一键生成API文档')}</a></li>
+        </ul>
+    </div>
+    <div class="panel-body">
+        <div id="myTabContent" class="tab-content">
+            <div class="tab-pane fade active in" id="crud">
+                <div class="row">
+                    <div class="col-xs-12">
+                        <form role="form">
+                            <input type="hidden" name="commandtype" value="crud" />
+                            <div class="form-group">
+                                <div class="row">
+                                    <div class="col-xs-3">
+                                        <input checked="" name="isrelation" type="hidden" value="0">
+                                        <label class="control-label" data-toggle="tooltip" title="当前只支持生成1对1关联模型,选中后请配置关联表和字段">
+                                            <input name="isrelation" type="checkbox" value="1">
+                                            关联模型
+                                        </label>
+                                    </div>
+                                    <div class="col-xs-3">
+                                        <input checked="" name="local" type="hidden" value="1">
+                                        <label class="control-label" data-toggle="tooltip" title="默认模型生成在application/admin/model目录下,选中后将生成在application/common/model目录下">
+                                            <input name="local" type="checkbox" value="0"> 全局模型类
+                                        </label>
+                                    </div>
+                                    <div class="col-xs-3">
+                                        <input checked="" name="delete" type="hidden" value="0">
+                                        <label class="control-label" data-toggle="tooltip" title="删除CRUD生成的相关文件">
+                                            <input name="delete" type="checkbox" value="1"> 删除模式
+                                        </label>
+                                    </div>
+                                    <div class="col-xs-3">
+                                        <input checked="" name="force" type="hidden" value="0">
+                                        <label class="control-label" data-toggle="tooltip" title="选中后,如果已经存在同名文件将被覆盖。如果是删除将不再提醒">
+                                            <input name="force" type="checkbox" value="1">
+                                            强制覆盖模式
+                                        </label>
+                                    </div>
+                                    <!--
+                                    <div class="col-xs-3">
+                                        <input checked="" name="menu" type="hidden" value="0">
+                                        <label class="control-label" data-toggle="tooltip" title="选中后,将同时生成后台菜单规则">
+                                            <input name="menu" type="checkbox" value="1">
+                                            生成菜单
+                                        </label>
+                                    </div>
+                                    -->
+                                </div>
+                            </div>
+                            <div class="form-group">
+                                <legend>主表设置</legend>
+                                <div class="row">
+                                    <div class="col-xs-3">
+                                        <label>请选择主表</label>
+                                        {:build_select('table',$tableList,null,['class'=>'form-control selectpicker', 'data-live-search'=>'true']);}
+                                    </div>
+                                    <div class="col-xs-3">
+                                        <label>自定义控制器名</label>
+                                        <input type="text" class="form-control" name="controller" data-toggle="tooltip" title="默认根据表名自动生成,如果需要放在二级目录请手动填写" placeholder="支持目录层级,以/分隔">
+                                    </div>
+                                    <div class="col-xs-3">
+                                        <label>自定义模型名</label>
+                                        <input type="text" class="form-control" name="model" data-toggle="tooltip" title="默认根据表名自动生成" placeholder="不支持目录层级">
+                                    </div>
+                                    <div class="col-xs-3">
+                                        <label>请选择显示字段(默认全部)</label>
+                                        <select name="fields[]" id="fields" multiple style="height:30px;" class="form-control selectpicker"></select>
+                                    </div>
+
+                                </div>
+
+                            </div>
+
+                            <div class="form-group hide" id="relation-zone">
+                                <legend>关联表设置</legend>
+
+                                <div class="row" style="margin-top:15px;">
+                                    <div class="col-xs-12">
+                                        <a href="javascript:;" class="btn btn-primary btn-sm btn-newrelation" data-index="1">追加关联模型</a>
+                                    </div>
+                                </div>
+                            </div>
+
+                            <hr>
+                            <div class="form-group" id="extend-zone">
+                                <legend>字段识别设置 <span style="font-size:12px;font-weight: normal;">(与之匹配的字段都将生成相应组件)</span></legend>
+                                <div class="row">
+                                    <div class="col-xs-2">
+                                        <label>复选框后缀</label>
+                                        <input type="text" class="form-control" name="setcheckboxsuffix" placeholder="默认为set类型" />
+                                    </div>
+                                    <div class="col-xs-2">
+                                        <label>单选框后缀</label>
+                                        <input type="text" class="form-control" name="enumradiosuffix" placeholder="默认为enum类型" />
+                                    </div>
+                                    <div class="col-xs-2">
+                                        <label>图片类型后缀</label>
+                                        <input type="text" class="form-control" name="imagefield" placeholder="默认为image,images,avatar,avatars" />
+                                    </div>
+                                    <div class="col-xs-2">
+                                        <label>文件类型后缀</label>
+                                        <input type="text" class="form-control" name="filefield" placeholder="默认为file,files" />
+                                    </div>
+                                    <div class="col-xs-2">
+                                        <label>日期时间后缀</label>
+                                        <input type="text" class="form-control" name="intdatesuffix" placeholder="默认为time" />
+                                    </div>
+                                    <div class="col-xs-2">
+                                        <label>开关后缀</label>
+                                        <input type="text" class="form-control" name="switchsuffix" placeholder="默认为switch" />
+                                    </div>
+                                    <div class="col-xs-2">
+                                        <label>城市选择后缀</label>
+                                        <input type="text" class="form-control" name="citysuffix" placeholder="默认为city" />
+                                    </div>
+                                    <div class="col-xs-2">
+                                        <label>动态下拉后缀(单)</label>
+                                        <input type="text" class="form-control" name="selectpagesuffix" placeholder="默认为_id" />
+                                    </div>
+                                    <div class="col-xs-2">
+                                        <label>动态下拉后缀(多)</label>
+                                        <input type="text" class="form-control" name="selectpagessuffix" placeholder="默认为_ids" />
+                                    </div>
+                                    <div class="col-xs-2">
+                                        <label>忽略的字段</label>
+                                        <input type="text" class="form-control" name="ignorefields" placeholder="默认无" />
+                                    </div>
+                                    <div class="col-xs-2">
+                                        <label>排序字段</label>
+                                        <input type="text" class="form-control" name="sortfield" placeholder="默认为weigh" />
+                                    </div>
+                                    <div class="col-xs-2">
+                                        <label>富文本编辑器</label>
+                                        <input type="text" class="form-control" name="editorsuffix" placeholder="默认为content" />
+                                    </div>
+                                    <div class="col-xs-2">
+                                        <label>选项卡过滤字段</label>
+                                        <input type="text" class="form-control" name="headingfilterfield" placeholder="默认为status" />
+                                    </div>
+
+                                </div>
+
+                            </div>
+
+                            <div class="form-group">
+                                <legend>生成命令行</legend>
+                                <textarea class="form-control" data-toggle="tooltip" title="如果在线执行命令失败,可以将命令复制到命令行进行执行" rel="command" rows="1" placeholder="请点击生成命令行"></textarea>
+                            </div>
+
+                            <div class="form-group">
+                                <legend>返回结果</legend>
+                                <textarea class="form-control" rel="result" rows="5" placeholder="请点击立即执行"></textarea>
+                            </div>
+
+                            <div class="form-group">
+                                    <button type="button" class="btn btn-info btn-embossed btn-command">{:__('生成命令行')}</button>
+                                    <button type="button" class="btn btn-success btn-embossed btn-execute">{:__('立即执行')}</button>
+                            </div>
+
+                        </form>
+                    </div>
+                </div>
+            </div>
+            <div class="tab-pane fade" id="menu">
+                <div class="row">
+                    <div class="col-xs-12">
+                        <form role="form">
+                            <input type="hidden" name="commandtype" value="menu" />
+                            <div class="form-group">
+                                <div class="row">
+                                    <div class="col-xs-3">
+                                        <input checked="" name="allcontroller" type="hidden" value="0">
+                                        <label class="control-label">
+                                            <input name="allcontroller" data-toggle="collapse" data-target="#controller" type="checkbox" value="1"> 一键生成全部控制器
+                                        </label>
+                                    </div>
+                                    <div class="col-xs-3">
+                                        <input checked="" name="delete" type="hidden" value="0">
+                                        <label class="control-label">
+                                            <input name="delete" type="checkbox" value="1"> 删除模式
+                                        </label>
+                                    </div>
+                                    <div class="col-xs-3">
+                                        <input checked="" name="force" type="hidden" value="0">
+                                        <label class="control-label">
+                                            <input name="force" type="checkbox" value="1"> 强制覆盖模式
+                                        </label>
+                                    </div>
+                                </div>
+                            </div>
+
+                            <div class="form-group in" id="controller">
+                                <legend>控制器设置</legend>
+
+                                <div class="row" style="margin-top:15px;">
+                                    <div class="col-xs-12">
+                                        <input type="text" name="controllerfile" class="form-control selectpage" style="width:720px;" data-source="command/get_controller_list" data-multiple="true" name="controller" placeholder="请选择控制器" />
+                                    </div>
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <legend>生成命令行</legend>
+                                <textarea class="form-control" rel="command" rows="1" placeholder="请点击生成命令行"></textarea>
+                            </div>
+
+                            <div class="form-group">
+                                <legend>返回结果</legend>
+                                <textarea class="form-control" rel="result" rows="5" placeholder="请点击立即执行"></textarea>
+                            </div>
+
+                            <div class="form-group">
+                                <button type="button" class="btn btn-info btn-embossed btn-command">{:__('生成命令行')}</button>
+                                <button type="button" class="btn btn-success btn-embossed btn-execute">{:__('立即执行')}</button>
+                            </div>
+
+                        </form>
+                    </div>
+                </div>
+            </div>
+            <div class="tab-pane fade" id="min">
+                <div class="row">
+                    <div class="col-xs-12">
+                        <form role="form">
+                            <input type="hidden" name="commandtype" value="min" />
+                            <div class="form-group">
+                                <legend>基础设置</legend>
+                                <div class="row">
+                                    <div class="col-xs-3">
+                                        <label>请选择压缩模块</label>
+                                        <select name="module" class="form-control selectpicker">
+                                            <option value="all" selected>全部</option>
+                                            <option value="backend">后台Backend</option>
+                                            <option value="frontend">前台Frontend</option>
+                                        </select>
+                                    </div>
+                                    <div class="col-xs-3">
+                                        <label>请选择压缩资源</label>
+                                        <select name="resource" class="form-control selectpicker">
+                                            <option value="all" selected>全部</option>
+                                            <option value="js">JS</option>
+                                            <option value="css">CSS</option>
+                                        </select>
+                                    </div>
+                                    <div class="col-xs-3">
+                                        <label>请选择压缩模式</label>
+                                        <select name="optimize" class="form-control selectpicker">
+                                            <option value="">无</option>
+                                            <option value="uglify">uglify</option>
+                                            <option value="closure">closure</option>
+                                        </select>
+                                    </div>
+                                </div>
+                            </div>
+
+                            <div class="form-group in">
+                                <legend>控制器设置</legend>
+
+                                <div class="row" style="margin-top:15px;">
+                                    <div class="col-xs-12">
+
+                                    </div>
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <legend>生成命令行</legend>
+                                <textarea class="form-control" rel="command" rows="1" placeholder="请点击生成命令行"></textarea>
+                            </div>
+
+                            <div class="form-group">
+                                <legend>返回结果</legend>
+                                <textarea class="form-control" rel="result" rows="5" placeholder="请点击立即执行"></textarea>
+                            </div>
+
+                            <div class="form-group">
+                                <button type="button" class="btn btn-info btn-embossed btn-command">{:__('生成命令行')}</button>
+                                <button type="button" class="btn btn-success btn-embossed btn-execute">{:__('立即执行')}</button>
+                            </div>
+
+                        </form>
+                    </div>
+                </div>
+            </div>
+            <div class="tab-pane fade" id="api">
+                <div class="row">
+                    <div class="col-xs-12">
+                        <form role="form">
+                            <input type="hidden" name="commandtype" value="api" />
+                            <div class="form-group">
+                                <div class="row">
+                                    <div class="col-xs-3">
+                                        <input checked="" name="force" type="hidden" value="0">
+                                        <label class="control-label">
+                                            <input name="force" type="checkbox" value="1">
+                                            覆盖模式
+                                        </label>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="form-group">
+                                <legend>文档设置</legend>
+                                <div class="row">
+                                    <div class="col-xs-3">
+                                        <label>请输入接口URL</label>
+                                        <input type="text" name="url" class="form-control" placeholder="API URL,可留空" />
+                                    </div>
+                                    <div class="col-xs-3">
+                                        <label>接口生成文件</label>
+                                        <input type="text" name="output" class="form-control" placeholder="留空则使用api.html" />
+                                    </div>
+                                    <div class="col-xs-3">
+                                        <label>模板文件</label>
+                                        <input type="text" name="template" class="form-control" placeholder="如果不清楚请留空" />
+                                    </div>
+                                </div>
+                                <div class="row" style="margin-top:10px;">
+                                    <div class="col-xs-3">
+                                        <label>文档标题</label>
+                                        <input type="text" name="title" class="form-control" placeholder="默认为FastAdmin" />
+                                    </div>
+                                    <div class="col-xs-3">
+                                        <label>文档作者</label>
+                                        <input type="text" name="author" class="form-control" placeholder="默认为FastAdmin" />
+                                    </div>
+                                    <div class="col-xs-3">
+                                        <label>文档语言</label>
+                                        <select name="language" class="form-control">
+                                            <option value="" selected>请选择语言</option>
+                                            <option value="zh-cn">中文</option>
+                                            <option value="en">英文</option>
+                                        </select>
+                                    </div>
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <legend>生成命令行</legend>
+                                <textarea class="form-control" rel="command" rows="1" placeholder="请点击生成命令行"></textarea>
+                            </div>
+
+                            <div class="form-group">
+                                <legend>返回结果</legend>
+                                <textarea class="form-control" rel="result" rows="5" placeholder="请点击立即执行"></textarea>
+                            </div>
+
+                            <div class="form-group">
+                                <button type="button" class="btn btn-info btn-embossed btn-command">{:__('生成命令行')}</button>
+                                <button type="button" class="btn btn-success btn-embossed btn-execute">{:__('立即执行')}</button>
+                            </div>
+
+                        </form>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+<script id="relationtpl" type="text/html">
+    <div class="row relation-item">
+        <div class="col-xs-2">
+            <label>请选择关联表</label>
+            <select name="relation[<%=index%>][relation]" class="form-control relationtable" data-live-search="true"></select>
+        </div>
+        <div class="col-xs-2">
+            <label>请选择关联类型</label>
+            <select name="relation[<%=index%>][relationmode]" class="form-control relationmode"></select>
+        </div>
+        <div class="col-xs-2">
+            <label>关联外键</label>
+            <select name="relation[<%=index%>][relationforeignkey]" class="form-control relationforeignkey"></select>
+        </div>
+        <div class="col-xs-2">
+            <label>关联主键</label>
+            <select name="relation[<%=index%>][relationprimarykey]" class="form-control relationprimarykey"></select>
+        </div>
+        <div class="col-xs-2">
+            <label>请选择显示字段</label>
+            <select name="relation[<%=index%>][relationfields][]" multiple class="form-control relationfields"></select>
+        </div>
+        <div class="col-xs-2">
+            <label>&nbsp;</label>
+            <a href="javascript:;" class="btn btn-danger btn-block btn-removerelation">移除</a>
+        </div>
+    </div>
+</script>

application/admin/view/command/detail.html

@@ -0,0 +1,42 @@
+<table class="table table-striped">
+    <thead>
+    <tr>
+        <th>{:__('Title')}</th>
+        <th>{:__('Content')}</th>
+    </tr>
+    </thead>
+    <tbody>
+    <tr>
+        <td>{:__('Type')}</td>
+        <td>{$row.type}({$row.type_text})</td>
+    </tr>
+    <tr>
+        <td>{:__('Params')}</td>
+        <td>{$row.params}</td>
+    </tr>
+    <tr>
+        <td>{:__('Command')}</td>
+        <td>{$row.command}</td>
+    </tr>
+    <tr>
+        <td>{:__('Content')}</td>
+        <td>
+            <textarea class="form-control" name="" id="" cols="60" rows="10">{$row.content}</textarea>
+        </td>
+    </tr>
+    <tr>
+        <td>{:__('Executetime')}</td>
+        <td>{$row.executetime|datetime}</td>
+    </tr>
+    <tr>
+        <td>{:__('Status')}</td>
+        <td>{$row.status_text}</td>
+    </tr>
+    </tbody>
+</table>
+<div class="hide layer-footer">
+    <label class="control-label col-xs-12 col-sm-2"></label>
+    <div class="col-xs-12 col-sm-8">
+        <button type="reset" class="btn btn-primary btn-embossed btn-close" onclick="Layer.closeAll();">{:__('Close')}</button>
+    </div>
+</div>

application/admin/view/command/index.html

@@ -0,0 +1,25 @@
+<div class="panel panel-default panel-intro">
+    {:build_heading()}
+
+    <div class="panel-body">
+        <div id="myTabContent" class="tab-content">
+            <div class="tab-pane fade active in" id="one">
+                <div class="widget-body no-padding">
+                    <div id="toolbar" class="toolbar">
+                        <a href="javascript:;" class="btn btn-primary btn-refresh" title="{:__('Refresh')}" ><i class="fa fa-refresh"></i> </a>
+                        <a href="javascript:;" class="btn btn-success btn-add {:$auth->check('command/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>
+                        <a href="javascript:;" class="btn btn-danger btn-del btn-disabled disabled {:$auth->check('command/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>
+
+                    </div>
+                    <table id="table" class="table table-striped table-bordered table-hover" 
+                           data-operate-detail="{:$auth->check('command/detail')}"
+                           data-operate-execute="{:$auth->check('command/execute')}"
+                           data-operate-del="{:$auth->check('command/del')}"
+                           width="100%">
+                    </table>
+                </div>
+            </div>
+
+        </div>
+    </div>
+</div>

application/admin/view/unishop/order/edit.html

@@ -75,21 +75,8 @@
         </div>
     </div>
 
-<!--    <div class="form-group">-->
-<!--        <label class="control-label col-xs-12 col-sm-2">{:__('Refund status')}:</label>-->
-<!--        <div class="col-xs-12 col-sm-8">-->
-
-<!--            <div class="radio">-->
-<!--                {foreach name="refundStatusList" item="vo"}-->
-<!--                <label for="row[refund_status]-{$key}"><input id="row[refund_status]-{$key}" name="row[refund_status]" type="radio" value="{$key}" {in name="key" value="$row.refund_status"}checked{/in} /> {$vo}</label>-->
-<!--                {/foreach}-->
-<!--            </div>-->
-
-<!--        </div>-->
-<!--    </div>-->
-
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('审核状态')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('Refund status')}:</label>
         <div class="col-xs-12 col-sm-8">
 
             <div class="radio">

application/api/controller/Student.php

@@ -252,7 +252,7 @@ class Student extends Api
             $this->error(__('默认绑定用户不可解绑！'));
         } elseif($is_main === 0) {
             $res = $studentModel->where(["id"=>$s_id,"user_id"=>$user_id])->delete();
-        }
+        } 
         if($res) {
             $this->success(__('解绑成功！'));
         } else {
@@ -260,19 +260,4 @@ class Student extends Api
         }
     }
 
-    /**
-     * 获取手机号
-     */
-    public function getMobile() {
-        $wxModel = new \app\admin\model\unishop\Config();
-        $wxConfigData = $wxModel->where([
-            'group' => 'basic', 'name' => 'mobile'
-        ])->find();
-        if($wxConfigData) {
-            $this->success(__('获取成功！'),$wxConfigData["value"]);
-        } else {
-            $this->error(__('获取失败！'));
-        }
-    }
-
 }

application/database.php

@@ -20,9 +20,10 @@ return [
     // 数据库名
     'database'        => Env::get('database.database', 'bookmilk'),
     // 用户名
-    'username'        => Env::get('database.username', 'kongqi'),
+    'username'        => Env::get('database.username', 'bookmilk'),
     // 密码
-    'password'        => Env::get('database.password', '123456'),
+    // 'password'        => Env::get('database.password', 'bifSksHx6mRJfGsj'),
+        'password'        => Env::get('database.password', '1234569'),
     // 端口
     'hostport'        => Env::get('database.hostport', ''),
     // 连接dsn

application/extra/addons.php

@@ -6,8 +6,7 @@ return array (
   array (
     'app_init' => 
     array (
-      0 => 'epay',
-      1 => 'unishop',
+      0 => 'unishop',
     ),
   ),
   'route' =>