mirror of
https://gitee.com/apiadmin/ApiAdmin.git
synced 2025-04-06 03:58:00 +08:00
Compare commits
No commits in common. "v4.1.5" and "master" have entirely different histories.
1
.env
Normal file
1
.env
Normal file
@ -0,0 +1 @@
|
||||
APP_DEBUG = true
[APP]
DEFAULT_TIMEZONE = Asia/Shanghai
[DATABASE]
TYPE = mysql
HOSTNAME = 127.0.0.1
DATABASE = apiadmin
USERNAME = root
PASSWORD = 123456
HOSTPORT = 3306
CHARSET = utf8
DEBUG = true
[LANG]
default_lang = zh-cn
|
||||
4
.gitignore
vendored
4
.gitignore
vendored
@ -2,6 +2,4 @@
|
||||
/.vscode
|
||||
/vendor
|
||||
*.log
|
||||
thinkphp
|
||||
.env
|
||||
.DS_Store
|
||||
composer.lock
|
||||
|
||||
850
CHANGELOG.md
850
CHANGELOG.md
@ -1,850 +0,0 @@
|
||||
## V5.1.35 LTS（2019-3-2）
|
||||
|
||||
本次主要为常规更新，修正了一些反馈的问题。
|
||||
|
||||
* 修正验证类自定义验证方法执行两次的问题
|
||||
* 模型增加`isEmpty`方法用于判断是否空模型
|
||||
* 改进获取器对`append`的支持
|
||||
* 修正一对多关联的`withCount`自关联问题
|
||||
* facade类注释调整
|
||||
* 改进关联属性的`visible`和`hidden`判断
|
||||
* 修正路由分组的`MISS`路由
|
||||
* 改进pgsql.sql
|
||||
|
||||
## V5.1.34 LTS（2019-1-30）
|
||||
|
||||
本次更新为常规更新，修正了一些反馈的问题。
|
||||
|
||||
* 改进Request类的`has`方法，支持`patch`
|
||||
* 改进`unique`验证的多条件支持
|
||||
* 修复自定义上传验证，检测文件大小
|
||||
* 改进`in`查询支持表达式
|
||||
* 改进路由的`getBind`方法
|
||||
* 改进验证类的错误信息获取
|
||||
* 改进`response`助手函数默认值
|
||||
* 修正mysql的`regexp`查询
|
||||
* 改进模型类型强制转换写入对`Expression`对象的支持
|
||||
|
||||
## V5.1.33 LTS（2019-1-16）
|
||||
|
||||
* 修复路由中存在多个相同替换的正则BUG
|
||||
* 修正whereLike查询
|
||||
* join方法支持参数绑定
|
||||
* 改进union方法
|
||||
* 修正多对多关联的attach方法
|
||||
* 改进验证类的正则规则自定义
|
||||
* 改进Request类method方法
|
||||
* 改进File日志类型的CLI日志写入
|
||||
* 改进文件日志time_format配置对JSON格式的支持
|
||||
|
||||
## V5.1.32 LTS（2018-12-24）
|
||||
|
||||
本次主要为常规更新，修正了一些反馈的问题。
|
||||
|
||||
|
||||
* 改进多对多关联的`attach`方法
|
||||
* 改进聚合查询的`field`处理
|
||||
* 改进关联的`save`方法
|
||||
* 修正模型`exists`方法返回值
|
||||
* 改进时间字段写入和输出
|
||||
* 改进控制器中间件的调用
|
||||
* 改进路由变量替换的性能
|
||||
* 改进缓存标签的处理机制
|
||||
|
||||
## V5.1.31 LTS (2018-12-9)
|
||||
|
||||
本次版本包含一个安全更新，建议升级。
|
||||
|
||||
* 改进`field`方法
|
||||
* 改进`count`方法返回类型
|
||||
* `download`函数增加在浏览器中显示文件功能
|
||||
* 修正多对多模型的中间表数据写入
|
||||
* 改进`sqlsrv`驱动支持多个Schemas模式查询
|
||||
* 统一助手函数与\think\response\Download函数文件过期时间
|
||||
* 完善关联模型的`save`方法 增加`make`方法仅创建对象不保存
|
||||
* 修改条件表达式对静态变量的支持
|
||||
* 修正控制器名获取
|
||||
* 改进view方法的`field`解析
|
||||
|
||||
## V5.1.30 LTS（2018-11-30）
|
||||
|
||||
该版本为常规更新，修正了一些社区反馈的问题。
|
||||
|
||||
主要更新如下：
|
||||
|
||||
* 改进查询类的`execute`方法
|
||||
* 判断路由规则定义添加对请求类型的判断
|
||||
* 修复`orderRaw`异常
|
||||
* 修正 `optimize:autoload`指令
|
||||
* 改进软删除的`destroy`方法造成重复执行事件的问题
|
||||
* 改进验证类对扩展验证规则 始终验证 不管是否`require`
|
||||
* 修复自定义验证`remove`所有规则的异常
|
||||
* 改进时间字段的自动写入支持微秒数据
|
||||
* 改进`Connection`类的`getrealsql`方法
|
||||
* 修正`https`地址的URL生成
|
||||
* 修复 `array_walk_recursive` 在低于PHP7.1消耗内部指针问题
|
||||
* 改进手动参数绑定使用
|
||||
* 改进聚合查询方法的`field`参数支持`Expression`
|
||||
|
||||
## V5.1.29 LTS（2018-11-11）
|
||||
|
||||
该版本主要改进了参数绑定的解析问题和提升性能，并修正了一些反馈的问题。
|
||||
|
||||
* 改进手动参数绑定
|
||||
* 修正MISS路由的分组参数无效问题
|
||||
* 行为支持对象的方法
|
||||
* 修正全局查询范围
|
||||
* 改进`belongsto`关联的`has`方法
|
||||
* 改进`hasMany`关联
|
||||
* 改进模型观察者多次注册的问题
|
||||
* 改进`query`类的默认查询参数处理
|
||||
* 修正`parseBetween`解析方法
|
||||
* 改进路由地址生成的本地域名支持
|
||||
* 改进参数绑定的实际URL解析性能
|
||||
* 改进`Env`类的`getEnv`和`get`方法
|
||||
* 改进模板缓存的生成优化
|
||||
* 修复验证类的多语言支持
|
||||
* 修复自定义场景验证`remove`规则异常
|
||||
* File类添加是否自动补全扩展名的选项
|
||||
* 改进`strpos`对子串是否存在的判断
|
||||
* 修复`choice`无法用值选择第一个选项问题
|
||||
* 验证器支持多维数组取值验证
|
||||
* 改进解析`extend`和`block`标签的正则
|
||||
|
||||
## V5.1.28 LTS（2018-10-29）
|
||||
|
||||
该版本主要修正了上一个版本存在的一些问题，并改进了关联查询
|
||||
|
||||
* 改进聚合查询方法的字段支持DISTINCT
|
||||
* 改进定义路由后url函数的端口生成
|
||||
* 改进控制器中间件对`swoole`等的支持
|
||||
* 改进Log类`save`方法
|
||||
* 改进验证类的闭包验证参数
|
||||
* 多对多关联支持指定中间表数据的名称
|
||||
* 关联聚合查询支持闭包方式指定聚合字段
|
||||
* 改进Lang类`get`方法
|
||||
* 多对多关联增加判断关联数据是否存在的方法
|
||||
* 改进关联查询使用`fetchsql`的情况
|
||||
* 改进修改器的是否已经执行判断
|
||||
* 增加`afterWith`和`beforeWith`验证规则 用于比较日期字段
|
||||
|
||||
## V5.1.27 LTS（2018-10-22）
|
||||
|
||||
该版本主要修正了路由绑定的参数，改进了修改器的执行多次问题，并正式宣布为LTS版本！
|
||||
|
||||
|
||||
* 修正路由绑定的参数丢失问题
|
||||
* 修正路由别名的参数获取
|
||||
* 改进修改器会执行多次的问题
|
||||
|
||||
## V5.1.26（2018-10-12）
|
||||
|
||||
该版本主要修正了上一个版本的一些问题，并改进了全局查询范围的支持，同时包含了一个安全更新。
|
||||
|
||||
|
||||
* 修正单一模块下注解路由无效的问题
|
||||
* 改进数据库的聚合查询的字段处理
|
||||
* 模型类增加`globalScope`属性定义 用于指定全局的查询范围
|
||||
* 模型的`useGlobalScope`方法支持传入数组 用于指定当前查询需要使用的全局查询范围
|
||||
* 改进数据集的`order`方法对数字类型的支持
|
||||
* 修正上一个版本`order`方法解析的一处BUG
|
||||
* 排序字段不合法或者错误的时候抛出异常
|
||||
* 改进`Request`类的`file`方法对上传文件的错误判断
|
||||
|
||||
## V5.1.25（2018-9-21）
|
||||
|
||||
该版本主要改进了查询参数绑定的性能和对浮点型的支持，以及一些细节的完善。
|
||||
|
||||
* 修正一处命令行问题
|
||||
* 改进`Socketlog`日志驱动，支持自定义默认展开日志类别
|
||||
* 修正`MorphMany`一处bug
|
||||
* 跳转到上次记住的url，并支持默认值
|
||||
* 改进模型的异常提示
|
||||
* 改进参数绑定对浮点型的支持
|
||||
* 改进`order`方法解析
|
||||
* 改进`json`字段数据的自动编码
|
||||
* 改进日志`log_write`可能造成的日志写入死循环
|
||||
* Log类增加`log_level`行为标签位置，用于对某个类型的日志进行处理
|
||||
* Route类增加`clear`方法清空路由规则
|
||||
* 分布式数据库配置支持使用数组
|
||||
* 单日志文件也支持`max_files`参数
|
||||
* 改进查询参数绑定的性能
|
||||
* 改进别名路由的URL后缀参数检测
|
||||
* 控制器前置方法和控制器中间件的`only`和`except`定义不区分大小写
|
||||
|
||||
## V5.1.24（2018-9-5）
|
||||
|
||||
该版本主要增加了命令行的表格输出功能，并增加了查看路由定义的指令，以及修正了社区的一些反馈问题。
|
||||
|
||||
* 修正`Request`类的`file`方法
|
||||
* 修正路由的`cache`方法
|
||||
* 修正路由缓存的一处问题
|
||||
* 改进上传文件获取的异常处理
|
||||
* 改进`fetchCollection`方法支持传入数据集类名
|
||||
* 修正多级控制器的注解路由生成
|
||||
* 改进`Middleware`类`clear`方法
|
||||
* 增加`route:list`指令用于[查看定义的路由](752690) 并支持排序
|
||||
* 命令行增加`Table`输出类
|
||||
* `Command`类增加`table`方法用于输出表格
|
||||
* 改进搜索器查询方法支持别名定义
|
||||
* 命令行配置增加`auto_path`参数用于定义自动载入的命令类路径
|
||||
* 增加`make:command`指令用于[快速生成指令](354146)
|
||||
* 改进`make:controller`指令对操作方法后缀的支持
|
||||
* 改进命令行的定义文件支持索引数组 用于指令对象的惰性加载
|
||||
* 改进`value`和`column`方法对后续查询结果的影响
|
||||
* 改进`RuleName`类的`setRule`方法
|
||||
|
||||
## V5.1.23（2018-8-23）
|
||||
|
||||
该版本主要改进了数据集对象的处理，增加了`findOrEmpty`方法，并且修正了一些社区反馈的BUG。
|
||||
|
||||
* 数据集类增加`diff`/`intersect`方法用于获取差集和交集（默认根据主键值比较）
|
||||
* 数据集类增加`order`方法支持指定字段排序
|
||||
* 数据集类增加`map`方法使用回调函数处理数据并返回新的数据集对象
|
||||
* Db增加`allowEmpty`方法允许`find`方法在没有数据的时候返回空数组或者空模型对象而不是null
|
||||
* Db增加`findOrEmpty`方法
|
||||
* Db增加`fetchCollection`方法用于指定查询返回数据集对象
|
||||
* 改进`order`方法的数组方式解析，增强安全性
|
||||
* 改进`withSearch`方法，支持第三个参数传入字段前缀标识，用于多表查询字段搜索
|
||||
* 修正`optimize:route`指令开启类库后缀后的注解路由生成
|
||||
* 修正redis缓存及session驱动
|
||||
* 支持指定`Yaconf`的独立配置文件
|
||||
* 增加`yaconf`助手函数用于配置文件
|
||||
|
||||
|
||||
## V5.1.22（2018-8-9）
|
||||
|
||||
该版本主要增加了模型搜索器和`withJoin`方法，完善了模型输出和对`Yaconf`的支持，修正了一些社区反馈的BUG。
|
||||
|
||||
* 改进一对一关联的`table`识别问题
|
||||
* 改进内置`Facade`类
|
||||
* 增加`withJoin`方法支持`join`方式的[一对一关联](一对一关联.md)查询
|
||||
* 改进`join`预载入查询的空数据问题
|
||||
* 改进`Config`类的`load`方法支持快速加载配置文件
|
||||
* 改进`execute`方法和事务的断线重连
|
||||
* 改进`memcache`驱动的`has`方法
|
||||
* 模型类支持定义[搜索器](搜索器.md)方法
|
||||
* 完善`Config`类对`Yaconf`的支持
|
||||
* 改进模型的`hidden/visible/append/withAttr`方法，支持在[查询前后调用](数组访问.md)，以及支持数据集对象
|
||||
* 数据集对象增加`where`方法根据字段或者关联数据[过滤数据](模型数据集.md)
|
||||
* 改进AJAX请求的`204`判断
|
||||
|
||||
|
||||
## V5.1.21（2018-8-2）
|
||||
|
||||
该版本主要增加了下载响应对象和数组查询对象的支持，并修正了一些社区反馈的问题。
|
||||
|
||||
* 改进核心对象的无用信息调试输出
|
||||
* 改进模型的`isRelationAttr`方法判断
|
||||
* 模型类的`get`和`all`方法并入Db类
|
||||
* 增加[下载响应对象](文件下载.md)和`download`助手函数
|
||||
* 修正别名路由配置定义读取
|
||||
* 改进`resultToModel`方法
|
||||
* 修正开启类库后缀后的注解路由生成
|
||||
* `Response`类增加`noCache`快捷方法
|
||||
* 改进路由对象在`Swoole`/`Workerman`下面参数多次合并问题
|
||||
* 修正路由`ajax`/`pjax`参数后路由变量无法正确获取的问题
|
||||
* 增加清除中间件的方法
|
||||
* 改进依赖注入的参数规范自动识别（便于对接前端小写+下划线规范）
|
||||
* 改进`hasWhere`的数组条件的字段判断
|
||||
* 增加[数组查询对象](高级查询.md)`Where`支持（喜欢数组查询的福音）
|
||||
* 改进多对多关联的闭包支持
|
||||
|
||||
## V5.1.20（2018-7-25）
|
||||
|
||||
该版本主要增加了Db和模型的动态获取器的支持，并修正了一些已知问题。
|
||||
|
||||
* Db类添加[获取器支持](703981)
|
||||
* 支持模型及关联模型字段[动态定义获取器](354046)
|
||||
* 动态获取器支持`JSON`字段
|
||||
* 改进路由的`before`行为执行（匹配后执行）
|
||||
* `Config`类支持`Yaconf`
|
||||
* 改进Url生成的端口问题
|
||||
* Request类增加`setUrl`和`setBaseUrl`方法
|
||||
* 改进页面trace的信息显示
|
||||
* 修正`MorphOne`关联
|
||||
* 命令行添加[查看版本指令](703994)
|
||||
|
||||
## V5.1.19 （2018-7-13）
|
||||
|
||||
该版本是一个小幅改进版本，针对`Swoole`和`Workerman`的`Cookie`支持做了一些改进，并修正了一些已知的问题。
|
||||
|
||||
|
||||
* 改进query类`delete`方法对软删除条件判断
|
||||
* 修正分表查询的软删除问题
|
||||
* 模型查询的时候同时传入`table`和`name`属性
|
||||
* 容器类增加`IteratorAggregate`和`Countable`接口支持
|
||||
* 路由分组支持对下面的资源路由统一设置`only/except/vars`参数
|
||||
* 改进Cookie类更好支持扩展
|
||||
* 改进Request类`post`方法
|
||||
* 改进模型自关联的自动识别
|
||||
* 改进Request类对`php://input`数据的处理
|
||||
|
||||
|
||||
## V5.1.18 （2018-6-30）
|
||||
|
||||
该版本主要完善了对`Swoole`和`Workerman`的`HttpServer`运行支持，改进`Request`类，并修正了一些已知的问题。
|
||||
|
||||
* 改进关联`append`方法的处理
|
||||
* 路由初始化和检测方法分离
|
||||
* 修正`destroy`方法强制删除
|
||||
* `app_init`钩子位置移入`run`方法
|
||||
* `think-swoole`扩展更新到2.0版本
|
||||
* `think-worker`扩展更新到2.0版本
|
||||
* 改进Url生成的域名自动识别
|
||||
* `Request`类增加`setPathinfo`方法和`setHost`方法
|
||||
* `Request`类增加`withGet`/`withPost`/`withHeader`/`withServer`/`withCookie`/`withEnv`方法进行赋值操作
|
||||
* Route类改进`host`属性的获取
|
||||
* 解决注解路由配置不生效的问题
|
||||
* 取消Test日志驱动，改为使用`close`设置关闭全局日志写入
|
||||
* 修正路由的`response`参数
|
||||
* 修正204响应输出的判断
|
||||
|
||||
## V5.1.17 （2018-6-18）
|
||||
|
||||
该版本主要增加了控制器中间件的支持，改进了路由功能，并且修正了社区反馈的一些问题。
|
||||
|
||||
* 修正软删除的`delete`方法
|
||||
* 修正Query类`Count`方法
|
||||
* 改进多对多`detach`方法
|
||||
* 改进Request类`Session`方法
|
||||
* 增加控制器中间件支持
|
||||
* 模型类增加`jsonAssoc`属性用于定义json数据是否返回数组
|
||||
* 修正Request类`method`方法的请求伪装
|
||||
* 改进静态路由的匹配
|
||||
* 分组首页路由自动完整匹配
|
||||
* 改进sqlsrv的`column`方法
|
||||
* 日志类的`apart_level`配置支持true自动生成对应类型的日志文件
|
||||
* 改进`204`输出判断
|
||||
* 修正cli下页面输出的BUG
|
||||
* 验证类使用更高效的`ctype`验证机制
|
||||
* 改进Request类`cookie`方法
|
||||
* 修正软删除的`withTrashed`方法
|
||||
* 改进多态一对多的预载入查询
|
||||
* 改进Query类`column`方法的缓存读取
|
||||
* Query类增加`whereBetweenTimeField`方法
|
||||
* 改进分组下多个相同路由规则的合并匹配问题
|
||||
* 路由类增加`getRule`/`getRuleList`方法获取定义的路由
|
||||
|
||||
## V5.1.16 （2018-6-7）
|
||||
|
||||
该版本主要修正了社区反馈的一些问题，并对Request类做了进一步规范和优化。
|
||||
|
||||
* 改进Session类的`boot`方法
|
||||
* App类的初始化方法可以单独执行
|
||||
* 改进Request类的`param`方法
|
||||
* 改进资源路由的变量替换
|
||||
* Request类增加`__isset`方法
|
||||
* 改进`useGlobalScope`方法对软删除的影响
|
||||
* 修正命令行调用
|
||||
* 改进Cookie类`init`方法
|
||||
* 改进多对多关联删除的返回值
|
||||
* 一对多关联写入支持`replace`
|
||||
* 路由增加`filter`检测方法,用于通过请求参数检测路由是否匹配
|
||||
* 取消Request类`session/env/server`方法的`filter`参数
|
||||
* 改进关联的指定属性输出
|
||||
* 模型删除操作删除后不清空对象数据仅作标记
|
||||
* 调整模型的`save`方法返回值为布尔值
|
||||
* 修正Request类`isAjax`方法
|
||||
* 修正中间件的模块配置读取
|
||||
* 取消Request类的请求变量的设置功能
|
||||
* 取消请求变量获取的默认修饰符
|
||||
* Request类增加`setAction/setModule/setController`方法
|
||||
* 关联模型的`delete`方法调用Query类
|
||||
* 改进URL生成的域名识别
|
||||
* 改进URL检测对已定义路由的域名判断
|
||||
* 模型类增加`isExists`和`isForce`方法
|
||||
* 软删除的`destroy`和`restore`方法返回值调整为布尔值
|
||||
|
||||
## V5.1.15 （2018-6-1）
|
||||
|
||||
该版本主要改进了路由缓存的性能和缓存方式设置，增加了JSON格式文件日志的支持，并修正了社区反馈的一些问题。
|
||||
|
||||
* 容器类增加`exists`方法 仅判断是否存在对象实例
|
||||
* 取消配置类的`autoload`方法
|
||||
* 改进路由缓存大小提高性能
|
||||
* 改进Dispatch类`init`方法
|
||||
* 增加`make:validate`指令生成验证器类
|
||||
* Config类`get`方法支持默认值参数
|
||||
* 修正字段缓存指令
|
||||
* 改进App类对`null`数据的返回
|
||||
* 改进模型类的`__isset`方法判断
|
||||
* 修正`Query`类的`withAggregate`方法
|
||||
* 改进`RuleItem`类的`setRuleName`方法
|
||||
* 修正依赖注入和参数的冲突问题
|
||||
* 修正Db类对第三方驱动的支持
|
||||
* 修正模型类查询对象问题
|
||||
* 修正File缓存驱动的`has`方法
|
||||
* 修正资源路由嵌套
|
||||
* 改进Request类对`$_SERVER`变量的读取
|
||||
* 改进请求缓存处理
|
||||
* 路由缓存支持指定单独的缓存方式和参数
|
||||
* 修正资源路由的中间件多次执行问题
|
||||
* 修正`optimize:config`指令
|
||||
* 文件日志支持`JSON`格式日志保存
|
||||
* 修正Db类`connect`方法
|
||||
* 改进Log类`write`方法不会自动写入之前日志
|
||||
* 模型的关联操作默认启用事务
|
||||
* 改进软删除的事件响应
|
||||
|
||||
## V5.1.14 （2018-5-18）
|
||||
|
||||
该版本主要对底层容器进行了一些优化改进，并增加了路由缓存功能，可以进一步提升路由性能。
|
||||
|
||||
* 依赖注入的对象参数传入改进
|
||||
* 改进核心类的容器实例化
|
||||
* 改进日期字段的读取
|
||||
* 改进验证类的`getScene`方法
|
||||
* 模型的`create`方法和`save`方法支持`replace`操作
|
||||
* 改进`Db`类的调用机制
|
||||
* App类调整为容器类
|
||||
* 改进容器默认绑定
|
||||
* `Loader`类增加工厂类的实例化方法
|
||||
* 增加路由变量默认规则配置参数
|
||||
* 增加路由缓存设计
|
||||
* 错误处理机制改进
|
||||
* 增加清空路由缓存指令
|
||||
|
||||
|
||||
## V5.1.13 （2018-5-11）
|
||||
|
||||
该版本主要增加了MySQL的XA事务支持，模型事件支持观察者，以及对Facade类的改进。
|
||||
|
||||
* 改进自动缓存
|
||||
* 改进Url生成
|
||||
* 修正数据缓存
|
||||
* 修正`value`方法的缓存
|
||||
* `join`方法和`view`方法的条件支持使用`Expression`对象
|
||||
* 改进驱动的`parseKey`方法
|
||||
* 改进Request类`host`方法和`domain`方法对端口的处理
|
||||
* 模型增加`withEvent`方法用于控制当前操作是否需要执行模型事件
|
||||
* 模型`setInc/setDec`方法支持更新事件
|
||||
* 模型添加`before_restore/after_restore`事件
|
||||
* 增加模型事件观察者
|
||||
* 路由增加`mobile`方法设置是否允许手机访问
|
||||
* 数据库XA事务支持
|
||||
* 改进索引数组查询对`IN`查询的支持
|
||||
* 修正`invokeMethod`方法
|
||||
* 修正空数据写入返回值的BUG
|
||||
* redis驱动支持`predis`
|
||||
* 改进`parseData`方法
|
||||
* 改进模块加载
|
||||
* App类初始化方法调整
|
||||
* 改进数组查询对表达式`Expression`对象支持
|
||||
* 改进闭包的依赖注入调用
|
||||
* 改进多对多关联的中间表模型更新
|
||||
* 增加容器中对象的自定义实例化
|
||||
|
||||
## V5.1.12 （2018-4-25）
|
||||
|
||||
该版本主要改进了主从查询的及时性，并支持动态设置请求数据。
|
||||
|
||||
* 支持动态设置请求数据
|
||||
* 改进`comment`方法解析
|
||||
* 修正App类`__unset`方法
|
||||
* 改进url生成的域名绑定
|
||||
* 改进主从查询的及时性
|
||||
* 修正`value`的数据缓存功能
|
||||
* 改进分页类的集合对象方法调用
|
||||
* 改进Db类的代码提示
|
||||
* SQL日志增加主从标记
|
||||
|
||||
## V5.1.11 （2018-4-19）
|
||||
|
||||
该版本为安全和修正版本，改进了JSON查询的参数绑定问题和容器类对象实例获取，并包含一处可能的安全隐患，建议更新。
|
||||
|
||||
* 支持指定JSON数据查询的字段类型
|
||||
* 修正`selectInsert`方法
|
||||
* `whereColumn`方法支持数组方式
|
||||
* 改进容器类`make`方法
|
||||
* 容器类`delete`方法支持数组
|
||||
* 改进`composer`自动加载
|
||||
* 改进模板引擎
|
||||
* 修正`like`查询的一处安全隐患
|
||||
|
||||
## V5.1.10 （2018-4-16）
|
||||
|
||||
该版本为修正版本，修正上一个版本的一些BUG，并增强了`think clear`指令。
|
||||
|
||||
* 改进`orderField`方法
|
||||
* 改进`exists`查询
|
||||
* 修改cli模式入口文件位置计算
|
||||
* 修正`null`查询
|
||||
* 改进`parseTime`方法
|
||||
* 修正关联预载入查询
|
||||
* 改进`mysql`驱动
|
||||
* 改进`think clear`指令 支持 `-c -l -r `选项
|
||||
* 改进路由规则对`/`结尾的支持
|
||||
|
||||
## V5.1.9 （2018-4-12）
|
||||
|
||||
该版本主要是一些改进和修正，并包含一个安全更新，是一个推荐更新版本。
|
||||
|
||||
* 默认模板渲染规则支持配置保持操作方法名
|
||||
* 改进`Request`类的`ip`方法
|
||||
* 支持模型软删除字段的默认值定义
|
||||
* 改进路由变量规则对中文的支持
|
||||
* 使用闭包查询的时候使用`cache(true)` 抛出异常提示
|
||||
* 改进`Loader`类`loadComposerAutoloadFiles`方法
|
||||
* 改进查询方法安全性
|
||||
* 修正路由地址中控制器名驼峰问题
|
||||
* 调整上一个版本的`module_init`和`app_begin`的钩子顺序问题
|
||||
* 改进CLI命令行执行的问题
|
||||
* 修正社区反馈的其它问题
|
||||
|
||||
## V5.1.8 （2018-4-5）
|
||||
|
||||
该版本主要改进了中间件的域名和模块支持，并同时修正了几个已知问题。
|
||||
|
||||
* 增加`template.auto_rule` 参数设置默认模板渲染的操作名自动转换规则
|
||||
* 默认模板渲染规则改由视图驱动实现
|
||||
* 修正路由标识定义
|
||||
* 修正控制器路由方法
|
||||
* 改进Request类`ip`方法支持自定义代理IP参数
|
||||
* 路由注册中间件支持数组方式别名
|
||||
* 改进命令行执行下的`composer`自动加载
|
||||
* 添加域名中间件注册支持
|
||||
* 全局中间件支持模块定义文件
|
||||
* Log日志配置支持`close`参数可以全局关闭日志写入
|
||||
* 中间件方法中捕获`HttpResponseException`异常
|
||||
* 改进中间件的闭包参数传入
|
||||
* 改进分组路由的延迟解析
|
||||
* 改进URL生成对域名绑定的支持
|
||||
* 改进文件缓存和文件日志驱动的并发支持
|
||||
|
||||
## V5.1.7 （2018-3-28）
|
||||
|
||||
该版本主要修正了路由的一些问题，并改进了查询的安全性。
|
||||
|
||||
* 支持`middleware`配置文件预先定义中间件别名方便路由调用
|
||||
* 修正资源路由
|
||||
* 改进`field`方法 自动识别`fieldRaw`
|
||||
* 增加`Expression`类
|
||||
* Query类增加`raw`方法
|
||||
* Query类的`field`/ `order` 和` where`方法都支持使用`raw`表达式查询
|
||||
* 改进`inc/dec`查询 支持批量更新
|
||||
* 改进路由分组
|
||||
* 改进Response类`create`方法
|
||||
* 改进composer自动加载
|
||||
* 修正域名路由的`append`方法
|
||||
* 修正操作方法的初始化方法获取不到问题
|
||||
|
||||
## V5.1.6 （2018-3-26）
|
||||
|
||||
该版本主要改进了路由规则的匹配算法，大幅提升了路由性能。并正式引入了中间件的支持，可以在路由中定义或者全局定义。另外包含了一个安全更新，是一个建议更新版本。
|
||||
|
||||
* 改进URL生成对路由`ext`方法的支持
|
||||
* 改进查询缓存对不同数据库相同表名的支持
|
||||
* 改进composer自动加载的性能
|
||||
* 改进空路由变量对默认参数的影响
|
||||
* mysql的`json`字段查询支持多级
|
||||
* Query类增加`option`方法
|
||||
* 优化路由匹配
|
||||
* 修复验证规则数字键名丢失问题
|
||||
* 改进路由Url生成
|
||||
* 改进一对一关联预载入查询
|
||||
* Request类增加`rootDomain`方法
|
||||
* 支持API资源控制器生成 `make:controller --api`
|
||||
* 优化Template类的标签解析
|
||||
* 容器类增加删除和清除对象实例的方法
|
||||
* 修正MorphMany关联的`eagerlyMorphToMany`方法一处错误
|
||||
* Container类的异常捕获改进
|
||||
* Domain对象支持`bind`方法
|
||||
* 修正分页参数
|
||||
* 默认模板的输出规则不受URL影响
|
||||
* 注解路由支持多级控制器
|
||||
* Query类增加`getNumRows`方法获取前次操作影响的记录数
|
||||
* 改进查询条件的性能
|
||||
* 改进模型类`readTransform`方法对序列化类型的处理
|
||||
* Log类增加`close`方法可以临时关闭当前请求的日志写入
|
||||
* 文件日志方式增加自动清理功能（设置`max_files`参数）
|
||||
* 修正Query类的`getPk`方法
|
||||
* 修正模板缓存的布局开关问题
|
||||
* 修正Query类`select`方法的缓存
|
||||
* 改进input助手函数
|
||||
* 改进断线重连的信息判断
|
||||
* 改进正则验证方法
|
||||
* 调整语言包的加载顺序 放到`app_init`之前
|
||||
* controller类`fetch`方法改为`final`
|
||||
* 路由地址中的变量支持使用`<var>`方式
|
||||
* 改进XMLResponse 支持传入编码过的xml内容
|
||||
* 修正Query类`view`方法的数组表名支持
|
||||
* 改进路由的模型闭包绑定
|
||||
* 改进分组变量规则的继承
|
||||
* 改进`cli-server`模式下的`composer`自动加载
|
||||
* 路由变量规则异常捕获
|
||||
* 引入中间件支持
|
||||
* 路由定义增加`middleware`方法
|
||||
* 增加生成中间件指令`make:middleware`
|
||||
* 增加全局中间件定义支持
|
||||
* 改进`optimize:config`指令对全局中间件的支持
|
||||
* 改进config类`has`方法
|
||||
* 改进时间查询的参数绑定
|
||||
* 改进`inc/dec/exp`查询的安全性
|
||||
|
||||
|
||||
## V5.1.5 （2018-1-31）
|
||||
|
||||
该版本主要增强了数据库的JSON查询，并支持JSON字段的聚合查询，改进了一些性能问题，修正了路由的一些BUG，主要更新如下：
|
||||
|
||||
* 改进数据集查询对`JSON`数据的支持
|
||||
* 改进聚合查询对`JSON`字段的支持
|
||||
* 模型类增加`getOrFail`方法
|
||||
* 改进数据库驱动的`parseKey`方法
|
||||
* 改进Query类`join`方法的自关联查询
|
||||
* 改进数据查询不存在不生成查询缓存
|
||||
* 增加`run`命令行指令启动内置服务器
|
||||
* `Request`类`pathinfo`方法改进对`cli-server`支持
|
||||
* `Session`类增加`use_lock`配置参数设置是否启用锁机制
|
||||
* 优化`File`缓存自动生成空目录的问题
|
||||
* 域名及分组路由支持`append`方法传递隐式参数
|
||||
* 改进日志的并发写入问题
|
||||
* 改进`Query`类的`where`方法支持传入`Query`对象
|
||||
* 支持设置单个日志文件的文件名
|
||||
* 修正路由规则的域名条件约束
|
||||
* `Request`类增加`subDomain`方法用于获取当前子域名
|
||||
* `Response`类增加`allowCache`方法控制是否允许请求缓存
|
||||
* `Request`类增加`sendData`方法便于扩展
|
||||
* 改进`Env`类不依赖`putenv`方法
|
||||
* 改进控制台`trace`显示错误
|
||||
* 改进`MorphTo`关联
|
||||
* 改进完整路由匹配后带斜线访问出错的情况
|
||||
* 改进路由的多级分组问题
|
||||
* 路由url地址生成支持多级分组
|
||||
* 改进路由Url生成的`url_convert`参数的影响
|
||||
* 改进`miss`和`auto`路由内部解析
|
||||
* 取消预载入关联查询缓存功能
|
||||
|
||||
## V5.1.4 （2018-1-19）
|
||||
|
||||
该版本主要增强了数据库和模型操作，主要更新如下：
|
||||
|
||||
* 支持设置 `deleteTime`属性为`false` 关闭软删除
|
||||
* 模型增加`getError`方法
|
||||
* 改进Query类的`getTableFields`/`getFieldsType`方法 支持表名自动获取
|
||||
* 模型类`toCollection`方法增加参数指定数据集类
|
||||
* 改进`union`查询
|
||||
* 关联预载入`with`方法增加缓存参数
|
||||
* 改进模型类的`get`和`all`方法的缓存 支持关联缓存
|
||||
* 支持`order by field`操作
|
||||
* 改进`insertAll`分批写入
|
||||
* 改进`json`字段数据支持
|
||||
* 增加JSON数据的模型对象化操作
|
||||
* 改进路由`ext`参数检测
|
||||
* 修正`rule`方法的`method`参数使用 `get|post` 方式注册路由的问题
|
||||
|
||||
## V5.1.3 （2018-1-12）
|
||||
|
||||
该版本主要改进了路由及调整函数加载顺序，主要更新如下：
|
||||
|
||||
* 增加`env`助手函数；
|
||||
* 增加`route`助手函数;
|
||||
* 增加视图路由方法；
|
||||
* 增加路由重定向方法;
|
||||
* 路由默认区分最后的目录斜杆（支持设置不区分）;
|
||||
* 调整公共文件和配置文件的加载顺序（可以在配置文件中直接使用助手函数）；
|
||||
* 视图类增加`filter`方法设置输出过滤；
|
||||
* `view`助手函数增加`filter`参数;
|
||||
* 改进缓存生成指令；
|
||||
* Session类的`get`方法支持获取多级；
|
||||
* Request类`only`方法支持指定默认值;
|
||||
* 改进路由分组;
|
||||
* 修正使用闭包查询的时候自动数据缓存出错的情况;
|
||||
* 废除`view_filter`钩子位置;
|
||||
* 修正分组下面的资源路由;
|
||||
* 改进session驱动;
|
||||
|
||||
## V5.1.2 （2018-1-8）
|
||||
|
||||
该版本改进了配置类及数据库类，主要更新如下：
|
||||
|
||||
* 修正嵌套路由分组；
|
||||
* 修正自定义模板标签界定符后表达式语法出错的情况；
|
||||
* 修正自关联的多次调用问题；
|
||||
* 修正数组查询的`null`条件查询；
|
||||
* 修正Query类的`order`及`field`的一处可能的BUG；
|
||||
* 配置参数设置支持三级；
|
||||
* 配置对象支持`ArrayAccess`；
|
||||
* App类增加`path`方法用于设置应用目录；
|
||||
* 关联定义增加`selfRelation`方法用于设置是否为自关联；
|
||||
|
||||
## V5.1.1 （2018-1-3）
|
||||
|
||||
修正一些反馈的BUG，包括：
|
||||
|
||||
* 修正Cookie类存取数组的问题
|
||||
* 修正Controller的`fetch`方法
|
||||
* 改进跨域请求
|
||||
* 修正`insertAll`方法
|
||||
* 修正`chunk`方法
|
||||
|
||||
## V5.1.0 （2018-1-1）
|
||||
|
||||
主要更新如下：
|
||||
|
||||
* 增加注解路由支持
|
||||
* 路由支持跨域请求设置
|
||||
* 增加`app_dispatch`钩子位置
|
||||
* 修正多对多关联的`detach`方法
|
||||
* 修正软删除的`destroy`方法
|
||||
* Cookie类`httponly`参数默认为false
|
||||
* 日志File驱动增加`single`参数配置记录同一个文件（不按日期生成）
|
||||
* 路由的`ext`和`denyExt`方法支持不传任何参数
|
||||
* 改进模型的`save`方法对`oracle`的支持
|
||||
* Query类的`insertall`方法支持配合`data`和`limit`方法
|
||||
* 增加`whereOr`动态查询支持
|
||||
* 日志的ip地址记录改进
|
||||
* 模型`saveAll`方法支持`isUpdate`方法
|
||||
* 改进`Pivot`模型的实例化操作
|
||||
* 改进Model类的`data`方法
|
||||
* 改进多对多中间表模型类
|
||||
* 模型增加`force`方法强制更新所有数据
|
||||
* Hook类支持设置入口方法名称
|
||||
* 改进验证类
|
||||
* 改进`hasWhere`查询的数据重复问题
|
||||
* 模型的`saveall`方法返回数据集对象
|
||||
* 改进File缓存的`clear`方法
|
||||
* 缓存添加统一的序列化机制
|
||||
* 改进泛三级域名的绑定
|
||||
* 改进泛域名的传值和取值
|
||||
* Request类增加`panDomain`方法
|
||||
* 改进废弃字段判断
|
||||
* App类增加`create`方法用于实例化应用类库
|
||||
* 容器类增加`has`方法
|
||||
* 改进多数据库切换连接
|
||||
* 改进断线重连的异常捕获
|
||||
* 改进模型类`buildQuery`方法
|
||||
* Query类增加`unionAll`方法
|
||||
* 关联统计功能增强（支持Sum/Max/Min/Avg）
|
||||
* 修正延迟写入
|
||||
* chunk方法支持复合主键
|
||||
* 改进JSON类型的写入
|
||||
* 改进Mysql的insertAll方法
|
||||
* Model类`save`方法改进复合主键包含自增的情况
|
||||
* 改进Query类`inc`和`dec`方法的关键字处理
|
||||
* File缓存inc和dec方法保持原来的有效期
|
||||
* 改进redis缓存的有效期判断
|
||||
* 增加checkRule方法用于单独数据的多个验证规则
|
||||
* 修正setDec方法的延迟写入
|
||||
* max和min方法增加force参数
|
||||
* 二级配置参数区分大小写
|
||||
* 改进join方法自关联的问题
|
||||
* 修正关联模型自定义表名的情况
|
||||
* Query类增加getFieldsType和getTableFields方法
|
||||
* 取消视图替换功能及view_replace_str配置参数
|
||||
* 改进域名绑定模块后的额外路由规则问题
|
||||
* 改进mysql的insertAll方法
|
||||
* 改进insertAll方法写入json字段数据的支持
|
||||
* 改进redis长连接多编号库的情况
|
||||
|
||||
## RC3版本（2017-11-6）
|
||||
|
||||
主要更新如下：
|
||||
|
||||
* 改进redis驱动的`get`方法
|
||||
* 修正Query类的`alias`方法
|
||||
* `File`类错误信息支持多语言
|
||||
* 修正路由的额外参数解析
|
||||
* 改进`whereTime`方法
|
||||
* 改进Model类`getAttr`方法
|
||||
* 改进App类的`controller`和`validate`方法支持多层
|
||||
* 改进`HasManyThrough`类
|
||||
* 修正软删除的`restore`方法
|
||||
* 改进`MorpthTo`关联
|
||||
* 改进数据库驱动类的`parseKey`方法
|
||||
* 增加`whereField`动态查询方法
|
||||
* 模型增加废弃字段功能
|
||||
* 改进路由的`after`行为检查和`before`行为机制
|
||||
* 改进路由分组的检查
|
||||
* 修正mysql的`json`字段查询
|
||||
* 取消Connection类的`quote`方法
|
||||
* 改进命令行的支持
|
||||
* 验证信息支持多语言
|
||||
* 修正路由模型绑定
|
||||
* 改进参数绑定类型对枚举类型的支持
|
||||
* 修正模板的`{$Think.version} `输出
|
||||
* 改进模板`date`函数解析
|
||||
* 改进`insertAll`方法支持分批执行
|
||||
* Request类`host`方法支持反向代理
|
||||
* 改进`JumpResponse`支持区分成功和错误模板
|
||||
* 改进开启类库后缀后的关联外键自动识别问题
|
||||
* 修正一对一关联的JOIN方式预载入查询问题
|
||||
* Query类增加`hidden`方法
|
||||
|
||||
## RC2版本（2017-10-17）
|
||||
|
||||
主要更新如下：
|
||||
|
||||
* 修正视图查询
|
||||
* 修正资源路由
|
||||
* 修正`HasMany`关联 修正`where`方法的闭包查询
|
||||
* 一对一关联绑定属性到父模型后 关联属性不再保留
|
||||
* 修正应用的命令行配置文件读取
|
||||
* 改进`Connection`类的`getCacheKey`方法
|
||||
* 改进文件上传的非法图像异常
|
||||
* 改进验证类的`unique`规则
|
||||
* Config类`get`方法支持获取一级配置
|
||||
* 修正count方法对`fetchSql`的支持
|
||||
* 修正mysql驱动对`socket`支持
|
||||
* 改进Connection类的`getRealSql`方法
|
||||
* 修正`view`助手函数
|
||||
* Query类增加`leftJoin` `rightJoin` 和 `fullJoin`方法
|
||||
* 改进app_namespace的获取
|
||||
* 改进`append`方法对一对一`bind`属性的支持
|
||||
* 改进关联的`saveall`方法的返回值
|
||||
* 路由标识设置异常修复
|
||||
* 改进Route类`rule`方法
|
||||
* 改进模型的`table`属性设置
|
||||
* 改进composer autofile的加载顺序
|
||||
* 改进`exception_handle`配置对闭包的支持
|
||||
* 改进app助手函数增加参数
|
||||
* 改进composer的加载路径判断
|
||||
* 修正路由组合变量的URL生成
|
||||
* 修正路由URL生成
|
||||
* 改进`whereTime`查询并支持扩展规则
|
||||
* File类的`move`方法第二个参数支持`false`
|
||||
* 改进Config类
|
||||
* 改进缓存类`remember`方法
|
||||
* 惯例配置文件调整 Url类当普通模式参数的时候不做`urlencode`处理
|
||||
* 取消`ROOT_PATH`和`APP_PATH`常量定义 如需更改应用目录 自己重新定义入口文件
|
||||
* 增加`app_debug`的`Env`获取
|
||||
* 修正泛域名绑定
|
||||
* 改进查询表达式的解析机制
|
||||
* mysql增加`regexp`查询表达式 支持正则查询
|
||||
* 改进查询表达式的异常判断
|
||||
* 改进model类的`destroy`方法
|
||||
* 改进Builder类 取消`parseValue`方法
|
||||
* 修正like查询的参数绑定问题
|
||||
* console和start文件移出核心纳入应用库
|
||||
* 改进Db类主键删除方法
|
||||
* 改进泛域名绑定模块
|
||||
* 取消`BIND_MODULE`常量 改为在入口文件使用`bind`方法设置
|
||||
* 改进数组查询
|
||||
* 改进模板渲染的异常处理
|
||||
* 改进控制器基类的架构方法参数
|
||||
* 改进Controller类的`success`和`error`方法
|
||||
* 改进对浏览器`JSON-Handle`插件的支持
|
||||
* 优化跳转模板的移动端显示
|
||||
* 修正模型查询的`chunk`方法对时间字段的支持
|
||||
* 改进trace驱动
|
||||
* Collection类增加`push`方法
|
||||
* 改进Redis Session驱动
|
||||
* 增加JumpResponse驱动
|
||||
|
||||
|
||||
## RC1（2017-9-8）
|
||||
|
||||
主要新特性为：
|
||||
|
||||
* 引入容器和Facade支持
|
||||
* 依赖注入完善和支持更多场景
|
||||
* 重构的（对象化）路由
|
||||
* 配置和路由目录独立
|
||||
* 取消系统常量
|
||||
* 助手函数增强
|
||||
* 类库别名机制
|
||||
* 模型和数据库增强
|
||||
* 验证类增强
|
||||
* 模板引擎改进
|
||||
* 支持PSR-3日志规范
|
||||
* RC1版本取消了5.0多个字段批量数组查询的方式
|
||||
50
DISCLAIMER.md
Normal file
50
DISCLAIMER.md
Normal file
@ -0,0 +1,50 @@
|
||||
<div align="center"><h3>ApiAdmin 开源框架法律声明与授权条款</h3></div>
|
||||
|
||||
```
|
||||
任何用户在使用由 ApiAdmin 技术开发团队（以下简称「本团队」）研发的系列框架（以下简称「ApiAdmin 通用权限开发框架」）前，请您仔细阅读并透彻理解本声明。若您一旦使用 ApiAdmin 通用权限开发框架，您的使用行为即被视为对本声明全部内容的认可和接受。
|
||||
```
|
||||
|
||||
**免责声明**
|
||||
|
||||
1. ApiAdmin 通用权限开发框架仅属于快速开发框架并不涉及具体业务应用场景，其尊重并保护所有用户的个人隐私权，不窃取任何用户计算机中的信息，更不具备用户数据存储等网络传输功能。
|
||||
|
||||
2. 任何单位或个人因下载使用 ApiAdmin 通用权限开发框架而产生的任何意外、疏忽、合约毁坏、诽谤、数据丢失、系统故障、服务中断、经济损失、商誉损害、版权或知识产权侵犯及其造成的损失 (包括但不限于直接、间接、附带或衍生的损失等)，本团队不承担任何法律责任。
|
||||
|
||||
3. 任何单位或个人在阅读本免责声明后，应在开源许可证所允许的范围内进行合法的发布、传播和使用 ApiAdmin 通用权限开发框架等行为，若违反本免责声明条款或违反法律法规所造成的法律责任(包括但不限于民事赔偿和刑事责任），由违约者自行承担，本团队不承担任何法律责任。
|
||||
|
||||
4. 本团队对 ApiAdmin 通用权限开发框架拥有知识产权（包括但不限于商标权、专利权、著作权、商业秘密等），上述产品均受到相关法律法规的保护。任何单位或个人不得在未经本团队书面授权的情况下对 ApiAdmin 通用权限开发框架本身申请相关的知识产权。
|
||||
|
||||
5. 使用者必须在适用法律和法规允许的范围内正确使用 ApiAdmin，严禁将其用于非法、欺诈、恶意或侵犯他人合法权益的目的，亦不将运用于任何违反我国法律法规的平台。若发现任何未经授权或违法使用本框架的情况，我们将依据相关法律追究责任，并有权采取必要的措施予以制止。
|
||||
|
||||
6. 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动。任何基于本项目二次开发而产生的一切法律纠纷和责任，均与作者无关。
|
||||
|
||||
7. 用户明确并同意本声明条款列举的全部内容，对使用 ApiAdmin 通用权限开发框架可能存在的风险和相关后果将完全由用户自行承担，本团队不承担任何法律责任。
|
||||
|
||||
8. 如果本声明的任何部分被认为无效或不可执行，则该部分将被解释为反映本团队的初衷，其余部分仍具有完全效力。不可执行的部分声明，并不构成我们放弃执行该声明的权利。
|
||||
|
||||
|
||||
**授权条款**
|
||||
|
||||
ApiAdmin 是一个基于 .NET 构建的开源通用权限开发框架，您可以在 MIT 许可证的条款下自由地使用、复制、分发、修改和贡献此项目。这意味着您可以根据自身需求和法律要求选择更适合您的许可条款：
|
||||
|
||||
1. **MIT 许可证**：另一种选择是遵循 MIT 许可协议，详情参见 [LICENSE-MIT](https://gitee.com/apiadmin/ApiAdmin/blob/master/LICENSE)。
|
||||
|
||||
|
||||
**责任限制**
|
||||
|
||||
ApiAdmin 团队及社区成员尽力提供完善的文档和技术支持，但并不对因使用框架过程中产生的问题提供绝对的解决方案保障。所有用户提供或推荐的解决方案、代码片段、最佳实践等均“按原样”提供，使用者须自行判断并承担使用后的一切风险。
|
||||
|
||||
|
||||
**法律义务与合规性**
|
||||
|
||||
使用者在利用 ApiAdmin 开发应用程序时，负有确保其应用程序符合所有适用法律、行业标准以及信息安全规范的全部责任。使用者应自行评估并确保其产品不会滥用框架功能，尤其是防止被用于潜在有害或不道德的目的。
|
||||
|
||||
|
||||
**技术交流**
|
||||
|
||||
ApiAdmin 交流群提供的支持和资源旨在辅助开发过程，但不应视为全面的技术指导或保证。我们鼓励用户积极参与开源过程，同时也提醒用户充分测试其开发成果，确保其安全性和稳定性。
|
||||
|
||||
|
||||
**变更说明**
|
||||
|
||||
本团队有权随时对声明条款及附件内容进行单方面的变更或更新，变更或更新后立即自动生效，无需另行单独通知您或任何第三方；若您在声明内容公告变更后继续使用的，表示您已充分阅读、理解并接受修改后的声明内容。
|
||||
21
LICENSE
Normal file
21
LICENSE
Normal file
@ -0,0 +1,21 @@
|
||||
MIT License
|
||||
|
||||
Copyright (c) 2021 Zhao
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
of this software and associated documentation files (the "Software"), to deal
|
||||
in the Software without restriction, including without limitation the rights
|
||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
copies of the Software, and to permit persons to whom the Software is
|
||||
furnished to do so, subject to the following conditions:
|
||||
|
||||
The above copyright notice and this permission notice shall be included in all
|
||||
copies or substantial portions of the Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
SOFTWARE.
|
||||
191
LICENSE.txt
191
LICENSE.txt
@ -1,191 +0,0 @@
|
||||
Apache License
|
||||
Version 2.0, January 2004
|
||||
http://www.apache.org/licenses/
|
||||
|
||||
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
|
||||
|
||||
1. Definitions.
|
||||
|
||||
"License" shall mean the terms and conditions for use, reproduction, and
|
||||
distribution as defined by Sections 1 through 9 of this document.
|
||||
|
||||
"Licensor" shall mean the copyright owner or entity authorized by the copyright
|
||||
owner that is granting the License.
|
||||
|
||||
"Legal Entity" shall mean the union of the acting entity and all other entities
|
||||
that control, are controlled by, or are under common control with that entity.
|
||||
For the purposes of this definition, "control" means (i) the power, direct or
|
||||
indirect, to cause the direction or management of such entity, whether by
|
||||
contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the
|
||||
outstanding shares, or (iii) beneficial ownership of such entity.
|
||||
|
||||
"You" (or "Your") shall mean an individual or Legal Entity exercising
|
||||
permissions granted by this License.
|
||||
|
||||
"Source" form shall mean the preferred form for making modifications, including
|
||||
but not limited to software source code, documentation source, and configuration
|
||||
files.
|
||||
|
||||
"Object" form shall mean any form resulting from mechanical transformation or
|
||||
translation of a Source form, including but not limited to compiled object code,
|
||||
generated documentation, and conversions to other media types.
|
||||
|
||||
"Work" shall mean the work of authorship, whether in Source or Object form, made
|
||||
available under the License, as indicated by a copyright notice that is included
|
||||
in or attached to the work (an example is provided in the Appendix below).
|
||||
|
||||
"Derivative Works" shall mean any work, whether in Source or Object form, that
|
||||
is based on (or derived from) the Work and for which the editorial revisions,
|
||||
annotations, elaborations, or other modifications represent, as a whole, an
|
||||
original work of authorship. For the purposes of this License, Derivative Works
|
||||
shall not include works that remain separable from, or merely link (or bind by
|
||||
name) to the interfaces of, the Work and Derivative Works thereof.
|
||||
|
||||
"Contribution" shall mean any work of authorship, including the original version
|
||||
of the Work and any modifications or additions to that Work or Derivative Works
|
||||
thereof, that is intentionally submitted to Licensor for inclusion in the Work
|
||||
by the copyright owner or by an individual or Legal Entity authorized to submit
|
||||
on behalf of the copyright owner. For the purposes of this definition,
|
||||
"submitted" means any form of electronic, verbal, or written communication sent
|
||||
to the Licensor or its representatives, including but not limited to
|
||||
communication on electronic mailing lists, source code control systems, and
|
||||
issue tracking systems that are managed by, or on behalf of, the Licensor for
|
||||
the purpose of discussing and improving the Work, but excluding communication
|
||||
that is conspicuously marked or otherwise designated in writing by the copyright
|
||||
owner as "Not a Contribution."
|
||||
|
||||
"Contributor" shall mean Licensor and any individual or Legal Entity on behalf
|
||||
of whom a Contribution has been received by Licensor and subsequently
|
||||
incorporated within the Work.
|
||||
|
||||
2. Grant of Copyright License.
|
||||
|
||||
Subject to the terms and conditions of this License, each Contributor hereby
|
||||
grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
|
||||
irrevocable copyright license to reproduce, prepare Derivative Works of,
|
||||
publicly display, publicly perform, sublicense, and distribute the Work and such
|
||||
Derivative Works in Source or Object form.
|
||||
|
||||
3. Grant of Patent License.
|
||||
|
||||
Subject to the terms and conditions of this License, each Contributor hereby
|
||||
grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
|
||||
irrevocable (except as stated in this section) patent license to make, have
|
||||
made, use, offer to sell, sell, import, and otherwise transfer the Work, where
|
||||
such license applies only to those patent claims licensable by such Contributor
|
||||
that are necessarily infringed by their Contribution(s) alone or by combination
|
||||
of their Contribution(s) with the Work to which such Contribution(s) was
|
||||
submitted. If You institute patent litigation against any entity (including a
|
||||
cross-claim or counterclaim in a lawsuit) alleging that the Work or a
|
||||
Contribution incorporated within the Work constitutes direct or contributory
|
||||
patent infringement, then any patent licenses granted to You under this License
|
||||
for that Work shall terminate as of the date such litigation is filed.
|
||||
|
||||
4. Redistribution.
|
||||
|
||||
You may reproduce and distribute copies of the Work or Derivative Works thereof
|
||||
in any medium, with or without modifications, and in Source or Object form,
|
||||
provided that You meet the following conditions:
|
||||
|
||||
You must give any other recipients of the Work or Derivative Works a copy of
|
||||
this License; and
|
||||
You must cause any modified files to carry prominent notices stating that You
|
||||
changed the files; and
|
||||
You must retain, in the Source form of any Derivative Works that You distribute,
|
||||
all copyright, patent, trademark, and attribution notices from the Source form
|
||||
of the Work, excluding those notices that do not pertain to any part of the
|
||||
Derivative Works; and
|
||||
If the Work includes a "NOTICE" text file as part of its distribution, then any
|
||||
Derivative Works that You distribute must include a readable copy of the
|
||||
attribution notices contained within such NOTICE file, excluding those notices
|
||||
that do not pertain to any part of the Derivative Works, in at least one of the
|
||||
following places: within a NOTICE text file distributed as part of the
|
||||
Derivative Works; within the Source form or documentation, if provided along
|
||||
with the Derivative Works; or, within a display generated by the Derivative
|
||||
Works, if and wherever such third-party notices normally appear. The contents of
|
||||
the NOTICE file are for informational purposes only and do not modify the
|
||||
License. You may add Your own attribution notices within Derivative Works that
|
||||
You distribute, alongside or as an addendum to the NOTICE text from the Work,
|
||||
provided that such additional attribution notices cannot be construed as
|
||||
modifying the License.
|
||||
You may add Your own copyright statement to Your modifications and may provide
|
||||
additional or different license terms and conditions for use, reproduction, or
|
||||
distribution of Your modifications, or for any such Derivative Works as a whole,
|
||||
provided Your use, reproduction, and distribution of the Work otherwise complies
|
||||
with the conditions stated in this License.
|
||||
|
||||
5. Submission of Contributions.
|
||||
|
||||
Unless You explicitly state otherwise, any Contribution intentionally submitted
|
||||
for inclusion in the Work by You to the Licensor shall be under the terms and
|
||||
conditions of this License, without any additional terms or conditions.
|
||||
Notwithstanding the above, nothing herein shall supersede or modify the terms of
|
||||
any separate license agreement you may have executed with Licensor regarding
|
||||
such Contributions.
|
||||
|
||||
6. Trademarks.
|
||||
|
||||
This License does not grant permission to use the trade names, trademarks,
|
||||
service marks, or product names of the Licensor, except as required for
|
||||
reasonable and customary use in describing the origin of the Work and
|
||||
reproducing the content of the NOTICE file.
|
||||
|
||||
7. Disclaimer of Warranty.
|
||||
|
||||
Unless required by applicable law or agreed to in writing, Licensor provides the
|
||||
Work (and each Contributor provides its Contributions) on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied,
|
||||
including, without limitation, any warranties or conditions of TITLE,
|
||||
NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are
|
||||
solely responsible for determining the appropriateness of using or
|
||||
redistributing the Work and assume any risks associated with Your exercise of
|
||||
permissions under this License.
|
||||
|
||||
8. Limitation of Liability.
|
||||
|
||||
In no event and under no legal theory, whether in tort (including negligence),
|
||||
contract, or otherwise, unless required by applicable law (such as deliberate
|
||||
and grossly negligent acts) or agreed to in writing, shall any Contributor be
|
||||
liable to You for damages, including any direct, indirect, special, incidental,
|
||||
or consequential damages of any character arising as a result of this License or
|
||||
out of the use or inability to use the Work (including but not limited to
|
||||
damages for loss of goodwill, work stoppage, computer failure or malfunction, or
|
||||
any and all other commercial damages or losses), even if such Contributor has
|
||||
been advised of the possibility of such damages.
|
||||
|
||||
9. Accepting Warranty or Additional Liability.
|
||||
|
||||
While redistributing the Work or Derivative Works thereof, You may choose to
|
||||
offer, and charge a fee for, acceptance of support, warranty, indemnity, or
|
||||
other liability obligations and/or rights consistent with this License. However,
|
||||
in accepting such obligations, You may act only on Your own behalf and on Your
|
||||
sole responsibility, not on behalf of any other Contributor, and only if You
|
||||
agree to indemnify, defend, and hold each Contributor harmless for any liability
|
||||
incurred by, or claims asserted against, such Contributor by reason of your
|
||||
accepting any such warranty or additional liability.
|
||||
|
||||
END OF TERMS AND CONDITIONS
|
||||
|
||||
APPENDIX: How to apply the Apache License to your work
|
||||
|
||||
To apply the Apache License to your work, attach the following boilerplate
|
||||
notice, with the fields enclosed by brackets "{}" replaced with your own
|
||||
identifying information. (Don't include the brackets!) The text should be
|
||||
enclosed in the appropriate comment syntax for the file format. We also
|
||||
recommend that a file or class name and description of purpose be included on
|
||||
the same "printed page" as the copyright notice for easier identification within
|
||||
third-party archives.
|
||||
|
||||
Copyright 2019 Zhao
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
32
README.md
32
README.md
@ -3,19 +3,24 @@
|
||||
|
||||
# ApiAdmin
|
||||
[](http://www.apiadmin.org/)
|
||||
[](http://www.apiadmin.org/)
|
||||
[](http://www.apiadmin.org/)
|
||||
[](http://www.apiadmin.org/)
|
||||
[](http://www.apiadmin.org/)
|
||||
[](http://www.apiadmin.org/)
|
||||
|
||||
|
||||
## 特别推荐
|
||||
博主新开的开源项目[EasyTiktok](https://gitee.com/apiadmin/tiktok)，如果你正在做抖音开发，相信你会需要它！目前项目还是dev状态，如果你有啥意见或者遇到BUG，及时提交，我会随时关注，及时更新！
|
||||
|
||||
|
||||
## 前端页面
|
||||
ApiAdmin4.1是一个前后端完全分离的项目，前端采用Vue构建，如需要可视化配置的请移步：[ApiAdmin-WEB](https://gitee.com/apiadmin/ApiAdmin-WEB)
|
||||
ApiAdmin5.0是一个前后端完全分离的项目，前端采用Vue构建，如需要可视化配置的请移步：[ApiAdmin-WEB](https://gitee.com/apiadmin/ApiAdmin-WEB)
|
||||
|
||||
## 快速安装
|
||||
|
||||
> 第一步：安装代码
|
||||
|
||||
```
|
||||
composer create-project apiadmin/apiadmin4
|
||||
composer create-project apiadmin/apiadmin
|
||||
```
|
||||
```
|
||||
你也可以：先获取基础代码 git clone https://gitee.com/apiadmin/ApiAdmin.git 再使用composer安装 composer install
|
||||
@ -24,13 +29,18 @@ composer create-project apiadmin/apiadmin4
|
||||
> 第二步：检测环境以及配置数据库
|
||||
|
||||
```
|
||||
php think apiadmin:install --db mysql://root:123456@127.0.0.1:3306/apiadmin#utf8mb4
|
||||
php think apiadmin:install
|
||||
```
|
||||
|
||||
> 第三步：完成数据迁移
|
||||
|
||||
```
|
||||
php think migrate:run
|
||||
|
||||
* 如出现报错：There are no commands defined in the "migrate" namespace.
|
||||
* 请先更新下think版本：composer update topthink/framework
|
||||
* 再执行：php think migrate:run
|
||||
* 特别鸣谢：@孙晔华
|
||||
```
|
||||
|
||||
> 第四步：构建后端路由
|
||||
@ -42,7 +52,7 @@ php think apiadmin:adminRouter
|
||||
> 第五步：获取管理后台账号密码
|
||||
|
||||
```
|
||||
cat application/install/lock.ini
|
||||
cat install/lock.ini
|
||||
```
|
||||
|
||||
## 灵 感
|
||||
@ -60,14 +70,14 @@ cat application/install/lock.ini
|
||||
|
||||
**系统需求**
|
||||
|
||||
- PHP >= 7.1
|
||||
- PHP >= 7.2.5
|
||||
- MySQL >= 5.5.3
|
||||
- Redis
|
||||
|
||||
**项目构成**
|
||||
|
||||
- ThinkPHP v5.1.*
|
||||
- Vue 2.0
|
||||
- ThinkPHP v6.0.*
|
||||
- Vue 2.*
|
||||
- ...
|
||||
|
||||
**功能简介**
|
||||
@ -115,8 +125,8 @@ cat application/install/lock.ini
|
||||
|
||||
## 鸣谢
|
||||
|
||||
ApiAdmin走到今天，也正式迈入4.1时代了，我们怀着激动的心情迎来这次发布。在新版本发布之际，我们真诚的感谢从1.0到4.0陪我们一路走来的朋友们。感谢你们的支持和信任！当然也感谢#开源中国#给大陆本土开源提供这样一个优秀的平台。
|
||||
ApiAdmin走到今天，也正式迈入4.1时代了，我们怀着激动的心情迎来这次发布。在新版本发布之际，我们真诚的感谢从1.0到5.0陪我们一路走来的朋友们。感谢你们的支持和信任！当然也感谢#开源中国#给大陆本土开源提供这样一个优秀的平台。
|
||||
|
||||
## 附：升级指南
|
||||
|
||||
很抱歉的告诉大家，虽然我们尽可能的和往期版本进行了兼容，但是，由于整体架构变化很大，所以想要零成本升级有点困难。我们建议大家可以使用4.1做新接口，慢慢的将4.0版本的接口移植到4.1。
|
||||
很抱歉的告诉大家，虽然我们尽可能的和往期版本进行了兼容，但是，由于整体架构变化很大，所以想要零成本升级有点困难。我们建议大家可以使用5.0做新接口，慢慢的将4.1版本的接口移植到5.0。
|
||||
|
||||
22
app/AppService.php
Normal file
22
app/AppService.php
Normal file
@ -0,0 +1,22 @@
|
||||
<?php
|
||||
declare (strict_types = 1);
|
||||
|
||||
namespace app;
|
||||
|
||||
use think\Service;
|
||||
|
||||
/**
|
||||
* 应用服务类
|
||||
*/
|
||||
class AppService extends Service
|
||||
{
|
||||
public function register()
|
||||
{
|
||||
// 服务注册
|
||||
}
|
||||
|
||||
public function boot()
|
||||
{
|
||||
// 服务启动
|
||||
}
|
||||
}
|
||||
94
app/BaseController.php
Normal file
94
app/BaseController.php
Normal file
@ -0,0 +1,94 @@
|
||||
<?php
|
||||
declare (strict_types = 1);
|
||||
|
||||
namespace app;
|
||||
|
||||
use think\App;
|
||||
use think\exception\ValidateException;
|
||||
use think\Validate;
|
||||
|
||||
/**
|
||||
* 控制器基础类
|
||||
*/
|
||||
abstract class BaseController
|
||||
{
|
||||
/**
|
||||
* Request实例
|
||||
* @var \think\Request
|
||||
*/
|
||||
protected $request;
|
||||
|
||||
/**
|
||||
* 应用实例
|
||||
* @var \think\App
|
||||
*/
|
||||
protected $app;
|
||||
|
||||
/**
|
||||
* 是否批量验证
|
||||
* @var bool
|
||||
*/
|
||||
protected $batchValidate = false;
|
||||
|
||||
/**
|
||||
* 控制器中间件
|
||||
* @var array
|
||||
*/
|
||||
protected $middleware = [];
|
||||
|
||||
/**
|
||||
* 构造方法
|
||||
* @access public
|
||||
* @param App $app 应用对象
|
||||
*/
|
||||
public function __construct(App $app)
|
||||
{
|
||||
$this->app = $app;
|
||||
$this->request = $this->app->request;
|
||||
|
||||
// 控制器初始化
|
||||
$this->initialize();
|
||||
}
|
||||
|
||||
// 初始化
|
||||
protected function initialize()
|
||||
{}
|
||||
|
||||
/**
|
||||
* 验证数据
|
||||
* @access protected
|
||||
* @param array $data 数据
|
||||
* @param string|array $validate 验证器名或者验证规则数组
|
||||
* @param array $message 提示信息
|
||||
* @param bool $batch 是否批量验证
|
||||
* @return array|string|true
|
||||
* @throws ValidateException
|
||||
*/
|
||||
protected function validate(array $data, $validate, array $message = [], bool $batch = false)
|
||||
{
|
||||
if (is_array($validate)) {
|
||||
$v = new Validate();
|
||||
$v->rule($validate);
|
||||
} else {
|
||||
if (strpos($validate, '.')) {
|
||||
// 支持场景
|
||||
[$validate, $scene] = explode('.', $validate);
|
||||
}
|
||||
$class = false !== strpos($validate, '\\') ? $validate : $this->app->parseClass('validate', $validate);
|
||||
$v = new $class();
|
||||
if (!empty($scene)) {
|
||||
$v->scene($scene);
|
||||
}
|
||||
}
|
||||
|
||||
$v->message($message);
|
||||
|
||||
// 是否批量验证
|
||||
if ($batch || $this->batchValidate) {
|
||||
$v->batch(true);
|
||||
}
|
||||
|
||||
return $v->failException(true)->check($data);
|
||||
}
|
||||
|
||||
}
|
||||
58
app/ExceptionHandle.php
Normal file
58
app/ExceptionHandle.php
Normal file
@ -0,0 +1,58 @@
|
||||
<?php
|
||||
namespace app;
|
||||
|
||||
use think\db\exception\DataNotFoundException;
|
||||
use think\db\exception\ModelNotFoundException;
|
||||
use think\exception\Handle;
|
||||
use think\exception\HttpException;
|
||||
use think\exception\HttpResponseException;
|
||||
use think\exception\ValidateException;
|
||||
use think\Response;
|
||||
use Throwable;
|
||||
|
||||
/**
|
||||
* 应用异常处理类
|
||||
*/
|
||||
class ExceptionHandle extends Handle
|
||||
{
|
||||
/**
|
||||
* 不需要记录信息（日志）的异常类列表
|
||||
* @var array
|
||||
*/
|
||||
protected $ignoreReport = [
|
||||
HttpException::class,
|
||||
HttpResponseException::class,
|
||||
ModelNotFoundException::class,
|
||||
DataNotFoundException::class,
|
||||
ValidateException::class,
|
||||
];
|
||||
|
||||
/**
|
||||
* 记录异常信息（包括日志或者其它方式记录）
|
||||
*
|
||||
* @access public
|
||||
* @param Throwable $exception
|
||||
* @return void
|
||||
*/
|
||||
public function report(Throwable $exception): void
|
||||
{
|
||||
// 使用内置的方式记录异常日志
|
||||
parent::report($exception);
|
||||
}
|
||||
|
||||
/**
|
||||
* Render an exception into an HTTP response.
|
||||
*
|
||||
* @access public
|
||||
* @param \think\Request $request
|
||||
* @param Throwable $e
|
||||
* @return Response
|
||||
*/
|
||||
public function render($request, Throwable $e): Response
|
||||
{
|
||||
// 添加自定义异常处理机制
|
||||
|
||||
// 其他错误交给系统处理
|
||||
return parent::render($request, $e)->header(config('apiadmin.CROSS_DOMAIN'));
|
||||
}
|
||||
}
|
||||
8
app/Request.php
Normal file
8
app/Request.php
Normal file
@ -0,0 +1,8 @@
|
||||
<?php
|
||||
namespace app;
|
||||
|
||||
// 应用请求对象类
|
||||
class Request extends \think\Request
|
||||
{
|
||||
|
||||
}
|
||||
26
app/command/ApiAdmin.php
Normal file
26
app/command/ApiAdmin.php
Normal file
@ -0,0 +1,26 @@
|
||||
<?php
|
||||
declare (strict_types=1);
|
||||
|
||||
namespace app\command;
|
||||
|
||||
use think\console\Command;
|
||||
use think\console\Input;
|
||||
use think\console\Output;
|
||||
|
||||
class ApiAdmin extends Command {
|
||||
protected function configure() {
|
||||
// 指令配置
|
||||
$this->setName('apiadmin:test')
|
||||
->setDescription('ApiAdmin默认命令行脚本，主要用于内部测试和研究');
|
||||
}
|
||||
|
||||
protected function execute(Input $input, Output $output): void {
|
||||
$a = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9];
|
||||
foreach ($a as $k => &$v) {
|
||||
if ($v === 5) {
|
||||
$v = 55;
|
||||
}
|
||||
}
|
||||
dump($a);
|
||||
}
|
||||
}
|
||||
112
app/command/AutoBuildFile.php
Normal file
112
app/command/AutoBuildFile.php
Normal file
@ -0,0 +1,112 @@
|
||||
<?php
|
||||
declare (strict_types=1);
|
||||
|
||||
namespace app\command;
|
||||
|
||||
use app\util\AutoBuild;
|
||||
use think\console\Command;
|
||||
use think\console\Input;
|
||||
use think\console\Output;
|
||||
|
||||
class AutoBuildFile extends Command {
|
||||
protected function configure() {
|
||||
// 指令配置
|
||||
$this->setName('apiadmin:autoBuild')->setDescription('ApiAdmin自动构建文件');
|
||||
}
|
||||
|
||||
/**
|
||||
* 自动构建
|
||||
* @param Input $input
|
||||
* @param Output $output
|
||||
* @throws \think\db\exception\DataNotFoundException
|
||||
* @throws \think\db\exception\DbException
|
||||
* @throws \think\db\exception\ModelNotFoundException
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
*/
|
||||
protected function execute(Input $input, Output $output): void {
|
||||
$config = $this->parseConfig($output);
|
||||
(new AutoBuild())->run($config);
|
||||
|
||||
$output->info('Build files successful');
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取cli配置输入
|
||||
* @param $output
|
||||
* @return array
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
*/
|
||||
private function parseConfig($output): array {
|
||||
$output->comment('Do you need to build a control? 1 or 0 (default 1)');
|
||||
$input = trim(fgets(fopen('php://stdin', 'r')));
|
||||
$dsn['control'] = strlen($input) ? $input : 1;
|
||||
|
||||
if ($dsn['control']) {
|
||||
$dsn['name'] = $this->getControlName($output);
|
||||
|
||||
$output->comment('Please choose module (1:admin;2:api, default 1):');
|
||||
$input = trim(fgets(fopen('php://stdin', 'r')));
|
||||
$dsn['module'] = strlen($input) ? $input : 1;
|
||||
|
||||
$output->comment('Do you need to build a menu? 1 or 0 (default 1):');
|
||||
$input = trim(fgets(fopen('php://stdin', 'r')));
|
||||
$dsn['menu'] = strlen($input) ? $input : 1;
|
||||
|
||||
if ($dsn['menu']) {
|
||||
$output->comment('Please input menu fid (default 0):');
|
||||
$input = trim(fgets(fopen('php://stdin', 'r')));
|
||||
$dsn['fid'] = strlen($input) ? $input : 0;
|
||||
|
||||
$output->comment('Do you need to create a route? 1 or 0 (default 0):');
|
||||
$input = trim(fgets(fopen('php://stdin', 'r')));
|
||||
$dsn['route'] = strlen($input) ? $input : 0;
|
||||
}
|
||||
}
|
||||
|
||||
$output->comment('Do you need to build a model? 1 or 0 (default 0):');
|
||||
$input = trim(fgets(fopen('php://stdin', 'r')));
|
||||
$dsn['model'] = strlen($input) ? $input : 0;
|
||||
|
||||
if ($dsn['model']) {
|
||||
$dsn['modelName'] = $this->getModelName($output);
|
||||
|
||||
$output->comment('Do you need to create a table? 1 or 0 (default 0):');
|
||||
$input = trim(fgets(fopen('php://stdin', 'r')));
|
||||
$dsn['table'] = strlen($input) ? $input : 0;
|
||||
}
|
||||
|
||||
return $dsn;
|
||||
}
|
||||
|
||||
/**
|
||||
* 递归获取控制器名称
|
||||
* @param $output
|
||||
* @return string
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
*/
|
||||
private function getModelName($output): string {
|
||||
$output->comment('Please input model name');
|
||||
$input = trim(fgets(fopen('php://stdin', 'r')));
|
||||
if ($input) {
|
||||
return $input;
|
||||
} else {
|
||||
return $this->getModelName($output);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 递归获取控制器名称
|
||||
* @param $output
|
||||
* @return string
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
*/
|
||||
private function getControlName($output): string {
|
||||
$output->comment('Please input controller name');
|
||||
$input = trim(fgets(fopen('php://stdin', 'r')));
|
||||
if ($input) {
|
||||
return $input;
|
||||
} else {
|
||||
return $this->getControlName($output);
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1,4 +1,5 @@
|
||||
<?php
|
||||
declare (strict_types=1);
|
||||
|
||||
namespace app\command;
|
||||
|
||||
@ -9,7 +10,7 @@ use think\console\Output;
|
||||
|
||||
class FreshAdminRouter extends Command {
|
||||
|
||||
protected function configure() {
|
||||
protected function configure(): void {
|
||||
// 指令配置
|
||||
$this->setName('apiadmin:adminRouter')->setDescription('自动构建后端路由');
|
||||
}
|
||||
@ -18,11 +19,12 @@ class FreshAdminRouter extends Command {
|
||||
* php think apiadmin:adminRouter
|
||||
* @param Input $input
|
||||
* @param Output $output
|
||||
* @return int|void|null
|
||||
* @throws \think\Exception
|
||||
* @throws \think\db\exception\DataNotFoundException
|
||||
* @throws \think\db\exception\DbException
|
||||
* @throws \think\db\exception\ModelNotFoundException
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
*/
|
||||
protected function execute(Input $input, Output $output) {
|
||||
protected function execute(Input $input, Output $output): void {
|
||||
RouterTool::buildAdminRouter();
|
||||
$output->info('路由构建成功');
|
||||
}
|
||||
120
app/command/Install.php
Normal file
120
app/command/Install.php
Normal file
@ -0,0 +1,120 @@
|
||||
<?php
|
||||
declare (strict_types=1);
|
||||
|
||||
namespace app\command;
|
||||
|
||||
use app\util\Strs;
|
||||
use think\console\Command;
|
||||
use think\console\Input;
|
||||
use think\console\Output;
|
||||
|
||||
class Install extends Command {
|
||||
|
||||
protected function configure(): void {
|
||||
$this->setName('apiadmin:install')->setDescription('ApiAdmin安装脚本');
|
||||
}
|
||||
|
||||
/**
|
||||
* php think apiadmin:install --db mysql://root:123456@127.0.0.1:3306/apiadmin#utf8mb4
|
||||
* @param Input $input
|
||||
* @param Output $output
|
||||
* @return int|void|null
|
||||
* @throws \think\Exception
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
*/
|
||||
protected function execute(Input $input, Output $output) {
|
||||
$tplPath = root_path() . 'install' . DIRECTORY_SEPARATOR;
|
||||
$lockFile = $tplPath . 'lock.ini';
|
||||
|
||||
if (file_exists($lockFile)) {
|
||||
$output->highlight("You have already installed it, please do not reinstall！");
|
||||
$output->highlight("If necessary, delete the install/lock.ini and try again");
|
||||
exit;
|
||||
}
|
||||
|
||||
if (!is_writable($tplPath)) {
|
||||
$output->highlight($tplPath . 'cannot be modified！');
|
||||
exit;
|
||||
}
|
||||
|
||||
$tempPath = runtime_path();
|
||||
if (!is_writable($tempPath)) {
|
||||
$output->highlight($tempPath . 'cannot be modified！');
|
||||
exit;
|
||||
}
|
||||
|
||||
if (!extension_loaded('redis')) {
|
||||
$output->highlight('Redis extension missing！');
|
||||
exit;
|
||||
}
|
||||
|
||||
try {
|
||||
$options = $this->parseDsnConfig($output);
|
||||
$dsn = "{$options['type']}:dbname={$options['database']};host={$options['hostname']};port={$options['hostport']};charset={$options['charset']}";
|
||||
new \PDO($dsn, $options['username'], $options['password']);
|
||||
|
||||
//处理数据库配置文件
|
||||
$dbConf = str_replace([
|
||||
'{$DB_TYPE}', '{$DB_HOST}', '{$DB_NAME}',
|
||||
'{$DB_USER}', '{$DB_PASSWORD}', '{$DB_PORT}',
|
||||
'{$DB_CHAR}'
|
||||
], [
|
||||
$options['type'], $options['hostname'], $options['database'],
|
||||
$options['username'], $options['password'], $options['hostport'],
|
||||
$options['charset']
|
||||
], file_get_contents($tplPath . 'db.tpl'));
|
||||
file_put_contents(root_path() . '.env', $dbConf);
|
||||
$output->info('Database configuration updated successfully');
|
||||
|
||||
//处理ApiAdmin自定义配置
|
||||
$authKey = substr(Strs::uuid(), 1, -1);
|
||||
$apiConf = str_replace('{$AUTH_KEY}', $authKey, file_get_contents($tplPath . 'apiadmin.tpl'));
|
||||
file_put_contents(config_path() . 'apiadmin.php', $apiConf);
|
||||
$output->info('ApiAdmin configuration updated successfully');
|
||||
|
||||
//生成lock文件，并且写入用户名密码
|
||||
file_put_contents($lockFile, $authKey);
|
||||
$output->info('Lock file initialization successful');
|
||||
} catch (\PDOException $e) {
|
||||
$output->highlight($e->getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* DSN解析
|
||||
* @param $output
|
||||
* @return array
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
*/
|
||||
private function parseDsnConfig($output): array {
|
||||
$output->comment('please input database type(default mysql):');
|
||||
$input = trim(fgets(fopen('php://stdin', 'r')));
|
||||
$dsn['type'] = $input ? $input : 'mysql';
|
||||
|
||||
$output->comment('please input database username(default root):');
|
||||
$input = trim(fgets(fopen('php://stdin', 'r')));
|
||||
$dsn['username'] = $input ? $input : 'root';
|
||||
|
||||
$output->comment('please input database password(default 123456):');
|
||||
$input = trim(fgets(fopen('php://stdin', 'r')));
|
||||
$dsn['password'] = $input ? $input : '123456';
|
||||
|
||||
$output->comment('please input database host(default 127.0.0.1):');
|
||||
$input = trim(fgets(fopen('php://stdin', 'r')));
|
||||
$dsn['hostname'] = $input ? $input : '127.0.0.1';
|
||||
|
||||
$output->comment('please input database port(default 3306):');
|
||||
$input = trim(fgets(fopen('php://stdin', 'r')));
|
||||
$dsn['hostport'] = $input ? $input : '3306';
|
||||
|
||||
$output->comment('please input database name(default apiadmin):');
|
||||
$input = trim(fgets(fopen('php://stdin', 'r')));
|
||||
$dsn['database'] = $input ? $input : 'apiadmin';
|
||||
|
||||
$output->comment('please input database charset(default utf8mb4):');
|
||||
$input = trim(fgets(fopen('php://stdin', 'r')));
|
||||
$dsn['charset'] = $input ? $input : 'utf8mb4';
|
||||
|
||||
return $dsn;
|
||||
}
|
||||
}
|
||||
2
app/common.php
Normal file
2
app/common.php
Normal file
@ -0,0 +1,2 @@
|
||||
<?php
|
||||
// 应用公共文件
|
||||
@ -1,11 +1,12 @@
|
||||
<?php
|
||||
declare (strict_types=1);
|
||||
/**
|
||||
* 应用管理
|
||||
* @since 2018-02-11
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
*/
|
||||
|
||||
namespace app\admin\controller;
|
||||
namespace app\controller\admin;
|
||||
|
||||
use app\model\AdminApp;
|
||||
use app\model\AdminList;
|
||||
@ -13,16 +14,17 @@ use app\model\AdminGroup;
|
||||
use app\util\ReturnCode;
|
||||
use app\util\Strs;
|
||||
use app\util\Tools;
|
||||
use think\Response;
|
||||
|
||||
class App extends Base {
|
||||
|
||||
/**
|
||||
* 获取应用列表
|
||||
* @return array
|
||||
* @throws \think\exception\DbException
|
||||
* @return Response
|
||||
* @throws \think\db\exception\DbException
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
*/
|
||||
public function index() {
|
||||
public function index(): Response {
|
||||
$limit = $this->request->get('size', config('apiadmin.ADMIN_LIST_DEFAULT'));
|
||||
$start = $this->request->get('page', 1);
|
||||
$keywords = $this->request->get('keywords', '');
|
||||
@ -43,7 +45,7 @@ class App extends Base {
|
||||
break;
|
||||
}
|
||||
}
|
||||
$listObj = $obj->order('app_add_time', 'DESC')->paginate($limit, false, ['page' => $start])->toArray();
|
||||
$listObj = $obj->order('app_add_time', 'DESC')->paginate(['page' => $start, 'list_rows' => $limit])->toArray();
|
||||
|
||||
return $this->buildSuccess([
|
||||
'list' => $listObj['data'],
|
||||
@ -53,22 +55,23 @@ class App extends Base {
|
||||
|
||||
/**
|
||||
* 获取AppId,AppSecret,接口列表,应用接口权限细节
|
||||
* @return Response
|
||||
* @throws \think\db\exception\DataNotFoundException
|
||||
* @throws \think\db\exception\DbException
|
||||
* @throws \think\db\exception\ModelNotFoundException
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
* @return array
|
||||
* @throws \think\Exception
|
||||
* @throws \think\exception\DbException
|
||||
*/
|
||||
public function getAppInfo() {
|
||||
$apiArr = AdminList::all();
|
||||
public function getAppInfo(): Response {
|
||||
$apiArr = (new AdminList())->select();
|
||||
foreach ($apiArr as $api) {
|
||||
$res['apiList'][$api['group_hash']][] = $api;
|
||||
}
|
||||
$groupArr = AdminGroup::all();
|
||||
$groupArr = (new AdminGroup())->select();
|
||||
$groupArr = Tools::buildArrFromObj($groupArr);
|
||||
$res['groupInfo'] = array_column($groupArr, 'name', 'hash');
|
||||
$id = $this->request->get('id', 0);
|
||||
if ($id) {
|
||||
$appInfo = AdminApp::get($id)->toArray();
|
||||
$appInfo = (new AdminApp())->where('id', $id)->find()->toArray();
|
||||
$res['app_detail'] = json_decode($appInfo['app_api_show'], true);
|
||||
} else {
|
||||
$res['app_id'] = mt_rand(1, 9) . Strs::randString(7, 1);
|
||||
@ -80,10 +83,10 @@ class App extends Base {
|
||||
|
||||
/**
|
||||
* 刷新APPSecret
|
||||
* @return Response
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
* @return array
|
||||
*/
|
||||
public function refreshAppSecret() {
|
||||
public function refreshAppSecret(): Response {
|
||||
$data['app_secret'] = Strs::randString(32);
|
||||
|
||||
return $this->buildSuccess($data);
|
||||
@ -91,10 +94,10 @@ class App extends Base {
|
||||
|
||||
/**
|
||||
* 新增应用
|
||||
* @return array
|
||||
* @return Response
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
*/
|
||||
public function add() {
|
||||
public function add(): Response {
|
||||
$postData = $this->request->post();
|
||||
$data = [
|
||||
'app_id' => $postData['app_id'],
|
||||
@ -124,10 +127,13 @@ class App extends Base {
|
||||
|
||||
/**
|
||||
* 应用状态编辑
|
||||
* @return array
|
||||
* @return Response
|
||||
* @throws \think\db\exception\DataNotFoundException
|
||||
* @throws \think\db\exception\DbException
|
||||
* @throws \think\db\exception\ModelNotFoundException
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
*/
|
||||
public function changeStatus() {
|
||||
public function changeStatus(): Response {
|
||||
$id = $this->request->get('id');
|
||||
$status = $this->request->get('status');
|
||||
$res = AdminApp::update([
|
||||
@ -137,9 +143,9 @@ class App extends Base {
|
||||
if ($res === false) {
|
||||
return $this->buildFailed(ReturnCode::DB_SAVE_ERROR);
|
||||
}
|
||||
$appInfo = AdminApp::get($id);
|
||||
$appInfo = (new AdminApp())->where('id', $id)->find();
|
||||
cache('AccessToken:Easy:' . $appInfo['app_secret'], null);
|
||||
if($oldWiki = cache('WikiLogin:' . $id)) {
|
||||
if ($oldWiki = cache('WikiLogin:' . $id)) {
|
||||
cache('WikiLogin:' . $oldWiki, null);
|
||||
}
|
||||
|
||||
@ -148,10 +154,13 @@ class App extends Base {
|
||||
|
||||
/**
|
||||
* 编辑应用
|
||||
* @return array
|
||||
* @return Response
|
||||
* @throws \think\db\exception\DataNotFoundException
|
||||
* @throws \think\db\exception\DbException
|
||||
* @throws \think\db\exception\ModelNotFoundException
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
*/
|
||||
public function edit() {
|
||||
public function edit(): Response {
|
||||
$postData = $this->request->post();
|
||||
$data = [
|
||||
'app_secret' => $postData['app_secret'],
|
||||
@ -173,9 +182,9 @@ class App extends Base {
|
||||
if ($res === false) {
|
||||
return $this->buildFailed(ReturnCode::DB_SAVE_ERROR);
|
||||
}
|
||||
$appInfo = AdminApp::get($postData['id']);
|
||||
$appInfo = (new AdminApp())->where('id', $postData['id'])->find();
|
||||
cache('AccessToken:Easy:' . $appInfo['app_secret'], null);
|
||||
if($oldWiki = cache('WikiLogin:' . $postData['id'])) {
|
||||
if ($oldWiki = cache('WikiLogin:' . $postData['id'])) {
|
||||
cache('WikiLogin:' . $oldWiki, null);
|
||||
}
|
||||
|
||||
@ -185,19 +194,22 @@ class App extends Base {
|
||||
|
||||
/**
|
||||
* 删除应用
|
||||
* @return array
|
||||
* @return Response
|
||||
* @throws \think\db\exception\DataNotFoundException
|
||||
* @throws \think\db\exception\DbException
|
||||
* @throws \think\db\exception\ModelNotFoundException
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
*/
|
||||
public function del() {
|
||||
public function del(): Response {
|
||||
$id = $this->request->get('id');
|
||||
if (!$id) {
|
||||
return $this->buildFailed(ReturnCode::EMPTY_PARAMS, '缺少必要参数');
|
||||
}
|
||||
$appInfo = AdminApp::get($id);
|
||||
$appInfo = (new AdminApp())->where('id', $id)->find();
|
||||
cache('AccessToken:Easy:' . $appInfo['app_secret'], null);
|
||||
|
||||
AdminApp::destroy($id);
|
||||
if($oldWiki = cache('WikiLogin:' . $id)) {
|
||||
if ($oldWiki = cache('WikiLogin:' . $id)) {
|
||||
cache('WikiLogin:' . $oldWiki, null);
|
||||
}
|
||||
|
||||
@ -1,25 +1,27 @@
|
||||
<?php
|
||||
declare (strict_types=1);
|
||||
/**
|
||||
*
|
||||
* @since 2018-02-11
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
*/
|
||||
|
||||
namespace app\admin\controller;
|
||||
namespace app\controller\admin;
|
||||
|
||||
use app\model\AdminApp;
|
||||
use app\model\AdminAppGroup;
|
||||
use app\util\ReturnCode;
|
||||
use think\Response;
|
||||
|
||||
class AppGroup extends Base {
|
||||
|
||||
/**
|
||||
* 获取应用组列表
|
||||
* @return array
|
||||
* @throws \think\exception\DbException
|
||||
* @return \think\Response
|
||||
* @throws \think\db\exception\DbException
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
*/
|
||||
public function index() {
|
||||
public function index(): Response {
|
||||
$limit = $this->request->get('size', config('apiadmin.ADMIN_LIST_DEFAULT'));
|
||||
$start = $this->request->get('page', 1);
|
||||
$keywords = $this->request->get('keywords', '');
|
||||
@ -42,7 +44,7 @@ class AppGroup extends Base {
|
||||
break;
|
||||
}
|
||||
}
|
||||
$listObj = $obj->paginate($limit, false, ['page' => $start])->toArray();
|
||||
$listObj = $obj->paginate(['page' => $start, 'list_rows' => $limit])->toArray();
|
||||
|
||||
return $this->buildSuccess([
|
||||
'list' => $listObj['data'],
|
||||
@ -52,12 +54,13 @@ class AppGroup extends Base {
|
||||
|
||||
/**
|
||||
* 获取全部有效的应用组
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
* @return Response
|
||||
* @throws \think\db\exception\DataNotFoundException
|
||||
* @throws \think\db\exception\DbException
|
||||
* @throws \think\db\exception\ModelNotFoundException
|
||||
* @throws \think\exception\DbException
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
*/
|
||||
public function getAll() {
|
||||
public function getAll(): Response {
|
||||
$listInfo = (new AdminAppGroup())->where(['status' => 1])->select();
|
||||
|
||||
return $this->buildSuccess([
|
||||
@ -67,10 +70,10 @@ class AppGroup extends Base {
|
||||
|
||||
/**
|
||||
* 应用组状态编辑
|
||||
* @return array
|
||||
* @return Response
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
*/
|
||||
public function changeStatus() {
|
||||
public function changeStatus(): Response {
|
||||
$id = $this->request->get('id');
|
||||
$status = $this->request->get('status');
|
||||
$res = AdminAppGroup::update([
|
||||
@ -86,10 +89,10 @@ class AppGroup extends Base {
|
||||
|
||||
/**
|
||||
* 添加应用组
|
||||
* @return Response
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
* @return array
|
||||
*/
|
||||
public function add() {
|
||||
public function add(): Response {
|
||||
$postData = $this->request->post();
|
||||
$res = AdminAppGroup::create($postData);
|
||||
if ($res === false) {
|
||||
@ -101,10 +104,10 @@ class AppGroup extends Base {
|
||||
|
||||
/**
|
||||
* 应用组编辑
|
||||
* @return Response
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
* @return array
|
||||
*/
|
||||
public function edit() {
|
||||
public function edit(): Response {
|
||||
$postData = $this->request->post();
|
||||
$res = AdminAppGroup::update($postData);
|
||||
if ($res === false) {
|
||||
@ -116,10 +119,10 @@ class AppGroup extends Base {
|
||||
|
||||
/**
|
||||
* 应用组删除
|
||||
* @return Response
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
* @return array
|
||||
*/
|
||||
public function del() {
|
||||
public function del(): Response {
|
||||
$hash = $this->request->get('hash');
|
||||
if (!$hash) {
|
||||
return $this->buildFailed(ReturnCode::EMPTY_PARAMS, '缺少必要参数');
|
||||
@ -1,11 +1,12 @@
|
||||
<?php
|
||||
declare (strict_types=1);
|
||||
/**
|
||||
* 权限相关配置
|
||||
* @since 2018-02-06
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
*/
|
||||
|
||||
namespace app\admin\controller;
|
||||
namespace app\controller\admin;
|
||||
|
||||
use app\model\AdminAuthGroup;
|
||||
use app\model\AdminAuthGroupAccess;
|
||||
@ -13,16 +14,17 @@ use app\model\AdminAuthRule;
|
||||
use app\model\AdminMenu;
|
||||
use app\util\ReturnCode;
|
||||
use app\util\Tools;
|
||||
use think\Response;
|
||||
|
||||
class Auth extends Base {
|
||||
|
||||
/**
|
||||
* 获取权限组列表
|
||||
* @return array
|
||||
* @throws \think\exception\DbException
|
||||
* @return Response
|
||||
* @throws \think\db\exception\DbException
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
*/
|
||||
public function index() {
|
||||
public function index(): Response {
|
||||
$limit = $this->request->get('size', config('apiadmin.ADMIN_LIST_DEFAULT'));
|
||||
$start = $this->request->get('page', 1);
|
||||
$keywords = $this->request->get('keywords', '');
|
||||
@ -36,7 +38,7 @@ class Auth extends Base {
|
||||
$obj = $obj->whereLike('name', "%{$keywords}%");
|
||||
}
|
||||
|
||||
$listObj = $obj->order('id', 'DESC')->paginate($limit, false, ['page' => $start])->toArray();
|
||||
$listObj = $obj->order('id', 'DESC')->paginate(['page' => $start, 'list_rows' => $limit])->toArray();
|
||||
|
||||
return $this->buildSuccess([
|
||||
'list' => $listObj['data'],
|
||||
@ -46,13 +48,13 @@ class Auth extends Base {
|
||||
|
||||
/**
|
||||
* 获取全部已开放的可选组
|
||||
* @return array
|
||||
* @return Response
|
||||
* @throws \think\db\exception\DataNotFoundException
|
||||
* @throws \think\db\exception\DbException
|
||||
* @throws \think\db\exception\ModelNotFoundException
|
||||
* @throws \think\exception\DbException
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
*/
|
||||
public function getGroups() {
|
||||
public function getGroups(): Response {
|
||||
$listInfo = (new AdminAuthGroup())->where(['status' => 1])->order('id', 'DESC')->select();
|
||||
$count = count($listInfo);
|
||||
$listInfo = Tools::buildArrFromObj($listInfo);
|
||||
@ -65,13 +67,13 @@ class Auth extends Base {
|
||||
|
||||
/**
|
||||
* 获取组所在权限列表
|
||||
* @return array
|
||||
* @return Response
|
||||
* @throws \think\db\exception\DataNotFoundException
|
||||
* @throws \think\db\exception\DbException
|
||||
* @throws \think\db\exception\ModelNotFoundException
|
||||
* @throws \think\exception\DbException
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
*/
|
||||
public function getRuleList() {
|
||||
public function getRuleList(): Response {
|
||||
$groupId = $this->request->get('group_id', 0);
|
||||
|
||||
$list = (new AdminMenu)->order('sort', 'ASC')->select();
|
||||
@ -93,11 +95,10 @@ class Auth extends Base {
|
||||
|
||||
/**
|
||||
* 新增组
|
||||
* @return array
|
||||
* @throws \Exception
|
||||
* @return Response
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
*/
|
||||
public function add() {
|
||||
public function add(): Response {
|
||||
$res = AdminAuthGroup::create([
|
||||
'name' => $this->request->post('name', ''),
|
||||
'description' => $this->request->post('description', '')
|
||||
@ -111,10 +112,10 @@ class Auth extends Base {
|
||||
|
||||
/**
|
||||
* 权限组状态编辑
|
||||
* @return array
|
||||
* @return Response
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
*/
|
||||
public function changeStatus() {
|
||||
public function changeStatus(): Response {
|
||||
$id = $this->request->get('id');
|
||||
$status = $this->request->get('status');
|
||||
$res = AdminAuthGroup::update([
|
||||
@ -130,14 +131,10 @@ class Auth extends Base {
|
||||
|
||||
/**
|
||||
* 编辑用户
|
||||
* @return array
|
||||
* @throws \Exception
|
||||
* @throws \think\db\exception\DataNotFoundException
|
||||
* @throws \think\db\exception\ModelNotFoundException
|
||||
* @throws \think\exception\DbException
|
||||
* @return Response
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
*/
|
||||
public function edit() {
|
||||
public function edit(): Response {
|
||||
$res = AdminAuthGroup::update([
|
||||
'id' => $this->request->post('id', 0),
|
||||
'name' => $this->request->post('name', ''),
|
||||
@ -152,13 +149,13 @@ class Auth extends Base {
|
||||
|
||||
/**
|
||||
* 删除组
|
||||
* @return array
|
||||
* @return Response
|
||||
* @throws \think\db\exception\DataNotFoundException
|
||||
* @throws \think\db\exception\DbException
|
||||
* @throws \think\db\exception\ModelNotFoundException
|
||||
* @throws \think\exception\DbException
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
*/
|
||||
public function del() {
|
||||
public function del(): Response {
|
||||
$id = $this->request->get('id');
|
||||
if (!$id) {
|
||||
return $this->buildFailed(ReturnCode::EMPTY_PARAMS, '缺少必要参数');
|
||||
@ -184,18 +181,19 @@ class Auth extends Base {
|
||||
|
||||
/**
|
||||
* 从指定组中删除指定用户
|
||||
* @return array
|
||||
* @throws \think\Exception
|
||||
* @throws \think\exception\DbException
|
||||
* @return Response
|
||||
* @throws \think\db\exception\DataNotFoundException
|
||||
* @throws \think\db\exception\DbException
|
||||
* @throws \think\db\exception\ModelNotFoundException
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
*/
|
||||
public function delMember() {
|
||||
public function delMember(): Response {
|
||||
$gid = $this->request->get('gid', 0);
|
||||
$uid = $this->request->get('uid', 0);
|
||||
if (!$gid || !$uid) {
|
||||
return $this->buildFailed(ReturnCode::EMPTY_PARAMS, '缺少必要参数');
|
||||
}
|
||||
$oldInfo = AdminAuthGroupAccess::get(['uid' => $uid])->toArray();
|
||||
$oldInfo = (new AdminAuthGroupAccess())->where('uid', $uid)->find()->toArray();
|
||||
$oldGroupArr = explode(',', $oldInfo['group_id']);
|
||||
$key = array_search($gid, $oldGroupArr);
|
||||
unset($oldGroupArr[$key]);
|
||||
@ -219,7 +217,7 @@ class Auth extends Base {
|
||||
* @return array
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
*/
|
||||
private function buildList($list, $rules) {
|
||||
private function buildList($list, $rules): array {
|
||||
$newList = [];
|
||||
foreach ($list as $key => $value) {
|
||||
$newList[$key]['title'] = $value['title'];
|
||||
@ -239,16 +237,16 @@ class Auth extends Base {
|
||||
|
||||
/**
|
||||
* 编辑权限细节
|
||||
* @throws \Exception
|
||||
* @return Response
|
||||
* @throws \think\db\exception\DataNotFoundException
|
||||
* @throws \think\db\exception\DbException
|
||||
* @throws \think\db\exception\ModelNotFoundException
|
||||
* @throws \think\exception\DbException
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
*/
|
||||
public function editRule() {
|
||||
public function editRule(): Response {
|
||||
$id = $this->request->post('id', 0);
|
||||
$rules = $this->request->post('rules', []);
|
||||
if ($rules) {
|
||||
if (is_array($rules)) {
|
||||
$needAdd = [];
|
||||
$has = (new AdminAuthRule())->where(['group_id' => $id])->select();
|
||||
$has = Tools::buildArrFromObj($has);
|
||||
105
app/controller/admin/Base.php
Normal file
105
app/controller/admin/Base.php
Normal file
@ -0,0 +1,105 @@
|
||||
<?php
|
||||
declare (strict_types=1);
|
||||
/**
|
||||
* 工程基类
|
||||
* @since 2017/02/28 创建
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
*/
|
||||
|
||||
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 <zhaoxiang051405@gmail.com>
|
||||
*/
|
||||
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 <zhaoxiang051405@gmail.com>
|
||||
*/
|
||||
public function updateUserInfo(array $data, bool $isDetail = false): void {
|
||||
$apiAuth = $this->request->header('Api-Auth');
|
||||
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 <zhaoxiang051405@gmail.com>
|
||||
*/
|
||||
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 <zhaoxiang051405@gmail.com>
|
||||
*/
|
||||
protected function debug($data): void {
|
||||
if ($data) {
|
||||
$this->debug[] = $data;
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1,21 +1,23 @@
|
||||
<?php
|
||||
declare (strict_types=1);
|
||||
/**
|
||||
* 接口输入输出字段维护
|
||||
* @since 2018-02-21
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
*/
|
||||
|
||||
namespace app\admin\controller;
|
||||
namespace app\controller\admin;
|
||||
|
||||
use app\model\AdminFields;
|
||||
use app\model\AdminList;
|
||||
use app\util\DataType;
|
||||
use app\util\ReturnCode;
|
||||
use app\util\Tools;
|
||||
use think\Response;
|
||||
|
||||
class Fields extends Base {
|
||||
|
||||
private $dataType = array(
|
||||
private $dataType = [
|
||||
DataType::TYPE_INTEGER => 'Integer',
|
||||
DataType::TYPE_STRING => 'String',
|
||||
DataType::TYPE_BOOLEAN => 'Boolean',
|
||||
@ -25,19 +27,25 @@ class Fields extends Base {
|
||||
DataType::TYPE_MOBILE => 'Mobile',
|
||||
DataType::TYPE_OBJECT => 'Object',
|
||||
DataType::TYPE_ARRAY => 'Array'
|
||||
);
|
||||
];
|
||||
|
||||
public function index() {
|
||||
/**
|
||||
* @return Response
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
*/
|
||||
public function index(): Response {
|
||||
return $this->buildSuccess($this->dataType);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取请求参数
|
||||
* @return array
|
||||
* @throws \think\exception\DbException
|
||||
* @return Response
|
||||
* @throws \think\db\exception\DataNotFoundException
|
||||
* @throws \think\db\exception\DbException
|
||||
* @throws \think\db\exception\ModelNotFoundException
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
*/
|
||||
public function request() {
|
||||
public function request(): Response {
|
||||
$limit = $this->request->get('size', config('apiadmin.ADMIN_LIST_DEFAULT'));
|
||||
$start = $this->request->get('page', 1);
|
||||
$hash = $this->request->get('hash', '');
|
||||
@ -45,8 +53,8 @@ class Fields extends Base {
|
||||
if (empty($hash)) {
|
||||
return $this->buildFailed(ReturnCode::EMPTY_PARAMS, '缺少必要参数');
|
||||
}
|
||||
$listObj = (new AdminFields())->where(['hash' => $hash, 'type' => 0])
|
||||
->paginate($limit, false, ['page' => $start])->toArray();
|
||||
$listObj = (new AdminFields())->where('hash', $hash)->where('type', 0)
|
||||
->paginate(['page' => $start, 'list_rows' => $limit])->toArray();
|
||||
|
||||
$apiInfo = (new AdminList())->where('hash', $hash)->find();
|
||||
|
||||
@ -60,11 +68,13 @@ class Fields extends Base {
|
||||
|
||||
/**
|
||||
* 获取返回参数
|
||||
* @return array
|
||||
* @throws \think\exception\DbException
|
||||
* @return Response
|
||||
* @throws \think\db\exception\DataNotFoundException
|
||||
* @throws \think\db\exception\DbException
|
||||
* @throws \think\db\exception\ModelNotFoundException
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
*/
|
||||
public function response() {
|
||||
public function response(): Response {
|
||||
$limit = $this->request->get('size', config('apiadmin.ADMIN_LIST_DEFAULT'));
|
||||
$start = $this->request->get('page', 1);
|
||||
$hash = $this->request->get('hash', '');
|
||||
@ -72,8 +82,8 @@ class Fields extends Base {
|
||||
if (empty($hash)) {
|
||||
return $this->buildFailed(ReturnCode::EMPTY_PARAMS, '缺少必要参数');
|
||||
}
|
||||
$listObj = (new AdminFields())->where(['hash' => $hash, 'type' => 1])
|
||||
->paginate($limit, false, ['page' => $start])->toArray();
|
||||
$listObj = (new AdminFields())->where('hash', $hash)->where('type', 1)
|
||||
->paginate(['page' => $start, 'list_rows' => $limit])->toArray();
|
||||
|
||||
$apiInfo = (new AdminList())->where('hash', $hash)->find();
|
||||
|
||||
@ -87,10 +97,10 @@ class Fields extends Base {
|
||||
|
||||
/**
|
||||
* 新增字段
|
||||
* @return array
|
||||
* @return Response
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
*/
|
||||
public function add() {
|
||||
public function add(): Response {
|
||||
$postData = $this->request->post();
|
||||
$postData['show_name'] = $postData['field_name'];
|
||||
$postData['default'] = $postData['defaults'];
|
||||
@ -110,10 +120,10 @@ class Fields extends Base {
|
||||
|
||||
/**
|
||||
* 字段编辑
|
||||
* @return array
|
||||
* @return Response
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
*/
|
||||
public function edit() {
|
||||
public function edit(): Response {
|
||||
$postData = $this->request->post();
|
||||
$postData['show_name'] = $postData['field_name'];
|
||||
$postData['default'] = $postData['defaults'];
|
||||
@ -133,17 +143,19 @@ class Fields extends Base {
|
||||
|
||||
/**
|
||||
* 字段删除
|
||||
* @return array
|
||||
* @throws \think\exception\DbException
|
||||
* @return Response
|
||||
* @throws \think\db\exception\DataNotFoundException
|
||||
* @throws \think\db\exception\DbException
|
||||
* @throws \think\db\exception\ModelNotFoundException
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
*/
|
||||
public function del() {
|
||||
public function del(): Response {
|
||||
$id = $this->request->get('id');
|
||||
if (!$id) {
|
||||
return $this->buildFailed(ReturnCode::EMPTY_PARAMS, '缺少必要参数');
|
||||
}
|
||||
|
||||
$fieldsInfo = AdminFields::get($id);
|
||||
$fieldsInfo = (new AdminFields())->where('id', $id)->find();
|
||||
cache('RequestFields:NewRule:' . $fieldsInfo->hash, null);
|
||||
cache('RequestFields:Rule:' . $fieldsInfo->hash, null);
|
||||
cache('ResponseFieldsRule:' . $fieldsInfo->hash, null);
|
||||
@ -155,13 +167,13 @@ class Fields extends Base {
|
||||
|
||||
/**
|
||||
* 批量上传返回字段
|
||||
* @return array
|
||||
* @return Response
|
||||
* @throws \think\db\exception\DataNotFoundException
|
||||
* @throws \think\db\exception\DbException
|
||||
* @throws \think\db\exception\ModelNotFoundException
|
||||
* @throws \think\exception\DbException
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
*/
|
||||
public function upload() {
|
||||
public function upload(): Response {
|
||||
$hash = $this->request->post('hash');
|
||||
$type = $this->request->post('type');
|
||||
$jsonStr = $this->request->post('jsonStr');
|
||||
@ -172,17 +184,15 @@ class Fields extends Base {
|
||||
}
|
||||
AdminList::update(['return_str' => json_encode($data)], ['hash' => $hash]);
|
||||
$this->handle($data['data'], $dataArr);
|
||||
$old = (new AdminFields())->where([
|
||||
'hash' => $hash,
|
||||
'type' => $type
|
||||
])->select();
|
||||
$old = (new AdminFields())->where('hash', $hash)->where('type', $type)->select();
|
||||
$old = Tools::buildArrFromObj($old);
|
||||
$oldArr = array_column($old, 'show_name');
|
||||
$newArr = array_column($dataArr, 'show_name');
|
||||
$addArr = array_diff($newArr, $oldArr);
|
||||
$delArr = array_diff($oldArr, $newArr);
|
||||
if ($delArr) {
|
||||
AdminFields::destroy(['show_name' => ['in', $delArr]]);
|
||||
$delArr = array_values($delArr);
|
||||
(new AdminFields())->whereIn('show_name', $delArr)->delete();
|
||||
}
|
||||
if ($addArr) {
|
||||
$addData = [];
|
||||
@ -201,30 +211,37 @@ class Fields extends Base {
|
||||
return $this->buildSuccess();
|
||||
}
|
||||
|
||||
private function handle($data, &$dataArr, $prefix = 'data', $index = 'data') {
|
||||
/**
|
||||
* @param $data
|
||||
* @param $dataArr
|
||||
* @param string $prefix
|
||||
* @param string $index
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
*/
|
||||
private function handle(array $data, &$dataArr, string $prefix = 'data', string $index = 'data'): void {
|
||||
if (!$this->isAssoc($data)) {
|
||||
$addArr = array(
|
||||
$addArr = [
|
||||
'field_name' => $index,
|
||||
'show_name' => $prefix,
|
||||
'hash' => $this->request->post('hash'),
|
||||
'is_must' => 1,
|
||||
'data_type' => DataType::TYPE_ARRAY,
|
||||
'type' => $this->request->post('type')
|
||||
);
|
||||
];
|
||||
$dataArr[] = $addArr;
|
||||
$prefix .= '[]';
|
||||
if (isset($data[0]) && is_array($data[0])) {
|
||||
$this->handle($data[0], $dataArr, $prefix);
|
||||
}
|
||||
} else {
|
||||
$addArr = array(
|
||||
$addArr = [
|
||||
'field_name' => $index,
|
||||
'show_name' => $prefix,
|
||||
'hash' => $this->request->post('hash'),
|
||||
'is_must' => 1,
|
||||
'data_type' => DataType::TYPE_OBJECT,
|
||||
'type' => $this->request->post('type')
|
||||
);
|
||||
];
|
||||
$dataArr[] = $addArr;
|
||||
$prefix .= '{}';
|
||||
foreach ($data as $index => $datum) {
|
||||
@ -260,7 +277,7 @@ class Fields extends Base {
|
||||
* @return bool
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
*/
|
||||
private function isAssoc(array $arr) {
|
||||
private function isAssoc(array $arr): bool {
|
||||
if (array() === $arr) return false;
|
||||
|
||||
return array_keys($arr) !== range(0, count($arr) - 1);
|
||||
@ -1,12 +1,14 @@
|
||||
<?php
|
||||
declare (strict_types=1);
|
||||
|
||||
namespace app\admin\controller;
|
||||
namespace app\controller\admin;
|
||||
|
||||
use app\util\ReturnCode;
|
||||
use think\Response;
|
||||
|
||||
class Index extends Base {
|
||||
|
||||
public function upload() {
|
||||
public function upload(): Response {
|
||||
$path = '/upload/' . date('Ymd', time()) . '/';
|
||||
$name = $_FILES['file']['name'];
|
||||
$tmp_name = $_FILES['file']['tmp_name'];
|
||||
@ -1,26 +1,28 @@
|
||||
<?php
|
||||
declare (strict_types=1);
|
||||
/**
|
||||
* 接口组维护
|
||||
* @since 2018-02-11
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
*/
|
||||
|
||||
namespace app\admin\controller;
|
||||
namespace app\controller\admin;
|
||||
|
||||
use app\model\AdminApp;
|
||||
use app\model\AdminGroup;
|
||||
use app\model\AdminList;
|
||||
use app\util\ReturnCode;
|
||||
use think\Response;
|
||||
|
||||
class InterfaceGroup extends Base {
|
||||
|
||||
/**
|
||||
* 获取接口组列表
|
||||
* @return array
|
||||
* @throws \think\exception\DbException
|
||||
* @return Response
|
||||
* @throws \think\db\exception\DbException
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
*/
|
||||
public function index() {
|
||||
public function index(): Response {
|
||||
$limit = $this->request->get('size', config('apiadmin.ADMIN_LIST_DEFAULT'));
|
||||
$start = $this->request->get('page', 1);
|
||||
$keywords = $this->request->get('keywords', '');
|
||||
@ -41,7 +43,7 @@ class InterfaceGroup extends Base {
|
||||
break;
|
||||
}
|
||||
}
|
||||
$listObj = $obj->order('create_time', 'desc')->paginate($limit, false, ['page' => $start])->toArray();
|
||||
$listObj = $obj->order('create_time', 'desc')->paginate(['page' => $start, 'list_rows' => $limit])->toArray();
|
||||
|
||||
return $this->buildSuccess([
|
||||
'list' => $listObj['data'],
|
||||
@ -51,12 +53,13 @@ class InterfaceGroup extends Base {
|
||||
|
||||
/**
|
||||
* 获取全部有效的接口组
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
* @return Response
|
||||
* @throws \think\db\exception\DataNotFoundException
|
||||
* @throws \think\db\exception\DbException
|
||||
* @throws \think\db\exception\ModelNotFoundException
|
||||
* @throws \think\exception\DbException
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
*/
|
||||
public function getAll() {
|
||||
public function getAll(): Response {
|
||||
$listInfo = (new AdminGroup())->where(['status' => 1])->select();
|
||||
|
||||
return $this->buildSuccess([
|
||||
@ -66,10 +69,10 @@ class InterfaceGroup extends Base {
|
||||
|
||||
/**
|
||||
* 接口组状态编辑
|
||||
* @return array
|
||||
* @return Response
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
*/
|
||||
public function changeStatus() {
|
||||
public function changeStatus(): Response {
|
||||
$id = $this->request->get('id');
|
||||
$status = $this->request->get('status');
|
||||
$res = AdminGroup::update([
|
||||
@ -85,10 +88,10 @@ class InterfaceGroup extends Base {
|
||||
|
||||
/**
|
||||
* 添加接口组
|
||||
* @return Response
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
* @return array
|
||||
*/
|
||||
public function add() {
|
||||
public function add(): Response {
|
||||
$postData = $this->request->post();
|
||||
$res = AdminGroup::create($postData);
|
||||
if ($res === false) {
|
||||
@ -100,10 +103,10 @@ class InterfaceGroup extends Base {
|
||||
|
||||
/**
|
||||
* 接口组编辑
|
||||
* @return Response
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
* @return array
|
||||
*/
|
||||
public function edit() {
|
||||
public function edit(): Response {
|
||||
$postData = $this->request->post();
|
||||
$res = AdminGroup::update($postData);
|
||||
if ($res === false) {
|
||||
@ -115,11 +118,13 @@ class InterfaceGroup extends Base {
|
||||
|
||||
/**
|
||||
* 接口组删除
|
||||
* @return array
|
||||
* @throws \think\exception\DbException
|
||||
* @return Response
|
||||
* @throws \think\db\exception\DataNotFoundException
|
||||
* @throws \think\db\exception\DbException
|
||||
* @throws \think\db\exception\ModelNotFoundException
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
*/
|
||||
public function del() {
|
||||
public function del(): Response {
|
||||
$hash = $this->request->get('hash');
|
||||
if (!$hash) {
|
||||
return $this->buildFailed(ReturnCode::EMPTY_PARAMS, '缺少必要参数');
|
||||
@ -129,10 +134,7 @@ class InterfaceGroup extends Base {
|
||||
}
|
||||
|
||||
AdminList::update(['group_hash' => 'default'], ['group_hash' => $hash]);
|
||||
|
||||
$hashRule = AdminApp::all([
|
||||
'app_api_show' => ['like', "%$hash%"]
|
||||
]);
|
||||
$hashRule = (new AdminApp())->whereLike('app_api_show', "%$hash%")->select();
|
||||
if ($hashRule) {
|
||||
foreach ($hashRule as $rule) {
|
||||
$appApiShowArr = json_decode($rule->app_api_show, true);
|
||||
@ -1,27 +1,29 @@
|
||||
<?php
|
||||
declare (strict_types=1);
|
||||
/**
|
||||
* 接口管理
|
||||
* @since 2018-02-11
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
*/
|
||||
|
||||
namespace app\admin\controller;
|
||||
namespace app\controller\admin;
|
||||
|
||||
use app\model\AdminApp;
|
||||
use app\model\AdminFields;
|
||||
use app\model\AdminList;
|
||||
use app\util\ReturnCode;
|
||||
use think\facade\Env;
|
||||
use think\Response;
|
||||
|
||||
class InterfaceList extends Base {
|
||||
|
||||
/**
|
||||
* 获取接口列表
|
||||
* @return array
|
||||
* @throws \think\exception\DbException
|
||||
* @return Response
|
||||
* @throws \think\db\exception\DbException
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
*/
|
||||
public function index() {
|
||||
public function index(): Response {
|
||||
$limit = $this->request->get('size', config('apiadmin.ADMIN_LIST_DEFAULT'));
|
||||
$start = $this->request->get('page', 1);
|
||||
$keywords = $this->request->get('keywords', '');
|
||||
@ -45,7 +47,7 @@ class InterfaceList extends Base {
|
||||
break;
|
||||
}
|
||||
}
|
||||
$listObj = $obj->order('id', 'DESC')->paginate($limit, false, ['page' => $start])->toArray();
|
||||
$listObj = $obj->order('id', 'DESC')->paginate(['page' => $start, 'list_rows' => $limit])->toArray();
|
||||
|
||||
return $this->buildSuccess([
|
||||
'list' => $listObj['data'],
|
||||
@ -55,10 +57,10 @@ class InterfaceList extends Base {
|
||||
|
||||
/**
|
||||
* 获取接口唯一标识
|
||||
* @return array
|
||||
* @return Response
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
*/
|
||||
public function getHash() {
|
||||
public function getHash(): Response {
|
||||
$res['hash'] = uniqid();
|
||||
|
||||
return $this->buildSuccess($res);
|
||||
@ -66,10 +68,10 @@ class InterfaceList extends Base {
|
||||
|
||||
/**
|
||||
* 新增接口
|
||||
* @return array
|
||||
* @return Response
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
*/
|
||||
public function add() {
|
||||
public function add(): Response {
|
||||
$postData = $this->request->post();
|
||||
if (!preg_match("/^[A-Za-z0-9_\/]+$/", $postData['api_class'])) {
|
||||
return $this->buildFailed(ReturnCode::DB_SAVE_ERROR, '真实类名只允许填写字母，数字和/');
|
||||
@ -85,10 +87,10 @@ class InterfaceList extends Base {
|
||||
|
||||
/**
|
||||
* 接口状态编辑
|
||||
* @return array
|
||||
* @return Response
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
*/
|
||||
public function changeStatus() {
|
||||
public function changeStatus(): Response {
|
||||
$hash = $this->request->get('hash');
|
||||
$status = $this->request->get('status');
|
||||
$res = AdminList::update([
|
||||
@ -106,10 +108,10 @@ class InterfaceList extends Base {
|
||||
|
||||
/**
|
||||
* 编辑接口
|
||||
* @return array
|
||||
* @return Response
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
*/
|
||||
public function edit() {
|
||||
public function edit(): Response {
|
||||
$postData = $this->request->post();
|
||||
if (!preg_match("/^[A-Za-z0-9_\/]+$/", $postData['api_class'])) {
|
||||
return $this->buildFailed(ReturnCode::DB_SAVE_ERROR, '真实类名只允许填写字母，数字和/');
|
||||
@ -126,21 +128,21 @@ class InterfaceList extends Base {
|
||||
|
||||
/**
|
||||
* 删除接口
|
||||
* @return array
|
||||
* @throws \think\exception\DbException
|
||||
* @return Response
|
||||
* @throws \think\db\exception\DataNotFoundException
|
||||
* @throws \think\db\exception\DbException
|
||||
* @throws \think\db\exception\ModelNotFoundException
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
*/
|
||||
public function del() {
|
||||
public function del(): Response {
|
||||
$hash = $this->request->get('hash');
|
||||
if (!$hash) {
|
||||
return $this->buildFailed(ReturnCode::EMPTY_PARAMS, '缺少必要参数');
|
||||
}
|
||||
|
||||
$hashRule = AdminApp::all([
|
||||
'app_api' => ['like', "%$hash%"]
|
||||
]);
|
||||
$hashRule = (new AdminApp())->whereLike('app_api', "%$hash%")->select();
|
||||
if ($hashRule) {
|
||||
$oldInfo = AdminList::get(['hash' => $hash]);
|
||||
$oldInfo = (new AdminList())->where('hash', $hash)->find();
|
||||
foreach ($hashRule as $rule) {
|
||||
$appApiArr = explode(',', $rule->app_api);
|
||||
$appApiIndex = array_search($hash, $appApiArr);
|
||||
@ -148,10 +150,10 @@ class InterfaceList extends Base {
|
||||
$rule->app_api = implode(',', $appApiArr);
|
||||
|
||||
$appApiShowArrOld = json_decode($rule->app_api_show, true);
|
||||
$appApiShowArr = $appApiShowArrOld[$oldInfo->groupHash];
|
||||
$appApiShowArr = $appApiShowArrOld[$oldInfo->group_hash];
|
||||
$appApiShowIndex = array_search($hash, $appApiShowArr);
|
||||
array_splice($appApiShowArr, $appApiShowIndex, 1);
|
||||
$appApiShowArrOld[$oldInfo->groupHash] = $appApiShowArr;
|
||||
$appApiShowArrOld[$oldInfo->group_hash] = $appApiShowArr;
|
||||
$rule->app_api_show = json_encode($appApiShowArrOld);
|
||||
|
||||
$rule->save();
|
||||
@ -168,27 +170,29 @@ class InterfaceList extends Base {
|
||||
|
||||
/**
|
||||
* 刷新接口路由
|
||||
* @return array
|
||||
* @throws \think\exception\DbException
|
||||
* @return Response
|
||||
* @throws \think\db\exception\DataNotFoundException
|
||||
* @throws \think\db\exception\DbException
|
||||
* @throws \think\db\exception\ModelNotFoundException
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
*/
|
||||
public function refresh() {
|
||||
$rootPath = Env::get('root_path');
|
||||
public function refresh(): Response {
|
||||
$rootPath = root_path();
|
||||
$apiRoutePath = $rootPath . 'route/apiRoute.php';
|
||||
$tplPath = $rootPath . 'application/install/apiRoute.tpl';
|
||||
$tplPath = $rootPath . 'install/apiRoute.tpl';
|
||||
$methodArr = ['*', 'POST', 'GET'];
|
||||
|
||||
$tplOriginStr = file_get_contents($tplPath);
|
||||
$listInfo = AdminList::all(['status' => 1]);
|
||||
$listInfo = (new AdminList())->where('status', 1)->select();
|
||||
$tplStr = [];
|
||||
foreach ($listInfo as $value) {
|
||||
if($value['hash_type'] === 1) {
|
||||
array_push($tplStr, 'Route::rule(\'' . addslashes($value->api_class) . '\',\'api/' . addslashes($value->api_class) . '\', \'' . $methodArr[$value->method] . '\')->middleware([\'ApiAuth\', \'ApiPermission\', \'RequestFilter\', \'ApiLog\']);');
|
||||
if ($value['hash_type'] === 1) {
|
||||
array_push($tplStr, 'Route::rule(\'' . addslashes($value->api_class) . '\',\'api.' . addslashes($value->api_class) . '\', \'' . $methodArr[$value->method] . '\')->middleware([app\middleware\ApiAuth::class, app\middleware\ApiPermission::class, app\middleware\RequestFilter::class, app\middleware\ApiLog::class]);');
|
||||
} else {
|
||||
array_push($tplStr, 'Route::rule(\'' . addslashes($value->hash) . '\',\'api/' . addslashes($value->api_class) . '\', \'' . $methodArr[$value->method] . '\')->middleware([\'ApiAuth\', \'ApiPermission\', \'RequestFilter\', \'ApiLog\']);');
|
||||
array_push($tplStr, 'Route::rule(\'' . addslashes($value->hash) . '\',\'api.' . addslashes($value->api_class) . '\', \'' . $methodArr[$value->method] . '\')->middleware([app\middleware\ApiAuth::class, app\middleware\ApiPermission::class, app\middleware\RequestFilter::class, app\middleware\ApiLog::class]);');
|
||||
}
|
||||
}
|
||||
$tplOriginStr = str_replace(['{$API_RULE}'], [implode($tplStr, PHP_EOL . ' ')], $tplOriginStr);
|
||||
$tplOriginStr = str_replace(['{$API_RULE}'], [implode(PHP_EOL . ' ', $tplStr)], $tplOriginStr);
|
||||
|
||||
file_put_contents($apiRoutePath, $tplOriginStr);
|
||||
|
||||
@ -1,24 +1,26 @@
|
||||
<?php
|
||||
declare (strict_types=1);
|
||||
/**
|
||||
* 后台操作日志管理
|
||||
* @since 2018-02-06
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
*/
|
||||
|
||||
namespace app\admin\controller;
|
||||
namespace app\controller\admin;
|
||||
|
||||
use app\model\AdminUserAction;
|
||||
use app\util\ReturnCode;
|
||||
use think\Response;
|
||||
|
||||
class Log extends Base {
|
||||
|
||||
/**
|
||||
* 获取操作日志列表
|
||||
* @return array
|
||||
* @throws \think\exception\DbException
|
||||
* @return Response
|
||||
* @throws \think\db\exception\DbException
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
*/
|
||||
public function index() {
|
||||
public function index(): Response {
|
||||
$limit = $this->request->get('size', config('apiadmin.ADMIN_LIST_DEFAULT'));
|
||||
$start = $this->request->get('page', 1);
|
||||
$type = $this->request->get('type', '');
|
||||
@ -38,7 +40,7 @@ class Log extends Base {
|
||||
break;
|
||||
}
|
||||
}
|
||||
$listObj = $obj->order('add_time', 'DESC')->paginate($limit, false, ['page' => $start])->toArray();
|
||||
$listObj = $obj->order('add_time', 'DESC')->paginate(['page' => $start, 'list_rows' => $limit])->toArray();
|
||||
|
||||
return $this->buildSuccess([
|
||||
'list' => $listObj['data'],
|
||||
@ -48,10 +50,10 @@ class Log extends Base {
|
||||
|
||||
/**
|
||||
* 删除日志
|
||||
* @return array
|
||||
* @return Response
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
*/
|
||||
public function del() {
|
||||
public function del(): Response {
|
||||
$id = $this->request->get('id');
|
||||
if (!$id) {
|
||||
return $this->buildFailed(ReturnCode::EMPTY_PARAMS, '缺少必要参数');
|
||||
@ -1,11 +1,12 @@
|
||||
<?php
|
||||
declare (strict_types=1);
|
||||
/**
|
||||
* 登录登出
|
||||
* @since 2017-11-02
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
*/
|
||||
|
||||
namespace app\admin\controller;
|
||||
namespace app\controller\admin;
|
||||
|
||||
use app\model\AdminAuthGroupAccess;
|
||||
use app\model\AdminAuthRule;
|
||||
@ -15,17 +16,19 @@ use app\model\AdminUserData;
|
||||
use app\util\ReturnCode;
|
||||
use app\util\RouterTool;
|
||||
use app\util\Tools;
|
||||
use think\Response;
|
||||
|
||||
class Login extends Base {
|
||||
|
||||
/**
|
||||
* 用户登录【账号密码登录】
|
||||
* @return array
|
||||
* @throws \think\Exception
|
||||
* @throws \think\exception\DbException
|
||||
* @return Response
|
||||
* @throws \think\db\exception\DataNotFoundException
|
||||
* @throws \think\db\exception\DbException
|
||||
* @throws \think\db\exception\ModelNotFoundException
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
*/
|
||||
public function index() {
|
||||
public function index(): Response {
|
||||
$username = $this->request->post('username');
|
||||
$password = $this->request->post('password');
|
||||
if (!$username) {
|
||||
@ -36,7 +39,7 @@ class Login extends Base {
|
||||
} else {
|
||||
$password = Tools::userMd5($password);
|
||||
}
|
||||
$userInfo = AdminUser::get(['username' => $username, 'password' => $password]);
|
||||
$userInfo = (new AdminUser())->where('username', $username)->where('password', $password)->find();
|
||||
if (!empty($userInfo)) {
|
||||
if ($userInfo['status']) {
|
||||
//更新用户数据
|
||||
@ -44,13 +47,13 @@ class Login extends Base {
|
||||
$data = [];
|
||||
if ($userData) {
|
||||
$userData->login_times++;
|
||||
$userData->last_login_ip = $this->request->ip(1);
|
||||
$userData->last_login_ip = sprintf("%u", ip2long($this->request->ip()));
|
||||
$userData->last_login_time = time();
|
||||
$userData->save();
|
||||
} else {
|
||||
$data['login_times'] = 1;
|
||||
$data['uid'] = $userInfo['id'];
|
||||
$data['last_login_ip'] = $this->request->ip(1);
|
||||
$data['last_login_ip'] = sprintf("%u", ip2long($this->request->ip()));
|
||||
$data['last_login_time'] = time();
|
||||
$data['head_img'] = '';
|
||||
AdminUserData::create($data);
|
||||
@ -64,7 +67,7 @@ class Login extends Base {
|
||||
return $this->buildFailed(ReturnCode::LOGIN_ERROR, '用户名密码不正确');
|
||||
}
|
||||
$userInfo['access'] = $this->getAccess($userInfo['id']);
|
||||
$userInfo['menu'] = $this->getAccessMenu($userInfo['id']);
|
||||
$userInfo['menu'] = $this->getAccessMenuData($userInfo['id']);
|
||||
|
||||
$apiAuth = md5(uniqid() . time());
|
||||
cache('Login:' . $apiAuth, json_encode($userInfo), config('apiadmin.ONLINE_TIME'));
|
||||
@ -72,51 +75,60 @@ class Login extends Base {
|
||||
|
||||
$userInfo['apiAuth'] = $apiAuth;
|
||||
|
||||
return $this->buildSuccess($userInfo, '登录成功');
|
||||
return $this->buildSuccess($userInfo->toArray(), '登录成功');
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取用户信息
|
||||
* @return mixed
|
||||
* @return Response
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
*/
|
||||
public function getUserInfo() {
|
||||
public function getUserInfo(): Response {
|
||||
return $this->buildSuccess($this->userInfo);
|
||||
}
|
||||
|
||||
/**
|
||||
* 用户登出
|
||||
* @return array
|
||||
* @return Response
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
*/
|
||||
public function logout() {
|
||||
$ApiAuth = $this->request->header('ApiAuth');
|
||||
public function logout(): Response {
|
||||
$ApiAuth = $this->request->header('Api-Auth');
|
||||
cache('Login:' . $ApiAuth, null);
|
||||
cache('Login:' . $this->userInfo['id'], null);
|
||||
|
||||
return $this->buildSuccess([], '登出成功');
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取当前用户的允许菜单
|
||||
* @return Response
|
||||
* @throws \think\db\exception\DataNotFoundException
|
||||
* @throws \think\db\exception\DbException
|
||||
* @throws \think\db\exception\ModelNotFoundException
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
*/
|
||||
public function getAccessMenu(): Response {
|
||||
return $this->buildSuccess($this->getAccessMenuData($this->userInfo['id']));
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取当前用户的允许菜单
|
||||
* @param int $uid
|
||||
* @return array
|
||||
* @throws \think\db\exception\DataNotFoundException
|
||||
* @throws \think\db\exception\DbException
|
||||
* @throws \think\db\exception\ModelNotFoundException
|
||||
* @throws \think\exception\DbException
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
*/
|
||||
public function getAccessMenu($uid = 0) {
|
||||
if ($uid == 0) {
|
||||
$uid = $this->userInfo['id'];
|
||||
}
|
||||
public function getAccessMenuData(int $uid): array {
|
||||
$returnData = [];
|
||||
$isSupper = Tools::isAdministrator($uid);
|
||||
if ($isSupper) {
|
||||
$access = (new AdminMenu())->where('router', '<>', '')->select();
|
||||
$returnData = Tools::listToTree(Tools::buildArrFromObj($access));
|
||||
} else {
|
||||
$groups = AdminAuthGroupAccess::get(['uid' => $uid]);
|
||||
$groups = (new AdminAuthGroupAccess())->where('uid', $uid)->find();
|
||||
if (isset($groups) && $groups->group_id) {
|
||||
$access = (new AdminAuthRule())->whereIn('group_id', $groups->group_id)->select();
|
||||
$access = array_unique(array_column(Tools::buildArrFromObj($access), 'url'));
|
||||
@ -126,28 +138,28 @@ class Login extends Base {
|
||||
RouterTool::buildVueRouter($returnData);
|
||||
}
|
||||
}
|
||||
if ($uid == 0) {
|
||||
return $this->buildSuccess($returnData);
|
||||
} else {
|
||||
return $returnData;
|
||||
}
|
||||
|
||||
return array_values($returnData);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取用户权限数据
|
||||
* @param $uid
|
||||
* @return array
|
||||
* @throws \think\db\exception\DataNotFoundException
|
||||
* @throws \think\db\exception\DbException
|
||||
* @throws \think\db\exception\ModelNotFoundException
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
*/
|
||||
public function getAccess($uid) {
|
||||
public function getAccess(int $uid): array {
|
||||
$isSupper = Tools::isAdministrator($uid);
|
||||
if ($isSupper) {
|
||||
$access = AdminMenu::all();
|
||||
$access = (new AdminMenu())->select();
|
||||
$access = Tools::buildArrFromObj($access);
|
||||
|
||||
return array_values(array_filter(array_column($access, 'url')));
|
||||
} else {
|
||||
$groups = AdminAuthGroupAccess::get(['uid' => $uid]);
|
||||
$groups = (new AdminAuthGroupAccess())->where('uid', $uid)->find();
|
||||
if (isset($groups) && $groups->group_id) {
|
||||
$access = (new AdminAuthRule())->whereIn('group_id', $groups->group_id)->select();
|
||||
$access = Tools::buildArrFromObj($access);
|
||||
@ -1,25 +1,29 @@
|
||||
<?php
|
||||
declare (strict_types=1);
|
||||
/**
|
||||
* 目录管理
|
||||
* @since 2018-01-16
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
*/
|
||||
|
||||
namespace app\admin\controller;
|
||||
namespace app\controller\admin;
|
||||
|
||||
use app\model\AdminMenu;
|
||||
use app\util\ReturnCode;
|
||||
use app\util\Tools;
|
||||
use think\Response;
|
||||
|
||||
class Menu extends Base {
|
||||
|
||||
/**
|
||||
* 获取菜单列表
|
||||
* @return array
|
||||
* @throws \think\exception\DbException
|
||||
* @return \think\Response
|
||||
* @throws \think\db\exception\DataNotFoundException
|
||||
* @throws \think\db\exception\DbException
|
||||
* @throws \think\db\exception\ModelNotFoundException
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
*/
|
||||
public function index() {
|
||||
public function index(): Response {
|
||||
$keywords = $this->request->get('keywords', '');
|
||||
$obj = new AdminMenu();
|
||||
if ($keywords) {
|
||||
@ -38,10 +42,10 @@ class Menu extends Base {
|
||||
|
||||
/**
|
||||
* 新增菜单
|
||||
* @return array
|
||||
* @return \think\Response
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
*/
|
||||
public function add() {
|
||||
public function add(): Response {
|
||||
$postData = $this->request->post();
|
||||
if ($postData['url']) {
|
||||
$postData['url'] = 'admin/' . $postData['url'];
|
||||
@ -56,10 +60,10 @@ class Menu extends Base {
|
||||
|
||||
/**
|
||||
* 菜单状态编辑
|
||||
* @return array
|
||||
* @return Response
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
*/
|
||||
public function changeStatus() {
|
||||
public function changeStatus(): Response {
|
||||
$id = $this->request->get('id');
|
||||
$status = $this->request->get('status');
|
||||
$res = AdminMenu::update([
|
||||
@ -75,10 +79,10 @@ class Menu extends Base {
|
||||
|
||||
/**
|
||||
* 编辑菜单
|
||||
* @return array
|
||||
* @return Response
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
*/
|
||||
public function edit() {
|
||||
public function edit(): Response {
|
||||
$postData = $this->request->post();
|
||||
if ($postData['url']) {
|
||||
$postData['url'] = 'admin/' . $postData['url'];
|
||||
@ -93,11 +97,10 @@ class Menu extends Base {
|
||||
|
||||
/**
|
||||
* 删除菜单
|
||||
* @return array
|
||||
* @throws \Exception
|
||||
* @return Response
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
*/
|
||||
public function del() {
|
||||
public function del(): Response {
|
||||
$id = $this->request->get('id');
|
||||
if (!$id) {
|
||||
return $this->buildFailed(ReturnCode::EMPTY_PARAMS, '缺少必要参数');
|
||||
@ -1,12 +1,14 @@
|
||||
<?php
|
||||
declare (strict_types=1);
|
||||
|
||||
namespace app\admin\controller;
|
||||
namespace app\controller\admin;
|
||||
|
||||
use app\util\ReturnCode;
|
||||
use think\Response;
|
||||
|
||||
class Miss extends Base {
|
||||
|
||||
public function index() {
|
||||
public function index(): Response {
|
||||
if ($this->request->isOptions()) {
|
||||
return $this->buildSuccess();
|
||||
} else {
|
||||
@ -1,11 +1,12 @@
|
||||
<?php
|
||||
declare (strict_types=1);
|
||||
/**
|
||||
* 三方一键登录平台
|
||||
* @since 2018-03-28
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
*/
|
||||
|
||||
namespace app\admin\controller;
|
||||
namespace app\controller\admin;
|
||||
|
||||
use app\model\AdminAuthGroupAccess;
|
||||
use app\model\AdminUser;
|
||||
@ -16,6 +17,7 @@ use Endroid\QrCode\ErrorCorrectionLevel;
|
||||
use Endroid\QrCode\QrCode;
|
||||
use think\facade\Cache;
|
||||
use think\facade\Env;
|
||||
use think\Response;
|
||||
|
||||
class ThirdLogin extends Base {
|
||||
|
||||
@ -50,13 +52,13 @@ class ThirdLogin extends Base {
|
||||
|
||||
/**
|
||||
* 使用微信开放平台登录
|
||||
* @return array
|
||||
* @return Response
|
||||
* @throws \think\db\exception\DataNotFoundException
|
||||
* @throws \think\db\exception\DbException
|
||||
* @throws \think\db\exception\ModelNotFoundException
|
||||
* @throws \think\exception\DbException
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
*/
|
||||
public function wx() {
|
||||
public function wx(): Response {
|
||||
$state = $this->request->get('state', '');
|
||||
$code = $this->request->get('code', '');
|
||||
|
||||
@ -89,10 +91,10 @@ class ThirdLogin extends Base {
|
||||
|
||||
/**
|
||||
* 获取授权登录的二维码
|
||||
* @return array
|
||||
* @return Response
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
*/
|
||||
public function getQr() {
|
||||
public function getQr(): Response {
|
||||
$state = uniqid();
|
||||
$query = [
|
||||
'appid' => $this->wxConfig['appId'],
|
||||
@ -126,12 +128,10 @@ class ThirdLogin extends Base {
|
||||
|
||||
/**
|
||||
* 接受微信回调，处理用户登录
|
||||
* @return array
|
||||
* @throws \think\Exception
|
||||
* @throws \think\exception\DbException
|
||||
* @return Response
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
*/
|
||||
public function loginByWx() {
|
||||
public function loginByWx(): Response {
|
||||
$code = $this->request->get('code');
|
||||
$state = $this->request->get('state');
|
||||
|
||||
@ -183,13 +183,13 @@ class ThirdLogin extends Base {
|
||||
|
||||
/**
|
||||
* 处理微信用户登录
|
||||
* @return array
|
||||
* @return Response
|
||||
* @throws \think\db\exception\DataNotFoundException
|
||||
* @throws \think\db\exception\DbException
|
||||
* @throws \think\db\exception\ModelNotFoundException
|
||||
* @throws \think\exception\DbException
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
*/
|
||||
public function checkWxLogin() {
|
||||
public function checkWxLogin(): Response {
|
||||
$state = $this->request->get('state');
|
||||
$userInfo = cache($state);
|
||||
|
||||
@ -212,10 +212,10 @@ class ThirdLogin extends Base {
|
||||
|
||||
/**
|
||||
* 获取qq登录必要参数
|
||||
* @return array
|
||||
* @return Response
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
*/
|
||||
public function getWxCode() {
|
||||
public function getWxCode(): Response {
|
||||
$state = md5(uniqid() . time());
|
||||
cache($state, $state, 300);
|
||||
|
||||
@ -228,10 +228,10 @@ class ThirdLogin extends Base {
|
||||
|
||||
/**
|
||||
* 获取qq登录必要参数
|
||||
* @return array
|
||||
* @return Response
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
*/
|
||||
public function getQQCode() {
|
||||
public function getQQCode(): Response {
|
||||
$state = md5(uniqid() . time());
|
||||
cache($state, $state, 300);
|
||||
|
||||
@ -244,13 +244,13 @@ class ThirdLogin extends Base {
|
||||
|
||||
/**
|
||||
* 使用QQ登录
|
||||
* @return array
|
||||
* @return Response
|
||||
* @throws \think\db\exception\DataNotFoundException
|
||||
* @throws \think\db\exception\DbException
|
||||
* @throws \think\db\exception\ModelNotFoundException
|
||||
* @throws \think\exception\DbException
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
*/
|
||||
public function loginByQQ() {
|
||||
public function loginByQQ(): Response {
|
||||
$state = $this->request->get('state', '');
|
||||
$code = $this->request->get('code', '');
|
||||
|
||||
@ -292,17 +292,20 @@ class ThirdLogin extends Base {
|
||||
* 统一处理用户登录
|
||||
* @param $openid
|
||||
* @param $userDetail
|
||||
* @return array
|
||||
* @return Response
|
||||
* @throws \think\db\exception\DataNotFoundException
|
||||
* @throws \think\db\exception\DbException
|
||||
* @throws \think\db\exception\ModelNotFoundException
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
*/
|
||||
private function doLogin($openid, $userDetail) {
|
||||
$userInfo = AdminUser::get(['openid' => $openid]);
|
||||
private function doLogin(string $openid, array $userDetail): Response {
|
||||
$userInfo = (new AdminUser())->where('openid', $openid)->find();
|
||||
if (empty($userInfo)) {
|
||||
$userInfo = AdminUser::create([
|
||||
'nickname' => $userDetail['nickname'],
|
||||
'username' => 'ApiAdmin_qq_' . Strs::randString(8),
|
||||
'openid' => $openid,
|
||||
'create_ip' => request()->ip(1),
|
||||
'create_ip' => sprintf("%u", ip2long($this->request->ip())),
|
||||
'status' => 1,
|
||||
'create_time' => time(),
|
||||
'password' => Tools::userMd5('ApiAdmin')
|
||||
@ -310,7 +313,7 @@ class ThirdLogin extends Base {
|
||||
$userDataArr = [
|
||||
'login_times' => 1,
|
||||
'uid' => $userInfo->id,
|
||||
'last_login_ip' => $this->request->ip(1),
|
||||
'last_login_ip' => sprintf("%u", ip2long($this->request->ip())),
|
||||
'last_login_time' => time(),
|
||||
'head_img' => $userDetail['head_img']
|
||||
];
|
||||
@ -325,7 +328,7 @@ class ThirdLogin extends Base {
|
||||
if ($userInfo['status']) {
|
||||
//更新用户数据
|
||||
$userInfo->userData->login_times++;
|
||||
$userInfo->userData->last_login_ip = $this->request->ip(1);
|
||||
$userInfo->userData->last_login_ip = sprintf("%u", ip2long($this->request->ip()));
|
||||
$userInfo->userData->last_login_time = time();
|
||||
$userInfo->userData->save();
|
||||
} else {
|
||||
@ -333,7 +336,8 @@ class ThirdLogin extends Base {
|
||||
}
|
||||
}
|
||||
|
||||
$userInfo['access'] = (new Login())->getAccess($userInfo['id']);
|
||||
$userInfo['access'] = (new Login(App()))->getAccess(intval($userInfo['id']));
|
||||
$userInfo['menu'] = (new Login(App()))->getAccessMenuData(intval($userInfo['id']));
|
||||
|
||||
$apiAuth = md5(uniqid() . time());
|
||||
cache('Login:' . $apiAuth, json_encode($userInfo), config('apiadmin.ONLINE_TIME'));
|
||||
@ -341,6 +345,6 @@ class ThirdLogin extends Base {
|
||||
|
||||
$userInfo['apiAuth'] = $apiAuth;
|
||||
|
||||
return $this->buildSuccess($userInfo, '登录成功');
|
||||
return $this->buildSuccess($userInfo->toArray(), '登录成功');
|
||||
}
|
||||
}
|
||||
@ -1,28 +1,30 @@
|
||||
<?php
|
||||
declare (strict_types=1);
|
||||
/**
|
||||
* 用户管理
|
||||
* @since 2018-02-06
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
*/
|
||||
|
||||
namespace app\admin\controller;
|
||||
namespace app\controller\admin;
|
||||
|
||||
use app\model\AdminAuthGroupAccess;
|
||||
use app\model\AdminUser;
|
||||
use app\model\AdminUserData;
|
||||
use app\util\ReturnCode;
|
||||
use app\util\Tools;
|
||||
use think\Db;
|
||||
use think\facade\Db;
|
||||
use think\Response;
|
||||
|
||||
class User extends Base {
|
||||
|
||||
/**
|
||||
* 获取用户列表
|
||||
* @return array
|
||||
* @throws \think\exception\DbException
|
||||
* @return Response
|
||||
* @throws \think\db\exception\DbException
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
*/
|
||||
public function index() {
|
||||
public function index(): Response {
|
||||
$limit = $this->request->get('size', config('apiadmin.ADMIN_LIST_DEFAULT'));
|
||||
$start = $this->request->get('page', 1);
|
||||
$type = $this->request->get('type', '', 'intval');
|
||||
@ -45,15 +47,13 @@ class User extends Base {
|
||||
}
|
||||
|
||||
$listObj = $obj->order('create_time', 'DESC')
|
||||
->paginate($limit, false, ['page' => $start])->each(function($item, $key){
|
||||
->paginate(['page' => $start, 'list_rows' => $limit])->each(function($item, $key) {
|
||||
$item->userData;
|
||||
})->toArray();
|
||||
$listInfo = $listObj['data'];
|
||||
$idArr = array_column($listInfo, 'id');
|
||||
|
||||
$userGroup = AdminAuthGroupAccess::all(function($query) use ($idArr) {
|
||||
$query->whereIn('uid', $idArr);
|
||||
});
|
||||
$userGroup = (new AdminAuthGroupAccess())->whereIn('uid', $idArr)->select();
|
||||
$userGroup = Tools::buildArrFromObj($userGroup);
|
||||
$userGroup = Tools::buildArrByNewKey($userGroup, 'uid');
|
||||
|
||||
@ -79,13 +79,13 @@ class User extends Base {
|
||||
|
||||
/**
|
||||
* 新增用户
|
||||
* @return array
|
||||
* @return Response
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
*/
|
||||
public function add() {
|
||||
$groups = '';
|
||||
$postData = $this->request->post();
|
||||
$postData['create_ip'] = request()->ip(1);
|
||||
$postData['create_ip'] = sprintf("%u", ip2long($this->request->ip()));
|
||||
$postData['password'] = Tools::userMd5($postData['password']);
|
||||
if (isset($postData['group_id']) && $postData['group_id']) {
|
||||
$groups = trim(implode(',', $postData['group_id']), ',');
|
||||
@ -105,9 +105,10 @@ class User extends Base {
|
||||
|
||||
/**
|
||||
* 获取当前组的全部用户
|
||||
* @return array
|
||||
* @throws \think\Exception
|
||||
* @throws \think\exception\DbException
|
||||
* @return Response
|
||||
* @throws \think\db\exception\DataNotFoundException
|
||||
* @throws \think\db\exception\DbException
|
||||
* @throws \think\db\exception\ModelNotFoundException
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
*/
|
||||
public function getUsers() {
|
||||
@ -146,7 +147,7 @@ class User extends Base {
|
||||
|
||||
/**
|
||||
* 用户状态编辑
|
||||
* @return array
|
||||
* @return Response
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
*/
|
||||
public function changeStatus() {
|
||||
@ -159,7 +160,7 @@ class User extends Base {
|
||||
if ($res === false) {
|
||||
return $this->buildFailed(ReturnCode::DB_SAVE_ERROR);
|
||||
}
|
||||
if($oldAdmin = cache('Login:' . $id)) {
|
||||
if ($oldAdmin = cache('Login:' . $id)) {
|
||||
cache('Login:' . $oldAdmin, null);
|
||||
}
|
||||
|
||||
@ -168,8 +169,10 @@ class User extends Base {
|
||||
|
||||
/**
|
||||
* 编辑用户
|
||||
* @return array
|
||||
* @throws \think\exception\DbException
|
||||
* @return Response
|
||||
* @throws \think\db\exception\DataNotFoundException
|
||||
* @throws \think\db\exception\DbException
|
||||
* @throws \think\db\exception\ModelNotFoundException
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
*/
|
||||
public function edit() {
|
||||
@ -188,7 +191,7 @@ class User extends Base {
|
||||
if ($res === false) {
|
||||
return $this->buildFailed(ReturnCode::DB_SAVE_ERROR);
|
||||
}
|
||||
$has = AdminAuthGroupAccess::get(['uid' => $postData['id']]);
|
||||
$has = (new AdminAuthGroupAccess())->where('uid', $postData['id'])->select();
|
||||
if ($has) {
|
||||
AdminAuthGroupAccess::update([
|
||||
'group_id' => $groups
|
||||
@ -201,7 +204,7 @@ class User extends Base {
|
||||
'group_id' => $groups
|
||||
]);
|
||||
}
|
||||
if($oldAdmin = cache('Login:' . $postData['id'])) {
|
||||
if ($oldAdmin = cache('Login:' . $postData['id'])) {
|
||||
cache('Login:' . $oldAdmin, null);
|
||||
}
|
||||
|
||||
@ -210,8 +213,10 @@ class User extends Base {
|
||||
|
||||
/**
|
||||
* 修改自己的信息
|
||||
* @return array
|
||||
* @throws \think\exception\DbException
|
||||
* @return Response
|
||||
* @throws \think\db\exception\DataNotFoundException
|
||||
* @throws \think\db\exception\DbException
|
||||
* @throws \think\db\exception\ModelNotFoundException
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
*/
|
||||
public function own() {
|
||||
@ -236,10 +241,10 @@ class User extends Base {
|
||||
if ($res === false) {
|
||||
return $this->buildFailed(ReturnCode::DB_SAVE_ERROR);
|
||||
}
|
||||
$userData = AdminUserData::get(['uid' => $postData['id']]);
|
||||
$userData = (new AdminUserData())->where('uid', $postData['id'])->find();
|
||||
$userData->head_img = $headImg;
|
||||
$userData->save();
|
||||
if($oldWiki = cache('WikiLogin:' . $postData['id'])) {
|
||||
if ($oldWiki = cache('WikiLogin:' . $postData['id'])) {
|
||||
cache('WikiLogin:' . $oldWiki, null);
|
||||
}
|
||||
|
||||
@ -248,11 +253,11 @@ class User extends Base {
|
||||
|
||||
/**
|
||||
* 删除用户
|
||||
* @return array
|
||||
* @return Response
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
*/
|
||||
public function del() {
|
||||
$id = $this->request->get('id');
|
||||
$id = $this->request->get('id/d');
|
||||
if (!$id) {
|
||||
return $this->buildFailed(ReturnCode::EMPTY_PARAMS, '缺少必要参数');
|
||||
}
|
||||
@ -263,7 +268,7 @@ class User extends Base {
|
||||
}
|
||||
AdminUser::destroy($id);
|
||||
AdminAuthGroupAccess::destroy(['uid' => $id]);
|
||||
if($oldAdmin = cache('Login:' . $id)) {
|
||||
if ($oldAdmin = cache('Login:' . $id)) {
|
||||
cache('Login:' . $oldAdmin, null);
|
||||
}
|
||||
|
||||
@ -1,16 +1,19 @@
|
||||
<?php
|
||||
declare (strict_types=1);
|
||||
/**
|
||||
* 工程基类
|
||||
* @since 2017/02/28 创建
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
*/
|
||||
|
||||
namespace app\api\controller;
|
||||
namespace app\controller\api;
|
||||
|
||||
use app\BaseController;
|
||||
use app\util\ReturnCode;
|
||||
use think\Controller;
|
||||
use think\facade\Env;
|
||||
use think\Response;
|
||||
|
||||
class Base extends Controller {
|
||||
class Base extends BaseController {
|
||||
|
||||
private $debug = [];
|
||||
protected $userInfo = [];
|
||||
@ -19,33 +22,33 @@ class Base extends Controller {
|
||||
// $this->userInfo = ''; 这部分初始化用户信息可以参考admin模块下的Base去自行处理
|
||||
}
|
||||
|
||||
public function buildSuccess($data = [], $msg = '操作成功', $code = ReturnCode::SUCCESS) {
|
||||
public function buildSuccess(array $data = [], string $msg = '操作成功', int $code = ReturnCode::SUCCESS): Response {
|
||||
$return = [
|
||||
'code' => $code,
|
||||
'msg' => $msg,
|
||||
'data' => $data
|
||||
];
|
||||
if (config('app.app_debug') && $this->debug) {
|
||||
if (Env::get('APP_DEBUG') && $this->debug) {
|
||||
$return['debug'] = $this->debug;
|
||||
}
|
||||
|
||||
return $return;
|
||||
return json($return);
|
||||
}
|
||||
|
||||
public function buildFailed($code, $msg = '操作失败', $data = []) {
|
||||
public function buildFailed(int $code, string $msg = '操作失败', array $data = []): Response {
|
||||
$return = [
|
||||
'code' => $code,
|
||||
'msg' => $msg,
|
||||
'data' => $data
|
||||
];
|
||||
if (config('app.app_debug') && $this->debug) {
|
||||
if (Env::get('APP_DEBUG') && $this->debug) {
|
||||
$return['debug'] = $this->debug;
|
||||
}
|
||||
|
||||
return $return;
|
||||
return json($return);
|
||||
}
|
||||
|
||||
protected function debug($data) {
|
||||
protected function debug($data): void {
|
||||
if ($data) {
|
||||
$this->debug[] = $data;
|
||||
}
|
||||
@ -5,7 +5,7 @@
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
*/
|
||||
|
||||
namespace app\api\controller;
|
||||
namespace app\controller\api;
|
||||
|
||||
use app\model\AdminApp;
|
||||
use app\util\ReturnCode;
|
||||
@ -15,10 +15,10 @@ class BuildToken extends Base {
|
||||
|
||||
/**
|
||||
* 构建AccessToken
|
||||
* @return array
|
||||
* @return \think\Response
|
||||
* @throws \think\db\exception\DataNotFoundException
|
||||
* @throws \think\db\exception\DbException
|
||||
* @throws \think\db\exception\ModelNotFoundException
|
||||
* @throws \think\exception\DbException
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
*/
|
||||
public function getAccessToken() {
|
||||
@ -26,10 +26,13 @@ class BuildToken extends Base {
|
||||
$appInfo = (new AdminApp())->where(['app_id' => $param['app_id'], 'app_status' => 1])->find();
|
||||
if (empty($appInfo)) {
|
||||
return $this->buildFailed(ReturnCode::INVALID, '应用ID非法');
|
||||
} else {
|
||||
$appInfo = $appInfo->toArray();
|
||||
}
|
||||
|
||||
$signature = $param['signature'];
|
||||
unset($param['signature']);
|
||||
unset($param['Access-Token']);
|
||||
$sign = $this->getAuthToken($appInfo['app_secret'], $param);
|
||||
$this->debug($sign);
|
||||
if ($sign !== $signature) {
|
||||
26
app/controller/api/Miss.php
Normal file
26
app/controller/api/Miss.php
Normal file
@ -0,0 +1,26 @@
|
||||
<?php
|
||||
declare (strict_types=1);
|
||||
|
||||
namespace app\controller\api;
|
||||
|
||||
use think\Exception;
|
||||
use think\facade\App;
|
||||
use think\Response;
|
||||
|
||||
class Miss extends Base {
|
||||
|
||||
public function index(): Response {
|
||||
$version = config('apiadmin.APP_VERSION');
|
||||
if (!$version) {
|
||||
throw new Exception('请先执行安装脚本，完成项目初始化！');
|
||||
} else {
|
||||
return $this->buildSuccess([
|
||||
'Product' => config('apiadmin.APP_NAME'),
|
||||
'ApiVersion' => $version,
|
||||
'TpVersion' => App::version(),
|
||||
'Company' => config('apiadmin.COMPANY_NAME'),
|
||||
'ToYou' => "I'm glad to meet you（终于等到你！）"
|
||||
]);
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1,10 +1,11 @@
|
||||
<?php
|
||||
declare (strict_types=1);
|
||||
/**
|
||||
* @since 2019-08-11
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
*/
|
||||
|
||||
namespace app\wiki\controller;
|
||||
namespace app\controller\wiki;
|
||||
|
||||
use app\model\AdminApp;
|
||||
use app\model\AdminFields;
|
||||
@ -13,10 +14,11 @@ use app\model\AdminList;
|
||||
use app\util\DataType;
|
||||
use app\util\ReturnCode;
|
||||
use app\util\Tools;
|
||||
use think\Response;
|
||||
|
||||
class Api extends Base {
|
||||
|
||||
public function errorCode() {
|
||||
public function errorCode(): Response {
|
||||
$codeArr = ReturnCode::getConstants();
|
||||
$codeArr = array_flip($codeArr);
|
||||
$result = [];
|
||||
@ -64,11 +66,11 @@ class Api extends Base {
|
||||
]);
|
||||
}
|
||||
|
||||
public function login() {
|
||||
public function login(): Response {
|
||||
$appId = $this->request->post('username');
|
||||
$appSecret = $this->request->post('password');
|
||||
|
||||
$appInfo = AdminApp::get(['app_id' => $appId, 'app_secret' => $appSecret]);
|
||||
$appInfo = (new AdminApp())->where('app_id', $appId)->where('app_secret', $appSecret)->find();
|
||||
if (!empty($appInfo)) {
|
||||
if ($appInfo->app_status) {
|
||||
//保存用户信息和登录凭证
|
||||
@ -88,9 +90,9 @@ class Api extends Base {
|
||||
}
|
||||
}
|
||||
|
||||
public function groupList() {
|
||||
$groupInfo = AdminGroup::all();
|
||||
$apiInfo = AdminList::all();
|
||||
public function groupList(): Response {
|
||||
$groupInfo = (new AdminGroup())->select();
|
||||
$apiInfo = (new AdminList())->select();
|
||||
|
||||
$listInfo = [];
|
||||
if ($this->appInfo['app_id'] === -1) {
|
||||
@ -98,7 +100,7 @@ class Api extends Base {
|
||||
foreach ($apiInfo as $aVal) {
|
||||
$_apiInfo[$aVal['group_hash']][] = $aVal;
|
||||
}
|
||||
foreach ($groupInfo as $gVal ) {
|
||||
foreach ($groupInfo as $gVal) {
|
||||
if (isset($_apiInfo[$gVal['hash']])) {
|
||||
$gVal['api_info'] = $_apiInfo[$gVal['hash']];
|
||||
}
|
||||
@ -125,7 +127,7 @@ class Api extends Base {
|
||||
]);
|
||||
}
|
||||
|
||||
public function detail() {
|
||||
public function detail(): Response {
|
||||
$hash = $this->request->get('hash');
|
||||
if (!$hash) {
|
||||
return $this->buildFailed(ReturnCode::NOT_EXISTS, '缺少必要参数');
|
||||
@ -135,9 +137,8 @@ class Api extends Base {
|
||||
if (!$apiList) {
|
||||
return $this->buildFailed(ReturnCode::NOT_EXISTS, '接口hash非法');
|
||||
}
|
||||
|
||||
$request = AdminFields::all(['hash' => $hash, 'type' => 0]);
|
||||
$response = AdminFields::all(['hash' => $hash, 'type' => 1]);
|
||||
$request = (new AdminFields())->where('hash', $hash)->where('type', 0)->select();
|
||||
$response = (new AdminFields())->where('hash', $hash)->where('type', 1)->select();
|
||||
$dataType = array(
|
||||
DataType::TYPE_INTEGER => 'Integer',
|
||||
DataType::TYPE_STRING => 'String',
|
||||
@ -150,7 +151,7 @@ class Api extends Base {
|
||||
DataType::TYPE_MOBILE => 'Mobile'
|
||||
);
|
||||
|
||||
$groupInfo = AdminGroup::get(['hash' => $apiList['group_hash']]);
|
||||
$groupInfo = (new AdminGroup())->where('hash', $apiList['group_hash'])->find();
|
||||
$groupInfo->hot = $groupInfo->hot + 1;
|
||||
$groupInfo->save();
|
||||
|
||||
@ -170,7 +171,7 @@ class Api extends Base {
|
||||
]);
|
||||
}
|
||||
|
||||
public function logout() {
|
||||
public function logout(): Response {
|
||||
$ApiAuth = $this->request->header('ApiAuth');
|
||||
cache('WikiLogin:' . $ApiAuth, null);
|
||||
cache('WikiLogin:' . $this->appInfo['id'], null);
|
||||
@ -1,41 +1,43 @@
|
||||
<?php
|
||||
declare (strict_types=1);
|
||||
/**
|
||||
* 工程基类
|
||||
* @since 2017/02/28 创建
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
*/
|
||||
|
||||
namespace app\wiki\controller;
|
||||
namespace app\controller\wiki;
|
||||
|
||||
use app\BaseController;
|
||||
use app\util\ReturnCode;
|
||||
use think\Controller;
|
||||
use think\Response;
|
||||
|
||||
class Base extends Controller {
|
||||
class Base extends BaseController {
|
||||
|
||||
protected $appInfo;
|
||||
|
||||
public function __construct() {
|
||||
parent::__construct();
|
||||
parent::__construct(App());
|
||||
$this->appInfo = $this->request->API_WIKI_USER_INFO;
|
||||
}
|
||||
|
||||
public function buildSuccess($data = [], $msg = '操作成功', $code = ReturnCode::SUCCESS) {
|
||||
public function buildSuccess($data = [], $msg = '操作成功', $code = ReturnCode::SUCCESS): Response {
|
||||
$return = [
|
||||
'code' => $code,
|
||||
'msg' => $msg,
|
||||
'data' => $data
|
||||
];
|
||||
|
||||
return $return;
|
||||
return json($return);
|
||||
}
|
||||
|
||||
public function buildFailed($code, $msg = '操作失败', $data = []) {
|
||||
public function buildFailed($code, $msg = '操作失败', $data = []): Response {
|
||||
$return = [
|
||||
'code' => $code,
|
||||
'msg' => $msg,
|
||||
'data' => $data
|
||||
];
|
||||
|
||||
return $return;
|
||||
return json($return);
|
||||
}
|
||||
}
|
||||
17
app/event.php
Normal file
17
app/event.php
Normal file
@ -0,0 +1,17 @@
|
||||
<?php
|
||||
// 事件定义文件
|
||||
return [
|
||||
'bind' => [
|
||||
],
|
||||
|
||||
'listen' => [
|
||||
'AppInit' => [],
|
||||
'HttpRun' => [],
|
||||
'HttpEnd' => [],
|
||||
'LogLevel' => [],
|
||||
'LogWrite' => [],
|
||||
],
|
||||
|
||||
'subscribe' => [
|
||||
],
|
||||
];
|
||||
10
app/middleware.php
Normal file
10
app/middleware.php
Normal file
@ -0,0 +1,10 @@
|
||||
<?php
|
||||
// 全局中间件定义文件
|
||||
return [
|
||||
// 全局请求缓存
|
||||
// \think\middleware\CheckRequestCache::class,
|
||||
// 多语言加载
|
||||
// \think\middleware\LoadLangPack::class,
|
||||
// Session初始化
|
||||
// \think\middleware\SessionInit::class
|
||||
];
|
||||
@ -1,8 +1,10 @@
|
||||
<?php
|
||||
declare (strict_types=1);
|
||||
|
||||
namespace app\http\middleware;
|
||||
namespace app\middleware;
|
||||
|
||||
use app\util\ReturnCode;
|
||||
use think\Response;
|
||||
|
||||
class AdminAuth {
|
||||
|
||||
@ -13,12 +15,14 @@ class AdminAuth {
|
||||
* @return mixed|\think\response\Json
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
*/
|
||||
public function handle($request, \Closure $next) {
|
||||
public function handle($request, \Closure $next): Response {
|
||||
$header = config('apiadmin.CROSS_DOMAIN');
|
||||
$ApiAuth = $request->header('apiAuth', '');
|
||||
$ApiAuth = $request->header('Api-Auth', '');
|
||||
if ($ApiAuth) {
|
||||
$userInfo = cache('Login:' . $ApiAuth);
|
||||
$userInfo = json_decode($userInfo, true);
|
||||
if ($userInfo) {
|
||||
$userInfo = json_decode($userInfo, true);
|
||||
}
|
||||
if (!$userInfo || !isset($userInfo['id'])) {
|
||||
return json([
|
||||
'code' => ReturnCode::AUTH_ERROR,
|
||||
@ -1,10 +1,12 @@
|
||||
<?php
|
||||
declare (strict_types=1);
|
||||
|
||||
namespace app\http\middleware;
|
||||
namespace app\middleware;
|
||||
|
||||
use app\model\AdminMenu;
|
||||
use app\model\AdminUserAction;
|
||||
use app\util\ReturnCode;
|
||||
use think\Response;
|
||||
|
||||
class AdminLog {
|
||||
|
||||
@ -14,9 +16,9 @@ class AdminLog {
|
||||
* @return \think\response\Json
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
*/
|
||||
public function handle($request, \Closure $next) {
|
||||
public function handle($request, \Closure $next): Response {
|
||||
$userInfo = $request->API_ADMIN_USER_INFO;
|
||||
$menuInfo = AdminMenu::get(['url' => $request->path()]);
|
||||
$menuInfo = (new AdminMenu())->where('url', $request->pathinfo())->find();
|
||||
|
||||
if ($menuInfo) {
|
||||
$menuInfo = $menuInfo->toArray();
|
||||
@ -24,7 +26,7 @@ class AdminLog {
|
||||
|
||||
return json([
|
||||
'code' => ReturnCode::INVALID,
|
||||
'msg' => '当前路由非法：' . $request->path(),
|
||||
'msg' => '当前路由非法：' . $request->pathinfo(),
|
||||
'data' => []
|
||||
])->header(config('apiadmin.CROSS_DOMAIN'));
|
||||
}
|
||||
@ -34,7 +36,7 @@ class AdminLog {
|
||||
'uid' => $userInfo['id'],
|
||||
'nickname' => $userInfo['nickname'],
|
||||
'add_time' => time(),
|
||||
'url' => $request->path(),
|
||||
'url' => $request->pathinfo(),
|
||||
'data' => json_encode($request->param())
|
||||
]);
|
||||
|
||||
@ -1,12 +1,14 @@
|
||||
<?php
|
||||
declare (strict_types=1);
|
||||
|
||||
namespace app\http\middleware;
|
||||
namespace app\middleware;
|
||||
|
||||
use app\model\AdminAuthGroup;
|
||||
use app\model\AdminAuthGroupAccess;
|
||||
use app\model\AdminAuthRule;
|
||||
use app\util\ReturnCode;
|
||||
use app\util\Tools;
|
||||
use think\Response;
|
||||
|
||||
class AdminPermission {
|
||||
|
||||
@ -17,13 +19,12 @@ class AdminPermission {
|
||||
* @return mixed|\think\response\Json
|
||||
* @throws \think\db\exception\DataNotFoundException
|
||||
* @throws \think\db\exception\ModelNotFoundException
|
||||
* @throws \think\exception\DbException
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
*/
|
||||
public function handle($request, \Closure $next) {
|
||||
public function handle($request, \Closure $next): Response {
|
||||
$userInfo = $request->API_ADMIN_USER_INFO;
|
||||
|
||||
if (!$this->checkAuth($userInfo['id'], $request->path())) {
|
||||
// rule里包含了rule(路由规则), ruoter(完整路由)
|
||||
if (!$this->checkAuth($userInfo['id'], $request->rule()->getRule())) {
|
||||
return json([
|
||||
'code' => ReturnCode::INVALID,
|
||||
'msg' => '非常抱歉，您没有权限这么做！',
|
||||
@ -65,7 +66,7 @@ class AdminPermission {
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
*/
|
||||
private function getAuth($uid) {
|
||||
$groups = AdminAuthGroupAccess::get(['uid' => $uid]);
|
||||
$groups = (new AdminAuthGroupAccess())->where('uid', $uid)->find();
|
||||
if (isset($groups) && $groups->group_id) {
|
||||
$openGroup = (new AdminAuthGroup())->whereIn('id', $groups->group_id)->where(['status' => 1])->select();
|
||||
if (isset($openGroup)) {
|
||||
@ -1,12 +1,14 @@
|
||||
<?php
|
||||
declare (strict_types=1);
|
||||
|
||||
namespace app\http\middleware;
|
||||
namespace app\middleware;
|
||||
|
||||
use think\facade\Config;
|
||||
use think\Response;
|
||||
|
||||
class AdminResponse {
|
||||
|
||||
public function handle($request, \Closure $next) {
|
||||
public function handle($request, \Closure $next): Response {
|
||||
return $next($request)->header(Config::get('apiadmin.CROSS_DOMAIN'));
|
||||
}
|
||||
}
|
||||
@ -1,40 +1,55 @@
|
||||
<?php
|
||||
declare (strict_types=1);
|
||||
|
||||
namespace app\http\middleware;
|
||||
namespace app\middleware;
|
||||
|
||||
use app\model\AdminApp;
|
||||
use app\model\AdminList;
|
||||
use app\util\ReturnCode;
|
||||
use think\facade\Cache;
|
||||
use think\Request;
|
||||
|
||||
class ApiAuth {
|
||||
|
||||
/**
|
||||
* 获取接口基本配置参数，校验接口Hash是否合法，校验APP_ID是否合法等
|
||||
* @param \think\facade\Request $request
|
||||
* @param Request $request
|
||||
* @param \Closure $next
|
||||
* @return mixed|\think\response\Json
|
||||
* @throws \think\db\exception\DataNotFoundException
|
||||
* @throws \think\db\exception\DbException
|
||||
* @throws \think\db\exception\ModelNotFoundException
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
*/
|
||||
public function handle($request, \Closure $next) {
|
||||
$header = config('apiadmin.CROSS_DOMAIN');
|
||||
$apiHash = substr($request->path(), 4);
|
||||
|
||||
$pathParam = [];
|
||||
$pathParamStr = str_replace($request->rule()->getRule() . '/', '', $request->pathinfo());
|
||||
$pathArr = explode('/', $pathParamStr);
|
||||
$pathArrLen = count($pathArr);
|
||||
for ($index = 0; $index < $pathArrLen; $index += 2) {
|
||||
if ($index + 1 < $pathArrLen) {
|
||||
$pathParam[$pathArr[$index]] = $pathArr[$index + 1];
|
||||
}
|
||||
}
|
||||
$apiHash = str_replace('api/', '', $request->rule()->getRule());
|
||||
|
||||
if ($apiHash) {
|
||||
$cached = Cache::has('ApiInfo:' . $apiHash);
|
||||
if ($cached) {
|
||||
$apiInfo = Cache::get('ApiInfo:' . $apiHash);
|
||||
} else {
|
||||
$apiInfo = AdminList::get(['hash' => $apiHash, 'hash_type' => 2]);
|
||||
$apiInfo = (new AdminList())->where('hash', $apiHash)->where('hash_type', 2)->find();
|
||||
if ($apiInfo) {
|
||||
$apiInfo = $apiInfo->toArray();
|
||||
Cache::rm('ApiInfo:' . $apiInfo['api_class']);
|
||||
Cache::delete('ApiInfo:' . $apiInfo['api_class']);
|
||||
Cache::set('ApiInfo:' . $apiHash, $apiInfo);
|
||||
} else {
|
||||
$apiInfo = AdminList::get(['api_class' => $apiHash, 'hash_type' => 1]);
|
||||
$apiInfo = (new AdminList())->where('api_class', $apiHash)->where('hash_type', 1)->find();
|
||||
if ($apiInfo) {
|
||||
$apiInfo = $apiInfo->toArray();
|
||||
Cache::rm('ApiInfo:' . $apiInfo['hash']);
|
||||
Cache::delete('ApiInfo:' . $apiInfo['hash']);
|
||||
Cache::set('ApiInfo:' . $apiHash, $apiInfo);
|
||||
} else {
|
||||
return json([
|
||||
@ -46,11 +61,20 @@ class ApiAuth {
|
||||
}
|
||||
}
|
||||
|
||||
$accessToken = $request->header('access-token', '');
|
||||
$accessToken = $request->header('Access-Token', '');
|
||||
if (!$accessToken) {
|
||||
$accessToken = $request->post('Access-Token', '');
|
||||
}
|
||||
if (!$accessToken) {
|
||||
$accessToken = $request->get('Access-Token', '');
|
||||
}
|
||||
if (!$accessToken && !empty($pathParam['Access-Token'])) {
|
||||
$accessToken = $pathParam['Access-Token'];
|
||||
}
|
||||
if (!$accessToken) {
|
||||
return json([
|
||||
'code' => ReturnCode::AUTH_ERROR,
|
||||
'msg' => '缺少必要参数access-token',
|
||||
'msg' => '缺少必要参数Access-Token',
|
||||
'data' => []
|
||||
])->header($header);
|
||||
}
|
||||
@ -62,7 +86,7 @@ class ApiAuth {
|
||||
if ($appInfo === false) {
|
||||
return json([
|
||||
'code' => ReturnCode::ACCESS_TOKEN_TIMEOUT,
|
||||
'msg' => 'access-token已过期',
|
||||
'msg' => 'Access-Token已过期',
|
||||
'data' => []
|
||||
])->header($header);
|
||||
}
|
||||
@ -83,13 +107,16 @@ class ApiAuth {
|
||||
/**
|
||||
* 简易鉴权，更具APP_SECRET获取应用信息
|
||||
* @param $accessToken
|
||||
* @return bool|mixed
|
||||
* @return array|false|mixed|object|\think\App
|
||||
* @throws \think\db\exception\DataNotFoundException
|
||||
* @throws \think\db\exception\DbException
|
||||
* @throws \think\db\exception\ModelNotFoundException
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
*/
|
||||
private function doEasyCheck($accessToken) {
|
||||
$appInfo = cache('AccessToken:Easy:' . $accessToken);
|
||||
if (!$appInfo) {
|
||||
$appInfo = AdminApp::get(['app_secret' => $accessToken]);
|
||||
$appInfo = (new AdminApp())->where('app_secret', $accessToken)->find();
|
||||
if (!$appInfo) {
|
||||
return false;
|
||||
} else {
|
||||
@ -1,15 +1,16 @@
|
||||
<?php
|
||||
declare (strict_types=1);
|
||||
|
||||
namespace app\http\middleware;
|
||||
namespace app\middleware;
|
||||
|
||||
use app\util\ApiLogTool;
|
||||
|
||||
class ApiLog {
|
||||
|
||||
/**
|
||||
* @param \think\facade\Request $request
|
||||
* @param $request
|
||||
* @param \Closure $next
|
||||
* @return mixed|\think\response\Json
|
||||
* @return mixed
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
*/
|
||||
public function handle($request, \Closure $next) {
|
||||
@ -18,11 +19,11 @@ class ApiLog {
|
||||
unset($requestInfo['API_CONF_DETAIL']);
|
||||
unset($requestInfo['APP_CONF_DETAIL']);
|
||||
|
||||
ApiLogTool::setApiInfo($request->API_CONF_DETAIL);
|
||||
ApiLogTool::setAppInfo($request->APP_CONF_DETAIL);
|
||||
ApiLogTool::setApiInfo((array)$request->API_CONF_DETAIL);
|
||||
ApiLogTool::setAppInfo((array)$request->APP_CONF_DETAIL);
|
||||
ApiLogTool::setRequest($requestInfo);
|
||||
ApiLogTool::setResponse($response->getData(), isset($response->getData()['code']) ? $response->getData()['code'] : 'null');
|
||||
ApiLogTool::setHeader($request->header());
|
||||
ApiLogTool::setResponse($response->getData(), isset($response->getData()['code']) ? strval($response->getData()['code']) : 'null');
|
||||
ApiLogTool::setHeader((array)$request->header());
|
||||
ApiLogTool::save();
|
||||
|
||||
return $response;
|
||||
@ -1,6 +1,7 @@
|
||||
<?php
|
||||
declare (strict_types=1);
|
||||
|
||||
namespace app\http\middleware;
|
||||
namespace app\middleware;
|
||||
|
||||
use app\util\ReturnCode;
|
||||
|
||||
@ -8,7 +9,7 @@ class ApiPermission {
|
||||
|
||||
/**
|
||||
* 校验当前App是否有请求当前接口的权限
|
||||
* @param \think\facade\Request $request
|
||||
* @param $request
|
||||
* @param \Closure $next
|
||||
* @return mixed|\think\response\Json
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
@ -1,6 +1,7 @@
|
||||
<?php
|
||||
declare (strict_types=1);
|
||||
|
||||
namespace app\http\middleware;
|
||||
namespace app\middleware;
|
||||
|
||||
use think\facade\Config;
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
<?php
|
||||
declare (strict_types=1);
|
||||
|
||||
namespace app\http\middleware;
|
||||
namespace app\middleware;
|
||||
|
||||
use app\model\AdminFields;
|
||||
use app\util\DataType;
|
||||
@ -12,9 +13,12 @@ class RequestFilter {
|
||||
|
||||
/**
|
||||
* 接口请求字段过滤【只验证数据的合法性，不再过滤数据】
|
||||
* @param \think\facade\Request $request
|
||||
* @param $request
|
||||
* @param \Closure $next
|
||||
* @return mixed|\think\response\Json
|
||||
* @throws \think\db\exception\DataNotFoundException
|
||||
* @throws \think\db\exception\DbException
|
||||
* @throws \think\db\exception\ModelNotFoundException
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
*/
|
||||
public function handle($request, \Closure $next) {
|
||||
@ -25,13 +29,13 @@ class RequestFilter {
|
||||
if ($has) {
|
||||
$newRule = cache('RequestFields:NewRule:' . $apiInfo['hash']);
|
||||
} else {
|
||||
$rule = AdminFields::all(['hash' => $apiInfo['hash'], 'type' => 0]);
|
||||
$rule = (new AdminFields())->where('hash', $apiInfo['hash'])->where('type', 0)->select();
|
||||
$newRule = $this->buildValidateRule($rule);
|
||||
cache('RequestFields:NewRule:' . $apiInfo['hash'], $newRule);
|
||||
}
|
||||
|
||||
if ($newRule) {
|
||||
$validate = Validate::make($newRule);
|
||||
$validate = Validate::rule($newRule);
|
||||
if (!$validate->check($data)) {
|
||||
return json(['code' => ReturnCode::PARAM_INVALID, 'msg' => $validate->getError(), 'data' => []]);
|
||||
}
|
||||
@ -46,7 +50,7 @@ class RequestFilter {
|
||||
* @return array
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
*/
|
||||
public function buildValidateRule($rule = array()) {
|
||||
public function buildValidateRule($rule = []) {
|
||||
$newRule = [];
|
||||
if ($rule) {
|
||||
foreach ($rule as $value) {
|
||||
@ -1,6 +1,7 @@
|
||||
<?php
|
||||
declare (strict_types=1);
|
||||
|
||||
namespace app\http\middleware;
|
||||
namespace app\middleware;
|
||||
|
||||
use app\util\ReturnCode;
|
||||
|
||||
@ -15,7 +16,7 @@ class WikiAuth {
|
||||
*/
|
||||
public function handle($request, \Closure $next) {
|
||||
$header = config('apiadmin.CROSS_DOMAIN');
|
||||
$ApiAuth = $request->header('apiAuth', '');
|
||||
$ApiAuth = $request->header('Api-Auth', '');
|
||||
if ($ApiAuth) {
|
||||
$userInfo = cache('Login:' . $ApiAuth);
|
||||
if (!$userInfo) {
|
||||
@ -1,15 +1,17 @@
|
||||
<?php
|
||||
declare (strict_types=1);
|
||||
/**
|
||||
*
|
||||
* @since 2018-02-08
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
*/
|
||||
|
||||
namespace app\model;
|
||||
|
||||
use think\model\relation\HasMany;
|
||||
|
||||
class AdminAuthGroup extends Base {
|
||||
|
||||
public function rules() {
|
||||
public function rules(): HasMany {
|
||||
return $this->hasMany('AdminAuthRule', 'group_id', 'id');
|
||||
}
|
||||
}
|
||||
@ -1,4 +1,5 @@
|
||||
<?php
|
||||
declare (strict_types=1);
|
||||
/**
|
||||
* @since 2017-11-02
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
@ -6,11 +7,13 @@
|
||||
|
||||
namespace app\model;
|
||||
|
||||
use think\model\relation\HasOne;
|
||||
|
||||
class AdminUser extends Base {
|
||||
|
||||
protected $autoWriteTimestamp = true;
|
||||
|
||||
public function userData() {
|
||||
public function userData(): HasOne {
|
||||
return $this->hasOne('AdminUserData', 'uid', 'id');
|
||||
}
|
||||
}
|
||||
9
app/provider.php
Normal file
9
app/provider.php
Normal file
@ -0,0 +1,9 @@
|
||||
<?php
|
||||
use app\ExceptionHandle;
|
||||
use app\Request;
|
||||
|
||||
// 容器Provider定义文件
|
||||
return [
|
||||
'think\Request' => Request::class,
|
||||
'think\exception\Handle' => ExceptionHandle::class,
|
||||
];
|
||||
9
app/service.php
Normal file
9
app/service.php
Normal file
@ -0,0 +1,9 @@
|
||||
<?php
|
||||
|
||||
use app\AppService;
|
||||
|
||||
// 系统服务定义文件
|
||||
// 服务在完成全局初始化之后执行
|
||||
return [
|
||||
AppService::class,
|
||||
];
|
||||
@ -1,4 +1,5 @@
|
||||
<?php
|
||||
declare (strict_types=1);
|
||||
/**
|
||||
* @since 2017-04-14
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
@ -18,23 +19,41 @@ class ApiLogTool {
|
||||
private static $userInfo = 'null';
|
||||
private static $separator = ' | ';
|
||||
|
||||
public static function setAppInfo($data) {
|
||||
/**
|
||||
* 设置应用信息
|
||||
* @param array $data
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
* @desc appId|appName|deviceId
|
||||
*/
|
||||
public static function setAppInfo(array $data): void {
|
||||
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');
|
||||
($data['app_id'] ?? 'null') . self::$separator .
|
||||
($data['app_name'] ?? 'null') . self::$separator .
|
||||
($data['device_id'] ?? 'null');
|
||||
}
|
||||
|
||||
public static function setHeader($data) {
|
||||
/**
|
||||
* 设置请求头日志数据
|
||||
* @param array $data
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
* @desc accessToken|version
|
||||
*/
|
||||
public static function setHeader(array $data): void {
|
||||
$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) {
|
||||
/**
|
||||
* 设置Api日志数据
|
||||
* @param array $data
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
* @desc hash|apiClass
|
||||
*/
|
||||
public static function setApiInfo(array $data): void {
|
||||
self::$apiInfo =
|
||||
(isset($data['hash']) ? $data['hash'] : 'null') . self::$separator .
|
||||
(isset($data['api_class']) ? $data['api_class'] : 'null');
|
||||
($data['hash'] ?? 'null') . self::$separator .
|
||||
($data['api_class'] ?? 'null');
|
||||
}
|
||||
|
||||
/**
|
||||
@ -42,29 +61,45 @@ class ApiLogTool {
|
||||
* @param $data
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
*/
|
||||
public static function setUserInfo($data) {
|
||||
public static function setUserInfo($data): void {
|
||||
if (is_array($data) || is_object($data)) {
|
||||
$data = json_encode($data);
|
||||
self::$userInfo = $data;
|
||||
}
|
||||
}
|
||||
|
||||
public static function setRequest($data) {
|
||||
/**
|
||||
* 设置请求信息
|
||||
* @param $data
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
*/
|
||||
public static function setRequest($data): void {
|
||||
if (is_array($data) || is_object($data)) {
|
||||
$data = json_encode($data);
|
||||
}
|
||||
self::$request = $data;
|
||||
}
|
||||
|
||||
public static function setResponse($data, $code = '') {
|
||||
/**
|
||||
* 设置返回的信息
|
||||
* @param $data
|
||||
* @param string $code
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
* @desc 返回码|数据
|
||||
*/
|
||||
public static function setResponse($data, string $code = ''): void {
|
||||
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;
|
||||
/**
|
||||
* 保存接口日志数据
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
*/
|
||||
public static function save(): void {
|
||||
$logPath = runtime_path() . 'ApiLog' . DIRECTORY_SEPARATOR;
|
||||
$logStr = implode(self::$separator, array(
|
||||
'[' . date('Y-m-d H:i:s') . ']',
|
||||
self::$apiInfo,
|
||||
@ -81,15 +116,21 @@ class ApiLogTool {
|
||||
}
|
||||
|
||||
/**
|
||||
* 保存日志文件
|
||||
* @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;
|
||||
public static function writeLog(string $log, string $type = 'sql', string $filePath = ''): void {
|
||||
if (!$filePath) {
|
||||
$filePath = runtime_path() . $type . DIRECTORY_SEPARATOR;
|
||||
} else {
|
||||
$filePath = $filePath . $type . DIRECTORY_SEPARATOR;
|
||||
}
|
||||
$filename = $filePath . date("YmdH") . ".log";
|
||||
if (!file_exists($filePath)) {
|
||||
mkdir($filePath, 0755, true);
|
||||
}
|
||||
$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);
|
||||
203
app/util/AutoBuild.php
Normal file
203
app/util/AutoBuild.php
Normal file
@ -0,0 +1,203 @@
|
||||
<?php
|
||||
/**
|
||||
*
|
||||
* @since 2021-02-18
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
*/
|
||||
|
||||
namespace app\util;
|
||||
|
||||
|
||||
use app\model\AdminMenu;
|
||||
use think\facade\Db;
|
||||
|
||||
class AutoBuild {
|
||||
|
||||
private $config = [
|
||||
'model' => 0, // 是否需要构建模型
|
||||
'control' => 1, // 是否需要构建控制器
|
||||
'menu' => 1, // 是否需要构建目录
|
||||
'route' => 1, // 是否需要构建路由
|
||||
'name' => '', // 唯一标识
|
||||
'module' => 1, // 构建类型 1：admin；2：api
|
||||
'table' => 0, // 是否创建表
|
||||
'modelName' => '', // 表名称
|
||||
'fid' => 0 // 父级ID
|
||||
];
|
||||
|
||||
/**
|
||||
* 自动构建
|
||||
* @param array $config
|
||||
* @throws \think\db\exception\DataNotFoundException
|
||||
* @throws \think\db\exception\DbException
|
||||
* @throws \think\db\exception\ModelNotFoundException
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
*/
|
||||
public function run($config = []) {
|
||||
$this->config = array_merge($this->config, $config);
|
||||
|
||||
if ($this->config['model'] == 1) {
|
||||
$this->buildModel();
|
||||
|
||||
if ($this->config['table'] == 1) {
|
||||
$this->createTable();
|
||||
}
|
||||
}
|
||||
if ($this->config['control'] && $this->config['name']) {
|
||||
$this->buildControl();
|
||||
|
||||
if ($this->config['menu'] && $this->config['module'] == 1) {
|
||||
$this->buildMenu();
|
||||
}
|
||||
|
||||
if ($this->config['route'] && $this->config['module'] == 1) {
|
||||
$this->buildRoute();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 驼峰命名转下划线命名
|
||||
* @param $camelCaps
|
||||
* @param string $separator
|
||||
* @return string
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
*/
|
||||
private function unCamelize($camelCaps, $separator = '_'): string {
|
||||
return strtolower(preg_replace('/([a-z])([A-Z])/', "$1" . $separator . "$2", $camelCaps));
|
||||
}
|
||||
|
||||
/**
|
||||
* 构建控制器
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
*/
|
||||
private function buildControl() {
|
||||
$tplPath = root_path() . 'install' . DIRECTORY_SEPARATOR;
|
||||
if ($this->config['module'] == 1) {
|
||||
$module = 'admin';
|
||||
} else {
|
||||
$module = 'api';
|
||||
}
|
||||
|
||||
$controlStr = str_replace(
|
||||
['{$MODULE}', '{$NAME}'],
|
||||
[$module, $this->config['name']],
|
||||
file_get_contents($tplPath . 'control.tpl')
|
||||
);
|
||||
file_put_contents(
|
||||
base_path() . 'controller' . DIRECTORY_SEPARATOR . $module . DIRECTORY_SEPARATOR . $this->config['name'] . '.php',
|
||||
$controlStr
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* 构建模型
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
*/
|
||||
private function buildModel() {
|
||||
$modelStr = '<?php' . PHP_EOL;
|
||||
$modelStr .= '/**' . PHP_EOL;
|
||||
$modelStr .= ' * 由ApiAdmin自动构建' . PHP_EOL;
|
||||
$modelStr .= ' * @author apiadmin <apiadmin.org>' . PHP_EOL;
|
||||
$modelStr .= ' */' . PHP_EOL;
|
||||
$modelStr .= 'namespace app\model;' . PHP_EOL;
|
||||
$modelStr .= 'class ' . $this->config['modelName'] . ' extends Base {' . PHP_EOL;
|
||||
$modelStr .= '}' . PHP_EOL;
|
||||
|
||||
file_put_contents(
|
||||
base_path() . 'model' . DIRECTORY_SEPARATOR . $this->config['modelName'] . '.php',
|
||||
$modelStr
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* 构建表
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
*/
|
||||
private function createTable() {
|
||||
$tableName = $this->unCamelize($this->config['modelName']);
|
||||
$cmd = "CREATE TABLE `{$tableName}` (`id` int NOT NULL AUTO_INCREMENT,PRIMARY KEY (`id`)) COMMENT='由ApiAdmin自动构建';";
|
||||
Db::execute($cmd);
|
||||
}
|
||||
|
||||
/**
|
||||
* 构建菜单
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
*/
|
||||
private function buildMenu() {
|
||||
$menus = [
|
||||
[
|
||||
'title' => '新增',
|
||||
'fid' => $this->config['fid'],
|
||||
'url' => "admin/{$this->config['name']}/add",
|
||||
'auth' => 1,
|
||||
'sort' => 0,
|
||||
'show' => 1,
|
||||
'icon' => '',
|
||||
'level' => 3,
|
||||
'component' => '',
|
||||
'router' => '',
|
||||
'log' => 1,
|
||||
'permission' => 1,
|
||||
'method' => 2
|
||||
],
|
||||
[
|
||||
'title' => '编辑',
|
||||
'fid' => $this->config['fid'],
|
||||
'url' => "admin/{$this->config['name']}/edit",
|
||||
'auth' => 1,
|
||||
'sort' => 0,
|
||||
'show' => 1,
|
||||
'icon' => '',
|
||||
'level' => 3,
|
||||
'component' => '',
|
||||
'router' => '',
|
||||
'log' => 1,
|
||||
'permission' => 1,
|
||||
'method' => 2
|
||||
],
|
||||
[
|
||||
'title' => '删除',
|
||||
'fid' => $this->config['fid'],
|
||||
'url' => "admin/{$this->config['name']}/del",
|
||||
'auth' => 1,
|
||||
'sort' => 0,
|
||||
'show' => 1,
|
||||
'icon' => '',
|
||||
'level' => 3,
|
||||
'component' => '',
|
||||
'router' => '',
|
||||
'log' => 1,
|
||||
'permission' => 1,
|
||||
'method' => 1
|
||||
],
|
||||
[
|
||||
'title' => '列表',
|
||||
'fid' => $this->config['fid'],
|
||||
'url' => "admin/{$this->config['name']}/index",
|
||||
'auth' => 1,
|
||||
'sort' => 0,
|
||||
'show' => 1,
|
||||
'icon' => '',
|
||||
'level' => 3,
|
||||
'component' => '',
|
||||
'router' => '',
|
||||
'log' => 1,
|
||||
'permission' => 1,
|
||||
'method' => 1
|
||||
]
|
||||
];
|
||||
(new AdminMenu())->insertAll($menus);
|
||||
}
|
||||
|
||||
/**
|
||||
* 构建路由
|
||||
* @throws \think\db\exception\DataNotFoundException
|
||||
* @throws \think\db\exception\DbException
|
||||
* @throws \think\db\exception\ModelNotFoundException
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
*/
|
||||
private function buildRoute() {
|
||||
RouterTool::buildAdminRouter();
|
||||
}
|
||||
}
|
||||
@ -1,4 +1,5 @@
|
||||
<?php
|
||||
declare (strict_types=1);
|
||||
/**
|
||||
* 错误码统一维护
|
||||
* @since 2017/02/28 创建
|
||||
@ -41,8 +42,9 @@ class ReturnCode {
|
||||
const UNKNOWN = -998;
|
||||
const EXCEPTION = -999;
|
||||
|
||||
public static function getConstants() {
|
||||
public static function getConstants(): array {
|
||||
$oClass = new \ReflectionClass(__CLASS__);
|
||||
|
||||
return $oClass->getConstants();
|
||||
}
|
||||
}
|
||||
@ -1,4 +1,5 @@
|
||||
<?php
|
||||
declare (strict_types=1);
|
||||
/**
|
||||
*
|
||||
* @since 2020-05-14
|
||||
@ -9,18 +10,22 @@ namespace app\util;
|
||||
|
||||
|
||||
use app\model\AdminMenu;
|
||||
use think\facade\Env;
|
||||
use think\App;
|
||||
|
||||
class RouterTool {
|
||||
|
||||
/**
|
||||
* 构建后端路由
|
||||
* @throws \think\db\exception\DataNotFoundException
|
||||
* @throws \think\db\exception\DbException
|
||||
* @throws \think\db\exception\ModelNotFoundException
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
*/
|
||||
public static function buildAdminRouter() {
|
||||
public static function buildAdminRouter(): void {
|
||||
$methodArr = ['*', 'get', 'post', 'put', 'delete'];
|
||||
$routePath = Env::get('route_path') . 'route.php';
|
||||
$bakPath = Env::get('route_path') . 'route.bak';
|
||||
$routePath = (new App())->getRootPath() . 'route' . DIRECTORY_SEPARATOR . 'app.php';
|
||||
$bakPath = (new App())->getRootPath() . 'route' . DIRECTORY_SEPARATOR . 'app.bak';
|
||||
|
||||
if (file_exists($bakPath)) {
|
||||
unlink($bakPath);
|
||||
}
|
||||
@ -30,19 +35,20 @@ class RouterTool {
|
||||
|
||||
$context = '<?php' . PHP_EOL;
|
||||
$context .= 'use think\facade\Route;' . PHP_EOL;
|
||||
$context .= "Route::miss('api/Miss/index');" . PHP_EOL;
|
||||
$context .= "Route::group('admin', function() {" . PHP_EOL;
|
||||
|
||||
$menus = AdminMenu::all();
|
||||
$menus = (new AdminMenu())->select();
|
||||
if ($menus) {
|
||||
foreach ($menus as $menu) {
|
||||
$menu = $menu->toArray();
|
||||
$menuUrl = str_replace('admin/', '', $menu['url']);
|
||||
if ($menu['url']) {
|
||||
$context .= "Route::rule('{$menu['url']}', '{$menu['url']}', '".
|
||||
$methodArr[$menu['method']] . "')".
|
||||
self::getAdminMiddleware($menu) . PHP_EOL;
|
||||
$context .= " Route::rule('{$menuUrl}', 'admin.{$menuUrl}', '"
|
||||
. $methodArr[$menu['method']] . "')" . self::getAdminMiddleware($menu) . PHP_EOL;
|
||||
}
|
||||
}
|
||||
}
|
||||
$context .= "Route::group('admin', function() {Route::miss('admin/Miss/index');})->middleware('AdminResponse');" . PHP_EOL;
|
||||
$context .= " Route::miss('admin.Miss/index');" . PHP_EOL . "});" . PHP_EOL;
|
||||
|
||||
file_put_contents($routePath, $context);
|
||||
}
|
||||
@ -54,7 +60,7 @@ class RouterTool {
|
||||
* @return mixed
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
*/
|
||||
public static function buildVueRouter(&$menus) {
|
||||
public static function buildVueRouter(array &$menus): void {
|
||||
foreach ($menus as $key => $menu) {
|
||||
if (isset($menu['children'])) {
|
||||
foreach ($menu['children'] as $cKey => $child) {
|
||||
@ -84,18 +90,18 @@ class RouterTool {
|
||||
* @return string
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
*/
|
||||
private static function getAdminMiddleware($menu) {
|
||||
$middle = ['AdminResponse'];
|
||||
private static function getAdminMiddleware(array $menu): string {
|
||||
$middle = ['app\middleware\AdminResponse::class'];
|
||||
if ($menu['log']) {
|
||||
array_unshift($middle,'AdminLog');
|
||||
array_unshift($middle, 'app\middleware\AdminLog::class');
|
||||
}
|
||||
if ($menu['permission']) {
|
||||
array_unshift($middle,'AdminPermission');
|
||||
array_unshift($middle, 'app\middleware\AdminPermission::class');
|
||||
}
|
||||
if ($menu['auth']) {
|
||||
array_unshift($middle,'AdminAuth');
|
||||
array_unshift($middle, 'app\middleware\AdminAuth::class');
|
||||
}
|
||||
|
||||
return '->middleware(["' . implode('", "', $middle) . '"]);';
|
||||
return '->middleware([' . implode(', ', $middle) . ']);';
|
||||
}
|
||||
}
|
||||
@ -1,4 +1,5 @@
|
||||
<?php
|
||||
declare (strict_types=1);
|
||||
/**
|
||||
* 构建各类有意义的随机数
|
||||
* @since 2018-08-07
|
||||
@ -18,7 +19,7 @@ class StrRandom {
|
||||
* @return float
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
*/
|
||||
public static function randomFloat($min = -999999999, $max = 999999999, $dmin = 0, $dmax = 8) {
|
||||
public static function randomFloat(int $min = -999999999, int $max = 999999999, int $dmin = 0, int $dmax = 8): float {
|
||||
$rand = '';
|
||||
$intNum = mt_rand($min, $max);
|
||||
$floatLength = mt_rand($dmin, $dmax);
|
||||
@ -36,7 +37,7 @@ class StrRandom {
|
||||
* @return false|string
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
*/
|
||||
public static function randomDate($format = 'Y-m-d H:i:s') {
|
||||
public static function randomDate(string $format = 'Y-m-d H:i:s'): string {
|
||||
$timestamp = time() - mt_rand(0, 86400 * 3650);
|
||||
|
||||
return date($format, $timestamp);
|
||||
@ -47,7 +48,7 @@ class StrRandom {
|
||||
* @return string
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
*/
|
||||
public static function randomIp() {
|
||||
public static function randomIp(): string {
|
||||
$ipLong = [
|
||||
['607649792', '608174079'], // 36.56.0.0-36.63.255.255
|
||||
['1038614528', '1039007743'], // 61.232.0.0-61.237.255.255
|
||||
@ -70,7 +71,7 @@ class StrRandom {
|
||||
* @return mixed
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail','com>
|
||||
*/
|
||||
public static function randomProtocol() {
|
||||
public static function randomProtocol(): string {
|
||||
$proArr = [
|
||||
'http',
|
||||
'ftp',
|
||||
@ -95,7 +96,7 @@ class StrRandom {
|
||||
* 随机生成一个顶级域名
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail','com>
|
||||
*/
|
||||
public static function randomTld() {
|
||||
public static function randomTld(): string {
|
||||
$tldArr = [
|
||||
'com', 'cn', 'xin', 'net', 'top', '在线',
|
||||
'xyz', 'wang', 'shop', 'site', 'club', 'cc',
|
||||
@ -116,7 +117,7 @@ class StrRandom {
|
||||
* @return string
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
*/
|
||||
public static function randomDomain() {
|
||||
public static function randomDomain(): string {
|
||||
$len = mt_rand(6, 16);
|
||||
|
||||
return strtolower(Strs::randString($len)) . '.' . self::randomTld();
|
||||
@ -128,7 +129,7 @@ class StrRandom {
|
||||
* @return string
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
*/
|
||||
public static function randomUrl($protocol = '') {
|
||||
public static function randomUrl($protocol = ''): string {
|
||||
$protocol = $protocol ? $protocol : self::randomProtocol();
|
||||
|
||||
return $protocol . '://' . self::randomDomain();
|
||||
@ -140,7 +141,7 @@ class StrRandom {
|
||||
* @return string
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
*/
|
||||
public static function randomEmail($domain = '') {
|
||||
public static function randomEmail($domain = ''): string {
|
||||
$len = mt_rand(6, 16);
|
||||
$domain = $domain ? $domain : self::randomDomain();
|
||||
|
||||
@ -149,7 +150,7 @@ class StrRandom {
|
||||
}
|
||||
|
||||
|
||||
public static function randomPhone() {
|
||||
public static function randomPhone(): string {
|
||||
$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,
|
||||
@ -164,7 +165,7 @@ class StrRandom {
|
||||
* @return string
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
*/
|
||||
public static function randomId() {
|
||||
public static function randomId(): string {
|
||||
$prefixArr = [
|
||||
11, 12, 13, 14, 15,
|
||||
21, 22, 23,
|
||||
@ -1,4 +1,5 @@
|
||||
<?php
|
||||
declare (strict_types=1);
|
||||
// +----------------------------------------------------------------------
|
||||
// | ThinkPHP [ WE CAN DO IT JUST THINK IT ]
|
||||
// +----------------------------------------------------------------------
|
||||
@ -18,8 +19,8 @@ class Strs {
|
||||
* @access public
|
||||
* @return string
|
||||
*/
|
||||
public static function uuid() {
|
||||
$charId = md5(uniqid(mt_rand(), true));
|
||||
public static function uuid(): string {
|
||||
$charId = md5(uniqid(strval(mt_rand()), true));
|
||||
$hyphen = chr(45);
|
||||
$uuid = chr(123)
|
||||
. substr($charId, 0, 8) . $hyphen
|
||||
@ -36,7 +37,7 @@ class Strs {
|
||||
* 生成Guid主键
|
||||
* @return Boolean
|
||||
*/
|
||||
public static function keyGen() {
|
||||
public static function keyGen(): string {
|
||||
return str_replace('-', '', substr(self::uuid(), 1, -1));
|
||||
}
|
||||
|
||||
@ -45,7 +46,7 @@ class Strs {
|
||||
* @param string $string 字符串
|
||||
* @return Boolean
|
||||
*/
|
||||
public static function isUtf8($string) {
|
||||
public static function isUtf8($string): bool {
|
||||
$len = strlen($string);
|
||||
for ($i = 0; $i < $len; $i++) {
|
||||
$c = ord($string[$i]);
|
||||
@ -72,15 +73,15 @@ class Strs {
|
||||
|
||||
/**
|
||||
* 字符串截取，支持中文和其他编码
|
||||
* @access public
|
||||
* @param string $str 需要转换的字符串
|
||||
* @param integer $start 开始位置
|
||||
* @param string $length 截取长度
|
||||
* @param string $charset 编码格式
|
||||
* @param bool $suffix 截断显示字符
|
||||
* @param string $str
|
||||
* @param float $start
|
||||
* @param int $length
|
||||
* @param string $charset
|
||||
* @param bool $suffix
|
||||
* @return string
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
*/
|
||||
public static function mSubStr($str, $start = 0, $length, $charset = "utf-8", $suffix = true) {
|
||||
public static function mSubStr(string $str, int $length, float $start = 0, string $charset = "utf-8", bool $suffix = true): string {
|
||||
if (function_exists("mb_substr"))
|
||||
$slice = mb_substr($str, $start, $length, $charset);
|
||||
elseif (function_exists('iconv_substr')) {
|
||||
@ -101,12 +102,12 @@ class Strs {
|
||||
* 产生随机字串，可用来自动生成密码
|
||||
* 默认长度6位 字母和数字混合 支持中文
|
||||
* @param integer $len 长度
|
||||
* @param string $type 字串类型
|
||||
* @param int $type 字串类型
|
||||
* 0 字母 1 数字 其它 混合
|
||||
* @param string $addChars 额外字符
|
||||
* @return string
|
||||
*/
|
||||
public static function randString($len = 6, $type = '', $addChars = '') {
|
||||
public static function randString(int $len = 6, int $type = 0, string $addChars = ''): string {
|
||||
$str = '';
|
||||
switch ($type) {
|
||||
case 0:
|
||||
@ -138,7 +139,7 @@ class Strs {
|
||||
} 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);
|
||||
$str .= self::msubstr($chars, 1, floor(mt_rand(0, mb_strlen($chars, 'utf-8') - 1)), 'utf-8', false);
|
||||
}
|
||||
}
|
||||
|
||||
@ -151,14 +152,14 @@ class Strs {
|
||||
* @param integer $length 长度
|
||||
* @param integer $mode 字串类型
|
||||
* 0 字母 1 数字 其它 混合
|
||||
* @return string
|
||||
* @return array
|
||||
*/
|
||||
public static function buildCountRand($number, $length = 4, $mode = 1) {
|
||||
public static function buildCountRand(int $number, int $length = 4, int $mode = 1): array {
|
||||
if ($mode == 1 && $length < strlen($number)) {
|
||||
//不足以生成一定数量的不重复数字
|
||||
return false;
|
||||
return [];
|
||||
}
|
||||
$rand = array();
|
||||
$rand = [];
|
||||
for ($i = 0; $i < $number; $i++) {
|
||||
$rand[] = self::randString($length, $mode);
|
||||
}
|
||||
@ -181,10 +182,10 @@ class Strs {
|
||||
* @param string $format 字符格式
|
||||
* # 表示数字 * 表示字母和数字 $ 表示字母
|
||||
* @param integer $number 生成数量
|
||||
* @return string | array
|
||||
* @return array
|
||||
*/
|
||||
public static function buildFormatRand($format, $number = 1) {
|
||||
$str = array();
|
||||
public static function buildFormatRand(string $format, int $number = 1): array {
|
||||
$str = [];
|
||||
$length = strlen($format);
|
||||
for ($j = 0; $j < $number; $j++) {
|
||||
$strTemp = '';
|
||||
@ -208,7 +209,7 @@ class Strs {
|
||||
$str[] = $strTemp;
|
||||
}
|
||||
|
||||
return $number == 1 ? $strTemp : $str;
|
||||
return $str;
|
||||
}
|
||||
|
||||
/**
|
||||
@ -217,12 +218,12 @@ class Strs {
|
||||
* @param integer $max 最大值
|
||||
* @return string
|
||||
*/
|
||||
public static function randNumber($min, $max) {
|
||||
public static function randNumber(int $min, int $max): string {
|
||||
return sprintf("%0" . strlen($max) . "d", mt_rand($min, $max));
|
||||
}
|
||||
|
||||
// 自动转换字符集 支持数组转换
|
||||
public static function autoCharset($string, $from = 'gbk', $to = 'utf-8') {
|
||||
public static function autoCharset(string $string, string $from = 'gbk', string $to = 'utf-8'): string {
|
||||
$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))) {
|
||||
@ -1,4 +1,5 @@
|
||||
<?php
|
||||
declare (strict_types=1);
|
||||
/**
|
||||
*
|
||||
* @since 2017-11-01
|
||||
@ -9,7 +10,13 @@ namespace app\util;
|
||||
|
||||
class Tools {
|
||||
|
||||
public static function getDate($timestamp) {
|
||||
/**
|
||||
* 获取相对时间
|
||||
* @param int $timestamp
|
||||
* @return string
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
*/
|
||||
public static function getDate(int $timestamp): string {
|
||||
$now = time();
|
||||
$diff = $now - $timestamp;
|
||||
if ($diff <= 60) {
|
||||
@ -32,7 +39,7 @@ class Tools {
|
||||
* @return string
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
*/
|
||||
public static function userMd5($str, $auth_key = '') {
|
||||
public static function userMd5(string $str, string $auth_key = ''): string {
|
||||
if (!$auth_key) {
|
||||
$auth_key = config('apiadmin.AUTH_KEY');
|
||||
}
|
||||
@ -42,11 +49,11 @@ class Tools {
|
||||
|
||||
/**
|
||||
* 判断当前用户是否是超级管理员
|
||||
* @param string $uid
|
||||
* @param int $uid
|
||||
* @return bool
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
*/
|
||||
public static function isAdministrator($uid = '') {
|
||||
public static function isAdministrator(int $uid = 0): bool {
|
||||
if (!empty($uid)) {
|
||||
$adminConf = config('apiadmin.USER_ADMINISTRATOR');
|
||||
if (is_array($adminConf)) {
|
||||
@ -78,12 +85,12 @@ class Tools {
|
||||
|
||||
/**
|
||||
* 将查询的二维对象转换成二维数组
|
||||
* @param array $res
|
||||
* @param $res
|
||||
* @param string $key 允许指定索引值
|
||||
* @return array
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
*/
|
||||
public static function buildArrFromObj($res, $key = '') {
|
||||
public static function buildArrFromObj($res, string $key = ''): array {
|
||||
$arr = [];
|
||||
foreach ($res as $value) {
|
||||
$value = $value->toArray();
|
||||
@ -100,12 +107,12 @@ class Tools {
|
||||
/**
|
||||
* 将二维数组变成指定key
|
||||
* @param $array
|
||||
* @param $keyName
|
||||
* @param string $keyName
|
||||
* @return array
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
*/
|
||||
public static function buildArrByNewKey($array, $keyName = 'id') {
|
||||
$list = array();
|
||||
public static function buildArrByNewKey($array, string $keyName = 'id'): array {
|
||||
$list = [];
|
||||
foreach ($array as $item) {
|
||||
$list[$item[$keyName]] = $item;
|
||||
}
|
||||
@ -122,10 +129,16 @@ class Tools {
|
||||
* @param string $root
|
||||
* @return array
|
||||
*/
|
||||
public static function listToTree($list, $pk = 'id', $pid = 'fid', $child = 'children', $root = '0') {
|
||||
$tree = array();
|
||||
public static function listToTree(
|
||||
array $list,
|
||||
string $pk = 'id',
|
||||
string $pid = 'fid',
|
||||
string $child = 'children',
|
||||
string $root = '0'
|
||||
): array {
|
||||
$tree = [];
|
||||
if (is_array($list)) {
|
||||
$refer = array();
|
||||
$refer = [];
|
||||
foreach ($list as $key => $data) {
|
||||
$refer[$data[$pk]] = &$list[$key];
|
||||
}
|
||||
@ -145,8 +158,16 @@ class Tools {
|
||||
return $tree;
|
||||
}
|
||||
|
||||
public static function formatTree($list, $lv = 0, $title = 'title') {
|
||||
$formatTree = array();
|
||||
/**
|
||||
* 将层级数组遍历成一维数组
|
||||
* @param array $list
|
||||
* @param int $lv
|
||||
* @param string $title
|
||||
* @return array
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
*/
|
||||
public static function formatTree(array $list, int $lv = 0, string $title = 'title'): array {
|
||||
$formatTree = [];
|
||||
foreach ($list as $key => $val) {
|
||||
$title_prefix = '';
|
||||
for ($i = 0; $i < $lv; $i++) {
|
||||
@ -1,77 +0,0 @@
|
||||
<?php
|
||||
/**
|
||||
* 工程基类
|
||||
* @since 2017/02/28 创建
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
*/
|
||||
|
||||
namespace app\admin\controller;
|
||||
|
||||
use app\model\AdminUser;
|
||||
use app\model\AdminUserData;
|
||||
use app\util\ReturnCode;
|
||||
use think\Controller;
|
||||
|
||||
class Base extends Controller {
|
||||
|
||||
private $debug = [];
|
||||
protected $userInfo;
|
||||
|
||||
public function __construct() {
|
||||
parent::__construct();
|
||||
$this->userInfo = $this->request->API_ADMIN_USER_INFO;
|
||||
}
|
||||
|
||||
public function buildSuccess($data = [], $msg = '操作成功', $code = ReturnCode::SUCCESS) {
|
||||
$return = [
|
||||
'code' => $code,
|
||||
'msg' => $msg,
|
||||
'data' => $data
|
||||
];
|
||||
if (config('app.app_debug') && $this->debug) {
|
||||
$return['debug'] = $this->debug;
|
||||
}
|
||||
|
||||
return $return;
|
||||
}
|
||||
|
||||
/**
|
||||
* 更新用户信息
|
||||
* @param $data
|
||||
* @param bool $isDetail
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
*/
|
||||
public function updateUserInfo($data, $isDetail = false) {
|
||||
$apiAuth = $this->request->header('apiAuth');
|
||||
if ($isDetail) {
|
||||
AdminUserData::update($data, ['uid' => $this->userInfo['id']]);
|
||||
$this->userInfo['userData'] = AdminUserData::get(['uid' => $this->userInfo['id']]);
|
||||
} else {
|
||||
AdminUser::update($data, ['id' => $this->userInfo['id']]);
|
||||
$detail = $this->userInfo['userData'];
|
||||
$this->userInfo = AdminUser::get(['id' => $this->userInfo['id']]);
|
||||
$this->userInfo['userData'] = $detail;
|
||||
}
|
||||
|
||||
cache('Login:' . $apiAuth, json_encode($this->userInfo), config('apiadmin.ONLINE_TIME'));
|
||||
}
|
||||
|
||||
public function buildFailed($code, $msg = '操作失败', $data = []) {
|
||||
$return = [
|
||||
'code' => $code,
|
||||
'msg' => $msg,
|
||||
'data' => $data
|
||||
];
|
||||
if (config('app.app_debug') && $this->debug) {
|
||||
$return['debug'] = $this->debug;
|
||||
}
|
||||
|
||||
return $return;
|
||||
}
|
||||
|
||||
protected function debug($data) {
|
||||
if ($data) {
|
||||
$this->debug[] = $data;
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1,21 +0,0 @@
|
||||
<?php
|
||||
|
||||
namespace app\api\controller;
|
||||
|
||||
use think\facade\App;
|
||||
|
||||
class Index extends Base {
|
||||
|
||||
public function index() {
|
||||
$this->debug([
|
||||
'TpVersion' => App::version()
|
||||
]);
|
||||
|
||||
return $this->buildSuccess([
|
||||
'Product' => config('apiadmin.APP_NAME'),
|
||||
'Version' => config('apiadmin.APP_VERSION'),
|
||||
'Company' => config('apiadmin.COMPANY_NAME'),
|
||||
'ToYou' => "I'm glad to meet you（终于等到你！）"
|
||||
]);
|
||||
}
|
||||
}
|
||||
@ -1,23 +0,0 @@
|
||||
<?php
|
||||
|
||||
namespace app\api\controller;
|
||||
|
||||
use app\util\StrRandom;
|
||||
use think\facade\App;
|
||||
|
||||
class Miss extends Base {
|
||||
|
||||
public function index() {
|
||||
$this->debug([
|
||||
'TpVersion' => App::version(),
|
||||
'Float' => StrRandom::randomPhone()
|
||||
]);
|
||||
|
||||
return $this->buildSuccess([
|
||||
'Product' => config('apiadmin.APP_NAME'),
|
||||
'Version' => config('apiadmin.APP_VERSION'),
|
||||
'Company' => config('apiadmin.COMPANY_NAME'),
|
||||
'ToYou' => "I'm glad to meet you（终于等到你！）"
|
||||
]);
|
||||
}
|
||||
}
|
||||
@ -1,12 +0,0 @@
|
||||
<?php
|
||||
// +----------------------------------------------------------------------
|
||||
// | ThinkPHP [ WE CAN DO IT JUST THINK ]
|
||||
// +----------------------------------------------------------------------
|
||||
// | Copyright (c) 2006-2016 http://thinkphp.cn All rights reserved.
|
||||
// +----------------------------------------------------------------------
|
||||
// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
|
||||
// +----------------------------------------------------------------------
|
||||
// | Author: yunwuxin <448901948@qq.com>
|
||||
// +----------------------------------------------------------------------
|
||||
|
||||
return [];
|
||||
@ -1,125 +0,0 @@
|
||||
<?php
|
||||
|
||||
namespace app\command;
|
||||
|
||||
use app\util\Strs;
|
||||
use think\Console;
|
||||
use think\console\Command;
|
||||
use think\console\Input;
|
||||
use think\console\input\Option;
|
||||
use think\console\Output;
|
||||
use think\db\Connection;
|
||||
use think\facade\Env;
|
||||
|
||||
class Install extends Command {
|
||||
|
||||
protected function configure() {
|
||||
// 指令配置
|
||||
$this->setName('apiadmin:install')
|
||||
->addOption('db', null, Option::VALUE_REQUIRED, '数据库连接参数，格式为：数据库类型://用户名:密码@数据库地址:数据库端口/数据库名#字符集')
|
||||
->setDescription('ApiAdmin安装脚本');
|
||||
}
|
||||
|
||||
/**
|
||||
* php think apiadmin:install --db mysql://root:123456@127.0.0.1:3306/apiadmin#utf8mb4
|
||||
* @param Input $input
|
||||
* @param Output $output
|
||||
* @return int|void|null
|
||||
* @throws \think\Exception
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
*/
|
||||
protected function execute(Input $input, Output $output) {
|
||||
$tplPath = Env::get('app_path') . 'install' . DIRECTORY_SEPARATOR;
|
||||
$lockFile = $tplPath . 'lock.ini';
|
||||
|
||||
if (file_exists($lockFile)) {
|
||||
$output->highlight("您已经安装过了，请勿重新安装！");
|
||||
$output->highlight("如有需要请删除application/install/lock.ini文件再次尝试");
|
||||
exit;
|
||||
}
|
||||
|
||||
if (!is_writable($tplPath)) {
|
||||
$output->highlight($tplPath . '缺少写权限！');
|
||||
exit;
|
||||
}
|
||||
|
||||
$tempPath = Env::get('runtime_path');
|
||||
if (!is_writable($tempPath)) {
|
||||
$output->highlight($tempPath . '缺少写权限！');
|
||||
exit;
|
||||
}
|
||||
|
||||
if (!extension_loaded('redis')) {
|
||||
$output->highlight('缺少Redis扩展！');
|
||||
exit;
|
||||
}
|
||||
|
||||
if ($input->hasOption('db')) {
|
||||
try {
|
||||
$options = $this->parseDsnConfig($input->getOption('db'));
|
||||
Connection::instance($options)->getTables($options['database']);
|
||||
$confPath = Env::get('config_path');
|
||||
|
||||
//处理数据库配置文件
|
||||
$dbConf = str_replace([
|
||||
'{$DB_TYPE}', '{$DB_HOST}', '{$DB_NAME}',
|
||||
'{$DB_USER}', '{$DB_PASSWORD}', '{$DB_PORT}',
|
||||
'{$DB_CHAR}'
|
||||
], [
|
||||
$options['type'], $options['hostname'], $options['database'],
|
||||
$options['username'], $options['password'], $options['hostport'],
|
||||
$options['charset']
|
||||
], file_get_contents($tplPath . 'db.tpl'));
|
||||
file_put_contents($confPath . 'database.php', $dbConf);
|
||||
$output->info('数据库配置更新成功');
|
||||
|
||||
//处理ApiAdmin自定义配置
|
||||
$authKey = substr(Strs::uuid(), 1, -1);
|
||||
$apiConf = str_replace('{$AUTH_KEY}', $authKey, file_get_contents($tplPath . 'apiadmin.tpl'));
|
||||
file_put_contents($confPath . 'apiadmin.php', $apiConf);
|
||||
$output->info('ApiAdmin配置更新成功');
|
||||
|
||||
//生成lock文件，并且写入用户名密码
|
||||
file_put_contents($lockFile, $authKey);
|
||||
$output->info('lock文件初始化成功');
|
||||
} catch (\PDOException $e) {
|
||||
$output->highlight($e->getMessage());
|
||||
}
|
||||
} else {
|
||||
$output->highlight("请输入数据库配置");
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* DSN解析
|
||||
* 格式： mysql://username:passwd@localhost:3306/DbName?param1=val1¶m2=val2#utf8
|
||||
* @access private
|
||||
* @param string $dsnStr
|
||||
* @return array
|
||||
*/
|
||||
private function parseDsnConfig($dsnStr) {
|
||||
$info = parse_url($dsnStr);
|
||||
|
||||
if (!$info) {
|
||||
return [];
|
||||
}
|
||||
|
||||
$dsn = [
|
||||
'type' => $info['scheme'],
|
||||
'username' => isset($info['user']) ? $info['user'] : '',
|
||||
'password' => isset($info['pass']) ? $info['pass'] : '',
|
||||
'hostname' => isset($info['host']) ? $info['host'] : '',
|
||||
'hostport' => isset($info['port']) ? $info['port'] : '',
|
||||
'database' => !empty($info['path']) ? ltrim($info['path'], '/') : '',
|
||||
'charset' => isset($info['fragment']) ? $info['fragment'] : 'utf8',
|
||||
];
|
||||
|
||||
if (isset($info['query'])) {
|
||||
parse_str($info['query'], $dsn['params']);
|
||||
} else {
|
||||
$dsn['params'] = [];
|
||||
}
|
||||
|
||||
return $dsn;
|
||||
}
|
||||
}
|
||||
@ -1,12 +0,0 @@
|
||||
<?php
|
||||
// +----------------------------------------------------------------------
|
||||
// | ThinkPHP [ WE CAN DO IT JUST THINK ]
|
||||
// +----------------------------------------------------------------------
|
||||
// | Copyright (c) 2006-2016 http://thinkphp.cn All rights reserved.
|
||||
// +----------------------------------------------------------------------
|
||||
// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
|
||||
// +----------------------------------------------------------------------
|
||||
// | Author: 流年 <liu21st@gmail.com>
|
||||
// +----------------------------------------------------------------------
|
||||
|
||||
// 应用公共文件
|
||||
@ -1,12 +0,0 @@
|
||||
<?php
|
||||
/**
|
||||
* Api路由
|
||||
*/
|
||||
|
||||
use think\facade\Route;
|
||||
|
||||
Route::group('api', function() {
|
||||
{$API_RULE}
|
||||
//MISS路由定义
|
||||
Route::miss('api/Miss/index');
|
||||
})->middleware('ApiResponse');
|
||||
@ -1,63 +0,0 @@
|
||||
<?php
|
||||
// +----------------------------------------------------------------------
|
||||
// | ThinkPHP [ WE CAN DO IT JUST THINK ]
|
||||
// +----------------------------------------------------------------------
|
||||
// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
|
||||
// +----------------------------------------------------------------------
|
||||
// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
|
||||
// +----------------------------------------------------------------------
|
||||
// | Author: liu21st <liu21st@gmail.com>
|
||||
// +----------------------------------------------------------------------
|
||||
|
||||
return [
|
||||
// 数据库类型
|
||||
'type' => '{$DB_TYPE}',
|
||||
// 服务器地址
|
||||
'hostname' => '{$DB_HOST}',
|
||||
// 数据库名
|
||||
'database' => '{$DB_NAME}',
|
||||
// 用户名
|
||||
'username' => '{$DB_USER}',
|
||||
// 密码
|
||||
'password' => '{$DB_PASSWORD}',
|
||||
// 端口
|
||||
'hostport' => '{$DB_PORT}',
|
||||
// 连接dsn
|
||||
'dsn' => '',
|
||||
// 数据库连接参数
|
||||
'params' => [],
|
||||
// 数据库编码默认采用utf8
|
||||
'charset' => '{$DB_CHAR}',
|
||||
// 数据库表前缀
|
||||
'prefix' => '',
|
||||
// 数据库调试模式
|
||||
'debug' => true,
|
||||
// 数据库部署方式:0 集中式(单一服务器),1 分布式(主从服务器)
|
||||
'deploy' => 0,
|
||||
// 数据库读写是否分离 主从式有效
|
||||
'rw_separate' => false,
|
||||
// 读写分离后 主服务器数量
|
||||
'master_num' => 1,
|
||||
// 指定从服务器序号
|
||||
'slave_no' => '',
|
||||
// 自动读取主库数据
|
||||
'read_master' => false,
|
||||
// 是否严格检查字段是否存在
|
||||
'fields_strict' => true,
|
||||
// 数据集返回类型
|
||||
'resultset_type' => 'array',
|
||||
// 自动写入时间戳字段
|
||||
'auto_timestamp' => false,
|
||||
// 时间字段取出后的默认时间格式
|
||||
'datetime_format' => 'Y-m-d H:i:s',
|
||||
// 是否需要进行SQL性能分析
|
||||
'sql_explain' => false,
|
||||
// Builder类
|
||||
'builder' => '',
|
||||
// Query类
|
||||
'query' => '\\think\\db\\Query',
|
||||
// 是否需要断线重连
|
||||
'break_reconnect' => false,
|
||||
// 断线标识字符串
|
||||
'break_match_str' => [],
|
||||
];
|
||||
@ -1,28 +0,0 @@
|
||||
<?php
|
||||
// +----------------------------------------------------------------------
|
||||
// | ThinkPHP [ WE CAN DO IT JUST THINK ]
|
||||
// +----------------------------------------------------------------------
|
||||
// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
|
||||
// +----------------------------------------------------------------------
|
||||
// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
|
||||
// +----------------------------------------------------------------------
|
||||
// | Author: liu21st <liu21st@gmail.com>
|
||||
// +----------------------------------------------------------------------
|
||||
|
||||
// 应用行为扩展定义文件
|
||||
return [
|
||||
// 应用初始化
|
||||
'app_init' => [],
|
||||
// 应用开始
|
||||
'app_begin' => [],
|
||||
// 模块初始化
|
||||
'module_init' => [],
|
||||
// 操作开始执行
|
||||
'action_begin' => [],
|
||||
// 视图内容过滤
|
||||
'view_filter' => [],
|
||||
// 日志写入
|
||||
'log_write' => [],
|
||||
// 应用结束
|
||||
'app_end' => [],
|
||||
];
|
||||
@ -1,104 +0,0 @@
|
||||
<?php
|
||||
/**
|
||||
*
|
||||
* @since 2019-04-23
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
*/
|
||||
|
||||
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;
|
||||
}
|
||||
}
|
||||
@ -1,24 +0,0 @@
|
||||
<?php
|
||||
/**
|
||||
* 应用管理
|
||||
* @since 2019-10-02
|
||||
* @author 何秀钢 <bstdn@126.com>
|
||||
*/
|
||||
|
||||
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'));
|
||||
}
|
||||
}
|
||||
@ -1,19 +0,0 @@
|
||||
<?php
|
||||
/**
|
||||
* mock配置和ApiAdmin内置的接口返回数据配置相互转化的类
|
||||
* @since 2018-08-23
|
||||
* @author zhaoxiang <zhaoxiang051405@gmail.com>
|
||||
*/
|
||||
|
||||
namespace app\util;
|
||||
|
||||
class MockConf {
|
||||
|
||||
public function mockToApiAdmin() {
|
||||
|
||||
}
|
||||
|
||||
public function apiAdminToMock() {
|
||||
|
||||
}
|
||||
}
|
||||
26
build.php
26
build.php
@ -1,26 +0,0 @@
|
||||
<?php
|
||||
// +----------------------------------------------------------------------
|
||||
// | ThinkPHP [ WE CAN DO IT JUST THINK ]
|
||||
// +----------------------------------------------------------------------
|
||||
// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
|
||||
// +----------------------------------------------------------------------
|
||||
// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
|
||||
// +----------------------------------------------------------------------
|
||||
// | Author: liu21st <liu21st@gmail.com>
|
||||
// +----------------------------------------------------------------------
|
||||
|
||||
return [
|
||||
// 生成应用公共文件
|
||||
'__file__' => ['common.php'],
|
||||
|
||||
// 定义demo模块的自动生成 （按照实际定义的文件名生成）
|
||||
'demo' => [
|
||||
'__file__' => ['common.php'],
|
||||
'__dir__' => ['behavior', 'controller', 'model', 'view'],
|
||||
'controller' => ['Index', 'Test', 'UserType'],
|
||||
'model' => ['User', 'UserType'],
|
||||
'view' => ['index/index'],
|
||||
],
|
||||
|
||||
// 其他更多的模块定义
|
||||
];
|
||||
@ -1,14 +1,14 @@
|
||||
{
|
||||
"name": "apiadmin/apiadmin4",
|
||||
"description": "the new apiadmin framework",
|
||||
"name": "apiadmin/apiadmin",
|
||||
"description": "Just For Api",
|
||||
"type": "project",
|
||||
"keywords": [
|
||||
"apiadmin",
|
||||
"framework",
|
||||
"thinkphp",
|
||||
"ORM"
|
||||
"api",
|
||||
"apiadmin"
|
||||
],
|
||||
"homepage": "https://www.apiadmin.org/",
|
||||
"homepage": "http://www.apiadmin.org/",
|
||||
"license": "Apache-2.0",
|
||||
"authors": [
|
||||
{
|
||||
@ -17,20 +17,30 @@
|
||||
}
|
||||
],
|
||||
"require": {
|
||||
"php": ">=7.0",
|
||||
"topthink/framework": "5.1.*",
|
||||
"topthink/think-migration": "^2.0",
|
||||
"guzzlehttp/guzzle": "^6.5"
|
||||
"php": ">=7.2.5",
|
||||
"topthink/framework": "^6.0",
|
||||
"topthink/think-orm": "^2.0",
|
||||
"topthink/think-migration": "^3.0"
|
||||
},
|
||||
"require-dev": {
|
||||
"symfony/var-dumper": "^4.2",
|
||||
"topthink/think-trace":"^1.0"
|
||||
},
|
||||
"autoload": {
|
||||
"psr-4": {
|
||||
"app\\": "application"
|
||||
"app\\": "app"
|
||||
},
|
||||
"psr-0": {
|
||||
"": "extend/"
|
||||
}
|
||||
},
|
||||
"extra": {
|
||||
"think-path": "thinkphp"
|
||||
},
|
||||
"config": {
|
||||
"preferred-install": "dist"
|
||||
},
|
||||
"scripts": {
|
||||
"post-autoload-dump": [
|
||||
"@php think service:discover",
|
||||
"@php think vendor:publish"
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
478
composer.lock
generated
478
composer.lock
generated
@ -1,478 +0,0 @@
|
||||
{
|
||||
"_readme": [
|
||||
"This file locks the dependencies of your project to a known state",
|
||||
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
|
||||
"This file is @generated automatically"
|
||||
],
|
||||
"content-hash": "7fa2f3e78fff7142ed6a489a3fc6722f",
|
||||
"packages": [
|
||||
{
|
||||
"name": "guzzlehttp/guzzle",
|
||||
"version": "6.5.2",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/guzzle/guzzle.git",
|
||||
"reference": "43ece0e75098b7ecd8d13918293029e555a50f82"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/guzzle/guzzle/zipball/43ece0e75098b7ecd8d13918293029e555a50f82",
|
||||
"reference": "43ece0e75098b7ecd8d13918293029e555a50f82",
|
||||
"shasum": "",
|
||||
"mirrors": [
|
||||
{
|
||||
"url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%",
|
||||
"preferred": true
|
||||
}
|
||||
]
|
||||
},
|
||||
"require": {
|
||||
"ext-json": "*",
|
||||
"guzzlehttp/promises": "^1.0",
|
||||
"guzzlehttp/psr7": "^1.6.1",
|
||||
"php": ">=5.5"
|
||||
},
|
||||
"require-dev": {
|
||||
"ext-curl": "*",
|
||||
"phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.4 || ^7.0",
|
||||
"psr/log": "^1.1"
|
||||
},
|
||||
"suggest": {
|
||||
"ext-intl": "Required for Internationalized Domain Name (IDN) support",
|
||||
"psr/log": "Required for using the Log middleware"
|
||||
},
|
||||
"type": "library",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "6.5-dev"
|
||||
}
|
||||
},
|
||||
"autoload": {
|
||||
"psr-4": {
|
||||
"GuzzleHttp\\": "src/"
|
||||
},
|
||||
"files": [
|
||||
"src/functions_include.php"
|
||||
]
|
||||
},
|
||||
"notification-url": "https://packagist.org/downloads/",
|
||||
"license": [
|
||||
"MIT"
|
||||
],
|
||||
"authors": [
|
||||
{
|
||||
"name": "Michael Dowling",
|
||||
"email": "mtdowling@gmail.com",
|
||||
"homepage": "https://github.com/mtdowling"
|
||||
}
|
||||
],
|
||||
"description": "Guzzle is a PHP HTTP client library",
|
||||
"homepage": "http://guzzlephp.org/",
|
||||
"keywords": [
|
||||
"client",
|
||||
"curl",
|
||||
"framework",
|
||||
"http",
|
||||
"http client",
|
||||
"rest",
|
||||
"web service"
|
||||
],
|
||||
"time": "2019-12-23T11:57:10+00:00"
|
||||
},
|
||||
{
|
||||
"name": "guzzlehttp/promises",
|
||||
"version": "v1.3.1",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/guzzle/promises.git",
|
||||
"reference": "a59da6cf61d80060647ff4d3eb2c03a2bc694646"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/guzzle/promises/zipball/a59da6cf61d80060647ff4d3eb2c03a2bc694646",
|
||||
"reference": "a59da6cf61d80060647ff4d3eb2c03a2bc694646",
|
||||
"shasum": "",
|
||||
"mirrors": [
|
||||
{
|
||||
"url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%",
|
||||
"preferred": true
|
||||
}
|
||||
]
|
||||
},
|
||||
"require": {
|
||||
"php": ">=5.5.0"
|
||||
},
|
||||
"require-dev": {
|
||||
"phpunit/phpunit": "^4.0"
|
||||
},
|
||||
"type": "library",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "1.4-dev"
|
||||
}
|
||||
},
|
||||
"autoload": {
|
||||
"psr-4": {
|
||||
"GuzzleHttp\\Promise\\": "src/"
|
||||
},
|
||||
"files": [
|
||||
"src/functions_include.php"
|
||||
]
|
||||
},
|
||||
"notification-url": "https://packagist.org/downloads/",
|
||||
"license": [
|
||||
"MIT"
|
||||
],
|
||||
"authors": [
|
||||
{
|
||||
"name": "Michael Dowling",
|
||||
"email": "mtdowling@gmail.com",
|
||||
"homepage": "https://github.com/mtdowling"
|
||||
}
|
||||
],
|
||||
"description": "Guzzle promises library",
|
||||
"keywords": [
|
||||
"promise"
|
||||
],
|
||||
"time": "2016-12-20T10:07:11+00:00"
|
||||
},
|
||||
{
|
||||
"name": "guzzlehttp/psr7",
|
||||
"version": "1.6.1",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/guzzle/psr7.git",
|
||||
"reference": "239400de7a173fe9901b9ac7c06497751f00727a"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/guzzle/psr7/zipball/239400de7a173fe9901b9ac7c06497751f00727a",
|
||||
"reference": "239400de7a173fe9901b9ac7c06497751f00727a",
|
||||
"shasum": "",
|
||||
"mirrors": [
|
||||
{
|
||||
"url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%",
|
||||
"preferred": true
|
||||
}
|
||||
]
|
||||
},
|
||||
"require": {
|
||||
"php": ">=5.4.0",
|
||||
"psr/http-message": "~1.0",
|
||||
"ralouphie/getallheaders": "^2.0.5 || ^3.0.0"
|
||||
},
|
||||
"provide": {
|
||||
"psr/http-message-implementation": "1.0"
|
||||
},
|
||||
"require-dev": {
|
||||
"ext-zlib": "*",
|
||||
"phpunit/phpunit": "~4.8.36 || ^5.7.27 || ^6.5.8"
|
||||
},
|
||||
"suggest": {
|
||||
"zendframework/zend-httphandlerrunner": "Emit PSR-7 responses"
|
||||
},
|
||||
"type": "library",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "1.6-dev"
|
||||
}
|
||||
},
|
||||
"autoload": {
|
||||
"psr-4": {
|
||||
"GuzzleHttp\\Psr7\\": "src/"
|
||||
},
|
||||
"files": [
|
||||
"src/functions_include.php"
|
||||
]
|
||||
},
|
||||
"notification-url": "https://packagist.org/downloads/",
|
||||
"license": [
|
||||
"MIT"
|
||||
],
|
||||
"authors": [
|
||||
{
|
||||
"name": "Michael Dowling",
|
||||
"email": "mtdowling@gmail.com",
|
||||
"homepage": "https://github.com/mtdowling"
|
||||
},
|
||||
{
|
||||
"name": "Tobias Schultze",
|
||||
"homepage": "https://github.com/Tobion"
|
||||
}
|
||||
],
|
||||
"description": "PSR-7 message implementation that also provides common utility methods",
|
||||
"keywords": [
|
||||
"http",
|
||||
"message",
|
||||
"psr-7",
|
||||
"request",
|
||||
"response",
|
||||
"stream",
|
||||
"uri",
|
||||
"url"
|
||||
],
|
||||
"time": "2019-07-01T23:21:34+00:00"
|
||||
},
|
||||
{
|
||||
"name": "psr/http-message",
|
||||
"version": "1.0.1",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/php-fig/http-message.git",
|
||||
"reference": "f6561bf28d520154e4b0ec72be95418abe6d9363"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/php-fig/http-message/zipball/f6561bf28d520154e4b0ec72be95418abe6d9363",
|
||||
"reference": "f6561bf28d520154e4b0ec72be95418abe6d9363",
|
||||
"shasum": "",
|
||||
"mirrors": [
|
||||
{
|
||||
"url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%",
|
||||
"preferred": true
|
||||
}
|
||||
]
|
||||
},
|
||||
"require": {
|
||||
"php": ">=5.3.0"
|
||||
},
|
||||
"type": "library",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "1.0.x-dev"
|
||||
}
|
||||
},
|
||||
"autoload": {
|
||||
"psr-4": {
|
||||
"Psr\\Http\\Message\\": "src/"
|
||||
}
|
||||
},
|
||||
"notification-url": "https://packagist.org/downloads/",
|
||||
"license": [
|
||||
"MIT"
|
||||
],
|
||||
"authors": [
|
||||
{
|
||||
"name": "PHP-FIG",
|
||||
"homepage": "http://www.php-fig.org/"
|
||||
}
|
||||
],
|
||||
"description": "Common interface for HTTP messages",
|
||||
"homepage": "https://github.com/php-fig/http-message",
|
||||
"keywords": [
|
||||
"http",
|
||||
"http-message",
|
||||
"psr",
|
||||
"psr-7",
|
||||
"request",
|
||||
"response"
|
||||
],
|
||||
"time": "2016-08-06T14:39:51+00:00"
|
||||
},
|
||||
{
|
||||
"name": "ralouphie/getallheaders",
|
||||
"version": "3.0.3",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/ralouphie/getallheaders.git",
|
||||
"reference": "120b605dfeb996808c31b6477290a714d356e822"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/ralouphie/getallheaders/zipball/120b605dfeb996808c31b6477290a714d356e822",
|
||||
"reference": "120b605dfeb996808c31b6477290a714d356e822",
|
||||
"shasum": "",
|
||||
"mirrors": [
|
||||
{
|
||||
"url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%",
|
||||
"preferred": true
|
||||
}
|
||||
]
|
||||
},
|
||||
"require": {
|
||||
"php": ">=5.6"
|
||||
},
|
||||
"require-dev": {
|
||||
"php-coveralls/php-coveralls": "^2.1",
|
||||
"phpunit/phpunit": "^5 || ^6.5"
|
||||
},
|
||||
"type": "library",
|
||||
"autoload": {
|
||||
"files": [
|
||||
"src/getallheaders.php"
|
||||
]
|
||||
},
|
||||
"notification-url": "https://packagist.org/downloads/",
|
||||
"license": [
|
||||
"MIT"
|
||||
],
|
||||
"authors": [
|
||||
{
|
||||
"name": "Ralph Khattar",
|
||||
"email": "ralph.khattar@gmail.com"
|
||||
}
|
||||
],
|
||||
"description": "A polyfill for getallheaders.",
|
||||
"time": "2019-03-08T08:55:37+00:00"
|
||||
},
|
||||
{
|
||||
"name": "topthink/framework",
|
||||
"version": "v5.1.39",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/top-think/framework.git",
|
||||
"reference": "5762858f3d58faafb3a39427f8788884b2927007"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/top-think/framework/zipball/5762858f3d58faafb3a39427f8788884b2927007",
|
||||
"reference": "5762858f3d58faafb3a39427f8788884b2927007",
|
||||
"shasum": "",
|
||||
"mirrors": [
|
||||
{
|
||||
"url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%",
|
||||
"preferred": true
|
||||
}
|
||||
]
|
||||
},
|
||||
"require": {
|
||||
"php": ">=5.6.0",
|
||||
"topthink/think-installer": "2.*"
|
||||
},
|
||||
"require-dev": {
|
||||
"johnkary/phpunit-speedtrap": "^1.0",
|
||||
"mikey179/vfsstream": "~1.6",
|
||||
"phpdocumentor/reflection-docblock": "^2.0",
|
||||
"phploc/phploc": "2.*",
|
||||
"phpunit/phpunit": "^5.0|^6.0",
|
||||
"sebastian/phpcpd": "2.*",
|
||||
"squizlabs/php_codesniffer": "2.*"
|
||||
},
|
||||
"type": "think-framework",
|
||||
"notification-url": "https://packagist.org/downloads/",
|
||||
"license": [
|
||||
"Apache-2.0"
|
||||
],
|
||||
"authors": [
|
||||
{
|
||||
"name": "liu21st",
|
||||
"email": "liu21st@gmail.com"
|
||||
},
|
||||
{
|
||||
"name": "yunwuxin",
|
||||
"email": "448901948@qq.com"
|
||||
}
|
||||
],
|
||||
"description": "the new thinkphp framework",
|
||||
"homepage": "http://thinkphp.cn/",
|
||||
"keywords": [
|
||||
"framework",
|
||||
"orm",
|
||||
"thinkphp"
|
||||
],
|
||||
"time": "2019-11-17T23:22:02+00:00"
|
||||
},
|
||||
{
|
||||
"name": "topthink/think-installer",
|
||||
"version": "v2.0.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/top-think/think-installer.git",
|
||||
"reference": "f5400a12c60e513911aef41fe443fa6920952675"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/top-think/think-installer/zipball/f5400a12c60e513911aef41fe443fa6920952675",
|
||||
"reference": "f5400a12c60e513911aef41fe443fa6920952675",
|
||||
"shasum": "",
|
||||
"mirrors": [
|
||||
{
|
||||
"url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%",
|
||||
"preferred": true
|
||||
}
|
||||
]
|
||||
},
|
||||
"require": {
|
||||
"composer-plugin-api": "^1.0"
|
||||
},
|
||||
"require-dev": {
|
||||
"composer/composer": "1.0.*@dev"
|
||||
},
|
||||
"type": "composer-plugin",
|
||||
"extra": {
|
||||
"class": "think\\composer\\Plugin"
|
||||
},
|
||||
"autoload": {
|
||||
"psr-4": {
|
||||
"think\\composer\\": "src"
|
||||
}
|
||||
},
|
||||
"notification-url": "https://packagist.org/downloads/",
|
||||
"license": [
|
||||
"Apache-2.0"
|
||||
],
|
||||
"authors": [
|
||||
{
|
||||
"name": "yunwuxin",
|
||||
"email": "448901948@qq.com"
|
||||
}
|
||||
],
|
||||
"time": "2018-05-11T06:45:42+00:00"
|
||||
},
|
||||
{
|
||||
"name": "topthink/think-migration",
|
||||
"version": "v2.0.3",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/top-think/think-migration.git",
|
||||
"reference": "70c89850ca29c2eab988c7c3475d1d5331901bb8"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/top-think/think-migration/zipball/70c89850ca29c2eab988c7c3475d1d5331901bb8",
|
||||
"reference": "70c89850ca29c2eab988c7c3475d1d5331901bb8",
|
||||
"shasum": "",
|
||||
"mirrors": [
|
||||
{
|
||||
"url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%",
|
||||
"preferred": true
|
||||
}
|
||||
]
|
||||
},
|
||||
"require": {
|
||||
"topthink/framework": "5.1.*"
|
||||
},
|
||||
"type": "library",
|
||||
"autoload": {
|
||||
"psr-4": {
|
||||
"Phinx\\": "phinx/src/Phinx",
|
||||
"think\\migration\\": "src"
|
||||
},
|
||||
"files": [
|
||||
"src/config.php"
|
||||
]
|
||||
},
|
||||
"notification-url": "https://packagist.org/downloads/",
|
||||
"license": [
|
||||
"Apache-2.0"
|
||||
],
|
||||
"authors": [
|
||||
{
|
||||
"name": "yunwuxin",
|
||||
"email": "448901948@qq.com"
|
||||
}
|
||||
],
|
||||
"time": "2017-12-31T16:32:22+00:00"
|
||||
}
|
||||
],
|
||||
"packages-dev": [],
|
||||
"aliases": [],
|
||||
"minimum-stability": "stable",
|
||||
"stability-flags": [],
|
||||
"prefer-stable": false,
|
||||
"prefer-lowest": false,
|
||||
"platform": {
|
||||
"php": ">=5.6.0"
|
||||
},
|
||||
"platform-dev": []
|
||||
}
|
||||
148
config/app.php
148
config/app.php
@ -1,146 +1,32 @@
|
||||
<?php
|
||||
// +----------------------------------------------------------------------
|
||||
// | ThinkPHP [ WE CAN DO IT JUST THINK ]
|
||||
// +----------------------------------------------------------------------
|
||||
// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
|
||||
// +----------------------------------------------------------------------
|
||||
// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
|
||||
// +----------------------------------------------------------------------
|
||||
// | Author: liu21st <liu21st@gmail.com>
|
||||
// +----------------------------------------------------------------------
|
||||
|
||||
// +----------------------------------------------------------------------
|
||||
// | 应用设置
|
||||
// +----------------------------------------------------------------------
|
||||
|
||||
return [
|
||||
// 应用名称
|
||||
'app_name' => '',
|
||||
// 应用地址
|
||||
'app_host' => '',
|
||||
// 应用调试模式
|
||||
'app_debug' => true,
|
||||
// 应用Trace
|
||||
'app_trace' => false,
|
||||
// 是否支持多模块
|
||||
'app_multi_module' => true,
|
||||
// 入口自动绑定模块
|
||||
'auto_bind_module' => false,
|
||||
// 注册的根命名空间
|
||||
'root_namespace' => [],
|
||||
// 默认输出类型
|
||||
'default_return_type' => 'json',
|
||||
// 默认AJAX 数据返回格式,可选json xml ...
|
||||
'default_ajax_return' => 'json',
|
||||
// 默认JSONP格式返回的处理方法
|
||||
'default_jsonp_handler' => 'jsonpReturn',
|
||||
// 默认JSONP处理方法
|
||||
'var_jsonp_handler' => 'callback',
|
||||
'app_host' => env('app.host', ''),
|
||||
// 应用的命名空间
|
||||
'app_namespace' => '',
|
||||
// 是否启用路由
|
||||
'with_route' => true,
|
||||
// 默认应用
|
||||
'default_app' => 'index',
|
||||
// 默认时区
|
||||
'default_timezone' => 'Asia/Shanghai',
|
||||
// 是否开启多语言
|
||||
'lang_switch_on' => false,
|
||||
// 默认全局过滤方法 用逗号分隔多个
|
||||
'default_filter' => '',
|
||||
// 默认语言
|
||||
'default_lang' => 'zh-cn',
|
||||
// 应用类库后缀
|
||||
'class_suffix' => false,
|
||||
// 控制器类后缀
|
||||
'controller_suffix' => false,
|
||||
'default_timezone' => 'Asia/Shanghai',
|
||||
|
||||
// +----------------------------------------------------------------------
|
||||
// | 模块设置
|
||||
// +----------------------------------------------------------------------
|
||||
|
||||
// 默认模块名
|
||||
'default_module' => 'api',
|
||||
// 禁止访问模块
|
||||
'deny_module_list' => ['http', 'install', 'model', 'util'],
|
||||
// 默认控制器名
|
||||
'default_controller' => 'Index',
|
||||
// 默认操作名
|
||||
'default_action' => 'index',
|
||||
// 默认验证器
|
||||
'default_validate' => '',
|
||||
// 默认的空模块名
|
||||
'empty_module' => '',
|
||||
// 默认的空控制器名
|
||||
'empty_controller' => 'Error',
|
||||
// 操作方法前缀
|
||||
'use_action_prefix' => false,
|
||||
// 操作方法后缀
|
||||
'action_suffix' => '',
|
||||
// 自动搜索控制器
|
||||
'controller_auto_search' => false,
|
||||
|
||||
// +----------------------------------------------------------------------
|
||||
// | URL设置
|
||||
// +----------------------------------------------------------------------
|
||||
|
||||
// PATHINFO变量名 用于兼容模式
|
||||
'var_pathinfo' => 's',
|
||||
// 兼容PATH_INFO获取
|
||||
'pathinfo_fetch' => ['ORIG_PATH_INFO', 'REDIRECT_PATH_INFO', 'REDIRECT_URL'],
|
||||
// pathinfo分隔符
|
||||
'pathinfo_depr' => '/',
|
||||
// HTTPS代理标识
|
||||
'https_agent_name' => '',
|
||||
// IP代理获取标识
|
||||
'http_agent_ip' => 'X-REAL-IP',
|
||||
// URL伪静态后缀
|
||||
'url_html_suffix' => 'html',
|
||||
// URL普通方式参数 用于自动生成
|
||||
'url_common_param' => false,
|
||||
// URL参数方式 0 按名称成对解析 1 按顺序解析
|
||||
'url_param_type' => 0,
|
||||
// 是否开启路由延迟解析
|
||||
'url_lazy_route' => false,
|
||||
// 是否强制使用路由
|
||||
'url_route_must' => true,
|
||||
// 合并路由规则
|
||||
'route_rule_merge' => false,
|
||||
// 路由是否完全匹配
|
||||
'route_complete_match' => false,
|
||||
// 使用注解路由
|
||||
'route_annotation' => false,
|
||||
// 域名根，如thinkphp.cn
|
||||
'url_domain_root' => '',
|
||||
// 是否自动转换URL中的控制器和操作名
|
||||
'url_convert' => true,
|
||||
// 默认的访问控制器层
|
||||
'url_controller_layer' => 'controller',
|
||||
// 表单请求类型伪装变量
|
||||
'var_method' => '_method',
|
||||
// 表单ajax伪装变量
|
||||
'var_ajax' => '_ajax',
|
||||
// 表单pjax伪装变量
|
||||
'var_pjax' => '_pjax',
|
||||
// 是否开启请求缓存 true自动缓存 支持设置请求缓存规则
|
||||
'request_cache' => false,
|
||||
// 请求缓存有效期
|
||||
'request_cache_expire' => null,
|
||||
// 全局请求缓存排除规则
|
||||
'request_cache_except' => [],
|
||||
// 是否开启路由缓存
|
||||
'route_check_cache' => false,
|
||||
// 路由缓存的Key自定义设置（闭包），默认为当前URL和请求类型的md5
|
||||
'route_check_cache_key' => '',
|
||||
// 路由缓存类型及参数
|
||||
'route_cache_option' => [],
|
||||
|
||||
// 默认跳转页面对应的模板文件
|
||||
'dispatch_success_tmpl' => Env::get('think_path') . 'tpl/dispatch_jump.tpl',
|
||||
'dispatch_error_tmpl' => Env::get('think_path') . 'tpl/dispatch_jump.tpl',
|
||||
// 应用映射（自动多应用模式有效）
|
||||
'app_map' => [],
|
||||
// 域名绑定（自动多应用模式有效）
|
||||
'domain_bind' => [],
|
||||
// 禁止URL访问的应用列表（自动多应用模式有效）
|
||||
'deny_app_list' => [],
|
||||
|
||||
// 异常页面的模板文件
|
||||
'exception_tmpl' => Env::get('think_path') . 'tpl/think_exception.tpl',
|
||||
'exception_tmpl' => app()->getThinkPath() . 'tpl/think_exception.tpl',
|
||||
|
||||
// 错误显示信息,非调试模式有效
|
||||
'error_message' => '页面错误！请稍后再试～',
|
||||
'error_message' => '页面错误！请稍后再试～',
|
||||
// 显示错误信息
|
||||
'show_error_msg' => false,
|
||||
// 异常处理handle类 留空使用 \think\exception\Handle
|
||||
'exception_handle' => '\\app\\util\\ExceptionHandle',
|
||||
|
||||
'show_error_msg' => true,
|
||||
];
|
||||
|
||||
@ -1,26 +1,39 @@
|
||||
<?php
|
||||
// +----------------------------------------------------------------------
|
||||
// | ThinkPHP [ WE CAN DO IT JUST THINK ]
|
||||
// +----------------------------------------------------------------------
|
||||
// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
|
||||
// +----------------------------------------------------------------------
|
||||
// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
|
||||
// +----------------------------------------------------------------------
|
||||
// | Author: liu21st <liu21st@gmail.com>
|
||||
// +----------------------------------------------------------------------
|
||||
|
||||
// +----------------------------------------------------------------------
|
||||
// | 缓存设置
|
||||
// +----------------------------------------------------------------------
|
||||
|
||||
return [
|
||||
// 驱动方式
|
||||
'type' => 'Redis',
|
||||
'host' => '127.0.0.1',
|
||||
// 缓存保存目录
|
||||
'path' => '',
|
||||
// 缓存前缀
|
||||
'prefix' => '',
|
||||
// 缓存有效期 0表示永久缓存
|
||||
'expire' => 0,
|
||||
// 默认缓存驱动
|
||||
'default' => env('cache.driver', 'redis'),
|
||||
|
||||
// 缓存连接方式配置
|
||||
'stores' => [
|
||||
'file' => [
|
||||
// 驱动方式
|
||||
'type' => 'File',
|
||||
// 缓存保存目录
|
||||
'path' => '',
|
||||
// 缓存前缀
|
||||
'prefix' => '',
|
||||
// 缓存有效期 0表示永久缓存
|
||||
'expire' => 0,
|
||||
// 缓存标签前缀
|
||||
'tag_prefix' => 'tag:',
|
||||
// 序列化机制 例如 ['serialize', 'unserialize']
|
||||
'serialize' => []
|
||||
],
|
||||
'redis' => [
|
||||
// 驱动方式
|
||||
'type' => 'Redis',
|
||||
'host' => '127.0.0.1',
|
||||
'port' => 6379,
|
||||
'password' => '',
|
||||
'select' => 0,
|
||||
'prefix' => '',
|
||||
'serialize' => []
|
||||
]
|
||||
// 更多的缓存连接
|
||||
],
|
||||
];
|
||||
|
||||
@ -1,20 +1,13 @@
|
||||
<?php
|
||||
// +----------------------------------------------------------------------
|
||||
// | ThinkPHP [ WE CAN DO IT JUST THINK ]
|
||||
// +----------------------------------------------------------------------
|
||||
// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
|
||||
// +----------------------------------------------------------------------
|
||||
// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
|
||||
// +----------------------------------------------------------------------
|
||||
// | Author: liu21st <liu21st@gmail.com>
|
||||
// +----------------------------------------------------------------------
|
||||
|
||||
// +----------------------------------------------------------------------
|
||||
// | 控制台配置
|
||||
// +----------------------------------------------------------------------
|
||||
return [
|
||||
'name' => 'Think Console',
|
||||
'version' => '0.1',
|
||||
'user' => null,
|
||||
'auto_path' => env('app_path') . 'command' . DIRECTORY_SEPARATOR,
|
||||
// 指令定义
|
||||
'commands' => [
|
||||
'apiadmin:adminRouter' => 'app\command\FreshAdminRouter',
|
||||
'apiadmin:install' => 'app\command\Install',
|
||||
'apiadmin:test' => 'app\command\ApiAdmin',
|
||||
'apiadmin:autoBuild' => 'app\command\AutoBuildFile'
|
||||
],
|
||||
];
|
||||
|
||||
@ -1,20 +1,8 @@
|
||||
<?php
|
||||
// +----------------------------------------------------------------------
|
||||
// | ThinkPHP [ WE CAN DO IT JUST THINK ]
|
||||
// +----------------------------------------------------------------------
|
||||
// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
|
||||
// +----------------------------------------------------------------------
|
||||
// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
|
||||
// +----------------------------------------------------------------------
|
||||
// | Author: liu21st <liu21st@gmail.com>
|
||||
// +----------------------------------------------------------------------
|
||||
|
||||
// +----------------------------------------------------------------------
|
||||
// | Cookie设置
|
||||
// +----------------------------------------------------------------------
|
||||
return [
|
||||
// cookie 名称前缀
|
||||
'prefix' => '',
|
||||
// cookie 保存时间
|
||||
'expire' => 0,
|
||||
// cookie 保存路径
|
||||
@ -24,7 +12,7 @@ return [
|
||||
// cookie 启用安全传输
|
||||
'secure' => false,
|
||||
// httponly设置
|
||||
'httponly' => '',
|
||||
'httponly' => false,
|
||||
// 是否使用 setcookie
|
||||
'setcookie' => true,
|
||||
];
|
||||
|
||||
@ -1,63 +1,62 @@
|
||||
<?php
|
||||
// +----------------------------------------------------------------------
|
||||
// | ThinkPHP [ WE CAN DO IT JUST THINK ]
|
||||
// +----------------------------------------------------------------------
|
||||
// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
|
||||
// +----------------------------------------------------------------------
|
||||
// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
|
||||
// +----------------------------------------------------------------------
|
||||
// | Author: liu21st <liu21st@gmail.com>
|
||||
// +----------------------------------------------------------------------
|
||||
|
||||
return [
|
||||
// 数据库类型
|
||||
'type' => 'mysql',
|
||||
// 服务器地址
|
||||
'hostname' => '127.0.0.1',
|
||||
// 数据库名
|
||||
'database' => 'apiadmin',
|
||||
// 用户名
|
||||
'username' => 'root',
|
||||
// 密码
|
||||
'password' => '123456',
|
||||
// 端口
|
||||
'hostport' => '',
|
||||
// 连接dsn
|
||||
'dsn' => '',
|
||||
// 数据库连接参数
|
||||
'params' => [],
|
||||
// 数据库编码默认采用utf8
|
||||
'charset' => 'utf8mb4',
|
||||
// 数据库表前缀
|
||||
'prefix' => '',
|
||||
// 数据库调试模式
|
||||
'debug' => true,
|
||||
// 数据库部署方式:0 集中式(单一服务器),1 分布式(主从服务器)
|
||||
'deploy' => 0,
|
||||
// 数据库读写是否分离 主从式有效
|
||||
'rw_separate' => false,
|
||||
// 读写分离后 主服务器数量
|
||||
'master_num' => 1,
|
||||
// 指定从服务器序号
|
||||
'slave_no' => '',
|
||||
// 自动读取主库数据
|
||||
'read_master' => false,
|
||||
// 是否严格检查字段是否存在
|
||||
'fields_strict' => true,
|
||||
// 数据集返回类型
|
||||
'resultset_type' => 'array',
|
||||
// 默认使用的数据库连接配置
|
||||
'default' => env('database.driver', 'mysql'),
|
||||
|
||||
// 自定义时间查询规则
|
||||
'time_query_rule' => [],
|
||||
|
||||
// 自动写入时间戳字段
|
||||
'auto_timestamp' => false,
|
||||
// true为自动识别类型 false关闭
|
||||
// 字符串则明确指定时间字段类型 支持 int timestamp datetime date
|
||||
'auto_timestamp' => true,
|
||||
|
||||
// 时间字段取出后的默认时间格式
|
||||
'datetime_format' => 'Y-m-d H:i:s',
|
||||
// 是否需要进行SQL性能分析
|
||||
'sql_explain' => false,
|
||||
// Builder类
|
||||
'builder' => '',
|
||||
// Query类
|
||||
'query' => '\\think\\db\\Query',
|
||||
// 是否需要断线重连
|
||||
'break_reconnect' => false,
|
||||
// 断线标识字符串
|
||||
'break_match_str' => [],
|
||||
|
||||
// 数据库连接配置信息
|
||||
'connections' => [
|
||||
'mysql' => [
|
||||
// 数据库类型
|
||||
'type' => env('database.type', 'mysql'),
|
||||
// 服务器地址
|
||||
'hostname' => env('database.hostname', '127.0.0.1'),
|
||||
// 数据库名
|
||||
'database' => env('database.database', ''),
|
||||
// 用户名
|
||||
'username' => env('database.username', 'root'),
|
||||
// 密码
|
||||
'password' => env('database.password', ''),
|
||||
// 端口
|
||||
'hostport' => env('database.hostport', '3306'),
|
||||
// 数据库连接参数
|
||||
'params' => [],
|
||||
// 数据库编码默认采用utf8
|
||||
'charset' => env('database.charset', 'utf8'),
|
||||
// 数据库表前缀
|
||||
'prefix' => env('database.prefix', ''),
|
||||
|
||||
// 数据库部署方式:0 集中式(单一服务器),1 分布式(主从服务器)
|
||||
'deploy' => 0,
|
||||
// 数据库读写是否分离 主从式有效
|
||||
'rw_separate' => false,
|
||||
// 读写分离后 主服务器数量
|
||||
'master_num' => 1,
|
||||
// 指定从服务器序号
|
||||
'slave_no' => '',
|
||||
// 是否严格检查字段是否存在
|
||||
'fields_strict' => true,
|
||||
// 是否需要断线重连
|
||||
'break_reconnect' => false,
|
||||
// 监听SQL
|
||||
'trigger_sql' => env('app_debug', true),
|
||||
// 开启字段缓存
|
||||
'fields_cache' => false,
|
||||
// 字段缓存路径
|
||||
'schema_cache_path' => app()->getRuntimePath() . 'schema' . DIRECTORY_SEPARATOR,
|
||||
],
|
||||
|
||||
// 更多的数据库配置信息
|
||||
],
|
||||
];
|
||||
|
||||
24
config/filesystem.php
Normal file
24
config/filesystem.php
Normal file
@ -0,0 +1,24 @@
|
||||
<?php
|
||||
|
||||
return [
|
||||
// 默认磁盘
|
||||
'default' => env('filesystem.driver', 'local'),
|
||||
// 磁盘列表
|
||||
'disks' => [
|
||||
'local' => [
|
||||
'type' => 'local',
|
||||
'root' => app()->getRuntimePath() . 'storage',
|
||||
],
|
||||
'public' => [
|
||||
// 磁盘类型
|
||||
'type' => 'local',
|
||||
// 磁盘路径
|
||||
'root' => app()->getRootPath() . 'public/storage',
|
||||
// 磁盘路径对应的外部URL路径
|
||||
'url' => '/storage',
|
||||
// 可见性
|
||||
'visibility' => 'public',
|
||||
],
|
||||
// 更多的磁盘配置信息
|
||||
],
|
||||
];
|
||||
25
config/lang.php
Normal file
25
config/lang.php
Normal file
@ -0,0 +1,25 @@
|
||||
<?php
|
||||
// +----------------------------------------------------------------------
|
||||
// | 多语言设置
|
||||
// +----------------------------------------------------------------------
|
||||
|
||||
return [
|
||||
// 默认语言
|
||||
'default_lang' => env('lang.default_lang', 'zh-cn'),
|
||||
// 允许的语言列表
|
||||
'allow_lang_list' => [],
|
||||
// 多语言自动侦测变量名
|
||||
'detect_var' => 'lang',
|
||||
// 是否使用Cookie记录
|
||||
'use_cookie' => true,
|
||||
// 多语言cookie变量
|
||||
'cookie_var' => 'think_lang',
|
||||
// 扩展语言包
|
||||
'extend_list' => [],
|
||||
// Accept-Language转义为对应语言包名称
|
||||
'accept_language' => [
|
||||
'zh-hans-cn' => 'zh-cn',
|
||||
],
|
||||
// 是否支持语言分组
|
||||
'allow_group' => false,
|
||||
];
|
||||
@ -1,30 +1,45 @@
|
||||
<?php
|
||||
// +----------------------------------------------------------------------
|
||||
// | ThinkPHP [ WE CAN DO IT JUST THINK ]
|
||||
// +----------------------------------------------------------------------
|
||||
// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
|
||||
// +----------------------------------------------------------------------
|
||||
// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
|
||||
// +----------------------------------------------------------------------
|
||||
// | Author: liu21st <liu21st@gmail.com>
|
||||
// +----------------------------------------------------------------------
|
||||
|
||||
// +----------------------------------------------------------------------
|
||||
// | 日志设置
|
||||
// +----------------------------------------------------------------------
|
||||
return [
|
||||
// 日志记录方式，内置 file socket 支持扩展
|
||||
'type' => 'File',
|
||||
// 日志保存目录
|
||||
'path' => '',
|
||||
// 默认日志记录通道
|
||||
'default' => env('log.channel', 'file'),
|
||||
// 日志记录级别
|
||||
'level' => [],
|
||||
// 单文件日志写入
|
||||
'single' => false,
|
||||
// 独立日志级别
|
||||
'apart_level' => [],
|
||||
// 最大日志文件数量
|
||||
'max_files' => 0,
|
||||
// 是否关闭日志写入
|
||||
'close' => false,
|
||||
'level' => [],
|
||||
// 日志类型记录的通道 ['error'=>'email',...]
|
||||
'type_channel' => [],
|
||||
// 关闭全局日志写入
|
||||
'close' => false,
|
||||
// 全局日志处理 支持闭包
|
||||
'processor' => null,
|
||||
|
||||
// 日志通道列表
|
||||
'channels' => [
|
||||
'file' => [
|
||||
// 日志记录方式
|
||||
'type' => 'File',
|
||||
// 日志保存目录
|
||||
'path' => '',
|
||||
// 单文件日志写入
|
||||
'single' => false,
|
||||
// 独立日志级别
|
||||
'apart_level' => [],
|
||||
// 最大日志文件数量
|
||||
'max_files' => 0,
|
||||
// 使用JSON格式记录
|
||||
'json' => false,
|
||||
// 日志处理
|
||||
'processor' => null,
|
||||
// 关闭通道日志写入
|
||||
'close' => false,
|
||||
// 日志输出格式化
|
||||
'format' => '[%s][%s] %s',
|
||||
// 是否实时写入
|
||||
'realtime_write' => false,
|
||||
],
|
||||
// 其它日志通道配置
|
||||
],
|
||||
|
||||
];
|
||||
|
||||
@ -1,18 +1,8 @@
|
||||
<?php
|
||||
// +----------------------------------------------------------------------
|
||||
// | ThinkPHP [ WE CAN DO IT JUST THINK ]
|
||||
// +----------------------------------------------------------------------
|
||||
// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
|
||||
// +----------------------------------------------------------------------
|
||||
// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
|
||||
// +----------------------------------------------------------------------
|
||||
// | Author: liu21st <liu21st@gmail.com>
|
||||
// +----------------------------------------------------------------------
|
||||
|
||||
// +----------------------------------------------------------------------
|
||||
// | 中间件配置
|
||||
// +----------------------------------------------------------------------
|
||||
// 中间件配置
|
||||
return [
|
||||
// 默认中间件命名空间
|
||||
'default_namespace' => 'app\\http\\middleware\\',
|
||||
// 别名或分组
|
||||
'alias' => [],
|
||||
// 优先级设置，此数组中的中间件会按照数组中的顺序优先执行
|
||||
'priority' => [],
|
||||
];
|
||||
|
||||
45
config/route.php
Normal file
45
config/route.php
Normal file
@ -0,0 +1,45 @@
|
||||
<?php
|
||||
// +----------------------------------------------------------------------
|
||||
// | 路由设置
|
||||
// +----------------------------------------------------------------------
|
||||
|
||||
return [
|
||||
// pathinfo分隔符
|
||||
'pathinfo_depr' => '/',
|
||||
// URL伪静态后缀
|
||||
'url_html_suffix' => 'html',
|
||||
// URL普通方式参数 用于自动生成
|
||||
'url_common_param' => true,
|
||||
// 是否开启路由延迟解析
|
||||
'url_lazy_route' => false,
|
||||
// 是否强制使用路由
|
||||
'url_route_must' => false,
|
||||
// 合并路由规则
|
||||
'route_rule_merge' => false,
|
||||
// 路由是否完全匹配
|
||||
'route_complete_match' => false,
|
||||
// 访问控制器层名称
|
||||
'controller_layer' => 'controller',
|
||||
// 空控制器名
|
||||
'empty_controller' => 'Error',
|
||||
// 是否使用控制器后缀
|
||||
'controller_suffix' => false,
|
||||
// 默认的路由变量规则
|
||||
'default_route_pattern' => '[\w\.]+',
|
||||
// 是否开启请求缓存 true自动缓存 支持设置请求缓存规则
|
||||
'request_cache_key' => false,
|
||||
// 请求缓存有效期
|
||||
'request_cache_expire' => null,
|
||||
// 全局请求缓存排除规则
|
||||
'request_cache_except' => [],
|
||||
// 默认控制器名
|
||||
'default_controller' => 'api.Miss',
|
||||
// 默认操作名
|
||||
'default_action' => 'index',
|
||||
// 操作方法后缀
|
||||
'action_suffix' => '',
|
||||
// 默认JSONP格式返回的处理方法
|
||||
'default_jsonp_handler' => 'jsonpReturn',
|
||||
// 默认JSONP处理方法
|
||||
'var_jsonp_handler' => 'callback',
|
||||
];
|
||||
@ -1,26 +1,19 @@
|
||||
<?php
|
||||
// +----------------------------------------------------------------------
|
||||
// | ThinkPHP [ WE CAN DO IT JUST THINK ]
|
||||
// +----------------------------------------------------------------------
|
||||
// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
|
||||
// +----------------------------------------------------------------------
|
||||
// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
|
||||
// +----------------------------------------------------------------------
|
||||
// | Author: liu21st <liu21st@gmail.com>
|
||||
// +----------------------------------------------------------------------
|
||||
|
||||
// +----------------------------------------------------------------------
|
||||
// | 会话设置
|
||||
// +----------------------------------------------------------------------
|
||||
|
||||
return [
|
||||
'id' => '',
|
||||
// session name
|
||||
'name' => 'PHPSESSID',
|
||||
// SESSION_ID的提交变量,解决flash上传跨域
|
||||
'var_session_id' => '',
|
||||
// SESSION 前缀
|
||||
'prefix' => 'think',
|
||||
// 驱动方式 支持redis memcache memcached
|
||||
'type' => '',
|
||||
// 是否自动开启 SESSION
|
||||
'auto_start' => true,
|
||||
// 驱动方式 支持file cache
|
||||
'type' => 'file',
|
||||
// 存储连接标识 当type使用cache的时候有效
|
||||
'store' => null,
|
||||
// 过期时间
|
||||
'expire' => 1440,
|
||||
// 前缀
|
||||
'prefix' => '',
|
||||
];
|
||||
|
||||
@ -1,35 +0,0 @@
|
||||
<?php
|
||||
// +----------------------------------------------------------------------
|
||||
// | ThinkPHP [ WE CAN DO IT JUST THINK ]
|
||||
// +----------------------------------------------------------------------
|
||||
// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
|
||||
// +----------------------------------------------------------------------
|
||||
// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
|
||||
// +----------------------------------------------------------------------
|
||||
// | Author: liu21st <liu21st@gmail.com>
|
||||
// +----------------------------------------------------------------------
|
||||
|
||||
// +----------------------------------------------------------------------
|
||||
// | 模板设置
|
||||
// +----------------------------------------------------------------------
|
||||
|
||||
return [
|
||||
// 模板引擎类型 支持 php think 支持扩展
|
||||
'type' => 'Think',
|
||||
// 默认模板渲染规则 1 解析为小写+下划线 2 全部转换小写 3 保持操作方法
|
||||
'auto_rule' => 1,
|
||||
// 模板路径
|
||||
'view_path' => '',
|
||||
// 模板后缀
|
||||
'view_suffix' => 'html',
|
||||
// 模板文件名分隔符
|
||||
'view_depr' => DIRECTORY_SEPARATOR,
|
||||
// 模板引擎普通标签开始标记
|
||||
'tpl_begin' => '{',
|
||||
// 模板引擎普通标签结束标记
|
||||
'tpl_end' => '}',
|
||||
// 标签库标签开始标记
|
||||
'taglib_begin' => '{',
|
||||
// 标签库标签结束标记
|
||||
'taglib_end' => '}',
|
||||
];
|
||||
@ -1,18 +1,10 @@
|
||||
<?php
|
||||
// +----------------------------------------------------------------------
|
||||
// | ThinkPHP [ WE CAN DO IT JUST THINK ]
|
||||
// +----------------------------------------------------------------------
|
||||
// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
|
||||
// +----------------------------------------------------------------------
|
||||
// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
|
||||
// +----------------------------------------------------------------------
|
||||
// | Author: liu21st <liu21st@gmail.com>
|
||||
// +----------------------------------------------------------------------
|
||||
|
||||
// +----------------------------------------------------------------------
|
||||
// | Trace设置 开启 app_trace 后 有效
|
||||
// | Trace设置 开启调试模式后有效
|
||||
// +----------------------------------------------------------------------
|
||||
return [
|
||||
// 内置Html Console 支持扩展
|
||||
'type' => 'Html',
|
||||
// 内置Html和Console两种方式 支持扩展
|
||||
'type' => 'Html',
|
||||
// 读取的日志通道名
|
||||
'channel' => '',
|
||||
];
|
||||
|
||||
25
config/view.php
Normal file
25
config/view.php
Normal file
@ -0,0 +1,25 @@
|
||||
<?php
|
||||
// +----------------------------------------------------------------------
|
||||
// | 模板设置
|
||||
// +----------------------------------------------------------------------
|
||||
|
||||
return [
|
||||
// 模板引擎类型使用Think
|
||||
'type' => 'Think',
|
||||
// 默认模板渲染规则 1 解析为小写+下划线 2 全部转换小写 3 保持操作方法
|
||||
'auto_rule' => 1,
|
||||
// 模板目录名
|
||||
'view_dir_name' => 'view',
|
||||
// 模板后缀
|
||||
'view_suffix' => 'html',
|
||||
// 模板文件名分隔符
|
||||
'view_depr' => DIRECTORY_SEPARATOR,
|
||||
// 模板引擎普通标签开始标记
|
||||
'tpl_begin' => '{',
|
||||
// 模板引擎普通标签结束标记
|
||||
'tpl_end' => '}',
|
||||
// 标签库标签开始标记
|
||||
'taglib_begin' => '{',
|
||||
// 标签库标签结束标记
|
||||
'taglib_end' => '}',
|
||||
];
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user