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

测试

Browse Source
This commit is contained in:
Anyon 2019-11-01 18:03:14 +08:00
parent 73a0a88f30
commit 28ae83eb43
4 changed files with 265 additions and 184 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/admin/controller/api/Update.php
View File

@ -16,6 +16,7 @@
namespace app\admin\controller\api; namespace app\admin\controller\api;
use think\admin\Controller; use think\admin\Controller;
use think\admin\extend\PlugsExtend;
/** /**
* 系统更新接口 * 系统更新接口
@ -29,10 +30,11 @@ class Update extends Controller
*/ */
public function tree() public function tree()
{ {
$plugs = new \think\admin\plugs\Plugs(); $this->success('获取当前文件列表成功！', PlugsExtend::instance($this->app)->buildFileList([
$this->success('获取当前文件列表成功！', $plugs->buildFileList([
'think', 'app/admin', 'public/static', 'think', 'app/admin', 'public/static',
], ['public/static/self'])); ], [
'public/static/self'
]));
} }
/** /**

238
vendor/zoujingli/think-library/src/extend/PlugsExtend.php vendored Normal file
View File

@ -0,0 +1,238 @@
<?php
// +----------------------------------------------------------------------
// | Library for ThinkAdmin
// +----------------------------------------------------------------------
// | 版权所有 2014~2019 广州楚才信息科技有限公司 [ http://www.cuci.cc ]
// +----------------------------------------------------------------------
// | 官方网站: http://demo.thinkadmin.top
// +----------------------------------------------------------------------
// | 开源协议 ( https://mit-license.org )
// +----------------------------------------------------------------------
// | gitee 仓库地址 ：https://gitee.com/zoujingli/ThinkLibrary
// | github 仓库地址 ：https://github.com/zoujingli/ThinkLibrary
// +----------------------------------------------------------------------
namespace think\admin\extend;
use think\App;
/**
* Class PlugsExtend
* @package think\admin\extend
*/
class PlugsExtend
{
/**
* 当前应用
* @var App
*/
private $app;
/**
* 目录地址
* @var string
*/
protected $uri;
/**
* 项目根目录
* @var string
*/
protected $path;
/**
* 当前版本号
* @var string
*/
protected $version;
/**
* 指定文件规则
* @var array
*/
protected $modules = [];
/**
* 当前实例
* @var $this
*/
private static $class;
/**
* 静态反射对象
* @param App $app
* @return $this
*/
public static function instance(App $app)
{
if (empty(self::$class)) {
self::$class = new static($app);
}
return self::$class;
}
/**
* PlugsExtend constructor.
* @param App $app
*/
public function __construct(App $app)
{
$this->app = $app;
$this->version = $this->app->config->get('app.thinkadmin_ver');
if (empty($this->version)) $this->version = 'v4';
$this->uri = "https://{$this->version}.thinkadmin.top";
$this->path = strtr($this->app->getRootPath(), '\\', '/');
}
/**
* 获取当前版本
* @return string
*/
public function getVersion()
{
return $this->version;
}
/**
* 同步指定文件
* @param array $file
*/
public function fileSynchronization($file)
{
if (in_array($file['type'], ['add', 'mod'])) {
if ($this->downloadFile(encode($file['name']))) {
$this->output->writeln("--- 下载 {$file['name']} 更新成功");
} else {
$this->output->writeln("--- 下载 {$file['name']} 更新失败");
}
} elseif (in_array($file['type'], ['del'])) {
$real = $this->path . $file['name'];
if (is_file($real) && unlink($real)) {
$this->removeEmptyDirectory(dirname($real));
$this->output->writeln("--- 删除 {$file['name']} 文件成功");
} else {
$this->output->error("--- 删除 {$file['name']} 文件失败");
}
}
}
/**
* 下载更新文件内容
* @param string $encode
* @return boolean|integer
*/
public function downloadFile($encode)
{
$result = json_decode(http_get("{$this->uri}?s=admin/api.update/get/{$encode}"), true);
if (empty($result['code'])) return false;
$filename = $this->path . decode($encode);
file_exists(dirname($filename)) || mkdir(dirname($filename), 0755, true);
return file_put_contents($filename, base64_decode($result['data']['content']));
}
/**
* 清理空目录
* @param string $path
*/
public function removeEmptyDirectory($path)
{
if (is_dir($path) && count(scandir($path)) === 2 && rmdir($path)) {
$this->removeEmptyDirectory(dirname($path));
}
}
/**
* 获取文件差异数据
* @return array
*/
public function grenerateDifference($modules = [])
{
$this->modules = $modules;
$result = json_decode(HttpExtend::get("{$this->uri}?s=/admin/api.update/tree"), true);
if (empty($result['code'])) return [];
$new = $this->buildFileList($result['data']['paths'], $result['data']['ignores']);
return $this->grenerateDifferenceContrast($result['data']['list'], $new['list']);
}
/**
* 两二维数组对比
* @param array $serve 线上文件列表信息
* @param array $local 本地文件列表信息
* @return array
*/
private function grenerateDifferenceContrast(array $serve = [], array $local = [])
{
// 数据扁平化
list($_serve, $_local, $_new) = [[], [], []];
foreach ($serve as $t) $_serve[$t['name']] = $t;
foreach ($local as $t) $_local[$t['name']] = $t;
unset($serve, $local);
// 线上数据差异计算
foreach ($_serve as $t) if (isset($_local[$t['name']])) array_push($_new, [
'type' => $t['hash'] === $_local[$t['name']]['hash'] ? null : 'mod', 'name' => $t['name'],
]);
else array_push($_new, ['type' => 'add', 'name' => $t['name']]);
// 本地数据增量计算
foreach ($_local as $t) if (!isset($_serve[$t['name']])) array_push($_new, ['type' => 'del', 'name' => $t['name']]);
unset($_serve, $_local);
usort($_new, function ($a, $b) {
return $a['name'] !== $b['name'] ? ($a['name'] > $b['name'] ? 1 : -1) : 0;
});
return $_new;
}
/**
* 获取文件信息列表
* @param array $paths 需要扫描的目录
* @param array $ignores 忽略扫描的文件
* @param array $maps 扫描结果列表
* @return array
*/
public function buildFileList(array $paths, array $ignores = [], array $data = [])
{
// 扫描规则文件
foreach ($paths as $key => $path) {
$data = array_merge($data, $this->getFileList("{$this->path}{$path}"));
}
// 清除忽略文件
foreach ($data as $key => $map) foreach ($ignores as $ingore) {
if (stripos($map['name'], $ingore) === 0) unset($data[$key]);
}
return ['paths' => $paths, 'ignores' => $ignores, 'list' => $data];
}
/**
* 获取目录文件列表
* @param string $path 待扫描的目录
* @param array $data 扫描结果
* @return array
*/
private function getFileList($path, $data = [])
{
if (file_exists($path)) if (is_dir($path)) foreach (scandir($path) as $sub) {
if (strpos($sub, '.') !== 0) if (is_dir($temp = "{$path}/{$sub}")) {
$data = array_merge($data, $this->getFileList($temp));
} else {
array_push($data, $this->getFileInfo($temp));
}
} else {
return [$this->getFileInfo($path)];
}
return $data;
}
/**
* 获取指定文件信息
* @param string $filename
* @return array
*/
private function getFileInfo($filename)
{
return [
'hash' => md5(preg_replace('/\s+/', '', file_get_contents($filename))),
'name' => strtr(strtr(realpath($filename), '\\', '/'), $this->path, ''),
];
}
}

