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

ComposerUpdate

Browse Source
This commit is contained in:
Anyon 2020-01-11 16:00:48 +08:00
parent b7adec7423
commit 4c8157671a
15 changed files with 232 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
vendor/composer/autoload_classmap.php vendored
View File

@ -166,6 +166,7 @@ return array(
'WeMini\\Image' => $vendorDir . '/zoujingli/wechat-developer/WeMini/Image.php',
'WeMini\\Logistics' => $vendorDir . '/zoujingli/wechat-developer/WeMini/Logistics.php',
'WeMini\\Message' => $vendorDir . '/zoujingli/wechat-developer/WeMini/Message.php',
'WeMini\\Newtmpl' => $vendorDir . '/zoujingli/wechat-developer/WeMini/Newtmpl.php',
'WeMini\\Ocr' => $vendorDir . '/zoujingli/wechat-developer/WeMini/Ocr.php',
'WeMini\\Plugs' => $vendorDir . '/zoujingli/wechat-developer/WeMini/Plugs.php',
'WeMini\\Poi' => $vendorDir . '/zoujingli/wechat-developer/WeMini/Poi.php',

1
vendor/composer/autoload_static.php vendored
View File

@ -267,6 +267,7 @@ class ComposerStaticInitbf5dd43c242f2a86b1513b16fb281176
'WeMini\\Image' => __DIR__ . '/..' . '/zoujingli/wechat-developer/WeMini/Image.php',
'WeMini\\Logistics' => __DIR__ . '/..' . '/zoujingli/wechat-developer/WeMini/Logistics.php',
'WeMini\\Message' => __DIR__ . '/..' . '/zoujingli/wechat-developer/WeMini/Message.php',
'WeMini\\Newtmpl' => __DIR__ . '/..' . '/zoujingli/wechat-developer/WeMini/Newtmpl.php',
'WeMini\\Ocr' => __DIR__ . '/..' . '/zoujingli/wechat-developer/WeMini/Ocr.php',
'WeMini\\Plugs' => __DIR__ . '/..' . '/zoujingli/wechat-developer/WeMini/Plugs.php',
'WeMini\\Poi' => __DIR__ . '/..' . '/zoujingli/wechat-developer/WeMini/Poi.php',

20
vendor/composer/installed.json vendored
View File

@ -502,12 +502,12 @@
"source": {
"type": "git",
"url": "https://github.com/zoujingli/ThinkLibrary.git",
"reference": "bc3a7d6203955f36f401e8286884a9aa7e6a4133"
"reference": "01e2bea38f9c5e7ba0f0f09e84f7305560c70b76"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/bc3a7d6203955f36f401e8286884a9aa7e6a4133",
"reference": "bc3a7d6203955f36f401e8286884a9aa7e6a4133",
"url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/01e2bea38f9c5e7ba0f0f09e84f7305560c70b76",
"reference": "01e2bea38f9c5e7ba0f0f09e84f7305560c70b76",
"shasum": "",
"mirrors": [
{
@ -527,7 +527,7 @@
"qiniu/php-sdk": "^7.2",
"topthink/framework": "5.1.*"
},
"time": "2019-12-30T09:51:14+00:00",
"time": "2020-01-09T02:58:35+00:00",
"type": "library",
"installation-source": "dist",
"autoload": {
@ -547,17 +547,17 @@
},
{
"name": "zoujingli/wechat-developer",
"version": "v1.2.15",
"version_normalized": "1.2.15.0",
"version": "v1.2.16",
"version_normalized": "1.2.16.0",
"source": {
"type": "git",
"url": "https://github.com/zoujingli/WeChatDeveloper.git",
"reference": "4b81e72cff7a3acfde2cca919bd8e173355bc53c"
"reference": "01fa1479e8c4d7a0875de96787a2bcaeacc755e9"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/zoujingli/WeChatDeveloper/zipball/4b81e72cff7a3acfde2cca919bd8e173355bc53c",
"reference": "4b81e72cff7a3acfde2cca919bd8e173355bc53c",
"url": "https://api.github.com/repos/zoujingli/WeChatDeveloper/zipball/01fa1479e8c4d7a0875de96787a2bcaeacc755e9",
"reference": "01fa1479e8c4d7a0875de96787a2bcaeacc755e9",
"shasum": "",
"mirrors": [
{
@ -575,7 +575,7 @@
"ext-simplexml": "*",
"php": ">=5.4"
},
"time": "2019-11-25T10:40:50+00:00",
"time": "2020-01-04T08:51:50+00:00",
"type": "library",
"installation-source": "dist",
"autoload": {

8
vendor/zoujingli/think-library/src/command/Sess.php vendored
View File

@ -32,7 +32,7 @@ class Sess extends Command
*/
protected function configure()
{
$this->setName('xclean:session')->setDescription('[清理]删除失效的会话文件');
$this->setName('xclean:session')->setDescription('Clean up invalid session files');
}
/**
@ -42,15 +42,15 @@ class Sess extends Command
*/
protected function execute(Input $input, Output $output)
{
$output->comment('=== 准备清理无效的会话文件 ===');
$output->comment('Start cleaning up invalid session files');
foreach (glob(config('session.path') . 'sess_*') as $file) {
list($fileatime, $filesize) = [fileatime($file), filesize($file)];
if ($filesize < 1 || $fileatime < time() - 3600) {
$output->info('移除会话文件 -> [ ' . date('Y-m-d H:i:s', $fileatime) . ' ] ' . basename($file) . " {$filesize}");
$output->info('Remove session file -> [ ' . date('Y-m-d H:i:s', $fileatime) . ' ] ' . basename($file) . " {$filesize}");
@unlink($file);
}
}
$output->comment('=== 成功清理无效的会话文件 ===');
$output->comment('Cleaning up invalid session files complete');
}
}

2
vendor/zoujingli/think-library/src/command/Sync.php vendored
View File

@ -82,7 +82,7 @@ class Sync extends Command
return $this->tree([
'think', 'config/log.php', 'config/cookie.php', 'config/template.php',
'application/admin', 'application/wechat', 'application/service',
'public/static/plugs', 'public/static/theme', 'public/static/admin.js',
'public/static/plugs', 'public/static/theme', 'public/static/admin.js', 'public/static/login.js',
]);
}

20
vendor/zoujingli/think-library/src/helper/ValidateHelper.php vendored
View File

@ -39,22 +39,30 @@ class ValidateHelper extends Helper
list($name, $alias) = explode('#', $name);
}
if (stripos($name, '.') === false) {
$data[$name] = empty($alias) ? $name : $alias;
if (is_numeric($name)) {
$keys = $message;
if (is_string($message) && stripos($message, '#') !== false) {
list($name, $alias) = explode('#', $message);
$keys = empty($alias) ? $name : $alias;
}
$data[$name] = input("{$type}{$keys}");
} else {
$data[$name] = $message;
}
} else {
list($_rgx) = explode(':', $name);
list($_key, $_rule) = explode('.', $name);
$keys = empty($alias) ? $_key : $alias;
$info[$_rgx] = $message;
$data[$_key] = empty($alias) ? $_key : $alias;
$data[$_key] = input("{$type}{$keys}");
$rule[$_key] = empty($rule[$_key]) ? $_rule : "{$rule[$_key]}|{$_rule}";
}
}
foreach ($data as $key => $name) $data[$key] = input("{$type}{$name}");
$validate = Validate::make($rule, $info);
if ($validate->check($data)) {
$validate = new Validate();
if ($validate->rule($rule)->message($info)->check($data)) {
return $data;
} else {
$this->controller->error($validate->getError());
}
}
}

27
vendor/zoujingli/think-library/src/queue/ListenQueue.php vendored
View File

@ -28,12 +28,18 @@ use think\Db;
*/
class ListenQueue extends Command
{
/**
* 当前任务服务
* @var ProcessService
*/
protected $process;
/**
* 配置指定信息
*/
protected function configure()
{
$this->setName('xtask:listen')->setDescription('[监听]启动任务监听主进程');
$this->setName('xtask:listen')->setDescription('Start task listening main process');
}
/**
@ -48,23 +54,26 @@ class ListenQueue extends Command
*/
protected function execute(Input $input, Output $output)
{
set_time_limit(0);
Db::name('SystemQueue')->count();
if (($process = ProcessService::instance())->iswin() && function_exists('cli_set_process_title')) {
cli_set_process_title("ThinkAdmin 监听主进程 {$process->version()}");
cli_set_process_title("ThinkAdmin {$process->version()} Queue Listen");
}
$output->comment('============ 任务监听中 ============');
$output->writeln('============ LISTENING ============');
while (true) {
foreach (Db::name('SystemQueue')->where([['status', 'eq', '1'], ['time', '<=', time()]])->order('time asc')->select() as $item) {
$map = [['status', 'eq', '1'], ['time', '<=', time()]];
foreach (Db::name('SystemQueue')->where($map)->order('time asc')->select() as $vo) {
try {
if ($process->query($command = $process->think("xtask:_work {$item['id']} -"))) {
$output->comment("正在执行 -> [{$item['id']}] {$item['title']}");
$command = $process->think("xtask:_work {$vo['id']} -");
if (count($process->query($command)) > 0) {
$this->output->writeln("Already in progress -> [{$vo['id']}] {$vo['title']}");
} else {
$process->create($command);
$output->info("创建成功 -> [{$item['id']}] {$item['title']}");
$this->output->writeln("Created new process -> [{$vo['id']}] {$vo['title']}");
}
} catch (\Exception $e) {
Db::name('SystemQueue')->where(['id' => $item['id']])->update(['status' => '4', 'desc' => $e->getMessage()]);
$output->error("创建处理任务的子进程失败 --> [{$item['id']}] {$item['title']}，{$e->getMessage()}");
Db::name('SystemQueue')->where(['id' => $vo['id']])->update(['status' => '4', 'desc' => $e->getMessage()]);
$output->error("Execution failed -> [{$vo['id']}] {$vo['title']}，{$e->getMessage()}");
}
}
sleep(1);

4
vendor/zoujingli/think-library/src/queue/QueryQueue.php vendored
View File

@ -32,7 +32,7 @@ class QueryQueue extends Command
*/
protected function configure()
{
$this->setName('xtask:query')->setDescription('[控制]查询正在运行的进程');
$this->setName('xtask:query')->setDescription('Query all running task processes');
}
/**
@ -47,7 +47,7 @@ class QueryQueue extends Command
if (count($result) > 0) foreach ($result as $item) {
$output->writeln("{$item['pid']}\t{$item['cmd']}");
} else {
$output->writeln('没有查询到相关任务进程');
$output->writeln('No related task process found');
}
}
}

8
vendor/zoujingli/think-library/src/queue/StartQueue.php vendored
View File

@ -34,7 +34,7 @@ class StartQueue extends Command
*/
protected function configure()
{
$this->setName('xtask:start')->setDescription('[控制]创建守护监听主进程');
$this->setName('xtask:start')->setDescription('Create daemons to listening main process');
}
/**
@ -48,14 +48,14 @@ class StartQueue extends Command
$process = ProcessService::instance();
$command = $process->think("xtask:listen");
if (count($result = $process->query($command)) > 0) {
$output->info("监听主进程{$result['0']['pid']}已经启动！");
$output->info("Listening main process {$result['0']['pid']} has started");
} else {
$process->create($command);
sleep(1);
if (count($result = $process->query($command)) > 0) {
$output->info("监听主进程{$result['0']['pid']}启动成功！");
$output->info("Listening main process {$result['0']['pid']} started successfully");
} else {
$output->error('监听主进程创建失败！');
$output->error('Failed to create listening main process');
}
}
}

6
vendor/zoujingli/think-library/src/queue/StateQueue.php vendored
View File

@ -32,7 +32,7 @@ class StateQueue extends Command
*/
protected function configure()
{
$this->setName('xtask:state')->setDescription('[控制]查看监听主进程状态');
$this->setName('xtask:state')->setDescription('Check listening main process status');
}
/**
@ -45,9 +45,9 @@ class StateQueue extends Command
$process = ProcessService::instance();
$command = $process->think('xtask:listen');
if (count($result = $process->query($command)) > 0) {
$output->info("异步任务监听主进程{$result[0]['pid']}正在运行...");
$output->info("Listening for main process {$result[0]['pid']} running");
} else {
$output->error("异步任务监听主进程没有运行哦!");
$output->error("The Listening main process is not running");
}
}
}

6
vendor/zoujingli/think-library/src/queue/StopQueue.php vendored
View File

@ -33,7 +33,7 @@ class StopQueue extends Command
*/
protected function configure()
{
$this->setName('xtask:stop')->setDescription('[控制]平滑停止所有的进程');
$this->setName('xtask:stop')->setDescription('Smooth stop of all task processes');
}
/**
@ -46,10 +46,10 @@ class StopQueue extends Command
$process = ProcessService::instance();
$command = $process->think('xtask:');
if (count($result = $process->query($command)) < 1) {
$output->writeln("没有需要结束的任务进程哦！");
$output->writeln("There is no task process to finish");
} else foreach ($result as $item) {
$process->close($item['pid']);
$output->writeln("发送结束进程{$item['pid']}信号成功！");
$output->writeln("Sending end process {$item['pid']} signal succeeded");
}
}
}

22
vendor/zoujingli/think-library/src/queue/WorkQueue.php vendored
View File

@ -49,9 +49,9 @@ class WorkQueue extends Command
*/
protected function configure()
{
$this->setName('xtask:_work')->setDescription('[执行]创建执行任务的进程');
$this->addArgument('id', Argument::OPTIONAL, '指定任务ID');
$this->addArgument('sp', Argument::OPTIONAL, '指令结束符');
$this->setName('xtask:_work')->setDescription('Create a process to execute a task');
$this->addArgument('id', Argument::OPTIONAL, 'TaskNumber');
$this->addArgument('sp', Argument::OPTIONAL, 'Separator');
}
/**
@ -65,18 +65,18 @@ class WorkQueue extends Command
{
$this->id = trim($input->getArgument('id'));
if (empty($this->id)) {
$this->output->error("执行任务需要指定任务编号！");
$this->output->error('Task number needs to be specified for task execution');
} else try {
$queue = Db::name('SystemQueue')->where(['id' => $this->id, 'status' => '1'])->find();
if (empty($queue)) {
// 这里不做任何处理（该任务可能在其它地方已经在执行）
$this->output->warning("执行任务{$this->id}的信息或状态异常！");
$this->output->warning("The or status of task {$this->id} is abnormal");
} else {
// 锁定任务状态
Db::name('SystemQueue')->where(['id' => $queue['id']])->update(['status' => '2', 'start_at' => date('Y-m-d H:i:s')]);
// 设置进程标题
if (($process = ProcessService::instance())->iswin() && function_exists('cli_set_process_title')) {
cli_set_process_title("ThinkAdmin {$process->version()} 执行任务 - {$queue['title']}");
cli_set_process_title("ThinkAdmin {$process->version()} Queue - {$queue['title']}");
}
// 执行任务内容
if (class_exists($queue['preload'])) {
@ -87,12 +87,12 @@ class WorkQueue extends Command
if (isset($class->title)) $class->title = $queue['title'];
$this->update('3', $class->execute($input, $output, is_array($data) ? $data : []));
} else {
throw new Exception("任务处理类 {$queue['preload']} 未定义 execute 入口！");
throw new Exception("Task processing class {$queue['preload']} not defined execute");
}
} else {
// 自定义指令，不支持返回消息（支持异常结束，异常码可选择 3|4 设置任务状态）
$attr = explode(' ', trim(preg_replace('|\s+|', ' ', $queue['command'])));
$this->update('3', Console::call(array_shift($attr), $attr, 'console'));
$attr = explode(' ', trim(preg_replace('|\s+|', ' ', $queue['preload'])));
$this->update('3', Console::call(array_shift($attr), $attr)->fetch());
}
}
} catch (\Exception $e) {
@ -114,9 +114,9 @@ class WorkQueue extends Command
*/
protected function update($status, $message)
{
$desc = explode("\n", trim(is_string($message) ? $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 : '',
'status' => $status, 'end_at' => date('Y-m-d H:i:s'), 'desc' => $desc[0],
]);
$this->output->writeln(is_string($message) ? $message : '');
return $result !== false;

10
vendor/zoujingli/think-library/src/service/CaptchaService.php vendored
View File

@ -108,9 +108,13 @@ class CaptchaService extends Service
public function check($code, $uniqid = null)
{
$_uni = is_string($uniqid) ? $uniqid : input('uniqid', '-');
$_val = $this->app->cache->get($_uni);
$this->app->cache->rm($_uni);
return is_string($_val) && strtolower($_val) === strtolower($code);
$_val = $this->app->cache->get($_uni, '');
if (is_string($_val) && strtolower($_val) === strtolower($code)) {
$this->app->cache->rm($_uni);
return true;
} else {
return false;
}
}
/**

4
vendor/zoujingli/think-library/src/service/ProcessService.php vendored
View File

@ -88,7 +88,7 @@ class ProcessService extends Service
/**
* 关闭任务进程
* @param integer $pid 进程号
* @return boolean
* @return $this
*/
public function close($pid)
{
@ -97,7 +97,7 @@ class ProcessService extends Service
} else {
$this->exec("kill -9 {$pid}");
}
return true;
return $this;
}
/**

151
vendor/zoujingli/wechat-developer/WeMini/Newtmpl.php vendored Normal file
View File

@ -0,0 +1,151 @@
<?php
// +----------------------------------------------------------------------
// | WeChatDeveloper
// +----------------------------------------------------------------------
// | 版权所有 2014~2018 广州楚才信息科技有限公司 [ http://www.cuci.cc ]
// +----------------------------------------------------------------------
// | 官方网站: http://think.ctolog.com
// +----------------------------------------------------------------------
// | 开源协议 ( https://mit-license.org )
// +----------------------------------------------------------------------
// | github开源项目：https://github.com/zoujingli/WeChatDeveloper
// +----------------------------------------------------------------------
namespace WeMini;
use WeChat\Contracts\BasicWeChat;
/**
* 公众号小程序订阅消息支持
* Class Mini
* @package WeChat
*/
class Newtmpl extends BasicWeChat
{
/**
* 获取小程序账号的类目
* @param array $data 类目信息列表
* @return array
* @throws \WeChat\Exceptions\InvalidResponseException
* @throws \WeChat\Exceptions\LocalCacheException
*/
public function addCategory($data)
{
$url = 'https://api.weixin.qq.com/cgi-bin/wxopen/addcategory?access_token=ACCESS_TOKEN';
$this->registerApi($url, __FUNCTION__, func_get_args());
return $this->callPostApi($url, $data, true);
}
/**
* 获取小程序账号的类目
* @return array
* @throws \WeChat\Exceptions\InvalidResponseException
* @throws \WeChat\Exceptions\LocalCacheException
*/
public function getCategory()
{
$url = 'https://api.weixin.qq.com/wxaapi/newtmpl/getcategory?access_token=ACCESS_TOKEN';
$this->registerApi($url, __FUNCTION__, func_get_args());
return $this->callGetApi($url);
}
/**
* 获取小程序账号的类目
* @return array
* @throws \WeChat\Exceptions\InvalidResponseException
* @throws \WeChat\Exceptions\LocalCacheException
*/
public function deleteCategory()
{
$url = 'https://api.weixin.qq.com/cgi-bin/wxopen/deletecategory?access_token=TOKEN';
$this->registerApi($url, __FUNCTION__, func_get_args());
return $this->callPostApi($url, [], true);
}
/**
* 获取帐号所属类目下的公共模板标题
* @param string $ids 类目 id，多个用逗号隔开
* @return array
* @throws \WeChat\Exceptions\InvalidResponseException
* @throws \WeChat\Exceptions\LocalCacheException
*/
public function getPubTemplateTitleList($ids)
{
$url = 'https://api.weixin.qq.com/wxaapi/newtmpl/getpubtemplatetitles?access_token=ACCESS_TOKEN';
$this->registerApi($url, __FUNCTION__, func_get_args());
return $this->callPostApi($url, ['ids'=>$ids,'start' => '0', 'limit' => '30'], true);
}
/**
* 获取模板标题下的关键词列表
* @param string $tid 模板标题 id，可通过接口获取
* @return array
* @throws \WeChat\Exceptions\InvalidResponseException
* @throws \WeChat\Exceptions\LocalCacheException
*/
public function getPubTemplateKeyWordsById($tid)
{
$url = 'https://api.weixin.qq.com/wxaapi/newtmpl/getpubtemplatekeywords?access_token=ACCESS_TOKEN';
$this->registerApi($url, __FUNCTION__, func_get_args());
return $this->callPostApi($url, ['tid' => $tid], true);
}
/**
* 组合模板并添加至帐号下的个人模板库
* @param string $tid 模板标题 id，可通过接口获取，也可登录小程序后台查看获取
* @param array $kidList 开发者自行组合好的模板关键词列表，关键词顺序可以自由搭配（例如 [3,5,4] 或 [4,5,3]），最多支持5个，最少2个关键词组合
* @param string $sceneDesc 服务场景描述，15个字以内
* @return array
* @throws \WeChat\Exceptions\InvalidResponseException
* @throws \WeChat\Exceptions\LocalCacheException
*/
public function addTemplate($tid, array $kidList, $sceneDesc = '')
{
$url = 'https://api.weixin.qq.com/wxaapi/newtmpl/addtemplate?access_token=ACCESS_TOKEN';
$this->registerApi($url, __FUNCTION__, func_get_args());
return $this->callPostApi($url, ['tid' => $tid, 'kidList' => $kidList, 'sceneDesc' => $sceneDesc], false);
}
/**
* 获取当前帐号下的个人模板列表
* @return array
* @throws \WeChat\Exceptions\InvalidResponseException
* @throws \WeChat\Exceptions\LocalCacheException
*/
public function getTemplateList()
{
$url = 'https://api.weixin.qq.com/wxaapi/newtmpl/gettemplate?access_token=ACCESS_TOKEN';
$this->registerApi($url, __FUNCTION__, func_get_args());
return $this->callPostApi($url, [], true);
}
/**
* 删除帐号下的个人模板
* @param string $priTmplId 要删除的模板id
* @return array
* @throws \WeChat\Exceptions\InvalidResponseException
* @throws \WeChat\Exceptions\LocalCacheException
*/
public function delTemplate($priTmplId)
{
$url = 'https://api.weixin.qq.com/wxaapi/newtmpl/deltemplate?access_token=ACCESS_TOKEN';
$this->registerApi($url, __FUNCTION__, func_get_args());
return $this->callPostApi($url, ['priTmplId' => $priTmplId], true);
}
/**
* 发送订阅消息
* @param array $data 发送的消息对象数组
* @return array
* @throws \WeChat\Exceptions\InvalidResponseException
* @throws \WeChat\Exceptions\LocalCacheException
*/
public function send(array $data)
{
$url = 'https://api.weixin.qq.com/cgi-bin/message/subscribe/send?access_token=ACCESS_TOKEN';
$this->registerApi($url, __FUNCTION__, func_get_args());
return $this->callPostApi($url, $data, true);
}
}