From 5e010f593a7bf0e3e8d8c6b2e11f18e23fe57bcd Mon Sep 17 00:00:00 2001 From: zhaoxiang Date: Tue, 29 Sep 2020 17:09:49 +0800 Subject: [PATCH] =?UTF-8?q?add=20=E5=88=9D=E6=AD=A5=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E8=B0=83=E6=95=B4=EF=BC=8C=E5=88=9D=E6=AD=A5=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=8A=A0=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .example.env => .env | 0 .gitignore | 1 - app/controller/Index.php | 17 -- app/controller/admin/Base.php | 105 ++++++++++++ app/controller/admin/Index.php | 50 ++++++ app/controller/admin/Miss.php | 16 ++ app/model/AdminApp.php | 7 + app/model/AdminAppGroup.php | 12 ++ app/model/AdminAuthGroup.php | 15 ++ app/model/AdminAuthGroupAccess.php | 12 ++ app/model/AdminAuthRule.php | 12 ++ app/model/AdminFields.php | 12 ++ app/model/AdminGroup.php | 13 ++ app/model/AdminList.php | 11 ++ app/model/AdminMenu.php | 7 + app/model/AdminUser.php | 16 ++ app/model/AdminUserAction.php | 12 ++ app/model/AdminUserData.php | 11 ++ app/model/Base.php | 14 ++ app/util/ApiLogTool.php | 97 +++++++++++ app/util/BuildName.php | 104 ++++++++++++ app/util/DataType.php | 22 +++ app/util/ExceptionHandle.php | 24 +++ app/util/MockConf.php | 19 +++ app/util/ReturnCode.php | 48 ++++++ app/util/RouterTool.php | 101 ++++++++++++ app/util/StrRandom.php | 184 +++++++++++++++++++++ app/util/Strs.php | 253 +++++++++++++++++++++++++++++ app/util/Tools.php | 171 +++++++++++++++++++ config/app.php | 2 +- config/console.php | 1 + route/app.php | 8 +- 32 files changed, 1354 insertions(+), 23 deletions(-) rename .example.env => .env (100%) delete mode 100644 app/controller/Index.php create mode 100644 app/controller/admin/Base.php create mode 100644 app/controller/admin/Index.php create mode 100644 app/controller/admin/Miss.php create mode 100644 app/model/AdminApp.php create mode 100644 app/model/AdminAppGroup.php create mode 100644 app/model/AdminAuthGroup.php create mode 100644 app/model/AdminAuthGroupAccess.php create mode 100644 app/model/AdminAuthRule.php create mode 100644 app/model/AdminFields.php create mode 100644 app/model/AdminGroup.php create mode 100644 app/model/AdminList.php create mode 100644 app/model/AdminMenu.php create mode 100644 app/model/AdminUser.php create mode 100644 app/model/AdminUserAction.php create mode 100644 app/model/AdminUserData.php create mode 100644 app/model/Base.php create mode 100644 app/util/ApiLogTool.php create mode 100644 app/util/BuildName.php create mode 100644 app/util/DataType.php create mode 100644 app/util/ExceptionHandle.php create mode 100644 app/util/MockConf.php create mode 100644 app/util/ReturnCode.php create mode 100644 app/util/RouterTool.php create mode 100644 app/util/StrRandom.php create mode 100644 app/util/Strs.php create mode 100644 app/util/Tools.php diff --git a/.example.env b/.env similarity index 100% rename from .example.env rename to .env diff --git a/.gitignore b/.gitignore index d465120..501a091 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,3 @@ /.vscode /vendor *.log -.env \ No newline at end of file diff --git a/app/controller/Index.php b/app/controller/Index.php deleted file mode 100644 index 81203ad..0000000 --- a/app/controller/Index.php +++ /dev/null @@ -1,17 +0,0 @@ -*{ padding: 0; margin: 0; } div{ padding: 4px 48px;} a{color:#2E5CD5;cursor: pointer;text-decoration: none} a:hover{text-decoration:underline; } body{ background: #fff; font-family: "Century Gothic","Microsoft yahei"; color: #333;font-size:18px;} h1{ font-size: 100px; font-weight: normal; margin-bottom: 12px; } p{ line-height: 1.6em; font-size: 42px }

:)

ThinkPHP V' . \think\facade\App::version() . '
14载初心不改 - 你值得信赖的PHP框架