5
vendor/zoujingli/think-library/src/plugs/AdminPlugs.php vendored
View File

@ -15,8 +15,9 @@ class AdminPlugs extends Plugs
protected function execute(Input $input, Output $output) protected function execute(Input $input, Output $output)
{ {
$this->modules['admin']; $this->modules[] = 'admin';
dump($this->uri); parent::execute($input, $output);
} }
} }

198
vendor/zoujingli/think-library/src/plugs/Plugs.php vendored
View File

@ -2,6 +2,7 @@
namespace think\admin\plugs; namespace think\admin\plugs;
use think\admin\extend\PlugsExtend;
use think\console\Command; use think\console\Command;
use think\console\Input; use think\console\Input;
use think\console\Output; use think\console\Output;
@ -12,53 +13,34 @@ use think\console\Output;
*/ */
class Plugs extends Command class Plugs extends Command
{ {
/**
* 目录地址
* @var string
*/
protected $uri;
/**
* 项目根目录
* @var string
*/
protected $path;
/**
* 当前版本号
* @var string
*/
protected $version;
/** /**
* 指定更新模块 * 指定更新模块
* @var array * @var array
*/ */
protected $modules = []; protected $modules = [];
/**
* 插件指令初始化
* @param Input $input
* @param Output $output
*/
protected function initialize(Input $input, Output $output)
{
$this->version = $this->app->config->get('app.thinkadmin_ver');
if (empty($this->version)) $this->version = 'v4';
$this->uri = "https://{$this->version}.thinkadmin.top";
$this->path = strtr($this->app->getAppPath(), '\\', '/');
}
protected function execute(Input $input, Output $output) protected function execute(Input $input, Output $output)
{ {
$data = []; $data = [];
$output->comment("=== 准备从代码仓库下载更新{$this->version}版本文件 ==="); $extend = PlugsExtend::instance($this->app);
foreach ($this->grenerateDifference() as $file) if (in_array($file['type'], ['add', 'del', 'mod'])) { $output->comment("=== 准备从代码仓库下载更新{$extend->getVersion()}版本文件 ===");
foreach ($this->modules as $module) if (stripos($file['name'], $module) === 0) $data[] = $file; foreach ($extend->grenerateDifference($this->modules) as $file) {
if (in_array($file['type'], ['add', 'del', 'mod'])) {
foreach ($this->modules as $module) {
if (stripos($file['name'], $module) === 0) {
$data[] = $file;
}
}
}
} }
if (empty($data)) $output->info('--- 本地文件与线上文件一致，无需更新文件'); if (empty($data)) {
else foreach ($data as $file) $this->fileSynchronization($file); $output->info('--- 本地文件与线上文件一致，无需更新文件');
$output->comment("=== 从代码仓库下载{$this->version}版本同步更新成功 ==="); } else {
foreach ($data as $file) {
$this->fileSynchronization($file);
}
}
$output->comment("=== 从代码仓库下载{$extend->getVersion()}版本同步更新成功 ===");
$this->install(); $this->install();
} }
@ -67,146 +49,4 @@ class Plugs extends Command
// #todo 模块安装 // #todo 模块安装
} }
/**
* 同步指定文件
* @param array $file
*/
private function fileSynchronization($file)
{
if (in_array($file['type'], ['add', 'mod'])) {
if ($this->downloadFile(encode($file['name']))) {
$this->output->writeln("--- 下载 {$file['name']} 更新成功");
} else {
$this->output->writeln("--- 下载 {$file['name']} 更新失败");
}
} elseif (in_array($file['type'], ['del'])) {
$real = $this->root . $file['name'];
if (is_file($real) && unlink($real)) {
$this->removeEmptyDirectory(dirname($real));
$this->output->writeln("--- 删除 {$file['name']} 文件成功");
} else {
$this->output->error("--- 删除 {$file['name']} 文件失败");
}
}
}
/**
* 下载更新文件内容
* @param string $encode
* @return boolean|integer
*/
private function downloadFile($encode)
{
$result = json_decode(http_get("{$this->uri}?s=admin/api.update/get/{$encode}"), true);
if (empty($result['code'])) return false;
$filename = $this->root . decode($encode);
file_exists(dirname($filename)) || mkdir(dirname($filename), 0755, true);
return file_put_contents($filename, base64_decode($result['data']['content']));
}
/**
* 清理空目录
* @param string $path
*/
private function removeEmptyDirectory($path)
{
if (is_dir($path) && count(scandir($path)) === 2) {
if (rmdir($path)) $this->removeEmptyDirectory(dirname($path));
}
}
/**
* 获取文件差异数据
* @return array
*/
private function grenerateDifference()
{
$result = json_decode(http_get("{$this->uri}?s=/admin/api.update/tree"), true);
if (empty($result['code'])) return [];
$new = $this->buildFileList($result['data']['paths'], $result['data']['ignores']);
return $this->grenerateDifferenceContrast($result['data']['list'], $new['list']);
}
/**
* 两二维数组对比
* @param array $serve 线上文件列表信息
* @param array $local 本地文件列表信息
* @return array
*/
private function grenerateDifferenceContrast(array $serve = [], array $local = [])
{
// 数据扁平化
list($_serve, $_local, $_new) = [[], [], []];
foreach ($serve as $t) $_serve[$t['name']] = $t;
foreach ($local as $t) $_local[$t['name']] = $t;
unset($serve, $local);
// 线上数据差异计算
foreach ($_serve as $t) if (isset($_local[$t['name']])) array_push($_new, [
'type' => $t['hash'] === $_local[$t['name']]['hash'] ? null : 'mod', 'name' => $t['name'],
]);
else array_push($_new, ['type' => 'add', 'name' => $t['name']]);
// 本地数据增量计算
foreach ($_local as $t) if (!isset($_serve[$t['name']])) array_push($_new, ['type' => 'del', 'name' => $t['name']]);
unset($_serve, $_local);
usort($_new, function ($a, $b) {
return $a['name'] !== $b['name'] ? ($a['name'] > $b['name'] ? 1 : -1) : 0;
});
return $_new;
}
/**
* 获取文件信息列表
* @param array $paths 需要扫描的目录
* @param array $ignores 忽略扫描的文件
* @param array $maps 扫描结果列表
* @return array
*/
public function buildFileList(array $paths, array $ignores = [], array $maps = [])
{
foreach ($paths as $key => $dir) {
$paths[$key] = strtr($dir, '\\', '/');
$maps = array_merge($maps, $this->getFileList("{$this->root}{$paths[$key]}", $this->root));
}
// 清除忽略文件
foreach ($maps as $key => $map) foreach ($ignores as $ingore) {
if (stripos($map['name'], $ingore) === 0) unset($maps[$key]);
}
return ['paths' => $paths, 'ignores' => $ignores, 'list' => $maps];
}
/**
* 获取目录文件列表
* @param string $path 待扫描的目录
* @param array $data 扫描结果
* @return array
*/
private function getFileList($path, $data = [])
{
if (file_exists($path)) {
if (is_file($path)) return [$this->getFileInfo($path)];
if (is_dir($path)) foreach (scandir($path) as $sub) if (strpos($sub, '.') !== 0) {
if (is_dir($temp = "{$path}/{$sub}")) {
$data = array_merge($data, $this->getFileList($temp));
} else {
array_push($data, $this->getFileInfo($temp));
}
}
}
return $data;
}
/**
* 获取指定文件信息
* @param string $filename
* @return array
*/
private function getFileInfo($filename)
{
return [
'hash' => md5(preg_replace('/\s+/', '', file_get_contents($filename))),
'name' => strtr(strtr(realpath($filename), '\\', '/'), $this->root, ''),
];
}
} }