ulthon/ulthon_admin
1
0
Fork 0
mirror of https://gitee.com/ulthon/ulthon_admin.git synced 2026-07-09 03:22:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

完善更新逻辑

Browse Source
This commit is contained in:
augushong
2023-10-18 17:45:41 +08:00
parent 1fcaf23a5e
commit f8657488d8
1 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
extend/base/admin/service/AdminUpdateServiceBase.php
View File

@@ -73,11 +73,12 @@ class AdminUpdateServiceBase
if ($last_version == $current_version) { if ($last_version == $current_version) {
$output->writeln('当前版本为最新版本'); $output->writeln('当前版本为最新版本');
if ($input->hasOption('reinstall')) { if ($input->hasOption('reinstall')) {
$output->writeln('重装代码'); $output->writeln('重装代码');
} else { } else {
$this->cleanWorkpaceDir(); $this->cleanWorkpaceDir();
return; return;
} }
} }
@@ -126,23 +127,23 @@ class AdminUpdateServiceBase
->toArray() ->toArray()
); );
$ignore_prefix = [
'runtime',
'vendor',
'.git',
];
// 当前版本的所有文件 // 当前版本的所有文件
$current_version_files = $current_version_filesystem->listContents('/', true) $current_version_files = $current_version_filesystem->listContents('/', true)
->filter(function (StorageAttributes $attributes) { ->filter(function (StorageAttributes $attributes) use ($ignore_prefix) {
if ($attributes->isDir()) { if ($attributes->isDir()) {
return false; return false;
} }
if (strpos($attributes->path(), 'runtime') === 0) { foreach ($ignore_prefix as $prefix) {
return false; if (str_starts_with($attributes->path(), $prefix)) {
} return false;
}
if (strpos($attributes->path(), 'vendor') === 0) {
return false;
}
if (strpos($attributes->path(), '.git') === 0) {
return false;
} }
return true; return true;
@@ -152,17 +153,15 @@ class AdminUpdateServiceBase
// 最新版本的所有文件 // 最新版本的所有文件
$last_version_files = $last_version_filesystem->listContents('/', true) $last_version_files = $last_version_filesystem->listContents('/', true)
->filter(function (StorageAttributes $attributes) { ->filter(function (StorageAttributes $attributes) use ($ignore_prefix) {
if ($attributes->isDir()) { if ($attributes->isDir()) {
return false; return false;
} }
if (strpos($attributes->path(), 'runtime') === 0) { foreach ($ignore_prefix as $prefix) {
return false; if (str_starts_with($attributes->path(), $prefix)) {
} return false;
}
if (strpos($attributes->path(), 'vendor') === 0) {
return false;
} }
return true; return true;
@@ -255,14 +254,15 @@ class AdminUpdateServiceBase
} }
} }
if(empty($need_process_files)){ if (empty($need_process_files)) {
$output->writeln('没有需要更新的文件'); $output->writeln('没有需要更新的文件');
$this->cleanWorkpaceDir(); $this->cleanWorkpaceDir();
return; return;
} }
// 处理需要更新的文件 // 处理需要更新的文件
foreach ($need_process_files as $file_path => $type) { foreach ($need_process_files as $file_path => $type) {
$now_file_path = $now_dir . '/' . $file_path; $now_file_path = $now_dir . '/' . $file_path;
$last_file_path = $last_version_dir . '/' . $file_path; $last_file_path = $last_version_dir . '/' . $file_path;