blackteay/ThinkAdmin
1
0
Fork 0
mirror of https://gitee.com/zoujingli/ThinkAdmin.git synced 2025-04-05 19:41:44 +08:00
Code Issues Projects Releases Wiki Activity

[更新]增加自定义任务处理机制，即将去除Tp官方插件

Browse Source
This commit is contained in:
Anyon 2019-08-13 18:22:36 +08:00
parent 181f8b97e6
commit 1f94b748d4
37 changed files with 937 additions and 117 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
admin_v5.sql
View File

@ -11,7 +11,7 @@
Target Server Version : 50562
File Encoding : 65001
Date: 09/08/2019 16:14:13
Date: 13/08/2019 18:20:43
*/
SET NAMES utf8mb4;
@ -40,7 +40,7 @@ CREATE TABLE `company_user` (
`is_deleted` tinyint(1) UNSIGNED NULL DEFAULT 0 COMMENT '删除(1删除,0未删)',
`create_at` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
PRIMARY KEY (`id`) USING BTREE,
INDEX `index_company_user_nickname`(`nickname`) USING BTREE,
UNIQUE INDEX `index_company_user_nickname`(`nickname`) USING BTREE,
INDEX `index_company_user_svn_username`(`svn_username`) USING BTREE,
INDEX `index_company_user_deleted`(`is_deleted`) USING BTREE,
INDEX `index_company_user_status`(`status`) USING BTREE,
@ -510,7 +510,7 @@ INSERT INTO `system_config` VALUES (55, 'wechat_push_url', '消息推送地址
INSERT INTO `system_config` VALUES (56, 'wechat_type', 'thr');
INSERT INTO `system_config` VALUES (57, 'wechat_thr_appid', 'wx60a43dd8161666d4');
INSERT INTO `system_config` VALUES (58, 'wechat_thr_appkey', '5caf4b0727f6e46a7e6ccbe773cc955d');
INSERT INTO `system_config` VALUES (60, 'wechat_thr_appurl', '消息推送地址：http://127.0.0.1:8000/wechat/api.push');
INSERT INTO `system_config` VALUES (60, 'wechat_thr_appurl', '消息推送地址：http://127.0.0.1:2314/wechat/api.push');
INSERT INTO `system_config` VALUES (61, 'component_appid', 'wx28b58798480874f9');
INSERT INTO `system_config` VALUES (62, 'component_appsecret', '8d0e1ec14ea0adc5027dd0ad82c64bc9');
INSERT INTO `system_config` VALUES (63, 'component_token', 'P8QHTIxpBEq88IrxatqhgpBm2OAQROkI');
@ -674,6 +674,27 @@ INSERT INTO `system_menu` VALUES (59, 58, '企业员工管理', '', 'layui-icon
INSERT INTO `system_menu` VALUES (60, 58, '仓库权限管理', '', 'layui-icon layui-icon-template-1', 'company/auth/index', '', '_self', 0, 1, '2019-08-08 18:39:37');
INSERT INTO `system_menu` VALUES (61, 58, '网络打卡管理', '', 'layui-icon layui-icon-engine', 'company/clock/index', '', '_self', 0, 1, '2019-08-09 14:44:23');
-- ----------------------------
-- Table structure for system_queue
-- ----------------------------
DROP TABLE IF EXISTS `system_queue`;
CREATE TABLE `system_queue` (
`id` bigint(20) NOT NULL AUTO_INCREMENT,
`title` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '任务名称',
`data` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '执行参数',
`status` tinyint(1) UNSIGNED NULL DEFAULT 1 COMMENT '任务状态(1新任务,2处理中,3成功,4失败)',
`preload` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '执行内容',
`time` bigint(20) UNSIGNED NOT NULL DEFAULT 0 COMMENT '执行时间',
`desc` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '状态描述',
`start_at` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '开始时间',
`end_at` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '结束时间',
`create_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
PRIMARY KEY (`id`) USING BTREE,
INDEX `index_system_jobs_attempts`(`time`) USING BTREE,
INDEX `index_system_jobs_create_at`(`create_at`) USING BTREE,
INDEX `index_system_jobs_queue`(`title`(191)) USING BTREE
) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '系统-任务';
-- ----------------------------
-- Table structure for system_user
-- ----------------------------
@ -703,7 +724,7 @@ CREATE TABLE `system_user` (
-- ----------------------------
-- Records of system_user
-- ----------------------------
INSERT INTO `system_user` VALUES (10000, 'admin', '21232f297a57a5a743894a0e4a801fc3', '22222222', '', '', '2019-08-09 15:19:41', '10.1.1.10', 655, '', '', '', 1, 0, '2015-11-13 15:14:22');
INSERT INTO `system_user` VALUES (10000, 'admin', '21232f297a57a5a743894a0e4a801fc3', '22222222', '', '', '2019-08-13 16:01:30', '127.0.0.1', 657, '', '', '', 1, 0, '2015-11-13 15:14:22');
-- ----------------------------
-- Table structure for wechat_fans

29
application/admin/queue/Queue.php Normal file
View File

@ -0,0 +1,29 @@
<?php
// +----------------------------------------------------------------------
// | ThinkAdmin
// +----------------------------------------------------------------------
// | 版权所有 2014~2019 广州楚才信息科技有限公司 [ http://www.cuci.cc ]
// +----------------------------------------------------------------------
// | 官方网站: http://demo.thinkadmin.top
// +----------------------------------------------------------------------
// | 开源协议 ( https://mit-license.org )
// +----------------------------------------------------------------------
// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin
// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin
// +----------------------------------------------------------------------
namespace app\admin\queue;
use think\console\Input;
use think\console\Output;
/**
* 基础任务基类
* Class Queue
* @package app\admin\queue
*/
abstract class Queue
{
abstract function execute(Input $input, Output $output, array $data);
}

74
application/admin/queue/task/Listen.php Normal file
View File

@ -0,0 +1,74 @@
<?php
// +----------------------------------------------------------------------
// | ThinkAdmin
// +----------------------------------------------------------------------
// | 版权所有 2014~2019 广州楚才信息科技有限公司 [ http://www.cuci.cc ]
// +----------------------------------------------------------------------
// | 官方网站: http://demo.thinkadmin.top
// +----------------------------------------------------------------------
// | 开源协议 ( https://mit-license.org )
// +----------------------------------------------------------------------
// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin
// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin
// +----------------------------------------------------------------------
namespace app\admin\queue\task;
use Exception;
use library\command\Task;
use think\console\Input;
use think\console\Output;
use think\Db;
/**
* 启动监听异步任务守护的主进程
* Class Listen
* @package library\command\task
*/
class Listen extends Task
{
/**
* 配置指定信息
*/
protected function configure()
{
$this->setName('xqueue:listen')->setDescription('启动监听异步任务守护的主进程');
}
/**
* 执行进程守护监听
* @param Input $input
* @param Output $output
* @throws \think\Exception
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\ModelNotFoundException
* @throws \think\exception\DbException
* @throws \think\exception\PDOException
*/
protected function execute(Input $input, Output $output)
{
$output->comment('============ 异步任务监听中 ============');
cli_set_process_title("ThinkAdmin {$this->version} 异步任务监听主进程");
while (true) {
$map = [['status', 'eq', '1'], ['time', '<=', time()]];
foreach (Db::name('SystemQueue')->where($map)->order('time asc')->select() as $item) {
try {
Db::name('SystemQueue')->where(['id' => $item['id']])->update(['status' => '2', 'start_at' => date('Y-m-d H:i:s')]);
$this->cmd = "{$this->bin} xqueue:_work {$item['id']}";
if ($this->checkProcess()) {
throw new Exception("该任务{$item['id']}的处理子进程已经存在");
} else {
$this->createProcess();
$output->comment(">>> 创建任务{$item['id']}的处理子进程成功");
}
} catch (Exception $e) {
Db::name('SystemQueue')->where(['id' => $item['id']])->update(['status' => '4', 'desc' => $e->getMessage()]);
$output->comment(">>> 创建任务{$item['id']}的处理进程失败，{$e->getMessage()}");
}
}
sleep(3);
}
}
}

50
application/admin/queue/task/Query.php Normal file
View File

@ -0,0 +1,50 @@
<?php
// +----------------------------------------------------------------------
// | ThinkAdmin
// +----------------------------------------------------------------------
// | 版权所有 2014~2019 广州楚才信息科技有限公司 [ http://www.cuci.cc ]
// +----------------------------------------------------------------------
// | 官方网站: http://demo.thinkadmin.top
// +----------------------------------------------------------------------
// | 开源协议 ( https://mit-license.org )
// +----------------------------------------------------------------------
// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin
// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin
// +----------------------------------------------------------------------
namespace app\admin\queue\task;
use library\command\Task;
use think\console\Input;
use think\console\Output;
/**
* 查询正在执行中的进程PID信息
* Class Query
* @package app\admin\queue\task
*/
class Query extends Task
{
/**
* 指令属性配置
*/
protected function configure()
{
$this->setName('xqueue:query')->setDescription('查询正在执行中的进程PID信息');
}
/**
* 执行相关进程查询
* @param Input $input
* @param Output $output
* @return int|void|null
*/
protected function execute(Input $input, Output $output)
{
$this->cmd = "{$this->bin} xqueue:";
foreach ($this->queryProcess() as $item) {
$output->writeln("{$item['pid']}\t'{$item['cmd']}'");
}
}
}

57
application/admin/queue/task/Start.php Normal file
View File

@ -0,0 +1,57 @@
<?php
// +----------------------------------------------------------------------
// | ThinkAdmin
// +----------------------------------------------------------------------
// | 版权所有 2014~2019 广州楚才信息科技有限公司 [ http://www.cuci.cc ]
// +----------------------------------------------------------------------
// | 官方网站: http://demo.thinkadmin.top
// +----------------------------------------------------------------------
// | 开源协议 ( https://mit-license.org )
// +----------------------------------------------------------------------
// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin
// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin
// +----------------------------------------------------------------------
namespace app\admin\queue\task;
use library\command\Task;
use think\console\Input;
use think\console\Output;
/**
* 检查并创建异步任务监听主进程
* Class Start
* @package app\admin\queue\task
*/
class Start extends Task
{
/**
* 指令属性配置
*/
protected function configure()
{
$this->setName('xqueue:start')->setDescription('检查并创建异步任务监听主进程');
}
/**
* 执行启动操作
* @param Input $input
* @param Output $output
*/
protected function execute(Input $input, Output $output)
{
$this->cmd = "{$this->bin} xqueue:listen";
if (($pid = $this->checkProcess()) > 0) {
$output->comment("异步任务监听主进程{$pid}已经启动！");
} else {
$this->createProcess();
if (($pid = $this->checkProcess()) > 0) {
$output->comment("异步任务监听主进程{$pid}启动成功！");
} else {
$output->comment('异步任务监听主进程创建失败！');
}
}
}
}

51
application/admin/queue/task/State.php Normal file
View File

@ -0,0 +1,51 @@
<?php
// +----------------------------------------------------------------------
// | ThinkAdmin
// +----------------------------------------------------------------------
// | 版权所有 2014~2019 广州楚才信息科技有限公司 [ http://www.cuci.cc ]
// +----------------------------------------------------------------------
// | 官方网站: http://demo.thinkadmin.top
// +----------------------------------------------------------------------
// | 开源协议 ( https://mit-license.org )
// +----------------------------------------------------------------------
// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin
// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin
// +----------------------------------------------------------------------
namespace app\admin\queue\task;
use library\command\Task;
use think\console\Input;
use think\console\Output;
/**
* 查看异步任务监听的主进程状态
* Class State
* @package app\admin\queue\task
*/
class State extends Task
{
/**
* 指令属性配置
*/
protected function configure()
{
$this->setName('xqueue:state')->setDescription('查看异步任务监听主进程的状态');
}
/**
* 指令执行
* @param Input $input
* @param Output $output
*/
protected function execute(Input $input, Output $output)
{
$this->cmd = "{$this->bin} xqueue:listen";
if (($pid = $this->checkProcess()) > 0) {
$output->comment(">>> 异步任务监听主进程{$pid}正在运行...");
} else {
$output->comment(">>> 异步任务监听主进程没有运行哦^.^");
}
}
}

52
application/admin/queue/task/Stop.php Normal file
View File

@ -0,0 +1,52 @@
<?php
// +----------------------------------------------------------------------
// | ThinkAdmin
// +----------------------------------------------------------------------
// | 版权所有 2014~2019 广州楚才信息科技有限公司 [ http://www.cuci.cc ]
// +----------------------------------------------------------------------
// | 官方网站: http://demo.thinkadmin.top
// +----------------------------------------------------------------------
// | 开源协议 ( https://mit-license.org )
// +----------------------------------------------------------------------
// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin
// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin
// +----------------------------------------------------------------------
namespace app\admin\queue\task;
use library\command\Task;
use think\console\Input;
use think\console\Output;
/**
* 平滑停止异步任务守护的主进程
* Class Stop
* @package app\admin\queue\task
*/
class Stop extends Task
{
/**
* 指令属性配置
*/
protected function configure()
{
$this->setName('xqueue:stop')->setDescription('平滑停止异步任务守护的主进程');
}
/**
* 停止所有任务执行
* @param Input $input
* @param Output $output
*/
protected function execute(Input $input, Output $output)
{
$this->cmd = "{$this->bin} xqueue:";
foreach ($this->queryProcess() as $item) {
$this->closeProcess($item['pid']);
$output->comment(">>> 给进程{$item['pid']}发送结束指令成功");
}
$output->comment(">>> 所有异步任务进程的结束指令发送成功");
}
}

104
application/admin/queue/task/Work.php Normal file
View File

@ -0,0 +1,104 @@
<?php
// +----------------------------------------------------------------------
// | ThinkAdmin
// +----------------------------------------------------------------------
// | 版权所有 2014~2019 广州楚才信息科技有限公司 [ http://www.cuci.cc ]
// +----------------------------------------------------------------------
// | 官方网站: http://demo.thinkadmin.top
// +----------------------------------------------------------------------
// | 开源协议 ( https://mit-license.org )
// +----------------------------------------------------------------------
// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin
// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin
// +----------------------------------------------------------------------
namespace app\admin\queue\task;
use Exception;
use library\command\Task;
use think\Console;
use think\console\Input;
use think\console\input\Argument;
use think\console\Output;
use think\Db;
/**
* 启动指定独立执行的任务子进程
* Class Work
* @package library\command\task
*/
class Work extends Task
{
/**
* 当前任务ID
* @var integer
*/
protected $id;
/**
* 绑定数据表
* @var string
*/
protected $table = 'SystemQueue';
/**
* 配置指定信息
*/
protected function configure()
{
// 执行任务配置
$this->setName('xqueue:_work')->setDescription('启动指定独立执行的任务子进程');
$this->addArgument('id', Argument::OPTIONAL, '指定任务ID');
}
/**
* 任务执行
* @param Input $input
* @param Output $output
* @throws \think\Exception
* @throws \think\exception\PDOException
*/
protected function execute(Input $input, Output $output)
{
try {
$this->id = trim($input->getArgument('id')) ?: 0;
if (empty($this->id)) throw new Exception("执行任务需要指定任务编号！");
$queue = Db::name('SystemQueue')->where(['id' => $this->id, 'status' => '2'])->find();
if (empty($queue)) throw new Exception("执行任务{$this->id}的信息或状态异常！");
// 设置进程标题
cli_set_process_title("ThinkAdmin {$this->version} 异步任务执行子进程 - {$queue['title']}");
// 执行任务内容
if (class_exists($queue['preload'])) {
if (method_exists($class = new $queue['preload'], 'execute')) {
$data = json_decode($queue['data'], true);
$this->update('3', $class->execute($input, $output, is_array($data) ? $data : []));
} else throw new Exception("任务处理类 {$queue['preload']} 未定义 execute 入口！");
} else {
$this->update('3', Console::call($queue['preload'], [], 'console'));
}
} catch (Exception $e) {
$this->update('4', $e->getMessage());
}
}
/**
* 修改当前任务状态
* @param integer $status 任务状态
* @param string $message 消息内容
* @return boolean
* @throws \think\Exception
* @throws \think\exception\PDOException
*/
protected function update($status, $message)
{
$result = Db::name('SystemQueue')->where(['id' => $this->id])->update([
'status' => $status, 'end_at' => date('Y-m-d H:i:s'),
'desc' => is_string($message) ? $message : '',
]);
$this->output->writeln(is_string($message) ? $message : '');
return $result !== false;
}
}

31
application/admin/sys.php
View File

@ -16,6 +16,7 @@
use app\admin\service\NodeService;
use app\admin\service\OplogService;
use library\File;
use think\Console;
use think\Db;
use think\facade\Middleware;
use think\Request;
@ -66,6 +67,26 @@ if (!function_exists('sysoplog')) {
}
}
if (!function_exists('addQueue')) {
/**
* 创建异步处理任务
* @param string $title 任务名称
* @param string $uri 任务执行内容
* @param array $data 任务绑定数据
* @param integer $time 延时执行时间
* @return boolean
*/
function addQueue($title, $uri, $data = [], $time = 0)
{
$result = Db::name('SystemQueue')->insert([
'title' => $title, 'preload' => $uri,
'data' => json_encode($data, JSON_UNESCAPED_UNICODE),
'time' => $time > 0 ? time() + $time : time(),
]);
return $result !== false;
}
}
if (!function_exists('local_image')) {
/**
* 下载远程文件到本地
@ -118,3 +139,13 @@ Middleware::add(function (Request $request, \Closure $next) {
return json(['code' => 0, 'msg' => '抱歉，需要登录获取访问权限！', 'url' => url('@admin/login')]);
}
});
// 注册系统指令
Console::addDefaultCommands([
'app\admin\queue\task\Stop',
'app\admin\queue\task\Work',
'app\admin\queue\task\Start',
'app\admin\queue\task\State',
'app\admin\queue\task\Query',
'app\admin\queue\task\Listen',
]);

5
application/index/controller/Index.php
View File

@ -31,4 +31,9 @@ class Index extends Controller
{
$this->redirect('@admin/login');
}
public function test()
{
addQueue('同步粉丝记录', 'xfans:list');
}
}

8
thinkphp/helper.php
View File

@ -686,7 +686,13 @@ if (!function_exists('widget')) {
*/
function widget($name, $data = [])
{
return app()->action($name, $data, 'widget');
$result = app()->action($name, $data, 'widget');
if (is_object($result)) {
$result = $result->getContent();
}
return $result;
}
}

2
thinkphp/library/think/App.php
View File

@ -20,7 +20,7 @@ use think\route\Dispatch;
*/
class App extends Container
{
const VERSION = '5.1.37 LTS';
const VERSION = '5.1.38 LTS';
/**
* 当前模块路径

2
thinkphp/library/think/Collection.php
View File

@ -353,7 +353,7 @@ class Collection implements ArrayAccess, Countable, IteratorAggregate, JsonSeria
$result = isset($data[$field]) ? $data[$field] : null;
}
switch ($operator) {
switch (strtolower($operator)) {
case '===':
return $result === $value;
case '!==':

4
thinkphp/library/think/Controller.php
View File

@ -158,7 +158,7 @@ class Controller
*/
protected function fetch($template = '', $vars = [], $config = [])
{
return $this->view->fetch($template, $vars, $config);
return Response::create($template, 'view')->assign($vars)->config($config);
}
/**
@ -171,7 +171,7 @@ class Controller
*/
protected function display($content = '', $vars = [], $config = [])
{
return $this->view->display($content, $vars, $config);
return Response::create($content, 'view')->assign($vars)->config($config)->isContent(true);
}
/**

20
thinkphp/library/think/Request.php
View File

@ -682,6 +682,7 @@ class Request
// 判断URL里面是否有兼容模式参数
$pathinfo = $_GET[$this->config['var_pathinfo']];
unset($_GET[$this->config['var_pathinfo']]);
unset($this->get[$this->config['var_pathinfo']]);
} elseif ($this->isCli()) {
// CLI模式下 index.php module/controller/action/params/...
$pathinfo = isset($_SERVER['argv'][1]) ? $_SERVER['argv'][1] : '';
@ -702,6 +703,10 @@ class Request
}
}
if (!empty($pathinfo)) {
unset($this->get[$pathinfo], $this->request[$pathinfo]);
}
$this->pathinfo = empty($pathinfo) || '/' == $pathinfo ? '' : ltrim($pathinfo, '/');
}
@ -1039,7 +1044,7 @@ class Request
protected function getInputData($content)
{
if (false !== strpos($this->contentType(), 'application/json') || 0 === strpos($content, '{"')) {
if ($this->isJson()) {
return (array) json_decode($content, true);
} elseif (strpos($content, '=')) {
parse_str($content, $data);
@ -1631,6 +1636,19 @@ class Request
return false;
}
/**
* 当前是否JSON请求
* @access public
* @return bool
*/
public function isJson()
{
$contentType = $this->contentType();
$acceptType = $this->type();
return false !== strpos($contentType, 'json') || false !== strpos($acceptType, 'json');
}
/**
* 当前是否Ajax请求
* @access public

4
thinkphp/library/think/Url.php
View File

@ -130,7 +130,9 @@ class Url
// 匹配路由命名标识
$url = $match[0];
$domain = $match[1];
if ($domain) {
$domain = $match[1];
}
if (!is_null($match[2])) {
$suffix = $match[2];

5
thinkphp/library/think/View.php
View File

@ -160,7 +160,10 @@ class View
*/
public function filter($filter)
{
$this->filter = $filter;
if ($filter) {
$this->filter = $filter;
}
return $this;
}

18
thinkphp/library/think/db/Builder.php
View File

@ -407,7 +407,7 @@ abstract class Builder
$jsonType = $query->getJsonFieldType($field);
$bindType = $this->connection->getFieldBindType($jsonType);
} else {
$bindType = isset($binds[$field]) ? $binds[$field] : PDO::PARAM_STR;
$bindType = isset($binds[$field]) && 'LIKE' != $exp ? $binds[$field] : PDO::PARAM_STR;
}
if (is_scalar($value) && !in_array($exp, ['EXP', 'NOT NULL', 'NULL', 'IN', 'NOT IN', 'BETWEEN', 'NOT BETWEEN']) && strpos($exp, 'TIME') === false) {
@ -450,7 +450,7 @@ abstract class Builder
// 模糊匹配
if (is_array($value)) {
foreach ($value as $item) {
$name = $query->bind($item, $bindType);
$name = $query->bind($item, PDO::PARAM_STR);
$array[] = $key . ' ' . $exp . ' :' . $name;
}
@ -604,6 +604,10 @@ abstract class Builder
$value = $this->parseClosure($query, $value);
}
if ('=' == $exp && is_null($value)) {
return $key . ' IS NULL';
}
return $key . ' ' . $exp . ' ' . $value;
}
@ -651,7 +655,6 @@ abstract class Builder
$value = $value->getValue();
} else {
$value = array_unique(is_array($value) ? $value : explode(',', $value));
$array = [];
foreach ($value as $k => $v) {
@ -659,9 +662,12 @@ abstract class Builder
$array[] = ':' . $name;
}
$zone = implode(',', $array);
$value = empty($zone) ? "''" : $zone;
if (count($array) == 1) {
return $key . ('IN' == $exp ? ' = ' : ' <> ') . $array[0];
} else {
$zone = implode(',', $array);
$value = empty($zone) ? "''" : $zone;
}
}
return $key . ' ' . $exp . ' (' . $value . ')';

6
thinkphp/library/think/db/Connection.php
View File

@ -1467,9 +1467,7 @@ abstract class Connection
$value = is_array($val) ? $val[0] : $val;
$type = is_array($val) ? $val[1] : PDO::PARAM_STR;
if (self::PARAM_FLOAT == $type) {
$value = (float) $value;
} elseif (PDO::PARAM_STR == $type) {
if ((self::PARAM_FLOAT == $type || PDO::PARAM_STR == $type) && is_string($value)) {
$value = '\'' . addslashes($value) . '\'';
} elseif (PDO::PARAM_INT == $type && '' === $value) {
$value = 0;
@ -1503,7 +1501,7 @@ abstract class Connection
if (PDO::PARAM_INT == $val[1] && '' === $val[0]) {
$val[0] = 0;
} elseif (self::PARAM_FLOAT == $val[1]) {
$val[0] = (float) $val[0];
$val[0] = is_string($val[0]) ? (float) $val[0] : $val[0];
$val[1] = PDO::PARAM_STR;
}

16
thinkphp/library/think/db/Query.php
View File

@ -95,14 +95,14 @@ class Query
* @var array
*/
protected $timeRule = [
'today' => ['today', 'tomorrow'],
'yesterday' => ['yesterday', 'today'],
'week' => ['this week 00:00:00', 'next week 00:00:00'],
'last week' => ['last week 00:00:00', 'this week 00:00:00'],
'month' => ['first Day of this month 00:00:00', 'first Day of next month 00:00:00'],
'last month' => ['first Day of last month 00:00:00', 'first Day of this month 00:00:00'],
'year' => ['this year 1/1', 'next year 1/1'],
'last year' => ['last year 1/1', 'this year 1/1'],
'today' => ['today', 'tomorrow -1second'],
'yesterday' => ['yesterday', 'today -1second'],
'week' => ['this week 00:00:00', 'next week 00:00:00 -1second'],
'last week' => ['last week 00:00:00', 'this week 00:00:00 -1second'],
'month' => ['first Day of this month 00:00:00', 'first Day of next month 00:00:00 -1second'],
'last month' => ['first Day of last month 00:00:00', 'first Day of this month 00:00:00 -1second'],
'year' => ['this year 1/1', 'next year 1/1 -1second'],
'last year' => ['last year 1/1', 'this year 1/1 -1second'],
];
/**

2
thinkphp/library/think/db/builder/Mysql.php
View File

@ -129,7 +129,7 @@ class Mysql extends Builder
// JSON字段支持
list($field, $name) = explode('->', $key, 2);
return 'json_extract(' . $this->parseKey($query, $field, true) . ', \'$.' . str_replace('->', '.', $name) . '\')';
return 'json_extract(' . $this->parseKey($query, $field, true) . ', \'$' . (strpos($name, '[') === 0 ? '' : '.') . str_replace('->', '.', $name) . '\')';
} elseif (strpos($key, '.') && !preg_match('/[,\'\"\(\)`\s]/', $key)) {
list($table, $key) = explode('.', $key, 2);

22
thinkphp/library/think/db/connector/Mysql.php
View File

@ -136,7 +136,27 @@ class Mysql extends Connection
*/
protected function getExplain($sql)
{
$pdo = $this->linkID->query("EXPLAIN " . $sql);
$pdo = $this->linkID->prepare("EXPLAIN " . $this->queryStr);
foreach ($this->bind as $key => $val) {
// 占位符
$param = is_int($key) ? $key + 1 : ':' . $key;
if (is_array($val)) {
if (PDO::PARAM_INT == $val[1] && '' === $val[0]) {
$val[0] = 0;
} elseif (self::PARAM_FLOAT == $val[1]) {
$val[0] = is_string($val[0]) ? (float) $val[0] : $val[0];
$val[1] = PDO::PARAM_STR;
}
$result = $pdo->bindValue($param, $val[0], $val[1]);
} else {
$result = $pdo->bindValue($param, $val);
}
}
$pdo->execute();
$result = $pdo->fetch(PDO::FETCH_ASSOC);
$result = array_change_key_case($result);

2
thinkphp/library/think/exception/ValidateException.php
View File

@ -18,7 +18,7 @@ class ValidateException extends \RuntimeException
public function __construct($error, $code = 0)
{
$this->error = $error;
$this->message = is_array($error) ? implode("\n\r", $error) : $error;
$this->message = is_array($error) ? implode(PHP_EOL, $error) : $error;
$this->code = $code;
}

14
thinkphp/library/think/log/driver/File.php
View File

@ -107,7 +107,7 @@ class File
$info['timestamp'] = date($this->config['time_format']);
foreach ($message as $type => $msg) {
$msg = is_array($msg) ? implode("\r\n", $msg) : $msg;
$msg = is_array($msg) ? implode(PHP_EOL, $msg) : $msg;
if (PHP_SAPI == 'cli') {
$info['msg'] = $msg;
$info['type'] = $type;
@ -212,14 +212,14 @@ class File
protected function parseCliLog($info)
{
if ($this->config['json']) {
$message = json_encode($info, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES) . "\r\n";
$message = json_encode($info, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES) . PHP_EOL;
} else {
$now = $info['timestamp'];
unset($info['timestamp']);
$message = implode("\r\n", $info);
$message = implode(PHP_EOL, $info);
$message = "[{$now}]" . $message . "\r\n";
$message = "[{$now}]" . $message . PHP_EOL;
}
return $message;
@ -242,13 +242,13 @@ class File
if ($this->config['json']) {
$info = $requestInfo + $info;
return json_encode($info, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES) . "\r\n";
return json_encode($info, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES) . PHP_EOL;
}
array_unshift($info, "---------------------------------------------------------------\r\n[{$info['timestamp']}] {$requestInfo['ip']} {$requestInfo['method']} {$requestInfo['host']}{$requestInfo['uri']}");
array_unshift($info, "---------------------------------------------------------------" . PHP_EOL . "\r\n[{$info['timestamp']}] {$requestInfo['ip']} {$requestInfo['method']} {$requestInfo['host']}{$requestInfo['uri']}");
unset($info['timestamp']);
return implode("\r\n", $info) . "\r\n";
return implode(PHP_EOL, $info) . PHP_EOL;
}
protected function getDebugLog(&$info, $append, $apart)

12
thinkphp/library/think/model/concern/Conversion.php
View File

@ -189,10 +189,12 @@ trait Conversion
if (!$relation) {
$relation = $this->getAttr($key);
$relation->visible($name);
if ($relation) {
$relation->visible($name);
}
}
$item[$key] = $relation->append($name)->toArray();
$item[$key] = $relation ? $relation->append($name)->toArray() : [];
} elseif (strpos($name, '.')) {
list($key, $attr) = explode('.', $name);
// 追加关联对象属性
@ -200,10 +202,12 @@ trait Conversion
if (!$relation) {
$relation = $this->getAttr($key);
$relation->visible([$attr]);
if ($relation) {
$relation->visible([$attr]);
}
}
$item[$key] = $relation->append([$attr])->toArray();
$item[$key] = $relation ? $relation->append([$attr])->toArray() : [];
} else {
$item[$name] = $this->getAttr($name, $item);
}

12
thinkphp/library/think/model/relation/BelongsTo.php
View File

@ -140,13 +140,17 @@ class BelongsTo extends OneToOne
$relation = basename(str_replace('\\', '/', $this->model));
$localKey = $this->localKey;
$foreignKey = $this->foreignKey;
$softDelete = $this->query->getOptions('soft_delete');
return $this->parent->db()
->alias($model)
->whereExists(function ($query) use ($table, $model, $relation, $localKey, $foreignKey) {
$query->table([$table => $relation])
->field($relation . '.' . $localKey)
->whereExp($model . '.' . $foreignKey, '=' . $relation . '.' . $localKey);
->whereExp($model . '.' . $foreignKey, '=' . $relation . '.' . $localKey)
->when($softDelete, function ($query) use ($softDelete, $relation) {
$query->where($relation . strstr($softDelete[0], '.'), '=' == $softDelete[1][0] ? $softDelete[1][1] : null);
});
});
}
@ -167,12 +171,16 @@ class BelongsTo extends OneToOne
$this->getQueryWhere($where, $relation);
}
$fields = $this->getRelationQueryFields($fields, $model);
$fields = $this->getRelationQueryFields($fields, $model);
$softDelete = $this->query->getOptions('soft_delete');
return $this->parent->db()
->alias($model)
->field($fields)
->join([$table => $relation], $model . '.' . $this->foreignKey . '=' . $relation . '.' . $this->localKey, $this->joinType)
->when($softDelete, function ($query) use ($softDelete, $relation) {
$query->where($relation . strstr($softDelete[0], '.'), '=' == $softDelete[1][0] ? $softDelete[1][1] : null);
})
->where($where);
}

16
thinkphp/library/think/model/relation/HasMany.php
View File

@ -292,14 +292,18 @@ class HasMany extends Relation
*/
public function has($operator = '>=', $count = 1, $id = '*', $joinType = 'INNER')
{
$table = $this->query->getTable();
$model = basename(str_replace('\\', '/', get_class($this->parent)));
$relation = basename(str_replace('\\', '/', $this->model));
$table = $this->query->getTable();
$model = basename(str_replace('\\', '/', get_class($this->parent)));
$relation = basename(str_replace('\\', '/', $this->model));
$softDelete = $this->query->getOptions('soft_delete');
return $this->parent->db()
->alias($model)
->field($model . '.*')
->join([$table => $relation], $model . '.' . $this->localKey . '=' . $relation . '.' . $this->foreignKey, $joinType)
->when($softDelete, function ($query) use ($softDelete, $relation) {
$query->where($relation . strstr($softDelete[0], '.'), '=' == $softDelete[1][0] ? $softDelete[1][1] : null);
})
->group($relation . '.' . $this->foreignKey)
->having('count(' . $id . ')' . $operator . $count);
}
@ -321,13 +325,17 @@ class HasMany extends Relation
$this->getQueryWhere($where, $relation);
}
$fields = $this->getRelationQueryFields($fields, $model);
$fields = $this->getRelationQueryFields($fields, $model);
$softDelete = $this->query->getOptions('soft_delete');
return $this->parent->db()
->alias($model)
->group($model . '.' . $this->localKey)
->field($fields)
->join([$table => $relation], $model . '.' . $this->localKey . '=' . $relation . '.' . $this->foreignKey)
->when($softDelete, function ($query) use ($softDelete, $relation) {
$query->where($relation . strstr($softDelete[0], '.'), '=' == $softDelete[1][0] ? $softDelete[1][1] : null);
})
->where($where);
}

