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

ComposerUpdate

Browse Source
This commit is contained in:
Anyon 2019-11-28 11:24:34 +08:00
parent 78010f8e86
commit b6af7068ba
9 changed files with 39 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
build.cmd
View File

@ -1,3 +1,2 @@
@echo off
@rmdir /s/q vendor
composer update --profile --prefer-dist --no-dev --optimize-autoloader

2
vendor/autoload.php vendored
View File

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

14
vendor/composer/autoload_real.php vendored
View File

@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
class ComposerAutoloaderInitcd358774cbdeec4e6bc6107ae33ae515
class ComposerAutoloaderInitbf5dd43c242f2a86b1513b16fb281176
{
private static $loader;
@ -19,15 +19,15 @@ class ComposerAutoloaderInitcd358774cbdeec4e6bc6107ae33ae515
return self::$loader;
}
spl_autoload_register(array('ComposerAutoloaderInitcd358774cbdeec4e6bc6107ae33ae515', 'loadClassLoader'), true, true);
spl_autoload_register(array('ComposerAutoloaderInitbf5dd43c242f2a86b1513b16fb281176', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader();
spl_autoload_unregister(array('ComposerAutoloaderInitcd358774cbdeec4e6bc6107ae33ae515', 'loadClassLoader'));
spl_autoload_unregister(array('ComposerAutoloaderInitbf5dd43c242f2a86b1513b16fb281176', '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\ComposerStaticInitcd358774cbdeec4e6bc6107ae33ae515::getInitializer($loader));
call_user_func(\Composer\Autoload\ComposerStaticInitbf5dd43c242f2a86b1513b16fb281176::getInitializer($loader));
} else {
$map = require __DIR__ . '/autoload_namespaces.php';
foreach ($map as $namespace => $path) {
@ -48,19 +48,19 @@ class ComposerAutoloaderInitcd358774cbdeec4e6bc6107ae33ae515
$loader->register(true);
if ($useStaticLoader) {
$includeFiles = Composer\Autoload\ComposerStaticInitcd358774cbdeec4e6bc6107ae33ae515::$files;
$includeFiles = Composer\Autoload\ComposerStaticInitbf5dd43c242f2a86b1513b16fb281176::$files;
} else {
$includeFiles = require __DIR__ . '/autoload_files.php';
}
foreach ($includeFiles as $fileIdentifier => $file) {
composerRequirecd358774cbdeec4e6bc6107ae33ae515($fileIdentifier, $file);
composerRequirebf5dd43c242f2a86b1513b16fb281176($fileIdentifier, $file);
}
return $loader;
}
}
function composerRequirecd358774cbdeec4e6bc6107ae33ae515($fileIdentifier, $file)
function composerRequirebf5dd43c242f2a86b1513b16fb281176($fileIdentifier, $file)
{
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
require $file;

8
vendor/composer/autoload_static.php vendored
View File

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

8
vendor/composer/installed.json vendored
View File

@ -502,12 +502,12 @@
"source": {
"type": "git",
"url": "https://github.com/zoujingli/ThinkLibrary.git",
"reference": "0fb1d49fde76d86487940f2b7f6bb6ff7b613648"
"reference": "7f20352fb92f249f64f9299cfdb9eda386adca86"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/0fb1d49fde76d86487940f2b7f6bb6ff7b613648",
"reference": "0fb1d49fde76d86487940f2b7f6bb6ff7b613648",
"url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/7f20352fb92f249f64f9299cfdb9eda386adca86",
"reference": "7f20352fb92f249f64f9299cfdb9eda386adca86",
"shasum": "",
"mirrors": [
{
@ -527,7 +527,7 @@
"qiniu/php-sdk": "^7.2",
"topthink/framework": "5.1.*"
},
"time": "2019-11-26T03:42:04+00:00",
"time": "2019-11-28T03:18:19+00:00",
"type": "library",
"installation-source": "dist",
"autoload": {

12
vendor/zoujingli/think-library/src/helper/DeleteHelper.php vendored
View File

@ -35,13 +35,13 @@ class DeleteHelper extends Helper
* 数据对象主键名称
* @var string
*/
protected $pkField;
protected $field;
/**
* 数据对象主键值
* @var string
*/
protected $pkValue;
protected $value;
/**
* 逻辑器初始化
@ -56,11 +56,11 @@ class DeleteHelper extends Helper
{
$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);
$this->field = empty($field) ? $this->query->getPk() : $field;
$this->value = $this->app->request->post($this->field, null);
// 主键限制处理
if (!isset($this->where[$this->pkField]) && is_string($this->pkValue)) {
$this->query->whereIn($this->pkField, explode(',', $this->pkValue));
if (!isset($this->where[$this->field]) && is_string($this->value)) {
$this->query->whereIn($this->field, explode(',', $this->value));
}
// 前置回调处理
if (false === $this->controller->callback('_delete_filter', $this->query, $where)) {

2
vendor/zoujingli/think-library/src/service/AuthService.php vendored
View File

@ -53,7 +53,7 @@ class AuthService extends Service
if (empty($nodes[$real]['isauth'])) {
return empty($nodes[$real]['islogin']) ? true : $this->isLogin();
} else {
return in_array($real, $this->app->session->get('user.nodes'));
return in_array($real, (array)$this->app->session->get('user.nodes'));
}
}

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

@ -146,7 +146,11 @@ class CaptchaService extends Service
$_x = $this->width / $this->codelen;
for ($i = 0; $i < $this->codelen; $i++) {
$this->fontcolor = imagecolorallocate($this->img, mt_rand(0, 156), mt_rand(0, 156), mt_rand(0, 156));
imagettftext($this->img, $this->fontsize, mt_rand(-30, 30), $_x * $i + mt_rand(1, 5), $this->height / 1.4, $this->fontcolor, $this->font, $this->code[$i]);
if (function_exists('imagettftext')) {
imagettftext($this->img, $this->fontsize, mt_rand(-30, 30), $_x * $i + mt_rand(1, 5), $this->height / 1.4, $this->fontcolor, $this->font, $this->code[$i]);
} else {
imagestring($this->img, 15, $_x * $i + mt_rand(0, 25), mt_rand(15, 20), $this->code[$i], $this->fontcolor);
}
}
ob_start();
imagepng($this->img);

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

@ -53,10 +53,9 @@ class ProcessService extends Service
public function create($command)
{
if ($this->iswin()) {
$command = __DIR__ . "/bin/console.exe {$command}";
pclose(popen("wmic process call create \"{$command}\"", 'r'));
$this->exec(__DIR__ . "/bin/console.exe {$command}");
} else {
pclose(popen("{$command} &", 'r'));
$this->exec("{$command} > /dev/null &");
}
return $this;
}
@ -70,14 +69,14 @@ class ProcessService extends Service
{
$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) {
$lines = $this->exec('wmic process where name="php.exe" get processid,CommandLine', true);
foreach ($lines 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) {
$lines = $this->exec("ps ax|grep -v grep|grep \"{$command}\"", true);
foreach ($lines 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)];
@ -104,11 +103,13 @@ class ProcessService extends Service
/**
* 立即执行指令
* @param string $command 执行指令
* @return string
* @param boolean $outarr 返回类型
* @return string|array
*/
public function exec($command)
public function exec($command, $outarr = false)
{
return shell_exec($command);
exec($command, $output);
return $outarr ? $output : join("\n", $output);
}
/**