[ V6.0 版本由 亿速云 独家赞助发布 ]
'; - } - - public function hello($name = 'ThinkPHP6') - { - return 'hello,' . $name; - } -} diff --git a/app/controller/admin/Base.php b/app/controller/admin/Base.php new file mode 100644 index 0000000..ceeb5f5 --- /dev/null +++ b/app/controller/admin/Base.php @@ -0,0 +1,105 @@ + + */ + +namespace app\controller\admin; + +use app\model\AdminUser; +use app\model\AdminUserData; +use app\util\ReturnCode; +use app\BaseController; +use think\App; +use think\facade\Env; +use think\Response; + +class Base extends BaseController { + + private $debug = []; + protected $userInfo; + + public function __construct(App $app) { + parent::__construct($app); + $this->userInfo = $this->request->API_ADMIN_USER_INFO; + } + + /** + * 成功的返回 + * @param array $data + * @param string $msg + * @param int $code + * @return Response + * @author zhaoxiang + */ + public function buildSuccess(array $data = [], string $msg = '操作成功', int $code = ReturnCode::SUCCESS): Response { + $return = [ + 'code' => $code, + 'msg' => $msg, + 'data' => $data + ]; + if (Env::get('APP_DEBUG') && $this->debug) { + $return['debug'] = $this->debug; + } + + return json($return); + } + + /** + * 更新用户信息 + * @param array $data + * @param bool $isDetail + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException + * @author zhaoxiang + */ + public function updateUserInfo(array $data, bool $isDetail = false): void { + $apiAuth = $this->request->header('apiAuth'); + if ($isDetail) { + AdminUserData::update($data, ['uid' => $this->userInfo['id']]); + $this->userInfo['userData'] = (new AdminUserData())->where('uid', $this->userInfo['id'])->find(); + } else { + AdminUser::update($data, ['id' => $this->userInfo['id']]); + $detail = $this->userInfo['userData']; + $this->userInfo = (new AdminUser())->where('id', $this->userInfo['id'])->find(); + $this->userInfo['userData'] = $detail; + } + + cache('Login:' . $apiAuth, json_encode($this->userInfo), config('apiadmin.ONLINE_TIME')); + } + + /** + * 错误的返回 + * @param int $code + * @param string $msg + * @param array $data + * @return Response + * @author zhaoxiang + */ + public function buildFailed(int $code, string $msg = '操作失败', array $data = []): Response { + $return = [ + 'code' => $code, + 'msg' => $msg, + 'data' => $data + ]; + if (Env::get('APP_DEBUG') && $this->debug) { + $return['debug'] = $this->debug; + } + + return json($return); + } + + /** + * debug参数收集 + * @param $data + * @author zhaoxiang + */ + protected function debug($data): void { + if ($data) { + $this->debug[] = $data; + } + } +} diff --git a/app/controller/admin/Index.php b/app/controller/admin/Index.php new file mode 100644 index 0000000..cb92426 --- /dev/null +++ b/app/controller/admin/Index.php @@ -0,0 +1,50 @@ +buildSuccess([ + 'fileName' => $new_name, + 'fileUrl' => $this->request->domain() . $path . $new_name + ]); + } else { + return $this->buildFailed(ReturnCode::FILE_SAVE_ERROR, '文件上传失败'); + } + } +} diff --git a/app/controller/admin/Miss.php b/app/controller/admin/Miss.php new file mode 100644 index 0000000..2d7222a --- /dev/null +++ b/app/controller/admin/Miss.php @@ -0,0 +1,16 @@ +request->isOptions()) { + return $this->buildSuccess(); + } else { + return $this->buildFailed(ReturnCode::INVALID, '接口地址异常'); + } + } +} diff --git a/app/model/AdminApp.php b/app/model/AdminApp.php new file mode 100644 index 0000000..2aba301 --- /dev/null +++ b/app/model/AdminApp.php @@ -0,0 +1,7 @@ + + */ + +namespace app\model; + +class AdminAppGroup extends Base { + +} diff --git a/app/model/AdminAuthGroup.php b/app/model/AdminAuthGroup.php new file mode 100644 index 0000000..eb00068 --- /dev/null +++ b/app/model/AdminAuthGroup.php @@ -0,0 +1,15 @@ + + */ + +namespace app\model; + +class AdminAuthGroup extends Base { + + public function rules() { + return $this->hasMany('AdminAuthRule', 'group_id', 'id'); + } +} diff --git a/app/model/AdminAuthGroupAccess.php b/app/model/AdminAuthGroupAccess.php new file mode 100644 index 0000000..c0027b1 --- /dev/null +++ b/app/model/AdminAuthGroupAccess.php @@ -0,0 +1,12 @@ + + */ + +namespace app\model; + +class AdminAuthGroupAccess extends Base { + +} diff --git a/app/model/AdminAuthRule.php b/app/model/AdminAuthRule.php new file mode 100644 index 0000000..bdf846d --- /dev/null +++ b/app/model/AdminAuthRule.php @@ -0,0 +1,12 @@ + + */ + +namespace app\model; + +class AdminAuthRule extends Base { + +} diff --git a/app/model/AdminFields.php b/app/model/AdminFields.php new file mode 100644 index 0000000..fb35e66 --- /dev/null +++ b/app/model/AdminFields.php @@ -0,0 +1,12 @@ + + */ + +namespace app\model; + +class AdminFields extends Base { + +} diff --git a/app/model/AdminGroup.php b/app/model/AdminGroup.php new file mode 100644 index 0000000..dfe9b47 --- /dev/null +++ b/app/model/AdminGroup.php @@ -0,0 +1,13 @@ + + */ + +namespace app\model; + +class AdminGroup extends Base { + + protected $autoWriteTimestamp = true; +} diff --git a/app/model/AdminList.php b/app/model/AdminList.php new file mode 100644 index 0000000..8f78daf --- /dev/null +++ b/app/model/AdminList.php @@ -0,0 +1,11 @@ + + */ + +namespace app\model; + +class AdminList extends Base { + +} diff --git a/app/model/AdminMenu.php b/app/model/AdminMenu.php new file mode 100644 index 0000000..3e4e280 --- /dev/null +++ b/app/model/AdminMenu.php @@ -0,0 +1,7 @@ + + */ + +namespace app\model; + +class AdminUser extends Base { + + protected $autoWriteTimestamp = true; + + public function userData() { + return $this->hasOne('AdminUserData', 'uid', 'id'); + } +} diff --git a/app/model/AdminUserAction.php b/app/model/AdminUserAction.php new file mode 100644 index 0000000..82daf69 --- /dev/null +++ b/app/model/AdminUserAction.php @@ -0,0 +1,12 @@ + + */ + +namespace app\model; + +class AdminUserAction extends Base { + +} diff --git a/app/model/AdminUserData.php b/app/model/AdminUserData.php new file mode 100644 index 0000000..221767f --- /dev/null +++ b/app/model/AdminUserData.php @@ -0,0 +1,11 @@ + + */ + +namespace app\model; + +class AdminUserData extends Base { + +} diff --git a/app/model/Base.php b/app/model/Base.php new file mode 100644 index 0000000..45ef387 --- /dev/null +++ b/app/model/Base.php @@ -0,0 +1,14 @@ + + */ + +namespace app\model; + +use think\Model; + +class Base extends Model { + +} diff --git a/app/util/ApiLogTool.php b/app/util/ApiLogTool.php new file mode 100644 index 0000000..20224fa --- /dev/null +++ b/app/util/ApiLogTool.php @@ -0,0 +1,97 @@ + + */ + +namespace app\util; + +use think\facade\Env; + +class ApiLogTool { + + private static $appInfo = 'null'; + private static $apiInfo = 'null'; + private static $request = 'null'; + private static $response = 'null'; + private static $header = 'null'; + private static $userInfo = 'null'; + private static $separator = ' | '; + + public static function setAppInfo($data) { + self::$appInfo = + (isset($data['app_id']) ? $data['app_id'] : 'null') . self::$separator . + (isset($data['app_name']) ? $data['app_name'] : 'null') . self::$separator . + (isset($data['device_id']) ? $data['device_id'] : 'null'); + } + + public static function setHeader($data) { + $accessToken = (isset($data['access-token']) && !empty($data['access-token'])) ? $data['access-token'] : 'null'; + $version = (isset($data['version']) && !empty($data['version'])) ? $data['version'] : 'null'; + self::$header = $accessToken . self::$separator . $version; + } + + public static function setApiInfo($data) { + self::$apiInfo = + (isset($data['hash']) ? $data['hash'] : 'null') . self::$separator . + (isset($data['api_class']) ? $data['api_class'] : 'null'); + } + + /** + * 这部分的日志其实很关键，但是由于不再强制检测UserToken，所以这部分日志暂时不生效，请大家各自适配 + * @param $data + * @author zhaoxiang + */ + public static function setUserInfo($data) { + if (is_array($data) || is_object($data)) { + $data = json_encode($data); + self::$userInfo = $data; + } + } + + public static function setRequest($data) { + if (is_array($data) || is_object($data)) { + $data = json_encode($data); + } + self::$request = $data; + } + + public static function setResponse($data, $code = '') { + if (is_array($data) || is_object($data)) { + $data = json_encode($data); + } + self::$response = $code . self::$separator . $data; + } + + public static function save() { + $logPath = Env::get('runtime_path') . 'ApiLog' . DIRECTORY_SEPARATOR; + $logStr = implode(self::$separator, array( + '[' . date('Y-m-d H:i:s') . ']', + self::$apiInfo, + self::$request, + self::$header, + self::$response, + self::$appInfo, + self::$userInfo + )); + if (!file_exists($logPath)) { + mkdir($logPath, 0755, true); + } + @file_put_contents($logPath . date('YmdH') . '.log', $logStr . "\n", FILE_APPEND); + } + + /** + * @param string $log 被记录的内容 + * @param string $type 日志文件名称 + * @param string $filePath + */ + public static function writeLog($log, $type = 'sql', $filePath = '') { + if(!$filePath) { + $filePath = Env::get('runtime_path') . DIRECTORY_SEPARATOR; + } + $filename = $filePath . date("Ymd") . '_' . $type . ".log"; + @$handle = fopen($filename, "a+"); + @fwrite($handle, date('Y-m-d H:i:s') . "\t" . $log . "\r\n"); + @fclose($handle); + } +} diff --git a/app/util/BuildName.php b/app/util/BuildName.php new file mode 100644 index 0000000..c44ec60 --- /dev/null +++ b/app/util/BuildName.php @@ -0,0 +1,104 @@ + + */ + +namespace app\util; + +class BuildName { + + private $arrXing, $numbXing; + private $arrMing, $numbMing; + + function __construct() { + $this->getXingList(); + $this->getMingList(); + } + + /* 获取姓列表 */ + private function getXingList() { + $this->arrXing = [ + '赵', '钱', '孙', '李', '周', '吴', '郑', '王', '冯', '陈', '褚', '卫', '蒋', + '沈', '韩', '杨', '朱', '秦', '尤', '许', '何', '吕', '施', '张', '孔', '曹', '严', '华', '金', '魏', + '陶', '姜', '戚', '谢', '邹', '喻', '柏', '水', '窦', '章', '云', '苏', '潘', '葛', '奚', '范', '彭', + '郎', '鲁', '韦', '昌', '马', '苗', '凤', '花', '方', '任', '袁', '柳', '鲍', '史', '唐', '费', '薛', + '雷', '贺', '倪', '汤', '滕', '殷', '罗', '毕', '郝', '安', '常', '傅', '卞', '齐', '元', '顾', '孟', + '平', '黄', '穆', '萧', '尹', '姚', '邵', '湛', '汪', '祁', '毛', '狄', '米', '伏', '成', '戴', '谈', + '宋', '茅', '庞', '熊', '纪', '舒', '屈', '项', '祝', '董', '梁', '杜', '阮', '蓝', '闵', '季', '贾', + '路', '娄', '江', '童', '颜', '郭', '梅', '盛', '林', '钟', '徐', '邱', '骆', '高', '夏', '蔡', '田', + '樊', '胡', '凌', '霍', '虞', '万', '支', '柯', '管', '卢', '莫', '柯', '房', '裘', '缪', '解', '应', + '宗', '丁', '宣', '邓', '单', '杭', '洪', '包', '诸', '左', '石', '崔', '吉', '龚', '程', '嵇', '邢', + '裴', '陆', '荣', '翁', '荀', '于', '惠', '甄', '曲', '封', '储', '仲', '伊', '宁', '仇', '甘', '武', + '符', '刘', '景', '詹', '龙', '叶', '幸', '司', '黎', '溥', '印', '怀', '蒲', '邰', '从', '索', '赖', + '卓', '屠', '池', '乔', '胥', '闻', '莘', '党', '翟', '谭', '贡', '劳', '逄', '姬', '申', '扶', '堵', + '冉', '宰', '雍', '桑', '寿', '通', '燕', '浦', '尚', '农', '温', '别', '庄', '晏', '柴', '瞿', '阎', + '连', '习', '容', '向', '古', '易', '廖', '庾', '终', '步', '都', '耿', '满', '弘', '匡', '国', '文', + '寇', '广', '禄', '阙', '东', '欧', '利', '师', '巩', '聂', '关', '荆', '司马', '上官', '欧阳', '夏侯', + '诸葛', '闻人', '东方', '赫连', '皇甫', '尉迟', '公羊', '澹台', '公冶', '宗政', '濮阳', '淳于', '单于', + '太叔', '申屠', '公孙', '仲孙', '轩辕', '令狐', '徐离', '宇文', '长孙', '慕容', '司徒', '司空']; + $this->numbXing = count($this->arrXing); //姓总数 + } + + + /* 获取名列表 */ + private function getMingList() { + $this->arrMing = [ + '伟', '刚', '勇', '毅', '俊', '峰', '强', '军', '平', '保', '东', '文', '辉', '力', '明', '永', '健', '世', '广', '志', '义', + '兴', '良', '海', '山', '仁', '波', '宁', '贵', '福', '生', '龙', '元', '全', '国', '胜', '学', '祥', '才', '发', '武', '新', + '利', '清', '飞', '彬', '富', '顺', '信', '子', '杰', '涛', '昌', '成', '康', '星', '光', '天', '达', '安', '岩', '中', '茂', + '进', '林', '有', '坚', '和', '彪', '博', '诚', '先', '敬', '震', '振', '壮', '会', '思', '群', '豪', '心', '邦', '承', '乐', + '绍', '功', '松', '善', '厚', '庆', '磊', '民', '友', '裕', '河', '哲', '江', '超', '浩', '亮', '政', '谦', '亨', '奇', '固', + '之', '轮', '翰', '朗', '伯', '宏', '言', '若', '鸣', '朋', '斌', '梁', '栋', '维', '启', '克', '伦', '翔', '旭', '鹏', '泽', + '晨', '辰', '士', '以', '建', '家', '致', '树', '炎', '德', '行', '时', '泰', '盛', '雄', '琛', '钧', '冠', '策', '腾', '楠', + '榕', '风', '航', '弘', '秀', '娟', '英', '华', '慧', '巧', '美', '娜', '静', '淑', '惠', '珠', '翠', '雅', '芝', '玉', '萍', + '红', '娥', '玲', '芬', '芳', '燕', '彩', '春', '菊', '兰', '凤', '洁', '梅', '琳', '素', '云', '莲', '真', '环', '雪', '荣', + '爱', '妹', '霞', '香', '月', '莺', '媛', '艳', '瑞', '凡', '佳', '嘉', '琼', '勤', '珍', '贞', '莉', '桂', '娣', '叶', '璧', + '璐', '娅', '琦', '晶', '妍', '茜', '秋', '珊', '莎', '锦', '黛', '青', '倩', '婷', '姣', '婉', '娴', '瑾', '颖', '露', '瑶', + '怡', '婵', '雁', '蓓', '纨', '仪', '荷', '丹', '蓉', '眉', '君', '琴', '蕊', '薇', '菁', '梦', '岚', '苑', '婕', '馨', '瑗', + '琰', '韵', '融', '园', '艺', '咏', '卿', '聪', '澜', '纯', '毓', '悦', '昭', '冰', '爽', '琬', '茗', '羽', '希', '欣', '飘', + '育', '滢', '馥', '筠', '柔', '竹', '霭', '凝', '晓', '欢', '霄', '枫', '芸', '菲', '寒', '伊', '亚', '宜', '可', '姬', '舒', + '影', '荔', '枝', '丽', '阳', '妮', '宝', '贝', '初', '程', '梵', '罡', '恒', '鸿', '桦', '骅', '剑', '娇', '纪', '宽', '苛', + '灵', '玛', '媚', '琪', '晴', '容', '睿', '烁', '堂', '唯', '威', '韦', '雯', '苇', '萱', '阅', '彦', '宇', '雨', '洋', '忠', + '宗', '曼', '紫', '逸', '贤', '蝶', '菡', '绿', '蓝', '儿', '翠', '烟', '小', '轩']; + //名总数 + $this->numbMing = count($this->arrMing); + } + + // 获取姓 + private function getXing() { + // mt_rand() 比rand()方法快四倍，而且生成的随机数比rand()生成的伪随机数无规律。 + return $this->arrXing[mt_rand(0, $this->numbXing - 1)]; + + } + + // 获取名字 + private function getMing() { + return $this->arrMing[mt_rand(0, $this->numbMing - 1)]; + } + + // 获取名字 + public function getName($type = 2) { + switch ($type) { + case 1: //2字 + $name = $this->getXing() . $this->getMing(); + break; + case 2: //随机2、3个字 + $name = $this->getXing() . $this->getMing(); + if (mt_rand(0, 100) > 50) $name .= $this->getMing(); + break; + case 3: //只取姓 + $name = $this->getXing(); + break; + case 4: //只取名 + $name = $this->getMing(); + break; + case 0: + default: //默认情况 1姓+2名 + $name = $this->getXing() . $this->getMing() . $this->getMing(); + } + + return $name; + } +} diff --git a/app/util/DataType.php b/app/util/DataType.php new file mode 100644 index 0000000..36938af --- /dev/null +++ b/app/util/DataType.php @@ -0,0 +1,22 @@ + + */ + +namespace app\util; + +class DataType { + + const TYPE_INTEGER = 1; + const TYPE_STRING = 2; + const TYPE_ARRAY = 3; + const TYPE_FLOAT = 4; + const TYPE_BOOLEAN = 5; + const TYPE_FILE = 6; + const TYPE_ENUM = 7; + const TYPE_MOBILE = 8; + const TYPE_OBJECT = 9; +} diff --git a/app/util/ExceptionHandle.php b/app/util/ExceptionHandle.php new file mode 100644 index 0000000..c137683 --- /dev/null +++ b/app/util/ExceptionHandle.php @@ -0,0 +1,24 @@ + + */ + +namespace app\util; + +use Exception; +use think\exception\Handle; + +/** + * Class ExceptionHandle + * @package app\util + * 异常处理handle类 + * Detail see: https://www.kancloud.cn/manual/thinkphp5_1/354092 + */ +class ExceptionHandle extends Handle { + + public function render(Exception $e) { + return parent::render($e)->header(config('apiadmin.CROSS_DOMAIN')); + } +} diff --git a/app/util/MockConf.php b/app/util/MockConf.php new file mode 100644 index 0000000..3a09aa4 --- /dev/null +++ b/app/util/MockConf.php @@ -0,0 +1,19 @@ + + */ + +namespace app\util; + +class MockConf { + + public function mockToApiAdmin() { + + } + + public function apiAdminToMock() { + + } +} diff --git a/app/util/ReturnCode.php b/app/util/ReturnCode.php new file mode 100644 index 0000000..f8ac0d7 --- /dev/null +++ b/app/util/ReturnCode.php @@ -0,0 +1,48 @@ + + */ + +namespace app\util; + +class ReturnCode { + + const SUCCESS = 1; + const INVALID = -1; + const DB_SAVE_ERROR = -2; + const DB_READ_ERROR = -3; + const CACHE_SAVE_ERROR = -4; + const CACHE_READ_ERROR = -5; + const FILE_SAVE_ERROR = -6; + const LOGIN_ERROR = -7; + const NOT_EXISTS = -8; + const JSON_PARSE_FAIL = -9; + const TYPE_ERROR = -10; + const NUMBER_MATCH_ERROR = -11; + const EMPTY_PARAMS = -12; + const DATA_EXISTS = -13; + const AUTH_ERROR = -14; + + const OTHER_LOGIN = -16; + const VERSION_INVALID = -17; + + const CURL_ERROR = -18; + + const RECORD_NOT_FOUND = -19; // 记录未找到 + const DELETE_FAILED = -20; // 删除失败 + const ADD_FAILED = -21; // 添加记录失败 + const UPDATE_FAILED = -22; // 添加记录失败 + + const PARAM_INVALID = -995; // 参数无效 + const ACCESS_TOKEN_TIMEOUT = -996; + const SESSION_TIMEOUT = -997; + const UNKNOWN = -998; + const EXCEPTION = -999; + + public static function getConstants() { + $oClass = new \ReflectionClass(__CLASS__); + return $oClass->getConstants(); + } +} diff --git a/app/util/RouterTool.php b/app/util/RouterTool.php new file mode 100644 index 0000000..c235693 --- /dev/null +++ b/app/util/RouterTool.php @@ -0,0 +1,101 @@ + + */ + +namespace app\util; + + +use app\model\AdminMenu; +use think\facade\Env; + +class RouterTool { + + /** + * 构建后端路由 + * @author zhaoxiang + */ + public static function buildAdminRouter() { + $methodArr = ['*', 'get', 'post', 'put', 'delete']; + $routePath = Env::get('route_path') . 'route.php'; + $bakPath = Env::get('route_path') . 'route.bak'; + if (file_exists($bakPath)) { + unlink($bakPath); + } + if (file_exists($routePath)) { + rename($routePath, $bakPath); + } + + $context = 'middleware('AdminResponse');" . PHP_EOL; + + file_put_contents($routePath, $context); + } + + /** + * 构建前端路由 + * TODO::待算法优化 + * @param $menus + * @return mixed + * @author zhaoxiang + */ + public static function buildVueRouter(&$menus) { + foreach ($menus as $key => $menu) { + if (isset($menu['children'])) { + foreach ($menu['children'] as $cKey => $child) { + if (!isset($child['children'])) { + unset($menus[$key]['children'][$cKey]); + } else { + $menus[$key]['children'][$cKey]['children'] = []; + } + } + } else { + unset($menus[$key]); + } + } + + foreach ($menus as $k => $m) { + if (isset($m['children']) && !empty($m['children'])) { + $menus[$k]['children'] = array_values($m['children']); + } else { + unset($menus[$k]); + } + } + } + + /** + * 构建菜单权限细节 + * @param $menu + * @return string + * @author zhaoxiang + */ + private static function getAdminMiddleware($menu) { + $middle = ['AdminResponse']; + if ($menu['log']) { + array_unshift($middle,'AdminLog'); + } + if ($menu['permission']) { + array_unshift($middle,'AdminPermission'); + } + if ($menu['auth']) { + array_unshift($middle,'AdminAuth'); + } + + return '->middleware(["' . implode('", "', $middle) . '"]);'; + } +} diff --git a/app/util/StrRandom.php b/app/util/StrRandom.php new file mode 100644 index 0000000..006834d --- /dev/null +++ b/app/util/StrRandom.php @@ -0,0 +1,184 @@ + + */ + +namespace app\util; + +class StrRandom { + + /** + * 构建一个随机浮点数 + * @param int $min 整数部分的最小值，默认值为-999999999 + * @param int $max 整数部分的最大值，默认值为999999999 + * @param int $dmin 小数部分位数的最小值，默认值为 0 + * @param int $dmax 小数部分位数的最大值，默认值为 8 + * @return float + * @author zhaoxiang + */ + public static function randomFloat($min = -999999999, $max = 999999999, $dmin = 0, $dmax = 8) { + $rand = ''; + $intNum = mt_rand($min, $max); + $floatLength = mt_rand($dmin, $dmax); + if ($floatLength > 1) { + $rand = Strs::randString($floatLength - 1, 1); + } + $floatEnd = mt_rand(1, 9); + + return floatval($intNum . '.' . $rand . $floatEnd); + } + + /** + * 获取随机的时间 + * @param string $format PHP的时间日期格式化字符 + * @return false|string + * @author zhaoxiang + */ + public static function randomDate($format = 'Y-m-d H:i:s') { + $timestamp = time() - mt_rand(0, 86400 * 3650); + + return date($format, $timestamp); + } + + /** + * 构建随机IP地址 + * @return string + * @author zhaoxiang + */ + public static function randomIp() { + $ipLong = [ + ['607649792', '608174079'], // 36.56.0.0-36.63.255.255 + ['1038614528', '1039007743'], // 61.232.0.0-61.237.255.255 + ['1783627776', '1784676351'], // 106.80.0.0-106.95.255.255 + ['2035023872', '2035154943'], // 121.76.0.0-121.77.255.255 + ['2078801920', '2079064063'], // 123.232.0.0-123.235.255.255 + ['-1950089216', '-1948778497'], // 139.196.0.0-139.215.255.255 + ['-1425539072', '-1425014785'], // 171.8.0.0-171.15.255.255 + ['-1236271104', '-1235419137'], // 182.80.0.0-182.92.255.255 + ['-770113536', '-768606209'], // 210.25.0.0-210.47.255.255 + ['-569376768', '-564133889'], // 222.16.0.0-222.95.255.255 + ]; + $randKey = mt_rand(0, 9); + + return $ip = long2ip(mt_rand($ipLong[$randKey][0], $ipLong[$randKey][1])); + } + + /** + * 随机生成一个 URL 协议 + * @return mixed + * @author zhaoxiang + */ + public static function randomProtocol() { + $proArr = [ + 'http', + 'ftp', + 'gopher', + 'mailto', + 'mid', + 'cid', + 'news', + 'nntp', + 'prospero', + 'telnet', + 'rlogin', + 'tn3270', + 'wais' + ]; + shuffle($proArr); + + return $proArr[0]; + } + + /** + * 随机生成一个顶级域名 + * @author zhaoxiang + */ + public static function randomTld() { + $tldArr = [ + 'com', 'cn', 'xin', 'net', 'top', '在线', + 'xyz', 'wang', 'shop', 'site', 'club', 'cc', + 'fun', 'online', 'biz', 'red', 'link', 'ltd', + 'mobi', 'info', 'org', 'edu', 'com.cn', 'net.cn', + 'org.cn', 'gov.cn', 'name', 'vip', 'pro', 'work', + 'tv', 'co', 'kim', 'group', 'tech', 'store', 'ren', + 'ink', 'pub', 'live', 'wiki', 'design', '中文网', + '我爱你', '中国', '网址', '网店', '公司', '网络', '集团', 'app' + ]; + shuffle($tldArr); + + return $tldArr[0]; + } + + /** + * 获取一个随机的域名 + * @return string + * @author zhaoxiang + */ + public static function randomDomain() { + $len = mt_rand(6, 16); + + return strtolower(Strs::randString($len)) . '.' . self::randomTld(); + } + + /** + * 随机生成一个URL + * @param string $protocol 协议名称，可以不用指定 + * @return string + * @author zhaoxiang + */ + public static function randomUrl($protocol = '') { + $protocol = $protocol ? $protocol : self::randomProtocol(); + + return $protocol . '://' . self::randomDomain(); + } + + /** + * 随机生成一个邮箱地址 + * @param string $domain 可以指定邮箱域名 + * @return string + * @author zhaoxiang + */ + public static function randomEmail($domain = '') { + $len = mt_rand(6, 16); + $domain = $domain ? $domain : self::randomDomain(); + + return Strs::randString($len) . '@' . $domain; + + } + + + public static function randomPhone() { + $prefixArr = [133, 153, 173, 177, 180, 181, 189, 199, 134, 135, + 136, 137, 138, 139, 150, 151, 152, 157, 158, 159, 172, 178, + 182, 183, 184, 187, 188, 198, 130, 131, 132, 155, 156, 166, + 175, 176, 185, 186, 145, 147, 149, 170, 171]; + shuffle($prefixArr); + + return $prefixArr[0] . Strs::randString(8, 1); + } + + /** + * 随机创建一个身份证号码 + * @return string + * @author zhaoxiang + */ + public static function randomId() { + $prefixArr = [ + 11, 12, 13, 14, 15, + 21, 22, 23, + 31, 32, 33, 34, 35, 36, 37, + 41, 42, 43, 44, 45, 46, + 50, 51, 52, 53, 54, + 61, 62, 63, 64, 65, + 71, 81, 82 + ]; + shuffle($prefixArr); + + $suffixArr = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 'X']; + shuffle($suffixArr); + + return $prefixArr[0] . '0000' . self::randomDate('Ymd') . Strs::randString(3, 1) . $suffixArr[0]; + } +} diff --git a/app/util/Strs.php b/app/util/Strs.php new file mode 100644 index 0000000..6bae4c4 --- /dev/null +++ b/app/util/Strs.php @@ -0,0 +1,253 @@ + +// +---------------------------------------------------------------------- + +namespace app\util; + +class Strs { + + /** + * 生成UUID 单机使用 + * @access public + * @return string + */ + public static function uuid() { + $charId = md5(uniqid(mt_rand(), true)); + $hyphen = chr(45); + $uuid = chr(123) + . substr($charId, 0, 8) . $hyphen + . substr($charId, 8, 4) . $hyphen + . substr($charId, 12, 4) . $hyphen + . substr($charId, 16, 4) . $hyphen + . substr($charId, 20, 12) + . chr(125); + + return $uuid; + } + + /** + * 生成Guid主键 + * @return Boolean + */ + public static function keyGen() { + return str_replace('-', '', substr(self::uuid(), 1, -1)); + } + + /** + * 检查字符串是否是UTF8编码 + * @param string $string 字符串 + * @return Boolean + */ + public static function isUtf8($string) { + $len = strlen($string); + for ($i = 0; $i < $len; $i++) { + $c = ord($string[$i]); + if ($c > 128) { + if (($c >= 254)) return false; + elseif ($c >= 252) $bits = 6; + elseif ($c >= 248) $bits = 5; + elseif ($c >= 240) $bits = 4; + elseif ($c >= 224) $bits = 3; + elseif ($c >= 192) $bits = 2; + else return false; + if (($i + $bits) > $len) return false; + while ($bits > 1) { + $i++; + $b = ord($string[$i]); + if ($b < 128 || $b > 191) return false; + $bits--; + } + } + } + + return true; + } + + /** + * 字符串截取，支持中文和其他编码 + * @access public + * @param string $str 需要转换的字符串 + * @param integer $start 开始位置 + * @param string $length 截取长度 + * @param string $charset 编码格式 + * @param bool $suffix 截断显示字符 + * @return string + */ + public static function mSubStr($str, $start = 0, $length, $charset = "utf-8", $suffix = true) { + if (function_exists("mb_substr")) + $slice = mb_substr($str, $start, $length, $charset); + elseif (function_exists('iconv_substr')) { + $slice = iconv_substr($str, $start, $length, $charset); + } else { + $re['utf-8'] = "/[\x01-\x7f]|[\xc2-\xdf][\x80-\xbf]|[\xe0-\xef][\x80-\xbf]{2}|[\xf0-\xff][\x80-\xbf]{3}/"; + $re['gb2312'] = "/[\x01-\x7f]|[\xb0-\xf7][\xa0-\xfe]/"; + $re['gbk'] = "/[\x01-\x7f]|[\x81-\xfe][\x40-\xfe]/"; + $re['big5'] = "/[\x01-\x7f]|[\x81-\xfe]([\x40-\x7e]|\xa1-\xfe])/"; + preg_match_all($re[$charset], $str, $match); + $slice = join("", array_slice($match[0], $start, $length)); + } + + return $suffix ? $slice . '...' : $slice; + } + + /** + * 产生随机字串，可用来自动生成密码 + * 默认长度6位 字母和数字混合 支持中文 + * @param integer $len 长度 + * @param string $type 字串类型 + * 0 字母 1 数字 其它 混合 + * @param string $addChars 额外字符 + * @return string + */ + public static function randString($len = 6, $type = '', $addChars = '') { + $str = ''; + switch ($type) { + case 0: + $chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz' . $addChars; + break; + case 1: + $chars = str_repeat('0123456789', 3); + break; + case 2: + $chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' . $addChars; + break; + case 3: + $chars = 'abcdefghijklmnopqrstuvwxyz' . $addChars; + break; + case 4: + $chars = "们以我到他会作时要动国产的一是工就年阶义发成部民可出能方进在了不和有大这主中人上为来分生对于学下级地个用同行面说种过命度革而多子后自社加小机也经力线本电高量长党得实家定深法表着水理化争现所二起政三好十战无农使性前等反体合斗路图把结第里正新开论之物从当两些还天资事队批点育重其思与间内去因件日利相由压员气业代全组数果期导平各基或月毛然如应形想制心样干都向变关问比展那它最及外没看治提五解系林者米群头意只明四道马认次文通但条较克又公孔领军流入接席位情运器并飞原油放立题质指建区验活众很教决特此常石强极土少已根共直团统式转别造切九你取西持总料连任志观调七么山程百报更见必真保热委手改管处己将修支识病象几先老光专什六型具示复安带每东增则完风回南广劳轮科北打积车计给节做务被整联步类集号列温装即毫知轴研单色坚据速防史拉世设达尔场织历花受求传口断况采精金界品判参层止边清至万确究书术状厂须离再目海交权且儿青才证低越际八试规斯近注办布门铁需走议县兵固除般引齿千胜细影济白格效置推空配刀叶率述今选养德话查差半敌始片施响收华觉备名红续均药标记难存测士身紧液派准斤角降维板许破述技消底床田势端感往神便贺村构照容非搞亚磨族火段算适讲按值美态黄易彪服早班麦削信排台声该击素张密害侯草何树肥继右属市严径螺检左页抗苏显苦英快称坏移约巴材省黑武培著河帝仅针怎植京助升王眼她抓含苗副杂普谈围食射源例致酸旧却充足短划剂宣环落首尺波承粉践府鱼随考刻靠够满夫失包住促枝局菌杆周护岩师举曲春元超负砂封换太模贫减阳扬江析亩木言球朝医校古呢稻宋听唯输滑站另卫字鼓刚写刘微略范供阿块某功套友限项余倒卷创律雨让骨远帮初皮播优占死毒圈伟季训控激找叫云互跟裂粮粒母练塞钢顶策双留误础吸阻故寸盾晚丝女散焊功株亲院冷彻弹错散商视艺灭版烈零室轻血倍缺厘泵察绝富城冲喷壤简否柱李望盘磁雄似困巩益洲脱投送奴侧润盖挥距触星松送获兴独官混纪依未突架宽冬章湿偏纹吃执阀矿寨责熟稳夺硬价努翻奇甲预职评读背协损棉侵灰虽矛厚罗泥辟告卵箱掌氧恩爱停曾溶营终纲孟钱待尽俄缩沙退陈讨奋械载胞幼哪剥迫旋征槽倒握担仍呀鲜吧卡粗介钻逐弱脚怕盐末阴丰雾冠丙街莱贝辐肠付吉渗瑞惊顿挤秒悬姆烂森糖圣凹陶词迟蚕亿矩康遵牧遭幅园腔订香肉弟屋敏恢忘编印蜂急拿扩伤飞露核缘游振操央伍域甚迅辉异序免纸夜乡久隶缸夹念兰映沟乙吗儒杀汽磷艰晶插埃燃欢铁补咱芽永瓦倾阵碳演威附牙芽永瓦斜灌欧献顺猪洋腐请透司危括脉宜笑若尾束壮暴企菜穗楚汉愈绿拖牛份染既秋遍锻玉夏疗尖殖井费州访吹荣铜沿替滚客召旱悟刺脑措贯藏敢令隙炉壳硫煤迎铸粘探临薄旬善福纵择礼愿伏残雷延烟句纯渐耕跑泽慢栽鲁赤繁境潮横掉锥希池败船假亮谓托伙哲怀割摆贡呈劲财仪沉炼麻罪祖息车穿货销齐鼠抽画饲龙库守筑房歌寒喜哥洗蚀废纳腹乎录镜妇恶脂庄擦险赞钟摇典柄辩竹谷卖乱虚桥奥伯赶垂途额壁网截野遗静谋弄挂课镇妄盛耐援扎虑键归符庆聚绕摩忙舞遇索顾胶羊湖钉仁音迹碎伸灯避泛亡答勇频皇柳哈揭甘诺概宪浓岛袭谁洪谢炮浇斑讯懂灵蛋闭孩释乳巨徒私银伊景坦累匀霉杜乐勒隔弯绩招绍胡呼痛峰零柴簧午跳居尚丁秦稍追梁折耗碱殊岗挖氏刃剧堆赫荷胸衡勤膜篇登驻案刊秧缓凸役剪川雪链渔啦脸户洛孢勃盟买杨宗焦赛旗滤硅炭股坐蒸凝竟陷枪黎救冒暗洞犯筒您宋弧爆谬涂味津臂障褐陆啊健尊豆拔莫抵桑坡缝警挑污冰柬嘴啥饭塑寄赵喊垫丹渡耳刨虎笔稀昆浪萨茶滴浅拥穴覆伦娘吨浸袖珠雌妈紫戏塔锤震岁貌洁剖牢锋疑霸闪埔猛诉刷狠忽灾闹乔唐漏闻沈熔氯荒茎男凡抢像浆旁玻亦忠唱蒙予纷捕锁尤乘乌智淡允叛畜俘摸锈扫毕璃宝芯爷鉴秘净蒋钙肩腾枯抛轨堂拌爸循诱祝励肯酒绳穷塘燥泡袋朗喂铝软渠颗惯贸粪综墙趋彼届墨碍启逆卸航衣孙龄岭骗休借" . $addChars; + break; + default : + // 默认去掉了容易混淆的字符oOLl和数字01，要添加请使用addChars参数 + $chars = 'ABCDEFGHIJKMNPQRSTUVWXYZabcdefghijkmnpqrstuvwxyz23456789' . $addChars; + break; + } + if ($len > 10) {//位数过长重复字符串一定次数 + $chars = $type == 1 ? str_repeat($chars, $len) : str_repeat($chars, 5); + } + if ($type != 4) { + $chars = str_shuffle($chars); + $str = substr($chars, 0, $len); + } else { + // 中文随机字 + for ($i = 0; $i < $len; $i++) { + $str .= self::msubstr($chars, floor(mt_rand(0, mb_strlen($chars, 'utf-8') - 1)), 1, 'utf-8', false); + } + } + + return $str; + } + + /** + * 生成一定数量的随机数，并且不重复 + * @param integer $number 数量 + * @param integer $length 长度 + * @param integer $mode 字串类型 + * 0 字母 1 数字 其它 混合 + * @return string + */ + public static function buildCountRand($number, $length = 4, $mode = 1) { + if ($mode == 1 && $length < strlen($number)) { + //不足以生成一定数量的不重复数字 + return false; + } + $rand = array(); + for ($i = 0; $i < $number; $i++) { + $rand[] = self::randString($length, $mode); + } + $unique = array_unique($rand); + if (count($unique) == count($rand)) { + return $rand; + } + $count = count($rand) - count($unique); + for ($i = 0; $i < $count * 3; $i++) { + $rand[] = self::randString($length, $mode); + } + $rand = array_slice(array_unique($rand), 0, $number); + + return $rand; + } + + /** + * 带格式生成随机字符 支持批量生成 + * 但可能存在重复 + * @param string $format 字符格式 + * # 表示数字 * 表示字母和数字 $ 表示字母 + * @param integer $number 生成数量 + * @return string | array + */ + public static function buildFormatRand($format, $number = 1) { + $str = array(); + $length = strlen($format); + for ($j = 0; $j < $number; $j++) { + $strTemp = ''; + for ($i = 0; $i < $length; $i++) { + $char = substr($format, $i, 1); + switch ($char) { + case "*"://字母和数字混合 + $strTemp .= self::randString(1); + break; + case "#"://数字 + $strTemp .= self::randString(1, 1); + break; + case "$"://大写字母 + $strTemp .= self::randString(1, 2); + break; + default://其他格式均不转换 + $strTemp .= $char; + break; + } + } + $str[] = $strTemp; + } + + return $number == 1 ? $strTemp : $str; + } + + /** + * 获取一定范围内的随机数字 位数不足补零 + * @param integer $min 最小值 + * @param integer $max 最大值 + * @return string + */ + public static function randNumber($min, $max) { + return sprintf("%0" . strlen($max) . "d", mt_rand($min, $max)); + } + + // 自动转换字符集 支持数组转换 + public static function autoCharset($string, $from = 'gbk', $to = 'utf-8') { + $from = strtoupper($from) == 'UTF8' ? 'utf-8' : $from; + $to = strtoupper($to) == 'UTF8' ? 'utf-8' : $to; + if (strtoupper($from) === strtoupper($to) || empty($string) || (is_scalar($string) && !is_string($string))) { + //如果编码相同或者非字符串标量则不转换 + return $string; + } + if (is_string($string)) { + if (function_exists('mb_convert_encoding')) { + return mb_convert_encoding($string, $to, $from); + } elseif (function_exists('iconv')) { + return iconv($from, $to, $string); + } else { + return $string; + } + } elseif (is_array($string)) { + foreach ($string as $key => $val) { + $_key = self::autoCharset($key, $from, $to); + $string[$_key] = self::autoCharset($val, $from, $to); + if ($key != $_key) + unset($string[$key]); + } + + return $string; + } else { + return $string; + } + } +} diff --git a/app/util/Tools.php b/app/util/Tools.php new file mode 100644 index 0000000..d136b54 --- /dev/null +++ b/app/util/Tools.php @@ -0,0 +1,171 @@ + + */ + +namespace app\util; + +class Tools { + + public static function getDate($timestamp) { + $now = time(); + $diff = $now - $timestamp; + if ($diff <= 60) { + return $diff . '秒前'; + } elseif ($diff <= 3600) { + return floor($diff / 60) . '分钟前'; + } elseif ($diff <= 86400) { + return floor($diff / 3600) . '小时前'; + } elseif ($diff <= 2592000) { + return floor($diff / 86400) . '天前'; + } else { + return '一个月前'; + } + } + + /** + * 二次封装的密码加密 + * @param $str + * @param string $auth_key + * @return string + * @author zhaoxiang + */ + public static function userMd5($str, $auth_key = '') { + if (!$auth_key) { + $auth_key = config('apiadmin.AUTH_KEY'); + } + + return '' === $str ? '' : md5(sha1($str) . $auth_key); + } + + /** + * 判断当前用户是否是超级管理员 + * @param string $uid + * @return bool + * @author zhaoxiang + */ + public static function isAdministrator($uid = '') { + if (!empty($uid)) { + $adminConf = config('apiadmin.USER_ADMINISTRATOR'); + if (is_array($adminConf)) { + if (is_array($uid)) { + $m = array_intersect($adminConf, $uid); + if (count($m)) { + return true; + } + } else { + if (in_array($uid, $adminConf)) { + return true; + } + } + } else { + if (is_array($uid)) { + if (in_array($adminConf, $uid)) { + return true; + } + } else { + if ($uid == $adminConf) { + return true; + } + } + } + } + + return false; + } + + /** + * 将查询的二维对象转换成二维数组 + * @param array $res + * @param string $key 允许指定索引值 + * @return array + * @author zhaoxiang + */ + public static function buildArrFromObj($res, $key = '') { + $arr = []; + foreach ($res as $value) { + $value = $value->toArray(); + if ($key) { + $arr[$value[$key]] = $value; + } else { + $arr[] = $value; + } + } + + return $arr; + } + + /** + * 将二维数组变成指定key + * @param $array + * @param $keyName + * @return array + * @author zhaoxiang + */ + public static function buildArrByNewKey($array, $keyName = 'id') { + $list = array(); + foreach ($array as $item) { + $list[$item[$keyName]] = $item; + } + + return $list; + } + + /** + * 把返回的数据集转换成Tree + * @param $list + * @param string $pk + * @param string $pid + * @param string $child + * @param string $root + * @return array + */ + public static function listToTree($list, $pk = 'id', $pid = 'fid', $child = 'children', $root = '0') { + $tree = array(); + if (is_array($list)) { + $refer = array(); + foreach ($list as $key => $data) { + $refer[$data[$pk]] = &$list[$key]; + } + foreach ($list as $key => $data) { + $parentId = $data[$pid]; + if ($root == $parentId) { + $tree[] = &$list[$key]; + } else { + if (isset($refer[$parentId])) { + $parent = &$refer[$parentId]; + $parent[$child][] = &$list[$key]; + } + } + } + } + + return $tree; + } + + public static function formatTree($list, $lv = 0, $title = 'title') { + $formatTree = array(); + foreach ($list as $key => $val) { + $title_prefix = ''; + for ($i = 0; $i < $lv; $i++) { + $title_prefix .= "|---"; + } + $val['lv'] = $lv; + $val['namePrefix'] = $lv == 0 ? '' : $title_prefix; + $val['showName'] = $lv == 0 ? $val[$title] : $title_prefix . $val[$title]; + if (!array_key_exists('children', $val)) { + array_push($formatTree, $val); + } else { + $child = $val['children']; + unset($val['children']); + array_push($formatTree, $val); + $middle = self::formatTree($child, $lv + 1, $title); //进行下一层递归 + $formatTree = array_merge($formatTree, $middle); + } + } + + return $formatTree; + } +} diff --git a/config/app.php b/config/app.php index 3dada4b..8c15313 100644 --- a/config/app.php +++ b/config/app.php @@ -28,5 +28,5 @@ return [ // 错误显示信息,非调试模式有效 'error_message' => '页面错误！请稍后再试～', // 显示错误信息 - 'show_error_msg' => false, + 'show_error_msg' => true, ]; diff --git a/config/console.php b/config/console.php index a818a98..b58c02b 100644 --- a/config/console.php +++ b/config/console.php @@ -5,5 +5,6 @@ return [ // 指令定义 'commands' => [ + 'hello' => 'app\command\Hello', ], ]; diff --git a/route/app.php b/route/app.php index d8e09e3..545cd2b 100644 --- a/route/app.php +++ b/route/app.php @@ -10,8 +10,8 @@ // +---------------------------------------------------------------------- use think\facade\Route; -Route::get('think', function () { - return 'hello,ThinkPHP6!'; +Route::group('admin', function() { + //Route::rule('Index/index', 'admin.Index/index', 'get'); + //MISS路由定义 + Route::miss('admin.Miss/index'); }); - -Route::get('hello/:name', 'index/hello');