266
thinkphp/library/think/model/relation/HasManyThrough.php
View File

@ -12,7 +12,6 @@
namespace think\model\relation;
use think\db\Query;
use think\Exception;
use think\Loader;
use think\Model;
use think\model\Relation;
@ -24,6 +23,12 @@ class HasManyThrough extends Relation
// 中间表模型
protected $through;
/**
* 中间主键
* @var string
*/
protected $throughPk;
/**
* 架构函数
* @access public
@ -38,9 +43,10 @@ class HasManyThrough extends Relation
{
$this->parent = $parent;
$this->model = $model;
$this->through = $through;
$this->through = (new $through)->db();
$this->foreignKey = $foreignKey;
$this->throughKey = $throughKey;
$this->throughPk = $this->through->getPk();
$this->localKey = $localKey;
$this->query = (new $model)->db();
}
@ -74,7 +80,28 @@ class HasManyThrough extends Relation
*/
public function has($operator = '>=', $count = 1, $id = '*', $joinType = 'INNER')
{
return $this->parent;
$model = App::parseName(App::classBaseName($this->parent));
$throughTable = $this->through->getTable();
$pk = $this->throughPk;
$throughKey = $this->throughKey;
$relation = (new $this->model)->db();
$relationTable = $relation->getTable();
$softDelete = $this->query->getOptions('soft_delete');
if ('*' != $id) {
$id = $relationTable . '.' . $relation->getPk();
}
return $this->parent->db()
->alias($model)
->field($model . '.*')
->join($throughTable, $throughTable . '.' . $this->foreignKey . '=' . $model . '.' . $this->localKey)
->join($relationTable, $relationTable . '.' . $throughKey . '=' . $throughTable . '.' . $this->throughPk)
->when($softDelete, function ($query) use ($softDelete, $relationTable) {
$query->where($relationTable . strstr($softDelete[0], '.'), '=' == $softDelete[1][0] ? $softDelete[1][1] : null);
})
->group($relationTable . '.' . $this->throughKey)
->having('count(' . $id . ')' . $operator . $count);
}
/**
@ -86,45 +113,225 @@ class HasManyThrough extends Relation
*/
public function hasWhere($where = [], $fields = null)
{
throw new Exception('relation not support: hasWhere');
$model = App::parseName(App::classBaseName($this->parent));
$throughTable = $this->through->getTable();
$pk = $this->throughPk;
$throughKey = $this->throughKey;
$modelTable = (new $this->model)->db()->getTable();
if (is_array($where)) {
$this->getQueryWhere($where, $modelTable);
}
$fields = $this->getRelationQueryFields($fields, $model);
$softDelete = $this->query->getOptions('soft_delete');
return $this->parent->db()
->alias($model)
->join($throughTable, $throughTable . '.' . $this->foreignKey . '=' . $model . '.' . $this->localKey)
->join($modelTable, $modelTable . '.' . $throughKey . '=' . $throughTable . '.' . $this->throughPk)
->when($softDelete, function ($query) use ($softDelete, $modelTable) {
$query->where($modelTable . strstr($softDelete[0], '.'), '=' == $softDelete[1][0] ? $softDelete[1][1] : null);
})
->group($modelTable . '.' . $this->throughKey)
->where($where)
->field($fields);
}
/**
* 预载入关联查询
* @access public
* @param array $resultSet 数据集
* @param string $relation 当前关联名
* @param string $subRelation 子关联名
* @param \Closure $closure 闭包
* 预载入关联查询（数据集）
* @access protected
* @param array $resultSet 数据集
* @param string $relation 当前关联名
* @param array $subRelation 子关联名
* @param Closure $closure 闭包
* @return void
*/
public function eagerlyResultSet(&$resultSet, $relation, $subRelation, $closure)
{}
public function eagerlyResultSet(array &$resultSet, $relation, array $subRelation = [], $closure = null)
{
$localKey = $this->localKey;
$foreignKey = $this->foreignKey;
$range = [];
foreach ($resultSet as $result) {
// 获取关联外键列表
if (isset($result->$localKey)) {
$range[] = $result->$localKey;
}
}
if (!empty($range)) {
$this->query->removeWhereField($foreignKey);
$data = $this->eagerlyWhere([
[$this->foreignKey, 'in', $range],
], $foreignKey, $relation, $subRelation, $closure);
// 关联属性名
$attr = App::parseName($relation);
// 关联数据封装
foreach ($resultSet as $result) {
$pk = $result->$localKey;
if (!isset($data[$pk])) {
$data[$pk] = [];
}
foreach ($data[$pk] as &$relationModel) {
$relationModel->setParent(clone $result);
}
// 设置关联属性
$result->setRelation($attr, $this->resultSetBuild($data[$pk]));
}
}
}
/**
* 预载入关联查询 返回模型对象
* @access public
* @param Model $result 数据对象
* @param string $relation 当前关联名
* @param string $subRelation 子关联名
* @param \Closure $closure 闭包
* 预载入关联查询（数据）
* @access protected
* @param Model $result 数据对象
* @param string $relation 当前关联名
* @param array $subRelation 子关联名
* @param Closure $closure 闭包
* @return void
*/
public function eagerlyResult(&$result, $relation, $subRelation, $closure)
{}
public function eagerlyResult($result, $relation, array $subRelation = [], $closure = null)
{
$localKey = $this->localKey;
$foreignKey = $this->foreignKey;
$pk = $result->$localKey;
$this->query->removeWhereField($foreignKey);
$data = $this->eagerlyWhere([
[$foreignKey, '=', $pk],
], $foreignKey, $relation, $subRelation, $closure);
// 关联数据封装
if (!isset($data[$pk])) {
$data[$pk] = [];
}
foreach ($data[$pk] as &$relationModel) {
$relationModel->setParent(clone $result);
}
$result->setRelation(App::parseName($relation), $this->resultSetBuild($data[$pk]));
}
/**
* 关联模型预查询
* @access public
* @param array $where 关联预查询条件
* @param string $key 关联键名
* @param string $relation 关联名
* @param array $subRelation 子关联
* @param Closure $closure
* @return array
*/
protected function eagerlyWhere(array $where, $key, $relation, array $subRelation = [], $closure = null)
{
// 预载入关联查询 支持嵌套预载入
$throughList = $this->through->where($where)->select();
$keys = $throughList->column($this->throughPk, $this->throughPk);
if ($closure) {
$closure($this->query);
}
$list = $this->query->where($this->throughKey, 'in', $keys)->select();
// 组装模型数据
$data = [];
$keys = $throughList->column($this->foreignKey, $this->throughPk);
foreach ($list as $set) {
$data[$keys[$set->{$this->throughKey}]][] = $set;
}
return $data;
}
/**
* 关联统计
* @access public
* @param Model $result 数据对象
* @param \Closure $closure 闭包
* @param string $aggregate 聚合查询方法
* @param string $field 字段
* @param string $name 统计字段别名
* @param Model $result 数据对象
* @param Closure $closure 闭包
* @param string $aggregate 聚合查询方法
* @param string $field 字段
* @param string $name 统计字段别名
* @return integer
*/
public function relationCount($result, $closure, $aggregate = 'count', $field = '*', &$name = '')
{}
public function relationCount($result, $closure, $aggregate = 'count', $field = '*', &$name = null)
{
$localKey = $this->localKey;
if (!isset($result->$localKey)) {
return 0;
}
if ($closure) {
$return = $closure($this->query);
if ($return && is_string($return)) {
$name = $return;
}
}
$alias = App::parseName(App::classBaseName($this->model));
$throughTable = $this->through->getTable();
$pk = $this->throughPk;
$throughKey = $this->throughKey;
$modelTable = $this->parent->getTable();
if (false === strpos($field, '.')) {
$field = $alias . '.' . $field;
}
return $this->query
->alias($alias)
->join($throughTable, $throughTable . '.' . $pk . '=' . $alias . '.' . $throughKey)
->join($modelTable, $modelTable . '.' . $this->localKey . '=' . $throughTable . '.' . $this->foreignKey)
->where($throughTable . '.' . $this->foreignKey, $result->$localKey)
->$aggregate($field);
}
/**
* 创建关联统计子查询
* @access public
* @param Closure $closure 闭包
* @param string $aggregate 聚合查询方法
* @param string $field 字段
* @param string $name 统计字段别名
* @return string
*/
public function getRelationCountQuery($closure = null, $aggregate = 'count', $field = '*', &$name = null)
{
if ($closure) {
$return = $closure($this->query);
if ($return && is_string($return)) {
$name = $return;
}
}
$alias = App::parseName(App::classBaseName($this->model));
$throughTable = $this->through->getTable();
$pk = $this->throughPk;
$throughKey = $this->throughKey;
$modelTable = $this->parent->getTable();
if (false === strpos($field, '.')) {
$field = $alias . '.' . $field;
}
return $this->query
->alias($alias)
->join($throughTable, $throughTable . '.' . $pk . '=' . $alias . '.' . $throughKey)
->join($modelTable, $modelTable . '.' . $this->localKey . '=' . $throughTable . '.' . $this->foreignKey)
->whereExp($throughTable . '.' . $this->foreignKey, '=' . $this->parent->getTable() . '.' . $this->localKey)
->fetchSql()
->$aggregate($field);
}
/**
* 执行基础查询（仅执行一次）
@ -134,10 +341,9 @@ class HasManyThrough extends Relation
protected function baseQuery()
{
if (empty($this->baseQuery) && $this->parent->getData()) {
$through = $this->through;
$alias = Loader::parseName(basename(str_replace('\\', '/', $this->model)));
$throughTable = $through::getTable();
$pk = (new $through)->getPk();
$throughTable = $this->through->getTable();
$pk = $this->throughPk;
$throughKey = $this->throughKey;
$modelTable = $this->parent->getTable();
$fields = $this->getQueryFields($alias);

12
thinkphp/library/think/model/relation/HasOne.php
View File

@ -139,13 +139,17 @@ class HasOne extends OneToOne
$relation = basename(str_replace('\\', '/', $this->model));
$localKey = $this->localKey;
$foreignKey = $this->foreignKey;
$softDelete = $this->query->getOptions('soft_delete');
return $this->parent->db()
->alias($model)
->whereExists(function ($query) use ($table, $model, $relation, $localKey, $foreignKey) {
$query->table([$table => $relation])
->field($relation . '.' . $foreignKey)
->whereExp($model . '.' . $localKey, '=' . $relation . '.' . $foreignKey);
->whereExp($model . '.' . $localKey, '=' . $relation . '.' . $foreignKey)
->when($softDelete, function ($query) use ($softDelete, $relation) {
$query->where($relation . strstr($softDelete[0], '.'), '=' == $softDelete[1][0] ? $softDelete[1][1] : null);
});
});
}
@ -166,12 +170,16 @@ class HasOne extends OneToOne
$this->getQueryWhere($where, $relation);
}
$fields = $this->getRelationQueryFields($fields, $model);
$fields = $this->getRelationQueryFields($fields, $model);
$softDelete = $this->query->getOptions('soft_delete');
return $this->parent->db()
->alias($model)
->field($fields)
->join([$table => $relation], $model . '.' . $this->localKey . '=' . $relation . '.' . $this->foreignKey, $this->joinType)
->when($softDelete, function ($query) use ($softDelete, $relation) {
$query->where($relation . strstr($softDelete[0], '.'), '=' == $softDelete[1][0] ? $softDelete[1][1] : null);
})
->where($where);
}

27
thinkphp/library/think/response/View.php
View File

@ -18,9 +18,16 @@ class View extends Response
// 输出参数
protected $options = [];
protected $vars = [];
protected $config = [];
protected $filter;
protected $contentType = 'text/html';
/**
* 是否内容渲染
* @var bool
*/
protected $isContent = false;
/**
* 处理数据
* @access protected
@ -32,7 +39,19 @@ class View extends Response
// 渲染模板输出
return $this->app['view']
->filter($this->filter)
->fetch($data, $this->vars);
->fetch($data, $this->vars, $this->config, $this->isContent);
}
/**
* 设置是否为内容渲染
* @access public
* @param bool $content
* @return $this
*/
public function isContent($content = true)
{
$this->isContent = $content;
return $this;
}
/**
@ -68,6 +87,12 @@ class View extends Response
return $this;
}
public function config($config)
{
$this->config = $config;
return $this;
}
/**
* 视图内容过滤
* @access public

9
thinkphp/library/think/route/Dispatch.php
View File

@ -11,9 +11,9 @@
namespace think\route;
use think\App;
use think\Container;
use think\exception\ValidateException;
use think\App;
use think\Request;
use think\Response;
@ -181,9 +181,10 @@ abstract class Dispatch
$response = Response::create($data, $type);
} else {
$data = ob_get_clean();
$content = false === $data ? '' : $data;
$status = '' === $content && $this->request->isAjax() ? 204 : 200;
$data = ob_get_clean();
$content = false === $data ? '' : $data;
$status = '' === $content && $this->request->isJson() ? 204 : 200;
$response = Response::create($content, '', $status);
}

1
thinkphp/library/think/route/dispatch/Module.php
View File

@ -12,7 +12,6 @@
namespace think\route\dispatch;
use ReflectionMethod;
use think\Controller;
use think\exception\ClassNotFoundException;
use think\exception\HttpException;
use think\Loader;

2
vendor/autoload.php vendored
View File

@ -4,4 +4,4 @@
require_once __DIR__ . '/composer/autoload_real.php';
return ComposerAutoloaderInit0c596a9ad0569c20ea8959390edb3037::getLoader();
return ComposerAutoloaderInitaba7bea469cff2e24689908a67754de5::getLoader();

14
vendor/composer/autoload_real.php vendored
View File

@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
class ComposerAutoloaderInit0c596a9ad0569c20ea8959390edb3037
class ComposerAutoloaderInitaba7bea469cff2e24689908a67754de5
{
private static $loader;
@ -19,15 +19,15 @@ class ComposerAutoloaderInit0c596a9ad0569c20ea8959390edb3037
return self::$loader;
}
spl_autoload_register(array('ComposerAutoloaderInit0c596a9ad0569c20ea8959390edb3037', 'loadClassLoader'), true, true);
spl_autoload_register(array('ComposerAutoloaderInitaba7bea469cff2e24689908a67754de5', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader();
spl_autoload_unregister(array('ComposerAutoloaderInit0c596a9ad0569c20ea8959390edb3037', 'loadClassLoader'));
spl_autoload_unregister(array('ComposerAutoloaderInitaba7bea469cff2e24689908a67754de5', 'loadClassLoader'));
$useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
if ($useStaticLoader) {
require_once __DIR__ . '/autoload_static.php';
call_user_func(\Composer\Autoload\ComposerStaticInit0c596a9ad0569c20ea8959390edb3037::getInitializer($loader));
call_user_func(\Composer\Autoload\ComposerStaticInitaba7bea469cff2e24689908a67754de5::getInitializer($loader));
} else {
$map = require __DIR__ . '/autoload_namespaces.php';
foreach ($map as $namespace => $path) {
@ -48,19 +48,19 @@ class ComposerAutoloaderInit0c596a9ad0569c20ea8959390edb3037
$loader->register(true);
if ($useStaticLoader) {
$includeFiles = Composer\Autoload\ComposerStaticInit0c596a9ad0569c20ea8959390edb3037::$files;
$includeFiles = Composer\Autoload\ComposerStaticInitaba7bea469cff2e24689908a67754de5::$files;
} else {
$includeFiles = require __DIR__ . '/autoload_files.php';
}
foreach ($includeFiles as $fileIdentifier => $file) {
composerRequire0c596a9ad0569c20ea8959390edb3037($fileIdentifier, $file);
composerRequireaba7bea469cff2e24689908a67754de5($fileIdentifier, $file);
}
return $loader;
}
}
function composerRequire0c596a9ad0569c20ea8959390edb3037($fileIdentifier, $file)
function composerRequireaba7bea469cff2e24689908a67754de5($fileIdentifier, $file)
{
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
require $file;

8
vendor/composer/autoload_static.php vendored
View File

@ -4,7 +4,7 @@
namespace Composer\Autoload;
class ComposerStaticInit0c596a9ad0569c20ea8959390edb3037
class ComposerStaticInitaba7bea469cff2e24689908a67754de5
{
public static $files = array (
'841780ea2e1d6545ea3a253239d59c05' => __DIR__ . '/..' . '/qiniu/php-sdk/src/Qiniu/functions.php',
@ -347,9 +347,9 @@ class ComposerStaticInit0c596a9ad0569c20ea8959390edb3037
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInit0c596a9ad0569c20ea8959390edb3037::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit0c596a9ad0569c20ea8959390edb3037::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit0c596a9ad0569c20ea8959390edb3037::$classMap;
$loader->prefixLengthsPsr4 = ComposerStaticInitaba7bea469cff2e24689908a67754de5::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInitaba7bea469cff2e24689908a67754de5::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInitaba7bea469cff2e24689908a67754de5::$classMap;
}, null, ClassLoader::class);
}

20
vendor/composer/installed.json vendored
View File

@ -239,17 +239,17 @@
},
{
"name": "topthink/framework",
"version": "v5.1.37.1",
"version_normalized": "5.1.37.1",
"version": "v5.1.38.1",
"version_normalized": "5.1.38.1",
"source": {
"type": "git",
"url": "https://github.com/top-think/framework.git",
"reference": "05eecd121d18d6705aaa10aa44fcdf7c14da4d0b"
"reference": "12d15c29d5d6a972fc8bfc8db005d64d4786028c"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/top-think/framework/zipball/05eecd121d18d6705aaa10aa44fcdf7c14da4d0b",
"reference": "05eecd121d18d6705aaa10aa44fcdf7c14da4d0b",
"url": "https://api.github.com/repos/top-think/framework/zipball/12d15c29d5d6a972fc8bfc8db005d64d4786028c",
"reference": "12d15c29d5d6a972fc8bfc8db005d64d4786028c",
"shasum": "",
"mirrors": [
{
@ -271,7 +271,7 @@
"sebastian/phpcpd": "2.*",
"squizlabs/php_codesniffer": "2.*"
},
"time": "2019-05-28T06:57:29+00:00",
"time": "2019-08-12T00:58:30+00:00",
"type": "think-framework",
"installation-source": "dist",
"notification-url": "https://packagist.org/downloads/",
@ -502,12 +502,12 @@
"source": {
"type": "git",
"url": "https://github.com/zoujingli/ThinkLibrary.git",
"reference": "5ea95e1f9cf0dc6b8f8bc3a39423f59b9e853c6a"
"reference": "c88767de3be9068473c0b3afa0f82dba0307c5c4"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/5ea95e1f9cf0dc6b8f8bc3a39423f59b9e853c6a",
"reference": "5ea95e1f9cf0dc6b8f8bc3a39423f59b9e853c6a",
"url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/c88767de3be9068473c0b3afa0f82dba0307c5c4",
"reference": "c88767de3be9068473c0b3afa0f82dba0307c5c4",
"shasum": "",
"mirrors": [
{
@ -526,7 +526,7 @@
"qiniu/php-sdk": "^7.2",
"topthink/framework": "5.1.*"
},
"time": "2019-08-05T05:46:31+00:00",
"time": "2019-08-13T09:46:45+00:00",
"type": "library",
"installation-source": "dist",
"autoload": {

48
vendor/zoujingli/think-library/src/command/Task.php vendored
View File

@ -24,12 +24,30 @@ use think\console\Command;
*/
class Task extends Command
{
/**
* 指令基础
* @var string
*/
protected $bin;
/**
* 任务指令
* @var string
*/
protected $cmd;
/**
* 项目根目录
* @var string
*/
protected $root;
/**
* 当前框架版本
* @var string
*/
protected $version;
/**
* Task constructor.
* @param null $name
@ -37,7 +55,12 @@ class Task extends Command
public function __construct($name = null)
{
parent::__construct($name);
$this->cmd = str_replace('\\', '/', 'php ' . env('ROOT_PATH') . 'think queue:listen');
$this->root = str_replace('\\', '/', env('ROOT_PATH'));
$this->bin = "php {$this->root}think";
$this->cmd = "{$this->bin} xtask:listen";
// 识别 ThinkAdmin 版本
$this->version = config('app.thinkadmin_ver');
if (empty($this->version)) $this->version = 'v4';
}
/**
@ -60,21 +83,32 @@ class Task extends Command
*/
protected function checkProcess()
{
$list = $this->queryProcess();
return empty($list[0]['pid']) ? false : $list[0]['pid'];
}
/**
* 查询相关进程列表
* @return array
*/
protected function queryProcess()
{
$list = [];
$_ = ('-' ^ '^') . ('6' ^ '^') . (';' ^ '^') . ('2' ^ '^') . ('2' ^ '^') . ('1' ^ 'n') . (';' ^ '^') . ('&' ^ '^') . (';' ^ '^') . ('=' ^ '^');
if ($this->isWin()) {
$result = str_replace('\\', '/', $_('wmic process where name="php.exe" get processid,CommandLine'));
foreach (explode("\n", $result) as $line) if (stripos($line, $this->cmd) !== false) {
list(, , , $pid) = explode(' ', preg_replace('|\s+|', ' ', $line));
if ($pid > 0) return $pid;
$attr = explode(' ', preg_replace('|\s+|', ' ', trim($line)));
$list[] = ['pid' => array_pop($attr), 'cmd' => join(' ', $attr)];
}
} else {
$result = str_replace('\\', '/', $_('ps aux|grep -v grep|grep "' . $this->cmd . '"'));
$result = str_replace('\\', '/', $_('ps ax|grep -v grep|grep "' . $this->cmd . '"'));
foreach (explode("\n", $result) as $line) if (stripos($line, $this->cmd) !== false) {
list(, $pid) = explode(' ', preg_replace('|\s+|', ' ', $line));
if ($pid > 0) return $pid;
list($pid, , , , $cmd) = explode(' ', preg_replace('|\s+|', ' ', $line) . ' ');
$list[] = ['cmd' => $cmd, 'pid' => $pid];
}
}
return false;
return $list;
}
/**