mirror of
https://gitee.com/ulthon/ulthon_admin.git
synced 2026-07-08 19:12:48 +08:00
修复更新逻辑
This commit is contained in:
@@ -202,6 +202,11 @@ class AdminUpdateServiceBase
|
|||||||
$need_process_files = [];
|
$need_process_files = [];
|
||||||
|
|
||||||
foreach ($changed_files as $file_path => $type) {
|
foreach ($changed_files as $file_path => $type) {
|
||||||
|
if ($type == 'add') {
|
||||||
|
$need_process_files[$file_path] = $type;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
$now_file_path = $now_dir . '/' . $file_path;
|
$now_file_path = $now_dir . '/' . $file_path;
|
||||||
$current_file_path = $current_version_dir . '/' . $file_path;
|
$current_file_path = $current_version_dir . '/' . $file_path;
|
||||||
$last_file_path = $last_version_dir . '/' . $file_path;
|
$last_file_path = $last_version_dir . '/' . $file_path;
|
||||||
@@ -211,18 +216,21 @@ class AdminUpdateServiceBase
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (PathTools::compareFiles($now_file_path, $current_file_path)) {
|
||||||
|
// 如果当前代码 和 当前版本 一致
|
||||||
|
$need_process_files[$file_path] = $type;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
if (in_array($file_path, $list_optional_update_files)) {
|
if (in_array($file_path, $list_optional_update_files)) {
|
||||||
// 可选更新的文件发生了变化,提示用户手动维护上游信息
|
// 可选更新的文件发生了变化,提示用户手动维护上游信息
|
||||||
$optional_update_waring_files[$file_path] = $type;
|
$optional_update_waring_files[$file_path] = $type;
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
// 强制更新的文件被定制了,需要提醒可能会产生错误
|
// 强制更新的文件被定制了,需要提醒可能会产生错误
|
||||||
$force_update_waring_files[$file_path] = $type;
|
$force_update_waring_files[$file_path] = $type;
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
if (!empty($optional_update_waring_files)) {
|
if (!empty($optional_update_waring_files)) {
|
||||||
foreach ($optional_update_waring_files as $file_path => $type) {
|
foreach ($optional_update_waring_files as $file_path => $type) {
|
||||||
$output->writeln($file_path . ' ' . $type);
|
$output->writeln($file_path . ' ' . $type);
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ use think\console\Output;
|
|||||||
|
|
||||||
class VersionBase extends Command
|
class VersionBase extends Command
|
||||||
{
|
{
|
||||||
public const VERSION = 'v2.0.61';
|
public const VERSION = 'v2.0.62';
|
||||||
|
|
||||||
public const LAYUI_VERSION = '2.8.17';
|
public const LAYUI_VERSION = '2.8.17';
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user