mirror of
https://gitee.com/zoujingli/ThinkAdmin.git
synced 2025-04-05 19:41:44 +08:00
ComposerUpdate 合并 v6 部分规则
This commit is contained in:
Anyon
parent
33967ab629
commit
8ad01915bb
@ -15,8 +15,8 @@
|
||||
|
||||
namespace app\admin\controller;
|
||||
|
||||
use app\admin\service\NodeService;
|
||||
use library\Controller;
|
||||
use library\service\AuthService;
|
||||
use think\Db;
|
||||
|
||||
/**
|
||||
@ -36,11 +36,6 @@ class Auth extends Controller
|
||||
* 系统权限管理
|
||||
* @auth true
|
||||
* @menu true
|
||||
* @throws \think\Exception
|
||||
* @throws \think\db\exception\DataNotFoundException
|
||||
* @throws \think\db\exception\ModelNotFoundException
|
||||
* @throws \think\exception\DbException
|
||||
* @throws \think\exception\PDOException
|
||||
*/
|
||||
public function index()
|
||||
{
|
||||
@ -58,34 +53,29 @@ class Auth extends Controller
|
||||
*/
|
||||
public function apply()
|
||||
{
|
||||
$this->title = '权限配置节点';
|
||||
$auth = $this->request->post('id', '0');
|
||||
switch (strtolower($this->request->post('action'))) {
|
||||
case 'get': // 获取权限配置
|
||||
$checks = Db::name('SystemAuthNode')->where(['auth' => $auth])->column('node');
|
||||
return $this->success('获取权限节点成功！', NodeService::getAuthTree($checks));
|
||||
case 'save': // 保存权限配置
|
||||
$map = ['auth' => input('id', '0')];
|
||||
$action = strtolower(input('action', ''));
|
||||
if ($action === 'get') {
|
||||
$checkeds = Db::name('SystemAuthNode')->where($map)->column('node');
|
||||
$this->success('获取权限节点成功！', AuthService::instance()->getTree($checkeds));
|
||||
} elseif ($action === 'save') {
|
||||
list($post, $data) = [$this->request->post(), []];
|
||||
foreach (isset($post['nodes']) ? $post['nodes'] : [] as $node) {
|
||||
$data[] = ['auth' => $auth, 'node' => $node];
|
||||
$data[] = ['auth' => $map['auth'], 'node' => $node];
|
||||
}
|
||||
Db::name('SystemAuthNode')->where(['auth' => $auth])->delete();
|
||||
Db::name('SystemAuthNode')->where($map)->delete();
|
||||
Db::name('SystemAuthNode')->insertAll($data);
|
||||
NodeService::applyUserAuth();
|
||||
return $this->success('权限授权更新成功！');
|
||||
default:
|
||||
return $this->_form($this->table, 'apply');
|
||||
AuthService::instance()->apply(true);
|
||||
$this->success('权限授权更新成功！', 'javascript:history.back()');
|
||||
} else {
|
||||
$this->title = '权限配置节点';
|
||||
$this->_form($this->table, 'apply');
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 添加系统权限
|
||||
* @auth true
|
||||
* @throws \think\Exception
|
||||
* @throws \think\db\exception\DataNotFoundException
|
||||
* @throws \think\db\exception\ModelNotFoundException
|
||||
* @throws \think\exception\DbException
|
||||
* @throws \think\exception\PDOException
|
||||
*/
|
||||
public function add()
|
||||
{
|
||||
@ -115,7 +105,7 @@ class Auth extends Controller
|
||||
public function refresh()
|
||||
{
|
||||
try {
|
||||
NodeService::applyUserAuth(true);
|
||||
AuthService::instance()->apply(true);
|
||||
$this->success('刷新系统授权成功！');
|
||||
} catch (\think\exception\HttpResponseException $exception) {
|
||||
throw $exception;
|
||||
@ -151,8 +141,6 @@ class Auth extends Controller
|
||||
/**
|
||||
* 删除系统权限
|
||||
* @auth true
|
||||
* @throws \think\Exception
|
||||
* @throws \think\exception\PDOException
|
||||
*/
|
||||
public function remove()
|
||||
{
|
||||
|
||||
@ -15,8 +15,9 @@
|
||||
|
||||
namespace app\admin\controller;
|
||||
|
||||
use app\admin\service\NodeService;
|
||||
use library\Controller;
|
||||
use library\service\AuthService;
|
||||
use library\service\MenuService;
|
||||
use library\tools\Data;
|
||||
use think\Console;
|
||||
use think\Db;
|
||||
@ -40,9 +41,9 @@ class Index extends Controller
|
||||
public function index()
|
||||
{
|
||||
$this->title = '系统管理后台';
|
||||
NodeService::applyUserAuth(true);
|
||||
$this->menus = NodeService::getMenuNodeTree();
|
||||
if (empty($this->menus) && !NodeService::islogin()) {
|
||||
$auth = AuthService::instance()->apply(true);
|
||||
$this->menus = MenuService::instance()->getTree();
|
||||
if (empty($this->menus) && !$auth->isLogin()) {
|
||||
$this->redirect('@admin/login');
|
||||
} else {
|
||||
$this->fetch();
|
||||
@ -61,6 +62,7 @@ class Index extends Controller
|
||||
|
||||
/**
|
||||
* 修改密码
|
||||
* @login true
|
||||
* @param integer $id
|
||||
* @throws \think\Exception
|
||||
* @throws \think\db\exception\DataNotFoundException
|
||||
@ -71,10 +73,10 @@ class Index extends Controller
|
||||
public function pass($id)
|
||||
{
|
||||
$this->applyCsrfToken();
|
||||
if (intval($id) !== intval(session('admin_user.id'))) {
|
||||
if (intval($id) !== intval(session('user.id'))) {
|
||||
$this->error('只能修改当前用户的密码！');
|
||||
}
|
||||
if (!NodeService::islogin()) {
|
||||
if (!AuthService::instance()->isLogin()) {
|
||||
$this->error('需要登录才能操作哦！');
|
||||
}
|
||||
if ($this->request->isGet()) {
|
||||
@ -100,8 +102,6 @@ class Index extends Controller
|
||||
if (md5($data['oldpassword']) !== $user['password']) {
|
||||
$this->error('旧密码验证失败，请重新输入！');
|
||||
}
|
||||
$result = NodeService::checkpwd($data['password']);
|
||||
if (empty($result['code'])) $this->error($result['msg']);
|
||||
if (Data::save('SystemUser', ['id' => $user['id'], 'password' => md5($data['password'])])) {
|
||||
$this->success('密码修改成功，下次请使用新密码登录！', '');
|
||||
} else {
|
||||
@ -112,20 +112,18 @@ class Index extends Controller
|
||||
|
||||
/**
|
||||
* 修改用户资料
|
||||
* @login true
|
||||
* @param integer $id 会员ID
|
||||
* @throws \think\Exception
|
||||
* @throws \think\db\exception\DataNotFoundException
|
||||
* @throws \think\db\exception\ModelNotFoundException
|
||||
* @throws \think\exception\DbException
|
||||
* @throws \think\exception\PDOException
|
||||
*/
|
||||
public function info($id = 0)
|
||||
{
|
||||
if (!NodeService::islogin()) {
|
||||
if (!AuthService::instance()->isLogin()) {
|
||||
$this->error('需要登录才能操作哦！');
|
||||
}
|
||||
$this->applyCsrfToken();
|
||||
if (intval($id) === intval(session('admin_user.id'))) {
|
||||
if (intval($id) === intval(session('user.id'))) {
|
||||
$this->_form('SystemUser', 'admin@user/form', 'id', [], ['id' => $id]);
|
||||
} else {
|
||||
$this->error('只能修改登录用户的资料！');
|
||||
@ -138,9 +136,6 @@ class Index extends Controller
|
||||
*/
|
||||
public function clearRuntime()
|
||||
{
|
||||
if (!NodeService::islogin()) {
|
||||
$this->error('需要登录才能操作哦！');
|
||||
}
|
||||
try {
|
||||
Console::call('clear');
|
||||
Console::call('xclean:session');
|
||||
@ -158,9 +153,6 @@ class Index extends Controller
|
||||
*/
|
||||
public function buildOptimize()
|
||||
{
|
||||
if (!NodeService::islogin()) {
|
||||
$this->error('需要登录才能操作哦！');
|
||||
}
|
||||
try {
|
||||
Console::call('optimize:route');
|
||||
Console::call('optimize:schema');
|
||||
|
||||
@ -15,9 +15,10 @@
|
||||
|
||||
namespace app\admin\controller;
|
||||
|
||||
use app\admin\service\CaptchaService;
|
||||
use app\admin\service\NodeService;
|
||||
use library\Controller;
|
||||
use library\service\AuthService;
|
||||
use library\service\CaptchaService;
|
||||
use library\service\SystemService;
|
||||
use think\Db;
|
||||
use think\facade\Request;
|
||||
|
||||
@ -40,29 +41,28 @@ class Login extends Controller
|
||||
public function index()
|
||||
{
|
||||
if (Request::isGet()) {
|
||||
if (NodeService::islogin()) {
|
||||
if (AuthService::instance()->isLogin()) {
|
||||
$this->redirect('@admin');
|
||||
} else {
|
||||
$this->title = '系统登录';
|
||||
$this->domain = Request::host(true);
|
||||
if (!($this->loginskey = session('loginskey'))) session('loginskey', $this->loginskey = uniqid());
|
||||
$this->devmode = in_array($this->domain, ['127.0.0.1', 'localhost']) || is_numeric(stripos($this->domain, 'thinkadmin.top'));
|
||||
$this->captcha = new CaptchaService();
|
||||
if (!($this->loginskey = session('loginskey'))) {
|
||||
session('loginskey', $this->loginskey = uniqid());
|
||||
}
|
||||
$this->devmode = SystemService::instance()->checkRunMode('dev');
|
||||
$this->captcha = CaptchaService::instance()->getAttrs();
|
||||
$this->fetch();
|
||||
}
|
||||
} else {
|
||||
$data = $this->_input([
|
||||
'username' => input('username'), 'password' => input('password'),
|
||||
], [
|
||||
'username' => 'require|min:4', 'password' => 'require|min:4',
|
||||
], [
|
||||
'username.require' => '登录账号不能为空！',
|
||||
$data = $this->_vali([
|
||||
'username.require' => '登录账号不能为空!',
|
||||
'username.min:4' => '登录账号长度不能少于4位有效字符！',
|
||||
'password.require' => '登录密码不能为空！',
|
||||
'username.min' => '登录账号长度不能少于4位有效字符！',
|
||||
'password.min' => '登录密码长度不能少于4位有效字符！',
|
||||
'password.min:4' => '登录密码长度不能少于4位有效字符！',
|
||||
'verify.require' => '图形验证码不能为空！',
|
||||
'uniqid.require' => '图形验证标识不能为空！'
|
||||
]);
|
||||
if (!CaptchaService::check(input('verify'), input('uniqid'))) {
|
||||
$this->error('图形验证码验证失败，请重新输入！');
|
||||
if (!CaptchaService::instance()->check($data['verify'], $data['uniqid'])) {
|
||||
$this->error('图形验证码验证失败，请重新输入!');
|
||||
}
|
||||
// 用户信息验证
|
||||
$map = ['is_deleted' => '0', 'username' => $data['username']];
|
||||
@ -75,9 +75,9 @@ class Login extends Controller
|
||||
Db::name('SystemUser')->where(['id' => $user['id']])->update([
|
||||
'login_at' => Db::raw('now()'), 'login_ip' => Request::ip(), 'login_num' => Db::raw('login_num+1'),
|
||||
]);
|
||||
session('user', $user);
|
||||
session('loginskey', null);
|
||||
session('admin_user', $user);
|
||||
NodeService::applyUserAuth(true);
|
||||
AuthService::instance()->apply(true);
|
||||
sysoplog('系统管理', '用户登录系统成功');
|
||||
$this->success('登录成功', url('@admin'));
|
||||
}
|
||||
@ -88,8 +88,8 @@ class Login extends Controller
|
||||
*/
|
||||
public function out()
|
||||
{
|
||||
\think\facade\Session::clear();
|
||||
\think\facade\Session::destroy();
|
||||
$this->app->session->clear();
|
||||
$this->app->session->destroy();
|
||||
$this->success('退出登录成功！', url('@admin/login'));
|
||||
}
|
||||
|
||||
|
||||
@ -15,8 +15,8 @@
|
||||
|
||||
namespace app\admin\controller;
|
||||
|
||||
use app\admin\service\NodeService;
|
||||
use library\Controller;
|
||||
use library\service\MenuService;
|
||||
use library\tools\Data;
|
||||
use think\Db;
|
||||
|
||||
@ -58,7 +58,7 @@ class Menu extends Controller
|
||||
{
|
||||
foreach ($data as &$vo) {
|
||||
if ($vo['url'] !== '#') {
|
||||
$vo['url'] = url($vo['url']) . (empty($vo['params']) ? '' : "?{$vo['params']}");
|
||||
$vo['url'] = trim(url($vo['url']) . (empty($vo['params']) ? '' : "?{$vo['params']}"), '/\\');
|
||||
}
|
||||
$vo['ids'] = join(',', Data::getArrSubIds($data, $vo['id']));
|
||||
}
|
||||
@ -119,7 +119,7 @@ class Menu extends Controller
|
||||
$vo['pid'] = $this->request->get('pid', '0');
|
||||
}
|
||||
// 读取系统功能节点
|
||||
$this->nodes = NodeService::getMenuNodeList();
|
||||
$this->nodes = MenuService::instance()->getList();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -44,7 +44,7 @@ class Queue extends Controller
|
||||
*/
|
||||
public function index()
|
||||
{
|
||||
if (session('admin_user.username') === 'admin') try {
|
||||
if (session('user.username') === 'admin') try {
|
||||
$this->cmd = 'php ' . env('root_path') . 'think xtask:start';
|
||||
$this->message = Console::call('xtask:state')->fetch();
|
||||
} catch (\Exception $exception) {
|
||||
@ -68,7 +68,7 @@ class Queue extends Controller
|
||||
}
|
||||
|
||||
/**
|
||||
* (WIN)创建任务监听进程
|
||||
* WIN开始监听任务
|
||||
* @auth true
|
||||
*/
|
||||
public function processStart()
|
||||
@ -83,7 +83,7 @@ class Queue extends Controller
|
||||
}
|
||||
|
||||
/**
|
||||
* (WIN)停止任务监听进程
|
||||
* WIN停止监听任务
|
||||
* @auth true
|
||||
*/
|
||||
public function processStop()
|
||||
|
||||
@ -15,7 +15,6 @@
|
||||
|
||||
namespace app\admin\controller;
|
||||
|
||||
use app\admin\service\NodeService;
|
||||
use library\Controller;
|
||||
use library\tools\Data;
|
||||
use think\Db;
|
||||
@ -98,8 +97,6 @@ class User extends Controller
|
||||
if ($post['password'] !== $post['repassword']) {
|
||||
$this->error('两次输入的密码不一致！');
|
||||
}
|
||||
$result = NodeService::checkpwd($post['password']);
|
||||
if (empty($result['code'])) $this->error($result['msg']);
|
||||
if (Data::save($this->table, ['id' => $post['id'], 'password' => md5($post['password'])], 'id')) {
|
||||
$this->success('密码修改成功，下次请使用新密码登录！', '');
|
||||
} else {
|
||||
@ -118,8 +115,6 @@ class User extends Controller
|
||||
public function _form_filter(&$data)
|
||||
{
|
||||
if ($this->request->isPost()) {
|
||||
// 刷新系统授权
|
||||
NodeService::applyUserAuth();
|
||||
// 用户权限处理
|
||||
$data['authorize'] = (isset($data['authorize']) && is_array($data['authorize'])) ? join(',', $data['authorize']) : '';
|
||||
// 用户账号重复检查
|
||||
|
||||
@ -15,7 +15,6 @@
|
||||
|
||||
namespace app\admin\controller\api;
|
||||
|
||||
use app\admin\service\NodeService;
|
||||
use library\Controller;
|
||||
use library\File;
|
||||
|
||||
@ -57,15 +56,13 @@ class Plugs extends Controller
|
||||
|
||||
/**
|
||||
* 后台通用文件上传
|
||||
* @login true
|
||||
* @return \think\response\Json
|
||||
* @throws \think\Exception
|
||||
* @throws \think\exception\PDOException
|
||||
*/
|
||||
public function upload()
|
||||
{
|
||||
if (!NodeService::islogin()) {
|
||||
$this->error('访问授权失败，请重新登录授权再试！');
|
||||
}
|
||||
if (!($file = $this->getUploadFile()) || empty($file)) {
|
||||
return json(['uploaded' => false, 'error' => ['message' => '文件上传异常，文件可能过大或未上传']]);
|
||||
}
|
||||
|
||||
@ -1,79 +0,0 @@
|
||||
<?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;
|
||||
use think\Db;
|
||||
|
||||
/**
|
||||
* 异步任务基类
|
||||
* Class Queue
|
||||
* @package app\admin\queue
|
||||
*/
|
||||
abstract class Queue
|
||||
{
|
||||
/**
|
||||
* 当前任务ID
|
||||
* @var integer
|
||||
*/
|
||||
public $jobid = 0;
|
||||
|
||||
/**
|
||||
* 当前任务标题
|
||||
* @var string
|
||||
*/
|
||||
public $title = '';
|
||||
|
||||
/**
|
||||
* 判断是否WIN环境
|
||||
* @return boolean
|
||||
*/
|
||||
protected function isWin()
|
||||
{
|
||||
return PATH_SEPARATOR === ';';
|
||||
}
|
||||
|
||||
/**
|
||||
* 重发异步任务记录
|
||||
* @param integer $wait 等待时间
|
||||
* @return boolean
|
||||
* @throws \think\db\exception\DataNotFoundException
|
||||
* @throws \think\db\exception\ModelNotFoundException
|
||||
* @throws \think\exception\DbException
|
||||
*/
|
||||
protected function redo($wait = 0)
|
||||
{
|
||||
if ($this->jobid > 0) {
|
||||
if ($queue = Db::name('SystemQueue')->where(['id' => $this->jobid])->find()) {
|
||||
$queue['time'] = time() + $wait;
|
||||
$queue['title'] .= " - 来自任务{$this->jobid} 重发任务";
|
||||
unset($queue['id'], $queue['create_at'], $queue['desc']);
|
||||
return Db::name('SystemQueue')->insert($queue) !== false;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
/**
|
||||
* 执行异步任务
|
||||
* @param Input $input 输入对象
|
||||
* @param Output $output 输出对象
|
||||
* @param array $data 任务参数
|
||||
* @return mixed
|
||||
*/
|
||||
abstract function execute(Input $input, Output $output, array $data = []);
|
||||
}
|
||||
@ -1,343 +0,0 @@
|
||||
<?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\service;
|
||||
|
||||
use library\tools\Data;
|
||||
use library\tools\Node;
|
||||
use think\Db;
|
||||
use think\facade\App;
|
||||
use think\facade\Cache;
|
||||
use think\facade\Request;
|
||||
|
||||
/**
|
||||
* 功能节点管理服务
|
||||
* Class NodeService
|
||||
* @package app\admin\service
|
||||
*/
|
||||
class NodeService
|
||||
{
|
||||
|
||||
/**
|
||||
* 获取标准访问节点
|
||||
* @param string $node
|
||||
* @return string
|
||||
*/
|
||||
public static function full($node = null)
|
||||
{
|
||||
if (empty($node)) return self::current();
|
||||
if (count(explode('/', $node)) === 1) {
|
||||
$node = Request::module() . '/' . Request::controller() . '/' . $node;
|
||||
}
|
||||
return self::parseString(trim($node, " /"));
|
||||
}
|
||||
|
||||
/**
|
||||
* 判断是否已经登录
|
||||
* @return boolean
|
||||
*/
|
||||
public static function islogin()
|
||||
{
|
||||
return session('admin_user.id') ? true : false;
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取当前访问节点
|
||||
* @return string
|
||||
*/
|
||||
public static function current()
|
||||
{
|
||||
return self::parseString(Request::module() . '/' . Request::controller() . '/' . Request::action());
|
||||
}
|
||||
|
||||
/**
|
||||
* 检查密码是否合法
|
||||
* @param string $password
|
||||
* @return array
|
||||
*/
|
||||
public static function checkpwd($password)
|
||||
{
|
||||
$password = trim($password);
|
||||
if (!strlen($password) >= 6) {
|
||||
return ['code' => 0, 'msg' => '密码必须大于6字符！'];
|
||||
}
|
||||
if (!preg_match("/^(?![\d]+$)(?![a-zA-Z]+$)(?![^\da-zA-Z]+$).{6,32}$/", $password)) {
|
||||
return ['code' => 0, 'msg' => '密码必需包含大小写字母、数字、符号任意两者组合！'];
|
||||
} else {
|
||||
return ['code' => 1, 'msg' => '密码复杂度通过验证！'];
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取可选菜单节点
|
||||
* @return array
|
||||
* @throws \ReflectionException
|
||||
*/
|
||||
public static function getMenuNodeList()
|
||||
{
|
||||
static $nodes = [];
|
||||
if (count($nodes) > 0) return $nodes;
|
||||
foreach (self::getMethodList() as $node => $method) if ($method['menu']) {
|
||||
$nodes[] = ['node' => $node, 'title' => $method['title']];
|
||||
}
|
||||
return $nodes;
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取系统菜单树数据
|
||||
* @return array
|
||||
* @throws \ReflectionException
|
||||
* @throws \think\db\exception\DataNotFoundException
|
||||
* @throws \think\db\exception\ModelNotFoundException
|
||||
* @throws \think\exception\DbException
|
||||
*/
|
||||
public static function getMenuNodeTree()
|
||||
{
|
||||
$list = Db::name('SystemMenu')->where(['status' => '1'])->order('sort desc,id asc')->select();
|
||||
return self::buildMenuData(Data::arr2tree($list), self::getMethodList());
|
||||
}
|
||||
|
||||
/**
|
||||
* 后台主菜单权限过滤
|
||||
* @param array $menus 当前菜单列表
|
||||
* @param array $nodes 系统权限节点
|
||||
* @return array
|
||||
* @throws \ReflectionException
|
||||
*/
|
||||
private static function buildMenuData($menus, $nodes)
|
||||
{
|
||||
foreach ($menus as $key => &$menu) {
|
||||
if (!empty($menu['sub'])) $menu['sub'] = self::buildMenuData($menu['sub'], $nodes);
|
||||
if (!empty($menu['sub'])) $menu['url'] = '#';
|
||||
elseif (preg_match('/^https?\:/i', $menu['url'])) continue;
|
||||
elseif ($menu['url'] === '#') unset($menus[$key]);
|
||||
else {
|
||||
$node = join('/', array_slice(explode('/', preg_replace('/[\W]/', '/', $menu['url'])), 0, 3));
|
||||
$menu['url'] = url($menu['url']) . (empty($menu['params']) ? '' : "?{$menu['params']}");
|
||||
if (!self::checkAuth($node)) unset($menus[$key]);
|
||||
}
|
||||
}
|
||||
return $menus;
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取授权节点列表
|
||||
* @return array
|
||||
* @throws \ReflectionException
|
||||
*/
|
||||
public static function getAuthList()
|
||||
{
|
||||
static $nodes = [];
|
||||
if (count($nodes) > 0) return $nodes;
|
||||
$nodes = Cache::tag('system')->get('NodeAuthList', []);
|
||||
if (count($nodes) > 0) return $nodes;
|
||||
foreach (self::getMethodList() as $key => $node) {
|
||||
if ($node['auth']) $nodes[$key] = $node['title'];
|
||||
}
|
||||
Cache::tag('system')->set('NodeAuthList', $nodes);
|
||||
return $nodes;
|
||||
}
|
||||
|
||||
/**
|
||||
* 强制验证访问权限
|
||||
* --- 需要加载控制器解析注释
|
||||
* @param null|string $node
|
||||
* @return boolean
|
||||
* @throws \ReflectionException
|
||||
*/
|
||||
public static function forceAuth($node = null)
|
||||
{
|
||||
if (session('admin_user.username') === 'admin') return true;
|
||||
$real = is_null($node) ? self::current() : self::full($node);
|
||||
list($module, $controller, $action) = explode('/', $real);
|
||||
if (class_exists($class = App::parseClass($module, 'controller', $controller))) {
|
||||
$reflection = new \ReflectionClass($class);
|
||||
if ($reflection->hasMethod($action)) {
|
||||
$comment = preg_replace("/\s/", '', $reflection->getMethod($action)->getDocComment());
|
||||
if (stripos($comment, '@authtrue') === false) return true;
|
||||
return in_array($real, (array)session('admin_user.nodes'));
|
||||
}
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* 检查指定节点授权
|
||||
* --- 需要读取缓存或扫描所有节点
|
||||
* @param null|string $node
|
||||
* @return boolean
|
||||
* @throws \ReflectionException
|
||||
*/
|
||||
public static function checkAuth($node = null)
|
||||
{
|
||||
if (session('admin_user.username') === 'admin') return true;
|
||||
$real = is_null($node) ? self::current() : self::full($node);
|
||||
if (isset(self::getAuthList()[$real])) {
|
||||
return in_array($real, (array)session('admin_user.nodes'));
|
||||
} else {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取授权节点列表
|
||||
* @param array $checkeds
|
||||
* @return array
|
||||
* @throws \ReflectionException
|
||||
*/
|
||||
public static function getAuthTree($checkeds = [])
|
||||
{
|
||||
static $nodes = [];
|
||||
if (count($nodes) > 0) return $nodes;
|
||||
foreach (self::getAuthList() as $node => $title) {
|
||||
$pnode = substr($node, 0, strripos($node, '/'));
|
||||
$nodes[$node] = ['node' => $node, 'title' => $title, 'pnode' => $pnode, 'checked' => in_array($node, $checkeds)];
|
||||
}
|
||||
foreach (self::getClassList() as $node => $title) foreach (array_keys($nodes) as $key) {
|
||||
if (stripos($key, "{$node}/") !== false) {
|
||||
$pnode = substr($node, 0, strripos($node, '/'));
|
||||
$nodes[$node] = ['node' => $node, 'title' => $title, 'pnode' => $pnode, 'checked' => in_array($node, $checkeds)];
|
||||
$nodes[$pnode] = ['node' => $pnode, 'title' => ucfirst($pnode), 'checked' => in_array($pnode, $checkeds)];
|
||||
}
|
||||
}
|
||||
return $nodes = Data::arr2tree($nodes, 'node', 'pnode', '_sub_');
|
||||
}
|
||||
|
||||
/**
|
||||
* 初始化用户权限
|
||||
* @param boolean $force 是否重置系统权限
|
||||
* @throws \think\db\exception\DataNotFoundException
|
||||
* @throws \think\db\exception\ModelNotFoundException
|
||||
* @throws \think\exception\DbException
|
||||
*/
|
||||
public static function applyUserAuth($force = false)
|
||||
{
|
||||
if ($force) {
|
||||
Cache::tag('system')->rm('NodeAuthList');
|
||||
Cache::tag('system')->rm('NodeClassData');
|
||||
Cache::tag('system')->rm('NodeMethodData');
|
||||
}
|
||||
if (($uid = session('admin_user.id'))) {
|
||||
session('admin_user', Db::name('SystemUser')->where(['id' => $uid])->find());
|
||||
}
|
||||
if (($aids = session('admin_user.authorize'))) {
|
||||
$where = [['status', 'eq', '1'], ['id', 'in', explode(',', $aids)]];
|
||||
$subsql = Db::name('SystemAuth')->field('id')->where($where)->buildSql();
|
||||
session('admin_user.nodes', array_unique(Db::name('SystemAuthNode')->whereRaw("auth in {$subsql}")->column('node')));
|
||||
} else {
|
||||
session('admin_user.nodes', []);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取控制器节点列表
|
||||
* @return array
|
||||
* @throws \ReflectionException
|
||||
*/
|
||||
public static function getClassList()
|
||||
{
|
||||
static $nodes = [];
|
||||
if (count($nodes) > 0) return $nodes;
|
||||
$nodes = Cache::tag('system')->get('NodeClassData', []);
|
||||
if (count($nodes) > 0) return $nodes;
|
||||
self::eachController(function (\ReflectionClass $reflection, $prenode) use (&$nodes) {
|
||||
list($node, $comment) = [trim($prenode, ' / '), $reflection->getDocComment()];
|
||||
$nodes[$node] = preg_replace('/^\/\*\*\*(.*?)\*.*?$/', '$1', preg_replace("/\s/", '', $comment));
|
||||
if (stripos($nodes[$node], '@') !== false) $nodes[$node] = '';
|
||||
});
|
||||
Cache::tag('system')->set('NodeClassData', $nodes);
|
||||
return $nodes;
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取方法节点列表
|
||||
* @return array
|
||||
* @throws \ReflectionException
|
||||
*/
|
||||
public static function getMethodList()
|
||||
{
|
||||
static $nodes = [];
|
||||
if (count($nodes) > 0) return $nodes;
|
||||
$nodes = Cache::tag('system')->get('NodeMethodData', []);
|
||||
if (count($nodes) > 0) return $nodes;
|
||||
self::eachController(function (\ReflectionClass $reflection, $prenode) use (&$nodes) {
|
||||
foreach ($reflection->getMethods(\ReflectionMethod::IS_PUBLIC) as $method) {
|
||||
$action = strtolower($method->getName());
|
||||
list($node, $comment) = ["{$prenode}{$action}", preg_replace("/\s/", '', $method->getDocComment())];
|
||||
$nodes[$node] = [
|
||||
'auth' => stripos($comment, '@authtrue') !== false,
|
||||
'menu' => stripos($comment, '@menutrue') !== false,
|
||||
'title' => preg_replace('/^\/\*\*\*(.*?)\*.*?$/', '$1', $comment),
|
||||
];
|
||||
if (stripos($nodes[$node]['title'], '@') !== false) $nodes[$node]['title'] = '';
|
||||
}
|
||||
});
|
||||
Cache::tag('system')->set('NodeMethodData', $nodes);
|
||||
return $nodes;
|
||||
}
|
||||
|
||||
/**
|
||||
* 控制器扫描回调
|
||||
* @param callable $callable
|
||||
* @throws \ReflectionException
|
||||
*/
|
||||
public static function eachController($callable)
|
||||
{
|
||||
foreach (self::scanPath(env('app_path') . "*/controller/") as $file) {
|
||||
if (!preg_match("|/(\w+)/controller/(.+)\.php$|", $file, $matches)) continue;
|
||||
list($module, $controller) = [$matches[1], strtr($matches[2], '/', '.')];
|
||||
if (class_exists($class = substr(strtr(env('app_namespace') . $matches[0], '/', '\\'), 0, -4))) {
|
||||
call_user_func($callable, new \ReflectionClass($class), Node::parseString("{$module}/{$controller}/"));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 驼峰转下划线规则
|
||||
* @param string $node 节点名称
|
||||
* @return string
|
||||
*/
|
||||
public static function parseString($node)
|
||||
{
|
||||
if (count($nodes = explode('/', $node)) > 1) {
|
||||
$dots = [];
|
||||
foreach (explode('.', $nodes[1]) as $dot) {
|
||||
$dots[] = trim(preg_replace("/[A-Z]/", "_\\0", $dot), "_");
|
||||
}
|
||||
$nodes[1] = join('.', $dots);
|
||||
}
|
||||
return strtolower(join('/', $nodes));
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取所有PHP文件列表
|
||||
* @param string $dirname 扫描目录
|
||||
* @param array $data 额外数据
|
||||
* @param string $ext 有文件后缀
|
||||
* @return array
|
||||
*/
|
||||
private static function scanPath($dirname, $data = [], $ext = 'php')
|
||||
{
|
||||
foreach (glob("{$dirname}*") as $file) {
|
||||
if (is_dir($file)) {
|
||||
$data = array_merge($data, self::scanPath("{$file}/"));
|
||||
} elseif (is_file($file) && pathinfo($file, 4) === $ext) {
|
||||
$data[] = str_replace('\\', '/', $file);
|
||||
}
|
||||
}
|
||||
return $data;
|
||||
}
|
||||
|
||||
}
|
||||
@ -1,54 +0,0 @@
|
||||
<?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\service;
|
||||
|
||||
use library\tools\Node;
|
||||
use think\Db;
|
||||
use think\facade\Request;
|
||||
|
||||
/**
|
||||
* 系统日志服务管理
|
||||
* Class LogService
|
||||
* @package app\admin\service
|
||||
*/
|
||||
class OplogService
|
||||
{
|
||||
/**
|
||||
* 写入操作日志
|
||||
* @param string $action 日志行为
|
||||
* @param string $content 日志内容
|
||||
* @return bool
|
||||
*/
|
||||
public static function write($action = '行为', $content = "内容描述")
|
||||
{
|
||||
return Db::name('SystemLog')->insert([
|
||||
'node' => Node::current(), 'action' => $action, 'content' => $content,
|
||||
'geoip' => PHP_SAPI === 'cli' ? '127.0.0.1' : Request::ip(),
|
||||
'username' => PHP_SAPI === 'cli' ? 'cli' : (string)session('admin_user.username'),
|
||||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
* 清理系统日志
|
||||
* @return boolean
|
||||
* @throws \think\Exception
|
||||
* @throws \think\exception\PDOException
|
||||
*/
|
||||
public static function clear()
|
||||
{
|
||||
return Db::name('SystemLog')->where('1=1')->delete() !== false;
|
||||
}
|
||||
}
|
||||
@ -13,11 +13,10 @@
|
||||
// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin
|
||||
// +----------------------------------------------------------------------
|
||||
|
||||
use app\admin\service\CaptchaService;
|
||||
use app\admin\service\NodeService;
|
||||
use app\admin\service\OplogService;
|
||||
use library\File;
|
||||
use think\Console;
|
||||
use library\service\AuthService;
|
||||
use library\service\CaptchaService;
|
||||
use library\service\SystemService;
|
||||
use think\Db;
|
||||
use think\facade\Middleware;
|
||||
use think\facade\Route;
|
||||
@ -32,7 +31,7 @@ if (!function_exists('auth')) {
|
||||
*/
|
||||
function auth($node)
|
||||
{
|
||||
return NodeService::checkAuth($node);
|
||||
return AuthService::instance()->check($node);
|
||||
}
|
||||
}
|
||||
|
||||
@ -40,18 +39,17 @@ if (!function_exists('sysdata')) {
|
||||
/**
|
||||
* JSON 数据读取与存储
|
||||
* @param string $name 数据名称
|
||||
* @param array|null $value 数据内容
|
||||
* @param mixed $value 数据内容
|
||||
* @return mixed
|
||||
* @throws \think\Exception
|
||||
* @throws \think\exception\PDOException
|
||||
* @throws \think\db\exception\DataNotFoundException
|
||||
* @throws \think\db\exception\ModelNotFoundException
|
||||
*/
|
||||
function sysdata($name, array $value = null)
|
||||
function sysdata($name, $value = null)
|
||||
{
|
||||
if (is_null($value)) {
|
||||
$data = json_decode(Db::name('SystemData')->where(['name' => $name])->value('value'), true);
|
||||
return empty($data) ? [] : $data;
|
||||
return SystemService::instance()->getData($name);
|
||||
} else {
|
||||
return data_save('SystemData', ['name' => $name, 'value' => json_encode($value, JSON_UNESCAPED_UNICODE)], 'name');
|
||||
return SystemService::instance()->setData($name, $value);
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -65,7 +63,7 @@ if (!function_exists('sysoplog')) {
|
||||
*/
|
||||
function sysoplog($action, $content)
|
||||
{
|
||||
return OplogService::write($action, $content);
|
||||
return SystemService::instance()->setOplog($action, $content);
|
||||
}
|
||||
}
|
||||
|
||||
@ -140,28 +138,18 @@ if (!function_exists('base64_image')) {
|
||||
|
||||
// 访问权限检查中间键
|
||||
Middleware::add(function (Request $request, \Closure $next) {
|
||||
if (NodeService::forceAuth()) {
|
||||
if (AuthService::instance()->check()) {
|
||||
return $next($request);
|
||||
} elseif (NodeService::islogin()) {
|
||||
} elseif (AuthService::instance()->isLogin()) {
|
||||
return json(['code' => 0, 'msg' => '抱歉，没有访问该操作的权限！']);
|
||||
} else {
|
||||
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',
|
||||
]);
|
||||
|
||||
// ThinkAdmin 图形验证码
|
||||
Route::get('/think/admin/captcha', function () {
|
||||
$image = new CaptchaService();
|
||||
$image = CaptchaService::instance();
|
||||
return json(['code' => '1', 'info' => '生成验证码', 'data' => [
|
||||
'uniqid' => $image->getUniqid(), 'image' => $image->getData()
|
||||
]]);
|
||||
|
||||
@ -45,11 +45,11 @@
|
||||
</ul>
|
||||
<ul class="layui-nav layui-layout-right">
|
||||
<li lay-unselect class="layui-nav-item"><a data-reload><i class="layui-icon layui-icon-refresh-3"></i></a></li>
|
||||
{notempty name='Think.session.admin_user.username'}
|
||||
{notempty name='Think.session.user.username'}
|
||||
<li class="layui-nav-item">
|
||||
<dl class="layui-nav-child">
|
||||
<dd lay-unselect><a data-modal="{:url('admin/index/info',['id'=>session('admin_user.id')])}"><i class="layui-icon layui-icon-set-fill margin-right-5"></i>基本资料</a></dd>
|
||||
<dd lay-unselect><a data-modal="{:url('admin/index/pass',['id'=>session('admin_user.id')])}"><i class="layui-icon layui-icon-component margin-right-5"></i>安全设置</a></dd>
|
||||
<dd lay-unselect><a data-modal="{:url('admin/index/info',['id'=>session('user.id')])}"><i class="layui-icon layui-icon-set-fill margin-right-5"></i>基本资料</a></dd>
|
||||
<dd lay-unselect><a data-modal="{:url('admin/index/pass',['id'=>session('user.id')])}"><i class="layui-icon layui-icon-component margin-right-5"></i>安全设置</a></dd>
|
||||
{if auth('admin/index/buildoptimize')}
|
||||
<dd lay-unselect><a data-modal="{:url('admin/index/buildOptimize')}"><i class="layui-icon layui-icon-template-1 margin-right-5"></i>压缩发布</a></dd>
|
||||
{/if}
|
||||
@ -61,7 +61,7 @@
|
||||
{/if}{/foreach}{/notempty}
|
||||
<dd lay-unselect><a data-confirm="确定要退出登录吗？" data-load="{:url('admin/login/out')}"><i class="layui-icon layui-icon-release margin-right-5"></i>退出登录</a></dd>
|
||||
</dl>
|
||||
<a><span><i class="layui-icon layui-icon-username margin-right-5"></i> {:session('admin_user.username')}</span></a>
|
||||
<a><span><i class="layui-icon layui-icon-username margin-right-5"></i> {:session('user.username')}</span></a>
|
||||
</li>
|
||||
{else}
|
||||
<li class="layui-nav-item">
|
||||
|
||||
@ -28,10 +28,10 @@
|
||||
<li class="verify layui-hide">
|
||||
<label class="inline-block relative">
|
||||
<i class="layui-icon layui-icon-picture-fine"></i>
|
||||
<input class="layui-input" required pattern="^\S{4,}$" name="verify" value="{$captcha->getCode()}" maxlength="4" autocomplete="off" placeholder="验证码" title="请输入验证码">
|
||||
<input class="layui-input" required pattern="^\S{4,}$" name="verify" value="{$captcha.code}" maxlength="4" autocomplete="off" placeholder="验证码" title="请输入验证码">
|
||||
</label>
|
||||
<img data-refresh-captcha alt="img" src="{$captcha->getData()}">
|
||||
<input type="hidden" name="uniqid" value="{$captcha->getUniqid()}">
|
||||
<img data-refresh-captcha alt="img" src="{$captcha.data}">
|
||||
<input type="hidden" name="uniqid" value="{$captcha.uniqid}">
|
||||
</li>
|
||||
<li class="text-center padding-top-20">
|
||||
<input type="hidden" name="skey" value="{$loginskey|default=''}">
|
||||
|
||||
@ -3,15 +3,15 @@
|
||||
{block name="button"}
|
||||
|
||||
{if auth("remove")}
|
||||
<button data-action='{:url("remove")}' data-confirm="确定要批量删除任务吗？" data-rule="id#{key}" class='layui-btn layui-btn-sm layui-btn-primary'>批量删除任务</button>
|
||||
<button data-action='{:url("remove")}' data-confirm="确定要批量删除任务吗？" data-rule="id#{key}" class='layui-btn layui-btn-sm layui-btn-primary'>批量删除</button>
|
||||
{/if}
|
||||
|
||||
{if auth("processstart") && $iswin}
|
||||
<button data-load='{:url("processstart")}' class='layui-btn layui-btn-sm layui-btn-primary'>创建监听进程</button>
|
||||
<button data-load='{:url("processstart")}' class='layui-btn layui-btn-sm layui-btn-primary'>开始监听</button>
|
||||
{/if}
|
||||
|
||||
{if auth("processstop") && $iswin}
|
||||
<button data-load='{:url("processstop")}' class='layui-btn layui-btn-sm layui-btn-primary'>停止监听进程</button>
|
||||
<button data-load='{:url("processstop")}' class='layui-btn layui-btn-sm layui-btn-primary'>停止监听</button>
|
||||
{/if}
|
||||
|
||||
{/block}
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{if session('admin_user.username') eq 'admin'}
|
||||
{if session('user.username') eq 'admin'}
|
||||
<fieldset class="margin-bottom-10">
|
||||
<legend>进程守护</legend>
|
||||
<div class="layui-code border-0 margin-top-0">
|
||||
|
||||
@ -39,11 +39,10 @@ class Fans extends Controller
|
||||
|
||||
/**
|
||||
* 初始化函数
|
||||
* Fans constructor.
|
||||
* @return Controller|void
|
||||
*/
|
||||
public function __construct()
|
||||
protected function initialize()
|
||||
{
|
||||
parent::__construct();
|
||||
$this->appid = input('appid', session('current_appid'));
|
||||
if (empty($this->appid)) {
|
||||
$this->where = ['status' => '1', 'service_type' => '2', 'is_deleted' => '0', 'verify_type' => '0'];
|
||||
|
||||
@ -1,3 +1,2 @@
|
||||
@echo off
|
||||
@rmdir /s/q vendor
|
||||
composer update --profile --prefer-dist --no-dev --optimize-autoloader
|
||||
2
vendor/autoload.php
vendored
2
vendor/autoload.php
vendored
@ -4,4 +4,4 @@
|
||||
|
||||
require_once __DIR__ . '/composer/autoload_real.php';
|
||||
|
||||
return ComposerAutoloaderInitf6b2a415c4f4503704bb8d12031deb95::getLoader();
|
||||
return ComposerAutoloaderInit0ac7cd5b2cda0031cee9c92b2dc93c50::getLoader();
|
||||
|
||||
16
vendor/composer/autoload_classmap.php
vendored
16
vendor/composer/autoload_classmap.php
vendored
@ -198,10 +198,6 @@ return array(
|
||||
'library\\command\\sync\\Plugs' => $vendorDir . '/zoujingli/think-library/src/command/sync/Plugs.php',
|
||||
'library\\command\\sync\\Service' => $vendorDir . '/zoujingli/think-library/src/command/sync/Service.php',
|
||||
'library\\command\\sync\\Wechat' => $vendorDir . '/zoujingli/think-library/src/command/sync/Wechat.php',
|
||||
'library\\command\\task\\Reset' => $vendorDir . '/zoujingli/think-library/src/command/task/Reset.php',
|
||||
'library\\command\\task\\Start' => $vendorDir . '/zoujingli/think-library/src/command/task/Start.php',
|
||||
'library\\command\\task\\State' => $vendorDir . '/zoujingli/think-library/src/command/task/State.php',
|
||||
'library\\command\\task\\Stop' => $vendorDir . '/zoujingli/think-library/src/command/task/Stop.php',
|
||||
'library\\driver\\Local' => $vendorDir . '/zoujingli/think-library/src/driver/Local.php',
|
||||
'library\\driver\\Oss' => $vendorDir . '/zoujingli/think-library/src/driver/Oss.php',
|
||||
'library\\driver\\Qiniu' => $vendorDir . '/zoujingli/think-library/src/driver/Qiniu.php',
|
||||
@ -212,7 +208,19 @@ return array(
|
||||
'library\\helper\\QueryHelper' => $vendorDir . '/zoujingli/think-library/src/helper/QueryHelper.php',
|
||||
'library\\helper\\SaveHelper' => $vendorDir . '/zoujingli/think-library/src/helper/SaveHelper.php',
|
||||
'library\\helper\\TokenHelper' => $vendorDir . '/zoujingli/think-library/src/helper/TokenHelper.php',
|
||||
'library\\helper\\ValidateHelper' => $vendorDir . '/zoujingli/think-library/src/helper/ValidateHelper.php',
|
||||
'library\\queue\\ListenQueue' => $vendorDir . '/zoujingli/think-library/src/queue/ListenQueue.php',
|
||||
'library\\queue\\QueryQueue' => $vendorDir . '/zoujingli/think-library/src/queue/QueryQueue.php',
|
||||
'library\\queue\\StartQueue' => $vendorDir . '/zoujingli/think-library/src/queue/StartQueue.php',
|
||||
'library\\queue\\StateQueue' => $vendorDir . '/zoujingli/think-library/src/queue/StateQueue.php',
|
||||
'library\\queue\\StopQueue' => $vendorDir . '/zoujingli/think-library/src/queue/StopQueue.php',
|
||||
'library\\queue\\WorkQueue' => $vendorDir . '/zoujingli/think-library/src/queue/WorkQueue.php',
|
||||
'library\\service\\AuthService' => $vendorDir . '/zoujingli/think-library/src/service/AuthService.php',
|
||||
'library\\service\\CaptchaService' => $vendorDir . '/zoujingli/think-library/src/service/CaptchaService.php',
|
||||
'library\\service\\MenuService' => $vendorDir . '/zoujingli/think-library/src/service/MenuService.php',
|
||||
'library\\service\\NodeService' => $vendorDir . '/zoujingli/think-library/src/service/NodeService.php',
|
||||
'library\\service\\ProcessService' => $vendorDir . '/zoujingli/think-library/src/service/ProcessService.php',
|
||||
'library\\service\\SystemService' => $vendorDir . '/zoujingli/think-library/src/service/SystemService.php',
|
||||
'library\\service\\TokenService' => $vendorDir . '/zoujingli/think-library/src/service/TokenService.php',
|
||||
'library\\tools\\Crypt' => $vendorDir . '/zoujingli/think-library/src/tools/Crypt.php',
|
||||
'library\\tools\\Csrf' => $vendorDir . '/zoujingli/think-library/src/tools/Csrf.php',
|
||||
|
||||
14
vendor/composer/autoload_real.php
vendored
14
vendor/composer/autoload_real.php
vendored
@ -2,7 +2,7 @@
|
||||
|
||||
// autoload_real.php @generated by Composer
|
||||
|
||||
class ComposerAutoloaderInitf6b2a415c4f4503704bb8d12031deb95
|
||||
class ComposerAutoloaderInit0ac7cd5b2cda0031cee9c92b2dc93c50
|
||||
{
|
||||
private static $loader;
|
||||
|
||||
@ -19,15 +19,15 @@ class ComposerAutoloaderInitf6b2a415c4f4503704bb8d12031deb95
|
||||
return self::$loader;
|
||||
}
|
||||
|
||||
spl_autoload_register(array('ComposerAutoloaderInitf6b2a415c4f4503704bb8d12031deb95', 'loadClassLoader'), true, true);
|
||||
spl_autoload_register(array('ComposerAutoloaderInit0ac7cd5b2cda0031cee9c92b2dc93c50', 'loadClassLoader'), true, true);
|
||||
self::$loader = $loader = new \Composer\Autoload\ClassLoader();
|
||||
spl_autoload_unregister(array('ComposerAutoloaderInitf6b2a415c4f4503704bb8d12031deb95', 'loadClassLoader'));
|
||||
spl_autoload_unregister(array('ComposerAutoloaderInit0ac7cd5b2cda0031cee9c92b2dc93c50', '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\ComposerStaticInitf6b2a415c4f4503704bb8d12031deb95::getInitializer($loader));
|
||||
call_user_func(\Composer\Autoload\ComposerStaticInit0ac7cd5b2cda0031cee9c92b2dc93c50::getInitializer($loader));
|
||||
} else {
|
||||
$map = require __DIR__ . '/autoload_namespaces.php';
|
||||
foreach ($map as $namespace => $path) {
|
||||
@ -48,19 +48,19 @@ class ComposerAutoloaderInitf6b2a415c4f4503704bb8d12031deb95
|
||||
$loader->register(true);
|
||||
|
||||
if ($useStaticLoader) {
|
||||
$includeFiles = Composer\Autoload\ComposerStaticInitf6b2a415c4f4503704bb8d12031deb95::$files;
|
||||
$includeFiles = Composer\Autoload\ComposerStaticInit0ac7cd5b2cda0031cee9c92b2dc93c50::$files;
|
||||
} else {
|
||||
$includeFiles = require __DIR__ . '/autoload_files.php';
|
||||
}
|
||||
foreach ($includeFiles as $fileIdentifier => $file) {
|
||||
composerRequiref6b2a415c4f4503704bb8d12031deb95($fileIdentifier, $file);
|
||||
composerRequire0ac7cd5b2cda0031cee9c92b2dc93c50($fileIdentifier, $file);
|
||||
}
|
||||
|
||||
return $loader;
|
||||
}
|
||||
}
|
||||
|
||||
function composerRequiref6b2a415c4f4503704bb8d12031deb95($fileIdentifier, $file)
|
||||
function composerRequire0ac7cd5b2cda0031cee9c92b2dc93c50($fileIdentifier, $file)
|
||||
{
|
||||
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
|
||||
require $file;
|
||||
|
||||
24
vendor/composer/autoload_static.php
vendored
24
vendor/composer/autoload_static.php
vendored
@ -4,7 +4,7 @@
|
||||
|
||||
namespace Composer\Autoload;
|
||||
|
||||
class ComposerStaticInitf6b2a415c4f4503704bb8d12031deb95
|
||||
class ComposerStaticInit0ac7cd5b2cda0031cee9c92b2dc93c50
|
||||
{
|
||||
public static $files = array (
|
||||
'841780ea2e1d6545ea3a253239d59c05' => __DIR__ . '/..' . '/qiniu/php-sdk/src/Qiniu/functions.php',
|
||||
@ -291,10 +291,6 @@ class ComposerStaticInitf6b2a415c4f4503704bb8d12031deb95
|
||||
'library\\command\\sync\\Plugs' => __DIR__ . '/..' . '/zoujingli/think-library/src/command/sync/Plugs.php',
|
||||
'library\\command\\sync\\Service' => __DIR__ . '/..' . '/zoujingli/think-library/src/command/sync/Service.php',
|
||||
'library\\command\\sync\\Wechat' => __DIR__ . '/..' . '/zoujingli/think-library/src/command/sync/Wechat.php',
|
||||
'library\\command\\task\\Reset' => __DIR__ . '/..' . '/zoujingli/think-library/src/command/task/Reset.php',
|
||||
'library\\command\\task\\Start' => __DIR__ . '/..' . '/zoujingli/think-library/src/command/task/Start.php',
|
||||
'library\\command\\task\\State' => __DIR__ . '/..' . '/zoujingli/think-library/src/command/task/State.php',
|
||||
'library\\command\\task\\Stop' => __DIR__ . '/..' . '/zoujingli/think-library/src/command/task/Stop.php',
|
||||
'library\\driver\\Local' => __DIR__ . '/..' . '/zoujingli/think-library/src/driver/Local.php',
|
||||
'library\\driver\\Oss' => __DIR__ . '/..' . '/zoujingli/think-library/src/driver/Oss.php',
|
||||
'library\\driver\\Qiniu' => __DIR__ . '/..' . '/zoujingli/think-library/src/driver/Qiniu.php',
|
||||
@ -305,7 +301,19 @@ class ComposerStaticInitf6b2a415c4f4503704bb8d12031deb95
|
||||
'library\\helper\\QueryHelper' => __DIR__ . '/..' . '/zoujingli/think-library/src/helper/QueryHelper.php',
|
||||
'library\\helper\\SaveHelper' => __DIR__ . '/..' . '/zoujingli/think-library/src/helper/SaveHelper.php',
|
||||
'library\\helper\\TokenHelper' => __DIR__ . '/..' . '/zoujingli/think-library/src/helper/TokenHelper.php',
|
||||
'library\\helper\\ValidateHelper' => __DIR__ . '/..' . '/zoujingli/think-library/src/helper/ValidateHelper.php',
|
||||
'library\\queue\\ListenQueue' => __DIR__ . '/..' . '/zoujingli/think-library/src/queue/ListenQueue.php',
|
||||
'library\\queue\\QueryQueue' => __DIR__ . '/..' . '/zoujingli/think-library/src/queue/QueryQueue.php',
|
||||
'library\\queue\\StartQueue' => __DIR__ . '/..' . '/zoujingli/think-library/src/queue/StartQueue.php',
|
||||
'library\\queue\\StateQueue' => __DIR__ . '/..' . '/zoujingli/think-library/src/queue/StateQueue.php',
|
||||
'library\\queue\\StopQueue' => __DIR__ . '/..' . '/zoujingli/think-library/src/queue/StopQueue.php',
|
||||
'library\\queue\\WorkQueue' => __DIR__ . '/..' . '/zoujingli/think-library/src/queue/WorkQueue.php',
|
||||
'library\\service\\AuthService' => __DIR__ . '/..' . '/zoujingli/think-library/src/service/AuthService.php',
|
||||
'library\\service\\CaptchaService' => __DIR__ . '/..' . '/zoujingli/think-library/src/service/CaptchaService.php',
|
||||
'library\\service\\MenuService' => __DIR__ . '/..' . '/zoujingli/think-library/src/service/MenuService.php',
|
||||
'library\\service\\NodeService' => __DIR__ . '/..' . '/zoujingli/think-library/src/service/NodeService.php',
|
||||
'library\\service\\ProcessService' => __DIR__ . '/..' . '/zoujingli/think-library/src/service/ProcessService.php',
|
||||
'library\\service\\SystemService' => __DIR__ . '/..' . '/zoujingli/think-library/src/service/SystemService.php',
|
||||
'library\\service\\TokenService' => __DIR__ . '/..' . '/zoujingli/think-library/src/service/TokenService.php',
|
||||
'library\\tools\\Crypt' => __DIR__ . '/..' . '/zoujingli/think-library/src/tools/Crypt.php',
|
||||
'library\\tools\\Csrf' => __DIR__ . '/..' . '/zoujingli/think-library/src/tools/Csrf.php',
|
||||
@ -325,9 +333,9 @@ class ComposerStaticInitf6b2a415c4f4503704bb8d12031deb95
|
||||
public static function getInitializer(ClassLoader $loader)
|
||||
{
|
||||
return \Closure::bind(function () use ($loader) {
|
||||
$loader->prefixLengthsPsr4 = ComposerStaticInitf6b2a415c4f4503704bb8d12031deb95::$prefixLengthsPsr4;
|
||||
$loader->prefixDirsPsr4 = ComposerStaticInitf6b2a415c4f4503704bb8d12031deb95::$prefixDirsPsr4;
|
||||
$loader->classMap = ComposerStaticInitf6b2a415c4f4503704bb8d12031deb95::$classMap;
|
||||
$loader->prefixLengthsPsr4 = ComposerStaticInit0ac7cd5b2cda0031cee9c92b2dc93c50::$prefixLengthsPsr4;
|
||||
$loader->prefixDirsPsr4 = ComposerStaticInit0ac7cd5b2cda0031cee9c92b2dc93c50::$prefixDirsPsr4;
|
||||
$loader->classMap = ComposerStaticInit0ac7cd5b2cda0031cee9c92b2dc93c50::$classMap;
|
||||
|
||||
}, null, ClassLoader::class);
|
||||
}
|
||||
|
||||
21
vendor/composer/installed.json
vendored
21
vendor/composer/installed.json
vendored
@ -401,12 +401,12 @@
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/zoujingli/ThinkLibrary.git",
|
||||
"reference": "dc8e618ca3f06652f402a67fc80e8fd8b775a7ed"
|
||||
"reference": "b2d566a6bdd14c91b84b4d4351f67d2c6048dfef"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/dc8e618ca3f06652f402a67fc80e8fd8b775a7ed",
|
||||
"reference": "dc8e618ca3f06652f402a67fc80e8fd8b775a7ed",
|
||||
"url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/b2d566a6bdd14c91b84b4d4351f67d2c6048dfef",
|
||||
"reference": "b2d566a6bdd14c91b84b4d4351f67d2c6048dfef",
|
||||
"shasum": "",
|
||||
"mirrors": [
|
||||
{
|
||||
@ -418,6 +418,7 @@
|
||||
"require": {
|
||||
"aliyuncs/oss-sdk-php": "^2.3",
|
||||
"ext-curl": "*",
|
||||
"ext-gd": "*",
|
||||
"ext-iconv": "*",
|
||||
"ext-json": "*",
|
||||
"ext-openssl": "*",
|
||||
@ -425,7 +426,7 @@
|
||||
"qiniu/php-sdk": "^7.2",
|
||||
"topthink/framework": "5.1.*"
|
||||
},
|
||||
"time": "2019-11-25T08:22:25+00:00",
|
||||
"time": "2019-11-25T10:37:39+00:00",
|
||||
"type": "library",
|
||||
"installation-source": "dist",
|
||||
"autoload": {
|
||||
@ -445,17 +446,17 @@
|
||||
},
|
||||
{
|
||||
"name": "zoujingli/wechat-developer",
|
||||
"version": "v1.2.14",
|
||||
"version_normalized": "1.2.14.0",
|
||||
"version": "v1.2.15",
|
||||
"version_normalized": "1.2.15.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/zoujingli/WeChatDeveloper.git",
|
||||
"reference": "39d53dd91040517a01d7c7423235f56b47deefa3"
|
||||
"reference": "4b81e72cff7a3acfde2cca919bd8e173355bc53c"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/zoujingli/WeChatDeveloper/zipball/39d53dd91040517a01d7c7423235f56b47deefa3",
|
||||
"reference": "39d53dd91040517a01d7c7423235f56b47deefa3",
|
||||
"url": "https://api.github.com/repos/zoujingli/WeChatDeveloper/zipball/4b81e72cff7a3acfde2cca919bd8e173355bc53c",
|
||||
"reference": "4b81e72cff7a3acfde2cca919bd8e173355bc53c",
|
||||
"shasum": "",
|
||||
"mirrors": [
|
||||
{
|
||||
@ -473,7 +474,7 @@
|
||||
"ext-simplexml": "*",
|
||||
"php": ">=5.4"
|
||||
},
|
||||
"time": "2019-11-05T02:35:27+00:00",
|
||||
"time": "2019-11-25T10:40:50+00:00",
|
||||
"type": "library",
|
||||
"installation-source": "dist",
|
||||
"autoload": {
|
||||
|
||||
1
vendor/zoujingli/think-library/composer.json
vendored
1
vendor/zoujingli/think-library/composer.json
vendored
@ -6,6 +6,7 @@
|
||||
"description": "ThinkPHP Basic Development Library",
|
||||
"require": {
|
||||
"php": ">=5.4",
|
||||
"ext-gd": "*",
|
||||
"ext-json": "*",
|
||||
"ext-curl": "*",
|
||||
"ext-iconv": "*",
|
||||
|
||||
@ -22,18 +22,18 @@ use library\helper\PageHelper;
|
||||
use library\helper\QueryHelper;
|
||||
use library\helper\SaveHelper;
|
||||
use library\helper\TokenHelper;
|
||||
use library\helper\ValidateHelper;
|
||||
use think\App;
|
||||
use think\Container;
|
||||
use think\db\Query;
|
||||
use think\exception\HttpResponseException;
|
||||
use think\Validate;
|
||||
|
||||
/**
|
||||
* 标准控制器基类
|
||||
* Class Controller
|
||||
* @package library
|
||||
*/
|
||||
class Controller extends \stdClass
|
||||
abstract class Controller extends \stdClass
|
||||
{
|
||||
|
||||
/**
|
||||
@ -72,6 +72,16 @@ class Controller extends \stdClass
|
||||
if (in_array($this->request->action(), get_class_methods(__CLASS__))) {
|
||||
$this->error('Access without permission.');
|
||||
}
|
||||
$this->initialize();
|
||||
}
|
||||
|
||||
/**
|
||||
* 控制器初始化
|
||||
* @return $this
|
||||
*/
|
||||
protected function initialize()
|
||||
{
|
||||
return $this;
|
||||
}
|
||||
|
||||
/**
|
||||
@ -191,7 +201,7 @@ class Controller extends \stdClass
|
||||
/**
|
||||
* 快捷查询逻辑器
|
||||
* @param string|Query $dbQuery
|
||||
* @return Query
|
||||
* @return QueryHelper
|
||||
*/
|
||||
protected function _query($dbQuery)
|
||||
{
|
||||
@ -206,6 +216,11 @@ class Controller extends \stdClass
|
||||
* @param boolean $total 集合分页记录数
|
||||
* @param integer $limit 集合每页记录数
|
||||
* @return array
|
||||
* @throws \think\Exception
|
||||
* @throws \think\db\exception\DataNotFoundException
|
||||
* @throws \think\db\exception\ModelNotFoundException
|
||||
* @throws \think\exception\DbException
|
||||
* @throws \think\exception\PDOException
|
||||
*/
|
||||
protected function _page($dbQuery, $isPage = true, $isDisplay = true, $total = false, $limit = 0)
|
||||
{
|
||||
@ -220,6 +235,9 @@ class Controller extends \stdClass
|
||||
* @param array $where 额外更新条件
|
||||
* @param array $data 表单扩展数据
|
||||
* @return array|boolean
|
||||
* @throws \think\db\exception\DataNotFoundException
|
||||
* @throws \think\db\exception\DbException
|
||||
* @throws \think\db\exception\ModelNotFoundException
|
||||
*/
|
||||
protected function _form($dbQuery, $tpl = '', $pkField = '', $where = [], $data = [])
|
||||
{
|
||||
@ -233,6 +251,8 @@ class Controller extends \stdClass
|
||||
* @param string $pkField 数据对象主键
|
||||
* @param array $where 额外更新条件
|
||||
* @return boolean
|
||||
* @throws \think\Exception
|
||||
* @throws \think\exception\PDOException
|
||||
*/
|
||||
protected function _save($dbQuery, $data = [], $pkField = '', $where = [])
|
||||
{
|
||||
@ -247,28 +267,7 @@ class Controller extends \stdClass
|
||||
*/
|
||||
protected function _vali(array $rules, $type = '')
|
||||
{
|
||||
list($data, $rule, $info) = [[], [], []];
|
||||
foreach ($rules as $name => $message) {
|
||||
if (stripos($name, '#') !== false) {
|
||||
list($name, $alias) = explode('#', $name);
|
||||
}
|
||||
if (stripos($name, '.') === false) {
|
||||
$data[$name] = empty($alias) ? $name : $alias;
|
||||
} else {
|
||||
list($_rgx) = explode(':', $name);
|
||||
list($_key, $_rule) = explode('.', $name);
|
||||
$info[$_rgx] = $message;
|
||||
$data[$_key] = empty($alias) ? $_key : $alias;
|
||||
$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)) {
|
||||
return $this->data;
|
||||
} else {
|
||||
$this->error($validate->getError());
|
||||
}
|
||||
return ValidateHelper::instance()->init($rules, $type);
|
||||
}
|
||||
|
||||
/**
|
||||
@ -289,6 +288,9 @@ class Controller extends \stdClass
|
||||
* @param string $pkField 数据对象主键
|
||||
* @param array $where 额外更新条件
|
||||
* @return boolean|null
|
||||
* @return boolean|null
|
||||
* @throws \think\Exception
|
||||
* @throws \think\exception\PDOException
|
||||
*/
|
||||
protected function _delete($dbQuery, $pkField = '', $where = [])
|
||||
{
|
||||
|
||||
@ -68,7 +68,7 @@ abstract class Helper
|
||||
/**
|
||||
* 实例对象反射
|
||||
* @param array $args 额外参数
|
||||
* @return Helper
|
||||
* @return $this
|
||||
*/
|
||||
public static function instance(array $args = [])
|
||||
{
|
||||
|
||||
@ -60,7 +60,7 @@ abstract class Service
|
||||
|
||||
/**
|
||||
* 静态实例对象
|
||||
* @return static
|
||||
* @return $this
|
||||
*/
|
||||
public static function instance()
|
||||
{
|
||||
|
||||
@ -1,56 +0,0 @@
|
||||
<?php
|
||||
|
||||
// +----------------------------------------------------------------------
|
||||
// | Library for ThinkAdmin
|
||||
// +----------------------------------------------------------------------
|
||||
// | 版权所有 2014~2019 广州楚才信息科技有限公司 [ http://www.cuci.cc ]
|
||||
// +----------------------------------------------------------------------
|
||||
// | 官方网站: http://library.thinkadmin.top
|
||||
// +----------------------------------------------------------------------
|
||||
// | 开源协议 ( https://mit-license.org )
|
||||
// +----------------------------------------------------------------------
|
||||
// | gitee 仓库地址 ：https://gitee.com/zoujingli/ThinkLibrary
|
||||
// | github 仓库地址 ：https://github.com/zoujingli/ThinkLibrary
|
||||
// +----------------------------------------------------------------------
|
||||
|
||||
namespace library\command\task;
|
||||
|
||||
use library\command\Task;
|
||||
use think\console\Input;
|
||||
use think\console\Output;
|
||||
|
||||
/**
|
||||
* Class Reset
|
||||
* @package library\command\task
|
||||
*/
|
||||
class Reset extends Task
|
||||
{
|
||||
|
||||
/**
|
||||
* 指令属性配置
|
||||
*/
|
||||
protected function configure()
|
||||
{
|
||||
$this->setName('xtask:reset')->setDescription('重新启动消息队列守护进程');
|
||||
}
|
||||
|
||||
/**
|
||||
* 执行重置操作
|
||||
* @param Input $input
|
||||
* @param Output $output
|
||||
* @return int|void|null
|
||||
*/
|
||||
protected function execute(Input $input, Output $output)
|
||||
{
|
||||
if (($pid = $this->checkProcess()) > 0) {
|
||||
$this->closeProcess($pid);
|
||||
$output->info("message queue daemon {$pid} closed successfully!");
|
||||
}
|
||||
$this->createProcess();
|
||||
if ($pid = $this->checkProcess()) {
|
||||
$output->info("message queue daemon {$pid} created successfully!");
|
||||
} else {
|
||||
$output->error('message queue daemon creation failed, try again later!');
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1,56 +0,0 @@
|
||||
<?php
|
||||
|
||||
// +----------------------------------------------------------------------
|
||||
// | Library for ThinkAdmin
|
||||
// +----------------------------------------------------------------------
|
||||
// | 版权所有 2014~2019 广州楚才信息科技有限公司 [ http://www.cuci.cc ]
|
||||
// +----------------------------------------------------------------------
|
||||
// | 官方网站: http://library.thinkadmin.top
|
||||
// +----------------------------------------------------------------------
|
||||
// | 开源协议 ( https://mit-license.org )
|
||||
// +----------------------------------------------------------------------
|
||||
// | gitee 仓库地址 ：https://gitee.com/zoujingli/ThinkLibrary
|
||||
// | github 仓库地址 ：https://github.com/zoujingli/ThinkLibrary
|
||||
// +----------------------------------------------------------------------
|
||||
|
||||
namespace library\command\task;
|
||||
|
||||
use library\command\Task;
|
||||
use think\console\Input;
|
||||
use think\console\Output;
|
||||
|
||||
/**
|
||||
* Class Start
|
||||
* @package library\command\task
|
||||
*/
|
||||
class Start extends Task
|
||||
{
|
||||
|
||||
/**
|
||||
* 指令属性配置
|
||||
*/
|
||||
protected function configure()
|
||||
{
|
||||
$this->setName('xtask:start')->setDescription('开始启动消息队列守护进程');
|
||||
}
|
||||
|
||||
/**
|
||||
* 执行启动操作
|
||||
* @param Input $input
|
||||
* @param Output $output
|
||||
*/
|
||||
protected function execute(Input $input, Output $output)
|
||||
{
|
||||
if (($pid = $this->checkProcess()) > 0) {
|
||||
$output->info("The message queue daemon {$pid} already exists!");
|
||||
} else {
|
||||
$this->createProcess();
|
||||
if (($pid = $this->checkProcess()) > 0) {
|
||||
$output->info("message queue daemon {$pid} created successfully!");
|
||||
} else {
|
||||
$output->error('message queue daemon creation failed, try again later!');
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@ -1,51 +0,0 @@
|
||||
<?php
|
||||
|
||||
// +----------------------------------------------------------------------
|
||||
// | Library for ThinkAdmin
|
||||
// +----------------------------------------------------------------------
|
||||
// | 版权所有 2014~2019 广州楚才信息科技有限公司 [ http://www.cuci.cc ]
|
||||
// +----------------------------------------------------------------------
|
||||
// | 官方网站: http://library.thinkadmin.top
|
||||
// +----------------------------------------------------------------------
|
||||
// | 开源协议 ( https://mit-license.org )
|
||||
// +----------------------------------------------------------------------
|
||||
// | gitee 仓库地址 ：https://gitee.com/zoujingli/ThinkLibrary
|
||||
// | github 仓库地址 ：https://github.com/zoujingli/ThinkLibrary
|
||||
// +----------------------------------------------------------------------
|
||||
|
||||
namespace library\command\task;
|
||||
|
||||
use library\command\Task;
|
||||
use think\console\Input;
|
||||
use think\console\Output;
|
||||
|
||||
/**
|
||||
* Class State
|
||||
* @package library\command\task
|
||||
*/
|
||||
class State extends Task
|
||||
{
|
||||
|
||||
/**
|
||||
* 指令属性配置
|
||||
*/
|
||||
protected function configure()
|
||||
{
|
||||
$this->setName('xtask:state')->setDescription('查看消息队列守护进程状态');
|
||||
}
|
||||
|
||||
/**
|
||||
* 执行查询操作
|
||||
* @param Input $input
|
||||
* @param Output $output
|
||||
*/
|
||||
protected function execute(Input $input, Output $output)
|
||||
{
|
||||
if (($pid = $this->checkProcess()) > 0) {
|
||||
$output->info("message queue daemon {$pid} is runing.");
|
||||
} else {
|
||||
$output->info('The message queue daemon is not running.');
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@ -1,52 +0,0 @@
|
||||
<?php
|
||||
|
||||
// +----------------------------------------------------------------------
|
||||
// | Library for ThinkAdmin
|
||||
// +----------------------------------------------------------------------
|
||||
// | 版权所有 2014~2019 广州楚才信息科技有限公司 [ http://www.cuci.cc ]
|
||||
// +----------------------------------------------------------------------
|
||||
// | 官方网站: http://library.thinkadmin.top
|
||||
// +----------------------------------------------------------------------
|
||||
// | 开源协议 ( https://mit-license.org )
|
||||
// +----------------------------------------------------------------------
|
||||
// | gitee 仓库地址 ：https://gitee.com/zoujingli/ThinkLibrary
|
||||
// | github 仓库地址 ：https://github.com/zoujingli/ThinkLibrary
|
||||
// +----------------------------------------------------------------------
|
||||
|
||||
namespace library\command\task;
|
||||
|
||||
use library\command\Task;
|
||||
use think\console\Input;
|
||||
use think\console\Output;
|
||||
|
||||
/**
|
||||
* Class Stop
|
||||
* @package library\command\task
|
||||
*/
|
||||
class Stop extends Task
|
||||
{
|
||||
|
||||
/**
|
||||
* 指令属性配置
|
||||
*/
|
||||
protected function configure()
|
||||
{
|
||||
$this->setName('xtask:stop')->setDescription('立即停止消息队列守护进程');
|
||||
}
|
||||
|
||||
/**
|
||||
* 执行停止操作
|
||||
* @param Input $input
|
||||
* @param Output $output
|
||||
*/
|
||||
protected function execute(Input $input, Output $output)
|
||||
{
|
||||
if (($pid = $this->checkProcess()) > 0) {
|
||||
$this->closeProcess($pid);
|
||||
$output->info("message queue daemon {$pid} closed successfully.");
|
||||
} else {
|
||||
$output->info('The message queue daemon is not running.');
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
18
vendor/zoujingli/think-library/src/common.php
vendored
18
vendor/zoujingli/think-library/src/common.php
vendored
@ -21,6 +21,7 @@ use library\tools\Http;
|
||||
use library\tools\Node;
|
||||
use think\Console;
|
||||
use think\Db;
|
||||
use think\db\Query;
|
||||
use think\facade\Cache;
|
||||
use think\facade\Middleware;
|
||||
use think\facade\Response;
|
||||
@ -141,7 +142,7 @@ if (!function_exists('http_post')) {
|
||||
if (!function_exists('data_save')) {
|
||||
/**
|
||||
* 数据增量保存
|
||||
* @param \think\db\Query|string $dbQuery 数据查询对象
|
||||
* @param Query|string $dbQuery 数据查询对象
|
||||
* @param array $data 需要保存或更新的数据
|
||||
* @param string $key 条件主键限制
|
||||
* @param array $where 其它的where条件
|
||||
@ -158,7 +159,7 @@ if (!function_exists('data_save')) {
|
||||
if (!function_exists('data_batch_save')) {
|
||||
/**
|
||||
* 批量更新数据
|
||||
* @param \think\db\Query|string $dbQuery 数据查询对象
|
||||
* @param Query|string $dbQuery 数据查询对象
|
||||
* @param array $data 需要更新的数据(二维数组)
|
||||
* @param string $key 条件主键限制
|
||||
* @param array $where 其它的where条件
|
||||
@ -249,14 +250,19 @@ if (PHP_SAPI !== 'cli') {
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
// 注册系统常用指令
|
||||
if (class_exists('think\Console')) {
|
||||
Console::addDefaultCommands([
|
||||
// 注册清理无效会话
|
||||
'library\command\Sess',
|
||||
'library\command\task\Stop',
|
||||
'library\command\task\State',
|
||||
'library\command\task\Start',
|
||||
// 注册系统任务指令
|
||||
'library\queue\WorkQueue',
|
||||
'library\queue\StopQueue',
|
||||
'library\queue\StateQueue',
|
||||
'library\queue\StartQueue',
|
||||
'library\queue\QueryQueue',
|
||||
'library\queue\ListenQueue',
|
||||
// 注册系统更新指令
|
||||
'library\command\sync\Admin',
|
||||
'library\command\sync\Plugs',
|
||||
'library\command\sync\Config',
|
||||
|
||||
@ -46,41 +46,44 @@ class FormHelper extends Helper
|
||||
/**
|
||||
* 逻辑器初始化
|
||||
* @param string|Query $dbQuery
|
||||
* @param string $field 操作数据主键
|
||||
* @param string $template 模板名称
|
||||
* @param string $field 指定数据主键
|
||||
* @param array $where 额外更新条件
|
||||
* @return boolean|null
|
||||
* @throws \think\Exception
|
||||
* @throws \think\exception\PDOException
|
||||
* @param array $data 表单扩展数据
|
||||
* @return array|boolean
|
||||
* @throws \think\db\exception\DataNotFoundException
|
||||
* @throws \think\db\exception\DbException
|
||||
* @throws \think\db\exception\ModelNotFoundException
|
||||
*/
|
||||
public function init($dbQuery, $field = '', $where = [])
|
||||
public function init($dbQuery, $template = '', $field = '', $where = [], $data = [])
|
||||
{
|
||||
$this->where = $where;
|
||||
$this->query = $this->buildQuery($dbQuery);
|
||||
$this->pkField = empty($field) ? $this->query->getPk() : $field;
|
||||
$this->pkValue = $this->app->request->post($this->pkField, null);
|
||||
// 主键限制处理
|
||||
if (!isset($this->where[$this->pkField]) && is_string($this->pkValue)) {
|
||||
$this->query->whereIn($this->pkField, explode(',', $this->pkValue));
|
||||
list($this->template, $this->where, $this->data) = [$template, $where, $data];
|
||||
$this->pkField = empty($field) ? ($this->query->getPk() ? $this->query->getPk() : 'id') : $field;;
|
||||
$this->pkValue = input($this->pkField, isset($data[$this->pkField]) ? $data[$this->pkField] : null);
|
||||
// GET请求, 获取数据并显示表单页面
|
||||
if ($this->app->request->isGet()) {
|
||||
if ($this->pkValue !== null) {
|
||||
$where = [$this->pkField => $this->pkValue];
|
||||
$data = (array)$this->query->where($where)->where($this->where)->find();
|
||||
}
|
||||
// 前置回调处理
|
||||
if (false === $this->controller->callback('_delete_filter', $this->query, $where)) {
|
||||
return null;
|
||||
$data = array_merge($data, $this->data);
|
||||
if (false !== $this->controller->callback('_form_filter', $data)) {
|
||||
return $this->controller->fetch($this->template, ['vo' => $data]);
|
||||
}
|
||||
// 执行删除操作
|
||||
if (method_exists($this->query, 'getTableFields') && in_array('is_deleted', $this->query->getTableFields())) {
|
||||
$result = $this->query->where($this->where)->update(['is_deleted' => '1']);
|
||||
} else {
|
||||
$result = $this->query->where($this->where)->delete();
|
||||
return $data;
|
||||
}
|
||||
// POST请求, 数据自动存库处理
|
||||
if ($this->app->request->isPost()) {
|
||||
$data = array_merge($this->app->request->post(), $this->data);
|
||||
if (false !== $this->controller->callback('_form_filter', $data, $this->where)) {
|
||||
$result = data_save($this->query, $data, $this->pkField, $this->where);
|
||||
if (false !== $this->controller->callback('_form_result', $result, $data)) {
|
||||
if ($result !== false) $this->controller->success('恭喜, 数据保存成功!', '');
|
||||
$this->controller->error('数据保存失败, 请稍候再试!');
|
||||
}
|
||||
// 结果回调处理
|
||||
if (false === $this->controller->callback('_delete_result', $result)) {
|
||||
return $result;
|
||||
}
|
||||
// 回复前端结果
|
||||
if ($result !== false) {
|
||||
$this->controller->success('数据删除成功！', '');
|
||||
} else {
|
||||
$this->controller->error('数据删除失败, 请稍候再试！');
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -21,6 +21,8 @@ use think\db\Query;
|
||||
/**
|
||||
* Class QueryHelper
|
||||
* @package library\helper
|
||||
* @see think\db\Query
|
||||
* @mixin think\db\Query
|
||||
*/
|
||||
class QueryHelper extends Helper
|
||||
{
|
||||
@ -51,7 +53,7 @@ class QueryHelper extends Helper
|
||||
|
||||
/**
|
||||
* 获取当前Db操作对象
|
||||
* @return \think\db\Query
|
||||
* @return Query
|
||||
*/
|
||||
public function db()
|
||||
{
|
||||
@ -212,6 +214,11 @@ class QueryHelper extends Helper
|
||||
* @param boolean $total 集合分页记录数
|
||||
* @param integer $limit 集合每页记录数
|
||||
* @return mixed
|
||||
* @throws \think\Exception
|
||||
* @throws \think\db\exception\DataNotFoundException
|
||||
* @throws \think\db\exception\ModelNotFoundException
|
||||
* @throws \think\exception\DbException
|
||||
* @throws \think\exception\PDOException
|
||||
*/
|
||||
public function page($isPage = true, $isDisplay = true, $total = false, $limit = 0)
|
||||
{
|
||||
|
||||
60
vendor/zoujingli/think-library/src/helper/ValidateHelper.php
vendored
Normal file
60
vendor/zoujingli/think-library/src/helper/ValidateHelper.php
vendored
Normal file
@ -0,0 +1,60 @@
|
||||
<?php
|
||||
|
||||
// +----------------------------------------------------------------------
|
||||
// | Library for ThinkAdmin
|
||||
// +----------------------------------------------------------------------
|
||||
// | 版权所有 2014~2019 广州楚才信息科技有限公司 [ http://www.cuci.cc ]
|
||||
// +----------------------------------------------------------------------
|
||||
// | 官方网站: http://library.thinkadmin.top
|
||||
// +----------------------------------------------------------------------
|
||||
// | 开源协议 ( https://mit-license.org )
|
||||
// +----------------------------------------------------------------------
|
||||
// | gitee 仓库地址 ：https://gitee.com/zoujingli/ThinkLibrary
|
||||
// | github 仓库地址 ：https://github.com/zoujingli/ThinkLibrary
|
||||
// +----------------------------------------------------------------------
|
||||
|
||||
namespace library\helper;
|
||||
|
||||
use library\Helper;
|
||||
use think\Validate;
|
||||
|
||||
/**
|
||||
* 快捷输入验证器
|
||||
* Class ValidateHelper
|
||||
* @package library\helper
|
||||
*/
|
||||
class ValidateHelper extends Helper
|
||||
{
|
||||
/**
|
||||
* 快捷输入并验证（ 支持 规则 # 别名 ）
|
||||
* @param array $rules 验证规则（ 验证信息数组 ）
|
||||
* @param string $type 输入方式 ( post. 或 get. )
|
||||
* @return array
|
||||
*/
|
||||
public function init(array $rules, $type = '')
|
||||
{
|
||||
list($data, $rule, $info) = [[], [], []];
|
||||
foreach ($rules as $name => $message) {
|
||||
if (stripos($name, '#') !== false) {
|
||||
list($name, $alias) = explode('#', $name);
|
||||
}
|
||||
if (stripos($name, '.') === false) {
|
||||
$data[$name] = empty($alias) ? $name : $alias;
|
||||
} else {
|
||||
list($_rgx) = explode(':', $name);
|
||||
list($_key, $_rule) = explode('.', $name);
|
||||
$info[$_rgx] = $message;
|
||||
$data[$_key] = empty($alias) ? $_key : $alias;
|
||||
$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)) {
|
||||
return $data;
|
||||
} else {
|
||||
$this->controller->error($validate->getError());
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@ -13,27 +13,27 @@
|
||||
// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin
|
||||
// +----------------------------------------------------------------------
|
||||
|
||||
namespace app\admin\queue\task;
|
||||
namespace library\queue;
|
||||
|
||||
use Exception;
|
||||
use library\command\Task;
|
||||
use library\service\ProcessService;
|
||||
use think\console\Command;
|
||||
use think\console\Input;
|
||||
use think\console\Output;
|
||||
use think\Db;
|
||||
|
||||
/**
|
||||
* 启动监听异步任务守护的主进程
|
||||
* Class Listen
|
||||
* @package library\command\task
|
||||
* 启动监听任务的主进程
|
||||
* Class ListenQueue
|
||||
* @package library\queue
|
||||
*/
|
||||
class Listen extends Task
|
||||
class ListenQueue extends Command
|
||||
{
|
||||
/**
|
||||
* 配置指定信息
|
||||
*/
|
||||
protected function configure()
|
||||
{
|
||||
$this->setName('xtask:listen')->setDescription('[监听]常驻异步任务循环监听主进程');
|
||||
$this->setName('xtask:listen')->setDescription('[监听]启动任务监听主进程');
|
||||
}
|
||||
|
||||
/**
|
||||
@ -49,30 +49,26 @@ class Listen extends Task
|
||||
protected function execute(Input $input, Output $output)
|
||||
{
|
||||
Db::name('SystemQueue')->count();
|
||||
$output->comment('============ 异步任务监听中 ============');
|
||||
if ($this->isWin() && function_exists('cli_set_process_title')) {
|
||||
cli_set_process_title("ThinkAdmin {$this->version} 异步任务监听主进程");
|
||||
if (($process = ProcessService::instance())->iswin() && function_exists('cli_set_process_title')) {
|
||||
cli_set_process_title("ThinkAdmin 监听主进程 {$process->version()}");
|
||||
}
|
||||
$output->comment('============ 任务监听中 ============');
|
||||
while (true) {
|
||||
foreach (Db::name('SystemQueue')->where([['status', 'eq', '1'], ['time', '<=', time()]])->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} xtask:_work {$item['id']} -";
|
||||
if ($this->isWin()) {
|
||||
$this->cmd = __DIR__ . DIRECTORY_SEPARATOR . "bin" . DIRECTORY_SEPARATOR . "ThinkAdmin.exe {$this->cmd}";
|
||||
}
|
||||
if ($this->checkProcess()) {
|
||||
$output->comment("处理任务的子进程已经存在 --> [{$item['id']}] {$item['title']}");
|
||||
if ($process->query($command = $process->think("xtask:_work {$item['id']} -"))) {
|
||||
$output->comment("正在执行 -> [{$item['id']}] {$item['title']}");
|
||||
} else {
|
||||
$this->createProcess();
|
||||
$output->info("创建处理任务的子进程成功 --> [{$item['id']}] {$item['title']}");
|
||||
$process->create($command);
|
||||
$output->info("创建成功 -> [{$item['id']}] {$item['title']}");
|
||||
}
|
||||
} catch (Exception $e) {
|
||||
} catch (\Exception $e) {
|
||||
Db::name('SystemQueue')->where(['id' => $item['id']])->update(['status' => '4', 'desc' => $e->getMessage()]);
|
||||
$output->error("创建处理任务的子进程失败 --> [{$item['id']}] {$item['title']}，{$e->getMessage()}");
|
||||
}
|
||||
}
|
||||
sleep(2);
|
||||
sleep(1);
|
||||
}
|
||||
}
|
||||
|
||||
@ -13,40 +13,41 @@
|
||||
// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin
|
||||
// +----------------------------------------------------------------------
|
||||
|
||||
namespace app\admin\queue\task;
|
||||
namespace library\queue;
|
||||
|
||||
use library\command\Task;
|
||||
use library\service\ProcessService;
|
||||
use think\console\Command;
|
||||
use think\console\Input;
|
||||
use think\console\Output;
|
||||
|
||||
/**
|
||||
* 查询正在执行中的进程PID信息
|
||||
* Class Query
|
||||
* @package app\admin\queue\task
|
||||
* 查询正在执行的进程PID
|
||||
* Class QueryQueue
|
||||
* @package library\queue
|
||||
*/
|
||||
class Query extends Task
|
||||
class QueryQueue extends Command
|
||||
{
|
||||
/**
|
||||
* 指令属性配置
|
||||
*/
|
||||
protected function configure()
|
||||
{
|
||||
$this->setName('xtask:query')->setDescription('[控制]查询正在执行的所有任务进程');
|
||||
$this->setName('xtask:query')->setDescription('[控制]查询正在运行的进程');
|
||||
}
|
||||
|
||||
/**
|
||||
* 执行相关进程查询
|
||||
* @param Input $input
|
||||
* @param Output $output
|
||||
* @return int|void|null
|
||||
*/
|
||||
protected function execute(Input $input, Output $output)
|
||||
{
|
||||
$this->cmd = "{$this->bin} xtask:";
|
||||
if (count($this->queryProcess()) < 1) {
|
||||
$output->writeln('没有查询到相关任务进程');
|
||||
} else foreach ($this->queryProcess() as $item) {
|
||||
$process = ProcessService::instance();
|
||||
$result = $process->query($process->think("xtask:"));
|
||||
if (count($result) > 0) foreach ($result as $item) {
|
||||
$output->writeln("{$item['pid']}\t{$item['cmd']}");
|
||||
} else {
|
||||
$output->writeln('没有查询到相关任务进程');
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -13,19 +13,20 @@
|
||||
// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin
|
||||
// +----------------------------------------------------------------------
|
||||
|
||||
namespace app\admin\queue\task;
|
||||
namespace library\queue;
|
||||
|
||||
use library\command\Task;
|
||||
use library\service\ProcessService;
|
||||
use think\console\Command;
|
||||
use think\console\Input;
|
||||
use think\console\Output;
|
||||
use think\Db;
|
||||
|
||||
/**
|
||||
* 检查并创建异步任务监听主进程
|
||||
* Class Start
|
||||
* @package app\admin\queue\task
|
||||
* 检查并创建监听主进程
|
||||
* Class StartQueue
|
||||
* @package library\queue
|
||||
*/
|
||||
class Start extends Task
|
||||
class StartQueue extends Command
|
||||
{
|
||||
|
||||
/**
|
||||
@ -33,7 +34,7 @@ class Start extends Task
|
||||
*/
|
||||
protected function configure()
|
||||
{
|
||||
$this->setName('xtask:start')->setDescription('[控制]创建异步任务守护监听主进程');
|
||||
$this->setName('xtask:start')->setDescription('[控制]创建守护监听主进程');
|
||||
}
|
||||
|
||||
/**
|
||||
@ -44,31 +45,18 @@ class Start extends Task
|
||||
protected function execute(Input $input, Output $output)
|
||||
{
|
||||
Db::name('SystemQueue')->count();
|
||||
$this->setBaseProcess();
|
||||
if (($pid = $this->checkProcess()) > 0) {
|
||||
$output->info("异步任务监听主进程{$pid}已经启动！");
|
||||
$process = ProcessService::instance();
|
||||
$command = $process->think("xtask:listen");
|
||||
if (count($result = $process->query($command)) > 0) {
|
||||
$output->info("监听主进程{$result['0']['pid']}已经启动！");
|
||||
} else {
|
||||
$this->setWinProcess();
|
||||
$this->createProcess();
|
||||
$this->setBaseProcess();
|
||||
$process->create($command);
|
||||
sleep(1);
|
||||
if (($pid = $this->checkProcess()) > 0) {
|
||||
$output->info("异步任务监听主进程{$pid}启动成功！");
|
||||
if (count($result = $process->query($command)) > 0) {
|
||||
$output->info("监听主进程{$result['0']['pid']}启动成功！");
|
||||
} else {
|
||||
$output->error('异步任务监听主进程创建失败！');
|
||||
$output->error('监听主进程创建失败！');
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private function setBaseProcess()
|
||||
{
|
||||
$this->cmd = "{$this->bin} xtask:listen";
|
||||
}
|
||||
|
||||
private function setWinProcess()
|
||||
{
|
||||
if ($this->isWin()) {
|
||||
$this->cmd = __DIR__ . DIRECTORY_SEPARATOR . "bin" . DIRECTORY_SEPARATOR . "ThinkAdmin.exe {$this->bin} xtask:listen";
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -13,25 +13,26 @@
|
||||
// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin
|
||||
// +----------------------------------------------------------------------
|
||||
|
||||
namespace app\admin\queue\task;
|
||||
namespace library\queue;
|
||||
|
||||
use library\command\Task;
|
||||
use library\service\ProcessService;
|
||||
use think\console\Command;
|
||||
use think\console\Input;
|
||||
use think\console\Output;
|
||||
|
||||
/**
|
||||
* 查看异步任务监听的主进程状态
|
||||
* Class State
|
||||
* @package app\admin\queue\task
|
||||
* 查看任务监听的主进程状态
|
||||
* Class StateQueue
|
||||
* @package library\queue
|
||||
*/
|
||||
class State extends Task
|
||||
class StateQueue extends Command
|
||||
{
|
||||
/**
|
||||
* 指令属性配置
|
||||
*/
|
||||
protected function configure()
|
||||
{
|
||||
$this->setName('xtask:state')->setDescription('[控制]查看异步任务监听主进程状态');
|
||||
$this->setName('xtask:state')->setDescription('[控制]查看监听主进程状态');
|
||||
}
|
||||
|
||||
/**
|
||||
@ -41,9 +42,10 @@ class State extends Task
|
||||
*/
|
||||
protected function execute(Input $input, Output $output)
|
||||
{
|
||||
$this->cmd = "{$this->bin} xtask:listen";
|
||||
if (($pid = $this->checkProcess()) > 0) {
|
||||
$output->info("异步任务监听主进程{$pid}正在运行...");
|
||||
$process = ProcessService::instance();
|
||||
$command = $process->think('xtask:listen');
|
||||
if (count($result = $process->query($command)) > 0) {
|
||||
$output->info("异步任务监听主进程{$result[0]['pid']}正在运行...");
|
||||
} else {
|
||||
$output->error("异步任务监听主进程没有运行哦!");
|
||||
}
|
||||
@ -13,18 +13,19 @@
|
||||
// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin
|
||||
// +----------------------------------------------------------------------
|
||||
|
||||
namespace app\admin\queue\task;
|
||||
namespace library\queue;
|
||||
|
||||
use library\command\Task;
|
||||
use library\service\ProcessService;
|
||||
use think\console\Command;
|
||||
use think\console\Input;
|
||||
use think\console\Output;
|
||||
|
||||
/**
|
||||
* 平滑停止异步任务守护的主进程
|
||||
* Class Stop
|
||||
* @package app\admin\queue\task
|
||||
* 平滑停止任务的所有进程
|
||||
* Class StopQueue
|
||||
* @package library\queue
|
||||
*/
|
||||
class Stop extends Task
|
||||
class StopQueue extends Command
|
||||
{
|
||||
|
||||
/**
|
||||
@ -32,7 +33,7 @@ class Stop extends Task
|
||||
*/
|
||||
protected function configure()
|
||||
{
|
||||
$this->setName('xtask:stop')->setDescription('[控制]平滑停止所有的异步任务进程');
|
||||
$this->setName('xtask:stop')->setDescription('[控制]平滑停止所有的进程');
|
||||
}
|
||||
|
||||
/**
|
||||
@ -42,12 +43,13 @@ class Stop extends Task
|
||||
*/
|
||||
protected function execute(Input $input, Output $output)
|
||||
{
|
||||
$this->cmd = "{$this->bin} xtask:";
|
||||
if (count($processList = $this->queryProcess()) < 1) {
|
||||
$process = ProcessService::instance();
|
||||
$command = $process->think('xtask:');
|
||||
if (count($result = $process->query($command)) < 1) {
|
||||
$output->writeln("没有需要结束的任务进程哦！");
|
||||
} else foreach ($processList as $item) {
|
||||
$this->closeProcess($item['pid']);
|
||||
$output->writeln("发送结束任务进程{$item['pid']}指令成功！");
|
||||
} else foreach ($result as $item) {
|
||||
$process->close($item['pid']);
|
||||
$output->writeln("发送结束进程{$item['pid']}信号成功！");
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -13,22 +13,23 @@
|
||||
// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin
|
||||
// +----------------------------------------------------------------------
|
||||
|
||||
namespace app\admin\queue\task;
|
||||
namespace library\queue;
|
||||
|
||||
use Exception;
|
||||
use library\command\Task;
|
||||
use library\service\ProcessService;
|
||||
use think\Console;
|
||||
use think\console\Command;
|
||||
use think\console\Input;
|
||||
use think\console\input\Argument;
|
||||
use think\console\Output;
|
||||
use think\Db;
|
||||
use think\Exception;
|
||||
|
||||
/**
|
||||
* 启动指定独立执行的任务子进程
|
||||
* Class Work
|
||||
* @package library\command\task
|
||||
* 启动独立执行进程
|
||||
* Class WorkQueue
|
||||
* @package library\queue
|
||||
*/
|
||||
class Work extends Task
|
||||
class WorkQueue extends Command
|
||||
{
|
||||
|
||||
/**
|
||||
@ -48,8 +49,7 @@ class Work extends Task
|
||||
*/
|
||||
protected function configure()
|
||||
{
|
||||
// 执行任务配置
|
||||
$this->setName('xtask:_work')->setDescription('[执行]创建执行单个指定任务的进程');
|
||||
$this->setName('xtask:_work')->setDescription('[执行]创建执行任务的进程');
|
||||
$this->addArgument('id', Argument::OPTIONAL, '指定任务ID');
|
||||
$this->addArgument('sp', Argument::OPTIONAL, '指令结束符');
|
||||
}
|
||||
@ -58,7 +58,7 @@ class Work extends Task
|
||||
* 任务执行
|
||||
* @param Input $input
|
||||
* @param Output $output
|
||||
* @throws \think\Exception
|
||||
* @throws Exception
|
||||
* @throws \think\exception\PDOException
|
||||
*/
|
||||
protected function execute(Input $input, Output $output)
|
||||
@ -67,10 +67,10 @@ class Work extends Task
|
||||
$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}的信息或状态异常！");
|
||||
if (empty($queue)) throw new Exception("执行任务{$this->id}的信息或状态异常！");;
|
||||
// 设置进程标题
|
||||
if ($this->isWin() && function_exists('cli_set_process_title')) {
|
||||
cli_set_process_title("ThinkAdmin {$this->version} 异步任务执行子进程 - {$queue['title']}");
|
||||
if (($process = ProcessService::instance())->iswin() && function_exists('cli_set_process_title')) {
|
||||
cli_set_process_title("ThinkAdmin {$process->version()} 执行任务 - {$queue['title']}");
|
||||
}
|
||||
// 执行任务内容
|
||||
if (class_exists($queue['preload'])) {
|
||||
@ -83,9 +83,10 @@ class Work extends Task
|
||||
throw new Exception("任务处理类 {$queue['preload']} 未定义 execute 入口！");
|
||||
}
|
||||
} else {
|
||||
$this->update('3', Console::call($queue['preload'], [], 'console'));
|
||||
$attr = explode(' ', trim(preg_replace('|\s+|', ' ', $queue['command'])));
|
||||
$this->update('3', Console::call(array_shift($attr), $attr, 'console'));
|
||||
}
|
||||
} catch (Exception $e) {
|
||||
} catch (\Exception $e) {
|
||||
$this->update('4', $e->getMessage());
|
||||
}
|
||||
}
|
||||
114
vendor/zoujingli/think-library/src/service/AuthService.php
vendored
Normal file
114
vendor/zoujingli/think-library/src/service/AuthService.php
vendored
Normal file
@ -0,0 +1,114 @@
|
||||
<?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 think\admin\service;
|
||||
|
||||
namespace library\service;
|
||||
|
||||
use library\Service;
|
||||
use library\tools\Data;
|
||||
use think\Db;
|
||||
|
||||
/**
|
||||
* 系统权限管理服务
|
||||
* Class AuthService
|
||||
* @package think\admin\service
|
||||
*/
|
||||
class AuthService extends Service
|
||||
{
|
||||
|
||||
/**
|
||||
* 判断是否已经登录
|
||||
* @return boolean
|
||||
*/
|
||||
public function isLogin()
|
||||
{
|
||||
return $this->app->session->get('user.id') ? true : false;
|
||||
}
|
||||
|
||||
/**
|
||||
* 检查指定节点授权
|
||||
* --- 需要读取缓存或扫描所有节点
|
||||
* @param string $node
|
||||
* @return boolean
|
||||
* @throws \ReflectionException
|
||||
*/
|
||||
public function check($node = '')
|
||||
{
|
||||
$service = NodeService::instance();
|
||||
if ($this->app->session->get('user.username') === 'admin') return true;
|
||||
list($real, $nodes) = [$service->fullnode($node), $service->getMethods()];
|
||||
if (empty($nodes[$real]['isauth'])) {
|
||||
return empty($nodes[$real]['islogin']) ? true : $this->isLogin();
|
||||
} else {
|
||||
return in_array($real, $this->app->session->get('user.nodes'));
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取授权节点列表
|
||||
* @param array $checkeds
|
||||
* @return array
|
||||
* @throws \ReflectionException
|
||||
*/
|
||||
public function getTree($checkeds = [])
|
||||
{
|
||||
list($nodes, $pnodes) = [[], []];
|
||||
$methods = array_reverse(NodeService::instance()->getMethods());
|
||||
foreach ($methods as $node => $method) {
|
||||
$count = substr_count($node, '/');
|
||||
$pnode = substr($node, 0, strripos($node, '/'));
|
||||
if ($count === 2 && !empty($method['isauth'])) {
|
||||
in_array($pnode, $pnodes) or array_push($pnodes, $pnode);
|
||||
$nodes[$node] = ['node' => $node, 'title' => $method['title'], 'pnode' => $pnode, 'checked' => in_array($node, $checkeds)];
|
||||
} elseif ($count === 1 && in_array($pnode, $pnodes)) {
|
||||
$nodes[$node] = ['node' => $node, 'title' => $method['title'], 'pnode' => $pnode, 'checked' => in_array($node, $checkeds)];
|
||||
}
|
||||
}
|
||||
foreach (array_keys($nodes) as $key) foreach ($methods as $node => $method) if (stripos($key, "{$node}/") !== false) {
|
||||
$pnode = substr($node, 0, strripos($node, '/'));
|
||||
$nodes[$node] = ['node' => $node, 'title' => $method['title'], 'pnode' => $pnode, 'checked' => in_array($node, $checkeds)];
|
||||
$nodes[$pnode] = ['node' => $pnode, 'title' => ucfirst($pnode), 'pnode' => '', 'checked' => in_array($pnode, $checkeds)];
|
||||
}
|
||||
return Data::arr2tree(array_reverse($nodes), 'node', 'pnode', '_sub_');
|
||||
}
|
||||
|
||||
/**
|
||||
* 初始化用户权限
|
||||
* @param boolean $force 强刷权限
|
||||
* @return AuthService
|
||||
* @throws \think\db\exception\DataNotFoundException
|
||||
* @throws \think\db\exception\ModelNotFoundException
|
||||
* @throws \think\exception\DbException
|
||||
*/
|
||||
public function apply($force = false)
|
||||
{
|
||||
if ($force) $this->app->cache->rm('system_auth_node');
|
||||
if (($uid = $this->app->session->get('user.id'))) {
|
||||
$user = Db::name('SystemUser')->where(['id' => $uid])->find();
|
||||
if (($aids = $user['authorize'])) {
|
||||
$where = [['status', 'eq', '1'], ['id', 'in', explode(',', $aids)]];
|
||||
$subsql = Db::name('SystemAuth')->field('id')->where($where)->buildSql();
|
||||
$user['nodes'] = array_unique(Db::name('SystemAuthNode')->whereRaw("auth in {$subsql}")->column('node'));
|
||||
$this->app->session->set('user', $user);
|
||||
} else {
|
||||
$user['nodes'] = [];
|
||||
$this->app->session->set('user', $user);
|
||||
}
|
||||
}
|
||||
return $this;
|
||||
}
|
||||
|
||||
}
|
||||
@ -13,16 +13,16 @@
|
||||
// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin
|
||||
// +----------------------------------------------------------------------
|
||||
|
||||
namespace app\admin\service;
|
||||
namespace library\service;
|
||||
|
||||
use think\facade\Cache;
|
||||
use library\Service;
|
||||
|
||||
/**
|
||||
* 图形验证码服务
|
||||
* Class CaptchaService
|
||||
* @package app\data\service
|
||||
* @package library\service
|
||||
*/
|
||||
class CaptchaService
|
||||
class CaptchaService extends Service
|
||||
{
|
||||
private $code; // 验证码
|
||||
private $uniqid; // 唯一序号
|
||||
@ -36,11 +36,11 @@ class CaptchaService
|
||||
private $fontcolor; // 指定字体颜色
|
||||
|
||||
/**
|
||||
* 构造方法初始化
|
||||
* CaptchaService constructor.
|
||||
* 服务初始化
|
||||
* @param array $config
|
||||
* @return static
|
||||
*/
|
||||
public function __construct($config = [])
|
||||
public function initialize($config = []): Service
|
||||
{
|
||||
// 动态配置属性
|
||||
foreach ($config as $k => $v) if (isset($this->$k)) $this->$k = $v;
|
||||
@ -51,10 +51,75 @@ class CaptchaService
|
||||
for ($i = 0; $i < $this->codelen; $i++) {
|
||||
$this->code .= $this->charset[mt_rand(0, $length)];
|
||||
}
|
||||
// 缓存验证码字符串
|
||||
Cache::tag('captcha')->set($this->uniqid, $this->code, 360);
|
||||
// 设置字体文件路径
|
||||
$this->font = __DIR__ . '/font/icon.ttf';
|
||||
$this->font = __DIR__ . '/bin/font.ttf';
|
||||
// 缓存验证码字符串
|
||||
$this->app->cache->set($this->uniqid, $this->code, 360);
|
||||
// 返回当前对象
|
||||
return $this;
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取验证码值
|
||||
* @return string
|
||||
*/
|
||||
public function getCode()
|
||||
{
|
||||
return $this->code;
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取图片内容
|
||||
* @return string
|
||||
*/
|
||||
public function getData()
|
||||
{
|
||||
return "data:image/png;base64,{$this->createImage()}";
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取验证码编号
|
||||
* @return string
|
||||
*/
|
||||
public function getUniqid()
|
||||
{
|
||||
return $this->uniqid;
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取验证码数据
|
||||
* @return array
|
||||
*/
|
||||
public function getAttrs()
|
||||
{
|
||||
return [
|
||||
'code' => $this->getCode(),
|
||||
'data' => $this->getData(),
|
||||
'uniqid' => $this->getUniqid(),
|
||||
];
|
||||
}
|
||||
|
||||
/**
|
||||
* 检查验证码是否正确
|
||||
* @param string $code 需要验证的值
|
||||
* @param string $uniqid 验证码编号
|
||||
* @return boolean
|
||||
*/
|
||||
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);
|
||||
}
|
||||
|
||||
/**
|
||||
* 输出图形验证码
|
||||
* @return string
|
||||
*/
|
||||
public function __toString()
|
||||
{
|
||||
return $this->getData();
|
||||
}
|
||||
|
||||
/**
|
||||
@ -90,58 +155,4 @@ class CaptchaService
|
||||
imagedestroy($this->img);
|
||||
return base64_encode($data);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取验证码
|
||||
* @return array
|
||||
*/
|
||||
public function getAttr()
|
||||
{
|
||||
return [
|
||||
'code' => $this->code,
|
||||
'uniq' => $this->uniqid,
|
||||
'data' => $this->getData()
|
||||
];
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取验证码值
|
||||
* @return string
|
||||
*/
|
||||
public function getCode()
|
||||
{
|
||||
return $this->code;
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取图片内容
|
||||
* @return string
|
||||
*/
|
||||
public function getData()
|
||||
{
|
||||
return "data:image/png;base64,{$this->createImage()}";
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取验证码编号
|
||||
* @return string
|
||||
*/
|
||||
public function getUniqid()
|
||||
{
|
||||
return $this->uniqid;
|
||||
}
|
||||
|
||||
/**
|
||||
* 检查验证码是否正确
|
||||
* @param string $code 需要验证的值
|
||||
* @param string $uniqid 验证码编号
|
||||
* @return boolean
|
||||
*/
|
||||
public static function check($code, $uniqid = null)
|
||||
{
|
||||
$_uni = is_string($uniqid) ? $uniqid : input('uniqid', '-');
|
||||
$_val = Cache::tag('captcha')->get($_uni);
|
||||
Cache::tag('captcha')->rm($_uni);
|
||||
return is_string($_val) && strtolower($_val) === strtolower($code);
|
||||
}
|
||||
}
|
||||
83
vendor/zoujingli/think-library/src/service/MenuService.php
vendored
Normal file
83
vendor/zoujingli/think-library/src/service/MenuService.php
vendored
Normal file
@ -0,0 +1,83 @@
|
||||
<?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 library\service;
|
||||
|
||||
use library\Service;
|
||||
use library\tools\Data;
|
||||
use think\Db;
|
||||
|
||||
/**
|
||||
* 系统菜单管理服务
|
||||
* Class MenuService
|
||||
* @package app\admin\service
|
||||
*/
|
||||
class MenuService extends Service
|
||||
{
|
||||
|
||||
/**
|
||||
* 获取可选菜单节点
|
||||
* @return array
|
||||
* @throws \ReflectionException
|
||||
*/
|
||||
public function getList()
|
||||
{
|
||||
static $nodes = [];
|
||||
if (count($nodes) > 0) return $nodes;
|
||||
foreach (NodeService::instance()->getMethods() as $node => $method) {
|
||||
if ($method['ismenu']) $nodes[] = ['node' => $node, 'title' => $method['title']];
|
||||
}
|
||||
return $nodes;
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取系统菜单树数据
|
||||
* @return array
|
||||
* @throws \ReflectionException
|
||||
* @throws \think\db\exception\DataNotFoundException
|
||||
* @throws \think\db\exception\ModelNotFoundException
|
||||
* @throws \think\exception\DbException
|
||||
*/
|
||||
public function getTree()
|
||||
{
|
||||
$result = Db::name('SystemMenu')->where(['status' => '1'])->order('sort desc,id asc')->select();
|
||||
return $this->buildData(Data::arr2tree($result), NodeService::instance()->getMethods());
|
||||
}
|
||||
|
||||
/**
|
||||
* 后台主菜单权限过滤
|
||||
* @param array $menus 当前菜单列表
|
||||
* @param array $nodes 系统权限节点
|
||||
* @return array
|
||||
* @throws \ReflectionException
|
||||
*/
|
||||
private function buildData($menus, $nodes)
|
||||
{
|
||||
foreach ($menus as $key => &$menu) {
|
||||
if (!empty($menu['sub'])) {
|
||||
$menu['sub'] = $this->buildData($menu['sub'], $nodes);
|
||||
}
|
||||
if (!empty($menu['sub'])) $menu['url'] = '#';
|
||||
elseif ($menu['url'] === '#') unset($menus[$key]);
|
||||
elseif (preg_match('|^https?://|i', $menu['url'])) continue;
|
||||
else {
|
||||
$node = join('/', array_slice(explode('/', preg_replace('/[\W]/', '/', $menu['url'])), 0, 3));
|
||||
$menu['url'] = url($menu['url']) . (empty($menu['params']) ? '' : "?{$menu['params']}");
|
||||
if (!AuthService::instance()->check($node)) unset($menus[$key]);
|
||||
}
|
||||
}
|
||||
return $menus;
|
||||
}
|
||||
}
|
||||
@ -86,8 +86,9 @@ class NodeService extends Service
|
||||
}
|
||||
$ignore = get_class_methods('\library\Controller');
|
||||
foreach ($this->scanDirectory($this->app->getAppPath()) as $file) {
|
||||
if (preg_match("|/(\w+)/(\w+)/controller/(.+)\.php$|i", $file, $matches)) {
|
||||
list(, $namespace, $application, $baseclass) = $matches;
|
||||
if (preg_match("|/(\w+)/controller/(.+)\.php$|i", $file, $matches)) {
|
||||
list(, $application, $baseclass) = $matches;
|
||||
$namespace = $this->app->env->get('APP_NAMESPACE');
|
||||
$class = new \ReflectionClass(strtr("{$namespace}/{$application}/controller/{$baseclass}", '/', '\\'));
|
||||
$prefix = strtr("{$application}/" . $this->nameTolower($baseclass), '\\', '/');
|
||||
$data[$prefix] = $this->parseComment($class->getDocComment(), $baseclass);
|
||||
|
||||
144
vendor/zoujingli/think-library/src/service/ProcessService.php
vendored
Normal file
144
vendor/zoujingli/think-library/src/service/ProcessService.php
vendored
Normal file
@ -0,0 +1,144 @@
|
||||
<?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 library\service;
|
||||
|
||||
use library\Service;
|
||||
|
||||
/**
|
||||
* 系统进程管理服务
|
||||
* Class ProcessService
|
||||
* @package think\admin\service
|
||||
*/
|
||||
class ProcessService extends Service
|
||||
{
|
||||
|
||||
/**
|
||||
* 创建并获取Think指令内容
|
||||
* @param string $args 指定参数
|
||||
* @return string
|
||||
*/
|
||||
public function think($args = '')
|
||||
{
|
||||
$root = $this->app->getRootPath();
|
||||
return trim("php {$root}think {$args}");
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取当前应用版本
|
||||
* @return string
|
||||
*/
|
||||
public function version()
|
||||
{
|
||||
return $this->app->config->get('app.thinkadmin_ver', 'v4');
|
||||
}
|
||||
|
||||
/**
|
||||
* 创建异步进程
|
||||
* @param string $command 任务指令
|
||||
* @return ProcessService
|
||||
*/
|
||||
public function create($command)
|
||||
{
|
||||
if ($this->iswin()) {
|
||||
$command = __DIR__ . "/bin/console.exe {$command}";
|
||||
pclose(popen("wmic process call create \"{$command}\"", 'r'));
|
||||
} else {
|
||||
pclose(popen("{$command} &", 'r'));
|
||||
}
|
||||
return $this;
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询相关进程列表
|
||||
* @param string $command 任务指令
|
||||
* @return array
|
||||
*/
|
||||
public function query($command)
|
||||
{
|
||||
$list = [];
|
||||
if ($this->iswin()) {
|
||||
$result = $this->exec('wmic process where name="php.exe" get processid,CommandLine');
|
||||
foreach (explode("\n", $result) as $line) if ($this->_issub($line, $command) !== false) {
|
||||
$attr = explode(' ', $this->_space($line));
|
||||
$list[] = ['pid' => array_pop($attr), 'cmd' => join(' ', $attr)];
|
||||
}
|
||||
} else {
|
||||
$result = $this->exec("ps ax|grep -v grep|grep \"{$command}\"");
|
||||
foreach (explode("\n", $result) as $line) if ($this->_issub($line, $command) !== false) {
|
||||
$attr = explode(' ', $this->_space($line));
|
||||
list($pid) = [array_shift($attr), array_shift($attr), array_shift($attr), array_shift($attr)];
|
||||
$list[] = ['pid' => $pid, 'cmd' => join(' ', $attr)];
|
||||
}
|
||||
}
|
||||
return $list;
|
||||
}
|
||||
|
||||
/**
|
||||
* 关闭任务进程
|
||||
* @param integer $pid 进程号
|
||||
* @return boolean
|
||||
*/
|
||||
public function close($pid)
|
||||
{
|
||||
if ($this->iswin()) {
|
||||
$this->exec("wmic process {$pid} call terminate");
|
||||
} else {
|
||||
$this->exec("kill -9 {$pid}");
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* 立即执行指令
|
||||
* @param string $command 执行指令
|
||||
* @return string
|
||||
*/
|
||||
public function exec($command)
|
||||
{
|
||||
return shell_exec($command);
|
||||
}
|
||||
|
||||
/**
|
||||
* 判断系统类型
|
||||
* @return boolean
|
||||
*/
|
||||
public function iswin()
|
||||
{
|
||||
return PATH_SEPARATOR === ';';
|
||||
}
|
||||
|
||||
/**
|
||||
* 消息空白字符过滤
|
||||
* @param string $content
|
||||
* @param string $tochar
|
||||
* @return string
|
||||
*/
|
||||
private function _space($content, $tochar = ' ')
|
||||
{
|
||||
return preg_replace('|\s+|', $tochar, strtr(trim($content), '\\', '/'));
|
||||
}
|
||||
|
||||
/**
|
||||
* 判断是否包含字符串
|
||||
* @param string $content
|
||||
* @param string $substr
|
||||
* @return boolean
|
||||
*/
|
||||
private function _issub($content, $substr)
|
||||
{
|
||||
return stripos($this->_space($content), $this->_space($substr)) !== false;
|
||||
}
|
||||
}
|
||||
162
vendor/zoujingli/think-library/src/service/SystemService.php
vendored
Normal file
162
vendor/zoujingli/think-library/src/service/SystemService.php
vendored
Normal file
@ -0,0 +1,162 @@
|
||||
<?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 library\service;
|
||||
|
||||
use library\Service;
|
||||
use think\Db;
|
||||
use think\db\Query;
|
||||
|
||||
/**
|
||||
* 系统参数管理服务
|
||||
* Class SystemService
|
||||
* @package think\admin\service
|
||||
*/
|
||||
class SystemService extends Service
|
||||
{
|
||||
|
||||
/**
|
||||
* 配置数据缓存
|
||||
* @var array
|
||||
*/
|
||||
protected $data = [];
|
||||
|
||||
/**
|
||||
* 设置配置数据
|
||||
* @param string $name 配置名称
|
||||
* @param string $value 配置内容
|
||||
* @return static
|
||||
* @throws \think\db\exception\DataNotFoundException
|
||||
* @throws \think\db\exception\DbException
|
||||
* @throws \think\db\exception\ModelNotFoundException
|
||||
*/
|
||||
public function set($name, $value = '')
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* 读取配置数据
|
||||
* @param string $name
|
||||
* @return array|mixed|string
|
||||
* @throws \think\db\exception\DataNotFoundException
|
||||
* @throws \think\db\exception\DbException
|
||||
* @throws \think\db\exception\ModelNotFoundException
|
||||
*/
|
||||
public function get($name)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* 数据增量保存
|
||||
* @param Query|string $dbQuery 数据查询对象
|
||||
* @param array $data 需要保存或更新的数据
|
||||
* @param string $key 条件主键限制
|
||||
* @param array $where 其它的where条件
|
||||
* @return bool|int|mixed|string
|
||||
* @throws \think\db\exception\DataNotFoundException
|
||||
* @throws \think\db\exception\DbException
|
||||
* @throws \think\db\exception\ModelNotFoundException
|
||||
*/
|
||||
public function save($dbQuery, $data, $key = 'id', $where = [])
|
||||
{
|
||||
$db = is_string($dbQuery) ? Db::name($dbQuery) : $dbQuery;
|
||||
list($table, $value) = [$db->getTable(), isset($data[$key]) ? $data[$key] : null];
|
||||
$map = isset($where[$key]) ? [] : (is_string($value) ? [[$key, 'in', explode(',', $value)]] : [$key => $value]);
|
||||
if (is_array($info = Db::table($table)->master()->where($where)->where($map)->find()) && !empty($info)) {
|
||||
if (Db::table($table)->strict(false)->where($where)->where($map)->update($data) !== false) {
|
||||
return isset($info[$key]) ? $info[$key] : true;
|
||||
} else {
|
||||
return false;
|
||||
}
|
||||
} else {
|
||||
return Db::table($table)->strict(false)->insertGetId($data);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 保存数据内容
|
||||
* @param string $name 数据名称
|
||||
* @param mixed $value 数据内容
|
||||
* @return boolean
|
||||
* @throws \think\db\exception\DataNotFoundException
|
||||
* @throws \think\db\exception\DbException
|
||||
* @throws \think\db\exception\ModelNotFoundException
|
||||
*/
|
||||
public function setData($name, $value)
|
||||
{
|
||||
$data = ['name' => $name, 'value' => serialize($value)];
|
||||
return $this->save('SystemData', $data, 'name');
|
||||
}
|
||||
|
||||
/**
|
||||
* 读取数据内容
|
||||
* @param string $name 数据名称
|
||||
* @param mixed $default 默认值
|
||||
* @return mixed
|
||||
*/
|
||||
public function getData($name, $default = null)
|
||||
{
|
||||
$value = Db::name('SystemData')->where(['name' => $name])->value('value');
|
||||
return empty($value) ? $default : unserialize($value);
|
||||
}
|
||||
|
||||
/**
|
||||
* 写入系统日志
|
||||
* @param string $action
|
||||
* @param string $content
|
||||
* @return integer
|
||||
*/
|
||||
public function setOplog($action, $content)
|
||||
{
|
||||
return Db::name('SystemLog')->insert([
|
||||
'node' => NodeService::instance()->getCurrent(),
|
||||
'action' => $action, 'content' => $content,
|
||||
'geoip' => $this->app->request->isCli() ? '127.0.0.1' : $this->app->request->ip(),
|
||||
'username' => $this->app->request->isCli() ? 'cli' : $this->app->session->get('user.username'),
|
||||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
* 打印输出数据到文件
|
||||
* @param mixed $data 输出的数据
|
||||
* @param boolean $new 强制替换文件
|
||||
* @param string|null $file 文件名称
|
||||
*/
|
||||
public function putDebug($data, $new = false, $file = null)
|
||||
{
|
||||
if (is_null($file)) $file = $this->app->getRuntimePath() . date('Ymd') . '.txt';
|
||||
$str = (is_string($data) ? $data : (is_array($data) || is_object($data)) ? print_r($data, true) : var_export($data, true)) . PHP_EOL;
|
||||
$new ? file_put_contents($file, $str) : file_put_contents($file, $str, FILE_APPEND);
|
||||
}
|
||||
|
||||
/**
|
||||
* 判断运行环境
|
||||
* @param string $type 运行模式（dev|demo|local）
|
||||
* @return boolean
|
||||
*/
|
||||
public function checkRunMode($type = 'dev')
|
||||
{
|
||||
$domain = $this->app->request->host(true);
|
||||
$isDemo = is_numeric(stripos($domain, 'thinkadmin.top'));
|
||||
$isLocal = in_array($domain, ['127.0.0.1', 'localhost']);
|
||||
if ($type === 'dev') return $isLocal || $isDemo;
|
||||
if ($type === 'demo') return $isDemo;
|
||||
if ($type === 'local') return $isLocal;
|
||||
return true;
|
||||
}
|
||||
|
||||
}
|
||||
@ -18,6 +18,7 @@ use WeChat\Contracts\BasicWePay;
|
||||
use WeChat\Exceptions\InvalidResponseException;
|
||||
use WePay\Bill;
|
||||
use WePay\Order;
|
||||
use WePay\Refund;
|
||||
use WePay\Transfers;
|
||||
use WePay\TransfersBank;
|
||||
|
||||
@ -116,7 +117,7 @@ class Pay extends BasicWePay
|
||||
*/
|
||||
public function createRefund(array $options)
|
||||
{
|
||||
return Order::instance($this->config->get())->create($options);
|
||||
return Refund::instance($this->config->get())->create($options);
|
||||
}
|
||||
|
||||
/**
|
||||
@ -128,7 +129,7 @@ class Pay extends BasicWePay
|
||||
*/
|
||||
public function queryRefund(array $options)
|
||||
{
|
||||
return Order::instance($this->config->get())->query($options);
|
||||
return Refund::instance($this->config->get())->query($options);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user